Merge revision r945180 from 1.0 release branch

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

30 files changed, 38 insertions, 111 deletions

diff --git a/sca-java-1.x/trunk/tutorials/travelsample/antdefs.xml b/sca-java-1.x/trunk/tutorials/travelsample/antdefs.xml
index 004e777ab1..6f98e87885 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/antdefs.xml
+++ b/sca-java-1.x/trunk/tutorials/travelsample/antdefs.xml
@@ -65,7 +65,7 @@
      "package" Creates a jar file containing the compiled Java class

         files (excluding unit test code) and any files in or under the

         resource directory, unless the jar file is already up to date.

-        If the build.xml file defines a path with id "package-path", this

+        If the build.xml file defines a property named "package-path", this

         path is used for the Class-Path manifest entry.

      "clean" Deletes all the files produced by the build.

 

@@ -613,43 +613,28 @@
         </war>

     </target>

 

-    <!-- build a jar file if there are no files in the webapp directory -->

-    <target name="#package-jar" unless="#webapp">

-        <antcall target="#create-jar"/>

-    </target>

-

-    <!-- check whether a dependency path for the package target was specified -->

-    <target name="#check-package-path">

-        <condition property="#package-path">

-            <isreference refid="package-path"/>

-        </condition>

-    </target>

-

     <!-- create a jar file with a Class-Path attribute -->

-    <target name="#create-jar-path" if="#package-path">

-        <property name="#parentdir" location=".."/>

-        <pathconvert property="#package-classpath" refid="package-path" pathsep=" " dirsep="/">

-            <map from="${#parentdir}" to=".."/>

-        </pathconvert>

+    <target name="#package-jar-path" unless="#webapp" if="package-path">

         <jar destfile="target/${ant.project.name}.jar" basedir="target/classes"

              excludes="**/*.cbp">

             <manifest>

-                <attribute name="Class-Path" value="${#package-classpath}"/>

+                <attribute name="Class-Path" value="${package-path}"/>

             </manifest>

         </jar>

     </target>

 

+    <target name="#not-package-path" unless="package-path">

+        <property name="#no-package-path" value=""/>

+    </target>

+

     <!-- create a jar file without a Class-Path attribute -->

-    <target name="#create-jar-nopath" unless="#package-path">

+    <target name="#package-jar-nopath" unless="#webapp" if="#no-package-path">

         <jar destfile="target/${ant.project.name}.jar" basedir="target/classes"

              excludes="**/*.cbp"/>

     </target>

 

-    <!-- create a jar file with or without a Class-Path attribute -->

-    <target name="#create-jar" depends="#check-package-path, #create-jar-path, #create-jar-nopath"/>

-

     <!-- build a packaged jar file or war file -->

-    <target name="#build-package" depends="#check-webapp, #package-war, #package-jar"/>

+    <target name="#build-package" depends="#check-webapp, #package-war, #package-jar-path, #not-package-path, #package-jar-nopath"/>

 

     <!-- If running from a downloaded distribution, the OpenEJB jars are in lib/openejb -->

     <target name="#lib-openejb">

diff --git a/sca-java-1.x/trunk/tutorials/travelsample/launchers/blog-feed/build.xml b/sca-java-1.x/trunk/tutorials/travelsample/launchers/blog-feed/build.xml
index da86028980..c5b87898ce 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/launchers/blog-feed/build.xml
+++ b/sca-java-1.x/trunk/tutorials/travelsample/launchers/blog-feed/build.xml
@@ -22,9 +22,7 @@
     <path id="compile-path">

         <pathelement path="../../util/launcher-common/target/scatours-util-launcher-common.jar"/>

     </path>

-    <path id="package-path">

-        <pathelement path="../util/scatours-util-launcher-common.jar"/>

-    </path>

+    <property name="package-path" value="../util/scatours-util-launcher-common.jar"/>

 

     <target name="run">

         <java classname="scatours.BlogFeedLauncher" fork="true" failonerror="true">

diff --git a/sca-java-1.x/trunk/tutorials/travelsample/launchers/buildingblocks/build.xml b/sca-java-1.x/trunk/tutorials/travelsample/launchers/buildingblocks/build.xml
index b169dca456..f4fccabeea 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/launchers/buildingblocks/build.xml
+++ b/sca-java-1.x/trunk/tutorials/travelsample/launchers/buildingblocks/build.xml
@@ -22,9 +22,7 @@
     <path id="compile-path">

         <pathelement path="../../util/launcher-common/target/scatours-util-launcher-common.jar"/>

     </path>

