Author: ningjiang
Date: Tue Nov 11 23:52:02 2008
New Revision: 713296
URL: http://svn.apache.org/viewvc?rev=713296&view=rev
Log:
Merged revisions 713292 via svnmerge from
https://svn.apache.org/repos/asf/activemq/camel/trunk
........
r713292 | ningjiang | 2008-11-12 15:40:29 +0800 (Wed, 12 Nov 2008) | 1 line
CAMEL-1079 patch applied with thanks to William
........
Added:
activemq/camel/branches/camel-1.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfGreeterPayLoadWithFeatureRouterTest.java
- copied unchanged from r713292,
activemq/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfGreeterPayLoadWithFeatureRouterTest.java
activemq/camel/branches/camel-1.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/TestCxfFeature.java
- copied unchanged from r713292,
activemq/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/TestCxfFeature.java
activemq/camel/branches/camel-1.x/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/GreeterEndpointWithFeatureBeans.xml
- copied unchanged from r713292,
activemq/camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/GreeterEndpointWithFeatureBeans.xml
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/CxfProducer.java
activemq/camel/branches/camel-1.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CXFGreeterRouterTest.java
activemq/camel/branches/camel-1.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfRouterTestSupport.java
(props changed)
Propchange: activemq/camel/branches/camel-1.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 11 23:52:02 2008
@@ -1 +1 @@
-/activemq/camel/trunk:709850,711200,711206,711219-711220,711523,711531,711756,711784,711859,711874,711962,711971,712064,712119,712148,712662,712692,712925,713013,713107,713273
+/activemq/camel/trunk:709850,711200,711206,711219-711220,711523,711531,711756,711784,711859,711874,711962,711971,712064,712119,712148,712662,712692,712925,713013,713107,713273,713292
Propchange: activemq/camel/branches/camel-1.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
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=713296&r1=713295&r2=713296&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
Tue Nov 11 23:52:02 2008
@@ -89,15 +89,7 @@
boolean jsr181Enabled =
CxfEndpointUtils.hasWebServiceAnnotation(serviceClass);
cfb.setJSR181Enabled(jsr181Enabled);
- dataFormat = CxfEndpointUtils.getDataFormat(endpoint);
- if (dataFormat.equals(DataFormat.MESSAGE)) {
- cfb.getFeatures().add(new MessageDataFormatFeature());
- // features.add(new LoggingFeature());
- } else if (dataFormat.equals(DataFormat.PAYLOAD)) {
- cfb.getFeatures().add(new PayLoadDataFormatFeature());
- // features.add(new LoggingFeature());
- }
-
+
return createClientFromClientFactoryBean(cfb);
}
@@ -153,6 +145,13 @@
cfb.setWsdlURL(endpoint.getWsdlURL());
}
}
+
+ if (dataFormat.equals(DataFormat.MESSAGE)) {
+ cfb.getFeatures().add(new MessageDataFormatFeature());
+ } else if (dataFormat.equals(DataFormat.PAYLOAD)) {
+ cfb.getFeatures().add(new PayLoadDataFormatFeature());
+ }
+
cfb.setBus(bus);
return cfb.create();
}
Modified:
activemq/camel/branches/camel-1.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CXFGreeterRouterTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CXFGreeterRouterTest.java?rev=713296&r1=713295&r2=713296&view=diff
==============================================================================
---
activemq/camel/branches/camel-1.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CXFGreeterRouterTest.java
(original)
+++
activemq/camel/branches/camel-1.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CXFGreeterRouterTest.java
Tue Nov 11 23:52:02 2008
@@ -16,22 +16,18 @@
*/
package org.apache.camel.component.cxf;
-import java.lang.reflect.UndeclaredThrowableException;
-
import javax.xml.namespace.QName;
import javax.xml.ws.Endpoint;
import javax.xml.ws.Service;
-import org.springframework.context.support.AbstractXmlApplicationContext;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
-
import org.apache.camel.CamelContext;
import org.apache.camel.spring.SpringCamelContext;
-import org.apache.camel.spring.processor.SpringTestHelper;
import org.apache.cxf.jaxws.EndpointImpl;
import org.apache.hello_world_soap_http.Greeter;
import org.apache.hello_world_soap_http.GreeterImpl;
import org.apache.hello_world_soap_http.NoSuchCodeLitFault;
+import org.springframework.context.support.AbstractXmlApplicationContext;
+import org.springframework.context.support.ClassPathXmlApplicationContext;
public class CXFGreeterRouterTest extends CxfRouterTestSupport {
protected AbstractXmlApplicationContext applicationContext;
Propchange:
activemq/camel/branches/camel-1.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfRouterTestSupport.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 11 23:52:02 2008
@@ -0,0 +1 @@
+/activemq/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfRouterTestSupport.java:713292
