From 994c753d4c4f224e7b93fa8dc6ae807367317678 Mon Sep 17 00:00:00 2001 From: rfeng Date: Tue, 19 Aug 2008 00:08:11 +0000 Subject: Add SCANodeFactory/SCANode and rename the artifact ids from node2-xxx to node-xxx git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@686901 13f79535-47bb-0310-9956-ffa450edef68 --- .../NodeImplementationDaemonBootstrap.java | 8 ++++---- .../NodeImplementationLauncherBootstrap.java | 22 +++++++++++----------- .../node/webapp/NodeWebAppServletHost.java | 10 +++++----- 3 files changed, 20 insertions(+), 20 deletions(-) (limited to 'java/sca/modules/implementation-node-runtime/src/main') diff --git a/java/sca/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationDaemonBootstrap.java b/java/sca/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationDaemonBootstrap.java index edf2aefdde..7d5954b3fd 100644 --- a/java/sca/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationDaemonBootstrap.java +++ b/java/sca/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationDaemonBootstrap.java @@ -20,7 +20,7 @@ package org.apache.tuscany.sca.implementation.node.launcher; import org.apache.tuscany.sca.host.embedded.SCADomain; -import org.apache.tuscany.sca.node.SCANode2; +import org.apache.tuscany.sca.node.SCANode; /** * Bootstrap class for the SCA node daemon. @@ -28,12 +28,12 @@ import org.apache.tuscany.sca.node.SCANode2; * @version $Rev$ $Date$ */ public class NodeImplementationDaemonBootstrap { - private SCANode2 node; + private SCANode node; /** * A node wrappering an instance of a node daemon. */ - public static class NodeFacade implements SCANode2 { + public static class NodeFacade implements SCANode { private ClassLoader threadContextClassLoader; private ClassLoader runtimeClassLoader; private SCADomain daemon; @@ -77,7 +77,7 @@ public class NodeImplementationDaemonBootstrap { * Returns the node representing the daemon. * @return */ - public SCANode2 getNode() { + public SCANode getNode() { return node; } diff --git a/java/sca/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationLauncherBootstrap.java b/java/sca/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationLauncherBootstrap.java index 06b1966c57..0264574fb9 100644 --- a/java/sca/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationLauncherBootstrap.java +++ b/java/sca/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeImplementationLauncherBootstrap.java @@ -21,8 +21,8 @@ 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.SCANode; +import org.apache.tuscany.sca.node.SCANodeFactory; import org.osoa.sca.CallableReference; import org.osoa.sca.ServiceReference; @@ -33,17 +33,17 @@ import org.osoa.sca.ServiceReference; */ public class NodeImplementationLauncherBootstrap { - private SCANode2 node; + private SCANode node; /** * A node facade. */ - public static class NodeFacade implements SCANode2, SCAClient { + public static class NodeFacade implements SCANode, SCAClient { private ClassLoader threadContextClassLoader; private ClassLoader runtimeClassLoader; - private SCANode2 delegate; + private SCANode delegate; - private NodeFacade(SCANode2 delegate) { + private NodeFacade(SCANode delegate) { runtimeClassLoader = Thread.currentThread().getContextClassLoader(); this.delegate = delegate; } @@ -90,7 +90,7 @@ public class NodeImplementationLauncherBootstrap { * @param configurationURI */ public NodeImplementationLauncherBootstrap(String configurationURI) throws Exception { - SCANode2Factory nodeFactory = SCANode2Factory.newInstance(); + SCANodeFactory nodeFactory = SCANodeFactory.newInstance(); node = new NodeFacade(nodeFactory.createSCANodeFromURL(configurationURI)); } @@ -101,7 +101,7 @@ public class NodeImplementationLauncherBootstrap { * @param contributionClassLoader */ public NodeImplementationLauncherBootstrap(String compositeURI, ClassLoader contributionClassLoader) throws Exception { - SCANode2Factory nodeFactory = SCANode2Factory.newInstance(); + SCANodeFactory nodeFactory = SCANodeFactory.newInstance(); node = new NodeFacade(nodeFactory.createSCANodeFromClassLoader(compositeURI, contributionClassLoader)); } @@ -113,7 +113,7 @@ public class NodeImplementationLauncherBootstrap { * @param locations */ public NodeImplementationLauncherBootstrap(String compositeURI, String[] uris, String[] locations) throws Exception { - SCANode2Factory nodeFactory = SCANode2Factory.newInstance(); + SCANodeFactory nodeFactory = SCANodeFactory.newInstance(); SCAContribution[] contributions = new SCAContribution[uris.length]; for (int i = 0; i < uris.length; i++) { contributions[i] = new SCAContribution(uris[i], locations[i]); @@ -129,7 +129,7 @@ public class NodeImplementationLauncherBootstrap { * @param locations */ public NodeImplementationLauncherBootstrap(String compositeURI, String compositeContent, String[] uris, String[] locations) throws Exception { - SCANode2Factory nodeFactory = SCANode2Factory.newInstance(); + SCANodeFactory nodeFactory = SCANodeFactory.newInstance(); SCAContribution[] contributions = new SCAContribution[uris.length]; for (int i = 0; i < uris.length; i++) { contributions[i] = new SCAContribution(uris[i], locations[i]); @@ -142,7 +142,7 @@ public class NodeImplementationLauncherBootstrap { * * @return */ - public SCANode2 getNode() { + public SCANode getNode() { return node; } diff --git a/java/sca/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/webapp/NodeWebAppServletHost.java b/java/sca/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/webapp/NodeWebAppServletHost.java index 47b42c9224..5a50f87d4c 100644 --- a/java/sca/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/webapp/NodeWebAppServletHost.java +++ b/java/sca/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/webapp/NodeWebAppServletHost.java @@ -48,8 +48,8 @@ import org.apache.tuscany.sca.host.http.ServletHostExtensionPoint; import org.apache.tuscany.sca.host.http.ServletMappingException; import org.apache.tuscany.sca.implementation.node.launcher.NodeImplementationLauncherUtil; import org.apache.tuscany.sca.node.SCAClient; -import org.apache.tuscany.sca.node.SCANode2; -import org.apache.tuscany.sca.node.SCANode2Factory; +import org.apache.tuscany.sca.node.SCANode; +import org.apache.tuscany.sca.node.SCANodeFactory; /** * ServletHost implementation for use in a Webapp Node environment. @@ -62,7 +62,7 @@ public class NodeWebAppServletHost implements ServletHost, Filter { private static final NodeWebAppServletHost servletHost = new NodeWebAppServletHost(); private Map servlets = new HashMap(); - private SCANode2 node; + private SCANode node; private String contextPath = "/"; private int defaultPort = 8080; @@ -112,7 +112,7 @@ public class NodeWebAppServletHost implements ServletHost, Filter { String nodeConfiguration = NodeImplementationLauncherUtil.nodeConfigurationURI(nodeName); // Create the SCA node - SCANode2Factory nodeFactory = SCANode2Factory.newInstance(); + SCANodeFactory nodeFactory = SCANodeFactory.newInstance(); node = nodeFactory.createSCANodeFromURL(nodeConfiguration); // Register the Servlet host @@ -350,7 +350,7 @@ public class NodeWebAppServletHost implements ServletHost, Filter { * * @return */ - private static ServletHostExtensionPoint servletHosts(SCANode2 node) { + private static ServletHostExtensionPoint servletHosts(SCANode node) { //FIXME Need a clean way to get the extension point registry // from the node ExtensionPointRegistry registry; -- cgit v1.2.3