Move the travel sample launchers/common module to util/launcher-common (TUSCANY-3422)

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

42 files changed, 130 insertions, 105 deletions

diff --git a/sandbox/travelsample/launchers/blog-feed/build.xml b/sandbox/travelsample/launchers/blog-feed/build.xml
index c425c33580..c708dabbe5 100644
--- a/sandbox/travelsample/launchers/blog-feed/build.xml
+++ b/sandbox/travelsample/launchers/blog-feed/build.xml
@@ -20,7 +20,7 @@
 <project name="scatours-launcher-blog-feed" default="compile">

     <import file="../../antdefs.xml"/>

     <path id="compile-path">

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

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

     </path>

 

     <target name="run">

diff --git a/sandbox/travelsample/launchers/blog-feed/pom.xml b/sandbox/travelsample/launchers/blog-feed/pom.xml
index 11d1c186fa..7df381d2e1 100644
--- a/sandbox/travelsample/launchers/blog-feed/pom.xml
+++ b/sandbox/travelsample/launchers/blog-feed/pom.xml
@@ -32,8 +32,15 @@
     

         <dependency>

             <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-launcher-common</artifactId>

+            <artifactId>scatours-util-launcher-common</artifactId>

             <version>${pom.version}</version>

+            <scope>provided</scope>

+        </dependency>

+

+        <dependency>

+            <groupId>org.apache.tuscany.sca</groupId>

+            <artifactId>tuscany-node-api</artifactId>

+            <version>${tuscany.version}</version>

         </dependency>

             

         <dependency>

@@ -87,6 +94,9 @@
                 <version>2.2</version>

                 <configuration>

                     <archive>

+                        <manifestEntries>

+                            <Class-Path>../util/scatours-util-launcher-common.jar</Class-Path>

+                        </manifestEntries>

                         <manifest>

                             <addClasspath>true</addClasspath>

                             <classpathPrefix>../lib/</classpathPrefix>

diff --git a/sandbox/travelsample/launchers/build.xml b/sandbox/travelsample/launchers/build.xml
index b080b2c473..a391f8e0cc 100644
--- a/sandbox/travelsample/launchers/build.xml
+++ b/sandbox/travelsample/launchers/build.xml
@@ -38,7 +38,6 @@
     </target>

 

     <target name="allsubdirs">

-        <ant dir="common" target="${target}"/> <!--needed by blog-feed-->

         <ant dir="blog-feed" target="${target}"/>

         <ant dir="currency-converter" target="${target}"/>

         <ant dir="currency-converter-corba" target="${target}"/>

diff --git a/sandbox/travelsample/launchers/common/build.xml b/sandbox/travelsample/launchers/common/build.xml
deleted file mode 100644
index c56323c786..0000000000
--- a/sandbox/travelsample/launchers/common/build.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- * 

- *   http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

--->

-

-<project name="scatours-launcher-common" default="compile">

-    <import file="../../antdefs.xml"/>

-</project>

diff --git a/sandbox/travelsample/launchers/common/pom.xml b/sandbox/travelsample/launchers/common/pom.xml
deleted file mode 100644
index 9424fd13d9..0000000000
--- a/sandbox/travelsample/launchers/common/pom.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    * Licensed to the Apache Software Foundation (ASF) under one
-    * or more contributor license agreements.  See the NOTICE file
-    * distributed with this work for additional information
-    * regarding copyright ownership.  The ASF licenses this file
-    * to you under the Apache License, Version 2.0 (the
-    * "License"); you may not use this file except in compliance
-    * with the License.  You may obtain a copy of the License at
-    * 
-    *   http://www.apache.org/licenses/LICENSE-2.0
-    * 
-    * Unless required by applicable law or agreed to in writing,
-    * software distributed under the License is distributed on an
-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    * KIND, either express or implied.  See the License for the
-    * specific language governing permissions and limitations
-    * under the License.    
--->
-<project>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>scatours</artifactId>
-        <version>1.0-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent><version>1.0-SNAPSHOT</version>
-    <artifactId>scatours-launcher-common</artifactId>
-    <name>Apache Tuscany SCA Tours Common Utility for Launchers</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-api</artifactId>
-            <version>${tuscany.version}</version>
-        </dependency>
-    </dependencies>
-    
-</project>
diff --git a/sandbox/travelsample/launchers/currency-converter-corba/build.xml b/sandbox/travelsample/launchers/currency-converter-corba/build.xml
index 0e51e79bca..20c4a3c11c 100644
--- a/sandbox/travelsample/launchers/currency-converter-corba/build.xml
+++ b/sandbox/travelsample/launchers/currency-converter-corba/build.xml
@@ -20,7 +20,7 @@
 <project name="scatours-launcher-currency-converter-corba" default="compile">

     <import file="../../antdefs.xml"/>

     <path id="compile-path">

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

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

     </path>

 

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

