Updates to match the DomainRegistry changes to 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@1124143 13f79535-47bb-0310-9956-ffa450edef68

4 files changed, 23 insertions, 23 deletions

diff --git a/sca-java-2.x/trunk/modules/domain-node/src/test/java/org/apache/tuscany/sca/impl/Node2TestCase.java b/sca-java-2.x/trunk/modules/domain-node/src/test/java/org/apache/tuscany/sca/impl/Node2TestCase.java
index 17963d97c9..dcb35995a8 100644
--- a/sca-java-2.x/trunk/modules/domain-node/src/test/java/org/apache/tuscany/sca/impl/Node2TestCase.java
+++ b/sca-java-2.x/trunk/modules/domain-node/src/test/java/org/apache/tuscany/sca/impl/Node2TestCase.java
@@ -143,7 +143,7 @@ public class Node2TestCase {
         node.installContribution("src/test/resources/export.jar");

         node.validateContribution("import");

         node.startComposite("import", "helloworld.composite");

-        Map<String, List<QName>> scs = node.getStartedComposites();

+        Map<String, List<String>> scs = node.getStartedCompositeURIs();

         Assert.assertEquals(1, scs.size());            

     }

 

@@ -160,7 +160,7 @@ public class Node2TestCase {
         nodeB.installContribution("src/test/resources/export.jar");

         nodeA.validateContribution("import");

         nodeA.startComposite("import", "helloworld.composite");

-        Map<String, List<QName>> scs = nodeB.getStartedComposites();

+        Map<String, List<String>> scs = nodeB.getStartedCompositeURIs();

         Assert.assertEquals(1, scs.size());            

     }

 

@@ -168,17 +168,17 @@ public class Node2TestCase {
     public void startTest() throws NoSuchServiceException, NoSuchDomainException, ContributionReadException, ActivationException, ValidationException {

         Node node = TuscanyRuntime.newInstance().createNode("ImportTestCase");

         node.installContribution("src/test/resources/sample-helloworld.jar");

-        Assert.assertEquals(0, node.getStartedComposites().size());

+        Assert.assertEquals(0, node.getStartedCompositeURIs().size());

 

         node.startComposite("sample-helloworld", "helloworld.composite");

-        Assert.assertEquals(1, node.getStartedComposites().size());

-        Assert.assertEquals("helloworld", node.getStartedComposites().get("sample-helloworld").get(0).getLocalPart());

+        Assert.assertEquals(1, node.getStartedCompositeURIs().size());

+        Assert.assertEquals("helloworld.composite", node.getStartedCompositeURIs().get("sample-helloworld").get(0));

         

         node.stopComposite("sample-helloworld", "helloworld.composite");

 //        Assert.assertEquals(0, node.getStartedComposites().size());

         node.startComposite("sample-helloworld", "helloworld.composite");

-        Assert.assertEquals(1, node.getStartedComposites().size());

-        Assert.assertEquals("helloworld", node.getStartedComposites().get("sample-helloworld").get(0).getLocalPart());

+        Assert.assertEquals(1, node.getStartedCompositeURIs().size());

+        Assert.assertEquals("helloworld.composite", node.getStartedCompositeURIs().get("sample-helloworld").get(0));

         node.stopComposite("sample-helloworld", "helloworld.composite");

     }

 

@@ -199,7 +199,7 @@ public class Node2TestCase {
         String compositeURI = node.addDeploymentComposite(curi, new StringReader(compositeXML));

 

         node.startComposite(curi, compositeURI);

-        Assert.assertEquals(1, node.getStartedComposites().size());

+        Assert.assertEquals(1, node.getStartedCompositeURIs().size());

         

         Composite dc = node.getDomainComposite();

         Assert.assertEquals(1, dc.getIncludes().size());

diff --git a/sca-java-2.x/trunk/modules/domain-node/src/test/java/org/apache/tuscany/sca/runtime/DeployerTestCase.java b/sca-java-2.x/trunk/modules/domain-node/src/test/java/org/apache/tuscany/sca/runtime/DeployerTestCase.java
index 8713d0b478..f32ff81625 100644
--- a/sca-java-2.x/trunk/modules/domain-node/src/test/java/org/apache/tuscany/sca/runtime/DeployerTestCase.java
+++ b/sca-java-2.x/trunk/modules/domain-node/src/test/java/org/apache/tuscany/sca/runtime/DeployerTestCase.java
@@ -74,9 +74,9 @@ public class DeployerTestCase {
         monitor.analyzeProblems();
         String cmpuri = node.addDeploymentComposite("foo", composite);
         node.startComposite("foo", cmpuri);
-        Map<String, List<QName>> dcs = node.getStartedComposites();
+        Map<String, List<String>> dcs = node.getStartedCompositeURIs();
         Assert.assertEquals(1, dcs.size());
-        Assert.assertEquals("helloworld2", dcs.get("foo").get(0).getLocalPart());
+        Assert.assertEquals("helloworld2.composite", dcs.get("foo").get(0));
     }
 
     @Test
@@ -88,9 +88,9 @@ public class DeployerTestCase {
 
         String cmpuri = node.addDeploymentComposite("foo", new FileReader(new File("src/test/resources/helloworld2.composite")));
         node.startComposite("foo", cmpuri);
-        Map<String, List<QName>> dcs = node.getStartedComposites();
+        Map<String, List<String>> dcs = node.getStartedCompositeURIs();
         Assert.assertEquals(1, dcs.size());
-        Assert.assertEquals("helloworld2", dcs.get("foo").get(0).getLocalPart());
+        Assert.assertEquals("helloworld2.composite", dcs.get("foo").get(0));
     }
 
 }
diff --git a/sca-java-2.x/trunk/modules/domain-node/src/test/java/org/apache/tuscany/sca/runtime/NodeXMLTestCase.java b/sca-java-2.x/trunk/modules/domain-node/src/test/java/org/apache/tuscany/sca/runtime/NodeXMLTestCase.java
index ca4ea32c4d..c7041fa5b4 100644
--- a/sca-java-2.x/trunk/modules/domain-node/src/test/java/org/apache/tuscany/sca/runtime/NodeXMLTestCase.java
+++ b/sca-java-2.x/trunk/modules/domain-node/src/test/java/org/apache/tuscany/sca/runtime/NodeXMLTestCase.java
@@ -40,9 +40,9 @@ public class NodeXMLTestCase {
         List<String> cs = node.getInstalledContributionURIs();
         Assert.assertEquals(1, cs.size());
         Assert.assertEquals("sample-helloworld", cs.get(0));
-        Map<String, List<QName>> startedComposites = node.getStartedComposites();
+        Map<String, List<String>> startedComposites = node.getStartedCompositeURIs();
         Assert.assertEquals(1, startedComposites.size());
-        Assert.assertEquals("helloworld", startedComposites.get("sample-helloworld").get(0).getLocalPart());
+        Assert.assertEquals("helloworld.composite", startedComposites.get("sample-helloworld").get(0));
     }
 
 }
