cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r677397 - in /cxf/branches/2.0.x-fixes: ./ rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/XMLFormatValidator.java
Date Wed, 16 Jul 2008 19:37:35 GMT
Author: dkulp
Date: Wed Jul 16 12:37:35 2008
New Revision: 677397

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

........
  r675644 | dkulp | 2008-07-10 12:46:59 -0400 (Thu, 10 Jul 2008) | 2 lines
  
  Fix xml wsdl validation to actually follow the documented rules.   Fixes the wsdl_first_pure_xml
demo.
........

Modified:
    cxf/branches/2.0.x-fixes/   (props changed)
    cxf/branches/2.0.x-fixes/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/XMLFormatValidator.java

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

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

Modified: cxf/branches/2.0.x-fixes/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/XMLFormatValidator.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/XMLFormatValidator.java?rev=677397&r1=677396&r2=677397&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/XMLFormatValidator.java
(original)
+++ cxf/branches/2.0.x-fixes/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/XMLFormatValidator.java
Wed Jul 16 12:37:35 2008
@@ -115,17 +115,8 @@
             Object ext = it.next();
             if (ext instanceof XMLBindingMessageFormat) {
                 XMLBindingMessageFormat xmlFormat = (XMLBindingMessageFormat)ext;
-                QName rootNodeName = bo.getName();
-                if (xmlFormat.getRootNode() != null) {
-                    if (xmlFormat.getRootNode().equals(rootNodeName)) {
-                        return true;
-                    } else {
-                        addErrorMessage(errorPath
-                                        + ": wrong value of rootNode attribute, the value
should be "
-                                        + rootNodeName);
-                        return false;
-                    }
-                } else {                    
+                if (xmlFormat.getRootNode() == null) {
+                    QName rootNodeName = bo.getName();
                     addErrorMessage(errorPath
                                     + ": empty value of rootNode attribute, the value should
be "
                                     + rootNodeName);
@@ -133,7 +124,6 @@
                 }
             }
         }
-        addErrorMessage(errorPath + ": missing xml format body element");
-        return false;
+        return true;
     }
 }



Mime
View raw message