cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject svn commit: r1458751 - in /cxf/branches/2.5.x-fixes: rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/ rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/ rt/ws/security/src/main/java/org/apache/cxf/ws/security/w...
Date Wed, 20 Mar 2013 10:48:36 GMT
Author: coheigea
Date: Wed Mar 20 10:48:36 2013
New Revision: 1458751

URL: http://svn.apache.org/r1458751
Log:
Merged revisions 1458745 via  git cherry-pick from
https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes

........
  r1458745 | coheigea | 2013-03-20 10:42:53 +0000 (Wed, 20 Mar 2013) | 18 lines

  Merged revisions 1458736 via  git cherry-pick from
  https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes

  ........
    r1458736 | coheigea | 2013-03-20 10:37:30 +0000 (Wed, 20 Mar 2013) | 10 lines

    Merged revisions 1458419 via  git cherry-pick from
    https://svn.apache.org/repos/asf/cxf/trunk

    ........
      r1458419 | coheigea | 2013-03-19 17:30:32 +0000 (Tue, 19 Mar 2013) | 2 lines

      [CXF-4904] - Correcting policy names

    ........

  ........

........

Modified:
    cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/SPConstants.java
    cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
    cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/AbstractBindingPolicyValidator.java
    cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/TransportBindingPolicyValidator.java
    cxf/branches/2.5.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/bindings/ts-first-policy.xml
    cxf/branches/2.5.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/bindings/ts-last-policy.xml

Modified: cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/SPConstants.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/SPConstants.java?rev=1458751&r1=1458750&r2=1458751&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/SPConstants.java
(original)
+++ cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/SPConstants.java
Wed Mar 20 10:48:36 2013
@@ -43,8 +43,8 @@ public abstract class SPConstants {
     public enum Layout {
         Lax,
         Strict,
-        LaxTimestampFirst,
-        LaxTimestampLast
+        LaxTsFirst,
+        LaxTsLast
     };
 
     

Modified: cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java?rev=1458751&r1=1458750&r2=1458751&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
(original)
+++ cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
Wed Mar 20 10:48:36 2013
@@ -407,9 +407,9 @@ public abstract class AbstractBindingBui
             for (AssertionInfo ai : ais) {
                 Layout layout = (Layout)ai.getAssertion();
                 ai.setAsserted(true);
-                if (SPConstants.Layout.LaxTimestampLast == layout.getValue()) {
+                if (SPConstants.Layout.LaxTsLast == layout.getValue()) {
                     if (timestamp == null) {
-                        ai.setNotAsserted(SPConstants.Layout.LaxTimestampLast + " requires
a timestamp");
+                        ai.setNotAsserted(SPConstants.Layout.LaxTsLast + " requires a timestamp");
                     } else {
                         ai.setAsserted(true);
                         Element el = timestamp.getElement();
@@ -418,9 +418,9 @@ public abstract class AbstractBindingBui
                             bottomUpElement = el;
                         }
                     }
-                } else if (SPConstants.Layout.LaxTimestampFirst == layout.getValue()) {
+                } else if (SPConstants.Layout.LaxTsFirst == layout.getValue()) {
                     if (timestamp == null) {
-                        ai.setNotAsserted(SPConstants.Layout.LaxTimestampFirst + " requires
a timestamp");
+                        ai.setNotAsserted(SPConstants.Layout.LaxTsFirst + " requires a timestamp");
                     } else {
                         addTopDownElement(timestampEl.getElement());
                     }

Modified: cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/AbstractBindingPolicyValidator.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/AbstractBindingPolicyValidator.java?rev=1458751&r1=1458750&r2=1458751&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/AbstractBindingPolicyValidator.java
(original)
+++ cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/AbstractBindingPolicyValidator.java
Wed Mar 20 10:48:36 2013
@@ -197,8 +197,8 @@ public abstract class AbstractBindingPol
         
         // Check the Layout
         Layout layout = binding.getLayout();
-        boolean timestampFirst = layout.getValue() == SPConstants.Layout.LaxTimestampFirst;
-        boolean timestampLast = layout.getValue() == SPConstants.Layout.LaxTimestampLast;
+        boolean timestampFirst = layout.getValue() == SPConstants.Layout.LaxTsFirst;
+        boolean timestampLast = layout.getValue() == SPConstants.Layout.LaxTsLast;
         if (!validateLayout(timestampFirst, timestampLast, results)) {
             String error = "Layout does not match the requirements";
             notAssertPolicy(aim, layout, error);

Modified: cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/TransportBindingPolicyValidator.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/TransportBindingPolicyValidator.java?rev=1458751&r1=1458750&r2=1458751&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/TransportBindingPolicyValidator.java
(original)
+++ cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/TransportBindingPolicyValidator.java
Wed Mar 20 10:48:36 2013
@@ -87,8 +87,8 @@ public class TransportBindingPolicyValid
             
             // Check the Layout
             Layout layout = binding.getLayout();
-            boolean timestampFirst = layout.getValue() == SPConstants.Layout.LaxTimestampFirst;
-            boolean timestampLast = layout.getValue() == SPConstants.Layout.LaxTimestampLast;
+            boolean timestampFirst = layout.getValue() == SPConstants.Layout.LaxTsFirst;
+            boolean timestampLast = layout.getValue() == SPConstants.Layout.LaxTsLast;
             if (!validateLayout(timestampFirst, timestampLast, results)) {
                 String error = "Layout does not match the requirements";
                 notAssertPolicy(aim, layout, error);

Modified: cxf/branches/2.5.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/bindings/ts-first-policy.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/bindings/ts-first-policy.xml?rev=1458751&r1=1458750&r2=1458751&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/bindings/ts-first-policy.xml
(original)
+++ cxf/branches/2.5.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/bindings/ts-first-policy.xml
Wed Mar 20 10:48:36 2013
@@ -29,7 +29,7 @@
                         </sp:RecipientToken>
                         <sp:Layout>
                             <wsp:Policy>
-                                <sp:LaxTimestampFirst />
+                                <sp:LaxTsFirst />
                             </wsp:Policy>
                         </sp:Layout>
                         <sp:IncludeTimestamp />

Modified: cxf/branches/2.5.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/bindings/ts-last-policy.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/bindings/ts-last-policy.xml?rev=1458751&r1=1458750&r2=1458751&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/bindings/ts-last-policy.xml
(original)
+++ cxf/branches/2.5.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/bindings/ts-last-policy.xml
Wed Mar 20 10:48:36 2013
@@ -29,7 +29,7 @@
                         </sp:RecipientToken>
                         <sp:Layout>
                             <wsp:Policy>
-                                <sp:LaxTimestampLast />
+                                <sp:LaxTsLast />
                             </wsp:Policy>
                         </sp:Layout>
                         <sp:IncludeTimestamp />



Mime
View raw message