Fix up the BPEL payment component to run in the wider application and take advantage of the BPEL resolved fix in 1.x

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

3 files changed, 27 insertions, 8 deletions

diff --git a/sandbox/travelsample/shared-contributions/creditcard-payment-jaxb-contribution/src/main/resources/CreditCardPayment.wsdl b/sandbox/travelsample/shared-contributions/creditcard-payment-jaxb-contribution/src/main/resources/CreditCardPayment.wsdl
index c194d78982..1813c77436 100644
--- a/sandbox/travelsample/shared-contributions/creditcard-payment-jaxb-contribution/src/main/resources/CreditCardPayment.wsdl
+++ b/sandbox/travelsample/shared-contributions/creditcard-payment-jaxb-contribution/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">
@@ -95,7 +95,7 @@
     <wsdl:binding name="CreditCardPaymentBinding" type="tns:CreditCardPayment">
         <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" />
         <wsdl:operation name="authorize">
-            <soap:operation soapAction="http://www.example.org/CreditCardPayment/authorize" />
+            <soap:operation soapAction="http://www.tuscanyscatours.com/CreditCardPayment/authorize" />
             <wsdl:input>
                 <soap:body use="literal" />
             </wsdl:input>
diff --git a/sandbox/travelsample/shared-contributions/creditcard-payment-jaxb-contribution/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/shared-contributions/creditcard-payment-jaxb-contribution/src/main/resources/META-INF/sca-contribution.xml
index d22f4816ab..8faf8db4ee 100644
--- a/sandbox/travelsample/shared-contributions/creditcard-payment-jaxb-contribution/src/main/resources/META-INF/sca-contribution.xml
+++ b/sandbox/travelsample/shared-contributions/creditcard-payment-jaxb-contribution/src/main/resources/META-INF/sca-contribution.xml
@@ -19,7 +19,4 @@
 -->
 <contribution xmlns="http://www.osoa.org/xmlns/sca/1.0">
    <export.java package="payment.creditcard"/>
-   <export.java package="payment.creditcard.impl"/>
-   <export.java package="payment.creditcard.ws"/>
-   <export.java package="payment.creditcard.ws.impl"/>
 </contribution>
\ No newline at end of file
diff --git a/sandbox/travelsample/shared-contributions/creditcard-payment-jaxb-contribution/src/test/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/shared-contributions/creditcard-payment-jaxb-contribution/src/test/resources/META-INF/sca-contribution.xml
new file mode 100644
index 0000000000..666c488b6d
--- /dev/null
+++ b/sandbox/travelsample/shared-contributions/creditcard-payment-jaxb-contribution/src/test/resources/META-INF/sca-contribution.xml
@@ -0,0 +1,22 @@
+<?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">
+    <import.java package="payment.creditcard"/>
+</contribution>
\ No newline at end of file