Rename contribution and launcher directories for introducing-* samples

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

22 files changed, 9 insertions, 9 deletions

diff --git a/sandbox/travelsample/contributions/introducing-client-contribution/build.xml b/sandbox/travelsample/contributions/introducing-client/build.xml
index 17bc0d7d5b..17bc0d7d5b 100644
--- a/sandbox/travelsample/contributions/introducing-client-contribution/build.xml
+++ b/sandbox/travelsample/contributions/introducing-client/build.xml
diff --git a/sandbox/travelsample/contributions/introducing-client-contribution/pom.xml b/sandbox/travelsample/contributions/introducing-client/pom.xml
index f3e0cd5e4d..9333caf3e4 100644
--- a/sandbox/travelsample/contributions/introducing-client-contribution/pom.xml
+++ b/sandbox/travelsample/contributions/introducing-client/pom.xml
@@ -25,7 +25,7 @@
         <version>1.6-SNAPSHOT</version>

         <!--relativePath>../../pom.xml</relativePath-->

     </parent><version>1.0-SNAPSHOT</version>

-    <artifactId>scatours-introducing-client-contribution</artifactId>

+    <artifactId>scatours-contribution-introducing-client</artifactId>

     <name>Apache Tuscany SCA Tours Introducing Client Contribution</name>

 

     <dependencies>

@@ -37,7 +37,7 @@
 

         <dependency>

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

-            <artifactId>scatours-introducing-tuscanyscatours-contribution</artifactId>

+            <artifactId>scatours-contribution-introducing-tours</artifactId>

             <version>1.0-SNAPSHOT</version>

         </dependency>

     </dependencies>

diff --git a/sandbox/travelsample/contributions/introducing-client-contribution/src/main/java/scatours/client/TestClient.java b/sandbox/travelsample/contributions/introducing-client/src/main/java/scatours/client/TestClient.java
index 64a1487f72..64a1487f72 100644
--- a/sandbox/travelsample/contributions/introducing-client-contribution/src/main/java/scatours/client/TestClient.java
+++ b/sandbox/travelsample/contributions/introducing-client/src/main/java/scatours/client/TestClient.java
diff --git a/sandbox/travelsample/contributions/introducing-client-contribution/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contributions/introducing-client/src/main/resources/META-INF/sca-contribution.xml
index 9ce11f16ef..9ce11f16ef 100644
--- a/sandbox/travelsample/contributions/introducing-client-contribution/src/main/resources/META-INF/sca-contribution.xml
+++ b/sandbox/travelsample/contributions/introducing-client/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sandbox/travelsample/contributions/introducing-client-contribution/src/main/resources/client.composite b/sandbox/travelsample/contributions/introducing-client/src/main/resources/client.composite
index 05c2755114..05c2755114 100644
--- a/sandbox/travelsample/contributions/introducing-client-contribution/src/main/resources/client.composite
+++ b/sandbox/travelsample/contributions/introducing-client/src/main/resources/client.composite
diff --git a/sandbox/travelsample/contributions/introducing-tuscanyscatours-contribution/build.xml b/sandbox/travelsample/contributions/introducing-tours/build.xml
index d9961176f3..d9961176f3 100644
--- a/sandbox/travelsample/contributions/introducing-tuscanyscatours-contribution/build.xml
+++ b/sandbox/travelsample/contributions/introducing-tours/build.xml
diff --git a/sandbox/travelsample/contributions/introducing-tuscanyscatours-contribution/pom.xml b/sandbox/travelsample/contributions/introducing-tours/pom.xml
index 9117c66c0f..edf71afa71 100644
--- a/sandbox/travelsample/contributions/introducing-tuscanyscatours-contribution/pom.xml
+++ b/sandbox/travelsample/contributions/introducing-tours/pom.xml
@@ -25,8 +25,8 @@
         <version>1.6-SNAPSHOT</version>

         <!--relativePath>../../pom.xml</relativePath-->

     </parent><version>1.0-SNAPSHOT</version>

-    <artifactId>scatours-introducing-tuscanyscatours-contribution</artifactId>

-    <name>Apache Tuscany SCA Tours Introducing TuscanySCATours Contribution</name>

+    <artifactId>scatours-contribution-introducing-tours</artifactId>

+    <name>Apache Tuscany SCA Tours Introducing Tours Contribution</name>

 

     <dependencies>

         <dependency>

