ws-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject svn commit: r1798458 - /webservices/wss4j/branches/2_1_x-fixes/policy/src/main/java/org/apache/wss4j/policy/builders/
Date Mon, 12 Jun 2017 13:03:57 GMT
Author: coheigea
Date: Mon Jun 12 13:03:56 2017
New Revision: 1798458

URL: http://svn.apache.org/viewvc?rev=1798458&view=rev
Log:
WSS-608 - Allow policy tokens not to have a wsp:Policy child element

Modified:
    webservices/wss4j/branches/2_1_x-fixes/policy/src/main/java/org/apache/wss4j/policy/builders/HttpsTokenBuilder.java
    webservices/wss4j/branches/2_1_x-fixes/policy/src/main/java/org/apache/wss4j/policy/builders/KerberosTokenBuilder.java
    webservices/wss4j/branches/2_1_x-fixes/policy/src/main/java/org/apache/wss4j/policy/builders/KeyValueTokenBuilder.java
    webservices/wss4j/branches/2_1_x-fixes/policy/src/main/java/org/apache/wss4j/policy/builders/SamlTokenBuilder.java
    webservices/wss4j/branches/2_1_x-fixes/policy/src/main/java/org/apache/wss4j/policy/builders/SecureConversationTokenBuilder.java
    webservices/wss4j/branches/2_1_x-fixes/policy/src/main/java/org/apache/wss4j/policy/builders/SecurityContextTokenBuilder.java
    webservices/wss4j/branches/2_1_x-fixes/policy/src/main/java/org/apache/wss4j/policy/builders/SpnegoContextTokenBuilder.java
    webservices/wss4j/branches/2_1_x-fixes/policy/src/main/java/org/apache/wss4j/policy/builders/UsernameTokenBuilder.java
    webservices/wss4j/branches/2_1_x-fixes/policy/src/main/java/org/apache/wss4j/policy/builders/X509TokenBuilder.java

