From 77137e309087bf11f67e8d05f4de189bfaeb305f Mon Sep 17 00:00:00 2001
From: nash <nash@13f79535-47bb-0310-9956-ffa450edef68>
Date: Sun, 21 Mar 2010 01:20:01 +0000
Subject: Change jumpstart launcher so that it doesn't use LauncherUtil
 (TUSCANY-3508)

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@925711 13f79535-47bb-0310-9956-ffa450edef68
---
 .../trunk/tutorials/travelsample/distribution/bundle/pom.xml  |  5 -----
 .../distribution/src/main/resources/build-launchers.xml       |  9 ---------
 .../tutorials/travelsample/launchers/jumpstart/build.xml      |  4 ----
 .../trunk/tutorials/travelsample/launchers/jumpstart/pom.xml  | 11 -----------
 .../jumpstart/src/main/java/scatours/JumpstartLauncher.java   |  5 ++---
 5 files changed, 2 insertions(+), 32 deletions(-)

(limited to 'sca-java-1.x')

diff --git a/sca-java-1.x/trunk/tutorials/travelsample/distribution/bundle/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/distribution/bundle/pom.xml
index 3aedf801c6..c4a141109e 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/distribution/bundle/pom.xml
+++ b/sca-java-1.x/trunk/tutorials/travelsample/distribution/bundle/pom.xml
@@ -423,11 +423,6 @@
             <artifactId>scatours-launcher-introducing-trips</artifactId>
             <version>${pom.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>scatours-launcher-jumpstart</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>scatours-launcher-notification-corba</artifactId>
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/resources/build-launchers.xml b/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/resources/build-launchers.xml
index dbddcb349b..5bd4931b40 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/resources/build-launchers.xml
+++ b/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/resources/build-launchers.xml
@@ -191,15 +191,6 @@
         </java>
     </target>
 
-    <target name="run-jumpstart">
-        <java classname="scatours.JumpstartLauncher" fork="true" failonerror="true">
-            <classpath>
-                <pathelement location="scatours-launcher-jumpstart.jar"/>
-                <path refid="scatours.tuscany-manifest"/>
-            </classpath>
-        </java>
-    </target>
-
     <target name="run-notification-corba">
         <java classname="scatours.NotificationCORBALauncher" fork="true" failonerror="true">
             <classpath>
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/launchers/jumpstart/build.xml b/sca-java-1.x/trunk/tutorials/travelsample/launchers/jumpstart/build.xml
index 5da2b075b6..b7aead4d1c 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/launchers/jumpstart/build.xml
+++ b/sca-java-1.x/trunk/tutorials/travelsample/launchers/jumpstart/build.xml
@@ -19,15 +19,11 @@
 
 <project name="scatours-launcher-jumpstart" default="compile">
     <import file="../../antdefs.xml"/>
-    <path id="compile-path">
-        <pathelement path="../../util/launcher-common/target/scatours-util-launcher-common.jar"/>
-    </path>
 
     <target name="run">
         <java classname="scatours.JumpstartLauncher" fork="true" failonerror="true">
             <classpath>
                 <pathelement location="target/${ant.project.name}.jar"/>
-                <path refid="compile-path"/>
                 <pathelement location="${env.TUSCANY_HOME}/lib/tuscany-sca-manifest.jar"/>
             </classpath>
         </java>
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/launchers/jumpstart/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/launchers/jumpstart/pom.xml
index 133ed2a0b7..c5f50cb8df 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/launchers/jumpstart/pom.xml
+++ b/sca-java-1.x/trunk/tutorials/travelsample/launchers/jumpstart/pom.xml
@@ -29,14 +29,6 @@
     <name>Apache Tuscany SCA Tours Jump Start Launcher</name>
 
     <dependencies>
-    
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>scatours-util-launcher-common</artifactId>
-            <version>${pom.version}</version>
-            <scope>provided</scope>
-        </dependency>
-            
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-api</artifactId>
@@ -74,9 +66,6 @@
                 <version>2.2</version>
                 <configuration>
                     <archive>
-                        <manifestEntries>
-                            <Class-Path>../util/scatours-util-launcher-common.jar</Class-Path>
-                        </manifestEntries>
                         <manifest>
                             <addClasspath>${scatours.selfContained}</addClasspath>
                             <classpathPrefix>../lib/</classpathPrefix>
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/launchers/jumpstart/src/main/java/scatours/JumpstartLauncher.java b/sca-java-1.x/trunk/tutorials/travelsample/launchers/jumpstart/src/main/java/scatours/JumpstartLauncher.java
index 1ded112193..e2f0f9da4b 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/launchers/jumpstart/src/main/java/scatours/JumpstartLauncher.java
+++ b/sca-java-1.x/trunk/tutorials/travelsample/launchers/jumpstart/src/main/java/scatours/JumpstartLauncher.java
@@ -19,8 +19,6 @@
 
 package scatours;
 
-import static scatours.launcher.LauncherUtil.locate;
-
 import org.apache.tuscany.sca.node.SCAClient;
 import org.apache.tuscany.sca.node.SCAContribution;
 import org.apache.tuscany.sca.node.SCANode;
@@ -29,7 +27,8 @@ import org.apache.tuscany.sca.node.SCANodeFactory;
 public class JumpstartLauncher {
 
     public static void main(String[] args) throws Exception {
-        SCAContribution gvtContribution = locate("introducing-trips");
+        SCAContribution gvtContribution = new SCAContribution("introducing-trips", 
+            "../../contributions/introducing-trips/target/classes");
 
         SCANode node = SCANodeFactory.newInstance().createSCANode("trips.composite", gvtContribution);
 
-- 
cgit v1.2.3