Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id AB5A27DED for ; Fri, 9 Dec 2011 17:56:26 +0000 (UTC) Received: (qmail 3742 invoked by uid 500); 9 Dec 2011 17:56:26 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 3696 invoked by uid 500); 9 Dec 2011 17:56:26 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 3689 invoked by uid 99); 9 Dec 2011 17:56:26 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 09 Dec 2011 17:56:26 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 09 Dec 2011 17:56:25 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 3844923889DA for ; Fri, 9 Dec 2011 17:56:04 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit 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 -0000 To: commits@cxf.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111209175604.3844923889DA@eris.apache.org> 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 @@ - - + - @@ -66,6 +66,7 @@ .*_EXPORT_.* .*_EXPORT1024_.* .*_WITH_DES_.* + .*_WITH_AES_.* .*_WITH_NULL_.* .*_DH_anon_.* 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 @@ .*_EXPORT_.* .*_EXPORT1024_.* .*_WITH_DES_.* + .*_WITH_AES_.* .*_WITH_NULL_.* .*_DH_anon_.* 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 @@ .*_EXPORT_.* .*_EXPORT1024_.* .*_WITH_DES_.* + .*_WITH_AES_.* .*_WITH_NULL_.* .*_DH_anon_.* 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 @@ .*_EXPORT_.* .*_EXPORT1024_.* .*_WITH_DES_.* + .*_WITH_AES_.* .*_WITH_NULL_.* .*_DH_anon_.* 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 @@ .*_EXPORT_.* .*_EXPORT1024_.* .*_WITH_DES_.* + .*_WITH_AES_.* .*_WITH_NULL_.* .*_DH_anon_.* 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 @@ .*_EXPORT_.* .*_EXPORT1024_.* .*_WITH_DES_.* + .*_WITH_AES_.* .*_WITH_NULL_.* .*_DH_anon_.*