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/09/22 09:04:18 UTC
svn commit: r1173970 - in /camel/branches/camel-2.8.x: ./
components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
components/camel-cxf/src/main/resources/schema/cxfEndpoint.xsd
Author: ningjiang
Date: Thu Sep 22 07:04:18 2011
New Revision: 1173970
URL: http://svn.apache.org/viewvc?rev=1173970&view=rev
Log:
Merged revisions 1173958 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r1173958 | ningjiang | 2011-09-22 14:11:35 +0800 (Thu, 22 Sep 2011) | 1 line
CAMEL-4473 Fixed the issue of cxf:bing configuration
........
Modified:
camel/branches/camel-2.8.x/ (props changed)
camel/branches/camel-2.8.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
camel/branches/camel-2.8.x/components/camel-cxf/src/main/resources/schema/cxfEndpoint.xsd
Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 22 07:04:18 2011
@@ -1 +1 @@
-/camel/trunk:1173732
+/camel/trunk:1173732,1173958
Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: camel/branches/camel-2.8.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java?rev=1173970&r1=1173969&r2=1173970&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java (original)
+++ camel/branches/camel-2.8.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java Thu Sep 22 07:04:18 2011
@@ -47,10 +47,12 @@ import org.apache.camel.util.EndpointHel
import org.apache.camel.util.ObjectHelper;
import org.apache.cxf.Bus;
import org.apache.cxf.BusFactory;
+import org.apache.cxf.binding.BindingConfiguration;
import org.apache.cxf.common.classloader.ClassLoaderUtils;
import org.apache.cxf.common.injection.ResourceInjector;
import org.apache.cxf.common.util.ClassHelper;
import org.apache.cxf.common.util.ModCountCopyOnWriteArrayList;
+import org.apache.cxf.databinding.DataBinding;
import org.apache.cxf.endpoint.Client;
import org.apache.cxf.endpoint.ClientImpl;
import org.apache.cxf.endpoint.Endpoint;
@@ -75,6 +77,7 @@ import org.apache.cxf.message.MessageCon
import org.apache.cxf.resource.DefaultResourceManager;
import org.apache.cxf.resource.ResourceManager;
import org.apache.cxf.resource.ResourceResolver;
+import org.apache.cxf.service.factory.ReflectionServiceFactoryBean;
import org.apache.cxf.service.model.BindingOperationInfo;
import org.apache.cxf.service.model.MessagePartInfo;
import org.slf4j.Logger;
@@ -129,7 +132,10 @@ public class CxfEndpoint extends Default
private List<String> schemaLocations;
private String transportId;
private String bindingId;
-
+
+ private BindingConfiguration bindingConfig;
+ private DataBinding dataBinding;
+ private ReflectionServiceFactoryBean serviceFactoryBean;
public CxfEndpoint(String remaining, CxfComponent cxfComponent) {
@@ -191,6 +197,17 @@ public class CxfEndpoint extends Default
if (schemaLocations != null) {
sfb.setSchemaLocations(schemaLocations);
}
+ if (bindingConfig != null) {
+ sfb.setBindingConfig(bindingConfig);
+ }
+
+ if (dataBinding != null) {
+ sfb.setDataBinding(dataBinding);
+ }
+
+ if (serviceFactoryBean != null) {
+ sfb.setServiceFactory(serviceFactoryBean);
+ }
if (sfb instanceof JaxWsServerFactoryBean && handlers != null) {
((JaxWsServerFactoryBean)sfb).setHandlers(handlers);
@@ -339,6 +356,18 @@ public class CxfEndpoint extends Default
factoryBean.setFeatures(features);
factoryBean.setTransportId(transportId);
factoryBean.setBindingId(bindingId);
+
+ if (bindingConfig != null) {
+ factoryBean.setBindingConfig(bindingConfig);
+ }
+
+ if (dataBinding != null) {
+ factoryBean.setDataBinding(dataBinding);
+ }
+
+ if (serviceFactoryBean != null) {
+ factoryBean.setServiceFactory(serviceFactoryBean);
+ }
// address
factoryBean.setAddress(getAddress());
@@ -826,4 +855,29 @@ public class CxfEndpoint extends Default
this.bindingId = bindingId;
}
+ public BindingConfiguration getBindingConfig() {
+ return bindingConfig;
+ }
+
+ public void setBindingConfig(BindingConfiguration bindingConfig) {
+ this.bindingConfig = bindingConfig;
+ }
+
+ public DataBinding getDataBinding() {
+ return dataBinding;
+ }
+
+ public void setDataBinding(DataBinding dataBinding) {
+ this.dataBinding = dataBinding;
+ }
+
+ public ReflectionServiceFactoryBean getServiceFactoryBean() {
+ return serviceFactoryBean;
+ }
+
+ public void setServiceFactoryBean(ReflectionServiceFactoryBean serviceFactoryBean) {
+ this.serviceFactoryBean = serviceFactoryBean;
+ }
+
+
}
Modified: camel/branches/camel-2.8.x/components/camel-cxf/src/main/resources/schema/cxfEndpoint.xsd
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-cxf/src/main/resources/schema/cxfEndpoint.xsd?rev=1173970&r1=1173969&r2=1173970&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/components/camel-cxf/src/main/resources/schema/cxfEndpoint.xsd (original)
+++ camel/branches/camel-2.8.x/components/camel-cxf/src/main/resources/schema/cxfEndpoint.xsd Thu Sep 22 07:04:18 2011
@@ -44,7 +44,6 @@
<xsd:element name="handlers" type="xsd:anyType" minOccurs="0"/>
<xsd:element name="properties" type="beans:mapType" minOccurs="0"/>
<xsd:element name="schemaLocations" type="schemasType" minOccurs="0"/>
- <xsd:element name="serviceBean" type="xsd:anyType" minOccurs="0"/>
<xsd:element name="serviceFactory" type="xsd:anyType" minOccurs="0"/>
</xsd:all>
<xsd:attributeGroup ref="cxf-beans:beanAttributes"/>