cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject svn commit: r1523663 - in /cxf/branches/2.6.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:20:02 GMT
Author: coheigea
Date: Mon Sep 16 14:20:02 2013
New Revision: 1523663

URL: http://svn.apache.org/r1523663
Log:
Merged revisions 1523656 via  git cherry-pick from
https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes

........
  r1523656 | coheigea | 2013-09-16 15:12:06 +0100 (Mon, 16 Sep 2013) | 10 lines

  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.6.x-fixes/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/client/Client.java
    cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/server/Server.java

Modified: cxf/branches/2.6.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.6.x-fixes/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/client/Client.java?rev=1523663&r1=1523662&r2=1523663&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/client/Client.java
(original)
+++ cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/client/Client.java
Mon Sep 16 14:20:02 2013
@@ -39,6 +39,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";
 
@@ -67,7 +69,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.6.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.6.x-fixes/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/server/Server.java?rev=1523663&r1=1523662&r2=1523663&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/server/Server.java
(original)
+++ cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/server/Server.java
Mon Sep 16 14:20:02 2013
@@ -35,6 +35,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";
 
@@ -65,7 +67,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");



Mime
View raw message