diff --git a/sandbox/travelsample/launchers/currency-converter-corba/pom.xml b/sandbox/travelsample/launchers/currency-converter-corba/pom.xml
index 43fc75d156..bf82181763 100644
--- a/sandbox/travelsample/launchers/currency-converter-corba/pom.xml
+++ b/sandbox/travelsample/launchers/currency-converter-corba/pom.xml
@@ -32,10 +32,11 @@
     

         <dependency>

             <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-launcher-common</artifactId>

+            <artifactId>scatours-util-launcher-common</artifactId>

             <version>${pom.version}</version>

+            <scope>provided</scope>

         </dependency>

-            

+

         <dependency>

             <groupId>org.apache.tuscany.sca</groupId>

             <artifactId>tuscany-node-api</artifactId>

@@ -87,6 +88,9 @@
                 <version>2.2</version>

                 <configuration>

                     <archive>

+                        <manifestEntries>

+                            <Class-Path>../util/scatours-util-launcher-common.jar</Class-Path>

+                        </manifestEntries>

                         <manifest>

                             <addClasspath>true</addClasspath>

                             <classpathPrefix>../lib/</classpathPrefix>

diff --git a/sandbox/travelsample/launchers/currency-converter-jms/build.xml b/sandbox/travelsample/launchers/currency-converter-jms/build.xml
index f67a8fd907..470e28bbf9 100644
--- a/sandbox/travelsample/launchers/currency-converter-jms/build.xml
+++ b/sandbox/travelsample/launchers/currency-converter-jms/build.xml
@@ -20,7 +20,7 @@
 <project name="scatours-launcher-currency-converter-jms" default="compile">

     <import file="../../antdefs.xml"/>

     <path id="compile-path">

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

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

     </path>

 

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

diff --git a/sandbox/travelsample/launchers/currency-converter-jms/pom.xml b/sandbox/travelsample/launchers/currency-converter-jms/pom.xml
index 674944efb7..d69d8a5cb1 100644
--- a/sandbox/travelsample/launchers/currency-converter-jms/pom.xml
+++ b/sandbox/travelsample/launchers/currency-converter-jms/pom.xml
@@ -32,10 +32,11 @@
     

         <dependency>

             <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-launcher-common</artifactId>

+            <artifactId>scatours-util-launcher-common</artifactId>

             <version>${pom.version}</version>

+            <scope>provided</scope>

         </dependency>

-            

+

         <dependency>

             <groupId>org.apache.tuscany.sca</groupId>

             <artifactId>tuscany-node-api</artifactId>

@@ -98,6 +99,9 @@
                 <version>2.2</version>

                 <configuration>

                     <archive>

+                        <manifestEntries>

+                            <Class-Path>../util/scatours-util-launcher-common.jar</Class-Path>

+                        </manifestEntries>

                         <manifest>

                             <addClasspath>true</addClasspath>

                             <classpathPrefix>../lib/</classpathPrefix>

diff --git a/sandbox/travelsample/launchers/currency-converter-rmi/build.xml b/sandbox/travelsample/launchers/currency-converter-rmi/build.xml
index ff42ceac1c..e61222505e 100644
--- a/sandbox/travelsample/launchers/currency-converter-rmi/build.xml
+++ b/sandbox/travelsample/launchers/currency-converter-rmi/build.xml
@@ -20,7 +20,7 @@
 <project name="scatours-launcher-currency-converter-rmi" default="compile">

     <import file="../../antdefs.xml"/>

     <path id="compile-path">

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

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

     </path>

 

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

