Author: thomas.diesler(a)jboss.com Date: 2009-09-01 17:11:41 -0400 (Tue, 01 Sep 2009) New Revision: 93096 Modified: projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/main/java/org/jboss/osgi/plugins/facade/launch/OSGiFrameworkFactory.java Log: Add support for runtime bootstrap Modified: projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/main/java/org/jboss/osgi/plugins/facade/launch/OSGiFrameworkFactory.java =================================================================== --- projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/main/java/org/jboss/osgi/plugins/facade/launch/OSGiFrameworkFactory.java 2009-09-01 21:10:35 UTC (rev 93095) +++ projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/main/java/org/jboss/osgi/plugins/facade/launch/OSGiFrameworkFactory.java 2009-09-01 21:11:41 UTC (rev 93096) @@ -70,10 +70,16 @@ BasicXMLDeployer deployer = new BasicXMLDeployer(kernel, ControllerMode.AUTOMATIC); URL url = null; - String[] bootstraps = new String[] { "/bootstrap/bootstrap.xml", "/META-INF/jboss-osgi-bootstrap.xml" }; + String[] bootstraps = new String[] { "bootstrap/bootstrap.xml", "jboss-osgi-bootstrap.xml", "META-INF/jboss-osgi-bootstrap.xml" }; + ClassLoader contextLoader = Thread.currentThread().getContextClassLoader(); for (String xml : bootstraps) { - url = getClass().getResource(xml); + if (contextLoader != null) + url = contextLoader.getResource(xml); + + if (url == null) + url = getClass().getResource(xml); + if (url != null) break; }