Apply new naming convention to contributions/currency-ws and launchers/currency-converter-ws

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

9 files changed, 65 insertions, 18 deletions

diff --git a/sandbox/travelsample/contributions/currency-ws-contribution/pom.xml b/sandbox/travelsample/contributions/currency-ws/pom.xml
index 4c6d2eacf3..bd6f9f7736 100644
--- a/sandbox/travelsample/contributions/currency-ws-contribution/pom.xml
+++ b/sandbox/travelsample/contributions/currency-ws/pom.xml
@@ -25,7 +25,7 @@
         <version>1.6-SNAPSHOT</version>

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

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

-    <artifactId>scatours-currency-ws-contribution</artifactId>

+    <artifactId>scatours-contribution-currency-ws</artifactId>

     <name>Apache Tuscany SCA Tours Currency Converter Contribution With Web Service Binding</name>

 

     <dependencies>

diff --git a/sandbox/travelsample/contributions/currency-ws-contribution/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contributions/currency-ws/src/main/resources/META-INF/sca-contribution.xml
index 31875cc170..cf7325d247 100644
--- a/sandbox/travelsample/contributions/currency-ws-contribution/src/main/resources/META-INF/sca-contribution.xml
+++ b/sandbox/travelsample/contributions/currency-ws/src/main/resources/META-INF/sca-contribution.xml
@@ -18,5 +18,6 @@
     * under the License.    

 -->

 <contribution xmlns="http://www.osoa.org/xmlns/sca/1.0">

-   <import.java package="scatours.currencyconverter"/>

-</contribution>
\ No newline at end of file
+    <import.java package="com.tuscanyscatours.currencyconverter" />

+    <import.java package="com.tuscanyscatours.currencyconverter.impl" />

+</contribution>

diff --git a/sandbox/travelsample/contributions/currency-ws-contribution/src/main/resources/currency-converter-ws.composite b/sandbox/travelsample/contributions/currency-ws/src/main/resources/currencyconverterws.composite
index f49395996e..ae55b17def 100644
--- a/sandbox/travelsample/contributions/currency-ws-contribution/src/main/resources/currency-converter-ws.composite
+++ b/sandbox/travelsample/contributions/currency-ws/src/main/resources/currencyconverterws.composite
@@ -18,14 +18,14 @@
  * under the License.    

 -->

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

-    targetNamespace="http://goodvaluetrips.com/"

-    name="currencyconverter">

+    targetNamespace="http://tuscanyscatours.com/"

+    name="currencyconverterws">

 

     <component name="CurrencyConverter">

-        <implementation.java class="scatours.currencyconverter.CurrencyConverterImpl" />

+        <implementation.java class="com.tuscanyscatours.currencyconverter.impl.CurrencyConverterImpl" />

         <service name="CurrencyConverter">

-            <interface.java interface="scatours.currencyconverter.CurrencyConverter" />

-            <binding.ws/>

+            <interface.java interface="com.tuscanyscatours.currencyconverter.CurrencyConverter" />

+            <binding.ws />

         </service>

     </component>

 </composite>

diff --git a/sandbox/travelsample/contributions/pom.xml b/sandbox/travelsample/contributions/pom.xml
index 231af32793..e0d6aeb075 100644
--- a/sandbox/travelsample/contributions/pom.xml
+++ b/sandbox/travelsample/contributions/pom.xml
@@ -49,7 +49,7 @@
                 <module>currency-jms-contribution</module>

                 <module>currency-jsp-contribution</module>

                 <module>currency-rmi-contribution</module>

-                <module>currency-ws-contribution</module>

+                <module>currency-ws</module>

                 <module>databinding-client-contribution</module>

                 <module>emailgateway</module>

                 <module>feed-logger-contribution</module>

diff --git a/sandbox/travelsample/launchers/currency-converter-ws/build.xml b/sandbox/travelsample/launchers/currency-converter-ws/build.xml
new file mode 100644
index 0000000000..2fc1b8caf5
--- /dev/null
+++ b/sandbox/travelsample/launchers/currency-converter-ws/build.xml
@@ -0,0 +1,48 @@
+<!--

+ * 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-launcher-currency-converter-ws" default="compile">

+    <property environment="env"/> 

+

+    <target name="compile">

+        <mkdir dir="target/classes"/>

+        <javac destdir="target/classes" debug="on" source="1.5" target="1.5">

+            <src path="src/main/java"/>

+            <classpath>

+                <pathelement location="${env.TUSCANY}/lib/tuscany-sca-manifest.jar"/>

