You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2014/01/16 12:55:39 UTC
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...

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)