[jboss-osgi-commits] JBoss-OSGI SVN: r95021 - in projects/jboss-osgi/projects/bundles: hotdeploy/trunk/src/main/java/org/jboss/osgi/hotdeploy/internal and 3 other directories.

Author: thomas.diesler(a)jboss.com Date: 2009-10-16 05:44:03 -0400 (Fri, 16 Oct 2009) New Revision: 95021 Modified: projects/jboss-osgi/projects/bundles/hotdeploy/trunk/pom.xml projects/jboss-osgi/projects/bundles/hotdeploy/trunk/src/main/java/org/jboss/osgi/hotdeploy/internal/DeploymentScannerActivator.java projects/jboss-osgi/projects/bundles/hotdeploy/trunk/src/main/java/org/jboss/osgi/hotdeploy/internal/DeploymentScannerImpl.java projects/jboss-osgi/projects/bundles/hotdeploy/trunk/src/main/java/org/jboss/osgi/hotdeploy/internal/ScannerThread.java projects/jboss-osgi/projects/bundles/microcontainer/trunk/pom.xml projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/integration/AbstractMicrocontainerService.java projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/internal/MicrocontainerServiceImpl.java Log: Extract deployment related API to jboss-osgi-deployment Modified: projects/jboss-osgi/projects/bundles/hotdeploy/trunk/pom.xml =================================================================== --- projects/jboss-osgi/projects/bundles/hotdeploy/trunk/pom.xml 2009-10-16 09:37:48 UTC (rev 95020) +++ projects/jboss-osgi/projects/bundles/hotdeploy/trunk/pom.xml 2009-10-16 09:44:03 UTC (rev 95021) @@ -40,6 +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.spi>1.0.3-SNAPSHOT</version.jboss.osgi.spi> <version.osgi>r4v42</version.osgi> </properties> @@ -59,6 +60,12 @@ <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> @@ -89,6 +96,7 @@ <Import-Package> javax.management, org.jboss.osgi.common.log;version=1.0, + org.jboss.osgi.deployment;version=1.0, org.jboss.osgi.spi.service;version=1.0, org.jboss.osgi.spi.util;version=1.0, org.osgi.framework, Modified: projects/jboss-osgi/projects/bundles/hotdeploy/trunk/src/main/java/org/jboss/osgi/hotdeploy/internal/DeploymentScannerActivator.java =================================================================== --- projects/jboss-osgi/projects/bundles/hotdeploy/trunk/src/main/java/org/jboss/osgi/hotdeploy/internal/DeploymentScannerActivator.java 2009-10-16 09:37:48 UTC (rev 95020) +++ projects/jboss-osgi/projects/bundles/hotdeploy/trunk/src/main/java/org/jboss/osgi/hotdeploy/internal/DeploymentScannerActivator.java 2009-10-16 09:44:03 UTC (rev 95021) @@ -23,7 +23,7 @@ //$Id$ -import org.jboss.osgi.spi.service.DeploymentScannerService; +import org.jboss.osgi.deployment.DeploymentScannerService; import org.osgi.framework.BundleActivator; import org.osgi.framework.BundleContext; Modified: projects/jboss-osgi/projects/bundles/hotdeploy/trunk/src/main/java/org/jboss/osgi/hotdeploy/internal/DeploymentScannerImpl.java =================================================================== --- projects/jboss-osgi/projects/bundles/hotdeploy/trunk/src/main/java/org/jboss/osgi/hotdeploy/internal/DeploymentScannerImpl.java 2009-10-16 09:37:48 UTC (rev 95020) +++ projects/jboss-osgi/projects/bundles/hotdeploy/trunk/src/main/java/org/jboss/osgi/hotdeploy/internal/DeploymentScannerImpl.java 2009-10-16 09:44:03 UTC (rev 95021) @@ -34,10 +34,10 @@ import java.util.List; import java.util.Map; -import org.jboss.osgi.spi.service.DeployerService; -import org.jboss.osgi.spi.service.DeploymentScannerService; -import org.jboss.osgi.spi.util.BundleDeployment; -import org.jboss.osgi.spi.util.BundleDeploymentFactory; +import org.jboss.osgi.deployment.BundleDeployment; +import org.jboss.osgi.deployment.BundleDeploymentFactory; +import org.jboss.osgi.deployment.DeployerService; +import org.jboss.osgi.deployment.DeploymentScannerService; import org.osgi.framework.Bundle; import org.osgi.framework.BundleContext; import org.osgi.framework.BundleException; Modified: projects/jboss-osgi/projects/bundles/hotdeploy/trunk/src/main/java/org/jboss/osgi/hotdeploy/internal/ScannerThread.java =================================================================== --- projects/jboss-osgi/projects/bundles/hotdeploy/trunk/src/main/java/org/jboss/osgi/hotdeploy/internal/ScannerThread.java 2009-10-16 09:37:48 UTC (rev 95020) +++ projects/jboss-osgi/projects/bundles/hotdeploy/trunk/src/main/java/org/jboss/osgi/hotdeploy/internal/ScannerThread.java 2009-10-16 09:44:03 UTC (rev 95021) @@ -24,7 +24,7 @@ //$Id$ import org.jboss.osgi.common.log.LogServiceTracker; -import org.jboss.osgi.spi.service.DeploymentScannerService; +import org.jboss.osgi.deployment.DeploymentScannerService; import org.osgi.framework.BundleContext; import org.osgi.service.log.LogService; Modified: projects/jboss-osgi/projects/bundles/microcontainer/trunk/pom.xml =================================================================== --- projects/jboss-osgi/projects/bundles/microcontainer/trunk/pom.xml 2009-10-16 09:37:48 UTC (rev 95020) +++ projects/jboss-osgi/projects/bundles/microcontainer/trunk/pom.xml 2009-10-16 09:44:03 UTC (rev 95021) @@ -35,6 +35,8 @@ <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.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>r4v42</version.osgi> </properties> @@ -42,7 +44,17 @@ <!-- Dependencies --> <dependencies> <dependency> + <groupId>org.jboss.osgi</groupId> + <artifactId>jboss-osgi-spi</artifactId> + <version>${version.jboss.osgi.spi}</version> + </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> @@ -114,11 +126,12 @@ org.jboss.deployers.*, org.jboss.joinpoint.*, org.jboss.logging, - org.jboss.osgi.common.log;version="1.0", - org.jboss.osgi.jbossxb;version="2.0", - org.jboss.osgi.spi;version="1.0", - org.jboss.osgi.spi.management;version="1.0", - org.jboss.osgi.spi.util;version="1.0", + org.jboss.osgi.common.log;version=1.0, + org.jboss.osgi.deployment;version=1.0, + org.jboss.osgi.jbossxb;version=2.0, + org.jboss.osgi.spi;version=1.0, + org.jboss.osgi.spi.management;version=1.0, + org.jboss.osgi.spi.util;version=1.0, org.jboss.reflect.*, org.jboss.util.*, org.jboss.virtual*, Modified: projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/integration/AbstractMicrocontainerService.java =================================================================== --- projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/integration/AbstractMicrocontainerService.java 2009-10-16 09:37:48 UTC (rev 95020) +++ projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/integration/AbstractMicrocontainerService.java 2009-10-16 09:44:03 UTC (rev 95021) @@ -48,13 +48,13 @@ import org.jboss.kernel.Kernel; import org.jboss.kernel.spi.dependency.KernelController; import org.jboss.kernel.spi.dependency.KernelControllerContext; +import org.jboss.osgi.deployment.BundleDeployment; +import org.jboss.osgi.deployment.BundleDeploymentFactory; +import org.jboss.osgi.deployment.DeployerService; +import org.jboss.osgi.deployment.DeploymentRegistryService; import org.jboss.osgi.spi.OSGiConstants; import org.jboss.osgi.spi.management.MicrocontainerServiceMBean; -import org.jboss.osgi.spi.service.DeployerService; -import org.jboss.osgi.spi.service.DeploymentRegistryService; import org.jboss.osgi.spi.service.MicrocontainerService; -import org.jboss.osgi.spi.util.BundleDeployment; -import org.jboss.osgi.spi.util.BundleDeploymentFactory; import org.jboss.virtual.VFS; import org.jboss.virtual.VirtualFile; import org.osgi.framework.BundleContext; Modified: projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/internal/MicrocontainerServiceImpl.java =================================================================== --- projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/internal/MicrocontainerServiceImpl.java 2009-10-16 09:37:48 UTC (rev 95020) +++ projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/internal/MicrocontainerServiceImpl.java 2009-10-16 09:44:03 UTC (rev 95021) @@ -35,10 +35,10 @@ import org.jboss.kernel.Kernel; import org.jboss.kernel.spi.dependency.KernelController; import org.jboss.osgi.common.log.LogServiceTracker; +import org.jboss.osgi.deployment.DeployerService; import org.jboss.osgi.jbossxb.XMLBindingService; import org.jboss.osgi.microcontainer.integration.AbstractMicrocontainerService; import org.jboss.osgi.spi.management.MicrocontainerServiceMBean; -import org.jboss.osgi.spi.service.DeployerService; import org.jboss.osgi.spi.service.MicrocontainerService; import org.jboss.virtual.VFS; import org.osgi.framework.BundleContext;