cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From amic...@apache.org
Subject svn commit: r1499699 - in /cxf/dosgi/trunk: discovery/distributed/cxf-discovery/src/main/java/org/apache/cxf/dosgi/discovery/zookeeper/publish/ discovery/distributed/cxf-discovery/src/main/java/org/apache/cxf/dosgi/discovery/zookeeper/subscribe/ discov...
Date Thu, 04 Jul 2013 09:16:11 GMT
Author: amichai
Date: Thu Jul  4 09:16:10 2013
New Revision: 1499699

URL: http://svn.apache.org/r1499699
Log:
Standardize EndpointDescription variable naming

Modified:
    cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/main/java/org/apache/cxf/dosgi/discovery/zookeeper/publish/PublishingEndpointListener.java
    cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/main/java/org/apache/cxf/dosgi/discovery/zookeeper/subscribe/InterfaceMonitor.java
    cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/main/java/org/apache/cxf/dosgi/discovery/zookeeper/subscribe/InterfaceMonitorManager.java
    cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/test/java/org/apache/cxf/dosgi/discovery/zookeeper/publish/PublishingEndpointListenerTest.java
    cxf/dosgi/trunk/discovery/local/src/main/java/org/apache/cxf/dosgi/discovery/local/internal/LocalDiscovery.java
    cxf/dosgi/trunk/discovery/local/src/main/java/org/apache/cxf/dosgi/discovery/local/util/EndpointUtils.java
    cxf/dosgi/trunk/discovery/local/src/test/java/org/apache/cxf/dosgi/discovery/local/internal/LocalDiscoveryTest.java
    cxf/dosgi/trunk/discovery/local/src/test/java/org/apache/cxf/dosgi/discovery/local/util/EndpointUtilsTest.java
    cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/ConfigurationTypeHandler.java
    cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/JaxRSPojoConfigurationTypeHandler.java
    cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/PojoConfigurationTypeHandler.java
    cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/WsdlConfigurationTypeHandler.java
    cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/service/ClientServiceFactory.java
    cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/service/EventAdminHelper.java
    cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/service/ExportReferenceImpl.java
    cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/service/ExportRegistrationImpl.java
    cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/service/ImportRegistrationImpl.java
    cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/service/RemoteServiceAdminCore.java
    cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/util/OsgiUtils.java
    cxf/dosgi/trunk/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/handlers/ClientServiceFactoryTest.java
    cxf/dosgi/trunk/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/service/ImportRegistrationImplTest.java
    cxf/dosgi/trunk/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/service/RemoteServiceAdminCoreTest.java
    cxf/dosgi/trunk/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/util/OsgiUtilsTest.java
    cxf/dosgi/trunk/dsw/cxf-topology-manager/src/main/java/org/apache/cxf/dosgi/topologymanager/exporter/EndpointRepository.java
    cxf/dosgi/trunk/dsw/cxf-topology-manager/src/main/java/org/apache/cxf/dosgi/topologymanager/importer/TopologyManagerImport.java
    cxf/dosgi/trunk/dsw/cxf-topology-manager/src/main/java/org/apache/cxf/dosgi/topologymanager/util/Utils.java
    cxf/dosgi/trunk/dsw/cxf-topology-manager/src/test/java/org/apache/cxf/dosgi/topologymanager/exporter/EndpointListenerNotifierTest.java
    cxf/dosgi/trunk/dsw/cxf-topology-manager/src/test/java/org/apache/cxf/dosgi/topologymanager/importer/TopologyManagerImportTest.java

