cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ningji...@apache.org
Subject svn commit: r1211755 - in /cxf/branches/2.3.x-fixes: ./ api/src/main/java/org/apache/cxf/databinding/AbstractDataBinding.java
Date Thu, 08 Dec 2011 04:36:43 GMT
Author: ningjiang
Date: Thu Dec  8 04:36:43 2011
New Revision: 1211755

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

................
  r1211190 | dkulp | 2011-12-07 05:56:15 +0800 (Wed, 07 Dec 2011) | 10 lines
  
  Merged revisions 1211099 via svnmerge from 
  https://svn.apache.org/repos/asf/cxf/trunk
  
  ........
    r1211099 | dkulp | 2011-12-06 15:35:15 -0500 (Tue, 06 Dec 2011) | 2 lines
    
    Add more information to the error message to help diagnose what is going
    on.
  ........
................

Modified:
    cxf/branches/2.3.x-fixes/   (props changed)
    cxf/branches/2.3.x-fixes/api/src/main/java/org/apache/cxf/databinding/AbstractDataBinding.java

Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Dec  8 04:36:43 2011
@@ -1,2 +1,2 @@
-/cxf/branches/2.4.x-fixes:1210532,1211549
+/cxf/branches/2.4.x-fixes:1210532,1211190,1211549
 /cxf/trunk:1210527

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

Modified: cxf/branches/2.3.x-fixes/api/src/main/java/org/apache/cxf/databinding/AbstractDataBinding.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/api/src/main/java/org/apache/cxf/databinding/AbstractDataBinding.java?rev=1211755&r1=1211754&r2=1211755&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/api/src/main/java/org/apache/cxf/databinding/AbstractDataBinding.java
(original)
+++ cxf/branches/2.3.x-fixes/api/src/main/java/org/apache/cxf/databinding/AbstractDataBinding.java
Thu Dec  8 04:36:43 2011
@@ -27,6 +27,7 @@ import java.util.Set;
 
 import javax.annotation.Resource;
 import javax.xml.XMLConstants;
+import javax.xml.namespace.QName;
 import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.stream.XMLStreamException;
 import javax.xml.transform.dom.DOMSource;
@@ -95,15 +96,17 @@ public abstract class AbstractDataBindin
          * Sanity check. The document has to remotely resemble a schema.
          */
         if (!XMLConstants.W3C_XML_SCHEMA_NS_URI.equals(d.getDocumentElement().getNamespaceURI()))
{
+            QName qn = DOMUtils.getElementQName(d.getDocumentElement());
             throw new RuntimeException("Invalid schema document passed to "
                                        + "AbstractDataBinding.addSchemaDocument, "
-                                       + "not in W3C schema namespace");
+                                       + "not in W3C schema namespace: " + qn);
         }
 
         if (!"schema".equals(d.getDocumentElement().getLocalName())) {
+            QName qn = DOMUtils.getElementQName(d.getDocumentElement());
             throw new RuntimeException("Invalid schema document passed to "
                                        + "AbstractDataBinding.addSchemaDocument, "
-                                       + "document element isn't 'schema'");
+                                       + "document element isn't 'schema': " + qn);
         }
 
         String ns = d.getDocumentElement().getAttribute("targetNamespace");



Mime
View raw message