Apply new naming convention to the payment-bpel, payment-groovy and emailgateway contributions

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

12 files changed, 60 insertions, 66 deletions

diff --git a/sandbox/travelsample/contributions/payment-bpel-contribution/log4j.properties b/sandbox/travelsample/contributions/payment-bpel/log4j.properties
index 7ed0bcaf77..7ed0bcaf77 100644
--- a/sandbox/travelsample/contributions/payment-bpel-contribution/log4j.properties
+++ b/sandbox/travelsample/contributions/payment-bpel/log4j.properties
diff --git a/sandbox/travelsample/contributions/payment-bpel-contribution/pom.xml b/sandbox/travelsample/contributions/payment-bpel/pom.xml
index ca27737521..41cf6fc0b0 100644
--- a/sandbox/travelsample/contributions/payment-bpel-contribution/pom.xml
+++ b/sandbox/travelsample/contributions/payment-bpel/pom.xml
@@ -26,7 +26,7 @@
         <!--relativePath>../../pom.xml</relativePath-->
     </parent>
     <version>1.0-SNAPSHOT</version>
-    <artifactId>scatours-payment-bpel-contribution</artifactId>
+    <artifactId>scatours-contribution-payment-bpel</artifactId>
     <name>Apache Tuscany SCA Tours Payment BPEL Contribution</name>
 
     <dependencies>
@@ -127,7 +127,7 @@
                         <goal>wsimport</goal>
                     </goals>
                     <configuration>
-                        <packageName>scatours.payment</packageName>
+                        <packageName>com.tuscanyscatours.payment</packageName>
                         <wsdlDirectory>${basedir}/src/main/resources
                         </wsdlDirectory>
                         <wsdlFiles>
diff --git a/sandbox/travelsample/contributions/payment-bpel-contribution/src/main/resources/CreditCardPayment.wsdl b/sandbox/travelsample/contributions/payment-bpel/src/main/resources/CreditCardPayment.wsdl
index 22ef6de317..22ef6de317 100644
--- a/sandbox/travelsample/contributions/payment-bpel-contribution/src/main/resources/CreditCardPayment.wsdl
+++ b/sandbox/travelsample/contributions/payment-bpel/src/main/resources/CreditCardPayment.wsdl
diff --git a/sandbox/travelsample/contributions/payment-bpel-contribution/src/main/resources/EmailGateway.wsdl b/sandbox/travelsample/contributions/payment-bpel/src/main/resources/EmailGateway.wsdl
index a097d9b7e4..a097d9b7e4 100644
--- a/sandbox/travelsample/contributions/payment-bpel-contribution/src/main/resources/EmailGateway.wsdl
+++ b/sandbox/travelsample/contributions/payment-bpel/src/main/resources/EmailGateway.wsdl
diff --git a/sandbox/travelsample/contributions/payment-bpel-contribution/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contributions/payment-bpel/src/main/resources/META-INF/sca-contribution.xml
index b458868b09..b458868b09 100644
--- a/sandbox/travelsample/contributions/payment-bpel-contribution/src/main/resources/META-INF/sca-contribution.xml
+++ b/sandbox/travelsample/contributions/payment-bpel/src/main/resources/META-INF/sca-contribution.xml
diff --git a/sandbox/travelsample/contributions/payment-bpel-contribution/src/main/resources/Payment.wsdl b/sandbox/travelsample/contributions/payment-bpel/src/main/resources/Payment.wsdl
index e2c4062f2e..e2c4062f2e 100644
--- a/sandbox/travelsample/contributions/payment-bpel-contribution/src/main/resources/Payment.wsdl
+++ b/sandbox/travelsample/contributions/payment-bpel/src/main/resources/Payment.wsdl
diff --git a/sandbox/travelsample/contributions/payment-bpel-contribution/src/main/resources/payment.bpel b/sandbox/travelsample/contributions/payment-bpel/src/main/resources/payment.bpel
index 8f11d76888..8f11d76888 100644
--- a/sandbox/travelsample/contributions/payment-bpel-contribution/src/main/resources/payment.bpel
+++ b/sandbox/travelsample/contributions/payment-bpel/src/main/resources/payment.bpel
diff --git a/sandbox/travelsample/contributions/payment-bpel-contribution/src/main/resources/payment.composite b/sandbox/travelsample/contributions/payment-bpel/src/main/resources/payment.composite
index 5c337799a7..5c337799a7 100644
--- a/sandbox/travelsample/contributions/payment-bpel-contribution/src/main/resources/payment.composite
+++ b/sandbox/travelsample/contributions/payment-bpel/src/main/resources/payment.composite
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);

+    }

+

+}

diff --git a/sandbox/travelsample/contributions/payment-bpel-contribution/src/test/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contributions/payment-bpel/src/test/resources/META-INF/sca-contribution.xml
index 86dd694fa9..fcfc2d7c61 100644
--- a/sandbox/travelsample/contributions/payment-bpel-contribution/src/test/resources/META-INF/sca-contribution.xml
+++ b/sandbox/travelsample/contributions/payment-bpel/src/test/resources/META-INF/sca-contribution.xml
@@ -18,8 +18,7 @@
     * under the License.    
 -->
 <contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
-              xmlns:pp="http://www.tuscanyscatours.com/Payment" >
-   <import namespace="http://www.tuscanyscatours.com/Payment"/>
-   <import namespace="http://www.tuscanyscatours.com/Payment/"/>
-   <deployable composite="pp:paymentClient" />
-</contribution>
\ No newline at end of file
+              xmlns:pp="http://www.tuscanyscatours.com/Payment">
+    <import.java package="com.tuscanyscatours.payment" />
+    <deployable composite="pp:paymentClient" />
+</contribution>
diff --git a/sandbox/travelsample/contributions/payment-bpel-contribution/src/test/resources/payment-client.composite b/sandbox/travelsample/contributions/payment-bpel/src/test/resources/payment-client.composite
index 75001d947b..a5110aacff 100644
--- a/sandbox/travelsample/contributions/payment-bpel-contribution/src/test/resources/payment-client.composite
+++ b/sandbox/travelsample/contributions/payment-bpel/src/test/resources/payment-client.composite
@@ -24,7 +24,7 @@
            name="paymentClient">
            
     <component name="PaymentClient">
-        <implementation.java class="scatours.payment.client.PaymentClientImpl" />
+        <implementation.java class="scatours.payment.client.impl.PaymentClientImpl" />
         <reference name="payment">
             <binding.ws uri="http://localhost:8080/Payment" />
         </reference>