[FOray-commit] SF.net SVN: foray: [9351] trunk/foray

[<vic...@us...>]

Revision: 9351
          http://svn.sourceforge.net/foray/?rev=9351&view=rev
Author:   victormote
Date:     2007-05-04 12:28:08 -0700 (Fri, 04 May 2007)

Log Message:
-----------
1. Upgrade the stax implementation to 1.2.0.
2. Add the stax source to the repository.
3. Fix mismatch between QName and XMLStreamReader about how null namespaces are handled.

Modified Paths:
--------------
    trunk/foray/foray-pretty/.classpath
    trunk/foray/foray-pretty/src/java/org/foray/pretty/FOrayXDiff.java
    trunk/foray/lib/readme.txt

Added Paths:
-----------
    trunk/foray/lib/stax-1.2.0.jar
    trunk/foray/lib-build/stax/
    trunk/foray/lib-build/stax/stax-src-1.2.0.zip

Removed Paths:
-------------
    trunk/foray/lib/stax-1.2.0_rc2-dev.jar

Modified: trunk/foray/foray-pretty/.classpath
===================================================================
--- trunk/foray/foray-pretty/.classpath	2007-05-04 17:31:39 UTC (rev 9350)
+++ trunk/foray/foray-pretty/.classpath	2007-05-04 19:28:08 UTC (rev 9351)
@@ -4,9 +4,9 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/FOrayCommon"/>
 	<classpathentry kind="lib" path="/FOray Lib/resolver.jar"/>
-	<classpathentry kind="lib" path="/FOray Lib/stax-1.2.0_rc2-dev.jar"/>
-	<classpathentry kind="lib" path="/FOray Lib/stax-api-1.0.1.jar"/>
+	<classpathentry kind="lib" path="/FOray Lib/stax-api-1.0.1.jar" sourcepath="/FOray Lib-Build/stax/stax-src-1.2.0.zip"/>
 	<classpathentry kind="lib" path="/FOray Lib/xercesImpl-2.7.1.jar"/>
 	<classpathentry kind="lib" path="/FOray Lib/xml-apis-1.3.02.jar"/>
+	<classpathentry kind="lib" path="/FOray Lib/stax-1.2.0.jar" sourcepath="/FOray Lib-Build/stax/stax-src-1.2.0.zip"/>
 	<classpathentry kind="output" path="build/eclipse"/>
 </classpath>

Modified: trunk/foray/foray-pretty/src/java/org/foray/pretty/FOrayXDiff.java
===================================================================
--- trunk/foray/foray-pretty/src/java/org/foray/pretty/FOrayXDiff.java	2007-05-04 17:31:39 UTC (rev 9350)
+++ trunk/foray/foray-pretty/src/java/org/foray/pretty/FOrayXDiff.java	2007-05-04 19:28:08 UTC (rev 9351)
@@ -518,11 +518,19 @@
                     this.readers[0].getAttributeName(i);
             final String baseAttributeValue =
                     this.readers[0].getAttributeValue(i);
+            String baseNamespaceURI = baseAttributeName.getNamespaceURI();
+            /* QName maps null attribute names to "", but the reader doesn't
+             * seem to know about that and treates "" as different from null.
+             * Therefore we must change it back to null for them to be seen
+             * as equivalent. */
+            if ("".equals(baseNamespaceURI)) {
+                baseNamespaceURI = null;
+            }
             /* Iterate through each of the other documents. */
             for (int j = 1; j < this.readers.length; j++) {
                 final XMLStreamReader reader = this.readers[j];
                 final String compareAttributeValue = reader.getAttributeValue(
-                        baseAttributeName.getNamespaceURI(),
+                        baseNamespaceURI,
                         baseAttributeName.getLocalPart());
                 if (compareAttributeValue == null) {
                     message("Attribute not found: "

Modified: trunk/foray/lib/readme.txt
===================================================================
--- trunk/foray/lib/readme.txt	2007-05-04 17:31:39 UTC (rev 9350)
+++ trunk/foray/lib/readme.txt	2007-05-04 19:28:08 UTC (rev 9351)
@@ -23,6 +23,13 @@
 -------------
 
 
+stax-*.jar
+----------
+The Reference Implementation of the Streaming API for XML, a pull-parsing
+  standard.
+Last download: http://stax.codehaus.org/
+
+
 xalan-*.jar (version 2.4.1)
 ---------------------------
 XSLT processor from xml.apache.org

Added: trunk/foray/lib/stax-1.2.0.jar
===================================================================
(Binary files differ)


Property changes on: trunk/foray/lib/stax-1.2.0.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: trunk/foray/lib/stax-1.2.0_rc2-dev.jar
===================================================================
(Binary files differ)

Added: trunk/foray/lib-build/stax/stax-src-1.2.0.zip
===================================================================
(Binary files differ)


Property changes on: trunk/foray/lib-build/stax/stax-src-1.2.0.zip
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.