You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by na...@apache.org on 2010/05/20 00:18:04 UTC
svn commit: r946463 - in /tuscany/sca-java-1.x/trunk/tutorials/travelsample:
binaries/src/main/resources/ launchers/usingsca/
launchers/usingsca/src/main/java/scatours/
launchers/usingsca/src/test/java/scatours/
Author: nash
Date: Wed May 19 22:18:03 2010
New Revision: 946463
URL: http://svn.apache.org/viewvc?rev=946463&view=rev
Log:
Merge revision r946387 from 1.0 release branch
Added:
tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/usingsca/src/main/java/scatours/UsingSCALauncher.java
- copied unchanged from r946387, tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/usingsca/src/main/java/scatours/UsingSCALauncher.java
tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/usingsca/src/test/java/scatours/UsingSCATestCase.java
- copied unchanged from r946387, tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/usingsca/src/test/java/scatours/UsingSCATestCase.java
Removed:
tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/usingsca/src/main/java/scatours/UsingLauncher.java
tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/usingsca/src/test/java/scatours/UsingTestCase.java
Modified:
tuscany/sca-java-1.x/trunk/tutorials/travelsample/binaries/src/main/resources/build-launchers.xml
tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/usingsca/build.xml
tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/usingsca/pom.xml
Modified: tuscany/sca-java-1.x/trunk/tutorials/travelsample/binaries/src/main/resources/build-launchers.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/binaries/src/main/resources/build-launchers.xml?rev=946463&r1=946462&r2=946463&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/travelsample/binaries/src/main/resources/build-launchers.xml (original)
+++ tuscany/sca-java-1.x/trunk/tutorials/travelsample/binaries/src/main/resources/build-launchers.xml Wed May 19 22:18:03 2010
@@ -327,7 +327,7 @@
</target>
<target name="run-usingsca">
- <java classname="scatours.UsingLauncher" fork="true" failonerror="true">
+ <java classname="scatours.UsingSCALauncher" fork="true" failonerror="true">
<classpath>
<pathelement location="scatours-launcher-usingsca.jar"/>
<path refid="scatours.tuscany-manifest"/>
Modified: tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/usingsca/build.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/usingsca/build.xml?rev=946463&r1=946462&r2=946463&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/usingsca/build.xml (original)
+++ tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/usingsca/build.xml Wed May 19 22:18:03 2010
@@ -25,7 +25,7 @@
<property name="package-path" value="../util/scatours-util-launcher-common.jar"/>
<target name="run">
- <java classname="scatours.UsingLauncher" fork="true" failonerror="true">
+ <java classname="scatours.UsingSCALauncher" fork="true" failonerror="true">
<classpath>
<pathelement location="target/${ant.project.name}.jar"/>
<path refid="compile-path"/>
Modified: tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/usingsca/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/usingsca/pom.xml?rev=946463&r1=946462&r2=946463&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/usingsca/pom.xml (original)
+++ tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/usingsca/pom.xml Wed May 19 22:18:03 2010
@@ -128,7 +128,7 @@
<manifest>
<addClasspath>${scatours.selfContained}</addClasspath>
<classpathPrefix>../lib/</classpathPrefix>
- <mainClass>scatours.BuildingBlocksLauncher</mainClass>
+ <mainClass>scatours.UsingSCALauncher</mainClass>
</manifest>
</archive>
</configuration>