Return-Path: Delivered-To: apmail-camel-commits-archive@www.apache.org Received: (qmail 78789 invoked from network); 19 Nov 2009 09:37:39 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 19 Nov 2009 09:37:39 -0000 Received: (qmail 43289 invoked by uid 500); 19 Nov 2009 09:37:39 -0000 Delivered-To: apmail-camel-commits-archive@camel.apache.org Received: (qmail 43242 invoked by uid 500); 19 Nov 2009 09:37:39 -0000 Mailing-List: contact commits-help@camel.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@camel.apache.org Delivered-To: mailing list commits@camel.apache.org Received: (qmail 43233 invoked by uid 99); 19 Nov 2009 09:37:39 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 19 Nov 2009 09:37:39 +0000 X-ASF-Spam-Status: No, hits=-2.6 required=5.0 tests=AWL,BAYES_00 X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 19 Nov 2009 09:37:37 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 0E9D4238888F; Thu, 19 Nov 2009 09:37:17 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r882088 - in /camel/trunk: components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfPayLoadMessageXmlBindingRouterTest.java parent/pom.xml Date: Thu, 19 Nov 2009 09:36:50 -0000 To: commits@camel.apache.org From: ningjiang@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20091119093717.0E9D4238888F@eris.apache.org> Author: ningjiang Date: Thu Nov 19 09:36:10 2009 New Revision: 882088 URL: http://svn.apache.org/viewvc?rev=882088&view=rev Log: CAMEL-2202 upgrade CXF to 2.2.5 Modified: camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfPayLoadMessageXmlBindingRouterTest.java camel/trunk/parent/pom.xml Modified: camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java?rev=882088&r1=882087&r2=882088&view=diff ============================================================================== --- camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java (original) +++ camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java Thu Nov 19 09:36:10 2009 @@ -154,15 +154,15 @@ if (CxfEndpointUtils.hasWebServiceAnnotation(cls)) { return new JaxWsProxyFactoryBean(new JaxWsClientFactoryBean() { @Override - protected void createClient(Endpoint ep) { - setClient(new CamelCxfClientImpl(getBus(), ep)); + protected Client createClient(Endpoint ep) { + return new CamelCxfClientImpl(getBus(), ep); } }); } else { return new ClientProxyFactoryBean(new ClientFactoryBean() { @Override - protected void createClient(Endpoint ep) { - setClient(new CamelCxfClientImpl(getBus(), ep)); + protected Client createClient(Endpoint ep) { + return new CamelCxfClientImpl(getBus(), ep); } }); } @@ -176,8 +176,8 @@ return new ClientFactoryBean(new WSDLServiceFactoryBean()) { @Override - protected void createClient(Endpoint ep) { - setClient(new CamelCxfClientImpl(getBus(), ep)); + protected Client createClient(Endpoint ep) { + return new CamelCxfClientImpl(getBus(), ep); } @Override Modified: camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfPayLoadMessageXmlBindingRouterTest.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfPayLoadMessageXmlBindingRouterTest.java?rev=882088&r1=882087&r2=882088&view=diff ============================================================================== --- camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfPayLoadMessageXmlBindingRouterTest.java (original) +++ camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfPayLoadMessageXmlBindingRouterTest.java Thu Nov 19 09:36:10 2009 @@ -119,6 +119,7 @@ } }; } + @Test public void testInvokingServiceFromCXFClient() throws Exception { HelloService client = getCXFClient(); Modified: camel/trunk/parent/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=882088&r1=882087&r2=882088&view=diff ============================================================================== --- camel/trunk/parent/pom.xml (original) +++ camel/trunk/parent/pom.xml Thu Nov 19 09:36:10 2009 @@ -38,7 +38,7 @@ 5.3.0 1.5.4 1.2.8 - 2.2.4 + 2.2.5 1.2.0 1.0 1.1.1