summaryrefslogtreecommitdiffstats
path: root/sandbox
diff options
context:
space:
mode:
authornash <nash@13f79535-47bb-0310-9956-ffa450edef68>2009-09-15 13:01:26 +0000
committernash <nash@13f79535-47bb-0310-9956-ffa450edef68>2009-09-15 13:01:26 +0000
commit927bf127eb5530bbda2da17ff99a0dab3d3f3a45 (patch)
treea0eaef54d7b3a5430c87da6450df57f4c7d375fc /sandbox
parent25bb766d16d8981f06c94b0414c71cb3ea57eeef (diff)
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
Diffstat (limited to '')
-rw-r--r--sandbox/travelsample/contributions/currency-jms/pom.xml (renamed from sandbox/travelsample/contributions/currency-jms-contribution/pom.xml)2
-rw-r--r--sandbox/travelsample/contributions/currency-jms/src/main/resources/META-INF/sca-contribution.xml (renamed from sandbox/travelsample/contributions/currency-jms-contribution/src/main/resources/META-INF/sca-contribution.xml)5
-rw-r--r--sandbox/travelsample/contributions/currency-jms/src/main/resources/currency-converter-jms.composite (renamed from sandbox/travelsample/contributions/currency-jms-contribution/src/main/resources/currency-converter-jms.composite)6
-rw-r--r--sandbox/travelsample/contributions/currency-jsp/pom.xml (renamed from sandbox/travelsample/contributions/currency-jsp-contribution/pom.xml)4
-rw-r--r--sandbox/travelsample/contributions/currency-jsp/src/main/webapp/META-INF/sca-deployables/web.composite (renamed from sandbox/travelsample/contributions/currency-jsp-contribution/src/main/webapp/META-INF/sca-deployables/web.composite)4
-rw-r--r--sandbox/travelsample/contributions/currency-jsp/src/main/webapp/WEB-INF/web.xml (renamed from sandbox/travelsample/contributions/currency-jsp-contribution/src/main/webapp/WEB-INF/web.xml)0
-rw-r--r--sandbox/travelsample/contributions/currency-jsp/src/main/webapp/currency-converter.jsp (renamed from sandbox/travelsample/contributions/currency-jsp-contribution/src/main/webapp/currency-converter.jsp)2
-rw-r--r--sandbox/travelsample/contributions/currency-rmi/pom.xml (renamed from sandbox/travelsample/contributions/currency-rmi-contribution/pom.xml)2
-rw-r--r--sandbox/travelsample/contributions/currency-rmi/src/main/resources/META-INF/sca-contribution.xml (renamed from sandbox/travelsample/contributions/currency-rmi-contribution/src/main/resources/META-INF/sca-contribution.xml)5
-rw-r--r--sandbox/travelsample/contributions/currency-rmi/src/main/resources/currency-converter-rmi.composite (renamed from sandbox/travelsample/contributions/currency-rmi-contribution/src/main/resources/currency-converter-rmi.composite)6
-rw-r--r--sandbox/travelsample/contributions/pom.xml6
-rw-r--r--sandbox/travelsample/launchers/currency-converter-jms/pom.xml (renamed from sandbox/travelsample/launchers/currency-converter-jms-launcher/pom.xml)2
-rw-r--r--sandbox/travelsample/launchers/currency-converter-jms/src/main/java/scatours/CurrencyConverterJMSLauncher.java (renamed from sandbox/travelsample/launchers/currency-converter-jms-launcher/src/main/java/scatours/LaunchCurrencyConverterJMSNode.java)8
-rw-r--r--sandbox/travelsample/launchers/currency-converter-jms/src/main/java/scatours/JMSBrokerLauncher.java (renamed from sandbox/travelsample/launchers/currency-converter-jms-launcher/src/main/java/scatours/LaunchJMSBroker.java)2
-rw-r--r--sandbox/travelsample/launchers/currency-converter-rmi/pom.xml (renamed from sandbox/travelsample/launchers/currency-converter-rmi-launcher/pom.xml)2
-rw-r--r--sandbox/travelsample/launchers/currency-converter-rmi/src/main/java/scatours/CurrencyConverterRMILauncher.java (renamed from sandbox/travelsample/launchers/currency-converter-rmi-launcher/src/main/java/scatours/LaunchCurrencyConverterRMINode.java)10
-rw-r--r--sandbox/travelsample/launchers/currency-converter-rmi/src/main/java/scatours/currencyconverter/CurrencyConverter.java (renamed from sandbox/travelsample/launchers/currency-converter-rmi-launcher/src/main/java/scatours/currencyconverter/CurrencyConverter.java)0
-rw-r--r--sandbox/travelsample/launchers/pom.xml4
18 files changed, 36 insertions, 34 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"/>
diff --git a/sandbox/travelsample/contributions/currency-jsp-contribution/pom.xml b/sandbox/travelsample/contributions/currency-jsp/pom.xml
index c3378d1235..25682147ea 100644
--- a/sandbox/travelsample/contributions/currency-jsp-contribution/pom.xml
+++ b/sandbox/travelsample/contributions/currency-jsp/pom.xml
@@ -25,7 +25,7 @@
<version>1.6-SNAPSHOT</version>
<!--relativePath>../../pom.xml</relativePath-->
</parent><version>1.0-SNAPSHOT</version>
- <artifactId>scatours-currency-jsp-contribution</artifactId>
+ <artifactId>scatours-contribution-currency-jsp</artifactId>
<packaging>war</packaging>
<name>Apache Tuscany SCA Tours Currency Converter JSP Contribution</name>
@@ -54,7 +54,7 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>scatours-currency-contribution</artifactId>
+ <artifactId>scatours-contribution-currency</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
</dependencies>
diff --git a/sandbox/travelsample/contributions/currency-jsp-contribution/src/main/webapp/META-INF/sca-deployables/web.composite b/sandbox/travelsample/contributions/currency-jsp/src/main/webapp/META-INF/sca-deployables/web.composite
index e93abf480c..50667b1ac0 100644
--- a/sandbox/travelsample/contributions/currency-jsp-contribution/src/main/webapp/META-INF/sca-deployables/web.composite
+++ b/sandbox/travelsample/contributions/currency-jsp/src/main/webapp/META-INF/sca-deployables/web.composite
@@ -19,7 +19,7 @@
-->
<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
- targetNamespace="http://scatours.com"
+ targetNamespace="http://tuscanyscatours.com/"
name="CurrencyConverterJSP">
<component name="WebClient">
@@ -28,7 +28,7 @@
</component>
<component name="CurrencyConverter">
- <implementation.java class="scatours.currencyconverter.CurrencyConverterImpl"/>
+ <implementation.java class="com.tuscanyscatours.currencyconverter.impl.CurrencyConverterImpl"/>
<service name="CurrencyConverter"/>
</component>
</composite>
diff --git a/sandbox/travelsample/contributions/currency-jsp-contribution/src/main/webapp/WEB-INF/web.xml b/sandbox/travelsample/contributions/currency-jsp/src/main/webapp/WEB-INF/web.xml
index 3b2c79ca76..3b2c79ca76 100644
--- a/sandbox/travelsample/contributions/currency-jsp-contribution/src/main/webapp/WEB-INF/web.xml
+++ b/sandbox/travelsample/contributions/currency-jsp/src/main/webapp/WEB-INF/web.xml
diff --git a/sandbox/travelsample/contributions/currency-jsp-contribution/src/main/webapp/currency-converter.jsp b/sandbox/travelsample/contributions/currency-jsp/src/main/webapp/currency-converter.jsp
index 0014492edb..d1970a37ab 100644
--- a/sandbox/travelsample/contributions/currency-jsp-contribution/src/main/webapp/currency-converter.jsp
+++ b/sandbox/travelsample/contributions/currency-jsp/src/main/webapp/currency-converter.jsp
@@ -19,7 +19,7 @@
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<%@ taglib uri="http://www.osoa.org/sca/sca_jsp.tld" prefix="sca" %>
-<sca:reference name="currencyConverter" type="scatours.currencyconverter.CurrencyConverter"/>
+<sca:reference name="currencyConverter" type="com.tuscanyscatours.currencyconverter.CurrencyConverter"/>
<html>
<body>
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>
diff --git a/sandbox/travelsample/contributions/pom.xml b/sandbox/travelsample/contributions/pom.xml
index a395133ac7..42cc847fdc 100644
--- a/sandbox/travelsample/contributions/pom.xml
+++ b/sandbox/travelsample/contributions/pom.xml
@@ -46,9 +46,9 @@
<module>creditcard-payment-sdo</module>
<module>currency</module>
<module>currency-corba</module>
- <module>currency-jms-contribution</module>
- <module>currency-jsp-contribution</module>
- <module>currency-rmi-contribution</module>
+ <module>currency-jms</module>
+ <module>currency-jsp</module>
+ <module>currency-rmi</module>
<module>currency-ws</module>
<module>databinding-client-contribution</module>
<module>emailgateway</module>
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>