diff --git a/sandbox/travelsample/launchers/currency-converter-rmi/pom.xml b/sandbox/travelsample/launchers/currency-converter-rmi/pom.xml
index 954b82fc8e..2782f72a76 100644
--- a/sandbox/travelsample/launchers/currency-converter-rmi/pom.xml
+++ b/sandbox/travelsample/launchers/currency-converter-rmi/pom.xml
@@ -32,8 +32,9 @@
     

         <dependency>

             <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-launcher-common</artifactId>

+            <artifactId>scatours-util-launcher-common</artifactId>

             <version>${pom.version}</version>

+            <scope>provided</scope>

         </dependency>

             

        <dependency>

@@ -94,6 +95,9 @@
                 <version>2.2</version>

                 <configuration>

                     <archive>

+                        <manifestEntries>

+                            <Class-Path>../util/scatours-util-launcher-common.jar</Class-Path>

+                        </manifestEntries>

                         <manifest>

                             <addClasspath>true</addClasspath>

                             <classpathPrefix>../lib/</classpathPrefix>

diff --git a/sandbox/travelsample/launchers/currency-converter-ws/build.xml b/sandbox/travelsample/launchers/currency-converter-ws/build.xml
index c7ffc87570..be278c5c24 100644
--- a/sandbox/travelsample/launchers/currency-converter-ws/build.xml
+++ b/sandbox/travelsample/launchers/currency-converter-ws/build.xml
@@ -20,7 +20,7 @@
 <project name="scatours-launcher-currency-converter-ws" default="compile">

     <import file="../../antdefs.xml"/>

     <path id="compile-path">

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

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

     </path>

 

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

diff --git a/sandbox/travelsample/launchers/currency-converter-ws/pom.xml b/sandbox/travelsample/launchers/currency-converter-ws/pom.xml
index fc4d563480..cc57ab3c9e 100644
--- a/sandbox/travelsample/launchers/currency-converter-ws/pom.xml
+++ b/sandbox/travelsample/launchers/currency-converter-ws/pom.xml
@@ -33,8 +33,9 @@
     

         <dependency>

             <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-launcher-common</artifactId>

+            <artifactId>scatours-util-launcher-common</artifactId>

             <version>${pom.version}</version>

+            <scope>provided</scope>

         </dependency>

             

         <dependency>

@@ -88,6 +89,9 @@
                 <version>2.2</version>

                 <configuration>

                     <archive>

+                        <manifestEntries>

+                            <Class-Path>../util/scatours-util-launcher-common.jar</Class-Path>

+                        </manifestEntries>

                         <manifest>

                             <addClasspath>true</addClasspath>

                             <classpathPrefix>../lib/</classpathPrefix>

diff --git a/sandbox/travelsample/launchers/currency-converter/build.xml b/sandbox/travelsample/launchers/currency-converter/build.xml
index 87d27f555f..2771b47262 100644
--- a/sandbox/travelsample/launchers/currency-converter/build.xml
+++ b/sandbox/travelsample/launchers/currency-converter/build.xml
@@ -20,7 +20,7 @@
 <project name="scatours-launcher-currency-converter" default="compile">

     <import file="../../antdefs.xml"/>

     <path id="compile-path">

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

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

     </path>

 

     <target name="run">

diff --git a/sandbox/travelsample/launchers/currency-converter/pom.xml b/sandbox/travelsample/launchers/currency-converter/pom.xml
index 1569625eac..e2dd7cf85b 100644
--- a/sandbox/travelsample/launchers/currency-converter/pom.xml
+++ b/sandbox/travelsample/launchers/currency-converter/pom.xml
@@ -32,10 +32,11 @@
     

         <dependency>

             <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-launcher-common</artifactId>

+            <artifactId>scatours-util-launcher-common</artifactId>

             <version>${pom.version}</version>

+            <scope>provided</scope>

         </dependency>

-            

+

         <dependency>

             <groupId>org.apache.tuscany.sca</groupId>

             <artifactId>tuscany-node-api</artifactId>

@@ -73,6 +74,9 @@
                 <version>2.2</version>

                 <configuration>

                     <archive>

+                        <manifestEntries>

+                            <Class-Path>../util/scatours-util-launcher-common.jar</Class-Path>

+                        </manifestEntries>

                         <manifest>

                             <addClasspath>true</addClasspath>

                             <classpathPrefix>../lib/</classpathPrefix>

