You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2010/08/09 21:30:33 UTC
svn commit: r983787 - in /cxf/branches/2.2.x-fixes: ./
rt/core/src/main/java/org/apache/cxf/interceptor/StaxOutInterceptor.java
systests/uncategorized/pom.xml
Author: dkulp
Date: Mon Aug 9 19:30:32 2010
New Revision: 983787
URL: http://svn.apache.org/viewvc?rev=983787&view=rev
Log:
Merged revisions 983676 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r983676 | dkulp | 2010-08-09 11:06:50 -0400 (Mon, 09 Aug 2010) | 2 lines
Allow "true" string to be used for start doc thing in config
Update smx version
........
Modified:
cxf/branches/2.2.x-fixes/ (props changed)
cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/StaxOutInterceptor.java
cxf/branches/2.2.x-fixes/systests/uncategorized/pom.xml
Propchange: cxf/branches/2.2.x-fixes/
('svn:mergeinfo' removed)
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/StaxOutInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/StaxOutInterceptor.java?rev=983787&r1=983786&r2=983787&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/StaxOutInterceptor.java (original)
+++ cxf/branches/2.2.x-fixes/rt/core/src/main/java/org/apache/cxf/interceptor/StaxOutInterceptor.java Mon Aug 9 19:30:32 2010
@@ -32,6 +32,7 @@ import org.apache.cxf.common.classloader
import org.apache.cxf.common.i18n.BundleUtils;
import org.apache.cxf.message.Exchange;
import org.apache.cxf.message.Message;
+import org.apache.cxf.message.MessageUtils;
import org.apache.cxf.phase.AbstractPhaseInterceptor;
import org.apache.cxf.phase.Phase;
import org.apache.cxf.staxutils.StaxUtils;
@@ -72,7 +73,7 @@ public class StaxOutInterceptor extends
writer = factory.createXMLStreamWriter(os, encoding);
}
}
- if (Boolean.TRUE.equals(message.getContextualProperty(FORCE_START_DOCUMENT))) {
+ if (MessageUtils.getContextualBoolean(message, FORCE_START_DOCUMENT, false)) {
writer.writeStartDocument(encoding, "1.0");
message.removeContent(OutputStream.class);
message.put(OUTPUT_STREAM_HOLDER, os);
Modified: cxf/branches/2.2.x-fixes/systests/uncategorized/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/systests/uncategorized/pom.xml?rev=983787&r1=983786&r2=983787&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/systests/uncategorized/pom.xml (original)
+++ cxf/branches/2.2.x-fixes/systests/uncategorized/pom.xml Mon Aug 9 19:30:32 2010
@@ -395,7 +395,7 @@
<dependency>
<groupId>org.apache.servicemix</groupId>
<artifactId>servicemix-core</artifactId>
- <version>3.3.1</version>
+ <version>3.3.2</version>
<exclusions>
<exclusion>
<groupId>jaxen</groupId>