You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by se...@apache.org on 2009/10/23 14:29:17 UTC

svn commit: r829026 - in /cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/http: HTTPSClientTest.java resources/pkcs12.xml

Author: sergeyb
Date: Fri Oct 23 12:29:17 2009
New Revision: 829026

URL: http://svn.apache.org/viewvc?rev=829026&view=rev
Log:
[CXF-2493] : applying a patch on behalf of Colm

Modified:
    cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/http/HTTPSClientTest.java
    cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/pkcs12.xml

Modified: cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/http/HTTPSClientTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/http/HTTPSClientTest.java?rev=829026&r1=829025&r2=829026&view=diff
==============================================================================
--- cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/http/HTTPSClientTest.java (original)
+++ cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/http/HTTPSClientTest.java Fri Oct 23 12:29:17 2009
@@ -111,7 +111,7 @@
     @Test
     public final void testJaxwsServerChangeHttpsToHttp() throws Exception {
         testSuccessfulCall("resources/jaxws-server.xml", 
-                            "http://localhost:9003/SoapContext/HttpPort");        
+                            "http://localhost:9003/SoapContext/HttpPort");    
     }    
     @Test
     public final void testJaxwsEndpoint() throws Exception {
@@ -122,7 +122,7 @@
     @Test
     public final void testPKCS12Endpoint() throws Exception {
         testSuccessfulCall("resources/pkcs12.xml",
-                           "https://localhost:9003/SoapContext/HttpsPort");
+                           "https://localhost:9006/SoapContext/HttpsPort");
     }
     
     @Test

Modified: cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/pkcs12.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/pkcs12.xml?rev=829026&r1=829025&r2=829026&view=diff
==============================================================================
--- cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/pkcs12.xml (original)
+++ cxf/trunk/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/pkcs12.xml Fri Oct 23 12:29:17 2009
@@ -49,22 +49,22 @@
     <!-- -->
     <jaxws:server 
         id="JaxwsHttpsEndpoint"        
-        address="https://localhost:9003/SoapContext/HttpsPort"
+        address="https://localhost:9006/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-9003-tls-config">
+        depends-on="port-9006-tls-config">
         <jaxws:serviceBean>
            <bean class="org.apache.cxf.systest.http.GreeterImpl"/>
         </jaxws:serviceBean>
     </jaxws:server>    
 
     <!-- -->
-    <!-- TLS Port configuration parameters for port 9002 -->
+    <!-- TLS Port configuration parameters for port 9006 -->
     <!-- -->
-    <httpj:engine-factory id="port-9003-tls-config">
-        <httpj:engine port="9003">
+    <httpj:engine-factory id="port-9006-tls-config">
+        <httpj:engine port="9006">
             <httpj:tlsServerParameters>
                 <sec:keyManagers keyPassword="password">
                     <sec:keyStore type="pkcs12" password="password"