diff --git a/sca-java-2.x/trunk/modules/domain-node/src/test/java/org/apache/tuscany/sca/runtime/TuscanyRuntimeTestCase.java b/sca-java-2.x/trunk/modules/domain-node/src/test/java/org/apache/tuscany/sca/runtime/TuscanyRuntimeTestCase.java
index 55d164c56e..4aa50447ad 100644
--- a/sca-java-2.x/trunk/modules/domain-node/src/test/java/org/apache/tuscany/sca/runtime/TuscanyRuntimeTestCase.java
+++ b/sca-java-2.x/trunk/modules/domain-node/src/test/java/org/apache/tuscany/sca/runtime/TuscanyRuntimeTestCase.java
@@ -57,7 +57,7 @@ public class TuscanyRuntimeTestCase {
         node.installContribution("helloworld", "src/test/resources/sample-helloworld.jar", null, null);
         node.startComposite("helloworld", "helloworld.composite");
 
-        Map<String, List<QName>> ci = node.getStartedComposites();
+        Map<String, List<String>> ci = node.getStartedCompositeURIs();
         Assert.assertEquals(1, ci.size());
 
         Helloworld helloworldService = node.getService(Helloworld.class, "HelloworldComponent");
@@ -130,10 +130,10 @@ public class TuscanyRuntimeTestCase {
         node.installContribution("foo", "src/test/resources/sample-helloworld.jar", null, null);
         List<String> dcs = node.startDeployables("foo");
         Assert.assertEquals(1, dcs.size());
-        Map<String, List<QName>> dcsx = node.getStartedComposites();
+        Map<String, List<String>> dcsx = node.getStartedCompositeURIs();
         Assert.assertEquals(1, dcsx.size());
         node.stopComposite("foo", "helloworld.composite");
-        dcsx = node.getStartedComposites();
+        dcsx = node.getStartedCompositeURIs();
         Assert.assertEquals(0, dcsx.size());
     }
 
@@ -143,9 +143,9 @@ public class TuscanyRuntimeTestCase {
         node.installContribution("helloworld", "src/test/resources/sample-helloworld-nodeployable.jar", "src/test/resources/sca-contribution-generated.xml", null);
         node.startComposite("helloworld", "helloworld.composite");
 
-        Map<String, List<QName>> dcs = node.getStartedComposites();
+        Map<String, List<String>> dcs = node.getStartedCompositeURIs();
         Assert.assertEquals(1, dcs.size());
-        Assert.assertEquals("helloworld", dcs.get("helloworld").get(0).getLocalPart());
+        Assert.assertEquals("helloworld.composite", dcs.get("helloworld").get(0));
 
         Helloworld helloworldService = node.getService(Helloworld.class, "HelloworldComponent");
         Assert.assertEquals("Hello petra", helloworldService.sayHello("petra"));
@@ -163,9 +163,9 @@ public class TuscanyRuntimeTestCase {
         Node node = TuscanyRuntime.runComposite("helloworld.composite", "src/test/resources/sample-helloworld.jar");
         List<String> cs = node.getInstalledContributionURIs();
         Assert.assertEquals(1, cs.size());
-        Map<String, List<QName>> dcs = node.getStartedComposites();
+        Map<String, List<String>> dcs = node.getStartedCompositeURIs();
         Assert.assertEquals(1, dcs.size());
-        Assert.assertEquals("helloworld", dcs.get("sample-helloworld").get(0).getLocalPart());
+        Assert.assertEquals("helloworld.composite", dcs.get("sample-helloworld").get(0));
     }
 
     @Test
@@ -173,9 +173,9 @@ public class TuscanyRuntimeTestCase {
         Node node = TuscanyRuntime.runComposite(null, "src/test/resources/sample-helloworld.jar");
         List<String> cs = node.getInstalledContributionURIs();
         Assert.assertEquals(1, cs.size());
-        Map<String, List<QName>> dcs = node.getStartedComposites();
+        Map<String, List<String>> dcs = node.getStartedCompositeURIs();
         Assert.assertEquals(1, dcs.size());
-        Assert.assertEquals("helloworld", dcs.get("sample-helloworld").get(0).getLocalPart());
+        Assert.assertEquals("helloworld.composite", dcs.get("sample-helloworld").get(0));
     }
     @Test
     public void testRunComposite() throws NoSuchServiceException {