cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1055165 - in /cxf/branches/2.3.x-fixes: ./ tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf3105/cxf3105.wsdl
Date Tue, 04 Jan 2011 19:44:21 GMT
Author: dkulp
Date: Tue Jan  4 19:44:21 2011
New Revision: 1055165

URL: http://svn.apache.org/viewvc?rev=1055165&view=rev
Log:
Merged revisions 1055155 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1055155 | dkulp | 2011-01-04 14:33:52 -0500 (Tue, 04 Jan 2011) | 2 lines
  
  [CXF-3201] Attempt to fix the failing test on Windows
  Patch from Jim Talbut applied.
........

Modified:
    cxf/branches/2.3.x-fixes/   (props changed)
    cxf/branches/2.3.x-fixes/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java
    cxf/branches/2.3.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf3105/cxf3105.wsdl

Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.3.x-fixes/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java?rev=1055165&r1=1055164&r2=1055165&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java
(original)
+++ cxf/branches/2.3.x-fixes/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java
Tue Jan  4 19:44:21 2011
@@ -1149,8 +1149,8 @@ public class CodeGenBugTest extends Abst
         File f = new File(output, "org/apache/cxf/testcase/cxf3105/Login.java");
         assertTrue(f.exists());
         String contents = IOUtils.readStringFromStream(new FileInputStream(f));
-        assertTrue(contents.contains("Loginrequest loginRequest"));
-        assertTrue(contents.contains("<Loginresponse> loginResponse"));
+        assertTrue(contents.contains("Loginrequesttype loginRequest"));
+        assertTrue(contents.contains("<Loginresponsetype> loginResponse"));
     }
 
     @Test

Modified: cxf/branches/2.3.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf3105/cxf3105.wsdl
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf3105/cxf3105.wsdl?rev=1055165&r1=1055164&r2=1055165&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf3105/cxf3105.wsdl
(original)
+++ cxf/branches/2.3.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf3105/cxf3105.wsdl
Tue Jan  4 19:44:21 2011
@@ -1,71 +1,71 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions xmlns:fc="http://cxf.apache.org/testcase/cxf3105" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
name="center" targetNamespace="http://cxf.apache.org/testcase/cxf3105">
-    <wsdl:types>
-        <xsd:schema targetNamespace="http://cxf.apache.org/testcase/cxf3105">
-            <xsd:complexType name="loginrequest">
-                <xsd:sequence>
-                    <xsd:element name="username" type="xsd:string"/>
-                    <xsd:element name="password" type="xsd:string"/>
-                </xsd:sequence>
-            </xsd:complexType>
-            <xsd:complexType name="loginresponse">
-                <xsd:sequence>
-                    <xsd:element name="userid" type="xsd:int"/>
-                    <xsd:element name="groupid" type="xsd:int"/>
-                </xsd:sequence>
-            </xsd:complexType>
-            
-
-            <xsd:element name="login">
-                <xsd:complexType>
-                    <xsd:sequence>
-                        <xsd:element name="login" type="fc:loginrequest"/>
-                        <xsd:element name="id" type="xsd:int" maxOccurs="1" minOccurs="0"/>
-                    </xsd:sequence>
-                </xsd:complexType>
-            </xsd:element>
-            <xsd:element name="loginResponse">
-                <xsd:complexType>
-                    <xsd:sequence>
-                        <xsd:element name="login" type="fc:loginresponse"/>
-                        <xsd:element name="password_temp" type="xsd:string"/>
-                    </xsd:sequence>
-                </xsd:complexType>
-            </xsd:element>
-        </xsd:schema>
-    </wsdl:types>
-
-    <wsdl:message name="loginRequest">
-        <wsdl:part name="parameters" element="fc:login"/>
-    </wsdl:message>
-    <wsdl:message name="loginResponse">
-        <wsdl:part name="parameters" element="fc:loginResponse"/>
-    </wsdl:message>
-    
-
-    <wsdl:portType name="Login">
-        <wsdl:operation name="login">
-            <wsdl:input message="fc:loginRequest"/>
-            <wsdl:output message="fc:loginResponse"/>
-        </wsdl:operation>
-    </wsdl:portType>
-    <wsdl:binding name="Login" type="fc:Login">
-        <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-
-        <wsdl:operation name="login">
-            <soap:operation soapAction="http://cxf.apache.org/testcase/cxf3105login"/>
-            <wsdl:input>
-                <soap:body use="literal"/>
-            </wsdl:input>
-            <wsdl:output>
-                <soap:body use="literal"/>
-            </wsdl:output>
-        </wsdl:operation>
-    </wsdl:binding>
-    <wsdl:service name="Login">
-        <wsdl:port binding="fc:Login" name="center">
-            <soap:address location="http://localhost:9000/"/>
-        </wsdl:port>
-    </wsdl:service>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<wsdl:definitions xmlns:fc="http://cxf.apache.org/testcase/cxf3105" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
name="center" targetNamespace="http://cxf.apache.org/testcase/cxf3105">
+    <wsdl:types>
+        <xsd:schema targetNamespace="http://cxf.apache.org/testcase/cxf3105">
+            <xsd:complexType name="loginrequesttype">
+                <xsd:sequence>
+                    <xsd:element name="username" type="xsd:string"/>
+                    <xsd:element name="password" type="xsd:string"/>
+                </xsd:sequence>
+            </xsd:complexType>
+            <xsd:complexType name="loginresponsetype">
+                <xsd:sequence>
+                    <xsd:element name="userid" type="xsd:int"/>
+                    <xsd:element name="groupid" type="xsd:int"/>
+                </xsd:sequence>
+            </xsd:complexType>
+            
+
+            <xsd:element name="login">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element name="login" type="fc:loginrequesttype"/>
+                        <xsd:element name="id" type="xsd:int" maxOccurs="1" minOccurs="0"/>
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="loginResponse">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element name="login" type="fc:loginresponsetype"/>
+                        <xsd:element name="password_temp" type="xsd:string"/>
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+        </xsd:schema>
+    </wsdl:types>
+
+    <wsdl:message name="loginRequest">
+        <wsdl:part name="parameters" element="fc:login"/>
+    </wsdl:message>
+    <wsdl:message name="loginResponse">
+        <wsdl:part name="parameters" element="fc:loginResponse"/>
+    </wsdl:message>
+    
+
+    <wsdl:portType name="Login">
+        <wsdl:operation name="login">
+            <wsdl:input message="fc:loginRequest"/>
+            <wsdl:output message="fc:loginResponse"/>
+        </wsdl:operation>
+    </wsdl:portType>
+    <wsdl:binding name="Login" type="fc:Login">
+        <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+
+        <wsdl:operation name="login">
+            <soap:operation soapAction="http://cxf.apache.org/testcase/cxf3105login"/>
+            <wsdl:input>
+                <soap:body use="literal"/>
+            </wsdl:input>
+            <wsdl:output>
+                <soap:body use="literal"/>
+            </wsdl:output>
+        </wsdl:operation>
+    </wsdl:binding>
+    <wsdl:service name="Login">
+        <wsdl:port binding="fc:Login" name="center">
+            <soap:address location="http://localhost:9000/"/>
+        </wsdl:port>
+    </wsdl:service>
+
 </wsdl:definitions>
\ No newline at end of file



Mime
View raw message