[jboss-osgi-commits] JBoss-OSGI SVN: r97045 - in projects/jboss-osgi/trunk/testsuite: example/src/test/resources/META-INF and 3 other directories.

Author: thomas.diesler(a)jboss.com Date: 2009-11-26 13:24:59 -0500 (Thu, 26 Nov 2009) New Revision: 97045 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/jboss-osgi-equinox.properties projects/jboss-osgi/trunk/testsuite/example/src/test/resources/jboss-osgi-felix.properties projects/jboss-osgi/trunk/testsuite/functional/pom.xml projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi212/OSGI212TestCase.java projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jboss-osgi-equinox.properties projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jboss-osgi-felix.properties Log: Fix embedded for all frameworks 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-26 18:22:24 UTC (rev 97044) +++ projects/jboss-osgi/trunk/testsuite/example/src/test/resources/META-INF/jboss-osgi-bootstrap.xml 2009-11-26 18:24:59 UTC (rev 97045) @@ -34,7 +34,9 @@ org.jboss.dependency.spi;version=2.0, org.jboss.kernel.spi.dependency;version=2.0, org.jboss.logging;version=2.0, - + org.jboss.reflect.spi;version=2.0, + org.jboss.util;version=2.2, + <!-- jboss-osgi --> org.jboss.osgi.spi;version=1.0, org.jboss.osgi.spi.capability;version=1.0, Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/resources/jboss-osgi-equinox.properties =================================================================== --- projects/jboss-osgi/trunk/testsuite/example/src/test/resources/jboss-osgi-equinox.properties 2009-11-26 18:22:24 UTC (rev 97044) +++ projects/jboss-osgi/trunk/testsuite/example/src/test/resources/jboss-osgi-equinox.properties 2009-11-26 18:24:59 UTC (rev 97045) @@ -25,16 +25,12 @@ org.jboss.osgi.spi.management;version=1.0, \ org.jboss.osgi.spi.service;version=1.0, \ org.jboss.osgi.spi.util;version=1.0, \ - org.jboss.virtual, \ - org.jboss.virtual.plugins.registry, \ - org.jboss.virtual.plugins.context.jar, \ - org.jboss.virtual.plugins.vfs.helpers, \ - org.jboss.virtual.protocol, \ - org.jboss.util, \ - org.jboss.util.id, \ - org.jboss.util.threadpool, \ - org.jboss.util.propertyeditor, \ - org.osgi.framework;version=1.4 + org.jboss.virtual;version=2.1, \ + org.jboss.virtual.plugins.registry;version=2.1, \ + org.jboss.virtual.plugins.context.jar;version=2.1, \ + org.jboss.virtual.plugins.vfs.helpers;version=2.1, \ + org.jboss.virtual.protocol;version=2.1, \ + org.osgi.framework;version=1.5 # Bundles that need to be installed with the Framework automatically org.jboss.osgi.spi.framework.autoInstall=\ Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/resources/jboss-osgi-felix.properties =================================================================== --- projects/jboss-osgi/trunk/testsuite/example/src/test/resources/jboss-osgi-felix.properties 2009-11-26 18:22:24 UTC (rev 97044) +++ projects/jboss-osgi/trunk/testsuite/example/src/test/resources/jboss-osgi-felix.properties 2009-11-26 18:24:59 UTC (rev 97045) @@ -22,7 +22,6 @@ org.apache.log4j;version=1.2, \ org.jboss.logging, \ org.jboss.net.protocol, \ - org.jboss.osgi.common.log;version=1.0, \ org.jboss.osgi.deployment.common;version=1.0, \ org.jboss.osgi.deployment.deployer;version=1.0, \ org.jboss.osgi.deployment.interceptor;version=1.0, \ Modified: projects/jboss-osgi/trunk/testsuite/functional/pom.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/pom.xml 2009-11-26 18:22:24 UTC (rev 97044) +++ projects/jboss-osgi/trunk/testsuite/functional/pom.xml 2009-11-26 18:24:59 UTC (rev 97045) @@ -150,6 +150,8 @@ <exclude>org/jboss/test/osgi/jbosgi39/**</exclude> <!-- [JBOSGI-108] Investigate statics on PackageAdmin.refresh --> <exclude>org/jboss/test/osgi/jbosgi108/**</exclude> + <!-- [JBOSGI-212] Cannot refresh Microcontainer service --> + <exclude>org/jboss/test/osgi/jbosgi212/**</exclude> </excludes> </configuration> </plugin> @@ -196,6 +198,8 @@ <configuration> <excludes> <exclude>${target.container.excludes}</exclude> + <!-- [JBOSGI-212] Cannot refresh Microcontainer service --> + <exclude>org/jboss/test/osgi/jbosgi212/**</exclude> </excludes> </configuration> </plugin> Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi212/OSGI212TestCase.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi212/OSGI212TestCase.java 2009-11-26 18:22:24 UTC (rev 97044) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi212/OSGI212TestCase.java 2009-11-26 18:24:59 UTC (rev 97045) @@ -52,13 +52,17 @@ try { runtime.addCapability(new MicrocontainerCapability()); - + + // On the MC Framework there is no such bundle. The service should still be available. OSGiBundle bundle = runtime.getBundle("jboss-osgi-microcontainer", null); - assertNotNull("MicrocontainerService available", bundle); - assertEquals("Bundle ACTIVE", Bundle.ACTIVE, bundle.getState()); - - // Update the MC bundle - // bundle.update(); + if (bundle != null) + { + assertNotNull("MicrocontainerService available", bundle); + assertEquals("Bundle ACTIVE", Bundle.ACTIVE, bundle.getState()); + + // Update the MC bundle + // bundle.update(); + } OSGiServiceReference sref = runtime.getServiceReference(MicrocontainerService.class.getName()); assertNotNull("MicrocontainerService still available", sref); Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jboss-osgi-equinox.properties =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jboss-osgi-equinox.properties 2009-11-26 18:22:24 UTC (rev 97044) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jboss-osgi-equinox.properties 2009-11-26 18:24:59 UTC (rev 97045) @@ -25,14 +25,10 @@ org.jboss.osgi.spi.management;version=1.0, \ org.jboss.osgi.spi.service;version=1.0, \ org.jboss.osgi.spi.util;version=1.0, \ - org.jboss.virtual, \ - org.jboss.virtual.plugins.registry, \ - org.jboss.virtual.plugins.context.jar, \ - org.jboss.virtual.plugins.vfs.helpers, \ - org.jboss.virtual.protocol, \ - org.jboss.util, \ - org.jboss.util.id, \ - org.jboss.util.threadpool, \ - org.jboss.util.propertyeditor, \ - org.osgi.framework;version=1.4 + org.jboss.virtual;version=2.1, \ + org.jboss.virtual.plugins.registry;version=2.1, \ + org.jboss.virtual.plugins.context.jar;version=2.1, \ + org.jboss.virtual.plugins.vfs.helpers;version=2.1, \ + org.jboss.virtual.protocol;version=2.1, \ + org.osgi.framework;version=1.5 Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jboss-osgi-felix.properties =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jboss-osgi-felix.properties 2009-11-26 18:22:24 UTC (rev 97044) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jboss-osgi-felix.properties 2009-11-26 18:24:59 UTC (rev 97045) @@ -28,15 +28,10 @@ org.jboss.osgi.spi.management;version=1.0, \ org.jboss.osgi.spi.service;version=1.0, \ org.jboss.osgi.spi.util;version=1.0, \ - org.jboss.osgi.testing, \ - org.jboss.util, \ - org.jboss.util.id, \ - org.jboss.util.threadpool, \ - org.jboss.util.propertyeditor, \ - org.jboss.virtual, \ - org.jboss.virtual.plugins.registry, \ - org.jboss.virtual.plugins.context.jar, \ - org.jboss.virtual.plugins.vfs.helpers, \ - org.jboss.virtual.protocol, \ + org.jboss.virtual;version=2.1, \ + org.jboss.virtual.plugins.registry;version=2.1, \ + org.jboss.virtual.plugins.context.jar;version=2.1, \ + org.jboss.virtual.plugins.vfs.helpers;version=2.1, \ + org.jboss.virtual.protocol;version=2.1, \ org.osgi.framework;version=1.5 \ No newline at end of file