cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r911140 - in /cxf/branches/2.2.x-fixes: ./ rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/ rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/
Date Wed, 17 Feb 2010 18:36:31 GMT
Author: dkulp
Date: Wed Feb 17 18:36:31 2010
New Revision: 911140

URL: http://svn.apache.org/viewvc?rev=911140&view=rev
Log:
Merged revisions 911137 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r911137 | dkulp | 2010-02-17 13:33:01 -0500 (Wed, 17 Feb 2010) | 1 line
  
  Record the token protection for transport binding
........

Modified:
    cxf/branches/2.2.x-fixes/   (props changed)
    cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/TransportBindingBuilder.java
    cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/Binding.java
    cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/SymmetricAsymmetricBindingBase.java
    cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/TransportBinding.java

Propchange: cxf/branches/2.2.x-fixes/
            ('svn:mergeinfo' removed)

Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/TransportBindingBuilder.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/TransportBindingBuilder.java?rev=911140&r1=911139&r2=911140&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/TransportBindingBuilder.java
(original)
+++ cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/TransportBindingBuilder.java
Wed Feb 17 18:36:31 2010
@@ -84,6 +84,8 @@
                         parent.setIncludeTimestamp(true);
                     } else if (name.equals(SPConstants.LAYOUT)) {
                         parent.setLayout((Layout)new LayoutBuilder().build(child));
+                    } else if (name.equals(SPConstants.PROTECT_TOKENS)) {
+                        parent.setTokenProtection(true);
                     } else if (name.equals(SPConstants.SIGNED_SUPPORTING_TOKENS)
                         || name.equals(SPConstants.SIGNED_ENDORSING_SUPPORTING_TOKENS)) {
                         

Modified: cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/Binding.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/Binding.java?rev=911140&r1=911139&r2=911140&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/Binding.java
(original)
+++ cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/Binding.java
Wed Feb 17 18:36:31 2010
@@ -27,6 +27,7 @@
     private Layout layout;
     private SupportingToken signedSupportingToken;
     private SupportingToken signedEndorsingSupportingTokens;
+    private boolean tokenProtection;
 
     public Binding(SPConstants version) {
         super(version);
@@ -90,4 +91,18 @@
     public void setSignedSupportingToken(SupportingToken signedSupportingToken) {
         this.signedSupportingToken = signedSupportingToken;
     }
+    
+    /**
+     * @return Returns the tokenProtection.
+     */
+    public boolean isTokenProtection() {
+        return tokenProtection;
+    }
+
+    /**
+     * @param tokenProtection The tokenProtection to set.
+     */
+    public void setTokenProtection(boolean tokenProtection) {
+        this.tokenProtection = tokenProtection;
+    }
 }

Modified: cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/SymmetricAsymmetricBindingBase.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/SymmetricAsymmetricBindingBase.java?rev=911140&r1=911139&r2=911140&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/SymmetricAsymmetricBindingBase.java
(original)
+++ cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/SymmetricAsymmetricBindingBase.java
Wed Feb 17 18:36:31 2010
@@ -26,8 +26,6 @@
 
     private boolean signatureProtection;
 
-    private boolean tokenProtection;
-
     private boolean entireHeadersAndBodySignatures;
 
     public SymmetricAsymmetricBindingBase(SPConstants version) {
@@ -76,18 +74,4 @@
         this.signatureProtection = signatureProtection;
     }
 
-    /**
-     * @return Returns the tokenProtection.
-     */
-    public boolean isTokenProtection() {
-        return tokenProtection;
-    }
-
-    /**
-     * @param tokenProtection The tokenProtection to set.
-     */
-    public void setTokenProtection(boolean tokenProtection) {
-        this.tokenProtection = tokenProtection;
-    }
-
 }

Modified: cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/TransportBinding.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/TransportBinding.java?rev=911140&r1=911139&r2=911140&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/TransportBinding.java
(original)
+++ cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/TransportBinding.java
Wed Feb 17 18:36:31 2010
@@ -109,6 +109,11 @@
             layout.serialize(writer);
             // </sp:Layout>
         }
+        if (isTokenProtection()) {
+            // <sp:ProtectTokens />
+            writer.writeStartElement(prefix, SPConstants.PROTECT_TOKENS, namespaceURI);
+            writer.writeEndElement();
+        }
 
         if (isIncludeTimestamp()) {
             // <sp:IncludeTimestamp>



Mime
View raw message