diff options
| author | rfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68> | 2008-07-09 22:51:48 +0000 |
|---|---|---|
| committer | rfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68> | 2008-07-09 22:51:48 +0000 |
| commit | 212e0b44dac194a5fa9a37c386985fa43bbf016b (patch) | |
| tree | 960a4a5b4df1176baf7740b6cb256bc90c1a3603 /branches/sca-java-1.3/modules/implementation-node-runtime | |
| parent | e7bad91576a64b9116cd04504df80639333b5be5 (diff) | |
Merge fix for TUSCANY-2409 from trunk
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@675373 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'branches/sca-java-1.3/modules/implementation-node-runtime')
2 files changed, 3 insertions, 3 deletions
diff --git a/branches/sca-java-1.3/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationLauncherBootstrap.java b/branches/sca-java-1.3/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationLauncherBootstrap.java index 397dcba433..f997d26cac 100644 --- a/branches/sca-java-1.3/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationLauncherBootstrap.java +++ b/branches/sca-java-1.3/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationLauncherBootstrap.java @@ -20,9 +20,9 @@ package org.apache.tuscany.sca.implementation.node.launcher; import org.apache.tuscany.sca.node.SCAClient; +import org.apache.tuscany.sca.node.SCAContribution; import org.apache.tuscany.sca.node.SCANode2; import org.apache.tuscany.sca.node.SCANode2Factory; -import org.apache.tuscany.sca.node.SCANode2Factory.SCAContribution; import org.osoa.sca.CallableReference; import org.osoa.sca.ServiceReference; @@ -91,7 +91,7 @@ public class NodeImplementationLauncherBootstrap { */ public NodeImplementationLauncherBootstrap(String configurationURI) throws Exception { SCANode2Factory nodeFactory = SCANode2Factory.newInstance(); - node = new NodeFacade(nodeFactory.createSCANode(configurationURI)); + node = new NodeFacade(nodeFactory.createSCANodeFromURL(configurationURI)); } /** diff --git a/branches/sca-java-1.3/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/webapp/NodeWebAppServletHost.java b/branches/sca-java-1.3/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/webapp/NodeWebAppServletHost.java index 7902866aa0..47b42c9224 100644 --- a/branches/sca-java-1.3/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/webapp/NodeWebAppServletHost.java +++ b/branches/sca-java-1.3/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/webapp/NodeWebAppServletHost.java @@ -113,7 +113,7 @@ public class NodeWebAppServletHost implements ServletHost, Filter { // Create the SCA node SCANode2Factory nodeFactory = SCANode2Factory.newInstance(); - node = nodeFactory.createSCANode(nodeConfiguration); + node = nodeFactory.createSCANodeFromURL(nodeConfiguration); // Register the Servlet host ServletHostExtensionPoint servletHosts = servletHosts(node); |