Author: ningjiang
Date: Thu Jun 17 10:00:26 2010
New Revision: 955531
URL: http://svn.apache.org/viewvc?rev=955531&view=rev
Log:
CAMEL-2785 upgrade cxf version of camel-cxf to 2.2.9
Modified:
camel/branches/camel-1.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/invoker/CxfClient.java
camel/branches/camel-1.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/invoker/CxfClientFactoryBean.java
camel/branches/camel-1.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfSoapMessageProviderTest.java
camel/branches/camel-1.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfWsdlFirstPayloadModeTest.java
camel/branches/camel-1.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfWsdlFirstTest.java
camel/branches/camel-1.x/parent/pom.xml
Modified:
camel/branches/camel-1.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/invoker/CxfClient.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-1.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/invoker/CxfClient.java?rev=955531&r1=955530&r2=955531&view=diff
==============================================================================
---
camel/branches/camel-1.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/invoker/CxfClient.java
(original)
+++
camel/branches/camel-1.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/invoker/CxfClient.java
Thu Jun 17 10:00:26 2010
@@ -122,12 +122,12 @@ public class CxfClient extends ClientImp
PhaseInterceptorChain chain = setupInterceptorChain(getEndpoint());
message.setInterceptorChain(chain);
- modifyChain(chain, requestContext);
+ modifyChain(chain, message, false);
chain.setFaultObserver(outFaultObserver);
// setup conduit selector
prepareConduitSelector(message);
- modifyChain(chain, null);
+ modifyChain(chain, null, false);
// execute chain
chain.doIntercept(message);
Modified:
camel/branches/camel-1.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/invoker/CxfClientFactoryBean.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-1.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/invoker/CxfClientFactoryBean.java?rev=955531&r1=955530&r2=955531&view=diff
==============================================================================
---
camel/branches/camel-1.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/invoker/CxfClientFactoryBean.java
(original)
+++
camel/branches/camel-1.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/invoker/CxfClientFactoryBean.java
Thu Jun 17 10:00:26 2010
@@ -62,9 +62,8 @@ public class CxfClientFactoryBean extend
}
}
- protected void createClient(Endpoint ep) {
- CxfClient client = new CxfClient(getBus(), ep);
- setClient(client);
+ protected Client createClient(Endpoint ep) {
+ return new CxfClient(getBus(), ep);
}
Modified:
camel/branches/camel-1.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfSoapMessageProviderTest.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-1.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfSoapMessageProviderTest.java?rev=955531&r1=955530&r2=955531&view=diff
==============================================================================
---
camel/branches/camel-1.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfSoapMessageProviderTest.java
(original)
+++
camel/branches/camel-1.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfSoapMessageProviderTest.java
Thu Jun 17 10:00:26 2010
@@ -69,7 +69,7 @@ public class CxfSoapMessageProviderTest
assertEquals("Can't get the right message count",
fromHandler.getMessageCount(), 8);
assertEquals("Can't get the right fault count",
fromHandler.getFaultCount(), 0);
- assertEquals("Can't get the right headers count",
fromHandler.getGetHeadersCount(), 4);
+ assertEquals("Can't get the right headers count",
fromHandler.getGetHeadersCount(), 8);
}
Modified:
camel/branches/camel-1.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfWsdlFirstPayloadModeTest.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-1.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfWsdlFirstPayloadModeTest.java?rev=955531&r1=955530&r2=955531&view=diff
==============================================================================
---
camel/branches/camel-1.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfWsdlFirstPayloadModeTest.java
(original)
+++
camel/branches/camel-1.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfWsdlFirstPayloadModeTest.java
Thu Jun 17 10:00:26 2010
@@ -89,7 +89,7 @@ public class CxfWsdlFirstPayloadModeTest
assertEquals(0, fromHandler.getFaultCount());
assertEquals(6, fromHandler.getMessageCount());
- assertEquals(8, toHandler.getGetHeadersCount());
+ assertEquals(22, toHandler.getGetHeadersCount());
assertEquals(10, toHandler.getMessageCount());
assertEquals(6, toHandler.getFaultCount());
Modified:
camel/branches/camel-1.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfWsdlFirstTest.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-1.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfWsdlFirstTest.java?rev=955531&r1=955530&r2=955531&view=diff
==============================================================================
---
camel/branches/camel-1.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfWsdlFirstTest.java
(original)
+++
camel/branches/camel-1.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfWsdlFirstTest.java
Thu Jun 17 10:00:26 2010
@@ -125,7 +125,7 @@ public class CxfWsdlFirstTest extends Sp
protected void verifyJaxwsHandlers(JaxwsTestHandler fromHandler,
JaxwsTestHandler toHandler) {
assertEquals(2, fromHandler.getFaultCount());
assertEquals(4, fromHandler.getMessageCount());
- assertEquals(7, toHandler.getGetHeadersCount());
+ assertEquals(20, toHandler.getGetHeadersCount());
assertEquals(8, toHandler.getMessageCount());
assertEquals(6, toHandler.getFaultCount());
Modified: camel/branches/camel-1.x/parent/pom.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-1.x/parent/pom.xml?rev=955531&r1=955530&r2=955531&view=diff
==============================================================================
--- camel/branches/camel-1.x/parent/pom.xml (original)
+++ camel/branches/camel-1.x/parent/pom.xml Thu Jun 17 10:00:26 2010
@@ -40,7 +40,7 @@
<activemq-version>5.2.0</activemq-version>
<apacheds-version>1.5.4</apacheds-version>
<axiom-version>1.2.8</axiom-version>
- <cxf-version>2.2.2</cxf-version>
+ <cxf-version>2.2.9</cxf-version>
<felix-osgi-version>1.2.0</felix-osgi-version>
<geronimo-jms-spec-version>1.1.1</geronimo-jms-spec-version>
<geronimo-jpa-spec-version>1.1.1</geronimo-jpa-spec-version>