20 files changed, 27 insertions, 27 deletions
diff --git a/sandbox/travelsample/launchers/introducing-client-launcher/build.xml b/sandbox/travelsample/launchers/introducing-client/build.xml
index aa48a6638d..51444507a8 100644
--- a/sandbox/travelsample/launchers/introducing-client-launcher/build.xml
+++ b/sandbox/travelsample/launchers/introducing-client/build.xml
@@ -17,7 +17,7 @@
  * under the License.
 -->
 
-<project name="scatours-introducing-client-launcher" default="compile">
+<project name="scatours-launcher-introducing-client" default="compile">
     <property environment="env"/> 
 
     <target name="compile">
diff --git a/sandbox/travelsample/launchers/introducing-client-launcher/pom.xml b/sandbox/travelsample/launchers/introducing-client/pom.xml
index c8267916ad..fc7b798bc0 100644
--- a/sandbox/travelsample/launchers/introducing-client-launcher/pom.xml
+++ b/sandbox/travelsample/launchers/introducing-client/pom.xml
@@ -25,8 +25,8 @@
         <version>1.6-SNAPSHOT</version>
         <!--relativePath>../../pom.xml</relativePath-->
     </parent><version>1.0-SNAPSHOT</version>
-    <artifactId>scatours-introducing-client-launcher</artifactId>
-    <name>Apache Tuscany SCA Tours Introducing Launcher</name>
+    <artifactId>scatours-launcher-introducing-client</artifactId>
+    <name>Apache Tuscany SCA Tours Introducing Client Launcher</name>
 
     <dependencies>
         <dependency>
diff --git a/sandbox/travelsample/launchers/introducing-client-launcher/src/main/java/scatours/IntroducingClientLauncher.java b/sandbox/travelsample/launchers/introducing-client/src/main/java/scatours/IntroducingClientLauncher.java
index b45a14cd9c..b45a14cd9c 100644
--- a/sandbox/travelsample/launchers/introducing-client-launcher/src/main/java/scatours/IntroducingClientLauncher.java
+++ b/sandbox/travelsample/launchers/introducing-client/src/main/java/scatours/IntroducingClientLauncher.java
diff --git a/sandbox/travelsample/launchers/introducing-domain-launcher/build.xml b/sandbox/travelsample/launchers/introducing-domain/build.xml
index 268464c33a..55334cf658 100644
--- a/sandbox/travelsample/launchers/introducing-domain-launcher/build.xml
+++ b/sandbox/travelsample/launchers/introducing-domain/build.xml
@@ -17,7 +17,7 @@
  * under the License.
 -->
 
-<project name="scatours-introducing-domain-launcher" default="run">
+<project name="scatours-launcher-introducing-domain" default="run">
     <property environment="env"/> 
 
     <target name="run">
diff --git a/sandbox/travelsample/launchers/introducing-domain-launcher/pom.xml b/sandbox/travelsample/launchers/introducing-domain/pom.xml
index f696b836f0..3b10b4d537 100644
--- a/sandbox/travelsample/launchers/introducing-domain-launcher/pom.xml
+++ b/sandbox/travelsample/launchers/introducing-domain/pom.xml
@@ -25,27 +25,27 @@
         <version>1.6-SNAPSHOT</version>
         <!--relativePath>../../pom.xml</relativePath-->
     </parent><version>1.0-SNAPSHOT</version>
-    <artifactId>scatours-introducing-domain-launcher</artifactId>
+    <artifactId>scatours-launcher-introducing-domain</artifactId>
     <name>Apache Tuscany SCA Tours Introducing Domain Launcher</name>
     
     <dependencies>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>scatours-introducing-tuscanyscatours-contribution</artifactId>
+            <artifactId>scatours-contribution-introducing-tours</artifactId>
             <version>1.0-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>        
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>scatours-introducing-goodvaluetrips-contribution</artifactId>
+            <artifactId>scatours-contribution-introducing-trips</artifactId>
             <version>1.0-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>        
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>scatours-introducing-client-contribution</artifactId>
+            <artifactId>scatours-contribution-introducing-client</artifactId>
             <version>1.0-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>        
