Author: nash
Date: Sun Mar 21 01:20:01 2010
New Revision: 925711
URL: http://svn.apache.org/viewvc?rev=925711&view=rev
Log:
Change jumpstart launcher so that it doesn't use LauncherUtil (TUSCANY-3508)
Modified:
tuscany/sca-java-1.x/trunk/tutorials/travelsample/distribution/bundle/pom.xml
tuscany/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/resources/build-launchers.xml
tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/jumpstart/build.xml
tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/jumpstart/pom.xml
tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/jumpstart/src/main/java/scatours/JumpstartLauncher.java
Modified:
tuscany/sca-java-1.x/trunk/tutorials/travelsample/distribution/bundle/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/distribution/bundle/pom.xml?rev=925711&r1=925710&r2=925711&view=diff
==============================================================================
---
tuscany/sca-java-1.x/trunk/tutorials/travelsample/distribution/bundle/pom.xml
(original)
+++
tuscany/sca-java-1.x/trunk/tutorials/travelsample/distribution/bundle/pom.xml
Sun Mar 21 01:20:01 2010
@@ -425,11 +425,6 @@
</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>
<version>${pom.version}</version>
</dependency>
Modified:
tuscany/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/resources/build-launchers.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/resources/build-launchers.xml?rev=925711&r1=925710&r2=925711&view=diff
==============================================================================
---
tuscany/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/resources/build-launchers.xml
(original)
+++
tuscany/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/resources/build-launchers.xml
Sun Mar 21 01:20:01 2010
@@ -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>
Modified:
tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/jumpstart/build.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/jumpstart/build.xml?rev=925711&r1=925710&r2=925711&view=diff
==============================================================================
---
tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/jumpstart/build.xml
(original)
+++
tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/jumpstart/build.xml
Sun Mar 21 01:20:01 2010
@@ -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>
Modified:
tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/jumpstart/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/jumpstart/pom.xml?rev=925711&r1=925710&r2=925711&view=diff
==============================================================================
---
tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/jumpstart/pom.xml
(original)
+++
tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/jumpstart/pom.xml
Sun Mar 21 01:20:01 2010
@@ -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>
Modified:
tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/jumpstart/src/main/java/scatours/JumpstartLauncher.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/jumpstart/src/main/java/scatours/JumpstartLauncher.java?rev=925711&r1=925710&r2=925711&view=diff
==============================================================================
---
tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/jumpstart/src/main/java/scatours/JumpstartLauncher.java
(original)
+++
tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/jumpstart/src/main/java/scatours/JumpstartLauncher.java
Sun Mar 21 01:20:01 2010
@@ -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.SCANo
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);
