Author: dkulp
Date: Thu Jul 28 23:45:04 2011
New Revision: 1152040
URL: http://svn.apache.org/viewvc?rev=1152040&view=rev
Log:
[CAMEL-4095] More dynamic ports and contexts
Added:
camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/jaxrs/CxfOperationException.xml
- copied, changed from r1152039,
camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/jaxrs/CxfRsSpringRouter.xml
Modified:
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CXFWsdlOnlyPayloadModeNoSpringTest.java
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfOperationExceptionTest.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/CxfRsConvertBodyToTest.java
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpointTest.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/CxfRsRouterTest.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/soap/headers/CxfMessageHeadersRelayTest.java
camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/cxfbean/CxfBeanTest-context.xml
camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/jaxrs/CxfRsProducerHeaderTest-context.xml
camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/jaxrs/CxfRsSpringRouter.xml
camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/mtom/CxfMtomDisabledProducerPayloadModeTest-context.xml
camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/mtom/CxfMtomProducerPayloadModeTest-context.xml
camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/soap/headers/CxfMessageHeadersRelayTest-context.xml
Modified:
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CXFWsdlOnlyPayloadModeNoSpringTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CXFWsdlOnlyPayloadModeNoSpringTest.java?rev=1152040&r1=1152039&r2=1152040&view=diff
==============================================================================
---
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CXFWsdlOnlyPayloadModeNoSpringTest.java
(original)
+++
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CXFWsdlOnlyPayloadModeNoSpringTest.java
Thu Jul 28 23:45:04 2011
@@ -47,7 +47,7 @@ public class CXFWsdlOnlyPayloadModeNoSpr
protected static final String SERVICE_NAME_PROP = "serviceName=";
protected static final String PORT_NAME_PROP =
"portName={http://camel.apache.org/wsdl-first}soap";;
protected static final String WSDL_URL_PROP =
"wsdlURL=classpath:person.wsdl";
- protected static Endpoint endpoint;
+ protected Endpoint endpoint;
protected int port1 = CXFTestSupport.getPort1();
protected int port2 = CXFTestSupport.getPort2();
Modified:
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfOperationExceptionTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfOperationExceptionTest.java?rev=1152040&r1=1152039&r2=1152040&view=diff
==============================================================================
---
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfOperationExceptionTest.java
(original)
+++
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfOperationExceptionTest.java
Thu Jul 28 23:45:04 2011
@@ -19,6 +19,7 @@ package org.apache.camel.component.cxf.j
import org.apache.camel.CamelExecutionException;
import org.apache.camel.Exchange;
+import org.apache.camel.component.cxf.CXFTestSupport;
import org.apache.camel.component.cxf.jaxrs.testbean.Customer;
import org.apache.camel.test.junit4.CamelSpringTestSupport;
import org.junit.Test;
@@ -26,10 +27,11 @@ import org.springframework.context.suppo
import org.springframework.context.support.ClassPathXmlApplicationContext;
public class CxfOperationExceptionTest extends CamelSpringTestSupport {
+ private static final int PORT1 = CXFTestSupport.getPort1();
@Override
protected AbstractXmlApplicationContext createApplicationContext() {
- return new
ClassPathXmlApplicationContext("org/apache/camel/component/cxf/jaxrs/CxfRsSpringRouter.xml");
+ return new
ClassPathXmlApplicationContext("org/apache/camel/component/cxf/jaxrs/CxfOperationException.xml");
}
@Test(expected = CamelExecutionException.class)
@@ -38,7 +40,7 @@ public class CxfOperationExceptionTest e
input.setName("Donald Duck");
// we cannot convert directly to Customer as we need camel-jaxb
- String response =
template.requestBodyAndHeader("cxfrs:http://localhost:9002/customerservice/customers?throwExceptionOnFailure=true";,
input,
+ String response =
template.requestBodyAndHeader("cxfrs:http://localhost:"; + PORT1 +
"/CxfOperationExceptionTest/customerservice/customers?throwExceptionOnFailure=true",
input,
Exchange.HTTP_METHOD, "POST", String.class);
assertNotNull(response);
@@ -51,10 +53,10 @@ public class CxfOperationExceptionTest e
input.setName("Donald Duck");
// we cannot convert directly to Customer as we need camel-jaxb
- String response =
template.requestBodyAndHeader("cxfrs:http://localhost:9002/customerservice/customers?throwExceptionOnFailure=false";,
input,
+ String response =
template.requestBodyAndHeader("cxfrs:http://localhost:"; + PORT1 +
"/CxfOperationExceptionTest/customerservice/customers?throwExceptionOnFailure=false",
input,
Exchange.HTTP_METHOD, "POST", String.class);
assertNotNull(response);
- assertTrue(response.contains("Problem accessing
/customerservice/customers"));
+ assertTrue(response.contains("Problem accessing
/CxfOperationExceptionTest/customerservice/customers"));
}
}
Modified:
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsConsumerTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsConsumerTest.java?rev=1152040&r1=1152039&r2=1152040&view=diff
==============================================================================
---
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsConsumerTest.java
(original)
+++
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsConsumerTest.java
Thu Jul 28 23:45:04 2011
@@ -29,6 +29,7 @@ import org.apache.camel.Processor;
import org.apache.camel.RuntimeCamelException;
import org.apache.camel.builder.NoErrorHandlerBuilder;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.cxf.CXFTestSupport;
import org.apache.camel.component.cxf.common.message.CxfConstants;
import org.apache.camel.component.cxf.jaxrs.testbean.Customer;
import org.apache.camel.test.junit4.CamelTestSupport;
@@ -44,8 +45,9 @@ import org.junit.Test;
public class CxfRsConsumerTest extends CamelTestSupport {
private static final String PUT_REQUEST =
"<Customer><name>Mary</name><id>123</id></Customer>";
+ private static final String CXT = CXFTestSupport.getPort1() +
"/CxfRsConsumerTest";
// START SNIPPET: example
- private static final String CXF_RS_ENDPOINT_URI =
"cxfrs://http://localhost:9000/rest?resourceClasses=org.apache.camel.component.cxf.jaxrs.testbean.CustomerServiceResource";;
+ private static final String CXF_RS_ENDPOINT_URI =
"cxfrs://http://localhost:"; + CXT +
"/rest?resourceClasses=org.apache.camel.component.cxf.jaxrs.testbean.CustomerServiceResource";
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
@@ -121,9 +123,9 @@ public class CxfRsConsumerTest extends C
@Test
public void testGetCustomer() throws Exception {
-
invokeGetCustomer("http://localhost:9000/rest/customerservice/customers/126";,
+ invokeGetCustomer("http://localhost:"; + CXT +
"/rest/customerservice/customers/126",
"{\"Customer\":{\"id\":126,\"name\":\"Willem\"}}");
-
invokeGetCustomer("http://localhost:9000/rest/customerservice/customers/123";,
+ invokeGetCustomer("http://localhost:"; + CXT +
"/rest/customerservice/customers/123",
"customer response back!");
}
@@ -132,14 +134,14 @@ public class CxfRsConsumerTest extends C
@Test
public void testGetWrongCustomer() throws Exception {
- URL url = new
URL("http://localhost:9000/rest/customerservice/customers/456";);
+ URL url = new URL("http://localhost:"; + CXT +
"/rest/customerservice/customers/456");
try {
url.openStream();
fail("Expect to get exception here");
} catch (FileNotFoundException exception) {
// do nothing here
}
- url = new
URL("http://localhost:9000/rest/customerservice/customers/256";);
+ url = new URL("http://localhost:"; + CXT +
"/rest/customerservice/customers/256");
try {
url.openStream();
fail("Expect to get exception here");
@@ -151,7 +153,7 @@ public class CxfRsConsumerTest extends C
@Test
public void testPutConsumer() throws Exception {
- HttpPut put = new
HttpPut("http://localhost:9000/rest/customerservice/customers";);
+ HttpPut put = new HttpPut("http://localhost:"; + CXT +
"/rest/customerservice/customers");
StringEntity entity = new StringEntity(PUT_REQUEST, "ISO-8859-1");
entity.setContentType("text/xml; charset=ISO-8859-1");
put.addHeader("test", "header1;header2");
Modified:
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsConvertBodyToTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsConvertBodyToTest.java?rev=1152040&r1=1152039&r2=1152040&view=diff
==============================================================================
---
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsConvertBodyToTest.java
(original)
+++
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsConvertBodyToTest.java
Thu Jul 28 23:45:04 2011
@@ -19,6 +19,7 @@ package org.apache.camel.component.cxf.j
import javax.ws.rs.core.Response;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.cxf.CXFTestSupport;
import org.apache.camel.component.cxf.jaxrs.testbean.Customer;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.junit4.CamelTestSupport;
@@ -32,7 +33,8 @@ import org.junit.Test;
public class CxfRsConvertBodyToTest extends CamelTestSupport {
private static final String PUT_REQUEST =
"<Customer><name>Mary</name><id>123</id></Customer>";
- private static final String CXF_RS_ENDPOINT_URI =
"cxfrs://http://localhost:9000/rest?resourceClasses=org.apache.camel.component.cxf.jaxrs.testbean.CustomerService";;
+ private static final String CXT = CXFTestSupport.getPort1() +
"/CxfRsConvertBodyToTest";
+ private static final String CXF_RS_ENDPOINT_URI =
"cxfrs://http://localhost:"; + CXT +
"/rest?resourceClasses=org.apache.camel.component.cxf.jaxrs.testbean.CustomerService";
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
@@ -55,7 +57,7 @@ public class CxfRsConvertBodyToTest exte
mock.expectedMessageCount(1);
mock.message(0).body().isInstanceOf(Customer.class);
- HttpPut put = new
HttpPut("http://localhost:9000/rest/customerservice/customers";);
+ HttpPut put = new HttpPut("http://localhost:"; + CXT +
"/rest/customerservice/customers");
StringEntity entity = new StringEntity(PUT_REQUEST, "ISO-8859-1");
entity.setContentType("text/xml; charset=ISO-8859-1");
put.addHeader("test", "header1;header2");
Modified:
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpointTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpointTest.java?rev=1152040&r1=1152039&r2=1152040&view=diff
==============================================================================
---
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpointTest.java
(original)
+++
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpointTest.java
Thu Jul 28 23:45:04 2011
@@ -16,15 +16,17 @@
*/
package org.apache.camel.component.cxf.jaxrs;
+import org.apache.camel.component.cxf.CXFTestSupport;
import org.apache.camel.component.cxf.jaxrs.testbean.CustomerService;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
public class CxfRsEndpointTest extends CamelTestSupport {
+ private static final String CTX = CXFTestSupport.getPort1() +
"/CxfRsEndpointTest";
@Test
public void testCreateCxfRsEndpoint() throws Exception {
- String endpointUri = "cxfrs://http://localhost:9000";
+ String endpointUri = "cxfrs://http://localhost:"; + CTX + ""
+
"?resourceClasses=org.apache.camel.component.cxf.jaxrs.testbean.CustomerService,
"
+ "java.lang.String ;
org.apache.camel.component.cxf.jaxrs.testbean.Order";
CxfRsComponent component = new CxfRsComponent(context);
@@ -39,10 +41,10 @@ public class CxfRsEndpointTest extends C
@Test
public void testCxfRsEndpointParameters() throws Exception {
CxfRsComponent component = new CxfRsComponent(context);
- CxfRsEndpoint endpoint =
(CxfRsEndpoint)component.createEndpoint("cxfrs://http://localhost:9000/templatetest/TID/ranges/start=0;end=1?";
+ CxfRsEndpoint endpoint =
(CxfRsEndpoint)component.createEndpoint("cxfrs://http://localhost:"; + CTX +
"/templatetest/TID/ranges/start=0;end=1?"
+ "httpClientAPI=true&q1=11&q2=12");
- assertEquals("Get a wrong URI ",
"cxfrs://http://localhost:9000/templatetest/TID/ranges/start=0;end=1?httpClientAPI=true&q1=11&q2=12";,
endpoint.getEndpointUri());
+ assertEquals("Get a wrong URI ", "cxfrs://http://localhost:"; + CTX +
"/templatetest/TID/ranges/start=0;end=1?httpClientAPI=true&q1=11&q2=12",
endpoint.getEndpointUri());
assertEquals("Get a wrong usingClientAPI option", true,
endpoint.isHttpClientAPI());
assertNotNull("The Parameter should not be null" +
endpoint.getParameters());
assertEquals("Get a wrong parameter map", "{q1=11, q2=12}",
endpoint.getParameters().toString());
Modified:
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerHeaderTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerHeaderTest.java?rev=1152040&r1=1152039&r2=1152040&view=diff
==============================================================================
---
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerHeaderTest.java
(original)
+++
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerHeaderTest.java
Thu Jul 28 23:45:04 2011
@@ -25,6 +25,7 @@ import org.apache.camel.Exchange;
import org.apache.camel.ExchangePattern;
import org.apache.camel.Message;
import org.apache.camel.Processor;
+import org.apache.camel.component.cxf.CXFTestSupport;
import org.apache.camel.component.cxf.common.message.CxfConstants;
import org.apache.camel.component.cxf.util.CxfUtils;
import org.junit.Test;
@@ -44,6 +45,8 @@ import static org.junit.Assert.assertNul
*/
@ContextConfiguration
public class CxfRsProducerHeaderTest extends AbstractJUnit4SpringContextTests {
+ static int port2 = CXFTestSupport.getPort2();
+ static int port3 = CXFTestSupport.getPort("CxfRsProducerHeaderTest.1");
private static final Object RESPONSE = "<?xml version=\"1.0\"
encoding=\"UTF-8\" standalone=\"yes\"?>"
+ "<Customer><id>123</id><name>John</name></Customer>";
@@ -84,7 +87,7 @@ public class CxfRsProducerHeaderTest ext
Message inMessage = exchange.getIn();
inMessage.setHeader(CxfConstants.CAMEL_CXF_RS_USING_HTTP_API,
Boolean.TRUE);
inMessage.setHeader(Exchange.HTTP_METHOD, "GET");
- inMessage.setHeader(Exchange.HTTP_PATH,
"/customerservice/customers/123");
+ inMessage.setHeader(Exchange.HTTP_PATH,
"/CxfRsProducerHeaderTest/customerservice/customers/123");
inMessage.setHeader(Exchange.ACCEPT_CONTENT_TYPE,
"application/json");
inMessage.setHeader("my-user-defined-header", "my-value");
inMessage.setBody(null);
Modified:
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsRouterTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsRouterTest.java?rev=1152040&r1=1152039&r2=1152040&view=diff
==============================================================================
---
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsRouterTest.java
(original)
+++
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsRouterTest.java
Thu Jul 28 23:45:04 2011
@@ -17,6 +17,7 @@
package org.apache.camel.component.cxf.jaxrs;
+import org.apache.camel.component.cxf.CXFTestSupport;
import org.apache.camel.test.junit4.CamelSpringTestSupport;
import org.apache.http.HttpResponse;
import org.apache.http.client.HttpClient;
@@ -31,6 +32,8 @@ import org.springframework.context.suppo
import org.springframework.context.support.ClassPathXmlApplicationContext;
public class CxfRsRouterTest extends CamelSpringTestSupport {
+ private static final int PORT0 = CXFTestSupport.getPort1();
+
private static final String PUT_REQUEST =
"<Customer><name>Mary</name><id>123</id></Customer>";
private static final String POST_REQUEST =
"<Customer><name>Jack</name></Customer>";
@@ -51,7 +54,7 @@ public class CxfRsRouterTest extends Cam
@Test
public void testGetCustomer() throws Exception {
- HttpGet get = new
HttpGet("http://localhost:9000/route/customerservice/customers/123";);
+ HttpGet get = new HttpGet("http://localhost:"; + PORT0 +
"/CxfRsRouterTest/route/customerservice/customers/123");
get.addHeader("Accept" , "application/json");
HttpClient httpclient = new DefaultHttpClient();
@@ -68,7 +71,7 @@ public class CxfRsRouterTest extends Cam
@Test
public void testGetCustomerWithQuery() throws Exception {
- HttpGet get = new
HttpGet("http://localhost:9000/route/customerservice/customers?id=123";);
+ HttpGet get = new HttpGet("http://localhost:"; + PORT0 +
"/CxfRsRouterTest/route/customerservice/customers?id=123");
get.addHeader("Accept" , "application/json");
HttpClient httpclient = new DefaultHttpClient();
@@ -84,7 +87,7 @@ public class CxfRsRouterTest extends Cam
@Test
public void testGetCustomers() throws Exception {
- HttpGet get = new
HttpGet("http://localhost:9000/route/customerservice/customers/";);
+ HttpGet get = new HttpGet("http://localhost:"; + PORT0 +
"/CxfRsRouterTest/route/customerservice/customers/");
get.addHeader("Accept" , "application/xml");
HttpClient httpclient = new DefaultHttpClient();
@@ -106,7 +109,7 @@ public class CxfRsRouterTest extends Cam
@Test
public void testGetSubResource() throws Exception {
- HttpGet get = new
HttpGet("http://localhost:9000/route/customerservice/orders/223/products/323";);
+ HttpGet get = new HttpGet("http://localhost:"; + PORT0 +
"/CxfRsRouterTest/route/customerservice/orders/223/products/323");
get.addHeader("Accept" , "application/json");
HttpClient httpclient = new DefaultHttpClient();
@@ -122,7 +125,7 @@ public class CxfRsRouterTest extends Cam
@Test
public void testPutConsumer() throws Exception {
- HttpPut put = new
HttpPut("http://localhost:9000/route/customerservice/customers";);
+ HttpPut put = new HttpPut("http://localhost:"; + PORT0 +
"/CxfRsRouterTest/route/customerservice/customers");
StringEntity entity = new StringEntity(PUT_REQUEST, "ISO-8859-1");
entity.setContentType("text/xml; charset=ISO-8859-1");
put.setEntity(entity);
@@ -139,7 +142,7 @@ public class CxfRsRouterTest extends Cam
@Test
public void testPostConsumer() throws Exception {
- HttpPost post = new
HttpPost("http://localhost:9000/route/customerservice/customers";);
+ HttpPost post = new HttpPost("http://localhost:"; + PORT0 +
"/CxfRsRouterTest/route/customerservice/customers");
post.addHeader("Accept" , "text/xml");
StringEntity entity = new StringEntity(POST_REQUEST, "ISO-8859-1");
entity.setContentType("text/xml; charset=ISO-8859-1");
@@ -159,7 +162,7 @@ public class CxfRsRouterTest extends Cam
@Test
public void testPostConsumerUniqueResponseCode() throws Exception {
- HttpPost post = new
HttpPost("http://localhost:9000/route/customerservice/customersUniqueResponseCode";);
+ HttpPost post = new HttpPost("http://localhost:"; + PORT0 +
"/CxfRsRouterTest/route/customerservice/customersUniqueResponseCode");
post.addHeader("Accept" , "text/xml");
StringEntity entity = new StringEntity(POST_REQUEST, "ISO-8859-1");
entity.setContentType("text/xml; charset=ISO-8859-1");
Modified:
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomProducerPayloadModeTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomProducerPayloadModeTest.java?rev=1152040&r1=1152039&r2=1152040&view=diff
==============================================================================
---
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomProducerPayloadModeTest.java
(original)
+++
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomProducerPayloadModeTest.java
Thu Jul 28 23:45:04 2011
@@ -36,6 +36,7 @@ import org.apache.camel.CamelContext;
import org.apache.camel.Exchange;
import org.apache.camel.ExchangePattern;
import org.apache.camel.Processor;
+import org.apache.camel.component.cxf.CXFTestSupport;
import org.apache.camel.component.cxf.CxfPayload;
import org.apache.cxf.binding.soap.SoapHeader;
import org.apache.cxf.helpers.DOMUtils;
@@ -57,14 +58,16 @@ import org.springframework.test.context.
*/
@ContextConfiguration
public class CxfMtomProducerPayloadModeTest extends
AbstractJUnit4SpringContextTests {
-
+ static int port = CXFTestSupport.getPort1();
+
@Autowired
protected CamelContext context;
protected Endpoint endpoint;
@Before
public void setUp() throws Exception {
- endpoint = Endpoint.publish("http://localhost:9092/jaxws-mtom/hello";,
getServiceImpl());
+ endpoint = Endpoint.publish("http://localhost:"; + port + "/" +
getClass().getSimpleName()
+ + "/jaxws-mtom/hello", getServiceImpl());
SOAPBinding binding = (SOAPBinding)endpoint.getBinding();
binding.setMTOMEnabled(isMtomEnabled());
}
Modified:
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/soap/headers/CxfMessageHeadersRelayTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/soap/headers/CxfMessageHeadersRelayTest.java?rev=1152040&r1=1152039&r2=1152040&view=diff
==============================================================================
---
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/soap/headers/CxfMessageHeadersRelayTest.java
(original)
+++
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/soap/headers/CxfMessageHeadersRelayTest.java
Thu Jul 28 23:45:04 2011
@@ -42,6 +42,7 @@ import org.apache.camel.Exchange;
import org.apache.camel.ExchangePattern;
import org.apache.camel.Processor;
import org.apache.camel.ProducerTemplate;
+import org.apache.camel.component.cxf.CXFTestSupport;
import org.apache.camel.component.cxf.CxfEndpoint;
import org.apache.camel.component.cxf.CxfPayload;
import org.apache.camel.component.cxf.common.header.CxfHeaderFilterStrategy;
@@ -77,6 +78,11 @@ import static org.junit.Assert.fail;
*/
@ContextConfiguration
public class CxfMessageHeadersRelayTest extends
AbstractJUnit4SpringContextTests {
+ static int portE1 = CXFTestSupport.getPort("CxfMessageHeadersRelayTest.1");
+ static int portE2 = CXFTestSupport.getPort("CxfMessageHeadersRelayTest.2");
+ static int portE3 = CXFTestSupport.getPort("CxfMessageHeadersRelayTest.3");
+ static int portE4 = CXFTestSupport.getPort("CxfMessageHeadersRelayTest.4");
+ static int portE5 = CXFTestSupport.getPort("CxfMessageHeadersRelayTest.5");
@Autowired
protected CamelContext context;
@@ -90,10 +96,13 @@ public class CxfMessageHeadersRelayTest
public void setUp() throws Exception {
template = context.createProducerTemplate();
- relayEndpoint =
Endpoint.publish("http://localhost:9091/HeaderService/";, new
HeaderTesterImpl());
- noRelayEndpoint =
Endpoint.publish("http://localhost:7070/HeaderService/";, new
HeaderTesterImpl(false));
- relayEndpointWithInsertion =
Endpoint.publish("http://localhost:5091/HeaderService/";,
- new
HeaderTesterWithInsertionImpl());
+ relayEndpoint = Endpoint.publish("http://localhost:";
+ + CXFTestSupport.getPort1() +
"/CxfMessageHeadersRelayTest/HeaderService/", new HeaderTesterImpl());
+ noRelayEndpoint = Endpoint.publish("http://localhost:";
+ + CXFTestSupport.getPort2() +
"/CxfMessageHeadersRelayTest/HeaderService/", new HeaderTesterImpl(false));
+ relayEndpointWithInsertion = Endpoint.publish("http://localhost:";
+ + CXFTestSupport.getPort3() +
"/CxfMessageHeadersRelayTest/HeaderService/",
+ new HeaderTesterWithInsertionImpl());
}
@@ -137,6 +146,9 @@ public class CxfMessageHeadersRelayTest
HeaderService s = new
HeaderService(getClass().getClassLoader().getResource("soap_header.wsdl"),
HeaderService.SERVICE);
HeaderTester proxy = s.getSoapPortRelay();
+ ((BindingProvider)proxy).getRequestContext()
+ .put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY,
+ "http://localhost:"; + portE1 +
"/CxfMessageHeadersRelayTest/HeaderService/");
InHeader me = new InHeader();
me.setRequestType("CXF user");
InHeaderResponse response = proxy.inHeader(me,
Constants.IN_HEADER_DATA);
@@ -149,6 +161,10 @@ public class CxfMessageHeadersRelayTest
HeaderService s = new
HeaderService(getClass().getClassLoader().getResource("soap_header.wsdl"),
HeaderService.SERVICE);
HeaderTester proxy = s.getSoapPortRelay();
+ ((BindingProvider)proxy).getRequestContext()
+ .put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY,
+ "http://localhost:"; + portE1 +
"/CxfMessageHeadersRelayTest/HeaderService/");
+
OutHeader me = new OutHeader();
me.setRequestType("CXF user");
Holder<OutHeaderResponse> result = new Holder<OutHeaderResponse>(new
OutHeaderResponse());
@@ -166,6 +182,9 @@ public class CxfMessageHeadersRelayTest
HeaderService s = new
HeaderService(getClass().getClassLoader().getResource("soap_header.wsdl"),
HeaderService.SERVICE);
HeaderTester proxy = s.getSoapPortRelay();
+ ((BindingProvider)proxy).getRequestContext()
+ .put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY,
+ "http://localhost:"; + portE1 +
"/CxfMessageHeadersRelayTest/HeaderService/");
InoutHeader me = new InoutHeader();
me.setRequestType("CXF user");
Holder<SOAPHeaderData> header = new
Holder<SOAPHeaderData>(Constants.IN_OUT_REQUEST_HEADER_DATA);
@@ -182,6 +201,9 @@ public class CxfMessageHeadersRelayTest
HeaderService s = new
HeaderService(getClass().getClassLoader().getResource("soap_header.wsdl"),
HeaderService.SERVICE);
HeaderTester proxy = s.getSoapPortRelay();
+ ((BindingProvider)proxy).getRequestContext()
+ .put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY,
+ "http://localhost:"; + portE1 +
"/CxfMessageHeadersRelayTest/HeaderService/");
addOutOfBoundHeader(proxy, false);
Me me = new Me();
me.setFirstName("john");
@@ -197,6 +219,9 @@ public class CxfMessageHeadersRelayTest
HeaderService s = new
HeaderService(getClass().getClassLoader().getResource("soap_header.wsdl"),
HeaderService.SERVICE);
HeaderTester proxy = s.getSoapPortRelay();
+ ((BindingProvider)proxy).getRequestContext()
+ .put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY,
+ "http://localhost:"; + portE1 +
"/CxfMessageHeadersRelayTest/HeaderService/");
addOutOfBoundHeader(proxy, false);
Me me = new Me();
me.setFirstName("john");
@@ -213,6 +238,9 @@ public class CxfMessageHeadersRelayTest
HeaderService s = new
HeaderService(getClass().getClassLoader().getResource("soap_header.wsdl"),
HeaderService.SERVICE);
HeaderTester proxy = s.getSoapPortRelayWithInsertion();
+ ((BindingProvider)proxy).getRequestContext()
+ .put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY,
+ "http://localhost:"; + portE2 +
"/CxfMessageHeadersRelayTest/HeaderService/");
addOutOfBoundHeader(proxy, false);
Me me = new Me();
me.setFirstName("john");
@@ -238,6 +266,9 @@ public class CxfMessageHeadersRelayTest
HeaderService s = new
HeaderService(getClass().getClassLoader().getResource("soap_header.wsdl"),
HeaderService.SERVICE);
HeaderTester proxy = s.getSoapPortRelay();
+ ((BindingProvider)proxy).getRequestContext()
+ .put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY,
+ "http://localhost:"; + portE1 +
"/CxfMessageHeadersRelayTest/HeaderService/");
Me me = new Me();
me.setFirstName("john");
me.setLastName("Doh");
@@ -253,6 +284,10 @@ public class CxfMessageHeadersRelayTest
HeaderService s = new
HeaderService(getClass().getClassLoader().getResource("soap_header.wsdl"),
HeaderService.SERVICE);
HeaderTester proxy = s.getSoapPortNoRelay();
+ ((BindingProvider)proxy).getRequestContext()
+ .put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY,
+ "http://localhost:"; + portE3 +
"/CxfMessageHeadersRelayTest/HeaderService/");
+
addOutOfBoundHeader(proxy, false);
Me me = new Me();
me.setFirstName("john");
@@ -269,6 +304,9 @@ public class CxfMessageHeadersRelayTest
HeaderService s = new
HeaderService(getClass().getClassLoader().getResource("soap_header.wsdl"),
HeaderService.SERVICE);
HeaderTester proxy = s.getSoapPortNoRelay();
+ ((BindingProvider)proxy).getRequestContext()
+ .put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY,
+ "http://localhost:"; + portE3 +
"/CxfMessageHeadersRelayTest/HeaderService/");
Me me = new Me();
me.setFirstName("john");
me.setLastName("Doh");
@@ -284,6 +322,9 @@ public class CxfMessageHeadersRelayTest
HeaderService s = new
HeaderService(getClass().getClassLoader().getResource("soap_header.wsdl"),
HeaderService.SERVICE);
HeaderTester proxy = s.getSoapPortNoRelay();
+ ((BindingProvider)proxy).getRequestContext()
+ .put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY,
+ "http://localhost:"; + portE3 +
"/CxfMessageHeadersRelayTest/HeaderService/");
addOutOfBoundHeader(proxy, false);
Me me = new Me();
me.setFirstName("john");
@@ -299,6 +340,9 @@ public class CxfMessageHeadersRelayTest
HeaderService s = new
HeaderService(getClass().getClassLoader().getResource("soap_header.wsdl"),
HeaderService.SERVICE);
HeaderTester proxy = s.getSoapPortNoRelay();
+ ((BindingProvider)proxy).getRequestContext()
+ .put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY,
+ "http://localhost:"; + portE3 +
"/CxfMessageHeadersRelayTest/HeaderService/");
InHeader me = new InHeader();
me.setRequestType("CXF user");
InHeaderResponse response = null;
@@ -318,6 +362,9 @@ public class CxfMessageHeadersRelayTest
HeaderService s = new
HeaderService(getClass().getClassLoader().getResource("soap_header.wsdl"),
HeaderService.SERVICE);
HeaderTester proxy = s.getSoapPortNoRelay();
+ ((BindingProvider)proxy).getRequestContext()
+ .put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY,
+ "http://localhost:"; + portE3 +
"/CxfMessageHeadersRelayTest/HeaderService/");
OutHeader me = new OutHeader();
me.setRequestType("CXF user");
Holder<OutHeaderResponse> result = new Holder<OutHeaderResponse>(new
OutHeaderResponse());
@@ -338,6 +385,9 @@ public class CxfMessageHeadersRelayTest
HeaderService s = new
HeaderService(getClass().getClassLoader().getResource("soap_header.wsdl"),
HeaderService.SERVICE);
HeaderTester proxy = s.getSoapPortNoRelay();
+ ((BindingProvider)proxy).getRequestContext()
+ .put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY,
+ "http://localhost:"; + portE3 +
"/CxfMessageHeadersRelayTest/HeaderService/");
InoutHeader me = new InoutHeader();
me.setRequestType("CXF user");
Holder<SOAPHeaderData> header = new
Holder<SOAPHeaderData>(Constants.IN_OUT_REQUEST_HEADER_DATA);
Modified:
camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/cxfbean/CxfBeanTest-context.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/cxfbean/CxfBeanTest-context.xml?rev=1152040&r1=1152039&r2=1152040&view=diff
==============================================================================
---
camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/cxfbean/CxfBeanTest-context.xml
(original)
+++
camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/cxfbean/CxfBeanTest-context.xml
Thu Jul 28 23:45:04 2011
@@ -64,8 +64,8 @@
</bean>
<camelContext errorHandlerRef="errorHandler" id="camel"
xmlns="http://camel.apache.org/schema/spring";>
- <endpoint id="ep1"
uri="jetty:http://localhost:${CxfBeanTest.1}?matchOnUriPrefix=true"/>
- <endpoint id="ep2"
uri="jetty:http://localhost:${CxfBeanTest.2}?matchOnUriPrefix=true"/>
+ <endpoint id="ep1"
uri="jetty:http://localhost:${CxfBeanTest.1}/?matchOnUriPrefix=true"/>
+ <endpoint id="ep2"
uri="jetty:http://localhost:${CxfBeanTest.2}/?matchOnUriPrefix=true"/>
<route>
<from uri="cxf:bean:routerEndpoint?dataFormat=PAYLOAD"
/>
Copied:
camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/jaxrs/CxfOperationException.xml
(from r1152039,
camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/jaxrs/CxfRsSpringRouter.xml)
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/jaxrs/CxfOperationException.xml?p2=camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/jaxrs/CxfOperationException.xml&p1=camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/jaxrs/CxfRsSpringRouter.xml&r1=1152039&r2=1152040&rev=1152040&view=diff
==============================================================================
---
camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/jaxrs/CxfRsSpringRouter.xml
(original)
+++
camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/jaxrs/CxfOperationException.xml
Thu Jul 28 23:45:04 2011
@@ -26,9 +26,12 @@
http://cxf.apache.org/jaxrs http://cxf.apache.org/schemas/jaxrs.xsd
http://camel.apache.org/schema/spring
http://camel.apache.org/schema/spring/camel-spring.xsd
">
+
+ <bean
class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+
<!-- Defined the real JAXRS back end service -->
<jaxrs:server id="restService"
- address="http://localhost:9002/rest";
+
address="http://localhost:${CXFTestSupport.port2}/CxfOperationExceptionTest/rest";
staticSubresourceResolution="true">
<jaxrs:serviceBeans>
<ref bean="customerService"/>
@@ -40,11 +43,11 @@
<bean id="customerService"
class="org.apache.camel.component.cxf.jaxrs.testbean.CustomerService" />
<!-- Defined the server endpoint to create the cxf-rs consumer -->
- <cxf:rsServer id="rsServer" address="http://localhost:9000/route";
+ <cxf:rsServer id="rsServer"
address="http://localhost:${CXFTestSupport.port1}/CxfOperationExceptionTest/route";
serviceClass="org.apache.camel.component.cxf.jaxrs.testbean.CustomerService" />
<!-- Defined the client endpoint to create the cxf-rs consumer -->
- <cxf:rsClient id="rsClient" address="http://localhost:9002/rest";
+ <cxf:rsClient id="rsClient"
address="http://localhost:${CXFTestSupport.port2}/CxfOperationExceptionTest/rest";
serviceClass="org.apache.camel.component.cxf.jaxrs.testbean.CustomerService"/>
<!-- The camel route context -->
Modified:
camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/jaxrs/CxfRsProducerHeaderTest-context.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/jaxrs/CxfRsProducerHeaderTest-context.xml?rev=1152040&r1=1152039&r2=1152040&view=diff
==============================================================================
---
camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/jaxrs/CxfRsProducerHeaderTest-context.xml
(original)
+++
camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/jaxrs/CxfRsProducerHeaderTest-context.xml
Thu Jul 28 23:45:04 2011
@@ -25,9 +25,10 @@
http://cxf.apache.org/jaxrs http://cxf.apache.org/schemas/jaxrs.xsd
http://camel.apache.org/schema/spring
http://camel.apache.org/schema/spring/camel-spring.xsd
">
-
+ <bean
class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+
<jaxrs:server id="restService"
- address="http://localhost:9002";
+
address="http://localhost:${CXFTestSupport.port2}/CxfRsProducerHeaderTest/";
staticSubresourceResolution="true">
<jaxrs:serviceBeans>
<ref bean="customerService"/>
@@ -37,18 +38,21 @@
<bean id="customerService"
class="org.apache.camel.component.cxf.jaxrs.testbean.CustomerService" />
<camelContext id="camel" xmlns="http://camel.apache.org/schema/spring";>
+ <endpoint id="to1"
uri="cxfrs://http://localhost:${CXFTestSupport.port2}/CxfRsProducerHeaderTest/"/>
+ <endpoint id="to2"
uri="cxfrs://http://localhost:${CxfRsProducerHeaderTest.1}/CxfRsProducerHeaderTest"/>
+ <endpoint id="from1"
uri="jetty://http://localhost:${CxfRsProducerHeaderTest.1}/CxfRsProducerHeaderTest?matchOnUriPrefix=true"/>
<route>
<from uri="direct://http"/>
- <to uri="cxfrs://http://localhost:9002"/>
+ <to ref="to1"/>
</route>
<route>
<from uri="direct://http2"/>
- <to uri="cxfrs://http://localhost:9003"/>
+ <to ref="to2"/>
</route>
<route>
- <from uri="jetty://http://localhost:9003?matchOnUriPrefix=true"/>
+ <from ref="from1"/>
<process ref="httpProcessor" />
</route>
</camelContext>
Modified:
camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/jaxrs/CxfRsSpringRouter.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/jaxrs/CxfRsSpringRouter.xml?rev=1152040&r1=1152039&r2=1152040&view=diff
==============================================================================
---
camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/jaxrs/CxfRsSpringRouter.xml
(original)
+++
camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/jaxrs/CxfRsSpringRouter.xml
Thu Jul 28 23:45:04 2011
@@ -26,9 +26,12 @@
http://cxf.apache.org/jaxrs http://cxf.apache.org/schemas/jaxrs.xsd
http://camel.apache.org/schema/spring
http://camel.apache.org/schema/spring/camel-spring.xsd
">
+
+ <bean
class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+
<!-- Defined the real JAXRS back end service -->
<jaxrs:server id="restService"
- address="http://localhost:9002/rest";
+
address="http://localhost:${CXFTestSupport.port2}/CxfRsRouterTest/rest";
staticSubresourceResolution="true">
<jaxrs:serviceBeans>
<ref bean="customerService"/>
@@ -40,11 +43,11 @@
<bean id="customerService"
class="org.apache.camel.component.cxf.jaxrs.testbean.CustomerService" />
<!-- Defined the server endpoint to create the cxf-rs consumer -->
- <cxf:rsServer id="rsServer" address="http://localhost:9000/route";
+ <cxf:rsServer id="rsServer"
address="http://localhost:${CXFTestSupport.port1}/CxfRsRouterTest/route";
serviceClass="org.apache.camel.component.cxf.jaxrs.testbean.CustomerService" />
<!-- Defined the client endpoint to create the cxf-rs consumer -->
- <cxf:rsClient id="rsClient" address="http://localhost:9002/rest";
+ <cxf:rsClient id="rsClient"
address="http://localhost:${CXFTestSupport.port2}/CxfRsRouterTest/rest";
serviceClass="org.apache.camel.component.cxf.jaxrs.testbean.CustomerService"/>
<!-- The camel route context -->
Modified:
camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/mtom/CxfMtomDisabledProducerPayloadModeTest-context.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/mtom/CxfMtomDisabledProducerPayloadModeTest-context.xml?rev=1152040&r1=1152039&r2=1152040&view=diff
==============================================================================
---
camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/mtom/CxfMtomDisabledProducerPayloadModeTest-context.xml
(original)
+++
camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/mtom/CxfMtomDisabledProducerPayloadModeTest-context.xml
Thu Jul 28 23:45:04 2011
@@ -24,8 +24,9 @@
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"/>
- <cxf:cxfEndpoint id="serviceEndpoint"
address="http://localhost:9092/jaxws-mtom/hello";
+ <cxf:cxfEndpoint id="serviceEndpoint"
address="http://localhost:${CXFTestSupport.port1}/CxfMtomDisabledProducerPayloadModeTest/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/mtom/CxfMtomProducerPayloadModeTest-context.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/mtom/CxfMtomProducerPayloadModeTest-context.xml?rev=1152040&r1=1152039&r2=1152040&view=diff
==============================================================================
---
camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/mtom/CxfMtomProducerPayloadModeTest-context.xml
(original)
+++
camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/mtom/CxfMtomProducerPayloadModeTest-context.xml
Thu Jul 28 23:45:04 2011
@@ -24,8 +24,9 @@
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"/>
- <cxf:cxfEndpoint id="serviceEndpoint"
address="http://localhost:9092/jaxws-mtom/hello";
+ <cxf:cxfEndpoint id="serviceEndpoint"
address="http://localhost:${CXFTestSupport.port1}/CxfMtomProducerPayloadModeTest/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/soap/headers/CxfMessageHeadersRelayTest-context.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/soap/headers/CxfMessageHeadersRelayTest-context.xml?rev=1152040&r1=1152039&r2=1152040&view=diff
==============================================================================
---
camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/soap/headers/CxfMessageHeadersRelayTest-context.xml
(original)
+++
camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/soap/headers/CxfMessageHeadersRelayTest-context.xml
Thu Jul 28 23:45:04 2011
@@ -25,9 +25,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"/>
<cxf:cxfEndpoint id="routerRelayEndpoint"
- address="http://localhost:9000/HeaderService/";
+
address="http://localhost:${CxfMessageHeadersRelayTest.1}/CxfMessageHeadersRelayTest/HeaderService/";
serviceClass="org.apache.camel.component.cxf.soap.headers.HeaderTester"
endpointName="tns:SoapPortRelay"
serviceName="tns:HeaderService"
@@ -36,7 +37,7 @@
</cxf:cxfEndpoint>
<cxf:cxfEndpoint id="routerRelayEndpointWithInsertion"
- address="http://localhost:5000/HeaderService/";
+
address="http://localhost:${CxfMessageHeadersRelayTest.2}/CxfMessageHeadersRelayTest/HeaderService/";
serviceClass="org.apache.camel.component.cxf.soap.headers.HeaderTester"
endpointName="tns:SoapPortRelayWithInsertion"
serviceName="tns:HeaderService"
@@ -51,7 +52,7 @@
</cxf:cxfEndpoint>
<cxf:cxfEndpoint id="routerNoRelayEndpoint"
- address="http://localhost:7000/HeaderService";
+
address="http://localhost:${CxfMessageHeadersRelayTest.3}/CxfMessageHeadersRelayTest/HeaderService";
serviceClass="org.apache.camel.component.cxf.soap.headers.HeaderTester"
endpointName="tns:SoapPortNoRelay"
serviceName="tns:HeaderService"
@@ -64,7 +65,7 @@
</cxf:cxfEndpoint>
<cxf:cxfEndpoint id="routerNoRelayNoServiceClassEndpoint"
- address="http://localhost:7002/HeaderService";
+
address="http://localhost:${CxfMessageHeadersRelayTest.5}/CxfMessageHeadersRelayTest/HeaderService";
endpointName="tns:SoapPortNoRelay"
serviceName="tns:HeaderService"
wsdlURL="soap_header.wsdl"
@@ -75,7 +76,7 @@
</cxf:cxfEndpoint>
<cxf:cxfEndpoint id="serviceRelayEndpoint"
- address="http://localhost:9091/HeaderService/";
+
address="http://localhost:${CXFTestSupport.port1}/CxfMessageHeadersRelayTest/HeaderService/";
serviceClass="org.apache.camel.component.cxf.soap.headers.HeaderTester"
endpointName="tns:SoapPortRelay"
serviceName="tns:HeaderService"
@@ -84,7 +85,7 @@
</cxf:cxfEndpoint>
<cxf:cxfEndpoint id="serviceRelayEndpointWithInsertion"
- address="http://localhost:5091/HeaderService/";
+
address="http://localhost:${CXFTestSupport.port3}/CxfMessageHeadersRelayTest/HeaderService/";
serviceClass="org.apache.camel.component.cxf.soap.headers.HeaderTester"
endpointName="tns:SoapPortRelayWithInsertion"
serviceName="tns:HeaderService"
@@ -99,7 +100,7 @@
</cxf:cxfEndpoint>
<cxf:cxfEndpoint id="serviceNoRelayEndpoint"
- address="http://localhost:7070/HeaderService/";
+
address="http://localhost:${CXFTestSupport.port2}/CxfMessageHeadersRelayTest/HeaderService/";
serviceClass="org.apache.camel.component.cxf.soap.headers.HeaderTester"
endpointName="tns:SoapPortNoRelay"
serviceName="tns:HeaderService"
@@ -112,7 +113,7 @@
</cxf:cxfEndpoint>
<cxf:cxfEndpoint id="serviceNoRelayNoServiceClassEndpoint"
- address="http://localhost:7070/HeaderService/";
+
address="http://localhost:${CXFTestSupport.port2}/CxfMessageHeadersRelayTest/HeaderService/";
endpointName="tns:SoapPortNoRelay"
serviceName="tns:HeaderService"
wsdlURL="soap_header.wsdl"
@@ -123,7 +124,7 @@
</cxf:cxfEndpoint>
<cxf:cxfEndpoint id="serviceExtraRelays"
- address="http://localhost:6060/HeaderService/";
+
address="http://localhost:${CxfMessageHeadersRelayTest.4}/CxfMessageHeadersRelayTest/HeaderService/";
serviceClass="org.apache.camel.component.cxf.soap.headers.HeaderTester"
endpointName="tns:SoapPortCustomRelay"
serviceName="tns:HeaderService"