-    <path id="package-path">

-        <pathelement path="../util/scatours-util-launcher-common.jar"/>

-    </path>

+    <property name="package-path" value="../util/scatours-util-launcher-common.jar"/>

 

     <target name="run">

         <java classname="scatours.BuildingBlocksLauncher" fork="true" failonerror="true">

diff --git a/sca-java-1.x/trunk/tutorials/travelsample/launchers/currency-converter-corba/build.xml b/sca-java-1.x/trunk/tutorials/travelsample/launchers/currency-converter-corba/build.xml
index 1fbdbb7ad7..0fbdccb9e1 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/launchers/currency-converter-corba/build.xml
+++ b/sca-java-1.x/trunk/tutorials/travelsample/launchers/currency-converter-corba/build.xml
@@ -22,9 +22,7 @@
     <path id="compile-path">

         <pathelement path="../../util/launcher-common/target/scatours-util-launcher-common.jar"/>

     </path>

-    <path id="package-path">

-        <pathelement path="../util/scatours-util-launcher-common.jar"/>

-    </path>

+    <property name="package-path" value="../util/scatours-util-launcher-common.jar"/>

 

     <!-- After starting the SCA CORBA service by invoking the "run" target below,

        the CORBA Java implementation of the currency converter client should be

diff --git a/sca-java-1.x/trunk/tutorials/travelsample/launchers/currency-converter-jms/build.xml b/sca-java-1.x/trunk/tutorials/travelsample/launchers/currency-converter-jms/build.xml
index 856ab73fb3..9c8eb69053 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/launchers/currency-converter-jms/build.xml
+++ b/sca-java-1.x/trunk/tutorials/travelsample/launchers/currency-converter-jms/build.xml
@@ -22,9 +22,7 @@
     <path id="compile-path">

         <pathelement path="../../util/launcher-common/target/scatours-util-launcher-common.jar"/>

     </path>

-    <path id="package-path">

-        <pathelement path="../util/scatours-util-launcher-common.jar"/>

-    </path>

+    <property name="package-path" value="../util/scatours-util-launcher-common.jar"/>

 

     <!-- After starting the SCA JMS service by invoking the "run" target below,

        the ActiveMQ JMS implementation of the currency converter client should be

diff --git a/sca-java-1.x/trunk/tutorials/travelsample/launchers/currency-converter-rmi/build.xml b/sca-java-1.x/trunk/tutorials/travelsample/launchers/currency-converter-rmi/build.xml
index 33a61e6d9e..509ed07280 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/launchers/currency-converter-rmi/build.xml
+++ b/sca-java-1.x/trunk/tutorials/travelsample/launchers/currency-converter-rmi/build.xml
@@ -22,9 +22,7 @@
     <path id="compile-path">

         <pathelement path="../../util/launcher-common/target/scatours-util-launcher-common.jar"/>

     </path>

-    <path id="package-path">

-        <pathelement path="../util/scatours-util-launcher-common.jar"/>

-    </path>

+    <property name="package-path" value="../util/scatours-util-launcher-common.jar"/>

 

     <!-- After starting the SCA RMI service by invoking the "run" target below,

        the RMI Java implementation of the currency converter client should be

diff --git a/sca-java-1.x/trunk/tutorials/travelsample/launchers/currency-converter-ws/build.xml b/sca-java-1.x/trunk/tutorials/travelsample/launchers/currency-converter-ws/build.xml
index 5260ec09ca..59c8e4c579 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/launchers/currency-converter-ws/build.xml
+++ b/sca-java-1.x/trunk/tutorials/travelsample/launchers/currency-converter-ws/build.xml
@@ -22,9 +22,7 @@
     <path id="compile-path">

         <pathelement path="../../util/launcher-common/target/scatours-util-launcher-common.jar"/>

     </path>

-    <path id="package-path">

-        <pathelement path="../util/scatours-util-launcher-common.jar"/>

-    </path>

+    <property name="package-path" value="../util/scatours-util-launcher-common.jar"/>

 

     <!-- After starting the SCA Web service by invoking the "run" target below,

        the JAX-WS implementation of the currency converter client should be

