Use package-path setting to add util/launcher-common dependency to manifest classpaths of launcher jars

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

28 files changed, 84 insertions, 0 deletions

diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/buildingblocks/build.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/buildingblocks/build.xml
index b61282f368..b169dca456 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/buildingblocks/build.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/buildingblocks/build.xml
@@ -22,6 +22,9 @@
     <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>

 

     <target name="run">

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

diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/currency-converter-corba/build.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/currency-converter-corba/build.xml
index c5f32d4588..1fbdbb7ad7 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/currency-converter-corba/build.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/currency-converter-corba/build.xml
@@ -22,6 +22,9 @@
     <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>

 

     <!-- 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/branches/sca-java-travelsample-1.0/launchers/currency-converter-jms/build.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/currency-converter-jms/build.xml
index 3ccf56b2c8..856ab73fb3 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/currency-converter-jms/build.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/currency-converter-jms/build.xml
@@ -22,6 +22,9 @@
     <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>

 

     <!-- 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/branches/sca-java-travelsample-1.0/launchers/currency-converter-rmi/build.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/currency-converter-rmi/build.xml
index 8990723c63..33a61e6d9e 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/currency-converter-rmi/build.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/currency-converter-rmi/build.xml
@@ -22,6 +22,9 @@
     <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>

 

     <!-- 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/branches/sca-java-travelsample-1.0/launchers/currency-converter-ws/build.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/currency-converter-ws/build.xml
index 2fd3663bab..5260ec09ca 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/currency-converter-ws/build.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/currency-converter-ws/build.xml
@@ -22,6 +22,9 @@
     <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>

 

     <!-- 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/branches/sca-java-travelsample-1.0/launchers/currency-converter/build.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/currency-converter/build.xml
index 2cd41af723..cef1c1e56e 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/currency-converter/build.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/currency-converter/build.xml
@@ -22,6 +22,9 @@
     <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>

 

     <target name="run">

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

diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/databinding/build.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/databinding/build.xml
index dc099ea479..4d7ff073d7 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/databinding/build.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/databinding/build.xml
@@ -22,6 +22,9 @@
     <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>
 
     <target name="run">
         <java classname="scatours.DatabindingLauncher" fork="true" failonerror="true">
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/feed-logger/build.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/feed-logger/build.xml
index 826c542cdb..48bef522cd 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/feed-logger/build.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/feed-logger/build.xml
@@ -22,6 +22,9 @@
     <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>

 

     <target name="run">

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

diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/fullapp/build.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/fullapp/build.xml
index ab2f62460c..60c791e93b 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/fullapp/build.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/fullapp/build.xml
@@ -22,6 +22,9 @@
     <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>
 
     <target name="run">
         <java classname="scatours.FullAppLauncher" fork="true" failonerror="true">
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/help-pages/build.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/help-pages/build.xml
index a763c082e0..74273cb3e6 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/help-pages/build.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/help-pages/build.xml
@@ -22,6 +22,9 @@
     <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>

 

     <target name="run">

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

diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/interaction/build.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/interaction/build.xml
index 8db09fe972..66704162cf 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/interaction/build.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/interaction/build.xml
@@ -22,6 +22,9 @@
     <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>

 

     <target name="run">

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

diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/introducing/build.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/introducing/build.xml
index 217679604d..b3faab5691 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/introducing/build.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/introducing/build.xml
@@ -22,6 +22,9 @@
     <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>

 

     <target name="run">

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

diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/notification-corba/build.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/notification-corba/build.xml
index 4c2524fdd0..343e79ecb2 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/notification-corba/build.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/notification-corba/build.xml
@@ -22,6 +22,9 @@
     <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>

 

     <!-- 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/branches/sca-java-travelsample-1.0/launchers/notification-ejb/build.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/notification-ejb/build.xml
index ddb8ae32e5..f77f400079 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/notification-ejb/build.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/notification-ejb/build.xml
@@ -22,6 +22,9 @@
     <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>

 

     <!-- 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/branches/sca-java-travelsample-1.0/launchers/notification-jms/build.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/notification-jms/build.xml
