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

2 files changed, 8 insertions, 10 deletions

diff --git a/sandbox/travelsample/contributions/fullapp-shoppingcart-contribution/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contributions/fullapp-packagedtrip/src/main/resources/META-INF/sca-contribution.xml
index f9cc655b83..7844d200db 100644
--- a/sandbox/travelsample/contributions/fullapp-shoppingcart-contribution/src/main/resources/META-INF/sca-contribution.xml
+++ b/sandbox/travelsample/contributions/fullapp-packagedtrip/src/main/resources/META-INF/sca-contribution.xml
@@ -18,9 +18,8 @@
     * under the License.    
 -->
 <contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
-   xmlns:scatours="http://scatours">
-   <deployable composite="scatours:shoppingcart"/>
-   <!-- import.java package="scatours.common"/-->
-   <import.java package="payment"/>
-   <import.java package="scatours.shoppingcart"/>
-</contribution>
\ No newline at end of file
+              xmlns:scatours="http://tuscanyscatours.com/">
+    <deployable composite="scatours:packagedtrip" />
+    <import.java package="com.tuscanyscatours.common" />
+    <import.java package="com.tuscanyscatours.trip.impl" />
+</contribution>
diff --git a/sandbox/travelsample/contributions/fullapp-packagedtrip-contribution/src/main/resources/scatours.composite b/sandbox/travelsample/contributions/fullapp-packagedtrip/src/main/resources/scatours.composite
index 024969edcc..0bd670c1a4 100644
--- a/sandbox/travelsample/contributions/fullapp-packagedtrip-contribution/src/main/resources/scatours.composite
+++ b/sandbox/travelsample/contributions/fullapp-packagedtrip/src/main/resources/scatours.composite
@@ -18,13 +18,12 @@
  * under the License.    
 -->
 <composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-           targetNamespace="http://scatours"
-           xmlns:scatours="http://scatours"
+           targetNamespace="http://tuscanyscatours.com/"
            xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
            name="packagedtrip">
 
-    <component name="TripComponent">
-        <implementation.java class="scatours.trip.TripImpl"/>
+    <component name="Trip">
+        <implementation.java class="com.tuscanyscatours.trip.impl.TripImpl"/>
         <service name="Search">
             <binding.ws name="searchws" uri="http://localhost:8085/Trip/Search"/>
             <tuscany:binding.jsonrpc name="searchjsonrpc"/>