Update interaction-* and calendar contributions and launcher to new naming convention

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

5 files changed, 62 insertions, 51 deletions

diff --git a/sandbox/travelsample/contributions/interaction-service-remote-contribution/build.xml b/sandbox/travelsample/contributions/interaction-client/build.xml
index 52b3087827..1baa30dd66 100644
--- a/sandbox/travelsample/contributions/interaction-service-remote-contribution/build.xml
+++ b/sandbox/travelsample/contributions/interaction-client/build.xml
@@ -17,7 +17,7 @@
  * under the License.
 -->
 
-<project name="scatours-chapter-02-client-contribution" default="compile">
+<project name="scatours-contribution-interaction-client" default="compile">
     <property environment="env"/> 
 
     <target name="compile">
@@ -25,14 +25,14 @@
         <javac destdir="target/classes" debug="on" source="1.5" target="1.5">
             <src path="src/main/java"/>
             <classpath>
-                <pathelement location="../tuscanyscatours-contribution/target/scatours-chapter-02-tuscanyscatours-contribution.jar"/>
+                <pathelement location="../common/target/scatours-contribution-common.jar"/>
                 <pathelement location="${env.TUSCANY}/lib/tuscany-sca-manifest.jar"/>
             </classpath>
         </javac>
         <copy todir="target/classes">
             <fileset dir="src/main/resources"/>
         </copy>
-        <jar destfile="target/scatours-chapter-02-client-contribution.jar"
+        <jar destfile="target/scatours-contribution-interaction-client.jar"
              basedir="target/classes"/>
     </target>
 
diff --git a/sandbox/travelsample/contributions/calendar-contribution/src/main/resources/calendar.composite b/sandbox/travelsample/contributions/interaction-service-remote/build.xml
index 16d7e58448..2bd31fad1b 100644
--- a/sandbox/travelsample/contributions/calendar-contribution/src/main/resources/calendar.composite
+++ b/sandbox/travelsample/contributions/interaction-service-remote/build.xml
@@ -1,29 +1,37 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- * 

- *   http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.    

--->

-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"

-           targetNamespace="http://scatours"

-           xmlns:scatours="http://scatours"

-           name="calendar">

-

-    <component name="CalendarComponent">

-		<implementation.java class="calendar.CalendarImpl"/>

-    </component>

-

-</composite>

+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+-->
+
+<project name="scatours-contribution-interaction-service-remote" default="compile">
+
+    <target name="compile">
+        <mkdir dir="target/classes"/>
+        <copy todir="target/classes">
+            <fileset dir="src/main/resources"/>
+        </copy>
+        <jar destfile="target/scatours-contribution-interaction-service-remote.jar"
+             basedir="target/classes"/>
+    </target>
+
+    <target name="clean">
+        <delete includeemptydirs="true">
+            <fileset dir="target"/>
+        </delete>
+    </target>
+
+</project>
diff --git a/sandbox/travelsample/contributions/interaction-service-remote-contribution/pom.xml b/sandbox/travelsample/contributions/interaction-service-remote/pom.xml
index a8dfdd8a20..f9b6ba74c6 100644
--- a/sandbox/travelsample/contributions/interaction-service-remote-contribution/pom.xml
+++ b/sandbox/travelsample/contributions/interaction-service-remote/pom.xml
@@ -25,26 +25,29 @@
         <version>1.6-SNAPSHOT</version>
         <!--relativePath>../../pom.xml</relativePath-->
     </parent><version>1.0-SNAPSHOT</version>
-    <artifactId>scatours-interaction-service-remote-contribution</artifactId>
+    <artifactId>scatours-contribution-interaction-service-remote</artifactId>
     <name>Apache Tuscany SCA Tours Interaction Service Remote Contribution</name>
 
     <dependencies>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-sca-api</artifactId>
