archive/apache-tuscany
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Change getDeployedComposites to return the composite relative uri instead of the absolute uri

Browse source 
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@960659 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
antelder 2010-07-05 18:59:18 +00:00
commit d5bbdc5161
3 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/node2/impl/NodeImpl.java
View file

@ -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;
}

2
sca-java-2.x/trunk/modules/domain-node/src/test/java/org/apache/tuscany/sca/node2/DeployerTestCase.java
View file

@ -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));
}
}

8
sca-java-2.x/trunk/modules/domain-node/src/test/java/org/apache/tuscany/sca/node2/NodeTestCase.java
View file

@ -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));
}
}