Use SDO TypeHelper/XSDHelper to help the java name

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

1 files changed, 50 insertions, 57 deletions

diff --git a/branches/sca-java-1.x/tools/databinding/sdo/src/test/resources/HelloService.wsdl b/branches/sca-java-1.x/tools/databinding/sdo/src/test/resources/HelloService.wsdl
index a36d6d02b9..8127e02d34 100644
--- a/branches/sca-java-1.x/tools/databinding/sdo/src/test/resources/HelloService.wsdl
+++ b/branches/sca-java-1.x/tools/databinding/sdo/src/test/resources/HelloService.wsdl
@@ -1,5 +1,5 @@
 <?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

@@ -17,165 +17,158 @@
  * specific language governing permissions and limitations

  * under the License.

  -->      

-

-<wsdl:definitions name="HelloWorld" targetNamespace="http://apache.org/hello_world_soap_http"

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

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

-    xmlns:tns="http://apache.org/hello_world_soap_http"

-    xmlns:x1="http://apache.org/hello_world_soap_http/types"

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

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

+<wsdl:definitions name="HelloWorld" targetNamespace="http://apache.org/hello_world_soap_http" xmlns="http://schemas.xmlsoap.org/wsdl/"

+    xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://apache.org/hello_world_soap_http" xmlns:x1="http://apache.org/hello_world_soap_http/types"

+    xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema">

     <wsdl:types>

-        <schema targetNamespace="http://apache.org/hello_world_soap_http/types"

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

-	    xmlns:tns="http://apache.org/hello_world_soap_http/types"

-            elementFormDefault="qualified">

-	    <simpleType name="MyStringType">

-		<restriction base="string">

-		    <maxLength value="30" />

-		</restriction>

-	    </simpleType>

+        <schema targetNamespace="http://apache.org/hello_world_soap_http/types" xmlns="http://www.w3.org/2001/XMLSchema"

+            xmlns:tns="http://apache.org/hello_world_soap_http/types" elementFormDefault="qualified">

+            <simpleType name="MyStringType">

+                <restriction base="string">

+                    <maxLength value="30" />

+                </restriction>

+            </simpleType>

 

             <element name="sayHi">

-                <complexType/>

+                <complexType />

             </element>

             <element name="sayHiResponse">

                 <complexType>

                     <sequence>

-                        <element name="responseType" type="string"/>

+                        <element name="responseType" type="string" />

                     </sequence>

                 </complexType>

             </element>

             <element name="greetMe">

                 <complexType>

                     <sequence>

-                        <element name="requestType" type="tns:MyStringType"/>

+                        <element name="requestType" type="tns:MyStringType" />

                     </sequence>

                 </complexType>

             </element>

             <element name="greetMeResponse">

                 <complexType>

                     <sequence>

-                        <element name="responseType" type="string"/>

+                        <element name="responseType" type="string" />

                     </sequence>

                 </complexType>

             </element>

             <element name="greetMeOneWay">

                 <complexType>

                     <sequence>

-                        <element name="requestType" type="string"/>

+                        <element name="requestType" type="string" />

                     </sequence>

                 </complexType>

             </element>

             <element name="pingMe">

-                <complexType/>

+                <complexType />

             </element>

             <element name="pingMeResponse">

-                <complexType/>

+                <complexType />

             </element>

             <element name="faultDetail">

                 <complexType>

                     <sequence>

-                        <element name="minor" type="short"/>

-                        <element name="major" type="short"/>

+                        <element name="minor" type="short" />

+                        <element name="major" type="short" />

                     </sequence>

                 </complexType>

             </element>

         </schema>

     </wsdl:types>

     <wsdl:message name="sayHiRequest">

-        <wsdl:part element="x1:sayHi" name="in"/>

+        <wsdl:part element="x1:sayHi" name="in" />

     </wsdl:message>

     <wsdl:message name="sayHiResponse">

-        <wsdl:part element="x1:sayHiResponse" name="out"/>

+        <wsdl:part element="x1:sayHiResponse" name="out" />

     </wsdl:message>

     <wsdl:message name="greetMeRequest">

-        <wsdl:part element="x1:greetMe" name="in"/>

+        <wsdl:part element="x1:greetMe" name="in" />

     </wsdl:message>

     <wsdl:message name="greetMeResponse">

-        <wsdl:part element="x1:greetMeResponse" name="out"/>

+        <wsdl:part element="x1:greetMeResponse" name="out" />

     </wsdl:message>

     <wsdl:message name="greetMeOneWayRequest">