diff --git a/sandbox/travelsample/launchers/introducing-domain-launcher/src/main/resources/cloud.composite b/sandbox/travelsample/launchers/introducing-domain/src/main/resources/cloud.composite
index 133b4c187a..133b4c187a 100644
--- a/sandbox/travelsample/launchers/introducing-domain-launcher/src/main/resources/cloud.composite
+++ b/sandbox/travelsample/launchers/introducing-domain/src/main/resources/cloud.composite
diff --git a/sandbox/travelsample/launchers/introducing-domain-launcher/src/main/resources/cloud/ClientNode.composite b/sandbox/travelsample/launchers/introducing-domain/src/main/resources/cloud/ClientNode.composite
index 14d8417ed2..14d8417ed2 100644
--- a/sandbox/travelsample/launchers/introducing-domain-launcher/src/main/resources/cloud/ClientNode.composite
+++ b/sandbox/travelsample/launchers/introducing-domain/src/main/resources/cloud/ClientNode.composite
diff --git a/sandbox/travelsample/launchers/introducing-domain-launcher/src/main/resources/cloud/ToursNode.composite b/sandbox/travelsample/launchers/introducing-domain/src/main/resources/cloud/ToursNode.composite
index 9408da0e0d..9408da0e0d 100644
--- a/sandbox/travelsample/launchers/introducing-domain-launcher/src/main/resources/cloud/ToursNode.composite
+++ b/sandbox/travelsample/launchers/introducing-domain/src/main/resources/cloud/ToursNode.composite
diff --git a/sandbox/travelsample/launchers/introducing-domain-launcher/src/main/resources/cloud/TripsNode.composite b/sandbox/travelsample/launchers/introducing-domain/src/main/resources/cloud/TripsNode.composite
index d769e89203..d769e89203 100644
--- a/sandbox/travelsample/launchers/introducing-domain-launcher/src/main/resources/cloud/TripsNode.composite
+++ b/sandbox/travelsample/launchers/introducing-domain/src/main/resources/cloud/TripsNode.composite
diff --git a/sandbox/travelsample/launchers/introducing-domain-launcher/src/main/resources/domain.composite b/sandbox/travelsample/launchers/introducing-domain/src/main/resources/domain.composite
index 5591ab3709..5591ab3709 100644
--- a/sandbox/travelsample/launchers/introducing-domain-launcher/src/main/resources/domain.composite
+++ b/sandbox/travelsample/launchers/introducing-domain/src/main/resources/domain.composite
diff --git a/sandbox/travelsample/launchers/introducing-domain-launcher/src/main/resources/workspace.xml b/sandbox/travelsample/launchers/introducing-domain/src/main/resources/workspace.xml
index 5910ae176f..f37620c3ce 100644
--- a/sandbox/travelsample/launchers/introducing-domain-launcher/src/main/resources/workspace.xml
+++ b/sandbox/travelsample/launchers/introducing-domain/src/main/resources/workspace.xml
@@ -3,10 +3,10 @@
            xmlns:ns1="http://tuscany.apache.org/xmlns/sca/1.0">
     <contribution location="file:./cloud"
            uri="http://tuscany.apache.org/cloud"/>
-    <contribution location="file:../../../../contributions/introducing-tuscanyscatours-contribution/target/scatours-introducing-tuscanyscatours-contribution.jar"
+    <contribution location="file:../../../../contributions/introducing-tours/target/scatours-contribution-introducing-tours.jar"
            uri="introducing-tours"/>
-    <contribution location="file:../../../../contributions/introducing-goodvaluetrips-contribution/target/scatours-introducing-goodvaluetrips-contribution.jar"
+    <contribution location="file:../../../../contributions/introducing-trips/target/scatours-contribution-introducing-trips.jar"
            uri="introducing-trips"/>