diff --git a/sandbox/travelsample/launchers/databinding/build.xml b/sandbox/travelsample/launchers/databinding/build.xml
index 810d656642..32756dad73 100644
--- a/sandbox/travelsample/launchers/databinding/build.xml
+++ b/sandbox/travelsample/launchers/databinding/build.xml
@@ -20,7 +20,7 @@
 <project name="scatours-launcher-databinding" default="compile">
     <import file="../../antdefs.xml"/>
     <path id="compile-path">
-        <pathelement path="../common/target/scatours-launcher-common.jar"/>
+        <pathelement path="../../util/launcher-common/target/scatours-util-launcher-common.jar"/>
     </path>
 
     <target name="run">
diff --git a/sandbox/travelsample/launchers/databinding/pom.xml b/sandbox/travelsample/launchers/databinding/pom.xml
index 517b3e23c3..8ebfef67af 100644
--- a/sandbox/travelsample/launchers/databinding/pom.xml
+++ b/sandbox/travelsample/launchers/databinding/pom.xml
@@ -33,8 +33,9 @@
     
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>scatours-launcher-common</artifactId>
+            <artifactId>scatours-util-launcher-common</artifactId>
             <version>${pom.version}</version>
+            <scope>provided</scope>
         </dependency>
             
         <dependency>
@@ -152,6 +153,9 @@
                 <version>2.2</version>
                 <configuration>
                     <archive>
+                        <manifestEntries>
+                            <Class-Path>../util/scatours-util-launcher-common.jar</Class-Path>
+                        </manifestEntries>
                         <manifest>
                             <addClasspath>true</addClasspath>
                             <classpathPrefix>../lib/</classpathPrefix>
diff --git a/sandbox/travelsample/launchers/feed-logger/build.xml b/sandbox/travelsample/launchers/feed-logger/build.xml
index 5823cf2be3..26031f3686 100644
--- a/sandbox/travelsample/launchers/feed-logger/build.xml
+++ b/sandbox/travelsample/launchers/feed-logger/build.xml
@@ -20,7 +20,7 @@
 <project name="scatours-launcher-feed-logger" default="compile">

     <import file="../../antdefs.xml"/>

     <path id="compile-path">

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

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

     </path>

 

     <target name="run">

diff --git a/sandbox/travelsample/launchers/feed-logger/pom.xml b/sandbox/travelsample/launchers/feed-logger/pom.xml
index c05ec8d13c..5b8a188592 100644
--- a/sandbox/travelsample/launchers/feed-logger/pom.xml
+++ b/sandbox/travelsample/launchers/feed-logger/pom.xml
@@ -33,8 +33,15 @@
     

         <dependency>

             <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-launcher-common</artifactId>

+            <artifactId>scatours-util-launcher-common</artifactId>

             <version>${pom.version}</version>

+            <scope>provided</scope>

+        </dependency>

+

+        <dependency>

+            <groupId>org.apache.tuscany.sca</groupId>

+            <artifactId>tuscany-node-api</artifactId>

+            <version>${tuscany.version}</version>

         </dependency>

             

         <dependency>

@@ -88,6 +95,9 @@
                 <version>2.2</version>

                 <configuration>

                     <archive>

+                        <manifestEntries>

+                            <Class-Path>../util/scatours-util-launcher-common.jar</Class-Path>

+                        </manifestEntries>

                         <manifest>

                             <addClasspath>true</addClasspath>

                             <classpathPrefix>../lib/</classpathPrefix>

diff --git a/sandbox/travelsample/launchers/fullapp/build.xml b/sandbox/travelsample/launchers/fullapp/build.xml
index 9db479d923..977dd2710c 100644
--- a/sandbox/travelsample/launchers/fullapp/build.xml
+++ b/sandbox/travelsample/launchers/fullapp/build.xml
@@ -20,7 +20,7 @@
 <project name="scatours-launcher-fullapp" default="compile">
     <import file="../../antdefs.xml"/>
     <path id="compile-path">
-        <pathelement path="../common/target/scatours-launcher-common.jar"/>
+        <pathelement path="../../util/launcher-common/target/scatours-util-launcher-common.jar"/>
     </path>
 
     <target name="run">
