You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2011/12/30 11:02:06 UTC
svn commit: r1225780 - in /camel/trunk/tests/camel-itest/src/test:
java/org/apache/camel/itest/greeter/
resources/org/apache/camel/itest/greeter/
Author: ningjiang
Date: Fri Dec 30 10:02:05 2011
New Revision: 1225780
URL: http://svn.apache.org/viewvc?rev=1225780&view=rev
Log:
CAMEL-4837 use dynamic port numbers with cxf greeter itests
Modified:
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/CamelFileGreeterOneWayTest.java
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/CamelGreeterConsumerTest.java
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/CamelGreeterFileDomTest.java
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/CamelGreeterTest.java
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/CxfToJmsInOutTest.java
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/MulticastCxfTest.java
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/RecipientListCxf2Test.java
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/RecipientListCxfTest.java
camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/greeter/CamelFileGreeterOneWayTest.xml
camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/greeter/CamelGreeterConsumerTest-context.xml
camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/greeter/CamelGreeterFileDomTest-context.xml
camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/greeter/CamelGreeterTest-context.xml
camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/greeter/CxfToJmsInOutTest-context.xml
camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/greeter/MulticastCxfTest-context.xml
camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/greeter/RecipientListCxf2Test-context.xml
camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/greeter/RecipientListCxfTest-context.xml
Modified: camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/CamelFileGreeterOneWayTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/CamelFileGreeterOneWayTest.java?rev=1225780&r1=1225779&r2=1225780&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/CamelFileGreeterOneWayTest.java (original)
+++ camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/CamelFileGreeterOneWayTest.java Fri Dec 30 10:02:05 2011
@@ -22,6 +22,7 @@ import javax.xml.ws.Endpoint;
import org.apache.camel.Exchange;
import org.apache.camel.ProducerTemplate;
+import org.apache.camel.test.AvailablePortFinder;
import org.apache.camel.test.junit4.CamelSpringTestSupport;
import org.junit.AfterClass;
import org.junit.BeforeClass;
@@ -37,12 +38,18 @@ public class CamelFileGreeterOneWayTest
private static Endpoint endpoint;
private static GreeterImpl greeterImpl;
+ private static int port = AvailablePortFinder.getNextAvailable(20000);
+ static {
+ //set them as system properties so Spring can use the property placeholder
+ //things to set them into the URL's in the spring contexts
+ System.setProperty("CamelFileGreeterOneWayTest.port", Integer.toString(port));
+ }
@BeforeClass
public static void startServer() throws Exception {
// Start the Greeter Server
greeterImpl = new GreeterImpl();
- String address = "http://localhost:9000/SoapContext/SoapPort";
+ String address = "http://localhost:" + port + "/SoapContext/SoapPort";
endpoint = Endpoint.publish(address, greeterImpl);
LOG.info("The WS endpoint is published! ");
}
Modified: camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/CamelGreeterConsumerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/CamelGreeterConsumerTest.java?rev=1225780&r1=1225779&r2=1225780&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/CamelGreeterConsumerTest.java (original)
+++ camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/CamelGreeterConsumerTest.java Fri Dec 30 10:02:05 2011
@@ -25,6 +25,7 @@ import org.apache.camel.CamelExecutionEx
import org.apache.camel.ExchangePattern;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.component.cxf.common.message.CxfConstants;
+import org.apache.camel.test.AvailablePortFinder;
import org.apache.hello_world_soap_http.PingMeFault;
import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
@@ -38,6 +39,12 @@ import static org.junit.Assert.fail;
@ContextConfiguration
public class CamelGreeterConsumerTest extends AbstractJUnit4SpringContextTests {
+ private static int port = AvailablePortFinder.getNextAvailable(20001);
+ static {
+ //set them as system properties so Spring can use the property placeholder
+ //things to set them into the URL's in the spring contexts
+ System.setProperty("CamelGreeterConsumerTest.port", Integer.toString(port));
+ }
@Autowired
protected CamelContext camelContext;
Modified: camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/CamelGreeterFileDomTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/CamelGreeterFileDomTest.java?rev=1225780&r1=1225779&r2=1225780&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/CamelGreeterFileDomTest.java (original)
+++ camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/CamelGreeterFileDomTest.java Fri Dec 30 10:02:05 2011
@@ -22,6 +22,7 @@ import javax.xml.ws.Endpoint;
import org.apache.camel.CamelContext;
import org.apache.camel.ExchangePattern;
import org.apache.camel.ProducerTemplate;
+import org.apache.camel.test.AvailablePortFinder;
import org.apache.camel.test.junit4.TestSupport;
import org.junit.AfterClass;
import org.junit.BeforeClass;
@@ -44,6 +45,12 @@ public class CamelGreeterFileDomTest ext
+ "<soap:Body><greetMe xmlns=\"http://apache.org/hello_world_soap_http/types\">"
+ "<requestType>Willem</requestType></greetMe></soap:Body></soap:Envelope>";
private static Endpoint endpoint;
+ private static int port = AvailablePortFinder.getNextAvailable(20003);
+ static {
+ //set them as system properties so Spring can use the property placeholder
+ //things to set them into the URL's in the spring contexts
+ System.setProperty("CamelGreeterFileDomTest.port", Integer.toString(port));
+ }
@Autowired
protected CamelContext camelContext;
@@ -51,7 +58,7 @@ public class CamelGreeterFileDomTest ext
public static void startServer() throws Exception {
// Start the Greeter Server
Object implementor = new GreeterImpl();
- String address = "http://localhost:9000/SoapContext/SoapPort";
+ String address = "http://localhost:" + port + "/SoapContext/SoapPort";
endpoint = Endpoint.publish(address, implementor);
LOG.info("The WS endpoint is published! ");
}
Modified: camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/CamelGreeterTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/CamelGreeterTest.java?rev=1225780&r1=1225779&r2=1225780&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/CamelGreeterTest.java (original)
+++ camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/CamelGreeterTest.java Fri Dec 30 10:02:05 2011
@@ -26,6 +26,7 @@ import org.apache.camel.Exchange;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.component.cxf.common.message.CxfConstants;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.AvailablePortFinder;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -43,6 +44,14 @@ public class CamelGreeterTest extends Ab
private static final transient Logger LOG = LoggerFactory.getLogger(CamelGreeterTest.class);
private static Endpoint endpoint;
+
+ private static int port = AvailablePortFinder.getNextAvailable(20004);
+ static {
+ //set them as system properties so Spring can use the property placeholder
+ //things to set them into the URL's in the spring contexts
+ System.setProperty("CamelGreeterTest.port", Integer.toString(port));
+ }
+
@Autowired
protected CamelContext camelContext;
@@ -53,7 +62,7 @@ public class CamelGreeterTest extends Ab
public static void startServer() throws Exception {
// Start the Greeter Server
Object implementor = new GreeterImpl();
- String address = "http://localhost:9000/SoapContext/SoapPort";
+ String address = "http://localhost:" + port + "/SoapContext/SoapPort";
endpoint = Endpoint.publish(address, implementor);
LOG.info("The WS endpoint is published! ");
}
Modified: camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/CxfToJmsInOutTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/CxfToJmsInOutTest.java?rev=1225780&r1=1225779&r2=1225780&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/CxfToJmsInOutTest.java (original)
+++ camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/CxfToJmsInOutTest.java Fri Dec 30 10:02:05 2011
@@ -20,6 +20,7 @@ import org.apache.camel.EndpointInject;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.component.cxf.common.message.CxfConstants;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.AvailablePortFinder;
import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.context.ContextConfiguration;
@@ -30,7 +31,13 @@ import static org.junit.Assert.assertNot
@ContextConfiguration
public class CxfToJmsInOutTest extends AbstractJUnit4SpringContextTests {
-
+ private static int port = AvailablePortFinder.getNextAvailable(20005);
+ static {
+ //set them as system properties so Spring can use the property placeholder
+ //things to set them into the URL's in the spring contexts
+ System.setProperty("CxfToJmsInOutTest.port", Integer.toString(port));
+ }
+
@Autowired
protected ProducerTemplate template;
Modified: camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/MulticastCxfTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/MulticastCxfTest.java?rev=1225780&r1=1225779&r2=1225780&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/MulticastCxfTest.java (original)
+++ camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/MulticastCxfTest.java Fri Dec 30 10:02:05 2011
@@ -19,12 +19,19 @@ package org.apache.camel.itest.greeter;
import org.apache.camel.EndpointInject;
import org.apache.camel.component.cxf.common.message.CxfConstants;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.AvailablePortFinder;
import org.apache.camel.test.junit4.CamelSpringTestSupport;
import org.junit.Test;
import org.springframework.context.support.AbstractApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
public class MulticastCxfTest extends CamelSpringTestSupport {
+ private static int port = AvailablePortFinder.getNextAvailable(20006);
+ static {
+ //set them as system properties so Spring can use the property placeholder
+ //things to set them into the URL's in the spring contexts
+ System.setProperty("MulticastCxfTest.port", Integer.toString(port));
+ }
@EndpointInject(uri = "mock:reply")
protected MockEndpoint replyEndpoint;
@@ -34,6 +41,8 @@ public class MulticastCxfTest extends Ca
@EndpointInject(uri = "mock:output")
protected MockEndpoint outputEndpoint;
+
+
@Override
protected AbstractApplicationContext createApplicationContext() {
Modified: camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/RecipientListCxf2Test.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/RecipientListCxf2Test.java?rev=1225780&r1=1225779&r2=1225780&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/RecipientListCxf2Test.java (original)
+++ camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/RecipientListCxf2Test.java Fri Dec 30 10:02:05 2011
@@ -22,12 +22,22 @@ import java.util.Map;
import org.apache.camel.EndpointInject;
import org.apache.camel.component.cxf.common.message.CxfConstants;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.AvailablePortFinder;
import org.apache.camel.test.junit4.CamelSpringTestSupport;
import org.junit.Test;
import org.springframework.context.support.AbstractApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
public class RecipientListCxf2Test extends CamelSpringTestSupport {
+
+ private static int port1 = AvailablePortFinder.getNextAvailable(20012);
+ private static int port2 = AvailablePortFinder.getNextAvailable(20013);
+ static {
+ //set them as system properties so Spring can use the property placeholder
+ //things to set them into the URL's in the spring contexts
+ System.setProperty("RecipientListCxf2Test.port1", Integer.toString(port1));
+ System.setProperty("RecipientListCxf2Test.port2", Integer.toString(port2));
+ }
@EndpointInject(uri = "mock:reply")
protected MockEndpoint replyEndpoint;
@@ -51,14 +61,14 @@ public class RecipientListCxf2Test exten
Map<String, Object> headers = new HashMap<String, Object>();
headers.put(CxfConstants.OPERATION_NAME, "greetMe");
- headers.put("foo", "cxf:bean:clientEndpoint?address=http://localhost:9002/SoapContext/SoapPort");
+ headers.put("foo", "cxf:bean:clientEndpoint?address=http://localhost:" + port1 + "/SoapContext/SoapPort");
// returns the last message from the recipient list
Object out = template.requestBodyAndHeaders("direct:start", "Willem", headers, String.class);
assertEquals("Hello Willem", out);
// change foo headers
- headers.put("foo", "cxf:bean:clientEndpoint?address=http://localhost:9003/SoapContext/SoapPort");
+ headers.put("foo", "cxf:bean:clientEndpoint?address=http://localhost:" + port2 + "/SoapContext/SoapPort");
// call again to ensure that works also
// returns the last message from the recipient list
@@ -66,8 +76,8 @@ public class RecipientListCxf2Test exten
assertEquals("Bye Claus", out2);
// change foo headers again
- headers.put("foo", "cxf:bean:clientEndpoint?address=http://localhost:9002/SoapContext/SoapPort"
- + ",cxf:bean:clientEndpoint?address=http://localhost:9003/SoapContext/SoapPort");
+ headers.put("foo", "cxf:bean:clientEndpoint?address=http://localhost:" + port1 + "/SoapContext/SoapPort"
+ + ",cxf:bean:clientEndpoint?address=http://localhost:" + port2 + "/SoapContext/SoapPort");
// and call again to ensure that it really works also
// returns the last message from the recipient list
@@ -75,8 +85,8 @@ public class RecipientListCxf2Test exten
assertEquals("Bye Jonathan", out3);
// change foo headers again
- headers.put("foo", "cxf:bean:clientEndpoint?address=http://localhost:9003/SoapContext/SoapPort"
- + ",cxf:bean:clientEndpoint?address=http://localhost:9002/SoapContext/SoapPort");
+ headers.put("foo", "cxf:bean:clientEndpoint?address=http://localhost:" + port2 + "/SoapContext/SoapPort"
+ + ",cxf:bean:clientEndpoint?address=http://localhost:" + port1 + "/SoapContext/SoapPort");
// and call again to ensure that it really works also
// returns the last message from the recipient list
Modified: camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/RecipientListCxfTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/RecipientListCxfTest.java?rev=1225780&r1=1225779&r2=1225780&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/RecipientListCxfTest.java (original)
+++ camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/RecipientListCxfTest.java Fri Dec 30 10:02:05 2011
@@ -22,12 +22,22 @@ import java.util.Map;
import org.apache.camel.EndpointInject;
import org.apache.camel.component.cxf.common.message.CxfConstants;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.AvailablePortFinder;
import org.apache.camel.test.junit4.CamelSpringTestSupport;
import org.junit.Test;
import org.springframework.context.support.AbstractApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
public class RecipientListCxfTest extends CamelSpringTestSupport {
+
+ private static int port1 = AvailablePortFinder.getNextAvailable(20022);
+ private static int port2 = AvailablePortFinder.getNextAvailable(20023);
+ static {
+ //set them as system properties so Spring can use the property placeholder
+ //things to set them into the URL's in the spring contexts
+ System.setProperty("RecipientListCxfTest.port1", Integer.toString(port1));
+ System.setProperty("RecipientListCxfTest.port2", Integer.toString(port2));
+ }
@EndpointInject(uri = "mock:reply")
protected MockEndpoint replyEndpoint;
Modified: camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/greeter/CamelFileGreeterOneWayTest.xml
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/greeter/CamelFileGreeterOneWayTest.xml?rev=1225780&r1=1225779&r2=1225780&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/greeter/CamelFileGreeterOneWayTest.xml (original)
+++ camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/greeter/CamelFileGreeterOneWayTest.xml Fri Dec 30 10:02:05 2011
@@ -26,8 +26,9 @@
">
<import resource="classpath:META-INF/cxf/cxf.xml"/>
+ <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
- <cxf:cxfEndpoint id="serviceEndpoint" address="http://localhost:9000/SoapContext/SoapPort"
+ <cxf:cxfEndpoint id="serviceEndpoint" address="http://localhost:${CamelFileGreeterOneWayTest.port}/SoapContext/SoapPort"
wsdlURL="wsdl/hello_world.wsdl"
serviceClass="org.apache.hello_world_soap_http.Greeter"
endpointName="s:SoapOverHttp"
Modified: camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/greeter/CamelGreeterConsumerTest-context.xml
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/greeter/CamelGreeterConsumerTest-context.xml?rev=1225780&r1=1225779&r2=1225780&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/greeter/CamelGreeterConsumerTest-context.xml (original)
+++ camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/greeter/CamelGreeterConsumerTest-context.xml Fri Dec 30 10:02:05 2011
@@ -26,8 +26,10 @@
">
<import resource="classpath:META-INF/cxf/cxf.xml"/>
+
+ <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
- <cxf:cxfEndpoint id="serviceEndpoint" address="http://localhost:9000/SoapContext/SoapPort"
+ <cxf:cxfEndpoint id="serviceEndpoint" address="http://localhost:${CamelGreeterConsumerTest.port}/SoapContext/SoapPort"
wsdlURL="wsdl/hello_world.wsdl"
serviceClass="org.apache.hello_world_soap_http.Greeter"
endpointName="s:SoapOverHttp"
Modified: camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/greeter/CamelGreeterFileDomTest-context.xml
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/greeter/CamelGreeterFileDomTest-context.xml?rev=1225780&r1=1225779&r2=1225780&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/greeter/CamelGreeterFileDomTest-context.xml (original)
+++ camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/greeter/CamelGreeterFileDomTest-context.xml Fri Dec 30 10:02:05 2011
@@ -26,8 +26,9 @@
">
<import resource="classpath:META-INF/cxf/cxf.xml"/>
+ <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
- <cxf:cxfEndpoint id="serviceEndpoint" address="http://localhost:9000/SoapContext/SoapPort"
+ <cxf:cxfEndpoint id="serviceEndpoint" address="http://localhost:${CamelGreeterFileDomTest.port}/SoapContext/SoapPort"
wsdlURL="wsdl/hello_world.wsdl"
serviceClass="org.apache.hello_world_soap_http.Greeter"
endpointName="s:SoapOverHttp"
Modified: camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/greeter/CamelGreeterTest-context.xml
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/greeter/CamelGreeterTest-context.xml?rev=1225780&r1=1225779&r2=1225780&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/greeter/CamelGreeterTest-context.xml (original)
+++ camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/greeter/CamelGreeterTest-context.xml Fri Dec 30 10:02:05 2011
@@ -26,8 +26,9 @@
">
<import resource="classpath:META-INF/cxf/cxf.xml"/>
+ <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
- <cxf:cxfEndpoint id="serviceEndpoint" address="http://localhost:9000/SoapContext/SoapPort"
+ <cxf:cxfEndpoint id="serviceEndpoint" address="http://localhost:${CamelGreeterTest.port}/SoapContext/SoapPort"
wsdlURL="wsdl/hello_world.wsdl"
serviceClass="org.apache.hello_world_soap_http.Greeter"
endpointName="s:SoapOverHttp"
Modified: camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/greeter/CxfToJmsInOutTest-context.xml
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/greeter/CxfToJmsInOutTest-context.xml?rev=1225780&r1=1225779&r2=1225780&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/greeter/CxfToJmsInOutTest-context.xml (original)
+++ camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/greeter/CxfToJmsInOutTest-context.xml Fri Dec 30 10:02:05 2011
@@ -25,8 +25,10 @@
">
<import resource="classpath:META-INF/cxf/cxf.xml"/>
+
+ <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
- <cxf:cxfEndpoint id="serviceEndpoint" address="http://localhost:9000/SoapContext/SoapPort"
+ <cxf:cxfEndpoint id="serviceEndpoint" address="http://localhost:${CxfToJmsInOutTest.port}/SoapContext/SoapPort"
wsdlURL="wsdl/hello_world.wsdl"
serviceClass="org.apache.hello_world_soap_http.Greeter"
endpointName="s:SoapOverHttp"
Modified: camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/greeter/MulticastCxfTest-context.xml
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/greeter/MulticastCxfTest-context.xml?rev=1225780&r1=1225779&r2=1225780&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/greeter/MulticastCxfTest-context.xml (original)
+++ camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/greeter/MulticastCxfTest-context.xml Fri Dec 30 10:02:05 2011
@@ -25,8 +25,10 @@
">
<import resource="classpath:META-INF/cxf/cxf.xml"/>
+
+ <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
- <cxf:cxfEndpoint id="serviceEndpoint" address="http://localhost:9002/SoapContext/SoapPort"
+ <cxf:cxfEndpoint id="serviceEndpoint" address="http://localhost:${MulticastCxfTest.port}/SoapContext/SoapPort"
wsdlURL="wsdl/hello_world.wsdl"
serviceClass="org.apache.hello_world_soap_http.Greeter"
endpointName="s:SoapOverHttp"
Modified: camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/greeter/RecipientListCxf2Test-context.xml
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/greeter/RecipientListCxf2Test-context.xml?rev=1225780&r1=1225779&r2=1225780&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/greeter/RecipientListCxf2Test-context.xml (original)
+++ camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/greeter/RecipientListCxf2Test-context.xml Fri Dec 30 10:02:05 2011
@@ -25,6 +25,7 @@
">
<import resource="classpath:META-INF/cxf/cxf.xml"/>
+ <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<!-- to use from client -->
<cxf:cxfEndpoint id="clientEndpoint"
@@ -35,7 +36,7 @@
xmlns:s="http://apache.org/hello_world_soap_http">
</cxf:cxfEndpoint>
- <cxf:cxfEndpoint id="serviceEndpoint" address="http://localhost:9002/SoapContext/SoapPort"
+ <cxf:cxfEndpoint id="serviceEndpoint" address="http://localhost:${RecipientListCxf2Test.port1}/SoapContext/SoapPort"
wsdlURL="wsdl/hello_world.wsdl"
serviceClass="org.apache.hello_world_soap_http.Greeter"
endpointName="s:SoapOverHttp"
@@ -43,7 +44,7 @@
xmlns:s="http://apache.org/hello_world_soap_http">
</cxf:cxfEndpoint>
- <cxf:cxfEndpoint id="serviceEndpoint2" address="http://localhost:9003/SoapContext/SoapPort"
+ <cxf:cxfEndpoint id="serviceEndpoint2" address="http://localhost:${RecipientListCxf2Test.port2}/SoapContext/SoapPort"
wsdlURL="wsdl/hello_world.wsdl"
serviceClass="org.apache.hello_world_soap_http.Greeter"
endpointName="s:SoapOverHttp"
Modified: camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/greeter/RecipientListCxfTest-context.xml
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/greeter/RecipientListCxfTest-context.xml?rev=1225780&r1=1225779&r2=1225780&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/greeter/RecipientListCxfTest-context.xml (original)
+++ camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/greeter/RecipientListCxfTest-context.xml Fri Dec 30 10:02:05 2011
@@ -25,8 +25,9 @@
">
<import resource="classpath:META-INF/cxf/cxf.xml"/>
+ <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
- <cxf:cxfEndpoint id="serviceEndpoint" address="http://localhost:9002/SoapContext/SoapPort"
+ <cxf:cxfEndpoint id="serviceEndpoint" address="http://localhost:${RecipientListCxfTest.port1}/SoapContext/SoapPort"
wsdlURL="wsdl/hello_world.wsdl"
serviceClass="org.apache.hello_world_soap_http.Greeter"
endpointName="s:SoapOverHttp"
@@ -34,7 +35,7 @@
xmlns:s="http://apache.org/hello_world_soap_http">
</cxf:cxfEndpoint>
- <cxf:cxfEndpoint id="serviceEndpoint2" address="http://localhost:9003/SoapContext/SoapPort"
+ <cxf:cxfEndpoint id="serviceEndpoint2" address="http://localhost:${RecipientListCxfTest.port2}/SoapContext/SoapPort"
wsdlURL="wsdl/hello_world.wsdl"
serviceClass="org.apache.hello_world_soap_http.Greeter"
endpointName="s:SoapOverHttp"