-    <contribution location="file:../../../../contributions/introducing-client-contribution/target/scatours-introducing-client-contribution.jar"
+    <contribution location="file:../../../../contributions/introducing-client/target/scatours-contribution-introducing-client.jar"
            uri="introducing-client"/>
 </workspace>
diff --git a/sandbox/travelsample/launchers/introducing-tours-launcher/build.xml b/sandbox/travelsample/launchers/introducing-tours/build.xml
index f81b0222ec..2a2d774177 100644
--- a/sandbox/travelsample/launchers/introducing-tours-launcher/build.xml
+++ b/sandbox/travelsample/launchers/introducing-tours/build.xml
@@ -17,7 +17,7 @@
  * under the License.
 -->
 
-<project name="scatours-introducing-tours-launcher" default="run">
+<project name="scatours-launcher-introducing-tours" default="run">
     <property environment="env"/> 
 
     <target name="run">
diff --git a/sandbox/travelsample/launchers/introducing-trips-launcher/build.xml b/sandbox/travelsample/launchers/introducing-trips/build.xml
index 7e9c5b66bf..d0a9623966 100644
--- a/sandbox/travelsample/launchers/introducing-trips-launcher/build.xml
+++ b/sandbox/travelsample/launchers/introducing-trips/build.xml
@@ -17,7 +17,7 @@
  * under the License.
 -->
 
-<project name="scatours-introducing-trips-launcher" default="run">
+<project name="scatours-launcher-introducing-trips" default="run">
     <property environment="env"/> 
 
     <target name="run">
diff --git a/sandbox/travelsample/launchers/introducing-launcher/build.xml b/sandbox/travelsample/launchers/introducing/build.xml
index 81085eba97..7cf57f6217 100644
--- a/sandbox/travelsample/launchers/introducing-launcher/build.xml
+++ b/sandbox/travelsample/launchers/introducing/build.xml
@@ -17,7 +17,7 @@
  * under the License.
 -->
 
-<project name="scatours-introducing-launcher" default="compile">
+<project name="scatours-launcher-introducing" default="compile">
     <property environment="env"/> 
 
     <target name="compile">
diff --git a/sandbox/travelsample/launchers/introducing-launcher/pom.xml b/sandbox/travelsample/launchers/introducing/pom.xml
index a60c5a3c1d..72b0b908fa 100644
--- a/sandbox/travelsample/launchers/introducing-launcher/pom.xml
+++ b/sandbox/travelsample/launchers/introducing/pom.xml
@@ -25,7 +25,7 @@
         <version>1.6-SNAPSHOT</version>
         <!--relativePath>../../pom.xml</relativePath-->
     </parent><version>1.0-SNAPSHOT</version>
-    <artifactId>scatours-introducing-launcher</artifactId>
+    <artifactId>scatours-launcher-introducing</artifactId>
     <name>Apache Tuscany SCA Tours Introducing Launcher</name>
 
     <dependencies>
