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-jms-contribution/pom.xml b/sandbox/travelsample/contributions/currency-jms/pom.xml
index cf53088544..17a2016d04 100644
--- a/sandbox/travelsample/contributions/currency-jms-contribution/pom.xml
+++ b/sandbox/travelsample/contributions/currency-jms/pom.xml
@@ -25,7 +25,7 @@
         <version>1.6-SNAPSHOT</version>

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

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

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

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

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

 

     <dependencies>

diff --git a/sandbox/travelsample/contributions/currency-jms-contribution/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contributions/currency-jms/src/main/resources/META-INF/sca-contribution.xml
index 0924b826b5..89ba1a3578 100644
--- a/sandbox/travelsample/contributions/currency-jms-contribution/src/main/resources/META-INF/sca-contribution.xml
+++ b/sandbox/travelsample/contributions/currency-jms/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-jms-contribution/src/main/resources/currency-converter-jms.composite b/sandbox/travelsample/contributions/currency-jms/src/main/resources/currency-converter-jms.composite
index 0c09053ca6..ac34d6f562 100644
--- a/sandbox/travelsample/contributions/currency-jms-contribution/src/main/resources/currency-converter-jms.composite
+++ b/sandbox/travelsample/contributions/currency-jms/src/main/resources/currency-converter-jms.composite
@@ -18,13 +18,13 @@
  * under the License.    

 -->

 <composite xmlns="http://www.osoa.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"/>

             <binding.jms initialContextFactory="org.apache.activemq.jndi.ActiveMQInitialContextFactory"

                              jndiURL="tcp://localhost:61619">

                 <destination name="RequestQueue" create="ifnotexist"/>