[jboss-osgi-commits] JBoss-OSGI SVN: r96263 - in projects/jboss-osgi/trunk/reactor/framework/src: test/java/org/jboss/test/osgi and 10 other directories.

Author: adrian(a)jboss.org Date: 2009-11-11 10:59:11 -0500 (Wed, 11 Nov 2009) New Revision: 96263 Added: projects/jboss-osgi/trunk/reactor/framework/src/test/resources/bootstrap/ projects/jboss-osgi/trunk/reactor/framework/src/test/resources/bootstrap/jboss-osgi-bootstrap.xml Removed: projects/jboss-osgi/trunk/reactor/framework/src/test/resources/META-INF/jboss-osgi-bootstrap.xml Modified: 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/FrameworkTestDelegate.java projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/bundle/BundleContextUnitTestCase.java projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/bundle/BundleEntriesUnitTestCase.java projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/bundle/BundleUnitTestCase.java projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/bundle/SystemBundleUnitTestCase.java projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/classloader/BundleClassPathTest.java projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/classloader/ExportImportPackageUnitTestCase.java projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/classloader/RequireBundleUnitTestCase.java projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/integration/simple/SimpleBundleTestCase.java projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/integration/simple/SimpleLogServiceTest.java projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/launch/FrameworkLaunchTestCase.java projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/resolver/AbstractResolverTest.java projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/resolver/ResolverSmokeTest.java projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/service/GetServiceReferencesUnitTestCase.java projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/service/GetUnGetServiceUnitTestCase.java projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/service/RegisterServiceUnitTestCase.java projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/service/ServiceFactoryUnitTestCase.java projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/service/ServiceReferenceUnitTestCase.java projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/service/ServiceRegistrationUnitTestCase.java projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/smoke/OSGiSmokeTestCase.java Log: [JBOSGI-202] - Add properties to control where the bootstrap file comes from and fix the broken testsuite caused by refactoring 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-11-11 15:28:38 UTC (rev 96262) +++ projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/launch/OSGiFrameworkFactory.java 2009-11-11 15:59:11 UTC (rev 96263) @@ -23,9 +23,14 @@ // $Id$ +import java.net.MalformedURLException; import java.net.URL; +import java.security.AccessController; +import java.security.PrivilegedAction; import java.util.Arrays; +import java.util.Collections; import java.util.HashMap; +import java.util.List; import java.util.Map; import org.jboss.dependency.plugins.AbstractControllerContext; @@ -40,7 +45,6 @@ import org.jboss.kernel.plugins.bootstrap.basic.BasicBootstrap; import org.jboss.kernel.plugins.deployment.xml.BasicXMLDeployer; import org.jboss.kernel.spi.dependency.KernelController; -import org.jboss.logging.Logger; import org.jboss.osgi.framework.bundle.OSGiBundleManager; import org.osgi.framework.launch.Framework; import org.osgi.framework.launch.FrameworkFactory; @@ -53,9 +57,12 @@ */ public class OSGiFrameworkFactory implements FrameworkFactory { - // Provide logging - final Logger log = Logger.getLogger(OSGiFrameworkFactory.class); + /** The system property used to get a bootstrap url */ + public static final String BOOTSTRAP_URL = "org.jboss.osgi.framework.launch.bootstrapURL"; + /** The system property used to get a bootstrap path loaded from a classloader */ + public static final String BOOTSTRAP_PATH = "org.jboss.osgi.framework.launch.bootstrapPath"; + @SuppressWarnings("unchecked") public Framework newFramework(Map configuration) { @@ -69,7 +76,29 @@ BasicXMLDeployer deployer = new BasicXMLDeployer(kernel, ControllerMode.AUTOMATIC); URL url = null; - String[] bootstraps = new String[] { "jboss-osgi-bootstrap.xml", "META-INF/jboss-osgi-bootstrap.xml", "META-INF/jboss-osgi-default-bootstrap.xml" }; + + // Specified urls + String bootstrapURL = getProperty(BOOTSTRAP_URL); + if (bootstrapURL != null) + { + try + { + url = new URL(bootstrapURL); + } + catch (MalformedURLException e) + { + throw new RuntimeException("Invalid system property " + BOOTSTRAP_URL, e); + } + } + + // Default bootstrap paths + List<String> bootstraps = Arrays.asList("jboss-osgi-bootstrap.xml", "META-INF/jboss-osgi-bootstrap.xml", "META-INF/jboss-osgi-default-bootstrap.xml"); + + // Specified bootstrap path + String bootstrapPath = getProperty(BOOTSTRAP_PATH); + if (bootstrapPath != null) + bootstraps = Collections.singletonList(bootstrapPath); + ClassLoader contextLoader = Thread.currentThread().getContextClassLoader(); for (String xml : bootstraps) { @@ -118,4 +147,24 @@ return controller; } + /** + * Get a property + * + * @param propertyName the property name + * @return the property + */ + private String getProperty(final String propertyName) + { + SecurityManager sm = System.getSecurityManager(); + if (sm == null) + return System.getProperty(propertyName); + + return AccessController.doPrivileged(new PrivilegedAction<String>() + { + public String run() + { + return System.getProperty(propertyName); + } + }); + } } \ No newline at end of file Modified: projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/FrameworkTestDelegate.java =================================================================== --- projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/FrameworkTestDelegate.java 2009-11-11 15:28:38 UTC (rev 96262) +++ projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/FrameworkTestDelegate.java 2009-11-11 15:59:11 UTC (rev 96263) @@ -67,7 +67,7 @@ */ protected void deploy() throws Exception { - String common = "/META-INF/jboss-osgi-bootstrap.xml"; + String common = "/bootstrap/jboss-osgi-bootstrap.xml"; URL url = getClass().getResource(common); if (url == null) throw new IllegalStateException(common + " not found"); Modified: projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/bundle/BundleContextUnitTestCase.java =================================================================== --- projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/bundle/BundleContextUnitTestCase.java 2009-11-11 15:28:38 UTC (rev 96262) +++ projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/bundle/BundleContextUnitTestCase.java 2009-11-11 15:59:11 UTC (rev 96263) @@ -29,6 +29,8 @@ import java.util.Locale; import java.util.Set; +import junit.framework.Test; + import org.jboss.test.osgi.FrameworkTestCase; import org.osgi.framework.Bundle; import org.osgi.framework.BundleContext; @@ -48,6 +50,11 @@ */ public class BundleContextUnitTestCase extends FrameworkTestCase { + public static Test suite() + { + return suite(BundleContextUnitTestCase.class); + } + public BundleContextUnitTestCase(String name) { super(name); Modified: projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/bundle/BundleEntriesUnitTestCase.java =================================================================== --- projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/bundle/BundleEntriesUnitTestCase.java 2009-11-11 15:28:38 UTC (rev 96262) +++ projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/bundle/BundleEntriesUnitTestCase.java 2009-11-11 15:59:11 UTC (rev 96263) @@ -28,6 +28,8 @@ import java.util.HashSet; import java.util.Set; +import junit.framework.Test; + import org.jboss.test.osgi.FrameworkTestCase; import org.osgi.framework.Bundle; @@ -41,6 +43,11 @@ */ public class BundleEntriesUnitTestCase extends FrameworkTestCase { + public static Test suite() + { + return suite(BundleEntriesUnitTestCase.class); + } + public BundleEntriesUnitTestCase(String name) { super(name); Modified: projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/bundle/BundleUnitTestCase.java =================================================================== --- projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/bundle/BundleUnitTestCase.java 2009-11-11 15:28:38 UTC (rev 96262) +++ projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/bundle/BundleUnitTestCase.java 2009-11-11 15:59:11 UTC (rev 96263) @@ -25,6 +25,8 @@ import java.util.Hashtable; import java.util.jar.Attributes; +import junit.framework.Test; + import org.jboss.test.osgi.FrameworkTestCase; import org.osgi.framework.Bundle; import org.osgi.framework.BundleContext; @@ -40,6 +42,11 @@ */ public class BundleUnitTestCase extends FrameworkTestCase { + public static Test suite() + { + return suite(BundleUnitTestCase.class); + } + public BundleUnitTestCase(String name) { super(name); Modified: projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/bundle/SystemBundleUnitTestCase.java =================================================================== --- projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/bundle/SystemBundleUnitTestCase.java 2009-11-11 15:28:38 UTC (rev 96262) +++ projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/bundle/SystemBundleUnitTestCase.java 2009-11-11 15:59:11 UTC (rev 96263) @@ -24,6 +24,8 @@ import java.util.Dictionary; import java.util.Hashtable; +import junit.framework.Test; + import org.jboss.test.osgi.FrameworkTestCase; import org.osgi.framework.Bundle; import org.osgi.framework.BundleException; @@ -43,6 +45,11 @@ super(name); } + public static Test suite() + { + return suite(SystemBundleUnitTestCase.class); + } + public void testBundleId() throws Exception { assertEquals(0, getSystemBundle().getBundleId()); Modified: projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/classloader/BundleClassPathTest.java =================================================================== --- projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/classloader/BundleClassPathTest.java 2009-11-11 15:28:38 UTC (rev 96262) +++ projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/classloader/BundleClassPathTest.java 2009-11-11 15:59:11 UTC (rev 96263) @@ -41,6 +41,11 @@ */ public class BundleClassPathTest extends OSGiTest { + public void setUp() + { + System.setProperty("org.jboss.osgi.framework.launch.bootstrapPath", "bootstrap/jboss-osgi-bootstrap.xml"); + } + @Test public void testBundleClassPath() throws Exception { Modified: projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/classloader/ExportImportPackageUnitTestCase.java =================================================================== --- projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/classloader/ExportImportPackageUnitTestCase.java 2009-11-11 15:28:38 UTC (rev 96262) +++ projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/classloader/ExportImportPackageUnitTestCase.java 2009-11-11 15:59:11 UTC (rev 96263) @@ -21,6 +21,8 @@ */ package org.jboss.test.osgi.classloader; +import junit.framework.Test; + import org.jboss.test.osgi.FrameworkTestCase; import org.jboss.test.osgi.classloader.support.a.A; import org.jboss.test.osgi.classloader.support.b.B; @@ -41,6 +43,11 @@ */ public class ExportImportPackageUnitTestCase extends FrameworkTestCase { + public static Test suite() + { + return suite(ExportImportPackageUnitTestCase.class); + } + public ExportImportPackageUnitTestCase(String name) { super(name); Modified: projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/classloader/RequireBundleUnitTestCase.java =================================================================== --- projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/classloader/RequireBundleUnitTestCase.java 2009-11-11 15:28:38 UTC (rev 96262) +++ projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/classloader/RequireBundleUnitTestCase.java 2009-11-11 15:59:11 UTC (rev 96263) @@ -21,6 +21,8 @@ */ package org.jboss.test.osgi.classloader; +import junit.framework.Test; + import org.jboss.test.osgi.FrameworkTestCase; import org.jboss.test.osgi.classloader.support.a.A; import org.jboss.test.osgi.classloader.support.b.B; @@ -41,6 +43,11 @@ super(name); } + public static Test suite() + { + return suite(RequireBundleUnitTestCase.class); + } + public void testSimpleRequireBundle() throws Exception { Bundle bundle1 = assembleBundle("bundleA", "/bundles/classloader/bundleA", A.class); Modified: projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/integration/simple/SimpleBundleTestCase.java =================================================================== --- projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/integration/simple/SimpleBundleTestCase.java 2009-11-11 15:28:38 UTC (rev 96262) +++ projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/integration/simple/SimpleBundleTestCase.java 2009-11-11 15:59:11 UTC (rev 96263) @@ -46,6 +46,11 @@ */ public class SimpleBundleTestCase { + public void setUp() + { + System.setProperty("org.jboss.osgi.framework.launch.bootstrapPath", "bootstrap/jboss-osgi-bootstrap.xml"); + } + @Test public void testBundleInstallLauchAPI() throws Exception { Modified: projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/integration/simple/SimpleLogServiceTest.java =================================================================== --- projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/integration/simple/SimpleLogServiceTest.java 2009-11-11 15:28:38 UTC (rev 96262) +++ projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/integration/simple/SimpleLogServiceTest.java 2009-11-11 15:59:11 UTC (rev 96263) @@ -51,6 +51,7 @@ public void setUp() { System.clearProperty("simple-logservice-bundle"); + System.setProperty("org.jboss.osgi.framework.launch.bootstrapPath", "bootstrap/jboss-osgi-bootstrap.xml"); } @Test Modified: projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/launch/FrameworkLaunchTestCase.java =================================================================== --- projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/launch/FrameworkLaunchTestCase.java 2009-11-11 15:28:38 UTC (rev 96262) +++ projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/launch/FrameworkLaunchTestCase.java 2009-11-11 15:59:11 UTC (rev 96263) @@ -40,6 +40,11 @@ */ public class FrameworkLaunchTestCase { + public void setUp() + { + System.setProperty("org.jboss.osgi.framework.launch.bootstrapPath", "bootstrap/jboss-osgi-bootstrap.xml"); + } + @Test public void testFrameworkLaunch() throws BundleException { Modified: projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/resolver/AbstractResolverTest.java =================================================================== --- projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/resolver/AbstractResolverTest.java 2009-11-11 15:28:38 UTC (rev 96262) +++ projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/resolver/AbstractResolverTest.java 2009-11-11 15:59:11 UTC (rev 96263) @@ -48,6 +48,8 @@ @BeforeClass public static void beforeClass() throws BundleException { + System.setProperty("org.jboss.osgi.framework.launch.bootstrapPath", "bootstrap/jboss-osgi-bootstrap.xml"); + OSGiBootstrapProvider bootProvider = OSGiBootstrap.getBootstrapProvider(); framework = (OSGiFramework)bootProvider.getFramework(); framework.start(); Modified: projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/resolver/ResolverSmokeTest.java =================================================================== --- projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/resolver/ResolverSmokeTest.java 2009-11-11 15:28:38 UTC (rev 96262) +++ projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/resolver/ResolverSmokeTest.java 2009-11-11 15:59:11 UTC (rev 96263) @@ -50,6 +50,11 @@ */ public class ResolverSmokeTest extends OSGiTest { + public void setUp() + { + System.setProperty("org.jboss.osgi.framework.launch.bootstrapPath", "bootstrap/jboss-osgi-bootstrap.xml"); + } + @Test public void testBundleResolver() throws BundleException { Modified: projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/service/GetServiceReferencesUnitTestCase.java =================================================================== --- projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/service/GetServiceReferencesUnitTestCase.java 2009-11-11 15:28:38 UTC (rev 96262) +++ projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/service/GetServiceReferencesUnitTestCase.java 2009-11-11 15:59:11 UTC (rev 96263) @@ -24,6 +24,8 @@ import java.util.Dictionary; import java.util.Hashtable; +import junit.framework.Test; + import org.jboss.test.osgi.FrameworkTestCase; import org.jboss.test.osgi.service.support.a.A; import org.jboss.test.osgi.service.support.b.B; @@ -43,6 +45,11 @@ */ public class GetServiceReferencesUnitTestCase extends FrameworkTestCase { + public static Test suite() + { + return suite(GetServiceReferencesUnitTestCase.class); + } + public GetServiceReferencesUnitTestCase(String name) { super(name); Modified: projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/service/GetUnGetServiceUnitTestCase.java =================================================================== --- projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/service/GetUnGetServiceUnitTestCase.java 2009-11-11 15:28:38 UTC (rev 96262) +++ projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/service/GetUnGetServiceUnitTestCase.java 2009-11-11 15:59:11 UTC (rev 96263) @@ -21,6 +21,8 @@ */ package org.jboss.test.osgi.service; +import junit.framework.Test; + import org.jboss.test.osgi.FrameworkTestCase; import org.jboss.test.osgi.service.support.BrokenServiceFactory; import org.osgi.framework.Bundle; @@ -39,6 +41,11 @@ { static String OBJCLASS = BundleContext.class.getName(); + public static Test suite() + { + return suite(GetUnGetServiceUnitTestCase.class); + } + public GetUnGetServiceUnitTestCase(String name) { super(name); Modified: projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/service/RegisterServiceUnitTestCase.java =================================================================== --- projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/service/RegisterServiceUnitTestCase.java 2009-11-11 15:28:38 UTC (rev 96262) +++ projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/service/RegisterServiceUnitTestCase.java 2009-11-11 15:59:11 UTC (rev 96263) @@ -24,6 +24,8 @@ import java.util.Dictionary; import java.util.Hashtable; +import junit.framework.Test; + import org.jboss.test.osgi.FrameworkTestCase; import org.osgi.framework.Bundle; import org.osgi.framework.BundleContext; @@ -43,6 +45,11 @@ static String OBJCLASS = BundleContext.class.getName(); static String[] OBJCLASSES = new String[] { OBJCLASS }; + public static Test suite() + { + return suite(RegisterServiceUnitTestCase.class); + } + public RegisterServiceUnitTestCase(String name) { super(name); Modified: projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/service/ServiceFactoryUnitTestCase.java =================================================================== --- projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/service/ServiceFactoryUnitTestCase.java 2009-11-11 15:28:38 UTC (rev 96262) +++ projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/service/ServiceFactoryUnitTestCase.java 2009-11-11 15:59:11 UTC (rev 96263) @@ -21,6 +21,8 @@ */ package org.jboss.test.osgi.service; +import junit.framework.Test; + import org.jboss.osgi.framework.bundle.OSGiBundleWrapper; import org.jboss.test.osgi.FrameworkTestCase; import org.jboss.test.osgi.service.support.SimpleServiceFactory; @@ -42,6 +44,11 @@ static String OBJCLASS = BundleContext.class.getName(); static String[] OBJCLASSES = new String[] { OBJCLASS }; + public static Test suite() + { + return suite(ServiceFactoryUnitTestCase.class); + } + public ServiceFactoryUnitTestCase(String name) { super(name); Modified: projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/service/ServiceReferenceUnitTestCase.java =================================================================== --- projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/service/ServiceReferenceUnitTestCase.java 2009-11-11 15:28:38 UTC (rev 96262) +++ projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/service/ServiceReferenceUnitTestCase.java 2009-11-11 15:59:11 UTC (rev 96263) @@ -28,6 +28,8 @@ import java.util.Set; import java.util.TreeSet; +import junit.framework.Test; + import org.jboss.test.osgi.FrameworkTestCase; import org.jboss.test.osgi.service.support.a.A; import org.osgi.framework.Bundle; @@ -50,6 +52,11 @@ super(name); } + public static Test suite() + { + return suite(ServiceReferenceUnitTestCase.class); + } + public void testGetProperty() throws Exception { ServiceReference reference = null; Modified: projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/service/ServiceRegistrationUnitTestCase.java =================================================================== --- projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/service/ServiceRegistrationUnitTestCase.java 2009-11-11 15:28:38 UTC (rev 96262) +++ projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/service/ServiceRegistrationUnitTestCase.java 2009-11-11 15:59:11 UTC (rev 96263) @@ -23,6 +23,8 @@ import java.util.Hashtable; +import junit.framework.Test; + import org.jboss.test.osgi.FrameworkTestCase; import org.jboss.test.osgi.service.support.SimpleServiceFactory; import org.osgi.framework.Bundle; @@ -45,6 +47,11 @@ super(name); } + public static Test suite() + { + return suite(ServiceRegistrationUnitTestCase.class); + } + public void testGetReference() throws Exception { Bundle bundle = addBundle("/bundles/simple/", "simple-bundle1"); Modified: projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/smoke/OSGiSmokeTestCase.java =================================================================== --- projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/smoke/OSGiSmokeTestCase.java 2009-11-11 15:28:38 UTC (rev 96262) +++ projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/smoke/OSGiSmokeTestCase.java 2009-11-11 15:59:11 UTC (rev 96263) @@ -24,6 +24,8 @@ import java.io.InputStream; import java.net.URL; +import junit.framework.Test; + import org.jboss.test.osgi.FrameworkTestCase; import org.jboss.test.osgi.smoke.support.a.A; import org.jboss.test.osgi.smoke.support.a.b.B; @@ -38,6 +40,11 @@ */ public class OSGiSmokeTestCase extends FrameworkTestCase { + public static Test suite() + { + return suite(OSGiSmokeTestCase.class); + } + public OSGiSmokeTestCase(String name) { super(name); @@ -45,14 +52,14 @@ public void testNoManifest() throws Exception { - // [TODO] discuss no manifest - //testBundle("smoke-no-manifest", Bundle.ACTIVE); + // TODO no manifest + // testBundle("smoke-no-manifest", Bundle.ACTIVE); } public void testNonOSGiManifest() throws Exception { - // [TODO] discuss no osgi manifest - //testBundle("smoke-non-osgi-manifest", Bundle.ACTIVE); + // TODO no manifest + // testBundle("smoke-non-osgi-manifest", Bundle.ACTIVE); } public void testOSGiManifest() throws Exception Deleted: projects/jboss-osgi/trunk/reactor/framework/src/test/resources/META-INF/jboss-osgi-bootstrap.xml =================================================================== --- projects/jboss-osgi/trunk/reactor/framework/src/test/resources/META-INF/jboss-osgi-bootstrap.xml 2009-11-11 15:28:38 UTC (rev 96262) +++ projects/jboss-osgi/trunk/reactor/framework/src/test/resources/META-INF/jboss-osgi-bootstrap.xml 2009-11-11 15:59:11 UTC (rev 96263) @@ -1,182 +0,0 @@ -<deployment xmlns="urn:jboss:bean-deployer:2.0"> - - <!-- - ******************************** - * * - * OSGi Framework * - * * - ******************************** - --> - - <bean name="OSGiBundleManager" class="org.jboss.osgi.framework.bundle.OSGiBundleManager"> - <constructor> - <parameter><inject bean="jboss.kernel:service=Kernel" /></parameter> - <parameter><inject bean="MainDeployer" /></parameter> - </constructor> - <property name="properties"> - <map keyClass="java.lang.String" valueClass="java.lang.String"> - <entry><key>org.osgi.framework.storage</key><value>${log4j.output.dir}/osgi-store</value></entry> - <entry><key>org.osgi.framework.storage.clean</key><value>onFirstInit</value></entry> - <entry><key>org.osgi.framework.system.packages.extra</key><value> - - org.jboss.logging;version=2.0, - - org.jboss.osgi.spi;version=1.0, - org.jboss.osgi.spi.capability;version=1.0, - org.jboss.osgi.spi.management;version=1.0, - org.jboss.osgi.spi.service;version=1.0, - org.jboss.osgi.spi.util;version=1.0, - - org.osgi.framework, - org.osgi.framework.launch, - org.osgi.service.startlevel, - org.osgi.service.packageadmin - </value></entry> - </map> - </property> - <incallback method="addPlugin" /> - <uncallback method="removePlugin" /> - </bean> - - <!-- - ******************************** - * * - * OSGi Framework Plugins * - * * - ******************************** - --> - - <bean name="OSGiBundleResolver" class="org.jboss.osgi.framework.resolver.internal.basic.BasicResolverImpl"> - <constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor> - </bean> - <bean name="OSGiFrameworkEventsPlugin" class="org.jboss.osgi.framework.plugins.internal.FrameworkEventsPluginImpl"> - <constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor> - </bean> - <bean name="OSGiStoragePlugin" class="org.jboss.osgi.framework.plugins.internal.BundleStoragePluginImpl"> - <constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor> - </bean> - <bean name="OSGiSystemPackages" class="org.jboss.osgi.framework.plugins.internal.SystemPackagesPluginImpl"> - <constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor> - </bean> - - <!-- - ******************************** - * * - * OSGi Service Plugins * - * * - ******************************** - --> - - <bean name="MicrocontainerService" class="org.jboss.osgi.framework.service.internal.MicrocontainerServiceImpl"> - <constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor> - </bean> - <bean name="StartLevelService" class="org.jboss.osgi.framework.service.internal.StartLevelImpl"> - <constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor> - </bean> - <bean name="PackageAdminService" class="org.jboss.osgi.framework.service.internal.PackageAdminImpl"> - <constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor> - </bean> - <bean name="DeployerService" class="org.jboss.osgi.framework.service.internal.DeployerServiceImpl"> - <constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor> - </bean> - <bean name="LifecycleInterceptorService" class="org.jboss.osgi.framework.service.internal.LifecycleInterceptorServiceImpl"> - <constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor> - </bean> - - <!-- - ******************************** - * * - * OSGi Deployment * - * * - ******************************** - --> - - <!-- The MainDeployer --> - <bean name="MainDeployer" class="org.jboss.deployers.plugins.main.MainDeployerImpl"> - <property name="structuralDeployers"><inject bean="StructuralDeployers" /></property> - <property name="deployers"><inject bean="Deployers" /></property> - </bean> - - <!-- The holder for deployers that determine structure --> - <bean name="StructuralDeployers" class="org.jboss.deployers.vfs.plugins.structure.VFSStructuralDeployersImpl"> - <property name="structureBuilder"> - <!-- The consolidator of the structure information --> - <bean name="StructureBuilder" class="org.jboss.deployers.vfs.plugins.structure.VFSStructureBuilder" /> - </property> - <!-- Accept any implementor of structure deployer --> - <incallback method="addDeployer" /> - <uncallback method="removeDeployer" /> - </bean> - - <!-- The holder for deployers that do real deployment --> - <bean name="Deployers" class="org.jboss.deployers.plugins.deployers.DeployersImpl"> - <constructor><parameter><inject bean="jboss.kernel:service=KernelController" /></parameter></constructor> - <!-- Accept any implementor of deployer --> - <incallback method="addDeployer" /> - <uncallback method="removeDeployer" /> - </bean> - - <!-- Bundle Structure --> - <bean name="BundleStructure" class="org.jboss.osgi.deployer.BundleStructureDeployer" /> - - <!-- JAR & File Structure (needed for negative testing) --> - <bean name="JARStructure" class="org.jboss.deployers.vfs.plugins.structure.jar.JARStructure" /> - <bean name="FileStructure" class="org.jboss.deployers.vfs.plugins.structure.file.FileStructure" /> - - <!-- POJO Deployment --> - <bean name="BeanDeployer" class="org.jboss.deployers.vfs.deployer.kernel.BeanDeployer" /> - <bean name="KernelDeploymentDeployer" class="org.jboss.deployers.vfs.deployer.kernel.KernelDeploymentDeployer" /> - <bean name="BeanMetaDataDeployer" class="org.jboss.deployers.vfs.deployer.kernel.BeanMetaDataDeployer"> - <constructor> - <parameter class="org.jboss.dependency.spi.Controller"><inject bean="jboss.kernel:service=KernelController" /></parameter> - </constructor> - </bean> - - <!-- OSGI Deployment --> - <bean name="OSGiManifestParsingDeployer" class="org.jboss.osgi.framework.deployers.OSGiManifestParsingDeployer" /> - <bean name="OSGiBundleStateDeployer" class="org.jboss.osgi.framework.deployers.OSGiBundleStateDeployer"> - <constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor> - </bean> - <bean name="OSGiBundleActivatorDeployer" class="org.jboss.osgi.framework.deployers.OSGiBundleActivatorDeployer" /> - - <!-- - ******************************** - * * - * OSGi Classloading * - * * - ******************************** - --> - - <bean name="OSGiClassLoaderSystem" class="org.jboss.osgi.framework.classloading.OSGiClassLoaderSystem" /> - <bean name="OSGiClassLoaderDomain" class="org.jboss.osgi.framework.classloading.OSGiClassLoaderDomain" > - <constructor><parameter>OSGiClassLoaderDomain</parameter></constructor> - <property name="classLoaderSystem"><inject bean="OSGiClassLoaderSystem"/></property> - <property name="bundleManager"><inject bean="OSGiBundleManager" /></property> - </bean> - <bean name="OSGiClassLoaderFactory" class="org.jboss.osgi.framework.classloading.OSGiClassLoaderFactory" > - <property name="system"><inject bean="OSGiClassLoaderSystem"/></property> - </bean> - <bean name="OSGiBundleClassLoadingDeployer" class="org.jboss.osgi.framework.classloading.OSGiBundleClassLoadingDeployer"> - <property name="domain"><inject bean="OSGiClassLoaderDomain"/></property> - <property name="factory"><inject bean="OSGiClassLoaderFactory"/></property> - </bean> - - <bean name="ClassLoading" class="org.jboss.classloading.spi.dependency.ClassLoading"> - <incallback method="addModule" state="Configured" /> - <uncallback method="removeModule" state="Configured" /> - </bean> - <bean name="ClassLoadingDefaultDeployer" class="org.jboss.deployers.plugins.classloading.ClassLoadingDefaultDeployer"> - <property name="defaultMetaData"> - <classloading xmlns="urn:jboss:classloading:1.0" export-all="NON_EMPTY" import-all="true" /> - </property> - </bean> - <bean name="ClassLoaderClassPathDeployer" class="org.jboss.deployers.vfs.plugins.classloader.VFSClassLoaderClassPathDeployer" /> - <bean name="ClassLoaderDescribeDeployer" class="org.jboss.deployers.vfs.plugins.classloader.VFSClassLoaderDescribeDeployer"> - <property name="classLoading"><inject bean="ClassLoading" /></property> - </bean> - <bean name="ClassLoaderDeployer" class="org.jboss.deployers.plugins.classloading.AbstractLevelClassLoaderSystemDeployer"> - <property name="classLoading"><inject bean="ClassLoading" /></property> - <property name="system"><inject bean="OSGiClassLoaderSystem" /></property> - </bean> - -</deployment> Copied: projects/jboss-osgi/trunk/reactor/framework/src/test/resources/bootstrap/jboss-osgi-bootstrap.xml (from rev 96255, projects/jboss-osgi/trunk/reactor/framework/src/test/resources/META-INF/jboss-osgi-bootstrap.xml) =================================================================== --- projects/jboss-osgi/trunk/reactor/framework/src/test/resources/bootstrap/jboss-osgi-bootstrap.xml (rev 0) +++ projects/jboss-osgi/trunk/reactor/framework/src/test/resources/bootstrap/jboss-osgi-bootstrap.xml 2009-11-11 15:59:11 UTC (rev 96263) @@ -0,0 +1,182 @@ +<deployment xmlns="urn:jboss:bean-deployer:2.0"> + + <!-- + ******************************** + * * + * OSGi Framework * + * * + ******************************** + --> + + <bean name="OSGiBundleManager" class="org.jboss.osgi.framework.bundle.OSGiBundleManager"> + <constructor> + <parameter><inject bean="jboss.kernel:service=Kernel" /></parameter> + <parameter><inject bean="MainDeployer" /></parameter> + </constructor> + <property name="properties"> + <map keyClass="java.lang.String" valueClass="java.lang.String"> + <entry><key>org.osgi.framework.storage</key><value>${log4j.output.dir}/osgi-store</value></entry> + <entry><key>org.osgi.framework.storage.clean</key><value>onFirstInit</value></entry> + <entry><key>org.osgi.framework.system.packages.extra</key><value> + + org.jboss.logging;version=2.0, + + org.jboss.osgi.spi;version=1.0, + org.jboss.osgi.spi.capability;version=1.0, + org.jboss.osgi.spi.management;version=1.0, + org.jboss.osgi.spi.service;version=1.0, + org.jboss.osgi.spi.util;version=1.0, + + org.osgi.framework, + org.osgi.framework.launch, + org.osgi.service.startlevel, + org.osgi.service.packageadmin + </value></entry> + </map> + </property> + <incallback method="addPlugin" /> + <uncallback method="removePlugin" /> + </bean> + + <!-- + ******************************** + * * + * OSGi Framework Plugins * + * * + ******************************** + --> + + <bean name="OSGiBundleResolver" class="org.jboss.osgi.framework.resolver.internal.basic.BasicResolverImpl"> + <constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor> + </bean> + <bean name="OSGiFrameworkEventsPlugin" class="org.jboss.osgi.framework.plugins.internal.FrameworkEventsPluginImpl"> + <constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor> + </bean> + <bean name="OSGiStoragePlugin" class="org.jboss.osgi.framework.plugins.internal.BundleStoragePluginImpl"> + <constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor> + </bean> + <bean name="OSGiSystemPackages" class="org.jboss.osgi.framework.plugins.internal.SystemPackagesPluginImpl"> + <constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor> + </bean> + + <!-- + ******************************** + * * + * OSGi Service Plugins * + * * + ******************************** + --> + + <bean name="MicrocontainerService" class="org.jboss.osgi.framework.service.internal.MicrocontainerServiceImpl"> + <constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor> + </bean> + <bean name="StartLevelService" class="org.jboss.osgi.framework.service.internal.StartLevelImpl"> + <constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor> + </bean> + <bean name="PackageAdminService" class="org.jboss.osgi.framework.service.internal.PackageAdminImpl"> + <constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor> + </bean> + <bean name="DeployerService" class="org.jboss.osgi.framework.service.internal.DeployerServiceImpl"> + <constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor> + </bean> + <bean name="LifecycleInterceptorService" class="org.jboss.osgi.framework.service.internal.LifecycleInterceptorServiceImpl"> + <constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor> + </bean> + + <!-- + ******************************** + * * + * OSGi Deployment * + * * + ******************************** + --> + + <!-- The MainDeployer --> + <bean name="MainDeployer" class="org.jboss.deployers.plugins.main.MainDeployerImpl"> + <property name="structuralDeployers"><inject bean="StructuralDeployers" /></property> + <property name="deployers"><inject bean="Deployers" /></property> + </bean> + + <!-- The holder for deployers that determine structure --> + <bean name="StructuralDeployers" class="org.jboss.deployers.vfs.plugins.structure.VFSStructuralDeployersImpl"> + <property name="structureBuilder"> + <!-- The consolidator of the structure information --> + <bean name="StructureBuilder" class="org.jboss.deployers.vfs.plugins.structure.VFSStructureBuilder" /> + </property> + <!-- Accept any implementor of structure deployer --> + <incallback method="addDeployer" /> + <uncallback method="removeDeployer" /> + </bean> + + <!-- The holder for deployers that do real deployment --> + <bean name="Deployers" class="org.jboss.deployers.plugins.deployers.DeployersImpl"> + <constructor><parameter><inject bean="jboss.kernel:service=KernelController" /></parameter></constructor> + <!-- Accept any implementor of deployer --> + <incallback method="addDeployer" /> + <uncallback method="removeDeployer" /> + </bean> + + <!-- Bundle Structure --> + <bean name="BundleStructure" class="org.jboss.osgi.deployer.BundleStructureDeployer" /> + + <!-- JAR & File Structure (needed for negative testing) --> + <bean name="JARStructure" class="org.jboss.deployers.vfs.plugins.structure.jar.JARStructure" /> + <bean name="FileStructure" class="org.jboss.deployers.vfs.plugins.structure.file.FileStructure" /> + + <!-- POJO Deployment --> + <bean name="BeanDeployer" class="org.jboss.deployers.vfs.deployer.kernel.BeanDeployer" /> + <bean name="KernelDeploymentDeployer" class="org.jboss.deployers.vfs.deployer.kernel.KernelDeploymentDeployer" /> + <bean name="BeanMetaDataDeployer" class="org.jboss.deployers.vfs.deployer.kernel.BeanMetaDataDeployer"> + <constructor> + <parameter class="org.jboss.dependency.spi.Controller"><inject bean="jboss.kernel:service=KernelController" /></parameter> + </constructor> + </bean> + + <!-- OSGI Deployment --> + <bean name="OSGiManifestParsingDeployer" class="org.jboss.osgi.framework.deployers.OSGiManifestParsingDeployer" /> + <bean name="OSGiBundleStateDeployer" class="org.jboss.osgi.framework.deployers.OSGiBundleStateDeployer"> + <constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor> + </bean> + <bean name="OSGiBundleActivatorDeployer" class="org.jboss.osgi.framework.deployers.OSGiBundleActivatorDeployer" /> + + <!-- + ******************************** + * * + * OSGi Classloading * + * * + ******************************** + --> + + <bean name="OSGiClassLoaderSystem" class="org.jboss.osgi.framework.classloading.OSGiClassLoaderSystem" /> + <bean name="OSGiClassLoaderDomain" class="org.jboss.osgi.framework.classloading.OSGiClassLoaderDomain" > + <constructor><parameter>OSGiClassLoaderDomain</parameter></constructor> + <property name="classLoaderSystem"><inject bean="OSGiClassLoaderSystem"/></property> + <property name="bundleManager"><inject bean="OSGiBundleManager" /></property> + </bean> + <bean name="OSGiClassLoaderFactory" class="org.jboss.osgi.framework.classloading.OSGiClassLoaderFactory" > + <property name="system"><inject bean="OSGiClassLoaderSystem"/></property> + </bean> + <bean name="OSGiBundleClassLoadingDeployer" class="org.jboss.osgi.framework.classloading.OSGiBundleClassLoadingDeployer"> + <property name="domain"><inject bean="OSGiClassLoaderDomain"/></property> + <property name="factory"><inject bean="OSGiClassLoaderFactory"/></property> + </bean> + + <bean name="ClassLoading" class="org.jboss.classloading.spi.dependency.ClassLoading"> + <incallback method="addModule" state="Configured" /> + <uncallback method="removeModule" state="Configured" /> + </bean> + <bean name="ClassLoadingDefaultDeployer" class="org.jboss.deployers.plugins.classloading.ClassLoadingDefaultDeployer"> + <property name="defaultMetaData"> + <classloading xmlns="urn:jboss:classloading:1.0" export-all="NON_EMPTY" import-all="true" /> + </property> + </bean> + <bean name="ClassLoaderClassPathDeployer" class="org.jboss.deployers.vfs.plugins.classloader.VFSClassLoaderClassPathDeployer" /> + <bean name="ClassLoaderDescribeDeployer" class="org.jboss.deployers.vfs.plugins.classloader.VFSClassLoaderDescribeDeployer"> + <property name="classLoading"><inject bean="ClassLoading" /></property> + </bean> + <bean name="ClassLoaderDeployer" class="org.jboss.deployers.plugins.classloading.AbstractLevelClassLoaderSystemDeployer"> + <property name="classLoading"><inject bean="ClassLoading" /></property> + <property name="system"><inject bean="OSGiClassLoaderSystem" /></property> + </bean> + +</deployment>