Author: ffang
Date: Mon Oct 22 05:35:06 2012
New Revision: 1400765
URL: http://svn.apache.org/viewvc?rev=1400765&view=rev
Log:
[SMXCOMP-950]upgrade to cxf 2.6.3
Modified:
servicemix/components/trunk/bindings/servicemix-cxf-bc/src/main/java/org/apache/servicemix/cxfbc/CxfBcProviderMessageObserver.java
servicemix/components/trunk/bindings/servicemix-cxf-bc/src/test/resources/org/apache/servicemix/cxfbc/ws/rm/xbean.xml
servicemix/components/trunk/pom.xml
Modified:
servicemix/components/trunk/bindings/servicemix-cxf-bc/src/main/java/org/apache/servicemix/cxfbc/CxfBcProviderMessageObserver.java
URL:
http://svn.apache.org/viewvc/servicemix/components/trunk/bindings/servicemix-cxf-bc/src/main/java/org/apache/servicemix/cxfbc/CxfBcProviderMessageObserver.java?rev=1400765&r1=1400764&r2=1400765&view=diff
==============================================================================
---
servicemix/components/trunk/bindings/servicemix-cxf-bc/src/main/java/org/apache/servicemix/cxfbc/CxfBcProviderMessageObserver.java
(original)
+++
servicemix/components/trunk/bindings/servicemix-cxf-bc/src/main/java/org/apache/servicemix/cxfbc/CxfBcProviderMessageObserver.java
Mon Oct 22 05:35:06 2012
@@ -296,7 +296,11 @@ public class CxfBcProviderMessageObserve
InputStream is = soapMessage.getContent(InputStream.class);
if (is != null) {
CachedOutputStream bos = new CachedOutputStream();
- IOUtils.copy(is, bos);
+ try {
+ IOUtils.copy(is, bos);
+ } catch (IOException e) {
+ //the is could be already closed for ws-rm, just ignore it.
+ }
bos.flush();
is.close();
soapMessage.setContent(InputStream.class, bos.getInputStream());
Modified:
servicemix/components/trunk/bindings/servicemix-cxf-bc/src/test/resources/org/apache/servicemix/cxfbc/ws/rm/xbean.xml
URL:
http://svn.apache.org/viewvc/servicemix/components/trunk/bindings/servicemix-cxf-bc/src/test/resources/org/apache/servicemix/cxfbc/ws/rm/xbean.xml?rev=1400765&r1=1400764&r2=1400765&view=diff
==============================================================================
---
servicemix/components/trunk/bindings/servicemix-cxf-bc/src/test/resources/org/apache/servicemix/cxfbc/ws/rm/xbean.xml
(original)
+++
servicemix/components/trunk/bindings/servicemix-cxf-bc/src/test/resources/org/apache/servicemix/cxfbc/ws/rm/xbean.xml
Mon Oct 22 05:35:06 2012
@@ -42,7 +42,7 @@
<bean class="org.apache.cxf.interceptor.LoggingOutInterceptor"/>
</cxfse:outFaultInterceptors>
</cxfse:endpoint>
- <cxfse:endpoint>
+ <cxfse:endpoint useJBIWrapper="false">
<cxfse:pojo>
<bean class="org.apache.servicemix.cxfbc.ws.rm.GreeterImpl" />
</cxfse:pojo>
@@ -81,6 +81,7 @@
targetEndpoint="GreeterPort"
targetService="greeter:GreeterService"
targetInterface="greeter:Greeter"
+ useJBIWrapper="false"
busCfg="org/apache/servicemix/cxfbc/ws/rm/decoupled.xml"
>
<cxfbc:inInterceptors>
Modified: servicemix/components/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/components/trunk/pom.xml?rev=1400765&r1=1400764&r2=1400765&view=diff
==============================================================================
--- servicemix/components/trunk/pom.xml (original)
+++ servicemix/components/trunk/pom.xml Mon Oct 22 05:35:06 2012
@@ -88,7 +88,7 @@
<camel.version>2.10.2</camel.version>
<!-- CXF -->
- <cxf.version>2.6.2</cxf.version>
+ <cxf.version>2.6.3</cxf.version>
<!-- Geronimo Specs and Modules -->
<geronimo-activation.version>1.0.2</geronimo-activation.version>
