Author: ningjiang
Date: Tue Mar 30 06:28:29 2010
New Revision: 929008
URL: http://svn.apache.org/viewvc?rev=929008&view=rev
Log:
CAMEL-2600 upgrade to use cxf 2.2.7 in camel-cxf
Modified:
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfSoapMessageProviderTest.java
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfWsdlFirstPayloadModeTest.java
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfWsdlFirstTest.java
camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/cxfConduitTimeOutContext.xml
camel/trunk/parent/pom.xml
Modified:
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfSoapMessageProviderTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfSoapMessageProviderTest.java?rev=929008&r1=929007&r2=929008&view=diff
==============================================================================
---
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfSoapMessageProviderTest.java
(original)
+++
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfSoapMessageProviderTest.java
Tue Mar 30 06:28:29 2010
@@ -71,7 +71,8 @@ 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);
+ //From CXF 2.2.7 the soap handler's getHeader() method will not be
called if the SOAP message don't have headers
+ //assertEquals("Can't get the right headers count",
fromHandler.getGetHeadersCount(), 4);
}
Modified:
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfWsdlFirstPayloadModeTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfWsdlFirstPayloadModeTest.java?rev=929008&r1=929007&r2=929008&view=diff
==============================================================================
---
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfWsdlFirstPayloadModeTest.java
(original)
+++
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfWsdlFirstPayloadModeTest.java
Tue Mar 30 06:28:29 2010
@@ -85,7 +85,8 @@ public class CxfWsdlFirstPayloadModeTest
protected void verifyJaxwsHandlers(JaxwsTestHandler fromHandler,
JaxwsTestHandler toHandler) {
assertEquals(1, fromHandler.getFaultCount());
assertEquals(5, fromHandler.getMessageCount());
- assertEquals(8, toHandler.getGetHeadersCount());
+ //From CXF 2.2.7 the soap handler's getHeader() method will not be
called if the SOAP message don't have headers
+ //assertEquals(8, toHandler.getGetHeadersCount());
assertEquals(10, toHandler.getMessageCount());
assertEquals(6, toHandler.getFaultCount());
}
Modified:
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfWsdlFirstTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfWsdlFirstTest.java?rev=929008&r1=929007&r2=929008&view=diff
==============================================================================
---
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfWsdlFirstTest.java
(original)
+++
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfWsdlFirstTest.java
Tue Mar 30 06:28:29 2010
@@ -102,7 +102,8 @@ public class CxfWsdlFirstTest extends Ca
protected void verifyJaxwsHandlers(JaxwsTestHandler fromHandler,
JaxwsTestHandler toHandler) {
assertEquals(2, fromHandler.getFaultCount());
assertEquals(4, fromHandler.getMessageCount());
- assertEquals(7, toHandler.getGetHeadersCount());
+ //From CXF 2.2.7 the soap handler's getHeader() method will not be
called if the SOAP message don't have headers
+ //assertEquals(7, toHandler.getGetHeadersCount());
assertEquals(8, toHandler.getMessageCount());
assertEquals(6, toHandler.getFaultCount());
}
Modified:
camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/cxfConduitTimeOutContext.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/cxfConduitTimeOutContext.xml?rev=929008&r1=929007&r2=929008&view=diff
==============================================================================
---
camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/cxfConduitTimeOutContext.xml
(original)
+++
camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/cxfConduitTimeOutContext.xml
Tue Mar 30 06:28:29 2010
@@ -29,6 +29,8 @@
<import resource="classpath:META-INF/cxf/cxf-extension-soap.xml" />
<import resource="classpath:META-INF/cxf/cxf-extension-http.xml" />
+ <!-- You can set the timeout and other client http transport configuration
here -->
+
<http-conf:conduit name="*.http-conduit">
<http-conf:client ReceiveTimeout="100" />
</http-conf:conduit>
Modified: camel/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=929008&r1=929007&r2=929008&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Tue Mar 30 06:28:29 2010
@@ -47,7 +47,7 @@
<commons-collections-version>3.2.1</commons-collections-version>
<commons-pool-version>1.5.4</commons-pool-version>
<commons-dbcp-version>1.3</commons-dbcp-version>
- <cxf-version>2.2.6</cxf-version>
+ <cxf-version>2.2.7</cxf-version>
<derby-version>10.4.2.0</derby-version>
<dozer-version>5.2.0</dozer-version>
<easymock-version>2.5.2</easymock-version>