Author: thomas.diesler(a)jboss.com Date: 2009-10-21 16:37:52 -0400 (Wed, 21 Oct 2009) New Revision: 95341 Removed: projects/jboss-osgi/trunk/reactor/deployment/src/main/java/org/jboss/osgi/deployment/deployer/DeployerServiceCapability.java Modified: projects/jboss-osgi/projects/bundles/hotdeploy/trunk/pom.xml projects/jboss-osgi/projects/bundles/microcontainer/trunk/pom.xml projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/MicrocontainerCapability.java projects/jboss-osgi/projects/bundles/webapp/trunk/pom.xml projects/jboss-osgi/projects/runtime/felix/trunk/pom.xml projects/jboss-osgi/projects/runtime/felix/trunk/src/main/java/org/jboss/osgi/felix/FelixFrameworkWrapper.java projects/jboss-osgi/projects/runtime/felix/trunk/src/test/java/org/jboss/test/osgi/felix/OSGiBootstrapTestCase.java projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-felix-all.properties projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-felix-default.properties projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-felix-minimal.properties projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-felix-web.properties projects/jboss-osgi/trunk/distribution/pom.xml projects/jboss-osgi/trunk/pom.xml projects/jboss-osgi/trunk/reactor/blueprint/impl/pom.xml projects/jboss-osgi/trunk/reactor/deployment/pom.xml projects/jboss-osgi/trunk/reactor/framework/pom.xml projects/jboss-osgi/trunk/testsuite/example/scripts/assembly-bundles.xml projects/jboss-osgi/trunk/testsuite/functional/scripts/assembly-bundles.xml projects/jboss-osgi/trunk/testsuite/pom.xml Log: Promote deployment to framework level Modified: projects/jboss-osgi/projects/bundles/hotdeploy/trunk/pom.xml =================================================================== --- projects/jboss-osgi/projects/bundles/hotdeploy/trunk/pom.xml 2009-10-21 20:25:46 UTC (rev 95340) +++ projects/jboss-osgi/projects/bundles/hotdeploy/trunk/pom.xml 2009-10-21 20:37:52 UTC (rev 95341) @@ -40,7 +40,7 @@ <!-- Properties --> <properties> <version.jboss.osgi.common>1.0.3-SNAPSHOT</version.jboss.osgi.common> - <version.jboss.osgi.deployment>1.0.0-SNAPSHOT</version.jboss.osgi.deployment> + <version.jboss.osgi.deployment>0.0.1-SNAPSHOT</version.jboss.osgi.deployment> <version.jboss.osgi.spi>1.0.3-SNAPSHOT</version.jboss.osgi.spi> <version.osgi>4.2.0</version.osgi> </properties> @@ -52,6 +52,11 @@ <artifactId>jboss-osgi-spi</artifactId> <version>${version.jboss.osgi.spi}</version> </dependency> + <dependency> + <groupId>org.jboss.osgi.runtime</groupId> + <artifactId>jboss-osgi-deployment</artifactId> + <version>${version.jboss.osgi.deployment}</version> + </dependency> <!-- Bundle dependencies --> <dependency> @@ -60,12 +65,6 @@ <version>${version.jboss.osgi.common}</version> <scope>provided</scope> </dependency> - <dependency> - <groupId>org.jboss.osgi.bundles</groupId> - <artifactId>jboss-osgi-deployment</artifactId> - <version>${version.jboss.osgi.deployment}</version> - <scope>provided</scope> - </dependency> <!-- OSGi Dependencies --> <dependency> Modified: projects/jboss-osgi/projects/bundles/microcontainer/trunk/pom.xml =================================================================== --- projects/jboss-osgi/projects/bundles/microcontainer/trunk/pom.xml 2009-10-21 20:25:46 UTC (rev 95340) +++ projects/jboss-osgi/projects/bundles/microcontainer/trunk/pom.xml 2009-10-21 20:37:52 UTC (rev 95341) @@ -42,7 +42,7 @@ <version.jboss.deployers>2.0.5.SP1</version.jboss.deployers> <version.jboss.microcontainer>2.0.9.GA</version.jboss.microcontainer> <version.jboss.osgi.runtime.deployers>1.0.2</version.jboss.osgi.runtime.deployers> - <version.jboss.osgi.deployment>1.0.0-SNAPSHOT</version.jboss.osgi.deployment> + <version.jboss.osgi.deployment>0.0.1-SNAPSHOT</version.jboss.osgi.deployment> <version.jboss.osgi.spi>1.0.3-SNAPSHOT</version.jboss.osgi.spi> <version.jboss.osgi.xml.binding>2.0.1.SP1</version.jboss.osgi.xml.binding> <version.osgi>4.2.0</version.osgi> @@ -57,11 +57,6 @@ </dependency> <dependency> <groupId>org.jboss.osgi.bundles</groupId> - <artifactId>jboss-osgi-deployment</artifactId> - <version>${version.jboss.osgi.deployment}</version> - </dependency> - <dependency> - <groupId>org.jboss.osgi.bundles</groupId> <artifactId>jboss-osgi-xml-binding</artifactId> <version>${version.jboss.osgi.xml.binding}</version> </dependency> @@ -70,6 +65,11 @@ <artifactId>jboss-osgi-deployers</artifactId> <version>${version.jboss.osgi.runtime.deployers}</version> </dependency> + <dependency> + <groupId>org.jboss.osgi.runtime</groupId> + <artifactId>jboss-osgi-deployment</artifactId> + <version>${version.jboss.osgi.deployment}</version> + </dependency> <dependency> <groupId>org.jboss.deployers</groupId> Modified: projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/MicrocontainerCapability.java =================================================================== --- projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/MicrocontainerCapability.java 2009-10-21 20:25:46 UTC (rev 95340) +++ projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/MicrocontainerCapability.java 2009-10-21 20:37:52 UTC (rev 95341) @@ -23,7 +23,6 @@ //$Id$ -import org.jboss.osgi.deployment.deployer.DeployerServiceCapability; import org.jboss.osgi.spi.capability.Capability; import org.jboss.osgi.spi.capability.CompendiumCapability; import org.jboss.osgi.spi.service.MicrocontainerService; @@ -47,7 +46,6 @@ super(MicrocontainerService.class.getName()); addDependency(new CompendiumCapability()); - addDependency(new DeployerServiceCapability()); addBundle("bundles/jboss-osgi-microcontainer.jar"); } Modified: projects/jboss-osgi/projects/bundles/webapp/trunk/pom.xml =================================================================== --- projects/jboss-osgi/projects/bundles/webapp/trunk/pom.xml 2009-10-21 20:25:46 UTC (rev 95340) +++ projects/jboss-osgi/projects/bundles/webapp/trunk/pom.xml 2009-10-21 20:37:52 UTC (rev 95341) @@ -39,7 +39,7 @@ <!-- Properties --> <properties> - <version.jboss.osgi.deployment>1.0.0-SNAPSHOT</version.jboss.osgi.deployment> + <version.jboss.osgi.deployment>0.0.1-SNAPSHOT</version.jboss.osgi.deployment> <version.ops4j.pax.web>0.7.1</version.ops4j.pax.web> <version.osgi>4.2.0</version.osgi> </properties> @@ -47,6 +47,13 @@ <!-- Dependencies --> <dependencies> <dependency> + <groupId>org.jboss.osgi.runtime</groupId> + <artifactId>jboss-osgi-deployment</artifactId> + <version>${version.jboss.osgi.deployment}</version> + </dependency> + + <!-- PAX-Web --> + <dependency> <groupId>org.ops4j.pax.web</groupId> <artifactId>pax-web-api</artifactId> <version>${version.ops4j.pax.web}</version> @@ -57,14 +64,6 @@ <version>${version.ops4j.pax.web}</version> </dependency> - <!-- Bundle dependencies --> - <dependency> - <groupId>org.jboss.osgi.bundles</groupId> - <artifactId>jboss-osgi-deployment</artifactId> - <version>${version.jboss.osgi.deployment}</version> - <scope>provided</scope> - </dependency> - <!-- OSGi Dependencies --> <dependency> <groupId>org.osgi</groupId> Modified: projects/jboss-osgi/projects/runtime/felix/trunk/pom.xml =================================================================== --- projects/jboss-osgi/projects/runtime/felix/trunk/pom.xml 2009-10-21 20:25:46 UTC (rev 95340) +++ projects/jboss-osgi/projects/runtime/felix/trunk/pom.xml 2009-10-21 20:37:52 UTC (rev 95341) @@ -38,23 +38,23 @@ <properties> <version.felix.framework>2.0.1</version.felix.framework> - <version.jboss.osgi.deployment>1.0.0-SNAPSHOT</version.jboss.osgi.deployment> + <version.jboss.osgi.deployment>0.0.1-SNAPSHOT</version.jboss.osgi.deployment> <version.jboss.osgi.spi>1.0.3-SNAPSHOT</version.jboss.osgi.spi> </properties> <!-- Dependencies --> <dependencies> <dependency> - <groupId>org.jboss.osgi.bundles</groupId> - <artifactId>jboss-osgi-deployment</artifactId> - <version>${version.jboss.osgi.deployment}</version> - </dependency> - <dependency> <groupId>org.jboss.osgi</groupId> <artifactId>jboss-osgi-spi</artifactId> <version>${version.jboss.osgi.spi}</version> </dependency> <dependency> + <groupId>org.jboss.osgi.runtime</groupId> + <artifactId>jboss-osgi-deployment</artifactId> + <version>${version.jboss.osgi.deployment}</version> + </dependency> + <dependency> <groupId>org.apache.felix</groupId> <artifactId>org.apache.felix.framework</artifactId> <version>${version.felix.framework}</version> Modified: projects/jboss-osgi/projects/runtime/felix/trunk/src/main/java/org/jboss/osgi/felix/FelixFrameworkWrapper.java =================================================================== --- projects/jboss-osgi/projects/runtime/felix/trunk/src/main/java/org/jboss/osgi/felix/FelixFrameworkWrapper.java 2009-10-21 20:25:46 UTC (rev 95340) +++ projects/jboss-osgi/projects/runtime/felix/trunk/src/main/java/org/jboss/osgi/felix/FelixFrameworkWrapper.java 2009-10-21 20:37:52 UTC (rev 95341) @@ -24,8 +24,11 @@ //$Id$ import org.jboss.logging.Logger; +import org.jboss.osgi.deployment.internal.DeploymentServicesActivator; import org.jboss.osgi.spi.framework.FrameworkWrapper; +import org.osgi.framework.BundleActivator; import org.osgi.framework.BundleContext; +import org.osgi.framework.BundleException; import org.osgi.framework.launch.Framework; /** @@ -39,12 +42,67 @@ // Provide logging final Logger log = Logger.getLogger(FelixFrameworkWrapper.class); + private BundleActivator deploymentServices; + FelixFrameworkWrapper(Framework framework) { super(framework); } @Override + public void start() throws BundleException + { + super.start(); + + // Start the deployment services + try + { + BundleContext context = framework.getBundleContext(); + deploymentServices = new DeploymentServicesActivator(); + deploymentServices.start(context); + } + catch (RuntimeException rte) + { + throw rte; + } + catch (BundleException ex) + { + throw ex; + } + catch (Exception ex) + { + throw new BundleException("Cannot start deployment services", ex); + } + } + + @Override + public void stop() throws BundleException + { + // Stop the deployment services + if (deploymentServices != null) + { + try + { + BundleContext context = framework.getBundleContext(); + deploymentServices.stop(context); + } + catch (RuntimeException rte) + { + throw rte; + } + catch (BundleException ex) + { + throw ex; + } + catch (Exception ex) + { + throw new BundleException("Cannot start deployment services", ex); + } + } + super.stop(); + } + + @Override public BundleContext getBundleContext() { BundleContext context = framework.getBundleContext(); Modified: projects/jboss-osgi/projects/runtime/felix/trunk/src/test/java/org/jboss/test/osgi/felix/OSGiBootstrapTestCase.java =================================================================== --- projects/jboss-osgi/projects/runtime/felix/trunk/src/test/java/org/jboss/test/osgi/felix/OSGiBootstrapTestCase.java 2009-10-21 20:25:46 UTC (rev 95340) +++ projects/jboss-osgi/projects/runtime/felix/trunk/src/test/java/org/jboss/test/osgi/felix/OSGiBootstrapTestCase.java 2009-10-21 20:37:52 UTC (rev 95341) @@ -24,12 +24,15 @@ //$Id$ import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import org.jboss.osgi.deployment.deployer.DeployerService; import org.jboss.osgi.felix.FelixBundleContextWrapper; import org.jboss.osgi.spi.framework.OSGiBootstrap; import org.jboss.osgi.spi.framework.OSGiBootstrapProvider; import org.junit.Test; import org.osgi.framework.BundleContext; +import org.osgi.framework.ServiceReference; import org.osgi.framework.launch.Framework; /** @@ -54,6 +57,9 @@ { BundleContext context = framework.getBundleContext(); assertEquals(FelixBundleContextWrapper.class.getName(), context.getClass().getName()); + + ServiceReference sref = context.getServiceReference(DeployerService.class.getName()); + assertNotNull("DeployerService not null", sref); } finally { 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-10-21 20:25:46 UTC (rev 95340) +++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml 2009-10-21 20:37:52 UTC (rev 95341) @@ -185,6 +185,7 @@ <include name="jboss-common-core.jar" /> <include name="jboss-logging-spi.jar" /> <include name="jboss-logging-log4j.jar" /> + <include name="jboss-osgi-deployment.jar" /> <include name="jboss-osgi-spi.jar" /> <include name="jboss-vfs.jar" /> <include name="log4j.jar" /> @@ -260,9 +261,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/minimal/deploy" override="true"> - <include name="jboss-osgi-deployment.jar" /> - </fileset> <fileset condition="isFelix" dir=&quot;(a){deploy.artifacts.dir}/lib&quot; targetdir="$INSTALL_PATH/runtime/server/all/deploy" override="true"> <include name="org.apache.felix.configadmin.jar" /> <include name="org.apache.felix.metatype.jar" /> @@ -278,7 +276,6 @@ <include name="org.eclipse.osgi.jar" /> </fileset> <fileset condition="isEquinox" dir=&quot;(a){deploy.artifacts.dir}/lib&quot; targetdir="$INSTALL_PATH/runtime/server/minimal/deploy" override="true"> - <include name="jboss-osgi-deployment.jar" /> <include name="org.eclipse.osgi.services.jar" /> </fileset> <fileset condition="isEquinox" dir=&quot;(a){deploy.artifacts.dir}/lib&quot; targetdir="$INSTALL_PATH/runtime/server/all/deploy" override="true"> @@ -318,7 +315,6 @@ <include name="jboss-mdr.jar" /> <include name="jboss-metatype.jar" /> <include name="jboss-osgi-deployers.jar" /> - <include name="jboss-osgi-deployment.jar" /> <include name="jboss-osgi-framework.jar" /> <include name="jboss-reflect.jar" /> <include name="jbossxb.jar" /> @@ -364,6 +360,7 @@ <!-- deployers/osgi.deployer --> <fileset dir=&quot;(a){deploy.artifacts.dir}/lib&quot; targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer" override="true"> <include name="jboss-osgi-deployers.jar" /> + <include name="jboss-osgi-deployment.jar" /> <include name="jboss-osgi-spi.jar" /> </fileset> @@ -387,7 +384,6 @@ <fileset condition="isFelix" dir=&quot;(a){deploy.artifacts.dir}/lib&quot; targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer" override="true"> - <include name="jboss-osgi-deployment.jar" /> <include name="jboss-osgi-runtime-felix.jar" /> <include name="jboss-osgi-runtime-jbossas.jar" /> <include name="org.apache.felix.framework.jar" /> @@ -395,7 +391,6 @@ <singlefile condition="isFelix" src=&quot;(a){deploy.artifacts.dir}/resources/jbossas/jboss-beans-felix.xml&quot; target="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer/META-INF/jboss-osgi-jboss-beans.xml" override="true" /> <fileset condition="isFelix" dir=&quot;(a){deploy.artifacts.dir}/lib&quot; targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/osgi" override="true"> - <include name="jboss-osgi-deployment.jar" /> <include name="org.apache.felix.configadmin.jar" /> <include name="org.apache.felix.metatype.jar" /> </fileset> @@ -408,7 +403,6 @@ <fileset condition="isEquinox" dir=&quot;(a){deploy.artifacts.dir}/lib&quot; targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer" override="true"> - <include name="jboss-osgi-deployment.jar" /> <include name="jboss-osgi-runtime-equinox.jar" /> <include name="jboss-osgi-runtime-jbossas.jar" /> <include name="org.apache.equinox.framework.jar" /> @@ -417,7 +411,6 @@ <singlefile condition="isEquinox" src=&quot;(a){deploy.artifacts.dir}/resources/jbossas/jboss-beans-equinox.xml&quot; target="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer/META-INF/jboss-osgi-jboss-beans.xml" override="true" /> <fileset condition="isEquinox" dir=&quot;(a){deploy.artifacts.dir}/lib&quot; targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/osgi" override="true"> - <include name="jboss-osgi-deployment.jar" /> <include name="org.apache.felix.configadmin.jar" /> <include name="org.apache.felix.metatype.jar" /> <include name="org.eclipse.osgi.services.jar" /> @@ -428,7 +421,6 @@ <fileset condition="isJBossMC" dir=&quot;(a){deploy.artifacts.dir}/lib&quot; targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer" override="true"> <include name="jboss-osgi-framework.jar" /> - <include name="jboss-osgi-deployment.jar" /> </fileset> <singlefile condition="isJBossMC" src=&quot;(a){deploy.artifacts.dir}/resources/jbossas/jboss-beans-jbossmc.xml&quot; target="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer/META-INF/jboss-osgi-jboss-beans.xml" override="true" /> Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-felix-all.properties =================================================================== --- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-felix-all.properties 2009-10-21 20:25:46 UTC (rev 95340) +++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-felix-all.properties 2009-10-21 20:37:52 UTC (rev 95341) @@ -30,6 +30,8 @@ org.apache.log4j;version=1.2, \ org.jboss.logging, \ org.jboss.net.protocol, \ + org.jboss.osgi.deployment.common;version=1.0, \ + org.jboss.osgi.deployment.deployer;version=1.0, \ org.jboss.osgi.spi;version=1.0, \ org.jboss.osgi.spi.capability;version=1.0, \ org.jboss.osgi.spi.framework;version=1.0, \ Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-felix-default.properties =================================================================== --- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-felix-default.properties 2009-10-21 20:25:46 UTC (rev 95340) +++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-felix-default.properties 2009-10-21 20:37:52 UTC (rev 95341) @@ -24,6 +24,8 @@ org.apache.log4j;version=1.2, \ org.jboss.logging, \ org.jboss.net.protocol, \ + org.jboss.osgi.deployment.common;version=1.0, \ + org.jboss.osgi.deployment.deployer;version=1.0, \ org.jboss.osgi.spi;version=1.0, \ org.jboss.osgi.spi.capability;version=1.0, \ org.jboss.osgi.spi.framework;version=1.0, \ Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-felix-minimal.properties =================================================================== --- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-felix-minimal.properties 2009-10-21 20:25:46 UTC (rev 95340) +++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-felix-minimal.properties 2009-10-21 20:37:52 UTC (rev 95341) @@ -10,6 +10,8 @@ org.osgi.framework.system.packages.extra=\ org.apache.log4j;version=1.2, \ org.jboss.logging, \ + org.jboss.osgi.deployment.common;version=1.0, \ + org.jboss.osgi.deployment.deployer;version=1.0, \ org.jboss.osgi.spi;version=1.0, \ org.jboss.osgi.spi.capability;version=1.0, \ org.jboss.osgi.spi.framework;version=1.0, \ Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-felix-web.properties =================================================================== --- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-felix-web.properties 2009-10-21 20:25:46 UTC (rev 95340) +++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-felix-web.properties 2009-10-21 20:37:52 UTC (rev 95341) @@ -30,6 +30,8 @@ org.apache.log4j;version=1.2, \ org.jboss.logging, \ org.jboss.net.protocol, \ + org.jboss.osgi.deployment.common;version=1.0, \ + org.jboss.osgi.deployment.deployer;version=1.0, \ org.jboss.osgi.spi;version=1.0, \ org.jboss.osgi.spi.capability;version=1.0, \ org.jboss.osgi.spi.framework;version=1.0, \ Modified: projects/jboss-osgi/trunk/distribution/pom.xml =================================================================== --- projects/jboss-osgi/trunk/distribution/pom.xml 2009-10-21 20:25:46 UTC (rev 95340) +++ projects/jboss-osgi/trunk/distribution/pom.xml 2009-10-21 20:37:52 UTC (rev 95341) @@ -140,22 +140,6 @@ <!-- jboss-osgi-common-core: no javadoc --> <dependency> <groupId>org.jboss.osgi.bundles</groupId> - <artifactId>jboss-osgi-deployment</artifactId> - </dependency> - <dependency> - <groupId>org.jboss.osgi.bundles</groupId> - <artifactId>jboss-osgi-deployment</artifactId> - <version>${version.jboss.osgi.deployment}</version> - <classifier>sources</classifier> - </dependency> - <dependency> - <groupId>org.jboss.osgi.bundles</groupId> - <artifactId>jboss-osgi-deployment</artifactId> - <version>${version.jboss.osgi.deployment}</version> - <classifier>javadoc</classifier> - </dependency> - <dependency> - <groupId>org.jboss.osgi.bundles</groupId> <artifactId>jboss-osgi-hotdeploy</artifactId> </dependency> <dependency> @@ -307,6 +291,22 @@ </dependency> <dependency> <groupId>org.jboss.osgi.runtime</groupId> + <artifactId>jboss-osgi-deployment</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.osgi.runtime</groupId> + <artifactId>jboss-osgi-deployment</artifactId> + <version>${version.jboss.osgi.deployment}</version> + <classifier>sources</classifier> + </dependency> + <dependency> + <groupId>org.jboss.osgi.runtime</groupId> + <artifactId>jboss-osgi-deployment</artifactId> + <version>${version.jboss.osgi.deployment}</version> + <classifier>javadoc</classifier> + </dependency> + <dependency> + <groupId>org.jboss.osgi.runtime</groupId> <artifactId>jboss-osgi-runtime-jbossas</artifactId> </dependency> <dependency> Modified: projects/jboss-osgi/trunk/pom.xml =================================================================== --- projects/jboss-osgi/trunk/pom.xml 2009-10-21 20:25:46 UTC (rev 95340) +++ projects/jboss-osgi/trunk/pom.xml 2009-10-21 20:37:52 UTC (rev 95341) @@ -54,7 +54,7 @@ <version.jboss.osgi.blueprint>1.0.0.Alpha3</version.jboss.osgi.blueprint> <version.jboss.osgi.common>1.0.3-SNAPSHOT</version.jboss.osgi.common> <version.jboss.osgi.common.core>2.2.13.GA</version.jboss.osgi.common.core> - <version.jboss.osgi.deployment>1.0.0-SNAPSHOT</version.jboss.osgi.deployment> + <version.jboss.osgi.deployment>0.0.1-SNAPSHOT</version.jboss.osgi.deployment> <version.jboss.osgi.framework>1.0.0.Alpha2</version.jboss.osgi.framework> <version.jboss.osgi.hotdeploy>1.0.3-SNAPSHOT</version.jboss.osgi.hotdeploy> <version.jboss.osgi.husky>1.0.1</version.jboss.osgi.husky> @@ -110,11 +110,6 @@ </dependency> <dependency> <groupId>org.jboss.osgi.bundles</groupId> - <artifactId>jboss-osgi-deployment</artifactId> - <version>${version.jboss.osgi.deployment}</version> - </dependency> - <dependency> - <groupId>org.jboss.osgi.bundles</groupId> <artifactId>jboss-osgi-common-core</artifactId> <version>${version.jboss.osgi.common.core}</version> </dependency> @@ -172,6 +167,11 @@ </dependency> <dependency> <groupId>org.jboss.osgi.runtime</groupId> + <artifactId>jboss-osgi-deployment</artifactId> + <version>${version.jboss.osgi.deployment}</version> + </dependency> + <dependency> + <groupId>org.jboss.osgi.runtime</groupId> <artifactId>jboss-osgi-runtime-jbossas</artifactId> <version>${version.jboss.osgi.runtime.jbossas}</version> </dependency> Modified: projects/jboss-osgi/trunk/reactor/blueprint/impl/pom.xml =================================================================== --- projects/jboss-osgi/trunk/reactor/blueprint/impl/pom.xml 2009-10-21 20:25:46 UTC (rev 95340) +++ projects/jboss-osgi/trunk/reactor/blueprint/impl/pom.xml 2009-10-21 20:37:52 UTC (rev 95341) @@ -33,6 +33,10 @@ <groupId>org.jboss.osgi.bundles</groupId> <artifactId>jboss-osgi-microcontainer</artifactId> </dependency> + <dependency> + <groupId>org.jboss.osgi.runtime</groupId> + <artifactId>jboss-osgi-deployment</artifactId> + </dependency> <!-- Provided Dependencies --> <dependency> Modified: projects/jboss-osgi/trunk/reactor/deployment/pom.xml =================================================================== --- projects/jboss-osgi/trunk/reactor/deployment/pom.xml 2009-10-21 20:25:46 UTC (rev 95340) +++ projects/jboss-osgi/trunk/reactor/deployment/pom.xml 2009-10-21 20:37:52 UTC (rev 95341) @@ -16,11 +16,11 @@ <name>JBossOSGi Deployment</name> - <groupId>org.jboss.osgi.bundles</groupId> + <groupId>org.jboss.osgi.runtime</groupId> <artifactId>jboss-osgi-deployment</artifactId> - <packaging>bundle</packaging> + <packaging>jar</packaging> - <version>1.0.0-SNAPSHOT</version> + <version>0.0.1-SNAPSHOT</version> <!-- Parent --> <parent> @@ -65,42 +65,10 @@ </dependency> </dependencies> + <!-- Build --> <build> <plugins> <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <extensions>true</extensions> - <configuration> - <instructions> - <Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName> - <Bundle-Activator>org.jboss.osgi.deployment.internal.DeploymentServicesActivator</Bundle-Activator> - <Export-Package> - org.jboss.osgi.deployment.common;version=${version}, - org.jboss.osgi.deployment.deployer;version=${version}, - org.jboss.osgi.deployment.interceptor;version=${version}, - org.jboss.osgi.deployment.scanner;version=${version}, - </Export-Package> - <Import-Package> - javax.management, - org.jboss.osgi.spi.capability;version=1.0, - org.jboss.osgi.spi.logging;version=1.0, - org.jboss.osgi.spi.management;version=1.0, - org.jboss.osgi.spi.util;version=1.0, - org.jboss.virtual, - org.osgi.framework, - org.osgi.service.packageadmin, - org.osgi.service.startlevel, - org.osgi.util.tracker, - org.slf4j - </Import-Package> - <Private-Package> - org.jboss.osgi.deployment.internal - </Private-Package> - </instructions> - </configuration> - </plugin> - <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>build-helper-maven-plugin</artifactId> <executions> Deleted: projects/jboss-osgi/trunk/reactor/deployment/src/main/java/org/jboss/osgi/deployment/deployer/DeployerServiceCapability.java =================================================================== --- projects/jboss-osgi/trunk/reactor/deployment/src/main/java/org/jboss/osgi/deployment/deployer/DeployerServiceCapability.java 2009-10-21 20:25:46 UTC (rev 95340) +++ projects/jboss-osgi/trunk/reactor/deployment/src/main/java/org/jboss/osgi/deployment/deployer/DeployerServiceCapability.java 2009-10-21 20:37:52 UTC (rev 95341) @@ -1,48 +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.deployment.deployer; - -//$Id$ - -import org.jboss.osgi.spi.capability.Capability; -import org.jboss.osgi.spi.testing.OSGiRuntime; - -/** - * Adds the DeploymentService capability to the {@link OSGiRuntime} - * under test. - * - * It is ignored if the {@link DeployerService} is already registered. - * - * Installed bundles: jboss-osgi-deployment.jar - * - * @author thomas.diesler(a)jboss.com - * @since 16-Oct-2009 - */ -public class DeployerServiceCapability extends Capability -{ - public DeployerServiceCapability() - { - super(DeployerService.class.getName()); - - addBundle("bundles/jboss-osgi-deployment.jar"); - } -} \ No newline at end of file Modified: projects/jboss-osgi/trunk/reactor/framework/pom.xml =================================================================== --- projects/jboss-osgi/trunk/reactor/framework/pom.xml 2009-10-21 20:25:46 UTC (rev 95340) +++ projects/jboss-osgi/trunk/reactor/framework/pom.xml 2009-10-21 20:37:52 UTC (rev 95341) @@ -135,12 +135,12 @@ <artifactId>jboss-osgi-spi</artifactId> </dependency> <dependency> - <groupId>org.jboss.osgi.bundles</groupId> - <artifactId>jboss-osgi-deployment</artifactId> + <groupId>org.jboss.osgi.runtime</groupId> + <artifactId>jboss-osgi-deployers</artifactId> </dependency> <dependency> <groupId>org.jboss.osgi.runtime</groupId> - <artifactId>jboss-osgi-deployers</artifactId> + <artifactId>jboss-osgi-deployment</artifactId> </dependency> <!-- Provided Dependencies --> Modified: projects/jboss-osgi/trunk/testsuite/example/scripts/assembly-bundles.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/example/scripts/assembly-bundles.xml 2009-10-21 20:25:46 UTC (rev 95340) +++ projects/jboss-osgi/trunk/testsuite/example/scripts/assembly-bundles.xml 2009-10-21 20:37:52 UTC (rev 95341) @@ -19,7 +19,6 @@ <include>*:jboss-osgi-blueprint:jar</include> <include>*:jboss-osgi-common:jar</include> <include>*:jboss-osgi-common-core:jar</include> - <include>*:jboss-osgi-deployment:jar</include> <include>*:jboss-osgi-husky:jar</include> <include>*:jboss-osgi-jaxb:jar</include> <include>*:jboss-osgi-jmx:jar</include> Modified: projects/jboss-osgi/trunk/testsuite/functional/scripts/assembly-bundles.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/scripts/assembly-bundles.xml 2009-10-21 20:25:46 UTC (rev 95340) +++ projects/jboss-osgi/trunk/testsuite/functional/scripts/assembly-bundles.xml 2009-10-21 20:37:52 UTC (rev 95341) @@ -19,7 +19,6 @@ <include>*:jboss-osgi-blueprint:jar</include> <include>*:jboss-osgi-common:jar</include> <include>*:jboss-osgi-common-core:jar</include> - <include>*:jboss-osgi-deployment:jar</include> <include>*:jboss-osgi-husky:jar</include> <include>*:jboss-osgi-jaxb:jar</include> <include>*:jboss-osgi-jmx:jar</include> Modified: projects/jboss-osgi/trunk/testsuite/pom.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/pom.xml 2009-10-21 20:25:46 UTC (rev 95340) +++ projects/jboss-osgi/trunk/testsuite/pom.xml 2009-10-21 20:37:52 UTC (rev 95341) @@ -51,6 +51,10 @@ <groupId>org.jboss.osgi</groupId> <artifactId>jboss-osgi-spi</artifactId> </dependency> + <dependency> + <groupId>org.jboss.osgi.runtime</groupId> + <artifactId>jboss-osgi-deployment</artifactId> + </dependency> <!-- Bundle Dependencies --> <dependency> @@ -115,11 +119,6 @@ </dependency> <dependency> <groupId>org.jboss.osgi.bundles</groupId> - <artifactId>jboss-osgi-deployment</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.osgi.bundles</groupId> <artifactId>jboss-osgi-husky</artifactId> <scope>provided</scope> </dependency>