From 3571fa366df88a6bfba3e4ec972f5ec6e7bdd1da Mon Sep 17 00:00:00 2001 From: slaws Date: Thu, 8 Apr 2010 12:21:20 +0000 Subject: TUSCANY-3529 - update binding matching to turn on code that looks at binding type provided intents git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@931904 13f79535-47bb-0310-9956-ffa450edef68 --- .../java/org/apache/tuscany/sca/node/impl/NodeFactoryImpl.java | 10 ++++++++++ .../main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java | 9 +++++++-- 2 files changed, 17 insertions(+), 2 deletions(-) (limited to 'sca-java-2.x/trunk/modules/node-impl/src/main/java/org/apache/tuscany/sca') diff --git a/sca-java-2.x/trunk/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeFactoryImpl.java b/sca-java-2.x/trunk/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeFactoryImpl.java index e0691ab11b..349c28d66e 100644 --- a/sca-java-2.x/trunk/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeFactoryImpl.java +++ b/sca-java-2.x/trunk/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeFactoryImpl.java @@ -471,4 +471,14 @@ public class NodeFactoryImpl extends NodeFactory { super.configure(attributes); } + /** + * Added to allow the node access to the deployer in order to get + * to the systemContribution and hence set up the CompositeContext so that + * the runtime epr matching algorithm can get at the binding types + * @return + */ + public Deployer getDeployer() { + return deployer; + } + } diff --git a/sca-java-2.x/trunk/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java b/sca-java-2.x/trunk/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java index eef9f39009..36091bec6c 100644 --- a/sca-java-2.x/trunk/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java +++ b/sca-java-2.x/trunk/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java @@ -128,8 +128,13 @@ public class NodeImpl implements Node { domainComposite = manager.configureNode(configuration, contributions, context); this.compositeContext = - new CompositeContext(manager.registry, endpointRegistry, domainComposite, configuration - .getDomainURI(), configuration.getURI()); + new CompositeContext(manager.registry, + endpointRegistry, + domainComposite, + configuration.getDomainURI(), + configuration.getURI(), + manager.getDeployer().getSystemDefinitions()); + CompositeContext.setThreadCompositeContext(compositeContext); } finally { // Reset the thread context monitor -- cgit v1.2.3