Modified: cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/main/java/org/apache/cxf/dosgi/discovery/zookeeper/publish/PublishingEndpointListener.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/main/java/org/apache/cxf/dosgi/discovery/zookeeper/publish/PublishingEndpointListener.java?rev=1499699&r1=1499698&r2=1499699&view=diff
==============================================================================
--- cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/main/java/org/apache/cxf/dosgi/discovery/zookeeper/publish/PublishingEndpointListener.java (original)
+++ cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/main/java/org/apache/cxf/dosgi/discovery/zookeeper/publish/PublishingEndpointListener.java Thu Jul  4 09:16:10 2013
@@ -196,9 +196,9 @@ public class PublishingEndpointListener 
         LOG.debug("closing - removing all endpoints");
         synchronized (endpoints) {
             closed = true;
-            for (EndpointDescription ed : endpoints) {
+            for (EndpointDescription endpoint : endpoints) {
                 try {
-                    removeEndpoint(ed);
+                    removeEndpoint(endpoint);
                 } catch (Exception ex) {
                     LOG.error("Exception while removing endpoint during close", ex);
                 }

Modified: cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/main/java/org/apache/cxf/dosgi/discovery/zookeeper/subscribe/InterfaceMonitor.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/main/java/org/apache/cxf/dosgi/discovery/zookeeper/subscribe/InterfaceMonitor.java?rev=1499699&r1=1499698&r2=1499699&view=diff
==============================================================================
--- cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/main/java/org/apache/cxf/dosgi/discovery/zookeeper/subscribe/InterfaceMonitor.java (original)
+++ cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/main/java/org/apache/cxf/dosgi/discovery/zookeeper/subscribe/InterfaceMonitor.java Thu Jul  4 09:16:10 2013
@@ -143,8 +143,8 @@ public class InterfaceMonitor implements
 
     public synchronized void close() {
         closed = true;
-        for (EndpointDescription epd : nodes.values()) {
-            endpointListener.endpointRemoved(epd, null);
+        for (EndpointDescription endpoint : nodes.values()) {
+            endpointListener.endpointRemoved(endpoint, null);
         }
         nodes.clear();
     }
@@ -161,8 +161,8 @@ public class InterfaceMonitor implements
 
         // whatever is left in prevNodes now has been removed from Discovery
         LOG.debug("processChildren done. Nodes that are missing now and need to be removed: {}", prevNodes.values());
-        for (EndpointDescription epd : prevNodes.values()) {
-            endpointListener.endpointRemoved(epd, null);
+        for (EndpointDescription endpoint : prevNodes.values()) {
+            endpointListener.endpointRemoved(endpoint, null);
         }
         nodes = newNodes;
     }
@@ -185,19 +185,19 @@ public class InterfaceMonitor implements
             boolean foundANode = false;
             for (String child : children) {
                 String childZNode = zn + '/' + child;
-                EndpointDescription epd = getEndpointDescriptionFromNode(childZNode);
-                if (epd != null) {
-                    EndpointDescription prevEpd = prevNodes.get(child);
+                EndpointDescription endpoint = getEndpointDescriptionFromNode(childZNode);
+                if (endpoint != null) {
+                    EndpointDescription prevEndpoint = prevNodes.get(child);
                     LOG.info("found new node " + zn + "/[" + child + "]   ( []->child )  props: "
-                            + epd.getProperties().values());
-                    newNodes.put(child, epd);
+                            + endpoint.getProperties().values());
+                    newNodes.put(child, endpoint);
                     prevNodes.remove(child);
                     foundANode = true;
-                    LOG.debug("Properties: {}", epd.getProperties());
-                    if (prevEpd == null) {
+                    LOG.debug("Properties: {}", endpoint.getProperties());
+                    if (prevEndpoint == null) {
                         // This guy is new
-                        endpointListener.endpointAdded(epd, null);
-                    } else if (!prevEpd.getProperties().equals(epd.getProperties())) {
+                        endpointListener.endpointAdded(endpoint, null);
+                    } else if (!prevEndpoint.getProperties().equals(endpoint.getProperties())) {
                         // TODO
                     }
                 }

Modified: cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/main/java/org/apache/cxf/dosgi/discovery/zookeeper/subscribe/InterfaceMonitorManager.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/main/java/org/apache/cxf/dosgi/discovery/zookeeper/subscribe/InterfaceMonitorManager.java?rev=1499699&r1=1499698&r2=1499699&view=diff
==============================================================================
--- cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/main/java/org/apache/cxf/dosgi/discovery/zookeeper/subscribe/InterfaceMonitorManager.java (original)
+++ cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/main/java/org/apache/cxf/dosgi/discovery/zookeeper/subscribe/InterfaceMonitorManager.java Thu Jul  4 09:16:10 2013
@@ -140,17 +140,18 @@ public class InterfaceMonitorManager {
         return new InterfaceMonitor(zooKeeper, objClass, endpointListener, scope);
     }
 
-    private void notifyListeners(EndpointDescription epd, String currentScope, boolean isAdded,
+    private void notifyListeners(EndpointDescription endpoint, String currentScope, boolean isAdded,
             List<ServiceReference> endpointListeners) {
         for (ServiceReference endpointListenerRef : endpointListeners) {
             Object service = bctx.getService(endpointListenerRef);
             try {
                 if (service instanceof EndpointListener) {
                     EndpointListener endpointListener = (EndpointListener) service;
-                    LOG.trace("matching {} against {}", epd, currentScope);
-                    if (matchFilter(bctx, currentScope, epd)) {
-                        LOG.debug("Matched {} against {}", epd, currentScope);
-                        notifyListener(epd, currentScope, isAdded, endpointListenerRef.getBundle(), endpointListener);
+                    LOG.trace("matching {} against {}", endpoint, currentScope);
+                    if (matchFilter(bctx, currentScope, endpoint)) {
+                        LOG.debug("Matched {} against {}", endpoint, currentScope);
+                        notifyListener(endpoint, currentScope, isAdded,
+                                endpointListenerRef.getBundle(), endpointListener);
                     }
                 }
             } finally {
@@ -161,18 +162,18 @@ public class InterfaceMonitorManager {
         }
     }
 
-    private void notifyListener(EndpointDescription epd, String currentScope, boolean isAdded,
+    private void notifyListener(EndpointDescription endpoint, String currentScope, boolean isAdded,
                                 Bundle endpointListenerBundle, EndpointListener endpointListener) {
         if (endpointListenerBundle == null) {
             LOG.info("listening service was unregistered, ignoring");
         } else if (isAdded) {
             LOG.info("calling EndpointListener.endpointAdded: " + endpointListener + " from bundle "
-                    + endpointListenerBundle.getSymbolicName() + " for endpoint: " + epd);
-            endpointListener.endpointAdded(epd, currentScope);
+                    + endpointListenerBundle.getSymbolicName() + " for endpoint: " + endpoint);
+            endpointListener.endpointAdded(endpoint, currentScope);
         } else {
             LOG.info("calling EndpointListener.endpointRemoved: " + endpointListener + " from bundle "
-                    + endpointListenerBundle.getSymbolicName() + " for endpoint: " + epd);
-            endpointListener.endpointRemoved(epd, currentScope);
+                    + endpointListenerBundle.getSymbolicName() + " for endpoint: " + endpoint);
+            endpointListener.endpointRemoved(endpoint, currentScope);
         }
     }
 

Modified: cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/test/java/org/apache/cxf/dosgi/discovery/zookeeper/publish/PublishingEndpointListenerTest.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/test/java/org/apache/cxf/dosgi/discovery/zookeeper/publish/PublishingEndpointListenerTest.java?rev=1499699&r1=1499698&r2=1499699&view=diff
==============================================================================
--- cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/test/java/org/apache/cxf/dosgi/discovery/zookeeper/publish/PublishingEndpointListenerTest.java (original)
+++ cxf/dosgi/trunk/discovery/distributed/cxf-discovery/src/test/java/org/apache/cxf/dosgi/discovery/zookeeper/publish/PublishingEndpointListenerTest.java Thu Jul  4 09:16:10 2013
@@ -68,13 +68,13 @@ public class PublishingEndpointListenerT
         props.put(RemoteConstants.ENDPOINT_ID, "http://google.de:80/test");
         props.put(RemoteConstants.SERVICE_IMPORTED_CONFIGS, "myConfig");
 
-        EndpointDescription ed = new EndpointDescription(props);
+        EndpointDescription endpoint = new EndpointDescription(props);
 
-        eli.endpointAdded(ed, null);
-        eli.endpointAdded(ed, null); // should do nothing
+        eli.endpointAdded(endpoint, null);
+        eli.endpointAdded(endpoint, null); // should do nothing
 
-        eli.endpointRemoved(ed, null);
-        eli.endpointRemoved(ed, null); // should do nothing
+        eli.endpointRemoved(endpoint, null);
+        eli.endpointRemoved(endpoint, null); // should do nothing
 
         c.verify();
     }
@@ -115,7 +115,7 @@ public class PublishingEndpointListenerT
         props.put(Constants.OBJECTCLASS, new String[] {"org.foo.myClass"});
         props.put(RemoteConstants.ENDPOINT_ID, "http://localhost:9876/test");
         props.put(RemoteConstants.SERVICE_IMPORTED_CONFIGS, "myConfig");
-        EndpointDescription ep = new EndpointDescription(props);
+        EndpointDescription endpoint = new EndpointDescription(props);
 
         Map<String, Object> expectedProps = new HashMap<String, Object>(props);
         expectedProps.put("endpoint.id", "http://localhost:9876/test/appended");
@@ -133,16 +133,16 @@ public class PublishingEndpointListenerT
 
         PublishingEndpointListener eli = new PublishingEndpointListener(zk, ctx);
 
-        List<EndpointDescription> endpointList = getEndpointsList(eli);
-        assertEquals("Precondition", 0, endpointList.size());
-        eli.endpointAdded(ep, null);
-        assertEquals(1, endpointList.size());
+        List<EndpointDescription> endpoints = getEndpoints(eli);
+        assertEquals("Precondition", 0, endpoints.size());
+        eli.endpointAdded(endpoint, null);
+        assertEquals(1, endpoints.size());
 
         EasyMock.verify(zk);
     }
 
     @SuppressWarnings("unchecked")
-    private List<EndpointDescription> getEndpointsList(PublishingEndpointListener eli) throws Exception {
+    private List<EndpointDescription> getEndpoints(PublishingEndpointListener eli) throws Exception {
         Field field = eli.getClass().getDeclaredField("endpoints");
         field.setAccessible(true);
         return (List<EndpointDescription>) field.get(eli);
@@ -173,9 +173,9 @@ public class PublishingEndpointListenerT
         props.put(RemoteConstants.ENDPOINT_ID, "http://google.de:80/test");
         props.put(RemoteConstants.SERVICE_IMPORTED_CONFIGS, "myConfig");
 
-        EndpointDescription ed = new EndpointDescription(props);
+        EndpointDescription endpoint = new EndpointDescription(props);
 
-        eli.endpointAdded(ed, null);
+        eli.endpointAdded(endpoint, null);
 
         eli.close(); // should result in zk.delete(...)
 

Modified: cxf/dosgi/trunk/discovery/local/src/main/java/org/apache/cxf/dosgi/discovery/local/internal/LocalDiscovery.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/discovery/local/src/main/java/org/apache/cxf/dosgi/discovery/local/internal/LocalDiscovery.java?rev=1499699&r1=1499698&r2=1499699&view=diff
==============================================================================
--- cxf/dosgi/trunk/discovery/local/src/main/java/org/apache/cxf/dosgi/discovery/local/internal/LocalDiscovery.java (original)
+++ cxf/dosgi/trunk/discovery/local/src/main/java/org/apache/cxf/dosgi/discovery/local/internal/LocalDiscovery.java Thu Jul  4 09:16:10 2013
@@ -173,10 +173,10 @@ public class LocalDiscovery implements B
     }
 
     private void findDeclaredRemoteServices(Bundle bundle) {
-        List<EndpointDescription> eds = EndpointUtils.getAllEndpointDescriptions(bundle);
-        for (EndpointDescription ed : eds) {
-            endpointDescriptions.put(ed, bundle);
-            addedEndpointDescription(ed);
+        List<EndpointDescription> endpoints = EndpointUtils.getAllEndpointDescriptions(bundle);
+        for (EndpointDescription endpoint : endpoints) {
+            endpointDescriptions.put(endpoint, bundle);
+            addedEndpointDescription(endpoint);
         }
     }
 
@@ -191,39 +191,39 @@ public class LocalDiscovery implements B
         }
     }
 
-    private void addedEndpointDescription(EndpointDescription ed) {
-        triggerCallbacks(ed, true);
+    private void addedEndpointDescription(EndpointDescription endpoint) {
+        triggerCallbacks(endpoint, true);
     }
 
-    private void removedEndpointDescription(EndpointDescription ed) {
-        triggerCallbacks(ed, false);
+    private void removedEndpointDescription(EndpointDescription endpoint) {
+        triggerCallbacks(endpoint, false);
     }
 
-    private void triggerCallbacks(EndpointDescription ed, boolean added) {
+    private void triggerCallbacks(EndpointDescription endpoint, boolean added) {
         for (Map.Entry<EndpointListener, Collection<String>> entry : listenerToFilters.entrySet()) {
             for (String match : entry.getValue()) {
-                triggerCallbacks(entry.getKey(), match, ed, added);
+                triggerCallbacks(entry.getKey(), match, endpoint, added);
             }
         }
     }
 
     private void triggerCallbacks(EndpointListener endpointListener, String toMatch,
-            EndpointDescription ed, boolean added) {
-        if (!Utils.matchFilter(bundleContext, toMatch, ed)) {
+            EndpointDescription endpoint, boolean added) {
+        if (!Utils.matchFilter(bundleContext, toMatch, endpoint)) {
             return;
         }
 
         if (added) {
-            endpointListener.endpointAdded(ed, toMatch);
+            endpointListener.endpointAdded(endpoint, toMatch);
         } else {
-            endpointListener.endpointRemoved(ed, toMatch);
+            endpointListener.endpointRemoved(endpoint, toMatch);
         }
     }
 
     private void triggerCallbacks(Collection<String> filters, EndpointListener endpointListener) {
         for (String filter : filters) {
-            for (EndpointDescription ed : endpointDescriptions.keySet()) {
-                triggerCallbacks(endpointListener, filter, ed, true);
+            for (EndpointDescription endpoint : endpointDescriptions.keySet()) {
+                triggerCallbacks(endpointListener, filter, endpoint, true);
             }
         }
     }

Modified: cxf/dosgi/trunk/discovery/local/src/main/java/org/apache/cxf/dosgi/discovery/local/util/EndpointUtils.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/discovery/local/src/main/java/org/apache/cxf/dosgi/discovery/local/util/EndpointUtils.java?rev=1499699&r1=1499698&r2=1499699&view=diff
==============================================================================
--- cxf/dosgi/trunk/discovery/local/src/main/java/org/apache/cxf/dosgi/discovery/local/util/EndpointUtils.java (original)
+++ cxf/dosgi/trunk/discovery/local/src/main/java/org/apache/cxf/dosgi/discovery/local/util/EndpointUtils.java Thu Jul  4 09:16:10 2013
@@ -80,15 +80,15 @@ public final class EndpointUtils {
     public static List<EndpointDescription> getAllEndpointDescriptions(Bundle b) {
         List<Element> elements = getAllDescriptionElements(b);
 
-        List<EndpointDescription> eds = new ArrayList<EndpointDescription>(elements.size());
+        List<EndpointDescription> endpoints = new ArrayList<EndpointDescription>(elements.size());
         for (Element el : elements) {
             if (ENDPOINT_DESCRIPTION_ELEMENT.equals(el.getName())) {
-                eds.add(getEndpointDescription(el));
+                endpoints.add(getEndpointDescription(el));
             } else if (SERVICE_DESCRIPTION_ELEMENT.equals(el.getName())) {
-                eds.add(getLegacyEndpointDescription(el));
+                endpoints.add(getLegacyEndpointDescription(el));
             }
         }
-        return eds;
+        return endpoints;
     }
 
     @SuppressWarnings("unchecked")

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=1499699&r1=1499698&r2=1499699&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 Thu Jul  4 09:16:10 2013
@@ -175,9 +175,9 @@ public class LocalDiscoveryTest extends 
         BundleEvent be = new BundleEvent(BundleEvent.STARTED, bundle);
         ld.bundleChanged(be);
         assertEquals(1, ld.endpointDescriptions.size());
-        EndpointDescription ed = ld.endpointDescriptions.keySet().iterator().next();
-        assertEquals("http://somewhere:12345", ed.getId());
-        assertSame(bundle, ld.endpointDescriptions.get(ed));
+        EndpointDescription endpoint = ld.endpointDescriptions.keySet().iterator().next();
+        assertEquals("http://somewhere:12345", endpoint.getId());
+        assertSame(bundle, ld.endpointDescriptions.get(endpoint));
 
         EasyMock.verify(endpointListener);
 
@@ -262,8 +262,8 @@ public class LocalDiscoveryTest extends 
                 EasyMock.eq("(|(objectClass=org.example.ClassA)(objectClass=org.example.ClassB))"));
         EasyMock.expectLastCall().andAnswer(new IAnswer<Object>() {
             public Object answer() throws Throwable {
-                EndpointDescription ed = (EndpointDescription) EasyMock.getCurrentArguments()[0];
-                actualEndpoints.addAll(ed.getInterfaces());
+                EndpointDescription endpoint = (EndpointDescription) EasyMock.getCurrentArguments()[0];
+                actualEndpoints.addAll(endpoint.getInterfaces());
                 return null;
             }
         }).times(2);

Modified: cxf/dosgi/trunk/discovery/local/src/test/java/org/apache/cxf/dosgi/discovery/local/util/EndpointUtilsTest.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/discovery/local/src/test/java/org/apache/cxf/dosgi/discovery/local/util/EndpointUtilsTest.java?rev=1499699&r1=1499698&r2=1499699&view=diff
==============================================================================
--- cxf/dosgi/trunk/discovery/local/src/test/java/org/apache/cxf/dosgi/discovery/local/util/EndpointUtilsTest.java (original)
+++ cxf/dosgi/trunk/discovery/local/src/test/java/org/apache/cxf/dosgi/discovery/local/util/EndpointUtilsTest.java Thu Jul  4 09:16:10 2013
@@ -84,26 +84,26 @@ public class EndpointUtilsTest extends T
                 Collections.enumeration(Arrays.asList(ed1URL))).anyTimes();
         EasyMock.replay(b);
 
-        List<EndpointDescription> eds = EndpointUtils.getAllEndpointDescriptions(b);
-        assertEquals(4, eds.size());
-        EndpointDescription ed0 = eds.get(0);
-        assertEquals("http://somewhere:12345", ed0.getId());
-        assertEquals(Arrays.asList("SomeService"), ed0.getInterfaces());
+        List<EndpointDescription> endpoints = EndpointUtils.getAllEndpointDescriptions(b);
+        assertEquals(4, endpoints.size());
+        EndpointDescription endpoint0 = endpoints.get(0);
+        assertEquals("http://somewhere:12345", endpoint0.getId());
+        assertEquals(Arrays.asList("SomeService"), endpoint0.getInterfaces());
         assertEquals(Arrays.asList("confidentiality"),
-            ed0.getProperties().get("osgi.remote.requires.intents"));
-        assertEquals("testValue", ed0.getProperties().get("testKey"));
+            endpoint0.getProperties().get("osgi.remote.requires.intents"));
+        assertEquals("testValue", endpoint0.getProperties().get("testKey"));
 
-        EndpointDescription ed1 = eds.get(1);
-        assertEquals("myScheme://somewhere:12345", ed1.getId());
-        assertEquals(Arrays.asList("SomeOtherService", "WithSomeSecondInterface"), ed1.getInterfaces());
-
-        EndpointDescription ed2 = eds.get(2);
-        assertEquals("http://somewhere", ed2.getId());
-        assertEquals(Arrays.asList("SomeOtherService", "WithSomeSecondInterface"), ed2.getInterfaces());
-
-        EndpointDescription ed3 = eds.get(3);
-        assertEquals("http://somewhere:1/2/3/4?5", ed3.getId());
-        assertEquals(Arrays.asList("SomeOtherService", "WithSomeSecondInterface"), ed3.getInterfaces());
+        EndpointDescription endpoint1 = endpoints.get(1);
+        assertEquals("myScheme://somewhere:12345", endpoint1.getId());
+        assertEquals(Arrays.asList("SomeOtherService", "WithSomeSecondInterface"), endpoint1.getInterfaces());
+
+        EndpointDescription endpoint2 = endpoints.get(2);
+        assertEquals("http://somewhere", endpoint2.getId());
+        assertEquals(Arrays.asList("SomeOtherService", "WithSomeSecondInterface"), endpoint2.getInterfaces());
+
+        EndpointDescription endpoint3 = endpoints.get(3);
+        assertEquals("http://somewhere:1/2/3/4?5", endpoint3.getId());
+        assertEquals(Arrays.asList("SomeOtherService", "WithSomeSecondInterface"), endpoint3.getInterfaces());
     }
 
     public void testAllEndpoints2() throws Exception {
@@ -116,18 +116,18 @@ public class EndpointUtilsTest extends T
                 Collections.enumeration(Arrays.asList(ed2URL))).anyTimes();
         EasyMock.replay(b);
 
-        List<EndpointDescription> eds = EndpointUtils.getAllEndpointDescriptions(b);
-        assertEquals(2, eds.size());
-        EndpointDescription ed0 = eds.get(0);
-        assertEquals("foo:bar", ed0.getId());
-        assertEquals(Arrays.asList("com.acme.HelloService"), ed0.getInterfaces());
-        assertEquals(Arrays.asList("SOAP"), ed0.getIntents());
+        List<EndpointDescription> endpoints = EndpointUtils.getAllEndpointDescriptions(b);
+        assertEquals(2, endpoints.size());
+        EndpointDescription endpoint0 = endpoints.get(0);
+        assertEquals("foo:bar", endpoint0.getId());
+        assertEquals(Arrays.asList("com.acme.HelloService"), endpoint0.getInterfaces());
+        assertEquals(Arrays.asList("SOAP"), endpoint0.getIntents());
         // changed from exported to imported
-        assertEquals("org.apache.cxf.ws", ed0.getProperties().get("service.imported.configs"));
+        assertEquals("org.apache.cxf.ws", endpoint0.getProperties().get("service.imported.configs"));
 
-        EndpointDescription ed1 = eds.get(1);
-        Map<String, Object> props = ed1.getProperties();
-        assertEquals(Arrays.asList("com.acme.HelloService", "some.other.Service"), ed1.getInterfaces());
+        EndpointDescription endpoint1 = endpoints.get(1);
+        Map<String, Object> props = endpoint1.getProperties();
+        assertEquals(Arrays.asList("com.acme.HelloService", "some.other.Service"), endpoint1.getInterfaces());
         assertEquals("org.apache.cxf.ws", props.get("service.imported.configs"));
         // exports should have been removed
         assertNull(props.get("service.exported.configs"));
@@ -183,16 +183,16 @@ public class EndpointUtilsTest extends T
                 Collections.enumeration(Arrays.asList(sdURL))).anyTimes();
         EasyMock.replay(b);
 
-        List<EndpointDescription> eds = EndpointUtils.getAllEndpointDescriptions(b);
-        assertEquals(1, eds.size());
-        EndpointDescription ed = eds.get(0);
-        assertEquals("http://localhost:9090/greeter", ed.getId());
-        assertEquals(Arrays.asList("org.apache.cxf.ws"), ed.getConfigurationTypes());
-        assertEquals(Arrays.asList("org.apache.cxf.dosgi.samples.greeter.GreeterService"), ed.getInterfaces());
+        List<EndpointDescription> endpoints = EndpointUtils.getAllEndpointDescriptions(b);
+        assertEquals(1, endpoints.size());
+        EndpointDescription endpoint = endpoints.get(0);
+        assertEquals("http://localhost:9090/greeter", endpoint.getId());
+        assertEquals(Arrays.asList("org.apache.cxf.ws"), endpoint.getConfigurationTypes());
+        assertEquals(Arrays.asList("org.apache.cxf.dosgi.samples.greeter.GreeterService"), endpoint.getInterfaces());
         assertNull("Should not contain service.exported.*",
-                ed.getProperties().get(RemoteConstants.SERVICE_EXPORTED_INTERFACES));
+                endpoint.getProperties().get(RemoteConstants.SERVICE_EXPORTED_INTERFACES));
         assertNull("Should not contain service.exported.*",
-                ed.getProperties().get(RemoteConstants.SERVICE_EXPORTED_CONFIGS));
+                endpoint.getProperties().get(RemoteConstants.SERVICE_EXPORTED_CONFIGS));
     }
 
     public void testLegacyServiceDescriptionFormat2() {
@@ -205,18 +205,18 @@ public class EndpointUtilsTest extends T
                 Collections.enumeration(Arrays.asList(sdURL))).anyTimes();
         EasyMock.replay(b);
 
-        List<EndpointDescription> eds = EndpointUtils.getAllEndpointDescriptions(b);
-        assertEquals(2, eds.size());
+        List<EndpointDescription> endpoints = EndpointUtils.getAllEndpointDescriptions(b);
+        assertEquals(2, endpoints.size());
 
-        EndpointDescription ed0 = eds.get(0);
-        assertEquals("http://localhost:9000/org/example/SomeService", ed0.getId());
-        assertEquals(Arrays.asList("org.apache.cxf.ws"), ed0.getConfigurationTypes());
-        assertEquals(Arrays.asList("org.example.SomeService"), ed0.getInterfaces());
-        assertEquals(Arrays.asList("confidentiality"), ed0.getIntents());
-
-        EndpointDescription ed1 = eds.get(1);
-        assertEquals(Arrays.asList("SomeOtherService", "WithSomeSecondInterface"), ed1.getInterfaces());
-        assertEquals("5", ed1.getProperties().get("blah"));
+        EndpointDescription endpoint0 = endpoints.get(0);
+        assertEquals("http://localhost:9000/org/example/SomeService", endpoint0.getId());
+        assertEquals(Arrays.asList("org.apache.cxf.ws"), endpoint0.getConfigurationTypes());
+        assertEquals(Arrays.asList("org.example.SomeService"), endpoint0.getInterfaces());
+        assertEquals(Arrays.asList("confidentiality"), endpoint0.getIntents());
+
+        EndpointDescription endpoint1 = endpoints.get(1);
+        assertEquals(Arrays.asList("SomeOtherService", "WithSomeSecondInterface"), endpoint1.getInterfaces());
+        assertEquals("5", endpoint1.getProperties().get("blah"));
     }
 
     public void testCreateXML() throws Exception {

Modified: cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/ConfigurationTypeHandler.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/ConfigurationTypeHandler.java?rev=1499699&r1=1499698&r2=1499699&view=diff
==============================================================================
--- cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/ConfigurationTypeHandler.java (original)
+++ cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/ConfigurationTypeHandler.java Thu Jul  4 09:16:10 2013
@@ -39,5 +39,5 @@ public interface ConfigurationTypeHandle
     Object createProxy(ServiceReference serviceReference,
                        BundleContext dswContext,
                        BundleContext callingContext,
-                       Class<?> iClass, EndpointDescription sd) throws IntentUnsatisfiedException;
+                       Class<?> iClass, EndpointDescription endpoint) throws IntentUnsatisfiedException;
 }

Modified: cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/JaxRSPojoConfigurationTypeHandler.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/JaxRSPojoConfigurationTypeHandler.java?rev=1499699&r1=1499698&r2=1499699&view=diff
==============================================================================
--- cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/JaxRSPojoConfigurationTypeHandler.java (original)
+++ cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/JaxRSPojoConfigurationTypeHandler.java Thu Jul  4 09:16:10 2013
@@ -56,8 +56,8 @@ public class JaxRSPojoConfigurationTypeH
 
     public Object createProxy(ServiceReference serviceReference, BundleContext dswContext,
                               BundleContext callingContext, Class<?> iClass,
-                              EndpointDescription sd) throws IntentUnsatisfiedException {
-        String address = getPojoAddress(sd, iClass);
+                              EndpointDescription endpoint) throws IntentUnsatisfiedException {
+        String address = getPojoAddress(endpoint, iClass);
         if (address == null) {
             LOG.warn("Remote address is unavailable");
             return null;
@@ -65,7 +65,7 @@ public class JaxRSPojoConfigurationTypeH
 
         ClassLoader oldClassLoader = Thread.currentThread().getContextClassLoader();
         try {
-            return createJaxrsProxy(address, callingContext, dswContext, iClass, null, sd);
+            return createJaxrsProxy(address, callingContext, dswContext, iClass, null, endpoint);
         } catch (Throwable e) {
             Thread.currentThread().setContextClassLoader(oldClassLoader);
         }
@@ -74,7 +74,7 @@ public class JaxRSPojoConfigurationTypeH
             ProxyClassLoader cl = new ProxyClassLoader();
             cl.addLoader(iClass.getClassLoader());
             cl.addLoader(Client.class.getClassLoader());
-            return createJaxrsProxy(address, callingContext, dswContext, iClass, cl, sd);
+            return createJaxrsProxy(address, callingContext, dswContext, iClass, cl, endpoint);
         } catch (Throwable e) {
             LOG.warn("proxy creation failed", e);
         }
@@ -87,14 +87,14 @@ public class JaxRSPojoConfigurationTypeH
                                       BundleContext callingContext,
                                       Class<?> iClass,
                                       ClassLoader loader,
-                                      EndpointDescription sd) {
+                                      EndpointDescription endpoint) {
         JAXRSClientFactoryBean bean = new JAXRSClientFactoryBean();
         bean.setAddress(address);
         if (loader != null) {
             bean.setClassLoader(loader);
         }
 
-        addRsInterceptorsFeaturesProps(bean, callingContext, sd.getProperties());
+        addRsInterceptorsFeaturesProps(bean, callingContext, endpoint.getProperties());
 
         List<UserResource> resources = JaxRSUtils.getModel(callingContext, iClass);
         if (resources != null) {
@@ -102,7 +102,7 @@ public class JaxRSPojoConfigurationTypeH
         } else {
             bean.setServiceClass(iClass);
         }
-        List<Object> providers = JaxRSUtils.getProviders(callingContext, dswContext, sd.getProperties());
+        List<Object> providers = JaxRSUtils.getProviders(callingContext, dswContext, endpoint.getProperties());
         if (providers != null && !providers.isEmpty()) {
             bean.setProviders(providers);
         }
@@ -192,8 +192,8 @@ public class JaxRSPojoConfigurationTypeH
         return factory;
     }
 
-    protected String getPojoAddress(EndpointDescription sd, Class<?> iClass) {
-        String address = OsgiUtils.getProperty(sd, Constants.RS_ADDRESS_PROPERTY);
+    protected String getPojoAddress(EndpointDescription endpoint, Class<?> iClass) {
+        String address = OsgiUtils.getProperty(endpoint, Constants.RS_ADDRESS_PROPERTY);
 
         if (address == null) {
             address = httpServiceManager.getDefaultAddress(iClass);

Modified: cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/PojoConfigurationTypeHandler.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/PojoConfigurationTypeHandler.java?rev=1499699&r1=1499698&r2=1499699&view=diff
==============================================================================
--- cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/PojoConfigurationTypeHandler.java (original)
+++ cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/PojoConfigurationTypeHandler.java Thu Jul  4 09:16:10 2013
@@ -53,9 +53,9 @@ public class PojoConfigurationTypeHandle
         return new String[] {Constants.WS_CONFIG_TYPE, Constants.WS_CONFIG_TYPE_OLD};
     }
 
-    public Object createProxy(ServiceReference sref, BundleContext dswContext,
-            BundleContext callingContext, Class<?> iClass, EndpointDescription epd) throws IntentUnsatisfiedException {
-        Map<String, Object> sd = epd.getProperties();
+    public Object createProxy(ServiceReference sref, BundleContext dswContext, BundleContext callingContext,
+                              Class<?> iClass, EndpointDescription endpoint) throws IntentUnsatisfiedException {
+        Map<String, Object> sd = endpoint.getProperties();
         String address = getClientAddress(sd, iClass);
         if (address == null) {
             LOG.warn("Remote address is unavailable");

Modified: cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/WsdlConfigurationTypeHandler.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/WsdlConfigurationTypeHandler.java?rev=1499699&r1=1499698&r2=1499699&view=diff
==============================================================================
--- cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/WsdlConfigurationTypeHandler.java (original)
+++ cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/WsdlConfigurationTypeHandler.java Thu Jul  4 09:16:10 2013
@@ -57,8 +57,8 @@ public class WsdlConfigurationTypeHandle
                               BundleContext dswContext,
                               BundleContext callingContext,
                               Class<?> iClass,
-                              EndpointDescription sd) {
-        String wsdlAddressProp = getWsdlAddress(sd, iClass);
+                              EndpointDescription endpoint) {
+        String wsdlAddressProp = getWsdlAddress(endpoint, iClass);
         if (wsdlAddressProp == null) {
             LOG.warn("WSDL address is unavailable");
             return null;
@@ -72,21 +72,22 @@ public class WsdlConfigurationTypeHandle
             return null;
         }
 
-        LOG.info("Creating a " + sd.getInterfaces().toArray()[0] + " client, wsdl address is "
-                 + OsgiUtils.getProperty(sd, Constants.WSDL_CONFIG_PREFIX));
+        LOG.info("Creating a " + endpoint.getInterfaces().toArray()[0] + " client, wsdl address is "
+                 + OsgiUtils.getProperty(endpoint, Constants.WSDL_CONFIG_PREFIX));
 
-        String serviceNs = OsgiUtils.getProperty(sd, Constants.WSDL_SERVICE_NAMESPACE);
+        String serviceNs = OsgiUtils.getProperty(endpoint, Constants.WSDL_SERVICE_NAMESPACE);
         if (serviceNs == null) {
             serviceNs = PackageUtils.getNamespace(PackageUtils.getPackageName(iClass));
         }
-        String serviceName = OsgiUtils.getProperty(sd, Constants.WSDL_SERVICE_NAME);
+        String serviceName = OsgiUtils.getProperty(endpoint, Constants.WSDL_SERVICE_NAME);
         if (serviceName == null) {
             serviceName = iClass.getSimpleName();
         }
-        QName serviceQname = getServiceQName(iClass, sd.getProperties(),
+        QName serviceQname = getServiceQName(iClass, endpoint.getProperties(),
                                              Constants.WSDL_SERVICE_NAMESPACE,
                                              Constants.WSDL_SERVICE_NAME);
-        QName portQname = getPortQName(serviceQname.getNamespaceURI(), sd.getProperties(), Constants.WSDL_PORT_NAME);
+        QName portQname = getPortQName(serviceQname.getNamespaceURI(),
+                endpoint.getProperties(), Constants.WSDL_PORT_NAME);
         Service service = createWebService(wsdlAddress, serviceQname);
         Object proxy = getProxy(portQname == null ? service.getPort(iClass) : service.getPort(portQname, iClass),
                                 iClass);
@@ -146,8 +147,8 @@ public class WsdlConfigurationTypeHandle
         return createServerFromFactory(factory, endpointProps);
     }
 
-    private String getWsdlAddress(EndpointDescription sd, Class<?> iClass) {
-        String address = OsgiUtils.getProperty(sd, Constants.WSDL_CONFIG_PREFIX);
+    private String getWsdlAddress(EndpointDescription endpoint, Class<?> iClass) {
+        String address = OsgiUtils.getProperty(endpoint, Constants.WSDL_CONFIG_PREFIX);
         if (address == null) {
             address = httpServiceManager.getDefaultAddress(iClass);
             if (address != null) {

Modified: cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/service/ClientServiceFactory.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/service/ClientServiceFactory.java?rev=1499699&r1=1499698&r2=1499699&view=diff
==============================================================================
--- cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/service/ClientServiceFactory.java (original)
+++ cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/service/ClientServiceFactory.java Thu Jul  4 09:16:10 2013
@@ -39,31 +39,31 @@ public class ClientServiceFactory implem
 
     private BundleContext dswContext;
     private Class<?> iClass;
-    private EndpointDescription sd;
+    private EndpointDescription endpoint;
     private ConfigurationTypeHandler handler;
     private ImportRegistrationImpl importRegistration;
 
     private boolean closeable;
     private int serviceCounter;
 
-    public ClientServiceFactory(BundleContext dswContext, Class<?> iClass, EndpointDescription sd,
+    public ClientServiceFactory(BundleContext dswContext, Class<?> iClass, EndpointDescription endpoint,
                                 ConfigurationTypeHandler handler, ImportRegistrationImpl ir) {
         this.dswContext = dswContext;
         this.iClass = iClass;
-        this.sd = sd;
+        this.endpoint = endpoint;
         this.handler = handler;
         this.importRegistration = ir;
     }
 
     public Object getService(final Bundle requestingBundle, final ServiceRegistration sreg) {
-        List<String> interfaces = sd.getInterfaces();
+        List<String> interfaces = endpoint.getInterfaces();
         String interfaceName = interfaces == null || interfaces.isEmpty() ? null : interfaces.get(0);
         LOG.debug("getService() from serviceFactory for {}", interfaceName);
         try {
             Object proxy = AccessController.doPrivileged(new PrivilegedAction<Object>() {
                 public Object run() {
                     return handler.createProxy(sreg.getReference(), dswContext,
-                            requestingBundle.getBundleContext(), iClass, sd);
+                            requestingBundle.getBundleContext(), iClass, endpoint);
                 }
             });
 

Modified: cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/service/EventAdminHelper.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/service/EventAdminHelper.java?rev=1499699&r1=1499698&r2=1499699&view=diff
==============================================================================
--- cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/service/EventAdminHelper.java (original)
+++ cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/service/EventAdminHelper.java Thu Jul  4 09:16:10 2013
@@ -64,21 +64,21 @@ public class EventAdminHelper {
         Properties props = new Properties();
         setIfNotNull(props, "cause", rsae.getException());
 
-        EndpointDescription epd = null;
+        EndpointDescription endpoint = null;
         if (rsae.getImportReference() != null) {
-            epd = ((ImportRegistrationImpl)rsae.getImportReference()).getImportedEndpointAlways();
-            setIfNotNull(props, "import.registration", epd);
+            endpoint = ((ImportRegistrationImpl)rsae.getImportReference()).getImportedEndpointAlways();
+            setIfNotNull(props, "import.registration", endpoint);
         } else if (rsae.getExportReference() != null) {
-            epd = rsae.getExportReference().getExportedEndpoint();
-            setIfNotNull(props, "export.registration", epd);
+            endpoint = rsae.getExportReference().getExportedEndpoint();
+            setIfNotNull(props, "export.registration", endpoint);
         }
 
-        if (epd != null) {
-            setIfNotNull(props, "service.remote.id", epd.getServiceId());
-            setIfNotNull(props, "service.remote.uuid", epd.getFrameworkUUID());
-            setIfNotNull(props, "service.remote.uri", epd.getId());
-            setIfNotNull(props, "objectClass", epd.getInterfaces().toArray());
-            setIfNotNull(props, "service.imported.configs", epd.getConfigurationTypes());
+        if (endpoint != null) {
+            setIfNotNull(props, "service.remote.id", endpoint.getServiceId());
+            setIfNotNull(props, "service.remote.uuid", endpoint.getFrameworkUUID());
+            setIfNotNull(props, "service.remote.uri", endpoint.getId());
+            setIfNotNull(props, "objectClass", endpoint.getInterfaces().toArray());
+            setIfNotNull(props, "service.imported.configs", endpoint.getConfigurationTypes());
         }
         props.put("timestamp", System.currentTimeMillis());
         props.put("event", rsae);

Modified: cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/service/ExportReferenceImpl.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/service/ExportReferenceImpl.java?rev=1499699&r1=1499698&r2=1499699&view=diff
==============================================================================
--- cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/service/ExportReferenceImpl.java (original)
+++ cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/service/ExportReferenceImpl.java Thu Jul  4 09:16:10 2013
@@ -25,11 +25,11 @@ import org.osgi.service.remoteserviceadm
 public class ExportReferenceImpl implements ExportReference {
 
     private ServiceReference serviceReference;
-    private EndpointDescription endpointDescription;
+    private EndpointDescription endpoint;
 
-    public ExportReferenceImpl(ServiceReference serviceReference, EndpointDescription endpointDescription) {
+    public ExportReferenceImpl(ServiceReference serviceReference, EndpointDescription endpoint) {
         this.serviceReference = serviceReference;
-        this.endpointDescription = endpointDescription;
+        this.endpoint = endpoint;
     }
 
     public ExportReferenceImpl(ExportReference exportReference) {
@@ -37,7 +37,7 @@ public class ExportReferenceImpl impleme
     }
 
     public EndpointDescription getExportedEndpoint() {
-        return endpointDescription;
+        return endpoint;
     }
 
     public ServiceReference getExportedService() {
@@ -48,7 +48,7 @@ public class ExportReferenceImpl impleme
     public int hashCode() {
         final int prime = 31;
         int result = 1;
-        result = prime * result + (endpointDescription == null ? 0 : endpointDescription.hashCode());
+        result = prime * result + (endpoint == null ? 0 : endpoint.hashCode());
         result = prime * result + (serviceReference == null ? 0 : serviceReference.hashCode());
         return result;
     }
@@ -62,15 +62,15 @@ public class ExportReferenceImpl impleme
             return false;
         }
         ExportReferenceImpl other = (ExportReferenceImpl) obj;
-        boolean ed = endpointDescription == null ? other.endpointDescription == null
-                : endpointDescription.equals(other.endpointDescription);
+        boolean ed = endpoint == null ? other.endpoint == null
+                : endpoint.equals(other.endpoint);
         boolean sr = serviceReference == null ? other.serviceReference == null
                 : serviceReference.equals(other.serviceReference);
         return ed && sr;
     }
 
     synchronized void close() {
-        this.endpointDescription = null;
+        this.endpoint = null;
         this.serviceReference = null;
     }
 }

Modified: cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/service/ExportRegistrationImpl.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/service/ExportRegistrationImpl.java?rev=1499699&r1=1499698&r2=1499699&view=diff
==============================================================================
--- cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/service/ExportRegistrationImpl.java (original)
+++ cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/service/ExportRegistrationImpl.java Thu Jul  4 09:16:10 2013
@@ -117,16 +117,16 @@ public class ExportRegistrationImpl impl
         if (exportReference == null) {
             return "Exportregistration closed";
         }
-        EndpointDescription endpointDescription = getExportReference().getExportedEndpoint();
+        EndpointDescription endpoint = getExportReference().getExportedEndpoint();
         ServiceReference serviceReference = getExportReference().getExportedService();
         String r = "EndpointDescription for ServiceReference " + serviceReference;
         r += "\n";
 
         r += "*** EndpointDescription: **** \n";
-        if (endpointDescription == null) {
+        if (endpoint == null) {
             r += "---> NULL <---- \n";
         } else {
-            Set<Map.Entry<String, Object>> props = endpointDescription.getProperties().entrySet();
+            Set<Map.Entry<String, Object>> props = endpoint.getProperties().entrySet();
             for (Map.Entry<String, Object> entry : props) {
                 Object value = entry.getValue();
                 r += entry.getKey() + " => "

Modified: cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/service/ImportRegistrationImpl.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/service/ImportRegistrationImpl.java?rev=1499699&r1=1499698&r2=1499699&view=diff
==============================================================================
--- cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/service/ImportRegistrationImpl.java (original)
+++ cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/service/ImportRegistrationImpl.java Thu Jul  4 09:16:10 2013
@@ -35,7 +35,7 @@ public class ImportRegistrationImpl impl
 
     private volatile Throwable exception;
     private volatile ServiceRegistration importedService; // used only in parent
-    private EndpointDescription importedEndpoint;
+    private EndpointDescription endpoint;
     private volatile ClientServiceFactory clientServiceFactory;
     private RemoteServiceAdminCore rsaCore;
     private boolean closed;
@@ -50,8 +50,8 @@ public class ImportRegistrationImpl impl
     }
 
     public ImportRegistrationImpl(EndpointDescription endpoint, RemoteServiceAdminCore rsac) {
-        importedEndpoint = endpoint;
-        rsaCore = rsac;
+        this.endpoint = endpoint;
+        this.rsaCore = rsac;
         initParent();
     }
 
@@ -62,7 +62,7 @@ public class ImportRegistrationImpl impl
         // we always want a link to the parent...
         parent = ir.getParent();
         exception = parent.getException();
-        importedEndpoint = parent.getImportedEndpointDescription();
+        endpoint = parent.getImportedEndpointDescription();
         clientServiceFactory = parent.clientServiceFactory;
         rsaCore = parent.rsaCore;
 
@@ -158,7 +158,7 @@ public class ImportRegistrationImpl impl
     }
 
     public EndpointDescription getImportedEndpointDescription() {
-        return isInvalid() ? null : importedEndpoint;
+        return isInvalid() ? null : endpoint;
     }
 
     @Override
@@ -224,6 +224,6 @@ public class ImportRegistrationImpl impl
      * @return the imported endpoint
      */
     public EndpointDescription getImportedEndpointAlways() {
-        return importedEndpoint;
+        return endpoint;
     }
 }

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=1499699&r1=1499698&r2=1499699&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 Thu Jul  4 09:16:10 2013
@@ -164,8 +164,9 @@ public class RemoteServiceAdminCore impl
             if (interfaceClass != null) {
                 ExportResult exportResult = handler.createServer(serviceReference, bctx, bundle.getBundleContext(),
                     serviceProperties, interfaceClass, service);
-                EndpointDescription epd = new EndpointDescription(exportResult.getEndpointProps());
-                ExportRegistrationImpl exportRegistration = new ExportRegistrationImpl(serviceReference, epd, this);
+                EndpointDescription endpoint = new EndpointDescription(exportResult.getEndpointProps());
+                ExportRegistrationImpl exportRegistration = new ExportRegistrationImpl(
+                        serviceReference, endpoint, this);
                 if (exportResult.getException() == null) {
                     LOG.info("created server for interface " + iface);
                     exportRegistration.setServer(exportResult.getServer());
@@ -364,13 +365,13 @@ public class RemoteServiceAdminCore impl
                 actualContext = requestingContext;
             }
 
-            EndpointDescription ed = imReg.getImportedEndpointDescription();
+            EndpointDescription endpoint = imReg.getImportedEndpointDescription();
             /* TODO: add additional local params... */
-            Dictionary<String, Object> serviceProps = new Hashtable<String, Object>(ed.getProperties());
+            Dictionary<String, Object> serviceProps = new Hashtable<String, Object>(endpoint.getProperties());
             serviceProps.put(RemoteConstants.SERVICE_IMPORTED, true);
             serviceProps.remove(RemoteConstants.SERVICE_EXPORTED_INTERFACES);
 
-            ClientServiceFactory csf = new ClientServiceFactory(actualContext, iClass, ed, handler, imReg);
+            ClientServiceFactory csf = new ClientServiceFactory(actualContext, iClass, endpoint, handler, imReg);
             imReg.setClientServiceFactory(csf);
             ServiceRegistration proxyReg = actualContext.registerService(interfaceName, csf, serviceProps);
             imReg.setImportedServiceRegistration(proxyReg);

Modified: cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/util/OsgiUtils.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/util/OsgiUtils.java?rev=1499699&r1=1499698&r2=1499699&view=diff
==============================================================================
--- cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/util/OsgiUtils.java (original)
+++ cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/util/OsgiUtils.java Thu Jul  4 09:16:10 2013
@@ -67,8 +67,8 @@ public final class OsgiUtils {
         }
     }
 
-    public static String getProperty(EndpointDescription sd, String name) {
-        return getProperty(sd.getProperties(), name);
+    public static String getProperty(EndpointDescription endpoint, String name) {
+        return getProperty(endpoint.getProperties(), name);
     }
 
     @SuppressWarnings("rawtypes")

Modified: cxf/dosgi/trunk/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/handlers/ClientServiceFactoryTest.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/handlers/ClientServiceFactoryTest.java?rev=1499699&r1=1499698&r2=1499699&view=diff
==============================================================================
--- cxf/dosgi/trunk/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/handlers/ClientServiceFactoryTest.java (original)
+++ cxf/dosgi/trunk/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/handlers/ClientServiceFactoryTest.java Thu Jul  4 09:16:10 2013
@@ -47,10 +47,10 @@ public class ClientServiceFactoryTest ex
         map.put(RemoteConstants.SERVICE_IMPORTED_CONFIGS, "myGreatConfiguration");
         map.put(Constants.OBJECTCLASS, new String[]{"my.class"});
 
-        EndpointDescription ed = new EndpointDescription(map);
+        EndpointDescription endpoint = new EndpointDescription(map);
         ConfigurationTypeHandler handler = control.createMock(ConfigurationTypeHandler.class);
 
-        ImportRegistrationImpl iri = new ImportRegistrationImpl(ed, null);
+        ImportRegistrationImpl iri = new ImportRegistrationImpl(endpoint, null);
 
         BundleContext requestingContext = control.createMock(BundleContext.class);
         Bundle requestingBundle = control.createMock(Bundle.class);
@@ -60,11 +60,11 @@ public class ClientServiceFactoryTest ex
         ServiceRegistration sreg = control.createMock(ServiceRegistration.class);
         EasyMock.expect(sreg.getReference()).andReturn(sr);
 
-        handler.createProxy(sr, dswContext, requestingContext, String.class, ed);
+        handler.createProxy(sr, dswContext, requestingContext, String.class, endpoint);
         EasyMock.expectLastCall().andReturn(myTestProxyObject);
         control.replay();
 
-        ClientServiceFactory csf = new ClientServiceFactory(dswContext, String.class, ed, handler, iri);
+        ClientServiceFactory csf = new ClientServiceFactory(dswContext, String.class, endpoint, handler, iri);
         assertSame(myTestProxyObject, csf.getService(requestingBundle, sreg));
     }
 }

Modified: cxf/dosgi/trunk/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/service/ImportRegistrationImplTest.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/service/ImportRegistrationImplTest.java?rev=1499699&r1=1499698&r2=1499699&view=diff
==============================================================================
--- cxf/dosgi/trunk/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/service/ImportRegistrationImplTest.java (original)
+++ cxf/dosgi/trunk/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/service/ImportRegistrationImplTest.java Thu Jul  4 09:16:10 2013
@@ -48,22 +48,22 @@ public class ImportRegistrationImplTest 
     @Test
     public void testDefaultCtor() {
         IMocksControl c = EasyMock.createNiceControl();
-        EndpointDescription ed = c.createMock(EndpointDescription.class);
+        EndpointDescription endpoint = c.createMock(EndpointDescription.class);
         RemoteServiceAdminCore rsac = c.createMock(RemoteServiceAdminCore.class);
 
         c.replay();
 
-        ImportRegistrationImpl i = new ImportRegistrationImpl(ed, rsac);
+        ImportRegistrationImpl i = new ImportRegistrationImpl(endpoint, rsac);
 
         assertNull(i.getException());
         assertEquals(i, i.getParent());
-        assertEquals(ed, i.getImportedEndpointDescription());
+        assertEquals(endpoint, i.getImportedEndpointDescription());
     }
 
     @Test
     public void testCloneAndClose() {
         IMocksControl c = EasyMock.createControl();
-        EndpointDescription ed = c.createMock(EndpointDescription.class);
+        EndpointDescription endpoint = c.createMock(EndpointDescription.class);
         RemoteServiceAdminCore rsac = c.createMock(RemoteServiceAdminCore.class);
 
         ServiceRegistration sr = c.createMock(ServiceRegistration.class);
@@ -72,7 +72,7 @@ public class ImportRegistrationImplTest 
 
         c.replay();
 
-        ImportRegistrationImpl i1 = new ImportRegistrationImpl(ed, rsac);
+        ImportRegistrationImpl i1 = new ImportRegistrationImpl(endpoint, rsac);
 
         ImportRegistrationImpl i2 = new ImportRegistrationImpl(i1);
 
@@ -91,9 +91,9 @@ public class ImportRegistrationImplTest 
         assertEquals(i1, i2.getParent());
         assertEquals(i1, i3.getParent());
 
-        assertEquals(ed, i1.getImportedEndpointDescription());
-        assertEquals(ed, i2.getImportedEndpointDescription());
-        assertEquals(ed, i3.getImportedEndpointDescription());
+        assertEquals(endpoint, i1.getImportedEndpointDescription());
+        assertEquals(endpoint, i2.getImportedEndpointDescription());
+        assertEquals(endpoint, i3.getImportedEndpointDescription());
 
         c.verify();
         c.reset();
@@ -137,12 +137,12 @@ public class ImportRegistrationImplTest 
     @Test
     public void testCloseAll() {
         IMocksControl c = EasyMock.createControl();
-        EndpointDescription ed = c.createMock(EndpointDescription.class);
+        EndpointDescription endpoint = c.createMock(EndpointDescription.class);
         RemoteServiceAdminCore rsac = c.createMock(RemoteServiceAdminCore.class);
 
         c.replay();
 
-        ImportRegistrationImpl i1 = new ImportRegistrationImpl(ed, rsac);
+        ImportRegistrationImpl i1 = new ImportRegistrationImpl(endpoint, rsac);
 
         ImportRegistrationImpl i2 = new ImportRegistrationImpl(i1);
 

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=1499699&r1=1499698&r2=1499699&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 Thu Jul  4 09:16:10 2013
@@ -218,9 +218,9 @@ public class RemoteServiceAdminCoreTest 
         assertEquals(1, ereg.size());
         assertNull(ereg.get(0).getException());
         assertSame(sref, ereg.get(0).getExportReference().getExportedService());
-        EndpointDescription ed = ereg.get(0).getExportReference().getExportedEndpoint();
+        EndpointDescription endpoint = ereg.get(0).getExportReference().getExportedEndpoint();
 
-        Map<String, Object> edProps = ed.getProperties();
+        Map<String, Object> edProps = endpoint.getProperties();
         assertEquals("http://something", edProps.get("endpoint.id"));
         assertNotNull(edProps.get("service.imported"));
         assertTrue(Arrays.equals(new String[] {"java.lang.Runnable"},

Modified: cxf/dosgi/trunk/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/util/OsgiUtilsTest.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/util/OsgiUtilsTest.java?rev=1499699&r1=1499698&r2=1499699&view=diff
==============================================================================
--- cxf/dosgi/trunk/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/util/OsgiUtilsTest.java (original)
+++ cxf/dosgi/trunk/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/util/OsgiUtilsTest.java Thu Jul  4 09:16:10 2013
@@ -183,10 +183,10 @@ public class OsgiUtilsTest extends TestC
         p.put(org.osgi.framework.Constants.OBJECTCLASS, new String[]{"my.class"});
         p.put(RemoteConstants.SERVICE_IMPORTED_CONFIGS, new String[]{"my.config"});
 
-        EndpointDescription ep = new EndpointDescription(p);
+        EndpointDescription endpoint = new EndpointDescription(p);
 
-        assertNull(OsgiUtils.getProperty(ep, "unknownProp"));
-        assertEquals(p.get(RemoteConstants.ENDPOINT_ID), OsgiUtils.getProperty(ep, RemoteConstants.ENDPOINT_ID));
-        assertEquals(null, OsgiUtils.getProperty(ep, "notAString"));
+        assertNull(OsgiUtils.getProperty(endpoint, "unknownProp"));
+        assertEquals(p.get(RemoteConstants.ENDPOINT_ID), OsgiUtils.getProperty(endpoint, RemoteConstants.ENDPOINT_ID));
+        assertEquals(null, OsgiUtils.getProperty(endpoint, "notAString"));
     }
 }

Modified: cxf/dosgi/trunk/dsw/cxf-topology-manager/src/main/java/org/apache/cxf/dosgi/topologymanager/exporter/EndpointRepository.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/dsw/cxf-topology-manager/src/main/java/org/apache/cxf/dosgi/topologymanager/exporter/EndpointRepository.java?rev=1499699&r1=1499698&r2=1499699&view=diff
==============================================================================
--- cxf/dosgi/trunk/dsw/cxf-topology-manager/src/main/java/org/apache/cxf/dosgi/topologymanager/exporter/EndpointRepository.java (original)
+++ cxf/dosgi/trunk/dsw/cxf-topology-manager/src/main/java/org/apache/cxf/dosgi/topologymanager/exporter/EndpointRepository.java Thu Jul  4 09:16:10 2013
@@ -98,13 +98,13 @@ class EndpointRepository {
     }
 
     synchronized Collection<EndpointDescription> getAllEndpoints() {
-        List<EndpointDescription> endpoints = new ArrayList<EndpointDescription>();
+        List<EndpointDescription> allEndpoints = new ArrayList<EndpointDescription>();
         for (Map<RemoteServiceAdmin, Collection<EndpointDescription>> exports : exportedServices.values()) {
-            for (Collection<EndpointDescription> regs : exports.values()) {
-                endpoints.addAll(regs);
+            for (Collection<EndpointDescription> endpoints : exports.values()) {
+                allEndpoints.addAll(endpoints);
             }
         }
-        return endpoints;
+        return allEndpoints;
     }
 
     synchronized Set<ServiceReference> getServicesToBeExportedFor(RemoteServiceAdmin rsa) {

Modified: cxf/dosgi/trunk/dsw/cxf-topology-manager/src/main/java/org/apache/cxf/dosgi/topologymanager/importer/TopologyManagerImport.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/dsw/cxf-topology-manager/src/main/java/org/apache/cxf/dosgi/topologymanager/importer/TopologyManagerImport.java?rev=1499699&r1=1499698&r2=1499699&view=diff
==============================================================================
--- cxf/dosgi/trunk/dsw/cxf-topology-manager/src/main/java/org/apache/cxf/dosgi/topologymanager/importer/TopologyManagerImport.java (original)
+++ cxf/dosgi/trunk/dsw/cxf-topology-manager/src/main/java/org/apache/cxf/dosgi/topologymanager/importer/TopologyManagerImport.java Thu Jul  4 09:16:10 2013
@@ -146,43 +146,43 @@ public class TopologyManagerImport imple
         }
     }
 
-    public void endpointAdded(EndpointDescription epd, String filter) {
+    public void endpointAdded(EndpointDescription endpoint, String filter) {
         if (filter == null) {
             LOG.error("Endpoint is not handled because no matching filter was provided!");
             return;
         }
-        LOG.debug("importable service added for filter {}, endpoint {}", filter, epd);
-        addImportPossibility(epd, filter);
+        LOG.debug("importable service added for filter {}, endpoint {}", filter, endpoint);
+        addImportPossibility(endpoint, filter);
         triggerImport(filter);
     }
 
-    public void endpointRemoved(EndpointDescription epd, String filter) {
-        LOG.debug("EndpointRemoved {}", epd);
-        removeImportPossibility(epd, filter);
+    public void endpointRemoved(EndpointDescription endpoint, String filter) {
+        LOG.debug("EndpointRemoved {}", endpoint);
+        removeImportPossibility(endpoint, filter);
         triggerImport(filter);
     }
 
-    private void addImportPossibility(EndpointDescription epd, String filter) {
+    private void addImportPossibility(EndpointDescription endpoint, String filter) {
         synchronized (importPossibilities) {
-            List<EndpointDescription> ips = importPossibilities.get(filter);
-            if (ips == null) {
-                ips = new ArrayList<EndpointDescription>();
-                importPossibilities.put(filter, ips);
+            List<EndpointDescription> endpoints = importPossibilities.get(filter);
+            if (endpoints == null) {
+                endpoints = new ArrayList<EndpointDescription>();
+                importPossibilities.put(filter, endpoints);
             }
             // prevent adding the same endpoint multiple times, which can happen sometimes,
             // and which causes imports to remain available even when services are actually down
-            if (!ips.contains(epd)) {
-                ips.add(epd);
+            if (!endpoints.contains(endpoint)) {
+                endpoints.add(endpoint);
             }
         }
     }
 
-    private void removeImportPossibility(EndpointDescription epd, String filter) {
+    private void removeImportPossibility(EndpointDescription endpoint, String filter) {
         synchronized (importPossibilities) {
-            List<EndpointDescription> ips = importPossibilities.get(filter);
-            if (ips != null) {
-                ips.remove(epd);
-                if (ips.isEmpty()) {
+            List<EndpointDescription> endpoints = importPossibilities.get(filter);
+            if (endpoints != null) {
+                endpoints.remove(endpoint);
+                if (endpoints.isEmpty()) {
                     importPossibilities.remove(filter);
                 }
             }
@@ -220,8 +220,8 @@ public class TopologyManagerImport imple
             if (importRegistrations != null) {
                 // iterate over a copy
                 for (ImportRegistration ir : new ArrayList<ImportRegistration>(importRegistrations)) {
-                    EndpointDescription ep = ir.getImportReference().getImportedEndpoint();
-                    if (!isImportPossibilityAvailable(ep, filter)) {
+                    EndpointDescription endpoint = ir.getImportReference().getImportedEndpoint();
+                    if (!isImportPossibilityAvailable(endpoint, filter)) {
                         removeImport(ir, null); // also unexports the service
                     }
                 }
@@ -229,10 +229,10 @@ public class TopologyManagerImport imple
         }
     }
 
-    private boolean isImportPossibilityAvailable(EndpointDescription ep, String filter) {
+    private boolean isImportPossibilityAvailable(EndpointDescription endpoint, String filter) {
         synchronized (importPossibilities) {
-            List<EndpointDescription> ips = importPossibilities.get(filter);
-            return ips != null && ips.contains(ep);
+            List<EndpointDescription> endpoints = importPossibilities.get(filter);
+            return endpoints != null && endpoints.contains(endpoint);
         }
     }
 
@@ -249,12 +249,12 @@ public class TopologyManagerImport imple
     private void importServices(String filter) {
         synchronized (importedServices) {
             List<ImportRegistration> importRegistrations = importedServices.get(filter);
-            for (EndpointDescription epd : getImportPossibilitiesCopy(filter)) {
+            for (EndpointDescription endpoint : getImportPossibilitiesCopy(filter)) {
                 // TODO but optional: if the service is already imported and the endpoint is still
                 // in the list of possible imports check if a "better" endpoint is now in the list
-                if (!alreadyImported(epd, importRegistrations)) {
+                if (!alreadyImported(endpoint, importRegistrations)) {
                     // service not imported yet -> import it now
-                    ImportRegistration ir = importService(epd);
+                    ImportRegistration ir = importService(endpoint);
                     if (ir != null) {
                         // import was successful
                         if (importRegistrations == null) {
@@ -271,10 +271,10 @@ public class TopologyManagerImport imple
         }
     }
 
-    private boolean alreadyImported(EndpointDescription epd, List<ImportRegistration> importRegistrations) {
+    private boolean alreadyImported(EndpointDescription endpoint, List<ImportRegistration> importRegistrations) {
         if (importRegistrations != null) {
             for (ImportRegistration ir : importRegistrations) {
-                if (epd.equals(ir.getImportReference().getImportedEndpoint())) {
+                if (endpoint.equals(ir.getImportReference().getImportedEndpoint())) {
                     return true;
                 }
             }
@@ -285,12 +285,12 @@ public class TopologyManagerImport imple
     /**
      * Tries to import the service with each rsa until one import is successful
      *
-     * @param ep endpoint to import
+     * @param endpoint endpoint to import
      * @return import registration of the first successful import
      */
-    private ImportRegistration importService(EndpointDescription ep) {
+    private ImportRegistration importService(EndpointDescription endpoint) {
         for (RemoteServiceAdmin rsa : remoteServiceAdminTracker.getAllServices()) {
-            ImportRegistration ir = rsa.importService(ep);
+            ImportRegistration ir = rsa.importService(endpoint);
             if (ir != null && ir.getException() == null) {
                 LOG.debug("Service import was successful {}", ir);
                 return ir;

Modified: cxf/dosgi/trunk/dsw/cxf-topology-manager/src/main/java/org/apache/cxf/dosgi/topologymanager/util/Utils.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/dsw/cxf-topology-manager/src/main/java/org/apache/cxf/dosgi/topologymanager/util/Utils.java?rev=1499699&r1=1499698&r2=1499699&view=diff
==============================================================================
--- cxf/dosgi/trunk/dsw/cxf-topology-manager/src/main/java/org/apache/cxf/dosgi/topologymanager/util/Utils.java (original)
+++ cxf/dosgi/trunk/dsw/cxf-topology-manager/src/main/java/org/apache/cxf/dosgi/topologymanager/util/Utils.java Thu Jul  4 09:16:10 2013
@@ -43,14 +43,14 @@ public final class Utils {
     /**
      * Retrieves an endpoint's properties as a Dictionary.
      *
-     * @param ep an endpoint description
+     * @param endpoint an endpoint description
      * @return endpoint properties (will never return null)
      */
-    public static Dictionary<String, Object> getEndpointProperties(EndpointDescription ep) {
-        if (ep == null || ep.getProperties() == null) {
+    public static Dictionary<String, Object> getEndpointProperties(EndpointDescription endpoint) {
+        if (endpoint == null || endpoint.getProperties() == null) {
             return new Hashtable<String, Object>();
         } else {
-            return new Hashtable<String, Object>(ep.getProperties());
+            return new Hashtable<String, Object>(endpoint.getProperties());
         }
     }
 

Modified: cxf/dosgi/trunk/dsw/cxf-topology-manager/src/test/java/org/apache/cxf/dosgi/topologymanager/exporter/EndpointListenerNotifierTest.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/dsw/cxf-topology-manager/src/test/java/org/apache/cxf/dosgi/topologymanager/exporter/EndpointListenerNotifierTest.java?rev=1499699&r1=1499698&r2=1499699&view=diff
==============================================================================
--- cxf/dosgi/trunk/dsw/cxf-topology-manager/src/test/java/org/apache/cxf/dosgi/topologymanager/exporter/EndpointListenerNotifierTest.java (original)
+++ cxf/dosgi/trunk/dsw/cxf-topology-manager/src/test/java/org/apache/cxf/dosgi/topologymanager/exporter/EndpointListenerNotifierTest.java Thu Jul  4 09:16:10 2013
@@ -47,8 +47,8 @@ public class EndpointListenerNotifierTes
         BundleContext bc = c.createMock(BundleContext.class);
         ServiceReference sref = c.createMock(ServiceReference.class);
         EndpointListener epl = EasyMock.createMock(EndpointListener.class);
-        EndpointDescription epd = c.createMock(EndpointDescription.class);
-        EndpointDescription epd2 = c.createMock(EndpointDescription.class);
+        EndpointDescription endpoint = c.createMock(EndpointDescription.class);
+        EndpointDescription endpoint2 = c.createMock(EndpointDescription.class);
 
         Map<String, Object> props = new HashMap<String, Object>();
         String[] oc = new String[1];
@@ -69,11 +69,11 @@ public class EndpointListenerNotifierTes
         EasyMock.expect(sref.getProperty(EasyMock.eq(EndpointListener.ENDPOINT_LISTENER_SCOPE)))
             .andReturn("(objectClass=myClass)").anyTimes();
 
-        EasyMock.expect(epd.getProperties()).andReturn(props).anyTimes();
-        EasyMock.expect(epd2.getProperties()).andReturn(props2).anyTimes();
+        EasyMock.expect(endpoint.getProperties()).andReturn(props).anyTimes();
+        EasyMock.expect(endpoint2.getProperties()).andReturn(props2).anyTimes();
 
         // must only be called for the first EndpointDescription!
-        epl.endpointRemoved(EasyMock.eq(epd), EasyMock.eq("(objectClass=myClass)"));
+        epl.endpointRemoved(EasyMock.eq(endpoint), EasyMock.eq("(objectClass=myClass)"));
         EasyMock.expectLastCall().once();
 
         EndpointRepository exportRepository = EasyMock.createMock(EndpointRepository.class);
@@ -84,8 +84,8 @@ public class EndpointListenerNotifierTes
         EndpointListenerNotifier tm = new EndpointListenerNotifier(bc, exportRepository);
 
         List<EndpointDescription> endpoints = new ArrayList<EndpointDescription>();
-        endpoints.add(epd);
-        endpoints.add(epd2);
+        endpoints.add(endpoint);
+        endpoints.add(endpoint2);
 
         tm.notifyListener(false, sref, endpoints);
 

Modified: cxf/dosgi/trunk/dsw/cxf-topology-manager/src/test/java/org/apache/cxf/dosgi/topologymanager/importer/TopologyManagerImportTest.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/dsw/cxf-topology-manager/src/test/java/org/apache/cxf/dosgi/topologymanager/importer/TopologyManagerImportTest.java?rev=1499699&r1=1499698&r2=1499699&view=diff
==============================================================================
--- cxf/dosgi/trunk/dsw/cxf-topology-manager/src/test/java/org/apache/cxf/dosgi/topologymanager/importer/TopologyManagerImportTest.java (original)
+++ cxf/dosgi/trunk/dsw/cxf-topology-manager/src/test/java/org/apache/cxf/dosgi/topologymanager/importer/TopologyManagerImportTest.java Thu Jul  4 09:16:10 2013
@@ -58,7 +58,7 @@ public class TopologyManagerImportTest {
                                            EasyMock.anyObject(),
                                            (Dictionary)EasyMock.anyObject())).andReturn(sreg).anyTimes();
 
-        EndpointDescription epd = c.createMock(EndpointDescription.class);
+        EndpointDescription endpoint = c.createMock(EndpointDescription.class);
         RemoteServiceAdmin rsa = c.createMock(RemoteServiceAdmin.class);
         final ImportRegistration ireg = c.createMock(ImportRegistration.class);
         EasyMock.expect(ireg.getException()).andReturn(null).anyTimes();
@@ -67,21 +67,21 @@ public class TopologyManagerImportTest {
         rsaTracker.addListener(EasyMock.<SimpleServiceTrackerListener>anyObject());
         EasyMock.expect(rsaTracker.getAllServices()).andReturn(Arrays.asList(rsa)).anyTimes();
 
-        EasyMock.expect(rsa.importService(EasyMock.eq(epd))).andAnswer(new IAnswer<ImportRegistration>() {
+        EasyMock.expect(rsa.importService(EasyMock.eq(endpoint))).andAnswer(new IAnswer<ImportRegistration>() {
             public ImportRegistration answer() throws Throwable {
                 sema.release();
                 return ireg;
             }
         }).once();
         EasyMock.expect(ireg.getImportReference()).andReturn(iref).anyTimes();
-        EasyMock.expect(iref.getImportedEndpoint()).andReturn(epd).anyTimes();
+        EasyMock.expect(iref.getImportedEndpoint()).andReturn(endpoint).anyTimes();
         c.replay();
 
         TopologyManagerImport tm = new TopologyManagerImport(bc, rsaTracker);
 
         tm.start();
         // no RSA available yet so no import...
-        tm.endpointAdded(epd, "myFilter");
+        tm.endpointAdded(endpoint, "myFilter");
         tm.triggerImportsForRemoteServiceAdmin(rsa);
         assertTrue("importService should have been called on RemoteServiceAdmin",
                    sema.tryAcquire(100, TimeUnit.SECONDS));



Mime
View raw message