diff options
3 files changed, 6 insertions, 6 deletions
diff --git a/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/node2/impl/NodeImpl.java b/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/node2/impl/NodeImpl.java index 1862e8b5f8..40ea587684 100644 --- a/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/node2/impl/NodeImpl.java +++ b/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/node2/impl/NodeImpl.java @@ -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; } diff --git a/sca-java-2.x/trunk/modules/domain-node/src/test/java/org/apache/tuscany/sca/node2/DeployerTestCase.java b/sca-java-2.x/trunk/modules/domain-node/src/test/java/org/apache/tuscany/sca/node2/DeployerTestCase.java index c66e1cacaa..450e5a8b3e 100644 --- a/sca-java-2.x/trunk/modules/domain-node/src/test/java/org/apache/tuscany/sca/node2/DeployerTestCase.java +++ b/sca-java-2.x/trunk/modules/domain-node/src/test/java/org/apache/tuscany/sca/node2/DeployerTestCase.java @@ -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)); } } diff --git a/sca-java-2.x/trunk/modules/domain-node/src/test/java/org/apache/tuscany/sca/node2/NodeTestCase.java b/sca-java-2.x/trunk/modules/domain-node/src/test/java/org/apache/tuscany/sca/node2/NodeTestCase.java index 9c19e3a8c4..d82287926b 100644 --- a/sca-java-2.x/trunk/modules/domain-node/src/test/java/org/apache/tuscany/sca/node2/NodeTestCase.java +++ b/sca-java-2.x/trunk/modules/domain-node/src/test/java/org/apache/tuscany/sca/node2/NodeTestCase.java @@ -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)); } } |