diff --git a/sandbox/travelsample/launchers/fullapp/pom.xml b/sandbox/travelsample/launchers/fullapp/pom.xml
index 9d9784758b..7ece4347be 100644
--- a/sandbox/travelsample/launchers/fullapp/pom.xml
+++ b/sandbox/travelsample/launchers/fullapp/pom.xml
@@ -33,8 +33,9 @@
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>scatours-launcher-common</artifactId>
+            <artifactId>scatours-util-launcher-common</artifactId>
             <version>${pom.version}</version>
+            <scope>provided</scope>
         </dependency>
         
         <dependency>
@@ -191,6 +192,9 @@
                 <version>2.2</version>
                 <configuration>
                     <archive>
+                        <manifestEntries>
+                            <Class-Path>../util/scatours-util-launcher-common.jar</Class-Path>
+                        </manifestEntries>
                         <manifest>
                             <addClasspath>true</addClasspath>
                             <classpathPrefix>../lib/</classpathPrefix>
diff --git a/sandbox/travelsample/launchers/help-pages/build.xml b/sandbox/travelsample/launchers/help-pages/build.xml
index 0a3ecdde0c..6488677cb9 100644
--- a/sandbox/travelsample/launchers/help-pages/build.xml
+++ b/sandbox/travelsample/launchers/help-pages/build.xml
@@ -20,7 +20,7 @@
 <project name="scatours-launcher-help-pages" default="compile">

     <import file="../../antdefs.xml"/>

     <path id="compile-path">

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

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

     </path>

 

     <target name="run">

diff --git a/sandbox/travelsample/launchers/help-pages/pom.xml b/sandbox/travelsample/launchers/help-pages/pom.xml
index 4b86ae3ec4..a501b7849c 100644
--- a/sandbox/travelsample/launchers/help-pages/pom.xml
+++ b/sandbox/travelsample/launchers/help-pages/pom.xml
@@ -32,8 +32,9 @@
     

         <dependency>

             <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-launcher-common</artifactId>

+            <artifactId>scatours-util-launcher-common</artifactId>

             <version>${pom.version}</version>

+            <scope>provided</scope>

         </dependency>

             

         <dependency>

@@ -87,6 +88,9 @@
                 <version>2.2</version>

                 <configuration>

                     <archive>

+                        <manifestEntries>

+                            <Class-Path>../util/scatours-util-launcher-common.jar</Class-Path>

+                        </manifestEntries>

                         <manifest>

                             <addClasspath>true</addClasspath>

                             <classpathPrefix>../lib/</classpathPrefix>

diff --git a/sandbox/travelsample/launchers/interaction/build.xml b/sandbox/travelsample/launchers/interaction/build.xml
index 981bf34176..28d3c93d61 100644
--- a/sandbox/travelsample/launchers/interaction/build.xml
+++ b/sandbox/travelsample/launchers/interaction/build.xml
@@ -20,7 +20,7 @@
 <project name="scatours-launcher-interaction" default="compile">

     <import file="../../antdefs.xml"/>

     <path id="compile-path">

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

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

     </path>

 

     <target name="run">

diff --git a/sandbox/travelsample/launchers/interaction/pom.xml b/sandbox/travelsample/launchers/interaction/pom.xml
index 76869a5a8c..7cff4aaea7 100644
--- a/sandbox/travelsample/launchers/interaction/pom.xml
+++ b/sandbox/travelsample/launchers/interaction/pom.xml
@@ -32,8 +32,9 @@
     

         <dependency>

             <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-launcher-common</artifactId>

+            <artifactId>scatours-util-launcher-common</artifactId>

             <version>${pom.version}</version>

+            <scope>provided</scope>

         </dependency>

             

         <dependency>

@@ -87,6 +88,9 @@
                 <version>2.2</version>

                 <configuration>

                     <archive>

+                        <manifestEntries>

+                            <Class-Path>../util/scatours-util-launcher-common.jar</Class-Path>

+                        </manifestEntries>

                         <manifest>

                             <addClasspath>true</addClasspath>

                             <classpathPrefix>../lib/</classpathPrefix>

diff --git a/sandbox/travelsample/launchers/introducing/build.xml b/sandbox/travelsample/launchers/introducing/build.xml
index 8ee16e40b2..2da6f00d28 100644
--- a/sandbox/travelsample/launchers/introducing/build.xml
+++ b/sandbox/travelsample/launchers/introducing/build.xml
@@ -20,7 +20,7 @@
 <project name="scatours-launcher-introducing" default="compile">

     <import file="../../antdefs.xml"/>

     <path id="compile-path">

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

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

     </path>

 

     <target name="run">

