Author: veithen
Date: Tue May 24 22:48:06 2011
New Revision: 1127327
URL: http://svn.apache.org/viewvc?rev=1127327&view=rev
Log:
AXIS2-5044: Make Axis2 compatible with the latest Jettison version.
Modified:
axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/AbstractJSONMessageFormatter.java
axis/axis2/java/core/trunk/modules/parent/pom.xml
Modified:
axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/AbstractJSONMessageFormatter.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/AbstractJSONMessageFormatter.java?rev=1127327&r1=1127326&r2=1127327&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/AbstractJSONMessageFormatter.java
(original)
+++
axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/AbstractJSONMessageFormatter.java
Tue May 24 22:48:06 2011
@@ -171,6 +171,8 @@ public abstract class AbstractJSONMessag
out.write(jsonToWrite.getBytes());
} else {
XMLStreamWriter jsonWriter = getJSONWriter(out, format);
+ // Jettison v1.2+ relies on writeStartDocument being called
(AXIS2-5044)
+ jsonWriter.writeStartDocument();
element.serializeAndConsume(jsonWriter);
jsonWriter.writeEndDocument();
}
@@ -205,6 +207,8 @@ public abstract class AbstractJSONMessag
} else {
StringWriter out = new StringWriter();
XMLStreamWriter jsonWriter = getJSONWriter(out);
+ // Jettison v1.2+ relies on writeStartDocument being
called (AXIS2-5044)
+ jsonWriter.writeStartDocument();
dataOut.serializeAndConsume(jsonWriter);
jsonWriter.writeEndDocument();
jsonString = out.toString();
Modified: axis/axis2/java/core/trunk/modules/parent/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/parent/pom.xml?rev=1127327&r1=1127326&r2=1127327&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/parent/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/parent/pom.xml Tue May 24 22:48:06 2011
@@ -95,7 +95,7 @@
<jaxb.api.version>2.1</jaxb.api.version>
<jaxbri.version>2.1.7</jaxbri.version>
<jaxen.version>1.1.1</jaxen.version>
- <jettison.version>1.0-RC2</jettison.version>
+ <jettison.version>1.3</jettison.version>
<jibx.version>1.2</jibx.version>
<junit.version-jdk1.4>3.8.2</junit.version-jdk1.4>
<junit.version>4.4</junit.version>
