summaryrefslogtreecommitdiffstats
path: root/sandbox
diff options
context:
space:
mode:
authornash <nash@13f79535-47bb-0310-9956-ffa450edef68>2009-09-15 13:17:22 +0000
committernash <nash@13f79535-47bb-0310-9956-ffa450edef68>2009-09-15 13:17:22 +0000
commit1b108a3c622e36a2baabcb89dbbd13d93f69e8c9 (patch)
tree95fa4089f2110b06d9e616c1cfb5c2133dbfd419 /sandbox
parent6a15ee52d19418ce6c0f34019fae6ae1dd70446f (diff)
Restore original names for composites in currency and currency-ws contributions
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@815318 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'sandbox')
-rw-r--r--sandbox/travelsample/contributions/currency-ws/src/main/resources/currency-converter-ws.composite (renamed from sandbox/travelsample/contributions/currency-ws/src/main/resources/currencyconverterws.composite)2
-rw-r--r--sandbox/travelsample/contributions/currency/src/main/resources/currency-converter.composite (renamed from sandbox/travelsample/contributions/currency/src/main/resources/currencyconverter.composite)0
-rw-r--r--sandbox/travelsample/launchers/currency-converter-ws/src/main/java/scatours/CurrencyConverterWSLauncher.java4
-rw-r--r--sandbox/travelsample/launchers/currency-converter/src/main/java/scatours/CurrencyConverterLauncher.java4
4 files changed, 5 insertions, 5 deletions
diff --git a/sandbox/travelsample/contributions/currency-ws/src/main/resources/currencyconverterws.composite b/sandbox/travelsample/contributions/currency-ws/src/main/resources/currency-converter-ws.composite
index ae55b17def..b048a826f1 100644
--- a/sandbox/travelsample/contributions/currency-ws/src/main/resources/currencyconverterws.composite
+++ b/sandbox/travelsample/contributions/currency-ws/src/main/resources/currency-converter-ws.composite
@@ -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" />
diff --git a/sandbox/travelsample/contributions/currency/src/main/resources/currencyconverter.composite b/sandbox/travelsample/contributions/currency/src/main/resources/currency-converter.composite
index 41d0d325d4..41d0d325d4 100644
--- a/sandbox/travelsample/contributions/currency/src/main/resources/currencyconverter.composite
+++ b/sandbox/travelsample/contributions/currency/src/main/resources/currency-converter.composite
diff --git a/sandbox/travelsample/launchers/currency-converter-ws/src/main/java/scatours/CurrencyConverterWSLauncher.java b/sandbox/travelsample/launchers/currency-converter-ws/src/main/java/scatours/CurrencyConverterWSLauncher.java
index 950239d32e..d62dfebf31 100644
--- a/sandbox/travelsample/launchers/currency-converter-ws/src/main/java/scatours/CurrencyConverterWSLauncher.java
+++ b/sandbox/travelsample/launchers/currency-converter-ws/src/main/java/scatours/CurrencyConverterWSLauncher.java
@@ -33,11 +33,11 @@ public class CurrencyConverterWSLauncher {
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");
diff --git a/sandbox/travelsample/launchers/currency-converter/src/main/java/scatours/CurrencyConverterLauncher.java b/sandbox/travelsample/launchers/currency-converter/src/main/java/scatours/CurrencyConverterLauncher.java
index 46373f64e2..fb74e8eeb1 100644
--- a/sandbox/travelsample/launchers/currency-converter/src/main/java/scatours/CurrencyConverterLauncher.java
+++ b/sandbox/travelsample/launchers/currency-converter/src/main/java/scatours/CurrencyConverterLauncher.java
@@ -30,11 +30,11 @@ public class CurrencyConverterLauncher {
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");