Merge revision r944832 from 1.0 release branch

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

9 files changed, 136 insertions, 332 deletions

diff --git a/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-java-callback/build.xml b/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-java-callback/build.xml
index 725a92e516..4f41161af5 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-java-callback/build.xml
+++ b/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-java-callback/build.xml
@@ -23,6 +23,14 @@
         <pathelement path="../../util/launcher-common/target/scatours-util-launcher-common.jar"/>
     </path>
 
+    <target name="wsdljava">
+        <antcall target="wsimport">
+            <param name="wsdlfile" value="Payment.wsdl"/>
+            <param name="javaclass" value="com/tuscanyscatours/payment/Payment.class"/>
+            <param name="package" value="com.tuscanyscatours.payment"/>
+        </antcall>
+    </target>
+
     <target name="run">
         <java classname="scatours.payment.PaymentLauncher" fork="true" failonerror="true">
             <classpath>
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-java-callback/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-java-callback/pom.xml
index 70f97ed9b6..d7888f441b 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-java-callback/pom.xml
+++ b/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-java-callback/pom.xml
@@ -91,9 +91,53 @@
     </dependencies>
     
     <build>
-       <finalName>${artifactId}</finalName>
+        <finalName>${artifactId}</finalName>
         <plugins>
             <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <version>1.0</version>