diff --git a/sandbox/travelsample/launchers/introducing-launcher/src/main/java/scatours/IntroducingLauncher.java b/sandbox/travelsample/launchers/introducing/src/main/java/scatours/IntroducingLauncher.java
index b137c115ee..b137c115ee 100644
--- a/sandbox/travelsample/launchers/introducing-launcher/src/main/java/scatours/IntroducingLauncher.java
+++ b/sandbox/travelsample/launchers/introducing/src/main/java/scatours/IntroducingLauncher.java
diff --git a/sandbox/travelsample/launchers/introducing-launcher/src/test/java/scatours/IntroducingTestCase.java b/sandbox/travelsample/launchers/introducing/src/test/java/scatours/IntroducingTestCase.java
index 8430f1846b..e31e8e70ab 100644
--- a/sandbox/travelsample/launchers/introducing-launcher/src/test/java/scatours/IntroducingTestCase.java
+++ b/sandbox/travelsample/launchers/introducing/src/test/java/scatours/IntroducingTestCase.java
@@ -27,9 +27,9 @@ import org.junit.Before;
 import org.junit.Test;
 
 /**
- * Test case to run the test code in introducing-client-contribution that
- * tests components and services in introducing-tuscanyscatours-contribution
- * and introducing-goodvaluetrips-contribution.
+ * Test case to run the test code in the introducing-client contribution
+ * that tests components and services in the introducing-tours contribution
+ * and the introducing-trips contribution.
  */
 public class IntroducingTestCase {
 
@@ -38,9 +38,9 @@ public class IntroducingTestCase {
     @Before
     public void startServer() throws Exception {
         node = SCANodeFactory.newInstance().createSCANode(null, 
-            new SCAContribution("introducing-tours", "../../contributions/introducing-tuscanyscatours-contribution/target/classes"),
-            new SCAContribution("introducing-trips", "../../contributions/introducing-goodvaluetrips-contribution/target/classes"),
-            new SCAContribution("introducing-client", "../../contributions/introducing-client-contribution/target/classes"));
+            new SCAContribution("introducing-tours", "../../contributions/introducing-tours/target/classes"),
+            new SCAContribution("introducing-trips", "../../contributions/introducing-trips/target/classes"),
+            new SCAContribution("introducing-client", "../../contributions/introducing-client/target/classes"));
         node.start();
     }
 
diff --git a/sandbox/travelsample/launchers/jumpstart-launcher/src/main/java/scatours/LaunchJumpstartNode.java b/sandbox/travelsample/launchers/jumpstart-launcher/src/main/java/scatours/LaunchJumpstartNode.java
index b6d7c8b9c8..cb7704b414 100644
--- a/sandbox/travelsample/launchers/jumpstart-launcher/src/main/java/scatours/LaunchJumpstartNode.java
+++ b/sandbox/travelsample/launchers/jumpstart-launcher/src/main/java/scatours/LaunchJumpstartNode.java
@@ -29,8 +29,8 @@ public class LaunchJumpstartNode {
     public static void main(String[] args) throws Exception {
         try {
             SCAContribution gvtContribution = 
-              new SCAContribution("goodvaluetrips", 
-                  "../../contributions/introducing-goodvaluetrips-contribution/target/classes");
+              new SCAContribution("introducing-trips", 
+                  "../../contributions/introducing-trips/target/classes");
             
             SCANode node = SCANodeFactory.newInstance().
                createSCANode("trips.composite", 
diff --git a/sandbox/travelsample/launchers/jumpstart-launcher/src/test/java/scatours/NodeTestCase.java b/sandbox/travelsample/launchers/jumpstart-launcher/src/test/java/scatours/NodeTestCase.java
index 904509a594..d8f958e718 100644
--- a/sandbox/travelsample/launchers/jumpstart-launcher/src/test/java/scatours/NodeTestCase.java
+++ b/sandbox/travelsample/launchers/jumpstart-launcher/src/test/java/scatours/NodeTestCase.java
@@ -36,7 +36,7 @@ public class NodeTestCase {
     @Before
     public void startServer() throws Exception {
         node = SCANodeFactory.newInstance().createSCANode("trips.composite", 
-            new SCAContribution("goodvaluetrips", "../../contributions/introducing-goodvaluetrips-contribution/target/classes"));
+            new SCAContribution("introducing-trips", "../../contributions/introducing-trips/target/classes"));
         node.start();
     }
 
diff --git a/sandbox/travelsample/launchers/pom.xml b/sandbox/travelsample/launchers/pom.xml
index e4acb21af7..a442e10212 100644
--- a/sandbox/travelsample/launchers/pom.xml
+++ b/sandbox/travelsample/launchers/pom.xml
@@ -46,9 +46,9 @@
                 <module>databinding-launcher</module>
                 <module>feed-logger-launcher</module>
                 <module>interaction-launcher</module>
-                <module>introducing-launcher</module>
-                <module>introducing-client-launcher</module>
-                <module>introducing-domain-launcher</module>
+                <module>introducing</module>
+                <module>introducing-client</module>
+                <module>introducing-domain</module>
                 <module>jumpstart-launcher</module>
                 <module>fullapp-launcher</module>
                 <module>help-pages-launcher</module>