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

7 files changed, 14 insertions, 14 deletions

diff --git a/sandbox/travelsample/launchers/currency-converter-jms-launcher/pom.xml b/sandbox/travelsample/launchers/currency-converter-jms/pom.xml
index 2a839aa01c..b06f2951d6 100644
--- a/sandbox/travelsample/launchers/currency-converter-jms-launcher/pom.xml
+++ b/sandbox/travelsample/launchers/currency-converter-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-converter-jms-launcher</artifactId>

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

     <name>Apache Tuscany SCA Tours Currency Converter JMS Launcher</name>

 

     <dependencies>

diff --git a/sandbox/travelsample/launchers/currency-converter-jms-launcher/src/main/java/scatours/LaunchCurrencyConverterJMSNode.java b/sandbox/travelsample/launchers/currency-converter-jms/src/main/java/scatours/CurrencyConverterJMSLauncher.java
index d844fd48ca..a8cf9079e0 100644
--- a/sandbox/travelsample/launchers/currency-converter-jms-launcher/src/main/java/scatours/LaunchCurrencyConverterJMSNode.java
+++ b/sandbox/travelsample/launchers/currency-converter-jms/src/main/java/scatours/CurrencyConverterJMSLauncher.java
@@ -23,16 +23,16 @@ import org.apache.tuscany.sca.node.SCAContribution;
 import org.apache.tuscany.sca.node.SCANode;

 import org.apache.tuscany.sca.node.SCANodeFactory;

 

-public class LaunchCurrencyConverterJMSNode {

+public class CurrencyConverterJMSLauncher {

 

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

         SCAContribution currencyJMSContribution = 

-            new SCAContribution("currency-jms", "../../contributions/currency-jms-contribution/target/classes");

+            new SCAContribution("currency-jms", "../../contributions/currency-jms/target/classes");

         SCAContribution currencyContribution = 

-          new SCAContribution("currency", "../../contributions/currency-contribution/target/classes");

+            new SCAContribution("currency", "../../contributions/currency/target/classes");

 

         SCANode node = SCANodeFactory.newInstance().createSCANode(

-                "currency-converter-jms.composite",currencyContribution, currencyJMSContribution);

+                "currency-converter-jms.composite", currencyContribution, currencyJMSContribution);

         node.start();

 

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

diff --git a/sandbox/travelsample/launchers/currency-converter-jms-launcher/src/main/java/scatours/LaunchJMSBroker.java b/sandbox/travelsample/launchers/currency-converter-jms/src/main/java/scatours/JMSBrokerLauncher.java
index fee4c357a1..7d063ca865 100644
--- a/sandbox/travelsample/launchers/currency-converter-jms-launcher/src/main/java/scatours/LaunchJMSBroker.java
+++ b/sandbox/travelsample/launchers/currency-converter-jms/src/main/java/scatours/JMSBrokerLauncher.java
@@ -20,7 +20,7 @@ package scatours;
 
 import org.apache.activemq.broker.BrokerService;
 
-public class LaunchJMSBroker {
+public class JMSBrokerLauncher {
 
     public static void main(String[] args) throws Exception {
       final BrokerService jmsBroker = new BrokerService();
diff --git a/sandbox/travelsample/launchers/currency-converter-rmi-launcher/pom.xml b/sandbox/travelsample/launchers/currency-converter-rmi/pom.xml
index 300fcb2833..19375335de 100644
--- a/sandbox/travelsample/launchers/currency-converter-rmi-launcher/pom.xml
+++ b/sandbox/travelsample/launchers/currency-converter-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-converter-rmi-launcher</artifactId>

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

     <name>Apache Tuscany SCA Tours Currency Converter RMI Launcher</name>

 

     <dependencies>

diff --git a/sandbox/travelsample/launchers/currency-converter-rmi-launcher/src/main/java/scatours/LaunchCurrencyConverterRMINode.java b/sandbox/travelsample/launchers/currency-converter-rmi/src/main/java/scatours/CurrencyConverterRMILauncher.java
index c017fb2291..7405ce3207 100644
--- a/sandbox/travelsample/launchers/currency-converter-rmi-launcher/src/main/java/scatours/LaunchCurrencyConverterRMINode.java
+++ b/sandbox/travelsample/launchers/currency-converter-rmi/src/main/java/scatours/CurrencyConverterRMILauncher.java
@@ -26,18 +26,18 @@ import org.apache.tuscany.sca.node.SCANodeFactory;
 

 import scatours.currencyconverter.CurrencyConverter;

 

-public class LaunchCurrencyConverterRMINode {

+public class CurrencyConverterRMILauncher {

 

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

         SCAContribution currencyRMIContribution = 

             new SCAContribution("currency-rmi", 

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

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

         SCAContribution currencyContribution = 

-          new SCAContribution("currency", 

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

+            new SCAContribution("currency", 

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

         

         SCANode node = SCANodeFactory.newInstance().createSCANode(

-            "currency-converter-rmi.composite",currencyContribution, currencyRMIContribution);

+            "currency-converter-rmi.composite", currencyContribution, currencyRMIContribution);

         node.start();

 

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

diff --git a/sandbox/travelsample/launchers/currency-converter-rmi-launcher/src/main/java/scatours/currencyconverter/CurrencyConverter.java b/sandbox/travelsample/launchers/currency-converter-rmi/src/main/java/scatours/currencyconverter/CurrencyConverter.java
index 6d0efc8c66..6d0efc8c66 100644
--- a/sandbox/travelsample/launchers/currency-converter-rmi-launcher/src/main/java/scatours/currencyconverter/CurrencyConverter.java
+++ b/sandbox/travelsample/launchers/currency-converter-rmi/src/main/java/scatours/currencyconverter/CurrencyConverter.java
diff --git a/sandbox/travelsample/launchers/pom.xml b/sandbox/travelsample/launchers/pom.xml
index 881f38d118..abb24eef6c 100644
--- a/sandbox/travelsample/launchers/pom.xml
+++ b/sandbox/travelsample/launchers/pom.xml
@@ -40,8 +40,8 @@
                 <module>blog-feed-launcher</module>
                 <module>currency-converter</module>
                 <module>currency-converter-corba</module>
-                <module>currency-converter-jms-launcher</module>
-                <module>currency-converter-rmi-launcher</module>
+                <module>currency-converter-jms</module>
+                <module>currency-converter-rmi</module>
                 <module>currency-converter-ws</module>
                 <module>databinding-launcher</module>
                 <module>feed-logger-launcher</module>