cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lmo...@apache.org
Subject svn commit: r979862 [14/19] - in /cxf/sandbox/oauth_1.0a: ./ api/ api/src/main/java/org/apache/cxf/ api/src/main/java/org/apache/cxf/endpoint/ api/src/main/java/org/apache/cxf/phase/ api/src/main/java/org/apache/cxf/ws/addressing/ api/src/main/java/org...
Date Tue, 27 Jul 2010 20:47:12 GMT
Modified: cxf/sandbox/oauth_1.0a/systests/transports/src/test/java/org/apache/cxf/systest/http/PublishedEndpointUrlTest.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/oauth_1.0a/systests/transports/src/test/java/org/apache/cxf/systest/http/PublishedEndpointUrlTest.java?rev=979862&r1=979861&r2=979862&view=diff
==============================================================================
--- cxf/sandbox/oauth_1.0a/systests/transports/src/test/java/org/apache/cxf/systest/http/PublishedEndpointUrlTest.java (original)
+++ cxf/sandbox/oauth_1.0a/systests/transports/src/test/java/org/apache/cxf/systest/http/PublishedEndpointUrlTest.java Tue Jul 27 20:46:55 2010
@@ -35,12 +35,14 @@ import junit.framework.Assert;
 import org.apache.cxf.endpoint.Server;
 import org.apache.cxf.helpers.CastUtils;
 import org.apache.cxf.jaxws.JaxWsServerFactoryBean;
