Add launchers/common to runtime path so that ant script works with maven-built jars

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

19 files changed, 19 insertions, 19 deletions

diff --git a/sandbox/travelsample/launchers/blog-feed/build.xml b/sandbox/travelsample/launchers/blog-feed/build.xml
index fff8bc212f..c425c33580 100644
--- a/sandbox/travelsample/launchers/blog-feed/build.xml
+++ b/sandbox/travelsample/launchers/blog-feed/build.xml
@@ -22,12 +22,12 @@
     <path id="compile-path">

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

     </path>

-    <path id="package-path" refid="compile-path"/>

 

     <target name="run">

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

             <classpath>

                 <pathelement location="target/${ant.project.name}.jar"/>

+                <path refid="compile-path"/>

                 <pathelement location="${env.TUSCANY_HOME}/lib/tuscany-sca-manifest.jar"/>

             </classpath>

         </java>

diff --git a/sandbox/travelsample/launchers/currency-converter-corba/build.xml b/sandbox/travelsample/launchers/currency-converter-corba/build.xml
index 36012e293a..c40f77c322 100644
--- a/sandbox/travelsample/launchers/currency-converter-corba/build.xml
+++ b/sandbox/travelsample/launchers/currency-converter-corba/build.xml
@@ -22,7 +22,6 @@
     <path id="compile-path">

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

     </path>

-    <path id="package-path" refid="compile-path"/>

 

     <!-- When running this sample, the tuscany-host-corba-jse and

        tuscany-host-corba-jse-tns jars need to be present on the classpath.

@@ -36,6 +35,7 @@
         <java classname="scatours.CurrencyConverterCORBALauncher" fork="true">

             <classpath>

                 <pathelement location="target/${ant.project.name}.jar"/>

+                <path refid="compile-path"/>

                 <pathelement location="${env.TUSCANY_HOME}/lib/tuscany-sca-manifest.jar"/>

                 <fileset dir="${env.TUSCANY_HOST_CORBA}"/>

             </classpath>

diff --git a/sandbox/travelsample/launchers/currency-converter-jms/build.xml b/sandbox/travelsample/launchers/currency-converter-jms/build.xml
index 264e028dd1..ab972ea3fe 100644
--- a/sandbox/travelsample/launchers/currency-converter-jms/build.xml
+++ b/sandbox/travelsample/launchers/currency-converter-jms/build.xml
@@ -22,7 +22,6 @@
     <path id="compile-path">

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

     </path>

-    <path id="package-path" refid="compile-path"/>

 

     <!-- Before invoking the "run" target, the JMS broker needs to be

          started and running in a different process. -->

@@ -30,6 +29,7 @@
         <java classname="scatours.JMSBrokerLauncher" fork="true">

             <classpath>

                 <pathelement location="target/${ant.project.name}.jar"/>

+                <path refid="compile-path"/>

                 <!-- The following is used to bring in the ActiveMQ runtime. -->

                 <pathelement location="${env.TUSCANY_HOME}/lib/tuscany-sca-manifest.jar"/>

             </classpath>

diff --git a/sandbox/travelsample/launchers/currency-converter-rmi/build.xml b/sandbox/travelsample/launchers/currency-converter-rmi/build.xml
index 814ed9a053..5d4fc20e8c 100644
--- a/sandbox/travelsample/launchers/currency-converter-rmi/build.xml
+++ b/sandbox/travelsample/launchers/currency-converter-rmi/build.xml
@@ -22,12 +22,12 @@
     <path id="compile-path">

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

     </path>

-    <path id="package-path" refid="compile-path"/>

 

     <target name="run">

         <java classname="scatours.CurrencyConverterRMILauncher" fork="true">

             <classpath>

                 <pathelement location="target/${ant.project.name}.jar"/>

+                <path refid="compile-path"/>

                 <pathelement location="${env.TUSCANY_HOME}/lib/tuscany-sca-manifest.jar"/>

             </classpath>

         </java>

diff --git a/sandbox/travelsample/launchers/currency-converter-ws/build.xml b/sandbox/travelsample/launchers/currency-converter-ws/build.xml
index f4b21d0b55..8b45a79763 100644
--- a/sandbox/travelsample/launchers/currency-converter-ws/build.xml
+++ b/sandbox/travelsample/launchers/currency-converter-ws/build.xml
@@ -22,12 +22,12 @@
     <path id="compile-path">

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

     </path>

