svn commit: r1051709 - in /axis/axis2/java/rampart/trunk/modules: rampart-core/src/main/java/org/apache/rampart/policy/ rampart-policy/src/main/java/org/apache/ws/secpolicy/model/ rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/

[samisa]

Author: samisa
Date: Wed Dec 22 00:15:32 2010
New Revision: 1051709

URL: http://svn.apache.org/viewvc?rev=1051709&view=rev
Log:
Fixed the problem of sp:ProtectTokens assertion being ignored w/ transport 
security binding - RAMPART-283

Modified:
    
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/policy/RampartPolicyBuilder.java
    
axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/TransportBinding.java
    
axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/TransportBindingBuilder.java

Modified: 
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/policy/RampartPolicyBuilder.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/policy/RampartPolicyBuilder.java?rev=1051709&r1=1051708&r2=1051709&view=diff
==============================================================================
--- 
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/policy/RampartPolicyBuilder.java
 (original)
+++ 
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/policy/RampartPolicyBuilder.java
 Wed Dec 22 00:15:32 2010
@@ -127,6 +127,7 @@ public class RampartPolicyBuilder {
     private static void processTransportBinding(TransportBinding binding, 
RampartPolicyData rpd) {
         binding(binding, rpd);
         rpd.setTransportBinding(true);
+        rpd.setTokenProtection(binding.isTokenProtection());
         TransportToken transportToken = binding.getTransportToken();
         if ( transportToken != null ) {
             rpd.setTransportToken(transportToken.getTransportToken());

Modified: 
axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/TransportBinding.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/TransportBinding.java?rev=1051709&r1=1051708&r2=1051709&view=diff
==============================================================================
--- 
axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/TransportBinding.java
 (original)
+++ 
axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/TransportBinding.java
 Wed Dec 22 00:15:32 2010
@@ -37,9 +37,12 @@ public class TransportBinding extends Bi
     private TransportToken transportToken;
 
     private List transportBindings;
+    
+    private boolean tokenProtection;
 
     public TransportBinding(int version) {
         super(version);
+        this.tokenProtection = false;
     }
     /**
      * @return Returns the transportToken.
@@ -55,6 +58,21 @@ public class TransportBinding extends Bi
     public void setTransportToken(TransportToken transportToken) {
         this.transportToken = transportToken;
     }
+    
+    /**
+     * @return Returns the tokenProtection.
+     */
+    public boolean isTokenProtection() {
+        return tokenProtection;
+    }
+
+    /**
+     * @param tokenProtection The tokenProtection to set.
+     */
+    public void setTokenProtection(boolean tokenProtection) {
+        this.tokenProtection = tokenProtection;
+    }
+    
 
     public List getConfigurations() {
         return transportBindings;

Modified: 
axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/TransportBindingBuilder.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/TransportBindingBuilder.java?rev=1051709&r1=1051708&r2=1051709&view=diff
==============================================================================
--- 
axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/TransportBindingBuilder.java
 (original)
+++ 
axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/TransportBindingBuilder.java
 Wed Dec 22 00:15:32 2010
@@ -77,6 +77,9 @@ public class TransportBindingBuilder imp
             } else if (name.equals(SP12Constants.LAYOUT)) {
                 parent.setLayout((Layout) primitive);
                  
+            } else if (name.equals(SP12Constants.PROTECT_TOKENS)) {
+                parent.setTokenProtection(true);
+                 
             } else if (name.equals(SP12Constants.SIGNED_SUPPORTING_TOKENS)) {
                 parent.setSignedSupportingToken((SupportingToken) primitive);