cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1331084 - in /cxf/trunk/tools/javato/ws/src/test: java/org/apache/cxf/tools/java2wsdl/processor/ resources/java2wsdl_wsdl/ resources/org/apache/cxf/tools/java2wsdl/processor/expected/
Date Thu, 26 Apr 2012 21:01:40 GMT
Author: dkulp
Date: Thu Apr 26 21:01:39 2012
New Revision: 1331084

URL: http://svn.apache.org/viewvc?rev=1331084&view=rev
Log:
Depending on a hashmap implementation, a test could fail due to relying
on output from non-compliant wsdl.

Modified:
    cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/JavaToProcessorTest.java
    cxf/trunk/tools/javato/ws/src/test/resources/java2wsdl_wsdl/hello_world_bare.wsdl
    cxf/trunk/tools/javato/ws/src/test/resources/org/apache/cxf/tools/java2wsdl/processor/expected/xml-bare-expected.wsdl

Modified: cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/JavaToProcessorTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/JavaToProcessorTest.java?rev=1331084&r1=1331083&r2=1331084&view=diff
==============================================================================
--- cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/JavaToProcessorTest.java
(original)
+++ cxf/trunk/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/JavaToProcessorTest.java
Thu Apr 26 21:01:39 2012
@@ -328,7 +328,7 @@ public class JavaToProcessorTest extends
     @Test
     public void testXMlBare() throws Exception {
         env.put(ToolConstants.CFG_OUTPUTFILE, output.getPath() + "/xml-bare.wsdl");
-        env.put(ToolConstants.CFG_CLASSNAME, "org.apache.xml_bare.Greeter");
+        env.put(ToolConstants.CFG_CLASSNAME, org.apache.xml_bare.Greeter.class.getName());
         processor.setEnvironment(env);
         processor.process();
 

Modified: cxf/trunk/tools/javato/ws/src/test/resources/java2wsdl_wsdl/hello_world_bare.wsdl
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/javato/ws/src/test/resources/java2wsdl_wsdl/hello_world_bare.wsdl?rev=1331084&r1=1331083&r2=1331084&view=diff
==============================================================================
--- cxf/trunk/tools/javato/ws/src/test/resources/java2wsdl_wsdl/hello_world_bare.wsdl (original)
+++ cxf/trunk/tools/javato/ws/src/test/resources/java2wsdl_wsdl/hello_world_bare.wsdl Thu
Apr 26 21:01:39 2012
@@ -48,7 +48,7 @@ under the License.
     <wsdl:message name="sayHiRequest"/>
 
     <wsdl:message name="sayHiResponse">
-        <wsdl:part type="xsd:string" name="out"/>
+        <wsdl:part type="xsd:string" name="sayHiOut"/>
     </wsdl:message>
 
     <wsdl:message name="greetMeRequest">

Modified: cxf/trunk/tools/javato/ws/src/test/resources/org/apache/cxf/tools/java2wsdl/processor/expected/xml-bare-expected.wsdl
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/javato/ws/src/test/resources/org/apache/cxf/tools/java2wsdl/processor/expected/xml-bare-expected.wsdl?rev=1331084&r1=1331083&r2=1331084&view=diff
==============================================================================
--- cxf/trunk/tools/javato/ws/src/test/resources/org/apache/cxf/tools/java2wsdl/processor/expected/xml-bare-expected.wsdl
(original)
+++ cxf/trunk/tools/javato/ws/src/test/resources/org/apache/cxf/tools/java2wsdl/processor/expected/xml-bare-expected.wsdl
Thu Apr 26 21:01:39 2012
@@ -18,125 +18,126 @@
   under the License.
 -->
 <wsdl:definitions name="GreeterService" targetNamespace="http://apache.org/xml_bare" xmlns:tns="http://apache.org/xml_bare"
xmlns:ns1="http://apache.org/xml_bare/types" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
-  <wsdl:types>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://apache.org/xml_bare/types"
elementFormDefault="qualified" targetNamespace="http://apache.org/xml_bare/types" version="1.0">
-<xs:element name="myComplexStruct" type="tns:myComplexStructType"/>
-<xs:element name="requestType" type="xs:string"/>
-<xs:element name="responseType" type="xs:string"/>
-<xs:complexType name="myComplexStructType">
-<xs:sequence>
-<xs:element name="elem1" type="xs:string"/>
-<xs:element name="elem2" type="xs:string"/>
-<xs:element name="elem3" type="xs:int"/>
-</xs:sequence>
-</xs:complexType>
-</xs:schema>
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ns0="http://apache.org/xml_bare/types"
xmlns:tns="http://apache.org/xml_bare" attributeFormDefault="unqualified" elementFormDefault="qualified"
targetNamespace="http://apache.org/xml_bare">
-<xsd:import namespace="http://apache.org/xml_bare/types"/>
-<xsd:element name="out" nillable="true" type="xsd:string"/>
-<xsd:element name="in" nillable="true" type="ns0:myComplexStructType"/>
-</xsd:schema>
-  </wsdl:types>
-  <wsdl:message name="sendReceiveData">
-    <wsdl:part name="in" element="tns:in">
-    </wsdl:part>
-  </wsdl:message>
-  <wsdl:message name="testMultiParamPart">
-    <wsdl:part name="in2" element="ns1:myComplexStruct">
-    </wsdl:part>
-    <wsdl:part name="in1" element="ns1:requestType">
-    </wsdl:part>
-  </wsdl:message>
-  <wsdl:message name="greetMe">
-    <wsdl:part name="me" element="ns1:requestType">
-    </wsdl:part>
-  </wsdl:message>
-  <wsdl:message name="sayHiResponse">
-    <wsdl:part name="out" element="tns:out">
-    </wsdl:part>
-  </wsdl:message>
-  <wsdl:message name="sendReceiveDataResponse">
-    <wsdl:part name="out" element="tns:out">
-    </wsdl:part>
-  </wsdl:message>
-  <wsdl:message name="testMultiParamPartResponse">
-    <wsdl:part name="out1" element="ns1:responseType">
-    </wsdl:part>
-  </wsdl:message>
-  <wsdl:message name="sayHi">
-  </wsdl:message>
-  <wsdl:message name="greetMeResponse">
-    <wsdl:part name="theResponse" element="ns1:responseType">
-    </wsdl:part>
-  </wsdl:message>
-  <wsdl:portType name="Greeter">
-    <wsdl:operation name="sayHi">
-      <wsdl:input name="sayHi" message="tns:sayHi">
-    </wsdl:input>
-      <wsdl:output name="sayHiResponse" message="tns:sayHiResponse">
-    </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="testMultiParamPart">
-      <wsdl:input name="testMultiParamPart" message="tns:testMultiParamPart">
-    </wsdl:input>
-      <wsdl:output name="testMultiParamPartResponse" message="tns:testMultiParamPartResponse">
-    </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="greetMe">
-      <wsdl:input name="greetMe" message="tns:greetMe">
-    </wsdl:input>
-      <wsdl:output name="greetMeResponse" message="tns:greetMeResponse">
-    </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="sendReceiveData">
-      <wsdl:input name="sendReceiveData" message="tns:sendReceiveData">
-    </wsdl:input>
-      <wsdl:output name="sendReceiveDataResponse" message="tns:sendReceiveDataResponse">
-    </wsdl:output>
-    </wsdl:operation>
-  </wsdl:portType>
-  <wsdl:binding name="GreeterServiceSoapBinding" type="tns:Greeter">
-    <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-    <wsdl:operation name="sayHi">
-      <soap:operation soapAction="" style="document"/>
-      <wsdl:input name="sayHi">
-        <soap:body use="literal"/>
-      </wsdl:input>
-      <wsdl:output name="sayHiResponse">
-        <soap:body use="literal"/>
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="testMultiParamPart">
-      <soap:operation soapAction="" style="document"/>
-      <wsdl:input name="testMultiParamPart">
-        <soap:body use="literal"/>
-      </wsdl:input>
-      <wsdl:output name="testMultiParamPartResponse">
-        <soap:body use="literal"/>
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="greetMe">
-      <soap:operation soapAction="" style="document"/>
-      <wsdl:input name="greetMe">
-        <soap:body use="literal"/>
-      </wsdl:input>
-      <wsdl:output name="greetMeResponse">
-        <soap:body use="literal"/>
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="sendReceiveData">
-      <soap:operation soapAction="" style="document"/>
-      <wsdl:input name="sendReceiveData">
-        <soap:body use="literal"/>
-      </wsdl:input>
-      <wsdl:output name="sendReceiveDataResponse">
-        <soap:body use="literal"/>
-      </wsdl:output>
-    </wsdl:operation>
-  </wsdl:binding>
-  <wsdl:service name="GreeterService">
-    <wsdl:port name="GreeterPort" binding="tns:GreeterServiceSoapBinding">
-      <soap:address location="http://localhost:9090/GreeterPort"/>
-    </wsdl:port>
-  </wsdl:service>
+    <wsdl:types>
+        <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://apache.org/xml_bare/types"
elementFormDefault="qualified" targetNamespace="http://apache.org/xml_bare/types" version="1.0">
+            <xs:element name="myComplexStruct" type="tns:myComplexStructType"/>
+            <xs:element name="requestType" type="xs:string"/>
+            <xs:element name="responseType" type="xs:string"/>
+            <xs:complexType name="myComplexStructType">
+                <xs:sequence>
+                    <xs:element name="elem1" type="xs:string"/>
+                    <xs:element name="elem2" type="xs:string"/>
+                    <xs:element name="elem3" type="xs:int"/>
+                </xs:sequence>
+            </xs:complexType>
+        </xs:schema>
+        <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ns0="http://apache.org/xml_bare/types"
xmlns:tns="http://apache.org/xml_bare" attributeFormDefault="unqualified" elementFormDefault="qualified"
targetNamespace="http://apache.org/xml_bare">
+            <xsd:import namespace="http://apache.org/xml_bare/types"/>
+            <xsd:element name="out" nillable="true" type="ns0:myComplexStructType"/>
+            <xsd:element name="sayHiOut" nillable="true" type="xsd:string"/>
+            <xsd:element name="in" nillable="true" type="ns0:myComplexStructType"/>
+        </xsd:schema>
+    </wsdl:types>
+    <wsdl:message name="sendReceiveData">
+        <wsdl:part name="in" element="tns:in">
+        </wsdl:part>
+    </wsdl:message>
+    <wsdl:message name="testMultiParamPart">
+        <wsdl:part name="in2" element="ns1:myComplexStruct">
+        </wsdl:part>
+        <wsdl:part name="in1" element="ns1:requestType">
+        </wsdl:part>
+    </wsdl:message>
+    <wsdl:message name="greetMe">
+        <wsdl:part name="me" element="ns1:requestType">
+        </wsdl:part>
+    </wsdl:message>
+    <wsdl:message name="sayHiResponse">
+        <wsdl:part name="out" element="tns:sayHiOut">
+        </wsdl:part>
+    </wsdl:message>
+    <wsdl:message name="sendReceiveDataResponse">
+        <wsdl:part name="out" element="tns:out">
+        </wsdl:part>
+    </wsdl:message>
+    <wsdl:message name="testMultiParamPartResponse">
+        <wsdl:part name="out1" element="ns1:responseType">
+        </wsdl:part>
+    </wsdl:message>
+    <wsdl:message name="sayHi">
+    </wsdl:message>
+    <wsdl:message name="greetMeResponse">
+        <wsdl:part name="theResponse" element="ns1:responseType">
+        </wsdl:part>
+    </wsdl:message>
+    <wsdl:portType name="Greeter">
+        <wsdl:operation name="sayHi">
+            <wsdl:input name="sayHi" message="tns:sayHi">
+            </wsdl:input>
+            <wsdl:output name="sayHiResponse" message="tns:sayHiResponse">
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="testMultiParamPart">
+            <wsdl:input name="testMultiParamPart" message="tns:testMultiParamPart">
+            </wsdl:input>
+            <wsdl:output name="testMultiParamPartResponse" message="tns:testMultiParamPartResponse">
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="greetMe">
+            <wsdl:input name="greetMe" message="tns:greetMe">
+            </wsdl:input>
+            <wsdl:output name="greetMeResponse" message="tns:greetMeResponse">
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="sendReceiveData">
+            <wsdl:input name="sendReceiveData" message="tns:sendReceiveData">
+            </wsdl:input>
+            <wsdl:output name="sendReceiveDataResponse" message="tns:sendReceiveDataResponse">
+            </wsdl:output>
+        </wsdl:operation>
+    </wsdl:portType>
+    <wsdl:binding name="GreeterServiceSoapBinding" type="tns:Greeter">
+        <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+        <wsdl:operation name="sayHi">
+            <soap:operation soapAction="" style="document"/>
+            <wsdl:input name="sayHi">
+                <soap:body use="literal"/>
+            </wsdl:input>
+            <wsdl:output name="sayHiResponse">
+                <soap:body use="literal"/>
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="testMultiParamPart">
+            <soap:operation soapAction="" style="document"/>
+            <wsdl:input name="testMultiParamPart">
+                <soap:body use="literal"/>
+            </wsdl:input>
+            <wsdl:output name="testMultiParamPartResponse">
+                <soap:body use="literal"/>
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="greetMe">
+            <soap:operation soapAction="" style="document"/>
+            <wsdl:input name="greetMe">
+                <soap:body use="literal"/>
+            </wsdl:input>
+            <wsdl:output name="greetMeResponse">
+                <soap:body use="literal"/>
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="sendReceiveData">
+            <soap:operation soapAction="" style="document"/>
+            <wsdl:input name="sendReceiveData">
+                <soap:body use="literal"/>
+            </wsdl:input>
+            <wsdl:output name="sendReceiveDataResponse">
+                <soap:body use="literal"/>
+            </wsdl:output>
+        </wsdl:operation>
+    </wsdl:binding>
+    <wsdl:service name="GreeterService">
+        <wsdl:port name="GreeterPort" binding="tns:GreeterServiceSoapBinding">
+            <soap:address location="http://localhost:9090/GreeterPort"/>
+        </wsdl:port>
+    </wsdl:service>
 </wsdl:definitions>



Mime
View raw message