-    <path id="package-path" refid="compile-path"/>

 

     <target name="run">

         <java classname="scatours.CurrencyConverterWSLauncher" fork="true">

             <classpath>

                 <pathelement location="target/${ant.project.name}.jar"/>

+                <path refid="compile-path"/>

                 <pathelement location="${env.TUSCANY_HOME}/lib/tuscany-sca-manifest.jar"/>

             </classpath>

         </java>

diff --git a/sandbox/travelsample/launchers/currency-converter/build.xml b/sandbox/travelsample/launchers/currency-converter/build.xml
index 6b0f17f2db..87d27f555f 100644
--- a/sandbox/travelsample/launchers/currency-converter/build.xml
+++ b/sandbox/travelsample/launchers/currency-converter/build.xml
@@ -22,12 +22,12 @@
     <path id="compile-path">

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

     </path>

-    <path id="package-path" refid="compile-path"/>

 

     <target name="run">

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

             <classpath>

                 <pathelement location="target/${ant.project.name}.jar"/>

+                <path refid="compile-path"/>

                 <pathelement location="${env.TUSCANY_HOME}/lib/tuscany-sca-manifest.jar"/>

             </classpath>

         </java>

diff --git a/sandbox/travelsample/launchers/databinding/build.xml b/sandbox/travelsample/launchers/databinding/build.xml
index 3d80a6ca68..810d656642 100644
--- a/sandbox/travelsample/launchers/databinding/build.xml
+++ b/sandbox/travelsample/launchers/databinding/build.xml
@@ -22,12 +22,12 @@
     <path id="compile-path">
         <pathelement path="../common/target/scatours-launcher-common.jar"/>
     </path>
-    <path id="package-path" refid="compile-path"/>
 
     <target name="run">
         <java classname="scatours.DatabindingLauncher" fork="true">
             <classpath>
                 <pathelement location="target/${ant.project.name}.jar"/>
+                <path refid="compile-path"/>
                 <pathelement location="${env.TUSCANY_HOME}/lib/tuscany-sca-manifest.jar"/>
             </classpath>
         </java>
diff --git a/sandbox/travelsample/launchers/feed-logger/build.xml b/sandbox/travelsample/launchers/feed-logger/build.xml
index e6bca9c15d..5823cf2be3 100644
--- a/sandbox/travelsample/launchers/feed-logger/build.xml
+++ b/sandbox/travelsample/launchers/feed-logger/build.xml
@@ -22,12 +22,12 @@
     <path id="compile-path">

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

     </path>

-    <path id="package-path" refid="compile-path"/>

 

     <target name="run">

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

             <classpath>

                 <pathelement location="target/${ant.project.name}.jar"/>

+                <path refid="compile-path"/>

                 <pathelement location="${env.TUSCANY_HOME}/lib/tuscany-sca-manifest.jar"/>

             </classpath>

         </java>

diff --git a/sandbox/travelsample/launchers/fullapp/build.xml b/sandbox/travelsample/launchers/fullapp/build.xml
index d6e7e18dbb..9db479d923 100644
--- a/sandbox/travelsample/launchers/fullapp/build.xml
+++ b/sandbox/travelsample/launchers/fullapp/build.xml
@@ -22,12 +22,12 @@
     <path id="compile-path">
         <pathelement path="../common/target/scatours-launcher-common.jar"/>
     </path>
-    <path id="package-path" refid="compile-path"/>
 
     <target name="run">
         <java classname="scatours.FullAppLauncher" fork="true">
             <classpath>
                 <pathelement location="target/${ant.project.name}.jar"/>
+                <path refid="compile-path"/>
                 <pathelement location="${env.TUSCANY_HOME}/lib/tuscany-sca-manifest.jar"/>
             </classpath>
         </java>
diff --git a/sandbox/travelsample/launchers/help-pages/build.xml b/sandbox/travelsample/launchers/help-pages/build.xml
index 3f83d64e22..0a3ecdde0c 100644
--- a/sandbox/travelsample/launchers/help-pages/build.xml
+++ b/sandbox/travelsample/launchers/help-pages/build.xml
@@ -22,12 +22,12 @@
     <path id="compile-path">

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

     </path>

