Author: jsdelfino
Date: Sat Apr 19 10:50:50 2008
New Revision: 649834
URL: http://svn.apache.org/viewvc?rev=649834&view=rev
Log:
Fixed the node/service binding URI determination algorithm to handle services
from included composites, by fusing the included composites before working on
their binding URIs.
Modified:
incubator/tuscany/java/sca/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/DeployableCompositeCollectionImpl.java
Modified:
incubator/tuscany/java/sca/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/DeployableCompositeCollectionImpl.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/DeployableCompositeCollectionImpl.java?rev=649834&r1=649833&r2=649834&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/DeployableCompositeCollectionImpl.java
(original)
+++
incubator/tuscany/java/sca/modules/workspace-admin/src/main/java/org/apache/tuscany/sca/workspace/admin/impl/DeployableCompositeCollectionImpl.java
Sat Apr 19 10:50:50 2008
@@ -62,6 +62,7 @@
import org.apache.tuscany.sca.assembly.builder.CompositeBuilderException;
import org.apache.tuscany.sca.assembly.builder.impl.CompositeBuilderImpl;
import
org.apache.tuscany.sca.assembly.builder.impl.CompositeConfigurationBuilderImpl;
+import
org.apache.tuscany.sca.assembly.builder.impl.CompositeIncludeBuilderImpl;
import org.apache.tuscany.sca.assembly.xml.Constants;
import org.apache.tuscany.sca.contribution.Artifact;
import org.apache.tuscany.sca.contribution.Contribution;
@@ -132,6 +133,7 @@
private StAXArtifactProcessor<Composite> compositeProcessor;
private XMLOutputFactory outputFactory;
private CompositeBuilder compositeBuilder;
+ private CompositeIncludeBuilderImpl compositeIncludeBuilder;
private CompositeConfigurationBuilderImpl compositeConfigurationBuilder;
private List<ContributionListener> contributionListeners;
@@ -184,6 +186,8 @@
compositeBuilder = new CompositeBuilderImpl(assemblyFactory,
scaBindingFactory, intentAttachPointTypeFactory,
contractMapper, monitor);
+ compositeIncludeBuilder = new CompositeIncludeBuilderImpl(monitor);
+
compositeConfigurationBuilder = new
CompositeConfigurationBuilderImpl(assemblyFactory,
scaBindingFactory,
intentAttachPointTypeFactory,
@@ -376,6 +380,9 @@
// add the deployable composite to the domain composite
domainComposite.getIncludes().add(deployable);
+
+ // Fuse includes into the deployable composite
+ compositeIncludeBuilder.fuseIncludes(deployable);
// store away the composite we are generating the deployable XML
for.
if (qname.equals(deployable.getName())){
@@ -429,7 +436,7 @@
}
}
- // build the domain composite
+ // Build the domain composite
try {
compositeBuilder.build(domainComposite);
} catch (CompositeBuilderException e) {
@@ -437,13 +444,12 @@
return;
}
- // rebuild the requested composite from the domain composite
- // we have to reverse the flatterning that went on when the domain
+ // Rebuild the requested composite from the domain composite
+ // we have to reverse the flattening that went on when the domain
// composite was built
List<Component> tempComponentList = new ArrayList<Component>();
tempComponentList.addAll(compositeImage.getComponents());
compositeImage.getComponents().clear();
-
for (Component inputComponent : tempComponentList){
for (Component deployComponent : domainComposite.getComponents()){
if
(deployComponent.getName().equals(inputComponent.getName())){
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
