svn commit: r960254 - in /tuscany/sca-java-2.x/trunk/modules/shell: META-INF/ src/main/java/org/ src/main/java/org/apache/ src/main/java/org/apache/tuscany/ src/main/java/org/apache/tuscany/sca/ src/main/java/org/apache/tuscany/sca/shell/ src/main/java...

[an...@apache.org]

Author: antelder
Date: Sat Jul  3 18:34:34 2010
New Revision: 960254

URL: http://svn.apache.org/viewvc?rev=960254&view=rev
Log:
Rename from sample to module package name and update to use domain node api

Added:
    tuscany/sca-java-2.x/trunk/modules/shell/META-INF/
    tuscany/sca-java-2.x/trunk/modules/shell/META-INF/MANIFEST.MF
    tuscany/sca-java-2.x/trunk/modules/shell/src/main/java/org/
    tuscany/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/
    tuscany/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/
    tuscany/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/
    tuscany/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/
      - copied from r960253, tuscany/sca-java-2.x/trunk/modules/shell/src/main/java/sample/
Removed:
    tuscany/sca-java-2.x/trunk/modules/shell/src/main/java/sample/
Modified:
    tuscany/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/Shell.java

Added: tuscany/sca-java-2.x/trunk/modules/shell/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/shell/META-INF/MANIFEST.MF?rev=960254&view=auto
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/shell/META-INF/MANIFEST.MF (added)
+++ tuscany/sca-java-2.x/trunk/modules/shell/META-INF/MANIFEST.MF Sat Jul  3 18:34:34 2010
@@ -0,0 +1,21 @@
+Manifest-Version: 1.0
+SCA-Version: 1.1
+Export-Package: org.apache.tuscany.sca.node2;version="2.0.0";uses:="org.apache.tuscany.sca.assembly,org.apache.tuscany.sca.contribution,org.apache.tuscany.sca.core,org.apache.tuscany.sca.deployment,org.apache.tuscany.sca.monitor,org.apache.tuscany.sca.runtime,org.apache.tuscany.sca.work,javax.xml.namespace,javax.xml.stream,org.oasisopen.sca"
+Bundle-Name: Apache Tuscany SCA Domain Node
+Bundle-Vendor: The Apache Software Foundation
+Bundle-Version: 2.0.0
+Bundle-ManifestVersion: 2
+Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
+Bundle-Description: Apache Tuscany SCA Domain Node
+Import-Package: 
+ org.apache.tuscany.sca.management;version="2.0.0",
+ org.apache.tuscany.sca.node;version="2.0.0",
+ org.apache.tuscany.sca.node2;version="2.0.0",
+ org.apache.tuscany.sca.node.configuration;version="2.0.0",
+ org.apache.tuscany.sca.node.impl;version="2.0.0",
+ org.apache.tuscany.sca.runtime;version="2.0.0",
+ org.apache.tuscany.sca.context;version="2.0.0",
+ org.apache.tuscany.sca.work;version="2.0.0"
+Bundle-SymbolicName: org.apache.tuscany.sca.domain.node
+Bundle-DocURL: http://www.apache.org/
+Bundle-RequiredExecutionEnvironment: J2SE-1.5,JavaSE-1.6

Modified: tuscany/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/Shell.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/Shell.java?rev=960254&r1=960253&r2=960254&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/Shell.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/Shell.java Sat Jul  3 18:34:34 2010
@@ -17,23 +17,26 @@
  * under the License.    
  */
 
-package sample;
+package org.apache.tuscany.sca.shell;
 
 import static java.lang.System.in;
 import static java.lang.System.out;
 
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.List;
-import java.util.ArrayList;
 import java.util.Map;
-import java.util.HashMap;
 import java.util.concurrent.Callable;
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
-import java.io.IOException;
-import org.apache.tuscany.sca.node.Contribution;
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
+
+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.runtime.ActivationException;
 
 
 /**
@@ -67,10 +70,10 @@ public class Shell {
         new Shell().run();
     }
 
-    boolean start(final String name, final String curi, final String cloc) {
-        final Node node = nodeFactory.createNode(new Contribution(curi, cloc));
+    boolean start(final String name, final String curi, final String cloc) throws ContributionReadException, ActivationException, ValidationException {
+        final Node node = nodeFactory.createNode("default");
+        node.installContribution(curi, cloc, null, null, true);
         nodes.put(name, new NodeInfo(name, curi, cloc, node));
-        node.start();
         return true;
     }
 
@@ -99,12 +102,12 @@ public class Shell {
         out.print("=> ");
         final String l = r.readLine();
         history.add(l);
-        return Arrays.asList(l != null? l.split(" ") : "bye".split(" "));
+        return Arrays.asList(l != null? l.trim().split(" ") : "bye".split(" "));
     }
        
     Callable<Boolean> eval(final List<String> toks) {
         final String op = toks.get(0);
-        if (op.equals("start")) return new Callable<Boolean>() { public Boolean call() {
+        if (op.equals("start")) return new Callable<Boolean>() { public Boolean call() throws Exception {
             return start(toks.get(1), toks.get(2), toks.get(3));
         }};
         if (op.equals("stop")) return new Callable<Boolean>() { public Boolean call() {