From 1b108a3c622e36a2baabcb89dbbd13d93f69e8c9 Mon Sep 17 00:00:00 2001
From: nash <nash@13f79535-47bb-0310-9956-ffa450edef68>
Date: Tue, 15 Sep 2009 13:17:22 +0000
Subject: 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
---
 .../main/resources/currency-converter-ws.composite | 31 ++++++++++++++++++++++
 .../main/resources/currencyconverterws.composite   | 31 ----------------------
 .../main/resources/currency-converter.composite    | 28 +++++++++++++++++++
 .../src/main/resources/currencyconverter.composite | 28 -------------------
 .../java/scatours/CurrencyConverterWSLauncher.java |  4 +--
 .../java/scatours/CurrencyConverterLauncher.java   |  4 +--
 6 files changed, 63 insertions(+), 63 deletions(-)
 create mode 100644 sandbox/travelsample/contributions/currency-ws/src/main/resources/currency-converter-ws.composite
 delete mode 100644 sandbox/travelsample/contributions/currency-ws/src/main/resources/currencyconverterws.composite
 create mode 100644 sandbox/travelsample/contributions/currency/src/main/resources/currency-converter.composite
 delete mode 100644 sandbox/travelsample/contributions/currency/src/main/resources/currencyconverter.composite

(limited to 'sandbox/travelsample')

diff --git a/sandbox/travelsample/contributions/currency-ws/src/main/resources/currency-converter-ws.composite b/sandbox/travelsample/contributions/currency-ws/src/main/resources/currency-converter-ws.composite
new file mode 100644
index 0000000000..b048a826f1
--- /dev/null
+++ b/sandbox/travelsample/contributions/currency-ws/src/main/resources/currency-converter-ws.composite
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+    targetNamespace="http://tuscanyscatours.com/"
+    name="currencyconverter">
+
+    <component name="CurrencyConverter">
+        <implementation.java class="com.tuscanyscatours.currencyconverter.impl.CurrencyConverterImpl" />
+        <service name="CurrencyConverter">
+            <interface.java interface="com.tuscanyscatours.currencyconverter.CurrencyConverter" />
+            <binding.ws />
+        </service>
+    </component>
+</composite>
diff --git a/sandbox/travelsample/contributions/currency-ws/src/main/resources/currencyconverterws.composite b/sandbox/travelsample/contributions/currency-ws/src/main/resources/currencyconverterws.composite
deleted file mode 100644
index ae55b17def..0000000000
--- a/sandbox/travelsample/contributions/currency-ws/src/main/resources/currencyconverterws.composite
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-    targetNamespace="http://tuscanyscatours.com/"
-    name="currencyconverterws">
-
-    <component name="CurrencyConverter">
-        <implementation.java class="com.tuscanyscatours.currencyconverter.impl.CurrencyConverterImpl" />
-        <service name="CurrencyConverter">
-            <interface.java interface="com.tuscanyscatours.currencyconverter.CurrencyConverter" />
-            <binding.ws />
-        </service>
-    </component>
-</composite>
diff --git a/sandbox/travelsample/contributions/currency/src/main/resources/currency-converter.composite b/sandbox/travelsample/contributions/currency/src/main/resources/currency-converter.composite
new file mode 100644
index 0000000000..41d0d325d4
--- /dev/null
+++ b/sandbox/travelsample/contributions/currency/src/main/resources/currency-converter.composite
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+    targetNamespace="http://tuscanyscatours.com/"
+    name="currencyconverter">
+
+    <component name="CurrencyConverter">
+        <implementation.java class="com.tuscanyscatours.currencyconverter.impl.CurrencyConverterImpl" />
+        <service name="CurrencyConverter"/>
+    </component>
+</composite>
diff --git a/sandbox/travelsample/contributions/currency/src/main/resources/currencyconverter.composite b/sandbox/travelsample/contributions/currency/src/main/resources/currencyconverter.composite
deleted file mode 100644
index 41d0d325d4..0000000000
--- a/sandbox/travelsample/contributions/currency/src/main/resources/currencyconverter.composite
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-    targetNamespace="http://tuscanyscatours.com/"
-    name="currencyconverter">
-
-    <component name="CurrencyConverter">
-        <implementation.java class="com.tuscanyscatours.currencyconverter.impl.CurrencyConverterImpl" />
-        <service name="CurrencyConverter"/>
-    </component>
-</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");
-- 
cgit v1.2.3