diff --git a/sandbox/travelsample/launchers/introducing/pom.xml b/sandbox/travelsample/launchers/introducing/pom.xml
index 9ae1f95069..5ded853c2a 100644
--- a/sandbox/travelsample/launchers/introducing/pom.xml
+++ b/sandbox/travelsample/launchers/introducing/pom.xml
@@ -32,8 +32,9 @@
     

         <dependency>

             <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-launcher-common</artifactId>

+            <artifactId>scatours-util-launcher-common</artifactId>

             <version>${pom.version}</version>

+            <scope>provided</scope>

         </dependency>

             

         <dependency>

@@ -73,6 +74,9 @@
                 <version>2.2</version>

                 <configuration>

                     <archive>

+                        <manifestEntries>

+                            <Class-Path>../util/scatours-util-launcher-common.jar</Class-Path>

+                        </manifestEntries>

                         <manifest>

                             <addClasspath>true</addClasspath>

                             <classpathPrefix>../lib/</classpathPrefix>

diff --git a/sandbox/travelsample/launchers/jumpstart/build.xml b/sandbox/travelsample/launchers/jumpstart/build.xml
index 5b58c98eb8..1ae0e6133e 100644
--- a/sandbox/travelsample/launchers/jumpstart/build.xml
+++ b/sandbox/travelsample/launchers/jumpstart/build.xml
@@ -20,7 +20,7 @@
 <project name="scatours-launcher-jumpstart" default="compile">

     <import file="../../antdefs.xml"/>

     <path id="compile-path">

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

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

     </path>

 

     <target name="run">

diff --git a/sandbox/travelsample/launchers/jumpstart/pom.xml b/sandbox/travelsample/launchers/jumpstart/pom.xml
index c13d37281b..1f3722d993 100644
--- a/sandbox/travelsample/launchers/jumpstart/pom.xml
+++ b/sandbox/travelsample/launchers/jumpstart/pom.xml
@@ -32,8 +32,9 @@
     

         <dependency>

             <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-launcher-common</artifactId>

+            <artifactId>scatours-util-launcher-common</artifactId>

             <version>${pom.version}</version>

+            <scope>provided</scope>

         </dependency>

             

         <dependency>

@@ -73,6 +74,9 @@
                 <version>2.2</version>

                 <configuration>

                     <archive>

+                        <manifestEntries>

+                            <Class-Path>../util/scatours-util-launcher-common.jar</Class-Path>

+                        </manifestEntries>

                         <manifest>

                             <addClasspath>true</addClasspath>

                             <classpathPrefix>../lib/</classpathPrefix>

diff --git a/sandbox/travelsample/launchers/notification-corba/build.xml b/sandbox/travelsample/launchers/notification-corba/build.xml
index d4d1af0e76..10146b8500 100644
--- a/sandbox/travelsample/launchers/notification-corba/build.xml
+++ b/sandbox/travelsample/launchers/notification-corba/build.xml
@@ -20,7 +20,7 @@
 <project name="scatours-launcher-notification-corba" default="compile">

     <import file="../../antdefs.xml"/>

     <path id="compile-path">

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

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

     </path>

 

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

diff --git a/sandbox/travelsample/launchers/notification-corba/pom.xml b/sandbox/travelsample/launchers/notification-corba/pom.xml
index ec157517e0..b99b64b0cf 100644
--- a/sandbox/travelsample/launchers/notification-corba/pom.xml
+++ b/sandbox/travelsample/launchers/notification-corba/pom.xml
@@ -32,8 +32,9 @@
     

         <dependency>

             <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-launcher-common</artifactId>

+            <artifactId>scatours-util-launcher-common</artifactId>

             <version>${pom.version}</version>

+            <scope>provided</scope>

         </dependency>

             

         <dependency>

@@ -87,6 +88,9 @@
                 <version>2.2</version>

                 <configuration>

                     <archive>

+                        <manifestEntries>

+                            <Class-Path>../util/scatours-util-launcher-common.jar</Class-Path>

+                        </manifestEntries>

                         <manifest>

                             <addClasspath>true</addClasspath>

                             <classpathPrefix>../lib/</classpathPrefix>

