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 1EB43FFC9 for ; Thu, 21 Mar 2013 14:58:23 +0000 (UTC) Received: (qmail 41470 invoked by uid 500); 21 Mar 2013 14:58:22 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 41337 invoked by uid 500); 21 Mar 2013 14:58:21 -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 41249 invoked by uid 99); 21 Mar 2013 14:58:21 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 21 Mar 2013 14:58:21 +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; Thu, 21 Mar 2013 14:58:20 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 529B923888FD; Thu, 21 Mar 2013 14:58:00 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1459342 - in /cxf/branches/wss4j2.0-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy: WSSecurityPolicyLoader.java interceptors/SecureConversationInInterceptor.java interceptors/WSSecurityPolicyInterceptorProvider.java Date: Thu, 21 Mar 2013 14:58:00 -0000 To: commits@cxf.apache.org From: coheigea@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130321145800.529B923888FD@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: coheigea Date: Thu Mar 21 14:57:59 2013 New Revision: 1459342 URL: http://svn.apache.org/r1459342 Log: Fixing some more tests Modified: cxf/branches/wss4j2.0-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/WSSecurityPolicyLoader.java cxf/branches/wss4j2.0-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/SecureConversationInInterceptor.java cxf/branches/wss4j2.0-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/WSSecurityPolicyInterceptorProvider.java Modified: cxf/branches/wss4j2.0-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/WSSecurityPolicyLoader.java URL: http://svn.apache.org/viewvc/cxf/branches/wss4j2.0-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/WSSecurityPolicyLoader.java?rev=1459342&r1=1459341&r2=1459342&view=diff ============================================================================== --- cxf/branches/wss4j2.0-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/WSSecurityPolicyLoader.java (original) +++ cxf/branches/wss4j2.0-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/WSSecurityPolicyLoader.java Thu Mar 21 14:57:59 2013 @@ -192,7 +192,6 @@ public final class WSSecurityPolicyLoade SP11Constants.REQUIRE_KEY_IDENTIFIER_REFERENCE, SP12Constants.PROTECT_TOKENS, SP11Constants.PROTECT_TOKENS, - SP11Constants.PROTECT_TOKENS, SP12Constants.RSA_KEY_VALUE, // Layout Modified: cxf/branches/wss4j2.0-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/SecureConversationInInterceptor.java URL: http://svn.apache.org/viewvc/cxf/branches/wss4j2.0-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/SecureConversationInInterceptor.java?rev=1459342&r1=1459341&r2=1459342&view=diff ============================================================================== --- cxf/branches/wss4j2.0-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/SecureConversationInInterceptor.java (original) +++ cxf/branches/wss4j2.0-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/SecureConversationInInterceptor.java Thu Mar 21 14:57:59 2013 @@ -71,6 +71,7 @@ class SecureConversationInInterceptor ex public SecureConversationInInterceptor() { super(Phase.PRE_PROTOCOL); + getBefore().add(WSS4JInInterceptor.class.getName()); } private AbstractBinding getBinding(AssertionInfoMap aim) { Collection ais = Modified: cxf/branches/wss4j2.0-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/WSSecurityPolicyInterceptorProvider.java URL: http://svn.apache.org/viewvc/cxf/branches/wss4j2.0-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/WSSecurityPolicyInterceptorProvider.java?rev=1459342&r1=1459341&r2=1459342&view=diff ============================================================================== --- cxf/branches/wss4j2.0-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/WSSecurityPolicyInterceptorProvider.java (original) +++ cxf/branches/wss4j2.0-port/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/WSSecurityPolicyInterceptorProvider.java Thu Mar 21 14:57:59 2013 @@ -39,6 +39,11 @@ public class WSSecurityPolicyInterceptor ASSERTION_TYPES.add(SP12Constants.LAYOUT); ASSERTION_TYPES.add(SP12Constants.INCLUDE_TIMESTAMP); ASSERTION_TYPES.add(SP12Constants.ALGORITHM_SUITE); + ASSERTION_TYPES.add(SP12Constants.ENCRYPT_SIGNATURE); + ASSERTION_TYPES.add(SP12Constants.PROTECT_TOKENS); + ASSERTION_TYPES.add(SP12Constants.ENCRYPT_BEFORE_SIGNING); + ASSERTION_TYPES.add(SP12Constants.SIGN_BEFORE_ENCRYPTING); + ASSERTION_TYPES.add(SP12Constants.ONLY_SIGN_ENTIRE_HEADERS_AND_BODY); ASSERTION_TYPES.add(SP12Constants.WSS10); ASSERTION_TYPES.add(SP12Constants.WSS11); ASSERTION_TYPES.add(SP12Constants.TRUST_13); @@ -72,6 +77,11 @@ public class WSSecurityPolicyInterceptor ASSERTION_TYPES.add(SP11Constants.LAYOUT); ASSERTION_TYPES.add(SP11Constants.INCLUDE_TIMESTAMP); ASSERTION_TYPES.add(SP11Constants.ALGORITHM_SUITE); + ASSERTION_TYPES.add(SP11Constants.ENCRYPT_SIGNATURE); + ASSERTION_TYPES.add(SP11Constants.PROTECT_TOKENS); + ASSERTION_TYPES.add(SP11Constants.ENCRYPT_BEFORE_SIGNING); + ASSERTION_TYPES.add(SP11Constants.SIGN_BEFORE_ENCRYPTING); + ASSERTION_TYPES.add(SP11Constants.ONLY_SIGN_ENTIRE_HEADERS_AND_BODY); ASSERTION_TYPES.add(SP11Constants.WSS10); ASSERTION_TYPES.add(SP11Constants.WSS11); ASSERTION_TYPES.add(SP11Constants.TRUST_10);