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/17 16:33:14 UTC

svn commit: r945180 - in /tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0: ./ launchers/blog-feed/ launchers/buildingblocks/ launchers/currency-converter-corba/ launchers/currency-converter-jms/ launchers/currency-converter-rmi/ launchers/curre...

Author: nash
Date: Mon May 17 14:33:13 2010
New Revision: 945180

URL: http://svn.apache.org/viewvc?rev=945180&view=rev
Log:
Change package-path to a property so that directory names can be included

Modified:
    tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/antdefs.xml
    tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/blog-feed/build.xml
    tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/buildingblocks/build.xml
    tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/currency-converter-corba/build.xml
    tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/currency-converter-jms/build.xml
    tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/currency-converter-rmi/build.xml
    tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/currency-converter-ws/build.xml
    tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/currency-converter/build.xml
    tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/databinding/build.xml
    tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/feed-logger/build.xml
    tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/fullapp/build.xml
    tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/help-pages/build.xml
    tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/interaction/build.xml
    tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/introducing/build.xml
    tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/notification-corba/build.xml
    tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/notification-ejb/build.xml
    tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/notification-jms/build.xml
    tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/notification-rmi/build.xml
    tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/notification-ws/build.xml
    tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/payment-bpel/build.xml
    tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/payment-groovy/build.xml
    tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/payment-java-callback/build.xml
    tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/payment-java-policy/build.xml
    tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/payment-java-reference-pass/build.xml
    tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/payment-java/build.xml
    tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/payment-python/build.xml
    tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/payment-spring-scatag/build.xml
    tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/payment-spring/build.xml
    tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/policy/build.xml
    tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/usingsca/build.xml

Modified: tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/antdefs.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/antdefs.xml?rev=945180&r1=945179&r2=945180&view=diff
==============================================================================
--- tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/antdefs.xml (original)
+++ tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/antdefs.xml Mon May 17 14:33:13 2010
@@ -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">

Modified: tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/blog-feed/build.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/blog-feed/build.xml?rev=945180&r1=945179&r2=945180&view=diff
==============================================================================
--- tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/blog-feed/build.xml (original)
+++ tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/blog-feed/build.xml Mon May 17 14:33:13 2010
@@ -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">

Modified: tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/buildingblocks/build.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/buildingblocks/build.xml?rev=945180&r1=945179&r2=945180&view=diff
==============================================================================
--- tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/buildingblocks/build.xml (original)
+++ tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/buildingblocks/build.xml Mon May 17 14:33:13 2010
@@ -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">

Modified: tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/currency-converter-corba/build.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/currency-converter-corba/build.xml?rev=945180&r1=945179&r2=945180&view=diff
==============================================================================
--- tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/currency-converter-corba/build.xml (original)
+++ tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/currency-converter-corba/build.xml Mon May 17 14:33:13 2010
@@ -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

Modified: tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/currency-converter-jms/build.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/currency-converter-jms/build.xml?rev=945180&r1=945179&r2=945180&view=diff
==============================================================================
--- tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/currency-converter-jms/build.xml (original)
+++ tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/currency-converter-jms/build.xml Mon May 17 14:33:13 2010
@@ -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

Modified: tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/currency-converter-rmi/build.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/currency-converter-rmi/build.xml?rev=945180&r1=945179&r2=945180&view=diff
==============================================================================
--- tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/currency-converter-rmi/build.xml (original)
+++ tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/currency-converter-rmi/build.xml Mon May 17 14:33:13 2010
@@ -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

Modified: tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/currency-converter-ws/build.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/currency-converter-ws/build.xml?rev=945180&r1=945179&r2=945180&view=diff
==============================================================================
--- tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/currency-converter-ws/build.xml (original)
+++ tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/currency-converter-ws/build.xml Mon May 17 14:33:13 2010
@@ -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

Modified: tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/currency-converter/build.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/currency-converter/build.xml?rev=945180&r1=945179&r2=945180&view=diff
==============================================================================
--- tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/currency-converter/build.xml (original)
+++ tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/currency-converter/build.xml Mon May 17 14:33:13 2010
@@ -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">

Modified: tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/databinding/build.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/databinding/build.xml?rev=945180&r1=945179&r2=945180&view=diff
==============================================================================
--- tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/databinding/build.xml (original)
+++ tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/databinding/build.xml Mon May 17 14:33:13 2010
@@ -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">

Modified: tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/feed-logger/build.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/feed-logger/build.xml?rev=945180&r1=945179&r2=945180&view=diff
==============================================================================
--- tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/feed-logger/build.xml (original)
+++ tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/feed-logger/build.xml Mon May 17 14:33:13 2010
@@ -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">

Modified: tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/fullapp/build.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/fullapp/build.xml?rev=945180&r1=945179&r2=945180&view=diff
==============================================================================
--- tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/fullapp/build.xml (original)
+++ tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/fullapp/build.xml Mon May 17 14:33:13 2010
@@ -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">

Modified: tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/help-pages/build.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/help-pages/build.xml?rev=945180&r1=945179&r2=945180&view=diff
==============================================================================
--- tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/help-pages/build.xml (original)
+++ tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/help-pages/build.xml Mon May 17 14:33:13 2010
@@ -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">

