DOSGI-162 Fix compile errors when compiling against osgi 4.3.1 with thanks to Amichai

git-svn-id: https://svn.apache.org/repos/asf/cxf/dosgi/trunk@1468081 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/discovery/distributed/cxf-discovery/src/main/java/org/apache/cxf/dosgi/discovery/zookeeper/PublishingEndpointListenerFactory.java b/discovery/distributed/cxf-discovery/src/main/java/org/apache/cxf/dosgi/discovery/zookeeper/PublishingEndpointListenerFactory.java
index 793a4de..a41c65c 100644 (file)
--- a/discovery/distributed/cxf-discovery/src/main/java/org/apache/cxf/dosgi/discovery/zookeeper/PublishingEndpointListenerFactory.java
+++ b/discovery/distributed/cxf-discovery/src/main/java/org/apache/cxf/dosgi/discovery/zookeeper/PublishingEndpointListenerFactory.java
@@ -19,8 +19,9 @@
 package org.apache.cxf.dosgi.discovery.zookeeper;
 
 import java.util.ArrayList;
+import java.util.Dictionary;
+import java.util.Hashtable;
 import java.util.List;
-import java.util.Properties;
 
 import org.apache.zookeeper.ZooKeeper;
 import org.osgi.framework.Bundle;
@@ -71,7 +72,7 @@ public class PublishingEndpointListenerFactory implements ServiceFactory {
     }
 
     public synchronized void start() {
-        Properties props = new Properties();
+        Dictionary<String, String> props = new Hashtable<String, String>();
         props.put(EndpointListener.ENDPOINT_LISTENER_SCOPE, 
                   "(&(" + Constants.OBJECTCLASS + "=*)(" + RemoteConstants.ENDPOINT_FRAMEWORK_UUID
                   + "=" + Util.getUUID(bctx) + "))");

diff --git a/discovery/distributed/cxf-discovery/src/test/java/org/apache/cxf/dosgi/discovery/zookeeper/EndpointListenerFactoryTest.java b/discovery/distributed/cxf-discovery/src/test/java/org/apache/cxf/dosgi/discovery/zookeeper/EndpointListenerFactoryTest.java
index 9671a88..7137796 100644 (file)
--- a/discovery/distributed/cxf-discovery/src/test/java/org/apache/cxf/dosgi/discovery/zookeeper/EndpointListenerFactoryTest.java
+++ b/discovery/distributed/cxf-discovery/src/test/java/org/apache/cxf/dosgi/discovery/zookeeper/EndpointListenerFactoryTest.java
@@ -18,8 +18,8 @@
  */
 package org.apache.cxf.dosgi.discovery.zookeeper;
 
+import java.util.Dictionary;
 import java.util.List;
-import java.util.Properties;
 
 import junit.framework.TestCase;
 
@@ -43,7 +43,7 @@ public class EndpointListenerFactoryTest extends TestCase {
 
         EasyMock.expect(
                         ctx.registerService(EasyMock.eq(EndpointListener.class.getName()), EasyMock.eq(eplf),
-                                            (Properties)EasyMock.anyObject())).andReturn(sreg).once();
+                                            (Dictionary<String, String>)EasyMock.anyObject())).andReturn(sreg).once();
         
         EasyMock.expect(ctx.getProperty(EasyMock.eq("org.osgi.framework.uuid"))).andReturn("myUUID")
             .anyTimes();
@@ -73,7 +73,7 @@ public class EndpointListenerFactoryTest extends TestCase {
 
         EasyMock.expect(
                         ctx.registerService(EasyMock.eq(EndpointListener.class.getName()), EasyMock.eq(eplf),
-                                            (Properties)EasyMock.anyObject())).andReturn(sreg).once();
+                                (Dictionary<String, String>)EasyMock.anyObject())).andReturn(sreg).once();
 
         
         EasyMock.expect(ctx.getProperty(EasyMock.eq("org.osgi.framework.uuid"))).andReturn("myUUID")

diff --git a/discovery/distributed/zookeeper-server-config/pom.xml b/discovery/distributed/zookeeper-server-config/pom.xml
index 89df850..6328ee0 100644 (file)
--- a/discovery/distributed/zookeeper-server-config/pom.xml
+++ b/discovery/distributed/zookeeper-server-config/pom.xml
@@ -42,7 +42,6 @@
         <dependency>
             <groupId>org.osgi</groupId>
             <artifactId>org.osgi.enterprise</artifactId>