index e7129ddc61..6ca46dc47a 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/notification-jms/build.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/notification-jms/build.xml
@@ -22,6 +22,9 @@
     <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>

 

     <!-- 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/branches/sca-java-travelsample-1.0/launchers/notification-rmi/build.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/notification-rmi/build.xml
index a4f7b17d01..7a3a00fe76 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/notification-rmi/build.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/notification-rmi/build.xml
@@ -22,6 +22,9 @@
     <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>

 

     <!-- 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/branches/sca-java-travelsample-1.0/launchers/notification-ws/build.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/notification-ws/build.xml
index a6a3ac5ef0..ef79dc7df6 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/notification-ws/build.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/notification-ws/build.xml
@@ -22,6 +22,9 @@
     <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>

 

     <!-- 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/branches/sca-java-travelsample-1.0/launchers/payment-bpel/build.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/payment-bpel/build.xml
index 7b0324ca3c..4f2066b39d 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/payment-bpel/build.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/payment-bpel/build.xml
@@ -22,6 +22,9 @@
     <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>
 
     <target name="wsdljava">
         <antcall target="wsimport">
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/payment-groovy/build.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/payment-groovy/build.xml
index ca65997d4e..374a6af02e 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/payment-groovy/build.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/payment-groovy/build.xml
@@ -22,6 +22,9 @@
     <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>
 
     <target name="wsdljava">
         <antcall target="wsimport">
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/payment-java-callback/build.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/payment-java-callback/build.xml
index 4f41161af5..373cb4bee0 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/payment-java-callback/build.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/payment-java-callback/build.xml
@@ -22,6 +22,9 @@
     <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>
 
     <target name="wsdljava">
         <antcall target="wsimport">
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/payment-java-policy/build.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/payment-java-policy/build.xml
index 9acde08548..a41f433670 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/payment-java-policy/build.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/payment-java-policy/build.xml
@@ -22,6 +22,9 @@
     <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>
 
     <target name="wsdljava">
         <antcall target="wsimport">
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/payment-java-reference-pass/build.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/payment-java-reference-pass/build.xml
index bd86576fac..37e6d16616 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/payment-java-reference-pass/build.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/payment-java-reference-pass/build.xml
@@ -22,6 +22,9 @@
     <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>
 
     <target name="wsdljava">
         <antcall target="wsimport">
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/payment-java/build.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/payment-java/build.xml
index 570ea9f159..9f9addbe23 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/payment-java/build.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/payment-java/build.xml
@@ -22,6 +22,9 @@
     <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>
 
     <target name="wsdljava">
         <antcall target="wsimport">
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/payment-python/build.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/payment-python/build.xml
index da94a8905e..eb889ab9b0 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/payment-python/build.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/payment-python/build.xml
@@ -22,6 +22,9 @@
     <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>
 
     <target name="wsdljava">
         <antcall target="wsimport">
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/payment-spring-scatag/build.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/payment-spring-scatag/build.xml
index f4e4e55ef3..3460f0f945 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/payment-spring-scatag/build.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/payment-spring-scatag/build.xml
@@ -22,6 +22,9 @@
     <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>
 
     <target name="wsdljava">
         <antcall target="wsimport">
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/payment-spring/build.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/payment-spring/build.xml
index 73732de9aa..0486e2490e 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/payment-spring/build.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/payment-spring/build.xml
@@ -22,6 +22,9 @@
     <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>
 
     <target name="wsdljava">
         <antcall target="wsimport">
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/policy/build.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/policy/build.xml
index 57001f70e3..dced7f0e3e 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/policy/build.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/policy/build.xml
@@ -22,6 +22,9 @@
     <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>
 
     <target name="run">
         <java classname="scatours.PolicyLauncher" fork="true">
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/usingsca/build.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/usingsca/build.xml
index 0f74d2fdf7..cc9a869e97 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/usingsca/build.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/usingsca/build.xml
@@ -22,6 +22,9 @@
     <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>

 

     <target name="run">

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