You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commons-dev@ws.apache.org by di...@apache.org on 2007/07/11 04:18:37 UTC
svn commit: r555141 - in /webservices/commons/trunk/modules/axiom/modules:
axiom-api/src/main/java/org/apache/axiom/om/util/
axiom-tests/src/test/java/org/apache/axiom/om/
axiom-tests/src/test/java/org/apache/axiom/om/impl/serializer/
Author: dims
Date: Tue Jul 10 19:18:36 2007
New Revision: 555141
URL: http://svn.apache.org/viewvc?view=rev&rev=555141
Log:
default encoding for sjsxp is *not* UTF-8, so set it explicitly
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/util/StAXUtils.java
webservices/commons/trunk/modules/axiom/modules/axiom-tests/src/test/java/org/apache/axiom/om/OMNavigatorTest.java
webservices/commons/trunk/modules/axiom/modules/axiom-tests/src/test/java/org/apache/axiom/om/impl/serializer/ElementSerializerTest.java
webservices/commons/trunk/modules/axiom/modules/axiom-tests/src/test/java/org/apache/axiom/om/impl/serializer/NoNamespaceSerializerTest.java
webservices/commons/trunk/modules/axiom/modules/axiom-tests/src/test/java/org/apache/axiom/om/impl/serializer/OMSerializerTest.java
webservices/commons/trunk/modules/axiom/modules/axiom-tests/src/test/java/org/apache/axiom/om/impl/serializer/OMSerializerTest2.java
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/util/StAXUtils.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/util/StAXUtils.java?view=diff&rev=555141&r1=555140&r2=555141
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/util/StAXUtils.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/util/StAXUtils.java Tue Jul 10 19:18:36 2007
@@ -21,6 +21,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.axiom.om.OMConstants;
import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLOutputFactory;
@@ -231,7 +232,7 @@
throws XMLStreamException {
XMLOutputFactory outputFactory = getXMLOutputFactory();
try {
- XMLStreamWriter writer = outputFactory.createXMLStreamWriter(out);
+ XMLStreamWriter writer = outputFactory.createXMLStreamWriter(out, OMConstants.DEFAULT_CHAR_SET_ENCODING);
if (isDebugEnabled) {
log.debug("XMLStreamWriter is " + writer.getClass().getName());
}
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-tests/src/test/java/org/apache/axiom/om/OMNavigatorTest.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-tests/src/test/java/org/apache/axiom/om/OMNavigatorTest.java?view=diff&rev=555141&r1=555140&r2=555141
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-tests/src/test/java/org/apache/axiom/om/OMNavigatorTest.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-tests/src/test/java/org/apache/axiom/om/OMNavigatorTest.java Tue Jul 10 19:18:36 2007
@@ -51,7 +51,7 @@
tempFile = File.createTempFile("temp", "xml");
output =
XMLOutputFactory.newInstance().createXMLStreamWriter(
- new FileOutputStream(tempFile));
+ new FileOutputStream(tempFile), OMConstants.DEFAULT_CHAR_SET_ENCODING);
}
public void testnavigatorFullyBuilt() throws Exception {
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-tests/src/test/java/org/apache/axiom/om/impl/serializer/ElementSerializerTest.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-tests/src/test/java/org/apache/axiom/om/impl/serializer/ElementSerializerTest.java?view=diff&rev=555141&r1=555140&r2=555141
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-tests/src/test/java/org/apache/axiom/om/impl/serializer/ElementSerializerTest.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-tests/src/test/java/org/apache/axiom/om/impl/serializer/ElementSerializerTest.java Tue Jul 10 19:18:36 2007
@@ -27,6 +27,7 @@
import org.apache.axiom.om.OMNode;
import org.apache.axiom.om.OMText;
import org.apache.axiom.om.OMXMLParserWrapper;
+import org.apache.axiom.om.OMConstants;
import org.apache.axiom.om.impl.llom.factory.OMXMLBuilderFactory;
import org.apache.axiom.soap.SOAPBody;
import org.apache.axiom.soap.SOAPEnvelope;
@@ -57,7 +58,7 @@
getTestResourceFile("soap/soapmessage.xml")));
tempFile = File.createTempFile("temp", "xml");
writer = XMLOutputFactory.newInstance().
- createXMLStreamWriter(new FileOutputStream(tempFile));
+ createXMLStreamWriter(new FileOutputStream(tempFile), OMConstants.DEFAULT_CHAR_SET_ENCODING);
builder =
OMXMLBuilderFactory.createStAXSOAPModelBuilder(
OMAbstractFactory.getSOAP11Factory(), reader);
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-tests/src/test/java/org/apache/axiom/om/impl/serializer/NoNamespaceSerializerTest.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-tests/src/test/java/org/apache/axiom/om/impl/serializer/NoNamespaceSerializerTest.java?view=diff&rev=555141&r1=555140&r2=555141
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-tests/src/test/java/org/apache/axiom/om/impl/serializer/NoNamespaceSerializerTest.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-tests/src/test/java/org/apache/axiom/om/impl/serializer/NoNamespaceSerializerTest.java Tue Jul 10 19:18:36 2007
@@ -23,6 +23,7 @@
import org.apache.axiom.om.OMAbstractFactory;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMXMLParserWrapper;
+import org.apache.axiom.om.OMConstants;
import org.apache.axiom.om.impl.llom.factory.OMXMLBuilderFactory;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.soap.SOAPFactory;
@@ -85,7 +86,7 @@
new InputStreamReader(
new ByteArrayInputStream(xmlTextTwo.getBytes())));
writer = XMLOutputFactory.newInstance().
- createXMLStreamWriter(new ByteArrayOutputStream());
+ createXMLStreamWriter(new ByteArrayOutputStream(), OMConstants.DEFAULT_CHAR_SET_ENCODING);
builderOne =
OMXMLBuilderFactory.createStAXSOAPModelBuilder(
OMAbstractFactory.getSOAP11Factory(), readerOne);
@@ -132,7 +133,7 @@
public void testSerilizationWithCacheOn() throws Exception {
ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
writer = XMLOutputFactory.newInstance().
- createXMLStreamWriter(byteArrayOutputStream);
+ createXMLStreamWriter(byteArrayOutputStream, OMConstants.DEFAULT_CHAR_SET_ENCODING);
SOAPEnvelope env = (SOAPEnvelope) builderOne.getDocumentElement();
env.serialize(writer);
@@ -143,7 +144,7 @@
/** Will just do a probe test to check serialize with caching off works without any exception */
public void testSerilizationWithCacheOff() throws Exception {
writer = XMLOutputFactory.newInstance().
- createXMLStreamWriter(new ByteArrayOutputStream());
+ createXMLStreamWriter(new ByteArrayOutputStream(), OMConstants.DEFAULT_CHAR_SET_ENCODING);
SOAPEnvelope env = (SOAPEnvelope) builderOne.getDocumentElement();
env.serializeAndConsume(writer);
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-tests/src/test/java/org/apache/axiom/om/impl/serializer/OMSerializerTest.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-tests/src/test/java/org/apache/axiom/om/impl/serializer/OMSerializerTest.java?view=diff&rev=555141&r1=555140&r2=555141
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-tests/src/test/java/org/apache/axiom/om/impl/serializer/OMSerializerTest.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-tests/src/test/java/org/apache/axiom/om/impl/serializer/OMSerializerTest.java Tue Jul 10 19:18:36 2007
@@ -22,6 +22,7 @@
import org.apache.axiom.om.AbstractTestCase;
import org.apache.axiom.om.OMAbstractFactory;
import org.apache.axiom.om.OMXMLParserWrapper;
+import org.apache.axiom.om.OMConstants;
import org.apache.axiom.om.impl.builder.StAXOMBuilder;
import org.apache.axiom.om.impl.llom.factory.OMXMLBuilderFactory;
import org.apache.axiom.om.impl.serialize.StreamingOMSerializer;
@@ -102,7 +103,7 @@
ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
writer =
XMLOutputFactory.newInstance().
- createXMLStreamWriter(byteArrayOutputStream);
+ createXMLStreamWriter(byteArrayOutputStream, OMConstants.DEFAULT_CHAR_SET_ENCODING);
SOAPEnvelope env = (SOAPEnvelope) soapBuilder.getDocumentElement();
env.serializeAndConsume(writer);
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-tests/src/test/java/org/apache/axiom/om/impl/serializer/OMSerializerTest2.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-tests/src/test/java/org/apache/axiom/om/impl/serializer/OMSerializerTest2.java?view=diff&rev=555141&r1=555140&r2=555141
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-tests/src/test/java/org/apache/axiom/om/impl/serializer/OMSerializerTest2.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-tests/src/test/java/org/apache/axiom/om/impl/serializer/OMSerializerTest2.java Tue Jul 10 19:18:36 2007
@@ -22,6 +22,7 @@
import org.apache.axiom.om.AbstractTestCase;
import org.apache.axiom.om.OMXMLParserWrapper;
import org.apache.axiom.om.OMAbstractFactory;
+import org.apache.axiom.om.OMConstants;
import org.apache.axiom.om.impl.serialize.StreamingOMSerializer;
import org.apache.axiom.om.impl.llom.factory.OMXMLBuilderFactory;
import org.apache.axiom.om.impl.builder.StAXOMBuilder;
@@ -100,7 +101,7 @@
ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
writer =
XMLOutputFactory.newInstance().
- createXMLStreamWriter(byteArrayOutputStream);
+ createXMLStreamWriter(byteArrayOutputStream, OMConstants.DEFAULT_CHAR_SET_ENCODING);
SOAPEnvelope env = (SOAPEnvelope) soapBuilder.getDocumentElement();
env.serializeAndConsume(writer);
---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: commons-dev-help@ws.apache.org