Merge revision r945295 from 1.0 release branch

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

3 files changed, 114 insertions, 0 deletions

diff --git a/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-python/build.xml b/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-python/build.xml
index 317469da2b..3129ae70c7 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-python/build.xml
+++ b/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-python/build.xml
@@ -25,6 +25,12 @@
     <property name="package-path" value="../util/scatours-util-launcher-common.jar"/>
 
     <target name="wsdljava">
+        <!-- Include the Java classes for EmailGateway in this jar file as a workaround for TUSCANY-3557. -->
+        <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"/>
+        </antcall>
         <antcall target="wsimport">
             <param name="wsdlfile" value="Payment.wsdl"/>
             <param name="javaclass" value="com/tuscanyscatours/payment/Payment.class"/>
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-python/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-python/pom.xml
index 28e7b11501..4940871388 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-python/pom.xml
+++ b/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-python/pom.xml
@@ -142,6 +142,25 @@
                             <xnocompile>true</xnocompile>
                         </configuration>
                     </execution>
+                    <!-- Include the Java classes for EmailGateway in this jar file as a workaround for TUSCANY-3557. -->
+                    <execution>
+                        <id>emailgateway</id>
+                        <phase>process-sources</phase>
+                        <goals>
+                            <goal>wsimport</goal>
+                        </goals>
+                        <configuration>
+                            <packageName>com.tuscanyscatours.emailgateway</packageName>
+                            <wsdlDirectory>${basedir}/src/main/resources</wsdlDirectory>
+                            <wsdlFiles>
+                                <wsdlFile>EmailGateway.wsdl</wsdlFile>
+                            </wsdlFiles>
+                            <sourceDestDir>${project.build.directory}/jaxws-source</sourceDestDir>
+                            <staleFile>${project.build.directory}/jaxws-source/stale/emailgateway.stale</staleFile>
+                            <verbose>false</verbose>
+                            <xnocompile>true</xnocompile>
+                        </configuration>
+                    </execution> 
                 </executions>
             </plugin>
             <plugin>
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-python/src/main/resources/EmailGateway.wsdl b/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-python/src/main/resources/EmailGateway.wsdl
new file mode 100644
index 0000000000..af296f4a1f
--- /dev/null
+++ b/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-python/src/main/resources/EmailGateway.wsdl
@@ -0,0 +1,89 @@
+<?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="EmailGateway" 

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

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

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

+                  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/EmailGateway/"

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

+                    

+            <xsd:element name="sendEmail" type="tns:SendEmailType"/>

+            <xsd:complexType name="SendEmailType">

+                <xsd:sequence>

+                    <xsd:element name="Email" type="tns:EmailType"></xsd:element>

+                </xsd:sequence>

+            </xsd:complexType>

+

+            <xsd:element name="sendEmailResponse" type="tns:SendEmailResponseType"/>

+            <xsd:complexType name="SendEmailResponseType">

+                <xsd:sequence>

+                    <xsd:element name="Status" type="xsd:string"></xsd:element>

+                </xsd:sequence>

+            </xsd:complexType>

+

+            <xsd:complexType name="EmailType">

+                <xsd:sequence>

+                    <xsd:element name="To" type="xsd:string"/>

+                    <xsd:element name="Title" type="xsd:string"/>

+                    <xsd:element name="Body" type="xsd:string"/>

+                </xsd:sequence>

+            </xsd:complexType>

+        </xsd:schema>

+    </wsdl:types>

+    <wsdl:message name="SendEmailRequest">

+        <wsdl:part name="parameters" element="tns:sendEmail"></wsdl:part>

+    </wsdl:message>

+    <wsdl:message name="SendEmailResponse">

+        <wsdl:part name="parameters" element="tns:sendEmailResponse"></wsdl:part>

+    </wsdl:message>

+    <wsdl:portType name="EmailGateway">

+        <wsdl:operation name="sendEmail">

+            <wsdl:input message="tns:SendEmailRequest"></wsdl:input>

+            <wsdl:output message="tns:SendEmailResponse"></wsdl:output>

+        </wsdl:operation>

+    </wsdl:portType>

+    <wsdl:binding name="EmailGatwayBinding" type="tns:EmailGateway">

+        <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" />

+        <wsdl:operation name="sendEmail">

+            <soap:operation soapAction="http://www.tuscanyscatours.com/EmailGateway/sendEmail" />

+            <wsdl:input>

+                <soap:body use="literal" />

+            </wsdl:input>

+            <wsdl:output>

+                <soap:body use="literal" />

+            </wsdl:output>

+        </wsdl:operation>

+    </wsdl:binding>

+    <wsdl:service name="EmailGatewayService">

+        <wsdl:port name="EmailGatewayPort" binding="tns:EmailGatwayBinding">

+            <soap:address location="http://localhost:8082/EmailGateway" />

+        </wsdl:port>

+    </wsdl:service>

+    

+    <plnk:partnerLinkType name="EmailGatewayLinkType">

+        <plnk:role name="forward" portType="tns:EmailGateway"/>

+    </plnk:partnerLinkType>

+</wsdl:definitions>
\ No newline at end of file