Merge revision r945281 from 1.0 release branch

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

7 files changed, 2 insertions, 280 deletions

diff --git a/sca-java-1.x/trunk/tutorials/travelsample/binaries/src/main/resources/build-launchers.xml b/sca-java-1.x/trunk/tutorials/travelsample/binaries/src/main/resources/build-launchers.xml
index e0f4ebd4c4..31e14457c7 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/binaries/src/main/resources/build-launchers.xml
+++ b/sca-java-1.x/trunk/tutorials/travelsample/binaries/src/main/resources/build-launchers.xml
@@ -257,7 +257,7 @@
     <target name="run-payment-python">

         <java classname="scatours.payment.PaymentLauncher" fork="true" failonerror="true">

             <classpath>

-                <pathelement location="scatours-launcher-payment-groovy.jar"/>

+                <pathelement location="scatours-launcher-payment-python.jar"/>

                 <path refid="scatours.tuscany-manifest"/>

             </classpath>

         </java>

diff --git a/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-groovy/build.xml b/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-groovy/build.xml
index 3a86952fc1..bc16f99976 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-groovy/build.xml
+++ b/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-groovy/build.xml
@@ -22,11 +22,6 @@
 

     <target name="wsdljava">

         <antcall target="wsimport">

-            <param name="wsdlfile" value="CreditCardPayment.wsdl"/>

-            <param name="javaclass" value="com/tuscanyscatours/payment/creditcard/CreditCardPayment.class"/>

-            <param name="package" value="com.tuscanyscatours.payment.creditcard"/>

-        </antcall>

-        <antcall target="wsimport">

             <param name="wsdlfile" value="EmailGateway.wsdl"/>

             <param name="javaclass" value="com/tuscanyscatours/emailgateway/EmailGateway.class"/>

             <param name="package" value="com.tuscanyscatours.emailgateway"/>

diff --git a/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-groovy/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-groovy/pom.xml
index f4a51f4675..6d95ed2ca6 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-groovy/pom.xml
+++ b/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-groovy/pom.xml
@@ -119,24 +119,6 @@
                     </configuration>
                 </execution> 
                 <execution>
