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

4 files changed, 10 insertions, 9 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>