Remove dependency on legacy DeploymentService

jbosgi · Jul 13, 2010 · fcd2a9f · fcd2a9f
1 parent 1043e9d
commit fcd2a9f
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 168 deletions.
diff --git a/pom.xml b/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <groupId>org.jboss.osgi</groupId>
     <artifactId>jboss-osgi-parent</artifactId>
-    <version>1.0.6</version>
+    <version>1.0.7-SNAPSHOT</version>
   </parent>
 
   <!-- Subversion -->
@@ -38,8 +38,8 @@
 
   <properties>
     <version.felix.framework>3.0.1</version.felix.framework>
-    <version.jboss.osgi.deployment>1.0.2</version.jboss.osgi.deployment>
-    <version.jboss.osgi.spi>1.0.7</version.jboss.osgi.spi>
+    <version.jboss.osgi.deployment>1.0.3-SNAPSHOT</version.jboss.osgi.deployment>
+    <version.jboss.osgi.spi>1.0.9-SNAPSHOT</version.jboss.osgi.spi>
     <version.osgi>4.2.0</version.osgi>
   </properties>
 

diff --git a/src/main/java/org/jboss/osgi/felix/FelixBootstrapProvider.java b/src/main/java/org/jboss/osgi/felix/FelixBootstrapProvider.java
@@ -21,15 +21,11 @@
  */
 package org.jboss.osgi.felix;
 
-//$Id$
-
 import java.util.Map;
 
 import org.jboss.logging.Logger;
-import org.jboss.osgi.deployment.DeploymentServicesActivator;
 import org.jboss.osgi.spi.framework.PropertiesBootstrapProvider;
 import org.jboss.osgi.spi.util.ServiceLoader;
-import org.osgi.framework.BundleContext;
 import org.osgi.framework.launch.Framework;
 import org.osgi.framework.launch.FrameworkFactory;
 
@@ -44,8 +40,6 @@ public class FelixBootstrapProvider extends PropertiesBootstrapProvider
    // Provide logging
    private static final Logger log = Logger.getLogger(FelixBootstrapProvider.class);
 
-   private DeploymentServicesActivator deploymentActivator;
-
    @Override
    protected Framework createFramework(Map<String, Object> properties)
    {
@@ -66,18 +60,4 @@ protected Framework createFramework(Map<String, Object> properties)
       Framework framework = factory.newFramework(properties);
       return framework;
    }
-
-   @Override
-   protected void registerSystemServices(BundleContext context)
-   {
-      deploymentActivator = new DeploymentServicesActivator();
-      deploymentActivator.start(context);
-   }
-
-   @Override
-   protected void unregisterSystemServices(BundleContext context)
-   {
-      if (deploymentActivator != null)
-         deploymentActivator.stop(context);
-   }
 }
diff --git a/src/main/java/org/jboss/osgi/felix/FelixIntegration.java b/src/main/java/org/jboss/osgi/felix/FelixIntegration.java
diff --git a/src/test/java/org/jboss/test/osgi/felix/OSGiBootstrapTestCase.java b/src/test/java/org/jboss/test/osgi/felix/OSGiBootstrapTestCase.java
@@ -21,18 +21,16 @@
  */
 package org.jboss.test.osgi.felix;
 
-//$Id$
-
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
-import org.jboss.osgi.deployment.deployer.DeployerService;
 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;
+import org.osgi.service.packageadmin.PackageAdmin;
 
 /**
  * Test OSGi System bundle access
@@ -55,8 +53,8 @@ public void testFrameworkLaunch() throws Exception
       try
       {
          BundleContext context = framework.getBundleContext();
-         ServiceReference sref = context.getServiceReference(DeployerService.class.getName());
-         assertNotNull("DeployerService not null", sref);
+         ServiceReference sref = context.getServiceReference(PackageAdmin.class.getName());
+         assertNotNull("PackageAdmin not null", sref);
       }
       finally
       {