-                    <id>payment.creditcard</id>
-                    <phase>process-sources</phase>
-                    <goals>
-                        <goal>wsimport</goal>
-                    </goals>
-                    <configuration>
-                        <packageName>com.tuscanyscatours.payment.creditcard</packageName>
-                        <wsdlDirectory>${basedir}/src/main/resources</wsdlDirectory>
-                        <wsdlFiles>
-                            <wsdlFile>CreditCardPayment.wsdl</wsdlFile>
-                        </wsdlFiles>
-                        <sourceDestDir>${project.build.directory}/jaxws-source</sourceDestDir>
-                        <staleFile>${project.build.directory}/jaxws-source/stale/creditcard.stale</staleFile>
-                        <verbose>false</verbose>
-                        <xnocompile>true</xnocompile>
-                    </configuration>
-                </execution> 
-                <execution>
                     <id>emailgateway</id>
                     <phase>process-sources</phase>
                     <goals>
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-groovy/src/main/resources/CreditCardPayment.wsdl b/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-groovy/src/main/resources/CreditCardPayment.wsdl
deleted file mode 100644
index 1813c77436..0000000000
--- a/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-groovy/src/main/resources/CreditCardPayment.wsdl
+++ /dev/null
@@ -1,116 +0,0 @@
-<?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.    
--->
-<wsdl:definitions name="CreditCardPayment" 
-                  targetNamespace="http://www.tuscanyscatours.com/CreditCardPayment/"
-                  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 
-                  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.tuscanyscatours.com/CreditCardPayment/"
-                    xmlns:tns="http://www.tuscanyscatours.com/CreditCardPayment/">
-            
-            <xsd:element name="authorize" type="tns:AuthorizeType"/>
-            <xsd:complexType name="AuthorizeType">
-                <xsd:sequence>
-                    <xsd:element name="CreditCard" type="tns:CreditCardDetailsType"></xsd:element>
-                    <xsd:element name="Amount" type="xsd:float"></xsd:element>
-                </xsd:sequence>
-            </xsd:complexType>
-
-            <xsd:element name="authorizeResponse" type="tns:AuthorizeResponseType"/>
-            <xsd:complexType name="AuthorizeResponseType">
-                <xsd:sequence>
-                    <xsd:element name="Status" type="xsd:string"></xsd:element>
-                </xsd:sequence>
-            </xsd:complexType>
-
-            <xsd:complexType name="CreditCardDetailsType">
-                <xsd:sequence>
-                    <xsd:element name="CreditCardType" type="tns:CreditCardTypeType" minOccurs="0" />
-                    <xsd:element name="CreditCardNumber" type="xsd:string" minOccurs="0" />
-                    <xsd:element name="ExpMonth" type="xsd:int" minOccurs="0" />
-                    <xsd:element name="ExpYear" type="xsd:int" minOccurs="0" />
-                    <xsd:element name="CardOwner" type="tns:PayerType" minOccurs="0" />
-                    <xsd:element name="CVV2" type="xsd:string" minOccurs="0" />
-                </xsd:sequence>
-            </xsd:complexType>
-            <xsd:simpleType name="CreditCardTypeType">
-                <xsd:restriction base="xsd:token">
-                    <xsd:enumeration value="Visa" />
-                    <xsd:enumeration value="MasterCard" />
-                    <xsd:enumeration value="Discover" />
-                    <xsd:enumeration value="Amex" />
-                </xsd:restriction>
-            </xsd:simpleType>
-            <xsd:complexType name="PayerType">
-                <xsd:sequence>
-                    <xsd:element name="Name" type="xsd:string" />
-                    <xsd:element name="Address" type="tns:AddressType" />
-                </xsd:sequence>
-            </xsd:complexType>
-            <xsd:complexType name="AddressType">
-                <xsd:sequence>
-                    <xsd:element name="Street" type="xsd:string" />
-                    <xsd:element name="City" type="xsd:string" />
-                    <xsd:element name="State" type="xsd:string" />
-                    <xsd:element name="ZipCode" type="xsd:string" />
-                    <xsd:element name="HomePhone" type="xsd:string" />
-                </xsd:sequence>
-            </xsd:complexType>
-        </xsd:schema>
-    </wsdl:types>
-    <wsdl:message name="AuthorizeRequest">
-        <wsdl:part name="parameters" element="tns:authorize"></wsdl:part>
-    </wsdl:message>
-    <wsdl:message name="AuthorizeResponse">
-        <wsdl:part name="parameters" element="tns:authorizeResponse"></wsdl:part>
-    </wsdl:message>
-    <wsdl:portType name="CreditCardPayment">
-        <wsdl:operation name="authorize">
-            <wsdl:input message="tns:AuthorizeRequest"></wsdl:input>
-            <wsdl:output message="tns:AuthorizeResponse"></wsdl:output>
-        </wsdl:operation>
-    </wsdl:portType>
-    <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.tuscanyscatours.com/CreditCardPayment/authorize" />
-            <wsdl:input>
-                <soap:body use="literal" />
-            </wsdl:input>
-            <wsdl:output>
-                <soap:body use="literal" />
-            </wsdl:output>
-        </wsdl:operation>
-    </wsdl:binding>
-    <wsdl:service name="CreditCardPaymentService">
-        <wsdl:port name="CreditCardPaymentPort" binding="tns:CreditCardPaymentBinding">
-            <soap:address location="http://localhost:8080/CreditCardPayment" />
-        </wsdl:port>
-    </wsdl:service>
-    
-    <plnk:partnerLinkType name="CreditCardPaymentLinkType">
-        <plnk:role name="forward" portType="tns:CreditCardPayment"/>
-    </plnk:partnerLinkType>    
-</wsdl:definitions>
\ No newline at end of file
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-python/build.xml b/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-python/build.xml
index 1c29162343..d3dd869069 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-python/build.xml
+++ b/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-python/build.xml
@@ -17,16 +17,11 @@
  * under the License.
 -->
 
-<project name="scatours-contribution-payment-pythin" default="compile">
+<project name="scatours-contribution-payment-python" default="compile">
     <import file="../../antdefs.xml"/>
 
     <target name="wsdljava">
         <antcall target="wsimport">
-            <param name="wsdlfile" value="CreditCardPayment.wsdl"/>
-            <param name="javaclass" value="com/tuscanyscatours/payment/creditcard/CreditCardPayment.class"/>
-            <param name="package" value="com.tuscanyscatours.payment.creditcard"/>
-        </antcall>
-        <antcall target="wsimport">
             <param name="wsdlfile" value="EmailGateway.wsdl"/>
             <param name="javaclass" value="com/tuscanyscatours/emailgateway/EmailGateway.class"/>
             <param name="package" value="com.tuscanyscatours.emailgateway"/>
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-python/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-python/pom.xml
index 2eba181055..ca83354ce2 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-python/pom.xml
+++ b/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-python/pom.xml
@@ -119,24 +119,6 @@
                     </configuration>
                 </execution> 
                 <execution>
