cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1212547 - in /cxf/branches/2.4.x-fixes: ./ systests/transports/src/test/java/org/apache/cxf/systest/http/ systests/transports/src/test/java/org/apache/cxf/systest/http/resources/
Date Fri, 09 Dec 2011 17:56:03 GMT
Author: dkulp
Date: Fri Dec  9 17:56:03 2011
New Revision: 1212547

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

........
  r1212157 | dkulp | 2011-12-08 17:00:24 -0500 (Thu, 08 Dec 2011) | 1 line
  
  Add AES method to https setups so they can run with Java7
........

Modified:
    cxf/branches/2.4.x-fixes/   (props changed)
    cxf/branches/2.4.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/HTTPConduitTest.java
    cxf/branches/2.4.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Bethal.cxf
    cxf/branches/2.4.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/BethalClientConfig.cxf
    cxf/branches/2.4.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Gordy.cxf
    cxf/branches/2.4.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Morpit.cxf
    cxf/branches/2.4.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Poltim.cxf
    cxf/branches/2.4.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Tarpin.cxf

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

Modified: cxf/branches/2.4.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/HTTPConduitTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/HTTPConduitTest.java?rev=1212547&r1=1212546&r2=1212547&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/HTTPConduitTest.java
(original)
+++ cxf/branches/2.4.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/HTTPConduitTest.java
Fri Dec  9 17:56:03 2011
@@ -155,6 +155,7 @@ public class HTTPConduitTest extends Abs
             filters.getInclude().add(".*_EXPORT_.*");
             filters.getInclude().add(".*_EXPORT1024_.*");
             filters.getInclude().add(".*_WITH_DES_.*");
+            filters.getInclude().add(".*_WITH_AES_.*");
             filters.getInclude().add(".*_WITH_NULL_.*");
             filters.getInclude().add(".*_DH_anon_.*");
             tlsClientParameters.setCipherSuitesFilter(filters);
@@ -219,7 +220,7 @@ public class HTTPConduitTest extends Abs
         System.setProperty("org.apache.cxf.bus.factory", 
             "org.apache.cxf.bus.CXFBusFactory");
     }
