diff options
author | nash <nash@13f79535-47bb-0310-9956-ffa450edef68> | 2010-05-19 22:18:03 +0000 |
---|---|---|
committer | nash <nash@13f79535-47bb-0310-9956-ffa450edef68> | 2010-05-19 22:18:03 +0000 |
commit | ca1fc48f5c3a5a8a86151eab4e8fdfd676217352 (patch) | |
tree | aa286d2ce9c647c40814488d100d25e4ebc8554d /sca-java-1.x/trunk/tutorials/travelsample/launchers | |
parent | 2ae4ed8eca5f970a92187d6ff21c8f97c4b05920 (diff) |
Merge revision r946387 from 1.0 release branch
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@946463 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to '')
-rw-r--r-- | sca-java-1.x/trunk/tutorials/travelsample/launchers/usingsca/build.xml | 2 | ||||
-rw-r--r-- | sca-java-1.x/trunk/tutorials/travelsample/launchers/usingsca/pom.xml | 2 | ||||
-rw-r--r-- | sca-java-1.x/trunk/tutorials/travelsample/launchers/usingsca/src/main/java/scatours/UsingSCALauncher.java (renamed from sca-java-1.x/trunk/tutorials/travelsample/launchers/usingsca/src/main/java/scatours/UsingLauncher.java) | 2 | ||||
-rw-r--r-- | sca-java-1.x/trunk/tutorials/travelsample/launchers/usingsca/src/test/java/scatours/UsingSCATestCase.java (renamed from sca-java-1.x/trunk/tutorials/travelsample/launchers/usingsca/src/test/java/scatours/UsingTestCase.java) | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/launchers/usingsca/build.xml b/sca-java-1.x/trunk/tutorials/travelsample/launchers/usingsca/build.xml index cbf2877335..0437ba0b45 100644 --- a/sca-java-1.x/trunk/tutorials/travelsample/launchers/usingsca/build.xml +++ b/sca-java-1.x/trunk/tutorials/travelsample/launchers/usingsca/build.xml @@ -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"/>
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/launchers/usingsca/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/launchers/usingsca/pom.xml index 3de04e9b36..84019c5a2e 100644 --- a/sca-java-1.x/trunk/tutorials/travelsample/launchers/usingsca/pom.xml +++ b/sca-java-1.x/trunk/tutorials/travelsample/launchers/usingsca/pom.xml @@ -128,7 +128,7 @@ <manifest>
<addClasspath>${scatours.selfContained}</addClasspath>
<classpathPrefix>../lib/</classpathPrefix>
- <mainClass>scatours.BuildingBlocksLauncher</mainClass>
+ <mainClass>scatours.UsingSCALauncher</mainClass>
</manifest>
</archive>
</configuration>
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/launchers/usingsca/src/main/java/scatours/UsingLauncher.java b/sca-java-1.x/trunk/tutorials/travelsample/launchers/usingsca/src/main/java/scatours/UsingSCALauncher.java index bb58e5752c..2c0f817e84 100644 --- a/sca-java-1.x/trunk/tutorials/travelsample/launchers/usingsca/src/main/java/scatours/UsingLauncher.java +++ b/sca-java-1.x/trunk/tutorials/travelsample/launchers/usingsca/src/main/java/scatours/UsingSCALauncher.java @@ -26,7 +26,7 @@ import org.apache.tuscany.sca.node.SCANodeFactory; import static scatours.launcher.LauncherUtil.locate;
-public class UsingLauncher {
+public class UsingSCALauncher {
public static void main(String[] args) throws Exception {
runAirportCodes();
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/launchers/usingsca/src/test/java/scatours/UsingTestCase.java b/sca-java-1.x/trunk/tutorials/travelsample/launchers/usingsca/src/test/java/scatours/UsingSCATestCase.java index cd643b6649..7cbbc6bc2d 100644 --- a/sca-java-1.x/trunk/tutorials/travelsample/launchers/usingsca/src/test/java/scatours/UsingTestCase.java +++ b/sca-java-1.x/trunk/tutorials/travelsample/launchers/usingsca/src/test/java/scatours/UsingSCATestCase.java @@ -25,7 +25,7 @@ import org.junit.Test; /**
* Tests the launcher
*/
-public class UsingTestCase {
+public class UsingSCATestCase {
@Before
public void startServer() throws Exception {
@@ -33,7 +33,7 @@ public class UsingTestCase { @Test
public void testLauncher() throws Exception {
- UsingLauncher.main(null);
+ UsingSCALauncher.main(null);
}
@After
|