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 E216BFB07 for ; Fri, 22 Mar 2013 11:24:31 +0000 (UTC) Received: (qmail 5367 invoked by uid 500); 22 Mar 2013 11:24:31 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 5252 invoked by uid 500); 22 Mar 2013 11:24:31 -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 5245 invoked by uid 99); 22 Mar 2013 11:24:31 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 22 Mar 2013 11:24:31 +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, 22 Mar 2013 11:24:27 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 8F00C238889B; Fri, 22 Mar 2013 11:24:05 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1459724 - in /cxf/branches/2.5.x-fixes: services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/ systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/kerberos/server/ systests/ws-security/src/test/... Date: Fri, 22 Mar 2013 11:24:05 -0000 To: commits@cxf.apache.org From: coheigea@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130322112405.8F00C238889B@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: coheigea Date: Fri Mar 22 11:24:04 2013 New Revision: 1459724 URL: http://svn.apache.org/r1459724 Log: Merged revisions 1459716 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes ........ r1459716 | coheigea | 2013-03-22 11:13:00 +0000 (Fri, 22 Mar 2013) | 18 lines Merged revisions 1459707 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes ........ r1459707 | coheigea | 2013-03-22 10:53:59 +0000 (Fri, 22 Mar 2013) | 10 lines Merged revisions 1459705 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/trunk ........ r1459705 | coheigea | 2013-03-22 10:51:38 +0000 (Fri, 22 Mar 2013) | 2 lines Fixing some TLS stuff in the tests ........ ........ ........ Modified: cxf/branches/2.5.x-fixes/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-transport.xml cxf/branches/2.5.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/kerberos/server/server.xml cxf/branches/2.5.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/server/server.xml cxf/branches/2.5.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/server/server.xml cxf/branches/2.5.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server/server.xml cxf/branches/2.5.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server/server_restricted.xml cxf/branches/2.5.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server/server_restricted_authorized.xml cxf/branches/2.5.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server/server_restricted_authorized_2.xml Modified: cxf/branches/2.5.x-fixes/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-transport.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-transport.xml?rev=1459724&r1=1459723&r2=1459724&view=diff ============================================================================== --- cxf/branches/2.5.x-fixes/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-transport.xml (original) +++ cxf/branches/2.5.x-fixes/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-transport.xml Fri Mar 22 11:24:04 2013 @@ -110,7 +110,8 @@ address="https://localhost:${testutil.ports.STSServer}/SecurityTokenService/Transport" wsdlLocation="src/test/resources/org/apache/cxf/systest/sts/deployment/ws-trust-1.4-service.wsdl" xmlns:ns1="http://docs.oasis-open.org/ws-sx/ws-trust/200512/" - serviceName="ns1:SecurityTokenService" endpointName="ns1:Transport_Port"> + serviceName="ns1:SecurityTokenService" endpointName="ns1:Transport_Port" + depends-on="ClientAuthHttpsSettings"> Modified: cxf/branches/2.5.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/kerberos/server/server.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/kerberos/server/server.xml?rev=1459724&r1=1459723&r2=1459724&view=diff ============================================================================== --- cxf/branches/2.5.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/kerberos/server/server.xml (original) +++ cxf/branches/2.5.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/kerberos/server/server.xml Fri Mar 22 11:24:04 2013 @@ -63,6 +63,7 @@ .*_EXPORT_.* .*_EXPORT1024_.* .*_WITH_DES_.* + .*_WITH_AES_.* .*_WITH_NULL_.* .*_DH_anon_.* Modified: cxf/branches/2.5.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/server/server.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/server/server.xml?rev=1459724&r1=1459723&r2=1459724&view=diff ============================================================================== --- cxf/branches/2.5.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/server/server.xml (original) +++ cxf/branches/2.5.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/server/server.xml Fri Mar 22 11:24:04 2013 @@ -138,7 +138,7 @@ address="https://localhost:${testutil.ports.Server.2}/DoubleItClientCert" serviceName="s:DoubleItService" endpointName="s:DoubleItClientCertPort" xmlns:s="http://www.example.org/contract/DoubleIt" implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl" - wsdlLocation="org/apache/cxf/systest/ws/policy/DoubleItPolicy.wsdl"> + wsdlLocation="org/apache/cxf/systest/ws/policy/DoubleItPolicy.wsdl" depends-on="tls-settings"> + wsdlLocation="org/apache/cxf/systest/ws/saml/DoubleItSaml.wsdl" + depends-on="tls-settings"> + wsdlLocation="org/apache/cxf/systest/ws/saml/DoubleItSaml.wsdl" + depends-on="tls-settings"> + wsdlLocation="org/apache/cxf/systest/ws/saml/DoubleItSaml.wsdl" + depends-on="tls-settings"> + wsdlLocation="org/apache/cxf/systest/ws/saml/DoubleItSaml.wsdl" + depends-on="tls-settings"> + wsdlLocation="org/apache/cxf/systest/ws/saml/DoubleItSaml.wsdl" + depends-on="tls-settings"> + wsdlLocation="org/apache/cxf/systest/ws/saml/DoubleItSaml.wsdl" + depends-on="tls-settings"> - Modified: cxf/branches/2.5.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server/server_restricted.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server/server_restricted.xml?rev=1459724&r1=1459723&r2=1459724&view=diff ============================================================================== --- cxf/branches/2.5.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server/server_restricted.xml (original) +++ cxf/branches/2.5.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server/server_restricted.xml Fri Mar 22 11:24:04 2013 @@ -60,14 +60,15 @@ - @@ -96,8 +97,7 @@ address="http://localhost:${testutil.ports.Server}/UserName" serviceName="interop:PingService" endpointName="interop:UserName_IPingService" - implementor="org.apache.cxf.systest.ws.wssec10.server.UserNameOverTransportRestricted" - depends-on="tls-settings"> + implementor="org.apache.cxf.systest.ws.wssec10.server.UserNameOverTransportRestricted"> Modified: cxf/branches/2.5.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server/server_restricted_authorized.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server/server_restricted_authorized.xml?rev=1459724&r1=1459723&r2=1459724&view=diff ============================================================================== --- cxf/branches/2.5.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server/server_restricted_authorized.xml (original) +++ cxf/branches/2.5.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server/server_restricted_authorized.xml Fri Mar 22 11:24:04 2013 @@ -53,14 +53,15 @@ - Modified: cxf/branches/2.5.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server/server_restricted_authorized_2.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server/server_restricted_authorized_2.xml?rev=1459724&r1=1459723&r2=1459724&view=diff ============================================================================== --- cxf/branches/2.5.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server/server_restricted_authorized_2.xml (original) +++ cxf/branches/2.5.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server/server_restricted_authorized_2.xml Fri Mar 22 11:24:04 2013 @@ -53,14 +53,15 @@ -