You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by na...@apache.org on 2009/09/15 15:01:28 UTC
svn commit: r815305 - in /tuscany/sandbox/travelsample: contributions/
contributions/currency-jms-contribution/ contributions/currency-jms/
contributions/currency-jms/src/main/resources/
contributions/currency-jms/src/main/resources/META-INF/ contribut...
Author: nash
Date: Tue Sep 15 13:01:26 2009
New Revision: 815305
URL: http://svn.apache.org/viewvc?rev=815305&view=rev
Log:
Apply new naming convention to currency converter contributions and launchers for RMI, JMS and JSP
Added:
tuscany/sandbox/travelsample/contributions/currency-jms/
- copied from r814729, tuscany/sandbox/travelsample/contributions/currency-jms-contribution/
tuscany/sandbox/travelsample/contributions/currency-jsp/
- copied from r814729, tuscany/sandbox/travelsample/contributions/currency-jsp-contribution/
tuscany/sandbox/travelsample/contributions/currency-rmi/
- copied from r814729, tuscany/sandbox/travelsample/contributions/currency-rmi-contribution/
tuscany/sandbox/travelsample/launchers/currency-converter-jms/
- copied from r814858, tuscany/sandbox/travelsample/launchers/currency-converter-jms-launcher/
tuscany/sandbox/travelsample/launchers/currency-converter-jms/src/main/java/scatours/CurrencyConverterJMSLauncher.java
- copied, changed from r814858, tuscany/sandbox/travelsample/launchers/currency-converter-jms-launcher/src/main/java/scatours/LaunchCurrencyConverterJMSNode.java
tuscany/sandbox/travelsample/launchers/currency-converter-jms/src/main/java/scatours/JMSBrokerLauncher.java
- copied, changed from r814858, tuscany/sandbox/travelsample/launchers/currency-converter-jms-launcher/src/main/java/scatours/LaunchJMSBroker.java
tuscany/sandbox/travelsample/launchers/currency-converter-rmi/
- copied from r814858, tuscany/sandbox/travelsample/launchers/currency-converter-rmi-launcher/
tuscany/sandbox/travelsample/launchers/currency-converter-rmi/src/main/java/scatours/CurrencyConverterRMILauncher.java
- copied, changed from r814858, tuscany/sandbox/travelsample/launchers/currency-converter-rmi-launcher/src/main/java/scatours/LaunchCurrencyConverterRMINode.java
Removed:
tuscany/sandbox/travelsample/contributions/currency-jms-contribution/
tuscany/sandbox/travelsample/contributions/currency-jsp-contribution/
tuscany/sandbox/travelsample/contributions/currency-rmi-contribution/
tuscany/sandbox/travelsample/launchers/currency-converter-jms-launcher/
tuscany/sandbox/travelsample/launchers/currency-converter-jms/src/main/java/scatours/LaunchCurrencyConverterJMSNode.java
tuscany/sandbox/travelsample/launchers/currency-converter-jms/src/main/java/scatours/LaunchJMSBroker.java
tuscany/sandbox/travelsample/launchers/currency-converter-rmi-launcher/
tuscany/sandbox/travelsample/launchers/currency-converter-rmi/src/main/java/scatours/LaunchCurrencyConverterRMINode.java
Modified:
tuscany/sandbox/travelsample/contributions/currency-jms/pom.xml
tuscany/sandbox/travelsample/contributions/currency-jms/src/main/resources/META-INF/sca-contribution.xml
tuscany/sandbox/travelsample/contributions/currency-jms/src/main/resources/currency-converter-jms.composite
tuscany/sandbox/travelsample/contributions/currency-jsp/pom.xml
tuscany/sandbox/travelsample/contributions/currency-jsp/src/main/webapp/META-INF/sca-deployables/web.composite
tuscany/sandbox/travelsample/contributions/currency-jsp/src/main/webapp/currency-converter.jsp
tuscany/sandbox/travelsample/contributions/currency-rmi/pom.xml
tuscany/sandbox/travelsample/contributions/currency-rmi/src/main/resources/META-INF/sca-contribution.xml
tuscany/sandbox/travelsample/contributions/currency-rmi/src/main/resources/currency-converter-rmi.composite
tuscany/sandbox/travelsample/contributions/pom.xml
tuscany/sandbox/travelsample/launchers/currency-converter-jms/pom.xml
tuscany/sandbox/travelsample/launchers/currency-converter-rmi/pom.xml
tuscany/sandbox/travelsample/launchers/pom.xml
Modified: tuscany/sandbox/travelsample/contributions/currency-jms/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/contributions/currency-jms/pom.xml?rev=815305&r1=814729&r2=815305&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/contributions/currency-jms/pom.xml (original)
+++ tuscany/sandbox/travelsample/contributions/currency-jms/pom.xml Tue Sep 15 13:01:26 2009
@@ -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>
Modified: tuscany/sandbox/travelsample/contributions/currency-jms/src/main/resources/META-INF/sca-contribution.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/contributions/currency-jms/src/main/resources/META-INF/sca-contribution.xml?rev=815305&r1=814729&r2=815305&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/contributions/currency-jms/src/main/resources/META-INF/sca-contribution.xml (original)
+++ tuscany/sandbox/travelsample/contributions/currency-jms/src/main/resources/META-INF/sca-contribution.xml Tue Sep 15 13:01:26 2009
@@ -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>
Modified: tuscany/sandbox/travelsample/contributions/currency-jms/src/main/resources/currency-converter-jms.composite
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/contributions/currency-jms/src/main/resources/currency-converter-jms.composite?rev=815305&r1=814729&r2=815305&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/contributions/currency-jms/src/main/resources/currency-converter-jms.composite (original)
+++ tuscany/sandbox/travelsample/contributions/currency-jms/src/main/resources/currency-converter-jms.composite Tue Sep 15 13:01:26 2009
@@ -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"/>
Modified: tuscany/sandbox/travelsample/contributions/currency-jsp/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/contributions/currency-jsp/pom.xml?rev=815305&r1=814729&r2=815305&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/contributions/currency-jsp/pom.xml (original)
+++ tuscany/sandbox/travelsample/contributions/currency-jsp/pom.xml Tue Sep 15 13:01:26 2009
@@ -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>
Modified: tuscany/sandbox/travelsample/contributions/currency-jsp/src/main/webapp/META-INF/sca-deployables/web.composite
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/contributions/currency-jsp/src/main/webapp/META-INF/sca-deployables/web.composite?rev=815305&r1=814729&r2=815305&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/contributions/currency-jsp/src/main/webapp/META-INF/sca-deployables/web.composite (original)
+++ tuscany/sandbox/travelsample/contributions/currency-jsp/src/main/webapp/META-INF/sca-deployables/web.composite Tue Sep 15 13:01:26 2009
@@ -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>
Modified: tuscany/sandbox/travelsample/contributions/currency-jsp/src/main/webapp/currency-converter.jsp
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/contributions/currency-jsp/src/main/webapp/currency-converter.jsp?rev=815305&r1=814729&r2=815305&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/contributions/currency-jsp/src/main/webapp/currency-converter.jsp (original)
+++ tuscany/sandbox/travelsample/contributions/currency-jsp/src/main/webapp/currency-converter.jsp Tue Sep 15 13:01:26 2009
@@ -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>
Modified: tuscany/sandbox/travelsample/contributions/currency-rmi/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/contributions/currency-rmi/pom.xml?rev=815305&r1=814729&r2=815305&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/contributions/currency-rmi/pom.xml (original)
+++ tuscany/sandbox/travelsample/contributions/currency-rmi/pom.xml Tue Sep 15 13:01:26 2009
@@ -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>
Modified: tuscany/sandbox/travelsample/contributions/currency-rmi/src/main/resources/META-INF/sca-contribution.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/contributions/currency-rmi/src/main/resources/META-INF/sca-contribution.xml?rev=815305&r1=814729&r2=815305&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/contributions/currency-rmi/src/main/resources/META-INF/sca-contribution.xml (original)
+++ tuscany/sandbox/travelsample/contributions/currency-rmi/src/main/resources/META-INF/sca-contribution.xml Tue Sep 15 13:01:26 2009
@@ -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>
Modified: tuscany/sandbox/travelsample/contributions/currency-rmi/src/main/resources/currency-converter-rmi.composite
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/contributions/currency-rmi/src/main/resources/currency-converter-rmi.composite?rev=815305&r1=814729&r2=815305&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/contributions/currency-rmi/src/main/resources/currency-converter-rmi.composite (original)
+++ tuscany/sandbox/travelsample/contributions/currency-rmi/src/main/resources/currency-converter-rmi.composite Tue Sep 15 13:01:26 2009
@@ -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>
Modified: tuscany/sandbox/travelsample/contributions/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/contributions/pom.xml?rev=815305&r1=815304&r2=815305&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/contributions/pom.xml (original)
+++ tuscany/sandbox/travelsample/contributions/pom.xml Tue Sep 15 13:01:26 2009
@@ -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>
Modified: tuscany/sandbox/travelsample/launchers/currency-converter-jms/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/launchers/currency-converter-jms/pom.xml?rev=815305&r1=814858&r2=815305&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/launchers/currency-converter-jms/pom.xml (original)
+++ tuscany/sandbox/travelsample/launchers/currency-converter-jms/pom.xml Tue Sep 15 13:01:26 2009
@@ -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>
Copied: tuscany/sandbox/travelsample/launchers/currency-converter-jms/src/main/java/scatours/CurrencyConverterJMSLauncher.java (from r814858, tuscany/sandbox/travelsample/launchers/currency-converter-jms-launcher/src/main/java/scatours/LaunchCurrencyConverterJMSNode.java)
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/launchers/currency-converter-jms/src/main/java/scatours/CurrencyConverterJMSLauncher.java?p2=tuscany/sandbox/travelsample/launchers/currency-converter-jms/src/main/java/scatours/CurrencyConverterJMSLauncher.java&p1=tuscany/sandbox/travelsample/launchers/currency-converter-jms-launcher/src/main/java/scatours/LaunchCurrencyConverterJMSNode.java&r1=814858&r2=815305&rev=815305&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/launchers/currency-converter-jms-launcher/src/main/java/scatours/LaunchCurrencyConverterJMSNode.java (original)
+++ tuscany/sandbox/travelsample/launchers/currency-converter-jms/src/main/java/scatours/CurrencyConverterJMSLauncher.java Tue Sep 15 13:01:26 2009
@@ -23,16 +23,16 @@
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.");
Copied: tuscany/sandbox/travelsample/launchers/currency-converter-jms/src/main/java/scatours/JMSBrokerLauncher.java (from r814858, tuscany/sandbox/travelsample/launchers/currency-converter-jms-launcher/src/main/java/scatours/LaunchJMSBroker.java)
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/launchers/currency-converter-jms/src/main/java/scatours/JMSBrokerLauncher.java?p2=tuscany/sandbox/travelsample/launchers/currency-converter-jms/src/main/java/scatours/JMSBrokerLauncher.java&p1=tuscany/sandbox/travelsample/launchers/currency-converter-jms-launcher/src/main/java/scatours/LaunchJMSBroker.java&r1=814858&r2=815305&rev=815305&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/launchers/currency-converter-jms-launcher/src/main/java/scatours/LaunchJMSBroker.java (original)
+++ tuscany/sandbox/travelsample/launchers/currency-converter-jms/src/main/java/scatours/JMSBrokerLauncher.java Tue Sep 15 13:01:26 2009
@@ -20,7 +20,7 @@
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();
Modified: tuscany/sandbox/travelsample/launchers/currency-converter-rmi/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/launchers/currency-converter-rmi/pom.xml?rev=815305&r1=814858&r2=815305&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/launchers/currency-converter-rmi/pom.xml (original)
+++ tuscany/sandbox/travelsample/launchers/currency-converter-rmi/pom.xml Tue Sep 15 13:01:26 2009
@@ -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>
Copied: tuscany/sandbox/travelsample/launchers/currency-converter-rmi/src/main/java/scatours/CurrencyConverterRMILauncher.java (from r814858, tuscany/sandbox/travelsample/launchers/currency-converter-rmi-launcher/src/main/java/scatours/LaunchCurrencyConverterRMINode.java)
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/launchers/currency-converter-rmi/src/main/java/scatours/CurrencyConverterRMILauncher.java?p2=tuscany/sandbox/travelsample/launchers/currency-converter-rmi/src/main/java/scatours/CurrencyConverterRMILauncher.java&p1=tuscany/sandbox/travelsample/launchers/currency-converter-rmi-launcher/src/main/java/scatours/LaunchCurrencyConverterRMINode.java&r1=814858&r2=815305&rev=815305&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/launchers/currency-converter-rmi-launcher/src/main/java/scatours/LaunchCurrencyConverterRMINode.java (original)
+++ tuscany/sandbox/travelsample/launchers/currency-converter-rmi/src/main/java/scatours/CurrencyConverterRMILauncher.java Tue Sep 15 13:01:26 2009
@@ -26,18 +26,18 @@
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");
Modified: tuscany/sandbox/travelsample/launchers/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/launchers/pom.xml?rev=815305&r1=815304&r2=815305&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/launchers/pom.xml (original)
+++ tuscany/sandbox/travelsample/launchers/pom.xml Tue Sep 15 13:01:26 2009
@@ -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>