Modified: webservices/wss4j/branches/2_1_x-fixes/policy/src/main/java/org/apache/wss4j/policy/builders/HttpsTokenBuilder.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_1_x-fixes/policy/src/main/java/org/apache/wss4j/policy/builders/HttpsTokenBuilder.java?rev=1798458&r1=1798457&r2=1798458&view=diff
==============================================================================
--- webservices/wss4j/branches/2_1_x-fixes/policy/src/main/java/org/apache/wss4j/policy/builders/HttpsTokenBuilder.java
(original)
+++ webservices/wss4j/branches/2_1_x-fixes/policy/src/main/java/org/apache/wss4j/policy/builders/HttpsTokenBuilder.java
Mon Jun 12 13:03:56 2017
@@ -51,9 +51,6 @@ public class HttpsTokenBuilder implement
         
         Policy nestedPolicy = null;
         if (nestedPolicyElement == null) {
-            if (spVersion != SPConstants.SPVersion.SP11) {
-                throw new IllegalArgumentException("sp:HttpsToken must have an inner wsp:Policy
element");
-            }
             nestedPolicy = new Policy();
         } else {
             nestedPolicy = factory.getPolicyEngine().getPolicy(nestedPolicyElement);

Modified: webservices/wss4j/branches/2_1_x-fixes/policy/src/main/java/org/apache/wss4j/policy/builders/KerberosTokenBuilder.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_1_x-fixes/policy/src/main/java/org/apache/wss4j/policy/builders/KerberosTokenBuilder.java?rev=1798458&r1=1798457&r2=1798458&view=diff
==============================================================================
--- webservices/wss4j/branches/2_1_x-fixes/policy/src/main/java/org/apache/wss4j/policy/builders/KerberosTokenBuilder.java
(original)
+++ webservices/wss4j/branches/2_1_x-fixes/policy/src/main/java/org/apache/wss4j/policy/builders/KerberosTokenBuilder.java
Mon Jun 12 13:03:56 2017
@@ -51,9 +51,6 @@ public class KerberosTokenBuilder implem
         
         Policy nestedPolicy = null;
         if (nestedPolicyElement == null) {
-            if (spVersion != SPConstants.SPVersion.SP11) {
-                throw new IllegalArgumentException("sp:KerberosToken must have an inner wsp:Policy
element");
-            }
             nestedPolicy = new Policy();
         } else {
             nestedPolicy = factory.getPolicyEngine().getPolicy(nestedPolicyElement);

Modified: webservices/wss4j/branches/2_1_x-fixes/policy/src/main/java/org/apache/wss4j/policy/builders/KeyValueTokenBuilder.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_1_x-fixes/policy/src/main/java/org/apache/wss4j/policy/builders/KeyValueTokenBuilder.java?rev=1798458&r1=1798457&r2=1798458&view=diff
==============================================================================
--- webservices/wss4j/branches/2_1_x-fixes/policy/src/main/java/org/apache/wss4j/policy/builders/KeyValueTokenBuilder.java
(original)
+++ webservices/wss4j/branches/2_1_x-fixes/policy/src/main/java/org/apache/wss4j/policy/builders/KeyValueTokenBuilder.java
Mon Jun 12 13:03:56 2017
@@ -49,9 +49,6 @@ public class KeyValueTokenBuilder implem
         
         Policy nestedPolicy = null;
         if (nestedPolicyElement == null) {
-            if (spVersion != SPConstants.SPVersion.SP11) {
-                throw new IllegalArgumentException("sp:KeyValueToken must have an inner wsp:Policy
element");
-            }
             nestedPolicy = new Policy();
         } else {
             nestedPolicy = factory.getPolicyEngine().getPolicy(nestedPolicyElement);

Modified: webservices/wss4j/branches/2_1_x-fixes/policy/src/main/java/org/apache/wss4j/policy/builders/SamlTokenBuilder.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_1_x-fixes/policy/src/main/java/org/apache/wss4j/policy/builders/SamlTokenBuilder.java?rev=1798458&r1=1798457&r2=1798458&view=diff
==============================================================================
--- webservices/wss4j/branches/2_1_x-fixes/policy/src/main/java/org/apache/wss4j/policy/builders/SamlTokenBuilder.java
(original)
+++ webservices/wss4j/branches/2_1_x-fixes/policy/src/main/java/org/apache/wss4j/policy/builders/SamlTokenBuilder.java
Mon Jun 12 13:03:56 2017
@@ -51,9 +51,6 @@ public class SamlTokenBuilder implements
         
         Policy nestedPolicy = null;
         if (nestedPolicyElement == null) {
-            if (spVersion != SPConstants.SPVersion.SP11) {
-                throw new IllegalArgumentException("sp:SamlToken must have an inner wsp:Policy
element");
-            }
             nestedPolicy = new Policy();
         } else {
             nestedPolicy = factory.getPolicyEngine().getPolicy(nestedPolicyElement);

Modified: webservices/wss4j/branches/2_1_x-fixes/policy/src/main/java/org/apache/wss4j/policy/builders/SecureConversationTokenBuilder.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_1_x-fixes/policy/src/main/java/org/apache/wss4j/policy/builders/SecureConversationTokenBuilder.java?rev=1798458&r1=1798457&r2=1798458&view=diff
==============================================================================
--- webservices/wss4j/branches/2_1_x-fixes/policy/src/main/java/org/apache/wss4j/policy/builders/SecureConversationTokenBuilder.java
(original)
+++ webservices/wss4j/branches/2_1_x-fixes/policy/src/main/java/org/apache/wss4j/policy/builders/SecureConversationTokenBuilder.java
Mon Jun 12 13:03:56 2017
@@ -48,9 +48,6 @@ public class SecureConversationTokenBuil
        
         Policy nestedPolicy = null;
         if (nestedPolicyElement == null) {
-            if (spVersion != SPConstants.SPVersion.SP11) {
-                throw new IllegalArgumentException("sp:SecureConversationToken must have
an inner wsp:Policy element");
-            }
             nestedPolicy = new Policy();
         } else {
             nestedPolicy = factory.getPolicyEngine().getPolicy(nestedPolicyElement);

Modified: webservices/wss4j/branches/2_1_x-fixes/policy/src/main/java/org/apache/wss4j/policy/builders/SecurityContextTokenBuilder.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_1_x-fixes/policy/src/main/java/org/apache/wss4j/policy/builders/SecurityContextTokenBuilder.java?rev=1798458&r1=1798457&r2=1798458&view=diff
==============================================================================
--- webservices/wss4j/branches/2_1_x-fixes/policy/src/main/java/org/apache/wss4j/policy/builders/SecurityContextTokenBuilder.java
(original)
+++ webservices/wss4j/branches/2_1_x-fixes/policy/src/main/java/org/apache/wss4j/policy/builders/SecurityContextTokenBuilder.java
Mon Jun 12 13:03:56 2017
@@ -51,9 +51,6 @@ public class SecurityContextTokenBuilder
         
         Policy nestedPolicy = null;
         if (nestedPolicyElement == null) {
-            if (spVersion != SPConstants.SPVersion.SP11) {
-                throw new IllegalArgumentException("sp:SecurityContextToken must have an
inner wsp:Policy element");
-            }
             nestedPolicy = new Policy();
         } else {
             nestedPolicy = factory.getPolicyEngine().getPolicy(nestedPolicyElement);

Modified: webservices/wss4j/branches/2_1_x-fixes/policy/src/main/java/org/apache/wss4j/policy/builders/SpnegoContextTokenBuilder.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_1_x-fixes/policy/src/main/java/org/apache/wss4j/policy/builders/SpnegoContextTokenBuilder.java?rev=1798458&r1=1798457&r2=1798458&view=diff
==============================================================================
--- webservices/wss4j/branches/2_1_x-fixes/policy/src/main/java/org/apache/wss4j/policy/builders/SpnegoContextTokenBuilder.java
(original)
+++ webservices/wss4j/branches/2_1_x-fixes/policy/src/main/java/org/apache/wss4j/policy/builders/SpnegoContextTokenBuilder.java
Mon Jun 12 13:03:56 2017
@@ -48,9 +48,6 @@ public class SpnegoContextTokenBuilder i
         
         Policy nestedPolicy = null;
         if (nestedPolicyElement == null) {
-            if (spVersion != SPConstants.SPVersion.SP11) {
-                throw new IllegalArgumentException("sp:SpnegoContextToken must have an inner
wsp:Policy element");
-            }
             nestedPolicy = new Policy();
         } else {
             nestedPolicy = factory.getPolicyEngine().getPolicy(nestedPolicyElement);

Modified: webservices/wss4j/branches/2_1_x-fixes/policy/src/main/java/org/apache/wss4j/policy/builders/UsernameTokenBuilder.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_1_x-fixes/policy/src/main/java/org/apache/wss4j/policy/builders/UsernameTokenBuilder.java?rev=1798458&r1=1798457&r2=1798458&view=diff
==============================================================================
--- webservices/wss4j/branches/2_1_x-fixes/policy/src/main/java/org/apache/wss4j/policy/builders/UsernameTokenBuilder.java
(original)
+++ webservices/wss4j/branches/2_1_x-fixes/policy/src/main/java/org/apache/wss4j/policy/builders/UsernameTokenBuilder.java
Mon Jun 12 13:03:56 2017
@@ -51,9 +51,6 @@ public class UsernameTokenBuilder implem
         
         Policy nestedPolicy = null;
         if (nestedPolicyElement == null) {
-            if (spVersion != SPConstants.SPVersion.SP11) {
-                throw new IllegalArgumentException("sp:UsernameToken must have an inner wsp:Policy
element");
-            }
             nestedPolicy = new Policy();
         } else {
             nestedPolicy = factory.getPolicyEngine().getPolicy(nestedPolicyElement);

Modified: webservices/wss4j/branches/2_1_x-fixes/policy/src/main/java/org/apache/wss4j/policy/builders/X509TokenBuilder.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_1_x-fixes/policy/src/main/java/org/apache/wss4j/policy/builders/X509TokenBuilder.java?rev=1798458&r1=1798457&r2=1798458&view=diff
==============================================================================
--- webservices/wss4j/branches/2_1_x-fixes/policy/src/main/java/org/apache/wss4j/policy/builders/X509TokenBuilder.java
(original)
+++ webservices/wss4j/branches/2_1_x-fixes/policy/src/main/java/org/apache/wss4j/policy/builders/X509TokenBuilder.java
Mon Jun 12 13:03:56 2017
@@ -51,9 +51,6 @@ public class X509TokenBuilder implements
         
         Policy nestedPolicy = null;
         if (nestedPolicyElement == null) {
-            if (spVersion != SPConstants.SPVersion.SP11) {
-                throw new IllegalArgumentException("sp:X509Token must have an inner wsp:Policy
element");
-            }
             nestedPolicy = new Policy();
         } else {
             nestedPolicy = factory.getPolicyEngine().getPolicy(nestedPolicyElement);



Mime
View raw message