Apply new naming convention to the Jumpstart launcher

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

5 files changed, 22 insertions, 27 deletions

diff --git a/sandbox/travelsample/launchers/jumpstart-launcher/build.xml b/sandbox/travelsample/launchers/jumpstart/build.xml
index 941047bd7d..36de2730b2 100644
--- a/sandbox/travelsample/launchers/jumpstart-launcher/build.xml
+++ b/sandbox/travelsample/launchers/jumpstart/build.xml
@@ -17,7 +17,7 @@
  * under the License.

 -->

 

-<project name="scatours-jumpstart-launcher" default="compile">

+<project name="scatours-launcher-jumpstart" default="compile">

     <property environment="env"/> 

 

     <target name="compile">

@@ -28,15 +28,15 @@
                 <pathelement location="${env.TUSCANY}/lib/tuscany-sca-manifest.jar"/>

             </classpath>

         </javac>

-        <jar destfile="target/scatours-jumpstart-launcher.jar" basedir="target/classes">

+        <jar destfile="target/scatours-launcher-jumpstart.jar" basedir="target/classes">

             <manifest>

-                <attribute name="Main-Class" value="scatours.LaunchNode"/>

+                <attribute name="Main-Class" value="scatours.JumpstartLauncher"/>

             </manifest>

         </jar>

     </target>

 

     <target name="run">

-        <java classname="scatours.LaunchNode" fork="true">

+        <java classname="scatours.JumpstartLauncher" fork="true">

             <classpath>

                 <pathelement location="target/classes"/>

                 <pathelement location="${env.TUSCANY}/lib/tuscany-sca-manifest.jar"/>

diff --git a/sandbox/travelsample/launchers/jumpstart-launcher/pom.xml b/sandbox/travelsample/launchers/jumpstart/pom.xml
index f4e53c1561..2a0a5016ec 100644
--- a/sandbox/travelsample/launchers/jumpstart-launcher/pom.xml
+++ b/sandbox/travelsample/launchers/jumpstart/pom.xml
@@ -25,7 +25,7 @@
         <version>1.6-SNAPSHOT</version>

         <!--relativePath>../../pom.xml</relativePath-->

     </parent><version>1.0-SNAPSHOT</version>

-    <artifactId>scatours-jumpstart-launcher</artifactId>

+    <artifactId>scatours-launcher-jumpstart</artifactId>

     <name>Apache Tuscany SCA Tours Jump Start Launcher</name>

 

     <dependencies>

diff --git a/sandbox/travelsample/launchers/jumpstart-launcher/src/main/java/scatours/LaunchJumpstartNode.java b/sandbox/travelsample/launchers/jumpstart/src/main/java/scatours/JumpstartLauncher.java
index cb7704b414..69ca38010f 100644
--- a/sandbox/travelsample/launchers/jumpstart-launcher/src/main/java/scatours/LaunchJumpstartNode.java
+++ b/sandbox/travelsample/launchers/jumpstart/src/main/java/scatours/JumpstartLauncher.java
@@ -24,30 +24,25 @@ import org.apache.tuscany.sca.node.SCAContribution;
 import org.apache.tuscany.sca.node.SCANode;

 import org.apache.tuscany.sca.node.SCANodeFactory;

 

-public class LaunchJumpstartNode {

+public class JumpstartLauncher {

 

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

-        try {

-            SCAContribution gvtContribution = 

-              new SCAContribution("introducing-trips", 

-                  "../../contributions/introducing-trips/target/classes");

-            

-            SCANode node = SCANodeFactory.newInstance().

-               createSCANode("trips.composite", 

-                             gvtContribution);

-            

-            node.start();

+        SCAContribution gvtContribution = 

+          new SCAContribution("introducing-trips", 

+              "../../contributions/introducing-trips/target/classes");

+        

+        SCANode node = SCANodeFactory.newInstance().

+           createSCANode("trips.composite", 

+                         gvtContribution);

+        

+        node.start();

 

-            Trips tripProvider = ((SCAClient)node).getService(Trips.class, 

-                                                              "TripProvider/Trips");

-            

-            System.out.println("Trip boooking code = " + 

-                               tripProvider.checkAvailability("FS1APR4", 2));

+        Trips tripProvider = ((SCAClient)node).getService(Trips.class, 

+                                                          "TripProvider/Trips");

+        

+        System.out.println("Trip boooking code = " + 

+                           tripProvider.checkAvailability("FS1APR4", 2));

 

-            node.stop();

-            

-        } catch (Throwable th) {

-            th.printStackTrace();

-        }

+        node.stop();

     }

 }

diff --git a/sandbox/travelsample/launchers/jumpstart-launcher/src/main/java/scatours/Trips.java b/sandbox/travelsample/launchers/jumpstart/src/main/java/scatours/Trips.java
index a7abf8e08d..a7abf8e08d 100644
--- a/sandbox/travelsample/launchers/jumpstart-launcher/src/main/java/scatours/Trips.java
+++ b/sandbox/travelsample/launchers/jumpstart/src/main/java/scatours/Trips.java
diff --git a/sandbox/travelsample/launchers/jumpstart-launcher/src/test/java/scatours/NodeTestCase.java b/sandbox/travelsample/launchers/jumpstart/src/test/java/scatours/JumpstartTestCase.java
index d8f958e718..5ed8942168 100644
--- a/sandbox/travelsample/launchers/jumpstart-launcher/src/test/java/scatours/NodeTestCase.java
+++ b/sandbox/travelsample/launchers/jumpstart/src/test/java/scatours/JumpstartTestCase.java
@@ -29,7 +29,7 @@ import org.junit.Test;
 /**

  * Tests the Jump Start scenario

  */

-public class NodeTestCase {

+public class JumpstartTestCase {

 

     private SCANode node;