Modified: tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/interaction/build.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/interaction/build.xml?rev=945180&r1=945179&r2=945180&view=diff
==============================================================================
--- tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/interaction/build.xml (original)
+++ tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/interaction/build.xml Mon May 17 14:33:13 2010
@@ -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">

Modified: tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/introducing/build.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/introducing/build.xml?rev=945180&r1=945179&r2=945180&view=diff
==============================================================================
--- tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/introducing/build.xml (original)
+++ tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/introducing/build.xml Mon May 17 14:33:13 2010
@@ -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">

Modified: tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/notification-corba/build.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/notification-corba/build.xml?rev=945180&r1=945179&r2=945180&view=diff
==============================================================================
--- tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/notification-corba/build.xml (original)
+++ tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/notification-corba/build.xml Mon May 17 14:33:13 2010
@@ -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. -->

Modified: tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/notification-ejb/build.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/notification-ejb/build.xml?rev=945180&r1=945179&r2=945180&view=diff
==============================================================================
--- tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/notification-ejb/build.xml (original)
+++ tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/notification-ejb/build.xml Mon May 17 14:33:13 2010
@@ -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. -->

Modified: tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/notification-jms/build.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/notification-jms/build.xml?rev=945180&r1=945179&r2=945180&view=diff
==============================================================================
--- tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/notification-jms/build.xml (original)
+++ tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/notification-jms/build.xml Mon May 17 14:33:13 2010
@@ -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. -->

Modified: tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/notification-rmi/build.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/notification-rmi/build.xml?rev=945180&r1=945179&r2=945180&view=diff
==============================================================================
--- tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/notification-rmi/build.xml (original)
+++ tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/notification-rmi/build.xml Mon May 17 14:33:13 2010
@@ -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. -->

Modified: tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/notification-ws/build.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/notification-ws/build.xml?rev=945180&r1=945179&r2=945180&view=diff
==============================================================================
--- tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/notification-ws/build.xml (original)
+++ tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/notification-ws/build.xml Mon May 17 14:33:13 2010
@@ -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. -->

Modified: tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/payment-bpel/build.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/payment-bpel/build.xml?rev=945180&r1=945179&r2=945180&view=diff
==============================================================================
--- tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/payment-bpel/build.xml (original)
+++ tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/payment-bpel/build.xml Mon May 17 14:33:13 2010
@@ -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">

Modified: tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/payment-groovy/build.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/payment-groovy/build.xml?rev=945180&r1=945179&r2=945180&view=diff
==============================================================================
--- tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/payment-groovy/build.xml (original)
+++ tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/payment-groovy/build.xml Mon May 17 14:33:13 2010
@@ -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">

Modified: tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/payment-java-callback/build.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/payment-java-callback/build.xml?rev=945180&r1=945179&r2=945180&view=diff
==============================================================================
--- tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/payment-java-callback/build.xml (original)
+++ tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/payment-java-callback/build.xml Mon May 17 14:33:13 2010
@@ -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">

Modified: tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/payment-java-policy/build.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/payment-java-policy/build.xml?rev=945180&r1=945179&r2=945180&view=diff
==============================================================================
--- tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/payment-java-policy/build.xml (original)
+++ tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/payment-java-policy/build.xml Mon May 17 14:33:13 2010
@@ -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">

Modified: tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/payment-java-reference-pass/build.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/payment-java-reference-pass/build.xml?rev=945180&r1=945179&r2=945180&view=diff
==============================================================================
--- tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/payment-java-reference-pass/build.xml (original)
+++ tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/payment-java-reference-pass/build.xml Mon May 17 14:33:13 2010
@@ -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">

Modified: tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/payment-java/build.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/payment-java/build.xml?rev=945180&r1=945179&r2=945180&view=diff
==============================================================================
--- tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/payment-java/build.xml (original)
+++ tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/payment-java/build.xml Mon May 17 14:33:13 2010
@@ -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">

Modified: tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/payment-python/build.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/payment-python/build.xml?rev=945180&r1=945179&r2=945180&view=diff
==============================================================================
--- tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/payment-python/build.xml (original)
+++ tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/payment-python/build.xml Mon May 17 14:33:13 2010
@@ -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">

Modified: tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/payment-spring-scatag/build.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/payment-spring-scatag/build.xml?rev=945180&r1=945179&r2=945180&view=diff
==============================================================================
--- tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/payment-spring-scatag/build.xml (original)
+++ tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/payment-spring-scatag/build.xml Mon May 17 14:33:13 2010
@@ -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">

Modified: tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/payment-spring/build.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/payment-spring/build.xml?rev=945180&r1=945179&r2=945180&view=diff
==============================================================================
--- tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/payment-spring/build.xml (original)
+++ tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/payment-spring/build.xml Mon May 17 14:33:13 2010
@@ -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">

Modified: tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/policy/build.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/policy/build.xml?rev=945180&r1=945179&r2=945180&view=diff
==============================================================================
--- tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/policy/build.xml (original)
+++ tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/policy/build.xml Mon May 17 14:33:13 2010
@@ -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">

Modified: tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/usingsca/build.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/usingsca/build.xml?rev=945180&r1=945179&r2=945180&view=diff
==============================================================================
--- tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/usingsca/build.xml (original)
+++ tuscany/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/usingsca/build.xml Mon May 17 14:33:13 2010
@@ -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">