cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cschnei...@apache.org
Subject svn commit: r1517475 - in /cxf/dosgi/trunk: discovery/distributed/cxf-discovery/ discovery/distributed/zookeeper-server-config/ discovery/distributed/zookeeper-server/ discovery/local/ discovery/local/src/test/java/org/apache/cxf/dosgi/discovery/local/...
Date Mon, 26 Aug 2013 09:21:13 GMT
Author: cschneider
Date: Mon Aug 26 09:21:12 2013
New Revision: 1517475

URL: http://svn.apache.org/r1517475
Log:
DOSGI-204 Update OSGi spec and felix

Modified:
    cxf/dosgi/trunk/discovery/distributed/cxf-discovery/pom.xml
    cxf/dosgi/trunk/discovery/distributed/zookeeper-server-config/pom.xml
    cxf/dosgi/trunk/discovery/distributed/zookeeper-server/pom.xml
    cxf/dosgi/trunk/discovery/local/pom.xml
    cxf/dosgi/trunk/discovery/local/src/test/java/org/apache/cxf/dosgi/discovery/local/internal/LocalDiscoveryTest.java
    cxf/dosgi/trunk/distribution/features/src/main/resources/features.xml
    cxf/dosgi/trunk/distribution/multi-bundle/pom.xml
    cxf/dosgi/trunk/dsw/cxf-dsw/pom.xml
    cxf/dosgi/trunk/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/qos/IntentTrackerTest.java
    cxf/dosgi/trunk/dsw/cxf-topology-manager/pom.xml
    cxf/dosgi/trunk/dsw/cxf-topology-manager/src/main/java/org/apache/cxf/dosgi/topologymanager/util/SimpleServiceTracker.java
    cxf/dosgi/trunk/dsw/cxf-topology-manager/src/test/java/org/apache/cxf/dosgi/topologymanager/util/SimpleServiceTrackerTest.java
    cxf/dosgi/trunk/parent/pom.xml
    cxf/dosgi/trunk/samples/discovery/client/pom.xml
    cxf/dosgi/trunk/samples/discovery/impl/pom.xml
    cxf/dosgi/trunk/samples/discovery/pom.xml
    cxf/dosgi/trunk/samples/ds/client/pom.xml
    cxf/dosgi/trunk/samples/ds/pom.xml
    cxf/dosgi/trunk/samples/greeter/client/pom.xml
    cxf/dosgi/trunk/samples/greeter/impl/pom.xml
    cxf/dosgi/trunk/samples/greeter/pom.xml
    cxf/dosgi/trunk/samples/greeter_rest/client/pom.xml
    cxf/dosgi/trunk/samples/greeter_rest/impl/pom.xml
    cxf/dosgi/trunk/samples/greeter_rest/impl2/pom.xml
    cxf/dosgi/trunk/samples/greeter_rest/pom.xml
    cxf/dosgi/trunk/samples/security_filter/pom.xml
    cxf/dosgi/trunk/samples/spring_dm/pom.xml
    cxf/dosgi/trunk/systests2/common/pom.xml
    cxf/dosgi/trunk/systests2/multi-bundle/pom.xml
    cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/AbstractDosgiTest.java
    cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/TestDiscoveryExport.java
    cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/TestImportService.java

Modified: cxf/dosgi/trunk/discovery/distributed/cxf-discovery/pom.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/discovery/distributed/cxf-discovery/pom.xml?rev=1517475&r1=1517474&r2=1517475&view=diff
==============================================================================
--- cxf/dosgi/trunk/discovery/distributed/cxf-discovery/pom.xml (original)
+++ cxf/dosgi/trunk/discovery/distributed/cxf-discovery/pom.xml Mon Aug 26 09:21:12 2013
@@ -42,7 +42,7 @@
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.enterprise</artifactId>
+            <artifactId>org.osgi.compendium</artifactId>
         </dependency>
 
         <dependency>

Modified: cxf/dosgi/trunk/discovery/distributed/zookeeper-server-config/pom.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/discovery/distributed/zookeeper-server-config/pom.xml?rev=1517475&r1=1517474&r2=1517475&view=diff
==============================================================================
--- cxf/dosgi/trunk/discovery/distributed/zookeeper-server-config/pom.xml (original)
+++ cxf/dosgi/trunk/discovery/distributed/zookeeper-server-config/pom.xml Mon Aug 26 09:21:12 2013
@@ -41,20 +41,13 @@
     <dependencies>
         <dependency>
             <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.enterprise</artifactId>
+            <artifactId>org.osgi.core</artifactId>
         </dependency>
-
         <dependency>
