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 A2A7C10E1A for ; Mon, 16 Sep 2013 14:12:36 +0000 (UTC) Received: (qmail 37512 invoked by uid 500); 16 Sep 2013 14:12:33 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 37393 invoked by uid 500); 16 Sep 2013 14:12:32 -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 37376 invoked by uid 99); 16 Sep 2013 14:12:31 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 16 Sep 2013 14:12: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; Mon, 16 Sep 2013 14:12:28 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 66A962388994; Mon, 16 Sep 2013 14:12:07 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1523656 - in /cxf/branches/2.7.x-fixes/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec: client/Client.java server/Server.java Date: Mon, 16 Sep 2013 14:12:07 -0000 To: commits@cxf.apache.org From: coheigea@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20130916141207.66A962388994@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: coheigea Date: Mon Sep 16 14:12:06 2013 New Revision: 1523656 URL: http://svn.apache.org/r1523656 Log: Merged revisions 1523654 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/trunk ........ r1523654 | coheigea | 2013-09-16 15:06:42 +0100 (Mon, 16 Sep 2013) | 2 lines Encrypt the UsernameToken rather than the Timestamp in the sample ........ Modified: cxf/branches/2.7.x-fixes/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/client/Client.java cxf/branches/2.7.x-fixes/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/server/Server.java Modified: cxf/branches/2.7.x-fixes/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/client/Client.java URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/client/Client.java?rev=1523656&r1=1523655&r2=1523656&view=diff ============================================================================== --- cxf/branches/2.7.x-fixes/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/client/Client.java (original) +++ cxf/branches/2.7.x-fixes/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/client/Client.java Mon Sep 16 14:12:06 2013 @@ -38,6 +38,8 @@ import org.apache.cxf.ws.security.wss4j. public final class Client { + private static final String WSSE_NS + = "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd"; private static final String WSU_NS = "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd"; @@ -66,7 +68,7 @@ public final class Client { outProps.put("encryptionPropFile", "etc/Client_Encrypt.properties"); outProps.put("encryptionKeyIdentifier", "IssuerSerial"); outProps.put("encryptionParts", - "{Element}{" + WSU_NS + "}Timestamp;" + "{Element}{" + WSSE_NS + "}UsernameToken;" + "{Content}{http://schemas.xmlsoap.org/soap/envelope/}Body"); outProps.put("signaturePropFile", "etc/Client_Sign.properties"); Modified: cxf/branches/2.7.x-fixes/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/server/Server.java URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/server/Server.java?rev=1523656&r1=1523655&r2=1523656&view=diff ============================================================================== --- cxf/branches/2.7.x-fixes/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/server/Server.java (original) +++ cxf/branches/2.7.x-fixes/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/server/Server.java Mon Sep 16 14:12:06 2013 @@ -34,6 +34,8 @@ import org.apache.cxf.ws.security.wss4j. import org.apache.cxf.ws.security.wss4j.WSS4JOutInterceptor; public class Server { + private static final String WSSE_NS + = "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd"; private static final String WSU_NS = "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd"; @@ -57,7 +59,7 @@ public class Server { outProps.put("encryptionUser", "clientx509v1"); outProps.put("encryptionPropFile", "etc/Server_SignVerf.properties"); outProps.put("encryptionKeyIdentifier", "IssuerSerial"); - outProps.put("encryptionParts", "{Element}{" + WSU_NS + "}Timestamp;" + outProps.put("encryptionParts", "{Element}{" + WSSE_NS + "}UsernameToken;" + "{Content}{http://schemas.xmlsoap.org/soap/envelope/}Body"); outProps.put("signaturePropFile", "etc/Server_Decrypt.properties");