Author: jsdelfino
Date: Sat May 17 09:41:45 2008
New Revision: 657391
URL: http://svn.apache.org/viewvc?rev=657391&view=rev
Log:
Added missing name to composite.
Modified:
incubator/tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/CompositeConfigurationServiceImpl.java
Modified:
incubator/tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/CompositeConfigurationServiceImpl.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/CompositeConfigurationServiceImpl.java?rev=657391&r1=657390&r2=657391&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/CompositeConfigurationServiceImpl.java
(original)
+++
incubator/tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/CompositeConfigurationServiceImpl.java
Sat May 17 09:41:45 2008
@@ -292,13 +292,15 @@
// find the node that will run this composite and the default
// bindings that it configures
Component nodeComponent = null;
+ QName nodeCompositeName = null;
for (Composite cloudComposite : cloudsComposite.getIncludes()) {
for (Component nc : cloudComposite.getComponents()) {
NodeImplementation nodeImplementation =
(NodeImplementation)nc.getImplementation();
if
(nodeImplementation.getComposite().getName().equals(compositeName) &&
nodeImplementation.getComposite().getURI().equals(contributionURI)) {
- nodeComponent = nc;
nodeImplementation.setComposite(composite);
+ nodeComponent = nc;
+ nodeCompositeName = cloudComposite.getName();
break;
}
}
@@ -307,6 +309,7 @@
if (nodeComponent != null) {
try {
Composite nodeComposite =
assemblyFactory.createComposite();
+ nodeComposite.setName(nodeCompositeName);
nodeComposite.getComponents().add(nodeComponent);
nodeConfigurationBuilder.build(nodeComposite);
} catch (CompositeBuilderException e) {
