Apply new naming convention to currency converter contributions and launchers for RMI, JMS and JSP

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

3 files changed, 7 insertions, 6 deletions

diff --git a/sandbox/travelsample/contributions/currency-rmi-contribution/pom.xml b/sandbox/travelsample/contributions/currency-rmi/pom.xml
index d90ec350a4..9638eed0c8 100644
--- a/sandbox/travelsample/contributions/currency-rmi-contribution/pom.xml
+++ b/sandbox/travelsample/contributions/currency-rmi/pom.xml
@@ -25,7 +25,7 @@
         <version>1.6-SNAPSHOT</version>

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

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

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

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

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

 

     <dependencies>

diff --git a/sandbox/travelsample/contributions/currency-rmi-contribution/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contributions/currency-rmi/src/main/resources/META-INF/sca-contribution.xml
index 31875cc170..cf7325d247 100644
--- a/sandbox/travelsample/contributions/currency-rmi-contribution/src/main/resources/META-INF/sca-contribution.xml
+++ b/sandbox/travelsample/contributions/currency-rmi/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-rmi-contribution/src/main/resources/currency-converter-rmi.composite b/sandbox/travelsample/contributions/currency-rmi/src/main/resources/currency-converter-rmi.composite
index 4c14eb9ac0..52df3a183f 100644
--- a/sandbox/travelsample/contributions/currency-rmi-contribution/src/main/resources/currency-converter-rmi.composite
+++ b/sandbox/travelsample/contributions/currency-rmi/src/main/resources/currency-converter-rmi.composite
@@ -19,13 +19,13 @@
 -->

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

     xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"

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

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

     name="currencyconverter">

 

     <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" />

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

             <tuscany:binding.rmi host="localhost" port="8099" serviceName="CurrencyConverterRMI"/>

         </service>

     </component>