You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by an...@apache.org on 2011/05/18 11:35:56 UTC
svn commit: r1124140 - in
/tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime:
BaseDomainRegistry.java BaseDomainRegistryFactory.java DomainRegistry.java
Author: antelder
Date: Wed May 18 09:35:56 2011
New Revision: 1124140
URL: http://svn.apache.org/viewvc?rev=1124140&view=rev
Log:
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
Modified:
tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/BaseDomainRegistry.java
tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/BaseDomainRegistryFactory.java
tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DomainRegistry.java
Modified: tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/BaseDomainRegistry.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/BaseDomainRegistry.java?rev=1124140&r1=1124139&r2=1124140&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/BaseDomainRegistry.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/BaseDomainRegistry.java Wed May 18 09:35:56 2011
@@ -65,7 +65,7 @@ public abstract class BaseDomainRegistry
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
logger.fine("Remove endpoint reference - " + endpointReference);
}
- public void removeListener(EndpointListener listener) {
+ public void removeEndpointListener(EndpointListener listener) {
listeners.remove(listener);
}
Modified: tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/BaseDomainRegistryFactory.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/BaseDomainRegistryFactory.java?rev=1124140&r1=1124139&r2=1124140&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/BaseDomainRegistryFactory.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/BaseDomainRegistryFactory.java Wed May 18 09:35:56 2011
@@ -68,7 +68,7 @@ public abstract class BaseDomainRegistry
}
for (EndpointListener listener : listeners) {
- domainRegistry.addListener(listener);
+ domainRegistry.addEndpointListener(listener);
}
domainRegistries.put(key, domainRegistry);
return domainRegistry;
@@ -97,7 +97,7 @@ public abstract class BaseDomainRegistry
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 BaseDomainRegistry
public synchronized void removeListener(EndpointListener listener) {
listeners.remove(listener);
for (DomainRegistry registry : domainRegistries.values()) {
- registry.removeListener(listener);
+ registry.removeEndpointListener(listener);
}
}
Modified: tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DomainRegistry.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DomainRegistry.java?rev=1124140&r1=1124139&r2=1124140&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DomainRegistry.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DomainRegistry.java Wed May 18 09:35:56 2011
@@ -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);
}