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:17:23 UTC

svn commit: r815318 - in /tuscany/sandbox/travelsample: contributions/currency-ws/src/main/resources/ contributions/currency/src/main/resources/ launchers/currency-converter-ws/src/main/java/scatours/ launchers/currency-converter/src/main/java/scatours/

Author: nash
Date: Tue Sep 15 13:17:22 2009
New Revision: 815318

URL: http://svn.apache.org/viewvc?rev=815318&view=rev
Log:
Restore original names for composites in currency and currency-ws contributions

Added:
    tuscany/sandbox/travelsample/contributions/currency-ws/src/main/resources/currency-converter-ws.composite
      - copied, changed from r815305, tuscany/sandbox/travelsample/contributions/currency-ws/src/main/resources/currencyconverterws.composite
    tuscany/sandbox/travelsample/contributions/currency/src/main/resources/currency-converter.composite
      - copied unchanged from r815305, tuscany/sandbox/travelsample/contributions/currency/src/main/resources/currencyconverter.composite
Removed:
    tuscany/sandbox/travelsample/contributions/currency-ws/src/main/resources/currencyconverterws.composite
    tuscany/sandbox/travelsample/contributions/currency/src/main/resources/currencyconverter.composite
Modified:
    tuscany/sandbox/travelsample/launchers/currency-converter-ws/src/main/java/scatours/CurrencyConverterWSLauncher.java
    tuscany/sandbox/travelsample/launchers/currency-converter/src/main/java/scatours/CurrencyConverterLauncher.java

Copied: tuscany/sandbox/travelsample/contributions/currency-ws/src/main/resources/currency-converter-ws.composite (from r815305, tuscany/sandbox/travelsample/contributions/currency-ws/src/main/resources/currencyconverterws.composite)
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/contributions/currency-ws/src/main/resources/currency-converter-ws.composite?p2=tuscany/sandbox/travelsample/contributions/currency-ws/src/main/resources/currency-converter-ws.composite&p1=tuscany/sandbox/travelsample/contributions/currency-ws/src/main/resources/currencyconverterws.composite&r1=815305&r2=815318&rev=815318&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/contributions/currency-ws/src/main/resources/currencyconverterws.composite (original)
+++ tuscany/sandbox/travelsample/contributions/currency-ws/src/main/resources/currency-converter-ws.composite Tue Sep 15 13:17:22 2009
@@ -19,7 +19,7 @@
 -->
 <composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
     targetNamespace="http://tuscanyscatours.com/"
-    name="currencyconverterws">
+    name="currencyconverter">
 
     <component name="CurrencyConverter">
         <implementation.java class="com.tuscanyscatours.currencyconverter.impl.CurrencyConverterImpl" />

Modified: tuscany/sandbox/travelsample/launchers/currency-converter-ws/src/main/java/scatours/CurrencyConverterWSLauncher.java
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/launchers/currency-converter-ws/src/main/java/scatours/CurrencyConverterWSLauncher.java?rev=815318&r1=815317&r2=815318&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/launchers/currency-converter-ws/src/main/java/scatours/CurrencyConverterWSLauncher.java (original)
+++ tuscany/sandbox/travelsample/launchers/currency-converter-ws/src/main/java/scatours/CurrencyConverterWSLauncher.java Tue Sep 15 13:17:22 2009
@@ -33,11 +33,11 @@
             new SCAContribution("currency-ws", 
               "../../contributions/currency-ws/target/classes");
         SCAContribution currencyContribution = 
-          new SCAContribution("currency", 
+            new SCAContribution("currency", 
               "../../contributions/currency/target/classes");
         
         SCANode node = SCANodeFactory.newInstance().createSCANode(
-            "currencyconverterws.composite", currencyContribution, currencyWSContribution);
+            "currency-converter-ws.composite", currencyContribution, currencyWSContribution);
         node.start();
 
         System.out.println("Quick currency converter test");

Modified: tuscany/sandbox/travelsample/launchers/currency-converter/src/main/java/scatours/CurrencyConverterLauncher.java
URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/launchers/currency-converter/src/main/java/scatours/CurrencyConverterLauncher.java?rev=815318&r1=815317&r2=815318&view=diff
==============================================================================
--- tuscany/sandbox/travelsample/launchers/currency-converter/src/main/java/scatours/CurrencyConverterLauncher.java (original)
+++ tuscany/sandbox/travelsample/launchers/currency-converter/src/main/java/scatours/CurrencyConverterLauncher.java Tue Sep 15 13:17:22 2009
@@ -30,11 +30,11 @@
 
     public static void main(String[] args) throws Exception {
         SCAContribution currencyContribution = 
-          new SCAContribution("currency", 
+            new SCAContribution("currency", 
               "../../contributions/currency/target/classes");
         
         SCANode node = SCANodeFactory.newInstance().createSCANode(
-            "currencyconverter.composite",currencyContribution);
+            "currency-converter.composite", currencyContribution);
         node.start();
 
         System.out.println("Quick currency converter test");