diff --git a/sca-java-1.x/trunk/tutorials/travelsample/launchers/currency-converter/build.xml b/sca-java-1.x/trunk/tutorials/travelsample/launchers/currency-converter/build.xml
index cef1c1e56e..5c029661a6 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/launchers/currency-converter/build.xml
+++ b/sca-java-1.x/trunk/tutorials/travelsample/launchers/currency-converter/build.xml
@@ -22,9 +22,7 @@
     <path id="compile-path">

         <pathelement path="../../util/launcher-common/target/scatours-util-launcher-common.jar"/>

     </path>

-    <path id="package-path">

-        <pathelement path="../util/scatours-util-launcher-common.jar"/>

-    </path>

+    <property name="package-path" value="../util/scatours-util-launcher-common.jar"/>

 

     <target name="run">

         <java classname="scatours.CurrencyConverterLauncher" fork="true" failonerror="true">

diff --git a/sca-java-1.x/trunk/tutorials/travelsample/launchers/databinding/build.xml b/sca-java-1.x/trunk/tutorials/travelsample/launchers/databinding/build.xml
index 4d7ff073d7..259ad600ef 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/launchers/databinding/build.xml
+++ b/sca-java-1.x/trunk/tutorials/travelsample/launchers/databinding/build.xml
@@ -22,9 +22,7 @@
     <path id="compile-path">
         <pathelement path="../../util/launcher-common/target/scatours-util-launcher-common.jar"/>
     </path>
-    <path id="package-path">
-        <pathelement path="../util/scatours-util-launcher-common.jar"/>
-    </path>
+    <property name="package-path" value="../util/scatours-util-launcher-common.jar"/>
 
     <target name="run">
         <java classname="scatours.DatabindingLauncher" fork="true" failonerror="true">
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/launchers/feed-logger/build.xml b/sca-java-1.x/trunk/tutorials/travelsample/launchers/feed-logger/build.xml
index 48bef522cd..7ba4ad820e 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/launchers/feed-logger/build.xml
+++ b/sca-java-1.x/trunk/tutorials/travelsample/launchers/feed-logger/build.xml
@@ -22,9 +22,7 @@
     <path id="compile-path">

         <pathelement path="../../util/launcher-common/target/scatours-util-launcher-common.jar"/>

     </path>

-    <path id="package-path">

-        <pathelement path="../util/scatours-util-launcher-common.jar"/>

-    </path>

+    <property name="package-path" value="../util/scatours-util-launcher-common.jar"/>

 

     <target name="run">

         <java classname="scatours.FeedLoggerLauncher" fork="true" failonerror="true">

diff --git a/sca-java-1.x/trunk/tutorials/travelsample/launchers/fullapp/build.xml b/sca-java-1.x/trunk/tutorials/travelsample/launchers/fullapp/build.xml
index 60c791e93b..216401eaab 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/launchers/fullapp/build.xml
+++ b/sca-java-1.x/trunk/tutorials/travelsample/launchers/fullapp/build.xml
@@ -22,9 +22,7 @@
     <path id="compile-path">
         <pathelement path="../../util/launcher-common/target/scatours-util-launcher-common.jar"/>
     </path>
-    <path id="package-path">
-        <pathelement path="../util/scatours-util-launcher-common.jar"/>
-    </path>
+    <property name="package-path" value="../util/scatours-util-launcher-common.jar"/>
 
     <target name="run">
         <java classname="scatours.FullAppLauncher" fork="true" failonerror="true">
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/launchers/help-pages/build.xml b/sca-java-1.x/trunk/tutorials/travelsample/launchers/help-pages/build.xml
index 74273cb3e6..0bca6a5fc0 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/launchers/help-pages/build.xml
+++ b/sca-java-1.x/trunk/tutorials/travelsample/launchers/help-pages/build.xml
@@ -22,9 +22,7 @@
     <path id="compile-path">

         <pathelement path="../../util/launcher-common/target/scatours-util-launcher-common.jar"/>

     </path>

-    <path id="package-path">

-        <pathelement path="../util/scatours-util-launcher-common.jar"/>

-    </path>

+    <property name="package-path" value="../util/scatours-util-launcher-common.jar"/>

 

     <target name="run">

         <java classname="scatours.HelpPagesLauncher" fork="true" failonerror="true">

