Apply new naming convention to contributions/payment-spring

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

6 files changed, 28 insertions, 31 deletions

diff --git a/sandbox/travelsample/contributions/payment-spring-contribution/src/main/resources/CreditCardPayment.wsdl b/sandbox/travelsample/contributions/payment-spring/src/main/resources/CreditCardPayment.wsdl
index 8224cd126f..8224cd126f 100644
--- a/sandbox/travelsample/contributions/payment-spring-contribution/src/main/resources/CreditCardPayment.wsdl
+++ b/sandbox/travelsample/contributions/payment-spring/src/main/resources/CreditCardPayment.wsdl
diff --git a/sandbox/travelsample/contributions/payment-spring-contribution/src/main/resources/EmailGateway.wsdl b/sandbox/travelsample/contributions/payment-spring/src/main/resources/EmailGateway.wsdl
index 44867f794c..44867f794c 100644
--- a/sandbox/travelsample/contributions/payment-spring-contribution/src/main/resources/EmailGateway.wsdl
+++ b/sandbox/travelsample/contributions/payment-spring/src/main/resources/EmailGateway.wsdl
diff --git a/sandbox/travelsample/contributions/payment-spring-contribution/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contributions/payment-spring/src/main/resources/META-INF/sca-contribution.xml
index 3f466760b0..b480cc4aa1 100644
--- a/sandbox/travelsample/contributions/payment-spring-contribution/src/main/resources/META-INF/sca-contribution.xml
+++ b/sandbox/travelsample/contributions/payment-spring/src/main/resources/META-INF/sca-contribution.xml
@@ -1,25 +1,24 @@
-<?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.    
--->
-<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
-              xmlns:scatours="http://scatours">
-   <export.java package="payment"/>
-   <export namespace="http://www.tuscanyscatours.com/Payment/"/>
-   <deployable composite="scatours:payment" />
-</contribution>
\ No newline at end of file
+<?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.    

+-->

+<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"

+              xmlns:scatours="http://tuscanyscatours.com/">

+    <export.java package="com.tuscanyscatours.payment"/>

+    <deployable composite="scatours:payment" />

+</contribution>

diff --git a/sandbox/travelsample/contributions/payment-spring-contribution/src/main/resources/Payment-context.xml b/sandbox/travelsample/contributions/payment-spring/src/main/resources/Payment-context.xml
index 976a24ce3a..c79abdb6ba 100644
--- a/sandbox/travelsample/contributions/payment-spring-contribution/src/main/resources/Payment-context.xml
+++ b/sandbox/travelsample/contributions/payment-spring/src/main/resources/Payment-context.xml
@@ -23,13 +23,13 @@
        xsi:schemaLocation="http://www.springframework.org/schema/beans 
                            http://www.springframework.org/schema/beans/spring-beans.xsd">
 
-    <bean id="Payment" class="payment.PaymentImpl">
+    <bean id="Payment" class="com.tuscanyscatours.payment.impl.PaymentImpl">
         <property name="creditCardPayment" ref="creditCardPaymentReference"/>
         <property name="emailGateway" ref="EmailGateway"/>
         <property name="transactionFee" value="0.5f"/>
     </bean>
 
-    <bean id="EmailGateway" class="scatours.emailgateway.EmailGatewayImpl">
+    <bean id="EmailGateway" class="com.tuscanyscatours.emailgateway.impl.EmailGatewayImpl">
     </bean>
   
 </beans>
diff --git a/sandbox/travelsample/contributions/payment-spring-contribution/src/main/resources/Payment.wsdl b/sandbox/travelsample/contributions/payment-spring/src/main/resources/Payment.wsdl
index e2c4062f2e..e2c4062f2e 100644
--- a/sandbox/travelsample/contributions/payment-spring-contribution/src/main/resources/Payment.wsdl
+++ b/sandbox/travelsample/contributions/payment-spring/src/main/resources/Payment.wsdl
diff --git a/sandbox/travelsample/contributions/payment-spring-contribution/src/main/resources/payment.composite b/sandbox/travelsample/contributions/payment-spring/src/main/resources/payment.composite
index f192bf9659..1e5bae2a2b 100644
--- a/sandbox/travelsample/contributions/payment-spring-contribution/src/main/resources/payment.composite
+++ b/sandbox/travelsample/contributions/payment-spring/src/main/resources/payment.composite
@@ -18,12 +18,10 @@
  * under the License.
 -->
 <composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
-           targetNamespace="http://scatours"
-           xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0"
-           xmlns:c="http://scatours"
+           targetNamespace="http://tuscanyscatours.com/"
            name="payment">
 
-     <component name="PaymentComponent">
+     <component name="Payment">
         <implementation.spring location="Payment-context.xml"/>
         <service name="Payment">
             <binding.ws uri="http://localhost:8081/Payment"/>