You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2008/11/11 05:00:01 UTC
svn commit: r712933 - in /activemq/camel/branches/camel-1.x: ./
components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfConsumer.java
components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfProducer.java
Author: ningjiang
Date: Mon Nov 10 20:00:01 2008
New Revision: 712933
URL: http://svn.apache.org/viewvc?rev=712933&view=rev
Log:
Merged revisions 712925 via svnmerge from
https://svn.apache.org/repos/asf/activemq/camel/trunk
........
r712925 | ningjiang | 2008-11-11 11:04:49 +0800 (Tue, 11 Nov 2008) | 1 line
CAMEL-1073 Applied patch with thanks to William
........
Modified:
activemq/camel/branches/camel-1.x/ (props changed)
activemq/camel/branches/camel-1.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfConsumer.java
activemq/camel/branches/camel-1.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfProducer.java
Propchange: activemq/camel/branches/camel-1.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 10 20:00:01 2008
@@ -1 +1 @@
-/activemq/camel/trunk:709850,711200,711206,711219-711220,711523,711531,711756,711784,711859,711874,711962,711971,712064,712119,712148,712662,712692
+/activemq/camel/trunk:709850,711200,711206,711219-711220,711523,711531,711756,711784,711859,711874,711962,711971,712064,712119,712148,712662,712692,712925
Propchange: activemq/camel/branches/camel-1.x/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Nov 10 20:00:01 2008
@@ -1 +1 @@
-/activemq/camel/trunk:1-708421,708553-709447,709449-709612,709614-709634,709636-710013,711200,711206,711219-711220,711523,711531,711599,711655-711656,711756,711784,711859,711874,711962,711971,712064,712119,712148,712662,712712
+/activemq/camel/trunk:1-708421,708553-709447,709449-709612,709614-709634,709636-710013,711200,711206,711219-711220,711523,711531,711599,711655-711656,711756,711784,711859,711874,711962,711971,712064,712119,712148,712662,712712,712925
Modified: activemq/camel/branches/camel-1.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfConsumer.java
URL: http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfConsumer.java?rev=712933&r1=712932&r2=712933&view=diff
==============================================================================
--- activemq/camel/branches/camel-1.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfConsumer.java (original)
+++ activemq/camel/branches/camel-1.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfConsumer.java Mon Nov 10 20:00:01 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/branches/camel-1.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfProducer.java
URL: http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfProducer.java?rev=712933&r1=712932&r2=712933&view=diff
==============================================================================
--- activemq/camel/branches/camel-1.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfProducer.java (original)
+++ activemq/camel/branches/camel-1.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfProducer.java Mon Nov 10 20:00:01 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);
}