-        
+
     public static KeyStore getKeyStore(String ksType, String file, String ksPassword)
         throws GeneralSecurityException,
                IOException {

Modified: cxf/branches/2.4.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Bethal.cxf
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Bethal.cxf?rev=1212547&r1=1212546&r2=1212547&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Bethal.cxf
(original)
+++ cxf/branches/2.4.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Bethal.cxf
Fri Dec  9 17:56:03 2011
@@ -50,12 +50,12 @@
   <httpj:engine-factory bus="cxf">
 	 <httpj:engine port="${testutil.ports.BusServer.2}">
 	     <httpj:tlsServerParameters>
-	      <sec:keyManagers keyPassword="password">
-	           <sec:keyStore type="JKS" password="password" 
+	      <sec:keyManagers keyPassword="OBF:1v2j1uum1xtv1zej1zer1xtn1uvk1v1v">
+	           <sec:keyStore type="JKS" password="OBF:1v2j1uum1xtv1zej1zer1xtn1uvk1v1v" 
 	                file="src/test/java/org/apache/cxf/systest/http/resources/Bethal.jks"/>
 	      </sec:keyManagers>
 	      <sec:trustManagers>
-	          <sec:keyStore type="JKS" password="password"
+	          <sec:keyStore type="JKS" password="OBF:1v2j1uum1xtv1zej1zer1xtn1uvk1v1v"
 	               file="src/test/java/org/apache/cxf/systest/http/resources/Truststore.jks"/>
 	      </sec:trustManagers>
 	      <sec:cipherSuitesFilter>
@@ -66,6 +66,7 @@
 	        <sec:include>.*_EXPORT_.*</sec:include>
 	        <sec:include>.*_EXPORT1024_.*</sec:include>
 	        <sec:include>.*_WITH_DES_.*</sec:include>
+            <sec:include>.*_WITH_AES_.*</sec:include>
 	        <sec:include>.*_WITH_NULL_.*</sec:include>
 	        <sec:exclude>.*_DH_anon_.*</sec:exclude>
 	      </sec:cipherSuitesFilter>

Modified: cxf/branches/2.4.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/BethalClientConfig.cxf
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/BethalClientConfig.cxf?rev=1212547&r1=1212546&r2=1212547&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/BethalClientConfig.cxf
(original)
+++ cxf/branches/2.4.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/BethalClientConfig.cxf
Fri Dec  9 17:56:03 2011
@@ -53,6 +53,7 @@
 	        <sec:include>.*_EXPORT_.*</sec:include>
 	        <sec:include>.*_EXPORT1024_.*</sec:include>
 	        <sec:include>.*_WITH_DES_.*</sec:include>
+            <sec:include>.*_WITH_AES_.*</sec:include>
 	        <sec:include>.*_WITH_NULL_.*</sec:include>
 	        <sec:exclude>.*_DH_anon_.*</sec:exclude>
 	      </sec:cipherSuitesFilter>

Modified: cxf/branches/2.4.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Gordy.cxf
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Gordy.cxf?rev=1212547&r1=1212546&r2=1212547&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Gordy.cxf
(original)
+++ cxf/branches/2.4.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Gordy.cxf
Fri Dec  9 17:56:03 2011
@@ -65,6 +65,7 @@
 	        <sec:include>.*_EXPORT_.*</sec:include>
 	        <sec:include>.*_EXPORT1024_.*</sec:include>
 	        <sec:include>.*_WITH_DES_.*</sec:include>
+            <sec:include>.*_WITH_AES_.*</sec:include>
 	        <sec:include>.*_WITH_NULL_.*</sec:include>
 	        <sec:exclude>.*_DH_anon_.*</sec:exclude>
 	      </sec:cipherSuitesFilter>

Modified: cxf/branches/2.4.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Morpit.cxf
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Morpit.cxf?rev=1212547&r1=1212546&r2=1212547&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Morpit.cxf
(original)
+++ cxf/branches/2.4.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Morpit.cxf
Fri Dec  9 17:56:03 2011
@@ -63,6 +63,7 @@
 	        <sec:include>.*_EXPORT_.*</sec:include>
 	        <sec:include>.*_EXPORT1024_.*</sec:include>
 	        <sec:include>.*_WITH_DES_.*</sec:include>
+            <sec:include>.*_WITH_AES_.*</sec:include>
 	        <sec:include>.*_WITH_NULL_.*</sec:include>
 	        <sec:exclude>.*_DH_anon_.*</sec:exclude>
 	      </sec:cipherSuitesFilter>

Modified: cxf/branches/2.4.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Poltim.cxf
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Poltim.cxf?rev=1212547&r1=1212546&r2=1212547&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Poltim.cxf
(original)
+++ cxf/branches/2.4.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Poltim.cxf
Fri Dec  9 17:56:03 2011
@@ -65,6 +65,7 @@
 	        <sec:include>.*_EXPORT_.*</sec:include>
 	        <sec:include>.*_EXPORT1024_.*</sec:include>
 	        <sec:include>.*_WITH_DES_.*</sec:include>
+            <sec:include>.*_WITH_AES_.*</sec:include>
 	        <sec:include>.*_WITH_NULL_.*</sec:include>
 	        <sec:exclude>.*_DH_anon_.*</sec:exclude>
 	      </sec:cipherSuitesFilter>

Modified: cxf/branches/2.4.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Tarpin.cxf
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Tarpin.cxf?rev=1212547&r1=1212546&r2=1212547&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Tarpin.cxf
(original)
+++ cxf/branches/2.4.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/http/resources/Tarpin.cxf
Fri Dec  9 17:56:03 2011
@@ -65,6 +65,7 @@
 	        <sec:include>.*_EXPORT_.*</sec:include>
 	        <sec:include>.*_EXPORT1024_.*</sec:include>
 	        <sec:include>.*_WITH_DES_.*</sec:include>
+            <sec:include>.*_WITH_AES_.*</sec:include>
 	        <sec:include>.*_WITH_NULL_.*</sec:include>
 	        <sec:exclude>.*_DH_anon_.*</sec:exclude>
 	      </sec:cipherSuitesFilter>



Mime
View raw message