You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by dk...@apache.org on 2011/09/19 23:30:39 UTC
svn commit: r1172846 - in /camel/branches/camel-2.8.x: ./
components/camel-cxf/src/test/java/org/apache/camel/component/cxf/holder/CXFHolderRouteTest.java
components/camel-cxf/src/test/java/org/apache/camel/component/cxf/holder/CxfHolderConsumerTest.java
Author: dkulp
Date: Mon Sep 19 21:30:39 2011
New Revision: 1172846
URL: http://svn.apache.org/viewvc?rev=1172846&view=rev
Log:
Merged revisions 1160701 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r1160701 | ningjiang | 2011-08-23 10:07:55 -0400 (Tue, 23 Aug 2011) | 1 line
Added an unit test for camel-cxf holder based on the camel user mailing list
........
Added:
camel/branches/camel-2.8.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/holder/CXFHolderRouteTest.java
- copied unchanged from r1160701, camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/holder/CXFHolderRouteTest.java
Modified:
camel/branches/camel-2.8.x/ (props changed)
camel/branches/camel-2.8.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/holder/CxfHolderConsumerTest.java
Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: camel/branches/camel-2.8.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/holder/CxfHolderConsumerTest.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/holder/CxfHolderConsumerTest.java?rev=1172846&r1=1172845&r2=1172846&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/holder/CxfHolderConsumerTest.java (original)
+++ camel/branches/camel-2.8.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/holder/CxfHolderConsumerTest.java Mon Sep 19 21:30:39 2011
@@ -61,11 +61,6 @@ public class CxfHolderConsumerTest exten
@Test
public void testInvokingServiceFromCXFClient() throws Exception {
- if (Version.getCurrentVersion().equals("2.4.1")) {
- // This test will be failed with CXF 2.4.1, as
- // the inObjects and outObjects of HolderOutInterceptor are equals
- return;
- }
JaxWsProxyFactoryBean proxyFactory = new JaxWsProxyFactoryBean();
ClientFactoryBean clientBean = proxyFactory.getClientFactoryBean();
clientBean.setAddress(ADDRESS);