camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ningji...@apache.org
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 GMT
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 @@
     <activemq-version>5.3.0</activemq-version>
     <apacheds-version>1.5.4</apacheds-version>
     <axiom-version>1.2.8</axiom-version>
-    <cxf-version>2.2.4</cxf-version>
+    <cxf-version>2.2.5</cxf-version>
     <felix-osgi-version>1.2.0</felix-osgi-version>
     <fuse-commons-management-version>1.0</fuse-commons-management-version>
     <geronimo-jms-spec-version>1.1.1</geronimo-jms-spec-version>



Mime
View raw message