svn commit: r1523654 - in /cxf/trunk/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec: client/Client.java server/Server.java

[coheigea]

Author: coheigea
Date: Mon Sep 16 14:06:42 2013
New Revision: 1523654

URL: http://svn.apache.org/r1523654
Log:
Encrypt the UsernameToken rather than the Timestamp in the sample

Modified:
    
cxf/trunk/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/client/Client.java
    
cxf/trunk/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/server/Server.java

Modified: 
cxf/trunk/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/client/Client.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/client/Client.java?rev=1523654&r1=1523653&r2=1523654&view=diff
==============================================================================
--- 
cxf/trunk/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/client/Client.java
 (original)
+++ 
cxf/trunk/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/client/Client.java
 Mon Sep 16 14:06:42 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/trunk/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/server/Server.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/server/Server.java?rev=1523654&r1=1523653&r2=1523654&view=diff
==============================================================================
--- 
cxf/trunk/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/server/Server.java
 (original)
+++ 
cxf/trunk/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/server/Server.java
 Mon Sep 16 14:06:42 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");