-            <version>${osgi.version}</version>
         </dependency>
 
         <dependency> 

diff --git a/discovery/local/pom.xml b/discovery/local/pom.xml
index c0c7202..5928ee4 100644 (file)
--- a/discovery/local/pom.xml
+++ b/discovery/local/pom.xml
@@ -51,7 +51,6 @@
         <dependency>
             <groupId>org.osgi</groupId>
             <artifactId>org.osgi.enterprise</artifactId>
-            <version>${osgi.version}</version>
         </dependency>
 
         <dependency>

diff --git a/distribution/multi-bundle/src/main/resources/distro_bundles.xml b/distribution/multi-bundle/src/main/resources/distro_bundles.xml
index b330d07..8df28a3 100644 (file)
--- a/distribution/multi-bundle/src/main/resources/distro_bundles.xml
+++ b/distribution/multi-bundle/src/main/resources/distro_bundles.xml
@@ -41,7 +41,7 @@
   <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/org.apache.aries.blueprint.core-1.1.0.jar</bundle>
   <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/org.apache.aries.blueprint.cm-1.0.1.jar</bundle>
   
-  <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/org.osgi.enterprise-${osgi.version}.jar</bundle>
+  <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/org.osgi.enterprise-${osgi.enterprise.version}.jar</bundle>
   <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/org.apache.felix.configadmin-1.6.0.jar</bundle>
   <bundle>cxf-dosgi-ri-multibundle-distribution-${project.version}-dir/apache-cxf-dosgi-ri-${project.version}/dosgi_bundles/org.apache.felix.fileinstall-3.2.6.jar</bundle>
 

diff --git a/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/ActivatorTest.java b/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/ActivatorTest.java
index fd0cdb2..39efc20 100644 (file)
--- a/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/ActivatorTest.java
+++ b/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/ActivatorTest.java
@@ -51,7 +51,7 @@ public class ActivatorTest extends TestCase {
         EasyMock.expectLastCall().atLeastOnce();
         ServiceRegistration sr = control.createMock(ServiceRegistration.class);
         EasyMock.expect(bc.registerService(EasyMock.eq(RemoteServiceAdmin.class.getName()),
-                                           EasyMock.anyObject(), (Dictionary<?, ?>)EasyMock.anyObject()))
+                                           EasyMock.anyObject(), (Dictionary<String, String>)EasyMock.anyObject()))
                                            .andReturn(sr).atLeastOnce();
         
         control.replay();

