svn commit: r1073057 - in /camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf: CxfConsumer.java jaxrs/CxfRsInvoker.java

[davsclaus]

Author: davsclaus
Date: Mon Feb 21 16:40:14 2011
New Revision: 1073057

URL: http://svn.apache.org/viewvc?rev=1073057&view=rev
Log:
CAMEL-3695: Removed logic which detects CXF version prior to 2.3 as camel-cxf 
now requires CXF 2.3 or better.

Modified:
    
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfConsumer.java
    
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsInvoker.java

Modified: 
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfConsumer.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfConsumer.java?rev=1073057&r1=1073056&r2=1073057&view=diff
==============================================================================
--- 
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfConsumer.java
 (original)
+++ 
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfConsumer.java
 Mon Feb 21 16:40:14 2011
@@ -37,11 +37,9 @@ import org.apache.cxf.message.Exchange;
 import org.apache.cxf.message.Message;
 import org.apache.cxf.service.invoker.Invoker;
 import org.apache.cxf.service.model.BindingOperationInfo;
-import org.apache.cxf.version.Version;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-
 /**
  * A Consumer of exchanges for a service in CXF.  CxfConsumer acts a CXF
  * service to receive requests, convert them, and forward them to Camel 
@@ -67,8 +65,7 @@ public class CxfConsumer extends Default
                     LOG.trace("Received CXF Request: " + cxfExchange);
                 }                
                 Continuation continuation;
-                // Only calling the continuation API for CXF 2.3.x 
-                if (!endpoint.isSynchronous() && (continuation = 
getContinuation(cxfExchange)) != null && 
Version.getCurrentVersion().startsWith("2.3")) {
+                if (!endpoint.isSynchronous() && (continuation = 
getContinuation(cxfExchange)) != null) {
                     if (LOG.isTraceEnabled()) {
                         LOG.trace("Calling the Camel async processors.");
                     }

Modified: 
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsInvoker.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsInvoker.java?rev=1073057&r1=1073056&r2=1073057&view=diff
==============================================================================
--- 
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsInvoker.java
 (original)
+++ 
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsInvoker.java
 Mon Feb 21 16:40:14 2011
@@ -29,7 +29,6 @@ import org.apache.cxf.continuations.Cont
 import org.apache.cxf.jaxrs.JAXRSInvoker;
 import org.apache.cxf.jaxrs.model.OperationResourceInfo;
 import org.apache.cxf.message.Exchange;
-import org.apache.cxf.version.Version;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -55,10 +54,15 @@ public class CxfRsInvoker extends JAXRSI
             return method.invoke(serviceObject, paramArray);
         }
         Continuation continuation;
-        if (!endpoint.isSynchronous() && (continuation = 
getContinuation(cxfExchange)) != null && 
Version.getCurrentVersion().startsWith("2.3")) {
-            // Only calling the continuation API for CXF 2.3.x
+        if (!endpoint.isSynchronous() && (continuation = 
getContinuation(cxfExchange)) != null) {
+            if (LOG.isTraceEnabled()) {
+                LOG.trace("Calling the Camel async processors.");
+            }
             return asyncInvoke(cxfExchange, serviceObject, method, paramArray, 
continuation);
         } else {
+            if (LOG.isTraceEnabled()) {
+                LOG.trace("Calling the Camel sync processors.");
+            }
             return syncInvoke(cxfExchange, serviceObject, method, paramArray);
         }
     }