-    <path id="package-path" refid="compile-path"/>

 

     <target name="run">

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

             <classpath>

                 <pathelement location="target/${ant.project.name}.jar"/>

+                <path refid="compile-path"/>

                 <pathelement location="${env.TUSCANY_HOME}/lib/tuscany-sca-manifest.jar"/>

             </classpath>

         </java>

diff --git a/sandbox/travelsample/launchers/interaction/build.xml b/sandbox/travelsample/launchers/interaction/build.xml
index e00596f636..981bf34176 100644
--- a/sandbox/travelsample/launchers/interaction/build.xml
+++ b/sandbox/travelsample/launchers/interaction/build.xml
@@ -22,12 +22,12 @@
     <path id="compile-path">

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

     </path>

-    <path id="package-path" refid="compile-path"/>

 

     <target name="run">

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

             <classpath>

                 <pathelement location="target/${ant.project.name}.jar"/>

+                <path refid="compile-path"/>

                 <pathelement location="${env.TUSCANY_HOME}/lib/tuscany-sca-manifest.jar"/>

             </classpath>

         </java>

diff --git a/sandbox/travelsample/launchers/introducing/build.xml b/sandbox/travelsample/launchers/introducing/build.xml
index 3e3e839610..8ee16e40b2 100644
--- a/sandbox/travelsample/launchers/introducing/build.xml
+++ b/sandbox/travelsample/launchers/introducing/build.xml
@@ -22,12 +22,12 @@
     <path id="compile-path">

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

     </path>

-    <path id="package-path" refid="compile-path"/>

 

     <target name="run">

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

             <classpath>

                 <pathelement location="target/${ant.project.name}.jar"/>

+                <path refid="compile-path"/>

                 <pathelement location="${env.TUSCANY_HOME}/lib/tuscany-sca-manifest.jar"/>

             </classpath>

         </java>

diff --git a/sandbox/travelsample/launchers/jumpstart/build.xml b/sandbox/travelsample/launchers/jumpstart/build.xml
index fdfc12c92d..5b58c98eb8 100644
--- a/sandbox/travelsample/launchers/jumpstart/build.xml
+++ b/sandbox/travelsample/launchers/jumpstart/build.xml
@@ -22,12 +22,12 @@
     <path id="compile-path">

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

     </path>

-    <path id="package-path" refid="compile-path"/>

 

     <target name="run">

         <java classname="scatours.JumpstartLauncher" fork="true">

             <classpath>

                 <pathelement location="target/${ant.project.name}.jar"/>

+                <path refid="compile-path"/>

                 <pathelement location="${env.TUSCANY_HOME}/lib/tuscany-sca-manifest.jar"/>

             </classpath>

         </java>

diff --git a/sandbox/travelsample/launchers/notification-corba/build.xml b/sandbox/travelsample/launchers/notification-corba/build.xml
index 152918616a..d4d1af0e76 100644
--- a/sandbox/travelsample/launchers/notification-corba/build.xml
+++ b/sandbox/travelsample/launchers/notification-corba/build.xml
@@ -22,7 +22,6 @@
     <path id="compile-path">

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

     </path>

-    <path id="package-path" refid="compile-path"/>

 

     <!-- Before invoking the "run" target, both the CORBA nameserver and

        the CORBA SMS Gateway service need to be started and running in

@@ -45,6 +44,7 @@
         <java classname="scatours.NotificationCORBALauncher" fork="true">

             <classpath>

                 <pathelement location="target/${ant.project.name}.jar"/>

+                <path refid="compile-path"/>

                 <pathelement location="${env.TUSCANY_HOME}/lib/tuscany-sca-manifest.jar"/>

                 <fileset dir="${env.TUSCANY_HOST_CORBA}"/>

             </classpath>

diff --git a/sandbox/travelsample/launchers/notification-ejb/build.xml b/sandbox/travelsample/launchers/notification-ejb/build.xml
index cc7e8466d8..edf78c4773 100644
--- a/sandbox/travelsample/launchers/notification-ejb/build.xml
+++ b/sandbox/travelsample/launchers/notification-ejb/build.xml
@@ -22,7 +22,6 @@
     <path id="compile-path">

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

     </path>

