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/11/08 16:30:24 UTC
svn commit: r1199288 - in /camel/trunk/components/camel-cxf/src:
main/java/org/apache/camel/component/cxf/ main/resources/schema/
main/resources/schema/blueprint/
test/java/org/apache/camel/component/cxf/spring/
test/resources/org/apache/camel/componen...
Author: ningjiang
Date: Tue Nov 8 15:30:24 2011
New Revision: 1199288
URL: http://svn.apache.org/viewvc?rev=1199288&view=rev
Log:
CAMEL-4645 Enhancement of loggingFeature setting on the cxfEndpoint
Modified:
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
camel/trunk/components/camel-cxf/src/main/resources/schema/blueprint/camel-cxf.xsd
camel/trunk/components/camel-cxf/src/main/resources/schema/cxfEndpoint.xsd
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/CxfEndpointBeanTest.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=1199288&r1=1199287&r2=1199288&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 Tue Nov 8 15:30:24 2011
@@ -263,7 +263,7 @@ public class CxfEndpoint extends Default
LOG.debug("Ignore DataFormat mode {} since SEI class is annotated with WebServiceProvider", getDataFormat());
}
- if (loggingFeatureEnabled) {
+ if (isLoggingFeatureEnabled()) {
sfb.getFeatures().add(new LoggingFeature());
}
@@ -414,7 +414,7 @@ public class CxfEndpoint extends Default
factoryBean.setDataBinding(new HybridSourceDataBinding());
}
- if (loggingFeatureEnabled) {
+ if (isLoggingFeatureEnabled()) {
factoryBean.getFeatures().add(new LoggingFeature());
}
Modified: camel/trunk/components/camel-cxf/src/main/resources/schema/blueprint/camel-cxf.xsd
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/resources/schema/blueprint/camel-cxf.xsd?rev=1199288&r1=1199287&r2=1199288&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/main/resources/schema/blueprint/camel-cxf.xsd (original)
+++ camel/trunk/components/camel-cxf/src/main/resources/schema/blueprint/camel-cxf.xsd Tue Nov 8 15:30:24 2011
@@ -57,6 +57,7 @@
<xsd:attribute name="wsdlURL" type="xsd:string"/>
<xsd:attribute name="endpointName" type="xsd:QName"/>
<xsd:attribute name="serviceName" type="xsd:QName"/>
+ <xsd:attribute name="loggingFeatureEnabled" type="xsd:boolean" default="true"/>
</xsd:extension>
</xsd:complexContent>
</xsd:complexType>
Modified: camel/trunk/components/camel-cxf/src/main/resources/schema/cxfEndpoint.xsd
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/resources/schema/cxfEndpoint.xsd?rev=1199288&r1=1199287&r2=1199288&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/main/resources/schema/cxfEndpoint.xsd (original)
+++ camel/trunk/components/camel-cxf/src/main/resources/schema/cxfEndpoint.xsd Tue Nov 8 15:30:24 2011
@@ -55,6 +55,7 @@
<xsd:attribute name="wsdlURL" type="xsd:string" />
<xsd:attribute name="endpointName" type="xsd:string" />
<xsd:attribute name="serviceName" type="xsd:string" />
+ <xsd:attribute name="loggingFeatureEnabled" type="xsd:boolean" default="true"/>
</xsd:extension>
</xsd:complexContent>
</xsd:complexType>
Modified: camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/CxfEndpointBeanTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/CxfEndpointBeanTest.java?rev=1199288&r1=1199287&r2=1199288&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/CxfEndpointBeanTest.java (original)
+++ camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/CxfEndpointBeanTest.java Tue Nov 8 15:30:24 2011
@@ -54,6 +54,7 @@ public class CxfEndpointBeanTest extends
CxfEndpoint myEndpoint = (CxfEndpoint)ctx.getBean("myEndpoint");
assertEquals("Got the wrong endpointName", endpointName, myEndpoint.getPortName());
assertEquals("Got the wrong serviceName", serviceName, myEndpoint.getServiceName());
+ assertEquals("loggingFeatureEnabled should be true", true, myEndpoint.isLoggingFeatureEnabled());
assertTrue("We should get a soap binding", myEndpoint.getBindingConfig() instanceof SoapBindingConfiguration);
SoapBindingConfiguration configuration = (SoapBindingConfiguration)myEndpoint.getBindingConfig();
assertEquals("We should get a right soap version", "1.2", String.valueOf(configuration.getVersion().getVersion()));
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=1199288&r1=1199287&r2=1199288&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 Tue Nov 8 15:30:24 2011
@@ -44,7 +44,7 @@
<cxf:cxfEndpoint id="myEndpoint" address="http://localhost:${CXFTestSupport.port3}/test"
serviceClass="org.apache.camel.wsdl_first.Person" serviceName="${CxfEndpointBeans.serviceName}" endpointName="${CxfEndpointBeans.endpointName}"
- wsdlURL="person.wsdl">
+ wsdlURL="person.wsdl" loggingFeatureEnabled="true">
<cxf:binding>
<soap:soapBinding version="1.2"/>
</cxf:binding>