From 054ba1cb6fc276ebc1702254d45281889f2fb8ef Mon Sep 17 00:00:00 2001
From: nash <nash@13f79535-47bb-0310-9956-ffa450edef68>
Date: Wed, 13 Jan 2010 10:12:36 +0000
Subject: 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
---
 sandbox/travelsample/distribution/pom.xml                      | 10 +++++-----
 .../distribution/src/main/components/bin-modules.xml           |  9 +++------
 2 files changed, 8 insertions(+), 11 deletions(-)

(limited to 'sandbox/travelsample/distribution')

diff --git a/sandbox/travelsample/distribution/pom.xml b/sandbox/travelsample/distribution/pom.xml
index 614f49b958..cb4f8adaaf 100644
--- a/sandbox/travelsample/distribution/pom.xml
+++ b/sandbox/travelsample/distribution/pom.xml
@@ -301,11 +301,6 @@
             <artifactId>scatours-contribution-tripbooking</artifactId>
             <version>${pom.version}</version>
         </dependency>
-       <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>scatours-launcher-common</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>scatours-launcher-blog-feed</artifactId>
@@ -451,6 +446,11 @@
             <artifactId>scatours-service-smsgateway-rmi</artifactId>
             <version>${pom.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>scatours-util-launcher-common</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
 
         <dependency>
            <groupId>org.apache.geronimo.specs</groupId>
diff --git a/sandbox/travelsample/distribution/src/main/components/bin-modules.xml b/sandbox/travelsample/distribution/src/main/components/bin-modules.xml
index 33f0459982..e50b056eb4 100644
--- a/sandbox/travelsample/distribution/src/main/components/bin-modules.xml
+++ b/sandbox/travelsample/distribution/src/main/components/bin-modules.xml
@@ -45,14 +45,14 @@
         </dependencySet>
 
         <dependencySet>
-            <outputDirectory>lib</outputDirectory>
+            <outputDirectory>util</outputDirectory>
+            <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
             <unpack>false</unpack>
             <includes>
-                <include>org.apache.tuscany.sca:scatours-launcher-common</include>
+                <include>org.apache.tuscany.sca:scatours-util-*</include>
             </includes>
             <scope>runtime</scope>
         </dependencySet>
-
         <dependencySet>
             <outputDirectory>contributions</outputDirectory>
             <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
@@ -69,9 +69,6 @@
             <includes>
                 <include>org.apache.tuscany.sca:scatours-launcher-*</include>
             </includes>
-            <excludes>
-                <exclude>org.apache.tuscany.sca:scatours-launcher-common</exclude>
-            </excludes>
             <scope>runtime</scope>
         </dependencySet>
         <dependencySet>
-- 
cgit v1.2.3