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/modules/domain-manager/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 'branches/sca-java-1.x/modules/domain-manager/src/main')
2 files changed, 7 insertions, 2 deletions
diff --git a/branches/sca-java-1.x/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/CompositeConfigurationServiceImpl.java b/branches/sca-java-1.x/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/CompositeConfigurationServiceImpl.java index 5de0002086..4178a2e8a0 100644 --- a/branches/sca-java-1.x/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/CompositeConfigurationServiceImpl.java +++ b/branches/sca-java-1.x/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/CompositeConfigurationServiceImpl.java @@ -48,6 +48,7 @@ import javax.xml.stream.XMLStreamWriter; import javax.xml.transform.TransformerFactory; import org.apache.tuscany.sca.assembly.AssemblyFactory; +import org.apache.tuscany.sca.assembly.Binding; import org.apache.tuscany.sca.assembly.Component; import org.apache.tuscany.sca.assembly.Composite; import org.apache.tuscany.sca.assembly.SCABindingFactory; @@ -151,6 +152,7 @@ public class CompositeConfigurationServiceImpl extends HttpServlet implements Se private DocumentBuilderFactory documentBuilderFactory; private TransformerFactory transformerFactory; private InterfaceContractMapper contractMapper; + private Map<Binding, Binding> bindingMap; /** * Initialize the component. @@ -202,7 +204,9 @@ public class CompositeConfigurationServiceImpl extends HttpServlet implements Se intentAttachPointTypeFactory = modelFactories.getFactory(IntentAttachPointTypeFactory.class); contractMapper = utilities.getUtility(InterfaceContractMapper.class); compositeIncludeBuilder = new CompositeIncludeBuilderImpl(monitor); - nodeConfigurationBuilder = new NodeCompositeBuilderImpl(assemblyFactory, scaBindingFactory, documentBuilderFactory, transformerFactory, contractMapper, null, monitor); + bindingMap = new HashMap<Binding, Binding>(); + nodeConfigurationBuilder = new NodeCompositeBuilderImpl(assemblyFactory, scaBindingFactory, documentBuilderFactory, + transformerFactory, contractMapper, null, monitor, bindingMap); // Load the definitions.xml loadSCADefinitions(extensionPoints); @@ -393,7 +397,7 @@ public class CompositeConfigurationServiceImpl extends HttpServlet implements Se } CompositeBuilder compositeBuilder = new CompositeBuilderImpl(assemblyFactory, null, scaBindingFactory, intentAttachPointTypeFactory, documentBuilderFactory, transformerFactory, - contractMapper, aggregatedDefinitions, monitor); + contractMapper, aggregatedDefinitions, monitor, bindingMap); try { compositeBuilder.build(domainComposite); analyzeProblems(); diff --git a/branches/sca-java-1.x/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/QuickStartServiceImpl.java b/branches/sca-java-1.x/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/QuickStartServiceImpl.java index 23c506446f..cf9e5b67fc 100644 --- a/branches/sca-java-1.x/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/QuickStartServiceImpl.java +++ b/branches/sca-java-1.x/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/QuickStartServiceImpl.java @@ -207,6 +207,7 @@ public class QuickStartServiceImpl extends HttpServlet { " <component name=\"" + nodeName + "\">\n" + " <t:implementation.node uri=\"" + contributionURI + "\" composite=\"c:" + compositeName.getLocalPart() + "\"/>\n" + " <service name=\"Node\">\n" + + " <binding.sca uri=\"" + nodeURI + "\"/>\n" + " <binding.ws uri=\"" + nodeURI + "\"/>\n" + " <t:binding.http uri=\"" + nodeURI + "\"/>\n" + " <t:binding.jsonrpc uri=\"" + nodeURI + "\"/>\n" + |