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 B45754A4B for ; Mon, 9 May 2011 16:01:10 +0000 (UTC) Received: (qmail 26182 invoked by uid 500); 9 May 2011 16:01:10 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 26140 invoked by uid 500); 9 May 2011 16:01:10 -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 26133 invoked by uid 99); 9 May 2011 16:01:10 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 09 May 2011 16:01:10 +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; Mon, 09 May 2011 16:01:08 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 95E362388A33; Mon, 9 May 2011 16:00:46 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1101079 - in /cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy: builders/SignedPartsBuilder.java model/SignedEncryptedElements.java Date: Mon, 09 May 2011 16:00:46 -0000 To: commits@cxf.apache.org From: coheigea@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110509160046.95E362388A33@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: coheigea Date: Mon May 9 16:00:46 2011 New Revision: 1101079 URL: http://svn.apache.org/viewvc?rev=1101079&view=rev Log: Default to signing the SOAP Body for an empty SignedParts policy assertion. Modified: cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/SignedPartsBuilder.java cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/SignedEncryptedElements.java Modified: cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/SignedPartsBuilder.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/SignedPartsBuilder.java?rev=1101079&r1=1101078&r2=1101079&view=diff ============================================================================== --- cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/SignedPartsBuilder.java (original) +++ cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/SignedPartsBuilder.java Mon May 9 16:00:46 2011 @@ -59,6 +59,14 @@ public class SignedPartsBuilder implemen nd = nd.getNextSibling(); } + // + // If SignedParts is empty then default to signing the SOAP Body + // + if (!signedEncryptedParts.isBody() && !signedEncryptedParts.isAttachments() + && signedEncryptedParts.getHeaders().isEmpty()) { + signedEncryptedParts.setBody(true); + } + return signedEncryptedParts; } Modified: cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/SignedEncryptedElements.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/SignedEncryptedElements.java?rev=1101079&r1=1101078&r2=1101079&view=diff ============================================================================== --- cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/SignedEncryptedElements.java (original) +++ cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/SignedEncryptedElements.java Mon May 9 16:00:46 2011 @@ -43,11 +43,11 @@ public class SignedEncryptedElements ext /** * Just a flag to identify whether this holds sign element info or encr elements info */ - private boolean signedElemets; + private boolean signedElements; public SignedEncryptedElements(boolean signedElements, SPConstants version) { super(version); - this.signedElemets = signedElements; + this.signedElements = signedElements; } /** @@ -76,10 +76,10 @@ public class SignedEncryptedElements ext } /** - * @return Returns the signedElemets. + * @return Returns the signedElements. */ public boolean isSignedElemets() { - return signedElemets; + return signedElements; } public Map getDeclaredNamespaces() { @@ -127,13 +127,13 @@ public class SignedEncryptedElements ext } public QName getRealName() { - if (signedElemets) { + if (signedElements) { return constants.getSignedElements(); } return constants.getEncryptedElements(); } public QName getName() { - if (signedElemets) { + if (signedElements) { return SP12Constants.INSTANCE.getSignedElements(); } return SP12Constants.INSTANCE.getEncryptedElements();