diff --git a/sandbox/travelsample/launchers/notification-ejb/build.xml b/sandbox/travelsample/launchers/notification-ejb/build.xml
index edf78c4773..f9dbaeb246 100644
--- a/sandbox/travelsample/launchers/notification-ejb/build.xml
+++ b/sandbox/travelsample/launchers/notification-ejb/build.xml
@@ -20,7 +20,7 @@
 <project name="scatours-launcher-notification-ejb" default="compile">

     <import file="../../antdefs.xml"/>

     <path id="compile-path">

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

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

     </path>

 

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

diff --git a/sandbox/travelsample/launchers/notification-ejb/pom.xml b/sandbox/travelsample/launchers/notification-ejb/pom.xml
index d04c99c36d..06cd88f2fd 100644
--- a/sandbox/travelsample/launchers/notification-ejb/pom.xml
+++ b/sandbox/travelsample/launchers/notification-ejb/pom.xml
@@ -32,10 +32,11 @@
     

         <dependency>

             <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-launcher-common</artifactId>

+            <artifactId>scatours-util-launcher-common</artifactId>

             <version>${pom.version}</version>

+            <scope>provided</scope>

         </dependency>

-            

+           

         <dependency>

             <groupId>org.apache.tuscany.sca</groupId>

             <artifactId>tuscany-node-api</artifactId>

@@ -93,6 +94,9 @@
                 <version>2.2</version>

                 <configuration>

                     <archive>

+                        <manifestEntries>

+                            <Class-Path>../util/scatours-util-launcher-common.jar</Class-Path>

+                        </manifestEntries>

                         <manifest>

                             <addClasspath>true</addClasspath>

                             <classpathPrefix>../lib/</classpathPrefix>

diff --git a/sandbox/travelsample/launchers/notification-jms/build.xml b/sandbox/travelsample/launchers/notification-jms/build.xml
index 829fbcfdf8..3d20022d2e 100644
--- a/sandbox/travelsample/launchers/notification-jms/build.xml
+++ b/sandbox/travelsample/launchers/notification-jms/build.xml
@@ -20,7 +20,7 @@
 <project name="scatours-launcher-notification-jms" default="compile">

     <import file="../../antdefs.xml"/>

     <path id="compile-path">

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

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

     </path>

 

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

diff --git a/sandbox/travelsample/launchers/notification-jms/pom.xml b/sandbox/travelsample/launchers/notification-jms/pom.xml
index e39f7b6691..0441ba9cff 100644
--- a/sandbox/travelsample/launchers/notification-jms/pom.xml
+++ b/sandbox/travelsample/launchers/notification-jms/pom.xml
@@ -32,8 +32,9 @@
     

         <dependency>

             <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-launcher-common</artifactId>

+            <artifactId>scatours-util-launcher-common</artifactId>

             <version>${pom.version}</version>

+            <scope>provided</scope>

         </dependency>

             

         <dependency>

@@ -131,6 +132,9 @@
                 <version>2.2</version>

                 <configuration>

                     <archive>

+                        <manifestEntries>

+                            <Class-Path>../util/scatours-util-launcher-common.jar</Class-Path>

+                        </manifestEntries>

                         <manifest>

                             <addClasspath>true</addClasspath>

                             <classpathPrefix>../lib/</classpathPrefix>

diff --git a/sandbox/travelsample/launchers/notification-rmi/build.xml b/sandbox/travelsample/launchers/notification-rmi/build.xml
index 7d544378be..c21d30071d 100644
--- a/sandbox/travelsample/launchers/notification-rmi/build.xml
+++ b/sandbox/travelsample/launchers/notification-rmi/build.xml
@@ -20,7 +20,7 @@
 <project name="scatours-launcher-notification-rmi" default="compile">

     <import file="../../antdefs.xml"/>

     <path id="compile-path">

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

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

     </path>

 

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

diff --git a/sandbox/travelsample/launchers/notification-rmi/pom.xml b/sandbox/travelsample/launchers/notification-rmi/pom.xml
index 7b41496c9f..ecac2d2d18 100644
--- a/sandbox/travelsample/launchers/notification-rmi/pom.xml
+++ b/sandbox/travelsample/launchers/notification-rmi/pom.xml
@@ -32,8 +32,9 @@
     

         <dependency>

             <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-launcher-common</artifactId>

