Author: veithen
Date: Sun Aug 9 15:57:03 2009
New Revision: 802554
URL: http://svn.apache.org/viewvc?rev=802554&view=rev
Log:
Made the StAXDialect API more uniform.
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/util/stax/dialect/BEADialect.java
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/util/stax/dialect/SJSXPDialect.java
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/util/stax/dialect/StAXDialect.java
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/util/stax/dialect/UnknownStAXDialect.java
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/main/java/org/apache/axiom/util/stax/dialect/XLXP2Dialect.java
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/util/stax/dialect/XLXPDialect.java
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/test/java/org/apache/axiom/om/impl/jaxp/OMSourceToStreamResultTestCase.java
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/test/java/org/apache/axiom/om/impl/serialize/StreamingOMSerializerTest.java
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/util/stax/dialect/BEADialect.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/util/stax/dialect/BEADialect.java?rev=802554&r1=802553&r2=802554&view=diff
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/util/stax/dialect/BEADialect.java
(original)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/util/stax/dialect/BEADialect.java
Sun Aug 9 15:57:03 2009
@@ -31,10 +31,11 @@
return "BEA";
}
- public void enableCDataReporting(XMLInputFactory factory) {
+ public XMLInputFactory enableCDataReporting(XMLInputFactory factory) {
factory.setProperty(XMLInputFactory.IS_COALESCING, Boolean.FALSE);
factory.setProperty("http://java.sun.com/xml/stream/properties/report-cdata-event";,
Boolean.TRUE);
+ return factory;
}
public XMLInputFactory disallowDoctypeDecl(XMLInputFactory factory) {
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/util/stax/dialect/SJSXPDialect.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/util/stax/dialect/SJSXPDialect.java?rev=802554&r1=802553&r2=802554&view=diff
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/util/stax/dialect/SJSXPDialect.java
(original)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/util/stax/dialect/SJSXPDialect.java
Sun Aug 9 15:57:03 2009
@@ -33,10 +33,11 @@
return "SJSXP";
}
- public void enableCDataReporting(XMLInputFactory factory) {
+ public XMLInputFactory enableCDataReporting(XMLInputFactory factory) {
factory.setProperty(XMLInputFactory.IS_COALESCING, Boolean.FALSE);
factory.setProperty("http://java.sun.com/xml/stream/properties/report-cdata-event";,
Boolean.TRUE);
+ return factory;
}
public XMLInputFactory disallowDoctypeDecl(XMLInputFactory factory) {
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/util/stax/dialect/StAXDialect.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/util/stax/dialect/StAXDialect.java?rev=802554&r1=802553&r2=802554&view=diff
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/util/stax/dialect/StAXDialect.java
(original)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/util/stax/dialect/StAXDialect.java
Sun Aug 9 15:57:03 2009
@@ -134,10 +134,12 @@
* @param factory
* the factory to configure; this may be an already normalized
factory or a "raw"
* factory object
+ * @return the factory with CDATA reporting enabled; this may be the
original factory instance
+ * or a wrapper
* @throws UnsupportedOperationException
* if reporting of CDATA sections is not supported
*/
- void enableCDataReporting(XMLInputFactory factory);
+ XMLInputFactory enableCDataReporting(XMLInputFactory factory);
/**
* Configure the given factory to disallow DOCTYPE declarations. The
effect of this is similar
@@ -159,7 +161,8 @@
* not contain a Document Type Declaration.
*
* @param factory
- * the factory to configure
+ * the factory to configure; this may be an already normalized
factory or a "raw"
+ * factory object
* @return the factory that disallows DOCTYPE declarations; this may be
the original factory
* instance or a wrapper
*/
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/util/stax/dialect/UnknownStAXDialect.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/util/stax/dialect/UnknownStAXDialect.java?rev=802554&r1=802553&r2=802554&view=diff
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/util/stax/dialect/UnknownStAXDialect.java
(original)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/util/stax/dialect/UnknownStAXDialect.java
Sun Aug 9 15:57:03 2009
@@ -29,9 +29,10 @@
return "Unknown";
}
- public void enableCDataReporting(XMLInputFactory factory) {
+ public XMLInputFactory enableCDataReporting(XMLInputFactory factory) {
// This is in principle only the prerequisite; let's hope that it is
sufficient
factory.setProperty(XMLInputFactory.IS_COALESCING, Boolean.FALSE);
+ return factory;
}
public XMLInputFactory disallowDoctypeDecl(XMLInputFactory factory) {
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=802554&r1=802553&r2=802554&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
Sun Aug 9 15:57:03 2009
@@ -31,9 +31,10 @@
return "Woodstox";
}
- public void enableCDataReporting(XMLInputFactory factory) {
+ public XMLInputFactory enableCDataReporting(XMLInputFactory factory) {
// For Woodstox, this is sufficient
factory.setProperty(XMLInputFactory.IS_COALESCING, Boolean.FALSE);
+ return factory;
}
public XMLInputFactory disallowDoctypeDecl(XMLInputFactory factory) {
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=802554&r1=802553&r2=802554&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
Sun Aug 9 15:57:03 2009
@@ -31,8 +31,9 @@
return "XLXP2";
}
- public void enableCDataReporting(XMLInputFactory factory) {
+ public XMLInputFactory enableCDataReporting(XMLInputFactory factory) {
factory.setProperty(XMLInputFactory.IS_COALESCING, Boolean.FALSE);
+ return factory;
}
public XMLInputFactory disallowDoctypeDecl(XMLInputFactory factory) {
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/util/stax/dialect/XLXPDialect.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/util/stax/dialect/XLXPDialect.java?rev=802554&r1=802553&r2=802554&view=diff
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/util/stax/dialect/XLXPDialect.java
(original)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/util/stax/dialect/XLXPDialect.java
Sun Aug 9 15:57:03 2009
@@ -36,8 +36,9 @@
: "XL XP-J (StAX compliant versions)";
}
- public void enableCDataReporting(XMLInputFactory factory) {
+ public XMLInputFactory enableCDataReporting(XMLInputFactory factory) {
factory.setProperty(XMLInputFactory.IS_COALESCING, Boolean.FALSE);
+ return factory;
}
public XMLInputFactory disallowDoctypeDecl(XMLInputFactory factory) {
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/test/java/org/apache/axiom/om/impl/jaxp/OMSourceToStreamResultTestCase.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-api/src/test/java/org/apache/axiom/om/impl/jaxp/OMSourceToStreamResultTestCase.java?rev=802554&r1=802553&r2=802554&view=diff
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/test/java/org/apache/axiom/om/impl/jaxp/OMSourceToStreamResultTestCase.java
(original)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/test/java/org/apache/axiom/om/impl/jaxp/OMSourceToStreamResultTestCase.java
Sun Aug 9 15:57:03 2009
@@ -52,7 +52,7 @@
StAXDialect dialect =
StAXDialectDetector.getDialect(inputFactory.getClass());
inputFactory = dialect.normalize(inputFactory);
// Make sure CDATA sections are reported by the StAX parser
- dialect.enableCDataReporting(inputFactory);
+ inputFactory = dialect.enableCDataReporting(inputFactory);
XMLStreamReader reader =
inputFactory.createXMLStreamReader(getTestResource(file));
StAXOMBuilder builder = new
StAXOMBuilder(omMetaFactory.getOMFactory(), reader);
OMSource source = new OMSource(builder.getDocumentElement());
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/test/java/org/apache/axiom/om/impl/serialize/StreamingOMSerializerTest.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-api/src/test/java/org/apache/axiom/om/impl/serialize/StreamingOMSerializerTest.java?rev=802554&r1=802553&r2=802554&view=diff
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/test/java/org/apache/axiom/om/impl/serialize/StreamingOMSerializerTest.java
(original)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/test/java/org/apache/axiom/om/impl/serialize/StreamingOMSerializerTest.java
Sun Aug 9 15:57:03 2009
@@ -46,7 +46,7 @@
StAXDialect dialect =
StAXDialectDetector.getDialect(inputFactory.getClass());
inputFactory = dialect.normalize(inputFactory);
// Allow CDATA events
- dialect.enableCDataReporting(inputFactory);
+ inputFactory = dialect.enableCDataReporting(inputFactory);
XMLOutputFactory outputFactory =
dialect.normalize(XMLOutputFactory.newInstance());
StreamingOMSerializer serializer = new StreamingOMSerializer();
ByteArrayOutputStream out = new ByteArrayOutputStream();
