November 2009 - jboss-osgi-commits

JBoss-OSGI SVN: r96762 - projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/bundle.

by jboss-osgi-commits＠lists.jboss.org

Author: alesj Date: 2009-11-23 16:40:41 -0500 (Mon, 23 Nov 2009) New Revision: 96762 Modified: projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/bundle/OSGiServiceState.java Log: Logger is cached in JBossObject. Modified: projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/bundle/OSGiServiceState.java =================================================================== --- projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/bundle/OSGiServiceState.java 2009-11-23 21:34:57 UTC (rev 96761) +++ projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/bundle/OSGiServiceState.java 2009-11-23 21:40:41 UTC (rev 96762) @@ -37,7 +37,6 @@ import org.jboss.dependency.spi.dispatch.InvokeDispatchContext; import org.jboss.kernel.Kernel; import org.jboss.kernel.spi.config.KernelConfigurator; -import org.jboss.logging.Logger; import org.jboss.osgi.framework.plugins.FrameworkEventsPlugin; import org.jboss.osgi.framework.util.CaseInsensitiveDictionary; import org.jboss.osgi.spi.util.BundleClassLoader; @@ -62,9 +61,6 @@ */ public class OSGiServiceState extends AbstractControllerContext implements ServiceReference, ServiceRegistration, InvokeDispatchContext { - /** The log */ - private static final Logger log = Logger.getLogger(OSGiServiceState.class); - /** The get classloader permission */ private static final RuntimePermission GET_CLASSLOADER_PERMISSION = new RuntimePermission("getClassLoader");

14 years, 7 months

1
0
0 / 0

JBoss-OSGI SVN: r96760 - projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/bundle.

by jboss-osgi-commits＠lists.jboss.org

Author: alesj Date: 2009-11-23 16:19:56 -0500 (Mon, 23 Nov 2009) New Revision: 96760 Modified: projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/bundle/OSGiScopeInfo.java projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/bundle/OSGiServiceState.java Log: [JBOSGI-141]; getTarget should be simpl, tracking is done elsewhere. Modified: projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/bundle/OSGiScopeInfo.java =================================================================== --- projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/bundle/OSGiScopeInfo.java 2009-11-23 21:18:59 UTC (rev 96759) +++ projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/bundle/OSGiScopeInfo.java 2009-11-23 21:19:56 UTC (rev 96760) @@ -77,7 +77,7 @@ if (qualifier instanceof Class) return key; - Object service = serviceState.getService(); + Object service = serviceState.getTarget(); if (service != null) { Class<?> clazz = service.getClass(); Modified: projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/bundle/OSGiServiceState.java =================================================================== --- projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/bundle/OSGiServiceState.java 2009-11-23 21:18:59 UTC (rev 96759) +++ projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/bundle/OSGiServiceState.java 2009-11-23 21:19:56 UTC (rev 96760) @@ -41,7 +41,6 @@ import org.jboss.osgi.framework.plugins.FrameworkEventsPlugin; import org.jboss.osgi.framework.util.CaseInsensitiveDictionary; import org.jboss.osgi.spi.util.BundleClassLoader; -import org.jboss.reflect.spi.ClassInfo; import org.jboss.util.collection.ConcurrentSet; import org.jboss.util.id.GUID; import org.osgi.framework.Bundle; @@ -198,39 +197,18 @@ setScopeInfo(OSGiScopeInfo.createScopeInfo(getName(), className, clazz, this)); } - /** - * Get service directly. - * - * @return the service - */ - Object getService() - { - return getService(bundleState); - } - @Override public Object getTarget() { - return bundleState.getService(this); + // get service directly + return getService(bundleState); } - public Object ungetTarget() - { - bundleState.ungetService(this); - return getService(); - } - public Object invoke(String name, Object[] parameters, String[] signature) throws Throwable { - Object service = getService(); - return getBeanInfo().invoke(service, name, signature, parameters); + return getBeanInfo().invoke(getTarget(), name, signature, parameters); } - public ClassInfo getClassInfo() - { - return getBeanInfo().getClassInfo(); - } - public ClassLoader getClassLoader() throws Throwable { SecurityManager sm = System.getSecurityManager(); @@ -242,27 +220,32 @@ public Object get(String name) throws Throwable { - Object service = getService(); - return getBeanInfo().getProperty(service, name); + return getBeanInfo().getProperty(getTarget(), name); } public void set(String name, Object value) throws Throwable { - Object service = getService(); - getBeanInfo().setProperty(service, name, value); + getBeanInfo().setProperty(getTarget(), name, value); } - public BeanInfo getBeanInfo() + /** + * Get bean info. + * + * @return the bean info + */ + protected BeanInfo getBeanInfo() { + if (isUnregistered()) + return null; + if (beanInfo == null) { try { Kernel kernel = bundleState.getBundleManager().getKernel(); KernelConfigurator configurator = kernel.getConfigurator(); - Object service = getService(); - if (service != null) - beanInfo = configurator.getBeanInfo(service.getClass()); + Object service = getTarget(); // should not be null, we're not unregistered + beanInfo = configurator.getBeanInfo(service.getClass()); } catch (Throwable t) {

14 years, 7 months

1
0
0 / 0

JBoss-OSGI SVN: r96748 - in projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework: service/internal and 1 other directory.

by jboss-osgi-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2009-11-23 13:21:25 -0500 (Mon, 23 Nov 2009) New Revision: 96748 Modified: projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/bundle/OSGiBundleManager.java projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/service/internal/PackageAdminImpl.java Log: [JBDEPLOY-226] Allow multiple deployments to change state at once Modified: projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/bundle/OSGiBundleManager.java =================================================================== --- projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/bundle/OSGiBundleManager.java 2009-11-23 18:02:03 UTC (rev 96747) +++ projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/bundle/OSGiBundleManager.java 2009-11-23 18:21:25 UTC (rev 96748) @@ -966,6 +966,7 @@ ControllerState requiredState = context.getRequiredState(); DeploymentStage requiredStage = unit.getRequiredStage(); + // TODO [JBDEPLOY-226] Allow multiple deployments to change state at once try { deployerClient.change(unit.getName(), DeploymentStages.CLASSLOADER); Modified: projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/service/internal/PackageAdminImpl.java =================================================================== --- projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/service/internal/PackageAdminImpl.java 2009-11-23 18:02:03 UTC (rev 96747) +++ projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/service/internal/PackageAdminImpl.java 2009-11-23 18:21:25 UTC (rev 96748) @@ -220,6 +220,7 @@ boolean allResolved = resolvableBundles.containsAll(unresolvedBundles); + // TODO [JBDEPLOY-226] Allow multiple deployments to change state at once int resolved = 1; while (resolved > 0) {

14 years, 7 months

1
0
0 / 0

JBoss-OSGI SVN: r96746 - in projects/jboss-osgi/trunk: testsuite/functional and 5 other directories.

by jboss-osgi-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2009-11-23 12:45:18 -0500 (Mon, 23 Nov 2009) New Revision: 96746 Removed: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/service/microcontainer/ projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/service/mcservice/ Modified: projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/resolver/ResolverSmokeTest.java projects/jboss-osgi/trunk/testsuite/functional/pom.xml projects/jboss-osgi/trunk/testsuite/functional/scripts/antrun-test-jars.xml projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi143/OSGI143TestCase.java projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi151/OSGI151TestCase.java Log: Document MC Framework resolver test failures 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-23 17:39:11 UTC (rev 96745) +++ projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/resolver/ResolverSmokeTest.java 2009-11-23 17:45:18 UTC (rev 96746) @@ -98,8 +98,8 @@ PackageAdminPlugin packageAdmin = bundleManager.getPlugin(PackageAdminPlugin.class); boolean allResoved = packageAdmin.resolveBundles(null); - if (allResoved == false) - System.out.println("FIXME: testRandomBundleResolution"); + //assertTrue("All bundles resolved", allResoved); + System.out.println("[JBOSGI-151] Cannot resolve circular dependencies"); } finally { Modified: projects/jboss-osgi/trunk/testsuite/functional/pom.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/pom.xml 2009-11-23 17:39:11 UTC (rev 96745) +++ projects/jboss-osgi/trunk/testsuite/functional/pom.xml 2009-11-23 17:45:18 UTC (rev 96746) @@ -259,15 +259,17 @@ <configuration> <excludes> <exclude>${target.container.excludes}</exclude> - <exclude>org/jboss/test/osgi/jbosgi39/**</exclude> - <exclude>org/jboss/test/osgi/jbosgi41/**</exclude> - <exclude>org/jboss/test/osgi/jbosgi99/**</exclude> - <exclude>org/jboss/test/osgi/jbosgi108/**</exclude> +  <exclude>org/jboss/test/osgi/jbosgi143/**</exclude> +  <exclude>org/jboss/test/osgi/jbosgi151/**</exclude> - <exclude>org/jboss/test/osgi/service/microcontainer/**</exclude>  <exclude>org/jboss/test/osgi/jbosgi99/**</exclude> +  + <exclude>org/jboss/test/osgi/jbosgi39/**</exclude> + <exclude>org/jboss/test/osgi/jbosgi108/**</exclude> +  + <exclude>org/jboss/test/osgi/jbosgi41/**</exclude> </excludes> </configuration> </plugin> @@ -308,14 +310,17 @@ <configuration> <excludes> <exclude>${target.container.excludes}</exclude> - <exclude>org/jboss/test/osgi/jbosgi39/**</exclude> - <exclude>org/jboss/test/osgi/jbosgi41/**</exclude> - <exclude>org/jboss/test/osgi/jbosgi108/**</exclude> +  <exclude>org/jboss/test/osgi/jbosgi143/**</exclude> +  <exclude>org/jboss/test/osgi/jbosgi151/**</exclude> - <exclude>org/jboss/test/osgi/service/microcontainer/**</exclude>  <exclude>org/jboss/test/osgi/jbosgi99/**</exclude> +  + <exclude>org/jboss/test/osgi/jbosgi39/**</exclude> + <exclude>org/jboss/test/osgi/jbosgi108/**</exclude> +  + <exclude>org/jboss/test/osgi/jbosgi41/**</exclude> </excludes> </configuration> </plugin> Modified: projects/jboss-osgi/trunk/testsuite/functional/scripts/antrun-test-jars.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/scripts/antrun-test-jars.xml 2009-11-23 17:39:11 UTC (rev 96745) +++ projects/jboss-osgi/trunk/testsuite/functional/scripts/antrun-test-jars.xml 2009-11-23 17:45:18 UTC (rev 96746) @@ -136,10 +136,6 @@  <bnd classpath="${tests.classes.dir}" output="${tests.output.dir}/test-libs/service/startlevel.jar" files="${tests.resources.dir}/service/startlevel/startlevel.bnd" /> -  - <bnd classpath="${tests.classes.dir}" output="${tests.output.dir}/test-libs/service/mcservice-bundleA.jar" files="${tests.resources.dir}/service/mcservice/mcservice-bundleA.bnd" /> - <bnd classpath="${tests.classes.dir}" output="${tests.output.dir}/test-libs/service/mcservice-bundleB.jar" files="${tests.resources.dir}/service/mcservice/mcservice-bundleB.bnd" /> -  </target> Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi143/OSGI143TestCase.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi143/OSGI143TestCase.java 2009-11-23 17:39:11 UTC (rev 96745) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi143/OSGI143TestCase.java 2009-11-23 17:45:18 UTC (rev 96746) @@ -28,7 +28,7 @@ import org.jboss.osgi.spi.framework.OSGiBootstrap; import org.jboss.osgi.spi.framework.OSGiBootstrapProvider; -import org.jboss.osgi.testing.OSGiTestHelper; +import org.jboss.osgi.testing.OSGiTest; import org.jboss.test.osgi.jbosgi143.bundleA.BeanA; import org.jboss.test.osgi.jbosgi143.bundleX.BeanX; import org.junit.Test; @@ -49,7 +49,7 @@ * @author thomas.diesler(a)jboss.com * @since 28-Aug-2009 */ -public class OSGI143TestCase +public class OSGI143TestCase extends OSGiTest { @Test public void testLoadClass() throws Exception @@ -58,22 +58,27 @@ Framework framework = bootProvider.getFramework(); framework.start(); - BundleContext sysContext = framework.getBundleContext(); - Bundle bundleX = sysContext.installBundle(getBundleLocation("jbosgi143-bundleX.jar")); - bundleX.start(); - - assertBundleLoadClass(bundleX, BeanX.class, true); - - Bundle bundleA = sysContext.installBundle(getBundleLocation("jbosgi143-bundleA.jar")); - bundleA.start(); - - assertBundleLoadClass(bundleA, BeanA.class, true); - - assertBundleLoadClass(bundleA, BeanX.class, true); - assertBundleLoadClass(bundleX, BeanA.class, true); - - framework.stop(); - framework.waitForStop(1000); + try + { + BundleContext sysContext = framework.getBundleContext(); + Bundle bundleX = sysContext.installBundle(getTestArchivePath("jbosgi143-bundleX.jar")); + bundleX.start(); + + assertBundleLoadClass(bundleX, BeanX.class, true); + + Bundle bundleA = sysContext.installBundle(getTestArchivePath("jbosgi143-bundleA.jar")); + bundleA.start(); + + assertBundleLoadClass(bundleA, BeanA.class, true); + + assertBundleLoadClass(bundleA, BeanX.class, true); + assertBundleLoadClass(bundleX, BeanA.class, true); + } + finally + { + framework.stop(); + framework.waitForStop(1000); + } } private void assertBundleLoadClass(Bundle bundle, Class<?> expClazz, boolean success) @@ -99,9 +104,4 @@ fail("Unexpected ClassNotFoundException for: " + message); } } - - private String getBundleLocation(String jarname) - { - return new OSGiTestHelper().getTestArchiveURL(jarname).toExternalForm(); - } } \ No newline at end of file Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi151/OSGI151TestCase.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi151/OSGI151TestCase.java 2009-11-23 17:39:11 UTC (rev 96745) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi151/OSGI151TestCase.java 2009-11-23 17:45:18 UTC (rev 96746) @@ -25,7 +25,7 @@ import org.jboss.osgi.spi.framework.OSGiBootstrap; import org.jboss.osgi.spi.framework.OSGiBootstrapProvider; -import org.jboss.osgi.testing.OSGiTestHelper; +import org.jboss.osgi.testing.OSGiTest; import org.jboss.test.osgi.jbosgi151.bundleA.BeanA; import org.jboss.test.osgi.jbosgi151.bundleB.BeanB; import org.junit.AfterClass; @@ -60,7 +60,7 @@ * @author thomas.diesler(a)jboss.com * @since 07-Sep-2009 */ -public class OSGI151TestCase +public class OSGI151TestCase extends OSGiTest { private static Framework framework; @@ -89,10 +89,10 @@ { BundleContext sysContext = framework.getBundleContext(); - Bundle bundleA = sysContext.installBundle(getBundleLocation("jbosgi151-bundleA.jar")); + Bundle bundleA = sysContext.installBundle(getTestArchivePath("jbosgi151-bundleA.jar")); assertEquals("INSTALLED expected", Bundle.INSTALLED, bundleA.getState()); - Bundle bundleB = sysContext.installBundle(getBundleLocation("jbosgi151-bundleB.jar")); + Bundle bundleB = sysContext.installBundle(getTestArchivePath("jbosgi151-bundleB.jar")); assertEquals("INSTALLED expected", Bundle.INSTALLED, bundleB.getState()); bundleB.start(); @@ -116,10 +116,10 @@ { BundleContext sysContext = framework.getBundleContext(); - Bundle bundleC = sysContext.installBundle(getBundleLocation("jbosgi151-bundleC.jar")); + Bundle bundleC = sysContext.installBundle(getTestArchivePath("jbosgi151-bundleC.jar")); assertEquals("INSTALLED expected", Bundle.INSTALLED, bundleC.getState()); - Bundle bundleD = sysContext.installBundle(getBundleLocation("jbosgi151-bundleD.jar")); + Bundle bundleD = sysContext.installBundle(getTestArchivePath("jbosgi151-bundleD.jar")); assertEquals("INSTALLED expected", Bundle.INSTALLED, bundleD.getState()); bundleD.start(); @@ -143,10 +143,10 @@ { BundleContext sysContext = framework.getBundleContext(); - Bundle bundleD = sysContext.installBundle(getBundleLocation("jbosgi151-bundleD.jar")); + Bundle bundleD = sysContext.installBundle(getTestArchivePath("jbosgi151-bundleD.jar")); assertEquals("INSTALLED expected", Bundle.INSTALLED, bundleD.getState()); - Bundle bundleC = sysContext.installBundle(getBundleLocation("jbosgi151-bundleC.jar")); + Bundle bundleC = sysContext.installBundle(getTestArchivePath("jbosgi151-bundleC.jar")); assertEquals("INSTALLED expected", Bundle.INSTALLED, bundleC.getState()); bundleD.start(); @@ -164,9 +164,4 @@ bundleD.uninstall(); bundleC.uninstall(); } - - private String getBundleLocation(String jarname) - { - return new OSGiTestHelper().getTestArchiveURL(jarname).toExternalForm(); - } } \ No newline at end of file

14 years, 7 months

1
0
0 / 0

JBoss-OSGI SVN: r96742 - projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf.

by jboss-osgi-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2009-11-23 11:48:38 -0500 (Mon, 23 Nov 2009) New Revision: 96742 Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-bootstrap.xml Log: Restore BasicResolver for AS integration Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-bootstrap.xml =================================================================== --- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-bootstrap.xml 2009-11-23 16:41:53 UTC (rev 96741) +++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-bootstrap.xml 2009-11-23 16:48:38 UTC (rev 96742) @@ -90,9 +90,6 @@ </list> </property> </bean> - <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>

14 years, 7 months

1
0
0 / 0

JBoss-OSGI SVN: r96741 - in projects/jboss-osgi/trunk/distribution/installer/src/main/resources: runtime/server/conf and 1 other directory.

by jboss-osgi-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2009-11-23 11:41:53 -0500 (Mon, 23 Nov 2009) New Revision: 96741 Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-jbossmc.xml projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-bootstrap.xml Log: Restore BasicResolver for AS integration Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-jbossmc.xml =================================================================== --- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-jbossmc.xml 2009-11-23 16:36:31 UTC (rev 96740) +++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-jbossmc.xml 2009-11-23 16:41:53 UTC (rev 96741) @@ -97,6 +97,9 @@ </bean> --> + <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> Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-bootstrap.xml =================================================================== --- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-bootstrap.xml 2009-11-23 16:36:31 UTC (rev 96740) +++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-bootstrap.xml 2009-11-23 16:41:53 UTC (rev 96741) @@ -90,6 +90,9 @@ </list> </property> </bean> + <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>

14 years, 7 months

1
0
0 / 0

JBoss-OSGI SVN: r96738 - in projects/jboss-osgi/trunk/distribution/installer/src/main/resources: runtime/server/conf and 1 other directory.

by jboss-osgi-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2009-11-23 09:40:57 -0500 (Mon, 23 Nov 2009) New Revision: 96738 Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-jbossmc.xml projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-bootstrap.xml Log: Remove ResolverPlugin from all configurations Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-jbossmc.xml =================================================================== --- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-jbossmc.xml 2009-11-23 14:37:50 UTC (rev 96737) +++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-jbossmc.xml 2009-11-23 14:40:57 UTC (rev 96738) @@ -97,9 +97,6 @@ </bean> --> - <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> Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-bootstrap.xml =================================================================== --- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-bootstrap.xml 2009-11-23 14:37:50 UTC (rev 96737) +++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-bootstrap.xml 2009-11-23 14:40:57 UTC (rev 96738) @@ -90,9 +90,6 @@ </list> </property> </bean> - <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>

14 years, 7 months

1
0
0 / 0

JBoss-OSGI SVN: r96737 - in projects/jboss-osgi/trunk: reactor/framework/src/main/java/org/jboss/osgi/framework/resolver/internal and 3 other directories.

by jboss-osgi-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2009-11-23 09:37:50 -0500 (Mon, 23 Nov 2009) New Revision: 96737 Removed: projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/resolver/internal/NoopResolverImpl.java Modified: projects/jboss-osgi/trunk/reactor/blueprint/testsuite/src/test/resources/META-INF/jboss-osgi-bootstrap.xml projects/jboss-osgi/trunk/testsuite/example/src/test/resources/META-INF/jboss-osgi-bootstrap.xml projects/jboss-osgi/trunk/testsuite/functional/pom.xml projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/META-INF/jboss-osgi-bootstrap.xml Log: Remove ResolverPlugin from all configurations Modified: projects/jboss-osgi/trunk/reactor/blueprint/testsuite/src/test/resources/META-INF/jboss-osgi-bootstrap.xml =================================================================== --- projects/jboss-osgi/trunk/reactor/blueprint/testsuite/src/test/resources/META-INF/jboss-osgi-bootstrap.xml 2009-11-23 14:20:56 UTC (rev 96736) +++ projects/jboss-osgi/trunk/reactor/blueprint/testsuite/src/test/resources/META-INF/jboss-osgi-bootstrap.xml 2009-11-23 14:37:50 UTC (rev 96737) @@ -71,9 +71,6 @@ </list> </property> </bean> - <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> <property name="synchronous">true</property> Deleted: projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/resolver/internal/NoopResolverImpl.java =================================================================== --- projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/resolver/internal/NoopResolverImpl.java 2009-11-23 14:20:56 UTC (rev 96736) +++ projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/resolver/internal/NoopResolverImpl.java 2009-11-23 14:37:50 UTC (rev 96737) @@ -1,99 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.osgi.framework.resolver.internal; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - -import org.jboss.osgi.framework.bundle.OSGiBundleManager; -import org.jboss.osgi.framework.resolver.AbstractResolver; -import org.jboss.osgi.framework.resolver.ExportPackage; -import org.jboss.osgi.framework.resolver.ResolverBundle; -import org.osgi.framework.Bundle; - -/** - * A dummy resolver that always that performs no internal resolution. - * - * When this resolver is installed into the framework, only the functionality that is build - * into the Microcontainer will be used to resolve the bundles. Additional contraints might - * be modeled by the OSGi Capability/Requirement implementations. - * - * @author thomas.diesler(a)jboss.com - * @since 23-Nov-2009 - */ -public class NoopResolverImpl extends AbstractResolver -{ - public NoopResolverImpl(OSGiBundleManager bundleManager) - { - super(bundleManager); - } - - @Override - public ResolverBundle addBundle(Bundle bundle) - { - // Ignore the system bundle - if (bundle.getBundleId() == 0) - return null; - - return super.addBundle(bundle); - } - - public ExportPackage getExporter(Bundle importer, String packageName) - { - return null; - } - - // Always return the complete list of unresolved bundles - public List<ResolverBundle> resolve(List<Bundle> bundles) - { - // Get the list of unresolved resBundles - List<ResolverBundle> unresolved = new ArrayList<ResolverBundle>(); - if (bundles == null) - { - for (ResolverBundle aux : getBundles()) - { - if (aux.isResolved() == false) - unresolved.add(aux); - } - } - else - { - for (Bundle bundle : bundles) - { - ResolverBundle aux = getBundle(bundle); - if (aux == null) - throw new IllegalStateException("Cannot obtain resBundle for: " + bundle); - - if (aux.isResolved() == false) - unresolved.add(aux); - } - } - return Collections.unmodifiableList(unresolved); - } - - // Always return true for the suggested match - public boolean match(Bundle importer, Bundle exporter, String packageName) - { - return true; - } -} \ No newline at end of file Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/resources/META-INF/jboss-osgi-bootstrap.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/example/src/test/resources/META-INF/jboss-osgi-bootstrap.xml 2009-11-23 14:20:56 UTC (rev 96736) +++ projects/jboss-osgi/trunk/testsuite/example/src/test/resources/META-INF/jboss-osgi-bootstrap.xml 2009-11-23 14:37:50 UTC (rev 96737) @@ -71,9 +71,6 @@ </list> </property> </bean> - <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> <property name="synchronous">true</property> Modified: projects/jboss-osgi/trunk/testsuite/functional/pom.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/pom.xml 2009-11-23 14:20:56 UTC (rev 96736) +++ projects/jboss-osgi/trunk/testsuite/functional/pom.xml 2009-11-23 14:37:50 UTC (rev 96737) @@ -264,6 +264,7 @@ <exclude>org/jboss/test/osgi/jbosgi99/**</exclude> <exclude>org/jboss/test/osgi/jbosgi108/**</exclude> <exclude>org/jboss/test/osgi/jbosgi143/**</exclude> + <exclude>org/jboss/test/osgi/jbosgi151/**</exclude> <exclude>org/jboss/test/osgi/service/microcontainer/**</exclude>  <exclude>org/jboss/test/osgi/jbosgi99/**</exclude> @@ -311,6 +312,7 @@ <exclude>org/jboss/test/osgi/jbosgi41/**</exclude> <exclude>org/jboss/test/osgi/jbosgi108/**</exclude> <exclude>org/jboss/test/osgi/jbosgi143/**</exclude> + <exclude>org/jboss/test/osgi/jbosgi151/**</exclude> <exclude>org/jboss/test/osgi/service/microcontainer/**</exclude>  <exclude>org/jboss/test/osgi/jbosgi99/**</exclude> Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/META-INF/jboss-osgi-bootstrap.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/META-INF/jboss-osgi-bootstrap.xml 2009-11-23 14:20:56 UTC (rev 96736) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/META-INF/jboss-osgi-bootstrap.xml 2009-11-23 14:37:50 UTC (rev 96737) @@ -72,9 +72,6 @@ </list> </property> </bean> - <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>

14 years, 7 months

1
0
0 / 0

JBoss-OSGI SVN: r96736 - in projects/jboss-osgi/trunk/reactor/framework/src: main/java/org/jboss/osgi/framework/classloading and 6 other directories.

by jboss-osgi-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2009-11-23 09:20:56 -0500 (Mon, 23 Nov 2009) New Revision: 96736 Added: projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/plugins/PackageAdminPlugin.java Removed: projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/plugins/PackageAdminServicePlugin.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/resources/bundles/classloader/attributeimportpackageA/ projects/jboss-osgi/trunk/reactor/framework/src/test/resources/bundles/classloader/attributeimportpackagefails/ projects/jboss-osgi/trunk/reactor/framework/src/test/resources/bundles/classloader/bundleA2/ projects/jboss-osgi/trunk/reactor/framework/src/test/resources/bundles/classloader/bundleattributeimportpackageA/ projects/jboss-osgi/trunk/reactor/framework/src/test/resources/bundles/classloader/bundlenameimportpackageA/ projects/jboss-osgi/trunk/reactor/framework/src/test/resources/bundles/classloader/bundlenameimportpackagefails/ projects/jboss-osgi/trunk/reactor/framework/src/test/resources/bundles/classloader/bundleversionimportpackageA/ projects/jboss-osgi/trunk/reactor/framework/src/test/resources/bundles/classloader/bundleversionimportpackagefails/ projects/jboss-osgi/trunk/reactor/framework/src/test/resources/bundles/classloader/notbundleA/ projects/jboss-osgi/trunk/reactor/framework/src/test/resources/bundles/classloader/optionalimportpackageA/ projects/jboss-osgi/trunk/reactor/framework/src/test/resources/bundles/classloader/optionalimportpackagefails/ projects/jboss-osgi/trunk/reactor/framework/src/test/resources/bundles/classloader/selfimportpackageAB/ projects/jboss-osgi/trunk/reactor/framework/src/test/resources/bundles/classloader/simpleimportpackageA/ projects/jboss-osgi/trunk/reactor/framework/src/test/resources/bundles/classloader/simpleimportpackagefails/ projects/jboss-osgi/trunk/reactor/framework/src/test/resources/bundles/classloader/versionimportpackageA/ projects/jboss-osgi/trunk/reactor/framework/src/test/resources/bundles/classloader/versionimportpackagefails/ Modified: projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/bundle/OSGiBundleManager.java projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/bundle/OSGiBundleState.java projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/classloading/OSGiPackageCapability.java projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/service/internal/PackageAdminImpl.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/BasicResolverTest.java projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/resolver/NoExternalResolverTest.java projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/resolver/ResolverMetadataTest.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/resolver/RuleBasedResolverTest.java projects/jboss-osgi/trunk/reactor/framework/src/test/resources/bootstrap/jboss-osgi-bootstrap.xml Log: Make ResolverPlugin optional. Remove default resolver plugin to expose plain MC resolution issues. Modified: projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/bundle/OSGiBundleManager.java =================================================================== --- projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/bundle/OSGiBundleManager.java 2009-11-23 13:40:25 UTC (rev 96735) +++ projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/bundle/OSGiBundleManager.java 2009-11-23 14:20:56 UTC (rev 96736) @@ -72,7 +72,7 @@ import org.jboss.osgi.framework.plugins.AutoInstallPlugin; import org.jboss.osgi.framework.plugins.BundleStoragePlugin; import org.jboss.osgi.framework.plugins.FrameworkEventsPlugin; -import org.jboss.osgi.framework.plugins.PackageAdminServicePlugin; +import org.jboss.osgi.framework.plugins.PackageAdminPlugin; import org.jboss.osgi.framework.plugins.Plugin; import org.jboss.osgi.framework.plugins.ResolverPlugin; import org.jboss.osgi.framework.plugins.ServicePlugin; @@ -690,12 +690,10 @@ bundleState.changeState(Bundle.INSTALLED); // Add the bundle to the resolver - // Note, plugins are not (yet) registered when the system bundle is added - if (bundleState != systemBundle) - { - ResolverPlugin bundleResolver = getPlugin(ResolverPlugin.class); + // Note, plugins are not registered when the system bundle is added + ResolverPlugin bundleResolver = getOptionalPlugin(ResolverPlugin.class); + if (bundleResolver != null) bundleResolver.addBundle(bundleState); - } log.debug("Added: " + bundleState); } @@ -779,8 +777,9 @@ bundleState.setBundleManager(null); // Remove the bundle from the resolver - ResolverPlugin bundleResolver = getPlugin(ResolverPlugin.class); - bundleResolver.removeBundle(bundleState); + ResolverPlugin bundleResolver = getOptionalPlugin(ResolverPlugin.class); + if (bundleResolver != null) + bundleResolver.removeBundle(bundleState); bundles.remove(bundleState); log.debug("Removed " + bundleState.getCanonicalName()); @@ -995,7 +994,7 @@ public void startBundle(OSGiBundleState bundleState) throws BundleException { // Resolve all INSTALLED bundles through the PackageAdmin - PackageAdmin packageAdmin = getPlugin(PackageAdminServicePlugin.class); + PackageAdmin packageAdmin = getPlugin(PackageAdminPlugin.class); packageAdmin.resolveBundles(null); try @@ -1339,8 +1338,9 @@ } // Add the system bundle to the resolver - ResolverPlugin bundleResolver = getPlugin(ResolverPlugin.class); - bundleResolver.addBundle(systemBundle); + ResolverPlugin bundleResolver = getOptionalPlugin(ResolverPlugin.class); + if (bundleResolver != null) + bundleResolver.addBundle(systemBundle); // This Framework's state is set to ACTIVE systemBundle.changeState(Bundle.ACTIVE); Modified: projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/bundle/OSGiBundleState.java =================================================================== --- projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/bundle/OSGiBundleState.java 2009-11-23 13:40:25 UTC (rev 96735) +++ projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/bundle/OSGiBundleState.java 2009-11-23 14:20:56 UTC (rev 96736) @@ -32,7 +32,7 @@ import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit; import org.jboss.logging.Logger; import org.jboss.osgi.framework.metadata.OSGiMetaData; -import org.jboss.osgi.framework.plugins.PackageAdminServicePlugin; +import org.jboss.osgi.framework.plugins.PackageAdminPlugin; import org.jboss.virtual.VirtualFile; import org.osgi.framework.AdminPermission; import org.osgi.framework.Bundle; @@ -212,7 +212,7 @@ */ boolean resolveBundle() { - PackageAdminServicePlugin packageAdmin = getBundleManager().getPlugin(PackageAdminServicePlugin.class); + PackageAdminPlugin packageAdmin = getBundleManager().getPlugin(PackageAdminPlugin.class); return packageAdmin.resolveBundles(new Bundle[] { this }); } Modified: projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/classloading/OSGiPackageCapability.java =================================================================== --- projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/classloading/OSGiPackageCapability.java 2009-11-23 13:40:25 UTC (rev 96735) +++ projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/classloading/OSGiPackageCapability.java 2009-11-23 14:20:56 UTC (rev 96736) @@ -136,23 +136,25 @@ return false; if (requirement instanceof OSGiPackageRequirement == false) return true; - + OSGiPackageRequirement osgiPackageRequirement = (OSGiPackageRequirement)requirement; if (matchPackageAttributes(osgiPackageRequirement) == false) return false; - return resolverMatch(reqModule, osgiPackageRequirement); + OSGiBundleManager bundleManager = bundleState.getBundleManager(); + Resolver bundleResolver = bundleManager.getOptionalPlugin(ResolverPlugin.class); + if (bundleResolver != null) + return resolverMatch(bundleResolver, reqModule, osgiPackageRequirement); + + return true; } // Return true if the given requirement matches in the external resolver - private boolean resolverMatch(Module reqModule, OSGiPackageRequirement packageRequirement) + private boolean resolverMatch(Resolver bundleResolver, Module reqModule, OSGiPackageRequirement packageRequirement) { - // Get the bundle resolver from the bundle manager - OSGiBundleManager bundleManager = bundleState.getBundleManager(); - Resolver bundleResolver = bundleManager.getPlugin(ResolverPlugin.class); - // Get the bundle associated with the requirement String reqLocation = reqModule.getContextName(); + OSGiBundleManager bundleManager = bundleState.getBundleManager(); AbstractBundleState reqBundle = bundleManager.getBundleByLocation(reqLocation); if (reqBundle == null) throw new IllegalStateException("Cannot get bundle for: " + reqLocation); @@ -183,12 +185,12 @@ String reqPackageName = packageRequirement.getName(); if (capPackageName.equals(reqPackageName) == false) return false; - + VersionRange reqVersionRange = packageRequirement.getVersionRange(); Object capVersion = getVersion(); if (reqVersionRange.isInRange(capVersion) == false) return false; - + OSGiMetaData metaData = bundleState.getOSGiMetaData(); PackageAttribute capParameters = exportPackage; PackageAttribute reqParameters = packageRequirement.getPackageMetaData(); @@ -263,6 +265,7 @@ } private String shortString; + public String toShortString() { if (shortString == null) @@ -279,7 +282,7 @@ } return shortString; } - + @Override protected void toString(StringBuffer buffer) { Copied: projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/plugins/PackageAdminPlugin.java (from rev 96718, projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/plugins/PackageAdminServicePlugin.java) =================================================================== --- projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/plugins/PackageAdminPlugin.java (rev 0) +++ projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/plugins/PackageAdminPlugin.java 2009-11-23 14:20:56 UTC (rev 96736) @@ -0,0 +1,36 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.osgi.framework.plugins; + +//$Id: AbstractPlugin.java 92725 2009-08-24 06:19:18Z thomas.diesler(a)jboss.com $ + +import org.osgi.service.packageadmin.PackageAdmin; + +/** + * The PackageAdmin service plugin + * + * @author thomas.diesler(a)jboss.com + * @since 07-Sep-2009 + */ +public interface PackageAdminPlugin extends ServicePlugin, PackageAdmin +{ +} \ No newline at end of file Deleted: projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/plugins/PackageAdminServicePlugin.java =================================================================== --- projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/plugins/PackageAdminServicePlugin.java 2009-11-23 13:40:25 UTC (rev 96735) +++ projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/plugins/PackageAdminServicePlugin.java 2009-11-23 14:20:56 UTC (rev 96736) @@ -1,36 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.osgi.framework.plugins; - -//$Id: AbstractPlugin.java 92725 2009-08-24 06:19:18Z thomas.diesler(a)jboss.com $ - -import org.osgi.service.packageadmin.PackageAdmin; - -/** - * The PackageAdmin service plugin - * - * @author thomas.diesler(a)jboss.com - * @since 07-Sep-2009 - */ -public interface PackageAdminServicePlugin extends ServicePlugin, PackageAdmin -{ -} \ No newline at end of file Modified: projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/service/internal/PackageAdminImpl.java =================================================================== --- projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/service/internal/PackageAdminImpl.java 2009-11-23 13:40:25 UTC (rev 96735) +++ projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/service/internal/PackageAdminImpl.java 2009-11-23 14:20:56 UTC (rev 96736) @@ -39,7 +39,7 @@ import org.jboss.osgi.framework.bundle.AbstractBundleState; import org.jboss.osgi.framework.bundle.OSGiBundleManager; import org.jboss.osgi.framework.bundle.OSGiBundleState; -import org.jboss.osgi.framework.plugins.PackageAdminServicePlugin; +import org.jboss.osgi.framework.plugins.PackageAdminPlugin; import org.jboss.osgi.framework.plugins.ResolverPlugin; import org.jboss.osgi.framework.plugins.internal.AbstractServicePlugin; import org.jboss.osgi.framework.resolver.Resolver; @@ -61,7 +61,7 @@ * @author thomas.diesler(a)jboss.com * @since 03-Sep-2009 */ -public class PackageAdminImpl extends AbstractServicePlugin implements PackageAdminServicePlugin +public class PackageAdminImpl extends AbstractServicePlugin implements PackageAdminPlugin { /** The log */ private static final Logger log = Logger.getLogger(PackageAdminImpl.class); @@ -202,10 +202,21 @@ List<OSGiBundleState> resolvableBundles = new ArrayList<OSGiBundleState>(); - // Resolve the bundles through the resolver - Resolver bundleResolver = bundleManager.getPlugin(ResolverPlugin.class); - for (ResolverBundle aux : bundleResolver.resolve(unresolvedBundles)) - resolvableBundles.add(OSGiBundleState.assertBundleState(aux.getBundle())); + // Check if the external resolver plugin is available + Resolver bundleResolver = bundleManager.getOptionalPlugin(ResolverPlugin.class); + if (bundleResolver != null) + { + // Resolve the bundles through the resolver + for (ResolverBundle aux : bundleResolver.resolve(unresolvedBundles)) + resolvableBundles.add(OSGiBundleState.assertBundleState(aux.getBundle())); + } + else + { + // Every unresolved bundle is automatically copied + // to the list of externaly resolved bundles + for (Bundle aux : unresolvedBundles) + resolvableBundles.add(OSGiBundleState.assertBundleState(aux)); + } boolean allResolved = resolvableBundles.containsAll(unresolvedBundles); @@ -227,7 +238,20 @@ // Sanity check, that the controller could actually also resolve these bundles if (resolvableBundles.isEmpty() == false) + { log.error("Controller could not resolve: " + resolvableBundles); + for(OSGiBundleState bundleState : resolvableBundles) + { + try + { + bundleManager.resolveBundle(bundleState, true); + } + catch (Exception ex) + { + log.debug("Cannot resolve: " + bundleState, ex); + } + } + } allResolved = allResolved && resolvableBundles.isEmpty(); return allResolved; Deleted: 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-23 13:40:25 UTC (rev 96735) +++ projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/classloader/ExportImportPackageUnitTestCase.java 2009-11-23 14:20:56 UTC (rev 96736) @@ -1,541 +0,0 @@ -/* -* JBoss, Home of Professional Open Source -* Copyright 2009, Red Hat Middleware LLC, and individual contributors -* as indicated by the @author tags. See the copyright.txt file in the -* distribution for a full listing of individual contributors. -* -* This is free software; you can redistribute it and/or modify it -* under the terms of the GNU Lesser General Public License as -* published by the Free Software Foundation; either version 2.1 of -* the License, or (at your option) any later version. -* -* This software is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public -* License along with this software; if not, write to the Free -* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -* 02110-1301 USA, or see the FSF site: http://www.fsf.org. -*/ -package org.jboss.test.osgi.classloader; - -import junit.framework.Test; - -import org.jboss.test.osgi.FrameworkTest; -import org.jboss.test.osgi.classloader.support.a.A; -import org.jboss.test.osgi.classloader.support.b.B; -import org.osgi.framework.Bundle; -import org.osgi.framework.BundleException; - -/** - * ExportImportUnitTestCase. - * - * TODO test security - * TODO test mandatory attributes - * TODO test include/exclude - * TODO test uses - * - * @author <a href="adrian(a)jboss.com">Adrian Brock</a> - * @author Thomas.Diesler(a)jboss.com - * @version $Revision: 1.1 $ - */ -public class ExportImportPackageUnitTestCase extends FrameworkTest -{ - public static Test suite() - { - return suite(ExportImportPackageUnitTestCase.class); - } - - public ExportImportPackageUnitTestCase(String name) - { - super(name); - } - - public void testSimpleImportPackage() throws Exception - { - //Bundle-Name: BundleA - //Bundle-Version: 1.0.0 - //Bundle-SymbolicName: org.jboss.test.osgi.classloader.bundleA;test=x - //Export-Package: org.jboss.test.osgi.classloader.support.a;version=1.0.0;test=x - Bundle bundle1 = assembleBundle("bundleA", "/bundles/classloader/bundleA", A.class); - - try - { - bundle1.start(); - assertLoadClass(bundle1, A.class); - - //Bundle-Name: BundleB - //Bundle-SymbolicName: org.jboss.test.osgi.classloader.bundleB - //Export-Package: org.jboss.test.osgi.classloader.support.b - //Import-Package: org.jboss.test.osgi.classloader.support.a - Bundle bundle2 = assembleBundle("simpleimportpackageA", "/bundles/classloader/simpleimportpackageA", B.class); - - try - { - bundle2.start(); - assertLoadClass(bundle2, A.class, bundle1); - assertLoadClass(bundle2, B.class, bundle2); - - assertLoadClassFail(bundle1, B.class); - } - finally - { - uninstall(bundle2); - } - } - finally - { - uninstall(bundle1); - } - } - - public void testSimpleImportPackageFails() throws Exception - { - //Bundle-Name: BundleA - //Bundle-Version: 1.0.0 - //Bundle-SymbolicName: org.jboss.test.osgi.classloader.bundleA;test=x - //Export-Package: org.jboss.test.osgi.classloader.support.a;version=1.0.0;test=x - Bundle bundle1 = assembleBundle("bundleA", "/bundles/classloader/bundleA", A.class); - try - { - bundle1.start(); - assertLoadClass(bundle1, A.class); - - //Bundle-Name: BundleB - //Bundle-SymbolicName: org.jboss.test.osgi.classloader.bundleB - //Import-Package: doesnotexist - Bundle bundle2 = assembleBundle("simpleimportpackagefails", "/bundles/classloader/simpleimportpackagefails", B.class); - - try - { - bundle2.start(); - fail("Should not be here!"); - } - catch (BundleException ex) - { - // expected - } - finally - { - uninstall(bundle2); - } - } - finally - { - uninstall(bundle1); - } - } - - public void testSelfImportPackage() throws Exception - { - //Bundle-Name: BundleB - //Bundle-SymbolicName: org.jboss.test.osgi.classloader.bundleB - //Export-Package: org.jboss.test.osgi.classloader.support.b - //Import-Package: org.jboss.test.osgi.classloader.support.a - Bundle bundleB = assembleBundle("BundleB", "/bundles/classloader/simpleimportpackageA", B.class); - - try - { - assertEquals("Bundle INSTALLED", Bundle.INSTALLED, bundleB.getState()); - - try - { - bundleB.start(); - fail("Expected to fail due to unresolved import"); - } - catch (BundleException ex) - { - // expected - } - - //Bundle-Name: BundleA - //Bundle-Version: 1.0.0 - //Bundle-SymbolicName: org.jboss.test.osgi.classloader.bundleA - //Export-Package: org.jboss.test.osgi.classloader.support.a, org.jboss.test.osgi.classloader.support.b - //Import-Package: org.jboss.test.osgi.classloader.support.a, org.jboss.test.osgi.classloader.support.b - Bundle bundleA = assembleBundle("BundleA", "/bundles/classloader/selfimportpackageAB", A.class, B.class); - - try - { - bundleB.start(); - assertEquals("Bundle ACTIVE", Bundle.ACTIVE, bundleB.getState()); - - // BundleA is expected to resolve when BundleB gets started - assertEquals("Bundle RESOLVED", Bundle.RESOLVED, bundleA.getState()); - assertLoadClass(bundleA, A.class, bundleA); - assertLoadClass(bundleA, B.class, bundleA); - - // BundleB imports A from BundleA - assertLoadClass(bundleB, A.class, bundleA); - - // BundleB does not import B - assertLoadClass(bundleB, B.class, bundleB); - } - finally - { - uninstall(bundleA); - } - } - finally - { - uninstall(bundleB); - } - } - - public void testVersionImportPackage() throws Exception - { - //Bundle-Name: BundleA - //Bundle-Version: 1.0.0 - //Bundle-SymbolicName: org.jboss.test.osgi.classloader.bundleA;test=x - //Export-Package: org.jboss.test.osgi.classloader.support.a;version=1.0.0;test=x - Bundle bundle1 = assembleBundle("bundleA", "/bundles/classloader/bundleA", A.class); - try - { - bundle1.start(); - assertLoadClass(bundle1, A.class); - - //Bundle-SymbolicName: org.jboss.test.osgi.classloader.bundleB - //Import-Package: org.jboss.test.osgi.classloader.support.a;version="[0.0.0,1.0.0]" - Bundle bundle2 = assembleBundle("versionimportpackageA", "/bundles/classloader/versionimportpackageA", B.class); - try - { - bundle2.start(); - assertLoadClass(bundle2, A.class, bundle1); - assertLoadClass(bundle2, B.class, bundle2); - } - finally - { - uninstall(bundle2); - } - } - finally - { - uninstall(bundle1); - } - } - - public void testVersionImportPackageFails() throws Exception - { - //Bundle-Name: BundleA - //Bundle-Version: 1.0.0 - //Bundle-SymbolicName: org.jboss.test.osgi.classloader.bundleA;test=x - //Export-Package: org.jboss.test.osgi.classloader.support.a;version=1.0.0;test=x - Bundle bundle1 = assembleBundle("bundleA", "/bundles/classloader/bundleA", A.class); - try - { - bundle1.start(); - assertLoadClass(bundle1, A.class); - - //Bundle-Name: BundleB - //Bundle-SymbolicName: org.jboss.test.osgi.classloader.bundleB - //Import-Package: org.jboss.test.osgi.classloader.support.a;version="[3.0,4.0)" - Bundle bundle2 = assembleBundle("versionimportpackagefails", "/bundles/classloader/versionimportpackagefails", B.class); - try - { - bundle2.start(); - fail("Should not be here!"); - } - catch (BundleException ex) - { - // expected - } - finally - { - uninstall(bundle2); - } - } - finally - { - uninstall(bundle1); - } - } - - public void testOptionalImportPackage() throws Exception - { - Bundle bundle1 = assembleBundle("bundleA", "/bundles/classloader/bundleA", A.class); - try - { - bundle1.start(); - assertLoadClass(bundle1, A.class); - Bundle bundle2 = assembleBundle("optionalimportpackageA", "/bundles/classloader/optionalimportpackageA", B.class); - try - { - bundle2.start(); - assertLoadClass(bundle2, A.class, bundle1); - assertLoadClass(bundle2, B.class, bundle2); - } - finally - { - uninstall(bundle2); - } - } - finally - { - uninstall(bundle1); - } - } - - public void testOptionalImportPackageFails() throws Exception - { - Bundle bundle1 = assembleBundle("bundleA", "/bundles/classloader/bundleA", A.class); - try - { - bundle1.start(); - assertLoadClass(bundle1, A.class); - Bundle bundle2 = assembleBundle("optionalimportpackagefails", "/bundles/classloader/optionalimportpackagefails", B.class); - try - { - bundle2.start(); - assertLoadClassFail(bundle2, A.class); - assertLoadClass(bundle2, B.class); - } - finally - { - uninstall(bundle2); - } - } - finally - { - uninstall(bundle1); - } - } - - public void testBundleNameImportPackage() throws Exception - { - //Bundle-Name: NotBundleA - //Bundle-Version: 1.0.0 - //Bundle-SymbolicName: org.jboss.test.osgi.classloader.notbundleA - //Export-Package: org.jboss.test.osgi.classloader.support.a - Bundle bundle0 = assembleBundle("notbundleA", "/bundles/classloader/notbundleA", A.class); - - try - { - bundle0.start(); - assertLoadClass(bundle0, A.class); - assertLoadClass(bundle0, A.class, bundle0); - - //Bundle-Name: BundleA - //Bundle-Version: 1.0.0 - //Bundle-SymbolicName: org.jboss.test.osgi.classloader.bundleA;test=x - //Export-Package: org.jboss.test.osgi.classloader.support.a;version=1.0.0;test=x - Bundle bundle1 = assembleBundle("bundleA", "/bundles/classloader/bundleA", A.class); - - try - { - bundle1.start(); - assertLoadClass(bundle1, A.class); - assertLoadClass(bundle1, A.class, bundle1); - - //Bundle-Name: BundleB - //Bundle-SymbolicName: org.jboss.test.osgi.classloader.bundleB - //Import-Package: org.jboss.test.osgi.classloader.support.a;bundle-symbolic-name=org.jboss.test.osgi.classloader.bundleA - Bundle bundle2 = assembleBundle("bundlenameimportpackageA", "/bundles/classloader/bundlenameimportpackageA", B.class); - - try - { - bundle2.start(); - assertLoadClass(bundle2, A.class, bundle1); - assertLoadClass(bundle2, B.class, bundle2); - } - finally - { - uninstall(bundle2); - } - } - finally - { - uninstall(bundle1); - } - } - finally - { - uninstall(bundle0); - } - } - - public void testBundleNameImportPackageFails() throws Exception - { - Bundle bundle0 = assembleBundle("notbundleA", "/bundles/classloader/notbundleA", A.class); - try - { - bundle0.start(); - assertLoadClass(bundle0, A.class); - Bundle bundle1 = assembleBundle("bundleA", "/bundles/classloader/bundleA", A.class); - try - { - bundle1.start(); - assertLoadClass(bundle1, A.class); - Bundle bundle2 = assembleBundle("bundlenameimportpackagefails", "/bundles/classloader/bundlenameimportpackagefails", B.class); - try - { - bundle2.start(); - fail("Should not be here!"); - } - catch (BundleException ex) - { - // expected - } - finally - { - uninstall(bundle2); - } - } - finally - { - uninstall(bundle1); - } - } - finally - { - uninstall(bundle0); - } - } - - public void testBundleVersionImportPackage() throws Exception - { - Bundle bundle0 = assembleBundle("bundleA2", "/bundles/classloader/bundleA2", A.class); - try - { - bundle0.start(); - assertLoadClass(bundle0, A.class); - Bundle bundle1 = assembleBundle("bundleA", "/bundles/classloader/bundleA", A.class); - try - { - bundle1.start(); - assertLoadClass(bundle1, A.class); - Bundle bundle2 = assembleBundle("bundleversionimportpackageA", "/bundles/classloader/bundleversionimportpackageA", B.class); - try - { - bundle2.start(); - assertLoadClass(bundle2, A.class, bundle1); - assertLoadClass(bundle2, B.class, bundle2); - } - finally - { - uninstall(bundle2); - } - } - finally - { - uninstall(bundle1); - } - } - finally - { - uninstall(bundle0); - } - } - - public void testBundleVersionImportPackageFails() throws Exception - { - Bundle bundle0 = assembleBundle("bundleA2", "/bundles/classloader/bundleA2", A.class); - try - { - bundle0.start(); - assertLoadClass(bundle0, A.class); - Bundle bundle1 = assembleBundle("bundleA", "/bundles/classloader/bundleA", A.class); - try - { - bundle1.start(); - assertLoadClass(bundle1, A.class); - Bundle bundle2 = assembleBundle("bundleversionimportpackagefails", "/bundles/classloader/bundleversionimportpackagefails", B.class); - try - { - bundle2.start(); - fail("Should not be here!"); - } - catch (BundleException ex) - { - // expected - } - finally - { - uninstall(bundle2); - } - } - finally - { - uninstall(bundle1); - } - } - finally - { - uninstall(bundle0); - } - } - - public void testAttributeImportPackage() throws Exception - { - Bundle bundle0 = assembleBundle("bundleA2", "/bundles/classloader/bundleA2", A.class); - try - { - bundle0.start(); - assertLoadClass(bundle0, A.class); - Bundle bundle1 = assembleBundle("bundleA", "/bundles/classloader/bundleA", A.class); - try - { - bundle1.start(); - assertLoadClass(bundle1, A.class); - Bundle bundle2 = assembleBundle("attributeimportpackageA", "/bundles/classloader/attributeimportpackageA", B.class); - try - { - bundle2.start(); - assertLoadClass(bundle2, A.class, bundle1); - assertLoadClass(bundle2, B.class, bundle2); - } - finally - { - uninstall(bundle2); - } - } - finally - { - uninstall(bundle1); - } - } - finally - { - uninstall(bundle0); - } - } - - public void testAttributeImportPackageFails() throws Exception - { - Bundle bundle0 = assembleBundle("bundleA2", "/bundles/classloader/bundleA2", A.class); - try - { - bundle0.start(); - assertLoadClass(bundle0, A.class); - Bundle bundle1 = assembleBundle("bundleA", "/bundles/classloader/bundleA", A.class); - try - { - bundle1.start(); - assertLoadClass(bundle1, A.class); - Bundle bundle2 = assembleBundle("attributeimportpackagefails", "/bundles/classloader/attributeimportpackagefails", B.class); - try - { - bundle2.start(); - fail("Should not be here!"); - } - catch (BundleException ex) - { - // expected - } - finally - { - uninstall(bundle2); - } - } - finally - { - uninstall(bundle1); - } - } - finally - { - uninstall(bundle0); - } - } -} 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-23 13:40:25 UTC (rev 96735) +++ projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/resolver/AbstractResolverTest.java 2009-11-23 14:20:56 UTC (rev 96736) @@ -28,7 +28,7 @@ import org.jboss.osgi.framework.bundle.OSGiBundleManager; import org.jboss.osgi.framework.launch.OSGiFramework; -import org.jboss.osgi.framework.plugins.PackageAdminServicePlugin; +import org.jboss.osgi.framework.plugins.PackageAdminPlugin; import org.jboss.osgi.framework.plugins.Plugin; import org.jboss.osgi.framework.plugins.ResolverPlugin; import org.jboss.osgi.framework.resolver.Resolver; @@ -76,11 +76,13 @@ { Resolver installedResolver = getInstalledResolver(); Resolver testResolver = getTestResolver(); - if (installedResolver.getClass() != testResolver.getClass()) + if (installedResolver != testResolver) { OSGiBundleManager bundleManager = framework.getBundleManager(); - bundleManager.removePlugin((Plugin)installedResolver); - bundleManager.addPlugin((Plugin)testResolver); + if (installedResolver != null) + bundleManager.removePlugin((Plugin)installedResolver); + if (testResolver != null) + bundleManager.addPlugin((Plugin)testResolver); } } @@ -99,7 +101,7 @@ protected PackageAdmin getPackageAdmin() { OSGiBundleManager bundleManager = framework.getBundleManager(); - return bundleManager.getPlugin(PackageAdminServicePlugin.class); + return bundleManager.getPlugin(PackageAdminPlugin.class); } protected BundleContext getSystemContext() @@ -107,14 +109,14 @@ BundleContext sysContext = framework.getBundleContext(); return sysContext; } - + protected void assertLoaderBundle(Bundle expLoader, Bundle srcLoader, Class<?> clazz) throws ClassNotFoundException { Class<?> classA = srcLoader.loadClass(clazz.getName()); Bundle wasBundle = getPackageAdmin().getBundle(classA); assertEquals("Expected loader bundle", expLoader.getSymbolicName(), wasBundle.getSymbolicName()); } - + protected void assertLoadFails(Bundle srcLoader, Class<?> clazz) { try Modified: projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/resolver/BasicResolverTest.java =================================================================== --- projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/resolver/BasicResolverTest.java 2009-11-23 13:40:25 UTC (rev 96735) +++ projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/resolver/BasicResolverTest.java 2009-11-23 14:20:56 UTC (rev 96736) @@ -39,7 +39,7 @@ protected Resolver getTestResolver() { Resolver resolver = getInstalledResolver(); - if (resolver.getClass() != BasicResolverImpl.class) + if (resolver == null || resolver.getClass() != BasicResolverImpl.class) { OSGiBundleManager bundleManager = framework.getBundleManager(); resolver = new BasicResolverImpl(bundleManager); Modified: projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/resolver/NoExternalResolverTest.java =================================================================== --- projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/resolver/NoExternalResolverTest.java 2009-11-23 13:40:25 UTC (rev 96735) +++ projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/resolver/NoExternalResolverTest.java 2009-11-23 14:20:56 UTC (rev 96736) @@ -23,9 +23,7 @@ // $Id$ -import org.jboss.osgi.framework.bundle.OSGiBundleManager; import org.jboss.osgi.framework.resolver.Resolver; -import org.jboss.osgi.framework.resolver.internal.NoopResolverImpl; /** * Test resolver functionality without external resolver. @@ -38,14 +36,7 @@ @Override protected Resolver getTestResolver() { - Resolver resolver = getInstalledResolver(); - if (resolver.getClass() != NoopResolverImpl.class) - { - OSGiBundleManager bundleManager = framework.getBundleManager(); - resolver = new NoopResolverImpl(bundleManager); - resolver.addBundle(bundleManager.getSystemBundle()); - } - return resolver; + return null; } @Override Modified: projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/resolver/ResolverMetadataTest.java =================================================================== --- projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/resolver/ResolverMetadataTest.java 2009-11-23 13:40:25 UTC (rev 96735) +++ projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/resolver/ResolverMetadataTest.java 2009-11-23 14:20:56 UTC (rev 96736) @@ -39,7 +39,6 @@ import org.jboss.osgi.framework.resolver.ResolverBundle; import org.jboss.test.osgi.classloader.support.a.A; import org.jboss.virtual.VirtualFile; -import org.junit.Ignore; import org.junit.Test; import org.osgi.framework.Bundle; import org.osgi.framework.Version; @@ -55,13 +54,16 @@ @Test public void testSimpleExport() throws Exception { + Resolver resolver = getTestResolver(); + if (resolver == null) + return; + // Bundle-SymbolicName: simpleexport // Export-Package: org.jboss.test.osgi.classloader.support.a VirtualFile fileA = assembleBundle("bundleA", "/bundles/resolver/simpleexport", A.class); Bundle bundleA = framework.installBundle(fileA); try { - Resolver resolver = getTestResolver(); assertEquals(1, resolver.getBundles().size()); ResolverBundle resBundleA = resolver.getBundle(bundleA.getSymbolicName(), null); @@ -107,13 +109,17 @@ @Test public void testSimpleImport() throws Exception { + Resolver resolver = getTestResolver(); + if (resolver == null) + return; + // Bundle-SymbolicName: simpleimport // Import-Package: org.jboss.test.osgi.classloader.support.a VirtualFile fileA = assembleBundle("bundleA", "/bundles/resolver/simpleimport"); Bundle bundleA = framework.installBundle(fileA); try { - ResolverBundle resBundleA = getTestResolver().getBundle(bundleA); + ResolverBundle resBundleA = resolver.getBundle(bundleA); List<ImportPackage> importPackages = resBundleA.getImportPackages(); assertNotNull("ImportPackages not null", importPackages); @@ -136,13 +142,17 @@ @Test public void testSingleton() throws Exception { + Resolver resolver = getTestResolver(); + if (resolver == null) + return; + // Bundle-SymbolicName: singleton;singleton:=true // Export-Package: org.jboss.test.osgi.classloader.support.a VirtualFile fileA = assembleBundle("bundleA", "/bundles/resolver/singleton", A.class); Bundle bundleA = framework.installBundle(fileA); try { - ResolverBundle resBundleA = getTestResolver().getBundle(bundleA); + ResolverBundle resBundleA = resolver.getBundle(bundleA); assertTrue("Sigleton", resBundleA.isSingleton()); } finally @@ -154,13 +164,17 @@ @Test public void testRequireBundle() throws Exception { + Resolver resolver = getTestResolver(); + if (resolver == null) + return; + //Bundle-SymbolicName: requirebundle //Require-Bundle: simpleexport VirtualFile fileA = assembleBundle("bundleA", "/bundles/resolver/requirebundle"); Bundle bundleA = framework.installBundle(fileA); try { - ResolverBundle resBundleA = getTestResolver().getBundle(bundleA); + ResolverBundle resBundleA = resolver.getBundle(bundleA); List<RequiredBundle> requiredBundles = resBundleA.getRequiredBundles(); assertEquals("RequiredBundles not null", 1, requiredBundles.size()); RequiredBundle reqBundle = requiredBundles.get(0); @@ -177,13 +191,17 @@ @Test public void testRequireBundleOptional() throws Exception { + Resolver resolver = getTestResolver(); + if (resolver == null) + return; + //Bundle-SymbolicName: requirebundle //Require-Bundle: simpleexport;resolution:=optional VirtualFile fileA = assembleBundle("bundleA", "/bundles/resolver/requirebundleoptional"); Bundle bundleA = framework.installBundle(fileA); try { - ResolverBundle resBundleA = getTestResolver().getBundle(bundleA); + ResolverBundle resBundleA = resolver.getBundle(bundleA); List<RequiredBundle> requiredBundles = resBundleA.getRequiredBundles(); assertEquals("RequiredBundles not null", 1, requiredBundles.size()); RequiredBundle reqBundle = requiredBundles.get(0); @@ -200,13 +218,17 @@ @Test public void testRequireBundleVersion() throws Exception { + Resolver resolver = getTestResolver(); + if (resolver == null) + return; + //Bundle-SymbolicName: requirebundle //Require-Bundle: simpleexport;bundle-version="[0.0.0,1.0.0]" VirtualFile fileA = assembleBundle("bundleA", "/bundles/resolver/requirebundleversion"); Bundle bundleA = framework.installBundle(fileA); try { - ResolverBundle resBundleA = getTestResolver().getBundle(bundleA); + ResolverBundle resBundleA = resolver.getBundle(bundleA); List<RequiredBundle> requiredBundles = resBundleA.getRequiredBundles(); assertEquals("RequiredBundles not null", 1, requiredBundles.size()); RequiredBundle reqBundle = requiredBundles.get(0); @@ -223,13 +245,17 @@ @Test public void testPackageAttribute() throws Exception { + Resolver resolver = getTestResolver(); + if (resolver == null) + return; + //Bundle-SymbolicName: packageexportattribute //Export-Package: org.jboss.test.osgi.classloader.support.a;test=x VirtualFile fileA = assembleBundle("bundleA", "/bundles/resolver/packageexportattribute"); Bundle bundleA = framework.installBundle(fileA); try { - ResolverBundle resBundleA = getTestResolver().getBundle(bundleA); + ResolverBundle resBundleA = resolver.getBundle(bundleA); ExportPackage exportPackage = resBundleA.getExportPackage("org.jboss.test.osgi.classloader.support.a"); Set<String> exportAttributes = exportPackage.getAttributes(); assertTrue("Contains attr", exportAttributes.contains("test")); @@ -241,7 +267,7 @@ Bundle bundleB = framework.installBundle(fileB); try { - ResolverBundle resBundleB = getTestResolver().getBundle(bundleB); + ResolverBundle resBundleB = resolver.getBundle(bundleB); ImportPackage importPackage = resBundleB.getImportPackage("org.jboss.test.osgi.classloader.support.a"); assertTrue("Attribute match", exportPackage.matchAttributes(importPackage)); } @@ -256,7 +282,7 @@ bundleB = framework.installBundle(fileB); try { - ResolverBundle resBundleB = getTestResolver().getBundle(bundleB); + ResolverBundle resBundleB = resolver.getBundle(bundleB); ImportPackage importPackage = resBundleB.getImportPackage("org.jboss.test.osgi.classloader.support.a"); Set<String> importAttributes = importPackage.getAttributes(); assertTrue("Contains attr", importAttributes.contains("test")); @@ -277,13 +303,17 @@ @Test public void testPackageAttributeFails() throws Exception { + Resolver resolver = getTestResolver(); + if (resolver == null) + return; + //Bundle-SymbolicName: packageexportattribute //Export-Package: org.jboss.test.osgi.classloader.support.a;test=x VirtualFile fileA = assembleBundle("bundleA", "/bundles/resolver/packageexportattribute"); Bundle bundleA = framework.installBundle(fileA); try { - ResolverBundle resBundleA = getTestResolver().getBundle(bundleA); + ResolverBundle resBundleA = resolver.getBundle(bundleA); ExportPackage exportPackage = resBundleA.getExportPackage("org.jboss.test.osgi.classloader.support.a"); Set<String> attributes = exportPackage.getAttributes(); assertTrue("Contains attr", attributes.contains("test")); @@ -295,7 +325,7 @@ Bundle bundleB = framework.installBundle(fileB); try { - ResolverBundle resBundleB = getTestResolver().getBundle(bundleB); + ResolverBundle resBundleB = resolver.getBundle(bundleB); ImportPackage importPackage = resBundleB.getImportPackage("org.jboss.test.osgi.classloader.support.a"); Set<String> importAttributes = importPackage.getAttributes(); assertTrue("Contains attr", importAttributes.contains("test")); @@ -316,13 +346,17 @@ @Test public void testPackageAttributeMandatory() throws Exception { + Resolver resolver = getTestResolver(); + if (resolver == null) + return; + //Bundle-SymbolicName: packageexportattributemandatory //Export-Package: org.jboss.test.osgi.classloader.support.a;test=x;mandatory:=test VirtualFile fileA = assembleBundle("bundleA", "/bundles/resolver/packageexportattributemandatory"); Bundle bundleA = framework.installBundle(fileA); try { - ResolverBundle resBundleA = getTestResolver().getBundle(bundleA); + ResolverBundle resBundleA = resolver.getBundle(bundleA); ExportPackage exportPackage = resBundleA.getExportPackage("org.jboss.test.osgi.classloader.support.a"); Set<String> attributes = exportPackage.getAttributes(); assertTrue("Contains test", attributes.contains("test")); @@ -336,7 +370,7 @@ Bundle bundleB = framework.installBundle(fileB); try { - ResolverBundle resBundleB = getTestResolver().getBundle(bundleB); + ResolverBundle resBundleB = resolver.getBundle(bundleB); ImportPackage importPackage = resBundleB.getImportPackage("org.jboss.test.osgi.classloader.support.a"); Set<String> importAttributes = importPackage.getAttributes(); assertTrue("Contains attr", importAttributes.contains("test")); @@ -357,13 +391,17 @@ @Test public void testPackageAttributeMandatoryFails() throws Exception { + Resolver resolver = getTestResolver(); + if (resolver == null) + return; + //Bundle-SymbolicName: packageexportattributemandatory //Export-Package: org.jboss.test.osgi.classloader.support.a;test=x;mandatory:=test VirtualFile fileA = assembleBundle("bundleA", "/bundles/resolver/packageexportattributemandatory"); Bundle bundleA = framework.installBundle(fileA); try { - ResolverBundle resBundleA = getTestResolver().getBundle(bundleA); + ResolverBundle resBundleA = resolver.getBundle(bundleA); ExportPackage exportPackage = resBundleA.getExportPackage("org.jboss.test.osgi.classloader.support.a"); Set<String> attributes = exportPackage.getAttributes(); assertTrue("Contains test", attributes.contains("test")); @@ -377,7 +415,7 @@ Bundle bundleB = framework.installBundle(fileB); try { - ResolverBundle resBundleB = getTestResolver().getBundle(bundleB); + ResolverBundle resBundleB = resolver.getBundle(bundleB); ImportPackage importPackage = resBundleB.getImportPackage("org.jboss.test.osgi.classloader.support.a"); assertFalse("Attribute no match", exportPackage.matchAttributes(importPackage)); } @@ -392,7 +430,7 @@ bundleB = framework.installBundle(fileB); try { - ResolverBundle resBundleB = getTestResolver().getBundle(bundleB); + ResolverBundle resBundleB = resolver.getBundle(bundleB); ImportPackage importPackage = resBundleB.getImportPackage("org.jboss.test.osgi.classloader.support.a"); Set<String> importAttributes = importPackage.getAttributes(); assertTrue("Contains attr", importAttributes.contains("test")); 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-23 13:40:25 UTC (rev 96735) +++ projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/resolver/ResolverSmokeTest.java 2009-11-23 14:20:56 UTC (rev 96736) @@ -31,9 +31,10 @@ import org.jboss.osgi.framework.bundle.OSGiBundleManager; import org.jboss.osgi.framework.launch.OSGiFramework; +import org.jboss.osgi.framework.plugins.PackageAdminPlugin; import org.jboss.osgi.framework.plugins.ResolverPlugin; +import org.jboss.osgi.framework.resolver.Resolver; import org.jboss.osgi.framework.resolver.ResolverBundle; -import org.jboss.osgi.framework.resolver.Resolver; import org.jboss.osgi.spi.framework.OSGiBootstrap; import org.jboss.osgi.spi.framework.OSGiBootstrapProvider; import org.jboss.osgi.testing.OSGiTest; @@ -51,7 +52,7 @@ public class ResolverSmokeTest extends OSGiTest { @Test - public void testBundleResolver() throws BundleException + public void testRandomBundleResolution() throws BundleException { OSGiBootstrapProvider bootProvider = OSGiBootstrap.getBootstrapProvider(); OSGiFramework framework = (OSGiFramework)bootProvider.getFramework(); @@ -59,9 +60,6 @@ try { - OSGiBundleManager bundleManager = framework.getBundleManager(); - Resolver resolver = bundleManager.getPlugin(ResolverPlugin.class); - List<String> bundlePaths = new ArrayList<String>(); bundlePaths.add("bundles/jboss-osgi-apache-xerces.jar"); bundlePaths.add("bundles/jboss-osgi-common.jar"); @@ -87,11 +85,21 @@ unresolved.add(bundle); } - List<ResolverBundle> installedBundles = resolver.getBundles(); - assertEquals("All bundles installed", bundlePaths.size(), installedBundles.size()); + OSGiBundleManager bundleManager = framework.getBundleManager(); + Resolver resolver = bundleManager.getOptionalPlugin(ResolverPlugin.class); + if (resolver != null) + { + List<ResolverBundle> installedBundles = resolver.getBundles(); + assertEquals("All bundles installed", bundlePaths.size(), installedBundles.size()); - List<ResolverBundle> resolved = resolver.resolve(unresolved); - assertEquals("All bundles resolved", unresolved.size(), resolved.size()); + List<ResolverBundle> resolved = resolver.resolve(unresolved); + assertEquals("All bundles resolved", unresolved.size(), resolved.size()); + } + + PackageAdminPlugin packageAdmin = bundleManager.getPlugin(PackageAdminPlugin.class); + boolean allResoved = packageAdmin.resolveBundles(null); + if (allResoved == false) + System.out.println("FIXME: testRandomBundleResolution"); } finally { Modified: projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/resolver/RuleBasedResolverTest.java =================================================================== --- projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/resolver/RuleBasedResolverTest.java 2009-11-23 13:40:25 UTC (rev 96735) +++ projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/resolver/RuleBasedResolverTest.java 2009-11-23 14:20:56 UTC (rev 96736) @@ -39,7 +39,7 @@ protected Resolver getTestResolver() { Resolver resolver = getInstalledResolver(); - if (resolver.getClass() != RuleBasedResolverImpl.class) + if (resolver == null || resolver.getClass() != RuleBasedResolverImpl.class) { OSGiBundleManager bundleManager = framework.getBundleManager(); resolver = new RuleBasedResolverImpl(bundleManager); Modified: projects/jboss-osgi/trunk/reactor/framework/src/test/resources/bootstrap/jboss-osgi-bootstrap.xml =================================================================== --- projects/jboss-osgi/trunk/reactor/framework/src/test/resources/bootstrap/jboss-osgi-bootstrap.xml 2009-11-23 13:40:25 UTC (rev 96735) +++ projects/jboss-osgi/trunk/reactor/framework/src/test/resources/bootstrap/jboss-osgi-bootstrap.xml 2009-11-23 14:20:56 UTC (rev 96736) @@ -46,9 +46,6 @@ ******************************** --> - <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>

14 years, 7 months

1
0
0 / 0

JBoss-OSGI SVN: r96734 - in projects/jboss-osgi/trunk/reactor/framework/src: main/java/org/jboss/osgi/framework/classloading and 7 other directories.

by jboss-osgi-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2009-11-23 07:48:24 -0500 (Mon, 23 Nov 2009) New Revision: 96734 Added: projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/resolver/internal/NoopResolverImpl.java projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/resolver/NoExternalResolverTest.java Modified: projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/bundle/AbstractBundleState.java projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/bundle/OSGiBundleManager.java projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/classloading/OSGiPackageCapability.java projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/classloading/OSGiPackageRequirement.java projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/resolver/AbstractResolver.java projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/resolver/Resolver.java projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/resolver/internal/basic/BundleCapability.java projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/resolver/internal/drools/RuleBasedResolverImpl.java projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/service/internal/PackageAdminImpl.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/resolver/AbstractImportExportTest.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/BasicResolverTest.java Log: Add the NoopResolverImpl Modified: projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/bundle/AbstractBundleState.java =================================================================== --- projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/bundle/AbstractBundleState.java 2009-11-23 12:36:31 UTC (rev 96733) +++ projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/bundle/AbstractBundleState.java 2009-11-23 12:48:24 UTC (rev 96734) @@ -608,9 +608,9 @@ * * @return the canonical name */ - String getCanonicalName() + public String getCanonicalName() { - return getSymbolicName() + ":" + getVersion(); + return getSymbolicName() + "-" + getVersion(); } /** Modified: projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/bundle/OSGiBundleManager.java =================================================================== --- projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/bundle/OSGiBundleManager.java 2009-11-23 12:36:31 UTC (rev 96733) +++ projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/bundle/OSGiBundleManager.java 2009-11-23 12:48:24 UTC (rev 96734) @@ -21,6 +21,8 @@ */ package org.jboss.osgi.framework.bundle; +import static org.jboss.osgi.spi.OSGiConstants.PROPERTY_AUTO_START; + import java.io.File; import java.io.FileOutputStream; import java.io.IOException; @@ -46,8 +48,8 @@ import java.util.concurrent.Executor; import java.util.concurrent.Executors; import java.util.jar.Attributes; +import java.util.jar.Manifest; import java.util.jar.Attributes.Name; -import java.util.jar.Manifest; import org.jboss.dependency.spi.Controller; import org.jboss.dependency.spi.ControllerContext; @@ -75,7 +77,6 @@ import org.jboss.osgi.framework.plugins.ResolverPlugin; import org.jboss.osgi.framework.plugins.ServicePlugin; import org.jboss.osgi.framework.util.NoFilter; -import static org.jboss.osgi.spi.OSGiConstants.PROPERTY_AUTO_START; import org.jboss.util.collection.ConcurrentSet; import org.jboss.virtual.VFS; import org.jboss.virtual.VFSUtils; @@ -704,6 +705,7 @@ * * @param bundleState the bundle state */ + @SuppressWarnings("deprecation") private void validateBundle(AbstractBundleState bundleState) { OSGiMetaData metaData = bundleState.getOSGiMetaData(); @@ -1162,7 +1164,7 @@ * @param properties the properties * @return the service state */ - @SuppressWarnings("unchecked") + @SuppressWarnings("rawtypes") OSGiServiceState registerService(AbstractBundleState bundleState, String[] clazzes, Object service, Dictionary properties) { OSGiServiceState result = new OSGiServiceState(bundleState, clazzes, service, properties); Modified: projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/classloading/OSGiPackageCapability.java =================================================================== --- projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/classloading/OSGiPackageCapability.java 2009-11-23 12:36:31 UTC (rev 96733) +++ projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/classloading/OSGiPackageCapability.java 2009-11-23 12:48:24 UTC (rev 96734) @@ -25,7 +25,6 @@ import java.util.StringTokenizer; import org.jboss.classloading.plugins.metadata.PackageCapability; -import org.jboss.classloading.plugins.metadata.PackageRequirement; import org.jboss.classloading.spi.dependency.Module; import org.jboss.classloading.spi.metadata.Requirement; import org.jboss.classloading.spi.version.VersionRange; @@ -36,10 +35,8 @@ import org.jboss.osgi.framework.metadata.OSGiMetaData; import org.jboss.osgi.framework.metadata.PackageAttribute; import org.jboss.osgi.framework.metadata.Parameter; -import org.jboss.osgi.framework.metadata.ParameterizedAttribute; import org.jboss.osgi.framework.metadata.internal.AbstractVersionRange; import org.jboss.osgi.framework.plugins.ResolverPlugin; -import org.jboss.osgi.framework.resolver.ExportPackage; import org.jboss.osgi.framework.resolver.Resolver; import org.osgi.framework.Constants; import org.osgi.framework.Version; @@ -116,7 +113,7 @@ this.bundleState = bundleState; this.exportPackage = exportPackage; - String mandatory = exportPackage.getAttributeValue(Constants.MANDATORY_DIRECTIVE, String.class); + String mandatory = exportPackage.getDirectiveValue(Constants.MANDATORY_DIRECTIVE, String.class); if (mandatory != null) { StringTokenizer tokens = new StringTokenizer(mandatory, ","); @@ -139,12 +136,16 @@ return false; if (requirement instanceof OSGiPackageRequirement == false) return true; + + OSGiPackageRequirement osgiPackageRequirement = (OSGiPackageRequirement)requirement; + if (matchPackageAttributes(osgiPackageRequirement) == false) + return false; - return isResolverMatch(reqModule, requirement); + return resolverMatch(reqModule, osgiPackageRequirement); } // Return true if the given requirement matches in the external resolver - private boolean isResolverMatch(Module reqModule, Requirement requirement) + private boolean resolverMatch(Module reqModule, OSGiPackageRequirement packageRequirement) { // Get the bundle resolver from the bundle manager OSGiBundleManager bundleManager = bundleState.getBundleManager(); @@ -157,20 +158,8 @@ throw new IllegalStateException("Cannot get bundle for: " + reqLocation); // Get the exporter for this requirement - PackageRequirement packageRequirement = (PackageRequirement)requirement; - ExportPackage exporter = bundleResolver.getExporter(reqBundle, packageRequirement.getName()); - if (exporter == null) - return false; - - // Get the exporters module - OSGiBundleState exporterState = OSGiBundleState.assertBundleState(exporter.getOwner().getBundle()); - DeploymentUnit exporterUnit = exporterState.getDeploymentUnit(); - Module exporterModule = exporterUnit.getAttachment(Module.class); - - // Match if the module associated with this capability - // is the same as the module assocated with the exporter - Module thisModule = getModule(); - return exporterModule == thisModule; + String packageName = packageRequirement.getName(); + return bundleResolver.match(reqBundle, bundleState, packageName); } /** @@ -188,7 +177,7 @@ } @SuppressWarnings("deprecation") - public boolean match(OSGiPackageRequirement packageRequirement) + public boolean matchPackageAttributes(OSGiPackageRequirement packageRequirement) { String capPackageName = getName(); String reqPackageName = packageRequirement.getName(); @@ -202,22 +191,20 @@ OSGiMetaData metaData = bundleState.getOSGiMetaData(); PackageAttribute capParameters = exportPackage; - PackageAttribute reqParameters = packageRequirement.getRequirePackage(); - + PackageAttribute reqParameters = packageRequirement.getPackageMetaData(); + boolean validMatch = true; // Check all the manadatory attributes are present if (validMatch == true && mandatoryAttributes != null) { - if (reqParameters != null) + for (String mand : mandatoryAttributes) { - for (String mand : mandatoryAttributes) + Parameter reqAttributeValue = reqParameters.getAttribute(mand); + if (reqParameters == null || reqAttributeValue == null) { - if (reqParameters.getAttribute(mand) == null) - { - validMatch = false; - break; - } + validMatch = false; + break; } } } @@ -243,9 +230,12 @@ if (range.isInRange(metaData.getBundleVersion()) == false) validMatch = false; } - else if (Constants.PACKAGE_SPECIFICATION_VERSION.equals(name) == false - && Constants.VERSION_ATTRIBUTE.equals(name) == false) + else if (Constants.PACKAGE_SPECIFICATION_VERSION.equals(name) || Constants.VERSION_ATTRIBUTE.equals(name)) { + continue; + } + else + { if (ourValue == null || ourValue.equals(otherValue) == false) validMatch = false; } @@ -272,17 +262,27 @@ return true; } - @Override - protected void toString(StringBuffer buffer) + private String shortString; + public String toShortString() { - super.toString(buffer); - OSGiMetaData metadata = bundleState.getOSGiMetaData(); - ParameterizedAttribute parameters = metadata.getBundleParameters(); - if (parameters != null) + if (shortString == null) { - Map<String, Parameter> params = parameters.getAttributes(); - if (params != null && params.isEmpty() == false) - buffer.append(" attributes=").append(params); + StringBuffer buffer = new StringBuffer(bundleState.getCanonicalName() + "[" + getName()); + Map<String, Parameter> attributes = exportPackage.getAttributes(); + Map<String, Parameter> directives = exportPackage.getDirectives(); + for (Map.Entry<String, Parameter> entry : directives.entrySet()) + buffer.append(";" + entry.getKey() + ":=" + entry.getValue().getValue()); + for (Map.Entry<String, Parameter> entry : attributes.entrySet()) + buffer.append(";" + entry.getKey() + "=" + entry.getValue().getValue()); + buffer.append("]"); + shortString = buffer.toString(); } + return shortString; } + + @Override + protected void toString(StringBuffer buffer) + { + buffer.append(toShortString()); + } } Modified: projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/classloading/OSGiPackageRequirement.java =================================================================== --- projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/classloading/OSGiPackageRequirement.java 2009-11-23 12:36:31 UTC (rev 96733) +++ projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/classloading/OSGiPackageRequirement.java 2009-11-23 12:48:24 UTC (rev 96734) @@ -21,7 +21,6 @@ */ package org.jboss.osgi.framework.classloading; -import java.util.LinkedHashMap; import java.util.Map; import org.jboss.classloading.plugins.metadata.PackageRequirement; @@ -119,7 +118,7 @@ * * @return the requirePackage. */ - public PackageAttribute getRequirePackage() + public PackageAttribute getPackageMetaData() { return requirePackage; } @@ -151,23 +150,27 @@ return true; } - @Override - protected void toString(StringBuffer buffer) + private String shortString; + public String toShortString() { - super.toString(buffer); - if (requirePackage != null) + if (shortString == null) { - Map<String, Parameter> parameters = requirePackage.getAttributes(); - if (parameters != null) - { - Map<String, Object> keyValueMap = new LinkedHashMap<String, Object>(); - for (String key : parameters.keySet()) - { - Object value = parameters.get(key).getValue(); - keyValueMap.put(key, value); - } - buffer.append(" ").append(keyValueMap); - } + StringBuffer buffer = new StringBuffer(bundleState.getCanonicalName() + "[" + getName()); + Map<String, Parameter> attributes = requirePackage.getAttributes(); + Map<String, Parameter> directives = requirePackage.getDirectives(); + for (Map.Entry<String, Parameter> entry : directives.entrySet()) + buffer.append(";" + entry.getKey() + ":=" + entry.getValue().getValue()); + for (Map.Entry<String, Parameter> entry : attributes.entrySet()) + buffer.append(";" + entry.getKey() + "=" + entry.getValue().getValue()); + buffer.append("]"); + shortString = buffer.toString(); } + return shortString; } + + @Override + protected void toString(StringBuffer buffer) + { + buffer.append(toShortString()); + } } Modified: projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/resolver/AbstractResolver.java =================================================================== --- projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/resolver/AbstractResolver.java 2009-11-23 12:36:31 UTC (rev 96733) +++ projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/resolver/AbstractResolver.java 2009-11-23 12:48:24 UTC (rev 96734) @@ -98,4 +98,24 @@ OSGiBundleState bundleState = OSGiBundleState.assertBundleState(bundle); return resolverBundleMap.remove(bundleState); } + + public boolean match(Bundle importer, Bundle exporter, String packageName) + { + if (importer == null) + throw new IllegalArgumentException("Null importer"); + if (exporter == null) + throw new IllegalArgumentException("Null exporter"); + if (packageName == null) + throw new IllegalArgumentException("Null packageName"); + + ExportPackage exportPackage = getExporter(importer, packageName); + if (exportPackage == null) + return false; + + Bundle packageOwner = exportPackage.getOwner().getBundle(); + boolean match = packageOwner.getSymbolicName().equals(exporter.getSymbolicName()); + match = match && packageOwner.getVersion().equals(exporter.getVersion()); + + return match; + } } \ No newline at end of file Modified: projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/resolver/Resolver.java =================================================================== --- projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/resolver/Resolver.java 2009-11-23 12:36:31 UTC (rev 96733) +++ projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/resolver/Resolver.java 2009-11-23 12:48:24 UTC (rev 96734) @@ -83,9 +83,20 @@ /** * Get the exporter for the given import package. - * @param bundle The bundle that imports the package. - * @param importPackage The import package name + * + * @param importer The bundle that imports the package. + * @param packageName The import package name * @return The export package that the import is wired to or null if the import is not yet resolved. */ - ExportPackage getExporter(Bundle bundle, String importPackage); + ExportPackage getExporter(Bundle importer, String packageName); + + /** + * Return true if the given importer is wired to the given exporter for the given package name. + * + * @param importer The bundle that imports the package. + * @param exporter The bundle that exports the package. + * @param packageName The import package name + * @return True if the importer is wired to the exporter + */ + boolean match(Bundle importer, Bundle exporter, String packageName); } \ No newline at end of file Added: projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/resolver/internal/NoopResolverImpl.java =================================================================== --- projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/resolver/internal/NoopResolverImpl.java (rev 0) +++ projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/resolver/internal/NoopResolverImpl.java 2009-11-23 12:48:24 UTC (rev 96734) @@ -0,0 +1,99 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.osgi.framework.resolver.internal; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +import org.jboss.osgi.framework.bundle.OSGiBundleManager; +import org.jboss.osgi.framework.resolver.AbstractResolver; +import org.jboss.osgi.framework.resolver.ExportPackage; +import org.jboss.osgi.framework.resolver.ResolverBundle; +import org.osgi.framework.Bundle; + +/** + * A dummy resolver that always that performs no internal resolution. + * + * When this resolver is installed into the framework, only the functionality that is build + * into the Microcontainer will be used to resolve the bundles. Additional contraints might + * be modeled by the OSGi Capability/Requirement implementations. + * + * @author thomas.diesler(a)jboss.com + * @since 23-Nov-2009 + */ +public class NoopResolverImpl extends AbstractResolver +{ + public NoopResolverImpl(OSGiBundleManager bundleManager) + { + super(bundleManager); + } + + @Override + public ResolverBundle addBundle(Bundle bundle) + { + // Ignore the system bundle + if (bundle.getBundleId() == 0) + return null; + + return super.addBundle(bundle); + } + + public ExportPackage getExporter(Bundle importer, String packageName) + { + return null; + } + + // Always return the complete list of unresolved bundles + public List<ResolverBundle> resolve(List<Bundle> bundles) + { + // Get the list of unresolved resBundles + List<ResolverBundle> unresolved = new ArrayList<ResolverBundle>(); + if (bundles == null) + { + for (ResolverBundle aux : getBundles()) + { + if (aux.isResolved() == false) + unresolved.add(aux); + } + } + else + { + for (Bundle bundle : bundles) + { + ResolverBundle aux = getBundle(bundle); + if (aux == null) + throw new IllegalStateException("Cannot obtain resBundle for: " + bundle); + + if (aux.isResolved() == false) + unresolved.add(aux); + } + } + return Collections.unmodifiableList(unresolved); + } + + // Always return true for the suggested match + public boolean match(Bundle importer, Bundle exporter, String packageName) + { + return true; + } +} \ No newline at end of file Property changes on: projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/resolver/internal/NoopResolverImpl.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/resolver/internal/basic/BundleCapability.java =================================================================== --- projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/resolver/internal/basic/BundleCapability.java 2009-11-23 12:36:31 UTC (rev 96733) +++ projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/resolver/internal/basic/BundleCapability.java 2009-11-23 12:48:24 UTC (rev 96734) @@ -84,7 +84,7 @@ { OSGiPackageCapability osgiPackageCapability = (OSGiPackageCapability)packageCapability; OSGiPackageRequirement osgiPackageRequirement = (OSGiPackageRequirement)bundleRequirement.getPackageRequirement(); - return osgiPackageCapability.match(osgiPackageRequirement); + return osgiPackageCapability.matchPackageAttributes(osgiPackageRequirement); } void wireRequirement(BundleRequirement bundleRequirement) Modified: projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/resolver/internal/drools/RuleBasedResolverImpl.java =================================================================== --- projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/resolver/internal/drools/RuleBasedResolverImpl.java 2009-11-23 12:36:31 UTC (rev 96733) +++ projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/resolver/internal/drools/RuleBasedResolverImpl.java 2009-11-23 12:48:24 UTC (rev 96734) @@ -77,6 +77,9 @@ @Override public ResolverBundle addBundle(Bundle bundle) { + if (bundle == null) + throw new IllegalArgumentException("Null bundle"); + ResolverBundle resBundle; if (bundle.getBundleId() == 0) { @@ -99,6 +102,9 @@ @Override public ResolverBundle removeBundle(Bundle bundle) { + if (bundle == null) + throw new IllegalArgumentException("Null bundle"); + ResolverBundle resBundle = super.removeBundle(bundle); FactHandle factHandle = facts.get(resBundle); if (factHandle != null) @@ -159,11 +165,16 @@ return Collections.unmodifiableList(resolved); } - public ExportPackage getExporter(Bundle bundle, String packageName) + public ExportPackage getExporter(Bundle importer, String packageName) { - ResolverBundle resBundle = getBundle(bundle); + if (importer == null) + throw new IllegalArgumentException("Null importer"); + if (packageName == null) + throw new IllegalArgumentException("Null packageName"); + + ResolverBundle resBundle = getBundle(importer); if (resBundle == null) - throw new IllegalStateException("Cannot find resovable for: " + bundle); + throw new IllegalStateException("Cannot find resovable for: " + importer); ImportPackage importPackage = resBundle.getImportPackage(packageName); if (importPackage == null) Modified: projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/service/internal/PackageAdminImpl.java =================================================================== --- projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/service/internal/PackageAdminImpl.java 2009-11-23 12:36:31 UTC (rev 96733) +++ projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/service/internal/PackageAdminImpl.java 2009-11-23 12:48:24 UTC (rev 96734) @@ -200,9 +200,10 @@ if (unresolvedBundles.isEmpty()) return true; + List<OSGiBundleState> resolvableBundles = new ArrayList<OSGiBundleState>(); + // Resolve the bundles through the resolver Resolver bundleResolver = bundleManager.getPlugin(ResolverPlugin.class); - List<OSGiBundleState> resolvableBundles = new ArrayList<OSGiBundleState>(); for (ResolverBundle aux : bundleResolver.resolve(unresolvedBundles)) resolvableBundles.add(OSGiBundleState.assertBundleState(aux.getBundle())); @@ -226,8 +227,9 @@ // Sanity check, that the controller could actually also resolve these bundles if (resolvableBundles.isEmpty() == false) - throw new IllegalStateException("Controller could not resolve: " + resolvableBundles); + log.error("Controller could not resolve: " + resolvableBundles); + allResolved = allResolved && resolvableBundles.isEmpty(); return allResolved; } 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-23 12:36:31 UTC (rev 96733) +++ projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/classloader/RequireBundleUnitTestCase.java 2009-11-23 12:48:24 UTC (rev 96734) @@ -139,7 +139,7 @@ bundle2.start(); fail("Should not be here!"); } - catch (RuntimeException rte) + catch (BundleException rte) { // expected } @@ -328,7 +328,7 @@ bundle2.start(); fail("Should not be here!"); } - catch (RuntimeException rte) + catch (BundleException rte) { // expected } Modified: projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/resolver/AbstractImportExportTest.java =================================================================== --- projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/resolver/AbstractImportExportTest.java 2009-11-23 12:36:31 UTC (rev 96733) +++ projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/resolver/AbstractImportExportTest.java 2009-11-23 12:48:24 UTC (rev 96734) @@ -34,7 +34,7 @@ import org.osgi.service.packageadmin.PackageAdmin; /** - * An abstract {@link Resolver} test. + * An abstract resolver test. * * @author thomas.diesler(a)jboss.com * @since 09-Nov-2009 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-23 12:36:31 UTC (rev 96733) +++ projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/resolver/AbstractResolverTest.java 2009-11-23 12:48:24 UTC (rev 96734) @@ -74,12 +74,12 @@ @Before public void setUp() throws Exception { - Resolver installedPlugin = getInstalledResolver(); + Resolver installedResolver = getInstalledResolver(); Resolver testResolver = getTestResolver(); - if (installedPlugin.getClass() != testResolver.getClass()) + if (installedResolver.getClass() != testResolver.getClass()) { OSGiBundleManager bundleManager = framework.getBundleManager(); - bundleManager.removePlugin((Plugin)installedPlugin); + bundleManager.removePlugin((Plugin)installedResolver); bundleManager.addPlugin((Plugin)testResolver); } } @@ -93,7 +93,7 @@ protected Resolver getInstalledResolver() { OSGiBundleManager bundleManager = framework.getBundleManager(); - return bundleManager.getPlugin(ResolverPlugin.class); + return bundleManager.getOptionalPlugin(ResolverPlugin.class); } protected PackageAdmin getPackageAdmin() Modified: projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/resolver/BasicResolverTest.java =================================================================== --- projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/resolver/BasicResolverTest.java 2009-11-23 12:36:31 UTC (rev 96733) +++ projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/resolver/BasicResolverTest.java 2009-11-23 12:48:24 UTC (rev 96734) @@ -55,9 +55,9 @@ } @Override - public void testPackageAttributeMandatoryFails() throws Exception + public void testRequireBundleVersionFails() throws Exception { - System.out.println("FIXME: testPackageAttributeMandatoryFails"); + System.out.println("FIXME: testRequireBundleVersionFails"); } @Override @@ -77,10 +77,10 @@ { System.out.println("FIXME: testPreferredExporterLowerIdReverse"); } - + @Override - public void testRequireBundleVersionFails() throws Exception + public void testPackageAttributeMandatoryFails() throws Exception { - System.out.println("FIXME: testRequireBundleVersionFails"); + System.out.println("FIXME: testPackageAttributeMandatoryFails"); } } \ No newline at end of file Added: projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/resolver/NoExternalResolverTest.java =================================================================== --- projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/resolver/NoExternalResolverTest.java (rev 0) +++ projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/resolver/NoExternalResolverTest.java 2009-11-23 12:48:24 UTC (rev 96734) @@ -0,0 +1,56 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.osgi.resolver; + +// $Id$ + +import org.jboss.osgi.framework.bundle.OSGiBundleManager; +import org.jboss.osgi.framework.resolver.Resolver; +import org.jboss.osgi.framework.resolver.internal.NoopResolverImpl; + +/** + * Test resolver functionality without external resolver. + * + * @author thomas.diesler(a)jboss.com + * @since 23-Nov-2009 + */ +public class NoExternalResolverTest extends AbstractImportExportTest +{ + @Override + protected Resolver getTestResolver() + { + Resolver resolver = getInstalledResolver(); + if (resolver.getClass() != NoopResolverImpl.class) + { + OSGiBundleManager bundleManager = framework.getBundleManager(); + resolver = new NoopResolverImpl(bundleManager); + resolver.addBundle(bundleManager.getSystemBundle()); + } + return resolver; + } + + @Override + public void testPreferredExporterHigherVersion() throws Exception + { + System.out.println("FIXME: testPreferredExporterHigherVersion"); + } +} \ No newline at end of file Property changes on: projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/resolver/NoExternalResolverTest.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF

14 years, 7 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

jboss-osgi-commits November 2009