diff options
author | nash <nash@13f79535-47bb-0310-9956-ffa450edef68> | 2009-09-13 22:18:22 +0000 |
---|---|---|
committer | nash <nash@13f79535-47bb-0310-9956-ffa450edef68> | 2009-09-13 22:18:22 +0000 |
commit | dd73db6726242b59890a257f08e5c1ba7090bde3 (patch) | |
tree | a37c0c96375df9b4ec89a065caa0d1def0b0ef3a /branches/sca-java-1.x/samples/domain-management/src/main | |
parent | 5c5a7b298776e002c4d3f9b85bee5c0802c99252 (diff) |
Copy r800411 and r807024 changes from 1.5.1 branch to 1.x branch
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@814399 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to '')
2 files changed, 8 insertions, 4 deletions
diff --git a/branches/sca-java-1.x/samples/domain-management/src/main/java/manager/DistributeAndRunComponents.java b/branches/sca-java-1.x/samples/domain-management/src/main/java/manager/DistributeAndRunComponents.java index 67bd07dfb6..83eff15a6a 100644 --- a/branches/sca-java-1.x/samples/domain-management/src/main/java/manager/DistributeAndRunComponents.java +++ b/branches/sca-java-1.x/samples/domain-management/src/main/java/manager/DistributeAndRunComponents.java @@ -157,12 +157,13 @@ public class DistributeAndRunComponents { SCABindingFactory scaBindingFactory = modelFactories.getFactory(SCABindingFactory.class); IntentAttachPointTypeFactory attachPointTypeFactory = modelFactories.getFactory(IntentAttachPointTypeFactory.class); InterfaceContractMapper contractMapper = utilities.getUtility(InterfaceContractMapper.class); + Map<Binding, Binding> bindingMap = new HashMap<Binding, Binding>(); domainCompositeBuilder = new CompositeBuilderImpl(assemblyFactory, scaBindingFactory, attachPointTypeFactory, - documentBuilderFactory, transformerFactory, contractMapper, monitor); + documentBuilderFactory, transformerFactory, contractMapper, monitor, bindingMap); // Create a node composite builder nodeCompositeBuilder = new NodeCompositeBuilderImpl(assemblyFactory, scaBindingFactory, - documentBuilderFactory, transformerFactory, contractMapper, null, monitor); + documentBuilderFactory, transformerFactory, contractMapper, null, monitor, bindingMap); } diff --git a/branches/sca-java-1.x/samples/domain-management/src/main/java/manager/DistributeComponents.java b/branches/sca-java-1.x/samples/domain-management/src/main/java/manager/DistributeComponents.java index 08ddc8875e..090cd02f43 100644 --- a/branches/sca-java-1.x/samples/domain-management/src/main/java/manager/DistributeComponents.java +++ b/branches/sca-java-1.x/samples/domain-management/src/main/java/manager/DistributeComponents.java @@ -25,8 +25,10 @@ import java.io.File; import java.io.IOException; import java.net.URI; import java.net.URL; +import java.util.HashMap; import java.util.HashSet; import java.util.List; +import java.util.Map; import java.util.Set; import javax.xml.namespace.QName; @@ -168,12 +170,13 @@ public class DistributeComponents { SCABindingFactory scaBindingFactory = modelFactories.getFactory(SCABindingFactory.class); IntentAttachPointTypeFactory attachPointTypeFactory = modelFactories.getFactory(IntentAttachPointTypeFactory.class); InterfaceContractMapper contractMapper = utilities.getUtility(InterfaceContractMapper.class); + Map<Binding, Binding> bindingMap = new HashMap<Binding, Binding>(); domainCompositeBuilder = new CompositeBuilderImpl(assemblyFactory, scaBindingFactory, attachPointTypeFactory, - documentBuilderFactory, transformerFactory, contractMapper, monitor); + documentBuilderFactory, transformerFactory, contractMapper, monitor, bindingMap); // Create a node composite builder nodeCompositeBuilder = new NodeCompositeBuilderImpl(assemblyFactory, scaBindingFactory, - documentBuilderFactory, transformerFactory, contractMapper, null, monitor); + documentBuilderFactory, transformerFactory, contractMapper, null, monitor, bindingMap); } |