camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1152167 - in /camel/trunk/components/camel-cxf: ./ src/test/java/org/apache/camel/component/cxf/ src/test/java/org/apache/camel/component/cxf/jaxrs/ src/test/java/org/apache/camel/component/cxf/mtom/ src/test/java/org/apache/camel/componen...
Date Fri, 29 Jul 2011 11:17:13 GMT
Author: dkulp
Date: Fri Jul 29 11:17:08 2011
New Revision: 1152167

URL: http://svn.apache.org/viewvc?rev=1152167&view=rev
Log:
[CAMEL-4095] More dynamic ports.  With latest CXF snapshots, some
parallel stuff works.

Modified:
    camel/trunk/components/camel-cxf/pom.xml
    camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/AbstractCXFGreeterRouterTest.java
    camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/AbstractCxfWsdlFirstTest.java
    camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CXFGreeterRouterTest.java
    camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfCustomerStartStopTest.java
    camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfGreeterConverterRouterTest.java
    camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfGreeterMessageRouterTest.java
    camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfGreeterPayLoadRouterTest.java
    camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfGreeterPayLoadWithFeatureRouterTest.java
    camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/LoggingInterceptorInMessageModeTest.java
    camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerAddressOverrideTest.java
    camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerTest.java
    camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomConsumerPayloadModeTest.java
    camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomDisabledConsumerPayloadModeTest.java
    camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomPOJOProducerTest.java
    camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/CxfEndpointBeanBusSettingTest.java
    camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/CxfEndpointBeanTest.java
    camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/CxfEndpointBeanWithBusTest.java
    camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/CxfRsClientFactoryBeanTest.java
    camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/CxfRsServerFactoryBeanTest.java
    camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/FileToCxfMessageDataFormatTest.java
    camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/wsa/WSAddressingTest.java
    camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/GreeterConverterEndpointsRouterContext.xml
    camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/GreeterEndpointBeans.xml
    camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/GreeterEndpointPayloadBeans.xml
    camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/GreeterEndpointWithFeatureBeans.xml
    camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/GreeterEndpointsRouterContext.xml
    camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/ServiceClassRefTest-context.xml
    camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/jaxrs/CxfRsSpringProducer.xml
    camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/jaxrs/CxfRsSpringProducerAddressOverride.xml
    camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/mtom/CxfMtomConsumerPayloadModeTest-context.xml
    camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/mtom/CxfMtomDisabledConsumerPayloadModeTest-context.xml
    camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/mtom/CxfMtomPOJOProducerTest-context.xml
    camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/spring/CxfEndpointBeans.xml
    camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/spring/CxfEndpointBeansBusSetting.xml
    camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/spring/CxfEndpointBeansRouterWithBus.xml
    camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/spring/CxfRsClientFactoryBeans.xml
    camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/spring/CxfRsServerFactoryBeans.xml
    camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/spring/FileToCxfMessageDataFormatTest.xml
    camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/wsa/WSAddressingTest-context.xml
    camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/wsa/client.xml

Modified: camel/trunk/components/camel-cxf/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/pom.xml?rev=1152167&r1=1152166&r2=1152167&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/pom.xml (original)
+++ camel/trunk/components/camel-cxf/pom.xml Fri Jul 29 11:17:08 2011
@@ -217,7 +217,7 @@
           <runOrder>alphabetical</runOrder>
           <!--parallel>classes</parallel>
           <perCoreThreadCount>true</perCoreThreadCount>
-          <threads>2</threads-->
+          <threadCount>2</threadCount-->
           <systemPropertyVariables>
             <java.util.logging.config.file>${basedir}/target/test-classes/logging.properties</java.util.logging.config.file>
           </systemPropertyVariables>

Modified: camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/AbstractCXFGreeterRouterTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/AbstractCXFGreeterRouterTest.java?rev=1152167&r1=1152166&r2=1152167&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/AbstractCXFGreeterRouterTest.java (original)
+++ camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/AbstractCXFGreeterRouterTest.java Fri Jul 29 11:17:08 2011
@@ -82,8 +82,8 @@ public abstract class AbstractCXFGreeter
     public void testInvokingServiceFromCXFClient() throws Exception {
         Service service = Service.create(serviceName);
         service.addPort(routerPortName, "http://schemas.xmlsoap.org/soap/",
-                        "http://localhost:" + getPort2() + "/CamelContext/RouterPort/"
-                        + getClass().getSimpleName());
+                        "http://localhost:" + getPort2() + "/"
+                        + getClass().getSimpleName() + "/CamelContext/RouterPort");
         Greeter greeter = service.getPort(routerPortName, Greeter.class);
 
         String reply = greeter.greetMe("test");