-        <wsdl:part element="x1:greetMeOneWay" name="in"/>

+        <wsdl:part element="x1:greetMeOneWay" name="in" />

     </wsdl:message>

     <wsdl:message name="pingMeRequest">

-        <wsdl:part name="in" element="x1:pingMe"/>

+        <wsdl:part name="in" element="x1:pingMe" />

     </wsdl:message>

     <wsdl:message name="pingMeResponse">

-        <wsdl:part name="out" element="x1:pingMeResponse"/>

+        <wsdl:part name="out" element="x1:pingMeResponse" />

     </wsdl:message>

     <wsdl:message name="pingMeFault">

-        <wsdl:part name="faultDetail" element="x1:faultDetail"/>

+        <wsdl:part name="faultDetail" element="x1:faultDetail" />

     </wsdl:message>

 

     <wsdl:portType name="Greeter">

         <wsdl:operation name="sayHi">

-            <wsdl:input message="tns:sayHiRequest" name="sayHiRequest"/>

-            <wsdl:output message="tns:sayHiResponse" name="sayHiResponse"/>

+            <wsdl:input message="tns:sayHiRequest" name="sayHiRequest" />

+            <wsdl:output message="tns:sayHiResponse" name="sayHiResponse" />

         </wsdl:operation>

 

         <wsdl:operation name="greetMe">

-            <wsdl:input message="tns:greetMeRequest" name="greetMeRequest"/>

-            <wsdl:output message="tns:greetMeResponse" name="greetMeResponse"/>

+            <wsdl:input message="tns:greetMeRequest" name="greetMeRequest" />

+            <wsdl:output message="tns:greetMeResponse" name="greetMeResponse" />

         </wsdl:operation>

 

         <wsdl:operation name="greetMeOneWay">

-            <wsdl:input message="tns:greetMeOneWayRequest" name="greetMeOneWayRequest"/>

+            <wsdl:input message="tns:greetMeOneWayRequest" name="greetMeOneWayRequest" />

         </wsdl:operation>

 

         <wsdl:operation name="pingMe">

-            <wsdl:input name="pingMeRequest" message="tns:pingMeRequest"/>

-            <wsdl:output name="pingMeResponse" message="tns:pingMeResponse"/>

-            <wsdl:fault name="pingMeFault" message="tns:pingMeFault"/>

+            <wsdl:input name="pingMeRequest" message="tns:pingMeRequest" />

+            <wsdl:output name="pingMeResponse" message="tns:pingMeResponse" />

+            <wsdl:fault name="pingMeFault" message="tns:pingMeFault" />

         </wsdl:operation>

     </wsdl:portType>

     <wsdl:binding name="Greeter_SOAPBinding" type="tns:Greeter">

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

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

 

         <wsdl:operation name="sayHi">

-            <soap:operation soapAction="" style="document"/>

+            <soap:operation soapAction="" style="document" />

             <wsdl:input name="sayHiRequest">

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

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

             </wsdl:input>

             <wsdl:output name="sayHiResponse">

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

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

             </wsdl:output>

         </wsdl:operation>

 

         <wsdl:operation name="greetMe">

-            <soap:operation soapAction="" style="document"/>

+            <soap:operation soapAction="" style="document" />

             <wsdl:input name="greetMeRequest">

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

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

             </wsdl:input>

             <wsdl:output name="greetMeResponse">

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

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

             </wsdl:output>

         </wsdl:operation>

 

         <wsdl:operation name="greetMeOneWay">

-            <soap:operation soapAction="" style="document"/>

+            <soap:operation soapAction="" style="document" />

             <wsdl:input name="greetMeOneWayRequest">

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

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

             </wsdl:input>

         </wsdl:operation>

 

         <wsdl:operation name="pingMe">

-            <soap:operation style="document"/>

+            <soap:operation style="document" />

             <wsdl:input>

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

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

             </wsdl:input>

             <wsdl:output>

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

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

             </wsdl:output>

             <wsdl:fault name="pingMeFault">

-                <soap:fault name="pingMeFault" use="literal"/>

+                <soap:fault name="pingMeFault" use="literal" />

             </wsdl:fault>

         </wsdl:operation>

 

     </wsdl:binding>

     <wsdl:service name="SOAPService">

         <wsdl:port binding="tns:Greeter_SOAPBinding" name="SoapPort">

-            <soap:address location="http://localhost:9000/SoapContext/SoapPort"/>

+            <soap:address location="http://localhost:9000/SoapContext/SoapPort" />

         </wsdl:port>

     </wsdl:service>

 </wsdl:definitions>