svn commit: r618554 - in /webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders: SecureConversationTokenBuilder.java X509TokenBuilder.java

[nandana]

Author: nandana
Date: Mon Feb  4 21:47:56 2008
New Revision: 618554

URL: http://svn.apache.org/viewvc?rev=618554&view=rev
Log:
rampart-policy related changes to support WS Security Policy 1.2

Modified:
    
webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/SecureConversationTokenBuilder.java
    
webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/X509TokenBuilder.java

Modified: 
webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/SecureConversationTokenBuilder.java
URL: 
http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/SecureConversationTokenBuilder.java?rev=618554&r1=618553&r2=618554&view=diff
==============================================================================
--- 
webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/SecureConversationTokenBuilder.java
 (original)
+++ 
webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/SecureConversationTokenBuilder.java
 Mon Feb  4 21:47:56 2008
@@ -53,6 +53,10 @@
         if (element != null) {
             if 
(element.getFirstChildWithName(SP12Constants.REQUIRE_DERIVED_KEYS) != null) {
                 conversationToken.setDerivedKeys(true);
+            } else if 
(element.getFirstChildWithName(SP12Constants.REQUIRE_IMPLIED_DERIVED_KEYS) != 
null) {
+                conversationToken.setImpliedDerivedKeys(true);
+            } else if 
(element.getFirstChildWithName(SP12Constants.REQUIRE_EXPLICIT_DERIVED_KEYS) != 
null) {
+                conversationToken.setExplicitDerivedKeys(true);
             }
 
             if (element

Modified: 
webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/X509TokenBuilder.java
URL: 
http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/X509TokenBuilder.java?rev=618554&r1=618553&r2=618554&view=diff
==============================================================================
--- 
webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/X509TokenBuilder.java
 (original)
+++ 
webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/X509TokenBuilder.java
 Mon Feb  4 21:47:56 2008
@@ -50,6 +50,10 @@
             
             if 
(policyElement.getFirstChildWithName(SP12Constants.REQUIRE_DERIVED_KEYS) != 
null) {
                 x509Token.setDerivedKeys(true);
+            } else if 
(policyElement.getFirstChildWithName(SP12Constants.REQUIRE_IMPLIED_DERIVED_KEYS)
 != null) {
+                x509Token.setImpliedDerivedKeys(true);
+            } else if 
(policyElement.getFirstChildWithName(SP12Constants.REQUIRE_EXPLICIT_DERIVED_KEYS)
 != null) {
+                x509Token.setExplicitDerivedKeys(true);
             }
             
             Policy policy = PolicyEngine.getPolicy(element.getFirstElement());
@@ -101,20 +105,17 @@
                 parent.setTokenVersionAndType(SPConstants.WSS_X509_V3_TOKEN11);
 
             } else if (SP12Constants.WSS_X509_PKCS7_TOKEN_10.equals(name)) {
-                parent
-                        
.setTokenVersionAndType(SPConstants.WSS_X509_PKCS7_TOKEN10);
-
+                
parent.setTokenVersionAndType(SPConstants.WSS_X509_PKCS7_TOKEN10);
+                
             } else if (SP12Constants.WSS_X509_PKCS7_TOKEN_11.equals(name)) {
-                parent
-                        
.setTokenVersionAndType(SPConstants.WSS_X509_PKCS7_TOKEN11);
-
+                
parent.setTokenVersionAndType(SPConstants.WSS_X509_PKCS7_TOKEN11);
+                
             } else if 
(SP12Constants.WSS_X509_PKI_PATH_V1_TOKEN_10.equals(name)) {
-                parent
-                        
.setTokenVersionAndType(SPConstants.WSS_X509_PKI_PATH_V1_TOKEN10);
-
+                
parent.setTokenVersionAndType(SPConstants.WSS_X509_PKI_PATH_V1_TOKEN10);
+                
             } else if 
(SP12Constants.WSS_X509_PKI_PATH_V1_TOKEN_11.equals(name)) {
-                parent
-                        
.setTokenVersionAndType(SPConstants.WSS_X509_PKI_PATH_V1_TOKEN11);
+                
parent.setTokenVersionAndType(SPConstants.WSS_X509_PKI_PATH_V1_TOKEN11);
+                
             }
         }
     }