svn commit: r1487435 - in /webservices/wss4j/trunk: ws-security-common/src/main/java/org/apache/wss4j/common/ConfigurationConstants.java ws-security-stax/src/main/java/org/apache/wss4j/stax/ConfigurationConverter.java

[coheigea]

Author: coheigea
Date: Wed May 29 10:41:20 2013
New Revision: 1487435

URL: http://svn.apache.org/r1487435
Log:
Convert derived actions as well

Modified:
    
webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/ConfigurationConstants.java
    
webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/ConfigurationConverter.java

Modified: 
webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/ConfigurationConstants.java
URL: 
http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/ConfigurationConstants.java?rev=1487435&r1=1487434&r2=1487435&view=diff
==============================================================================
--- 
webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/ConfigurationConstants.java
 (original)
+++ 
webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/ConfigurationConstants.java
 Wed May 29 10:41:20 2013
@@ -84,6 +84,18 @@ public final class ConfigurationConstant
      */
     public static final String TIMESTAMP = "Timestamp";
     
+    /**
+     * Perform a Signature action with derived keys. The signature specific 
parameters define how
+     * to sign, which keys to use, and so on.
+     */
+    public static final String SIGNATURE_DERIVED = "SignatureDerived";
+
+    /**
+     * Perform an Encryption action with derived keys. The encryption specific 
parameters define how 
+     * to encrypt, which keys to use, and so on.
+     */
+    public static final String ENCRYPT_DERIVED = "EncryptDerived";
+    
     //
     // User properties
     //

Modified: 
webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/ConfigurationConverter.java
URL: 
http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/ConfigurationConverter.java?rev=1487435&r1=1487434&r2=1487435&view=diff
==============================================================================
--- 
webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/ConfigurationConverter.java
 (original)
+++ 
webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/ConfigurationConverter.java
 Wed May 29 10:41:20 2013
@@ -100,6 +100,10 @@ public final class ConfigurationConverte
                 actions.add(WSSConstants.TIMESTAMP);
             } else if 
(single[i].equals(ConfigurationConstants.USERNAME_TOKEN_SIGNATURE)) {
                 actions.add(WSSConstants.USERNAMETOKEN_SIGNED);
+            } else if 
(single[i].equals(ConfigurationConstants.SIGNATURE_DERIVED)) {
+                actions.add(WSSConstants.SIGNATURE_WITH_DERIVED_KEY);
+            } else if 
(single[i].equals(ConfigurationConstants.ENCRYPT_DERIVED)) {
+                actions.add(WSSConstants.ENCRYPT_WITH_DERIVED_KEY);
             }
         }