You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by cs...@apache.org on 2011/06/02 13:28:08 UTC
svn commit: r1130499 [1/3] - in /camel/trunk/components: camel-cxf-transport/
camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/common/
camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/common/header/
camel-cxf-transport/s...
Author: cschneider
Date: Thu Jun 2 11:28:04 2011
New Revision: 1130499
URL: http://svn.apache.org/viewvc?rev=1130499&view=rev
Log:
CAMEL-2389 Factoring out common code and reversing dependency so camel-cxf depends on camel-cxf-transport but not the other way.
CXfBeanTransport still depends on camel-cxf-transport
Added:
camel/trunk/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/common/
camel/trunk/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/common/header/
camel/trunk/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/common/header/CxfHeaderFilterStrategy.java
camel/trunk/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/common/header/CxfHeaderHelper.java
camel/trunk/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/common/header/MessageHeaderFilter.java
camel/trunk/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/common/header/SoapMessageHeaderFilter.java
camel/trunk/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/common/message/
- copied from r1130427, camel/trunk/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/util/
camel/trunk/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/common/message/CxfConstants.java
- copied, changed from r1130427, camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfConstants.java
camel/trunk/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/common/message/CxfMessageMapper.java
- copied, changed from r1130427, camel/trunk/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/cxfbean/CxfBeanBinding.java
camel/trunk/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/common/message/DefaultCxfMesssageMapper.java
- copied, changed from r1130427, camel/trunk/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/cxfbean/DefaultCxfBeanBinding.java
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/cxfbean/CxfBeanComponent.java
- copied, changed from r1130427, camel/trunk/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/cxfbean/CxfBeanComponent.java
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/cxfbean/CxfBeanDestination.java
- copied, changed from r1130427, camel/trunk/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/cxfbean/CxfBeanDestination.java
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/cxfbean/CxfBeanEndpoint.java
- copied, changed from r1130427, camel/trunk/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/cxfbean/CxfBeanEndpoint.java
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/cxfbean/CxfBeanTransportFactory.java
- copied unchanged from r1130427, camel/trunk/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/cxfbean/CxfBeanTransportFactory.java
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/cxfbean/CamelEndpointSpringConfigureTest.java
- copied, changed from r1130427, camel/trunk/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/transport/CamelEndpointSpringConfigureTest.java
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/cxfbean/CxfBeanTest.java
- copied, changed from r1130427, camel/trunk/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/cxfbean/CxfBeanTest.java
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/cxfbean/CxfBeanWithWsdlLocationInBeanAndIoCTest.java
- copied, changed from r1130427, camel/trunk/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/cxfbean/CxfBeanWithWsdlLocationInBeanAndIoCTest.java
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/cxfbean/CxfBeanWithWsdlLocationInBeanTest.java
- copied, changed from r1130427, camel/trunk/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/cxfbean/CxfBeanWithWsdlLocationInBeanTest.java
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/Customer.java
- copied unchanged from r1130427, camel/trunk/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/Customer.java
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/CustomerService.java
- copied unchanged from r1130427, camel/trunk/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/CustomerService.java
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/Order.java
- copied unchanged from r1130427, camel/trunk/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/Order.java
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/Product.java
- copied unchanged from r1130427, camel/trunk/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/Product.java
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/wsdl_first/PersonImpl.java
- copied unchanged from r1130427, camel/trunk/components/camel-cxf-transport/src/test/java/org/apache/camel/wsdl_first/PersonImpl.java
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/wsdl_first/PersonImplWithWsdl.java
- copied unchanged from r1130427, camel/trunk/components/camel-cxf-transport/src/test/java/org/apache/camel/wsdl_first/PersonImplWithWsdl.java
Removed:
camel/trunk/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/cxfbean/CxfBeanBinding.java
camel/trunk/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/cxfbean/CxfBeanComponent.java
camel/trunk/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/cxfbean/CxfBeanDestination.java
camel/trunk/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/cxfbean/CxfBeanEndpoint.java
camel/trunk/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/cxfbean/CxfBeanTransportFactory.java
camel/trunk/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/cxfbean/DefaultCxfBeanBinding.java
camel/trunk/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/util/
camel/trunk/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/cxfbean/
camel/trunk/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/
camel/trunk/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/transport/CamelEndpointSpringConfigureTest.java
camel/trunk/components/camel-cxf-transport/src/test/java/org/apache/camel/wsdl_first/
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfConstants.java
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/transport/spring/
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/util/CxfHeaderHelper.java
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/util/CxfMessageHelper.java
Modified:
camel/trunk/components/camel-cxf-transport/ (props changed)
camel/trunk/components/camel-cxf-transport/pom.xml
camel/trunk/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/common/message/CxfMessageHelper.java
camel/trunk/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/CamelConduit.java
camel/trunk/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/CamelDestination.java
camel/trunk/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/CamelTransportFactory.java
camel/trunk/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/spring/AbstractCamelContextBeanDefinitionParser.java
camel/trunk/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/transport/CamelDestinationTest.java
camel/trunk/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/transport/CamelJBIClientProxyTest.java
camel/trunk/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/transport/JaxWSCamelConduitTest.java
camel/trunk/components/camel-cxf/pom.xml
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfBlueprintEndpoint.java
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfComponent.java
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfConsumer.java
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/CxfHeaderFilterStrategy.java
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfPayload.java
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfProducer.java
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfSpringEndpoint.java
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultSEI.java
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/HybridSourceDataBinding.java
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/WSDLServiceConfiguration.java
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/blueprint/CxfNamespaceHandler.java
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/blueprint/EndpointDefinitionParser.java
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/blueprint/RsClientDefinitionParser.java
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CxfPayloadConverter.java
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/MessageDataFormatFeature.java
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/PayLoadDataFormatFeature.java
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsComponent.java
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsHeaderFilterStrategy.java
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducer.java
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/DefaultCxfRsBinding.java
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/AbstractCxfBeanDefinitionParser.java
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/CxfEndpointBean.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/CxfRsClientFactoryBeanDefinitionParser.java
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/CxfRsServerFactoryBeanDefinitionParser.java
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/SpringBusFactoryBean.java
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/util/CxfEndpointUtils.java
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/util/CxfUtils.java
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/util/DataInInterceptor.java
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CXFWsdlOnlyPayloadModeMultiPartNoSpringTest.java
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerPayLoadFaultMessageTest.java
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerPayLoadMarshalFaultTest.java
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerPayloadFaultTest.java
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerPayloadTest.java
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerProviderTest.java
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerResponseTest.java
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerTest.java
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfCustomizedExceptionTest.java
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfDispatchMessageTest.java
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfDispatchPayloadTest.java
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfDispatchTestSupport.java
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfJavaOnlyPayloadModeTest.java
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfMixedModeRouterTest.java
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfNonWrapperTest.java
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfPayLoadMessageRouterAddressOverrideTest.java
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfPayLoadMessageRouterTest.java
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfPayLoadMessageXmlBindingRouterTest.java
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfPayLoadSoapHeaderTest.java
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerContextTest.java
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerOperationTest.java
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerProtocalHeaderTest.java
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerRouterTest.java
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerSoapFaultTest.java
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerTest.java
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfSimpleRouterTest.java
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfSpringCustomizedExceptionTest.java
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfTimeoutTest.java
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfWsdlFirstTest.java
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/DefaultCxfBindingTest.java
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/HelloImpl.java
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/LoggingInterceptorInMessageModeTest.java
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/ServiceClassRefTest.java
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/TestCamel1145Route.java
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/converter/CxfPayloadConverterTest.java
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/converter/MyCxfCustomerConverter.java
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsConsumerTest.java
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerHeaderTest.java
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerTest.java
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsSpringEndpointTest.java
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomConsumerPayloadModeTest.java
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomConsumerTest.java
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomDisabledConsumerPayloadModeTest.java
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomDisabledProducerPayloadModeTest.java
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomPOJOProducerTest.java
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomProducerPayloadModeTest.java
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomRouterPayloadMode12Test.java
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomRouterPayloadModeTest.java
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/multipart/CXFMultiPartTest.java
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/multipart/MultiPartInvokeImpl.java
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/soap/headers/CustomHeaderFilter.java
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/soap/headers/CxfMessageHeadersRelayTest.java
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/soap/headers/HeaderTesterImpl.java
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/soap/headers/HeaderTesterWithInsertionImpl.java
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/CxfEndpointBeanTest.java
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/CxfEndpointBeansRouterTest.java
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/MyProcessor.java
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/SpringBusFactoryBeanTest.java
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/util/CxfMessageHelperTest.java
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/util/CxfUtilsTest.java
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/util/SplitterWithXqureyTest.java
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/wsa/WSAddressingTest.java
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/wsdl_first/JaxwsTestHandler.java
Propchange: camel/trunk/components/camel-cxf-transport/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Jun 2 11:28:04 2011
@@ -0,0 +1,4 @@
+.classpath
+.project
+.settings
+target
Modified: camel/trunk/components/camel-cxf-transport/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf-transport/pom.xml?rev=1130499&r1=1130498&r2=1130499&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf-transport/pom.xml (original)
+++ camel/trunk/components/camel-cxf-transport/pom.xml Thu Jun 2 11:28:04 2011
@@ -68,23 +68,20 @@
<version>${cxf-version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-cxf</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-spring</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-blueprint</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.aries.blueprint</groupId>
- <artifactId>org.apache.aries.blueprint</artifactId>
- </exclusion>
- </exclusions>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-bindings-soap</artifactId>
+ <version>${cxf-version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-beans</artifactId>
</dependency>
<!-- for testing -->
@@ -112,12 +109,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-bindings-jbi</artifactId>
- <version>${cxf-version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-test</artifactId>
<scope>test</scope>
Added: camel/trunk/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/common/header/CxfHeaderFilterStrategy.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/common/header/CxfHeaderFilterStrategy.java?rev=1130499&view=auto
==============================================================================
--- camel/trunk/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/common/header/CxfHeaderFilterStrategy.java (added)
+++ camel/trunk/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/common/header/CxfHeaderFilterStrategy.java Thu Jun 2 11:28:04 2011
@@ -0,0 +1,243 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.cxf.common.header;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.camel.Exchange;
+import org.apache.camel.component.cxf.common.message.CxfConstants;
+import org.apache.camel.impl.DefaultHeaderFilterStrategy;
+import org.apache.cxf.endpoint.Client;
+import org.apache.cxf.headers.Header;
+import org.apache.cxf.message.Message;
+import org.apache.cxf.service.model.BindingInfo;
+import org.apache.cxf.service.model.BindingOperationInfo;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * The default CXF header filter strategy.
+ *
+ * @version
+ */
+public class CxfHeaderFilterStrategy extends DefaultHeaderFilterStrategy {
+ private static final Logger LOG = LoggerFactory.getLogger(CxfHeaderFilterStrategy.class);
+ private Map<String, MessageHeaderFilter> messageHeaderFiltersMap;
+
+ private List<MessageHeaderFilter> messageHeaderFilters;
+
+ private boolean relayHeaders = true;
+ private boolean allowFilterNamespaceClash;
+ private boolean relayAllMessageHeaders;
+
+ public CxfHeaderFilterStrategy() {
+ initialize();
+ }
+
+ protected void initialize() {
+ //filter the operationName and operationName
+ getOutFilter().add(CxfConstants.OPERATION_NAME.toLowerCase());
+ getOutFilter().add(CxfConstants.OPERATION_NAMESPACE.toLowerCase());
+
+ // Request and response context Maps will be passed to CXF Client APIs
+ getOutFilter().add(Client.REQUEST_CONTEXT.toLowerCase());
+ getOutFilter().add(Client.RESPONSE_CONTEXT.toLowerCase());
+
+ // protocol headers are stored as a Map. DefaultCxfBinding
+ // read the Map and send each entry to the filter. Therefore,
+ // we need to filter the header of this name.
+ getOutFilter().add(Message.PROTOCOL_HEADERS.toLowerCase());
+ getInFilter().add(Message.PROTOCOL_HEADERS.toLowerCase());
+
+ // Add the filter for the Generic Message header
+ // http://www.w3.org/Protocols/rfc2616/rfc2616-sec4.html#sec4.5
+ getOutFilter().add("cache-control");
+ getOutFilter().add("connection");
+ getOutFilter().add("date");
+ getOutFilter().add("pragma");
+ getOutFilter().add("trailer");
+ getOutFilter().add("transfer-encoding");
+ getOutFilter().add("upgrade");
+ getOutFilter().add("via");
+ getOutFilter().add("warning");
+
+ // Since CXF can take the content-type from the protocol header
+ // we need to filter this header of this name.
+ getOutFilter().add("Content-Type".toLowerCase());
+
+ // Filter out Content-Length since it can fool Jetty (HttpGenerator) to
+ // close response output stream prematurely. (It occurs when the
+ // message size (e.g. with attachment) is large and response content length
+ // is bigger than request content length.)
+ getOutFilter().add("Content-Length".toLowerCase());
+
+ // Filter Content-Length as it will cause some trouble when the message
+ // is passed to the other endpoint
+ getInFilter().add("content-length".toLowerCase());
+
+ setLowerCase(true);
+
+ // initialize message header filter map with default SOAP filter
+ messageHeaderFiltersMap = new HashMap<String, MessageHeaderFilter>();
+ addToMessageHeaderFilterMap(new SoapMessageHeaderFilter());
+
+ // filter headers begin with "Camel" or "org.apache.camel"
+ setOutFilterPattern("(Camel|org\\.apache\\.camel)[\\.|a-z|A-z|0-9]*");
+ }
+
+ @SuppressWarnings("unchecked")
+ @Override
+ protected boolean extendedFilter(Direction direction, String key, Object value, Exchange exchange) {
+ // Currently only handles Header.HEADER_LIST message header relay/filter
+ if (!Header.HEADER_LIST.equals(key) || value == null) {
+ return false;
+ }
+
+ if (!relayHeaders) {
+ // not propagating Header.HEADER_LIST at all
+ return true;
+ }
+
+ if (relayAllMessageHeaders) {
+ // all message headers will be relayed (no filtering)
+ return false;
+ }
+
+ // get filter
+ MessageHeaderFilter messageHeaderfilter = getMessageHeaderFilter(exchange);
+ if (messageHeaderfilter == null) {
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("No CXF Binding namespace can be resolved. Message headers are intact.");
+ }
+ return false;
+ }
+
+ LOG.trace("messageHeaderfilter = {}", messageHeaderfilter);
+
+ try {
+ messageHeaderfilter.filter(direction, (List<Header>)value);
+ } catch (Throwable t) {
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Failed to cast value to Header<List> due to " + t.toString(), t);
+ }
+ }
+
+ // return false since the header list (which has been filtered) should be propagated
+ return false;
+ }
+
+ private void addToMessageHeaderFilterMap(MessageHeaderFilter filter) {
+ for (String ns : filter.getActivationNamespaces()) {
+ if (messageHeaderFiltersMap.containsKey(ns) && messageHeaderFiltersMap.get(ns)
+ != messageHeaderFiltersMap && !allowFilterNamespaceClash) {
+ throw new IllegalArgumentException("More then one MessageHeaderRelay activates "
+ + "for the same namespace: " + ns);
+ }
+ messageHeaderFiltersMap.put(ns, filter);
+ }
+ }
+
+ private MessageHeaderFilter getMessageHeaderFilter(Exchange exchange) {
+ BindingOperationInfo boi = exchange.getProperty(BindingOperationInfo.class.getName(),
+ BindingOperationInfo.class);
+ String ns = null;
+ if (boi != null) {
+ BindingInfo b = boi.getBinding();
+ if (b != null) {
+ ns = b.getBindingId();
+ }
+ }
+
+ MessageHeaderFilter answer = null;
+ if (ns != null) {
+ answer = messageHeaderFiltersMap.get(ns);
+ }
+
+ return answer;
+ }
+
+ /**
+ * @param messageHeaderFilters the messageHeaderFilters to set
+ */
+ public void setMessageHeaderFilters(List<MessageHeaderFilter> messageHeaderFilters) {
+ this.messageHeaderFilters = messageHeaderFilters;
+ // clear the amp to allow removal of default filter
+ messageHeaderFiltersMap.clear();
+ for (MessageHeaderFilter filter : messageHeaderFilters) {
+ addToMessageHeaderFilterMap(filter);
+ }
+ }
+
+ /**
+ * @return the messageHeaderFilters
+ */
+ public List<MessageHeaderFilter> getMessageHeaderFilters() {
+ return messageHeaderFilters;
+ }
+
+ /**
+ * @return the allowFilterNamespaceClash
+ */
+ public boolean isAllowFilterNamespaceClash() {
+ return allowFilterNamespaceClash;
+ }
+
+ /**
+ * @param allowFilterNamespaceClash the allowFilterNamespaceClash to set
+ */
+ public void setAllowFilterNamespaceClash(boolean allowFilterNamespaceClash) {
+ this.allowFilterNamespaceClash = allowFilterNamespaceClash;
+ }
+
+ /**
+ * @return the messageHeaderFiltersMap
+ */
+ public Map<String, MessageHeaderFilter> getMessageHeaderFiltersMap() {
+ return messageHeaderFiltersMap;
+ }
+
+ /**
+ * @param relayHeaders the relayHeaders to set
+ */
+ public void setRelayHeaders(boolean relayHeaders) {
+ this.relayHeaders = relayHeaders;
+ }
+
+ /**
+ * @return the relayHeaders
+ */
+ public boolean isRelayHeaders() {
+ return relayHeaders;
+ }
+
+ /**
+ * @return the relayAllMessageHeaders
+ */
+ public boolean isRelayAllMessageHeaders() {
+ return relayAllMessageHeaders;
+ }
+
+ /**
+ * @param relayAllMessageHeaders the relayAllMessageHeaders to set
+ */
+ public void setRelayAllMessageHeaders(boolean relayAllMessageHeaders) {
+ this.relayAllMessageHeaders = relayAllMessageHeaders;
+ }
+
+}
Added: camel/trunk/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/common/header/CxfHeaderHelper.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/common/header/CxfHeaderHelper.java?rev=1130499&view=auto
==============================================================================
--- camel/trunk/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/common/header/CxfHeaderHelper.java (added)
+++ camel/trunk/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/common/header/CxfHeaderHelper.java Thu Jun 2 11:28:04 2011
@@ -0,0 +1,129 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.cxf.common.header;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
+
+import org.apache.camel.Exchange;
+import org.apache.camel.spi.HeaderFilterStrategy;
+import org.apache.cxf.endpoint.Client;
+import org.apache.cxf.helpers.CastUtils;
+import org.apache.cxf.message.Message;
+
+/**
+ * Utility class to propagate headers to and from CXF message.
+ *
+ * @version
+ */
+public final class CxfHeaderHelper {
+
+ /**
+ * Utility class does not have public constructor
+ */
+ private CxfHeaderHelper() {
+ }
+
+ /**
+ * Propagates Camel headers to CXF message.
+ *
+ * @param strategy header filter strategy
+ * @param headers Camel header
+ * @param message CXF message
+ * @param exchange provides context for filtering
+ */
+ public static void propagateCamelToCxf(HeaderFilterStrategy strategy,
+ Map<String, Object> headers, Message message, Exchange exchange) {
+
+ Map<String, List<String>> cxfHeaders =
+ CastUtils.cast((Map)message.get(Message.PROTOCOL_HEADERS));
+
+ if (cxfHeaders == null) {
+ // use a treemap to keep ordering and ignore key case
+ cxfHeaders = new TreeMap<String, List<String>>(String.CASE_INSENSITIVE_ORDER);
+ message.put(Message.PROTOCOL_HEADERS, cxfHeaders);
+ }
+
+ for (Map.Entry<String, Object> entry : headers.entrySet()) {
+ if (strategy != null
+ && !strategy.applyFilterToCamelHeaders(entry.getKey(), entry.getValue(), exchange)) {
+
+ if (Exchange.CONTENT_TYPE.equals(entry.getKey())) {
+ message.put(Message.CONTENT_TYPE, entry.getValue());
+ } else if (Client.REQUEST_CONTEXT.equals(entry.getKey())
+ || Client.RESPONSE_CONTEXT.equals(entry.getKey())
+ || Message.RESPONSE_CODE.equals(entry.getKey())) {
+ message.put(entry.getKey(), entry.getValue());
+ } else {
+ List<String> listValue = new ArrayList<String>();
+ listValue.add(entry.getValue().toString());
+ cxfHeaders.put(entry.getKey(), listValue);
+ }
+ }
+ }
+ }
+
+ public static void propagateCxfToCamel(HeaderFilterStrategy strategy,
+ Message message, Map<String, Object> headers, Exchange exchange) {
+
+ if (strategy == null) {
+ return;
+ }
+
+ // Copy the CXF protocol headers to the camel headers
+ Map<String, List<String>> cxfHeaders =
+ CastUtils.cast((Map)message.get(Message.PROTOCOL_HEADERS));
+ if (cxfHeaders != null) {
+ for (Map.Entry<String, List<String>> entry : cxfHeaders.entrySet()) {
+ if (!strategy.applyFilterToExternalHeaders(entry.getKey(), entry.getValue(), exchange)) {
+ headers.put(entry.getKey(), entry.getValue().get(0));
+ }
+ }
+ }
+
+ // propagate content type
+ String key = Message.CONTENT_TYPE;
+ Object value = message.get(key);
+ if (value != null && !strategy.applyFilterToExternalHeaders(key, value, exchange)) {
+ headers.put(Exchange.CONTENT_TYPE, value);
+ }
+
+ // propagate request context
+ key = Client.REQUEST_CONTEXT;
+ value = message.get(key);
+ if (value != null && !strategy.applyFilterToExternalHeaders(key, value, exchange)) {
+ headers.put(key, value);
+ }
+
+ // propagate response context
+ key = Client.RESPONSE_CONTEXT;
+ value = message.get(key);
+ if (value != null && !strategy.applyFilterToExternalHeaders(key, value, exchange)) {
+ headers.put(key, value);
+ }
+
+ // propagate response code
+ key = Message.RESPONSE_CODE;
+ value = message.get(key);
+ if (value != null && !strategy.applyFilterToExternalHeaders(key, value, exchange)) {
+ headers.put(Exchange.HTTP_RESPONSE_CODE, value);
+ }
+ }
+
+}
Added: camel/trunk/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/common/header/MessageHeaderFilter.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/common/header/MessageHeaderFilter.java?rev=1130499&view=auto
==============================================================================
--- camel/trunk/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/common/header/MessageHeaderFilter.java (added)
+++ camel/trunk/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/common/header/MessageHeaderFilter.java Thu Jun 2 11:28:04 2011
@@ -0,0 +1,44 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.cxf.common.header;
+
+import java.util.List;
+
+import org.apache.camel.spi.HeaderFilterStrategy.Direction;
+import org.apache.cxf.headers.Header;
+
+/**
+ * Filter the wire message headers from one CXF endpoint to another CXF endpoint
+ */
+public interface MessageHeaderFilter {
+
+ /**
+ * @return a list of binding name spaces that this relay can service
+ */
+ List<String> getActivationNamespaces();
+
+ /**
+ * This method filters (removes) headers from the given header list.
+ * <i>Out</i> direction refers to processing headers from a Camel message to an
+ * CXF message. <i>In</i> direction is the reverse direction.
+ *
+ * @param direction the direction of the processing
+ * @param headers the origin list of headers
+ */
+ void filter(Direction direction, List<Header> headers);
+
+}
Added: camel/trunk/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/common/header/SoapMessageHeaderFilter.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/common/header/SoapMessageHeaderFilter.java?rev=1130499&view=auto
==============================================================================
--- camel/trunk/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/common/header/SoapMessageHeaderFilter.java (added)
+++ camel/trunk/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/common/header/SoapMessageHeaderFilter.java Thu Jun 2 11:28:04 2011
@@ -0,0 +1,84 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.cxf.common.header;
+
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.List;
+
+import org.apache.camel.spi.HeaderFilterStrategy.Direction;
+
+import org.apache.cxf.binding.soap.SoapBindingConstants;
+import org.apache.cxf.binding.soap.SoapBindingFactory;
+import org.apache.cxf.binding.soap.SoapHeader;
+import org.apache.cxf.binding.soap.SoapVersion;
+import org.apache.cxf.binding.soap.SoapVersionFactory;
+import org.apache.cxf.headers.Header;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * A {@link MessageHeaderFilter} to drop all SOAP headers.
+ *
+ * @version
+ */
+public class SoapMessageHeaderFilter implements MessageHeaderFilter {
+ private static final Logger LOG = LoggerFactory.getLogger(SoapMessageHeaderFilter.class);
+
+ private static final List<String> ACTIVATION_NS =
+ Arrays.asList(SoapBindingConstants.SOAP11_BINDING_ID,
+ SoapBindingFactory.SOAP_11_BINDING,
+ SoapBindingFactory.SOAP_12_BINDING);
+
+ public List<String> getActivationNamespaces() {
+ return ACTIVATION_NS;
+ }
+
+ public void filter(Direction direction, List<Header> headers) {
+ // Treat both in and out direction the same
+ if (headers == null) {
+ return;
+ }
+
+ Iterator<Header> iterator = headers.iterator();
+ while (iterator.hasNext()) {
+ Header header = iterator.next();
+ LOG.trace("Processing header: {}", header);
+
+ if (!(header instanceof SoapHeader)) {
+ LOG.trace("Skipped header: {} since it is not a SoapHeader", header);
+ continue;
+ }
+
+ SoapHeader soapHeader = SoapHeader.class.cast(header);
+ for (Iterator<SoapVersion> itv = SoapVersionFactory.getInstance().getVersions(); itv.hasNext();) {
+ SoapVersion version = itv.next();
+
+ if (soapHeader.getActor() != null
+ && soapHeader.getActor().equals(version.getNextRole())) {
+ // dropping headers if actor/role equals to {ns}/role|actor/next
+ // cxf SoapHeader needs to have soap:header@relay attribute,
+ // then we can check for it here as well
+ LOG.trace("Filtered header: {}", header);
+ iterator.remove();
+ break;
+ }
+ }
+ }
+ }
+
+}
Copied: camel/trunk/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/common/message/CxfConstants.java (from r1130427, camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfConstants.java)
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/common/message/CxfConstants.java?p2=camel/trunk/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/common/message/CxfConstants.java&p1=camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfConstants.java&r1=1130427&r2=1130499&rev=1130499&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfConstants.java (original)
+++ camel/trunk/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/common/message/CxfConstants.java Thu Jun 2 11:28:04 2011
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.cxf;
+package org.apache.camel.component.cxf.common.message;
/**
* Constants used in this module
Modified: camel/trunk/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/common/message/CxfMessageHelper.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/common/message/CxfMessageHelper.java?rev=1130499&r1=1130427&r2=1130499&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/common/message/CxfMessageHelper.java (original)
+++ camel/trunk/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/common/message/CxfMessageHelper.java Thu Jun 2 11:28:04 2011
@@ -14,15 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.cxf.transport.util;
+package org.apache.camel.component.cxf.common.message;
import java.io.InputStream;
-import javax.xml.transform.Source;
-
-import org.apache.camel.InvalidPayloadException;
+import org.apache.camel.component.cxf.common.header.CxfHeaderHelper;
import org.apache.camel.component.cxf.transport.CamelTransportConstants;
-import org.apache.camel.component.cxf.util.CxfHeaderHelper;
import org.apache.camel.spi.HeaderFilterStrategy;
import org.apache.cxf.message.ExchangeImpl;
import org.apache.cxf.message.MessageImpl;
Copied: camel/trunk/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/common/message/CxfMessageMapper.java (from r1130427, camel/trunk/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/cxfbean/CxfBeanBinding.java)
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/common/message/CxfMessageMapper.java?p2=camel/trunk/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/common/message/CxfMessageMapper.java&p1=camel/trunk/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/cxfbean/CxfBeanBinding.java&r1=1130427&r2=1130499&rev=1130499&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/cxfbean/CxfBeanBinding.java (original)
+++ camel/trunk/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/common/message/CxfMessageMapper.java Thu Jun 2 11:28:04 2011
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.cxf.cxfbean;
+package org.apache.camel.component.cxf.common.message;
import org.apache.camel.Exchange;
import org.apache.camel.spi.HeaderFilterStrategy;
@@ -25,7 +25,7 @@ import org.apache.cxf.message.Message;
*
* @version
*/
-public interface CxfBeanBinding {
+public interface CxfMessageMapper {
/**
* Create a CXF {@link Message} from a Camel exchange.
Copied: camel/trunk/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/common/message/DefaultCxfMesssageMapper.java (from r1130427, camel/trunk/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/cxfbean/DefaultCxfBeanBinding.java)
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/common/message/DefaultCxfMesssageMapper.java?p2=camel/trunk/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/common/message/DefaultCxfMesssageMapper.java&p1=camel/trunk/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/cxfbean/DefaultCxfBeanBinding.java&r1=1130427&r2=1130499&rev=1130499&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/cxfbean/DefaultCxfBeanBinding.java (original)
+++ camel/trunk/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/common/message/DefaultCxfMesssageMapper.java Thu Jun 2 11:28:04 2011
@@ -14,13 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.cxf.cxfbean;
+package org.apache.camel.component.cxf.common.message;
import java.util.List;
import java.util.Map;
import org.apache.camel.Exchange;
-import org.apache.camel.component.cxf.util.CxfMessageHelper;
import org.apache.camel.spi.HeaderFilterStrategy;
import org.apache.cxf.helpers.CastUtils;
import org.apache.cxf.message.Message;
@@ -31,8 +30,8 @@ import org.slf4j.LoggerFactory;
*
* @version
*/
-public class DefaultCxfBeanBinding implements CxfBeanBinding {
- private static final Logger LOG = LoggerFactory.getLogger(DefaultCxfBeanBinding.class);
+public class DefaultCxfMesssageMapper implements CxfMessageMapper {
+ private static final Logger LOG = LoggerFactory.getLogger(DefaultCxfMesssageMapper.class);
public Message createCxfMessageFromCamelExchange(Exchange camelExchange,
HeaderFilterStrategy headerFilterStrategy) {
Modified: camel/trunk/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/CamelConduit.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/CamelConduit.java?rev=1130499&r1=1130498&r2=1130499&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/CamelConduit.java (original)
+++ camel/trunk/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/CamelConduit.java Thu Jun 2 11:28:04 2011
@@ -26,8 +26,8 @@ import org.apache.camel.ExchangePattern;
import org.apache.camel.Producer;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.RuntimeCamelException;
-import org.apache.camel.component.cxf.transport.util.CxfMessageHelper;
-import org.apache.camel.component.cxf.util.CxfHeaderHelper;
+import org.apache.camel.component.cxf.common.header.CxfHeaderHelper;
+import org.apache.camel.component.cxf.common.message.CxfMessageHelper;
import org.apache.camel.spi.HeaderFilterStrategy;
import org.apache.camel.util.ObjectHelper;
import org.apache.cxf.Bus;
Modified: camel/trunk/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/CamelDestination.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/CamelDestination.java?rev=1130499&r1=1130498&r2=1130499&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/CamelDestination.java (original)
+++ camel/trunk/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/CamelDestination.java Thu Jun 2 11:28:04 2011
@@ -19,15 +19,14 @@ package org.apache.camel.component.cxf.t
import java.io.IOException;
import java.io.OutputStream;
-
import org.apache.camel.CamelContext;
import org.apache.camel.Consumer;
import org.apache.camel.Endpoint;
import org.apache.camel.Exchange;
import org.apache.camel.FailedToCreateConsumerException;
import org.apache.camel.Processor;
-import org.apache.camel.component.cxf.cxfbean.DefaultCxfBeanBinding;
-import org.apache.camel.component.cxf.util.CxfHeaderHelper;
+import org.apache.camel.component.cxf.common.header.CxfHeaderHelper;
+import org.apache.camel.component.cxf.common.message.DefaultCxfMesssageMapper;
import org.apache.camel.spi.HeaderFilterStrategy;
import org.apache.camel.util.ObjectHelper;
import org.apache.camel.util.ServiceHelper;
@@ -143,7 +142,7 @@ public class CamelDestination extends Ab
protected void incoming(org.apache.camel.Exchange camelExchange) {
LOG.debug("server received request: ", camelExchange);
- DefaultCxfBeanBinding beanBinding = new DefaultCxfBeanBinding();
+ DefaultCxfMesssageMapper beanBinding = new DefaultCxfMesssageMapper();
org.apache.cxf.message.Message inMessage =
beanBinding.createCxfMessageFromCamelExchange(camelExchange, headerFilterStrategy);
Modified: camel/trunk/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/CamelTransportFactory.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/CamelTransportFactory.java?rev=1130499&r1=1130498&r2=1130499&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/CamelTransportFactory.java (original)
+++ camel/trunk/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/CamelTransportFactory.java Thu Jun 2 11:28:04 2011
@@ -18,17 +18,15 @@ package org.apache.camel.component.cxf.t
import java.io.IOException;
import java.util.Arrays;
-import java.util.Collection;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
-import javax.annotation.PostConstruct;
import javax.annotation.Resource;
import org.apache.camel.CamelContext;
import org.apache.camel.CamelContextAware;
-import org.apache.camel.component.cxf.CxfHeaderFilterStrategy;
+import org.apache.camel.component.cxf.common.header.CxfHeaderFilterStrategy;
import org.apache.camel.spi.HeaderFilterStrategy;
import org.apache.cxf.Bus;
import org.apache.cxf.common.injection.NoJSR250Annotations;
@@ -36,10 +34,8 @@ import org.apache.cxf.service.model.Endp
import org.apache.cxf.transport.AbstractTransportFactory;
import org.apache.cxf.transport.Conduit;
import org.apache.cxf.transport.ConduitInitiator;
-import org.apache.cxf.transport.ConduitInitiatorManager;
import org.apache.cxf.transport.Destination;
import org.apache.cxf.transport.DestinationFactory;
-import org.apache.cxf.transport.DestinationFactoryManager;
import org.apache.cxf.ws.addressing.EndpointReferenceType;
/**
Modified: camel/trunk/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/spring/AbstractCamelContextBeanDefinitionParser.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/spring/AbstractCamelContextBeanDefinitionParser.java?rev=1130499&r1=1130498&r2=1130499&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/spring/AbstractCamelContextBeanDefinitionParser.java (original)
+++ camel/trunk/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/spring/AbstractCamelContextBeanDefinitionParser.java Thu Jun 2 11:28:04 2011
@@ -16,15 +16,14 @@
*/
package org.apache.camel.component.cxf.transport.spring;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
import org.apache.camel.util.ObjectHelper;
import org.apache.cxf.configuration.spring.AbstractBeanDefinitionParser;
import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.beans.factory.support.BeanDefinitionBuilder;
import org.springframework.beans.factory.xml.ParserContext;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
public class AbstractCamelContextBeanDefinitionParser extends AbstractBeanDefinitionParser {
private static final String DEFAULT_CAMEL_CONTEXT_NAME = "camelContext";
Modified: camel/trunk/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/transport/CamelDestinationTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/transport/CamelDestinationTest.java?rev=1130499&r1=1130498&r2=1130499&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/transport/CamelDestinationTest.java (original)
+++ camel/trunk/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/transport/CamelDestinationTest.java Thu Jun 2 11:28:04 2011
@@ -42,7 +42,6 @@ import org.apache.cxf.transport.ConduitI
import org.apache.cxf.transport.ConduitInitiatorManager;
import org.apache.cxf.transport.MessageObserver;
import org.easymock.classextension.EasyMock;
-import org.hamcrest.core.IsNull;
import org.junit.Assert;
import org.junit.Test;
Modified: camel/trunk/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/transport/CamelJBIClientProxyTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/transport/CamelJBIClientProxyTest.java?rev=1130499&r1=1130498&r2=1130499&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/transport/CamelJBIClientProxyTest.java (original)
+++ camel/trunk/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/transport/CamelJBIClientProxyTest.java Thu Jun 2 11:28:04 2011
@@ -16,6 +16,9 @@
*/
package org.apache.camel.component.cxf.transport;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
import org.apache.camel.CamelContext;
import org.apache.camel.ProducerTemplate;
import org.junit.After;
@@ -23,9 +26,6 @@ import org.junit.Before;
import org.junit.Test;
import org.springframework.context.support.ClassPathXmlApplicationContext;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
public class CamelJBIClientProxyTest {
private HelloService proxy;
private ClassPathXmlApplicationContext applicationContext;
Modified: camel/trunk/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/transport/JaxWSCamelConduitTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/transport/JaxWSCamelConduitTest.java?rev=1130499&r1=1130498&r2=1130499&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/transport/JaxWSCamelConduitTest.java (original)
+++ camel/trunk/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/transport/JaxWSCamelConduitTest.java Thu Jun 2 11:28:04 2011
@@ -16,6 +16,8 @@
*/
package org.apache.camel.component.cxf.transport;
+import static org.hamcrest.CoreMatchers.is;
+
import javax.jws.WebMethod;
import javax.jws.WebResult;
import javax.jws.WebService;
@@ -28,8 +30,6 @@ import org.apache.cxf.BusFactory;
import org.junit.Before;
import org.junit.Test;
-import static org.hamcrest.CoreMatchers.is;
-
/**
* Test CXF-CamelConduit when the destination is not a pipeline
*/
Modified: camel/trunk/components/camel-cxf/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/pom.xml?rev=1130499&r1=1130498&r2=1130499&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/pom.xml (original)
+++ camel/trunk/components/camel-cxf/pom.xml Thu Jun 2 11:28:04 2011
@@ -72,6 +72,10 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-spring</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-cxf-transport</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
Modified: camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfBlueprintEndpoint.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfBlueprintEndpoint.java?rev=1130499&r1=1130498&r2=1130499&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfBlueprintEndpoint.java (original)
+++ camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfBlueprintEndpoint.java Thu Jun 2 11:28:04 2011
@@ -20,9 +20,11 @@ package org.apache.camel.component.cxf;
import java.lang.reflect.Proxy;
import java.util.List;
import java.util.Map;
+
import javax.xml.ws.handler.Handler;
import org.apache.camel.blueprint.BlueprintCamelContext;
+import org.apache.camel.component.cxf.common.message.CxfConstants;
import org.apache.camel.component.cxf.util.CxfEndpointUtils;
import org.apache.camel.util.ObjectHelper;
import org.apache.cxf.BusFactory;
Modified: camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfComponent.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfComponent.java?rev=1130499&r1=1130498&r2=1130499&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfComponent.java (original)
+++ camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfComponent.java Thu Jun 2 11:28:04 2011
@@ -21,6 +21,7 @@ import java.util.Map;
import org.apache.camel.CamelContext;
import org.apache.camel.Endpoint;
+import org.apache.camel.component.cxf.common.message.CxfConstants;
import org.apache.camel.component.cxf.spring.CxfEndpointBean;
import org.apache.camel.impl.HeaderFilterStrategyComponent;
import org.apache.camel.util.CamelContextHelper;
Modified: camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfConsumer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfConsumer.java?rev=1130499&r1=1130498&r2=1130499&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfConsumer.java (original)
+++ camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfConsumer.java Thu Jun 2 11:28:04 2011
@@ -22,10 +22,9 @@ import java.util.Map;
import javax.xml.ws.WebFault;
-import org.w3c.dom.Element;
-
import org.apache.camel.AsyncCallback;
import org.apache.camel.Processor;
+import org.apache.camel.component.cxf.common.message.CxfConstants;
import org.apache.camel.impl.DefaultConsumer;
import org.apache.camel.util.ObjectHelper;
import org.apache.cxf.continuations.Continuation;
@@ -39,6 +38,7 @@ import org.apache.cxf.service.invoker.In
import org.apache.cxf.service.model.BindingOperationInfo;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.w3c.dom.Element;
/**
* A Consumer of exchanges for a service in CXF. CxfConsumer acts a CXF
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=1130499&r1=1130498&r2=1130499&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 Thu Jun 2 11:28:04 2011
@@ -24,14 +24,13 @@ import java.util.concurrent.atomic.Atomi
import javax.xml.ws.WebServiceProvider;
-import org.w3c.dom.Element;
-
import org.apache.camel.CamelContext;
import org.apache.camel.CamelException;
import org.apache.camel.Consumer;
import org.apache.camel.Processor;
import org.apache.camel.Producer;
import org.apache.camel.Service;
+import org.apache.camel.component.cxf.common.message.CxfConstants;
import org.apache.camel.component.cxf.feature.MessageDataFormatFeature;
import org.apache.camel.component.cxf.feature.PayLoadDataFormatFeature;
import org.apache.camel.component.cxf.util.CxfEndpointUtils;
@@ -65,6 +64,7 @@ import org.apache.cxf.service.model.Mess
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.context.ApplicationContext;
+import org.w3c.dom.Element;
/**
* Defines the <a href="http://camel.apache.org/cxf.html">CXF Endpoint</a>.
Modified: camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfHeaderFilterStrategy.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfHeaderFilterStrategy.java?rev=1130499&r1=1130498&r2=1130499&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfHeaderFilterStrategy.java (original)
+++ camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfHeaderFilterStrategy.java Thu Jun 2 11:28:04 2011
@@ -21,6 +21,7 @@ import java.util.List;
import java.util.Map;
import org.apache.camel.Exchange;
+import org.apache.camel.component.cxf.common.message.CxfConstants;
import org.apache.camel.impl.DefaultHeaderFilterStrategy;
import org.apache.cxf.endpoint.Client;
import org.apache.cxf.headers.Header;
Modified: camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfPayload.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfPayload.java?rev=1130499&r1=1130498&r2=1130499&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfPayload.java (original)
+++ camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfPayload.java Thu Jun 2 11:28:04 2011
@@ -20,9 +20,8 @@ import java.util.List;
import javax.xml.transform.TransformerException;
-import org.w3c.dom.Element;
-
import org.apache.camel.converter.jaxp.XmlConverter;
+import org.w3c.dom.Element;
/**
* CxfMessage body type when {@link DataFormat#PAYLOAD} is used.
Modified: camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfProducer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfProducer.java?rev=1130499&r1=1130498&r2=1130499&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfProducer.java (original)
+++ camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfProducer.java Thu Jun 2 11:28:04 2011
@@ -32,6 +32,7 @@ import org.apache.camel.AsyncProcessor;
import org.apache.camel.Exchange;
import org.apache.camel.InvalidPayloadException;
import org.apache.camel.RuntimeCamelException;
+import org.apache.camel.component.cxf.common.message.CxfConstants;
import org.apache.camel.impl.DefaultProducer;
import org.apache.camel.util.ObjectHelper;
import org.apache.cxf.binding.soap.model.SoapHeaderInfo;
Modified: camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfSpringEndpoint.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfSpringEndpoint.java?rev=1130499&r1=1130498&r2=1130499&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfSpringEndpoint.java (original)
+++ camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfSpringEndpoint.java Thu Jun 2 11:28:04 2011
@@ -21,6 +21,7 @@ import java.lang.reflect.Proxy;
import javax.xml.namespace.QName;
import org.apache.camel.CamelContext;
+import org.apache.camel.component.cxf.common.message.CxfConstants;
import org.apache.camel.component.cxf.spring.CxfEndpointBean;
import org.apache.camel.component.cxf.util.CxfEndpointUtils;
import org.apache.camel.spring.SpringCamelContext;
Modified: camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java?rev=1130499&r1=1130498&r2=1130499&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java (original)
+++ camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java Thu Jun 2 11:28:04 2011
@@ -33,12 +33,9 @@ import javax.xml.transform.Source;
import javax.xml.transform.dom.DOMSource;
import javax.xml.ws.Holder;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
import org.apache.camel.Exchange;
import org.apache.camel.ExchangePattern;
+import org.apache.camel.component.cxf.common.message.CxfConstants;
import org.apache.camel.spi.HeaderFilterStrategy;
import org.apache.camel.spi.HeaderFilterStrategyAware;
import org.apache.camel.util.ObjectHelper;
@@ -64,6 +61,9 @@ import org.apache.cxf.service.model.Mess
import org.apache.cxf.service.model.OperationInfo;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
/**
Modified: camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultSEI.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultSEI.java?rev=1130499&r1=1130498&r2=1130499&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultSEI.java (original)
+++ camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultSEI.java Thu Jun 2 11:28:04 2011
@@ -21,7 +21,6 @@ import javax.jws.Oneway;
import javax.jws.WebMethod;
import javax.jws.WebParam;
import javax.jws.WebService;
-
import javax.jws.soap.SOAPBinding;
import javax.jws.soap.SOAPBinding.ParameterStyle;
Modified: camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/HybridSourceDataBinding.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/HybridSourceDataBinding.java?rev=1130499&r1=1130498&r2=1130499&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/HybridSourceDataBinding.java (original)
+++ camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/HybridSourceDataBinding.java Thu Jun 2 11:28:04 2011
@@ -19,8 +19,6 @@ package org.apache.camel.component.cxf;
import javax.xml.stream.XMLStreamReader;
import javax.xml.stream.XMLStreamWriter;
-import org.w3c.dom.Node;
-
import org.apache.cxf.databinding.DataReader;
import org.apache.cxf.databinding.DataWriter;
import org.apache.cxf.databinding.source.NodeDataReader;
@@ -28,6 +26,7 @@ import org.apache.cxf.databinding.source
import org.apache.cxf.databinding.source.XMLStreamDataReader;
import org.apache.cxf.databinding.source.XMLStreamDataWriter;
import org.apache.cxf.jaxb.JAXBDataBinding;
+import org.w3c.dom.Node;
/**
* This is a hybrid DataBinding of {@link JAXBDataBinding} and {@link org.apache.cxf.databinding.source.SourceDataBinding}.
Modified: camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/WSDLServiceConfiguration.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/WSDLServiceConfiguration.java?rev=1130499&r1=1130498&r2=1130499&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/WSDLServiceConfiguration.java (original)
+++ camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/WSDLServiceConfiguration.java Thu Jun 2 11:28:04 2011
@@ -20,7 +20,6 @@ import java.util.Map;
import javax.wsdl.Definition;
import javax.wsdl.Service;
-import javax.wsdl.WSDLException;
import javax.xml.namespace.QName;
import org.apache.camel.RuntimeCamelException;
Modified: camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/blueprint/CxfNamespaceHandler.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/blueprint/CxfNamespaceHandler.java?rev=1130499&r1=1130498&r2=1130499&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/blueprint/CxfNamespaceHandler.java (original)
+++ camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/blueprint/CxfNamespaceHandler.java Thu Jun 2 11:28:04 2011
@@ -21,14 +21,14 @@ import java.net.URL;
import java.util.Arrays;
import java.util.HashSet;
import java.util.Set;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
import org.apache.aries.blueprint.NamespaceHandler;
import org.apache.aries.blueprint.ParserContext;
import org.apache.cxf.bus.blueprint.BlueprintBus;
import org.osgi.service.blueprint.reflect.ComponentMetadata;
import org.osgi.service.blueprint.reflect.Metadata;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
public class CxfNamespaceHandler implements NamespaceHandler {
Modified: camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/blueprint/EndpointDefinitionParser.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/blueprint/EndpointDefinitionParser.java?rev=1130499&r1=1130498&r2=1130499&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/blueprint/EndpointDefinitionParser.java (original)
+++ camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/blueprint/EndpointDefinitionParser.java Thu Jun 2 11:28:04 2011
@@ -20,10 +20,8 @@ package org.apache.camel.component.cxf.b
import java.util.Set;
import java.util.StringTokenizer;
import java.util.concurrent.Callable;
+
import javax.xml.namespace.QName;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
import org.apache.aries.blueprint.ComponentDefinitionRegistry;
import org.apache.aries.blueprint.ComponentDefinitionRegistryProcessor;
@@ -41,6 +39,9 @@ import org.osgi.framework.Bundle;
import org.osgi.service.blueprint.container.BlueprintContainer;
import org.osgi.service.blueprint.reflect.ComponentMetadata;
import org.osgi.service.blueprint.reflect.Metadata;
+import org.w3c.dom.Attr;
+import org.w3c.dom.Element;
+import org.w3c.dom.NamedNodeMap;
public class EndpointDefinitionParser extends AbstractBPBeanDefinitionParser {
Modified: camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/blueprint/RsClientDefinitionParser.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/blueprint/RsClientDefinitionParser.java?rev=1130499&r1=1130498&r2=1130499&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/blueprint/RsClientDefinitionParser.java (original)
+++ camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/blueprint/RsClientDefinitionParser.java Thu Jun 2 11:28:04 2011
@@ -18,7 +18,6 @@
package org.apache.camel.component.cxf.blueprint;
import java.util.StringTokenizer;
-import org.w3c.dom.Element;
import org.apache.aries.blueprint.ParserContext;
import org.apache.aries.blueprint.mutable.MutableBeanMetadata;
@@ -26,6 +25,7 @@ import org.apache.camel.component.cxf.Cx
import org.apache.cxf.common.util.StringUtils;
import org.apache.cxf.configuration.blueprint.AbstractBPBeanDefinitionParser;
import org.osgi.service.blueprint.reflect.Metadata;
+import org.w3c.dom.Element;
public class RsClientDefinitionParser extends AbstractBPBeanDefinitionParser {
Modified: camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CxfPayloadConverter.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CxfPayloadConverter.java?rev=1130499&r1=1130498&r2=1130499&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CxfPayloadConverter.java (original)
+++ camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CxfPayloadConverter.java Thu Jun 2 11:28:04 2011
@@ -20,17 +20,16 @@ import java.io.InputStream;
import java.util.ArrayList;
import java.util.List;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
import org.apache.camel.Converter;
import org.apache.camel.Exchange;
import org.apache.camel.FallbackConverter;
import org.apache.camel.TypeConverter;
import org.apache.camel.component.cxf.CxfPayload;
import org.apache.camel.spi.TypeConverterRegistry;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
@Converter
public final class CxfPayloadConverter {
Copied: camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/cxfbean/CxfBeanComponent.java (from r1130427, camel/trunk/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/cxfbean/CxfBeanComponent.java)
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/cxfbean/CxfBeanComponent.java?p2=camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/cxfbean/CxfBeanComponent.java&p1=camel/trunk/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/cxfbean/CxfBeanComponent.java&r1=1130427&r2=1130499&rev=1130499&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/cxfbean/CxfBeanComponent.java (original)
+++ camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/cxfbean/CxfBeanComponent.java Thu Jun 2 11:28:04 2011
@@ -20,7 +20,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.apache.camel.Endpoint;
+import org.apache.camel.Endpoint;
import org.apache.camel.impl.HeaderFilterStrategyComponent;
/**
Copied: camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/cxfbean/CxfBeanDestination.java (from r1130427, camel/trunk/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/cxfbean/CxfBeanDestination.java)
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/cxfbean/CxfBeanDestination.java?p2=camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/cxfbean/CxfBeanDestination.java&p1=camel/trunk/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/cxfbean/CxfBeanDestination.java&r1=1130427&r2=1130499&rev=1130499&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/cxfbean/CxfBeanDestination.java (original)
+++ camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/cxfbean/CxfBeanDestination.java Thu Jun 2 11:28:04 2011
@@ -20,7 +20,7 @@ import java.io.IOException;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
-import org.apache.camel.component.cxf.CxfConstants;
+import org.apache.camel.component.cxf.common.message.CxfConstants;
import org.apache.camel.component.cxf.transport.CamelDestination;
import org.apache.cxf.Bus;
import org.apache.cxf.message.Message;
Copied: camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/cxfbean/CxfBeanEndpoint.java (from r1130427, camel/trunk/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/cxfbean/CxfBeanEndpoint.java)
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/cxfbean/CxfBeanEndpoint.java?p2=camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/cxfbean/CxfBeanEndpoint.java&p1=camel/trunk/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/cxfbean/CxfBeanEndpoint.java&r1=1130427&r2=1130499&rev=1130499&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/cxfbean/CxfBeanEndpoint.java (original)
+++ camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/cxfbean/CxfBeanEndpoint.java Thu Jun 2 11:28:04 2011
@@ -22,6 +22,8 @@ import java.util.List;
import javax.jws.WebService;
import org.apache.camel.component.cxf.CxfHeaderFilterStrategy;
+import org.apache.camel.component.cxf.common.message.CxfMessageMapper;
+import org.apache.camel.component.cxf.common.message.DefaultCxfMesssageMapper;
import org.apache.camel.impl.ProcessorEndpoint;
import org.apache.camel.spi.HeaderFilterStrategy;
import org.apache.camel.spi.HeaderFilterStrategyAware;
@@ -47,7 +49,7 @@ public class CxfBeanEndpoint extends Pro
private Server server;
private Bus bus;
private boolean isSetDefaultBus;
- private CxfBeanBinding cxfBeanBinding = new DefaultCxfBeanBinding();
+ private CxfMessageMapper cxfBeanBinding = new DefaultCxfMesssageMapper();
private HeaderFilterStrategy headerFilterStrategy = new CxfHeaderFilterStrategy();
private boolean loggingFeatureEnabled;
private boolean populateFromClass = true;
@@ -164,11 +166,11 @@ public class CxfBeanEndpoint extends Pro
return isSetDefaultBus;
}
- public void setCxfBeanBinding(CxfBeanBinding cxfBeanBinding) {
+ public void setCxfBeanBinding(CxfMessageMapper cxfBeanBinding) {
this.cxfBeanBinding = cxfBeanBinding;
}
- public CxfBeanBinding getCxfBeanBinding() {
+ public CxfMessageMapper getCxfBeanBinding() {
return cxfBeanBinding;
}
Modified: camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/MessageDataFormatFeature.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/MessageDataFormatFeature.java?rev=1130499&r1=1130498&r2=1130499&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/MessageDataFormatFeature.java (original)
+++ camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/MessageDataFormatFeature.java Thu Jun 2 11:28:04 2011
@@ -20,14 +20,12 @@ package org.apache.camel.component.cxf.f
import java.util.List;
import org.apache.camel.component.cxf.interceptors.RawMessageContentRedirectInterceptor;
-import org.apache.camel.util.ObjectHelper;
import org.apache.cxf.Bus;
import org.apache.cxf.endpoint.Client;
import org.apache.cxf.endpoint.Server;
import org.apache.cxf.interceptor.Interceptor;
import org.apache.cxf.message.Message;
import org.apache.cxf.phase.Phase;
-import org.apache.cxf.version.Version;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/PayLoadDataFormatFeature.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/PayLoadDataFormatFeature.java?rev=1130499&r1=1130498&r2=1130499&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/PayLoadDataFormatFeature.java (original)
+++ camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/PayLoadDataFormatFeature.java Thu Jun 2 11:28:04 2011
@@ -19,7 +19,6 @@ package org.apache.camel.component.cxf.f
import java.util.ArrayList;
import java.util.Collection;
-
import org.apache.camel.component.cxf.interceptors.ConfigureDocLitWrapperInterceptor;
import org.apache.camel.component.cxf.interceptors.RemoveClassTypeInterceptor;
import org.apache.cxf.Bus;
Modified: camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsComponent.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsComponent.java?rev=1130499&r1=1130498&r2=1130499&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsComponent.java (original)
+++ camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsComponent.java Thu Jun 2 11:28:04 2011
@@ -21,8 +21,7 @@ import java.util.Map;
import org.apache.camel.CamelContext;
import org.apache.camel.Endpoint;
-import org.apache.camel.component.cxf.CxfConstants;
-import org.apache.camel.component.cxf.CxfEndpoint;
+import org.apache.camel.component.cxf.common.message.CxfConstants;
import org.apache.camel.impl.HeaderFilterStrategyComponent;
import org.apache.camel.util.CamelContextHelper;
import org.apache.camel.util.CastUtils;
Modified: camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsHeaderFilterStrategy.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsHeaderFilterStrategy.java?rev=1130499&r1=1130498&r2=1130499&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsHeaderFilterStrategy.java (original)
+++ camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsHeaderFilterStrategy.java Thu Jun 2 11:28:04 2011
@@ -17,7 +17,7 @@
package org.apache.camel.component.cxf.jaxrs;
import org.apache.camel.Exchange;
-import org.apache.camel.component.cxf.CxfConstants;
+import org.apache.camel.component.cxf.common.message.CxfConstants;
import org.apache.camel.impl.DefaultHeaderFilterStrategy;
/**