Update to create a service proxy directly instead of using the sca client factory api and update testcases for that, and rename package

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1058025 13f79535-47bb-0310-9956-ffa450edef68

3 files changed, 6 insertions, 6 deletions

diff --git a/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/Shell.java b/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/Shell.java
index ba4ba8a63f..d45e95e863 100644
--- a/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/Shell.java
+++ b/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/Shell.java
@@ -46,13 +46,13 @@ import org.apache.tuscany.sca.contribution.Artifact;
 import org.apache.tuscany.sca.contribution.Contribution;

 import org.apache.tuscany.sca.contribution.processor.ContributionReadException;

 import org.apache.tuscany.sca.monitor.ValidationException;

-import org.apache.tuscany.sca.node2.Node;

-import org.apache.tuscany.sca.node2.NodeFactory;

-import org.apache.tuscany.sca.node2.impl.NodeImpl;

 import org.apache.tuscany.sca.runtime.ActivationException;

 import org.apache.tuscany.sca.runtime.EndpointRegistry;

+import org.apache.tuscany.sca.runtime.Node;

+import org.apache.tuscany.sca.runtime.NodeFactory;

 import org.apache.tuscany.sca.runtime.RuntimeComponent;

 import org.apache.tuscany.sca.runtime.Version;

+import org.apache.tuscany.sca.runtime.impl.NodeImpl;

 import org.apache.tuscany.sca.shell.jline.JLine;

 

 /**

@@ -405,7 +405,7 @@ public class Shell {
 

     boolean start(String nodeName, String compositeURI, String contributionURL, String... dependentContributionURLs)

         throws ActivationException, ValidationException {

-        Node node = NodeFactory.newStandaloneNode(compositeURI, contributionURL, dependentContributionURLs);

+        Node node = NodeFactory.createStandaloneNode(compositeURI, contributionURL, dependentContributionURLs);

         standaloneNodes.put(nodeName, node);

         return true;

     }

diff --git a/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/jline/ServiceCompletor.java b/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/jline/ServiceCompletor.java
index 69b8fbd033..d23e04b331 100644
--- a/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/jline/ServiceCompletor.java
+++ b/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/jline/ServiceCompletor.java
@@ -25,8 +25,8 @@ import java.util.List;
 import jline.SimpleCompletor;
 
 import org.apache.tuscany.sca.assembly.Endpoint;
-import org.apache.tuscany.sca.node2.impl.NodeImpl;
 import org.apache.tuscany.sca.runtime.EndpointRegistry;
+import org.apache.tuscany.sca.runtime.impl.NodeImpl;
 import org.apache.tuscany.sca.shell.Shell;
 
 /**
diff --git a/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/jline/ServiceOperationCompletor.java b/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/jline/ServiceOperationCompletor.java
index d4e1fc55e4..82e102a904 100644
--- a/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/jline/ServiceOperationCompletor.java
+++ b/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/jline/ServiceOperationCompletor.java
@@ -27,9 +27,9 @@ import java.util.List;
 import jline.SimpleCompletor;
 
 import org.apache.tuscany.sca.assembly.Endpoint;
-import org.apache.tuscany.sca.node2.impl.NodeImpl;
 import org.apache.tuscany.sca.runtime.EndpointRegistry;
 import org.apache.tuscany.sca.runtime.RuntimeComponent;
+import org.apache.tuscany.sca.runtime.impl.NodeImpl;
 import org.apache.tuscany.sca.shell.Shell;
 
 /**