Apply the new naming conventions to the fullapp contributions and launchers

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

3 files changed, 7 insertions, 9 deletions

diff --git a/sandbox/travelsample/contributions/trip-contribution/src/test/java/scatours/trip/TripTestCase.java b/sandbox/travelsample/contributions/trip/src/test/java/scatours/trip/TripTestCase.java
index e5116fd0d4..88df6f4c2e 100644
--- a/sandbox/travelsample/contributions/trip-contribution/src/test/java/scatours/trip/TripTestCase.java
+++ b/sandbox/travelsample/contributions/trip/src/test/java/scatours/trip/TripTestCase.java
@@ -27,8 +27,8 @@ import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import scatours.common.Book;
-import scatours.common.TripItem;
+import com.tuscanyscatours.common.Book;
+import com.tuscanyscatours.common.TripItem;
 
 /**
  * 
@@ -53,7 +53,7 @@ public class TripTestCase {
     @Test
     public void testPayment() {
         SCAClient client = (SCAClient) tripNode;
-        Book booking = client.getService(Book.class, "TripComponent/Book");
+        Book booking = client.getService(Book.class, "Trip/Book");
         TripItem tripItem = new TripItem("1234",
                                          "5678",
                                          TripItem.TRIP,
diff --git a/sandbox/travelsample/contributions/trip-contribution/src/test/resources/definitions.xml b/sandbox/travelsample/contributions/trip/src/test/resources/definitions.xml
index 61fe02ca86..8d7ff59b0c 100644
--- a/sandbox/travelsample/contributions/trip-contribution/src/test/resources/definitions.xml
+++ b/sandbox/travelsample/contributions/trip/src/test/resources/definitions.xml
@@ -20,8 +20,7 @@
 <definitions xmlns="http://www.osoa.org/xmlns/sca/1.0" 
              targetNamespace="http://tuscany.apache.org/xmlns/sca/1.0"
              xmlns:sca="http://www.osoa.org/xmlns/sca/1.0" 
-             xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
-             xmlns:scatours="http://scatours">
+             xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0">
 
     <!-- PolicySets -->
     <policySet name="JDKLoggingPolicy" provides="tuscany:logging" appliesTo="sca:implementation.java"
@@ -30,4 +29,4 @@
             <logLevel>FINER</logLevel>
         </tuscany:jdkLogger>
     </policySet>
-</definitions>
\ No newline at end of file
+</definitions>
diff --git a/sandbox/travelsample/contributions/trip-contribution/src/test/resources/trip.composite b/sandbox/travelsample/contributions/trip/src/test/resources/trip.composite
index e7f0df3cee..06c449633c 100644
--- a/sandbox/travelsample/contributions/trip-contribution/src/test/resources/trip.composite
+++ b/sandbox/travelsample/contributions/trip/src/test/resources/trip.composite
@@ -19,12 +19,11 @@
 -->
 <composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
            targetNamespace="http://scatours"
-           xmlns:scatours="http://scatours"
            xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
            name="packagedtrip">
 
-    <component name="TripComponent">
-        <implementation.java class="scatours.trip.TripImpl" requires="tuscany:logging"/>
+    <component name="Trip">
+        <implementation.java class="com.tuscanyscatours.trip.impl.TripImpl" requires="tuscany:logging"/>
         <service name="Search"/>
         <service name="Book"/>        
     </component>