+                <executions>
+                    <execution>
+                        <id>add-source</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>add-source</goal>
+                        </goals>
+                        <configuration>
+                            <sources>
+                                <source>target/jaxws-source</source>
+                            </sources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>jaxws-maven-plugin</artifactId>
+                <version>1.12</version>
+                <executions>
+                    <execution>
+                        <id>wsimport</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>wsimport</goal>
+                        </goals>
+                        <configuration>
+                            <packageName>com.tuscanyscatours.payment</packageName>
+                            <wsdlDirectory>${basedir}/src/main/resources</wsdlDirectory>
+                            <wsdlFiles>
+                                <wsdlFile>Payment.wsdl</wsdlFile>
+                            </wsdlFiles>
+                            <sourceDestDir>${project.build.directory}/jaxws-source</sourceDestDir>
+                            <staleFile>${project.build.directory}/jaxws-source/stale/payment.stale</staleFile>
+                            <verbose>false</verbose>
+                            <xnocompile>true</xnocompile>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
                 <version>2.2</version>
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-java-callback/src/main/java/com/tuscanyscatours/payment/MakePaymentMemberResponseType.java b/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-java-callback/src/main/java/com/tuscanyscatours/payment/MakePaymentMemberResponseType.java
deleted file mode 100644
index e5f3ef3cad..0000000000
--- a/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-java-callback/src/main/java/com/tuscanyscatours/payment/MakePaymentMemberResponseType.java
+++ /dev/null
@@ -1,62 +0,0 @@
-
-package com.tuscanyscatours.payment;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for MakePaymentMemberResponseType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="MakePaymentMemberResponseType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element name="Status" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "MakePaymentMemberResponseType", propOrder = {
-    "status"
-})
-public class MakePaymentMemberResponseType {
-
-    @XmlElement(name = "Status", required = true)
-    protected String status;
-
-    /**
-     * Gets the value of the status property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getStatus() {
-        return status;
-    }
-
-    /**
-     * Sets the value of the status property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setStatus(String value) {
-        this.status = value;
-    }
-
-}
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-java-callback/src/main/java/com/tuscanyscatours/payment/MakePaymentMemberType.java b/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-java-callback/src/main/java/com/tuscanyscatours/payment/MakePaymentMemberType.java
deleted file mode 100644
index ca94d86628..0000000000
--- a/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-java-callback/src/main/java/com/tuscanyscatours/payment/MakePaymentMemberType.java
+++ /dev/null
@@ -1,82 +0,0 @@
-
-package com.tuscanyscatours.payment;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for MakePaymentMemberType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="MakePaymentMemberType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element name="CustomerId" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         &lt;element name="Amount" type="{http://www.w3.org/2001/XMLSchema}float"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "MakePaymentMemberType", propOrder = {
-    "customerId",
-    "amount"
-})
-public class MakePaymentMemberType {
-
-    @XmlElement(name = "CustomerId", required = true)
-    protected String customerId;
-    @XmlElement(name = "Amount")
-    protected float amount;
-
-    /**
-     * Gets the value of the customerId property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getCustomerId() {
-        return customerId;
-    }
-
-    /**
-     * Sets the value of the customerId property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setCustomerId(String value) {
-        this.customerId = value;
-    }
-
-    /**
-     * Gets the value of the amount property.
-     * 
-     */
-    public float getAmount() {
-        return amount;
-    }
-
-    /**
-     * Sets the value of the amount property.
-     * 
-     */
-    public void setAmount(float value) {
-        this.amount = value;
-    }
-
-}
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-java-callback/src/main/java/com/tuscanyscatours/payment/ObjectFactory.java b/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-java-callback/src/main/java/com/tuscanyscatours/payment/ObjectFactory.java
deleted file mode 100644
index b069b2ba94..0000000000
--- a/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-java-callback/src/main/java/com/tuscanyscatours/payment/ObjectFactory.java
+++ /dev/null
@@ -1,71 +0,0 @@
-
-package com.tuscanyscatours.payment;
-
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlElementDecl;
-import javax.xml.bind.annotation.XmlRegistry;
-import javax.xml.namespace.QName;
-
-
-/**
- * This object contains factory methods for each 
- * Java content interface and Java element interface 
- * generated in the com.tuscanyscatours.payment package. 
- * <p>An ObjectFactory allows you to programatically 
- * construct new instances of the Java representation 
- * for XML content. The Java representation of XML 
- * content can consist of schema derived interfaces 
- * and classes representing the binding of schema 
- * type definitions, element declarations and model 
- * groups.  Factory methods for each of these are 
- * provided in this class.
- * 
- */
-@XmlRegistry
-public class ObjectFactory {
-
-    private final static QName _MakePaymentMember_QNAME = new QName("http://www.tuscanyscatours.com/Payment/", "makePaymentMember");
-    private final static QName _MakePaymentMemberResponse_QNAME = new QName("http://www.tuscanyscatours.com/Payment/", "makePaymentMemberResponse");
-
-    /**
-     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: com.tuscanyscatours.payment
-     * 
-     */
-    public ObjectFactory() {
-    }
-
-    /**
-     * Create an instance of {@link MakePaymentMemberResponseType }
-     * 
-     */
-    public MakePaymentMemberResponseType createMakePaymentMemberResponseType() {
-        return new MakePaymentMemberResponseType();
-    }
-
-    /**
-     * Create an instance of {@link MakePaymentMemberType }
-     * 
-     */
-    public MakePaymentMemberType createMakePaymentMemberType() {
-        return new MakePaymentMemberType();
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link MakePaymentMemberType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.tuscanyscatours.com/Payment/", name = "makePaymentMember")
-    public JAXBElement<MakePaymentMemberType> createMakePaymentMember(MakePaymentMemberType value) {
-        return new JAXBElement<MakePaymentMemberType>(_MakePaymentMember_QNAME, MakePaymentMemberType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link MakePaymentMemberResponseType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.tuscanyscatours.com/Payment/", name = "makePaymentMemberResponse")
-    public JAXBElement<MakePaymentMemberResponseType> createMakePaymentMemberResponse(MakePaymentMemberResponseType value) {
-        return new JAXBElement<MakePaymentMemberResponseType>(_MakePaymentMemberResponse_QNAME, MakePaymentMemberResponseType.class, null, value);
-    }
-
-}
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-java-callback/src/main/java/com/tuscanyscatours/payment/Payment.java b/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-java-callback/src/main/java/com/tuscanyscatours/payment/Payment.java
deleted file mode 100644
index bbbd03d89a..0000000000
--- a/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-java-callback/src/main/java/com/tuscanyscatours/payment/Payment.java
+++ /dev/null
@@ -1,43 +0,0 @@
-
-package com.tuscanyscatours.payment;
-
-import javax.jws.WebMethod;
-import javax.jws.WebParam;
-import javax.jws.WebResult;
-import javax.jws.WebService;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.ws.RequestWrapper;
-import javax.xml.ws.ResponseWrapper;
-
-
-/**
- * This class was generated by the JAX-WS RI.
- * JAX-WS RI 2.1.7-b01-
- * Generated source version: 2.1
- * 
- */
-@WebService(name = "Payment", targetNamespace = "http://www.tuscanyscatours.com/Payment/")
-@XmlSeeAlso({
-    ObjectFactory.class
-})
-public interface Payment {
-
-
-    /**
-     * 
-     * @param amount
-     * @param customerId
-     * @return
-     *     returns java.lang.String
-     */
-    @WebMethod(action = "http://www.tuscanyscatours.com/Payment/makePayment")
-    @WebResult(name = "Status", targetNamespace = "")
-    @RequestWrapper(localName = "makePaymentMember", targetNamespace = "http://www.tuscanyscatours.com/Payment/", className = "com.tuscanyscatours.payment.MakePaymentMemberType")
-    @ResponseWrapper(localName = "makePaymentMemberResponse", targetNamespace = "http://www.tuscanyscatours.com/Payment/", className = "com.tuscanyscatours.payment.MakePaymentMemberResponseType")
-    public String makePaymentMember(
-        @WebParam(name = "CustomerId", targetNamespace = "")
-        String customerId,
-        @WebParam(name = "Amount", targetNamespace = "")
-        float amount);
-
-}
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-java-callback/src/main/java/com/tuscanyscatours/payment/PaymentService.java b/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-java-callback/src/main/java/com/tuscanyscatours/payment/PaymentService.java
deleted file mode 100644
index a430175976..0000000000
--- a/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-java-callback/src/main/java/com/tuscanyscatours/payment/PaymentService.java
+++ /dev/null
@@ -1,71 +0,0 @@
-
-package com.tuscanyscatours.payment;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.logging.Logger;
-import javax.xml.namespace.QName;
-import javax.xml.ws.Service;
-import javax.xml.ws.WebEndpoint;
-import javax.xml.ws.WebServiceClient;
-import javax.xml.ws.WebServiceFeature;
-
-
-/**
- * This class was generated by the JAX-WS RI.
- * JAX-WS RI 2.1.7-b01-
- * Generated source version: 2.1
- * 
- */
-@WebServiceClient(name = "PaymentService", targetNamespace = "http://www.tuscanyscatours.com/Payment/", wsdlLocation = "file:/C:/simon/tuscany/travelsample/contributions/payment-java/src/main/resources/Payment.wsdl")
-public class PaymentService
-    extends Service
-{
-
-    private final static URL PAYMENTSERVICE_WSDL_LOCATION;
-    private final static Logger logger = Logger.getLogger(com.tuscanyscatours.payment.PaymentService.class.getName());
-
-    static {
-        URL url = null;
-        try {
-            URL baseUrl;
-            baseUrl = com.tuscanyscatours.payment.PaymentService.class.getResource(".");
-            url = new URL(baseUrl, "file:/C:/simon/tuscany/travelsample/contributions/payment-java/src/main/resources/Payment.wsdl");
-        } catch (MalformedURLException e) {
-            logger.warning("Failed to create URL for the wsdl Location: 'file:/C:/simon/tuscany/travelsample/contributions/payment-java/src/main/resources/Payment.wsdl', retrying as a local file");
-            logger.warning(e.getMessage());
-        }
-        PAYMENTSERVICE_WSDL_LOCATION = url;
-    }
-
-    public PaymentService(URL wsdlLocation, QName serviceName) {
-        super(wsdlLocation, serviceName);
-    }
-
-    public PaymentService() {
-        super(PAYMENTSERVICE_WSDL_LOCATION, new QName("http://www.tuscanyscatours.com/Payment/", "PaymentService"));
-    }
-
-    /**
-     * 
-     * @return
-     *     returns Payment
-     */
-    @WebEndpoint(name = "PaymentPort")
-    public Payment getPaymentPort() {
-        return super.getPort(new QName("http://www.tuscanyscatours.com/Payment/", "PaymentPort"), Payment.class);
-    }
-
-    /**
-     * 
-     * @param features
-     *     A list of {@link javax.xml.ws.WebServiceFeature} to configure on the proxy.  Supported features not in the <code>features</code> parameter will have their default values.
-     * @return
-     *     returns Payment
-     */
-    @WebEndpoint(name = "PaymentPort")
-    public Payment getPaymentPort(WebServiceFeature... features) {
-        return super.getPort(new QName("http://www.tuscanyscatours.com/Payment/", "PaymentPort"), Payment.class, features);
-    }
-
-}
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-java-callback/src/main/java/com/tuscanyscatours/payment/package-info.java b/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-java-callback/src/main/java/com/tuscanyscatours/payment/package-info.java
deleted file mode 100644
index acd208f5c9..0000000000
--- a/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-java-callback/src/main/java/com/tuscanyscatours/payment/package-info.java
+++ /dev/null
@@ -1,2 +0,0 @@
-@javax.xml.bind.annotation.XmlSchema(namespace = "http://www.tuscanyscatours.com/Payment/")
-package com.tuscanyscatours.payment;
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-java-callback/src/main/resources/Payment.wsdl b/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-java-callback/src/main/resources/Payment.wsdl
new file mode 100644
index 0000000000..f5539f57fa
--- /dev/null
+++ b/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-java-callback/src/main/resources/Payment.wsdl
@@ -0,0 +1,83 @@
+<?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="Payment" 

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

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

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

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

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

+

+            <xsd:complexType name="MakePaymentMemberType">

+                <xsd:sequence>

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

+                    <xsd:element name="Amount" type="xsd:float"></xsd:element>

+                </xsd:sequence>

+            </xsd:complexType>                    

+            <xsd:element name="makePaymentMember" type="tns:MakePaymentMemberType"/>

+      

+            <xsd:complexType name="MakePaymentMemberResponseType">

+                <xsd:sequence>

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

+                </xsd:sequence>

+            </xsd:complexType>

+            <xsd:element name="makePaymentMemberResponse" type="tns:MakePaymentMemberResponseType"/>

+            

+        </xsd:schema>

+    </wsdl:types>

+    <wsdl:message name="MakePaymentMemberRequest">

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

+    </wsdl:message>

+    <wsdl:message name="MakePaymentMemberResponse">

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

+    </wsdl:message>

+    <wsdl:portType name="Payment">

+        <wsdl:operation name="makePaymentMember">

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

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

+        </wsdl:operation>

+    </wsdl:portType>

+    <wsdl:binding name="PaymentBinding" type="tns:Payment">

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

+        <wsdl:operation name="makePaymentMember">

+            <soap:operation soapAction="http://www.tuscanyscatours.com/Payment/makePayment" />

+            <wsdl:input>

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

+            </wsdl:input>

+            <wsdl:output>

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

+            </wsdl:output>

+        </wsdl:operation>

+    </wsdl:binding>

+    <wsdl:service name="PaymentService">

+        <wsdl:port name="PaymentPort" binding="tns:PaymentBinding">

+            <soap:address location="http://localhost:8080/Payment" />

+        </wsdl:port>

+    </wsdl:service>

+    

+   <plnk:partnerLinkType name="PaymentLinkType">

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

+   </plnk:partnerLinkType>

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