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 7122F109D4 for ; Tue, 17 Dec 2013 13:50:56 +0000 (UTC) Received: (qmail 68957 invoked by uid 500); 17 Dec 2013 13:50:54 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 68846 invoked by uid 500); 17 Dec 2013 13:50:54 -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 68839 invoked by uid 99); 17 Dec 2013 13:50:53 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 17 Dec 2013 13:50:53 +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; Tue, 17 Dec 2013 13:50:52 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 55902238890B; Tue, 17 Dec 2013 13:50:32 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1551542 - /cxf/branches/2.7.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/WSSecurityInterceptorProvider.java Date: Tue, 17 Dec 2013 13:50:32 -0000 To: commits@cxf.apache.org From: coheigea@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20131217135032.55902238890B@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: coheigea Date: Tue Dec 17 13:50:31 2013 New Revision: 1551542 URL: http://svn.apache.org/r1551542 Log: Merged revisions 1551540 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/trunk ........ r1551540 | coheigea | 2013-12-17 13:40:19 +0000 (Tue, 17 Dec 2013) | 2 lines Also engage the WSS4J policy handlers on a SignedParts policy, in case we have no binding ........ Modified: cxf/branches/2.7.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/WSSecurityInterceptorProvider.java Modified: cxf/branches/2.7.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/WSSecurityInterceptorProvider.java URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/WSSecurityInterceptorProvider.java?rev=1551542&r1=1551541&r2=1551542&view=diff ============================================================================== --- cxf/branches/2.7.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/WSSecurityInterceptorProvider.java (original) +++ cxf/branches/2.7.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/WSSecurityInterceptorProvider.java Tue Dec 17 13:50:31 2013 @@ -41,6 +41,15 @@ public class WSSecurityInterceptorProvid ASSERTION_TYPES.add(SP12Constants.TRANSPORT_BINDING); ASSERTION_TYPES.add(SP12Constants.ASYMMETRIC_BINDING); ASSERTION_TYPES.add(SP12Constants.SYMMETRIC_BINDING); +<<<<<<< HEAD +======= + ASSERTION_TYPES.add(SP12Constants.SIGNED_PARTS); + + ASSERTION_TYPES.add(SP11Constants.TRANSPORT_BINDING); + ASSERTION_TYPES.add(SP11Constants.ASYMMETRIC_BINDING); + ASSERTION_TYPES.add(SP11Constants.SYMMETRIC_BINDING); + ASSERTION_TYPES.add(SP11Constants.SIGNED_PARTS); +>>>>>>> 5b06160... Also engage the WSS4J policy handlers on a SignedParts policy, in case we have no binding } public WSSecurityInterceptorProvider() {