This is an automated email from the ASF dual-hosted git repository. ffang pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push: new 18c4124 [CAMEL-16433]avoid using deprecated CXF LogFeature and LoggingInterceptors 18c4124 is described below commit 18c41240c654eac6a3df1a812ea2cac47dc94a6f Author: Freeman Fang <freeman.f...@gmail.com> AuthorDate: Tue Mar 30 17:57:28 2021 -0400 [CAMEL-16433]avoid using deprecated CXF LogFeature and LoggingInterceptors --- .../apache/camel/component/cxf/feature/RAWDataFormatFeature.java | 2 +- .../camel/component/cxf/CXFWsdlOnlyPayloadModeNoSpringTest.java | 4 ++-- .../component/cxf/CxfConsumerPayloadFaultCauseEnabledTest.java | 4 ++-- .../apache/camel/component/cxf/CxfConsumerPayloadFaultTest.java | 4 ++-- .../camel/component/cxf/LoggingInterceptorInMessageModeTest.java | 2 +- .../component/cxf/jaxrs/CxfRsProducerClientFactoryBeanTest.java | 4 ++-- .../camel/component/cxf/spring/CxfEndpointBeanWithBusTest.java | 2 +- .../component/cxf/LoggingInterceptorInMessageModeTest-context.xml | 2 +- .../org/apache/camel/component/cxf/WsdlFirstBeansPayloadMode.xml | 8 ++++---- .../component/cxf/jaxrs/CxfRsProducerClientFactoryBeanTest.xml | 4 ++-- .../org/apache/camel/component/cxf/jms/camel-context.xml | 4 ++-- .../component/cxf/mtom/CxfMtomRouterPayloadMode12Test-context.xml | 4 ++-- .../component/cxf/mtom/CxfMtomRouterPayloadModeTest-context.xml | 4 ++-- .../camel/component/cxf/mtom/CxfMtomRouterRawModeTest-context.xml | 4 ++-- .../cxf/soap/headers/CxfMessageHeadersRelayTest-context.xml | 4 ++-- .../camel/component/cxf/spring/CxfEndpointBeansRouterWithBus.xml | 2 +- .../camel/component/cxf/wsa/WSAddressingCXFMSGTest-context.xml | 4 ++-- .../camel/component/cxf/wsa/WSAddressingPAYLOADTest-context.xml | 4 ++-- .../apache/camel/component/cxf/wsa/WSAddressingTest-context.xml | 4 ++-- .../test/resources/org/apache/camel/component/cxf/wsa/client.xml | 4 ++-- .../test/resources/org/apache/camel/component/cxf/wsa/server.xml | 4 ++-- .../org/apache/camel/component/cxf/wsrm/WSRMTest-context.xml | 4 ++-- components/camel-wordpress/pom.xml | 4 ++++ .../api/service/impl/AbstractWordpressServiceAdapter.java | 4 ++-- 24 files changed, 47 insertions(+), 43 deletions(-) diff --git a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/RAWDataFormatFeature.java b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/RAWDataFormatFeature.java index 48b1984..573eacf 100644 --- a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/RAWDataFormatFeature.java +++ b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/RAWDataFormatFeature.java @@ -22,8 +22,8 @@ import org.apache.camel.component.cxf.interceptors.RawMessageWSDLGetInterceptor; import org.apache.cxf.Bus; import org.apache.cxf.endpoint.Client; import org.apache.cxf.endpoint.Server; +import org.apache.cxf.ext.logging.LoggingOutInterceptor; import org.apache.cxf.interceptor.Interceptor; -import org.apache.cxf.interceptor.LoggingOutInterceptor; import org.apache.cxf.interceptor.OneWayProcessorInterceptor; import org.apache.cxf.message.Message; import org.apache.cxf.phase.Phase; diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CXFWsdlOnlyPayloadModeNoSpringTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CXFWsdlOnlyPayloadModeNoSpringTest.java index ddc41d8..1c1313f 100644 --- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CXFWsdlOnlyPayloadModeNoSpringTest.java +++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CXFWsdlOnlyPayloadModeNoSpringTest.java @@ -32,9 +32,9 @@ import org.apache.camel.wsdl_first.PersonImpl; import org.apache.camel.wsdl_first.PersonService; import org.apache.camel.wsdl_first.UnknownPersonFault; import org.apache.cxf.endpoint.Client; +import org.apache.cxf.ext.logging.LoggingInInterceptor; +import org.apache.cxf.ext.logging.LoggingOutInterceptor; import org.apache.cxf.frontend.ClientProxy; -import org.apache.cxf.interceptor.LoggingInInterceptor; -import org.apache.cxf.interceptor.LoggingOutInterceptor; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerPayloadFaultCauseEnabledTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerPayloadFaultCauseEnabledTest.java index b581af2..24b2ba6 100644 --- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerPayloadFaultCauseEnabledTest.java +++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerPayloadFaultCauseEnabledTest.java @@ -34,10 +34,10 @@ import org.apache.camel.test.junit5.CamelTestSupport; import org.apache.camel.wsdl_first.Person; import org.apache.camel.wsdl_first.PersonService; import org.apache.cxf.endpoint.Client; +import org.apache.cxf.ext.logging.LoggingInInterceptor; +import org.apache.cxf.ext.logging.LoggingOutInterceptor; import org.apache.cxf.frontend.ClientProxy; import org.apache.cxf.interceptor.Fault; -import org.apache.cxf.interceptor.LoggingInInterceptor; -import org.apache.cxf.interceptor.LoggingOutInterceptor; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.springframework.context.support.AbstractXmlApplicationContext; diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerPayloadFaultTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerPayloadFaultTest.java index 4bf0054..096c369 100644 --- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerPayloadFaultTest.java +++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerPayloadFaultTest.java @@ -34,9 +34,9 @@ import org.apache.camel.wsdl_first.PersonService; import org.apache.camel.wsdl_first.UnknownPersonFault; import org.apache.cxf.binding.soap.SoapFault; import org.apache.cxf.endpoint.Client; +import org.apache.cxf.ext.logging.LoggingInInterceptor; +import org.apache.cxf.ext.logging.LoggingOutInterceptor; import org.apache.cxf.frontend.ClientProxy; -import org.apache.cxf.interceptor.LoggingInInterceptor; -import org.apache.cxf.interceptor.LoggingOutInterceptor; import org.apache.cxf.staxutils.StaxUtils; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/LoggingInterceptorInMessageModeTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/LoggingInterceptorInMessageModeTest.java index 43b382c..f899938 100644 --- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/LoggingInterceptorInMessageModeTest.java +++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/LoggingInterceptorInMessageModeTest.java @@ -21,11 +21,11 @@ import java.io.StringWriter; import org.apache.camel.CamelContext; import org.apache.cxf.endpoint.Server; +import org.apache.cxf.ext.logging.LoggingOutInterceptor; import org.apache.cxf.frontend.ClientFactoryBean; import org.apache.cxf.frontend.ClientProxyFactoryBean; import org.apache.cxf.frontend.ServerFactoryBean; import org.apache.cxf.interceptor.Interceptor; -import org.apache.cxf.interceptor.LoggingOutInterceptor; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerClientFactoryBeanTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerClientFactoryBeanTest.java index 3c814aa..e12bcec 100644 --- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerClientFactoryBeanTest.java +++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerClientFactoryBeanTest.java @@ -20,9 +20,9 @@ import java.util.List; import org.apache.camel.CamelContext; import org.apache.camel.spring.SpringCamelContext; +import org.apache.cxf.ext.logging.LoggingInInterceptor; +import org.apache.cxf.ext.logging.LoggingOutInterceptor; import org.apache.cxf.interceptor.Interceptor; -import org.apache.cxf.interceptor.LoggingInInterceptor; -import org.apache.cxf.interceptor.LoggingOutInterceptor; import org.apache.cxf.jaxrs.client.JAXRSClientFactoryBean; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/CxfEndpointBeanWithBusTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/CxfEndpointBeanWithBusTest.java index 216ae51..f261416 100644 --- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/CxfEndpointBeanWithBusTest.java +++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/CxfEndpointBeanWithBusTest.java @@ -19,8 +19,8 @@ package org.apache.camel.component.cxf.spring; import org.apache.camel.CamelContext; import org.apache.camel.component.cxf.CXFTestSupport; import org.apache.camel.component.cxf.CxfEndpoint; +import org.apache.cxf.ext.logging.LoggingInInterceptor; import org.apache.cxf.interceptor.Interceptor; -import org.apache.cxf.interceptor.LoggingInInterceptor; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/LoggingInterceptorInMessageModeTest-context.xml b/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/LoggingInterceptorInMessageModeTest-context.xml index aeb42ec..cf15d57 100644 --- a/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/LoggingInterceptorInMessageModeTest-context.xml +++ b/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/LoggingInterceptorInMessageModeTest-context.xml @@ -34,7 +34,7 @@ </cxf:cxfEndpoint> <!-- START SNIPPET: enableLoggingOutInterceptor --> - <bean id="loggingOutInterceptor" class="org.apache.cxf.interceptor.LoggingOutInterceptor"> + <bean id="loggingOutInterceptor" class="org.apache.cxf.ext.logging.LoggingOutInterceptor"> <!-- it really should have been user-prestream but CXF does have such phase! --> <constructor-arg value="target/write"/> </bean> diff --git a/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/WsdlFirstBeansPayloadMode.xml b/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/WsdlFirstBeansPayloadMode.xml index c02f28c..d7c31ee 100644 --- a/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/WsdlFirstBeansPayloadMode.xml +++ b/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/WsdlFirstBeansPayloadMode.xml @@ -34,10 +34,10 @@ <ref bean="fromEndpointJaxwsHandler"/> </cxf:handlers> <cxf:inInterceptors> - <bean class="org.apache.cxf.interceptor.LoggingInInterceptor"/> + <bean class="org.apache.cxf.ext.logging.LoggingInInterceptor"/> </cxf:inInterceptors> <cxf:outInterceptors> - <bean class="org.apache.cxf.interceptor.LoggingOutInterceptor"/> + <bean class="org.apache.cxf.ext.logging.LoggingOutInterceptor"/> </cxf:outInterceptors> </cxf:cxfEndpoint> @@ -47,10 +47,10 @@ <ref bean="toEndpointJaxwsHandler"/> </cxf:handlers> <cxf:inInterceptors> - <bean class="org.apache.cxf.interceptor.LoggingInInterceptor"/> + <bean class="org.apache.cxf.ext.logging.LoggingInInterceptor"/> </cxf:inInterceptors> <cxf:outInterceptors> - <bean class="org.apache.cxf.interceptor.LoggingOutInterceptor"/> + <bean class="org.apache.cxf.ext.logging.LoggingOutInterceptor"/> </cxf:outInterceptors> </cxf:cxfEndpoint> diff --git a/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/jaxrs/CxfRsProducerClientFactoryBeanTest.xml b/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/jaxrs/CxfRsProducerClientFactoryBeanTest.xml index 4299a0c..3df294f 100644 --- a/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/jaxrs/CxfRsProducerClientFactoryBeanTest.xml +++ b/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/jaxrs/CxfRsProducerClientFactoryBeanTest.xml @@ -31,10 +31,10 @@ <cxf:rsClient id="rsClientHttpInterceptors" address="http://localhost:8080/CxfRsProducerClientFactoryBeanInterceptors/"> <cxf:inInterceptors> - <bean class="org.apache.cxf.interceptor.LoggingInInterceptor"/> + <bean class="org.apache.cxf.ext.logging.LoggingInInterceptor"/> </cxf:inInterceptors> <cxf:outInterceptors> - <bean class="org.apache.cxf.interceptor.LoggingOutInterceptor"/> + <bean class="org.apache.cxf.ext.logging.LoggingOutInterceptor"/> </cxf:outInterceptors> </cxf:rsClient> diff --git a/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/jms/camel-context.xml b/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/jms/camel-context.xml index a3e82af..24039a3 100644 --- a/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/jms/camel-context.xml +++ b/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/jms/camel-context.xml @@ -28,8 +28,8 @@ http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/came http://camel.apache.org/schema/cxf http://camel.apache.org/schema/cxf/camel-cxf.xsd http://cxf.apache.org/transports/jms http://cxf.apache.org/schemas/configuration/jms.xsd"> -<bean id="logginOutInterceptor" class="org.apache.cxf.interceptor.LoggingOutInterceptor"/> -<bean id="logginInInterceptor" class="org.apache.cxf.interceptor.LoggingInInterceptor"/> +<bean id="logginOutInterceptor" class="org.apache.cxf.ext.logging.LoggingOutInterceptor"/> +<bean id="logginInInterceptor" class="org.apache.cxf.ext.logging.LoggingInInterceptor"/> <cxf:cxfEndpoint id="jmsEndpoint" address="jms:jndi:dynamicQueues/test.cxf.jmstransport.queue?jndiInitialContextFactory=org.apache.activemq.jndi.ActiveMQInitialContextFactory&jndiConnectionFactoryName=ConnectionFactory&jndiURL=vm://localhost" diff --git a/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/mtom/CxfMtomRouterPayloadMode12Test-context.xml b/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/mtom/CxfMtomRouterPayloadMode12Test-context.xml index fbca6ae..9ab81e3 100644 --- a/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/mtom/CxfMtomRouterPayloadMode12Test-context.xml +++ b/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/mtom/CxfMtomRouterPayloadMode12Test-context.xml @@ -86,7 +86,7 @@ </route> </camelContext> - <bean id="logOutbound" class="org.apache.cxf.interceptor.LoggingOutInterceptor" /> - <bean id="logInbound" class="org.apache.cxf.interceptor.LoggingInInterceptor"/> + <bean id="logOutbound" class="org.apache.cxf.ext.logging.LoggingOutInterceptor" /> + <bean id="logInbound" class="org.apache.cxf.ext.logging.LoggingInInterceptor"/> </beans> \ No newline at end of file diff --git a/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/mtom/CxfMtomRouterPayloadModeTest-context.xml b/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/mtom/CxfMtomRouterPayloadModeTest-context.xml index 954b6ec..f6ca84a 100644 --- a/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/mtom/CxfMtomRouterPayloadModeTest-context.xml +++ b/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/mtom/CxfMtomRouterPayloadModeTest-context.xml @@ -84,7 +84,7 @@ </route> </camelContext> - <bean id="logOutbound" class="org.apache.cxf.interceptor.LoggingOutInterceptor" /> - <bean id="logInbound" class="org.apache.cxf.interceptor.LoggingInInterceptor"/> + <bean id="logOutbound" class="org.apache.cxf.ext.logging.LoggingOutInterceptor" /> + <bean id="logInbound" class="org.apache.cxf.ext.logging.LoggingInInterceptor"/> </beans> \ No newline at end of file diff --git a/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/mtom/CxfMtomRouterRawModeTest-context.xml b/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/mtom/CxfMtomRouterRawModeTest-context.xml index 0c101b8..c73db4f 100644 --- a/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/mtom/CxfMtomRouterRawModeTest-context.xml +++ b/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/mtom/CxfMtomRouterRawModeTest-context.xml @@ -84,7 +84,7 @@ </route> </camelContext> - <bean id="logOutbound" class="org.apache.cxf.interceptor.LoggingOutInterceptor" /> - <bean id="logInbound" class="org.apache.cxf.interceptor.LoggingInInterceptor"/> + <bean id="logOutbound" class="org.apache.cxf.ext.logging.LoggingOutInterceptor" /> + <bean id="logInbound" class="org.apache.cxf.ext.logging.LoggingInInterceptor"/> </beans> \ No newline at end of file diff --git a/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/soap/headers/CxfMessageHeadersRelayTest-context.xml b/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/soap/headers/CxfMessageHeadersRelayTest-context.xml index 77df73e..9eceb6b 100644 --- a/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/soap/headers/CxfMessageHeadersRelayTest-context.xml +++ b/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/soap/headers/CxfMessageHeadersRelayTest-context.xml @@ -201,6 +201,6 @@ <bean id="InsertRequestOutHeaderProcessor" class="org.apache.camel.component.cxf.soap.headers.CxfMessageHeadersRelayTest$InsertRequestOutHeaderProcessor" /> <bean id="InsertResponseOutHeaderProcessor" class="org.apache.camel.component.cxf.soap.headers.CxfMessageHeadersRelayTest$InsertResponseOutHeaderProcessor" /> - <bean id="logOutbound" class="org.apache.cxf.interceptor.LoggingOutInterceptor" /> - <bean id="logInbound" class="org.apache.cxf.interceptor.LoggingInInterceptor"/> + <bean id="logOutbound" class="org.apache.cxf.ext.logging.LoggingOutInterceptor" /> + <bean id="logInbound" class="org.apache.cxf.ext.logging.LoggingInInterceptor"/> </beans> diff --git a/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/spring/CxfEndpointBeansRouterWithBus.xml b/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/spring/CxfEndpointBeansRouterWithBus.xml index dea4362..4a02161 100644 --- a/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/spring/CxfEndpointBeansRouterWithBus.xml +++ b/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/spring/CxfEndpointBeansRouterWithBus.xml @@ -35,7 +35,7 @@ <!-- configure the bus --> <cxfcore:bus> <cxfcore:features> - <cxfcore:logging/> + <bean class="org.apache.cxf.ext.logging.LoggingFeature"/> </cxfcore:features> </cxfcore:bus> <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/> diff --git a/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/wsa/WSAddressingCXFMSGTest-context.xml b/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/wsa/WSAddressingCXFMSGTest-context.xml index 35a9894..5a0273a 100644 --- a/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/wsa/WSAddressingCXFMSGTest-context.xml +++ b/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/wsa/WSAddressingCXFMSGTest-context.xml @@ -62,8 +62,8 @@ <bean id="removeRequestOutHeaderProcessor" class="org.apache.camel.component.cxf.wsa.WSAddressingTest$RemoveRequestOutHeaderProcessor" /> - <bean id="loggingOutInterceptor" class="org.apache.cxf.interceptor.LoggingOutInterceptor" /> - <bean id="logInbound" class="org.apache.cxf.interceptor.LoggingInInterceptor" /> + <bean id="loggingOutInterceptor" class="org.apache.cxf.ext.logging.LoggingOutInterceptor" /> + <bean id="logInbound" class="org.apache.cxf.ext.logging.LoggingInInterceptor" /> <camelContext id="camel" trace="true" xmlns="http://camel.apache.org/schema/spring"> <route> diff --git a/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/wsa/WSAddressingPAYLOADTest-context.xml b/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/wsa/WSAddressingPAYLOADTest-context.xml index 92b239b..bd845c8 100644 --- a/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/wsa/WSAddressingPAYLOADTest-context.xml +++ b/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/wsa/WSAddressingPAYLOADTest-context.xml @@ -62,8 +62,8 @@ <bean id="removeRequestOutHeaderProcessor" class="org.apache.camel.component.cxf.wsa.WSAddressingTest$RemoveRequestOutHeaderProcessor" /> - <bean id="loggingOutInterceptor" class="org.apache.cxf.interceptor.LoggingOutInterceptor" /> - <bean id="logInbound" class="org.apache.cxf.interceptor.LoggingInInterceptor" /> + <bean id="loggingOutInterceptor" class="org.apache.cxf.ext.logging.LoggingOutInterceptor" /> + <bean id="logInbound" class="org.apache.cxf.ext.logging.LoggingInInterceptor" /> <camelContext id="camel" trace="true" xmlns="http://camel.apache.org/schema/spring"> <route> diff --git a/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/wsa/WSAddressingTest-context.xml b/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/wsa/WSAddressingTest-context.xml index 8266a83..00eac12 100644 --- a/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/wsa/WSAddressingTest-context.xml +++ b/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/wsa/WSAddressingTest-context.xml @@ -62,8 +62,8 @@ <bean id="removeRequestOutHeaderProcessor" class="org.apache.camel.component.cxf.wsa.WSAddressingTest$RemoveRequestOutHeaderProcessor" /> - <bean id="loggingOutInterceptor" class="org.apache.cxf.interceptor.LoggingOutInterceptor" /> - <bean id="logInbound" class="org.apache.cxf.interceptor.LoggingInInterceptor" /> + <bean id="loggingOutInterceptor" class="org.apache.cxf.ext.logging.LoggingOutInterceptor" /> + <bean id="logInbound" class="org.apache.cxf.ext.logging.LoggingInInterceptor" /> <camelContext id="camel" trace="true" xmlns="http://camel.apache.org/schema/spring"> <route> diff --git a/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/wsa/client.xml b/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/wsa/client.xml index f15efdb..6e33f0b 100644 --- a/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/wsa/client.xml +++ b/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/wsa/client.xml @@ -47,7 +47,7 @@ </cxf:outInterceptors> </cxf:bus> - <bean id="loggingOutInterceptor" class="org.apache.cxf.interceptor.LoggingOutInterceptor" /> - <bean id="logInbound" class="org.apache.cxf.interceptor.LoggingInInterceptor"/> + <bean id="loggingOutInterceptor" class="org.apache.cxf.ext.logging.LoggingOutInterceptor" /> + <bean id="logInbound" class="org.apache.cxf.ext.logging.LoggingInInterceptor"/> </beans> diff --git a/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/wsa/server.xml b/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/wsa/server.xml index 3645434..6074c4f 100644 --- a/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/wsa/server.xml +++ b/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/wsa/server.xml @@ -39,7 +39,7 @@ http://www.springframework.org/schema/beans http://www.springframework.org/schem </cxf:bus> - <bean id="loggingOutInterceptor" class="org.apache.cxf.interceptor.LoggingOutInterceptor" /> - <bean id="logInbound" class="org.apache.cxf.interceptor.LoggingInInterceptor"/> + <bean id="loggingOutInterceptor" class="org.apache.cxf.ext.logging.LoggingOutInterceptor" /> + <bean id="logInbound" class="org.apache.cxf.ext.logging.LoggingInInterceptor"/> </beans> diff --git a/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/wsrm/WSRMTest-context.xml b/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/wsrm/WSRMTest-context.xml index 63942ec..c76880c 100644 --- a/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/wsrm/WSRMTest-context.xml +++ b/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/wsrm/WSRMTest-context.xml @@ -78,8 +78,8 @@ <bean id="myProcessor" class="org.apache.camel.component.cxf.wsrm.MyProcessor"/> - <bean id="loggingOutInterceptor" class="org.apache.cxf.interceptor.LoggingOutInterceptor" /> - <bean id="logInbound" class="org.apache.cxf.interceptor.LoggingInInterceptor" /> + <bean id="loggingOutInterceptor" class="org.apache.cxf.ext.logging.LoggingOutInterceptor" /> + <bean id="logInbound" class="org.apache.cxf.ext.logging.LoggingInInterceptor" /> <http:conduit name="{http://camel.apache.org/cxf/wsrm}HelloWorldPort.http-conduit"> <http:client AllowChunking="false" DecoupledEndpoint="http://localhost:${CXFTestSupport.port3}/wsrm/decoupled_endpoint"/> diff --git a/components/camel-wordpress/pom.xml b/components/camel-wordpress/pom.xml index 41b0e22..3cffc03 100644 --- a/components/camel-wordpress/pom.xml +++ b/components/camel-wordpress/pom.xml @@ -79,6 +79,10 @@ <artifactId>cxf-rt-frontend-jaxrs</artifactId> </dependency> <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-features-logging</artifactId> + </dependency> + <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> </dependency> diff --git a/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/api/service/impl/AbstractWordpressServiceAdapter.java b/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/api/service/impl/AbstractWordpressServiceAdapter.java index cdd0e64..0347d3d 100644 --- a/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/api/service/impl/AbstractWordpressServiceAdapter.java +++ b/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/api/service/impl/AbstractWordpressServiceAdapter.java @@ -23,8 +23,8 @@ import javax.ws.rs.core.MediaType; import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider; import org.apache.camel.component.wordpress.api.auth.WordpressAuthentication; import org.apache.camel.component.wordpress.api.service.WordpressService; -import org.apache.cxf.interceptor.LoggingInInterceptor; -import org.apache.cxf.interceptor.LoggingOutInterceptor; +import org.apache.cxf.ext.logging.LoggingInInterceptor; +import org.apache.cxf.ext.logging.LoggingOutInterceptor; import org.apache.cxf.jaxrs.client.JAXRSClientFactory; import org.apache.cxf.jaxrs.client.WebClient; import org.slf4j.Logger;