Apply new naming convention to contributions/creditcard-payment-sdo

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

3 files changed, 13 insertions, 15 deletions

diff --git a/sandbox/travelsample/contributions/creditcard-payment-sdo-contribution/src/main/resources/CreditCardPayment.wsdl b/sandbox/travelsample/contributions/creditcard-payment-sdo/src/main/resources/CreditCardPayment.wsdl
index 3f4f09561f..d7e274aeee 100644
--- a/sandbox/travelsample/contributions/creditcard-payment-sdo-contribution/src/main/resources/CreditCardPayment.wsdl
+++ b/sandbox/travelsample/contributions/creditcard-payment-sdo/src/main/resources/CreditCardPayment.wsdl
@@ -18,17 +18,17 @@
  * under the License.    

 -->

 <wsdl:definitions name="CreditCardPayment" 

-                  targetNamespace="http://www.example.org/CreditCardPayment/"

+                  targetNamespace="http://www.tuscanyscatours.com/CreditCardPayment/"

                   xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 

-                  xmlns:tns="http://www.example.org/CreditCardPayment/" 

+                  xmlns:tns="http://www.tuscanyscatours.com/CreditCardPayment/" 

                   xmlns:xsd="http://www.w3.org/2001/XMLSchema"

                   xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"

                   xmlns:bpws="http://schemas.xmlsoap.org/ws/2004/03/business-process/"

                   xmlns:plnk="http://schemas.xmlsoap.org/ws/2004/03/partner-link/">

     <wsdl:types>

         <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" 

-                    targetNamespace="http://www.example.org/CreditCardPayment/"

-                    xmlns:tns="http://www.example.org/CreditCardPayment/">

+                    targetNamespace="http://www.tuscanyscatours.com/CreditCardPayment/"

+                    xmlns:tns="http://www.tuscanyscatours.com/CreditCardPayment/">

             

             <xsd:element name="authorize" type="tns:AuthorizeType"/>

             <xsd:complexType name="AuthorizeType">

diff --git a/sandbox/travelsample/contributions/creditcard-payment-sdo-contribution/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contributions/creditcard-payment-sdo/src/main/resources/META-INF/sca-contribution.xml
index b5238e8353..ab31664247 100644
--- a/sandbox/travelsample/contributions/creditcard-payment-sdo-contribution/src/main/resources/META-INF/sca-contribution.xml
+++ b/sandbox/travelsample/contributions/creditcard-payment-sdo/src/main/resources/META-INF/sca-contribution.xml
@@ -18,6 +18,6 @@
     * under the License.    
 -->
 <contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
-             xmlns:creditcard="http://creditcard">
-   <deployable composite="creditcard:creditcard" />
-</contribution>
\ No newline at end of file
+              xmlns:tours="http://tuscanyscatours.com/">
+    <deployable composite="tours:creditcard" />
+</contribution>
diff --git a/sandbox/travelsample/contributions/creditcard-payment-sdo-contribution/src/main/resources/creditcard.composite b/sandbox/travelsample/contributions/creditcard-payment-sdo/src/main/resources/creditcard.composite
index 047780dbaf..f5cd7c2506 100644
--- a/sandbox/travelsample/contributions/creditcard-payment-sdo-contribution/src/main/resources/creditcard.composite
+++ b/sandbox/travelsample/contributions/creditcard-payment-sdo/src/main/resources/creditcard.composite
@@ -18,18 +18,16 @@
  * under the License.    
 -->
 <composite xmlns="http://www.osoa.org/xmlns/sca/1.0" 
-           targetNamespace="http://creditcard"
-           xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0"
-           xmlns:c="http://creditcard" 
+           targetNamespace="http://tuscanyscatours.com/"
            name="creditcard">
 
-    <component name="CreditCardPaymentComponent">
-        <implementation.java class="payment.creditcard.impl.CreditCardPaymentImpl" />
+    <component name="CreditCardPayment">
+        <implementation.java class="com.tuscanyscatours.payment.creditcard.impl.CreditCardPaymentImpl" />
         <service name="CreditCardPayment">
-            <interface.wsdl interface="http://www.example.org/CreditCardPayment/#wsdl.interface(CreditCardPayment)"/>
+            <interface.wsdl interface="http://www.tuscanyscatours.com/CreditCardPayment/#wsdl.interface(CreditCardPayment)"/>
             <binding.ws uri="http://localhost:8082/CreditCardPayment" />
-            <binding.sca/>
+            <binding.sca />
         </service>
     </component>
     
-</composite>
\ No newline at end of file
+</composite>