[jboss-osgi-commits] JBoss-OSGI SVN: r97983 - in projects/jboss-osgi: trunk and 14 other directories.

Author: thomas.diesler(a)jboss.com Date: 2009-12-18 05:29:18 -0500 (Fri, 18 Dec 2009) New Revision: 97983 Modified: projects/jboss-osgi/projects/runtime/framework/trunk/.settings/org.eclipse.jdt.core.prefs projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml projects/jboss-osgi/trunk/distribution/pom.xml projects/jboss-osgi/trunk/pom.xml projects/jboss-osgi/trunk/reactor/blueprint/pom.xml projects/jboss-osgi/trunk/reactor/blueprint/scripts/assembly-bundles.xml projects/jboss-osgi/trunk/reactor/blueprint/src/main/java/org/jboss/osgi/blueprint/BlueprintCapability.java projects/jboss-osgi/trunk/reactor/pom.xml projects/jboss-osgi/trunk/testsuite/example/pom.xml projects/jboss-osgi/trunk/testsuite/example/scripts/assembly-bundles.xml projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/microcontainer/MicrocontainerTestCase.java projects/jboss-osgi/trunk/testsuite/functional/scripts/assembly-bundles.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/java/org/jboss/test/osgi/jbossas/jbosgi36/OSGI36TestCase.java projects/jboss-osgi/trunk/testsuite/pom.xml projects/jboss-osgi/trunk/testsuite/trailblazer/scripts/assembly-bundles.xml Log: Remove microcontainer/blueprint support for Felix & Equinox Modified: projects/jboss-osgi/projects/runtime/framework/trunk/.settings/org.eclipse.jdt.core.prefs =================================================================== --- projects/jboss-osgi/projects/runtime/framework/trunk/.settings/org.eclipse.jdt.core.prefs 2009-12-18 10:12:55 UTC (rev 97982) +++ projects/jboss-osgi/projects/runtime/framework/trunk/.settings/org.eclipse.jdt.core.prefs 2009-12-18 10:29:18 UTC (rev 97983) @@ -1,4 +1,4 @@ -#Fri Dec 04 12:28:37 CET 2009 +#Fri Dec 18 11:03:28 CET 2009 eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 org.eclipse.jdt.core.compiler.compliance=1.5 Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml =================================================================== --- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml 2009-12-18 10:12:55 UTC (rev 97982) +++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml 2009-12-18 10:29:18 UTC (rev 97983) @@ -146,7 +146,6 @@ <include name="jboss-osgi-jmx-sources.jar" /> <include name="jboss-osgi-jndi-sources.jar" /> <include name="jboss-osgi-jta-sources.jar" /> - <include name="jboss-osgi-microcontainer-sources.jar" /> <include name="jboss-osgi-reflect-sources.jar" /> <include name="jboss-osgi-runtime-equinox-sources.jar" /> <include name="jboss-osgi-runtime-felix-sources.jar" /> @@ -269,9 +268,6 @@ <fileset condition="isFelix" dir=&quot;(a){deploy.artifacts.dir}/lib/org.osgi&quot; targetdir="$INSTALL_PATH/runtime/server/minimal/deploy" override="true"> <include name="org.osgi.compendium.jar" /> </fileset> - <fileset condition="isFelix" dir=&quot;(a){deploy.artifacts.dir}/lib&quot; targetdir="$INSTALL_PATH/runtime/server/all/deploy" override="true"> - <include name="jboss-osgi-microcontainer.jar" /> - </fileset> <!-- Equinox Integration --> @@ -293,9 +289,6 @@ <include name="org.eclipse.osgi.services.jar" /> <include name="org.eclipse.osgi.util.jar" /> </fileset> - <fileset condition="isEquinox" dir=&quot;(a){deploy.artifacts.dir}/lib&quot; targetdir="$INSTALL_PATH/runtime/server/all/deploy" override="true"> - <include name="jboss-osgi-microcontainer.jar" /> - </fileset> <!-- JBossMC Integration --> Modified: projects/jboss-osgi/trunk/distribution/pom.xml =================================================================== --- projects/jboss-osgi/trunk/distribution/pom.xml 2009-12-18 10:12:55 UTC (rev 97982) +++ projects/jboss-osgi/trunk/distribution/pom.xml 2009-12-18 10:29:18 UTC (rev 97983) @@ -231,22 +231,6 @@ </dependency> <dependency> <groupId>org.jboss.osgi.bundles</groupId> - <artifactId>jboss-osgi-microcontainer</artifactId> - </dependency> - <dependency> - <groupId>org.jboss.osgi.bundles</groupId> - <artifactId>jboss-osgi-microcontainer</artifactId> - <version>${version.jboss.osgi.microcontainer}</version> - <classifier>sources</classifier> - </dependency> - <dependency> - <groupId>org.jboss.osgi.bundles</groupId> - <artifactId>jboss-osgi-microcontainer</artifactId> - <version>${version.jboss.osgi.microcontainer}</version> - <classifier>javadoc</classifier> - </dependency> - <dependency> - <groupId>org.jboss.osgi.bundles</groupId> <artifactId>jboss-osgi-webapp</artifactId> </dependency> <dependency> Modified: projects/jboss-osgi/trunk/pom.xml =================================================================== --- projects/jboss-osgi/trunk/pom.xml 2009-12-18 10:12:55 UTC (rev 97982) +++ projects/jboss-osgi/trunk/pom.xml 2009-12-18 10:29:18 UTC (rev 97983) @@ -61,7 +61,6 @@ <version.jboss.osgi.jmx>1.0.2.SP1</version.jboss.osgi.jmx> <version.jboss.osgi.jndi>1.0.2</version.jboss.osgi.jndi> <version.jboss.osgi.jta>1.0.0</version.jboss.osgi.jta> - <version.jboss.osgi.microcontainer>2.2.0-SNAPSHOT</version.jboss.osgi.microcontainer> <version.jboss.osgi.reflect>2.2.0-SNAPSHOT</version.jboss.osgi.reflect> <version.jboss.osgi.runtime.deployers>1.0.4-SNAPSHOT</version.jboss.osgi.runtime.deployers> <version.jboss.osgi.runtime.equinox>3.5.1</version.jboss.osgi.runtime.equinox> @@ -143,11 +142,6 @@ </dependency> <dependency> <groupId>org.jboss.osgi.bundles</groupId> - <artifactId>jboss-osgi-microcontainer</artifactId> - <version>${version.jboss.osgi.microcontainer}</version> - </dependency> - <dependency> - <groupId>org.jboss.osgi.bundles</groupId> <artifactId>jboss-osgi-reflect</artifactId> <version>${version.jboss.osgi.reflect}</version> </dependency> Modified: projects/jboss-osgi/trunk/reactor/blueprint/pom.xml =================================================================== --- projects/jboss-osgi/trunk/reactor/blueprint/pom.xml 2009-12-18 10:12:55 UTC (rev 97982) +++ projects/jboss-osgi/trunk/reactor/blueprint/pom.xml 2009-12-18 10:29:18 UTC (rev 97983) @@ -89,17 +89,17 @@ </dependency> <dependency> <groupId>org.jboss.osgi.bundles</groupId> - <artifactId>jboss-osgi-microcontainer</artifactId> + <artifactId>jboss-osgi-reflect</artifactId> <scope>provided</scope> </dependency> <dependency> <groupId>org.jboss.osgi.bundles</groupId> - <artifactId>jboss-osgi-reflect</artifactId> + <artifactId>jboss-osgi-xml-binding</artifactId> <scope>provided</scope> </dependency> <dependency> - <groupId>org.jboss.osgi.bundles</groupId> - <artifactId>jboss-osgi-xml-binding</artifactId> + <groupId>org.jboss.osgi.runtime</groupId> + <artifactId>jboss-osgi-framework</artifactId> <scope>provided</scope> </dependency> @@ -302,13 +302,6 @@ <value>equinox</value> </property> </activation> - <dependencies> - <dependency> - <groupId>org.jboss.osgi.runtime</groupId> - <artifactId>jboss-osgi-runtime-equinox</artifactId> - <scope>provided</scope> - </dependency> - </dependencies> <build> <plugins> <plugin> @@ -333,58 +326,18 @@ <value>felix</value> </property> </activation> - <dependencies> - <dependency> - <groupId>org.jboss.osgi.runtime</groupId> - <artifactId>jboss-osgi-runtime-felix</artifactId> - <scope>provided</scope> - </dependency> - </dependencies> - </profile> - - <!-- - Name: framework-jbossmc - Descr: Setup for JBossMC framework integration testing - --> - <profile> - <id>framework-jbossmc</id> - <activation> - <property> - <name>framework</name> - <value>jbossmc</value> - </property> - </activation> - <dependencies> - <dependency> - <groupId>org.jboss.osgi.runtime</groupId> - <artifactId>jboss-osgi-framework</artifactId> - <scope>provided</scope> - </dependency> - </dependencies> <build> <plugins> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <skipTests>true</skipTests> + </configuration> + </plugin> </plugins> </build> </profile> - <profile> - <id>framework-jbossmc-default</id> - <activation> - <property> - <name>!framework</name> - </property> - </activation> - <dependencies> - <dependency> - <groupId>org.jboss.osgi.runtime</groupId> - <artifactId>jboss-osgi-framework</artifactId> - <scope>provided</scope> - </dependency> - </dependencies> - <build> - <plugins> - </plugins> - </build> - </profile> + </profiles> </project> Modified: projects/jboss-osgi/trunk/reactor/blueprint/scripts/assembly-bundles.xml =================================================================== --- projects/jboss-osgi/trunk/reactor/blueprint/scripts/assembly-bundles.xml 2009-12-18 10:12:55 UTC (rev 97982) +++ projects/jboss-osgi/trunk/reactor/blueprint/scripts/assembly-bundles.xml 2009-12-18 10:29:18 UTC (rev 97983) @@ -22,7 +22,6 @@ <include>*:jboss-osgi-jaxb:jar</include> <include>*:jboss-osgi-jmx:jar</include> <include>*:jboss-osgi-jndi:jar</include> - <include>*:jboss-osgi-microcontainer:jar</include> <include>*:jboss-osgi-reflect:jar</include> <include>*:jboss-osgi-xml-binding:jar</include> </includes> Modified: projects/jboss-osgi/trunk/reactor/blueprint/src/main/java/org/jboss/osgi/blueprint/BlueprintCapability.java =================================================================== --- projects/jboss-osgi/trunk/reactor/blueprint/src/main/java/org/jboss/osgi/blueprint/BlueprintCapability.java 2009-12-18 10:12:55 UTC (rev 97982) +++ projects/jboss-osgi/trunk/reactor/blueprint/src/main/java/org/jboss/osgi/blueprint/BlueprintCapability.java 2009-12-18 10:29:18 UTC (rev 97983) @@ -24,8 +24,8 @@ //$Id$ import org.jboss.osgi.jbossxb.XMLBindingCapability; -import org.jboss.osgi.microcontainer.MicrocontainerCapability; import org.jboss.osgi.spi.capability.Capability; +import org.jboss.osgi.testing.OSGiRuntime; /** * Adds the Blueprint capability to the {@link OSGiRuntime} @@ -45,7 +45,6 @@ super (BlueprintService.class.getName()); addDependency(new XMLBindingCapability()); - addDependency(new MicrocontainerCapability()); addBundle("bundles/jboss-osgi-blueprint.jar"); } Modified: projects/jboss-osgi/trunk/reactor/pom.xml =================================================================== --- projects/jboss-osgi/trunk/reactor/pom.xml 2009-12-18 10:12:55 UTC (rev 97982) +++ projects/jboss-osgi/trunk/reactor/pom.xml 2009-12-18 10:29:18 UTC (rev 97983) @@ -41,8 +41,28 @@ </parent> <modules> - <module>framework</module> <module>blueprint</module> </modules> + <!-- Profiles --> + <profiles> + + <!-- + Name: framework-equinox + Descr: Setup for Equinox framework integration testing + --> + <profile> + <id>noframework</id> + <activation> + <property> + <name>!noframework</name> + </property> + </activation> + <modules> + <module>framework</module> + </modules> + </profile> + + </profiles> + </project> Modified: projects/jboss-osgi/trunk/testsuite/example/pom.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/example/pom.xml 2009-12-18 10:12:55 UTC (rev 97982) +++ projects/jboss-osgi/trunk/testsuite/example/pom.xml 2009-12-18 10:29:18 UTC (rev 97983) @@ -182,15 +182,14 @@ <configuration> <excludes> <exclude>${target.container.excludes}</exclude> - <!-- exclude interceptor based tests --> + <!-- [JBOSGI-236] XML Binding example fails in JBossAS --> + <exclude>org/jboss/test/osgi/example/xml/jbossxb/**</exclude> + <!-- Functionality not supported in Equinox --> + <exclude>org/jboss/test/osgi/example/blueprint/**</exclude> <exclude>org/jboss/test/osgi/example/interceptor/**</exclude> + <exclude>org/jboss/test/osgi/example/microcontainer/**</exclude> <exclude>org/jboss/test/osgi/example/webapp/WebAppNegativeTestCase.class</exclude> <exclude>org/jboss/test/osgi/example/webapp/WebAppInterceptorTestCase.class</exclude> - <!-- [JBOSGI-214] Cannot repeatedly register service bound to an interface from the system classpath --> - <exclude>org/jboss/test/osgi/example/blueprint/**</exclude> - <exclude>org/jboss/test/osgi/example/microcontainer/**</exclude> - <!-- [JBOSGI-236] XML Binding example fails in JBossAS --> - <exclude>org/jboss/test/osgi/example/xml/jbossxb/**</exclude> </excludes> </configuration> </plugin> @@ -241,6 +240,9 @@ <exclude>org/jboss/test/osgi/example/interceptor/**</exclude> <exclude>org/jboss/test/osgi/example/webapp/WebAppNegativeTestCase.class</exclude> <exclude>org/jboss/test/osgi/example/webapp/WebAppInterceptorTestCase.class</exclude> + <!-- Functionality not supported in Felix --> + <exclude>org/jboss/test/osgi/example/blueprint/**</exclude> + <exclude>org/jboss/test/osgi/example/microcontainer/**</exclude> </excludes> </configuration> </plugin> Modified: projects/jboss-osgi/trunk/testsuite/example/scripts/assembly-bundles.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/example/scripts/assembly-bundles.xml 2009-12-18 10:12:55 UTC (rev 97982) +++ projects/jboss-osgi/trunk/testsuite/example/scripts/assembly-bundles.xml 2009-12-18 10:29:18 UTC (rev 97983) @@ -24,7 +24,6 @@ <include>*:jboss-osgi-jmx:jar</include> <include>*:jboss-osgi-jndi:jar</include> <include>*:jboss-osgi-jta:jar</include> - <include>*:jboss-osgi-microcontainer:jar</include> <include>*:jboss-osgi-reflect:jar</include> <include>*:jboss-osgi-webapp:jar</include> <include>*:jboss-osgi-xml-binding:jar</include> Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/microcontainer/MicrocontainerTestCase.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/microcontainer/MicrocontainerTestCase.java 2009-12-18 10:12:55 UTC (rev 97982) +++ projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/microcontainer/MicrocontainerTestCase.java 2009-12-18 10:29:18 UTC (rev 97983) @@ -26,7 +26,7 @@ import static org.jboss.test.osgi.example.microcontainer.bundleA.SomeBeanMBean.MBEAN_NAME; import static org.junit.Assert.assertEquals; -import org.jboss.osgi.microcontainer.MicrocontainerCapability; +import org.jboss.osgi.jmx.JMXCapability; import org.jboss.osgi.spi.management.MBeanProxy; import org.jboss.osgi.testing.OSGiBundle; import org.jboss.osgi.testing.OSGiRuntime; @@ -51,7 +51,7 @@ public static void setUpClass() throws Exception { runtime = new OSGiTestHelper().getDefaultRuntime(); - runtime.addCapability(new MicrocontainerCapability()); + runtime.addCapability(new JMXCapability()); bundleA = runtime.installBundle("example-mcservice-bundleA.jar"); bundleA.start(); Modified: projects/jboss-osgi/trunk/testsuite/functional/scripts/assembly-bundles.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/scripts/assembly-bundles.xml 2009-12-18 10:12:55 UTC (rev 97982) +++ projects/jboss-osgi/trunk/testsuite/functional/scripts/assembly-bundles.xml 2009-12-18 10:29:18 UTC (rev 97983) @@ -23,7 +23,6 @@ <include>*:jboss-osgi-jaxb:jar</include> <include>*:jboss-osgi-jmx:jar</include> <include>*:jboss-osgi-jndi:jar</include> - <include>*:jboss-osgi-microcontainer:jar</include> <include>*:jboss-osgi-reflect:jar</include> <include>*:jboss-osgi-webapp:jar</include> <include>*:jboss-osgi-xml-binding:jar</include> 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-12-18 10:12:55 UTC (rev 97982) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi212/OSGI212TestCase.java 2009-12-18 10:29:18 UTC (rev 97983) @@ -25,7 +25,7 @@ import static org.junit.Assert.assertNotNull; -import org.jboss.osgi.microcontainer.MicrocontainerCapability; +import org.jboss.osgi.jmx.JMXCapability; import org.jboss.osgi.spi.service.MicrocontainerService; import org.jboss.osgi.testing.OSGiBundle; import org.jboss.osgi.testing.OSGiRuntime; @@ -50,7 +50,7 @@ OSGiRuntime runtime = getDefaultRuntime(); try { - runtime.addCapability(new MicrocontainerCapability()); + runtime.addCapability(new JMXCapability()); // On the MC Framework there is no such bundle. The service should still be available. OSGiBundle bundle = runtime.getBundle("jboss-osgi-microcontainer", null); Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbossas/jbosgi36/OSGI36TestCase.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbossas/jbosgi36/OSGI36TestCase.java 2009-12-18 10:12:55 UTC (rev 97982) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbossas/jbosgi36/OSGI36TestCase.java 2009-12-18 10:29:18 UTC (rev 97983) @@ -26,7 +26,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; -import org.jboss.osgi.microcontainer.MicrocontainerCapability; +import org.jboss.osgi.jmx.JMXCapability; import org.jboss.osgi.spi.management.MBeanProxy; import org.jboss.osgi.spi.management.MBeanProxyException; import org.jboss.osgi.testing.OSGiTest; @@ -53,7 +53,7 @@ public static void setUpClass() throws Exception { runtime = (RemoteRuntime)new OSGiTestHelper().getRemoteRuntime(); - runtime.addCapability(new MicrocontainerCapability()); + runtime.addCapability(new JMXCapability()); runtime.installBundle("jbosgi36-bundle.jar"); runtime.deploy("jbosgi36-mbean.jar"); Modified: projects/jboss-osgi/trunk/testsuite/pom.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/pom.xml 2009-12-18 10:12:55 UTC (rev 97982) +++ projects/jboss-osgi/trunk/testsuite/pom.xml 2009-12-18 10:29:18 UTC (rev 97983) @@ -154,11 +154,6 @@ </dependency> <dependency> <groupId>org.jboss.osgi.bundles</groupId> - <artifactId>jboss-osgi-microcontainer</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.osgi.bundles</groupId> <artifactId>jboss-osgi-webapp</artifactId> <scope>provided</scope> </dependency> Modified: projects/jboss-osgi/trunk/testsuite/trailblazer/scripts/assembly-bundles.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/trailblazer/scripts/assembly-bundles.xml 2009-12-18 10:12:55 UTC (rev 97982) +++ projects/jboss-osgi/trunk/testsuite/trailblazer/scripts/assembly-bundles.xml 2009-12-18 10:29:18 UTC (rev 97983) @@ -32,7 +32,6 @@ <include>*:jboss-osgi-jaxb:jar</include> <include>*:jboss-osgi-jmx:jar</include> <include>*:jboss-osgi-jndi:jar</include> - <include>*:jboss-osgi-microcontainer:jar</include> <include>*:jboss-osgi-xml-binding:jar</include> <include>*:org.apache.felix.configadmin:jar</include> <include>*:org.apache.felix.log:jar</include>