Author: veithen
Date: Sat Jul 25 16:53:47 2009
New Revision: 797796
URL: http://svn.apache.org/viewvc?rev=797796&view=rev
Log:
Moved the XMLStreamReader wrapper (previously used in the tests) to
org.apache.axiom.util.stax.dialect. Since this may change the XMLStreamReader
implementation class seen by client code, did a full regression test with Axis2.
Added:
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/util/stax/dialect/WoodstoxStreamReaderWrapper.java
- copied, changed from r795448,
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/test/java/org/apache/axiom/om/impl/WoodstoxXMLStreamReaderWrapper.java
Removed:
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/test/java/org/apache/axiom/om/impl/WoodstoxXMLStreamReaderWrapper.java
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/util/stax/dialect/WoodstoxDialect.java
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/test/java/org/apache/axiom/om/impl/OMStAXWrapperConformanceTestCase.java
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/util/stax/dialect/WoodstoxDialect.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/util/stax/dialect/WoodstoxDialect.java?rev=797796&r1=797795&r2=797796&view=diff
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/util/stax/dialect/WoodstoxDialect.java
(original)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/util/stax/dialect/WoodstoxDialect.java
Sat Jul 25 16:53:47 2009
@@ -21,8 +21,10 @@
import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLOutputFactory;
+import javax.xml.stream.XMLStreamReader;
+import javax.xml.stream.XMLStreamWriter;
-class WoodstoxDialect implements StAXDialect {
+class WoodstoxDialect extends AbstractStAXDialect {
public static final WoodstoxDialect INSTANCE = new WoodstoxDialect();
public String getName() {
@@ -34,8 +36,16 @@
factory.setProperty(XMLInputFactory.IS_COALESCING, Boolean.FALSE);
}
+ public XMLStreamReader normalize(XMLStreamReader reader) {
+ return new WoodstoxStreamReaderWrapper(reader);
+ }
+
+ public XMLStreamWriter normalize(XMLStreamWriter writer) {
+ return writer;
+ }
+
public XMLInputFactory normalize(XMLInputFactory factory) {
- return factory;
+ return new NormalizingXMLInputFactoryWrapper(factory, this);
}
public XMLOutputFactory normalize(XMLOutputFactory factory) {
Copied:
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/util/stax/dialect/WoodstoxStreamReaderWrapper.java
(from r795448,
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/test/java/org/apache/axiom/om/impl/WoodstoxXMLStreamReaderWrapper.java)
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/util/stax/dialect/WoodstoxStreamReaderWrapper.java?p2=webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/util/stax/dialect/WoodstoxStreamReaderWrapper.java&p1=webservices/commons/trunk/modules/axiom/modules/axiom-api/src/test/java/org/apache/axiom/om/impl/WoodstoxXMLStreamReaderWrapper.java&r1=795448&r2=797796&rev=797796&view=diff
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/test/java/org/apache/axiom/om/impl/WoodstoxXMLStreamReaderWrapper.java
(original)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/util/stax/dialect/WoodstoxStreamReaderWrapper.java
Sat Jul 25 16:53:47 2009
@@ -16,22 +16,21 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.axiom.om.impl;
+package org.apache.axiom.util.stax.dialect;
import javax.xml.stream.XMLStreamReader;
-import javax.xml.stream.util.StreamReaderDelegate;
-/**
- * Wrapper fixing known issues in the Woodstox parser. We need this to avoid
- * false positives in {...@link
org.apache.axiom.util.stax.XMLStreamReaderComparator}.
- * Once the issues are fixed in Woodstox we can remove this class.
- */
-public class WoodstoxXMLStreamReaderWrapper extends StreamReaderDelegate {
- public WoodstoxXMLStreamReaderWrapper(XMLStreamReader reader) {
+import org.apache.axiom.util.stax.XMLStreamReaderWrapper;
+
+class WoodstoxStreamReaderWrapper extends XMLStreamReaderWrapper {
+ public WoodstoxStreamReaderWrapper(XMLStreamReader reader) {
super(reader);
}
public boolean isCharacters() {
+ // TODO: in the dialect detection we should take into account the
Woodstox version,
+ // so that we can avoid creating the wrapper for Woodstox
versions where this
+ // issue has been fixed
// This addresses WSTX-201:
return getEventType() == CHARACTERS;
}
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/test/java/org/apache/axiom/om/impl/OMStAXWrapperConformanceTestCase.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-api/src/test/java/org/apache/axiom/om/impl/OMStAXWrapperConformanceTestCase.java?rev=797796&r1=797795&r2=797796&view=diff
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/test/java/org/apache/axiom/om/impl/OMStAXWrapperConformanceTestCase.java
(original)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/test/java/org/apache/axiom/om/impl/OMStAXWrapperConformanceTestCase.java
Sat Jul 25 16:53:47 2009
@@ -50,8 +50,7 @@
InputStream in1 = getTestResource(file);
InputStream in2 = getTestResource(file);
try {
- XMLStreamReader expected = new WoodstoxXMLStreamReaderWrapper(
- StAXUtils.createXMLStreamReader(in1));
+ XMLStreamReader expected = StAXUtils.createXMLStreamReader(in1);
// Skip to document element. Note that nextTag is not appropriate
here because
// there could be a DTD event.
while (expected.next() != XMLStreamReader.START_ELEMENT) {