-            <groupId>org.apache.felix</groupId>
-            <artifactId>org.apache.felix.framework</artifactId>
-            <version>${felix.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.apache.felix</groupId>
-                    <artifactId>org.osgi.foundation</artifactId>
-                </exclusion>
-            </exclusions>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.compendium</artifactId>
         </dependency>
+
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>

Modified: cxf/dosgi/trunk/discovery/distributed/zookeeper-server/pom.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/discovery/distributed/zookeeper-server/pom.xml?rev=1517475&r1=1517474&r2=1517475&view=diff
==============================================================================
--- cxf/dosgi/trunk/discovery/distributed/zookeeper-server/pom.xml (original)
+++ cxf/dosgi/trunk/discovery/distributed/zookeeper-server/pom.xml Mon Aug 26 09:21:12 2013
@@ -42,7 +42,7 @@
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.enterprise</artifactId>
+            <artifactId>org.osgi.compendium</artifactId>
         </dependency>
 
         <dependency>

Modified: cxf/dosgi/trunk/discovery/local/pom.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/discovery/local/pom.xml?rev=1517475&r1=1517474&r2=1517475&view=diff
==============================================================================
--- cxf/dosgi/trunk/discovery/local/pom.xml (original)
+++ cxf/dosgi/trunk/discovery/local/pom.xml Mon Aug 26 09:21:12 2013
@@ -37,20 +37,12 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.apache.felix</groupId>
-            <artifactId>org.apache.felix.framework</artifactId>
-            <version>${felix.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.apache.felix</groupId>
-                    <artifactId>org.osgi.foundation</artifactId>
-                </exclusion>
-            </exclusions>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.core</artifactId>
         </dependency>
-
         <dependency>
             <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.enterprise</artifactId>
+            <artifactId>org.osgi.compendium</artifactId>
         </dependency>
 
         <dependency>

Modified: cxf/dosgi/trunk/discovery/local/src/test/java/org/apache/cxf/dosgi/discovery/local/internal/LocalDiscoveryTest.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/discovery/local/src/test/java/org/apache/cxf/dosgi/discovery/local/internal/LocalDiscoveryTest.java?rev=1517475&r1=1517474&r2=1517475&view=diff
==============================================================================
--- cxf/dosgi/trunk/discovery/local/src/test/java/org/apache/cxf/dosgi/discovery/local/internal/LocalDiscoveryTest.java (original)
+++ cxf/dosgi/trunk/discovery/local/src/test/java/org/apache/cxf/dosgi/discovery/local/internal/LocalDiscoveryTest.java Mon Aug 26 09:21:12 2013
@@ -108,7 +108,7 @@ public class LocalDiscoveryTest extends 
         EasyMock.replay(b1);
         Bundle b2 = EasyMock.createMock(Bundle.class);
         EasyMock.expect(b2.getState()).andReturn(Bundle.ACTIVE);
-        Dictionary<String, Object> headers = new Hashtable<String, Object>();
+        Dictionary<String, String> headers = new Hashtable<String, String>();
         headers.put("Remote-Service", "OSGI-INF/remote-service/");
         EasyMock.expect(b2.getHeaders()).andReturn(headers);
 
@@ -141,7 +141,7 @@ public class LocalDiscoveryTest extends 
         Bundle bundle = EasyMock.createMock(Bundle.class);
         EasyMock.expect(bundle.getSymbolicName()).andReturn("testing.bundle").anyTimes();
         EasyMock.expect(bundle.getState()).andReturn(Bundle.ACTIVE);
-        Dictionary<String, Object> headers = new Hashtable<String, Object>();
+        Dictionary<String, String> headers = new Hashtable<String, String>();
         headers.put("Remote-Service", "OSGI-INF/rsa/");
         EasyMock.expect(bundle.getHeaders()).andReturn(headers);
         EasyMock.expect(bundle.findEntries("OSGI-INF/rsa", "*.xml", false))
@@ -199,7 +199,7 @@ public class LocalDiscoveryTest extends 
 
         Bundle bundle = EasyMock.createMock(Bundle.class);
         EasyMock.expect(bundle.getState()).andReturn(Bundle.ACTIVE);
-        Dictionary<String, Object> headers = new Hashtable<String, Object>();
+        Dictionary<String, String> headers = new Hashtable<String, String>();
         headers.put("Remote-Service", "OSGI-INF/rsa/ed4.xml");
         EasyMock.expect(bundle.getHeaders()).andReturn(headers);
         EasyMock.expect(bundle.findEntries("OSGI-INF/rsa", "ed4.xml", false))

Modified: cxf/dosgi/trunk/distribution/features/src/main/resources/features.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/distribution/features/src/main/resources/features.xml?rev=1517475&r1=1517474&r2=1517475&view=diff
==============================================================================
--- cxf/dosgi/trunk/distribution/features/src/main/resources/features.xml (original)
+++ cxf/dosgi/trunk/distribution/features/src/main/resources/features.xml Mon Aug 26 09:21:12 2013
@@ -4,13 +4,12 @@
     <repository>mvn:org.apache.karaf.assemblies.features/standard/2.3.1/xml/features</repository>
 
 	<feature name="cxf-dosgi-base" description="base libs needed outside karaf" version="${project.version}" resolver="(obr)">
-		<bundle start-level="8">mvn:org.osgi/org.osgi.compendium/4.2.0</bundle>
+		<bundle start-level="8">mvn:org.osgi/org.osgi.compendium/${osgi.compendium.version}</bundle>
         <bundle start-level="8">mvn:org.ops4j.base/ops4j-base-lang/1.4.0</bundle>
         <bundle start-level="8">mvn:org.ops4j.pax.logging/pax-logging-api/1.7.0</bundle>
         <bundle start-level="8">mvn:org.ops4j.pax.logging/pax-logging-service/1.7.0</bundle>
         <bundle start-level="10">mvn:org.apache.felix/org.apache.felix.configadmin/1.6.0</bundle>
         <bundle start-level="11">mvn:org.apache.felix/org.apache.felix.fileinstall/3.2.6</bundle>
-        <bundle start-level="20">mvn:org.ow2.asm/asm-all/4.1</bundle>
         <bundle start-level="20">mvn:org.apache.aries/org.apache.aries.util/1.1.0</bundle>
         <bundle start-level="20">mvn:org.apache.aries.proxy/org.apache.aries.proxy.api/1.0.0</bundle>
         <bundle start-level="20">mvn:org.apache.aries.proxy/org.apache.aries.proxy.impl/1.0.1</bundle>
@@ -25,7 +24,6 @@
         <feature>cxf-jaxrs</feature>
         <feature>cxf-databinding-aegis</feature>
         <feature>cxf-http-jetty</feature>
-        <bundle>mvn:org.osgi/org.osgi.enterprise/${osgi.enterprise.version}</bundle>
         <bundle>mvn:${project.groupId}/cxf-dosgi-ri-topology-manager/${project.version}</bundle>
         <bundle>mvn:${project.groupId}/cxf-dosgi-ri-dsw-cxf/${project.version}</bundle>
     </feature>

Modified: cxf/dosgi/trunk/distribution/multi-bundle/pom.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/distribution/multi-bundle/pom.xml?rev=1517475&r1=1517474&r2=1517475&view=diff
==============================================================================
--- cxf/dosgi/trunk/distribution/multi-bundle/pom.xml (original)
+++ cxf/dosgi/trunk/distribution/multi-bundle/pom.xml Mon Aug 26 09:21:12 2013
@@ -365,10 +365,6 @@
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.enterprise</artifactId>
-        </dependency>
-        <dependency>
             <groupId>org.apache.cxf.dosgi</groupId>
             <artifactId>cxf-dosgi-ri-discovery-distributed-zookeeper-server</artifactId>
             <version>${project.version}</version>

Modified: cxf/dosgi/trunk/dsw/cxf-dsw/pom.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/dsw/cxf-dsw/pom.xml?rev=1517475&r1=1517474&r2=1517475&view=diff
==============================================================================
--- cxf/dosgi/trunk/dsw/cxf-dsw/pom.xml (original)
+++ cxf/dosgi/trunk/dsw/cxf-dsw/pom.xml Mon Aug 26 09:21:12 2013
@@ -46,7 +46,7 @@
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.enterprise</artifactId>
+            <artifactId>org.osgi.compendium</artifactId>
         </dependency>
 
         <dependency>

Modified: cxf/dosgi/trunk/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/qos/IntentTrackerTest.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/qos/IntentTrackerTest.java?rev=1517475&r1=1517474&r2=1517475&view=diff
==============================================================================
--- cxf/dosgi/trunk/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/qos/IntentTrackerTest.java (original)
+++ cxf/dosgi/trunk/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/qos/IntentTrackerTest.java Mon Aug 26 09:21:12 2013
@@ -45,7 +45,6 @@ public class IntentTrackerTest {
         BundleContext bc = c.createMock(BundleContext.class);
         Filter filter = c.createMock(Filter.class);
         expect(bc.createFilter(EasyMock.<String>anyObject())).andReturn(filter);
-        expect(bc.getProperty(org.osgi.framework.Constants.FRAMEWORK_VERSION)).andReturn("1.6.0");
         final Capture<ServiceListener> capturedListener = new Capture<ServiceListener>();
         bc.addServiceListener(EasyMock.capture(capturedListener), EasyMock.<String>anyObject());
         EasyMock.expectLastCall().atLeastOnce();
@@ -54,7 +53,8 @@ public class IntentTrackerTest {
         IntentMap intentMap = new IntentMap();
 
         // Create a custom intent
-        ServiceReference reference = c.createMock(ServiceReference.class);
+        @SuppressWarnings("unchecked")
+        ServiceReference<AbstractFeature> reference = c.createMock(ServiceReference.class);
         expect(reference.getProperty(Constants.INTENT_NAME_PROP)).andReturn(MY_INTENT_NAME);
         AbstractFeature testIntent = new AbstractFeature() {
         };

Modified: cxf/dosgi/trunk/dsw/cxf-topology-manager/pom.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/dsw/cxf-topology-manager/pom.xml?rev=1517475&r1=1517474&r2=1517475&view=diff
==============================================================================
--- cxf/dosgi/trunk/dsw/cxf-topology-manager/pom.xml (original)
+++ cxf/dosgi/trunk/dsw/cxf-topology-manager/pom.xml Mon Aug 26 09:21:12 2013
@@ -37,24 +37,19 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.apache.felix</groupId>
-            <artifactId>org.apache.felix.framework</artifactId>
-            <version>${felix.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.apache.felix</groupId>
-                    <artifactId>org.osgi.foundation</artifactId>
-                </exclusion>
-            </exclusions>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.core</artifactId>
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.enterprise</artifactId>
+            <artifactId>org.osgi.compendium</artifactId>
         </dependency>
+
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
         </dependency>
+
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>

Modified: cxf/dosgi/trunk/dsw/cxf-topology-manager/src/main/java/org/apache/cxf/dosgi/topologymanager/util/SimpleServiceTracker.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/dsw/cxf-topology-manager/src/main/java/org/apache/cxf/dosgi/topologymanager/util/SimpleServiceTracker.java?rev=1517475&r1=1517474&r2=1517475&view=diff
==============================================================================
--- cxf/dosgi/trunk/dsw/cxf-topology-manager/src/main/java/org/apache/cxf/dosgi/topologymanager/util/SimpleServiceTracker.java (original)
+++ cxf/dosgi/trunk/dsw/cxf-topology-manager/src/main/java/org/apache/cxf/dosgi/topologymanager/util/SimpleServiceTracker.java Mon Aug 26 09:21:12 2013
@@ -47,10 +47,10 @@ import org.osgi.util.tracker.ServiceTrac
  *
  * @param <T> the service interface type
  */
-public class SimpleServiceTracker<T> extends ServiceTracker {
+public class SimpleServiceTracker<T> extends ServiceTracker<T, T> {
 
     // we must use a map with references as keys, so as not to invoke equals remotely on service objects
-    private ConcurrentMap<ServiceReference, T> services;
+    private ConcurrentMap<ServiceReference<T>, T> services;
     private List<SimpleServiceTrackerListener<T>> listeners;
 
     /**
@@ -65,7 +65,7 @@ public class SimpleServiceTracker<T> ext
     public SimpleServiceTracker(BundleContext context, Class<T> clazz) {
         super(context, clazz.getName(), null);
         this.listeners = new CopyOnWriteArrayList<SimpleServiceTrackerListener<T>>();
-        this.services = new ConcurrentHashMap<ServiceReference, T>();
+        this.services = new ConcurrentHashMap<ServiceReference<T>, T>();
     }
 
     /**
@@ -78,8 +78,7 @@ public class SimpleServiceTracker<T> ext
     }
 
     @Override
-    public Object addingService(ServiceReference reference) {
-        @SuppressWarnings("unchecked")
+    public T addingService(ServiceReference<T> reference) {
         T service = (T) super.addingService(reference);
         services.put(reference, service);
         for (SimpleServiceTrackerListener<T> listener : listeners) {
@@ -89,9 +88,7 @@ public class SimpleServiceTracker<T> ext
     }
 
     @Override
-    public void removedService(ServiceReference reference, Object serviceObject) {
-        @SuppressWarnings("unchecked")
-        T service = (T) serviceObject;
+    public void removedService(ServiceReference<T> reference, T service) {
         services.remove(reference, service);
         for (SimpleServiceTrackerListener<T> listener : listeners) {
             listener.removed(service);

Modified: cxf/dosgi/trunk/dsw/cxf-topology-manager/src/test/java/org/apache/cxf/dosgi/topologymanager/util/SimpleServiceTrackerTest.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/dsw/cxf-topology-manager/src/test/java/org/apache/cxf/dosgi/topologymanager/util/SimpleServiceTrackerTest.java?rev=1517475&r1=1517474&r2=1517475&view=diff
==============================================================================
--- cxf/dosgi/trunk/dsw/cxf-topology-manager/src/test/java/org/apache/cxf/dosgi/topologymanager/util/SimpleServiceTrackerTest.java (original)
+++ cxf/dosgi/trunk/dsw/cxf-topology-manager/src/test/java/org/apache/cxf/dosgi/topologymanager/util/SimpleServiceTrackerTest.java Mon Aug 26 09:21:12 2013
@@ -49,8 +49,9 @@ import static org.junit.Assert.assertFal
 
 public class SimpleServiceTrackerTest {
 
-    private ServiceReference createUserServiceBundle(IMocksControl c, BundleContext context) {
-        final ServiceReference sref = c.createMock(ServiceReference.class);
+    private ServiceReference<RemoteServiceAdmin> createUserServiceBundle(IMocksControl c, BundleContext context) {
+        @SuppressWarnings("unchecked")
+        final ServiceReference<RemoteServiceAdmin> sref = c.createMock(ServiceReference.class);
         Bundle srefBundle = c.createMock(Bundle.class);
         expect(srefBundle.getBundleContext()).andReturn(context).anyTimes();
         expect(sref.getBundle()).andReturn(srefBundle).anyTimes();
@@ -79,17 +80,17 @@ public class SimpleServiceTrackerTest {
                 .andReturn(filter).atLeastOnce();
         // support context.getServiceReferences based on our list
         final List<RemoteServiceAdmin> services = new ArrayList<RemoteServiceAdmin>();
-        final List<ServiceReference> srefs = new ArrayList<ServiceReference>();
+        final List<ServiceReference<RemoteServiceAdmin>> srefs = new ArrayList<ServiceReference<RemoteServiceAdmin>>();
         expect(context.getServiceReferences((String)anyObject(), eq((String)null))).andAnswer(
-                new IAnswer<ServiceReference[]>() {
+                new IAnswer<ServiceReference<?>[]>() {
                 @Override
-                public ServiceReference[] answer() {
+                public ServiceReference<?>[] answer() {
                     return srefs.toArray(new ServiceReference[srefs.size()]);
                 }
             });
         // create services
-        ServiceReference sref1 = createUserServiceBundle(c, context);
-        ServiceReference sref2 = createUserServiceBundle(c, context);
+        ServiceReference<RemoteServiceAdmin> sref1 = createUserServiceBundle(c, context);
+        ServiceReference<RemoteServiceAdmin> sref2 = createUserServiceBundle(c, context);
         RemoteServiceAdmin service1 = c.createMock(RemoteServiceAdmin.class);
         RemoteServiceAdmin service2 = c.createMock(RemoteServiceAdmin.class);
         expect(context.getService(sref1)).andReturn(service1).atLeastOnce();
@@ -107,12 +108,16 @@ public class SimpleServiceTrackerTest {
         // add our listener
         SimpleServiceTrackerListener<RemoteServiceAdmin> listener =
                 new SimpleServiceTrackerListener<RemoteServiceAdmin>() {
+                @SuppressWarnings({
+                    "unchecked", "rawtypes"
+                })
                 @Override
-                @SuppressWarnings("unchecked")
                 public void added(RemoteServiceAdmin service) {
                     // prove that original ServiceTracker fails here
-                    Object[] trackerServices = tracker.getServices() != null ? tracker.getServices() : new Object[0];
-                    assertFalse(new HashSet(services).equals(new HashSet(Arrays.asList(trackerServices))));
+                    Object[] trackerServices = (Object[])
+                        (tracker.getServices() != null ? tracker.getServices() : new Object[0]);
+                    assertFalse(new HashSet(services)
+                                .equals(new HashSet(Arrays.asList(trackerServices))));
                     // but we succeed
                     assertEqualsUnordered(services, tracker.getAllServices());
                 }

Modified: cxf/dosgi/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/parent/pom.xml?rev=1517475&r1=1517474&r2=1517475&view=diff
==============================================================================
--- cxf/dosgi/trunk/parent/pom.xml (original)
+++ cxf/dosgi/trunk/parent/pom.xml Mon Aug 26 09:21:12 2013
@@ -46,11 +46,11 @@
         <!-- portable text resource processing -->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
-        <osgi.version>4.2.0</osgi.version>
-        <osgi.enterprise.version>4.2.0</osgi.enterprise.version>
+        <osgi.version>4.3.1</osgi.version>
+        <osgi.compendium.version>4.3.1</osgi.compendium.version>
         <cxf.version>2.7.6</cxf.version>
         <cxf.build-utils.version>2.5.0</cxf.build-utils.version>
-        <felix.version>3.2.2</felix.version>
+        <felix.version>4.2.1</felix.version>
         <spring.version>3.0.6.RELEASE</spring.version>
         <spring.osgi.version>1.2.1</spring.osgi.version>
         <zookeeper.version>3.3.2</zookeeper.version>
@@ -88,8 +88,8 @@
             </dependency>
             <dependency>
                 <groupId>org.osgi</groupId>
-                <artifactId>org.osgi.enterprise</artifactId>
-                <version>${osgi.enterprise.version}</version>
+                <artifactId>org.osgi.compendium</artifactId>
+                <version>${osgi.compendium.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.slf4j</groupId>

Modified: cxf/dosgi/trunk/samples/discovery/client/pom.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/samples/discovery/client/pom.xml?rev=1517475&r1=1517474&r2=1517475&view=diff
==============================================================================
--- cxf/dosgi/trunk/samples/discovery/client/pom.xml (original)
+++ cxf/dosgi/trunk/samples/discovery/client/pom.xml Mon Aug 26 09:21:12 2013
@@ -1,75 +1,67 @@
 <?xml version='1.0' encoding='UTF-8' ?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements. See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership. The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License. You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied. See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
-<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>
-  <groupId>org.apache.cxf.dosgi.samples</groupId>
-  <artifactId>cxf-dosgi-ri-samples-discovery-client</artifactId>
-  <packaging>bundle</packaging>
-  <name>Distributed OSGI Discovery Sample Client Bundle</name>
-  <version>1.6-SNAPSHOT</version>
-
-  <parent>
+<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor 
+    license agreements. See the NOTICE file distributed with this work for additional 
+    information regarding copyright ownership. The ASF licenses this file to 
+    you under the Apache License, Version 2.0 (the "License"); you may not use 
+    this file except in compliance with the License. You may obtain a copy of 
+    the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required 
+    by applicable law or agreed to in writing, software distributed under the 
+    License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 
+    OF ANY KIND, either express or implied. See the License for the specific 
+    language governing permissions and limitations under the License. -->
+<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>
     <groupId>org.apache.cxf.dosgi.samples</groupId>
-    <artifactId>cxf-dosgi-ri-bundles-discovery-parent</artifactId>
+    <artifactId>cxf-dosgi-ri-samples-discovery-client</artifactId>
+    <packaging>bundle</packaging>
+    <name>Distributed OSGI Discovery Sample Client Bundle</name>
     <version>1.6-SNAPSHOT</version>
-  </parent>
 
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.felix</groupId>
-      <artifactId>org.apache.felix.framework</artifactId>
-      <version>${felix.version}</version>
-      <exclusions>
-        <exclusion>
-          <groupId>org.apache.felix</groupId>
-          <artifactId>org.osgi.foundation</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.cxf.dosgi.samples</groupId>
-      <artifactId>cxf-dosgi-ri-samples-discovery-interface</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-  </dependencies>
+    <parent>
+        <groupId>org.apache.cxf.dosgi.samples</groupId>
+        <artifactId>cxf-dosgi-ri-bundles-discovery-parent</artifactId>
+        <version>1.6-SNAPSHOT</version>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.compendium</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.cxf.dosgi.samples</groupId>
+            <artifactId>cxf-dosgi-ri-samples-discovery-interface</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+    </dependencies>
 
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <configuration>
-          <instructions>
-            <Bundle-Name>${project.name}</Bundle-Name>
-            <Bundle-Description>The client-side implementation of the Distributed OSGi Discovery sample</Bundle-Description>
-            <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-            <Bundle-Activator>org.apache.cxf.dosgi.samples.discovery.consumer.Activator</Bundle-Activator>
-            <Import-Package>
-              org.apache.cxf.dosgi.samples.discovery,
-              org.osgi.framework,
-              org.osgi.util.tracker
-            </Import-Package>
-            <Private-Package>org.apache.cxf.dosgi.samples.discovery.consumer</Private-Package>
-          </instructions>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Bundle-Name>${project.name}</Bundle-Name>
+                        <Bundle-Description>The client-side
+                            implementation of the Distributed OSGi
+                            Discovery sample</Bundle-Description>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+                        <Bundle-Activator>org.apache.cxf.dosgi.samples.discovery.consumer.Activator</Bundle-Activator>
+                        <Import-Package>
+                            org.apache.cxf.dosgi.samples.discovery,
+                            org.osgi.framework,
+                            org.osgi.util.tracker
+                        </Import-Package>
+                        <Private-Package>org.apache.cxf.dosgi.samples.discovery.consumer</Private-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>

Modified: cxf/dosgi/trunk/samples/discovery/impl/pom.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/samples/discovery/impl/pom.xml?rev=1517475&r1=1517474&r2=1517475&view=diff
==============================================================================
--- cxf/dosgi/trunk/samples/discovery/impl/pom.xml (original)
+++ cxf/dosgi/trunk/samples/discovery/impl/pom.xml Mon Aug 26 09:21:12 2013
@@ -1,74 +1,62 @@
 <?xml version='1.0' encoding='UTF-8' ?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements. See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership. The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License. You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied. See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
-<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>
-  <groupId>org.apache.cxf.dosgi.samples</groupId>
-  <artifactId>cxf-dosgi-ri-samples-discovery-impl</artifactId>
-  <packaging>bundle</packaging>
-  <name>Distributed OSGI Discovery Sample Implementation Bundle</name>
-  <version>1.6-SNAPSHOT</version>
-
-  <parent>
+<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor 
+    license agreements. See the NOTICE file distributed with this work for additional 
+    information regarding copyright ownership. The ASF licenses this file to 
+    you under the Apache License, Version 2.0 (the "License"); you may not use 
+    this file except in compliance with the License. You may obtain a copy of 
+    the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required 
+    by applicable law or agreed to in writing, software distributed under the 
+    License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 
+    OF ANY KIND, either express or implied. See the License for the specific 
+    language governing permissions and limitations under the License. -->
+<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>
     <groupId>org.apache.cxf.dosgi.samples</groupId>
-    <artifactId>cxf-dosgi-ri-bundles-discovery-parent</artifactId>
+    <artifactId>cxf-dosgi-ri-samples-discovery-impl</artifactId>
+    <packaging>bundle</packaging>
+    <name>Distributed OSGI Discovery Sample Implementation Bundle</name>
     <version>1.6-SNAPSHOT</version>
-  </parent>
 
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.felix</groupId>
-      <artifactId>org.apache.felix.framework</artifactId>
-      <version>${felix.version}</version>
-      <exclusions>
-        <exclusion>
-          <groupId>org.apache.felix</groupId>
-          <artifactId>org.osgi.foundation</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.cxf.dosgi.samples</groupId>
-      <artifactId>cxf-dosgi-ri-samples-discovery-interface</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-  </dependencies>
+    <parent>
+        <groupId>org.apache.cxf.dosgi.samples</groupId>
+        <artifactId>cxf-dosgi-ri-bundles-discovery-parent</artifactId>
+        <version>1.6-SNAPSHOT</version>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.cxf.dosgi.samples</groupId>
+            <artifactId>cxf-dosgi-ri-samples-discovery-interface</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+    </dependencies>
 
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <configuration>
-          <instructions>
-            <Bundle-Name>${project.name}</Bundle-Name>
-            <Bundle-Description>The server-side implementation of the Distributed OSGi Discovery sample</Bundle-Description>
-            <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-            <Bundle-Activator>org.apache.cxf.dosgi.samples.discovery.impl.Activator</Bundle-Activator>
-            <Import-Package>
-              org.apache.cxf.dosgi.samples.discovery,
-              org.osgi.framework
-            </Import-Package>
-            <Private-Package>org.apache.cxf.dosgi.samples.discovery.impl</Private-Package>
-          </instructions>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Bundle-Name>${project.name}</Bundle-Name>
+                        <Bundle-Description>The server-side
+                            implementation of the Distributed OSGi
+                            Discovery sample</Bundle-Description>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+                        <Bundle-Activator>org.apache.cxf.dosgi.samples.discovery.impl.Activator</Bundle-Activator>
+                        <Import-Package>
+                            org.apache.cxf.dosgi.samples.discovery,
+                            org.osgi.framework
+                        </Import-Package>
+                        <Private-Package>org.apache.cxf.dosgi.samples.discovery.impl</Private-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>

Modified: cxf/dosgi/trunk/samples/discovery/pom.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/samples/discovery/pom.xml?rev=1517475&r1=1517474&r2=1517475&view=diff
==============================================================================
--- cxf/dosgi/trunk/samples/discovery/pom.xml (original)
+++ cxf/dosgi/trunk/samples/discovery/pom.xml Mon Aug 26 09:21:12 2013
@@ -21,7 +21,7 @@
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.cxf.dosgi.samples</groupId>
-    <artifactId>cxf-dosgi-ri-bundles-discovery-parent</artifactId>
+    <artifactId>cxf-dosgi-ri-samples-discovery-parent</artifactId>
     <packaging>pom</packaging>
     <name>Distributed OSGI Discovery Sample</name>
     <version>1.6-SNAPSHOT</version>

Modified: cxf/dosgi/trunk/samples/ds/client/pom.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/samples/ds/client/pom.xml?rev=1517475&r1=1517474&r2=1517475&view=diff
==============================================================================
--- cxf/dosgi/trunk/samples/ds/client/pom.xml (original)
+++ cxf/dosgi/trunk/samples/ds/client/pom.xml Mon Aug 26 09:21:12 2013
@@ -1,67 +1,64 @@
 <?xml version='1.0' encoding='UTF-8' ?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements. See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership. The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License. You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied. See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
-<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>
-  <groupId>org.apache.cxf.dosgi.samples</groupId>
-  <artifactId>cxf-dosgi-ri-samples-ds-client</artifactId>
-  <packaging>bundle</packaging>
-  <name>Distributed OSGI Declarative Services Sample Client Bundle</name>
-  <version>1.6-SNAPSHOT</version>
-
-  <parent>
+<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor 
+    license agreements. See the NOTICE file distributed with this work for additional 
+    information regarding copyright ownership. The ASF licenses this file to 
+    you under the Apache License, Version 2.0 (the "License"); you may not use 
+    this file except in compliance with the License. You may obtain a copy of 
+    the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required 
+    by applicable law or agreed to in writing, software distributed under the 
+    License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 
+    OF ANY KIND, either express or implied. See the License for the specific 
+    language governing permissions and limitations under the License. -->
+<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>
     <groupId>org.apache.cxf.dosgi.samples</groupId>
-    <artifactId>cxf-dosgi-ri-bundles-ds-parent</artifactId>
+    <artifactId>cxf-dosgi-ri-samples-ds-client</artifactId>
+    <packaging>bundle</packaging>
+    <name>Distributed OSGI Declarative Services Sample Client Bundle</name>
     <version>1.6-SNAPSHOT</version>
-  </parent>
 
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.felix</groupId>
-      <artifactId>org.apache.felix.framework</artifactId>
-      <version>${felix.version}</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.cxf.dosgi.samples</groupId>
-      <artifactId>cxf-dosgi-ri-samples-ds-interface</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-  </dependencies>
+    <parent>
+        <groupId>org.apache.cxf.dosgi.samples</groupId>
+        <artifactId>cxf-dosgi-ri-bundles-ds-parent</artifactId>
+        <version>1.6-SNAPSHOT</version>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.compendium</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.cxf.dosgi.samples</groupId>
+            <artifactId>cxf-dosgi-ri-samples-ds-interface</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+    </dependencies>
 
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <configuration>
-          <instructions>
-            <Bundle-Name>${project.name}</Bundle-Name>
-            <Bundle-Description>The client-side implementation of the Distributed OSGi with Declarative Services sample</Bundle-Description>
-            <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-            <Bundle-Activator>org.apache.cxf.dosgi.samples.ds.consumer.Activator</Bundle-Activator>
-            <Import-Package>*</Import-Package>
-            <Private-Package>org.apache.cxf.dosgi.samples.ds.consumer</Private-Package>
-            <Service-Component>OSGI-INF/component.xml</Service-Component>
-          </instructions>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Bundle-Name>${project.name}</Bundle-Name>
+                        <Bundle-Description>The client-side
+                            implementation of the Distributed OSGi with
+                            Declarative Services sample</Bundle-Description>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+                        <Bundle-Activator>org.apache.cxf.dosgi.samples.ds.consumer.Activator</Bundle-Activator>
+                        <Import-Package>*</Import-Package>
+                        <Private-Package>org.apache.cxf.dosgi.samples.ds.consumer</Private-Package>
+                        <Service-Component>OSGI-INF/component.xml</Service-Component>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>

Modified: cxf/dosgi/trunk/samples/ds/pom.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/samples/ds/pom.xml?rev=1517475&r1=1517474&r2=1517475&view=diff
==============================================================================
--- cxf/dosgi/trunk/samples/ds/pom.xml (original)
+++ cxf/dosgi/trunk/samples/ds/pom.xml Mon Aug 26 09:21:12 2013
@@ -20,7 +20,7 @@
 <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>
     <groupId>org.apache.cxf.dosgi.samples</groupId>
-    <artifactId>cxf-dosgi-ri-bundles-ds-parent</artifactId>
+    <artifactId>cxf-dosgi-ri-samples-ds-parent</artifactId>
     <packaging>pom</packaging>
     <name>Distributed OSGI Declarative Services Sample</name>
     <version>1.6-SNAPSHOT</version>

Modified: cxf/dosgi/trunk/samples/greeter/client/pom.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/samples/greeter/client/pom.xml?rev=1517475&r1=1517474&r2=1517475&view=diff
==============================================================================
--- cxf/dosgi/trunk/samples/greeter/client/pom.xml (original)
+++ cxf/dosgi/trunk/samples/greeter/client/pom.xml Mon Aug 26 09:21:12 2013
@@ -45,15 +45,12 @@
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.felix</groupId>
-            <artifactId>org.apache.felix.framework</artifactId>
-            <version>${felix.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.apache.felix</groupId>
-                    <artifactId>org.osgi.foundation</artifactId>
-                </exclusion>
-            </exclusions>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.compendium</artifactId>
         </dependency>
     </dependencies>
 

Modified: cxf/dosgi/trunk/samples/greeter/impl/pom.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/samples/greeter/impl/pom.xml?rev=1517475&r1=1517474&r2=1517475&view=diff
==============================================================================
--- cxf/dosgi/trunk/samples/greeter/impl/pom.xml (original)
+++ cxf/dosgi/trunk/samples/greeter/impl/pom.xml Mon Aug 26 09:21:12 2013
@@ -39,15 +39,12 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.apache.felix</groupId>
-            <artifactId>org.apache.felix.framework</artifactId>
-            <version>${felix.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.apache.felix</groupId>
-                    <artifactId>org.osgi.foundation</artifactId>
-                </exclusion>
-            </exclusions>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.compendium</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf.dosgi.samples</groupId>

Modified: cxf/dosgi/trunk/samples/greeter/pom.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/samples/greeter/pom.xml?rev=1517475&r1=1517474&r2=1517475&view=diff
==============================================================================
--- cxf/dosgi/trunk/samples/greeter/pom.xml (original)
+++ cxf/dosgi/trunk/samples/greeter/pom.xml Mon Aug 26 09:21:12 2013
@@ -21,7 +21,7 @@
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.cxf.dosgi.samples</groupId>
-    <artifactId>cxf-dosgi-ri-bundles-greeter</artifactId>
+    <artifactId>cxf-dosgi-ri-samples-greeter-parent</artifactId>
     <packaging>pom</packaging>
     <name>Distributed OSGI Greeter Bundles</name>
     <version>1.6-SNAPSHOT</version>

Modified: cxf/dosgi/trunk/samples/greeter_rest/client/pom.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/samples/greeter_rest/client/pom.xml?rev=1517475&r1=1517474&r2=1517475&view=diff
==============================================================================
--- cxf/dosgi/trunk/samples/greeter_rest/client/pom.xml (original)
+++ cxf/dosgi/trunk/samples/greeter_rest/client/pom.xml Mon Aug 26 09:21:12 2013
@@ -44,15 +44,12 @@
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.felix</groupId>
-            <artifactId>org.apache.felix.framework</artifactId>
-            <version>${felix.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.apache.felix</groupId>
-                    <artifactId>org.osgi.foundation</artifactId>
-                </exclusion>
-            </exclusions>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.compendium</artifactId>
         </dependency>
     </dependencies>
 

Modified: cxf/dosgi/trunk/samples/greeter_rest/impl/pom.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/samples/greeter_rest/impl/pom.xml?rev=1517475&r1=1517474&r2=1517475&view=diff
==============================================================================
--- cxf/dosgi/trunk/samples/greeter_rest/impl/pom.xml (original)
+++ cxf/dosgi/trunk/samples/greeter_rest/impl/pom.xml Mon Aug 26 09:21:12 2013
@@ -40,15 +40,12 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.apache.felix</groupId>
-            <artifactId>org.apache.felix.framework</artifactId>
-            <version>${felix.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.apache.felix</groupId>
-                    <artifactId>org.osgi.foundation</artifactId>
-                </exclusion>
-            </exclusions>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.compendium</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf.dosgi.samples</groupId>

Modified: cxf/dosgi/trunk/samples/greeter_rest/impl2/pom.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/samples/greeter_rest/impl2/pom.xml?rev=1517475&r1=1517474&r2=1517475&view=diff
==============================================================================
--- cxf/dosgi/trunk/samples/greeter_rest/impl2/pom.xml (original)
+++ cxf/dosgi/trunk/samples/greeter_rest/impl2/pom.xml Mon Aug 26 09:21:12 2013
@@ -40,15 +40,12 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.apache.felix</groupId>
-            <artifactId>org.apache.felix.framework</artifactId>
-            <version>${felix.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.apache.felix</groupId>
-                    <artifactId>org.osgi.foundation</artifactId>
-                </exclusion>
-            </exclusions>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.compendium</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf.dosgi.samples</groupId>

Modified: cxf/dosgi/trunk/samples/greeter_rest/pom.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/samples/greeter_rest/pom.xml?rev=1517475&r1=1517474&r2=1517475&view=diff
==============================================================================
--- cxf/dosgi/trunk/samples/greeter_rest/pom.xml (original)
+++ cxf/dosgi/trunk/samples/greeter_rest/pom.xml Mon Aug 26 09:21:12 2013
@@ -21,7 +21,7 @@
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.cxf.dosgi.samples</groupId>
-    <artifactId>cxf-dosgi-ri-bundles-greeter-rest</artifactId>
+    <artifactId>cxf-dosgi-ri-samples-greeter-rest-parent</artifactId>
     <packaging>pom</packaging>
     <name>Distributed OSGI Greeter Rest Bundles</name>
     <version>1.6-SNAPSHOT</version>

Modified: cxf/dosgi/trunk/samples/security_filter/pom.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/samples/security_filter/pom.xml?rev=1517475&r1=1517474&r2=1517475&view=diff
==============================================================================
--- cxf/dosgi/trunk/samples/security_filter/pom.xml (original)
+++ cxf/dosgi/trunk/samples/security_filter/pom.xml Mon Aug 26 09:21:12 2013
@@ -1,82 +1,74 @@
 <?xml version='1.0' encoding='UTF-8' ?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements. See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership. The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License. You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied. See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
-<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>
-  <groupId>org.apache.cxf.dosgi.samples</groupId>
-  <artifactId>cxf-dosgi-ri-bundles-sample-security</artifactId>
-  <packaging>bundle</packaging>
-  <name>Distributed OSGI Security Sample Bundle</name>
-  <version>1.6-SNAPSHOT</version>
-
-  <parent>
-    <groupId>org.apache.cxf.dosgi</groupId>
-    <artifactId>cxf-dosgi-ri-parent</artifactId>
+<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor 
+    license agreements. See the NOTICE file distributed with this work for additional 
+    information regarding copyright ownership. The ASF licenses this file to 
+    you under the Apache License, Version 2.0 (the "License"); you may not use 
+    this file except in compliance with the License. You may obtain a copy of 
+    the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required 
+    by applicable law or agreed to in writing, software distributed under the 
+    License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 
+    OF ANY KIND, either express or implied. See the License for the specific 
+    language governing permissions and limitations under the License. -->
+<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>
+    <groupId>org.apache.cxf.dosgi.samples</groupId>
+    <artifactId>cxf-dosgi-ri-samples-security</artifactId>
+    <packaging>bundle</packaging>
+    <name>Distributed OSGI Security Sample Bundle</name>
     <version>1.6-SNAPSHOT</version>
-    <relativePath>../../parent/pom.xml</relativePath>
-  </parent>
-
-  <dependencies>
-      <dependency>
-          <groupId>org.apache.felix</groupId>
-          <artifactId>org.apache.felix.framework</artifactId>
-          <version>${felix.version}</version>
-          <exclusions>
-              <exclusion>
-                  <groupId>org.apache.felix</groupId>
-                  <artifactId>org.osgi.foundation</artifactId>
-              </exclusion>
-          </exclusions>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.geronimo.specs</groupId>
-        <artifactId>geronimo-servlet_${servlet.version}_spec</artifactId>
-        <version>1.0</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.servicemix.specs</groupId>
-        <artifactId>org.apache.servicemix.specs.jsr311-api-1.0</artifactId>
-        <version>${servicemix.specs.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.slf4j</groupId>
-        <artifactId>slf4j-api</artifactId>
-      </dependency>
-  </dependencies>
 
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <configuration>
-          <instructions>
-            <Bundle-Name>${project.name}</Bundle-Name>
-            <Bundle-Description>An example Distributed OSGi endpoint that passes requests through a security filter</Bundle-Description>
-            <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-            <Private-Package>org.apache.cxf.dosgi.samples.security</Private-Package>
-            <Bundle-Activator>org.apache.cxf.dosgi.samples.security.Activator</Bundle-Activator>
-          </instructions>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
+    <parent>
+        <groupId>org.apache.cxf.dosgi</groupId>
+        <artifactId>cxf-dosgi-ri-parent</artifactId>
+        <version>1.6-SNAPSHOT</version>
+        <relativePath>../../parent/pom.xml</relativePath>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.compendium</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-servlet_${servlet.version}_spec</artifactId>
+            <version>1.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.servicemix.specs</groupId>
+            <artifactId>org.apache.servicemix.specs.jsr311-api-1.0</artifactId>
+            <version>${servicemix.specs.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Bundle-Name>${project.name}</Bundle-Name>
+                        <Bundle-Description>An example Distributed OSGi
+                            endpoint that passes requests through a
+                            security filter</Bundle-Description>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+                        <Private-Package>org.apache.cxf.dosgi.samples.security</Private-Package>
+                        <Bundle-Activator>org.apache.cxf.dosgi.samples.security.Activator</Bundle-Activator>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 
 </project>

Modified: cxf/dosgi/trunk/samples/spring_dm/pom.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/samples/spring_dm/pom.xml?rev=1517475&r1=1517474&r2=1517475&view=diff
==============================================================================
--- cxf/dosgi/trunk/samples/spring_dm/pom.xml (original)
+++ cxf/dosgi/trunk/samples/spring_dm/pom.xml Mon Aug 26 09:21:12 2013
@@ -21,7 +21,7 @@
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.cxf.dosgi.samples</groupId>
-    <artifactId>cxf-dosgi-ri-bundles-spring-dm-parent</artifactId>
+    <artifactId>cxf-dosgi-ri-samples-spring-dm-parent</artifactId>
     <packaging>pom</packaging>
     <name>Distributed OSGI Spring-DM Sample</name>
     <version>1.6-SNAPSHOT</version>

Modified: cxf/dosgi/trunk/systests2/common/pom.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/systests2/common/pom.xml?rev=1517475&r1=1517474&r2=1517475&view=diff
==============================================================================
--- cxf/dosgi/trunk/systests2/common/pom.xml (original)
+++ cxf/dosgi/trunk/systests2/common/pom.xml Mon Aug 26 09:21:12 2013
@@ -36,9 +36,14 @@
     <dependencies>
         <dependency>
             <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.enterprise</artifactId>
+            <artifactId>org.osgi.core</artifactId>
         </dependency>
         <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.compendium</artifactId>
+        </dependency>
+
+        <dependency>
             <groupId>org.ops4j.pax.swissbox</groupId>
             <artifactId>pax-swissbox-tinybundles</artifactId>
             <version>1.3.1</version>

Modified: cxf/dosgi/trunk/systests2/multi-bundle/pom.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/systests2/multi-bundle/pom.xml?rev=1517475&r1=1517474&r2=1517475&view=diff
==============================================================================
--- cxf/dosgi/trunk/systests2/multi-bundle/pom.xml (original)
+++ cxf/dosgi/trunk/systests2/multi-bundle/pom.xml Mon Aug 26 09:21:12 2013
@@ -79,12 +79,11 @@
             <groupId>org.osgi</groupId>
             <artifactId>org.osgi.core</artifactId>
         </dependency>
-
         <dependency>
             <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.enterprise</artifactId>
-            <scope>test</scope>
+            <artifactId>org.osgi.compendium</artifactId>
         </dependency>
+
         <dependency>
             <groupId>org.apache.cxf.dosgi.systests</groupId>
             <artifactId>cxf-dosgi-ri-systests2-common</artifactId>

Modified: cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/AbstractDosgiTest.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/AbstractDosgiTest.java?rev=1517475&r1=1517474&r2=1517475&view=diff
==============================================================================
--- cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/AbstractDosgiTest.java (original)
+++ cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/AbstractDosgiTest.java Mon Aug 26 09:21:12 2013
@@ -26,6 +26,7 @@ import java.net.MalformedURLException;
 import java.net.ServerSocket;
 import java.net.Socket;
 import java.net.URL;
+import java.util.Collection;
 import java.util.concurrent.TimeoutException;
 
 import org.apache.cxf.aegis.databinding.AegisDatabinding;
@@ -60,14 +61,14 @@ public class AbstractDosgiTest {
         Thread.sleep(interval);
     }
 
-    protected ServiceReference waitService(BundleContext bc, Class<?> cls, String filter, int timeout)
+    protected <T> ServiceReference<T> waitService(BundleContext bc, Class<T> cls, String filter, int timeout)
         throws Exception {
         System.out.println("Waiting for service: " + cls + " " + filter);
         long startTime = System.currentTimeMillis();
         while (true) {
-            ServiceReference[] refs = bc.getServiceReferences(cls.getName(), filter);
-            if (refs != null && refs.length > 0) {
-                return refs[0];
+            Collection<ServiceReference<T>> refs = bc.getServiceReferences(cls, filter);
+            if (refs != null && refs.size() > 0) {
+                return refs.iterator().next();
             }
             sleepOrTimeout(startTime, timeout, "Service not found: " + cls + " " + filter);
         }

Modified: cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/TestDiscoveryExport.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/TestDiscoveryExport.java?rev=1517475&r1=1517474&r2=1517475&view=diff
==============================================================================
--- cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/TestDiscoveryExport.java (original)
+++ cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/TestDiscoveryExport.java Mon Aug 26 09:21:12 2013
@@ -19,7 +19,6 @@
 package org.apache.cxf.dosgi.systests2.multi;
 
 import java.io.IOException;
-import java.io.InputStream;
 import java.util.Dictionary;
 import java.util.Hashtable;
 
@@ -27,11 +26,6 @@ import javax.inject.Inject;
 
 import junit.framework.Assert;
 
-import org.apache.cxf.dosgi.systests2.common.test2.Test2Service;
-import org.apache.cxf.dosgi.systests2.common.test2.client.ClientActivator;
-import org.apache.cxf.dosgi.systests2.common.test2.client.Test2ServiceTracker;
-import org.apache.cxf.dosgi.systests2.common.test2.server.ServerActivator;
-import org.apache.cxf.dosgi.systests2.common.test2.server.Test2ServiceImpl;
 import org.apache.zookeeper.ZooKeeper;
 import org.apache.zookeeper.data.Stat;
 import org.junit.Test;
@@ -39,9 +33,7 @@ import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.Option;
 import org.ops4j.pax.exam.junit.Configuration;
 import org.ops4j.pax.exam.junit.JUnit4TestRunner;
-import org.ops4j.pax.swissbox.tinybundles.core.TinyBundles;
 import org.osgi.framework.BundleContext;
-import org.osgi.framework.Constants;
 import org.osgi.service.cm.ConfigurationAdmin;
 
 import static org.ops4j.pax.exam.CoreOptions.frameworkStartLevel;
@@ -73,16 +65,19 @@ public class TestDiscoveryExport extends
                     .artifactId("cxf-dosgi-ri-samples-greeter-impl").versionAsInProject(),
                 mavenBundle().groupId("org.apache.cxf.dosgi.systests")
                     .artifactId("cxf-dosgi-ri-systests2-common").versionAsInProject(),
-                frameworkStartLevel(100)
+                frameworkStartLevel(100),
+                //CoreOptions.vmOption("-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005")
         };
     }
 
     @Test
     public void testDiscoveryExport() throws Exception {
         final int zkPort = getFreePort();
-        configureZookeeper(configAdmin, zkPort);
+        System.out.println("*** Port for ZooKeeper Server: " + zkPort);
+        updateZkServerConfig(zkPort, configAdmin);
+        updateZkClientConfig(zkPort, configAdmin);
         ZooKeeper zk = new ZooKeeper("localhost:" + zkPort, 1000, null);
-        assertNodeExists(zk, GREETER_ZOOKEEPER_NODE, 4000);
+        assertNodeExists(zk, GREETER_ZOOKEEPER_NODE, 14000);
         zk.close();
     }
 
@@ -100,32 +95,6 @@ public class TestDiscoveryExport extends
         Assert.assertNotNull("ZooKeeper node " + zNode + " was not found", stat);
     }
 
-    protected static InputStream getClientBundle() {
-        return TinyBundles.newBundle()
-            .add(ClientActivator.class)
-            .add(Test2Service.class)
-            .add(Test2ServiceTracker.class)
-            .set(Constants.BUNDLE_SYMBOLICNAME, "test2ClientBundle")
-            .set(Constants.BUNDLE_ACTIVATOR, ClientActivator.class.getName())
-            .build(TinyBundles.withBnd());
-    }
-
-    protected static InputStream getServerBundle() {
-        return TinyBundles.newBundle()
-            .add(ServerActivator.class)
-            .add(Test2Service.class)
-            .add(Test2ServiceImpl.class)
-            .set(Constants.BUNDLE_SYMBOLICNAME, "test2ServerBundle")
-            .set(Constants.BUNDLE_ACTIVATOR, ServerActivator.class.getName())
-            .build(TinyBundles.withBnd());
-    }
-
-    protected void configureZookeeper(ConfigurationAdmin ca, int zkPort) throws IOException {
-        System.out.println("*** Port for ZooKeeper Server: " + zkPort);
-        updateZkServerConfig(zkPort, ca);
-        updateZkClientConfig(zkPort, ca);
-    }
-
     protected void updateZkClientConfig(final int zkPort, ConfigurationAdmin cadmin) throws IOException {
         Dictionary<String, Object> cliProps = new Hashtable<String, Object>();
         cliProps.put("zookeeper.host", "127.0.0.1");

Modified: cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/TestImportService.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/TestImportService.java?rev=1517475&r1=1517474&r2=1517475&view=diff
==============================================================================
--- cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/TestImportService.java (original)
+++ cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/TestImportService.java Mon Aug 26 09:21:12 2013
@@ -127,7 +127,7 @@ public class TestImportService extends A
             bundleContext.registerService(Object.class.getName(), new Object(), props);
 
             // Wait for the service tracker in the test bundle to register a service with the test result
-            ServiceReference ref = waitService(bundleContext, String.class, "(testResult=test1)", 20);
+            ServiceReference<String> ref = waitService(bundleContext, String.class, "(testResult=test1)", 20);
             Assert.assertEquals("HiOSGi;exception", ref.getProperty("result"));
         } finally {
             if (server != null) {



Mime
View raw message