diff --git a/sca-java-1.x/trunk/tutorials/travelsample/launchers/interaction/build.xml b/sca-java-1.x/trunk/tutorials/travelsample/launchers/interaction/build.xml
index 66704162cf..394b41ca82 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/launchers/interaction/build.xml
+++ b/sca-java-1.x/trunk/tutorials/travelsample/launchers/interaction/build.xml
@@ -22,9 +22,7 @@
     <path id="compile-path">

         <pathelement path="../../util/launcher-common/target/scatours-util-launcher-common.jar"/>

     </path>

-    <path id="package-path">

-        <pathelement path="../util/scatours-util-launcher-common.jar"/>

-    </path>

+    <property name="package-path" value="../util/scatours-util-launcher-common.jar"/>

 

     <target name="run">

         <java classname="scatours.InteractionLauncher" fork="true" failonerror="true">

diff --git a/sca-java-1.x/trunk/tutorials/travelsample/launchers/introducing/build.xml b/sca-java-1.x/trunk/tutorials/travelsample/launchers/introducing/build.xml
index b3faab5691..0659e654dd 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/launchers/introducing/build.xml
+++ b/sca-java-1.x/trunk/tutorials/travelsample/launchers/introducing/build.xml
@@ -22,9 +22,7 @@
     <path id="compile-path">

         <pathelement path="../../util/launcher-common/target/scatours-util-launcher-common.jar"/>

     </path>

-    <path id="package-path">

-        <pathelement path="../util/scatours-util-launcher-common.jar"/>

-    </path>

+    <property name="package-path" value="../util/scatours-util-launcher-common.jar"/>

 

     <target name="run">

         <java classname="scatours.IntroducingLauncher" fork="true" failonerror="true">

diff --git a/sca-java-1.x/trunk/tutorials/travelsample/launchers/notification-corba/build.xml b/sca-java-1.x/trunk/tutorials/travelsample/launchers/notification-corba/build.xml
index 343e79ecb2..4e9de66cf3 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/launchers/notification-corba/build.xml
+++ b/sca-java-1.x/trunk/tutorials/travelsample/launchers/notification-corba/build.xml
@@ -22,9 +22,7 @@
     <path id="compile-path">

         <pathelement path="../../util/launcher-common/target/scatours-util-launcher-common.jar"/>

     </path>

-    <path id="package-path">

-        <pathelement path="../util/scatours-util-launcher-common.jar"/>

-    </path>

+    <property name="package-path" value="../util/scatours-util-launcher-common.jar"/>

 

     <!-- Before invoking the "run" target, the CORBA SMS Gateway service

        needs to be started and running in a different process. -->

diff --git a/sca-java-1.x/trunk/tutorials/travelsample/launchers/notification-ejb/build.xml b/sca-java-1.x/trunk/tutorials/travelsample/launchers/notification-ejb/build.xml
index c8a2f6bd6e..007afec26a 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/launchers/notification-ejb/build.xml
+++ b/sca-java-1.x/trunk/tutorials/travelsample/launchers/notification-ejb/build.xml
@@ -22,9 +22,7 @@
     <path id="compile-path">

         <pathelement path="../../util/launcher-common/target/scatours-util-launcher-common.jar"/>

     </path>

-    <path id="package-path">

-        <pathelement path="../util/scatours-util-launcher-common.jar"/>

-    </path>

+    <property name="package-path" value="../util/scatours-util-launcher-common.jar"/>

 

     <!-- Before invoking the "run" target, the EJB server for the SMS Gateway EJB

        needs to be started and running in a different process. -->

diff --git a/sca-java-1.x/trunk/tutorials/travelsample/launchers/notification-jms/build.xml b/sca-java-1.x/trunk/tutorials/travelsample/launchers/notification-jms/build.xml
index 6ca46dc47a..a76cb4ac88 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/launchers/notification-jms/build.xml
+++ b/sca-java-1.x/trunk/tutorials/travelsample/launchers/notification-jms/build.xml
@@ -22,9 +22,7 @@
     <path id="compile-path">

         <pathelement path="../../util/launcher-common/target/scatours-util-launcher-common.jar"/>

     </path>

-    <path id="package-path">

-        <pathelement path="../util/scatours-util-launcher-common.jar"/>

-    </path>

+    <property name="package-path" value="../util/scatours-util-launcher-common.jar"/>

 

     <!-- Before invoking the "run" target, the JMS implementation of the

        SMS gateway needs to be started and running in a different process. -->