diff --git a/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/handlers/JaxRSUtilsTest.java b/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/handlers/JaxRSUtilsTest.java
index 74921de..57a621d 100644 (file)
--- a/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/handlers/JaxRSUtilsTest.java
+++ b/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/handlers/JaxRSUtilsTest.java
@@ -136,7 +136,7 @@ public class JaxRSUtilsTest extends TestCase {
     public void testCustomGlobalProvider() throws Exception {
         ServiceReference sref = EasyMock.createNiceMock(ServiceReference.class);
         BundleContext bc = EasyMock.createNiceMock(BundleContext.class);
-        bc.getServiceReferences(null, JaxRSUtils.PROVIDERS_FILTER);
+        bc.getServiceReferences((String)null, JaxRSUtils.PROVIDERS_FILTER);
         EasyMock.expectLastCall().andReturn(new ServiceReference[] {
             sref
         });
@@ -158,7 +158,7 @@ public class JaxRSUtilsTest extends TestCase {
     public void testNoCustomGlobalProvider() throws Exception {
         ServiceReference sref = EasyMock.createNiceMock(ServiceReference.class);
         BundleContext bc = EasyMock.createNiceMock(BundleContext.class);
-        bc.getServiceReferences(null, JaxRSUtils.PROVIDERS_FILTER);
+        bc.getServiceReferences((String)null, JaxRSUtils.PROVIDERS_FILTER);
         EasyMock.expectLastCall().andReturn(new ServiceReference[] {
             sref
         });
@@ -180,7 +180,7 @@ public class JaxRSUtilsTest extends TestCase {
     public void testCustomGlobalProviderExpected() throws Exception {
         ServiceReference sref = EasyMock.createNiceMock(ServiceReference.class);
         BundleContext bc = EasyMock.createNiceMock(BundleContext.class);
-        bc.getServiceReferences(null, JaxRSUtils.PROVIDERS_FILTER);
+        bc.getServiceReferences((String)null, JaxRSUtils.PROVIDERS_FILTER);
         EasyMock.expectLastCall().andReturn(new ServiceReference[] {
             sref
         });

diff --git a/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/service/EventProducerTest.java b/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/service/EventProducerTest.java
index 30b7de4..0a93b58 100644 (file)
--- a/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/service/EventProducerTest.java
+++ b/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/service/EventProducerTest.java
@@ -59,7 +59,7 @@ public class EventProducerTest {
         final Bundle bundle = EasyMock.createNiceMock(Bundle.class);
         EasyMock.expect(bundle.getBundleId()).andReturn(42L).anyTimes();
         EasyMock.expect(bundle.getSymbolicName()).andReturn("test.bundle").anyTimes();
-        Hashtable<String, Object> headers = new Hashtable<String, Object>();
+        Hashtable<String, String> headers = new Hashtable<String, String>();
         headers.put("Bundle-Version", "1.2.3.test");
         EasyMock.expect(bundle.getHeaders()).andReturn(headers).anyTimes();
         EasyMock.replay(bundle);
@@ -128,7 +128,7 @@ public class EventProducerTest {
         final Bundle bundle = EasyMock.createNiceMock(Bundle.class);
         EasyMock.expect(bundle.getBundleId()).andReturn(42L).anyTimes();
         EasyMock.expect(bundle.getSymbolicName()).andReturn("test.bundle").anyTimes();
-        EasyMock.expect(bundle.getHeaders()).andReturn(new Hashtable<String, Object>()).anyTimes();
+        EasyMock.expect(bundle.getHeaders()).andReturn(new Hashtable<String, String>()).anyTimes();
         EasyMock.replay(bundle);
 
         final Exception exportException = new Exception();

diff --git a/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/service/RemoteServiceAdminCoreTest.java b/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/service/RemoteServiceAdminCoreTest.java
index 2270a01..5a61225 100644 (file)
--- a/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/service/RemoteServiceAdminCoreTest.java
+++ b/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/service/RemoteServiceAdminCoreTest.java
@@ -32,7 +32,6 @@ import java.util.HashMap;
 import java.util.Hashtable;
 import java.util.List;
 import java.util.Map;
-import java.util.Properties;
 
 import org.apache.cxf.dosgi.dsw.handlers.ConfigTypeHandlerFactory;
 import org.apache.cxf.dosgi.dsw.handlers.ConfigurationTypeHandler;
@@ -69,7 +68,7 @@ public class RemoteServiceAdminCoreTest {
 
         EasyMock.expect(bc.getBundle()).andReturn(b).anyTimes();
 
-        Dictionary<?, ?> d = new Properties();
+        Dictionary<String, String> d = new Hashtable<String, String>();
         EasyMock.expect(b.getHeaders()).andReturn(d).anyTimes();
 
         ServiceReference sref = c.createMock(ServiceReference.class);
@@ -103,7 +102,7 @@ public class RemoteServiceAdminCoreTest {
         Bundle b = c.createMock(Bundle.class);
         BundleContext bc = c.createMock(BundleContext.class);
 
-        Dictionary<?, ?> d = new Properties();
+        Dictionary<String, String> d = new Hashtable<String, String>();
         EasyMock.expect(b.getHeaders()).andReturn(d).anyTimes();
 
         EasyMock.expect(bc.getBundle()).andReturn(b).anyTimes();

diff --git a/dsw/cxf-topology-manager/pom.xml b/dsw/cxf-topology-manager/pom.xml
index 488e59e..db3deb0 100644 (file)
--- a/dsw/cxf-topology-manager/pom.xml
+++ b/dsw/cxf-topology-manager/pom.xml
@@ -57,7 +57,6 @@
         <dependency>
             <groupId>org.osgi</groupId>
             <artifactId>org.osgi.enterprise</artifactId>
-            <version>${osgi.version}</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>

diff --git a/parent/pom.xml b/parent/pom.xml
index 1f53f87..33617cd 100644 (file)
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -41,7 +41,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
         <osgi.version>4.2.0</osgi.version>
-
+        <osgi.enterprise.version>4.2.0</osgi.enterprise.version>
         <cxf.version>2.7.2</cxf.version>
         <cxf.build-utils.version>2.5.0</cxf.build-utils.version>
         <felix.version>3.0.8</felix.version>
@@ -82,7 +82,7 @@
             <dependency>
                 <groupId>org.osgi</groupId>
                 <artifactId>org.osgi.enterprise</artifactId>
-                <version>${osgi.version}</version>
+                <version>${osgi.enterprise.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.slf4j</groupId>