2 files changed, 53 insertions, 58 deletions
diff --git a/sandbox/travelsample/contributions/payment-bpel-contribution/src/test/java/scatours/payment/PaymentTestCase.java b/sandbox/travelsample/contributions/payment-bpel/src/test/java/scatours/payment/PaymentTestCase.java
index 1f6f5b69fa..76ef390d62 100644
--- a/sandbox/travelsample/contributions/payment-bpel-contribution/src/test/java/scatours/payment/PaymentTestCase.java
+++ b/sandbox/travelsample/contributions/payment-bpel/src/test/java/scatours/payment/PaymentTestCase.java
@@ -19,6 +19,7 @@
 
 package scatours.payment;
 
+import com.tuscanyscatours.payment.Payment;
 import org.apache.tuscany.sca.node.SCAClient;
 import org.apache.tuscany.sca.node.SCAContribution;
 import org.apache.tuscany.sca.node.SCANode;
@@ -37,28 +38,22 @@ public class PaymentTestCase {
 
     @BeforeClass
     public static void setUpBeforeClass() throws Exception {  
-        try {
-            creditCardNode = SCANodeFactory.newInstance().createSCANode("creditcard.composite",
-                    new SCAContribution("creditcard", "../creditcard-payment-jaxb/target/classes"),
-                    new SCAContribution("creditcard-test", "../creditcard-payment-jaxb/target/test-classes"));
-                
-            creditCardNode.start();
-                
-            emailGatewayNode = SCANodeFactory.newInstance().createSCANode("emailgateway.composite",
-                    new SCAContribution("emailgateway", "../emailgateway-contribution/target/classes"),
-                    new SCAContribution("emailgateway-test", "../emailgateway-contribution/target/test-classes"));
-                
-            emailGatewayNode.start();            
-   
-            paymentNode = SCANodeFactory.newInstance().createSCANode(null, 
-                    new SCAContribution("payment-bpel", "./target/classes"),
-                    new SCAContribution("payment-bpel-test", "./target/test-classes"));
-    
+        creditCardNode = SCANodeFactory.newInstance().createSCANode("creditcard.composite",
+                new SCAContribution("creditcard", "../creditcard-payment-jaxb/target/classes"));
+            
+        creditCardNode.start();
+            
+        emailGatewayNode = SCANodeFactory.newInstance().createSCANode("emailgateway.composite",
+                new SCAContribution("emailgateway", "../emailgateway/target/classes"),
+                new SCAContribution("emailgateway-test", "../emailgateway/target/test-classes"));
+            
+        emailGatewayNode.start();            
+
+        paymentNode = SCANodeFactory.newInstance().createSCANode(null, 
+                new SCAContribution("payment-bpel", "./target/classes"),
+                new SCAContribution("payment-bpel-test", "./target/test-classes"));
 
-            paymentNode.start();
-        } catch (Exception ex) {
-            ex.printStackTrace();
-        }
+        paymentNode.start();
     }
     
     @Test
diff --git a/sandbox/travelsample/contributions/payment-bpel-contribution/src/test/java/scatours/payment/client/PaymentClientImpl.java b/sandbox/travelsample/contributions/payment-bpel/src/test/java/scatours/payment/client/impl/PaymentClientImpl.java
index eaa7498e84..a38ba51ac5 100644
--- a/sandbox/travelsample/contributions/payment-bpel-contribution/src/test/java/scatours/payment/client/PaymentClientImpl.java
+++ b/sandbox/travelsample/contributions/payment-bpel/src/test/java/scatours/payment/client/impl/PaymentClientImpl.java
@@ -1,37 +1,37 @@
-/*
- * 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.payment.client;
-
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
-
-import scatours.payment.Payment;
-
-@Service(Payment.class)
-public class PaymentClientImpl implements Payment {
-    @Reference
-    protected Payment payment;
-
-    public String makePaymentMember(String customerId, float amount) {
-        // Delegate the external web service
-        return payment.makePaymentMember(customerId, amount);
-    }
-
-}
+/*
+ * 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.payment.client.impl;
+
+import org.osoa.sca.annotations.Reference;
+import org.osoa.sca.annotations.Service;
+
+import com.tuscanyscatours.payment.Payment;
+
+@Service(Payment.class)
+public class PaymentClientImpl implements Payment {
+    @Reference
+    protected Payment payment;
+
+    public String makePaymentMember(String customerId, float amount) {
+        // Delegate the external web service
+        return payment.makePaymentMember(customerId, amount);
+    }
+
+}