diff --git a/sca-java-1.x/trunk/tutorials/travelsample/launchers/notification-rmi/build.xml b/sca-java-1.x/trunk/tutorials/travelsample/launchers/notification-rmi/build.xml
index 7a3a00fe76..f563ced833 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/launchers/notification-rmi/build.xml
+++ b/sca-java-1.x/trunk/tutorials/travelsample/launchers/notification-rmi/build.xml
@@ -22,9 +22,7 @@
     <path id="compile-path">

         <pathelement path="../../util/launcher-common/target/scatours-util-launcher-common.jar"/>

     </path>

-    <path id="package-path">

-        <pathelement path="../util/scatours-util-launcher-common.jar"/>

-    </path>

+    <property name="package-path" value="../util/scatours-util-launcher-common.jar"/>

 

     <!-- Before invoking the "run" target, the RMI server for the SMS Gateway

        remote object needs to be started and running in a different process. -->

diff --git a/sca-java-1.x/trunk/tutorials/travelsample/launchers/notification-ws/build.xml b/sca-java-1.x/trunk/tutorials/travelsample/launchers/notification-ws/build.xml
index ef79dc7df6..800c79a9aa 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/launchers/notification-ws/build.xml
+++ b/sca-java-1.x/trunk/tutorials/travelsample/launchers/notification-ws/build.xml
@@ -22,9 +22,7 @@
     <path id="compile-path">

         <pathelement path="../../util/launcher-common/target/scatours-util-launcher-common.jar"/>

     </path>

-    <path id="package-path">

-        <pathelement path="../util/scatours-util-launcher-common.jar"/>

-    </path>

+    <property name="package-path" value="../util/scatours-util-launcher-common.jar"/>

 

     <!-- Before invoking the "run" target, the JAX-WS server for the SMS Gateway

        remote object needs to be started and running in a different process. -->

diff --git a/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-bpel/build.xml b/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-bpel/build.xml
index 4f2066b39d..fe23152b32 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-bpel/build.xml
+++ b/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-bpel/build.xml
@@ -22,9 +22,7 @@
     <path id="compile-path">
         <pathelement path="../../util/launcher-common/target/scatours-util-launcher-common.jar"/>
     </path>
-    <path id="package-path">
-        <pathelement path="../util/scatours-util-launcher-common.jar"/>
-    </path>
+    <property name="package-path" value="../util/scatours-util-launcher-common.jar ../ode/"/>
 
     <target name="wsdljava">
         <antcall target="wsimport">
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-groovy/build.xml b/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-groovy/build.xml
index 374a6af02e..652ecac91b 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-groovy/build.xml
+++ b/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-groovy/build.xml
@@ -22,9 +22,7 @@
     <path id="compile-path">
         <pathelement path="../../util/launcher-common/target/scatours-util-launcher-common.jar"/>
     </path>
-    <path id="package-path">
-        <pathelement path="../util/scatours-util-launcher-common.jar"/>
-    </path>
+    <property name="package-path" value="../util/scatours-util-launcher-common.jar"/>
 
     <target name="wsdljava">
         <antcall target="wsimport">
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-java-callback/build.xml b/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-java-callback/build.xml
index 373cb4bee0..4731586cc5 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-java-callback/build.xml
+++ b/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-java-callback/build.xml
@@ -22,9 +22,7 @@
     <path id="compile-path">
         <pathelement path="../../util/launcher-common/target/scatours-util-launcher-common.jar"/>
     </path>
-    <path id="package-path">
-        <pathelement path="../util/scatours-util-launcher-common.jar"/>
-    </path>
+    <property name="package-path" value="../util/scatours-util-launcher-common.jar"/>
 
     <target name="wsdljava">
         <antcall target="wsimport">
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-java-policy/build.xml b/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-java-policy/build.xml
index a41f433670..df2896ff11 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-java-policy/build.xml
+++ b/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-java-policy/build.xml
@@ -22,9 +22,7 @@
     <path id="compile-path">
         <pathelement path="../../util/launcher-common/target/scatours-util-launcher-common.jar"/>
     </path>
