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 14:12:09 UTC
svn commit: r1225819 - in /camel/trunk/tests/camel-itest/src/test:
java/org/apache/camel/itest/async/ java/org/apache/camel/itest/jetty/
resources/org/apache/camel/itest/jetty/
Author: ningjiang
Date: Fri Dec 30 13:12:08 2011
New Revision: 1225819
URL: http://svn.apache.org/viewvc?rev=1225819&view=rev
Log:
CAMEL-4837 use dynamic port numbers with jetty itests
Modified:
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/async/HttpAsyncCallbackTest.java
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyFailoverRoundRobinTest.java
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyFileMulticastTest.java
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyJmsShutdownInProgressTest.java
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyJmsShutdownTest.java
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyJmsTest.java
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyJmsTwowayTest.java
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyMulticastJmsFileTest.java
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettySimulateFailoverRoundRobinTest.java
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettySpringFailoverRoundRobinTest.java
camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/jetty/JettyFileMulticastTest-context.xml
camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/jetty/JettyJmsShutdownInProgressTest-context.xml
camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/jetty/JettyJmsShutdownTest-context.xml
camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/jetty/JettyJmsTest-context.xml
camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/jetty/JettyJmsTwowayTest-context.xml
camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/jetty/JettyMulticastJmsFileTest-context.xml
camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/jetty/JettySpringFailoverRoundRobinTest.xml
Modified: camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/async/HttpAsyncCallbackTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/async/HttpAsyncCallbackTest.java?rev=1225819&r1=1225818&r2=1225819&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/async/HttpAsyncCallbackTest.java (original)
+++ camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/async/HttpAsyncCallbackTest.java Fri Dec 30 13:12:08 2011
@@ -48,7 +48,7 @@ public class HttpAsyncCallbackTest exten
// give on completion time to complete properly before we do assertions on its size
// TODO: improve MockEndpoint.assertIsSatisfied(long) to make this sleep unnecessary
- Thread.sleep(1200);
+ Thread.sleep(2200);
// END SNIPPET: e3
assertMockEndpointsSatisfied();
Modified: camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyFailoverRoundRobinTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyFailoverRoundRobinTest.java?rev=1225819&r1=1225818&r2=1225819&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyFailoverRoundRobinTest.java (original)
+++ camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyFailoverRoundRobinTest.java Fri Dec 30 13:12:08 2011
@@ -19,18 +19,24 @@ package org.apache.camel.itest.jetty;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.test.AvailablePortFinder;
import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.BeforeClass;
import org.junit.Test;
/**
* @version
*/
public class JettyFailoverRoundRobinTest extends CamelTestSupport {
-
- private String bad = "jetty:http://localhost:8871/bad";
- private String bad2 = "jetty:http://localhost:8872/bad2";
- private String good = "jetty:http://localhost:8873/good";
- private String good2 = "jetty:http://localhost:8874/good2";
+ private static int port1 = AvailablePortFinder.getNextAvailable(23021);
+ private static int port2 = AvailablePortFinder.getNextAvailable(23022);
+ private static int port3 = AvailablePortFinder.getNextAvailable(23023);
+ private static int port4 = AvailablePortFinder.getNextAvailable(23024);
+
+ private String bad = "jetty:http://localhost:" + port1 + "/bad";
+ private String bad2 = "jetty:http://localhost:" + port2 + "/bad2";
+ private String good = "jetty:http://localhost:" + port3 + "/good";
+ private String good2 = "jetty:http://localhost:" + port4 + "/good2";
@Test
public void testJettyFailoverRoundRobin() throws Exception {
Modified: camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyFileMulticastTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyFileMulticastTest.java?rev=1225819&r1=1225818&r2=1225819&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyFileMulticastTest.java (original)
+++ camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyFileMulticastTest.java Fri Dec 30 13:12:08 2011
@@ -23,6 +23,7 @@ import org.apache.camel.EndpointInject;
import org.apache.camel.Exchange;
import org.apache.camel.ProducerTemplate;
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;
@@ -34,6 +35,13 @@ import static org.junit.Assert.assertNot
@ContextConfiguration
public class JettyFileMulticastTest extends AbstractJUnit4SpringContextTests {
+ private static int port = AvailablePortFinder.getNextAvailable(20033);
+ 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("JettyFileMulticastTest.port", Integer.toString(port));
+ }
+
@Autowired
protected CamelContext camelContext;
Modified: camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyJmsShutdownInProgressTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyJmsShutdownInProgressTest.java?rev=1225819&r1=1225818&r2=1225819&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyJmsShutdownInProgressTest.java (original)
+++ camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyJmsShutdownInProgressTest.java Fri Dec 30 13:12:08 2011
@@ -24,6 +24,7 @@ import junit.framework.Assert;
import org.apache.camel.CamelContext;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.component.http.HttpOperationFailedException;
+import org.apache.camel.test.AvailablePortFinder;
import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.context.ContextConfiguration;
@@ -31,6 +32,13 @@ import org.springframework.test.context.
@ContextConfiguration
public class JettyJmsShutdownInProgressTest extends AbstractJUnit4SpringContextTests {
+ private static int port = AvailablePortFinder.getNextAvailable(20034);
+ private static final String URL = "http://localhost:" + port + "/test";
+ 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("JettyJmsShutdownInProgressTest.port", Integer.toString(port));
+ }
@Autowired
protected CamelContext camelContext;
@@ -40,8 +48,8 @@ public class JettyJmsShutdownInProgressT
@Test
public void testShutdownInProgress() throws Exception {
- Future<String> reply1 = template.asyncRequestBody("http://localhost:9002/test", "World", String.class);
- Future<String> reply2 = template.asyncRequestBody("http://localhost:9002/test", "Camel", String.class);
+ Future<String> reply1 = template.asyncRequestBody(URL, "World", String.class);
+ Future<String> reply2 = template.asyncRequestBody(URL, "Camel", String.class);
// shutdown camel while in progress, wait 2 sec so the first req has been received in Camel route
Executors.newSingleThreadExecutor().execute(new Runnable() {
@@ -60,7 +68,7 @@ public class JettyJmsShutdownInProgressT
// this one should fail
try {
- template.requestBody("http://localhost:9002/test", "Tiger", String.class);
+ template.requestBody(URL, "Tiger", String.class);
Assert.fail("Should have thrown exception");
} catch (Exception e) {
HttpOperationFailedException hofe = (HttpOperationFailedException) e.getCause();
Modified: camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyJmsShutdownTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyJmsShutdownTest.java?rev=1225819&r1=1225818&r2=1225819&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyJmsShutdownTest.java (original)
+++ camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyJmsShutdownTest.java Fri Dec 30 13:12:08 2011
@@ -22,6 +22,7 @@ import java.util.concurrent.TimeUnit;
import junit.framework.Assert;
import org.apache.camel.CamelContext;
import org.apache.camel.ProducerTemplate;
+import org.apache.camel.test.AvailablePortFinder;
import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.context.ContextConfiguration;
@@ -29,6 +30,13 @@ import org.springframework.test.context.
@ContextConfiguration
public class JettyJmsShutdownTest extends AbstractJUnit4SpringContextTests {
+ private static int port = AvailablePortFinder.getNextAvailable(20035);
+ private static final String URL = "http://localhost:" + port + "/test";
+ 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("JettyJmsShutdownTest.port", Integer.toString(port));
+ }
@Autowired
protected CamelContext camelContext;
@@ -38,9 +46,9 @@ public class JettyJmsShutdownTest extend
@Test
public void testShutdown() throws Exception {
- Future<String> reply1 = template.asyncRequestBody("http://localhost:9000/test", "World", String.class);
- Future<String> reply2 = template.asyncRequestBody("http://localhost:9000/test", "Camel", String.class);
- Future<String> reply3 = template.asyncRequestBody("http://localhost:9000/test", "Tiger", String.class);
+ Future<String> reply1 = template.asyncRequestBody(URL, "World", String.class);
+ Future<String> reply2 = template.asyncRequestBody(URL, "Camel", String.class);
+ Future<String> reply3 = template.asyncRequestBody(URL, "Tiger", String.class);
Thread.sleep(1000);
Modified: camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyJmsTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyJmsTest.java?rev=1225819&r1=1225818&r2=1225819&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyJmsTest.java (original)
+++ camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyJmsTest.java Fri Dec 30 13:12:08 2011
@@ -23,6 +23,7 @@ import org.apache.camel.EndpointInject;
import org.apache.camel.Exchange;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.AvailablePortFinder;
import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
@@ -34,6 +35,13 @@ import static org.junit.Assert.assertNot
@ContextConfiguration
public class JettyJmsTest extends AbstractJUnit4SpringContextTests {
+ private static int port = AvailablePortFinder.getNextAvailable(20038);
+ private static final String URL = "jetty:http://localhost:" + port + "/test";
+ 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("JettyJmsTest.port", Integer.toString(port));
+ }
@Autowired
protected CamelContext camelContext;
@@ -47,7 +55,7 @@ public class JettyJmsTest extends Abstra
resultEndpoint.reset();
ProducerTemplate template = camelContext.createProducerTemplate();
- template.sendBodyAndHeader("jetty:http://localhost:9000/test", "Hello form Willem", "Operation", "greetMe");
+ template.sendBodyAndHeader(URL, "Hello form Willem", "Operation", "greetMe");
// Sleep a while and wait for the message whole processing
Thread.sleep(4000);
Modified: camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyJmsTwowayTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyJmsTwowayTest.java?rev=1225819&r1=1225818&r2=1225819&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyJmsTwowayTest.java (original)
+++ camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyJmsTwowayTest.java Fri Dec 30 13:12:08 2011
@@ -20,6 +20,7 @@ import org.apache.camel.CamelContext;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.ProducerTemplate;
+import org.apache.camel.test.AvailablePortFinder;
import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.context.ContextConfiguration;
@@ -30,6 +31,15 @@ import static org.junit.Assert.assertNot
@ContextConfiguration
public class JettyJmsTwowayTest extends AbstractJUnit4SpringContextTests {
+
+ private static int port = AvailablePortFinder.getNextAvailable(20123);
+ private static final String URL = "jetty:http://localhost:" + port + "/test";
+ 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("JettyJmsTwowayTest.port", Integer.toString(port));
+ }
+
@Autowired
protected CamelContext camelContext;
@@ -38,7 +48,7 @@ public class JettyJmsTwowayTest extends
public void testSendingRequest() throws Exception {
assertNotNull("the camelContext should not be null", camelContext);
ProducerTemplate template = camelContext.createProducerTemplate();
- Exchange exchange = template.send("jetty:http://localhost:9000/test", new Processor() {
+ Exchange exchange = template.send(URL, new Processor() {
public void process(Exchange exchange) throws Exception {
exchange.getIn().setBody("<hello>Willem</hello>");
exchange.getIn().setHeader("Operation", "greetMe");
Modified: camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyMulticastJmsFileTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyMulticastJmsFileTest.java?rev=1225819&r1=1225818&r2=1225819&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyMulticastJmsFileTest.java (original)
+++ camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyMulticastJmsFileTest.java Fri Dec 30 13:12:08 2011
@@ -19,6 +19,7 @@ package org.apache.camel.itest.jetty;
import org.apache.camel.CamelContext;
import org.apache.camel.ConsumerTemplate;
import org.apache.camel.ProducerTemplate;
+import org.apache.camel.test.AvailablePortFinder;
import org.apache.camel.test.junit4.TestSupport;
import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
@@ -29,6 +30,14 @@ import static org.junit.Assert.assertEqu
@ContextConfiguration
public class JettyMulticastJmsFileTest extends AbstractJUnit4SpringContextTests {
+
+ private static int port = AvailablePortFinder.getNextAvailable(20040);
+ private static final String URL = "jetty:http://localhost:" + port + "/test";
+ 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("JettyMulticastJmsFileTest.port", Integer.toString(port));
+ }
@Autowired
protected CamelContext camelContext;
@@ -39,7 +48,7 @@ public class JettyMulticastJmsFileTest e
ProducerTemplate template = camelContext.createProducerTemplate();
- String out = template.requestBody("jetty:http://localhost:9000/test", "Hello World", String.class);
+ String out = template.requestBody(URL, "Hello World", String.class);
assertEquals("Bye World", out);
template.stop();
Modified: camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettySimulateFailoverRoundRobinTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettySimulateFailoverRoundRobinTest.java?rev=1225819&r1=1225818&r2=1225819&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettySimulateFailoverRoundRobinTest.java (original)
+++ camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettySimulateFailoverRoundRobinTest.java Fri Dec 30 13:12:08 2011
@@ -24,6 +24,7 @@ import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.test.AvailablePortFinder;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
@@ -32,10 +33,15 @@ import org.junit.Test;
*/
public class JettySimulateFailoverRoundRobinTest extends CamelTestSupport {
- private String bad = "jetty:http://localhost:8871/bad";
- private String bad2 = "jetty:http://localhost:8872/bad2";
- private String good = "jetty:http://localhost:8873/good";
- private String good2 = "jetty:http://localhost:8874/good2";
+ private static int port1 = AvailablePortFinder.getNextAvailable(23041);
+ private static int port2 = AvailablePortFinder.getNextAvailable(23042);
+ private static int port3 = AvailablePortFinder.getNextAvailable(23043);
+ private static int port4 = AvailablePortFinder.getNextAvailable(23044);
+
+ private String bad = "jetty:http://localhost:" + port1 + "/bad";
+ private String bad2 = "jetty:http://localhost:" + port2 + "/bad2";
+ private String good = "jetty:http://localhost:" + port3 + "/good";
+ private String good2 = "jetty:http://localhost:" + port4 + "/good2";
@Test
public void testJettySimulateFailoverRoundRobin() throws Exception {
Modified: camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettySpringFailoverRoundRobinTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettySpringFailoverRoundRobinTest.java?rev=1225819&r1=1225818&r2=1225819&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettySpringFailoverRoundRobinTest.java (original)
+++ camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettySpringFailoverRoundRobinTest.java Fri Dec 30 13:12:08 2011
@@ -16,6 +16,7 @@
*/
package org.apache.camel.itest.jetty;
+import org.apache.camel.test.AvailablePortFinder;
import org.apache.camel.test.junit4.CamelSpringTestSupport;
import org.junit.Test;
import org.springframework.context.support.AbstractXmlApplicationContext;
@@ -26,6 +27,20 @@ import org.springframework.context.suppo
*/
public class JettySpringFailoverRoundRobinTest extends CamelSpringTestSupport {
+ private static int port1 = AvailablePortFinder.getNextAvailable(23051);
+ private static int port2 = AvailablePortFinder.getNextAvailable(23052);
+ private static int port3 = AvailablePortFinder.getNextAvailable(23053);
+ private static int port4 = AvailablePortFinder.getNextAvailable(23054);
+
+ 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("JettySpringFailoverRoundRobinTest.port1", Integer.toString(port1));
+ System.setProperty("JettySpringFailoverRoundRobinTest.port2", Integer.toString(port2));
+ System.setProperty("JettySpringFailoverRoundRobinTest.port3", Integer.toString(port3));
+ System.setProperty("JettySpringFailoverRoundRobinTest.port4", Integer.toString(port4));
+ }
+
@Override
protected AbstractXmlApplicationContext createApplicationContext() {
return new ClassPathXmlApplicationContext("org/apache/camel/itest/jetty/JettySpringFailoverRoundRobinTest.xml");
Modified: camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/jetty/JettyFileMulticastTest-context.xml
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/jetty/JettyFileMulticastTest-context.xml?rev=1225819&r1=1225818&r2=1225819&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/jetty/JettyFileMulticastTest-context.xml (original)
+++ camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/jetty/JettyFileMulticastTest-context.xml Fri Dec 30 13:12:08 2011
@@ -21,18 +21,18 @@
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
">
-
+ <bean id="properties" class="org.apache.camel.component.properties.PropertiesComponent"/>
<bean id="SetResponseProcessor" class="org.apache.camel.itest.jetty.SetResponseProcessor"/>
<!-- START SNIPPET: example -->
<camelContext xmlns="http://camel.apache.org/schema/spring" trace="true">
<route>
- <from uri="jetty:http://localhost:9000/test"/>
+ <from uri="jetty:http://localhost:{{JettyFileMulticastTest.port}}/test"/>
<process ref="SetResponseProcessor"/>
</route>
<route>
<from uri="direct:start"/>
- <to uri="jetty:http://localhost:9000/test"/>
+ <to uri="jetty:http://localhost:{{JettyFileMulticastTest.port}}/test"/>
<multicast>
<to uri="direct:file"/>
<to uri="direct:mock"/>
Modified: camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/jetty/JettyJmsShutdownInProgressTest-context.xml
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/jetty/JettyJmsShutdownInProgressTest-context.xml?rev=1225819&r1=1225818&r2=1225819&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/jetty/JettyJmsShutdownInProgressTest-context.xml (original)
+++ camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/jetty/JettyJmsShutdownInProgressTest-context.xml Fri Dec 30 13:12:08 2011
@@ -21,7 +21,7 @@
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
">
-
+ <bean id="properties" class="org.apache.camel.component.properties.PropertiesComponent"/>
<bean id="jms" class="org.apache.activemq.camel.component.ActiveMQComponent">
<property name="brokerURL" value="vm://localhost?broker.persistent=false"/>
</bean>
@@ -30,7 +30,7 @@
<!-- jetty supports suspension so we can graceful shutdown -->
<route>
- <from uri="jetty:http://localhost:9002/test"/>
+ <from uri="jetty:http://localhost:{{JettyJmsShutdownInProgressTest.port}}/test"/>
<to uri="jms:queue:foo"/>
</route>
Modified: camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/jetty/JettyJmsShutdownTest-context.xml
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/jetty/JettyJmsShutdownTest-context.xml?rev=1225819&r1=1225818&r2=1225819&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/jetty/JettyJmsShutdownTest-context.xml (original)
+++ camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/jetty/JettyJmsShutdownTest-context.xml Fri Dec 30 13:12:08 2011
@@ -22,6 +22,8 @@
http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
">
+ <bean id="properties" class="org.apache.camel.component.properties.PropertiesComponent"/>
+
<bean id="jms" class="org.apache.activemq.camel.component.ActiveMQComponent">
<property name="brokerURL" value="vm://localhost?broker.persistent=false"/>
</bean>
@@ -30,7 +32,7 @@
<!-- defer shutdown to route the in progress exchanges -->
<route shutdownRoute="Defer">
- <from uri="jetty:http://localhost:9000/test"/>
+ <from uri="jetty:http://localhost:{{JettyJmsShutdownTest.port}}/test"/>
<to uri="jms:queue:foo"/>
</route>
Modified: camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/jetty/JettyJmsTest-context.xml
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/jetty/JettyJmsTest-context.xml?rev=1225819&r1=1225818&r2=1225819&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/jetty/JettyJmsTest-context.xml (original)
+++ camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/jetty/JettyJmsTest-context.xml Fri Dec 30 13:12:08 2011
@@ -21,6 +21,7 @@
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
">
+ <bean id="properties" class="org.apache.camel.component.properties.PropertiesComponent"/>
<bean id="jms" class="org.apache.activemq.camel.component.ActiveMQComponent">
<property name="brokerURL" value="vm://localhost?broker.persistent=false"/>
@@ -31,7 +32,7 @@
<!-- START SNIPPET: example -->
<camelContext xmlns="http://camel.apache.org/schema/spring" trace="true">
<route>
- <from uri="jetty:http://localhost:9000/test"/>
+ <from uri="jetty:http://localhost:{{JettyJmsTest.port}}/test"/>
<to uri="log:MyCategory?level=INFO"/>
<process ref="setExchangePatternProcessor"/>
<to uri="jms:responseQueue"/>
Modified: camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/jetty/JettyJmsTwowayTest-context.xml
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/jetty/JettyJmsTwowayTest-context.xml?rev=1225819&r1=1225818&r2=1225819&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/jetty/JettyJmsTwowayTest-context.xml (original)
+++ camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/jetty/JettyJmsTwowayTest-context.xml Fri Dec 30 13:12:08 2011
@@ -22,6 +22,8 @@
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
">
+
+ <bean id="properties" class="org.apache.camel.component.properties.PropertiesComponent"/>
<bean id="jms" class="org.apache.activemq.camel.component.ActiveMQComponent">
<property name="brokerURL" value="vm://localhost?broker.persistent=false"/>
@@ -32,7 +34,7 @@
<!-- START SNIPPET: example -->
<camelContext xmlns="http://camel.apache.org/schema/spring" trace="true">
<route>
- <from uri="jetty:http://localhost:9000/test"/>
+ <from uri="jetty:http://localhost:{{JettyJmsTwowayTest.port}}/test"/>
<to uri="jms:responseQueue"/>
</route>
<route>
Modified: camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/jetty/JettyMulticastJmsFileTest-context.xml
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/jetty/JettyMulticastJmsFileTest-context.xml?rev=1225819&r1=1225818&r2=1225819&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/jetty/JettyMulticastJmsFileTest-context.xml (original)
+++ camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/jetty/JettyMulticastJmsFileTest-context.xml Fri Dec 30 13:12:08 2011
@@ -22,6 +22,7 @@
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
">
+ <bean id="properties" class="org.apache.camel.component.properties.PropertiesComponent"/>
<bean id="jms" class="org.apache.activemq.camel.component.ActiveMQComponent">
<property name="brokerURL" value="vm://localhost?broker.persistent=false"/>
@@ -29,7 +30,7 @@
<camelContext xmlns="http://camel.apache.org/schema/spring" trace="true">
<route streamCache="true">
- <from uri="jetty:http://localhost:9000/test"/>
+ <from uri="jetty:http://localhost:{{JettyMulticastJmsFileTest.port}}/test"/>
<multicast>
<to uri="jms:queue:foo" pattern="InOnly"/>
<to uri="file://target/jetty" pattern="InOnly"/>
Modified: camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/jetty/JettySpringFailoverRoundRobinTest.xml
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/jetty/JettySpringFailoverRoundRobinTest.xml?rev=1225819&r1=1225818&r2=1225819&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/jetty/JettySpringFailoverRoundRobinTest.xml (original)
+++ camel/trunk/tests/camel-itest/src/test/resources/org/apache/camel/itest/jetty/JettySpringFailoverRoundRobinTest.xml Fri Dec 30 13:12:08 2011
@@ -21,12 +21,14 @@
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
">
+
+ <bean id="properties" class="org.apache.camel.component.properties.PropertiesComponent"/>
<camelContext xmlns="http://camel.apache.org/schema/spring">
- <endpoint id="bad" uri="jetty:http://localhost:8871/bar"/>
- <endpoint id="bad2" uri="jetty:http://localhost:8872/bad2"/>
- <endpoint id="good" uri="jetty:http://localhost:8873/good"/>
- <endpoint id="good2" uri="jetty:http://localhost:8874/good2"/>
+ <endpoint id="bad" uri="jetty:http://localhost:{{JettySpringFailoverRoundRobinTest.port1}}/bar"/>
+ <endpoint id="bad2" uri="jetty:http://localhost:{{JettySpringFailoverRoundRobinTest.port2}}/bad2"/>
+ <endpoint id="good" uri="jetty:http://localhost:{{JettySpringFailoverRoundRobinTest.port3}}/good"/>
+ <endpoint id="good2" uri="jetty:http://localhost:{{JettySpringFailoverRoundRobinTest.port4}}/good2"/>
<!-- START SNIPPET: e1 -->
<route>