svn commit: r960659 - in /tuscany/sca-java-2.x/trunk/modules/domain-node/src: main/java/org/apache/tuscany/sca/node2/impl/NodeImpl.java test/java/org/apache/tuscany/sca/node2/DeployerTestCase.java test/java/org/apache/tuscany/sca/node2/NodeTestCase.java

[an...@apache.org]

Author: antelder
Date: Mon Jul  5 18:59:18 2010
New Revision: 960659

URL: http://svn.apache.org/viewvc?rev=960659&view=rev
Log:
Change getDeployedComposites to return the composite relative uri instead of the absolute uri

Modified:
    tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/node2/impl/NodeImpl.java
    tuscany/sca-java-2.x/trunk/modules/domain-node/src/test/java/org/apache/tuscany/sca/node2/DeployerTestCase.java
    tuscany/sca-java-2.x/trunk/modules/domain-node/src/test/java/org/apache/tuscany/sca/node2/NodeTestCase.java

Modified: tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/node2/impl/NodeImpl.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/node2/impl/NodeImpl.java?rev=960659&r1=960658&r2=960659&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/node2/impl/NodeImpl.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/node2/impl/NodeImpl.java Mon Jul  5 18:59:18 2010
@@ -279,7 +279,7 @@ public class NodeImpl implements Node {
             throw new IllegalArgumentException("no contribution found for: " + contributionURI);
         }
         for (DeployedComposite dc : ic.getDeployedComposites()) {
-            compositeURIs.add(ic.getURI() + "/" + dc.getURI());
+            compositeURIs.add(dc.getURI());
         }
         return compositeURIs;
     }

Modified: tuscany/sca-java-2.x/trunk/modules/domain-node/src/test/java/org/apache/tuscany/sca/node2/DeployerTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/domain-node/src/test/java/org/apache/tuscany/sca/node2/DeployerTestCase.java?rev=960659&r1=960658&r2=960659&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/domain-node/src/test/java/org/apache/tuscany/sca/node2/DeployerTestCase.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/domain-node/src/test/java/org/apache/tuscany/sca/node2/DeployerTestCase.java Mon Jul  5 18:59:18 2010
@@ -71,7 +71,7 @@ public class DeployerTestCase {
         node.addDeploymentComposite("foo", composite);
         List<String> dcs = node.getDeployedCompostes("foo");
         Assert.assertEquals(1, dcs.size());
-        Assert.assertEquals("foo/helloworld2.composite", dcs.get(0));
+        Assert.assertEquals("helloworld2.composite", dcs.get(0));
     }
 
 }

Modified: tuscany/sca-java-2.x/trunk/modules/domain-node/src/test/java/org/apache/tuscany/sca/node2/NodeTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/domain-node/src/test/java/org/apache/tuscany/sca/node2/NodeTestCase.java?rev=960659&r1=960658&r2=960659&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/domain-node/src/test/java/org/apache/tuscany/sca/node2/NodeTestCase.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/domain-node/src/test/java/org/apache/tuscany/sca/node2/NodeTestCase.java Mon Jul  5 18:59:18 2010
@@ -89,7 +89,7 @@ public class NodeTestCase {
         node.installContribution("foo", "src/test/resources/sample-helloworld.jar", null, null, true);
         List<String> dcs = node.getDeployedCompostes("foo");
         Assert.assertEquals(1, dcs.size());
-        Assert.assertEquals("foo/helloworld.composite", dcs.get(0));
+        Assert.assertEquals("helloworld.composite", dcs.get(0));
     }
 
     @Test
@@ -108,7 +108,7 @@ public class NodeTestCase {
 
         List<String> dcs = node.getDeployedCompostes("helloworld");
         Assert.assertEquals(1, dcs.size());
-        Assert.assertEquals("helloworld/helloworld.composite", dcs.get(0));
+        Assert.assertEquals("helloworld.composite", dcs.get(0));
 
 //        Helloworld helloworldService = scaClientFactory.getService(Helloworld.class, "HelloworldComponent");
 //        Assert.assertEquals("Hello petra", helloworldService.sayHello("petra"));
@@ -128,7 +128,7 @@ public class NodeTestCase {
         Assert.assertEquals(1, cs.size());
         List<String> dcs = node.getDeployedCompostes(cs.get(0));
         Assert.assertEquals(1, dcs.size());
-        Assert.assertEquals("sample-helloworld/helloworld.composite", dcs.get(0));
+        Assert.assertEquals("helloworld.composite", dcs.get(0));
     }
 
     @Test
@@ -138,6 +138,6 @@ public class NodeTestCase {
         Assert.assertEquals(1, cs.size());
         List<String> dcs = node.getDeployedCompostes(cs.get(0));
         Assert.assertEquals(1, dcs.size());
-        Assert.assertEquals("sample-helloworld/helloworld.composite", dcs.get(0));
+        Assert.assertEquals("helloworld.composite", dcs.get(0));
     }
 }