Author: veithen
Date: Wed Sep 29 19:55:20 2010
New Revision: 1002830
URL: http://svn.apache.org/viewvc?rev=1002830&view=rev
Log:
Correctly normalize the behavior of isCharacters for XLXP2.
Added:
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/util/stax/dialect/XLXPStreamReaderWrapper.java
(with props)
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/util/stax/dialect/XLXP1StreamReaderWrapper.java
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/util/stax/dialect/XLXP2Dialect.java
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/util/stax/dialect/XLXP1StreamReaderWrapper.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/util/stax/dialect/XLXP1StreamReaderWrapper.java?rev=1002830&r1=1002829&r2=1002830&view=diff
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/util/stax/dialect/XLXP1StreamReaderWrapper.java
(original)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/util/stax/dialect/XLXP1StreamReaderWrapper.java
Wed Sep 29 19:55:20 2010
@@ -21,10 +21,7 @@ package org.apache.axiom.util.stax.diale
import javax.xml.stream.XMLStreamReader;
-import org.apache.axiom.ext.stax.DelegatingXMLStreamReader;
-import org.apache.axiom.util.stax.wrapper.XMLStreamReaderWrapper;
-
-class XLXP1StreamReaderWrapper extends XMLStreamReaderWrapper implements
DelegatingXMLStreamReader {
+class XLXP1StreamReaderWrapper extends XLXPStreamReaderWrapper {
public XLXP1StreamReaderWrapper(XMLStreamReader parent) {
super(parent);
}
@@ -34,13 +31,4 @@ class XLXP1StreamReaderWrapper extends X
String encoding = super.getEncoding();
return encoding == null || encoding.length() == 0 ? null : encoding;
}
-
- public boolean isCharacters() {
- // XLXP returns true for SPACE events as well; this is not correct
- return getEventType() == CHARACTERS;
- }
-
- public XMLStreamReader getParent() {
- return super.getParent();
- }
}
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/util/stax/dialect/XLXP2Dialect.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/util/stax/dialect/XLXP2Dialect.java?rev=1002830&r1=1002829&r2=1002830&view=diff
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/util/stax/dialect/XLXP2Dialect.java
(original)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/util/stax/dialect/XLXP2Dialect.java
Wed Sep 29 19:55:20 2010
@@ -55,7 +55,8 @@ class XLXP2Dialect extends AbstractStAXD
public XMLStreamReader normalize(XMLStreamReader reader) {
// XLXP2's getNamespaceContext implementation is broken
- return new NamespaceContextCorrectingXMLStreamReaderWrapper(reader);
+ return new NamespaceContextCorrectingXMLStreamReaderWrapper(
+ new XLXPStreamReaderWrapper(reader));
}
public XMLStreamWriter normalize(XMLStreamWriter writer) {
Added:
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/util/stax/dialect/XLXPStreamReaderWrapper.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/util/stax/dialect/XLXPStreamReaderWrapper.java?rev=1002830&view=auto
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/util/stax/dialect/XLXPStreamReaderWrapper.java
(added)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/util/stax/dialect/XLXPStreamReaderWrapper.java
Wed Sep 29 19:55:20 2010
@@ -0,0 +1,39 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.axiom.util.stax.dialect;
+
+import javax.xml.stream.XMLStreamReader;
+
+import org.apache.axiom.ext.stax.DelegatingXMLStreamReader;
+import org.apache.axiom.util.stax.wrapper.XMLStreamReaderWrapper;
+
+public class XLXPStreamReaderWrapper extends XMLStreamReaderWrapper implements
DelegatingXMLStreamReader {
+ public XLXPStreamReaderWrapper(XMLStreamReader parent) {
+ super(parent);
+ }
+
+ public boolean isCharacters() {
+ // XLXP returns true for SPACE events as well; this is not correct
+ return getEventType() == CHARACTERS;
+ }
+
+ public XMLStreamReader getParent() {
+ return super.getParent();
+ }
+}
Propchange:
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/util/stax/dialect/XLXPStreamReaderWrapper.java
------------------------------------------------------------------------------
svn:eol-style = native
