cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject svn commit: r1220793 - in /cxf/dosgi/trunk/dsw: cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/service/RemoteServiceAdminCore.java cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/service/RemoteServiceAdminCoreTest.java cxf-topology-manager/pom.xml
Date Mon, 19 Dec 2011 15:25:35 GMT
Author: sergeyb
Date: Mon Dec 19 15:25:34 2011
New Revision: 1220793

URL: http://svn.apache.org/viewvc?rev=1220793&view=rev
Log:
[DOSGI-79] Updating RemoteServiceAdmin core to return corect type

Modified:
    cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/service/RemoteServiceAdminCore.java
    cxf/dosgi/trunk/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/service/RemoteServiceAdminCoreTest.java
    cxf/dosgi/trunk/dsw/cxf-topology-manager/pom.xml

Modified: cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/service/RemoteServiceAdminCore.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/service/RemoteServiceAdminCore.java?rev=1220793&r1=1220792&r2=1220793&view=diff
==============================================================================
--- cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/service/RemoteServiceAdminCore.java
(original)
+++ cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/service/RemoteServiceAdminCore.java
Mon Dec 19 15:25:34 2011
@@ -41,6 +41,7 @@ import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceReference;
 import org.osgi.framework.ServiceRegistration;
 import org.osgi.service.remoteserviceadmin.EndpointDescription;
+import org.osgi.service.remoteserviceadmin.ImportReference;
 import org.osgi.service.remoteserviceadmin.ImportRegistration;
 import org.osgi.service.remoteserviceadmin.RemoteConstants;
 import org.osgi.service.remoteserviceadmin.RemoteServiceAdmin;
@@ -307,9 +308,11 @@ public class RemoteServiceAdminCore impl
 
     public Collection getImportedEndpoints() {
         synchronized (importedServices) {
-            List<ImportRegistrationImpl> irs = new ArrayList<ImportRegistrationImpl>();
+            List<ImportReference> irs = new ArrayList<ImportReference>();
             for (Collection<ImportRegistrationImpl> irl : importedServices.values())
{
-                irs.addAll(irl);
+            	for (ImportRegistrationImpl impl : irl) {
+            		irs.add(impl.getImportReference());
+            	}
             }
             return Collections.unmodifiableCollection(irs);
         }

Modified: cxf/dosgi/trunk/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/service/RemoteServiceAdminCoreTest.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/service/RemoteServiceAdminCoreTest.java?rev=1220793&r1=1220792&r2=1220793&view=diff
==============================================================================
--- cxf/dosgi/trunk/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/service/RemoteServiceAdminCoreTest.java
(original)
+++ cxf/dosgi/trunk/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/service/RemoteServiceAdminCoreTest.java
Mon Dec 19 15:25:34 2011
@@ -127,7 +127,7 @@ public class RemoteServiceAdminCoreTest 
         assertNotNull(ireg2);
         assertEquals(2,rsaCore.getImportedEndpoints().size());
 
-        assertEquals(ireg, (rsaCore.getImportedEndpoints().toArray())[0]);
+        assertEquals(ireg.getImportReference(), (rsaCore.getImportedEndpoints().toArray())[0]);
 
         assertEquals(ireg.getImportReference().getImportedEndpoint(), ireg2.getImportReference()
             .getImportedEndpoint());

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=1220793&r1=1220792&r2=1220793&view=diff
==============================================================================
--- cxf/dosgi/trunk/dsw/cxf-topology-manager/pom.xml (original)
+++ cxf/dosgi/trunk/dsw/cxf-topology-manager/pom.xml Mon Dec 19 15:25:34 2011
@@ -52,13 +52,11 @@
                 </exclusion>
             </exclusions>
         </dependency>
-
         <dependency>
-            <groupId>org.apache.cxf.dosgi</groupId>
-            <artifactId>cxf-dosgi-remote-service-admin-interfaces</artifactId>
-            <version>${project.version}</version>
+	     <groupId>org.osgi</groupId>
+	     <artifactId>org.osgi.enterprise</artifactId>
+	     <version>${osgi.version}</version>
         </dependency>
-
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>



Mime
View raw message