-    <path id="package-path">
-        <pathelement path="../util/scatours-util-launcher-common.jar"/>
-    </path>
+    <property name="package-path" value="../util/scatours-util-launcher-common.jar"/>
 
     <target name="wsdljava">
         <antcall target="wsimport">
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-java-reference-pass/build.xml b/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-java-reference-pass/build.xml
index 37e6d16616..6263634fbb 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-java-reference-pass/build.xml
+++ b/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-java-reference-pass/build.xml
@@ -22,9 +22,7 @@
     <path id="compile-path">
         <pathelement path="../../util/launcher-common/target/scatours-util-launcher-common.jar"/>
     </path>
-    <path id="package-path">
-        <pathelement path="../util/scatours-util-launcher-common.jar"/>
-    </path>
+    <property name="package-path" value="../util/scatours-util-launcher-common.jar"/>
 
     <target name="wsdljava">
         <antcall target="wsimport">
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-java/build.xml b/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-java/build.xml
index 9f9addbe23..142a922fa0 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-java/build.xml
+++ b/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-java/build.xml
@@ -22,9 +22,7 @@
     <path id="compile-path">
         <pathelement path="../../util/launcher-common/target/scatours-util-launcher-common.jar"/>
     </path>
-    <path id="package-path">
-        <pathelement path="../util/scatours-util-launcher-common.jar"/>
-    </path>
+    <property name="package-path" value="../util/scatours-util-launcher-common.jar"/>
 
     <target name="wsdljava">
         <antcall target="wsimport">
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-python/build.xml b/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-python/build.xml
index eb889ab9b0..317469da2b 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-python/build.xml
+++ b/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-python/build.xml
@@ -22,9 +22,7 @@
     <path id="compile-path">
         <pathelement path="../../util/launcher-common/target/scatours-util-launcher-common.jar"/>
     </path>
-    <path id="package-path">
-        <pathelement path="../util/scatours-util-launcher-common.jar"/>
-    </path>
+    <property name="package-path" value="../util/scatours-util-launcher-common.jar"/>
 
     <target name="wsdljava">
         <antcall target="wsimport">
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-spring-scatag/build.xml b/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-spring-scatag/build.xml
index 3460f0f945..bb2b83890a 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-spring-scatag/build.xml
+++ b/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-spring-scatag/build.xml
@@ -22,9 +22,7 @@
     <path id="compile-path">
         <pathelement path="../../util/launcher-common/target/scatours-util-launcher-common.jar"/>
     </path>
-    <path id="package-path">
-        <pathelement path="../util/scatours-util-launcher-common.jar"/>
-    </path>
+    <property name="package-path" value="../util/scatours-util-launcher-common.jar"/>
 
     <target name="wsdljava">
         <antcall target="wsimport">
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-spring/build.xml b/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-spring/build.xml
index 0486e2490e..0a88cf16b4 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-spring/build.xml
+++ b/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-spring/build.xml
@@ -22,9 +22,7 @@
     <path id="compile-path">
         <pathelement path="../../util/launcher-common/target/scatours-util-launcher-common.jar"/>
     </path>
-    <path id="package-path">
-        <pathelement path="../util/scatours-util-launcher-common.jar"/>
-    </path>
+    <property name="package-path" value="../util/scatours-util-launcher-common.jar"/>
 
     <target name="wsdljava">
         <antcall target="wsimport">
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/launchers/policy/build.xml b/sca-java-1.x/trunk/tutorials/travelsample/launchers/policy/build.xml
index dced7f0e3e..847e0ac3a8 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/launchers/policy/build.xml
+++ b/sca-java-1.x/trunk/tutorials/travelsample/launchers/policy/build.xml
@@ -22,9 +22,7 @@
     <path id="compile-path">
         <pathelement path="../../util/launcher-common/target/scatours-util-launcher-common.jar"/>
     </path>
-    <path id="package-path">
-        <pathelement path="../util/scatours-util-launcher-common.jar"/>
-    </path>
+    <property name="package-path" value="../util/scatours-util-launcher-common.jar"/>
 
     <target name="run">
         <java classname="scatours.PolicyLauncher" fork="true">
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 cc9a869e97..cbf2877335 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
@@ -22,9 +22,7 @@
     <path id="compile-path">

         <pathelement path="../../util/launcher-common/target/scatours-util-launcher-common.jar"/>

     </path>

-    <path id="package-path">

-        <pathelement path="../util/scatours-util-launcher-common.jar"/>

-    </path>

+    <property name="package-path" value="../util/scatours-util-launcher-common.jar"/>

 

     <target name="run">

         <java classname="scatours.UsingLauncher" fork="true" failonerror="true">