@@ -110,8 +110,9 @@ public abstract class AbstractCXFGreeter
     @Test
     public void testRoutingSOAPFault() throws Exception {
         try {
-            template.sendBody("http://localhost:" + getPort2() 
-                              + "/CamelContext/RouterPort/" + getClass().getSimpleName(),
+            template.sendBody("http://localhost:" + getPort2() + "/"
+                              + getClass().getSimpleName()
+                              + "/CamelContext/RouterPort/",
                               testDocLitFaultBody);
             fail("Should get an exception here.");
         } catch (RuntimeCamelException exception) {
@@ -122,7 +123,8 @@ public abstract class AbstractCXFGreeter
     
     @Test
     public void testPublishEndpointUrl() throws Exception {
-        String response = template.requestBody("http://localhost:" + getPort2() + "/CamelContext/RouterPort/"
+        String response = template.requestBody("http://localhost:" + getPort2() + "/" + getClass().getSimpleName()
+                                               + "/CamelContext/RouterPort/"
             + getClass().getSimpleName() + "?wsdl", null, String.class);
         assertTrue("Can't find the right service location.", response.indexOf("http://www.simple.com/services/test") > 0);
     }

Modified: camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/AbstractCxfWsdlFirstTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/AbstractCxfWsdlFirstTest.java?rev=1152167&r1=1152166&r2=1152167&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/AbstractCxfWsdlFirstTest.java (original)
+++ camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/AbstractCxfWsdlFirstTest.java Fri Jul 29 11:17:08 2011
@@ -41,8 +41,10 @@ import org.junit.Test;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
 public abstract class AbstractCxfWsdlFirstTest extends CamelSpringTestSupport {
+    static int port1 = CXFTestSupport.getPort1();
+    
     public static int getPort1() {
-        return CXFTestSupport.getPort1();
+        return port1;
     }
     public static int getPort2() {
         return CXFTestSupport.getPort2();

Modified: camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CXFGreeterRouterTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CXFGreeterRouterTest.java?rev=1152167&r1=1152166&r2=1152167&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CXFGreeterRouterTest.java (original)
+++ camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CXFGreeterRouterTest.java Fri Jul 29 11:17:08 2011
@@ -51,7 +51,7 @@ public class CXFGreeterRouterTest extend
     @BeforeClass
     public static void startService() {
         Object implementor = new GreeterImpl();
-        String address = "http://localhost:" + getPort1() + "/SoapContext/SoapPort/CXFGreeterRouterTest"; 
+        String address = "http://localhost:" + getPort1() + "/CXFGreeterRouterTest/SoapContext/SoapPort"; 
         endpoint = Endpoint.publish(address, implementor); 
     }
 

Modified: camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfCustomerStartStopTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfCustomerStartStopTest.java?rev=1152167&r1=1152166&r2=1152167&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfCustomerStartStopTest.java (original)
+++ camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfCustomerStartStopTest.java Fri Jul 29 11:17:08 2011
@@ -31,8 +31,8 @@ import org.junit.Test;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 @org.junit.Ignore
 public class CxfCustomerStartStopTest extends Assert {
-    static final int PORT1 = AvailablePortFinder.getNextAvailable();  
-    static final int PORT2 = AvailablePortFinder.getNextAvailable();  
+    static final int PORT1 = CXFTestSupport.getPort1();  
+    static final int PORT2 = CXFTestSupport.getPort1();  
     @Test
     public void startAndStopService() throws Exception {
         CamelContext context = new DefaultCamelContext();

Modified: camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfGreeterConverterRouterTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfGreeterConverterRouterTest.java?rev=1152167&r1=1152166&r2=1152167&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfGreeterConverterRouterTest.java (original)
+++ camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfGreeterConverterRouterTest.java Fri Jul 29 11:17:08 2011
@@ -40,7 +40,7 @@ public class CxfGreeterConverterRouterTe
     public static void startService() {
         Object implementor = new GreeterImpl();
         String address = "http://localhost:" + getPort1()
-            + "/SoapContext/SoapPort/CxfGreeterConverterRouterTest";
+            + "/CxfGreeterConverterRouterTest/SoapContext/SoapPort";
         endpoint = Endpoint.publish(address, implementor); 
     }
 

Modified: camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfGreeterMessageRouterTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfGreeterMessageRouterTest.java?rev=1152167&r1=1152166&r2=1152167&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfGreeterMessageRouterTest.java (original)
+++ camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfGreeterMessageRouterTest.java Fri Jul 29 11:17:08 2011
@@ -44,7 +44,7 @@ public class CxfGreeterMessageRouterTest
     public static void startService() {
         Object implementor = new GreeterImpl();
         String address = "http://localhost:" + getPort1() 
-            + "/SoapContext/SoapPort/CxfGreeterMessageRouterTest";
+            + "/CxfGreeterMessageRouterTest/SoapContext/SoapPort";
         endpoint = Endpoint.publish(address, implementor); 
     }
     

Modified: camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfGreeterPayLoadRouterTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfGreeterPayLoadRouterTest.java?rev=1152167&r1=1152166&r2=1152167&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfGreeterPayLoadRouterTest.java (original)
+++ camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfGreeterPayLoadRouterTest.java Fri Jul 29 11:17:08 2011
@@ -41,7 +41,7 @@ public class CxfGreeterPayLoadRouterTest
     @BeforeClass
     public static void startService() {
         Object implementor = new GreeterImpl();
-        String address = "http://localhost:" + getPort1() + "/SoapContext/SoapPort/CxfGreeterPayLoadRouterTest";
+        String address = "http://localhost:" + getPort1() + "/CxfGreeterPayLoadRouterTest/SoapContext/SoapPort";
         endpoint = Endpoint.publish(address, implementor); 
     }
 

Modified: camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfGreeterPayLoadWithFeatureRouterTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfGreeterPayLoadWithFeatureRouterTest.java?rev=1152167&r1=1152166&r2=1152167&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfGreeterPayLoadWithFeatureRouterTest.java (original)
+++ camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfGreeterPayLoadWithFeatureRouterTest.java Fri Jul 29 11:17:08 2011
@@ -46,7 +46,7 @@ public class CxfGreeterPayLoadWithFeatur
     public static void startService() {
         Object implementor = new GreeterImpl();
         String address = "http://localhost:" + getPort1() 
-                + "/SoapContext/SoapPort/CxfGreeterPayLoadWithFeatureRouterTest";
+                + "/CxfGreeterPayLoadWithFeatureRouterTest/SoapContext/SoapPort";
         endpoint = Endpoint.publish(address, implementor); 
     }
 

Modified: camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/LoggingInterceptorInMessageModeTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/LoggingInterceptorInMessageModeTest.java?rev=1152167&r1=1152166&r2=1152167&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/LoggingInterceptorInMessageModeTest.java (original)
+++ camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/LoggingInterceptorInMessageModeTest.java Fri Jul 29 11:17:08 2011
@@ -21,11 +21,14 @@ import java.io.StringWriter;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.test.AvailablePortFinder;
+import org.apache.cxf.endpoint.Server;
 import org.apache.cxf.frontend.ClientFactoryBean;
 import org.apache.cxf.frontend.ClientProxyFactoryBean;
 import org.apache.cxf.frontend.ServerFactoryBean;
 import org.apache.cxf.interceptor.Interceptor;
 import org.apache.cxf.interceptor.LoggingOutInterceptor;
+
+import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -49,6 +52,8 @@ public class LoggingInterceptorInMessage
     protected static final String ROUTER_ADDRESS = "http://localhost:" + port1 + "/LoggingInterceptorInMessageModeTest/router";
     protected static final String SERVICE_ADDRESS = "http://localhost:" + port2 + "/LoggingInterceptorInMessageModeTest/helloworld";
 
+    static Server server;
+    
     @Autowired
     protected CamelContext context;
     
@@ -61,8 +66,12 @@ public class LoggingInterceptorInMessage
         svrBean.setServiceClass(HelloService.class);
         svrBean.setServiceBean(new HelloServiceImpl());
     
-        svrBean.create();
-        
+        server = svrBean.create();
+    }
+    @AfterClass
+    public static void stopService() {
+        server.stop();
+        server.destroy();
     }
     
     @Test

Modified: camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerAddressOverrideTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerAddressOverrideTest.java?rev=1152167&r1=1152166&r2=1152167&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerAddressOverrideTest.java (original)
+++ camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerAddressOverrideTest.java Fri Jul 29 11:17:08 2011
@@ -18,31 +18,24 @@ package org.apache.camel.component.cxf.j
 
 import org.apache.camel.Exchange;
 import org.apache.camel.Message;
+import org.apache.camel.component.cxf.CXFTestSupport;
 import org.apache.camel.test.AvailablePortFinder;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
 public class CxfRsProducerAddressOverrideTest extends CxfRsProducerTest {
-    private static int port1 = AvailablePortFinder.getNextAvailable(); 
-    private static int port2 = AvailablePortFinder.getNextAvailable(); 
-    
-    public int getPort1() {
-        return port1;
-    }
+    private static int port2 = CXFTestSupport.getPort("CxfRsProducerAddressOverrideTest.jetty"); 
     public int getPort2() {
         return port2;
     }
-    
-    
+
     @Override
     protected AbstractXmlApplicationContext createApplicationContext() {       
-        System.setProperty("CxfRsProducerAddressOverrideTest.port1", Integer.toString(port1));
-        System.setProperty("CxfRsProducerAddressOverrideTest.port2", Integer.toString(port2));
         return new ClassPathXmlApplicationContext("org/apache/camel/component/cxf/jaxrs/CxfRsSpringProducerAddressOverride.xml");
     }
     
     protected void setupDestinationURL(Message inMessage) {
         inMessage.setHeader(Exchange.DESTINATION_OVERRIDE_URL, 
-            "http://localhost:" + port1);
+            "http://localhost:" + getPort1() + "/CxfRsProducerAddressOverrideTest");
     }
 }

Modified: camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerTest.java?rev=1152167&r1=1152166&r2=1152167&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerTest.java (original)
+++ camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerTest.java Fri Jul 29 11:17:08 2011
@@ -27,6 +27,7 @@ import org.apache.camel.Exchange;
 import org.apache.camel.ExchangePattern;
 import org.apache.camel.Message;
 import org.apache.camel.Processor;
+import org.apache.camel.component.cxf.CXFTestSupport;
 import org.apache.camel.component.cxf.common.message.CxfConstants;
 import org.apache.camel.component.cxf.jaxrs.testbean.Customer;
 import org.apache.camel.test.AvailablePortFinder;
@@ -38,8 +39,8 @@ import org.springframework.context.suppo
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
 public class CxfRsProducerTest extends CamelSpringTestSupport {
-    private static int port1 = AvailablePortFinder.getNextAvailable(); 
-    private static int port2 = AvailablePortFinder.getNextAvailable(); 
+    private static int port1 = CXFTestSupport.getPort1(); 
+    private static int port2 = CXFTestSupport.getPort("CxfRsProducerTest.jetty"); 
     
     public static class JettyProcessor implements Processor {
         public void process(Exchange exchange) throws Exception {
@@ -58,8 +59,6 @@ public class CxfRsProducerTest extends C
     
     @Override
     protected AbstractXmlApplicationContext createApplicationContext() {     
-        System.setProperty("CxfRsProducerTest.port1", Integer.toString(port1));
-        System.setProperty("CxfRsProducerTest.port2", Integer.toString(port2));
         return new ClassPathXmlApplicationContext("org/apache/camel/component/cxf/jaxrs/CxfRsSpringProducer.xml");
     }
     
@@ -155,7 +154,7 @@ public class CxfRsProducerTest extends C
     @Test
     public void testGetConstumerWithCxfRsEndpoint() {
         Exchange exchange 
-            = template.send("cxfrs://http://localhost:" + getPort1() + "?httpClientAPI=true", new Processor() {
+            = template.send("cxfrs://http://localhost:" + getPort1() + "/" + getClass().getSimpleName() + "/?httpClientAPI=true", new Processor() {
                 public void process(Exchange exchange) throws Exception {
                     exchange.setPattern(ExchangePattern.InOut);
                     Message inMessage = exchange.getIn();
@@ -181,7 +180,7 @@ public class CxfRsProducerTest extends C
     @Test
     public void testAddCustomerUniqueResponseCodeWithHttpClientAPI() {
         Exchange exchange 
-            = template.send("cxfrs://http://localhost:" + getPort1() + "?httpClientAPI=true", new Processor() {
+            = template.send("cxfrs://http://localhost:" + getPort1() + "/" + getClass().getSimpleName() + "?httpClientAPI=true", new Processor() {
                 public void process(Exchange exchange) throws Exception {
                     exchange.setPattern(ExchangePattern.InOut);
                     Message inMessage = exchange.getIn();
@@ -241,7 +240,7 @@ public class CxfRsProducerTest extends C
     @Test
     public void testAddCustomerUniqueResponseCode() {
         Exchange exchange 
-            = template.send("cxfrs://http://localhost:" + getPort1()  + "?httpClientAPI=true", new Processor() {
+            = template.send("cxfrs://http://localhost:" + getPort1() + "/" + getClass().getSimpleName() + "?httpClientAPI=true", new Processor() {
                 public void process(Exchange exchange) throws Exception {
                     exchange.setPattern(ExchangePattern.InOut);
                     Message inMessage = exchange.getIn();
@@ -270,7 +269,7 @@ public class CxfRsProducerTest extends C
     @Test
     public void testProducerWithQueryParameters() {
         // START SNIPPET: QueryExample
-        Exchange exchange = template.send("cxfrs://http://localhost:" + getPort2() + "/testQuery?httpClientAPI=true&q1=12&q2=13"
+        Exchange exchange = template.send("cxfrs://http://localhost:" + getPort2() + "/" + getClass().getSimpleName() + "/testQuery?httpClientAPI=true&q1=12&q2=13"
         // END SNIPPET: QueryExample                                   
             , new Processor() {        
                 public void process(Exchange exchange) throws Exception {
@@ -292,7 +291,7 @@ public class CxfRsProducerTest extends C
     
     @Test
     public void testProducerWithQueryParametersHeader() {
-        Exchange exchange = template.send("cxfrs://http://localhost:" + getPort2() + "/testQuery?httpClientAPI=true&q1=12&q2=13"
+        Exchange exchange = template.send("cxfrs://http://localhost:" + getPort2() + "/" + getClass().getSimpleName() + "/testQuery?httpClientAPI=true&q1=12&q2=13"
             , new Processor() {
                 public void process(Exchange exchange) throws Exception {
                     exchange.setPattern(ExchangePattern.InOut);
@@ -323,7 +322,7 @@ public class CxfRsProducerTest extends C
     @Test    
     public void testRestServerDirectlyGetCustomer() {
         // we cannot convert directly to Customer as we need camel-jaxb
-        String response = template.requestBodyAndHeader("cxfrs:http://localhost:" + getPort1() + "/customerservice/customers/123",
+        String response = template.requestBodyAndHeader("cxfrs:http://localhost:" + getPort1() + "/" + getClass().getSimpleName() + "/customerservice/customers/123",
                 null, Exchange.HTTP_METHOD, "GET", String.class);
         
         assertNotNull("The response should not be null ", response);
@@ -335,7 +334,7 @@ public class CxfRsProducerTest extends C
         input.setName("Donald Duck");
 
         // we cannot convert directly to Customer as we need camel-jaxb
-        String response = template.requestBodyAndHeader("cxfrs:http://localhost:" + getPort1() + "/customerservice/customers",
+        String response = template.requestBodyAndHeader("cxfrs:http://localhost:" + getPort1() + "/" + getClass().getSimpleName() + "/customerservice/customers",
                 input, Exchange.HTTP_METHOD, "POST", String.class);
 
         assertNotNull(response);

Modified: camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomConsumerPayloadModeTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomConsumerPayloadModeTest.java?rev=1152167&r1=1152166&r2=1152167&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomConsumerPayloadModeTest.java (original)
+++ camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomConsumerPayloadModeTest.java Fri Jul 29 11:17:08 2011
@@ -34,6 +34,7 @@ import org.apache.camel.CamelContext;
 import org.apache.camel.Exchange;
 import org.apache.camel.ExchangePattern;
 import org.apache.camel.Processor;
+import org.apache.camel.component.cxf.CXFTestSupport;
 import org.apache.camel.component.cxf.CxfPayload;
 import org.apache.cxf.binding.soap.SoapHeader;
 import org.apache.cxf.helpers.DOMUtils;
@@ -54,7 +55,8 @@ import static org.junit.Assert.assertEqu
 */
 @ContextConfiguration
 public class CxfMtomConsumerPayloadModeTest extends AbstractJUnit4SpringContextTests {
-
+    static int port = CXFTestSupport.getPort1();
+    
     @Autowired
     protected CamelContext context;
     

Modified: camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomDisabledConsumerPayloadModeTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomDisabledConsumerPayloadModeTest.java?rev=1152167&r1=1152166&r2=1152167&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomDisabledConsumerPayloadModeTest.java (original)
+++ camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomDisabledConsumerPayloadModeTest.java Fri Jul 29 11:17:08 2011
@@ -29,6 +29,7 @@ import junit.framework.Assert;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
+import org.apache.camel.component.cxf.CXFTestSupport;
 import org.apache.camel.component.cxf.CxfPayload;
 import org.apache.cxf.binding.soap.SoapHeader;
 import org.apache.cxf.helpers.DOMUtils;
@@ -44,6 +45,7 @@ import org.springframework.test.context.
 */
 @ContextConfiguration
 public class CxfMtomDisabledConsumerPayloadModeTest extends CxfMtomConsumerPayloadModeTest {
+    static int port = CXFTestSupport.getPort1();
 
     @Override
     protected String getRequestMessage() {

Modified: camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomPOJOProducerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomPOJOProducerTest.java?rev=1152167&r1=1152166&r2=1152167&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomPOJOProducerTest.java (original)
+++ camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomPOJOProducerTest.java Fri Jul 29 11:17:08 2011
@@ -30,6 +30,8 @@ import junit.framework.Assert;
 import org.apache.camel.CamelContext;
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
+import org.apache.camel.component.cxf.CXFTestSupport;
+
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -45,14 +47,15 @@ import static org.junit.Assert.assertEqu
  */
 @ContextConfiguration
 public class CxfMtomPOJOProducerTest extends AbstractJUnit4SpringContextTests {
-        
+    static int port = CXFTestSupport.getPort1();
+    
     @Autowired
     protected CamelContext context;
     private Endpoint endpoint;
 
     @Before
     public void setUp() throws Exception {
-        endpoint = Endpoint.publish("http://localhost:9092/jaxws-mtom/hello", getImpl());
+        endpoint = Endpoint.publish("http://localhost:" + port + "/CxfMtomPOJOProducerTest/jaxws-mtom/hello", getImpl());
         SOAPBinding binding = (SOAPBinding)endpoint.getBinding();
         binding.setMTOMEnabled(true);
         

Modified: camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/CxfEndpointBeanBusSettingTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/CxfEndpointBeanBusSettingTest.java?rev=1152167&r1=1152166&r2=1152167&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/CxfEndpointBeanBusSettingTest.java (original)
+++ camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/CxfEndpointBeanBusSettingTest.java Fri Jul 29 11:17:08 2011
@@ -19,6 +19,7 @@ package org.apache.camel.component.cxf.s
 import java.util.List;
 
 import org.apache.camel.CamelContext;
+import org.apache.camel.component.cxf.CXFTestSupport;
 import org.apache.camel.component.cxf.CxfEndpoint;
 import org.apache.cxf.Bus;
 import org.apache.cxf.interceptor.Interceptor;
@@ -29,6 +30,8 @@ import org.junit.Test;
 
 public class CxfEndpointBeanBusSettingTest extends AbstractSpringBeanTestSupport {
 
+    static int port1 = CXFTestSupport.getPort1();
+    
     @Override
     protected String[] getApplicationContextFiles() {
         return new String[]{"org/apache/camel/component/cxf/spring/CxfEndpointBeansBusSetting.xml"};    

Modified: camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/CxfEndpointBeanTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/CxfEndpointBeanTest.java?rev=1152167&r1=1152166&r2=1152167&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/CxfEndpointBeanTest.java (original)
+++ camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/CxfEndpointBeanTest.java Fri Jul 29 11:17:08 2011
@@ -16,18 +16,14 @@
  */
 package org.apache.camel.component.cxf.spring;
 
+import org.apache.camel.component.cxf.CXFTestSupport;
 import org.apache.camel.component.cxf.CxfEndpoint;
 import org.apache.camel.test.AvailablePortFinder;
 import org.junit.Test;
 
 public class CxfEndpointBeanTest extends AbstractSpringBeanTestSupport {
-    private static int port1 = AvailablePortFinder.getNextAvailable(); 
-    private static int port2 = AvailablePortFinder.getNextAvailable(); 
-    
-    static {
-        System.setProperty("CxfEndpointBeanTest.port1", Integer.toString(port1));
-        System.setProperty("CxfEndpointBeanTest.port2", Integer.toString(port2));
-    }
+    static int port1 = CXFTestSupport.getPort1();
+    static int port2 = CXFTestSupport.getPort2();
 
     
     protected String[] getApplicationContextFiles() {
@@ -37,7 +33,8 @@ public class CxfEndpointBeanTest extends
     @Test
     public void testCxfEndpointBeanDefinitionParser() {
         CxfEndpoint routerEndpoint = (CxfEndpoint)ctx.getBean("routerEndpoint");
-        assertEquals("Got the wrong endpoint address", "http://localhost:" + port1 + "/router", routerEndpoint.getAddress());
+        assertEquals("Got the wrong endpoint address", "http://localhost:" + port1 
+                     + "/CxfEndpointBeanTest/router", routerEndpoint.getAddress());
         assertEquals("Got the wrong endpont service class", "org.apache.camel.component.cxf.HelloService",
                          routerEndpoint.getServiceClass().getName());
         assertEquals("Got the wrong handlers size", 1, routerEndpoint.getHandlers().size());

Modified: camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/CxfEndpointBeanWithBusTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/CxfEndpointBeanWithBusTest.java?rev=1152167&r1=1152166&r2=1152167&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/CxfEndpointBeanWithBusTest.java (original)
+++ camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/CxfEndpointBeanWithBusTest.java Fri Jul 29 11:17:08 2011
@@ -17,6 +17,7 @@
 package org.apache.camel.component.cxf.spring;
 
 import org.apache.camel.CamelContext;
+import org.apache.camel.component.cxf.CXFTestSupport;
 import org.apache.camel.component.cxf.CxfEndpoint;
 import org.apache.cxf.interceptor.LoggingInInterceptor;
 import org.junit.Before;
@@ -28,11 +29,13 @@ import org.springframework.context.suppo
  *
  * @version 
  */
-public class CxfEndpointBeanWithBusTest extends CxfEndpointBeanTest {
-    
-    @Before
-    public void setUp() throws Exception {
-        ctx = new ClassPathXmlApplicationContext(new String[]{"org/apache/camel/component/cxf/spring/CxfEndpointBeansRouterWithBus.xml"});
+public class CxfEndpointBeanWithBusTest extends AbstractSpringBeanTestSupport {
+    static int port1 = CXFTestSupport.getPort1();
+    static int port2 = CXFTestSupport.getPort2();
+
+        
+    protected String[] getApplicationContextFiles() {
+        return new String[]{"org/apache/camel/component/cxf/spring/CxfEndpointBeansRouterWithBus.xml"};
     }
     
     @Test
@@ -50,7 +53,8 @@ public class CxfEndpointBeanWithBusTest 
     @Test
     public void testCxfEndpointBeanDefinitionParser() {
         CxfEndpoint routerEndpoint = (CxfEndpoint)ctx.getBean("routerEndpoint");
-        assertEquals("Got the wrong endpoint address", "http://localhost:9000/router", routerEndpoint.getAddress());
+        assertEquals("Got the wrong endpoint address", "http://localhost:" + port1 
+                     + "/CxfEndpointBeanWithBusTest/router/", routerEndpoint.getAddress());
         assertEquals("Got the wrong endpont service class", 
                      "org.apache.camel.component.cxf.HelloService",
                      routerEndpoint.getServiceClass().getName());

Modified: camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/CxfRsClientFactoryBeanTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/CxfRsClientFactoryBeanTest.java?rev=1152167&r1=1152166&r2=1152167&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/CxfRsClientFactoryBeanTest.java (original)
+++ camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/CxfRsClientFactoryBeanTest.java Fri Jul 29 11:17:08 2011
@@ -16,10 +16,12 @@
  */
 package org.apache.camel.component.cxf.spring;
 
+import org.apache.camel.component.cxf.CXFTestSupport;
 import org.apache.camel.component.cxf.jaxrs.testbean.CustomerService;
 import org.junit.Test;
 
 public class CxfRsClientFactoryBeanTest extends AbstractSpringBeanTestSupport {
+    static int port = CXFTestSupport.getPort1();
     
     @Override
     protected String[] getApplicationContextFiles() {        
@@ -29,7 +31,7 @@ public class CxfRsClientFactoryBeanTest 
     @Test
     public void testCxfRsClientFactoryBean() {
         SpringJAXRSClientFactoryBean cfb = (SpringJAXRSClientFactoryBean) ctx.getBean("rsClient1");
-        assertEquals("Get a wrong address", cfb.getAddress(), "http://localhost:9000/router");
+        assertEquals("Get a wrong address", cfb.getAddress(), "http://localhost:" + port + "/CxfRsClientFactoryBeanTest/router");
         assertEquals("Get a wrong beanId", cfb.getBeanId(), "rsClient1");
         assertEquals("Get a wrong password", cfb.getPassword(), "passwd");
         assertEquals("Get a wrong user name", cfb.getUsername(), "username");

Modified: camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/CxfRsServerFactoryBeanTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/CxfRsServerFactoryBeanTest.java?rev=1152167&r1=1152166&r2=1152167&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/CxfRsServerFactoryBeanTest.java (original)
+++ camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/CxfRsServerFactoryBeanTest.java Fri Jul 29 11:17:08 2011
@@ -18,10 +18,12 @@ package org.apache.camel.component.cxf.s
 
 import java.util.List;
 
+import org.apache.camel.component.cxf.CXFTestSupport;
 import org.apache.camel.component.cxf.jaxrs.testbean.CustomerService;
 import org.junit.Test;
 
 public class CxfRsServerFactoryBeanTest extends AbstractSpringBeanTestSupport {
+    static int port = CXFTestSupport.getPort1();
 
     @Override
     protected String[] getApplicationContextFiles() {        
@@ -31,13 +33,13 @@ public class CxfRsServerFactoryBeanTest 
     @Test
     public void testCxfRsServerFactoryBean() {
         SpringJAXRSServerFactoryBean sfb1 = (SpringJAXRSServerFactoryBean) ctx.getBean("rsServer1");
-        assertEquals("Get a wrong address", sfb1.getAddress(), "http://localhost:9000/server1");        
+        assertEquals("Get a wrong address", sfb1.getAddress(), "http://localhost:" + port + "/CxfRsServerFactoryBeanTest/server1");        
         List<Class<?>> resource1Classes = sfb1.getResourceClasses();
         assertEquals("Get a wrong size of resouceClasses", resource1Classes.size(), 1);
         assertEquals("Get a wrong resource class", resource1Classes.get(0), CustomerService.class);
         
         SpringJAXRSServerFactoryBean sfb2 = (SpringJAXRSServerFactoryBean) ctx.getBean("rsServer2");
-        assertEquals("Get a wrong address", sfb2.getAddress(), "http://localhost:9000/server2");
+        assertEquals("Get a wrong address", sfb2.getAddress(), "http://localhost:" + port + "/CxfRsServerFactoryBeanTest/server2");
         sfb2.getResourceClasses();
         List<Class<?>> resource2Classes = sfb2.getResourceClasses();
         assertEquals("Get a wrong size of resouceClasses", resource2Classes.size(), 1);

Modified: camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/FileToCxfMessageDataFormatTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/FileToCxfMessageDataFormatTest.java?rev=1152167&r1=1152166&r2=1152167&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/FileToCxfMessageDataFormatTest.java (original)
+++ camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/FileToCxfMessageDataFormatTest.java Fri Jul 29 11:17:08 2011
@@ -17,6 +17,7 @@
 package org.apache.camel.component.cxf.spring;
 
 import org.apache.camel.Exchange;
+import org.apache.camel.component.cxf.CXFTestSupport;
 import org.apache.camel.component.cxf.HelloService;
 import org.apache.camel.component.cxf.HelloServiceImpl;
 import org.apache.camel.component.mock.MockEndpoint;
@@ -32,7 +33,7 @@ import org.springframework.context.suppo
  * @version 
  */
 public class FileToCxfMessageDataFormatTest extends CamelSpringTestSupport {
-    private static int port1 = AvailablePortFinder.getNextAvailable(); 
+    private static int port1 = CXFTestSupport.getPort1(); 
 
     private Server server;
 
@@ -43,7 +44,7 @@ public class FileToCxfMessageDataFormatT
         // set CXF
         ServerFactoryBean factory = new ServerFactoryBean();
 
-        factory.setAddress("http://localhost:" + port1 + "/router");
+        factory.setAddress("http://localhost:" + port1 + "/FileToCxfMessageDataFormatTest/router");
         factory.setServiceClass(HelloService.class);
         factory.setServiceBean(new HelloServiceImpl());
 
@@ -63,7 +64,6 @@ public class FileToCxfMessageDataFormatT
 
     @Override
     protected AbstractApplicationContext createApplicationContext() {
-        System.setProperty("FileToCxfMessageDataFormatTest.port1", Integer.toString(port1));
         return new ClassPathXmlApplicationContext("org/apache/camel/component/cxf/spring/FileToCxfMessageDataFormatTest.xml");
     }
 

Modified: camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/wsa/WSAddressingTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/wsa/WSAddressingTest.java?rev=1152167&r1=1152166&r2=1152167&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/wsa/WSAddressingTest.java (original)
+++ camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/wsa/WSAddressingTest.java Fri Jul 29 11:17:08 2011
@@ -22,6 +22,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.component.cxf.CXFTestSupport;
 import org.apache.camel.test.AvailablePortFinder;
 import org.apache.cxf.bus.spring.SpringBusFactory;
 import org.apache.cxf.common.classloader.ClassLoaderUtils;
@@ -46,14 +47,9 @@ import static org.junit.Assert.assertEqu
  */
 @ContextConfiguration
 public class WSAddressingTest extends AbstractJUnit4SpringContextTests {
-    protected static int port0 = AvailablePortFinder.getNextAvailable(); 
-    protected static int port1 = AvailablePortFinder.getNextAvailable(); 
-    protected static int port2 = AvailablePortFinder.getNextAvailable(); 
-    static {
-        System.setProperty("WSAddressingTest.port0", Integer.toString(port0));
-        System.setProperty("WSAddressingTest.port1", Integer.toString(port1));
-        System.setProperty("WSAddressingTest.port2", Integer.toString(port2));        
-    }
+    protected static int port0 = CXFTestSupport.getPort1(); 
+    protected static int port1 = CXFTestSupport.getPort2(); 
+    protected static int port2 = CXFTestSupport.getPort3(); 
     
     
     @Autowired
@@ -67,7 +63,7 @@ public class WSAddressingTest extends Ab
         
         template = context.createProducerTemplate();
         JaxWsServerFactoryBean svrBean = new JaxWsServerFactoryBean();
-        svrBean.setAddress("http://localhost:" + port1 + "/SoapContext/SoapPort");
+        svrBean.setAddress("http://localhost:" + port1 + "/WSAddressingTest/SoapContext/SoapPort");
         svrBean.setServiceClass(Greeter.class);
         svrBean.setServiceBean(new GreeterImpl());
         SpringBusFactory bf = new SpringBusFactory();
@@ -92,7 +88,7 @@ public class WSAddressingTest extends Ab
     public void testWSAddressing() throws Exception {
         JaxWsProxyFactoryBean proxyFactory = new  JaxWsProxyFactoryBean();
         ClientFactoryBean clientBean = proxyFactory.getClientFactoryBean();
-        clientBean.setAddress("http://localhost:" + port0 + "/SoapContext/SoapPort");
+        clientBean.setAddress("http://localhost:" + port0 + "/WSAddressingTest/SoapContext/SoapPort");
         clientBean.setServiceClass(Greeter.class);
         SpringBusFactory bf = new SpringBusFactory();
         URL cxfConfig = null;

Modified: camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/GreeterConverterEndpointsRouterContext.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/GreeterConverterEndpointsRouterContext.xml?rev=1152167&r1=1152166&r2=1152167&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/GreeterConverterEndpointsRouterContext.xml (original)
+++ camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/GreeterConverterEndpointsRouterContext.xml Fri Jul 29 11:17:08 2011
@@ -30,7 +30,7 @@
    <!-- Added the import for testing the CAMEL-329 -->
 
 
-   <cxf:cxfEndpoint id="routerEndpoint" address="http://localhost:${CXFTestSupport.port2}/CamelContext/RouterPort/CxfGreeterConverterRouterTest"
+   <cxf:cxfEndpoint id="routerEndpoint" address="http://localhost:${CXFTestSupport.port2}/CxfGreeterConverterRouterTest/CamelContext/RouterPort"
     		serviceClass="org.apache.hello_world_soap_http.Greeter" 
     		endpointName="s:SoapPort"
     		serviceName="s:SOAPService"
@@ -41,7 +41,7 @@
     	    
    </cxf:cxfEndpoint>
 
-   <cxf:cxfEndpoint id="serviceEndpoint" address="http://localhost:${CXFTestSupport.port1}/SoapContext/SoapPort/CxfGreeterConverterRouterTest"
+   <cxf:cxfEndpoint id="serviceEndpoint" address="http://localhost:${CXFTestSupport.port1}/CxfGreeterConverterRouterTest/SoapContext/SoapPort"
     		wsdlURL="testutils/hello_world.wsdl"
     		serviceClass="org.apache.hello_world_soap_http.Greeter"
     		endpointName="s:SoapPort"

Modified: camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/GreeterEndpointBeans.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/GreeterEndpointBeans.xml?rev=1152167&r1=1152166&r2=1152167&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/GreeterEndpointBeans.xml (original)
+++ camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/GreeterEndpointBeans.xml Fri Jul 29 11:17:08 2011
@@ -31,10 +31,10 @@
    <!-- Added the import for testing the CAMEL-329 -->
 
 
-   <cxf:cxfEndpoint id="routerEndpoint" address="http://localhost:${CXFTestSupport.port2}/CamelContext/RouterPort/CxfGreeterMessageRouterTest"
+   <cxf:cxfEndpoint id="routerEndpoint" address="http://localhost:${CXFTestSupport.port2}/CxfGreeterMessageRouterTest/CamelContext/RouterPort"
     		serviceClass="org.apache.hello_world_soap_http.GreeterImpl"/>
 
-   <cxf:cxfEndpoint id="serviceEndpoint" address="http://localhost:${CXFTestSupport.port1}/SoapContext/SoapPort/CxfGreeterMessageRouterTest"
+   <cxf:cxfEndpoint id="serviceEndpoint" address="http://localhost:${CXFTestSupport.port1}/CxfGreeterMessageRouterTest/SoapContext/SoapPort"
     		wsdlURL="testutils/hello_world.wsdl"
     		serviceClass="org.apache.hello_world_soap_http.Greeter"
     		endpointName="s:SoapPort"

Modified: camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/GreeterEndpointPayloadBeans.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/GreeterEndpointPayloadBeans.xml?rev=1152167&r1=1152166&r2=1152167&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/GreeterEndpointPayloadBeans.xml (original)
+++ camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/GreeterEndpointPayloadBeans.xml Fri Jul 29 11:17:08 2011
@@ -31,10 +31,10 @@
    <!-- Added the import for testing the CAMEL-329 -->
 
 
-   <cxf:cxfEndpoint id="routerEndpoint" address="http://localhost:${CXFTestSupport.port2}/CamelContext/RouterPort/CxfGreeterPayLoadRouterTest"
+   <cxf:cxfEndpoint id="routerEndpoint" address="http://localhost:${CXFTestSupport.port2}/CxfGreeterPayLoadRouterTest/CamelContext/RouterPort"
     		serviceClass="org.apache.hello_world_soap_http.GreeterImpl"/>
 
-   <cxf:cxfEndpoint id="serviceEndpoint" address="http://localhost:${CXFTestSupport.port1}/SoapContext/SoapPort/CxfGreeterPayLoadRouterTest"
+   <cxf:cxfEndpoint id="serviceEndpoint" address="http://localhost:${CXFTestSupport.port1}/CxfGreeterPayLoadRouterTest/SoapContext/SoapPort"
     		wsdlURL="testutils/hello_world.wsdl"
     		serviceClass="org.apache.hello_world_soap_http.Greeter"
     		endpointName="s:SoapPort"

Modified: camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/GreeterEndpointWithFeatureBeans.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/GreeterEndpointWithFeatureBeans.xml?rev=1152167&r1=1152166&r2=1152167&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/GreeterEndpointWithFeatureBeans.xml (original)
+++ camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/GreeterEndpointWithFeatureBeans.xml Fri Jul 29 11:17:08 2011
@@ -30,11 +30,11 @@
    <import resource="classpath:META-INF/cxf/cxf.xml"/>
    <!-- Added the import for testing the CAMEL-329 -->
 
-   <cxf:cxfEndpoint id="routerEndpoint" address="http://localhost:${CXFTestSupport.port2}/CamelContext/RouterPort/CxfGreeterPayLoadWithFeatureRouterTest"
+   <cxf:cxfEndpoint id="routerEndpoint" address="http://localhost:${CXFTestSupport.port2}/CxfGreeterPayLoadWithFeatureRouterTest/CamelContext/RouterPort"
     		serviceClass="org.apache.hello_world_soap_http.GreeterImpl"/>
  
 
-   <cxf:cxfEndpoint id="serviceEndpoint" address="http://localhost:${CXFTestSupport.port1}/SoapContext/SoapPort/CxfGreeterPayLoadWithFeatureRouterTest"
+   <cxf:cxfEndpoint id="serviceEndpoint" address="http://localhost:${CXFTestSupport.port1}/CxfGreeterPayLoadWithFeatureRouterTest/SoapContext/SoapPort"
     		wsdlURL="testutils/hello_world.wsdl"
     		serviceClass="org.apache.hello_world_soap_http.Greeter"
     		endpointName="s:SoapPort"

Modified: camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/GreeterEndpointsRouterContext.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/GreeterEndpointsRouterContext.xml?rev=1152167&r1=1152166&r2=1152167&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/GreeterEndpointsRouterContext.xml (original)
+++ camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/GreeterEndpointsRouterContext.xml Fri Jul 29 11:17:08 2011
@@ -30,7 +30,7 @@
    <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
 
    <!-- START SNIPPET: example -->
-   <cxf:cxfEndpoint id="routerEndpoint" address="http://localhost:${CXFTestSupport.port2}/CamelContext/RouterPort/CXFGreeterRouterTest"
+   <cxf:cxfEndpoint id="routerEndpoint" address="http://localhost:${CXFTestSupport.port2}/CXFGreeterRouterTest/CamelContext/RouterPort"
     		serviceClass="org.apache.hello_world_soap_http.GreeterImpl">
         <cxf:outInterceptors>
             <!-- This interceptor will force the CXF server send the XML start document to client -->
@@ -43,7 +43,7 @@
    </cxf:cxfEndpoint>
    <!-- END SNIPPET: example --> 		
 
-   <cxf:cxfEndpoint id="serviceEndpoint" address="http://localhost:${CXFTestSupport.port1}/SoapContext/SoapPort/CXFGreeterRouterTest"
+   <cxf:cxfEndpoint id="serviceEndpoint" address="http://localhost:${CXFTestSupport.port1}/CXFGreeterRouterTest/SoapContext/SoapPort"
     		wsdlURL="testutils/hello_world.wsdl"
     		serviceClass="org.apache.hello_world_soap_http.Greeter"
     		endpointName="s:SoapPort"

Modified: camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/ServiceClassRefTest-context.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/ServiceClassRefTest-context.xml?rev=1152167&r1=1152166&r2=1152167&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/ServiceClassRefTest-context.xml (original)
+++ camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/ServiceClassRefTest-context.xml Fri Jul 29 11:17:08 2011
@@ -25,17 +25,17 @@
 
 	<bean id="myServiceClass" class="org.apache.camel.component.cxf.HelloServiceImpl" />
 	
-	<cxf:cxfEndpoint id="fromEndpointWithProps" address="http://localhost:${CXFTestSupport.port4}/helloworld"
+	<cxf:cxfEndpoint id="fromEndpointWithProps" address="http://localhost:${CXFTestSupport.port4}/ServiceClassRefTest/helloworld"
 		serviceClass="#myServiceClass">
 		<cxf:properties>
 			<entry key="dataFormat" value="PAYLOAD" />
 		</cxf:properties>
 	</cxf:cxfEndpoint>
 	
-	<cxf:cxfEndpoint id="fromEndpoint" address="http://localhost:${CXFTestSupport.port3}/helloworld"
+	<cxf:cxfEndpoint id="fromEndpoint" address="http://localhost:${CXFTestSupport.port3}/ServiceClassRefTest/helloworld"
 		serviceClass="#myServiceClass" />
 
-	<cxf:cxfEndpoint id="toEndpoint" address="http://localhost:${CXFTestSupport.port2}/helloworld"
+	<cxf:cxfEndpoint id="toEndpoint" address="http://localhost:${CXFTestSupport.port2}/ServiceClassRefTest/helloworld"
 		serviceClass="org.apache.camel.component.cxf.HelloService" />
 		
 	<camelContext id="camelContext" xmlns="http://camel.apache.org/schema/spring">

Modified: camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/jaxrs/CxfRsSpringProducer.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/jaxrs/CxfRsSpringProducer.xml?rev=1152167&r1=1152166&r2=1152167&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/jaxrs/CxfRsSpringProducer.xml (original)
+++ camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/jaxrs/CxfRsSpringProducer.xml Fri Jul 29 11:17:08 2011
@@ -28,7 +28,7 @@
   <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
 
   <jaxrs:server id="restService"
-		        address="http://localhost:${CxfRsProducerTest.port1}" 
+		        address="http://localhost:${CXFTestSupport.port1}/CxfRsProducerTest/" 
 		        staticSubresourceResolution="true">
     <jaxrs:serviceBeans>
       <ref bean="customerService"/>
@@ -37,13 +37,13 @@
   
   <bean id="customerService" class="org.apache.camel.component.cxf.jaxrs.testbean.CustomerService" />
 
-  <cxf:rsClient id="rsClientProxy" address="http://localhost:${CxfRsProducerTest.port1}"
+  <cxf:rsClient id="rsClientProxy" address="http://localhost:${CXFTestSupport.port1}/CxfRsProducerTest/"
     serviceClass="org.apache.camel.component.cxf.jaxrs.testbean.CustomerService"/>
    
-  <cxf:rsClient id="rsClientHttp" address="http://localhost:${CxfRsProducerTest.port1}"/>
+  <cxf:rsClient id="rsClientHttp" address="http://localhost:${CXFTestSupport.port1}/CxfRsProducerTest/"/>
 
   <camelContext id="camel" xmlns="http://camel.apache.org/schema/spring">
-    <endpoint id="fromEndpoint" uri="jetty://http://localhost:${CxfRsProducerTest.port2}/testQuery"/>
+    <endpoint id="fromEndpoint" uri="jetty://http://localhost:${CxfRsProducerTest.jetty}/CxfRsProducerTest/testQuery"/>
     <route>
        <from uri="direct://proxy"/>
        <to uri="cxfrs://bean://rsClientProxy"/>

Modified: camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/jaxrs/CxfRsSpringProducerAddressOverride.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/jaxrs/CxfRsSpringProducerAddressOverride.xml?rev=1152167&r1=1152166&r2=1152167&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/jaxrs/CxfRsSpringProducerAddressOverride.xml (original)
+++ camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/jaxrs/CxfRsSpringProducerAddressOverride.xml Fri Jul 29 11:17:08 2011
@@ -28,7 +28,7 @@
   <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
 
   <jaxrs:server id="restService"
-		        address="http://localhost:${CxfRsProducerAddressOverrideTest.port1}" 
+		        address="http://localhost:${CXFTestSupport.port1}/CxfRsProducerAddressOverrideTest/" 
 		        staticSubresourceResolution="true">
     <jaxrs:serviceBeans>
       <ref bean="customerService"/>
@@ -43,7 +43,7 @@
   <cxf:rsClient id="rsClientHttp" address="http://badAddress"/>
 
   <camelContext id="camel" xmlns="http://camel.apache.org/schema/spring">
-    <endpoint id="fromEndpoint" uri="jetty://http://localhost:${CxfRsProducerAddressOverrideTest.port2}/testQuery"/>
+    <endpoint id="fromEndpoint" uri="jetty://http://localhost:${CxfRsProducerAddressOverrideTest.jetty}/CxfRsProducerAddressOverrideTest/testQuery"/>
     <route>
        <from uri="direct://proxy"/>
        <to uri="cxfrs://bean://rsClientProxy"/>

Modified: camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/mtom/CxfMtomConsumerPayloadModeTest-context.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/mtom/CxfMtomConsumerPayloadModeTest-context.xml?rev=1152167&r1=1152166&r2=1152167&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/mtom/CxfMtomConsumerPayloadModeTest-context.xml (original)
+++ camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/mtom/CxfMtomConsumerPayloadModeTest-context.xml Fri Jul 29 11:17:08 2011
@@ -25,7 +25,9 @@
        http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
     ">
 
-   <cxf:cxfEndpoint id="consumerEndpoint" address="http://localhost:9091/jaxws-mtom/hello"
+    <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+
+   <cxf:cxfEndpoint id="consumerEndpoint" address="http://localhost:${CXFTestSupport.port1}/CxfMtomConsumerPayloadModeTest/jaxws-mtom/hello"
             wsdlURL="mtom.wsdl"
             serviceName="ns:HelloService"
             endpointName="ns:HelloPort"

Modified: camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/mtom/CxfMtomDisabledConsumerPayloadModeTest-context.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/mtom/CxfMtomDisabledConsumerPayloadModeTest-context.xml?rev=1152167&r1=1152166&r2=1152167&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/mtom/CxfMtomDisabledConsumerPayloadModeTest-context.xml (original)
+++ camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/mtom/CxfMtomDisabledConsumerPayloadModeTest-context.xml Fri Jul 29 11:17:08 2011
@@ -25,7 +25,9 @@
        http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
     ">
 
-   <cxf:cxfEndpoint id="consumerEndpoint" address="http://localhost:9091/jaxws-mtom/hello"
+    <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+
+   <cxf:cxfEndpoint id="consumerEndpoint" address="http://localhost:${CXFTestSupport.port1}/CxfMtomDisabledConsumerPayloadModeTest/jaxws-mtom/hello"
             wsdlURL="mtom.wsdl"
             serviceName="ns:HelloService"
             endpointName="ns:HelloPort"

Modified: camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/mtom/CxfMtomPOJOProducerTest-context.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/mtom/CxfMtomPOJOProducerTest-context.xml?rev=1152167&r1=1152166&r2=1152167&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/mtom/CxfMtomPOJOProducerTest-context.xml (original)
+++ camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/mtom/CxfMtomPOJOProducerTest-context.xml Fri Jul 29 11:17:08 2011
@@ -14,11 +14,12 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 --><beans xmlns="http://www.springframework.org/schema/beans" xmlns:cxf="http://camel.apache.org/schema/cxf" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd        http://camel.apache.org/schema/cxf http://camel.apache.org/schema/cxf/camel-cxf.xsd        http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd     ">
+       <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
 
    <cxf:cxfEndpoint xmlns:ns="http://apache.org/camel/cxf/mtom_feature"
      id="serviceEndpoint"
      serviceClass="org.apache.camel.cxf.mtom_feature.Hello"  
-     address="http://localhost:9092/jaxws-mtom/hello" 
+     address="http://localhost:${CXFTestSupport.port1}/CxfMtomPOJOProducerTest/jaxws-mtom/hello" 
      endpointName="ns:HelloPort" 
      serviceName="ns:HelloService"
      wsdlURL="mtom.wsdl">

Modified: camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/spring/CxfEndpointBeans.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/spring/CxfEndpointBeans.xml?rev=1152167&r1=1152166&r2=1152167&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/spring/CxfEndpointBeans.xml (original)
+++ camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/spring/CxfEndpointBeans.xml Fri Jul 29 11:17:08 2011
@@ -28,7 +28,7 @@
 
   <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
 
-  <cxf:cxfEndpoint id="routerEndpoint" address="http://localhost:${CxfEndpointBeanTest.port1}/router"
+  <cxf:cxfEndpoint id="routerEndpoint" address="http://localhost:${CXFTestSupport.port1}/CxfEndpointBeanTest/router"
     serviceClass="org.apache.camel.component.cxf.HelloService">
     <cxf:schemaLocations>
     	<cxf:schemaLocation>classpath:wsdl/Message.xsd</cxf:schemaLocation>
@@ -37,7 +37,7 @@
   </cxf:cxfEndpoint>
 
 
-  <cxf:cxfEndpoint id="serviceEndpoint" address="http://localhost:${CxfEndpointBeanTest.port2}/helloworld"
+  <cxf:cxfEndpoint id="serviceEndpoint" address="http://localhost:${CXFTestSupport.port2}/CxfEndpointBeanTest/helloworld"
     serviceClass="org.apache.camel.component.cxf.HelloService"/>
 
 </beans>

Modified: camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/spring/CxfEndpointBeansBusSetting.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/spring/CxfEndpointBeansBusSetting.xml?rev=1152167&r1=1152166&r2=1152167&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/spring/CxfEndpointBeansBusSetting.xml (original)
+++ camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/spring/CxfEndpointBeansBusSetting.xml Fri Jul 29 11:17:08 2011
@@ -27,6 +27,7 @@
        http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
        http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd
     ">
+    <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
 
     <bean id="cxf1" class="org.apache.cxf.bus.extension.ExtensionManagerBus"/>
     <bean id="cxf2" class="org.apache.cxf.bus.extension.ExtensionManagerBus"/>
@@ -45,11 +46,11 @@
     </cxfcore:bus>
    
   
-  <cxf:cxfEndpoint id="routerEndpoint" address="http://localhost:9000/router"
+  <cxf:cxfEndpoint id="routerEndpoint" address="http://localhost:${CXFTestSupport.port1}/CxfEndpointBeanBusSettingTest/router"
     serviceClass="org.apache.camel.component.cxf.HelloService" bus="cxf1"/>
 
 
-  <cxf:cxfEndpoint id="serviceEndpoint" address="http://localhost:9002/helloworld"
+  <cxf:cxfEndpoint id="serviceEndpoint" address="http://localhost:${CXFTestSupport.port1}/CxfEndpointBeanBusSettingTest/helloworld"
     serviceClass="org.apache.camel.component.cxf.HelloService" bus="cxf2"/>
     
   <camelContext id="camel" xmlns="http://camel.apache.org/schema/spring">

Modified: camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/spring/CxfEndpointBeansRouterWithBus.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/spring/CxfEndpointBeansRouterWithBus.xml?rev=1152167&r1=1152166&r2=1152167&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/spring/CxfEndpointBeansRouterWithBus.xml (original)
+++ camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/spring/CxfEndpointBeansRouterWithBus.xml Fri Jul 29 11:17:08 2011
@@ -29,9 +29,6 @@
     ">
     
   <import resource="classpath:META-INF/cxf/cxf.xml" />  
-  <import resource="classpath:META-INF/cxf/cxf-extension-soap.xml" />
-  <import resource="classpath:META-INF/cxf/cxf-extension-http.xml" />
-  <import resource="classpath:META-INF/cxf/cxf-extension-http-jetty.xml" />
   
   <!-- configure the bus -->
   <cxfcore:bus>
@@ -39,12 +36,13 @@
       <cxfcore:logging/>
     </cxfcore:features>
   </cxfcore:bus> 
+  <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
 
-  <cxf:cxfEndpoint id="routerEndpoint" address="http://localhost:9000/router"
+  <cxf:cxfEndpoint id="routerEndpoint" address="http://localhost:${CXFTestSupport.port1}/CxfEndpointBeanWithBusTest/router/"
     serviceClass="org.apache.camel.component.cxf.HelloService"/>
 
 
-  <cxf:cxfEndpoint id="serviceEndpoint" address="http://localhost:9002/helloworld"
+  <cxf:cxfEndpoint id="serviceEndpoint" address="http://localhost:${CXFTestSupport.port2}/CxfEndpointBeanWithBusTest/helloworld"
     serviceClass="org.apache.camel.component.cxf.HelloService"/>
 
   <!-- Setting the http conduit policy -->

Modified: camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/spring/CxfRsClientFactoryBeans.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/spring/CxfRsClientFactoryBeans.xml?rev=1152167&r1=1152166&r2=1152167&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/spring/CxfRsClientFactoryBeans.xml (original)
+++ camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/spring/CxfRsClientFactoryBeans.xml Fri Jul 29 11:17:08 2011
@@ -23,8 +23,9 @@
        http://camel.apache.org/schema/cxf http://camel.apache.org/schema/cxf/camel-cxf.xsd
     ">
 
+    <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
 
-  <cxf:rsClient id="rsClient1" address="http://localhost:9000/router"
+  <cxf:rsClient id="rsClient1" address="http://localhost:${CXFTestSupport.port1}/CxfRsClientFactoryBeanTest/router"
     serviceClass="org.apache.camel.component.cxf.jaxrs.testbean.CustomerService"
     username="username" password="passwd" >
     <cxf:schemaLocations>

Modified: camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/spring/CxfRsServerFactoryBeans.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/spring/CxfRsServerFactoryBeans.xml?rev=1152167&r1=1152166&r2=1152167&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/spring/CxfRsServerFactoryBeans.xml (original)
+++ camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/spring/CxfRsServerFactoryBeans.xml Fri Jul 29 11:17:08 2011
@@ -23,14 +23,15 @@
        http://camel.apache.org/schema/cxf http://camel.apache.org/schema/cxf/camel-cxf.xsd
     ">
 
+    <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
 
-  <cxf:rsServer id="rsServer1" address="http://localhost:9000/server1">
+  <cxf:rsServer id="rsServer1" address="http://localhost:${CXFTestSupport.port1}/CxfRsServerFactoryBeanTest/server1">
      <cxf:serviceBeans>
        <ref bean="customerService"/>
      </cxf:serviceBeans>
   </cxf:rsServer>
     
-  <cxf:rsServer id="rsServer2" address="http://localhost:9000/server2"
+  <cxf:rsServer id="rsServer2" address="http://localhost:${CXFTestSupport.port1}/CxfRsServerFactoryBeanTest/server2"
     serviceClass="org.apache.camel.component.cxf.jaxrs.testbean.CustomerService">
     <cxf:schemaLocations>
     	 <cxf:schemaLocation>classpath:wsdl/Message.xsd</cxf:schemaLocation>

Modified: camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/spring/FileToCxfMessageDataFormatTest.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/spring/FileToCxfMessageDataFormatTest.xml?rev=1152167&r1=1152166&r2=1152167&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/spring/FileToCxfMessageDataFormatTest.xml (original)
+++ camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/spring/FileToCxfMessageDataFormatTest.xml Fri Jul 29 11:17:08 2011
@@ -26,7 +26,7 @@
     <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
 
     <cxf:cxfEndpoint id="routerEndpoint"
-                     address="http://localhost:${FileToCxfMessageDataFormatTest.port1}/router"
+                     address="http://localhost:${CXFTestSupport.port1}/FileToCxfMessageDataFormatTest/router"
                      serviceClass="org.apache.camel.component.cxf.HelloService">
         <!-- use MESSAGE data format -->
         <cxf:properties>

Modified: camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/wsa/WSAddressingTest-context.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/wsa/WSAddressingTest-context.xml?rev=1152167&r1=1152166&r2=1152167&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/wsa/WSAddressingTest-context.xml (original)
+++ camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/wsa/WSAddressingTest-context.xml Fri Jul 29 11:17:08 2011
@@ -26,7 +26,7 @@
      <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
   
 	<cxf:cxfEndpoint id="routerEndpoint"
-		address="http://localhost:${WSAddressingTest.port0}/SoapContext/SoapPort" endpointName="tns:SoapPort"
+		address="http://localhost:${CXFTestSupport.port1}/WSAddressingTest/SoapContext/SoapPort" endpointName="tns:SoapPort"
 		serviceName="tns:SOAPService" wsdlURL="/wsdl/hello_world.wsdl"
 		serviceClass="org.apache.hello_world_soap_http.Greeter"
 		xmlns:tns="http://apache.org/hello_world_soap_http">
@@ -41,7 +41,7 @@
 		</cxf:features>
 	</cxf:cxfEndpoint>
 	<cxf:cxfEndpoint id="serviceEndpoint"
-		address="http://localhost:${WSAddressingTest.port1}/SoapContext/SoapPort" endpointName="tns:SoapPort"
+		address="http://localhost:${CXFTestSupport.port2}/WSAddressingTest/SoapContext/SoapPort" endpointName="tns:SoapPort"
 		serviceName="tns:SOAPService" wsdlURL="/wsdl/hello_world.wsdl"
 		serviceClass="org.apache.hello_world_soap_http.Greeter"		
 		xmlns:tns="http://apache.org/hello_world_soap_http">

Modified: camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/wsa/client.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/wsa/client.xml?rev=1152167&r1=1152166&r2=1152167&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/wsa/client.xml (original)
+++ camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/wsa/client.xml Fri Jul 29 11:17:08 2011
@@ -31,7 +31,7 @@
    <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
   
     <http:conduit name="{http://apache.org/hello_world_soap_http}SoapPort.http-conduit">
-      <http:client DecoupledEndpoint="http://localhost:${WSAddressingTest.port2}/decoupled_endpoint"/>
+      <http:client DecoupledEndpoint="http://localhost:${CXFTestSupport.port3}/decoupled_endpoint"/>
     </http:conduit>
 
     <cxf:bus>



Mime
View raw message