summaryrefslogtreecommitdiffstats
path: root/sca-java-2.x/trunk/modules/domain-node
diff options
context:
space:
mode:
authorantelder <antelder@13f79535-47bb-0310-9956-ffa450edef68>2011-06-14 06:48:46 +0000
committerantelder <antelder@13f79535-47bb-0310-9956-ffa450edef68>2011-06-14 06:48:46 +0000
commit745f458002e384d4de784449685e9fc21e667a99 (patch)
treed418cac2d5152d114e64d2036f26a007fe015735 /sca-java-2.x/trunk/modules/domain-node
parent4bdede666fe9e6b28034a2e3995f1238b15f8f78 (diff)
Fix getDeployables so that any composites added with addDeployable are included in all the deployables
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1135389 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'sca-java-2.x/trunk/modules/domain-node')
-rw-r--r--sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/NodeImpl.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/NodeImpl.java b/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/NodeImpl.java
index 0a840aa66f..2abc441728 100644
--- a/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/NodeImpl.java
+++ b/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/NodeImpl.java
@@ -175,7 +175,9 @@ public class NodeImpl implements Node {
public List<String> getDeployableCompositeURIs(String contributionURI) {
ContributionDescription cd = domainRegistry.getInstalledContribution(contributionURI);
- return new ArrayList<String>(cd.getDeployables());
+ List<String> deployables = new ArrayList<String>(cd.getDeployables());
+ deployables.addAll(cd.getAdditionalDeployables().keySet());
+ return deployables;
}
public String addDeploymentComposite(String contributionURI, Reader compositeXML) throws ContributionReadException, XMLStreamException, ValidationException {