-                    <id>payment.creditcard</id>
-                    <phase>process-sources</phase>
-                    <goals>
-                        <goal>wsimport</goal>
-                    </goals>
-                    <configuration>
-                        <packageName>com.tuscanyscatours.payment.creditcard</packageName>
-                        <wsdlDirectory>${basedir}/src/main/resources</wsdlDirectory>
-                        <wsdlFiles>
-                            <wsdlFile>CreditCardPayment.wsdl</wsdlFile>
-                        </wsdlFiles>
-                        <sourceDestDir>${project.build.directory}/jaxws-source</sourceDestDir>
-                        <staleFile>${project.build.directory}/jaxws-source/stale/creditcard.stale</staleFile>
-                        <verbose>false</verbose>
-                        <xnocompile>true</xnocompile>
-                    </configuration>
-                </execution> 
-                <execution>
                     <id>emailgateway</id>
                     <phase>process-sources</phase>
                     <goals>
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-python/src/main/resources/CreditCardPayment.wsdl b/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-python/src/main/resources/CreditCardPayment.wsdl
deleted file mode 100644
index 1813c77436..0000000000
--- a/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-python/src/main/resources/CreditCardPayment.wsdl
+++ /dev/null
@@ -1,116 +0,0 @@
-<?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.    
--->
-<wsdl:definitions name="CreditCardPayment" 
-                  targetNamespace="http://www.tuscanyscatours.com/CreditCardPayment/"
-                  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 
-                  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.tuscanyscatours.com/CreditCardPayment/"
-                    xmlns:tns="http://www.tuscanyscatours.com/CreditCardPayment/">
-            
-            <xsd:element name="authorize" type="tns:AuthorizeType"/>
-            <xsd:complexType name="AuthorizeType">
-                <xsd:sequence>
-                    <xsd:element name="CreditCard" type="tns:CreditCardDetailsType"></xsd:element>
-                    <xsd:element name="Amount" type="xsd:float"></xsd:element>
-                </xsd:sequence>
-            </xsd:complexType>
-
-            <xsd:element name="authorizeResponse" type="tns:AuthorizeResponseType"/>
-            <xsd:complexType name="AuthorizeResponseType">
-                <xsd:sequence>
-                    <xsd:element name="Status" type="xsd:string"></xsd:element>
-                </xsd:sequence>
-            </xsd:complexType>
-
-            <xsd:complexType name="CreditCardDetailsType">
-                <xsd:sequence>
-                    <xsd:element name="CreditCardType" type="tns:CreditCardTypeType" minOccurs="0" />
-                    <xsd:element name="CreditCardNumber" type="xsd:string" minOccurs="0" />
-                    <xsd:element name="ExpMonth" type="xsd:int" minOccurs="0" />
-                    <xsd:element name="ExpYear" type="xsd:int" minOccurs="0" />
-                    <xsd:element name="CardOwner" type="tns:PayerType" minOccurs="0" />
-                    <xsd:element name="CVV2" type="xsd:string" minOccurs="0" />
-                </xsd:sequence>
-            </xsd:complexType>
-            <xsd:simpleType name="CreditCardTypeType">
-                <xsd:restriction base="xsd:token">
-                    <xsd:enumeration value="Visa" />
-                    <xsd:enumeration value="MasterCard" />
-                    <xsd:enumeration value="Discover" />
-                    <xsd:enumeration value="Amex" />
-                </xsd:restriction>
-            </xsd:simpleType>
-            <xsd:complexType name="PayerType">
-                <xsd:sequence>
-                    <xsd:element name="Name" type="xsd:string" />
-                    <xsd:element name="Address" type="tns:AddressType" />
-                </xsd:sequence>
-            </xsd:complexType>
-            <xsd:complexType name="AddressType">
-                <xsd:sequence>
-                    <xsd:element name="Street" type="xsd:string" />
-                    <xsd:element name="City" type="xsd:string" />
-                    <xsd:element name="State" type="xsd:string" />
-                    <xsd:element name="ZipCode" type="xsd:string" />
-                    <xsd:element name="HomePhone" type="xsd:string" />
-                </xsd:sequence>
-            </xsd:complexType>
-        </xsd:schema>
-    </wsdl:types>
-    <wsdl:message name="AuthorizeRequest">
-        <wsdl:part name="parameters" element="tns:authorize"></wsdl:part>
-    </wsdl:message>
-    <wsdl:message name="AuthorizeResponse">
-        <wsdl:part name="parameters" element="tns:authorizeResponse"></wsdl:part>
-    </wsdl:message>
-    <wsdl:portType name="CreditCardPayment">
-        <wsdl:operation name="authorize">
-            <wsdl:input message="tns:AuthorizeRequest"></wsdl:input>
-            <wsdl:output message="tns:AuthorizeResponse"></wsdl:output>
-        </wsdl:operation>
-    </wsdl:portType>
-    <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.tuscanyscatours.com/CreditCardPayment/authorize" />
-            <wsdl:input>
-                <soap:body use="literal" />
-            </wsdl:input>
-            <wsdl:output>
-                <soap:body use="literal" />
-            </wsdl:output>
-        </wsdl:operation>
-    </wsdl:binding>
-    <wsdl:service name="CreditCardPaymentService">
-        <wsdl:port name="CreditCardPaymentPort" binding="tns:CreditCardPaymentBinding">
-            <soap:address location="http://localhost:8080/CreditCardPayment" />
-        </wsdl:port>
-    </wsdl:service>
-    
-    <plnk:partnerLinkType name="CreditCardPaymentLinkType">
-        <plnk:role name="forward" portType="tns:CreditCardPayment"/>
-    </plnk:partnerLinkType>    
-</wsdl:definitions>
\ No newline at end of file