[jboss-osgi-commits] JBoss-OSGI SVN: r95005 - in projects/jboss-osgi/trunk: reactor and 2 other directories.

Author: thomas.diesler(a)jboss.com Date: 2009-10-16 02:38:39 -0400 (Fri, 16 Oct 2009) New Revision: 95005 Removed: projects/jboss-osgi/trunk/reactor/runtime/ Modified: projects/jboss-osgi/trunk/ projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/launch/OSGiFrameworkFactory.java projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/OSGiTestDelegate.java Log: [JBOSGI-184] Allow for overlay of jboss-osgi-bootstrap.xml Prepare - WIP Property changes on: projects/jboss-osgi/trunk ___________________________________________________________________ Name: svn:ignore - autoinstall.xml target Modified: projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/launch/OSGiFrameworkFactory.java =================================================================== --- projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/launch/OSGiFrameworkFactory.java 2009-10-16 06:29:24 UTC (rev 95004) +++ projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/launch/OSGiFrameworkFactory.java 2009-10-16 06:38:39 UTC (rev 95005) @@ -70,7 +70,7 @@ BasicXMLDeployer deployer = new BasicXMLDeployer(kernel, ControllerMode.AUTOMATIC); URL url = null; - String[] bootstraps = new String[] { "bootstrap/bootstrap.xml", "jboss-osgi-bootstrap.xml", "META-INF/jboss-osgi-bootstrap.xml" }; + String[] bootstraps = new String[] { "jboss-osgi-bootstrap.xml", "META-INF/jboss-osgi-bootstrap.xml", "META-INF/jboss-osgi-default-bootstrap.xml" }; ClassLoader contextLoader = Thread.currentThread().getContextClassLoader(); for (String xml : bootstraps) { Modified: projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/OSGiTestDelegate.java =================================================================== --- projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/OSGiTestDelegate.java 2009-10-16 06:29:24 UTC (rev 95004) +++ projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/OSGiTestDelegate.java 2009-10-16 06:38:39 UTC (rev 95005) @@ -81,10 +81,11 @@ */ protected void deploy() throws Exception { - String common = "/META-INF/jboss-osgi-bootstrap.xml"; - URL url = getClass().getResource(common); + URL url = getClass().getResource("/META-INF/jboss-osgi-bootstrap.xml"); if (url == null) - throw new IllegalStateException(common + " not found"); + url = getClass().getResource("/META-INF/jboss-osgi-default-bootstrap.xml"); + if (url == null) + throw new IllegalStateException("Cannot find: jboss-osgi-bootstrap.xml"); deploy(url); try {