You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2010/10/26 08:25:59 UTC

svn commit: r1027376 [3/3] - in /camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty: ./ async/ file/ jettyproducer/

Modified: camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettySimplifiedHandle404Test.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettySimplifiedHandle404Test.java?rev=1027376&r1=1027375&r2=1027376&view=diff
==============================================================================
--- camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettySimplifiedHandle404Test.java (original)
+++ camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettySimplifiedHandle404Test.java Tue Oct 26 06:25:56 2010
@@ -21,7 +21,6 @@ import org.apache.camel.Processor;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.processor.aggregate.AggregationStrategy;
-import org.apache.camel.test.junit4.CamelTestSupport;
 import org.junit.Test;
 
 /**
@@ -29,7 +28,7 @@ import org.junit.Test;
  *
  * @version $Revision$
  */
-public class JettySimplifiedHandle404Test extends CamelTestSupport {
+public class JettySimplifiedHandle404Test extends BaseJettyTest {
 
     @Test
     public void testSimulate404() throws Exception {
@@ -55,7 +54,7 @@ public class JettySimplifiedHandle404Tes
                 // HttpOperationFailedException in case of failures.
                 // This allows us to handle all responses in the aggregation strategy where we can check the HTTP response code
                 // and decide what to do. As this is based on an unit test we assert the code is 404
-                from("direct:start").enrich("http://localhost:8222/myserver?throwExceptionOnFailure=false&user=Camel", new AggregationStrategy() {
+                from("direct:start").enrich("http://localhost:{{port}}/myserver?throwExceptionOnFailure=false&user=Camel", new AggregationStrategy() {
                     public Exchange aggregate(Exchange original, Exchange resource) {
                         // get the response code
                         Integer code = resource.getIn().getHeader(Exchange.HTTP_RESPONSE_CODE, Integer.class);
@@ -65,7 +64,7 @@ public class JettySimplifiedHandle404Tes
                 }).to("mock:result");
 
                 // this is our jetty server where we simulate the 404
-                from("jetty://http://localhost:8222/myserver")
+                from("jetty://http://localhost:{{port}}/myserver")
                         .process(new Processor() {
                             public void process(Exchange exchange) throws Exception {
                                 exchange.getOut().setBody("Page not found");

Modified: camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettySimulateInOnlyTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettySimulateInOnlyTest.java?rev=1027376&r1=1027375&r2=1027376&view=diff
==============================================================================
--- camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettySimulateInOnlyTest.java (original)
+++ camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettySimulateInOnlyTest.java Tue Oct 26 06:25:56 2010
@@ -20,13 +20,12 @@ import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.junit4.CamelTestSupport;
 import org.junit.Test;
 
 /**
  * @version $Revision$
  */
-public class JettySimulateInOnlyTest extends CamelTestSupport {
+public class JettySimulateInOnlyTest extends BaseJettyTest {
 
     private static String route = "";
 
@@ -41,7 +40,7 @@ public class JettySimulateInOnlyTest ext
             @Override
             public void configure() throws Exception {
                 // START SNIPPET: e1
-                from("jetty://http://localhost:8333/myserver")
+                from("jetty://http://localhost:{{port}}/myserver")
                     // turn the route to in only as we do not want jetty to wait for the response
                     // we can do this using the wiretap EIP pattern
                     .wireTap("direct:continue")
@@ -67,7 +66,7 @@ public class JettySimulateInOnlyTest ext
         mock.expectedMessageCount(1);
         mock.expectedHeaderReceived("foo", "bar");
 
-        String reply = template.requestBody("http://localhost:8333/myserver?foo=bar", null, String.class);
+        String reply = template.requestBody("http://localhost:{{port}}/myserver?foo=bar", null, String.class);
         route += "A";
         assertEquals("OK", reply);
 
@@ -81,7 +80,7 @@ public class JettySimulateInOnlyTest ext
         context.addRoutes(new RouteBuilder() {
             @Override
             public void configure() throws Exception {
-                from("jetty://http://localhost:8333/myserver")
+                from("jetty://http://localhost:{{port}}/myserver")
                     // turn the route to in only as we do not want jetty to wait for the response
                     // we can do this by changing the MEP and sending to a seda endpoint to spin off
                     // a new thread continue doing the routing
@@ -107,7 +106,7 @@ public class JettySimulateInOnlyTest ext
         mock.expectedMessageCount(1);
         mock.expectedHeaderReceived("foo", "bar");
 
-        String reply = template.requestBody("http://localhost:8333/myserver?foo=bar", null, String.class);
+        String reply = template.requestBody("http://localhost:{{port}}/myserver?foo=bar", null, String.class);
         route += "A";
         assertEquals("OK", reply);
 

Modified: camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettySteveIssueTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettySteveIssueTest.java?rev=1027376&r1=1027375&r2=1027376&view=diff
==============================================================================
--- camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettySteveIssueTest.java (original)
+++ camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettySteveIssueTest.java Tue Oct 26 06:25:56 2010
@@ -18,15 +18,14 @@ package org.apache.camel.component.jetty
 
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.junit4.CamelTestSupport;
 import org.junit.Test;
 
 /**
  * Unit test based on Steve request for CAMEL-877.
  */
-public class JettySteveIssueTest extends CamelTestSupport {
+public class JettySteveIssueTest extends BaseJettyTest {
 
-    private String serverUri = "http://localhost:9080/myservice";
+    private String serverUri = "http://localhost:" + getPort() + "/myservice";
 
     @Test
     public void testSendX() throws Exception {

Modified: camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettySuspendResumeTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettySuspendResumeTest.java?rev=1027376&r1=1027375&r2=1027376&view=diff
==============================================================================
--- camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettySuspendResumeTest.java (original)
+++ camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettySuspendResumeTest.java Tue Oct 26 06:25:56 2010
@@ -16,20 +16,17 @@
  */
 package org.apache.camel.component.jetty;
 
-import java.net.ConnectException;
-
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.http.HttpConsumer;
 import org.apache.camel.component.http.HttpOperationFailedException;
-import org.apache.camel.test.junit4.CamelTestSupport;
 import org.junit.Test;
 
 /**
  * @version $Revision$
  */
-public class JettySuspendResumeTest extends CamelTestSupport {
+public class JettySuspendResumeTest extends BaseJettyTest {
 
-    private String serverUri = "http://localhost:9186/cool";
+    private String serverUri = "http://localhost:" + getPort() + "/cool";
 
     @Test
     public void testJettySuspendResume() throws Exception {

Modified: camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettySuspendTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettySuspendTest.java?rev=1027376&r1=1027375&r2=1027376&view=diff
==============================================================================
--- camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettySuspendTest.java (original)
+++ camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettySuspendTest.java Tue Oct 26 06:25:56 2010
@@ -16,20 +16,17 @@
  */
 package org.apache.camel.component.jetty;
 
-import java.net.ConnectException;
-
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.http.HttpConsumer;
 import org.apache.camel.component.http.HttpOperationFailedException;
-import org.apache.camel.test.junit4.CamelTestSupport;
 import org.junit.Test;
 
 /**
  * @version $Revision$
  */
-public class JettySuspendTest extends CamelTestSupport {
+public class JettySuspendTest extends BaseJettyTest {
 
-    private String serverUri = "http://localhost:9187/cool";
+    private String serverUri = "http://localhost:" + getPort() + "/cool";
 
     @Test
     public void testJettySuspend() throws Exception {

Modified: camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettySuspendWhileInProgressTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettySuspendWhileInProgressTest.java?rev=1027376&r1=1027375&r2=1027376&view=diff
==============================================================================
--- camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettySuspendWhileInProgressTest.java (original)
+++ camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettySuspendWhileInProgressTest.java Tue Oct 26 06:25:56 2010
@@ -23,17 +23,14 @@ import java.util.concurrent.TimeUnit;
 import org.apache.camel.RuntimeCamelException;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.http.HttpOperationFailedException;
-import org.apache.camel.test.junit4.CamelTestSupport;
 import org.junit.Test;
 
-import static org.apache.camel.language.simple.SimpleLanguage.simple;
-
 /**
  * @version $Revision$
  */
-public class JettySuspendWhileInProgressTest extends CamelTestSupport {
+public class JettySuspendWhileInProgressTest extends BaseJettyTest {
 
-    private String serverUri = "http://localhost:9185/cool";
+    private String serverUri = "http://localhost:" + getPort() + "/cool";
 
     @Test
     public void testJettySuspendWhileInProgress() throws Exception {

Modified: camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyWithXPathChoiceTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyWithXPathChoiceTest.java?rev=1027376&r1=1027375&r2=1027376&view=diff
==============================================================================
--- camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyWithXPathChoiceTest.java (original)
+++ camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyWithXPathChoiceTest.java Tue Oct 26 06:25:56 2010
@@ -18,13 +18,12 @@ package org.apache.camel.component.jetty
 
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.junit4.CamelTestSupport;
 import org.junit.Before;
 import org.junit.Test;
 
 import static org.apache.camel.component.mock.MockEndpoint.expectsMessageCount;
 
-public class JettyWithXPathChoiceTest extends CamelTestSupport {
+public class JettyWithXPathChoiceTest extends BaseJettyTest {
     protected MockEndpoint x;
     protected MockEndpoint y;
     protected MockEndpoint z;
@@ -51,7 +50,7 @@ public class JettyWithXPathChoiceTest ex
     }
 
     private void sendBody(String body) {
-        template.sendBody("http://localhost:9080/myworld", body);
+        template.sendBody("http://localhost:{{port}}/myworld", body);
     }
 
     @Override
@@ -67,7 +66,7 @@ public class JettyWithXPathChoiceTest ex
     protected RouteBuilder createRouteBuilder() {
         return new RouteBuilder() {
             public void configure() {
-                from("jetty:http://localhost:9080/myworld")
+                from("jetty:http://localhost:{{port}}/myworld")
                     // use stream caching
                     .streamCaching()
                     .choice()

Modified: camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/MultiPartFormTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/MultiPartFormTest.java?rev=1027376&r1=1027375&r2=1027376&view=diff
==============================================================================
--- camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/MultiPartFormTest.java (original)
+++ camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/MultiPartFormTest.java Tue Oct 26 06:25:56 2010
@@ -23,17 +23,15 @@ import org.apache.camel.Exchange;
 import org.apache.camel.Message;
 import org.apache.camel.Processor;
 import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit4.CamelTestSupport;
 import org.apache.commons.httpclient.HttpClient;
 import org.apache.commons.httpclient.methods.PostMethod;
 import org.apache.commons.httpclient.methods.multipart.FilePart;
 import org.apache.commons.httpclient.methods.multipart.MultipartRequestEntity;
 import org.apache.commons.httpclient.methods.multipart.Part;
 import org.apache.commons.httpclient.methods.multipart.StringPart;
-import org.junit.Ignore;
 import org.junit.Test;
 
-public class MultiPartFormTest extends CamelTestSupport {
+public class MultiPartFormTest extends BaseJettyTest {
 
     @Test
     public void testSendMultiPartForm() throws Exception {
@@ -41,7 +39,7 @@ public class MultiPartFormTest extends C
 
         File file = new File("src/main/resources/META-INF/NOTICE.txt");
 
-        PostMethod httppost = new PostMethod("http://localhost:9080/test");
+        PostMethod httppost = new PostMethod("http://localhost:" + getPort() + "/test");
         Part[] parts = {
             new StringPart("comment", "A binary file of some kind"),
             new FilePart(file.getName(), file)
@@ -68,7 +66,7 @@ public class MultiPartFormTest extends C
                 // The option works rightly from Camel 2.4.0
                 getContext().getProperties().put("CamelJettyTempDir", "target");
                 
-                from("jetty://http://localhost:9080/test").process(new Processor() {
+                from("jetty://http://localhost:{{port}}/test").process(new Processor() {
 
                     public void process(Exchange exchange) throws Exception {
                         Message in = exchange.getIn();

Modified: camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/MultiThreadedHttpGetTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/MultiThreadedHttpGetTest.java?rev=1027376&r1=1027375&r2=1027376&view=diff
==============================================================================
--- camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/MultiThreadedHttpGetTest.java (original)
+++ camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/MultiThreadedHttpGetTest.java Tue Oct 26 06:25:56 2010
@@ -24,13 +24,12 @@ import org.apache.camel.Processor;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.http.HttpComponent;
 import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.junit4.CamelTestSupport;
 import org.junit.Test;
 
 /**
  * @version $Revision$
  */
-public class MultiThreadedHttpGetTest extends CamelTestSupport {
+public class MultiThreadedHttpGetTest extends BaseJettyTest {
 
     @Test
     public void testHttpGetWithConversion() throws Exception {
@@ -99,13 +98,13 @@ public class MultiThreadedHttpGetTest ex
     protected RouteBuilder createRouteBuilder() throws Exception {
         return new RouteBuilder() {
             public void configure() {
-                from("seda:withConversion?concurrentConsumers=5").to("http://localhost:5430/search")
+                from("seda:withConversion?concurrentConsumers=5").to("http://localhost:{{port}}/search")
                         .convertBodyTo(String.class).to("mock:results");
 
-                from("seda:withoutConversion?concurrentConsumers=5").to("http://localhost:5430/search")
+                from("seda:withoutConversion?concurrentConsumers=5").to("http://localhost:{{port}}/search")
                         .to("mock:results");
 
-                from("jetty:http://localhost:5430/search").process(new Processor() {
+                from("jetty:http://localhost:{{port}}/search").process(new Processor() {
                     public void process(Exchange exchange) throws Exception {
                         exchange.getOut().setBody("<html>Bye World</html>");
                     }

Modified: camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/TwoCamelContextWithJettyRouteTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/TwoCamelContextWithJettyRouteTest.java?rev=1027376&r1=1027375&r2=1027376&view=diff
==============================================================================
--- camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/TwoCamelContextWithJettyRouteTest.java (original)
+++ camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/TwoCamelContextWithJettyRouteTest.java Tue Oct 26 06:25:56 2010
@@ -21,13 +21,14 @@ import java.net.ConnectException;
 import org.apache.camel.CamelContext;
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
-import org.apache.camel.RoutesBuilder;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.impl.DefaultCamelContext;
-import org.apache.camel.test.junit4.CamelTestSupport;
 import org.junit.Test;
 
-public class TwoCamelContextWithJettyRouteTest extends CamelTestSupport {
+public class TwoCamelContextWithJettyRouteTest extends BaseJettyTest {
+
+    private int port1;
+    private int port2;
 
     @Test
     public void testTwoServerPorts() throws Exception {
@@ -36,15 +37,13 @@ public class TwoCamelContextWithJettyRou
         contextB.addRoutes(new RouteBuilder() {
             @Override
             public void configure() throws Exception {
-                from("jetty://http://localhost:9888/myotherapp").process(new Processor() {
+                from("jetty://http://localhost:" + port2 + "/myotherapp").process(new Processor() {
                     public void process(Exchange exchange) throws Exception {
                         String in = exchange.getIn().getBody(String.class);
                         exchange.getOut().setBody("Hi " + in);
                     }
                 });
-                
             }
-            
         });
         contextB.start();
         
@@ -74,11 +73,14 @@ public class TwoCamelContextWithJettyRou
         return new RouteBuilder() {
             @Override
             public void configure() throws Exception {
-                from("direct:a").to("http://localhost:9777/myapp");
+                port1 = getPort();
+                port2 = getNextPort();
+
+                from("direct:a").to("http://localhost:" + port1 + "/myapp");
 
-                from("direct:b").to("http://localhost:9888/myotherapp");
+                from("direct:b").to("http://localhost:" + port2 + "/myotherapp");
 
-                from("jetty://http://localhost:9777/myapp").process(new Processor() {
+                from("jetty://http://localhost:" + port1 + "/myapp").process(new Processor() {
                     public void process(Exchange exchange) throws Exception {
                         String in = exchange.getIn().getBody(String.class);
                         exchange.getOut().setBody("Bye " + in);

Modified: camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/async/JettyAsyncCBRTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/async/JettyAsyncCBRTest.java?rev=1027376&r1=1027375&r2=1027376&view=diff
==============================================================================
--- camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/async/JettyAsyncCBRTest.java (original)
+++ camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/async/JettyAsyncCBRTest.java Tue Oct 26 06:25:56 2010
@@ -17,19 +17,19 @@
 package org.apache.camel.component.jetty.async;
 
 import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.component.jetty.BaseJettyTest;
 import org.junit.Test;
 
 /**
  * @version $Revision$
  */
-public class JettyAsyncCBRTest extends CamelTestSupport {
+public class JettyAsyncCBRTest extends BaseJettyTest {
 
     @Test
     public void testJettyAsync() throws Exception {
         getMockEndpoint("mock:result").expectedBodiesReceived("Bye World");
 
-        String reply = template.requestBody("http://localhost:8876/myservice", "Hello Camel", String.class);
+        String reply = template.requestBody("http://localhost:{{port}}/myservice", "Hello Camel", String.class);
         assertEquals("Bye World", reply);
 
         assertMockEndpointsSatisfied();
@@ -42,7 +42,7 @@ public class JettyAsyncCBRTest extends C
             public void configure() throws Exception {
                 context.addComponent("async", new MyAsyncComponent());
 
-                from("jetty:http://localhost:8876/myservice")
+                from("jetty:http://localhost:{{port}}/myservice")
                     .convertBodyTo(String.class)
                     .choice()
                         .when(body().contains("Camel"))

Modified: camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/async/JettyAsyncFilterTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/async/JettyAsyncFilterTest.java?rev=1027376&r1=1027375&r2=1027376&view=diff
==============================================================================
--- camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/async/JettyAsyncFilterTest.java (original)
+++ camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/async/JettyAsyncFilterTest.java Tue Oct 26 06:25:56 2010
@@ -17,19 +17,19 @@
 package org.apache.camel.component.jetty.async;
 
 import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.component.jetty.BaseJettyTest;
 import org.junit.Test;
 
 /**
  * @version $Revision$
  */
-public class JettyAsyncFilterTest extends CamelTestSupport {
+public class JettyAsyncFilterTest extends BaseJettyTest {
 
     @Test
     public void testJettyAsync() throws Exception {
         getMockEndpoint("mock:result").expectedBodiesReceived("Bye World");
 
-        String reply = template.requestBody("http://localhost:8876/myservice", "Hello Camel", String.class);
+        String reply = template.requestBody("http://localhost:{{port}}/myservice", "Hello Camel", String.class);
         assertEquals("Bye World", reply);
 
         assertMockEndpointsSatisfied();
@@ -42,7 +42,7 @@ public class JettyAsyncFilterTest extend
             public void configure() throws Exception {
                 context.addComponent("async", new MyAsyncComponent());
 
-                from("jetty:http://localhost:8876/myservice")
+                from("jetty:http://localhost:{{port}}/myservice")
                     .convertBodyTo(String.class)
                     .filter(body().contains("Camel"))
                         .to("async:Bye World")

Modified: camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/async/JettyAsyncTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/async/JettyAsyncTest.java?rev=1027376&r1=1027375&r2=1027376&view=diff
==============================================================================
--- camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/async/JettyAsyncTest.java (original)
+++ camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/async/JettyAsyncTest.java Tue Oct 26 06:25:56 2010
@@ -17,19 +17,19 @@
 package org.apache.camel.component.jetty.async;
 
 import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.component.jetty.BaseJettyTest;
 import org.junit.Test;
 
 /**
  * @version $Revision$
  */
-public class JettyAsyncTest extends CamelTestSupport {
+public class JettyAsyncTest extends BaseJettyTest {
 
     @Test
     public void testJettyAsync() throws Exception {
         getMockEndpoint("mock:result").expectedBodiesReceived("Bye World");
 
-        String reply = template.requestBody("http://localhost:8877/myservice", null, String.class);
+        String reply = template.requestBody("http://localhost:{{port}}/myservice", null, String.class);
         assertEquals("Bye World", reply);
 
         assertMockEndpointsSatisfied();
@@ -42,7 +42,7 @@ public class JettyAsyncTest extends Came
             public void configure() throws Exception {
                 context.addComponent("async", new MyAsyncComponent());
 
-                from("jetty:http://localhost:8877/myservice")
+                from("jetty:http://localhost:{{port}}/myservice")
                     .to("async:Bye World")
                     .to("mock:result");
             }

Modified: camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/async/JettyAsyncTransformTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/async/JettyAsyncTransformTest.java?rev=1027376&r1=1027375&r2=1027376&view=diff
==============================================================================
--- camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/async/JettyAsyncTransformTest.java (original)
+++ camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/async/JettyAsyncTransformTest.java Tue Oct 26 06:25:56 2010
@@ -17,19 +17,19 @@
 package org.apache.camel.component.jetty.async;
 
 import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.component.jetty.BaseJettyTest;
 import org.junit.Test;
 
 /**
  * @version $Revision$
  */
-public class JettyAsyncTransformTest extends CamelTestSupport {
+public class JettyAsyncTransformTest extends BaseJettyTest {
 
     @Test
     public void testJettyAsync() throws Exception {
         getMockEndpoint("mock:result").expectedBodiesReceived("Bye World");
 
-        String reply = template.requestBody("http://localhost:8876/myservice", null, String.class);
+        String reply = template.requestBody("http://localhost:{{port}}/myservice", null, String.class);
         assertEquals("Bye World", reply);
 
         assertMockEndpointsSatisfied();
@@ -42,7 +42,7 @@ public class JettyAsyncTransformTest ext
             public void configure() throws Exception {
                 context.addComponent("async", new MyAsyncComponent());
 
-                from("jetty:http://localhost:8876/myservice")
+                from("jetty:http://localhost:{{port}}/myservice")
                     .to("log:foo")
                     .convertBodyTo(String.class)
                     .transform(constant("Hello World"))

Modified: camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/async/JettyAsyncTryCatchFinallyTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/async/JettyAsyncTryCatchFinallyTest.java?rev=1027376&r1=1027375&r2=1027376&view=diff
==============================================================================
--- camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/async/JettyAsyncTryCatchFinallyTest.java (original)
+++ camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/async/JettyAsyncTryCatchFinallyTest.java Tue Oct 26 06:25:56 2010
@@ -17,13 +17,13 @@
 package org.apache.camel.component.jetty.async;
 
 import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.component.jetty.BaseJettyTest;
 import org.junit.Test;
 
 /**
  * @version $Revision$
  */
-public class JettyAsyncTryCatchFinallyTest extends CamelTestSupport {
+public class JettyAsyncTryCatchFinallyTest extends BaseJettyTest {
 
     @Test
     public void testJettyAsync() throws Exception {
@@ -32,7 +32,7 @@ public class JettyAsyncTryCatchFinallyTe
         getMockEndpoint("mock:finally").expectedBodiesReceived("Bye Camel");
         getMockEndpoint("mock:result").expectedBodiesReceived("Bye World");
 
-        String reply = template.requestBody("http://localhost:8872/myservice", "Hello Camel", String.class);
+        String reply = template.requestBody("http://localhost:{{port}}/myservice", "Hello Camel", String.class);
         assertEquals("Bye World", reply);
 
         assertMockEndpointsSatisfied();
@@ -45,7 +45,7 @@ public class JettyAsyncTryCatchFinallyTe
             public void configure() throws Exception {
                 context.addComponent("async", new MyAsyncComponent());
 
-                from("jetty:http://localhost:8872/myservice")
+                from("jetty:http://localhost:{{port}}/myservice")
                     .convertBodyTo(String.class)
                     .doTry()
                         .to("mock:try")

Modified: camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/file/JettyFileConsumerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/file/JettyFileConsumerTest.java?rev=1027376&r1=1027375&r2=1027376&view=diff
==============================================================================
--- camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/file/JettyFileConsumerTest.java (original)
+++ camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/file/JettyFileConsumerTest.java Tue Oct 26 06:25:56 2010
@@ -21,11 +21,11 @@ import java.io.FileInputStream;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.component.jetty.BaseJettyTest;
 import org.junit.Before;
 import org.junit.Test;
 
-public class JettyFileConsumerTest extends CamelTestSupport {
+public class JettyFileConsumerTest extends BaseJettyTest {
 
     @Override
     @Before
@@ -38,7 +38,7 @@ public class JettyFileConsumerTest exten
     private void testingSendingFile(File src) throws Exception {
         deleteDirectory("target/test");
         FileInputStream fis = new FileInputStream(src);
-        String response = template.requestBody("http://localhost:9080/myapp/myservice", fis, String.class);
+        String response = template.requestBody("http://localhost:{{port}}/myapp/myservice", fis, String.class);
         assertEquals("Response should be OK ", "OK", response);
         File des = new File("target/test/temp.xml");
         assertTrue("The uploaded file should exists", des.exists());
@@ -61,7 +61,7 @@ public class JettyFileConsumerTest exten
     public void testSendBinaryFile() throws Exception {
         deleteDirectory("target/test");
         File jpg = new File("src/test/resources/java.jpg");
-        String response = template.requestBody("http://localhost:9080/myapp/myservice2", jpg, String.class);
+        String response = template.requestBody("http://localhost:{{port}}/myapp/myservice2", jpg, String.class);
         assertEquals("Response should be OK ", "OK", response);
         File des = new File("target/test/java.jpg");
         assertTrue("The uploaded file should exists", des.exists());
@@ -87,17 +87,17 @@ public class JettyFileConsumerTest exten
     protected RouteBuilder createRouteBuilder() throws Exception {
         return new RouteBuilder() {
             public void configure() throws Exception {
-                from("jetty:http://localhost:9080/myapp/myservice")
+                from("jetty:http://localhost:{{port}}/myapp/myservice")
                     .to("file://target/test?fileName=temp.xml")
                     .setBody(constant("OK"));
                 
-                from("jetty:http://localhost:9080/myapp/myservice2")
+                from("jetty:http://localhost:{{port}}/myapp/myservice2")
                     .to("log:foo?showAll=true")
                     .to("file://target/test?fileName=java.jpg")
                     .setBody(constant("OK"));
 
                 from("file://target/binary?noop=true")
-                    .to("http://localhost:9080/myapp/myservice2")
+                    .to("http://localhost:{{port}}/myapp/myservice2")
                     .to("mock:result");
             }
         };

Modified: camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/HttpJettyProducerTwoEndpointTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/HttpJettyProducerTwoEndpointTest.java?rev=1027376&r1=1027375&r2=1027376&view=diff
==============================================================================
--- camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/HttpJettyProducerTwoEndpointTest.java (original)
+++ camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/HttpJettyProducerTwoEndpointTest.java Tue Oct 26 06:25:56 2010
@@ -19,14 +19,13 @@ package org.apache.camel.component.jetty
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
 import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Ignore;
+import org.apache.camel.component.jetty.BaseJettyTest;
 import org.junit.Test;
 
 /**
  * @version $Revision$
  */
-public class HttpJettyProducerTwoEndpointTest extends CamelTestSupport {
+public class HttpJettyProducerTwoEndpointTest extends BaseJettyTest {
 
     @Test
     public void testTwoEndpoints() throws Exception {
@@ -58,11 +57,11 @@ public class HttpJettyProducerTwoEndpoin
         return new RouteBuilder() {
             @Override
             public void configure() throws Exception {
-                from("direct:a").to("jetty://http://localhost:9888/myapp?foo=123&bar=cheese");
+                from("direct:a").to("jetty://http://localhost:{{port}}/myapp?foo=123&bar=cheese");
 
-                from("direct:b").to("jetty://http://localhost:9888/myapp?foo=456&bar=cake");
+                from("direct:b").to("jetty://http://localhost:{{port}}/myapp?foo=456&bar=cake");
 
-                from("jetty://http://localhost:9888/myapp").process(new Processor() {
+                from("jetty://http://localhost:{{port}}/myapp").process(new Processor() {
                     public void process(Exchange exchange) throws Exception {
                         int foo = exchange.getIn().getHeader("foo", Integer.class);
                         String bar = exchange.getIn().getHeader("bar", String.class);

Modified: camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProderReturnFaultTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProderReturnFaultTest.java?rev=1027376&r1=1027375&r2=1027376&view=diff
==============================================================================
--- camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProderReturnFaultTest.java (original)
+++ camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProderReturnFaultTest.java Tue Oct 26 06:25:56 2010
@@ -19,14 +19,13 @@ package org.apache.camel.component.jetty
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
 import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Ignore;
+import org.apache.camel.component.jetty.BaseJettyTest;
 import org.junit.Test;
 
 /**
  * @version $Revision$
  */
-public class JettyHttpProderReturnFaultTest extends CamelTestSupport {
+public class JettyHttpProderReturnFaultTest extends BaseJettyTest {
 
     @Test
     public void testHttpFault() throws Exception {
@@ -38,7 +37,7 @@ public class JettyHttpProderReturnFaultT
         // give Jetty time to startup properly
         Thread.sleep(1000);
 
-        String out = template.requestBody("jetty://http://localhost:9082/test", "Hello World", String.class);
+        String out = template.requestBody("jetty://http://localhost:{{port}}/test", "Hello World", String.class);
         assertEquals("This is a fault", out);
     }
 
@@ -47,7 +46,7 @@ public class JettyHttpProderReturnFaultT
         return new RouteBuilder() {
             @Override
             public void configure() throws Exception {
-                from("jetty://http://localhost:9082/test")
+                from("jetty://http://localhost:{{port}}/test")
                     .process(new Processor() {
                         public void process(Exchange exchange) throws Exception {
                             exchange.getOut().setFault(true);

Modified: camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerAsyncTimeoutTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerAsyncTimeoutTest.java?rev=1027376&r1=1027375&r2=1027376&view=diff
==============================================================================
--- camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerAsyncTimeoutTest.java (original)
+++ camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerAsyncTimeoutTest.java Tue Oct 26 06:25:56 2010
@@ -18,16 +18,15 @@ package org.apache.camel.component.jetty
 
 import org.apache.camel.ExchangeTimedOutException;
 import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Ignore;
+import org.apache.camel.component.jetty.BaseJettyTest;
 import org.junit.Test;
 
 /**
  * @version $Revision$
  */
-public class JettyHttpProducerAsyncTimeoutTest extends CamelTestSupport {
+public class JettyHttpProducerAsyncTimeoutTest extends BaseJettyTest {
 
-    private String url = "jetty://http://0.0.0.0:9123/timeout?httpClient.timeout=2000";
+    private String url = "jetty://http://0.0.0.0:" + getPort() + "/timeout?httpClient.timeout=2000";
 
     @Test
     public void testTimeout() throws Exception {

Modified: camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerAsynchronousTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerAsynchronousTest.java?rev=1027376&r1=1027375&r2=1027376&view=diff
==============================================================================
--- camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerAsynchronousTest.java (original)
+++ camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerAsynchronousTest.java Tue Oct 26 06:25:56 2010
@@ -21,20 +21,19 @@ import javax.servlet.http.HttpServletRes
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
 import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.jetty.BaseJettyTest;
 import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Ignore;
 import org.junit.Test;
 
 /**
  * @version $Revision$
  */
-public class JettyHttpProducerAsynchronousTest extends CamelTestSupport {
+public class JettyHttpProducerAsynchronousTest extends BaseJettyTest {
 
     private static String thread1;
     private static String thread2;
 
-    private String url = "jetty://http://0.0.0.0:9123/foo";
+    private String url = "jetty://http://0.0.0.0:" + getPort() + "/foo";
 
     @Test
     public void testAsynchronous() throws Exception {

Modified: camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerConcurrentTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerConcurrentTest.java?rev=1027376&r1=1027375&r2=1027376&view=diff
==============================================================================
--- camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerConcurrentTest.java (original)
+++ camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerConcurrentTest.java Tue Oct 26 06:25:56 2010
@@ -26,6 +26,7 @@ import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
 
 import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.jetty.BaseJettyTest;
 import org.apache.camel.test.junit4.CamelTestSupport;
 import org.junit.Ignore;
 import org.junit.Test;
@@ -35,7 +36,7 @@ import org.junit.Test;
  *
  * @version $Revision$
  */
-public class JettyHttpProducerConcurrentTest extends CamelTestSupport {
+public class JettyHttpProducerConcurrentTest extends BaseJettyTest {
 
     @Test
     public void testNoConcurrentProducers() throws Exception {
@@ -73,7 +74,7 @@ public class JettyHttpProducerConcurrent
             final int index = i;
             Future out = executor.submit(new Callable<Object>() {
                 public Object call() throws Exception {
-                    return template.requestBody("jetty://http://localhost:9080/echo", "" + index, String.class);
+                    return template.requestBody("jetty://http://localhost:{{port}}/echo", "" + index, String.class);
                 }
             });
             responses.put(index, out);
@@ -97,7 +98,7 @@ public class JettyHttpProducerConcurrent
         return new RouteBuilder() {
             public void configure() throws Exception {
                 // expose a echo service
-                from("jetty:http://localhost:9080/echo")
+                from("jetty:http://localhost:{{port}}/echo")
                         .convertBodyTo(String.class)
                         .to("log:input")
                         .transform(body().append(body())).to("mock:result");

Modified: camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerConnectionFailureTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerConnectionFailureTest.java?rev=1027376&r1=1027375&r2=1027376&view=diff
==============================================================================
--- camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerConnectionFailureTest.java (original)
+++ camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerConnectionFailureTest.java Tue Oct 26 06:25:56 2010
@@ -19,19 +19,17 @@ package org.apache.camel.component.jetty
 import java.net.ConnectException;
 
 import org.apache.camel.CamelExchangeException;
-import org.apache.camel.CamelExecutionException;
 import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.jetty.BaseJettyTest;
 import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Ignore;
 import org.junit.Test;
 
 /**
  * Unit test to verify that we can have URI options for external system (endpoint is lenient)
  */
-public class JettyHttpProducerConnectionFailureTest extends CamelTestSupport {
+public class JettyHttpProducerConnectionFailureTest extends BaseJettyTest {
 
-    private String serverUri = "jetty://http://localhost:9080/myservice";
+    private String serverUri = "jetty://http://localhost:{{port}}/myservice";
 
     @Test
     public void testHttpGetWithParamsViaURI() throws Exception {

Modified: camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerContentBasedRouteTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerContentBasedRouteTest.java?rev=1027376&r1=1027375&r2=1027376&view=diff
==============================================================================
--- camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerContentBasedRouteTest.java (original)
+++ camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerContentBasedRouteTest.java Tue Oct 26 06:25:56 2010
@@ -17,17 +17,16 @@
 package org.apache.camel.component.jetty.jettyproducer;
 
 import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.jetty.BaseJettyTest;
 import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Ignore;
 import org.junit.Test;
 
 /**
  * Unit test with a simple route test.
  */
-public class JettyHttpProducerContentBasedRouteTest extends CamelTestSupport {
+public class JettyHttpProducerContentBasedRouteTest extends BaseJettyTest {
 
-    private String serverUri = "jetty://http://localhost:9087/myservice";
+    private String serverUri = "jetty://http://localhost:" + getPort() + "/myservice";
 
     @Test
     public void testSendOne() throws Exception {

Modified: camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerGetWithParamAsExchangeHeaderTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerGetWithParamAsExchangeHeaderTest.java?rev=1027376&r1=1027375&r2=1027376&view=diff
==============================================================================
--- camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerGetWithParamAsExchangeHeaderTest.java (original)
+++ camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerGetWithParamAsExchangeHeaderTest.java Tue Oct 26 06:25:56 2010
@@ -18,17 +18,16 @@ package org.apache.camel.component.jetty
 
 import org.apache.camel.Exchange;
 import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.jetty.BaseJettyTest;
 import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Ignore;
 import org.junit.Test;
 
 /**
  * Unit test to verify that we can have URI options for external system (endpoint is lenient)
  */
-public class JettyHttpProducerGetWithParamAsExchangeHeaderTest extends CamelTestSupport {
+public class JettyHttpProducerGetWithParamAsExchangeHeaderTest extends BaseJettyTest {
 
-    private String serverUri = "jetty://http://localhost:9088/myservice";
+    private String serverUri = "jetty://http://localhost:" + getPort() + "/myservice";
 
     @Test
     public void testHttpGetWithParamsViaURI() throws Exception {

Modified: camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerGetWithParamTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerGetWithParamTest.java?rev=1027376&r1=1027375&r2=1027376&view=diff
==============================================================================
--- camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerGetWithParamTest.java (original)
+++ camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerGetWithParamTest.java Tue Oct 26 06:25:56 2010
@@ -21,17 +21,16 @@ import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.http.HttpMessage;
+import org.apache.camel.component.jetty.BaseJettyTest;
 import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Ignore;
 import org.junit.Test;
 
 /**
  * Unit test to verify that we can have URI options for external system (endpoint is lenient)
  */
-public class JettyHttpProducerGetWithParamTest extends CamelTestSupport {
+public class JettyHttpProducerGetWithParamTest extends BaseJettyTest {
 
-    private String serverUri = "jetty://http://localhost:9086/myservice";
+    private String serverUri = "jetty://http://localhost:" + getPort() + "/myservice";
     private MyParamsProcessor processor = new MyParamsProcessor();
 
     @Test

Modified: camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerGoogleAsynchronousTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerGoogleAsynchronousTest.java?rev=1027376&r1=1027375&r2=1027376&view=diff
==============================================================================
--- camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerGoogleAsynchronousTest.java (original)
+++ camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerGoogleAsynchronousTest.java Tue Oct 26 06:25:56 2010
@@ -28,7 +28,7 @@ import org.junit.Test;
 public class JettyHttpProducerGoogleAsynchronousTest extends CamelTestSupport {
 
     @Test
-    @Ignore("ignore online tests, will be improved in Camel 2.3")
+    @Ignore("ignore online tests")
     public void testGoogleFrontPageAsync() throws Exception {
         // these tests does not run well on Windows
         if (isPlatform("windows")) {

Modified: camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerGoogleTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerGoogleTest.java?rev=1027376&r1=1027375&r2=1027376&view=diff
==============================================================================
--- camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerGoogleTest.java (original)
+++ camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerGoogleTest.java Tue Oct 26 06:25:56 2010
@@ -27,7 +27,7 @@ import org.junit.Test;
 public class JettyHttpProducerGoogleTest extends CamelTestSupport {
 
     @Test
-    @Ignore("ignore online tests, will be improved in Camel 2.3")
+    @Ignore("ignore online tests")
     public void testGoogleFrontPage() throws Exception {
         // these tests does not run well on Windows
         if (isPlatform("windows")) {

Modified: camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerQueryParamTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerQueryParamTest.java?rev=1027376&r1=1027375&r2=1027376&view=diff
==============================================================================
--- camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerQueryParamTest.java (original)
+++ camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerQueryParamTest.java Tue Oct 26 06:25:56 2010
@@ -17,19 +17,19 @@
 package org.apache.camel.component.jetty.jettyproducer;
 
 import java.util.Map;
+
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
 import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Ignore;
+import org.apache.camel.component.jetty.BaseJettyTest;
 import org.junit.Test;
 
 /**
  * @version $Revision$
  */
-public class JettyHttpProducerQueryParamTest extends CamelTestSupport {
+public class JettyHttpProducerQueryParamTest extends BaseJettyTest {
 
-    private String url = "jetty://http://0.0.0.0:9123/cheese";
+    private String url = "jetty://http://0.0.0.0:" + getPort() + "/cheese";
 
     @Test
     public void testQueryParameters() throws Exception {

Modified: camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerSendFileTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerSendFileTest.java?rev=1027376&r1=1027375&r2=1027376&view=diff
==============================================================================
--- camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerSendFileTest.java (original)
+++ camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerSendFileTest.java Tue Oct 26 06:25:56 2010
@@ -22,6 +22,7 @@ import java.io.InputStream;
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
 import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.jetty.BaseJettyTest;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.test.junit4.CamelTestSupport;
 import org.junit.Ignore;
@@ -30,7 +31,7 @@ import org.junit.Test;
 /**
  * @version $Revision$
  */
-public class JettyHttpProducerSendFileTest extends CamelTestSupport {
+public class JettyHttpProducerSendFileTest extends BaseJettyTest {
 
     @Test
     public void testSendImage() throws Exception {
@@ -47,7 +48,7 @@ public class JettyHttpProducerSendFileTe
         mock.message(0).body().isInstanceOf(InputStream.class);
         mock.message(0).header("Content-Type").isEqualTo("image/jpeg");
 
-        Exchange out = template.send("jetty://http://localhost:9080/myapp/myservice", new Processor() {
+        Exchange out = template.send("jetty://http://localhost:{{port}}/myapp/myservice", new Processor() {
             public void process(Exchange exchange) throws Exception {
                 exchange.getIn().setBody(new File("src/test/data/logo.jpeg"));
                 exchange.getIn().setHeader("Content-Type", "image/jpeg");
@@ -64,7 +65,7 @@ public class JettyHttpProducerSendFileTe
     protected RouteBuilder createRouteBuilder() throws Exception {
         return new RouteBuilder() {
             public void configure() throws Exception {
-                from("jetty:http://localhost:9080/myapp/myservice")
+                from("jetty:http://localhost:{{port}}/myapp/myservice")
                     .to("mock:result")
                     .process(new Processor() {
                         public void process(Exchange exchange) throws Exception {

Modified: camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerSimulate404ErrorTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerSimulate404ErrorTest.java?rev=1027376&r1=1027375&r2=1027376&view=diff
==============================================================================
--- camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerSimulate404ErrorTest.java (original)
+++ camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerSimulate404ErrorTest.java Tue Oct 26 06:25:56 2010
@@ -20,16 +20,15 @@ import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.http.HttpOperationFailedException;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Ignore;
+import org.apache.camel.component.jetty.BaseJettyTest;
 import org.junit.Test;
 
 /**
  * @version $Revision$
  */
-public class JettyHttpProducerSimulate404ErrorTest extends CamelTestSupport {
+public class JettyHttpProducerSimulate404ErrorTest extends BaseJettyTest {
 
-    private String url = "jetty://http://0.0.0.0:9123/bar";
+    private String url = "jetty://http://0.0.0.0:" + getPort() + "/bar";
 
     @Test
     public void test404() throws Exception {
@@ -46,7 +45,7 @@ public class JettyHttpProducerSimulate40
         } catch (Exception e) {
             HttpOperationFailedException cause = assertIsInstanceOf(HttpOperationFailedException.class, e.getCause());
             assertEquals(404, cause.getStatusCode());
-            assertEquals("http//0.0.0.0:9123/bar", cause.getUri());
+            assertEquals("http//0.0.0.0:" + getPort() + "/bar", cause.getUri());
             assertEquals("Page not found", cause.getResponseBody());
             assertNotNull(cause.getResponseHeaders());
         }

Modified: camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerSlowResponseTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerSlowResponseTest.java?rev=1027376&r1=1027375&r2=1027376&view=diff
==============================================================================
--- camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerSlowResponseTest.java (original)
+++ camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerSlowResponseTest.java Tue Oct 26 06:25:56 2010
@@ -21,17 +21,16 @@ import javax.servlet.http.HttpServletRes
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
 import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.jetty.BaseJettyTest;
 import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Ignore;
 import org.junit.Test;
 
 /**
  * @version $Revision$
  */
-public class JettyHttpProducerSlowResponseTest extends CamelTestSupport {
+public class JettyHttpProducerSlowResponseTest extends BaseJettyTest {
 
-    private String url = "jetty://http://0.0.0.0:9321/foo";
+    private String url = "jetty://http://0.0.0.0:" + getPort() + "/foo";
 
     @Test
     public void testSlowReply() throws Exception {

Modified: camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerSuspendResumeTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerSuspendResumeTest.java?rev=1027376&r1=1027375&r2=1027376&view=diff
==============================================================================
--- camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerSuspendResumeTest.java (original)
+++ camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerSuspendResumeTest.java Tue Oct 26 06:25:56 2010
@@ -19,16 +19,15 @@ package org.apache.camel.component.jetty
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.http.HttpConsumer;
 import org.apache.camel.component.http.HttpOperationFailedException;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Ignore;
+import org.apache.camel.component.jetty.BaseJettyTest;
 import org.junit.Test;
 
 /**
  * @version $Revision$
  */
-public class JettyHttpProducerSuspendResumeTest extends CamelTestSupport {
+public class JettyHttpProducerSuspendResumeTest extends BaseJettyTest {
 
-    private String serverUri = "jetty://http://localhost:9286/cool";
+    private String serverUri = "jetty://http://localhost:" + getPort() + "/cool";
 
     @Test
     public void testJettySuspendResume() throws Exception {

Modified: camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerSuspendTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerSuspendTest.java?rev=1027376&r1=1027375&r2=1027376&view=diff
==============================================================================
--- camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerSuspendTest.java (original)
+++ camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerSuspendTest.java Tue Oct 26 06:25:56 2010
@@ -19,16 +19,15 @@ package org.apache.camel.component.jetty
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.http.HttpConsumer;
 import org.apache.camel.component.http.HttpOperationFailedException;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Ignore;
+import org.apache.camel.component.jetty.BaseJettyTest;
 import org.junit.Test;
 
 /**
  * @version $Revision$
  */
-public class JettyHttpProducerSuspendTest extends CamelTestSupport {
+public class JettyHttpProducerSuspendTest extends BaseJettyTest {
 
-    private String serverUri = "jetty://http://localhost:9287/cool";
+    private String serverUri = "jetty://http://localhost:" + getPort() + "/cool";
 
     @Test
     public void testJettySuspend() throws Exception {

Modified: camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerSuspendWhileInProgressTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerSuspendWhileInProgressTest.java?rev=1027376&r1=1027375&r2=1027376&view=diff
==============================================================================
--- camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerSuspendWhileInProgressTest.java (original)
+++ camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerSuspendWhileInProgressTest.java Tue Oct 26 06:25:56 2010
@@ -23,18 +23,15 @@ import java.util.concurrent.TimeUnit;
 import org.apache.camel.RuntimeCamelException;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.http.HttpOperationFailedException;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Ignore;
+import org.apache.camel.component.jetty.BaseJettyTest;
 import org.junit.Test;
 
-import static org.apache.camel.language.simple.SimpleLanguage.simple;
-
 /**
  * @version $Revision$
  */
-public class JettyHttpProducerSuspendWhileInProgressTest extends CamelTestSupport {
+public class JettyHttpProducerSuspendWhileInProgressTest extends BaseJettyTest {
 
-    private String serverUri = "jetty://http://localhost:9285/cool";
+    private String serverUri = "jetty://http://localhost:" + getPort() + "/cool";
 
     @Test
     public void testJettySuspendWhileInProgress() throws Exception {

Modified: camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerSynchronousFalseTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerSynchronousFalseTest.java?rev=1027376&r1=1027375&r2=1027376&view=diff
==============================================================================
--- camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerSynchronousFalseTest.java (original)
+++ camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerSynchronousFalseTest.java Tue Oct 26 06:25:56 2010
@@ -19,17 +19,18 @@ package org.apache.camel.component.jetty
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
 import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.jetty.BaseJettyTest;
 import org.apache.camel.test.junit4.CamelTestSupport;
 import org.junit.Test;
 
 /**
  * @version $Revision: 957588 $
  */
-public class JettyHttpProducerSynchronousFalseTest extends CamelTestSupport {
+public class JettyHttpProducerSynchronousFalseTest extends BaseJettyTest {
 
     private static String beforeThreadName;
     private static String afterThreadName;
-    private String url = "jetty://http://0.0.0.0:9123/sync?synchronous=false";
+    private String url = "jetty://http://0.0.0.0:" + getPort() + "/sync?synchronous=false";
 
     @Test
     public void testSynchronous() throws Exception {

Modified: camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerSynchronousTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerSynchronousTest.java?rev=1027376&r1=1027375&r2=1027376&view=diff
==============================================================================
--- camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerSynchronousTest.java (original)
+++ camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerSynchronousTest.java Tue Oct 26 06:25:56 2010
@@ -19,17 +19,17 @@ package org.apache.camel.component.jetty
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
 import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.component.jetty.BaseJettyTest;
 import org.junit.Test;
 
 /**
  * @version $Revision$
  */
-public class JettyHttpProducerSynchronousTest extends CamelTestSupport {
+public class JettyHttpProducerSynchronousTest extends BaseJettyTest {
 
     private static String beforeThreadName;
     private static String afterThreadName;
-    private String url = "jetty://http://0.0.0.0:9123/sync?synchronous=true";
+    private String url = "jetty://http://0.0.0.0:" + getPort() + "/sync?synchronous=true";
 
     @Test
     public void testSynchronous() throws Exception {

Modified: camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerTimeoutTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerTimeoutTest.java?rev=1027376&r1=1027375&r2=1027376&view=diff
==============================================================================
--- camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerTimeoutTest.java (original)
+++ camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerTimeoutTest.java Tue Oct 26 06:25:56 2010
@@ -19,16 +19,15 @@ package org.apache.camel.component.jetty
 import org.apache.camel.Exchange;
 import org.apache.camel.ExchangeTimedOutException;
 import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Ignore;
+import org.apache.camel.component.jetty.BaseJettyTest;
 import org.junit.Test;
 
 /**
  * @version $Revision$
  */
-public class JettyHttpProducerTimeoutTest extends CamelTestSupport {
+public class JettyHttpProducerTimeoutTest extends BaseJettyTest {
 
-    private String url = "jetty://http://0.0.0.0:9123/timeout?httpClient.timeout=2000";
+    private String url = "jetty://http://0.0.0.0:" + getPort() + "/timeout?httpClient.timeout=2000";
 
     @Test
     public void testTimeout() throws Exception {

Modified: camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpsProducerRouteSetupWithSystemPropsTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpsProducerRouteSetupWithSystemPropsTest.java?rev=1027376&r1=1027375&r2=1027376&view=diff
==============================================================================
--- camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpsProducerRouteSetupWithSystemPropsTest.java (original)
+++ camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpsProducerRouteSetupWithSystemPropsTest.java Tue Oct 26 06:25:56 2010
@@ -54,16 +54,19 @@ public class JettyHttpsProducerRouteSetu
     protected RouteBuilder createRouteBuilder() throws Exception {
         return new RouteBuilder() {
             public void configure() {
-                from("jetty:https://localhost:9080/test").to("mock:a");
+                port1 = getPort();
+                port2 = getNextPort();
+
+                from("jetty:https://localhost:" + port1 + "/test").to("mock:a");
 
                 Processor proc = new Processor() {
                     public void process(Exchange exchange) throws Exception {
                         exchange.getOut().setBody("<b>Hello World</b>");
                     }
                 };
-                from("jetty:https://localhost:9080/hello").process(proc);
+                from("jetty:https://localhost:" + port1 + "/hello").process(proc);
 
-                from("jetty:https://localhost:9090/test").to("mock:b");
+                from("jetty:https://localhost:" + port2 + "/test").to("mock:b");
             }
         };
     }

Modified: camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyProducerHandle404Test.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyProducerHandle404Test.java?rev=1027376&r1=1027375&r2=1027376&view=diff
==============================================================================
--- camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyProducerHandle404Test.java (original)
+++ camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyProducerHandle404Test.java Tue Oct 26 06:25:56 2010
@@ -27,7 +27,7 @@ import org.junit.Ignore;
 public class JettyProducerHandle404Test extends JettyHandle404Test {
 
     public String getProducerUrl() {
-        return "jetty://http://localhost:8123/myserver?user=Camel";
+        return "jetty://http://localhost:{{port}}/myserver?user=Camel";
     }
 
 }
\ No newline at end of file

Modified: camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyProducerHttpsRouteTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyProducerHttpsRouteTest.java?rev=1027376&r1=1027375&r2=1027376&view=diff
==============================================================================
--- camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyProducerHttpsRouteTest.java (original)
+++ camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyProducerHttpsRouteTest.java Tue Oct 26 06:25:56 2010
@@ -19,7 +19,6 @@ package org.apache.camel.component.jetty
 import org.apache.camel.RuntimeCamelException;
 import org.apache.camel.component.jetty.HttpsRouteTest;
 import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Ignore;
 import org.junit.Test;
 
 public class JettyProducerHttpsRouteTest extends HttpsRouteTest {
@@ -40,7 +39,7 @@ public class JettyProducerHttpsRouteTest
 
         MockEndpoint mockEndpoint = resolveMandatoryEndpoint("mock:a", MockEndpoint.class);
         try {
-            template.sendBodyAndHeader("jetty://http://localhost:9080/test", expectedBody, "Content-Type", "application/xml");
+            template.sendBodyAndHeader("jetty://http://localhost:" + port1 + "/test", expectedBody, "Content-Type", "application/xml");
             fail("expect exception on access to https endpoint via http");
         } catch (RuntimeCamelException expected) {
         }