Modified: camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/cxfbean/CxfBeanWithWsdlLocationInBeanAndIoCTest-context.xml URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/cxfbean/CxfBeanWithWsdlLocationInBeanAndIoCTest-context.xml?rev=1151313&r1=1151312&r2=1151313&view=diff ============================================================================== --- camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/cxfbean/CxfBeanWithWsdlLocationInBeanAndIoCTest-context.xml (original) +++ camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/cxfbean/CxfBeanWithWsdlLocationInBeanAndIoCTest-context.xml Wed Jul 27 02:36:21 2011 @@ -21,13 +21,16 @@ http://camel.apache.org/schema/cxf http://camel.apache.org/schema/cxf/camel-cxf.xsd "> + <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/> + <bean class="org.apache.camel.wsdl_first.PersonImplWithWsdl" id="jaxwsBean"> <property name="reply" value="Bye"/> </bean> <camelContext id="camel" xmlns="http://camel.apache.org/schema/spring";> + <endpoint id="ep1" uri="jetty:http://localhost:${CxfBeanWithWsdlLocationInBeanAndIoCTest.1}?matchOnUriPrefix=true"; /> <route> - <from uri="jetty:http://localhost:9090?matchOnUriPrefix=true"; /> + <from ref="ep1"/> <to uri="cxfbean:jaxwsBean" /> </route> </camelContext>
Modified: camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/cxfbean/CxfBeanWithWsdlLocationInBeanTest-context.xml URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/cxfbean/CxfBeanWithWsdlLocationInBeanTest-context.xml?rev=1151313&r1=1151312&r2=1151313&view=diff ============================================================================== --- camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/cxfbean/CxfBeanWithWsdlLocationInBeanTest-context.xml (original) +++ camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/cxfbean/CxfBeanWithWsdlLocationInBeanTest-context.xml Wed Jul 27 02:36:21 2011 @@ -20,12 +20,14 @@ http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd http://camel.apache.org/schema/cxf http://camel.apache.org/schema/cxf/camel-cxf.xsd "> + <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/> <bean class="org.apache.camel.wsdl_first.PersonImplWithWsdl" id="jaxwsBean" /> <camelContext id="camel" xmlns="http://camel.apache.org/schema/spring";> + <endpoint id="ep1" uri="jetty:http://localhost:${CxfBeanWithWsdlLocationInBeanTest.1}?matchOnUriPrefix=true"; /> <route> - <from uri="jetty:http://localhost:9090?matchOnUriPrefix=true"; /> + <from ref="ep1" /> <to uri="cxfbean:jaxwsBean" /> </route> </camelContext> Modified: camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/mtom/CxfMtomRouterPayloadMode12Test-context.xml URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/mtom/CxfMtomRouterPayloadMode12Test-context.xml?rev=1151313&r1=1151312&r2=1151313&view=diff ============================================================================== --- camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/mtom/CxfMtomRouterPayloadMode12Test-context.xml (original) +++ camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/mtom/CxfMtomRouterPayloadMode12Test-context.xml Wed Jul 27 02:36:21 2011 @@ -24,10 +24,11 @@ http://camel.apache.org/schema/cxf http://camel.apache.org/schema/cxf/camel-cxf.xsd http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd "> + <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/> <!-- START SNIPPET: enableMtom --> - <cxf:cxfEndpoint id="routerEndpoint" address="http://localhost:9091/jaxws-mtom/hello"; + <cxf:cxfEndpoint id="routerEndpoint" address="http://localhost:${CXFTestSupport.port1}/CxfMtomRouterPayloadMode12Test/jaxws-mtom/hello"; wsdlURL="mtom.wsdl" serviceName="ns:HelloService12" endpointName="ns:HelloPort" @@ -54,7 +55,7 @@ </cxf:cxfEndpoint> - <cxf:cxfEndpoint id="serviceEndpoint" address="http://localhost:9092/jaxws-mtom/hello"; + <cxf:cxfEndpoint id="serviceEndpoint" address="http://localhost:${CXFTestSupport.port2}/CxfMtomRouterPayloadMode12Test/jaxws-mtom/hello"; wsdlURL="mtom.wsdl" serviceName="ns:HelloService12" endpointName="ns:HelloPort" Modified: camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/mtom/CxfMtomRouterPayloadModeTest-context.xml URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/mtom/CxfMtomRouterPayloadModeTest-context.xml?rev=1151313&r1=1151312&r2=1151313&view=diff ============================================================================== --- camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/mtom/CxfMtomRouterPayloadModeTest-context.xml (original) +++ camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/mtom/CxfMtomRouterPayloadModeTest-context.xml Wed Jul 27 02:36:21 2011 @@ -24,10 +24,11 @@ http://camel.apache.org/schema/cxf http://camel.apache.org/schema/cxf/camel-cxf.xsd http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd "> + <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/> <!-- START SNIPPET: enableMtom --> - <cxf:cxfEndpoint id="routerEndpoint" address="http://localhost:9091/jaxws-mtom/hello"; + <cxf:cxfEndpoint id="routerEndpoint" address="http://localhost:${CXFTestSupport.port1}/CxfMtomRouterPayloadModeTest/jaxws-mtom/hello"; wsdlURL="mtom.wsdl" serviceName="ns:HelloService" endpointName="ns:HelloPort" @@ -53,7 +54,7 @@ --> </cxf:cxfEndpoint> - <cxf:cxfEndpoint id="serviceEndpoint" address="http://localhost:9092/jaxws-mtom/hello"; + <cxf:cxfEndpoint id="serviceEndpoint" address="http://localhost:${CXFTestSupport.port2}/CxfMtomRouterPayloadModeTest/jaxws-mtom/hello"; wsdlURL="mtom.wsdl" serviceName="ns:HelloService" endpointName="ns:HelloPort" Modified: camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/multipart/MultiPartTest.xml URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/multipart/MultiPartTest.xml?rev=1151313&r1=1151312&r2=1151313&view=diff ============================================================================== --- camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/multipart/MultiPartTest.xml (original) +++ camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/multipart/MultiPartTest.xml Wed Jul 27 02:36:21 2011 @@ -24,11 +24,10 @@ http://camel.apache.org/schema/cxf http://camel.apache.org/schema/cxf/camel-cxf.xsd http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd "> + <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/> <import resource="classpath:META-INF/cxf/cxf.xml"/> - <import resource="classpath:META-INF/cxf/cxf-extension-soap.xml" /> - <import resource="classpath:META-INF/cxf/cxf-extension-http-jetty.xml" /> - <cxf:cxfEndpoint id="routerEndpoint" address="http://localhost:9003/CamelContext/RouterPort"; + <cxf:cxfEndpoint id="routerEndpoint" address="http://localhost:${CXFTestSupport.port3}/CXFMultiPartTest/CamelContext/RouterPort"; wsdlURL="classpath:/MultiPartTest.wsdl" endpointName="s:MultiPartInvokePort" serviceName="s:MultiPartInvokeService" xmlns:s="http://camel.apache.org/cxf/multipart";> @@ -37,7 +36,7 @@ </cxf:outInterceptors> </cxf:cxfEndpoint> - <cxf:cxfEndpoint id="serviceEndpoint" address="http://localhost:9000/SoapContext/SoapPort"; + <cxf:cxfEndpoint id="serviceEndpoint" address="http://localhost:${CXFTestSupport.port1}/CXFMultiPartTest/SoapContext/SoapPort"; wsdlURL="classpath:MultiPartTest.wsdl" endpointName="s:MultiPartInvokePort" serviceName="s:MultiPartInvokeService" Modified: camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/nonWrapperProcessor.xml URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/nonWrapperProcessor.xml?rev=1151313&r1=1151312&r2=1151313&view=diff ============================================================================== --- camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/nonWrapperProcessor.xml (original) +++ camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/nonWrapperProcessor.xml Wed Jul 27 02:36:21 2011 @@ -26,7 +26,7 @@ "> <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/> - <cxf:cxfEndpoint id="routerEndpoint" address="http://localhost:${CxfNonWrapperTest.port1}/PersonService/"; + <cxf:cxfEndpoint id="routerEndpoint" address="http://localhost:${CXFTestSupport.port1}/CxfNonWrapperTest/PersonService/"; serviceClass="org.apache.camel.non_wrapper.Person" endpointName="person:soap" serviceName="person:PersonService" Modified: camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/spring/CxfEndpointBeansRouter.xml URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/spring/CxfEndpointBeansRouter.xml?rev=1151313&r1=1151312&r2=1151313&view=diff ============================================================================== --- camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/spring/CxfEndpointBeansRouter.xml (original) +++ camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/spring/CxfEndpointBeansRouter.xml Wed Jul 27 02:36:21 2011 @@ -26,12 +26,14 @@ http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd "> + <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/> - <cxf:cxfEndpoint id="routerEndpoint" address="http://localhost:9000/router"; + + <cxf:cxfEndpoint id="routerEndpoint" address="http://localhost:${CXFTestSupport.port1}/CxfEndpointBeansRouterTest/router"; serviceClass="org.apache.camel.component.cxf.HelloService"/> - <cxf:cxfEndpoint id="serviceEndpoint" address="http://localhost:9002/helloworld"; + <cxf:cxfEndpoint id="serviceEndpoint" address="http://localhost:${CXFTestSupport.port2}/CxfEndpointBeansRouterTest/helloworld"; serviceClass="org.apache.camel.component.cxf.HelloService"/> <!-- Setting the http conduit policy -->