+import org.apache.cxf.testutil.common.TestUtil;
 import org.apache.hello_world_soap_http.Greeter;
 import org.junit.Test;
 
 
 public class PublishedEndpointUrlTest extends Assert {
-    
+    public static final String PORT = TestUtil.getPortNumber(PublishedEndpointUrlTest.class);
+
     @Test
     public void testPublishedEndpointUrl() throws Exception {
         
@@ -49,7 +51,7 @@ public class PublishedEndpointUrlTest ex
         
         JaxWsServerFactoryBean svrFactory = new JaxWsServerFactoryBean();
         svrFactory.setServiceClass(Greeter.class);
-        svrFactory.setAddress("http://localhost:9000/publishedEndpointUrl");
+        svrFactory.setAddress("http://localhost:" + PORT + "/publishedEndpointUrl");
         svrFactory.setPublishedEndpointUrl(publishedEndpointUrl);
         svrFactory.setServiceBean(implementor);
         

Modified: cxf/sandbox/oauth_1.0a/systests/transports/src/test/java/org/apache/cxf/systest/http/Server.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/oauth_1.0a/systests/transports/src/test/java/org/apache/cxf/systest/http/Server.java?rev=979862&r1=979861&r2=979862&view=diff
==============================================================================
--- cxf/sandbox/oauth_1.0a/systests/transports/src/test/java/org/apache/cxf/systest/http/Server.java (original)
+++ cxf/sandbox/oauth_1.0a/systests/transports/src/test/java/org/apache/cxf/systest/http/Server.java Tue Jul 27 20:46:55 2010
@@ -28,6 +28,7 @@ import org.apache.cxf.jaxws.EndpointImpl
 import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
 
 public class Server extends AbstractBusTestServerBase {
+    public static final String PORT = allocatePort(Server.class);
 
     private String name;
     private String address;

Modified: cxf/sandbox/oauth_1.0a/systests/transports/src/test/java/org/apache/cxf/systest/http/SessionServer.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/oauth_1.0a/systests/transports/src/test/java/org/apache/cxf/systest/http/SessionServer.java?rev=979862&r1=979861&r2=979862&view=diff
==============================================================================
--- cxf/sandbox/oauth_1.0a/systests/transports/src/test/java/org/apache/cxf/systest/http/SessionServer.java (original)
+++ cxf/sandbox/oauth_1.0a/systests/transports/src/test/java/org/apache/cxf/systest/http/SessionServer.java Tue Jul 27 20:46:55 2010
@@ -28,6 +28,7 @@ import org.apache.cxf.bus.spring.SpringB
 import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
 
 public class SessionServer extends AbstractBusTestServerBase {
+    public static final String PORT = allocatePort(SessionServer.class);
 
     @Override
     protected void run() {
@@ -43,7 +44,7 @@ public class SessionServer extends Abstr
         Bus bus = new SpringBusFactory().createBus(configure, true);
         SpringBusFactory.setDefaultBus(bus);
         implementor = new GreeterSessionImpl();
-        address = "http://localhost:9020/SoapContext/GreeterPort";
+        address = "http://localhost:" + PORT + "/SoapContext/GreeterPort";
         Endpoint.publish(address, implementor);
         
     }

Modified: cxf/sandbox/oauth_1.0a/systests/transports/src/test/java/org/apache/cxf/systest/http/WSDLAddressRewriteTest.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/oauth_1.0a/systests/transports/src/test/java/org/apache/cxf/systest/http/WSDLAddressRewriteTest.java?rev=979862&r1=979861&r2=979862&view=diff
==============================================================================
--- cxf/sandbox/oauth_1.0a/systests/transports/src/test/java/org/apache/cxf/systest/http/WSDLAddressRewriteTest.java (original)
+++ cxf/sandbox/oauth_1.0a/systests/transports/src/test/java/org/apache/cxf/systest/http/WSDLAddressRewriteTest.java Tue Jul 27 20:46:55 2010
@@ -34,7 +34,7 @@ import org.apache.cxf.testutil.common.Ab
 import org.junit.Test;
 
 public class WSDLAddressRewriteTest extends AbstractBusClientServerTestBase {
-
+    public static final String PORT = allocatePort(WSDLAddressRewriteTest.class);
     @Test
     public void testWithSameAddress() throws Exception {
         Endpoint endpoint = null;
@@ -84,7 +84,7 @@ public class WSDLAddressRewriteTest exte
     }
 
     private String getSoapAddressLine(String address) throws Exception {
-        Socket s = new Socket(address, 9020);
+        Socket s = new Socket(address, Integer.parseInt(PORT));
         OutputStream os = s.getOutputStream();
         os.write("GET /SoapContext/GreeterPort?wsdl HTTP/1.1\r\n".getBytes());
         os.write(("Host:" + address + "\r\n\r\n").getBytes());
@@ -105,7 +105,7 @@ public class WSDLAddressRewriteTest exte
     }
 
     private Endpoint publishEndpoint(boolean autoRewriteSoapAddress) {
-        Endpoint endpoint = Endpoint.publish("http://localhost:9020/SoapContext/GreeterPort",
+        Endpoint endpoint = Endpoint.publish("http://localhost:" + PORT + "/SoapContext/GreeterPort",
                                              new GreeterImpl());
         EndpointInfo ei = ((EndpointImpl)endpoint).getServer().getEndpoint().getEndpointInfo();
         ei.setProperty("autoRewriteSoapAddress", autoRewriteSoapAddress);

Modified: cxf/sandbox/oauth_1.0a/systests/transports/src/test/java/org/apache/cxf/systest/http/WSDLQueryTest.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/oauth_1.0a/systests/transports/src/test/java/org/apache/cxf/systest/http/WSDLQueryTest.java?rev=979862&r1=979861&r2=979862&view=diff
==============================================================================
--- cxf/sandbox/oauth_1.0a/systests/transports/src/test/java/org/apache/cxf/systest/http/WSDLQueryTest.java (original)
+++ cxf/sandbox/oauth_1.0a/systests/transports/src/test/java/org/apache/cxf/systest/http/WSDLQueryTest.java Tue Jul 27 20:46:55 2010
@@ -30,6 +30,7 @@ import org.junit.BeforeClass;
 import org.junit.Test;
 
 public class WSDLQueryTest extends AbstractBusClientServerTestBase {
+    public static final String PORT = BareServer.PORT;
     @BeforeClass
     public static void startServers() throws Exception {
         assertTrue("server did not launch correctly",
@@ -43,7 +44,7 @@ public class WSDLQueryTest extends Abstr
 
     @Test
     public void testCorrectHostHeader() throws Exception {
-        sendQuery("localhost:9020", "HTTP/1.1 200 OK");
+        sendQuery("localhost:" + PORT, "HTTP/1.1 200 OK");
     }
 
     @Test
@@ -53,7 +54,7 @@ public class WSDLQueryTest extends Abstr
 
     @Test
     public void testBogusHostHeader() throws Exception {
-        sendQuery("foobar:9020", "HTTP/1.1 200 OK");
+        sendQuery("foobar:" + PORT, "HTTP/1.1 200 OK");
     }
 
     @Test
@@ -68,7 +69,7 @@ public class WSDLQueryTest extends Abstr
 
     private void sendQuery(String hostHeader, String expectedResponseLine)
         throws Exception {
-        Socket s = new Socket("localhost", 9020);
+        Socket s = new Socket("localhost", Integer.parseInt(PORT));
         OutputStream os = s.getOutputStream();
         os.write("GET /SoapContext/GreeterPort?wsdl HTTP/1.1\r\n".getBytes());
         os.write(("Host:" + hostHeader + "\r\n\r\n").getBytes());

Modified: cxf/sandbox/oauth_1.0a/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Abost.cxf
URL: http://svn.apache.org/viewvc/cxf/sandbox/oauth_1.0a/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Abost.cxf?rev=979862&r1=979861&r2=979862&view=diff
==============================================================================
--- cxf/sandbox/oauth_1.0a/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Abost.cxf (original)
+++ cxf/sandbox/oauth_1.0a/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Abost.cxf Tue Jul 27 20:46:55 2010
@@ -38,9 +38,10 @@
               http://cxf.apache.org/schemas/configuration/http-jetty.xsd
            http://www.springframework.org/schema/beans
               http://www.springframework.org/schema/beans/spring-beans.xsd">
+  <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
 
   <http:destination name="{http://apache.org/hello_world}Abost.http-destination">
-    <http:server RedirectURL="http://localhost:9006/Hurlon"/>
+    <http:server RedirectURL="http://localhost:${testutil.ports.BusServer.6}/Hurlon"/>
   </http:destination>
 
 </beans>

Modified: cxf/sandbox/oauth_1.0a/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Bethal.cxf
URL: http://svn.apache.org/viewvc/cxf/sandbox/oauth_1.0a/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Bethal.cxf?rev=979862&r1=979861&r2=979862&view=diff
==============================================================================
--- cxf/sandbox/oauth_1.0a/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Bethal.cxf (original)
+++ cxf/sandbox/oauth_1.0a/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Bethal.cxf Tue Jul 27 20:46:55 2010
@@ -39,13 +39,14 @@
               http://cxf.apache.org/schemas/configuration/http-jetty.xsd
            http://www.springframework.org/schema/beans
               http://www.springframework.org/schema/beans/spring-beans.xsd">
+  <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
 
   <http:destination 
     name="{http://apache.org/hello_world}Bethal.http-destination">
   </http:destination>
   
   <httpj:engine-factory bus="cxf">
-	 <httpj:engine port="9002">
+	 <httpj:engine port="${testutil.ports.BusServer.2}">
 	     <httpj:tlsServerParameters>
 	      <sec:keyManagers keyPassword="password">
 	           <sec:keyStore type="JKS" password="password" 

Modified: cxf/sandbox/oauth_1.0a/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/BethalClientBeans.xml
URL: http://svn.apache.org/viewvc/cxf/sandbox/oauth_1.0a/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/BethalClientBeans.xml?rev=979862&r1=979861&r2=979862&view=diff
==============================================================================
--- cxf/sandbox/oauth_1.0a/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/BethalClientBeans.xml (original)
+++ cxf/sandbox/oauth_1.0a/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/BethalClientBeans.xml Tue Jul 27 20:46:55 2010
@@ -33,6 +33,7 @@
            http://www.springframework.org/schema/beans
               http://www.springframework.org/schema/beans/spring-beans.xsd
            http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd">
+   <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
  
 
 	<import resource="classpath:org/apache/cxf/systest/http/resources/BethalClientConfig.cxf" />
@@ -42,6 +43,6 @@
     serviceName="s:SOAPService"
     endpointName="s:Bethal"
     xmlns:s="http://apache.org/hello_world"
-    address="https://localhost:9002/Bethal"/>
+    address="https://localhost:${testutil.ports.BusServer.2}/Bethal"/>
    
 </beans>

Modified: cxf/sandbox/oauth_1.0a/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/BethalClientConfig.cxf
URL: http://svn.apache.org/viewvc/cxf/sandbox/oauth_1.0a/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/BethalClientConfig.cxf?rev=979862&r1=979861&r2=979862&view=diff
==============================================================================
--- cxf/sandbox/oauth_1.0a/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/BethalClientConfig.cxf (original)
+++ cxf/sandbox/oauth_1.0a/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/BethalClientConfig.cxf Tue Jul 27 20:46:55 2010
@@ -32,6 +32,7 @@
               http://cxf.apache.org/schemas/configuration/http-jetty.xsd
            http://www.springframework.org/schema/beans
               http://www.springframework.org/schema/beans/spring-beans.xsd">
+   <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
  
    <http:conduit name="{http://apache.org/hello_world}Bethal.http-conduit">
 

Modified: cxf/sandbox/oauth_1.0a/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Gordy.cxf
URL: http://svn.apache.org/viewvc/cxf/sandbox/oauth_1.0a/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Gordy.cxf?rev=979862&r1=979861&r2=979862&view=diff
==============================================================================
--- cxf/sandbox/oauth_1.0a/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Gordy.cxf (original)
+++ cxf/sandbox/oauth_1.0a/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Gordy.cxf Tue Jul 27 20:46:55 2010
@@ -39,14 +39,15 @@
               http://cxf.apache.org/schemas/configuration/http-jetty.xsd
            http://www.springframework.org/schema/beans
               http://www.springframework.org/schema/beans/spring-beans.xsd">
+  <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
 
   <http:destination 
          name="{http://apache.org/hello_world}Gordy.http-destination">
-    <http:server RedirectURL="https://localhost:9002/Bethal"/>
+    <http:server RedirectURL="https://localhost:${testutil.ports.BusServer.2}/Bethal"/>
   </http:destination>
   
   <httpj:engine-factory bus="cxf">
-	 <httpj:engine port="9001">
+	 <httpj:engine port="${testutil.ports.BusServer.1}">
 	     <httpj:tlsServerParameters>
 	      <sec:keyManagers keyPassword="password">
 	           <sec:keyStore type="JKS" password="password" 

Modified: cxf/sandbox/oauth_1.0a/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Http2HttpLoopRedirectFail.cxf
URL: http://svn.apache.org/viewvc/cxf/sandbox/oauth_1.0a/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Http2HttpLoopRedirectFail.cxf?rev=979862&r1=979861&r2=979862&view=diff
==============================================================================
--- cxf/sandbox/oauth_1.0a/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Http2HttpLoopRedirectFail.cxf (original)
+++ cxf/sandbox/oauth_1.0a/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Http2HttpLoopRedirectFail.cxf Tue Jul 27 20:46:55 2010
@@ -32,6 +32,7 @@
               http://cxf.apache.org/schemas/configuration/http-jetty.xsd
            http://www.springframework.org/schema/beans
               http://www.springframework.org/schema/beans/spring-beans.xsd">
+   <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
  
    <http:conduit name="{http://apache.org/hello_world}Hurlon.http-conduit">
 

Modified: cxf/sandbox/oauth_1.0a/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Hurlon.cxf
URL: http://svn.apache.org/viewvc/cxf/sandbox/oauth_1.0a/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Hurlon.cxf?rev=979862&r1=979861&r2=979862&view=diff
==============================================================================
--- cxf/sandbox/oauth_1.0a/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Hurlon.cxf (original)
+++ cxf/sandbox/oauth_1.0a/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Hurlon.cxf Tue Jul 27 20:46:55 2010
@@ -39,9 +39,10 @@
               http://cxf.apache.org/schemas/configuration/http-jetty.xsd
            http://www.springframework.org/schema/beans
               http://www.springframework.org/schema/beans/spring-beans.xsd">
+  <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
 
   <http:destination name="{http://apache.org/hello_world}Hurlon.http-destination">
-    <http:server RedirectURL="http://localhost:9007/Abost"/>
+    <http:server RedirectURL="http://localhost:${testutil.ports.BusServer.7}/Abost"/>
   </http:destination>
   
 </beans>

Modified: cxf/sandbox/oauth_1.0a/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Morpit.cxf
URL: http://svn.apache.org/viewvc/cxf/sandbox/oauth_1.0a/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Morpit.cxf?rev=979862&r1=979861&r2=979862&view=diff
==============================================================================
--- cxf/sandbox/oauth_1.0a/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Morpit.cxf (original)
+++ cxf/sandbox/oauth_1.0a/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Morpit.cxf Tue Jul 27 20:46:55 2010
@@ -39,12 +39,13 @@
               http://cxf.apache.org/schemas/configuration/http-jetty.xsd
            http://www.springframework.org/schema/beans
               http://www.springframework.org/schema/beans/spring-beans.xsd">
+  <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
 
   <http:destination name="{http://apache.org/hello_world}GreeterImplPort.http-destination">
   </http:destination>
   
   <httpj:engine-factory bus="cxf">
-	 <httpj:engine port="9008">
+	 <httpj:engine port="${testutil.ports.BusServer.8}">
 	     <httpj:tlsServerParameters>
 	      <sec:keyManagers keyPassword="password">
 	           <sec:keyStore type="JKS" password="password" 

Modified: cxf/sandbox/oauth_1.0a/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Poltim.cxf
URL: http://svn.apache.org/viewvc/cxf/sandbox/oauth_1.0a/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Poltim.cxf?rev=979862&r1=979861&r2=979862&view=diff
==============================================================================
--- cxf/sandbox/oauth_1.0a/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Poltim.cxf (original)
+++ cxf/sandbox/oauth_1.0a/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Poltim.cxf Tue Jul 27 20:46:55 2010
@@ -40,13 +40,14 @@
            http://www.springframework.org/schema/beans
               http://www.springframework.org/schema/beans/spring-beans.xsd">
 
+  <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
 
   <http:destination name="{http://apache.org/hello_world}Poltim.http-destination">
-    <http:server RedirectURL="http://localhost:9000/Mortimer"/>
+    <http:server RedirectURL="http://localhost:${testutil.ports.BusServer.0}/Mortimer"/>
   </http:destination>
   
   <httpj:engine-factory bus="cxf">
-	 <httpj:engine port="9005">
+	 <httpj:engine port="${testutil.ports.BusServer.5}">
 	     <httpj:tlsServerParameters>
 	      <sec:keyManagers keyPassword="password">
 	           <sec:keyStore type="JKS" password="password" 

Modified: cxf/sandbox/oauth_1.0a/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Rethwel.cxf
URL: http://svn.apache.org/viewvc/cxf/sandbox/oauth_1.0a/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Rethwel.cxf?rev=979862&r1=979861&r2=979862&view=diff
==============================================================================
--- cxf/sandbox/oauth_1.0a/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Rethwel.cxf (original)
+++ cxf/sandbox/oauth_1.0a/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Rethwel.cxf Tue Jul 27 20:46:55 2010
@@ -39,10 +39,11 @@
               http://cxf.apache.org/schemas/configuration/http-jetty.xsd
            http://www.springframework.org/schema/beans
               http://www.springframework.org/schema/beans/spring-beans.xsd">
+  <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
 
   <http:destination name="{http://apache.org/hello_world}Rethwel.http-destination">
 
-    <http:server RedirectURL="http://localhost:9000/Mortimer"/>
+    <http:server RedirectURL="http://localhost:${testutil.ports.BusServer.0}/Mortimer"/>
   </http:destination>
   
 </beans>

Modified: cxf/sandbox/oauth_1.0a/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/SessionServer.xml
URL: http://svn.apache.org/viewvc/cxf/sandbox/oauth_1.0a/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/SessionServer.xml?rev=979862&r1=979861&r2=979862&view=diff
==============================================================================
--- cxf/sandbox/oauth_1.0a/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/SessionServer.xml (original)
+++ cxf/sandbox/oauth_1.0a/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/SessionServer.xml Tue Jul 27 20:46:55 2010
@@ -32,9 +32,10 @@
               http://cxf.apache.org/schemas/configuration/http-jetty.xsd
            http://www.springframework.org/schema/beans
               http://www.springframework.org/schema/beans/spring-beans.xsd">
+  <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
               
   <httpj:engine-factory bus="cxf">
-	 <httpj:engine port="9020">
+	 <httpj:engine port="${testutil.ports.SessionServer}">
 	     <httpj:sessionSupport>true</httpj:sessionSupport>	    
 	  </httpj:engine>
    </httpj:engine-factory>  

Modified: cxf/sandbox/oauth_1.0a/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/SessionServer_Windows.xml
URL: http://svn.apache.org/viewvc/cxf/sandbox/oauth_1.0a/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/SessionServer_Windows.xml?rev=979862&r1=979861&r2=979862&view=diff
==============================================================================
--- cxf/sandbox/oauth_1.0a/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/SessionServer_Windows.xml (original)
+++ cxf/sandbox/oauth_1.0a/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/SessionServer_Windows.xml Tue Jul 27 20:46:55 2010
@@ -32,9 +32,10 @@
               http://cxf.apache.org/schemas/configuration/http-jetty.xsd
            http://www.springframework.org/schema/beans
               http://www.springframework.org/schema/beans/spring-beans.xsd">
+  <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
               
   <httpj:engine-factory bus="cxf">
-	 <httpj:engine port="9020">
+	 <httpj:engine port="${testutil.ports.SessionServer}">
 	     <httpj:sessionSupport>true</httpj:sessionSupport>
 	     <!-- If the reuseAddress is true and running in a Windows box, 
 	     Jetty will not throw the java.net.BindException even the port is already used  -->

Modified: cxf/sandbox/oauth_1.0a/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Tarpin.cxf
URL: http://svn.apache.org/viewvc/cxf/sandbox/oauth_1.0a/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Tarpin.cxf?rev=979862&r1=979861&r2=979862&view=diff
==============================================================================
--- cxf/sandbox/oauth_1.0a/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Tarpin.cxf (original)
+++ cxf/sandbox/oauth_1.0a/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Tarpin.cxf Tue Jul 27 20:46:55 2010
@@ -40,13 +40,14 @@
            http://www.springframework.org/schema/beans
               http://www.springframework.org/schema/beans/spring-beans.xsd">
 
+  <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
 
   <http:destination name="{http://apache.org/hello_world}Tarpin.http-destination">
-    <http:server RedirectURL="https://localhost:9001/Gordy"/>
+    <http:server RedirectURL="https://localhost:${testutil.ports.BusServer.1}/Gordy"/>
   </http:destination>
   
   <httpj:engine-factory bus="cxf">
-	 <httpj:engine port="9003">
+	 <httpj:engine port="${testutil.ports.BusServer.3}">
 	     <httpj:tlsServerParameters>
 	      <sec:keyManagers keyPassword="password">
 	           <sec:keyStore type="JKS" password="password" 

Modified: cxf/sandbox/oauth_1.0a/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/jaxws-publish.xml
URL: http://svn.apache.org/viewvc/cxf/sandbox/oauth_1.0a/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/jaxws-publish.xml?rev=979862&r1=979861&r2=979862&view=diff
==============================================================================
--- cxf/sandbox/oauth_1.0a/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/jaxws-publish.xml (original)
+++ cxf/sandbox/oauth_1.0a/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/jaxws-publish.xml Tue Jul 27 20:46:55 2010
@@ -30,6 +30,7 @@ under the License.
         http://cxf.apache.org/transports/http-jetty/configuration   http://cxf.apache.org/schemas/configuration/http-jetty.xsd
         http://cxf.apache.org/configuration/security                http://cxf.apache.org/schemas/configuration/security.xsd
         ">
+    <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
 
     <!-- -->
     <!-- This Spring config file is designed to represent a minimal -->
@@ -48,7 +49,7 @@ under the License.
     <jaxws:endpoint 
         id="JaxwsHttpsEndpoint"
         implementor="org.apache.cxf.systest.http.GreeterImpl"
-        address="https://localhost:9001/SoapContext/HttpsPort"
+        address="https://localhost:${testutil.ports.BusServer.1}/SoapContext/HttpsPort"
         serviceName="s:SOAPService"
         endpointName="e:HttpsPort"
         xmlns:e="http://apache.org/hello_world/services"
@@ -59,7 +60,7 @@ under the License.
     <!-- TLS Port configuration parameters for port 9001 -->
     <!-- -->
     <httpj:engine-factory id="port-9001-tls-config">
-        <httpj:engine port="9001">
+        <httpj:engine port="${testutil.ports.BusServer.1}">
             <httpj:tlsServerParameters>
                <sec:keyManagers keyPassword="password">
                <sec:keyStore type="JKS" password="password" 

Modified: cxf/sandbox/oauth_1.0a/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/jaxws-server-constraints.xml
URL: http://svn.apache.org/viewvc/cxf/sandbox/oauth_1.0a/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/jaxws-server-constraints.xml?rev=979862&r1=979861&r2=979862&view=diff
==============================================================================
--- cxf/sandbox/oauth_1.0a/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/jaxws-server-constraints.xml (original)
+++ cxf/sandbox/oauth_1.0a/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/jaxws-server-constraints.xml Tue Jul 27 20:46:55 2010
@@ -30,6 +30,7 @@ under the License.
         http://cxf.apache.org/transports/http-jetty/configuration   http://cxf.apache.org/schemas/configuration/http-jetty.xsd
         http://cxf.apache.org/configuration/security                http://cxf.apache.org/schemas/configuration/security.xsd
         ">
+    <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
 
     <!-- -->
     <!-- This Spring config file is designed to represent a minimal -->
@@ -46,114 +47,114 @@ under the License.
     <!-- Spring-load an HTTPS servant -->
     <!-- -->
     <jaxws:server 
-        id="JaxwsHttpsEndpoint9006"        
-        address="https://localhost:9006/SoapContext/HttpsPort"
+        id="JaxwsHttpsEndpoint-testutil-ports-BusServer-0"        
+        address="https://localhost:${testutil.ports.BusServer.0}/SoapContext/HttpsPort"
         serviceName="s:SOAPService"
         endpointName="e:HttpsPort"
         xmlns:e="http://apache.org/hello_world/services"
         xmlns:s="http://apache.org/hello_world/services"
-        depends-on="port-9006-tls-config">
+        depends-on="port-testutil.ports.BusServer.0-tls-config">
         <jaxws:serviceBean>
            <bean class="org.apache.cxf.systest.http.GreeterImpl"/>
         </jaxws:serviceBean>
     </jaxws:server>  
     
     <jaxws:server 
-        id="JaxwsHttpsEndpoint9007"        
-        address="https://localhost:9007/SoapContext/HttpsPort"
+        id="JaxwsHttpsEndpoint-testutil-ports-BusServer-1"        
+        address="https://localhost:${testutil.ports.BusServer.1}/SoapContext/HttpsPort"
         serviceName="s:SOAPService"
         endpointName="e:HttpsPort"
         xmlns:e="http://apache.org/hello_world/services"
         xmlns:s="http://apache.org/hello_world/services"
-        depends-on="port-9007-tls-config">
+        depends-on="port-testutil.ports.BusServer.1-tls-config">
         <jaxws:serviceBean>
            <bean class="org.apache.cxf.systest.http.GreeterImpl"/>
         </jaxws:serviceBean>
     </jaxws:server> 
     
     <jaxws:server 
-        id="JaxwsHttpsEndpoint9008"        
-        address="https://localhost:9008/SoapContext/HttpsPort"
+        id="JaxwsHttpsEndpoint-testutil-ports-BusServer-2"        
+        address="https://localhost:${testutil.ports.BusServer.2}/SoapContext/HttpsPort"
         serviceName="s:SOAPService"
         endpointName="e:HttpsPort"
         xmlns:e="http://apache.org/hello_world/services"
         xmlns:s="http://apache.org/hello_world/services"
-        depends-on="port-9008-tls-config">
+        depends-on="port-testutil.ports.BusServer.2-tls-config">
         <jaxws:serviceBean>
            <bean class="org.apache.cxf.systest.http.GreeterImpl"/>
         </jaxws:serviceBean>
     </jaxws:server>   
     
     <jaxws:server 
-        id="JaxwsHttpsEndpoint9009"        
-        address="https://localhost:9009/SoapContext/HttpsPort"
+        id="JaxwsHttpsEndpoint-testutil-ports-BusServer-3"        
+        address="https://localhost:${testutil.ports.BusServer.3}/SoapContext/HttpsPort"
         serviceName="s:SOAPService"
         endpointName="e:HttpsPort"
         xmlns:e="http://apache.org/hello_world/services"
         xmlns:s="http://apache.org/hello_world/services"
-        depends-on="port-9009-tls-config">
+        depends-on="port-testutil.ports.BusServer.3-tls-config">
         <jaxws:serviceBean>
            <bean class="org.apache.cxf.systest.http.GreeterImpl"/>
         </jaxws:serviceBean>
     </jaxws:server>   
     
     <jaxws:server 
-        id="JaxwsHttpsEndpoint9010"        
-        address="https://localhost:9010/SoapContext/HttpsPort"
+        id="JaxwsHttpsEndpoint-testutil-ports-BusServer-4"        
+        address="https://localhost:${testutil.ports.BusServer.4}/SoapContext/HttpsPort"
         serviceName="s:SOAPService"
         endpointName="e:HttpsPort"
         xmlns:e="http://apache.org/hello_world/services"
         xmlns:s="http://apache.org/hello_world/services"
-        depends-on="port-9010-tls-config">
+        depends-on="port-testutil.ports.BusServer.4-tls-config">
         <jaxws:serviceBean>
            <bean class="org.apache.cxf.systest.http.GreeterImpl"/>
         </jaxws:serviceBean>
     </jaxws:server>   
     
     <jaxws:server 
-        id="JaxwsHttpsEndpoint9011"        
-        address="https://localhost:9011/SoapContext/HttpsPort"
+        id="JaxwsHttpsEndpoint-testutil-ports-BusServer-5"        
+        address="https://localhost:${testutil.ports.BusServer.5}/SoapContext/HttpsPort"
         serviceName="s:SOAPService"
         endpointName="e:HttpsPort"
         xmlns:e="http://apache.org/hello_world/services"
         xmlns:s="http://apache.org/hello_world/services"
-        depends-on="port-9011-tls-config">
+        depends-on="port-testutil.ports.BusServer.5-tls-config">
         <jaxws:serviceBean>
            <bean class="org.apache.cxf.systest.http.GreeterImpl"/>
         </jaxws:serviceBean>
     </jaxws:server>    
     
     <jaxws:server 
-        id="JaxwsHttpsEndpoint9012"        
-        address="https://localhost:9012/SoapContext/HttpsPort"
+        id="JaxwsHttpsEndpoint-testutil-ports-BusServer-6"        
+        address="https://localhost:${testutil.ports.BusServer.6}/SoapContext/HttpsPort"
         serviceName="s:SOAPService"
         endpointName="e:HttpsPort"
         xmlns:e="http://apache.org/hello_world/services"
         xmlns:s="http://apache.org/hello_world/services"
-        depends-on="port-9012-tls-config">
+        depends-on="port-testutil.ports.BusServer.6-tls-config">
         <jaxws:serviceBean>
            <bean class="org.apache.cxf.systest.http.GreeterImpl"/>
         </jaxws:serviceBean>
     </jaxws:server> 
     
     <jaxws:server 
-        id="JaxwsHttpsEndpoint9013"        
-        address="https://localhost:9013/SoapContext/HttpsPort"
+        id="JaxwsHttpsEndpoint-testutil-ports-BusServer-7"        
+        address="https://localhost:${testutil.ports.BusServer.7}/SoapContext/HttpsPort"
         serviceName="s:SOAPService"
         endpointName="e:HttpsPort"
         xmlns:e="http://apache.org/hello_world/services"
         xmlns:s="http://apache.org/hello_world/services"
-        depends-on="port-9013-tls-config">
+        depends-on="port-testutil.ports.BusServer.7-tls-config">
         <jaxws:serviceBean>
            <bean class="org.apache.cxf.systest.http.GreeterImpl"/>
         </jaxws:serviceBean>
     </jaxws:server>      
     
     <!-- -->
-    <!-- TLS Port configuration parameters for port 9006 -->
+    <!-- TLS Port configuration parameters for port 9000 -->
     <!-- -->
-    <httpj:engine-factory id="port-9006-tls-config">
-        <httpj:engine port="9006">
+    <httpj:engine-factory id="port-testutil.ports.BusServer.0-tls-config">
+        <httpj:engine port="${testutil.ports.BusServer.0}">
             <httpj:tlsServerParameters>
                 <sec:keyManagers keyPassword="password">
 	            <sec:keyStore type="JKS" password="password" 
@@ -176,8 +177,8 @@ under the License.
     <!-- -->
     <!-- TLS Port configuration parameters for port 9007 -->
     <!-- -->
-    <httpj:engine-factory id="port-9007-tls-config">
-        <httpj:engine port="9007">
+    <httpj:engine-factory id="port-testutil.ports.BusServer.1-tls-config">
+        <httpj:engine port="${testutil.ports.BusServer.1}">
             <httpj:tlsServerParameters>
                 <sec:keyManagers keyPassword="password">
 	            <sec:keyStore type="JKS" password="password" 
@@ -199,8 +200,8 @@ under the License.
     <!-- -->
     <!-- TLS Port configuration parameters for port 9008 -->
     <!-- -->
-    <httpj:engine-factory id="port-9008-tls-config">
-        <httpj:engine port="9008">
+    <httpj:engine-factory id="port-testutil.ports.BusServer.2-tls-config">
+        <httpj:engine port="${testutil.ports.BusServer.2}">
             <httpj:tlsServerParameters>
                 <sec:keyManagers keyPassword="password">
 	            <sec:keyStore type="JKS" password="password" 
@@ -223,8 +224,8 @@ under the License.
     <!-- -->
     <!-- TLS Port configuration parameters for port 9009 -->
     <!-- -->
-    <httpj:engine-factory id="port-9009-tls-config">
-        <httpj:engine port="9009">
+    <httpj:engine-factory id="port-testutil.ports.BusServer.3-tls-config">
+        <httpj:engine port="${testutil.ports.BusServer.3}">
             <httpj:tlsServerParameters>
                 <sec:keyManagers keyPassword="password">
 	            <sec:keyStore type="JKS" password="password" 
@@ -247,8 +248,8 @@ under the License.
     <!-- -->
     <!-- TLS Port configuration parameters for port 9010 -->
     <!-- -->
-    <httpj:engine-factory id="port-9010-tls-config">
-        <httpj:engine port="9010">
+    <httpj:engine-factory id="port-testutil.ports.BusServer.4-tls-config">
+        <httpj:engine port="${testutil.ports.BusServer.4}">
             <httpj:tlsServerParameters>
                 <sec:keyManagers keyPassword="password">
 	            <sec:keyStore type="JKS" password="password" 
@@ -272,8 +273,8 @@ under the License.
     <!-- -->
     <!-- TLS Port configuration parameters for port 9011 -->
     <!-- -->
-    <httpj:engine-factory id="port-9011-tls-config">
-        <httpj:engine port="9011">
+    <httpj:engine-factory id="port-testutil.ports.BusServer.5-tls-config">
+        <httpj:engine port="${testutil.ports.BusServer.5}">
             <httpj:tlsServerParameters>
                 <sec:keyManagers keyPassword="password">
 	            <sec:keyStore type="JKS" password="password" 
@@ -296,8 +297,8 @@ under the License.
     <!-- -->
     <!-- TLS Port configuration parameters for port 9012 -->
     <!-- -->
-    <httpj:engine-factory id="port-9012-tls-config">
-        <httpj:engine port="9012">
+    <httpj:engine-factory id="port-testutil.ports.BusServer.6-tls-config">
+        <httpj:engine port="${testutil.ports.BusServer.6}">
             <httpj:tlsServerParameters>
                 <sec:keyManagers keyPassword="password">
 	            <sec:keyStore type="JKS" password="password" 
@@ -315,8 +316,8 @@ under the License.
     <!-- -->
     <!-- TLS Port configuration parameters for port 9013 -->
     <!-- -->
-    <httpj:engine-factory id="port-9013-tls-config">
-        <httpj:engine port="9013">
+    <httpj:engine-factory id="port-testutil.ports.BusServer.7-tls-config">
+        <httpj:engine port="${testutil.ports.BusServer.7}">
             <httpj:tlsServerParameters>
                 <sec:keyManagers keyPassword="password">
 	            <sec:keyStore type="JKS" password="password" 

Modified: cxf/sandbox/oauth_1.0a/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/jaxws-server.xml
URL: http://svn.apache.org/viewvc/cxf/sandbox/oauth_1.0a/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/jaxws-server.xml?rev=979862&r1=979861&r2=979862&view=diff
==============================================================================
--- cxf/sandbox/oauth_1.0a/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/jaxws-server.xml (original)
+++ cxf/sandbox/oauth_1.0a/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/jaxws-server.xml Tue Jul 27 20:46:55 2010
@@ -30,6 +30,7 @@ under the License.
         http://cxf.apache.org/transports/http-jetty/configuration   http://cxf.apache.org/schemas/configuration/http-jetty.xsd
         http://cxf.apache.org/configuration/security                http://cxf.apache.org/schemas/configuration/security.xsd
         ">
+    <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
 
     <!-- -->
     <!-- This Spring config file is designed to represent a minimal -->
@@ -47,7 +48,7 @@ under the License.
     <!-- -->
     <jaxws:server 
         id="JaxwsHttpsEndpoint"        
-        address="https://localhost:9002/SoapContext/HttpsPort"
+        address="https://localhost:${testutil.ports.BusServer.2}/SoapContext/HttpsPort"
         serviceName="s:SOAPService"
         endpointName="e:HttpsPort"
         xmlns:e="http://apache.org/hello_world/services"
@@ -61,7 +62,7 @@ under the License.
     <!--  Non http endpoint -->
     <jaxws:server 
         id="JaxwsHttpEndpoint"        
-        address="http://localhost:9003/SoapContext/HttpPort"
+        address="http://localhost:${testutil.ports.BusServer.3}/SoapContext/HttpPort"
         serviceName="s:SOAPService"
         endpointName="e:HttpsPort"
         xmlns:e="http://apache.org/hello_world/services"
@@ -75,7 +76,7 @@ under the License.
     <!-- TLS Port configuration parameters for port 9002 -->
     <!-- -->
     <httpj:engine-factory id="port-9002-tls-config">
-        <httpj:engine port="9002">
+        <httpj:engine port="${testutil.ports.BusServer.2}">
             <httpj:tlsServerParameters>
                <sec:keyManagers keyPassword="password">
 	           <sec:keyStore type="JKS" password="password" 

Modified: cxf/sandbox/oauth_1.0a/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/pkcs12.xml
URL: http://svn.apache.org/viewvc/cxf/sandbox/oauth_1.0a/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/pkcs12.xml?rev=979862&r1=979861&r2=979862&view=diff
==============================================================================
--- cxf/sandbox/oauth_1.0a/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/pkcs12.xml (original)
+++ cxf/sandbox/oauth_1.0a/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/pkcs12.xml Tue Jul 27 20:46:55 2010
@@ -30,6 +30,7 @@ under the License.
         http://cxf.apache.org/transports/http-jetty/configuration   http://cxf.apache.org/schemas/configuration/http-jetty.xsd
         http://cxf.apache.org/configuration/security                http://cxf.apache.org/schemas/configuration/security.xsd
         ">
+  <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
 
     <!-- -->
     <!-- This Spring config file is designed to represent a minimal -->
@@ -49,7 +50,7 @@ under the License.
     <!-- -->
     <jaxws:server 
         id="JaxwsHttpsEndpoint"        
-        address="https://localhost:9006/SoapContext/HttpsPort"
+        address="https://localhost:${testutil.ports.BusServer.6}/SoapContext/HttpsPort"
         serviceName="s:SOAPService"
         endpointName="e:HttpsPort"
         xmlns:e="http://apache.org/hello_world/services"
@@ -64,7 +65,7 @@ under the License.
     <!-- TLS Port configuration parameters for port 9006 -->
     <!-- -->
     <httpj:engine-factory id="port-9006-tls-config">
-        <httpj:engine port="9006">
+        <httpj:engine port="${testutil.ports.BusServer.6}">
             <httpj:tlsServerParameters>
                 <sec:keyManagers keyPassword="password">
                     <sec:keyStore type="pkcs12" password="password" 

Modified: cxf/sandbox/oauth_1.0a/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/resource-key-spec-url.xml
URL: http://svn.apache.org/viewvc/cxf/sandbox/oauth_1.0a/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/resource-key-spec-url.xml?rev=979862&r1=979861&r2=979862&view=diff
==============================================================================
--- cxf/sandbox/oauth_1.0a/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/resource-key-spec-url.xml (original)
+++ cxf/sandbox/oauth_1.0a/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/resource-key-spec-url.xml Tue Jul 27 20:46:55 2010
@@ -30,6 +30,7 @@ under the License.
         http://cxf.apache.org/transports/http-jetty/configuration   http://cxf.apache.org/schemas/configuration/http-jetty.xsd
         http://cxf.apache.org/configuration/security                http://cxf.apache.org/schemas/configuration/security.xsd
         ">
+  <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
 
     <!-- -->
     <!-- This Spring config file is designed to represent a minimal -->
@@ -48,7 +49,7 @@ under the License.
     <jaxws:endpoint 
         id="JaxwsHttpsEndpoint"
         implementor="org.apache.cxf.systest.http.GreeterImpl"
-        address="https://localhost:9005/SoapContext/HttpsPort"
+        address="https://localhost:${testutil.ports.BusServer.5}/SoapContext/HttpsPort"
         serviceName="s:SOAPService"
         endpointName="e:HttpsPort"
         xmlns:e="http://apache.org/hello_world/services"
@@ -61,7 +62,7 @@ under the License.
     <!-- This test exercises the resource attribute in a keyStore element -->
     <!-- -->
     <httpj:engine-factory id="port-9005-tls-config">
-        <httpj:engine port="9005">
+        <httpj:engine port="${testutil.ports.BusServer.5}">
             <httpj:tlsServerParameters>
                <sec:keyManagers keyPassword="password">
                <sec:keyStore type="JKS" password="password" 
@@ -80,7 +81,7 @@ under the License.
     <!-- -->
     <!-- This test exercises the resource attribute in a keyStore and certStore element -->
     <!-- -->
-    <http:conduit name="https://localhost:9005/SoapContext/HttpsPort">
+    <http:conduit name="https://localhost:.*/SoapContext/HttpsPort">
         <http:tlsClientParameters disableCNCheck="true">
             <sec:keyManagers keyPassword="password">
                <sec:keyStore type="pkcs12" password="password" 

Modified: cxf/sandbox/oauth_1.0a/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/resource-key-spec.xml
URL: http://svn.apache.org/viewvc/cxf/sandbox/oauth_1.0a/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/resource-key-spec.xml?rev=979862&r1=979861&r2=979862&view=diff
==============================================================================
--- cxf/sandbox/oauth_1.0a/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/resource-key-spec.xml (original)
+++ cxf/sandbox/oauth_1.0a/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/resource-key-spec.xml Tue Jul 27 20:46:55 2010
@@ -30,6 +30,7 @@ under the License.
         http://cxf.apache.org/transports/http-jetty/configuration   http://cxf.apache.org/schemas/configuration/http-jetty.xsd
         http://cxf.apache.org/configuration/security                http://cxf.apache.org/schemas/configuration/security.xsd
         ">
+  <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
 
     <!-- -->
     <!-- This Spring config file is designed to represent a minimal -->
@@ -48,7 +49,7 @@ under the License.
     <jaxws:endpoint 
         id="JaxwsHttpsEndpoint"
         implementor="org.apache.cxf.systest.http.GreeterImpl"
-        address="https://localhost:9004/SoapContext/HttpsPort"
+        address="https://localhost:${testutil.ports.BusServer.4}/SoapContext/HttpsPort"
         serviceName="s:SOAPService"
         endpointName="e:HttpsPort"
         xmlns:e="http://apache.org/hello_world/services"
@@ -61,7 +62,7 @@ under the License.
     <!-- This test exercises the resource attribute in a keyStore element -->
     <!-- -->
     <httpj:engine-factory id="port-9004-tls-config">
-        <httpj:engine port="9004">
+        <httpj:engine port="${testutil.ports.BusServer.4}">
             <httpj:tlsServerParameters>
                <sec:keyManagers keyPassword="password">
                <sec:keyStore type="JKS" password="password" 

Modified: cxf/sandbox/oauth_1.0a/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/EngineLifecycleTest.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/oauth_1.0a/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/EngineLifecycleTest.java?rev=979862&r1=979861&r2=979862&view=diff
==============================================================================
--- cxf/sandbox/oauth_1.0a/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/EngineLifecycleTest.java (original)
+++ cxf/sandbox/oauth_1.0a/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/EngineLifecycleTest.java Tue Jul 27 20:46:55 2010
@@ -39,16 +39,18 @@ import org.apache.cxf.endpoint.ServerReg
 import org.apache.cxf.helpers.IOUtils;
 
 import org.apache.cxf.io.CachedOutputStream;
+import org.apache.cxf.testutil.common.TestUtil;
 import org.apache.cxf.transport.http_jetty.JettyHTTPDestination;
 import org.apache.cxf.transport.http_jetty.JettyHTTPServerEngine;
+
+import org.eclipse.jetty.server.Handler;
+import org.eclipse.jetty.webapp.WebAppContext;
+
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
-
-
 import org.junit.Test;
-import org.mortbay.jetty.Handler;
-import org.mortbay.jetty.webapp.WebAppContext;
+
 import org.springframework.beans.factory.config.PropertyPlaceholderConfigurer;
 import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
 import org.springframework.context.support.GenericApplicationContext;
@@ -60,6 +62,8 @@ import org.springframework.core.io.Resou
  * is extra jetty configuration.
  */
 public class EngineLifecycleTest extends Assert {
+    private static final String PORT1 = TestUtil.getPortNumber(EngineLifecycleTest.class, 1);
+    private static final String PORT2 = TestUtil.getPortNumber(EngineLifecycleTest.class, 2);
     private String close;
     private GenericApplicationContext applicationContext;
     
@@ -127,7 +131,7 @@ public class EngineLifecycleTest extends
     
     private void getTestHtml() throws Exception {
         HttpURLConnection httpConnection = 
-            getHttpConnection("http://localhost:8808/test.html");    
+            getHttpConnection("http://localhost:" + PORT2 + "/test.html");    
         httpConnection.connect();
         InputStream in = httpConnection.getInputStream();        
         assertNotNull(in);
@@ -172,7 +176,7 @@ public class EngineLifecycleTest extends
         ServerImpl si = (ServerImpl) sr.getServers().get(0);
         JettyHTTPDestination jhd = (JettyHTTPDestination) si.getDestination();
         JettyHTTPServerEngine e = (JettyHTTPServerEngine) jhd.getEngine();
-        org.mortbay.jetty.Server jettyServer = e.getServer();
+        org.eclipse.jetty.server.Server jettyServer = e.getServer();
 
         Handler[] contexts = jettyServer.getChildHandlersByClass(WebAppContext.class);
         WebAppContext servletContext = null;
@@ -183,18 +187,18 @@ public class EngineLifecycleTest extends
                 break;
             }
         }
-        servletContext.addServlet("org.mortbay.jetty.servlet.DefaultServlet", "/bloop");
+        servletContext.addServlet("org.eclipse.jetty.servlet.DefaultServlet", "/bloop");
         getTestHtml();
         invokeService();        
         shutdownService();
-        verifyNoServer(8808);
-        verifyNoServer(8801);
+        verifyNoServer(PORT2);
+        verifyNoServer(PORT1);
     }
     
         
-    private void verifyNoServer(int port) {
+    private void verifyNoServer(String port) {
         try {
-            Socket socket = new Socket(InetAddress.getLocalHost(), port);
+            Socket socket = new Socket(InetAddress.getLocalHost(), Integer.parseInt(port));
             socket.close();
         } catch (UnknownHostException e) {
             fail("Unknown host for local address");
@@ -218,8 +222,8 @@ public class EngineLifecycleTest extends
         invokeService();    
         invokeService8801();
         shutdownService();
-        verifyNoServer(8808);
-        verifyNoServer(8801);
+        verifyNoServer(PORT2);
+        verifyNoServer(PORT1);
         
         
         setUpBus(true);
@@ -228,8 +232,8 @@ public class EngineLifecycleTest extends
         invokeService8801();
         getTestHtml();
         shutdownService();
-        verifyNoServer(8808);
-        verifyNoServer(8801);
+        verifyNoServer(PORT2);
+        verifyNoServer(PORT1);
         
 
     }

Modified: cxf/sandbox/oauth_1.0a/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/Server.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/oauth_1.0a/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/Server.java?rev=979862&r1=979861&r2=979862&view=diff
==============================================================================
--- cxf/sandbox/oauth_1.0a/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/Server.java (original)
+++ cxf/sandbox/oauth_1.0a/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/Server.java Tue Jul 27 20:46:55 2010
@@ -29,7 +29,8 @@ import org.apache.cxf.testutil.common.Ab
 
 
 public class Server extends AbstractBusTestServerBase  {
-    static final String ADDRESS = "http://localhost:9077/SoapContext/SoapPort";
+    static final String PORT = allocatePort(Server.class);
+    static final String ADDRESS = "http://localhost:" + PORT + "/SoapContext/SoapPort";
 
     protected void run()  {
 

Modified: cxf/sandbox/oauth_1.0a/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/ThreadPoolTest.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/oauth_1.0a/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/ThreadPoolTest.java?rev=979862&r1=979861&r2=979862&view=diff
==============================================================================
--- cxf/sandbox/oauth_1.0a/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/ThreadPoolTest.java (original)
+++ cxf/sandbox/oauth_1.0a/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/ThreadPoolTest.java Tue Jul 27 20:46:55 2010
@@ -36,6 +36,7 @@ import org.junit.Test;
  */
 
 public class ThreadPoolTest extends AbstractClientServerTestBase {
+    private static final String ADDRESS = Server.ADDRESS;
     private static final QName SERVICE_NAME = 
         new QName("http://apache.org/hello_world_soap_http", "SOAPServiceAddressing");
 
@@ -53,7 +54,7 @@ public class ThreadPoolTest extends Abst
         greeter = new SOAPService(wsdl, SERVICE_NAME).getPort(Greeter.class);
         BindingProvider bp = (BindingProvider)greeter;
         bp.getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY,
-                                   Server.ADDRESS);
+                                   ADDRESS);
     }
 
     @Test

Modified: cxf/sandbox/oauth_1.0a/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/continuations/ClientServerWrappedContinuationTest.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/oauth_1.0a/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/continuations/ClientServerWrappedContinuationTest.java?rev=979862&r1=979861&r2=979862&view=diff
==============================================================================
--- cxf/sandbox/oauth_1.0a/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/continuations/ClientServerWrappedContinuationTest.java (original)
+++ cxf/sandbox/oauth_1.0a/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/continuations/ClientServerWrappedContinuationTest.java Tue Jul 27 20:46:55 2010
@@ -37,7 +37,8 @@ import org.junit.BeforeClass;
 import org.junit.Test;
 
 public class ClientServerWrappedContinuationTest extends AbstractClientServerTestBase {
-
+    public static final String PORT = allocatePort(Server.class);
+    
     private static final String CLIENT_CONFIG_FILE =
         "org/apache/cxf/systest/http_jetty/continuations/cxf.xml";
     private static final String SERVER_CONFIG_FILE =
@@ -51,7 +52,7 @@ public class ClientServerWrappedContinua
             BusFactory.setDefaultBus(bus);
             
             Object implementor = new HelloImplWithWrapppedContinuation();
-            String address = "http://localhost:9092/hellocontinuation";
+            String address = "http://localhost:" + PORT + "/hellocontinuation";
             Endpoint.publish(address, implementor);
         }
 
@@ -81,7 +82,7 @@ public class ClientServerWrappedContinua
         
         QName serviceName = new QName("http://cxf.apache.org/systest/jaxws", "HelloContinuationService");
         
-        URL wsdlURL = new URL("http://localhost:9092/hellocontinuation?wsdl");
+        URL wsdlURL = new URL("http://localhost:" + PORT + "/hellocontinuation?wsdl");
         
         HelloContinuationService service = new HelloContinuationService(wsdlURL, serviceName);
         assertNotNull(service);
@@ -92,7 +93,7 @@ public class ClientServerWrappedContinua
         CountDownLatch startSignal = new CountDownLatch(1);
         CountDownLatch controlDoneSignal = new CountDownLatch(5);
         CountDownLatch helloDoneSignal = new CountDownLatch(5);
-        
+
         executor.execute(new ControlWorker(helloPort, "Fred", startSignal, controlDoneSignal));
         executor.execute(new HelloWorker(helloPort, "Fred", "", startSignal, helloDoneSignal));
         
@@ -110,8 +111,8 @@ public class ClientServerWrappedContinua
         
         startSignal.countDown();
         
-        controlDoneSignal.await(10, TimeUnit.SECONDS);
-        helloDoneSignal.await(10, TimeUnit.SECONDS);
+        controlDoneSignal.await(100, TimeUnit.SECONDS);
+        helloDoneSignal.await(100, TimeUnit.SECONDS);
         executor.shutdownNow();
         assertEquals("Not all invocations have been resumed", 0, controlDoneSignal.getCount());
         assertEquals("Not all invocations have completed", 0, helloDoneSignal.getCount());

Modified: cxf/sandbox/oauth_1.0a/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/jetty-engine.xml
URL: http://svn.apache.org/viewvc/cxf/sandbox/oauth_1.0a/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/jetty-engine.xml?rev=979862&r1=979861&r2=979862&view=diff
==============================================================================
--- cxf/sandbox/oauth_1.0a/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/jetty-engine.xml (original)
+++ cxf/sandbox/oauth_1.0a/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/jetty-engine.xml Tue Jul 27 20:46:55 2010
@@ -32,33 +32,35 @@
               http://cxf.apache.org/schemas/configuration/http-jetty.xsd
            http://www.springframework.org/schema/beans
               http://www.springframework.org/schema/beans/spring-beans.xsd">
+ <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
+              
  <httpj:engine-factory bus="cxf">
-  <httpj:engine port='8801'>
+  <httpj:engine port='${testutil.ports.EngineLifecycleTest.1}'>
    <httpj:connector>
-    <bean class="org.mortbay.jetty.bio.SocketConnector">
-     <property name="port" value="8801"/>
+    <bean class="org.eclipse.jetty.server.bio.SocketConnector">
+     <property name="port" value="${testutil.ports.EngineLifecycleTest.1}"/>
     </bean>
    </httpj:connector>
   </httpj:engine>
-  <httpj:engine port="8808">
+  <httpj:engine port="${testutil.ports.EngineLifecycleTest.2}">
    <httpj:handlers>
-    <bean class="org.mortbay.jetty.webapp.WebAppContext">
+    <bean class="org.eclipse.jetty.webapp.WebAppContext">
       <constructor-arg value="."/>
       <constructor-arg value="/jsunit"/>
     </bean>
-    <bean class="org.mortbay.jetty.handler.ContextHandler">
+    <bean class="org.eclipse.jetty.server.handler.ContextHandler">
      <property name="contextPath" value="/" />
      <property name="handler">
-      <bean class="org.mortbay.jetty.handler.ResourceHandler">
+      <bean class="org.eclipse.jetty.server.handler.ResourceHandler">
        <property name="baseResource">
-        <bean class="org.mortbay.resource.FileResource">
+        <bean class="org.eclipse.jetty.util.resource.FileResource">
          <constructor-arg value="${staticResourceURL}" />
         </bean>
         </property>
       </bean>
      </property>
     </bean>
-    <bean class="org.mortbay.jetty.handler.DefaultHandler"/>
+    <bean class="org.eclipse.jetty.server.handler.DefaultHandler"/>
    </httpj:handlers>
   </httpj:engine>
  </httpj:engine-factory>

Modified: cxf/sandbox/oauth_1.0a/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/server-lifecycle-beans.xml
URL: http://svn.apache.org/viewvc/cxf/sandbox/oauth_1.0a/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/server-lifecycle-beans.xml?rev=979862&r1=979861&r2=979862&view=diff
==============================================================================
--- cxf/sandbox/oauth_1.0a/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/server-lifecycle-beans.xml (original)
+++ cxf/sandbox/oauth_1.0a/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/server-lifecycle-beans.xml Tue Jul 27 20:46:55 2010
@@ -29,6 +29,7 @@
         http://cxf.apache.org/transports/http/configuration         http://cxf.apache.org/schemas/configuration/http-conf.xsd
         http://cxf.apache.org/transports/http-jetty/configuration   http://cxf.apache.org/schemas/configuration/http-jetty.xsd
  ">
+   <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
 
   <bean id="aegisBean" class="org.apache.cxf.aegis.databinding.AegisDatabinding" scope='prototype'>
   <property name='configuration'>
@@ -47,7 +48,7 @@
 
  <jaxws:endpoint id="dummy-service-endpoint" 
     implementor="org.apache.cxf.systest.http_jetty.Dummy" 
-    address="http://localhost:8808/Dummy">
+    address="http://localhost:${testutil.ports.EngineLifecycleTest.2}/Dummy">
   <jaxws:serviceFactory>
    <ref bean='jaxws-and-aegis-service-factory' />
   </jaxws:serviceFactory>
@@ -55,7 +56,7 @@
 
  <jaxws:endpoint id="dummy-8801-service-endpoint"  
                  implementor="org.apache.cxf.systest.http_jetty.Dummy" 
-                 address="http://localhost:8801/Dummy">
+                 address="http://localhost:${testutil.ports.EngineLifecycleTest.1}/Dummy">
   <jaxws:serviceFactory>
    <ref bean='jaxws-and-aegis-service-factory' />
   </jaxws:serviceFactory>
@@ -65,14 +66,14 @@
 
  <bean id="clientFactory" class="org.apache.cxf.jaxws.JaxWsProxyFactoryBean">
   <property name="serviceClass" value="org.apache.cxf.systest.http_jetty.DummyInterface" />
-  <property name="address" value="http://localhost:8808/Dummy" />
+  <property name="address" value="http://localhost:${testutil.ports.EngineLifecycleTest.2}/Dummy" />
  </bean>
 
 <bean id="dummy-client-8801" class="org.apache.cxf.systest.http_jetty.DummyInterface" factory-bean="clientFactory-8801" factory-method="create" />
 
  <bean id="clientFactory-8801" class="org.apache.cxf.jaxws.JaxWsProxyFactoryBean">
   <property name="serviceClass" value="org.apache.cxf.systest.http_jetty.DummyInterface" />
-  <property name="address" value="http://localhost:8801/Dummy" />
+  <property name="address" value="http://localhost:${testutil.ports.EngineLifecycleTest.1}/Dummy" />
  </bean>
 
 </beans>

Modified: cxf/sandbox/oauth_1.0a/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/server.xml
URL: http://svn.apache.org/viewvc/cxf/sandbox/oauth_1.0a/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/server.xml?rev=979862&r1=979861&r2=979862&view=diff
==============================================================================
--- cxf/sandbox/oauth_1.0a/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/server.xml (original)
+++ cxf/sandbox/oauth_1.0a/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/server.xml Tue Jul 27 20:46:55 2010
@@ -26,7 +26,7 @@ http://www.springframework.org/schema/be
   
     <http-jetty:engine-factory bus="cxf">
         <http-jetty:engine port="0">
-	    <http-jetty:threadingParameters minThreads="1" maxThreads="3"/>   
+	       <http-jetty:threadingParameters minThreads="1" maxThreads="3"/>   
         </http-jetty:engine>
     </http-jetty:engine-factory>
 

Modified: cxf/sandbox/oauth_1.0a/systests/transports/src/test/java/org/apache/cxf/systest/jms/JMSClientServerTest.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/oauth_1.0a/systests/transports/src/test/java/org/apache/cxf/systest/jms/JMSClientServerTest.java?rev=979862&r1=979861&r2=979862&view=diff
==============================================================================
--- cxf/sandbox/oauth_1.0a/systests/transports/src/test/java/org/apache/cxf/systest/jms/JMSClientServerTest.java (original)
+++ cxf/sandbox/oauth_1.0a/systests/transports/src/test/java/org/apache/cxf/systest/jms/JMSClientServerTest.java Tue Jul 27 20:46:55 2010
@@ -45,6 +45,8 @@ import javax.xml.ws.soap.SOAPBinding;
 import javax.xml.ws.soap.SOAPFaultException;
 
 
+import org.apache.cxf.Bus;
+import org.apache.cxf.BusFactory;
 import org.apache.cxf.endpoint.Client;
 import org.apache.cxf.frontend.ClientProxy;
 import org.apache.cxf.hello_world_jms.BadRecordLitFault;
@@ -99,7 +101,8 @@ import org.springframework.jms.support.d
 import org.springframework.jndi.JndiTemplate;
 
 public class JMSClientServerTest extends AbstractBusClientServerTestBase {
-    
+    static final String JMS_PORT = EmbeddedJMSBrokerLauncher.PORT;
+    static final String PORT = Server.PORT;
     @BeforeClass
     public static void startServers() throws Exception {
         Map<String, String> props = new HashMap<String, String>();                
@@ -114,10 +117,13 @@ public class JMSClientServerTest extends
 
         assertTrue("server did not launch correctly", 
                    launchServer(Server.class, false));
+        
     }
     
     public URL getWSDLURL(String s) throws Exception {
-        return getClass().getResource(s);
+        URL u = getClass().getResource(s);
+        EmbeddedJMSBrokerLauncher.updateWsdlExtensors(getBus(), u.toString());
+        return u;
     }
     public QName getServiceName(QName q) {
         return q;
@@ -141,6 +147,7 @@ public class JMSClientServerTest extends
         String response2 = new String("Bonjour");
         try {
             Greeter greeter = service.getPort(portName, Greeter.class);
+            
             Client client = ClientProxy.getClient(greeter);
             EndpointInfo ei = client.getEndpoint().getEndpointInfo();
             AddressType address = ei.getTraversedExtensor(new AddressType(), AddressType.class);
@@ -414,7 +421,7 @@ public class JMSClientServerTest extends
                                  "HelloWorldPubSubService"));
         QName portName = getPortName(new QName("http://cxf.apache.org/hello_world_jms", 
                              "HelloWorldPubSubPort"));
-        URL wsdl = getClass().getResource("/wsdl/jms_test.wsdl");
+        URL wsdl = getWSDLURL("/wsdl/jms_test.wsdl");
         assertNotNull(wsdl);
 
         HelloWorldPubSubService service = new HelloWorldPubSubService(wsdl, serviceName);
@@ -438,7 +445,7 @@ public class JMSClientServerTest extends
                                  "JmsDestinationPubSubService"));
         QName portName = getPortName(new QName("http://cxf.apache.org/hello_world_jms", 
                              "JmsDestinationPubSubPort"));
-        URL wsdl = getClass().getResource("/wsdl/jms_test.wsdl");
+        URL wsdl = getWSDLURL("/wsdl/jms_test.wsdl");
         assertNotNull(wsdl);
 
         HelloWorldPubSubService service = new HelloWorldPubSubService(wsdl, serviceName);
@@ -458,10 +465,14 @@ public class JMSClientServerTest extends
     
     @Test 
     public void testConnectionsWithinSpring() throws Exception {
+        BusFactory.setDefaultBus(null);
+        BusFactory.setThreadDefaultBus(null);
+        
         ClassPathXmlApplicationContext ctx = 
             new ClassPathXmlApplicationContext(
                 new String[] {"/org/apache/cxf/systest/jms/JMSClients.xml"});
-               
+        EmbeddedJMSBrokerLauncher.updateWsdlExtensors((Bus)ctx.getBean("cxf"),
+                                                      "classpath:wsdl/jms_test.wsdl");   
         HelloWorldPortType greeter = (HelloWorldPortType)ctx.getBean("jmsRPCClient");
         assertNotNull(greeter);
         
@@ -505,7 +516,9 @@ public class JMSClientServerTest extends
         } catch (Exception ex) {
             fail("There should not throw the exception" + ex);
         }
-        
+        ctx.close();
+        BusFactory.setDefaultBus(getBus());
+        BusFactory.setThreadDefaultBus(getBus());
     }
     
     @Test
@@ -514,7 +527,7 @@ public class JMSClientServerTest extends
                                  "HelloWorldOneWayQueueService"));
         QName portName = getPortName(new QName("http://cxf.apache.org/hello_world_jms", 
                              "HelloWorldOneWayQueuePort"));
-        URL wsdl = getClass().getResource("/wsdl/jms_test.wsdl");
+        URL wsdl = getWSDLURL("/wsdl/jms_test.wsdl");
         assertNotNull(wsdl);
 
         HelloWorldOneWayQueueService service = new HelloWorldOneWayQueueService(wsdl, serviceName);
@@ -538,8 +551,10 @@ public class JMSClientServerTest extends
                                                      "HelloWorldQueueDecoupledOneWaysService"));
         QName portName = getPortName(new QName("http://cxf.apache.org/hello_world_jms", 
                                                "HelloWorldQueueDecoupledOneWaysPort"));
-        URL wsdl = getClass().getResource("/wsdl/jms_test.wsdl");
+        URL wsdl = getWSDLURL("/wsdl/jms_test.wsdl");
         assertNotNull(wsdl);
+        EmbeddedJMSBrokerLauncher.updateWsdlExtensors(getBus(), wsdl.toString());
+        EmbeddedJMSBrokerLauncher.updateWsdlExtensors(getBus(), "testutils/jms_test.wsdl");
 
         HelloWorldQueueDecoupledOneWaysService service = 
             new HelloWorldQueueDecoupledOneWaysService(wsdl, serviceName);
@@ -606,8 +621,9 @@ public class JMSClientServerTest extends
                                                      "HelloWorldQueueDecoupledOneWaysService"));
         QName portName = getPortName(new QName("http://cxf.apache.org/hello_world_jms", 
                                                "HelloWorldQueueDecoupledOneWaysPort"));
-        URL wsdl = getClass().getResource("/wsdl/jms_test.wsdl");
+        URL wsdl = getWSDLURL("/wsdl/jms_test.wsdl");
         assertNotNull(wsdl);
+        EmbeddedJMSBrokerLauncher.updateWsdlExtensors(getBus(), "testutils/jms_test.wsdl");
 
         HelloWorldQueueDecoupledOneWaysService service = 
             new HelloWorldQueueDecoupledOneWaysService(wsdl, serviceName);
@@ -725,7 +741,7 @@ public class JMSClientServerTest extends
         QName portNameSales = getPortName(new QName("http://cxf.apache.org/hello_world_jms", 
                                                "HelloWorldPortAppCorrelationIDSales"));
 
-        URL wsdl = getClass().getResource("/wsdl/jms_test.wsdl");
+        URL wsdl = getWSDLURL("/wsdl/jms_test.wsdl");
         assertNotNull(wsdl);
 
         HelloWorldServiceAppCorrelationID service = 
@@ -783,7 +799,7 @@ public class JMSClientServerTest extends
         QName portNameSales = getPortName(new QName("http://cxf.apache.org/hello_world_jms", 
                                                "HelloWorldPortAppCorrelationIDStaticPrefixSales"));
 
-        URL wsdl = getClass().getResource("/wsdl/jms_test.wsdl");
+        URL wsdl = getWSDLURL("/wsdl/jms_test.wsdl");
         assertNotNull(wsdl);
 
         HelloWorldServiceAppCorrelationIDStaticPrefix service = 
@@ -834,7 +850,7 @@ public class JMSClientServerTest extends
                                  "HelloWorldServiceAppCorrelationIDNoPrefix"));
         QName portName = getPortName(new QName("http://cxf.apache.org/hello_world_jms", 
                                                "HelloWorldPortAppCorrelationIDNoPrefix"));
-        URL wsdl = getClass().getResource("/wsdl/jms_test.wsdl");
+        URL wsdl = getWSDLURL("/wsdl/jms_test.wsdl");
         assertNotNull(wsdl);
 
         HelloWorldServiceAppCorrelationIDNoPrefix service = 
@@ -904,7 +920,7 @@ public class JMSClientServerTest extends
         QName portNameSales = getPortName(new QName("http://cxf.apache.org/hello_world_jms", 
                                   "HelloWorldPortRuntimeCorrelationIDStaticPrefixSales"));
 
-        URL wsdl = getClass().getResource("/wsdl/jms_test.wsdl");
+        URL wsdl = getWSDLURL("/wsdl/jms_test.wsdl");
         assertNotNull(wsdl);
 
         HelloWorldServiceRuntimeCorrelationIDStaticPrefix service = 
@@ -950,7 +966,7 @@ public class JMSClientServerTest extends
         QName portName = getPortName(new QName("http://cxf.apache.org/hello_world_jms", 
                                                "HelloWorldPortRuntimeCorrelationIDDynamicPrefix"));
         
-        URL wsdl = getClass().getResource("/wsdl/jms_test.wsdl");
+        URL wsdl = getWSDLURL("/wsdl/jms_test.wsdl");
         assertNotNull(wsdl);
 
         HelloWorldServiceRuntimeCorrelationIDDynamicPrefix service = 
@@ -989,7 +1005,7 @@ public class JMSClientServerTest extends
         QName serviceName = getServiceName(new QName("http://cxf.apache.org/hello_world_jms",
                                  "HelloWorldService"));
         QName portName = getPortName(new QName("http://cxf.apache.org/hello_world_jms", "HelloWorldPort"));
-        URL wsdl = getClass().getResource("/wsdl/jms_test.wsdl");
+        URL wsdl = getWSDLURL("/wsdl/jms_test.wsdl");
         assertNotNull(wsdl);
 
         HelloWorldService service = new HelloWorldService(wsdl, serviceName);
@@ -1045,7 +1061,7 @@ public class JMSClientServerTest extends
         QName serviceName = new QName("http://cxf.apache.org/jms_mtom", "JMSMTOMService");
         QName portName = new QName("http://cxf.apache.org/jms_mtom", "MTOMPort");
 
-        URL wsdl = getClass().getResource("/wsdl/jms_test_mtom.wsdl");
+        URL wsdl = getWSDLURL("/wsdl/jms_test_mtom.wsdl");
         assertNotNull(wsdl);
 
         JMSMTOMService service = new JMSMTOMService(wsdl, serviceName);
@@ -1138,7 +1154,7 @@ public class JMSClientServerTest extends
             throw (Exception)ex.getCause();
         }
     }
