Rename addListener/removeListener to be addEndpointListener/removeEndpointListener as there are now multiple types of listener, and change the running composite methods to use the composite uri instead of its QName

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1124140 13f79535-47bb-0310-9956-ffa450edef68

3 files changed, 10 insertions, 10 deletions

diff --git a/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/BaseDomainRegistry.java b/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/BaseDomainRegistry.java
index e3743d535a..bb20ae5337 100644
--- a/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/BaseDomainRegistry.java
+++ b/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/BaseDomainRegistry.java
@@ -65,7 +65,7 @@ public abstract class BaseDomainRegistry implements DomainRegistry, LifeCycleLis
         logger.fine("Add endpoint reference - " + endpointReference);
     }
 
-    public void addListener(EndpointListener listener) {
+    public void addEndpointListener(EndpointListener listener) {
         listeners.add(listener);
     }
 
@@ -149,7 +149,7 @@ public abstract class BaseDomainRegistry implements DomainRegistry, LifeCycleLis
         logger.fine("Remove endpoint reference - " + endpointReference);
     }
 
-    public void removeListener(EndpointListener listener) {
+    public void removeEndpointListener(EndpointListener listener) {
         listeners.remove(listener);
     }
 
diff --git a/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/BaseDomainRegistryFactory.java b/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/BaseDomainRegistryFactory.java
index 7f707030ae..ce38eb4eee 100644
--- a/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/BaseDomainRegistryFactory.java
+++ b/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/BaseDomainRegistryFactory.java
@@ -68,7 +68,7 @@ public abstract class BaseDomainRegistryFactory implements DomainRegistryFactory
         }
 
         for (EndpointListener listener : listeners) {
-            domainRegistry.addListener(listener);
+            domainRegistry.addEndpointListener(listener);
         }
         domainRegistries.put(key, domainRegistry);
         return domainRegistry;
@@ -97,7 +97,7 @@ public abstract class BaseDomainRegistryFactory implements DomainRegistryFactory
     public synchronized void addListener(EndpointListener listener) {
         listeners.add(listener);
         for (DomainRegistry registry : domainRegistries.values()) {
-            registry.addListener(listener);
+            registry.addEndpointListener(listener);
         }
     }
 
@@ -108,7 +108,7 @@ public abstract class BaseDomainRegistryFactory implements DomainRegistryFactory
     public synchronized void removeListener(EndpointListener listener) {
         listeners.remove(listener);
         for (DomainRegistry registry : domainRegistries.values()) {
-            registry.removeListener(listener);
+            registry.removeEndpointListener(listener);
         }
     }
 
diff --git a/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DomainRegistry.java b/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DomainRegistry.java
index 95fca25431..c1d5d855d9 100644
--- a/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DomainRegistry.java
+++ b/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DomainRegistry.java
@@ -76,8 +76,8 @@ public interface DomainRegistry {
      */
     public List<EndpointReference> findEndpointReferences( String uri );
 
-    void addListener(EndpointListener listener);
-    void removeListener(EndpointListener listener);
+    void addEndpointListener(EndpointListener listener);
+    void removeEndpointListener(EndpointListener listener);
 
     String getDomainURI();
 
@@ -92,8 +92,8 @@ public interface DomainRegistry {
 
     // TODO: Change to use the QName instead of Composite and have clients look up the Composite from the contribution themselves, but i need to get that working first
     void addRunningComposite(String contributionURI, Composite composite);
-    void removeRunningComposite(String contributionURI, QName name);
-    Map<String, List<QName>> getRunningCompositeNames();
-    Composite getRunningComposite(String contributionURI, QName name);
+    void removeRunningComposite(String contributionURI, String compositeURI);
+    Map<String, List<String>> getRunningCompositeURIs();
+    Composite getRunningComposite(String contributionURI, String compositeURI);
 
 }