Author: coheigea
Date: Tue Oct 15 09:42:19 2013
New Revision: 1532265
URL: http://svn.apache.org/r1532265
Log:
Allow "AlwaysToInitiator" for WS-SecurityPolicy 1.1 policies, as per the errata
Modified:
webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/SP11Constants.java
webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/SP12Constants.java
webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/SPConstants.java
Modified:
webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/SP11Constants.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/SP11Constants.java?rev=1532265&r1=1532264&r2=1532265&view=diff
==============================================================================
---
webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/SP11Constants.java
(original)
+++
webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/SP11Constants.java
Tue Oct 15 09:42:19 2013
@@ -53,10 +53,13 @@ public class SP11Constants extends SPCon
SP11Constants.SP_NS + SPConstants.INCLUDE_TOKEN_ONCE_SUFFIX;
public final static String INCLUDE_ALWAYS_TO_RECIPIENT =
- SP11Constants.SP_NS +
SPConstants.INCLUDE_TOEKN_ALWAYS_TO_RECIPIENT_SUFFIX;
+ SP11Constants.SP_NS +
SPConstants.INCLUDE_TOKEN_ALWAYS_TO_RECIPIENT_SUFFIX;
+
+ public final static String INCLUDE_ALWAYS_TO_INITIATOR =
+ SP11Constants.SP_NS +
SPConstants.INCLUDE_TOKEN_ALWAYS_TO_INITIATOR_SUFFIX;
public final static String INCLUDE_ALWAYS =
- SP11Constants.SP_NS + SPConstants.INCLUDE_TOEKN_ALWAYS_SUFFIX;
+ SP11Constants.SP_NS + SPConstants.INCLUDE_TOKEN_ALWAYS_SUFFIX;
public static final QName ATTR_XPATH_VERSION = new QName(
SP11Constants.SP_NS, SPConstants.XPATH_VERSION,
SP11Constants.SP_PREFIX);
@@ -337,6 +340,8 @@ public class SP11Constants extends SPCon
return IncludeTokenType.INCLUDE_TOKEN_ALWAYS;
} else if (INCLUDE_ALWAYS_TO_RECIPIENT.equals(value)) {
return IncludeTokenType.INCLUDE_TOKEN_ALWAYS_TO_RECIPIENT;
+ } else if (INCLUDE_ALWAYS_TO_INITIATOR.equals(value)) {
+ return IncludeTokenType.INCLUDE_TOKEN_ALWAYS_TO_INITIATOR;
} else if (INCLUDE_NEVER.equals(value)) {
return IncludeTokenType.INCLUDE_TOKEN_NEVER;
} else if (INCLUDE_ONCE.equals(value)) {
@@ -352,6 +357,8 @@ public class SP11Constants extends SPCon
return SP11Constants.INCLUDE_ALWAYS;
case INCLUDE_TOKEN_ALWAYS_TO_RECIPIENT:
return SP11Constants.INCLUDE_ALWAYS_TO_RECIPIENT;
+ case INCLUDE_TOKEN_ALWAYS_TO_INITIATOR:
+ return SP11Constants.INCLUDE_ALWAYS_TO_INITIATOR;
case INCLUDE_TOKEN_NEVER:
return SP11Constants.INCLUDE_NEVER;
case INCLUDE_TOKEN_ONCE:
Modified:
webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/SP12Constants.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/SP12Constants.java?rev=1532265&r1=1532264&r2=1532265&view=diff
==============================================================================
---
webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/SP12Constants.java
(original)
+++
webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/SP12Constants.java
Tue Oct 15 09:42:19 2013
@@ -55,13 +55,13 @@ public class SP12Constants extends SPCon
SP12Constants.SP_NS + SPConstants.INCLUDE_TOKEN_ONCE_SUFFIX;
public static final String INCLUDE_ALWAYS_TO_RECIPIENT =
- SP12Constants.SP_NS +
SPConstants.INCLUDE_TOEKN_ALWAYS_TO_RECIPIENT_SUFFIX;
+ SP12Constants.SP_NS +
SPConstants.INCLUDE_TOKEN_ALWAYS_TO_RECIPIENT_SUFFIX;
public static final String INCLUDE_ALWAYS_TO_INITIATOR =
- SP12Constants.SP_NS +
SPConstants.INCLUDE_TOEKN_ALWAYS_TO_INITIATOR_SUFFIX;
+ SP12Constants.SP_NS +
SPConstants.INCLUDE_TOKEN_ALWAYS_TO_INITIATOR_SUFFIX;
public static final String INCLUDE_ALWAYS =
- SP12Constants.SP_NS + SPConstants.INCLUDE_TOEKN_ALWAYS_SUFFIX;
+ SP12Constants.SP_NS + SPConstants.INCLUDE_TOKEN_ALWAYS_SUFFIX;
public static final QName TRUST_13 = new QName(
SP12Constants.SP_NS, SPConstants.TRUST_13,
SP12Constants.SP_PREFIX);
Modified:
webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/SPConstants.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/SPConstants.java?rev=1532265&r1=1532264&r2=1532265&view=diff
==============================================================================
---
webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/SPConstants.java
(original)
+++
webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/SPConstants.java
Tue Oct 15 09:42:19 2013
@@ -361,21 +361,21 @@ public abstract class SPConstants {
public static final String INCLUDE_TOKEN_ONCE_SUFFIX =
"/IncludeToken/Once";
- public static final String INCLUDE_TOEKN_ALWAYS_TO_RECIPIENT_SUFFIX =
"/IncludeToken/AlwaysToRecipient";
+ public static final String INCLUDE_TOKEN_ALWAYS_TO_RECIPIENT_SUFFIX =
"/IncludeToken/AlwaysToRecipient";
- public static final String INCLUDE_TOEKN_ALWAYS_TO_INITIATOR_SUFFIX =
"/IncludeToken/AlwaysToInitiator";
+ public static final String INCLUDE_TOKEN_ALWAYS_TO_INITIATOR_SUFFIX =
"/IncludeToken/AlwaysToInitiator";
- public static final String INCLUDE_TOEKN_ALWAYS_SUFFIX =
"/IncludeToken/Always";
+ public static final String INCLUDE_TOKEN_ALWAYS_SUFFIX =
"/IncludeToken/Always";
public static final int INCLUDE_TOKEN_NEVER = 1;
public static final int INCLUDE_TOKEN_ONCE = 2;
- public static final int INCLUDE_TOEKN_ALWAYS_TO_RECIPIENT = 3;
+ public static final int INCLUDE_TOKEN_ALWAYS_TO_RECIPIENT = 3;
- public static final int INCLUDE_TOEKN_ALWAYS_TO_INITIATOR = 4;
+ public static final int INCLUDE_TOKEN_ALWAYS_TO_INITIATOR = 4;
- public static final int INCLUDE_TOEKN_ALWAYS = 5;
+ public static final int INCLUDE_TOKEN_ALWAYS = 5;
////////////////////////////////////////////////////////////////////////////////////////////////
