Fix naming inconsistencies

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@815338 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 45 insertions, 58 deletions

diff --git a/sandbox/travelsample/launchers/databinding-launcher/src/main/java/scatours/DatabindingLauncher.java b/sandbox/travelsample/launchers/databinding-launcher/src/main/java/scatours/DatabindingLauncher.java
new file mode 100644
index 0000000000..b88149c183
--- /dev/null
+++ b/sandbox/travelsample/launchers/databinding-launcher/src/main/java/scatours/DatabindingLauncher.java
@@ -0,0 +1,45 @@
+/*
+ * 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.    
+ */
+
+package scatours;
+
+import org.apache.tuscany.sca.node.SCAClient;
+import org.apache.tuscany.sca.node.SCAContribution;
+import org.apache.tuscany.sca.node.SCANode;
+import org.apache.tuscany.sca.node.SCANodeFactory;
+
+public class DatabindingLauncher {
+    public static void main(String[] args) throws Exception {
+        SCANode node1 = SCANodeFactory.newInstance().createSCANode(null, 
+                new SCAContribution("paymentjava", "../../contributions/payment-java/target/classes"),
+                new SCAContribution("client", "../../contributions/databinding-client-contribution/target/classes"));
+        
+        SCANode node2 = SCANodeFactory.newInstance().createSCANode(null, 
+                new SCAContribution("creditcardpaymentsdo", "../../contributions/creditcard-payment-sdo/target/classes"));
+        
+        node1.start();
+        node2.start();
+
+        Runnable runner = ((SCAClient)node1).getService(Runnable.class, "TestClient/Runnable");
+        runner.run();
+        
+        node1.stop();
+        node2.stop();
+    }
+}
diff --git a/sandbox/travelsample/launchers/databinding-launcher/src/main/java/scatours/LaunchDatabindingNode.java b/sandbox/travelsample/launchers/databinding-launcher/src/main/java/scatours/LaunchDatabindingNode.java
deleted file mode 100644
index b910e90a2d..0000000000
--- a/sandbox/travelsample/launchers/databinding-launcher/src/main/java/scatours/LaunchDatabindingNode.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * 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.    
- */
-
-package scatours;
-
-import java.io.IOException;
-
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
-
-public class LaunchDatabindingNode {
-    public static void main(String[] args) throws Exception {
-    	LaunchDatabindingNode.launchFromFileSystemDir();
-    }
-    
-    // OK for development but you must launch the node from this module 
-    public static void launchFromFileSystemDir(){
-        try {
-            SCANode node1 = SCANodeFactory.newInstance().createSCANode(null, 
-                    new SCAContribution("paymentjava", "../../contributions/payment-java-contribution/target/classes"),
-                    new SCAContribution("client", "../../contributions/databinding-client-contribution/target/classes"));
-            
-            SCANode node2 = SCANodeFactory.newInstance().createSCANode(null, 
-                    new SCAContribution("creditcardpaymentjaxb", "../../contributions/creditcard-payment-sdo-contribution/target/classes"));
-            
-
-            node1.start();
-            node2.start();
-
-            Runnable runner = ((SCAClient)node1).getService(Runnable.class, "TestClient/Runnable");
-            runner.run();
-            
-            node1.stop();
-            node2.stop();
-            
-        } catch (Throwable th) {
-            th.printStackTrace();
-        }
-    }
-}