-    <path id="package-path" refid="compile-path"/>

 

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

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

@@ -34,6 +33,7 @@
         <java classname="scatours.NotificationEJBLauncher" fork="true">

             <classpath>

                 <pathelement location="target/${ant.project.name}.jar"/>

+                <path refid="compile-path"/>

                 <pathelement location="${env.TUSCANY_HOME}/lib/tuscany-sca-manifest.jar"/>

                 <fileset dir="${env.OPENEJB_HOME}/lib"/>

             </classpath>

diff --git a/sandbox/travelsample/launchers/notification-jms/build.xml b/sandbox/travelsample/launchers/notification-jms/build.xml
index 0c1c4d2063..829fbcfdf8 100644
--- a/sandbox/travelsample/launchers/notification-jms/build.xml
+++ b/sandbox/travelsample/launchers/notification-jms/build.xml
@@ -22,7 +22,6 @@
     <path id="compile-path">

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

     </path>

-    <path id="package-path" refid="compile-path"/>

 

     <!-- Before invoking the "run" target, both the JMS broker and the

        JMS implementation of the SMS gateway need to be started and running

@@ -38,6 +37,7 @@
         <java classname="scatours.NotificationJMSLauncher" fork="true">

             <classpath>

                 <pathelement location="target/${ant.project.name}.jar"/>

+                <path refid="compile-path"/>

                 <pathelement location="${env.TUSCANY_HOME}/lib/tuscany-sca-manifest.jar"/>

             </classpath>

         </java>

diff --git a/sandbox/travelsample/launchers/notification-rmi/build.xml b/sandbox/travelsample/launchers/notification-rmi/build.xml
index addffd998e..7d544378be 100644
--- a/sandbox/travelsample/launchers/notification-rmi/build.xml
+++ b/sandbox/travelsample/launchers/notification-rmi/build.xml
@@ -22,7 +22,6 @@
     <path id="compile-path">

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

     </path>

-    <path id="package-path" refid="compile-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. -->

@@ -34,6 +33,7 @@
         <java classname="scatours.NotificationRMILauncher" fork="true">

             <classpath>

                 <pathelement location="target/${ant.project.name}.jar"/>

+                <path refid="compile-path"/>

                 <pathelement location="${env.TUSCANY_HOME}/lib/tuscany-sca-manifest.jar"/>

             </classpath>

         </java>

diff --git a/sandbox/travelsample/launchers/notification-ws/build.xml b/sandbox/travelsample/launchers/notification-ws/build.xml
index 2d9660caeb..cc9e73890c 100644
--- a/sandbox/travelsample/launchers/notification-ws/build.xml
+++ b/sandbox/travelsample/launchers/notification-ws/build.xml
@@ -22,7 +22,6 @@
     <path id="compile-path">

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

     </path>

-    <path id="package-path" refid="compile-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. -->

@@ -34,6 +33,7 @@
         <java classname="scatours.NotificationWSLauncher" fork="true">

             <classpath>

                 <pathelement location="target/${ant.project.name}.jar"/>

+                <path refid="compile-path"/>

                 <pathelement location="${env.TUSCANY_HOME}/lib/tuscany-sca-manifest.jar"/>

             </classpath>

         </java>

diff --git a/sandbox/travelsample/launchers/policy/build.xml b/sandbox/travelsample/launchers/policy/build.xml
index 2e670f6983..376a1830bc 100644
--- a/sandbox/travelsample/launchers/policy/build.xml
+++ b/sandbox/travelsample/launchers/policy/build.xml
@@ -22,12 +22,12 @@
     <path id="compile-path">
         <pathelement path="../common/target/scatours-launcher-common.jar"/>
     </path>
-    <path id="package-path" refid="compile-path"/>
 
     <target name="run">
         <java classname="scatours.PolicyLauncher" fork="true">
             <classpath>
                 <pathelement location="target/${ant.project.name}.jar"/>
+                <path refid="compile-path"/>
                 <pathelement location="${env.TUSCANY_HOME}/lib/tuscany-sca-manifest.jar"/>
             </classpath>
         </java>