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 2008/07/16 21:42:09 UTC

svn commit: r677398 - in /cxf/branches/2.0.x-fixes: ./ tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/validator/ValidatorTest.java tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/xml_format_root.wsdl

Author: dkulp
Date: Wed Jul 16 12:42:09 2008
New Revision: 677398

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

........
  r675653 | dkulp | 2008-07-10 13:06:38 -0400 (Thu, 10 Jul 2008) | 2 lines
  
  Fix test that failed with latest commit
........

Modified:
    cxf/branches/2.0.x-fixes/   (props changed)
    cxf/branches/2.0.x-fixes/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/validator/ValidatorTest.java
    cxf/branches/2.0.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/xml_format_root.wsdl

Propchange: cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul 16 12:42:09 2008
@@ -1 +1 @@
-/cxf/trunk:673548,674485,674547,674551,674562,674601,674649,674764,674887,675644
+/cxf/trunk:673548,674485,674547,674551,674562,674601,674649,674764,674887,675644,675653

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

Modified: cxf/branches/2.0.x-fixes/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/validator/ValidatorTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/validator/ValidatorTest.java?rev=677398&r1=677397&r2=677398&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/validator/ValidatorTest.java (original)
+++ cxf/branches/2.0.x-fixes/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/validator/ValidatorTest.java Wed Jul 16 12:42:09 2008
@@ -52,7 +52,8 @@
             fail("xml_format_root.wsdl is not a valid wsdl, should throws exception here");
         } catch (Exception e) {
             String expected = "Binding(Greeter_XMLBinding):BindingOperation" 
-                + "({http://apache.org/xml_http_bare}sayHi)-input: missing xml format body element";
+                + "({http://apache.org/xml_http_bare}sayHi)-input: empty value of rootNode attribute, "
+                + "the value should be {http://apache.org/xml_http_bare}sayHi";
             assertEquals(expected, e.getMessage().trim());
         }
     }

Modified: cxf/branches/2.0.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/xml_format_root.wsdl
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/xml_format_root.wsdl?rev=677398&r1=677397&r2=677398&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/xml_format_root.wsdl (original)
+++ cxf/branches/2.0.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/xml_format_root.wsdl Wed Jul 16 12:42:09 2008
@@ -61,7 +61,7 @@
     <xformat:binding/>
     <wsdl:operation name="sayHi">
       <wsdl:input name="sayHiRequest">
-	<!--xformat:body rootNode="tns:sayHi"/-->
+	<xformat:body/>
       </wsdl:input>
       <wsdl:output name="sayHiResponse">
       </wsdl:output>