Author: antelder
Date: Tue Jun 14 06:48:46 2011
New Revision: 1135389
URL: http://svn.apache.org/viewvc?rev=1135389&view=rev
Log:
Fix getDeployables so that any composites added with addDeployable are included
in all the deployables
Modified:
tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/NodeImpl.java
Modified:
tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/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/impl/NodeImpl.java?rev=1135389&r1=1135388&r2=1135389&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/NodeImpl.java
(original)
+++
tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/impl/NodeImpl.java
Tue Jun 14 06:48:46 2011
@@ -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 {