cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject svn commit: r829031 - in /cxf/branches/2.2.x-fixes: ./ systests/transports/src/test/java/org/apache/cxf/systest/http/HTTPSClientTest.java systests/transports/src/test/java/org/apache/cxf/systest/http/resources/pkcs12.xml
Date Fri, 23 Oct 2009 12:41:03 GMT
Author: sergeyb
Date: Fri Oct 23 12:41:02 2009
New Revision: 829031

URL: http://svn.apache.org/viewvc?rev=829031&view=rev
Log:
Merged revisions 829026 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r829026 | sergeyb | 2009-10-23 13:29:17 +0100 (Fri, 23 Oct 2009) | 1 line
  
  [CXF-2493] : applying a patch on behalf of Colm
........

Modified:
    cxf/branches/2.2.x-fixes/   (props changed)
    cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/HTTPSClientTest.java
    cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/pkcs12.xml

Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
    svn:mergeinfo = /cxf/trunk:829026

Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/HTTPSClientTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/HTTPSClientTest.java?rev=829031&r1=829030&r2=829031&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/HTTPSClientTest.java
(original)
+++ cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/HTTPSClientTest.java
Fri Oct 23 12:41:02 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/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/pkcs12.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/pkcs12.xml?rev=829031&r1=829030&r2=829031&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/pkcs12.xml
(original)
+++ cxf/branches/2.2.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/pkcs12.xml
Fri Oct 23 12:41:02 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" 



Mime
View raw message