+            <artifactId>scatours-util-launcher-common</artifactId>

             <version>${pom.version}</version>

+            <scope>provided</scope>

         </dependency>

             

         <dependency>

@@ -87,6 +88,9 @@
                 <version>2.2</version>

                 <configuration>

                     <archive>

+                        <manifestEntries>

+                            <Class-Path>../util/scatours-util-launcher-common.jar</Class-Path>

+                        </manifestEntries>

                         <manifest>

                             <addClasspath>true</addClasspath>

                             <classpathPrefix>../lib/</classpathPrefix>

diff --git a/sandbox/travelsample/launchers/notification-ws/build.xml b/sandbox/travelsample/launchers/notification-ws/build.xml
index cc9e73890c..7f8e3bc917 100644
--- a/sandbox/travelsample/launchers/notification-ws/build.xml
+++ b/sandbox/travelsample/launchers/notification-ws/build.xml
@@ -20,7 +20,7 @@
 <project name="scatours-launcher-notification-ws" default="compile">

     <import file="../../antdefs.xml"/>

     <path id="compile-path">

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

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

     </path>

 

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

diff --git a/sandbox/travelsample/launchers/notification-ws/pom.xml b/sandbox/travelsample/launchers/notification-ws/pom.xml
index 9a31916603..19669752cb 100644
--- a/sandbox/travelsample/launchers/notification-ws/pom.xml
+++ b/sandbox/travelsample/launchers/notification-ws/pom.xml
@@ -32,8 +32,9 @@
     

         <dependency>

             <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-launcher-common</artifactId>

+            <artifactId>scatours-util-launcher-common</artifactId>

             <version>${pom.version}</version>

+            <scope>provided</scope>

         </dependency>

             

         <dependency>

@@ -87,6 +88,9 @@
                 <version>2.2</version>

                 <configuration>

                     <archive>

+                        <manifestEntries>

+                            <Class-Path>../util/scatours-util-launcher-common.jar</Class-Path>

+                        </manifestEntries>

                         <manifest>

                             <addClasspath>true</addClasspath>

                             <classpathPrefix>../lib/</classpathPrefix>

diff --git a/sandbox/travelsample/launchers/policy/build.xml b/sandbox/travelsample/launchers/policy/build.xml
index 376a1830bc..57001f70e3 100644
--- a/sandbox/travelsample/launchers/policy/build.xml
+++ b/sandbox/travelsample/launchers/policy/build.xml
@@ -20,7 +20,7 @@
 <project name="scatours-launcher-policy" default="compile">
     <import file="../../antdefs.xml"/>
     <path id="compile-path">
-        <pathelement path="../common/target/scatours-launcher-common.jar"/>
+        <pathelement path="../../util/launcher-common/target/scatours-util-launcher-common.jar"/>
     </path>
 
     <target name="run">
diff --git a/sandbox/travelsample/launchers/policy/pom.xml b/sandbox/travelsample/launchers/policy/pom.xml
index 292ad75c00..bb2c34a4fb 100644
--- a/sandbox/travelsample/launchers/policy/pom.xml
+++ b/sandbox/travelsample/launchers/policy/pom.xml
@@ -32,8 +32,9 @@
     
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>scatours-launcher-common</artifactId>
+            <artifactId>scatours-util-launcher-common</artifactId>
             <version>${pom.version}</version>
+            <scope>provided</scope>
         </dependency>
             
         <dependency>
@@ -94,6 +95,9 @@
                 <version>2.2</version>
                 <configuration>
                     <archive>
+                        <manifestEntries>
+                            <Class-Path>../util/scatours-util-launcher-common.jar</Class-Path>
+                        </manifestEntries>
                         <manifest>
                             <addClasspath>true</addClasspath>
                             <classpathPrefix>../lib/</classpathPrefix>
diff --git a/sandbox/travelsample/launchers/pom.xml b/sandbox/travelsample/launchers/pom.xml
index 2e23f03b30..2bb2e8a31b 100644
--- a/sandbox/travelsample/launchers/pom.xml
+++ b/sandbox/travelsample/launchers/pom.xml
@@ -37,7 +37,6 @@
                 <activeByDefault>true</activeByDefault>

             </activation>

             <modules>

-                <module>common</module>

                 <module>blog-feed</module>

                 <module>currency-converter</module>

                 <module>currency-converter-corba</module>