svn commit: r712925 - in /activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf: CxfConsumer.java CxfProducer.java

[ningjiang]

Author: ningjiang
Date: Mon Nov 10 19:04:49 2008
New Revision: 712925

URL: http://svn.apache.org/viewvc?rev=712925&view=rev
Log:
CAMEL-1073 Applied patch with thanks to William

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

Modified: 
activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfConsumer.java
URL: 
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfConsumer.java?rev=712925&r1=712924&r2=712925&view=diff
==============================================================================
--- 
activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfConsumer.java
 (original)
+++ 
activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfConsumer.java
 Mon Nov 10 19:04:49 2008
@@ -16,9 +16,6 @@
  */
 package org.apache.camel.component.cxf;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import javax.xml.ws.WebServiceProvider;
 
 import org.apache.camel.Processor;
@@ -32,7 +29,6 @@
 import org.apache.cxf.bus.spring.SpringBusFactory;
 import org.apache.cxf.common.classloader.ClassLoaderUtils;
 import org.apache.cxf.endpoint.Server;
-import org.apache.cxf.feature.AbstractFeature;
 import org.apache.cxf.frontend.ServerFactoryBean;
 
 /**
@@ -93,18 +89,15 @@
 
         // apply feature here
         if (!dataFormat.equals(DataFormat.POJO) && !isWebServiceProvider) {
-            List<AbstractFeature> features = new ArrayList<AbstractFeature>();
 
             if (dataFormat.equals(DataFormat.PAYLOAD)) {
-                features.add(new PayLoadDataFormatFeature());
+                svrBean.getFeatures().add(new PayLoadDataFormatFeature());
                 // adding the logging feature here for debug
                 //features.add(new LoggingFeature());
             } else if (dataFormat.equals(DataFormat.MESSAGE)) {
-                features.add(new MessageDataFormatFeature());
+                svrBean.getFeatures().add(new MessageDataFormatFeature());
                 //features.add(new LoggingFeature());
             }
-            svrBean.setFeatures(features);
-
         }
         svrBean.setBus(bus);
         svrBean.setStart(false);

Modified: 
activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfProducer.java
URL: 
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfProducer.java?rev=712925&r1=712924&r2=712925&view=diff
==============================================================================
--- 
activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfProducer.java
 (original)
+++ 
activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfProducer.java
 Mon Nov 10 19:04:49 2008
@@ -42,7 +42,6 @@
 import org.apache.cxf.common.classloader.ClassLoaderUtils;
 import org.apache.cxf.endpoint.Client;
 import org.apache.cxf.endpoint.Endpoint;
-import org.apache.cxf.feature.AbstractFeature;
 import org.apache.cxf.frontend.ClientFactoryBean;
 import org.apache.cxf.message.ExchangeImpl;
 import org.apache.cxf.message.Message;
@@ -90,17 +89,14 @@
 
         boolean jsr181Enabled = 
CxfEndpointUtils.hasWebServiceAnnotation(serviceClass);
         cfb.setJSR181Enabled(jsr181Enabled);
-
         dataFormat = CxfEndpointUtils.getDataFormat(endpoint);
-        List<AbstractFeature> features = new ArrayList<AbstractFeature>();
         if (dataFormat.equals(DataFormat.MESSAGE)) {
-            features.add(new MessageDataFormatFeature());
+            cfb.getFeatures().add(new MessageDataFormatFeature());
             // features.add(new LoggingFeature());
         } else if (dataFormat.equals(DataFormat.PAYLOAD)) {
-            features.add(new PayLoadDataFormatFeature());
+            cfb.getFeatures().add(new PayLoadDataFormatFeature());
             // features.add(new LoggingFeature());
         }
-        cfb.setFeatures(features);
 
         return createClientFromClientFactoryBean(cfb);
     }