-    
+
     @Test
     public void testWsdlExtensionSpecJMSPortError() throws Exception {
         QName serviceName = getServiceName(new QName("http://cxf.apache.org/jms_greeter",
@@ -1162,7 +1178,8 @@ public class JMSClientServerTest extends
         String address = "jms:jndi:dynamicQueues/test.cxf.jmstransport.queue3"
             + "?jndiInitialContextFactory"
             + "=org.apache.activemq.jndi.ActiveMQInitialContextFactory"
-            + "&jndiConnectionFactoryName=ConnectionFactory&jndiURL=tcp://localhost:61500";
+            + "&jndiConnectionFactoryName=ConnectionFactory&jndiURL=tcp://localhost:"
+            + JMS_PORT;
 
         JaxWsProxyFactoryBean factory = new JaxWsProxyFactoryBean();
         factory.setTransportId(JMSSpecConstants.SOAP_JMS_SPECIFICIATION_TRANSPORTID);
@@ -1212,7 +1229,7 @@ public class JMSClientServerTest extends
     public void testReplyToConfig() throws Exception {
         JMSEndpoint endpoint = new JMSEndpoint();
         endpoint.setJndiInitialContextFactory("org.apache.activemq.jndi.ActiveMQInitialContextFactory");
-        endpoint.setJndiURL("tcp://localhost:61500");
+        endpoint.setJndiURL("tcp://localhost:" + JMS_PORT);
         endpoint.setJndiConnectionFactoryName("ConnectionFactory");
 
         final JMSConfiguration jmsConfig = new JMSConfiguration();        

Modified: cxf/sandbox/oauth_1.0a/systests/transports/src/test/java/org/apache/cxf/systest/jms/Server.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/oauth_1.0a/systests/transports/src/test/java/org/apache/cxf/systest/jms/Server.java?rev=979862&r1=979861&r2=979862&view=diff
==============================================================================
--- cxf/sandbox/oauth_1.0a/systests/transports/src/test/java/org/apache/cxf/systest/jms/Server.java (original)
+++ cxf/sandbox/oauth_1.0a/systests/transports/src/test/java/org/apache/cxf/systest/jms/Server.java Tue Jul 27 20:46:55 2010
@@ -22,13 +22,16 @@ import javax.xml.ws.Binding;
 import javax.xml.ws.Endpoint;
 import javax.xml.ws.soap.SOAPBinding;
 
+import org.apache.cxf.Bus;
+import org.apache.cxf.BusFactory;
 import org.apache.cxf.jaxws.EndpointImpl;
 import org.apache.cxf.jaxws.JaxWsServerFactoryBean;
 import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
+import org.apache.cxf.testutil.common.EmbeddedJMSBrokerLauncher;
 import org.apache.cxf.transport.jms.spec.JMSSpecConstants;
 
 public class Server extends AbstractBusTestServerBase {
-
+    public static final String PORT = allocatePort(Server.class);
 
     protected void run()  {
         Object implementor = new GreeterImplTwoWayJMS();
@@ -49,8 +52,12 @@ public class Server extends AbstractBusT
         Object i8 = new GreeterImplTwoWayJMSAppCorrelationIDSales();
         Object mtom = new JMSMTOMImpl();
         
+        Bus bus = BusFactory.getDefaultBus();
+        EmbeddedJMSBrokerLauncher.updateWsdlExtensors(bus, "testutils/hello_world_doc_lit.wsdl");
+        EmbeddedJMSBrokerLauncher.updateWsdlExtensors(bus, "testutils/jms_test.wsdl");
+        EmbeddedJMSBrokerLauncher.updateWsdlExtensors(bus, "testutils/jms_test_mtom.wsdl");
         Endpoint.publish(null, impleDoc);
-        String address = "http://localhost:9000/SoapContext/SoapPort";
+        String address = "http://localhost:" + PORT + "/SoapContext/SoapPort";
         Endpoint.publish(address, implementor);
         Endpoint.publish("http://testaddr.not.required/", impl2);
         Endpoint.publish("http://testaddr.not.required.topic/", impl3);
@@ -74,14 +81,16 @@ public class Server extends AbstractBusT
         String address1 = "jms:jndi:dynamicQueues/test.cxf.jmstransport.queue2"
                          + "?jndiInitialContextFactory"
                          + "=org.apache.activemq.jndi.ActiveMQInitialContextFactory"
-                         + "&jndiConnectionFactoryName=ConnectionFactory&jndiURL=tcp://localhost:61500";
+                         + "&jndiConnectionFactoryName=ConnectionFactory&jndiURL=tcp://localhost:"
+                         + EmbeddedJMSBrokerLauncher.PORT;
         Endpoint.publish(address1, spec1);
         
         Object spec2 = new GreeterSpecWithPortError();
         String address2 = "jms:jndi:dynamicQueues/test.cxf.jmstransport.queue5"
             + "?jndiInitialContextFactory"
             + "=org.apache.activemq.jndi.ActiveMQInitialContextFactory"
-            + "&jndiConnectionFactoryName=ConnectionFactory&jndiURL=tcp://localhost:61500";
+            + "&jndiConnectionFactoryName=ConnectionFactory&jndiURL=tcp://localhost:"
+            + EmbeddedJMSBrokerLauncher.PORT;
         Endpoint.publish(address2, spec2);
         
         initNoWsdlServer();
@@ -95,7 +104,8 @@ public class Server extends AbstractBusT
         String address = "jms:jndi:dynamicQueues/test.cxf.jmstransport.queue3"
             + "?jndiInitialContextFactory"
             + "=org.apache.activemq.jndi.ActiveMQInitialContextFactory"
-            + "&jndiConnectionFactoryName=ConnectionFactory&jndiURL=tcp://localhost:61500";
+            + "&jndiConnectionFactoryName=ConnectionFactory&jndiURL=tcp://localhost:"
+            + EmbeddedJMSBrokerLauncher.PORT;
         Hello implementor = new HelloImpl();
         JaxWsServerFactoryBean svrFactory = new JaxWsServerFactoryBean();
         svrFactory.setServiceClass(Hello.class);

Modified: cxf/sandbox/oauth_1.0a/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/HelloWorldContinuationsClientServerTest.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/oauth_1.0a/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/HelloWorldContinuationsClientServerTest.java?rev=979862&r1=979861&r2=979862&view=diff
==============================================================================
--- cxf/sandbox/oauth_1.0a/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/HelloWorldContinuationsClientServerTest.java (original)
+++ cxf/sandbox/oauth_1.0a/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/HelloWorldContinuationsClientServerTest.java Tue Jul 27 20:46:55 2010
@@ -35,10 +35,14 @@ import org.apache.cxf.systest.http_jetty
 import org.apache.cxf.systest.http_jetty.continuations.HelloContinuationService;
 import org.apache.cxf.systest.http_jetty.continuations.HelloWorker;
 import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
+import org.apache.cxf.testutil.common.EmbeddedJMSBrokerLauncher;
+
 import org.junit.Before;
 import org.junit.Test;
 
 public class HelloWorldContinuationsClientServerTest extends AbstractBusClientServerTestBase {
+    static final String JMS_PORT = EmbeddedJMSBrokerLauncher.PORT;
+    static final String PORT = Server2.PORT;
     
     private static boolean serversStarted;
     private static final String CONFIG_FILE =

Modified: cxf/sandbox/oauth_1.0a/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/HelloWorldContinuationsThrottleTest.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/oauth_1.0a/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/HelloWorldContinuationsThrottleTest.java?rev=979862&r1=979861&r2=979862&view=diff
==============================================================================
--- cxf/sandbox/oauth_1.0a/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/HelloWorldContinuationsThrottleTest.java (original)
+++ cxf/sandbox/oauth_1.0a/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/HelloWorldContinuationsThrottleTest.java Tue Jul 27 20:46:55 2010
@@ -41,7 +41,8 @@ import org.junit.Before;
 import org.junit.Test;
 
 public class HelloWorldContinuationsThrottleTest extends AbstractBusClientServerTestBase {
-    
+    static final String JMS_PORT = EmbeddedJMSBrokerLauncher.PORT;
+
     private static boolean serversStarted;
     private static final String CONFIG_FILE =
         "org/apache/cxf/systest/jms/continuations/jms_test_config.xml";
@@ -75,7 +76,7 @@ public class HelloWorldContinuationsThro
         QName serviceName = new QName("http://cxf.apache.org/systest/jaxws", "HelloContinuationService");
         
         URL wsdlURL = getClass().getResource("/org/apache/cxf/systest/jms/continuations/test2.wsdl");
-        
+        EmbeddedJMSBrokerLauncher.updateWsdlExtensors(getBus(), wsdlURL.toString());
         HelloContinuationService service = new HelloContinuationService(wsdlURL, serviceName);
         assertNotNull(service);
         final HelloContinuation helloPort = service.getHelloContinuationPort();

Modified: cxf/sandbox/oauth_1.0a/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/JMSContinuationsClientServerTest.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/oauth_1.0a/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/JMSContinuationsClientServerTest.java?rev=979862&r1=979861&r2=979862&view=diff
==============================================================================
--- cxf/sandbox/oauth_1.0a/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/JMSContinuationsClientServerTest.java (original)
+++ cxf/sandbox/oauth_1.0a/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/JMSContinuationsClientServerTest.java Tue Jul 27 20:46:55 2010
@@ -33,8 +33,10 @@ import org.junit.Before;
 import org.junit.Test;
 
 public class JMSContinuationsClientServerTest extends AbstractBusClientServerTestBase {
-    
     protected static boolean serversStarted;
+    static final String JMS_PORT = EmbeddedJMSBrokerLauncher.PORT;
+    static final String PORT = Server.PORT;
+
 
     @Before
     public void startServers() throws Exception {
@@ -74,6 +76,8 @@ public class JMSContinuationsClientServe
         QName portName = getPortName(new QName("http://cxf.apache.org/hello_world_jms", "HelloWorldPort"));
         URL wsdl = getWSDLURL("/org/apache/cxf/systest/jms/continuations/jms_test.wsdl");
         assertNotNull(wsdl);
+        
+        EmbeddedJMSBrokerLauncher.updateWsdlExtensors(getBus(), wsdl.toString());
 
         HelloWorldService service = new HelloWorldService(wsdl, serviceName);
         assertNotNull(service);

Modified: cxf/sandbox/oauth_1.0a/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/Server.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/oauth_1.0a/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/Server.java?rev=979862&r1=979861&r2=979862&view=diff
==============================================================================
--- cxf/sandbox/oauth_1.0a/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/Server.java (original)
+++ cxf/sandbox/oauth_1.0a/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/Server.java Tue Jul 27 20:46:55 2010
@@ -20,14 +20,20 @@ package org.apache.cxf.systest.jms.conti
 
 import javax.xml.ws.Endpoint;
 
+import org.apache.cxf.BusFactory;
 import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
+import org.apache.cxf.testutil.common.EmbeddedJMSBrokerLauncher;
 
 public class Server extends AbstractBusTestServerBase {
+    public static final String PORT = allocatePort(Server.class);
 
 
     protected void run()  {
+        EmbeddedJMSBrokerLauncher.updateWsdlExtensors(BusFactory.getDefaultBus(),
+            "testutils/jms_test.wsdl");
+
         Object implementor = new GreeterImplWithContinuationsJMS();        
-        String address = "http://localhost:9000/SoapContext/SoapPort";
+        String address = "http://localhost:" + PORT + "/SoapContext/SoapPort";
         Endpoint.publish(address, implementor);
     }
 

Modified: cxf/sandbox/oauth_1.0a/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/Server2.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/oauth_1.0a/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/Server2.java?rev=979862&r1=979861&r2=979862&view=diff
==============================================================================
--- cxf/sandbox/oauth_1.0a/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/Server2.java (original)
+++ cxf/sandbox/oauth_1.0a/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/Server2.java Tue Jul 27 20:46:55 2010
@@ -20,14 +20,19 @@ package org.apache.cxf.systest.jms.conti
 
 import javax.xml.ws.Endpoint;
 
+import org.apache.cxf.BusFactory;
 import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
+import org.apache.cxf.testutil.common.EmbeddedJMSBrokerLauncher;
 
 public class Server2 extends AbstractBusTestServerBase {
+    public static final String PORT = allocatePort(Server2.class);
 
    
     protected void run()  {
+        EmbeddedJMSBrokerLauncher.updateWsdlExtensors(BusFactory.getDefaultBus(),
+                                                      "org/apache/cxf/systest/jms/continuations/test.wsdl");
         Object implementor = new HelloWorldWithContinuationsJMS();        
-        String address = "http://localhost:9000/SoapContext/SoapPort";
+        String address = "http://localhost:" + PORT + "/SoapContext/SoapPort";
         Endpoint.publish(address, implementor);
     }
 

Modified: cxf/sandbox/oauth_1.0a/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/Server3.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/oauth_1.0a/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/Server3.java?rev=979862&r1=979861&r2=979862&view=diff
==============================================================================
--- cxf/sandbox/oauth_1.0a/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/Server3.java (original)
+++ cxf/sandbox/oauth_1.0a/systests/transports/src/test/java/org/apache/cxf/systest/jms/continuations/Server3.java Tue Jul 27 20:46:55 2010
@@ -24,8 +24,10 @@ import org.apache.cxf.Bus;
 import org.apache.cxf.BusFactory;
 import org.apache.cxf.bus.spring.SpringBusFactory;
 import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
+import org.apache.cxf.testutil.common.EmbeddedJMSBrokerLauncher;
 
 public class Server3 extends AbstractBusTestServerBase {
+    public static final String PORT = allocatePort(Server3.class);
 
     private static final String CONFIG_FILE =
         "org/apache/cxf/systest/jms/continuations/jms_test_config.xml";
@@ -34,8 +36,10 @@ public class Server3 extends AbstractBus
         SpringBusFactory bf = new SpringBusFactory();
         Bus bus = bf.createBus(CONFIG_FILE);
         BusFactory.setDefaultBus(bus);
+        EmbeddedJMSBrokerLauncher.updateWsdlExtensors(bus, 
+                                                      "org/apache/cxf/systest/jms/continuations/test2.wsdl");
         Object implementor = new HelloWorldWithContinuationsJMS2();        
-        String address = "http://localhost:9000/SoapContext/SoapPort";
+        String address = "http://localhost:" + PORT + "/SoapContext/SoapPort";
         Endpoint.publish(address, implementor);
     }
 



Mime
View raw message