diff --git a/sandbox/travelsample/contributions/introducing-goodvaluetrips-contribution/src/main/java/com/goodvaluetrips/Trips.java b/sandbox/travelsample/contributions/introducing-tours/src/main/java/com/goodvaluetrips/Trips.java
index 365a210368..365a210368 100644
--- a/sandbox/travelsample/contributions/introducing-goodvaluetrips-contribution/src/main/java/com/goodvaluetrips/Trips.java
+++ b/sandbox/travelsample/contributions/introducing-tours/src/main/java/com/goodvaluetrips/Trips.java
diff --git a/sandbox/travelsample/contributions/introducing-tuscanyscatours-contribution/src/main/java/com/tuscanyscatours/Bookings.java b/sandbox/travelsample/contributions/introducing-tours/src/main/java/com/tuscanyscatours/Bookings.java
index 9d54d46bb6..9d54d46bb6 100644
--- a/sandbox/travelsample/contributions/introducing-tuscanyscatours-contribution/src/main/java/com/tuscanyscatours/Bookings.java
+++ b/sandbox/travelsample/contributions/introducing-tours/src/main/java/com/tuscanyscatours/Bookings.java
diff --git a/sandbox/travelsample/contributions/introducing-tuscanyscatours-contribution/src/main/java/com/tuscanyscatours/Checkout.java b/sandbox/travelsample/contributions/introducing-tours/src/main/java/com/tuscanyscatours/Checkout.java
index 29c84d2bc0..29c84d2bc0 100644
--- a/sandbox/travelsample/contributions/introducing-tuscanyscatours-contribution/src/main/java/com/tuscanyscatours/Checkout.java
+++ b/sandbox/travelsample/contributions/introducing-tours/src/main/java/com/tuscanyscatours/Checkout.java
diff --git a/sandbox/travelsample/contributions/introducing-tuscanyscatours-contribution/src/main/java/com/tuscanyscatours/ShoppingCart.java b/sandbox/travelsample/contributions/introducing-tours/src/main/java/com/tuscanyscatours/ShoppingCart.java
index db551501e1..db551501e1 100644
--- a/sandbox/travelsample/contributions/introducing-tuscanyscatours-contribution/src/main/java/com/tuscanyscatours/ShoppingCart.java
+++ b/sandbox/travelsample/contributions/introducing-tours/src/main/java/com/tuscanyscatours/ShoppingCart.java
diff --git a/sandbox/travelsample/contributions/introducing-tuscanyscatours-contribution/src/main/java/com/tuscanyscatours/TripBooking.java b/sandbox/travelsample/contributions/introducing-tours/src/main/java/com/tuscanyscatours/TripBooking.java
index e64d60545e..e64d60545e 100644
--- a/sandbox/travelsample/contributions/introducing-tuscanyscatours-contribution/src/main/java/com/tuscanyscatours/TripBooking.java
+++ b/sandbox/travelsample/contributions/introducing-tours/src/main/java/com/tuscanyscatours/TripBooking.java
diff --git a/sandbox/travelsample/contributions/introducing-tuscanyscatours-contribution/src/main/java/com/tuscanyscatours/Updates.java b/sandbox/travelsample/contributions/introducing-tours/src/main/java/com/tuscanyscatours/Updates.java
index e33b0399cb..e33b0399cb 100644
--- a/sandbox/travelsample/contributions/introducing-tuscanyscatours-contribution/src/main/java/com/tuscanyscatours/Updates.java
+++ b/sandbox/travelsample/contributions/introducing-tours/src/main/java/com/tuscanyscatours/Updates.java
diff --git a/sandbox/travelsample/contributions/introducing-tuscanyscatours-contribution/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contributions/introducing-tours/src/main/resources/META-INF/sca-contribution.xml
index 5f76588dad..5f76588dad 100644
--- a/sandbox/travelsample/contributions/introducing-tuscanyscatours-contribution/src/main/resources/META-INF/sca-contribution.xml
+++ b/sandbox/travelsample/contributions/introducing-tours/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sandbox/travelsample/contributions/introducing-tuscanyscatours-contribution/src/main/resources/tours.composite b/sandbox/travelsample/contributions/introducing-tours/src/main/resources/tours.composite
index f166a1635d..f166a1635d 100644
--- a/sandbox/travelsample/contributions/introducing-tuscanyscatours-contribution/src/main/resources/tours.composite
+++ b/sandbox/travelsample/contributions/introducing-tours/src/main/resources/tours.composite
diff --git a/sandbox/travelsample/contributions/introducing-goodvaluetrips-contribution/build.xml b/sandbox/travelsample/contributions/introducing-trips/build.xml
index fa67a921e2..fa67a921e2 100644
--- a/sandbox/travelsample/contributions/introducing-goodvaluetrips-contribution/build.xml
+++ b/sandbox/travelsample/contributions/introducing-trips/build.xml
diff --git a/sandbox/travelsample/contributions/introducing-goodvaluetrips-contribution/pom.xml b/sandbox/travelsample/contributions/introducing-trips/pom.xml
index d24b3f3d0d..8640d602b1 100644
--- a/sandbox/travelsample/contributions/introducing-goodvaluetrips-contribution/pom.xml
+++ b/sandbox/travelsample/contributions/introducing-trips/pom.xml
@@ -25,8 +25,8 @@
         <version>1.6-SNAPSHOT</version>

         <!--relativePath>../../pom.xml</relativePath-->

     </parent><version>1.0-SNAPSHOT</version>

