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 2011/08/29 14:47:00 UTC
svn commit: r1162771 - in /camel/trunk/components/camel-cxf/src:
main/java/org/apache/camel/component/cxf/
main/java/org/apache/camel/component/cxf/spring/
test/resources/org/apache/camel/component/cxf/spring/
Author: ningjiang
Date: Mon Aug 29 12:47:00 2011
New Revision: 1162771
URL: http://svn.apache.org/viewvc?rev=1162771&view=rev
Log:
CAMEL-4351 removed the need of customer QNameConverter
Modified:
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/CxfEndpointBeanDefinitionParser.java
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/QNameConverter.java
camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/spring/CxfEndpointBeans.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=1162771&r1=1162770&r2=1162771&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 Mon Aug 29 12:47:00 2011
@@ -544,13 +544,13 @@ public class CxfEndpoint extends Default
public void setServiceClass(String type) throws ClassNotFoundException {
serviceClass = ClassLoaderUtils.loadClass(type, getClass());
}
-
- public void setServiceName(QName service) {
- serviceName = service;
+
+ public void setServiceNameString(String service) {
+ serviceName = QName.valueOf(service);
}
- public void setServiceName(String service) {
- setServiceName(QName.valueOf(service));
+ public void setServiceName(QName service) {
+ serviceName = service;
}
public QName getServiceName() {
@@ -565,12 +565,12 @@ public class CxfEndpoint extends Default
portName = port;
}
- public void setEndpointName(QName port) {
- portName = port;
+ public void setEndpointNameString(String port) {
+ portName = QName.valueOf(port);
}
- public void setEndpointName(String port) {
- setEndpointName(QName.valueOf(port));
+ public void setEndpointName(QName port) {
+ portName = port;
}
public String getDefaultOperationName() {
Modified: camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/CxfEndpointBeanDefinitionParser.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/CxfEndpointBeanDefinitionParser.java?rev=1162771&r1=1162770&r2=1162771&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/CxfEndpointBeanDefinitionParser.java (original)
+++ camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/CxfEndpointBeanDefinitionParser.java Mon Aug 29 12:47:00 2011
@@ -45,7 +45,8 @@ public class CxfEndpointBeanDefinitionPa
protected void mapAttribute(BeanDefinitionBuilder bean, Element e, String name, String val) {
if ("endpointName".equals(name) || "serviceName".equals(name)) {
if (isSpringPlaceHolder(val)) {
- mapToProperty(bean, name, val);
+ // set the property with the String value directly
+ mapToProperty(bean, name + "String", val);
} else {
QName q = parseQName(e, val);
bean.addPropertyValue(name, q);
Modified: camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/spring/CxfEndpointBeans.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/spring/CxfEndpointBeans.xml?rev=1162771&r1=1162770&r2=1162771&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/spring/CxfEndpointBeans.xml (original)
+++ camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/spring/CxfEndpointBeans.xml Mon Aug 29 12:47:00 2011
@@ -28,15 +28,6 @@
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
- <bean id="conversionService"
- class="org.springframework.context.support.ConversionServiceFactoryBean">
- <property name="converters">
- <list>
- <bean class="org.apache.camel.component.cxf.spring.QNameConverter"/>
- </list>
- </property>
- </bean>
-
<cxf:cxfEndpoint id="routerEndpoint" address="http://localhost:${CXFTestSupport.port1}/CxfEndpointBeanTest/router"
serviceClass="org.apache.camel.component.cxf.HelloService">
<cxf:schemaLocations>