-            <version>1.6-SNAPSHOT</version>
+            <artifactId>scatours-contribution-common</artifactId>
+            <version>1.0-SNAPSHOT</version>
+            <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>scatours-common-contribution</artifactId>
+            <artifactId>scatours-contribution-flight</artifactId>
             <version>1.0-SNAPSHOT</version>
+            <scope>runtime</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>scatours-hotel-contribution</artifactId>
+            <artifactId>scatours-contribution-hotel</artifactId>
             <version>1.0-SNAPSHOT</version>
+            <scope>runtime</scope>
         </dependency>
     </dependencies>
 
diff --git a/sandbox/travelsample/contributions/interaction-service-remote-contribution/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contributions/interaction-service-remote/src/main/resources/META-INF/sca-contribution.xml
index 716264650c..c26d63563b 100644
--- a/sandbox/travelsample/contributions/interaction-service-remote-contribution/src/main/resources/META-INF/sca-contribution.xml
+++ b/sandbox/travelsample/contributions/interaction-service-remote/src/main/resources/META-INF/sca-contribution.xml
@@ -18,9 +18,9 @@
     * under the License.    
 -->
 <contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
-              xmlns:client="http://client.scatours/">
-    <import.java package="scatours.common"/>
-    <import.java package="scatours.hotel"/>
-    <import.java package="scatours.flight"/>
-    <deployable composite="client:Client" />
+              xmlns:tours="http://com.tuscanyscatours/">
+    <import.java package="com.tuscanyscatours.common" />
+    <import.java package="com.tuscanyscatours.flight.impl" />
+    <import.java package="com.tuscanyscatours.hotel.impl" />
+    <deployable composite="tours:service" />
 </contribution>
diff --git a/sandbox/travelsample/contributions/interaction-service-remote-contribution/src/main/resources/client.composite b/sandbox/travelsample/contributions/interaction-service-remote/src/main/resources/service.composite
index 4c693864bb..ceeeacd49d 100644
--- a/sandbox/travelsample/contributions/interaction-service-remote-contribution/src/main/resources/client.composite
+++ b/sandbox/travelsample/contributions/interaction-service-remote/src/main/resources/service.composite
@@ -18,29 +18,29 @@
  * under the License.    
 -->
 <composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-    targetNamespace="http://service.scatours/"
+    targetNamespace="http://tuscanyscatours.com/"
     name="Service">
      
      <component name="Hotel">
-        <implementation.java class="scatours.hotel.HotelImpl"/>
+        <implementation.java class="com.tuscanyscatours.hotel.impl.HotelImpl"/>
         <service name="Search">
-            <interface.java interface="scatours.common.Search" 
-                    callbackInterface="scatours.common.SearchCallback"/>
+            <interface.java interface="com.tuscanyscatours.common.Search" 
+                    callbackInterface="com.tuscanyscatours.common.SearchCallback"/>
             <binding.ws uri="http://localhost:8081/Hotel/Search"/>
             <callback>
-                <binding.ws uri="http://localhost:8080/Client/SearchCallback"/>
+                <binding.ws name="callback" uri="http://localhost:8080/Client/SearchCallback"/>
             </callback>            
         </service>
     </component> 
     
      <component name="Flight">
-        <implementation.java class="scatours.flight.FlightImpl"/>
+        <implementation.java class="com.tuscanyscatours.flight.impl.FlightImpl"/>
         <service name="Search">
-            <interface.java interface="scatours.common.Search" 
-                    callbackInterface="scatours.common.SearchCallback"/>
+            <interface.java interface="com.tuscanyscatours.common.Search" 
+                    callbackInterface="com.tuscanyscatours.common.SearchCallback"/>
             <binding.ws uri="http://localhost:8081/Hotel/SearchConversational"/>
             <callback>
-                <binding.ws uri="http://localhost:8080/Client/SearchCallbackConversational"/>
+                <binding.ws name="callback" uri="http://localhost:8080/Client/SearchCallbackConversational"/>
             </callback>            
         </service>
     </component>