You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2009/11/14 14:30:56 UTC
svn commit: r836172 - in /cxf/branches/2.2.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
Author: dkulp
Date: Sat Nov 14 13:30:55 2009
New Revision: 836172
URL: http://svn.apache.org/viewvc?rev=836172&view=rev
Log:
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.2.x-fixes/ (props changed)
cxf/branches/2.2.x-fixes/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java
cxf/branches/2.2.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf1152/jaxws1.xml
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.2.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.2.x-fixes/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java?rev=836172&r1=836171&r2=836172&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java (original)
+++ cxf/branches/2.2.x-fixes/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/jaxws/CodeGenBugTest.java Sat Nov 14 13:30:55 2009
@@ -962,7 +962,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.2.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf1152/jaxws1.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf1152/jaxws1.xml?rev=836172&r1=836171&r2=836172&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf1152/jaxws1.xml (original)
+++ cxf/branches/2.2.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/cxf1152/jaxws1.xml Sat Nov 14 13:30:55 2009
@@ -36,8 +36,8 @@
<jaxws:javadoc>this is class javadoc</jaxws:javadoc>
</jaxws:class>
</jaxws:bindings>
- <jaxws:bindings node="wsdl:definitions/wsdl:service[@name='SOAPService']">
- <jaxws:class name="SOAPService">
+ <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>