svn commit: r619877 - /webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/Trust13Builder.java

[nandana]

Author: nandana
Date: Fri Feb  8 05:28:06 2008
New Revision: 619877

URL: http://svn.apache.org/viewvc?rev=619877&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/Trust13Builder.java

Modified: 
webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/Trust13Builder.java
URL: 
http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/Trust13Builder.java?rev=619877&r1=619876&r2=619877&view=diff
==============================================================================
--- 
webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/Trust13Builder.java
 (original)
+++ 
webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/Trust13Builder.java
 Fri Feb  8 05:28:06 2008
@@ -23,7 +23,7 @@
 import org.apache.neethi.builders.AssertionBuilder;
 import org.apache.ws.secpolicy.SPConstants;
 import org.apache.ws.secpolicy.SP12Constants;
-import org.apache.ws.secpolicy.model.Trust10;
+import org.apache.ws.secpolicy.model.Trust13;
 
 public class Trust13Builder implements AssertionBuilder {
 
@@ -37,31 +37,39 @@
                     "Trust10 assertion doesn't contain any Policy");
         }
 
-        Trust10 trust10 = new Trust10(SPConstants.SP_V12);
+        Trust13 trust13 = new Trust13(SPConstants.SP_V12);
 
         if (element
                 
.getFirstChildWithName(SP12Constants.MUST_SUPPORT_CLIENT_CHALLENGE) != null) {
-            trust10.setMustSupportClientChallenge(true);
+            trust13.setMustSupportClientChallenge(true);
         }
 
         if (element
                 
.getFirstChildWithName(SP12Constants.MUST_SUPPORT_SERVER_CHALLENGE) != null) {
-            trust10.setMustSupportServerChallenge(true);
+            trust13.setMustSupportServerChallenge(true);
         }
 
         if 
(element.getFirstChildWithName(SP12Constants.REQUIRE_CLIENT_ENTROPY) != null) {
-            trust10.setRequireClientEntropy(true);
+            trust13.setRequireClientEntropy(true);
         }
 
         if 
(element.getFirstChildWithName(SP12Constants.REQUIRE_SERVER_ENTROPY) != null) {
-            trust10.setRequireServerEntropy(true);
+            trust13.setRequireServerEntropy(true);
         }
 
         if 
(element.getFirstChildWithName(SP12Constants.MUST_SUPPORT_ISSUED_TOKENS) != 
null) {
-            trust10.setMustSupportIssuedTokens(true);
+            trust13.setMustSupportIssuedTokens(true);
+        }
+        
+        if 
(element.getFirstChildWithName(SP12Constants.REQUIRE_REQUEST_SECURITY_TOKEN_COLLECTION)
 != null) {
+            trust13.setRequireRequestSecurityTokenCollection(true);
+        }
+        
+        if (element.getFirstChildWithName(SP12Constants.REQUIRE_APPLIES_TO) != 
null) {
+            trust13.setRequireAppliesTo(true);
         }
 
-        return trust10;
+        return trust13;
     }
 
     public QName[] getKnownElements() {