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 4042610BEA for ; Thu, 16 Jan 2014 11:56:06 +0000 (UTC) Received: (qmail 36395 invoked by uid 500); 16 Jan 2014 11:56:04 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 36336 invoked by uid 500); 16 Jan 2014 11:56:03 -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 36328 invoked by uid 99); 16 Jan 2014 11:56:03 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 16 Jan 2014 11:56:03 +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, 16 Jan 2014 11:56:00 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 28C7823889E2; Thu, 16 Jan 2014 11:55:39 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1558766 - in /cxf/trunk/distribution/src/main/release/samples/ws_security: sign_enc/src/main/java/demo/wssec/client/ sign_enc/src/main/java/demo/wssec/server/ ut_sign/ ut_sign/src/main/java/demo/wssec/client/ ut_sign/src/main/java/demo/wss... Date: Thu, 16 Jan 2014 11:55:39 -0000 To: commits@cxf.apache.org From: coheigea@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140116115539.28C7823889E2@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: coheigea Date: Thu Jan 16 11:55:38 2014 New Revision: 1558766 URL: http://svn.apache.org/r1558766 Log: Fixing sign_enc demo. Deleting ut_sign demo. Removed: cxf/trunk/distribution/src/main/release/samples/ws_security/ut_sign/README.txt cxf/trunk/distribution/src/main/release/samples/ws_security/ut_sign/logging.properties cxf/trunk/distribution/src/main/release/samples/ws_security/ut_sign/pom.xml cxf/trunk/distribution/src/main/release/samples/ws_security/ut_sign/src/main/java/demo/wssec/client/Client.java cxf/trunk/distribution/src/main/release/samples/ws_security/ut_sign/src/main/java/demo/wssec/client/StaxClient.java cxf/trunk/distribution/src/main/release/samples/ws_security/ut_sign/src/main/java/demo/wssec/client/UTPasswordCallback.java cxf/trunk/distribution/src/main/release/samples/ws_security/ut_sign/src/main/java/demo/wssec/client/wssec.xml cxf/trunk/distribution/src/main/release/samples/ws_security/ut_sign/src/main/java/demo/wssec/common/ConciseFormatter.java cxf/trunk/distribution/src/main/release/samples/ws_security/ut_sign/src/main/java/demo/wssec/server/GreeterImpl.java cxf/trunk/distribution/src/main/release/samples/ws_security/ut_sign/src/main/java/demo/wssec/server/Server.java cxf/trunk/distribution/src/main/release/samples/ws_security/ut_sign/src/main/java/demo/wssec/server/StaxServer.java cxf/trunk/distribution/src/main/release/samples/ws_security/ut_sign/src/main/java/demo/wssec/server/UTPasswordCallback.java cxf/trunk/distribution/src/main/release/samples/ws_security/ut_sign/src/main/java/demo/wssec/server/wssec.xml cxf/trunk/distribution/src/main/release/samples/ws_security/ut_sign/src/main/resources/etc/Client_Encrypt.properties cxf/trunk/distribution/src/main/release/samples/ws_security/ut_sign/src/main/resources/etc/Client_Sign.properties cxf/trunk/distribution/src/main/release/samples/ws_security/ut_sign/src/main/resources/etc/Server_Decrypt.properties cxf/trunk/distribution/src/main/release/samples/ws_security/ut_sign/src/main/resources/etc/Server_SignVerf.properties cxf/trunk/distribution/src/main/release/samples/ws_security/ut_sign/src/main/resources/keystore/client-keystore.jks cxf/trunk/distribution/src/main/release/samples/ws_security/ut_sign/src/main/resources/keystore/client-truststore.jks cxf/trunk/distribution/src/main/release/samples/ws_security/ut_sign/src/main/resources/keystore/server-keystore.jks cxf/trunk/distribution/src/main/release/samples/ws_security/ut_sign/src/main/resources/keystore/server-truststore.jks cxf/trunk/distribution/src/main/release/samples/ws_security/ut_sign/wsdl/hello_world_wssec.wsdl Modified: cxf/trunk/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/client/StaxClient.java cxf/trunk/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/server/StaxServer.java Modified: cxf/trunk/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/client/StaxClient.java URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/client/StaxClient.java?rev=1558766&r1=1558765&r2=1558766&view=diff ============================================================================== --- cxf/trunk/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/client/StaxClient.java (original) +++ cxf/trunk/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/client/StaxClient.java Thu Jan 16 11:55:38 2014 @@ -83,7 +83,7 @@ public final class StaxClient { "http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p" ); properties.addEncryptionPart( - new SecurePart(new QName(WSSConstants.NS_WSU10, "Timestamp"), SecurePart.Modifier.Element) + new SecurePart(new QName(WSSConstants.NS_WSSE10, "UsernameToken"), SecurePart.Modifier.Element) ); properties.addEncryptionPart( new SecurePart(new QName(WSSConstants.NS_SOAP11, "Body"), SecurePart.Modifier.Content) Modified: cxf/trunk/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/server/StaxServer.java URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/server/StaxServer.java?rev=1558766&r1=1558765&r2=1558766&view=diff ============================================================================== --- cxf/trunk/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/server/StaxServer.java (original) +++ cxf/trunk/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/server/StaxServer.java Thu Jan 16 11:55:38 2014 @@ -81,7 +81,7 @@ public class StaxServer { "http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p" ); properties.addEncryptionPart( - new SecurePart(new QName(WSSConstants.NS_WSU10, "Timestamp"), SecurePart.Modifier.Element) + new SecurePart(new QName(WSSConstants.NS_WSSE10, "UsernameToken"), SecurePart.Modifier.Element) ); properties.addEncryptionPart( new SecurePart(new QName(WSSConstants.NS_SOAP11, "Body"), SecurePart.Modifier.Content)