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 2013/12/13 15:48:43 UTC

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

Author: coheigea
Date: Fri Dec 13 14:48:43 2013
New Revision: 1550745

URL: http://svn.apache.org/r1550745
Log:
Fixing streaming ws-security sample

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

Modified: cxf/trunk/distribution/src/main/release/samples/ws_security/stax_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/stax_sign_enc/src/main/java/demo/wssec/client/Client.java?rev=1550745&r1=1550744&r2=1550745&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/ws_security/stax_sign_enc/src/main/java/demo/wssec/client/Client.java (original)
+++ cxf/trunk/distribution/src/main/release/samples/ws_security/stax_sign_enc/src/main/java/demo/wssec/client/Client.java Fri Dec 13 14:48:43 2013
@@ -64,12 +64,11 @@ public final class Client {
                 CryptoFactory.getProperties("etc/Client_Sign.properties", Server.class.getClassLoader());
             
             WSSSecurityProperties properties = new WSSSecurityProperties();
-            properties.setOutAction(
-                new XMLSecurityConstants.Action[] {
-                    WSSConstants.USERNAMETOKEN, WSSConstants.TIMESTAMP, WSSConstants.SIGNATURE, 
-                    WSSConstants.ENCRYPT
-                }
-            );
+            properties.addAction(WSSConstants.USERNAMETOKEN);
+            properties.addAction(WSSConstants.TIMESTAMP);
+            properties.addAction(WSSConstants.SIGNATURE);
+            properties.addAction(WSSConstants.ENCRYPT);
+
             properties.setUsernameTokenPasswordType(WSSConstants.UsernameTokenPasswordType.PASSWORD_DIGEST);
             properties.setTokenUser("abcd");
             properties.setSignatureUser("clientx509v1");

Modified: cxf/trunk/distribution/src/main/release/samples/ws_security/stax_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/stax_sign_enc/src/main/java/demo/wssec/server/Server.java?rev=1550745&r1=1550744&r2=1550745&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/ws_security/stax_sign_enc/src/main/java/demo/wssec/server/Server.java (original)
+++ cxf/trunk/distribution/src/main/release/samples/ws_security/stax_sign_enc/src/main/java/demo/wssec/server/Server.java Fri Dec 13 14:48:43 2013
@@ -61,12 +61,11 @@ public class Server {
             CryptoFactory.getProperties("etc/Server_SignVerf.properties", Server.class.getClassLoader());
         
         WSSSecurityProperties properties = new WSSSecurityProperties();
-        properties.setOutAction(
-            new XMLSecurityConstants.Action[] {
-                WSSConstants.USERNAMETOKEN, WSSConstants.TIMESTAMP, WSSConstants.SIGNATURE, 
-                WSSConstants.ENCRYPT
-            }
-        );
+        properties.addAction(WSSConstants.USERNAMETOKEN);
+        properties.addAction(WSSConstants.TIMESTAMP);
+        properties.addAction(WSSConstants.SIGNATURE);
+        properties.addAction(WSSConstants.ENCRYPT);
+
         properties.setUsernameTokenPasswordType(WSSConstants.UsernameTokenPasswordType.PASSWORD_TEXT);
         properties.setTokenUser("Alice");
         properties.setSignatureUser("serverx509v1");