Author: thomas.diesler(a)jboss.com Date: 2009-04-26 15:42:44 -0400 (Sun, 26 Apr 2009) New Revision: 87847 Added: projects/jboss-osgi/trunk/bundle/microcontainer/ Removed: projects/jboss-osgi/trunk/bundle/microcontainer/src/main/java/org/jboss/osgi/spi/ projects/jboss-osgi/trunk/microcontainer/ Modified: projects/jboss-osgi/trunk/build/distribution/pom.xml projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/jmx/JMXTestCase.java projects/jboss-osgi/trunk/bundle/jmx/.classpath projects/jboss-osgi/trunk/bundle/microcontainer/.project projects/jboss-osgi/trunk/bundle/microcontainer/pom.xml projects/jboss-osgi/trunk/bundle/pom.xml projects/jboss-osgi/trunk/bundle/webconsole/pom.xml projects/jboss-osgi/trunk/pom.xml projects/jboss-osgi/trunk/runtime/deployer/pom.xml projects/jboss-osgi/trunk/runtime/equinox/pom.xml projects/jboss-osgi/trunk/runtime/felix/pom.xml projects/jboss-osgi/trunk/runtime/knopflerfish/pom.xml projects/jboss-osgi/trunk/runtime/pom.xml projects/jboss-osgi/trunk/spi/pom.xml projects/jboss-osgi/trunk/testsuite/example/pom.xml projects/jboss-osgi/trunk/testsuite/functional/pom.xml projects/jboss-osgi/trunk/testsuite/pom.xml Log: Microcontainer Bundle - first cut Modified: projects/jboss-osgi/trunk/build/distribution/pom.xml =================================================================== --- projects/jboss-osgi/trunk/build/distribution/pom.xml 2009-04-26 19:20:01 UTC (rev 87846) +++ projects/jboss-osgi/trunk/build/distribution/pom.xml 2009-04-26 19:42:44 UTC (rev 87847) @@ -14,7 +14,6 @@ <modelVersion>4.0.0</modelVersion> <name>JBossOSGi - Distribution</name> - <description>JBossOSGi - IzPack Distribution</description> <groupId>org.jboss.osgi</groupId> <artifactId>jboss-osgi-distribution</artifactId> Modified: projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/jmx/JMXTestCase.java =================================================================== --- projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/jmx/JMXTestCase.java 2009-04-26 19:20:01 UTC (rev 87846) +++ projects/jboss-osgi/trunk/bundle/blueprint/src/test/java/org/jboss/test/osgi/blueprint/jmx/JMXTestCase.java 2009-04-26 19:42:44 UTC (rev 87847) @@ -29,7 +29,6 @@ import org.jboss.osgi.spi.management.MBeanProxy; import org.jboss.test.osgi.blueprint.BlueprintTest; import org.jboss.test.osgi.blueprint.jmx.bundle.FooMBean; -import org.jboss.test.osgi.blueprint.jmx.bundle.JMXTestService; import org.osgi.framework.BundleContext; /** Modified: projects/jboss-osgi/trunk/bundle/jmx/.classpath =================================================================== --- projects/jboss-osgi/trunk/bundle/jmx/.classpath 2009-04-26 19:20:01 UTC (rev 87846) +++ projects/jboss-osgi/trunk/bundle/jmx/.classpath 2009-04-26 19:42:44 UTC (rev 87847) @@ -1,8 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> <classpathentry kind="src" output="target/classes" path="src/main/java"/> - <classpathentry kind="src" output="target/test-classes" path="src/test/java"/> - <classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/> <classpathentry kind="output" path="target/classes"/> Copied: projects/jboss-osgi/trunk/bundle/microcontainer (from rev 87844, projects/jboss-osgi/trunk/spi) Modified: projects/jboss-osgi/trunk/bundle/microcontainer/.project =================================================================== --- projects/jboss-osgi/trunk/spi/.project 2009-04-26 15:06:13 UTC (rev 87844) +++ projects/jboss-osgi/trunk/bundle/microcontainer/.project 2009-04-26 19:42:44 UTC (rev 87847) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <projectDescription> - <name>jboss-osgi-runtime-spi</name> + <name>jboss-osgi-microcontainer</name> <comment></comment> <projects> </projects> Modified: projects/jboss-osgi/trunk/bundle/microcontainer/pom.xml =================================================================== --- projects/jboss-osgi/trunk/spi/pom.xml 2009-04-26 15:06:13 UTC (rev 87844) +++ projects/jboss-osgi/trunk/bundle/microcontainer/pom.xml 2009-04-26 19:42:44 UTC (rev 87847) @@ -2,17 +2,16 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> - <name>JBossOSGi - SPI</name> - <description>JBossOSGi - SPI</description> + <name>JBossOSGi - Bundle Microcontainer</name> <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-spi</artifactId> + <artifactId>jboss-osgi-microcontainer</artifactId> <packaging>jar</packaging> <!-- Parent --> <parent> <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi</artifactId> + <artifactId>jboss-osgi-bundle</artifactId> <version>1.0.0.Beta2</version> </parent> @@ -40,30 +39,32 @@ <groupId>org.jboss.microcontainer</groupId> <artifactId>jboss-kernel</artifactId> </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </dependency> </dependencies> <build> <plugins> <plugin> - <artifactId>maven-javadoc-plugin</artifactId> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <extensions>true</extensions> <configuration> - <quiet>true</quiet> - <excludePackageNames>*.internal</excludePackageNames> + <instructions> + <Bundle-SymbolicName>jboss-osgi-microcontainer</Bundle-SymbolicName> + <Bundle-Activator>jboss-osgi-microcontainer.internal.ServiceActivator</Bundle-Activator> + <Export-Package> + org.jboss.osgi.microcontainer;version=${version.felix.webconsole} + </Export-Package> + <Private-Package> + </Private-Package> + <Import-Package> + </Import-Package> + <Embed-Dependency> + jboss-deployers-client-spi, + jboss-deployers-vfs, + jboss-kernel, + </Embed-Dependency> + </instructions> </configuration> - <executions> - <execution> - <goals> - <goal>jar</goal> - </goals> - <configuration> - <aggregate>true</aggregate> - </configuration> - </execution> - </executions> </plugin> </plugins> </build> Modified: projects/jboss-osgi/trunk/bundle/pom.xml =================================================================== --- projects/jboss-osgi/trunk/bundle/pom.xml 2009-04-26 19:20:01 UTC (rev 87846) +++ projects/jboss-osgi/trunk/bundle/pom.xml 2009-04-26 19:42:44 UTC (rev 87847) @@ -17,6 +17,7 @@ <module>common</module> <module>jmx</module> <module>logging</module> + <module>microcontainer</module> <module>remotelog</module> <module>webconsole</module> </modules> Modified: projects/jboss-osgi/trunk/bundle/webconsole/pom.xml =================================================================== --- projects/jboss-osgi/trunk/bundle/webconsole/pom.xml 2009-04-26 19:20:01 UTC (rev 87846) +++ projects/jboss-osgi/trunk/bundle/webconsole/pom.xml 2009-04-26 19:42:44 UTC (rev 87847) @@ -2,7 +2,6 @@ <modelVersion>4.0.0</modelVersion> <name>JBossOSGi - Bundle WebConsole</name> - <description>JBossOSGi - WebConsole</description> <groupId>org.jboss.osgi</groupId> <artifactId>jboss-osgi-webconsole</artifactId> Modified: projects/jboss-osgi/trunk/pom.xml =================================================================== --- projects/jboss-osgi/trunk/pom.xml 2009-04-26 19:20:01 UTC (rev 87846) +++ projects/jboss-osgi/trunk/pom.xml 2009-04-26 19:42:44 UTC (rev 87847) @@ -16,7 +16,6 @@ </parent> <url>http://www.jboss.org/community/wiki/JBossOSGi</url> - <description>JBossOSGi</description> <scm> <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossas/projects/jbo... @@ -26,9 +25,8 @@ <!-- Modules --> <modules> - <module>microcontainer</module> - <module>repository</module> <module>spi</module> + <module>repository</module> <module>runtime</module> <module>bundle</module> <module>testsuite</module> Modified: projects/jboss-osgi/trunk/runtime/deployer/pom.xml =================================================================== --- projects/jboss-osgi/trunk/runtime/deployer/pom.xml 2009-04-26 19:20:01 UTC (rev 87846) +++ projects/jboss-osgi/trunk/runtime/deployer/pom.xml 2009-04-26 19:42:44 UTC (rev 87847) @@ -3,7 +3,6 @@ <modelVersion>4.0.0</modelVersion> <name>JBossOSGi - Runtime Deployer</name> - <description>JBossOSGi - JBoss Deployer</description> <groupId>org.jboss.osgi</groupId> <artifactId>jboss-osgi-runtime-deployer</artifactId> Modified: projects/jboss-osgi/trunk/runtime/equinox/pom.xml =================================================================== --- projects/jboss-osgi/trunk/runtime/equinox/pom.xml 2009-04-26 19:20:01 UTC (rev 87846) +++ projects/jboss-osgi/trunk/runtime/equinox/pom.xml 2009-04-26 19:42:44 UTC (rev 87847) @@ -3,7 +3,6 @@ <modelVersion>4.0.0</modelVersion> <name>JBossOSGi - Runtime Equinox</name> - <description>JBossOSGi - Equinox Runtime</description> <groupId>org.jboss.osgi</groupId> <artifactId>jboss-osgi-runtime-equinox</artifactId> Modified: projects/jboss-osgi/trunk/runtime/felix/pom.xml =================================================================== --- projects/jboss-osgi/trunk/runtime/felix/pom.xml 2009-04-26 19:20:01 UTC (rev 87846) +++ projects/jboss-osgi/trunk/runtime/felix/pom.xml 2009-04-26 19:42:44 UTC (rev 87847) @@ -3,7 +3,6 @@ <modelVersion>4.0.0</modelVersion> <name>JBossOSGi - Runtime Felix</name> - <description>JBossOSGi - Apache Felix Runtime</description> <groupId>org.jboss.osgi</groupId> <artifactId>jboss-osgi-runtime-felix</artifactId> Modified: projects/jboss-osgi/trunk/runtime/knopflerfish/pom.xml =================================================================== --- projects/jboss-osgi/trunk/runtime/knopflerfish/pom.xml 2009-04-26 19:20:01 UTC (rev 87846) +++ projects/jboss-osgi/trunk/runtime/knopflerfish/pom.xml 2009-04-26 19:42:44 UTC (rev 87847) @@ -3,7 +3,6 @@ <modelVersion>4.0.0</modelVersion> <name>JBossOSGi - Runtime Knopflerfish</name> - <description>JBossOSGi - Knopflerfish Runtime</description> <groupId>org.jboss.osgi</groupId> <artifactId>jboss-osgi-runtime-knopflerfish</artifactId> Modified: projects/jboss-osgi/trunk/runtime/pom.xml =================================================================== --- projects/jboss-osgi/trunk/runtime/pom.xml 2009-04-26 19:20:01 UTC (rev 87846) +++ projects/jboss-osgi/trunk/runtime/pom.xml 2009-04-26 19:42:44 UTC (rev 87847) @@ -16,6 +16,7 @@ <module>equinox</module> <module>felix</module> <module>knopflerfish</module> + <module>microcontainer</module> </modules> </project> Modified: projects/jboss-osgi/trunk/spi/pom.xml =================================================================== --- projects/jboss-osgi/trunk/spi/pom.xml 2009-04-26 19:20:01 UTC (rev 87846) +++ projects/jboss-osgi/trunk/spi/pom.xml 2009-04-26 19:42:44 UTC (rev 87847) @@ -3,7 +3,6 @@ <modelVersion>4.0.0</modelVersion> <name>JBossOSGi - SPI</name> - <description>JBossOSGi - SPI</description> <groupId>org.jboss.osgi</groupId> <artifactId>jboss-osgi-spi</artifactId> Modified: projects/jboss-osgi/trunk/testsuite/example/pom.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/example/pom.xml 2009-04-26 19:20:01 UTC (rev 87846) +++ projects/jboss-osgi/trunk/testsuite/example/pom.xml 2009-04-26 19:42:44 UTC (rev 87847) @@ -3,7 +3,6 @@ <modelVersion>4.0.0</modelVersion> <name>JBossOSGi - Testsuite Examples</name> - <description>JBossOSGi - Testsuite Examples</description> <groupId>org.jboss.osgi</groupId> <artifactId>jboss-osgi-testsuite-example</artifactId> Modified: projects/jboss-osgi/trunk/testsuite/functional/pom.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/pom.xml 2009-04-26 19:20:01 UTC (rev 87846) +++ projects/jboss-osgi/trunk/testsuite/functional/pom.xml 2009-04-26 19:42:44 UTC (rev 87847) @@ -3,7 +3,6 @@ <modelVersion>4.0.0</modelVersion> <name>JBossOSGi - Testsuite Functional</name> - <description>JBossOSGi - Testsuite Functional</description> <groupId>org.jboss.osgi</groupId> <artifactId>jboss-osgi-testsuite-functional</artifactId> Modified: projects/jboss-osgi/trunk/testsuite/pom.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/pom.xml 2009-04-26 19:20:01 UTC (rev 87846) +++ projects/jboss-osgi/trunk/testsuite/pom.xml 2009-04-26 19:42:44 UTC (rev 87847) @@ -3,7 +3,6 @@ <modelVersion>4.0.0</modelVersion> <name>JBossOSGi - Testsuite</name> - <description>JBossOSGi - Testsuite</description> <groupId>org.jboss.osgi</groupId> <artifactId>jboss-osgi-testsuite</artifactId>