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/07/19 00:04:45 UTC
svn commit: r1363144 - in /webservices/axiom/branches/AXIOM-435/modules:
axiom-api/src/main/java/org/apache/axiom/om/impl/builder/
axiom-api/src/main/java/org/apache/axiom/om/impl/serialize/
axiom-common-impl/src/main/java/org/apache/axiom/om/impl/comm...
Author: veithen
Date: Wed Jul 18 22:04:44 2012
New Revision: 1363144
URL: http://svn.apache.org/viewvc?rev=1363144&view=rev
Log:
More unfinished code.
Added:
webservices/axiom/branches/AXIOM-435/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/container/SAXSerializer.java (with props)
Modified:
webservices/axiom/branches/AXIOM-435/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/builder/SAXOMBuilder.java
webservices/axiom/branches/AXIOM-435/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/serialize/OMXMLReader.java
webservices/axiom/branches/AXIOM-435/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/SwitchingWrapper.java
webservices/axiom/branches/AXIOM-435/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/factory/AbstractOMMetaFactory.java
webservices/axiom/branches/AXIOM-435/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/factory/SAXOMXMLParserWrapper.java
webservices/axiom/branches/AXIOM-435/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMEntityReferenceImpl.java
webservices/axiom/branches/AXIOM-435/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/AxiomTestCase.java
webservices/axiom/branches/AXIOM-435/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/container/TestGetSAXSource.java
webservices/axiom/branches/AXIOM-435/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/container/TestGetXMLStreamReader.java
webservices/axiom/branches/AXIOM-435/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/container/TestSerialize.java
webservices/axiom/branches/AXIOM-435/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap11/faultreason/TestGetTextWithCDATA.java
Modified: webservices/axiom/branches/AXIOM-435/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/builder/SAXOMBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/AXIOM-435/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/builder/SAXOMBuilder.java?rev=1363144&r1=1363143&r2=1363144&view=diff
==============================================================================
--- webservices/axiom/branches/AXIOM-435/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/builder/SAXOMBuilder.java (original)
+++ webservices/axiom/branches/AXIOM-435/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/builder/SAXOMBuilder.java Wed Jul 18 22:04:44 2012
@@ -59,6 +59,8 @@ public class SAXOMBuilder extends Defaul
List prefixMappings = new ArrayList();
int textNodeType = OMNode.TEXT_NODE;
+
+ private boolean inEntityReference;
public SAXOMBuilder(OMFactory factory, boolean expandEntityReferences) {
this.factory = (OMFactoryEx)factory;
@@ -217,7 +219,9 @@ public class SAXOMBuilder extends Defaul
public void characters(char[] ch, int start, int length)
throws SAXException {
- characterData(ch, start, length, textNodeType);
+ if (!inEntityReference) {
+ characterData(ch, start, length, textNodeType);
+ }
}
public void ignorableWhitespace(char[] ch, int start, int length)
@@ -242,9 +246,14 @@ public class SAXOMBuilder extends Defaul
}
public void startEntity(String name) throws SAXException {
+ if (!expandEntityReferences) {
+ addNode(factory.createOMEntityReference(getContainer(), name, true));
+ inEntityReference = true;
+ }
}
public void endEntity(String name) throws SAXException {
+ inEntityReference = false;
}
public OMDocument getDocument() {
Modified: webservices/axiom/branches/AXIOM-435/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/serialize/OMXMLReader.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/AXIOM-435/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/serialize/OMXMLReader.java?rev=1363144&r1=1363143&r2=1363144&view=diff
==============================================================================
--- webservices/axiom/branches/AXIOM-435/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/serialize/OMXMLReader.java (original)
+++ webservices/axiom/branches/AXIOM-435/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/serialize/OMXMLReader.java Wed Jul 18 22:04:44 2012
@@ -31,6 +31,7 @@ import org.apache.axiom.om.OMComment;
import org.apache.axiom.om.OMContainer;
import org.apache.axiom.om.OMDocument;
import org.apache.axiom.om.OMElement;
+import org.apache.axiom.om.OMEntityReference;
import org.apache.axiom.om.OMNamespace;
import org.apache.axiom.om.OMNode;
import org.apache.axiom.om.OMProcessingInstruction;
@@ -177,6 +178,9 @@ public class OMXMLReader extends Abstrac
for (Iterator it = parent.getChildren(); it.hasNext(); ) {
OMNode node = (OMNode)it.next();
switch (node.getType()) {
+ case OMNode.DTD_NODE:
+ // DTD nodes are silently skipped
+ break;
case OMNode.ELEMENT_NODE:
generateEvents((OMElement)node);
break;
@@ -204,6 +208,12 @@ public class OMXMLReader extends Abstrac
case OMNode.PI_NODE:
OMProcessingInstruction pi = (OMProcessingInstruction)node;
contentHandler.processingInstruction(pi.getTarget(), pi.getValue());
+ break;
+ case OMNode.ENTITY_REFERENCE_NODE:
+ contentHandler.skippedEntity(((OMEntityReference)node).getName());
+ break;
+ default:
+ throw new IllegalStateException("Unrecognized node type " + node.getType());
}
}
}
Modified: webservices/axiom/branches/AXIOM-435/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/SwitchingWrapper.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/AXIOM-435/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/SwitchingWrapper.java?rev=1363144&r1=1363143&r2=1363144&view=diff
==============================================================================
--- webservices/axiom/branches/AXIOM-435/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/SwitchingWrapper.java (original)
+++ webservices/axiom/branches/AXIOM-435/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/SwitchingWrapper.java Wed Jul 18 22:04:44 2012
@@ -45,6 +45,7 @@ import org.apache.axiom.om.OMDataSource;
import org.apache.axiom.om.OMDocType;
import org.apache.axiom.om.OMDocument;
import org.apache.axiom.om.OMElement;
+import org.apache.axiom.om.OMEntityReference;
import org.apache.axiom.om.OMException;
import org.apache.axiom.om.OMNamespace;
import org.apache.axiom.om.OMNode;
@@ -276,12 +277,14 @@ class SwitchingWrapper extends AbstractX
if (parser != null && currentEvent != END_DOCUMENT) {
return parser.getLocalName();
} else {
- if ((currentEvent == START_ELEMENT)
- || (currentEvent == END_ELEMENT)
- || (currentEvent == ENTITY_REFERENCE)) {
- return ((OMElement) lastNode).getLocalName();
- } else {
- throw new IllegalStateException();
+ switch (currentEvent) {
+ case START_ELEMENT:
+ case END_ELEMENT:
+ return ((OMElement)lastNode).getLocalName();
+ case ENTITY_REFERENCE:
+ return ((OMEntityReference)lastNode).getName();
+ default:
+ throw new IllegalStateException();
}
}
}
Modified: webservices/axiom/branches/AXIOM-435/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/factory/AbstractOMMetaFactory.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/AXIOM-435/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/factory/AbstractOMMetaFactory.java?rev=1363144&r1=1363143&r2=1363144&view=diff
==============================================================================
--- webservices/axiom/branches/AXIOM-435/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/factory/AbstractOMMetaFactory.java (original)
+++ webservices/axiom/branches/AXIOM-435/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/factory/AbstractOMMetaFactory.java Wed Jul 18 22:04:44 2012
@@ -113,12 +113,12 @@ public abstract class AbstractOMMetaFact
public OMXMLParserWrapper createOMBuilder(OMFactory omFactory, DOMSource source,
boolean expandEntityReferences) {
- return new StAXOMBuilder(omFactory, new DOMXMLStreamReader(((DOMSource)source).getNode(), expandEntityReferences));
+ return new StAXOMBuilder(omFactory, new DOMXMLStreamReader(source.getNode(), expandEntityReferences));
}
public OMXMLParserWrapper createOMBuilder(OMFactory omFactory, SAXSource source,
boolean expandEntityReferences) {
- return new SAXOMXMLParserWrapper(omFactory, (SAXSource)source);
+ return new SAXOMXMLParserWrapper(omFactory, source, expandEntityReferences);
}
public OMXMLParserWrapper createOMBuilder(StAXParserConfiguration configuration,
Modified: webservices/axiom/branches/AXIOM-435/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/factory/SAXOMXMLParserWrapper.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/AXIOM-435/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/factory/SAXOMXMLParserWrapper.java?rev=1363144&r1=1363143&r2=1363144&view=diff
==============================================================================
--- webservices/axiom/branches/AXIOM-435/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/factory/SAXOMXMLParserWrapper.java (original)
+++ webservices/axiom/branches/AXIOM-435/modules/axiom-common-impl/src/main/java/org/apache/axiom/om/impl/common/factory/SAXOMXMLParserWrapper.java Wed Jul 18 22:04:44 2012
@@ -44,16 +44,18 @@ import org.xml.sax.XMLReader;
public class SAXOMXMLParserWrapper implements OMXMLParserWrapper {
private final OMFactory factory;
private final SAXSource source;
+ private final boolean expandEntityReferences;
private OMDocument document;
- public SAXOMXMLParserWrapper(OMFactory factory, SAXSource source) {
+ public SAXOMXMLParserWrapper(OMFactory factory, SAXSource source, boolean expandEntityReferences) {
this.factory = factory;
this.source = source;
+ this.expandEntityReferences = expandEntityReferences;
}
public OMDocument getDocument() {
if (document == null) {
- SAXOMBuilder builder = new SAXOMBuilder(factory);
+ SAXOMBuilder builder = new SAXOMBuilder(factory, expandEntityReferences);
XMLReader reader = source.getXMLReader();
reader.setContentHandler(builder);
try {
Modified: webservices/axiom/branches/AXIOM-435/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMEntityReferenceImpl.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/AXIOM-435/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMEntityReferenceImpl.java?rev=1363144&r1=1363143&r2=1363144&view=diff
==============================================================================
--- webservices/axiom/branches/AXIOM-435/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMEntityReferenceImpl.java (original)
+++ webservices/axiom/branches/AXIOM-435/modules/axiom-impl/src/main/java/org/apache/axiom/om/impl/llom/OMEntityReferenceImpl.java Wed Jul 18 22:04:44 2012
@@ -36,8 +36,7 @@ public class OMEntityReferenceImpl exten
}
public int getType() {
- // TODO
- throw new UnsupportedOperationException();
+ return OMNode.ENTITY_REFERENCE_NODE;
}
public void internalSerialize(XMLStreamWriter writer, boolean cache) throws XMLStreamException {
@@ -45,8 +44,7 @@ public class OMEntityReferenceImpl exten
}
public String getName() {
- // TODO
- throw new UnsupportedOperationException();
+ return name;
}
OMNode clone(OMCloneOptions options, OMContainer targetParent) {
Modified: webservices/axiom/branches/AXIOM-435/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/AxiomTestCase.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/AXIOM-435/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/AxiomTestCase.java?rev=1363144&r1=1363143&r2=1363144&view=diff
==============================================================================
--- webservices/axiom/branches/AXIOM-435/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/AxiomTestCase.java (original)
+++ webservices/axiom/branches/AXIOM-435/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/AxiomTestCase.java Wed Jul 18 22:04:44 2012
@@ -20,12 +20,28 @@ package org.apache.axiom.ts;
import java.util.Iterator;
+import javax.xml.stream.XMLInputFactory;
+
import org.apache.axiom.om.OMContainer;
import org.apache.axiom.om.OMMetaFactory;
+import org.apache.axiom.om.util.StAXParserConfiguration;
import org.apache.axiom.testutils.suite.TestCaseEx;
+import org.apache.axiom.util.stax.dialect.StAXDialect;
import org.apache.commons.io.output.NullOutputStream;
public abstract class AxiomTestCase extends TestCaseEx {
+ protected static final StAXParserConfiguration TEST_PARSER_CONFIGURATION = new StAXParserConfiguration() {
+ public XMLInputFactory configure(XMLInputFactory factory, StAXDialect dialect) {
+ // For the tests, preserve as much of the syntactic structure of the test documents
+ factory.setProperty(XMLInputFactory.IS_REPLACING_ENTITY_REFERENCES, Boolean.FALSE);
+ return dialect.enableCDataReporting(factory);
+ }
+
+ public String toString() {
+ return "PRESERVE_CDATA_SECTIONS";
+ }
+ };
+
protected final OMMetaFactory metaFactory;
public AxiomTestCase(OMMetaFactory metaFactory) {
Added: webservices/axiom/branches/AXIOM-435/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/container/SAXSerializer.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/AXIOM-435/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/container/SAXSerializer.java?rev=1363144&view=auto
==============================================================================
--- webservices/axiom/branches/AXIOM-435/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/container/SAXSerializer.java (added)
+++ webservices/axiom/branches/AXIOM-435/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/container/SAXSerializer.java Wed Jul 18 22:04:44 2012
@@ -0,0 +1,29 @@
+/*
+ * 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.ts.om.container;
+
+import org.apache.xml.serializer.ToXMLStream;
+import org.xml.sax.SAXException;
+
+public class SAXSerializer extends ToXMLStream {
+ public void skippedEntity(String name) throws SAXException {
+ // The Xalan serializer ignores skippedEntity events; output them as entity references
+ entityReference(name);
+ }
+}
Propchange: webservices/axiom/branches/AXIOM-435/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/container/SAXSerializer.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: webservices/axiom/branches/AXIOM-435/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/container/TestGetSAXSource.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/AXIOM-435/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/container/TestGetSAXSource.java?rev=1363144&r1=1363143&r2=1363144&view=diff
==============================================================================
--- webservices/axiom/branches/AXIOM-435/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/container/TestGetSAXSource.java (original)
+++ webservices/axiom/branches/AXIOM-435/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/container/TestGetSAXSource.java Wed Jul 18 22:04:44 2012
@@ -23,18 +23,16 @@ import java.io.ByteArrayOutputStream;
import java.io.InputStream;
import javax.xml.transform.sax.SAXSource;
-import javax.xml.transform.stream.StreamResult;
import org.apache.axiom.om.AbstractTestCase;
import org.apache.axiom.om.OMMetaFactory;
import org.apache.axiom.om.OMXMLBuilderFactory;
import org.apache.axiom.om.OMXMLParserWrapper;
-import org.apache.axiom.om.util.StAXParserConfiguration;
import org.apache.axiom.testutils.conformance.ConformanceTestFile;
import org.apache.axiom.ts.ConformanceTestCase;
-import org.apache.xalan.processor.TransformerFactoryImpl;
import org.custommonkey.xmlunit.XMLAssert;
import org.custommonkey.xmlunit.XMLUnit;
+import org.xml.sax.XMLReader;
public class TestGetSAXSource extends ConformanceTestCase {
private final OMContainerFactory containerFactory;
@@ -53,15 +51,19 @@ public class TestGetSAXSource extends Co
InputStream in = getFileAsStream();
try {
OMXMLParserWrapper builder = OMXMLBuilderFactory.createOMBuilder(metaFactory.getOMFactory(),
- StAXParserConfiguration.PRESERVE_CDATA_SECTIONS, in);
+ TEST_PARSER_CONFIGURATION, in);
SAXSource source = containerFactory.getContainer(builder).getSAXSource(cache);
- StreamResult result = new StreamResult(out);
- new TransformerFactoryImpl().newTransformer().transform(source, result);
+ XMLReader xmlReader = source.getXMLReader();
+ SAXSerializer serializer = new SAXSerializer();
+ serializer.setOutputStream(out);
+ xmlReader.setContentHandler(serializer);
+ xmlReader.setProperty("http://xml.org/sax/properties/lexical-handler", serializer);
+ xmlReader.parse(source.getInputSource());
} finally {
in.close();
}
XMLAssert.assertXMLIdentical(XMLUnit.compareXML(
- AbstractTestCase.toDocumentWithoutDTD(getFileAsStream()),
- AbstractTestCase.toDocumentWithoutDTD(new ByteArrayInputStream(out.toByteArray()))), true);
+ AbstractTestCase.toDocumentWithoutDTD(getFileAsStream(), false),
+ AbstractTestCase.toDocumentWithoutDTD(new ByteArrayInputStream(out.toByteArray()), false)), true);
}
}
Modified: webservices/axiom/branches/AXIOM-435/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/container/TestGetXMLStreamReader.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/AXIOM-435/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/container/TestGetXMLStreamReader.java?rev=1363144&r1=1363143&r2=1363144&view=diff
==============================================================================
--- webservices/axiom/branches/AXIOM-435/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/container/TestGetXMLStreamReader.java (original)
+++ webservices/axiom/branches/AXIOM-435/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/container/TestGetXMLStreamReader.java Wed Jul 18 22:04:44 2012
@@ -51,9 +51,9 @@ public class TestGetXMLStreamReader exte
InputStream in1 = getFileAsStream();
InputStream in2 = getFileAsStream();
try {
- XMLStreamReader expected = StAXUtils.createXMLStreamReader(in1);
+ XMLStreamReader expected = StAXUtils.createXMLStreamReader(TEST_PARSER_CONFIGURATION, in1);
try {
- OMXMLParserWrapper builder = OMXMLBuilderFactory.createOMBuilder(metaFactory.getOMFactory(), in2);
+ OMXMLParserWrapper builder = OMXMLBuilderFactory.createOMBuilder(metaFactory.getOMFactory(), TEST_PARSER_CONFIGURATION, in2);
try {
XMLStreamReader actual = containerFactory.getContainer(builder).getXMLStreamReader(cache);
new XMLStreamReaderComparator(containerFactory.filter(expected), containerFactory.filter(actual)).compare();
Modified: webservices/axiom/branches/AXIOM-435/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/container/TestSerialize.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/AXIOM-435/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/container/TestSerialize.java?rev=1363144&r1=1363143&r2=1363144&view=diff
==============================================================================
--- webservices/axiom/branches/AXIOM-435/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/container/TestSerialize.java (original)
+++ webservices/axiom/branches/AXIOM-435/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/container/TestSerialize.java Wed Jul 18 22:04:44 2012
@@ -29,7 +29,6 @@ import org.apache.axiom.om.OMContainer;
import org.apache.axiom.om.OMMetaFactory;
import org.apache.axiom.om.OMXMLBuilderFactory;
import org.apache.axiom.om.OMXMLParserWrapper;
-import org.apache.axiom.om.util.StAXParserConfiguration;
import org.apache.axiom.testutils.conformance.ConformanceTestFile;
import org.apache.axiom.ts.ConformanceTestCase;
import org.apache.commons.io.IOUtils;
@@ -54,7 +53,7 @@ public class TestSerialize extends Confo
InputStream in = getFileAsStream();
try {
OMXMLParserWrapper builder = OMXMLBuilderFactory.createOMBuilder(metaFactory.getOMFactory(),
- StAXParserConfiguration.PRESERVE_CDATA_SECTIONS, in);
+ TEST_PARSER_CONFIGURATION, in);
try {
OMContainer container = containerFactory.getContainer(builder);
// We need to clone the InputSource objects so that we can dump their contents
Modified: webservices/axiom/branches/AXIOM-435/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap11/faultreason/TestGetTextWithCDATA.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/AXIOM-435/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap11/faultreason/TestGetTextWithCDATA.java?rev=1363144&r1=1363143&r2=1363144&view=diff
==============================================================================
--- webservices/axiom/branches/AXIOM-435/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap11/faultreason/TestGetTextWithCDATA.java (original)
+++ webservices/axiom/branches/AXIOM-435/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap11/faultreason/TestGetTextWithCDATA.java Wed Jul 18 22:04:44 2012
@@ -25,7 +25,6 @@ import javax.xml.stream.XMLStreamReader;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMMetaFactory;
import org.apache.axiom.om.OMXMLBuilderFactory;
-import org.apache.axiom.om.util.StAXParserConfiguration;
import org.apache.axiom.om.util.StAXUtils;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.soap.SOAPFault;
@@ -54,7 +53,7 @@ public class TestGetTextWithCDATA extend
"</SOAP-ENV:Body>" +
"</SOAP-ENV:Envelope>";
XMLStreamReader soap11Parser = StAXUtils.createXMLStreamReader(
- StAXParserConfiguration.PRESERVE_CDATA_SECTIONS, new StringReader(soap11Fault));
+ TEST_PARSER_CONFIGURATION, new StringReader(soap11Fault));
SOAPModelBuilder soap11Builder = OMXMLBuilderFactory.createStAXSOAPModelBuilder(metaFactory, soap11Parser);
OMElement element = soap11Builder.getDocumentElement();
element.build();