[ARQ-1776] Create branch compatible with OSGi 4.2

basovnik · May 22, 2014 · 4a64be0 · 4a64be0
1 parent 3986a1e
commit 4a64be0
Show file tree

Hide file tree

Showing 38 changed files with 518 additions and 210 deletions.
diff --git a/bundle/src/main/java/org/jboss/arquillian/osgi/ArquillianBundleActivator.java b/bundle/src/main/java/org/jboss/arquillian/osgi/ArquillianBundleActivator.java
@@ -88,7 +88,7 @@ public Class<?> loadTestClass(String className) throws ClassNotFoundException {
 
                 // Load the the test class from bundle that defines a Bundle-ClassPath
                 for (Bundle aux : bundles) {
-                    String bundlecp = aux.getHeaders().get(Constants.BUNDLE_CLASSPATH);
+                    String bundlecp = (String) aux.getHeaders().get(Constants.BUNDLE_CLASSPATH);
                     if (bundlecp != null) {
                         try {
                             return aux.loadClass(className);

diff --git a/container/common/pom.xml b/container/common/pom.xml
@@ -41,6 +41,11 @@
             <artifactId>org.osgi.core</artifactId>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.enterprise</artifactId>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
 
 	<build>

diff --git a/...common/src/main/java/org/jboss/arquillian/container/osgi/EmbeddedDeployableContainer.java b/...common/src/main/java/org/jboss/arquillian/container/osgi/EmbeddedDeployableContainer.java
@@ -174,7 +174,7 @@ protected void awaitArquillianBundleActive(BundleContext syscontext, long timeou
         final CountDownLatch latch = new CountDownLatch(1);
         final AtomicReference<Bundle> bundleRef = new AtomicReference<Bundle>();
         int states = Bundle.INSTALLED | Bundle.RESOLVED | Bundle.STARTING | Bundle.ACTIVE;
-        BundleTracker<Bundle> tracker = new BundleTracker<Bundle>(syscontext, states, null) {
+        BundleTracker tracker = new BundleTracker(syscontext, states, null) {
             @Override
             public Bundle addingBundle(Bundle bundle, BundleEvent event) {
                 if ("arquillian-osgi-bundle".equals(bundle.getSymbolicName())) {
@@ -186,7 +186,7 @@ public Bundle addingBundle(Bundle bundle, BundleEvent event) {
             }
 
             @Override
-            public void modifiedBundle(Bundle bundle, BundleEvent event, Bundle tracked) {
+            public void modifiedBundle(Bundle bundle, BundleEvent event, Object tracked) {
                 if (event != null && event.getType() == BundleEvent.STARTED) {
                     latch.countDown();
                 }
@@ -213,7 +213,7 @@ public void modifiedBundle(Bundle bundle, BundleEvent event, Bundle tracked) {
     @SuppressWarnings({ "unchecked", "rawtypes" })
     protected void awaitBootstrapCompleteService(BundleContext syscontext, String serviceName, long timeout, TimeUnit unit) {
         final CountDownLatch latch = new CountDownLatch(1);
-        ServiceTracker<?, ?> tracker = new ServiceTracker(syscontext, serviceName, null) {
+        ServiceTracker tracker = new ServiceTracker(syscontext, serviceName, null) {
             @Override
             public Object addingService(ServiceReference sref) {
                 Object service = super.addingService(sref);
@@ -289,10 +289,11 @@ public void undeploy(Archive<?> archive) throws DeploymentException {
         try {
             String location = archive.getName();
             log.info("Uninstalling bundle: " + location);
-
-            Bundle bundle = syscontext.getBundle(location);
-            if (bundle != null && bundle.getState() != Bundle.UNINSTALLED) {
-                uninstallBundle(bundle);
+            for (Bundle aux : syscontext.getBundles()) {
+                if (aux.getLocation().equals(location) && aux.getState() != Bundle.UNINSTALLED) {
+                    aux.uninstall();
+                    break;
+                }
             }
         } catch (BundleException ex) {
             log.warn("Cannot undeploy: " + archive, ex);

diff --git a/container/equinox/embedded/pom.xml b/container/equinox/embedded/pom.xml
@@ -44,6 +44,10 @@
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.jboss.logging</groupId>
+            <artifactId>jboss-logging</artifactId>
+        </dependency>
 
         <!-- Provided Dependencies -->
         <dependency>
@@ -88,7 +92,7 @@
                     <systemPropertyVariables>
                         <java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
                         <test.archive.directory>${project.build.directory}/test-libs</test.archive.directory>
-                        <log4j.configuration>${basedir}/src/test/resources/logging.properties</log4j.configuration>
+                        <log4j.configuration>file://${basedir}/src/test/resources/logging.properties</log4j.configuration>
                     </systemPropertyVariables>
                 </configuration>
             </plugin>

diff --git a/...src/test/java/org/jboss/test/arquillian/container/equinox/ArquillianDeployerTestCase.java b/...src/test/java/org/jboss/test/arquillian/container/equinox/ArquillianDeployerTestCase.java
@@ -42,12 +42,12 @@
 @RunWith(Arquillian.class)
 public class ArquillianDeployerTestCase {
 
-    private static final String GOOD_BUNDLE = "good-bundle";
-    private static final String BAD_BUNDLE = "bad-bundle";
+    private static final String GOOD_BUNDLE = "good-bundle.jar";
+    private static final String BAD_BUNDLE = "bad-bundle.jar";
 
     @Deployment
     public static JavaArchive create() {
-        return ShrinkWrap.create(JavaArchive.class, "deployer-tests");
+        return ShrinkWrap.create(JavaArchive.class, "deployer-tests.jar");
     }
 
     @ArquillianResource
@@ -147,7 +147,7 @@ public InputStream openStream() {
                 OSGiManifestBuilder builder = OSGiManifestBuilder.newInstance();
                 builder.addBundleSymbolicName(BAD_BUNDLE);
                 builder.addBundleManifestVersion(2);
-                builder.addImportPackage("org.acme.foo");
+                builder.addImportPackages("org.acme.foo");
                 return builder.openStream();
             }
         });

diff --git a/...embedded/src/test/java/org/jboss/test/arquillian/container/equinox/AutostartTestCase.java b/...embedded/src/test/java/org/jboss/test/arquillian/container/equinox/AutostartTestCase.java
@@ -41,13 +41,15 @@
 @RunWith(Arquillian.class)
 public class AutostartTestCase {
 
+    private static final String BUNDLE = "autostart-bundle.jar";
+
     @ArquillianResource
     Bundle bundle;
 
     @Deployment
     @StartLevelAware(autostart = true)
     public static JavaArchive create() {
-        final JavaArchive archive = ShrinkWrap.create(JavaArchive.class, "autostart-bundle");
+        final JavaArchive archive = ShrinkWrap.create(JavaArchive.class, BUNDLE);
         archive.setManifest(new Asset() {
             @Override
             public InputStream openStream() {
@@ -64,7 +66,7 @@ public InputStream openStream() {
     public void testStartLevel() throws Exception {
 
         assertEquals("Bundle ACTIVE", Bundle.ACTIVE, bundle.getState());
-        assertEquals("autostart-bundle", bundle.getSymbolicName());
+        assertEquals(BUNDLE, bundle.getSymbolicName());
 
         bundle.uninstall();
         assertEquals("Bundle UNINSTALLED", Bundle.UNINSTALLED, bundle.getState());

diff --git a/...c/test/java/org/jboss/test/arquillian/container/equinox/DynamicImportPackageTestCase.java b/...c/test/java/org/jboss/test/arquillian/container/equinox/DynamicImportPackageTestCase.java
@@ -16,19 +16,6 @@
  */
 package org.jboss.test.arquillian.container.equinox;
 
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.InputStream;
-import java.net.URL;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map.Entry;
-import java.util.Properties;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-
-import org.eclipse.osgi.launch.Equinox;
 import org.jboss.osgi.metadata.OSGiManifestBuilder;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.jboss.shrinkwrap.api.asset.Asset;
@@ -40,13 +27,19 @@
 import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
+import org.eclipse.osgi.launch.Equinox;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.BundleException;
 import org.osgi.framework.BundleReference;
-import org.osgi.framework.FrameworkEvent;
-import org.osgi.framework.FrameworkListener;
-import org.osgi.framework.wiring.FrameworkWiring;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.InputStream;
+import java.net.URL;
+import java.util.HashMap;
+import java.util.Map.Entry;
+import java.util.Properties;
+import java.util.concurrent.TimeoutException;
 
 /**
  * The arquillian-osgi-bundle loads test cases dynamically from the test archive.
@@ -84,7 +77,7 @@ public void setUp() throws Exception {
         syscontext = framework.getBundleContext();
     }
 
-    @Test
+    @Test @Ignore
     public void testBundleContextInjection() throws Exception {
 
         // The loader bundle has Dynamic-ImportPackage: *
@@ -115,28 +108,28 @@ public void testBundleContextInjection() throws Exception {
     }
 
     private void refreshBundle(Bundle bundle) throws TimeoutException {
-
-        final CountDownLatch latch = new CountDownLatch(1);
-        FrameworkListener listener = new FrameworkListener() {
-            @Override
-            public void frameworkEvent(FrameworkEvent event) {
-                if (event.getType() == FrameworkEvent.PACKAGES_REFRESHED) {
-                    latch.countDown();
-                }
-            }
-        };
-
-        FrameworkWiring fwWiring = syscontext.getBundle().adapt(FrameworkWiring.class);
-        fwWiring.refreshBundles(Collections.singleton(bundle), listener);
-
-        // Wait for the refresh to complete
-        try {
-            if (!latch.await(10, TimeUnit.SECONDS)) {
-                throw new TimeoutException();
-            }
-        } catch (InterruptedException ex) {
-            // ignore
-        }
+        throw new UnsupportedOperationException("Bundle refreshing is not implemented");
+//      final CountDownLatch latch = new CountDownLatch(1);
+//      FrameworkListener listener = new FrameworkListener() {
+//          @Override
+//          public void frameworkEvent(FrameworkEvent event) {
+//              if (event.getType() == FrameworkEvent.PACKAGES_REFRESHED) {
+//                  latch.countDown();
+//              }
+//          }
+//      };
+//
+//      FrameworkWiring fwWiring = syscontext.getBundle().adapt(FrameworkWiring.class);
+//      fwWiring.refreshBundles(Collections.singleton(bundle), listener);
+//
+//      // Wait for the refresh to complete
+//      try {
+//          if (!latch.await(10, TimeUnit.SECONDS)) {
+//              throw new TimeoutException();
+//          }
+//      } catch (InterruptedException ex) {
+//          // ignore
+//      }
     }
 
     private Bundle installBundle(JavaArchive archive) throws BundleException {
@@ -154,7 +147,7 @@ public InputStream openStream() {
                 OSGiManifestBuilder builder = OSGiManifestBuilder.newInstance();
                 builder.addBundleSymbolicName(archive.getName());
                 builder.addBundleManifestVersion(2);
-                builder.addDynamicImportPackage("*");
+                builder.addDynamicImportPackages("*");
                 return builder.openStream();
             }
         });

diff --git a/...t/java/org/jboss/test/arquillian/container/equinox/MultipleBundleDeploymentsTestCase.java b/...t/java/org/jboss/test/arquillian/container/equinox/MultipleBundleDeploymentsTestCase.java
@@ -31,7 +31,7 @@
 import org.junit.runner.RunWith;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
-import org.osgi.framework.wiring.FrameworkWiring;
+import org.osgi.service.packageadmin.PackageAdmin;
 
 /**
  * Test multiple bundle deployments
@@ -42,23 +42,27 @@
 @RunWith(Arquillian.class)
 public class MultipleBundleDeploymentsTestCase {
 
-    static final String BUNDLE_A = "bundle-a";
-    static final String BUNDLE_B = "bundle-b";
+    static final String BUNDLE_A = "bundle-a.jar";
+    static final String BUNDLE_B = "bundle-b.jar";
 
     @ArquillianResource
     BundleContext context;
 
+    @ArquillianResource
+    PackageAdmin packageAdmin;
+
+
     @Deployment
     public static Archive<?> deployment() {
         // The default deployment is needed if we don't want to @RunAsClient
-        final JavaArchive archive = ShrinkWrap.create(JavaArchive.class, "multiple-tests");
+        final JavaArchive archive = ShrinkWrap.create(JavaArchive.class, "multiple-tests.jar");
         archive.setManifest(new Asset() {
             @Override
             public InputStream openStream() {
                 OSGiManifestBuilder builder = OSGiManifestBuilder.newInstance();
                 builder.addBundleSymbolicName(archive.getName());
                 builder.addBundleManifestVersion(2);
-                builder.addImportPackages(FrameworkWiring.class);
+                builder.addImportPackages(PackageAdmin.class);
                 return builder.openStream();
             }
         });
@@ -97,10 +101,10 @@ public InputStream openStream() {
 
     @Test
     public void testBundleDeployments() throws Exception {
-        Bundle bundleA = context.getBundle(BUNDLE_A);
+        Bundle bundleA = packageAdmin.getBundles(BUNDLE_A, null)[0];
         Assert.assertEquals("Bundle RESOLVED", Bundle.RESOLVED, bundleA.getState());
 
-        Bundle bundleB = context.getBundle(BUNDLE_B);
+        Bundle bundleB = packageAdmin.getBundles(BUNDLE_B, null)[0];
         Assert.assertEquals("Bundle RESOLVED", Bundle.RESOLVED, bundleB.getState());
     }
 }
diff --git a/...rc/test/java/org/jboss/test/arquillian/container/equinox/OperateOnDeploymentTestCase.java b/...rc/test/java/org/jboss/test/arquillian/container/equinox/OperateOnDeploymentTestCase.java
@@ -41,13 +41,13 @@
 @RunWith(Arquillian.class)
 public class OperateOnDeploymentTestCase {
 
-    static final String BUNDLE_A = "bundle-a";
-    static final String BUNDLE_B = "bundle-b";
+    static final String BUNDLE_A = "bundle-a.jar";
+    static final String BUNDLE_B = "bundle-b.jar";
 
     @Deployment
     public static Archive<?> deployment() {
         // The default deployment is needed if we don't want to @RunAsClient
-        final JavaArchive archive = ShrinkWrap.create(JavaArchive.class, "multiple-tests");
+        final JavaArchive archive = ShrinkWrap.create(JavaArchive.class, "multiple-tests.jar");
         archive.setManifest(new Asset() {
             @Override
             public InputStream openStream() {

diff --git a/...ed/src/test/java/org/jboss/test/arquillian/container/equinox/StartLevelAwareTestCase.java b/...ed/src/test/java/org/jboss/test/arquillian/container/equinox/StartLevelAwareTestCase.java
@@ -38,8 +38,7 @@
 import org.osgi.framework.BundleException;
 import org.osgi.framework.FrameworkEvent;
 import org.osgi.framework.FrameworkListener;
-import org.osgi.framework.startlevel.BundleStartLevel;
-import org.osgi.framework.startlevel.FrameworkStartLevel;
+import org.osgi.service.startlevel.StartLevel;
 
 /**
  * Test {@link StartLevelAware}
@@ -56,6 +55,9 @@ public class StartLevelAwareTestCase {
     @ArquillianResource
     BundleContext context;
 
+    @ArquillianResource
+    StartLevel startLevel;
+
     @Deployment
     @StartLevelAware(startLevel = 3)
     public static JavaArchive create() {
@@ -66,7 +68,7 @@ public InputStream openStream() {
                 OSGiManifestBuilder builder = OSGiManifestBuilder.newInstance();
                 builder.addBundleSymbolicName(archive.getName());
                 builder.addBundleManifestVersion(2);
-                builder.addImportPackages(FrameworkStartLevel.class);
+                builder.addImportPackages(StartLevel.class);
                 return builder.openStream();
             }
         });
@@ -76,15 +78,13 @@ public InputStream openStream() {
     @Test
     public void testStartLevel() throws Exception {
 
-        FrameworkStartLevel fwStartLevel = context.getBundle().adapt(FrameworkStartLevel.class);
-        int initialStartLevel = fwStartLevel.getInitialBundleStartLevel();
+        int initialStartLevel = startLevel.getInitialBundleStartLevel();
         assertEquals("Initial bundle start level", 1, initialStartLevel);
 
         assertEquals("Bundle RESOLVED", Bundle.RESOLVED, bundle.getState());
         assertEquals("start-level-bundle", bundle.getSymbolicName());
 
-        BundleStartLevel bStartLevel = bundle.adapt(BundleStartLevel.class);
-        int bundleStartLevel = bStartLevel.getStartLevel();
+        int bundleStartLevel = startLevel.getBundleStartLevel(bundle);
         assertEquals("Bundle start level", 3, bundleStartLevel);
 
         try {
@@ -108,7 +108,7 @@ public void frameworkEvent(FrameworkEvent event) {
                     latch.countDown();
             }
         });
-        fwStartLevel.setStartLevel(3);
+        startLevel.setStartLevel(3);
         latch.await(3, TimeUnit.SECONDS);
 
         // The bundle should now be started

diff --git a/container/felix/embedded/pom.xml b/container/felix/embedded/pom.xml
@@ -29,7 +29,7 @@
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.framework</artifactId>
             <version>${version.apache.felix.framework}</version><!--$NO-MVN-MAN-VER$-->
-            <classifier>source-release</classifier>
+            <classifier>bin</classifier>
             <type>zip</type>
         </dependency>
         <dependency>
@@ -55,6 +55,10 @@
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.jboss.logging</groupId>
+            <artifactId>jboss-logging</artifactId>
+        </dependency>
 
         <!-- Provided Dependencies -->
         <dependency>