[jboss-svn-commits] JBoss Common SVN: r4287 - in jbossxb/trunk/src/main/java/org/jboss/xb/binding: sunday/unmarshalling and 1 other directory.

[jboss-svn-commits at lists.jboss.org]

Author: alex.loubyansky at jboss.com
Date: 2010-04-21 09:32:32 -0400 (Wed, 21 Apr 2010)
New Revision: 4287

Modified:
   jbossxb/trunk/src/main/java/org/jboss/xb/binding/parser/sax/SaxJBossXBParser.java
   jbossxb/trunk/src/main/java/org/jboss/xb/binding/sunday/unmarshalling/SundayContentHandler.java
Log:
JBXB-246

Modified: jbossxb/trunk/src/main/java/org/jboss/xb/binding/parser/sax/SaxJBossXBParser.java
===================================================================
--- jbossxb/trunk/src/main/java/org/jboss/xb/binding/parser/sax/SaxJBossXBParser.java	2010-04-21 12:32:17 UTC (rev 4286)
+++ jbossxb/trunk/src/main/java/org/jboss/xb/binding/parser/sax/SaxJBossXBParser.java	2010-04-21 13:32:32 UTC (rev 4287)
@@ -192,7 +192,18 @@
       }
       catch(Throwable e)
       {
-         throw new JBossXBException("Failed to parse source: " + e.getMessage(), e);
+         String str;
+         if(locator != null)
+            str = getLocationAsString(null);
+         else if(source.getSystemId() != null)
+            str = source.getSystemId();
+         else if(source.getByteStream() != null)
+            str = source.getByteStream().toString();
+         else if(source.getCharacterStream() != null)
+            str = source.getCharacterStream().toString();
+         else
+            str = "";
+         throw new JBossXBException("Failed to parse source: " + str, e);
       }
    }
 
@@ -206,6 +217,8 @@
          String id = locator.getSystemId();
          if (id == null)
             id = locator.getPublicId();
+         if (id == null)
+            id = "xml_stream";
          buffer.append(id).append('@');
          buffer.append(locator.getLineNumber());
          buffer.append(',');

Modified: jbossxb/trunk/src/main/java/org/jboss/xb/binding/sunday/unmarshalling/SundayContentHandler.java
===================================================================
--- jbossxb/trunk/src/main/java/org/jboss/xb/binding/sunday/unmarshalling/SundayContentHandler.java	2010-04-21 12:32:17 UTC (rev 4286)
+++ jbossxb/trunk/src/main/java/org/jboss/xb/binding/sunday/unmarshalling/SundayContentHandler.java	2010-04-21 13:32:32 UTC (rev 4287)
@@ -178,13 +178,13 @@
             if(schemaBinding != null)
                particle = schemaBinding.getElementParticle(startName);
             else
-               throw new JBossXBRuntimeException("Failed to resolve schema nsURI=" + namespaceURI + " location=" + schemaLocation);
+               throw new JBossXBRuntimeException("Failed to resolve schema binding for QName " + startName + " with schemaLocation=" + schemaLocation);
          }
 
          if(particle == null)
          {
             StringBuffer sb = new StringBuffer();
-            sb.append("Failed to resolve global element ");
+            sb.append("Failed to resolve global element binding ");
             sb.append(startName);
             if(schemaBinding == null && schemaResolver == null)
                sb.append(". Neither SchemaBinding nor SchemaBindingResolver are available.");