You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xmlbeans.apache.org by ce...@apache.org on 2005/03/17 02:11:07 UTC
svn commit: r157842 - in xmlbeans/trunk/src:
store/org/apache/xmlbeans/impl/store/Saver.java
tools/org/apache/xmlbeans/impl/inst2xsd/Inst2Xsd.java
Author: cezar
Date: Wed Mar 16 17:11:06 2005
New Revision: 157842
URL: http://svn.apache.org/viewcvs?view=rev&rev=157842
Log:
Inst2xsd fix when validation was enabled, and SAX output of namespaces.
Modified:
xmlbeans/trunk/src/store/org/apache/xmlbeans/impl/store/Saver.java
xmlbeans/trunk/src/tools/org/apache/xmlbeans/impl/inst2xsd/Inst2Xsd.java
Modified: xmlbeans/trunk/src/store/org/apache/xmlbeans/impl/store/Saver.java
URL: http://svn.apache.org/viewcvs/xmlbeans/trunk/src/store/org/apache/xmlbeans/impl/store/Saver.java?view=diff&r1=157841&r2=157842
==============================================================================
--- xmlbeans/trunk/src/store/org/apache/xmlbeans/impl/store/Saver.java (original)
+++ xmlbeans/trunk/src/store/org/apache/xmlbeans/impl/store/Saver.java Wed Mar 16 17:11:06 2005
@@ -2046,9 +2046,9 @@
}
if (prefix == null || prefix.length() == 0)
- _attributes.addAttribute( "", "", "xmlns", "CDATA", uri );
+ _attributes.addAttribute( "http://www.w3.org/2000/xmlns/", "", "xmlns", "CDATA", uri );
else
- _attributes.addAttribute( "", "", "xmlns:" + prefix, "CDATA", uri );
+ _attributes.addAttribute( "http://www.w3.org/2000/xmlns/", "", "xmlns:" + prefix, "CDATA", uri );
}
}
Modified: xmlbeans/trunk/src/tools/org/apache/xmlbeans/impl/inst2xsd/Inst2Xsd.java
URL: http://svn.apache.org/viewcvs/xmlbeans/trunk/src/tools/org/apache/xmlbeans/impl/inst2xsd/Inst2Xsd.java?view=diff&r1=157841&r2=157842
==============================================================================
--- xmlbeans/trunk/src/tools/org/apache/xmlbeans/impl/inst2xsd/Inst2Xsd.java (original)
+++ xmlbeans/trunk/src/tools/org/apache/xmlbeans/impl/inst2xsd/Inst2Xsd.java Wed Mar 16 17:11:06 2005
@@ -336,17 +336,15 @@
for (int i = 0; i < instances.length; i++)
{
- String instance = instances[i].toString();
-
XmlObject xobj;
try
{
- xobj = sLoader.parse( instance, null, new XmlOptions().setLoadLineNumbers() );
+ xobj = sLoader.parse( instances[i].newXMLStreamReader(), null, new XmlOptions().setLoadLineNumbers() );
}
catch (XmlException e)
{
- System.out.println("Error:\n" + instance + " not loadable: " + e);
+ System.out.println("Error:\n" + instances[i].documentProperties().getSourceName() + " not loadable: " + e);
e.printStackTrace(System.out);
result = false;
continue;
@@ -356,7 +354,7 @@
if (xobj.schemaType() == XmlObject.type)
{
- System.out.println(instance + " NOT valid. ");
+ System.out.println(instances[i].documentProperties().getSourceName() + " NOT valid. ");
System.out.println(" Document type not found." );
result = false;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xmlbeans.apache.org
For additional commands, e-mail: commits-help@xmlbeans.apache.org