You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by ve...@apache.org on 2012/04/23 21:04:51 UTC
svn commit: r1329373 - in
/webservices/commons/trunk/modules/axiom/modules/axiom-api/src:
main/java/org/apache/axiom/util/stax/dialect/
test/java/org/apache/axiom/util/stax/dialect/
Author: veithen
Date: Mon Apr 23 19:04:51 2012
New Revision: 1329373
URL: http://svn.apache.org/viewvc?rev=1329373&view=rev
Log:
AXIOM-407: Restore the default behavior of Woodstox 3, which was to report whitespace in prolog.
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/util/stax/dialect/Woodstox4Dialect.java
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/DialectTestSuite.java
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/TestGetTextInProlog.java
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/util/stax/dialect/Woodstox4Dialect.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/util/stax/dialect/Woodstox4Dialect.java?rev=1329373&r1=1329372&r2=1329373&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/util/stax/dialect/Woodstox4Dialect.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/util/stax/dialect/Woodstox4Dialect.java Mon Apr 23 19:04:51 2012
@@ -68,6 +68,9 @@ class Woodstox4Dialect extends AbstractS
}
public XMLInputFactory normalize(XMLInputFactory factory) {
+ // Woodstox 3 used to report whitespace in prolog, but this is no longer the case by default
+ // in Woodstox 4. The following property changes that behavior.
+ factory.setProperty("org.codehaus.stax2.reportPrologWhitespace", Boolean.TRUE);
return new Woodstox4InputFactoryWrapper(factory, this, wstx276);
}
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/DialectTestSuite.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/DialectTestSuite.java?rev=1329373&r1=1329372&r2=1329373&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/DialectTestSuite.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/DialectTestSuite.java Mon Apr 23 19:04:51 2012
@@ -48,6 +48,9 @@ public class DialectTestSuite extends Te
addParsersFromDirectory(builder, new File("parsers"));
addParsersFromDirectory(builder, new File(targetDir, "parsers"));
+ // SJSXP doesn't report whitespace in prolog
+ builder.exclude(TestGetTextInProlog.class, "(implementation=sjsxp-1.0.1.jar)");
+
return builder.build();
}
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/TestGetTextInProlog.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/TestGetTextInProlog.java?rev=1329373&r1=1329372&r2=1329373&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/TestGetTextInProlog.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/TestGetTextInProlog.java Mon Apr 23 19:04:51 2012
@@ -32,11 +32,7 @@ public class TestGetTextInProlog extends
XMLInputFactory factory = staxImpl.newNormalizedXMLInputFactory();
XMLStreamReader reader = factory.createXMLStreamReader(
new StringReader("<?xml version=\"1.0\"?>\r\n<root/>"));
- if (reader.next() == XMLStreamReader.START_ELEMENT) {
- System.out.println("Warning: " + staxImpl.getDialect().getName()
- + " doesn't report character data in prolog");
- } else {
- assertEquals("\n", reader.getText());
- }
+ assertEquals(XMLStreamReader.SPACE, reader.next());
+ assertEquals("\n", reader.getText());
}
}