cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r836321 - in /cxf/branches/2.1.x-fixes: ./ tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf1152/jaxws1.xml
Date Sun, 15 Nov 2009 04:02:26 GMT
Author: dkulp
Date: Sun Nov 15 04:02:25 2009
New Revision: 836321

URL: http://svn.apache.org/viewvc?rev=836321&view=rev
Log:
Merged revisions 836172 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/branches/2.2.x-fixes

................
  r836172 | dkulp | 2009-11-14 08:30:55 -0500 (Sat, 14 Nov 2009) | 9 lines
  
  Merged revisions 836168 via svnmerge from 
  https://svn.apache.org/repos/asf/cxf/trunk
  
  ........
    r836168 | dkulp | 2009-11-14 08:27:28 -0500 (Sat, 14 Nov 2009) | 1 line
    
    Fix randomly failing test
  ........
................

Modified:
    cxf/branches/2.1.x-fixes/   (props changed)
    cxf/branches/2.1.x-fixes/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java
    cxf/branches/2.1.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf1152/jaxws1.xml

Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
    svn:mergeinfo = /cxf/branches/2.2.x-fixes:836172

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

Modified: cxf/branches/2.1.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.1.x-fixes/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java?rev=836321&r1=836320&r2=836321&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java
(original)
+++ cxf/branches/2.1.x-fixes/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java
Sun Nov 15 04:02:25 2009
@@ -960,7 +960,7 @@
         assertTrue(results1.contains("     * this is method javadoc"));
         
         List<String> results2 = FileUtils.readLines(new File(output.getCanonicalPath(),

-            "org/mypkg/SOAPService.java")); 
+            "org/mypkg/SOAPServiceTest1.java")); 
         
         boolean match1 = false;
         boolean match2 = false;

Modified: cxf/branches/2.1.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf1152/jaxws1.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf1152/jaxws1.xml?rev=836321&r1=836320&r2=836321&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf1152/jaxws1.xml
(original)
+++ cxf/branches/2.1.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf1152/jaxws1.xml
Sun Nov 15 04:02:25 2009
@@ -36,6 +36,11 @@
            <jaxws:javadoc>this is class javadoc</jaxws:javadoc>
         </jaxws:class>
     </jaxws:bindings>
+    <jaxws:bindings node="wsdl:definitions/wsdl:service[@name='SOAPService_Test1']">
+        <jaxws:class name="SOAPServiceTest1">
+           <jaxws:javadoc>this is service class javadoc</jaxws:javadoc>
+        </jaxws:class>
+    </jaxws:bindings>
 
     <jaxws:bindings node="wsdl:definitions/wsdl:portType[@name='Greeter']/wsdl:operation[@name='greetMe']">
         <!-- rename the generated java method name-->



Mime
View raw message