-    <artifactId>scatours-introducing-goodvaluetrips-contribution</artifactId>

-    <name>Apache Tuscany SCA Tours Introducing GoodValueTrips Contribution</name>

+    <artifactId>scatours-contribution-introducing-trips</artifactId>

+    <name>Apache Tuscany SCA Tours Introducing Trips Contribution</name>

 

     <dependencies>

         <dependency>

diff --git a/sandbox/travelsample/contributions/introducing-goodvaluetrips-contribution/src/main/java/com/goodvaluetrips/TripProvider.java b/sandbox/travelsample/contributions/introducing-trips/src/main/java/com/goodvaluetrips/TripProvider.java
index d30046aaef..d30046aaef 100644
--- a/sandbox/travelsample/contributions/introducing-goodvaluetrips-contribution/src/main/java/com/goodvaluetrips/TripProvider.java
+++ b/sandbox/travelsample/contributions/introducing-trips/src/main/java/com/goodvaluetrips/TripProvider.java
diff --git a/sandbox/travelsample/contributions/introducing-tuscanyscatours-contribution/src/main/java/com/goodvaluetrips/Trips.java b/sandbox/travelsample/contributions/introducing-trips/src/main/java/com/goodvaluetrips/Trips.java
index 365a210368..365a210368 100644
--- a/sandbox/travelsample/contributions/introducing-tuscanyscatours-contribution/src/main/java/com/goodvaluetrips/Trips.java
+++ b/sandbox/travelsample/contributions/introducing-trips/src/main/java/com/goodvaluetrips/Trips.java
diff --git a/sandbox/travelsample/contributions/introducing-goodvaluetrips-contribution/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contributions/introducing-trips/src/main/resources/META-INF/sca-contribution.xml
index 12a7b94330..12a7b94330 100644
--- a/sandbox/travelsample/contributions/introducing-goodvaluetrips-contribution/src/main/resources/META-INF/sca-contribution.xml
+++ b/sandbox/travelsample/contributions/introducing-trips/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sandbox/travelsample/contributions/introducing-goodvaluetrips-contribution/src/main/resources/trips.composite b/sandbox/travelsample/contributions/introducing-trips/src/main/resources/trips.composite
index ab173e5ef7..ab173e5ef7 100644
--- a/sandbox/travelsample/contributions/introducing-goodvaluetrips-contribution/src/main/resources/trips.composite
+++ b/sandbox/travelsample/contributions/introducing-trips/src/main/resources/trips.composite
diff --git a/sandbox/travelsample/contributions/pom.xml b/sandbox/travelsample/contributions/pom.xml
index 328f08f601..a37485ba64 100644
--- a/sandbox/travelsample/contributions/pom.xml
+++ b/sandbox/travelsample/contributions/pom.xml
@@ -63,9 +63,9 @@
                 <module>hotel-contribution</module>

                 <module>interaction-client-contribution</module>

                 <module>interaction-service-remote-contribution</module>

-                <module>introducing-client-contribution</module>

-                <module>introducing-goodvaluetrips-contribution</module>

-                <module>introducing-tuscanyscatours-contribution</module>

+                <module>introducing-client</module>

+                <module>introducing-tours</module>

+                <module>introducing-trips</module>

                 <module>notification-contribution</module>

                 <module>notification-ws-contribution</module>

                 <module>notification-corba-contribution</module>