+            </classpath>

+        </javac>

+    </target>

+

+    <target name="run">

+        <java classname="scatours.CurrencyConverterWSLauncher" fork="true">

+            <classpath>

+                <pathelement location="target/classes"/>

+                <pathelement location="${env.TUSCANY}/lib/tuscany-sca-manifest.jar"/>

+            </classpath>

+        </java>

+    </target>

+

+    <target name="clean">

+        <delete includeemptydirs="true">

+            <fileset dir="target"/>

+        </delete>

+    </target>

+

+</project>

diff --git a/sandbox/travelsample/launchers/currency-converter-ws-launcher/pom.xml b/sandbox/travelsample/launchers/currency-converter-ws/pom.xml
index 4e55d185ab..d2830d78a0 100644
--- a/sandbox/travelsample/launchers/currency-converter-ws-launcher/pom.xml
+++ b/sandbox/travelsample/launchers/currency-converter-ws/pom.xml
@@ -25,7 +25,7 @@
         <version>1.6-SNAPSHOT</version>

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

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

-    <artifactId>scatours-currency-converter-ws-launcher</artifactId>

+    <artifactId>scatours-launcher-currency-converter-ws</artifactId>

     <name>Apache Tuscany SCA Tours Currency Converter Web Service Launcher</name>

 

     <dependencies>

diff --git a/sandbox/travelsample/launchers/currency-converter-ws-launcher/src/main/java/scatours/LaunchCurrencyConverterWSNode.java b/sandbox/travelsample/launchers/currency-converter-ws/src/main/java/scatours/CurrencyConverterWSLauncher.java
index c6dcbd679f..950239d32e 100644
--- a/sandbox/travelsample/launchers/currency-converter-ws-launcher/src/main/java/scatours/LaunchCurrencyConverterWSNode.java
+++ b/sandbox/travelsample/launchers/currency-converter-ws/src/main/java/scatours/CurrencyConverterWSLauncher.java
@@ -26,18 +26,18 @@ import org.apache.tuscany.sca.node.SCANodeFactory;
 

 import scatours.currencyconverter.CurrencyConverter;

 

-public class LaunchCurrencyConverterWSNode {

+public class CurrencyConverterWSLauncher {

 

     public static void main(String[] args) throws Exception {

         SCAContribution currencyWSContribution = 

             new SCAContribution("currency-ws", 

-              "../../contributions/currency-ws-contribution/target/classes");

+              "../../contributions/currency-ws/target/classes");

         SCAContribution currencyContribution = 

           new SCAContribution("currency", 

-              "../../contributions/currency-contribution/target/classes");

+              "../../contributions/currency/target/classes");

         

         SCANode node = SCANodeFactory.newInstance().createSCANode(

-            "currency-converter-ws.composite",currencyContribution, currencyWSContribution);

+            "currencyconverterws.composite", currencyContribution, currencyWSContribution);

         node.start();

 

         System.out.println("Quick currency converter test");

@@ -50,9 +50,7 @@ public class LaunchCurrencyConverterWSNode {
 

         System.out.println("Node started - Press enter to shutdown.");

         System.in.read();

-        

-        

-        

+

         node.stop();

     }

 }

diff --git a/sandbox/travelsample/launchers/currency-converter-ws-launcher/src/main/java/scatours/currencyconverter/CurrencyConverter.java b/sandbox/travelsample/launchers/currency-converter-ws/src/main/java/scatours/currencyconverter/CurrencyConverter.java
index 6d0efc8c66..6d0efc8c66 100644
--- a/sandbox/travelsample/launchers/currency-converter-ws-launcher/src/main/java/scatours/currencyconverter/CurrencyConverter.java
+++ b/sandbox/travelsample/launchers/currency-converter-ws/src/main/java/scatours/currencyconverter/CurrencyConverter.java
diff --git a/sandbox/travelsample/launchers/pom.xml b/sandbox/travelsample/launchers/pom.xml
index fee61d8064..1144a087e6 100644
--- a/sandbox/travelsample/launchers/pom.xml
+++ b/sandbox/travelsample/launchers/pom.xml
@@ -42,7 +42,7 @@
                 <module>currency-converter-corba-launcher</module>
                 <module>currency-converter-jms-launcher</module>
                 <module>currency-converter-rmi-launcher</module>
-                <module>currency-converter-ws-launcher</module>
+                <module>currency-converter-ws</module>
                 <module>databinding-launcher</module>
                 <module>feed-logger-launcher</module>
                 <module>interaction</module>