Add much more simplistic launcher as an example of how we can focus in on the embedding we're trying to demonstrate rather than how clever we can make the launcher.

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

4 files changed, 69 insertions, 4 deletions

diff --git a/sca-java-2.x/trunk/samples/launcher-embedded-jse/README b/sca-java-2.x/trunk/samples/launcher-embedded-jse/README
index 359e5d134d..7108333efa 100644
--- a/sca-java-2.x/trunk/samples/launcher-embedded-jse/README
+++ b/sca-java-2.x/trunk/samples/launcher-embedded-jse/README
@@ -2,7 +2,7 @@ JSE Sample Launcher
 ===================

 

 This directory contains a sample java launcher for the

-tuscany sample contributions. sample contributions.  

+tuscany sample contributions.   

 

 The README file in the <distribution-unpack-dir>/samples directory provides 

 general instructions about building and running sample contributions using the

diff --git a/sca-java-2.x/trunk/samples/launcher-embedded-jse/build.xml b/sca-java-2.x/trunk/samples/launcher-embedded-jse/build.xml
index 89987056d2..64bad00b76 100644
--- a/sca-java-2.x/trunk/samples/launcher-embedded-jse/build.xml
+++ b/sca-java-2.x/trunk/samples/launcher-embedded-jse/build.xml
@@ -75,7 +75,7 @@
     </target>

 	

     <target name="run-contribution-binding-ws-calculator" depends="compile">

-        <java classname="${main.class}"

+        <java classname="launcher.JSELauncherBindingWSCalculator"

               fork="true"

               failonerror="true">

             <classpath>  

@@ -84,7 +84,6 @@
                    <include name="tuscany-sca-manifest.jar" />

                 </fileset>

             </classpath> 

-            <arg value="contribution-binding-ws-calculator"/> 

         </java>     

     </target>	

 	

diff --git a/sca-java-2.x/trunk/samples/launcher-embedded-jse/src/main/java/launcher/JSELauncherBindingWSCalculator.java b/sca-java-2.x/trunk/samples/launcher-embedded-jse/src/main/java/launcher/JSELauncherBindingWSCalculator.java
new file mode 100644
index 0000000000..3342e4a286
--- /dev/null
+++ b/sca-java-2.x/trunk/samples/launcher-embedded-jse/src/main/java/launcher/JSELauncherBindingWSCalculator.java
@@ -0,0 +1,59 @@
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ * 

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ * 

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, either express or implied.  See the License for the

+ * specific language governing permissions and limitations

+ * under the License.    

+ */

+

+package launcher;

+

+import org.apache.tuscany.sca.node.Contribution;

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

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

+

+import calculator.CalculatorService;

+

+/**

+ * This client program shows how to create an embedded SCA runtime, load a contribution,

+ * start it and locate and invoke an SCA component 

+ */

+public class JSELauncherBindingWSCalculator {

+    

+    public static void main(String[] args) throws Exception {

+        JSELauncherBindingWSCalculator launcher = new JSELauncherBindingWSCalculator();

+        launcher.launchBindingWSCalculator();         

+    }

+    

+    /*

+     * Using the Tuscany Node API to load a contribution.

+     * Using the Tuscany Node API to get a local service proxy

+     */

+    public void launchBindingWSCalculator(){

+        Node node = NodeFactory.newInstance().createNode(new Contribution("c1", "../contribution-binding-ws-calculator/target/sample-contribution-binding-ws-calculator.jar"));

+        node.start();

+        

+        CalculatorService calculator = node.getService(CalculatorService.class, "CalculatorServiceComponent");

+        

+        // TODO - could use JUnit assertions but don't want to have to handle JUnit dependency from Ant script

+        double result = calculator.add(3, 2);

+        System.out.println("3 + 2 = " + result);

+        if (result != 5.0){

+            throw new SampleLauncherException();

+        }

+        

+        node.stop();

+    }

+    

+}

diff --git a/sca-java-2.x/trunk/samples/launcher-embedded-jse/src/test/java/launcher/LauncherTestCase.java b/sca-java-2.x/trunk/samples/launcher-embedded-jse/src/test/java/launcher/LauncherTestCase.java
index 3c2acbcc46..33159dc469 100644
--- a/sca-java-2.x/trunk/samples/launcher-embedded-jse/src/test/java/launcher/LauncherTestCase.java
+++ b/sca-java-2.x/trunk/samples/launcher-embedded-jse/src/test/java/launcher/LauncherTestCase.java
@@ -30,10 +30,17 @@ public class LauncherTestCase {
         SampleJSELauncher.main(new String[] {"contribution-binding-sca-calculator"});

     }

     

+/* replaced by call to specific launcher

     @Test

     public void testContributionBindingWSCalculator() throws Exception {

         SampleJSELauncher.main(new String[] {"contribution-binding-ws-calculator"});

-    }  

+    } 

+*/    

+    

+    @Test

+    public void testContributionBindingWSCalculator() throws Exception {

+        JSELauncherBindingWSCalculator.main(null);

+    }     

     

     @Test

     public void testContributionBindingRMICalculator() throws Exception {