You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by gi...@apache.org on 2011/12/04 21:33:12 UTC

svn commit: r1210203 [2/16] - in /webservices/wss4j/branches/swssf/rampart-policy: ./ src/main/java/META-INF/ src/main/java/org/apache/ws/secpolicy/ src/main/java/org/apache/ws/secpolicy/builders/ src/main/java/org/apache/ws/secpolicy/model/ src/main/j...

Modified: webservices/wss4j/branches/swssf/rampart-policy/src/main/java/org/apache/ws/secpolicy/SP12Constants.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/rampart-policy/src/main/java/org/apache/ws/secpolicy/SP12Constants.java?rev=1210203&r1=1210202&r2=1210203&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/rampart-policy/src/main/java/org/apache/ws/secpolicy/SP12Constants.java (original)
+++ webservices/wss4j/branches/swssf/rampart-policy/src/main/java/org/apache/ws/secpolicy/SP12Constants.java Sun Dec  4 20:33:05 2011
@@ -1,150 +1,216 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 package org.apache.ws.secpolicy;
 
+import org.apache.commons.lang.StringUtils;
+import org.apache.ws.secpolicy.model.SupportingTokenType;
+
 import javax.xml.namespace.QName;
+import java.util.EnumSet;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @author $Author$
+ * @version $Revision$ $Date$
+ */
+public class SP12Constants extends SPConstants {
+
+    private static SP12Constants sp12Constants = null;
+
+    protected SP12Constants() {
+    }
+
+    public static synchronized SP12Constants getInstance() {
+        if (sp12Constants == null) {
+            sp12Constants = new SP12Constants();
+        }
+        return sp12Constants;
+    }
+
+    public static final String SP_NS = "http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702";
+    public static final String SP_PREFIX = "sp";
+
+    public static final String WST_NS = "http://docs.oasis-open.org/ws-sx/ws-trust/200512";
+    public static final String WST_PREFIX = "wst";
+
+    public static final QName INCLUDE_TOKEN = new QName(
+            SP12Constants.SP_NS, SPConstants.ATTR_INCLUDE_TOKEN, SP12Constants.SP_PREFIX);
+
+    public static final String INCLUDE_NEVER =
+            SP12Constants.SP_NS + SPConstants.INCLUDE_TOKEN_NEVER_SUFFIX;
+
+    public static final String INCLUDE_ONCE =
+            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;
+
+    public static final String INCLUDE_ALWAYS_TO_INITIATOR =
+            SP12Constants.SP_NS + SPConstants.INCLUDE_TOEKN_ALWAYS_TO_INITIATOR_SUFFIX;
+
+    public static final String INCLUDE_ALWAYS =
+            SP12Constants.SP_NS + SPConstants.INCLUDE_TOEKN_ALWAYS_SUFFIX;
+
+    public static final QName TRUST_13 = new QName(
+            SP12Constants.SP_NS, SPConstants.TRUST_13, SP12Constants.SP_PREFIX);
 
-public class SP12Constants {
+    public static final QName REQUIRE_CLIENT_CERTIFICATE = new QName(
+            SP12Constants.SP_NS, "RequireClientCertificate", SP12Constants.SP_PREFIX);
 
-    public final static String SP_NS = "http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702";
+    public static final QName HTTP_BASIC_AUTHENTICATION = new QName(
+            SP12Constants.SP_NS, "HttpBasicAuthentication", SP12Constants.SP_PREFIX);
 
-    public final static String SP_PREFIX = "sp";
-    
-    public static final QName INCLUDE_TOKEN = new QName(SP_NS, SPConstants.ATTR_INCLUDE_TOKEN,
-            SP12Constants.SP_PREFIX);
-    
-    public final static String INCLUDE_NEVER = SP12Constants.SP_NS + 
-                                                                SPConstants.INCLUDE_TOKEN_NEVER_SUFFIX;
-
-    public final static String INCLUDE_ONCE = SP12Constants.SP_NS + 
-                                                                SPConstants.INCLUDE_TOKEN_ONCE_SUFFIX;
-
-    public final static String INCLUDE_ALWAYS_TO_RECIPIENT = SP12Constants.SP_NS
-        + SPConstants.INCLUDE_TOEKN_ALWAYS_TO_RECIPIENT_SUFFIX;
-    
-    public final static String INCLUDE_ALWAYS_TO_INITIATOR = SP12Constants.SP_NS
-    + SPConstants.INCLUDE_TOEKN_ALWAYS_TO_INITIATOR_SUFFIX;
-
-    public final static String INCLUDE_ALWAYS = SP12Constants.SP_NS
-        + SPConstants.INCLUDE_TOEKN_ALWAYS_SUFFIX;
-    
-    public static final QName TRUST_13 = new QName(SP12Constants.SP_NS, SPConstants.TRUST_13,
-            SP12Constants.SP_PREFIX);
-    
-    public final static QName REQUIRE_CLIENT_CERTIFICATE = new QName(SP12Constants.SP_NS, "RequireClientCertificate", SP12Constants.SP_PREFIX); 
-    
-    public final static QName HTTP_BASIC_AUTHENTICATION = new QName(SP12Constants.SP_NS, "HttpBasicAuthentication", SP12Constants.SP_PREFIX);
-    
-    public final static QName HTTP_DIGEST_AUTHENTICATION = new QName(SP12Constants.SP_NS, "HttpDigestAuthentication", SP12Constants.SP_PREFIX);
-    
-    // /////////////////////////////////////////////////////////////////////
-
-    public static final QName ATTR_XPATH_VERSION = new QName(SP_NS, SPConstants.XPATH_VERSION, SP12Constants.SP_PREFIX);
-    
-    ////////////////////////////////////////////////////////////////////////
-
-
-    public static final QName TRANSPORT_BINDING = new QName(SP_NS,
-            SPConstants.TRANSPORT_BINDING , SP12Constants.SP_PREFIX);
-
-    public static final QName ALGORITHM_SUITE = new QName(SP_NS,
-            SPConstants.ALGO_SUITE , SP12Constants.SP_PREFIX);
-
-    public static final QName LAYOUT = new QName(SP_NS, SPConstants.LAYOUT, SP_PREFIX);
-
-
-    public static final QName STRICT = new QName(SP12Constants.SP_NS, SPConstants.LAYOUT_STRICT,
-            SP12Constants.SP_PREFIX);
-
-    public static final QName LAX = new QName(SP12Constants.SP_NS, SPConstants.LAYOUT_LAX ,
-            SP12Constants.SP_PREFIX);
-
-    public static final QName LAXTSFIRST = new QName(SP12Constants.SP_NS,
-            SPConstants.LAYOUT_LAX_TIMESTAMP_FIRST, SP12Constants.SP_PREFIX);
-
-    public static final QName LAXTSLAST = new QName(SP12Constants.SP_NS,
-            SPConstants.LAYOUT_LAX_TIMESTAMP_LAST, SP12Constants.SP_PREFIX);
-
-    // ////////////////
-
-    public static final QName INCLUDE_TIMESTAMP = new QName(SP12Constants.SP_NS,
-            SPConstants.INCLUDE_TIMESTAMP, SP12Constants.SP_PREFIX);
-    
-    public static final QName ENCRYPT_BEFORE_SIGNING = new QName(SP12Constants.SP_NS, 
-            SPConstants.ENCRYPT_BEFORE_SIGNING, SP12Constants.SP_PREFIX);
-    
-    public static final QName SIGN_BEFORE_ENCRYPTING = new QName(SP12Constants.SP_NS,
-            SPConstants.SIGN_BEFORE_ENCRYPTING, SP12Constants.SP_PREFIX);
-    
-    public static final QName ONLY_SIGN_ENTIRE_HEADERS_AND_BODY = new QName(SP12Constants.SP_NS,
-            SPConstants.ONLY_SIGN_ENTIRE_HEADERS_AND_BODY,SP12Constants.SP_PREFIX);
+    public static final QName HTTP_DIGEST_AUTHENTICATION = new QName(
+            SP12Constants.SP_NS, "HttpDigestAuthentication", SP12Constants.SP_PREFIX);
 
-    public static final QName TRANSPORT_TOKEN = new QName(SP_NS,
-            SPConstants.TRANSPORT_TOKEN, SP12Constants.SP_PREFIX);
+    public static final QName TRANSPORT_BINDING = new QName(
+            SP12Constants.SP_NS, SPConstants.TRANSPORT_BINDING, SP12Constants.SP_PREFIX);
 
-    public static final QName HTTPS_TOKEN = new QName(SP12Constants.SP_NS,
-            SPConstants.HTTPS_TOKEN, SP12Constants.SP_PREFIX);
+    public static final QName ALGORITHM_SUITE = new QName(
+            SP12Constants.SP_NS, SPConstants.ALGORITHM_SUITE, SP12Constants.SP_PREFIX);
+
+    public static final QName LAYOUT = new QName(
+            SP12Constants.SP_NS, SPConstants.LAYOUT, SP12Constants.SP_PREFIX);
+
+    public static final QName STRICT = new QName(
+            SP12Constants.SP_NS, SPConstants.LAYOUT_STRICT, SP12Constants.SP_PREFIX);
+
+    public static final QName LAX = new QName(
+            SP12Constants.SP_NS, SPConstants.LAYOUT_LAX, SP12Constants.SP_PREFIX);
+
+    public static final QName LAXTSFIRST = new QName(
+            SP12Constants.SP_NS, SPConstants.LAYOUT_LAX_TIMESTAMP_FIRST, SP12Constants.SP_PREFIX);
+
+    public static final QName LAXTSLAST = new QName(
+            SP12Constants.SP_NS, SPConstants.LAYOUT_LAX_TIMESTAMP_LAST, SP12Constants.SP_PREFIX);
+
+    public static final QName INCLUDE_TIMESTAMP = new QName(
+            SP12Constants.SP_NS, SPConstants.INCLUDE_TIMESTAMP, SP12Constants.SP_PREFIX);
+
+    public static final QName ENCRYPT_BEFORE_SIGNING = new QName(
+            SP12Constants.SP_NS, SPConstants.ENCRYPT_BEFORE_SIGNING, SP12Constants.SP_PREFIX);
+
+    public static final QName SIGN_BEFORE_ENCRYPTING = new QName(
+            SP12Constants.SP_NS, SPConstants.SIGN_BEFORE_ENCRYPTING, SP12Constants.SP_PREFIX);
+
+    public static final QName ONLY_SIGN_ENTIRE_HEADERS_AND_BODY = new QName(
+            SP12Constants.SP_NS, SPConstants.ONLY_SIGN_ENTIRE_HEADERS_AND_BODY, SP12Constants.SP_PREFIX);
+
+    public static final QName TRANSPORT_TOKEN = new QName(
+            SP12Constants.SP_NS, SPConstants.TRANSPORT_TOKEN, SP12Constants.SP_PREFIX);
+
+    public static final QName HTTPS_TOKEN = new QName(
+            SP12Constants.SP_NS, SPConstants.HTTPS_TOKEN, SP12Constants.SP_PREFIX);
+
+    public static final QName KERBEROS_TOKEN = new QName(
+            SP12Constants.SP_NS, SPConstants.KERBEROS_TOKEN, SP12Constants.SP_PREFIX);
+
+    public static final QName SPNEGO_CONTEXT_TOKEN = new QName(
+            SP12Constants.SP_NS, SPConstants.SPNEGO_CONTEXT_TOKEN, SP12Constants.SP_PREFIX);
 
     public static final QName SECURITY_CONTEXT_TOKEN = new QName(
             SP12Constants.SP_NS, SPConstants.SECURITY_CONTEXT_TOKEN, SP12Constants.SP_PREFIX);
 
     public static final QName SECURE_CONVERSATION_TOKEN = new QName(
-            SP12Constants.SP_NS, SPConstants.SECURE_CONVERSATION_TOKEN , SP12Constants.SP_PREFIX);
+            SP12Constants.SP_NS, SPConstants.SECURE_CONVERSATION_TOKEN, SP12Constants.SP_PREFIX);
+
+    public static final QName MUST_NOT_SEND_CANCEL = new QName(
+            SP12Constants.SP_NS, SPConstants.MUST_NOT_SEND_CANCEL, SP12Constants.SP_PREFIX);
+
+    public static final QName MUST_NOT_SEND_AMEND = new QName(
+            SP12Constants.SP_NS, SPConstants.MUST_NOT_SEND_AMEND, SP12Constants.SP_PREFIX);
+
+    public static final QName MUST_NOT_SEND_RENEW = new QName(
+            SP12Constants.SP_NS, SPConstants.MUST_NOT_SEND_RENEW, SP12Constants.SP_PREFIX);
 
-    public static final QName SIGNATURE_TOKEN = new QName(SP12Constants.SP_NS,
-            SPConstants.SIGNATURE_TOKEN , SP12Constants.SP_PREFIX);
+    public static final QName SAML_TOKEN = new QName(
+            SP12Constants.SP_NS, SPConstants.SAML_TOKEN, SP12Constants.SP_PREFIX);
 
-    public static final QName SIGNED_PARTS = new QName(SP12Constants.SP_NS,
-            SPConstants.SIGNED_PARTS , SP12Constants.SP_PREFIX);
-    
-    public static final QName ENCRYPTED_PARTS = new QName(SP12Constants.SP_NS,
-            SPConstants.ENCRYPTED_PARTS , SP12Constants.SP_PREFIX);
-
-    public static final QName SIGNED_ELEMENTS = new QName(SP12Constants.SP_NS,
-            SPConstants.SIGNED_ELEMENTS , SP12Constants.SP_PREFIX);
-
-    public static final QName ENCRYPTED_ELEMENTS = new QName(SP12Constants.SP_NS,
-            SPConstants.ENCRYPTED_ELEMENTS, SP12Constants.SP_PREFIX);
-
-    public static final QName REQUIRED_ELEMENTS = new QName(SP12Constants.SP_NS,
-            SPConstants.REQUIRED_ELEMENTS, SP12Constants.SP_PREFIX);
-    
-    public static final QName REQUIRED_PARTS = new QName(SP12Constants.SP_NS,
-            SPConstants.REQUIRED_PARTS, SP12Constants.SP_PREFIX);
-    
-    public static final QName CONTENT_ENCRYPTED_ELEMENTS = new QName(SP12Constants.SP_NS,
-            SPConstants.CONTENT_ENCRYPTED_ELEMENTS, SP12Constants.SP_PREFIX);
-
-    public static final QName USERNAME_TOKEN = new QName(SP12Constants.SP_NS,
-            SPConstants.USERNAME_TOKEN , SP12Constants.SP_PREFIX);
-
-    public static final QName WSS_USERNAME_TOKEN10 = new QName(SP12Constants.SP_NS,
-            SPConstants.USERNAME_TOKEN10 , SP12Constants.SP_PREFIX);
-
-    public static final QName WSS_USERNAME_TOKEN11 = new QName(SP12Constants.SP_NS,
-            SPConstants.USERNAME_TOKEN11 , SP12Constants.SP_PREFIX);
-
-    public static final QName ENCRYPTION_TOKEN = new QName(SP12Constants.SP_NS,
-            SPConstants.ENCRYPTION_TOKEN, SP12Constants.SP_PREFIX);
-
-    public static final QName X509_TOKEN = new QName(SP12Constants.SP_NS,
-            SPConstants.X509_TOKEN , SP12Constants.SP_PREFIX);
-    
-    public static final QName WSS_X509_V1_TOKEN_10 = new QName(SP12Constants.SP_NS,
-            SPConstants.WSS_X509_V1_TOKEN10 , SP12Constants.SP_PREFIX);
+    public static final QName REL_TOKEN = new QName(
+            SP12Constants.SP_NS, SPConstants.REL_TOKEN, SP12Constants.SP_PREFIX);
 
-    public static final QName WSS_X509_V3_TOKEN_10 = new QName(SP12Constants.SP_NS,
-            SPConstants.WSS_X509_V3_TOKEN10 , SP12Constants.SP_PREFIX);
+    public static final QName KEY_VALUE_TOKEN = new QName(
+            SP12Constants.SP_NS, SPConstants.KEY_VALUE_TOKEN, SP12Constants.SP_PREFIX);
+
+    public static final QName RSA_KEY_VALUE = new QName(
+            SP12Constants.SP_NS, SPConstants.RSA_KEY_VALUE, SP12Constants.SP_PREFIX);
+
+    public static final QName SIGNATURE_TOKEN = new QName(
+            SP12Constants.SP_NS, SPConstants.SIGNATURE_TOKEN, SP12Constants.SP_PREFIX);
+
+    public static final QName SIGNED_PARTS = new QName(
+            SP12Constants.SP_NS, SPConstants.SIGNED_PARTS, SP12Constants.SP_PREFIX);
+
+    public static final QName ENCRYPTED_PARTS = new QName(
+            SP12Constants.SP_NS, SPConstants.ENCRYPTED_PARTS, SP12Constants.SP_PREFIX);
+
+    public static final QName SIGNED_ELEMENTS = new QName(
+            SP12Constants.SP_NS, SPConstants.SIGNED_ELEMENTS, SP12Constants.SP_PREFIX);
+
+    public static final QName XPATH_EXPR = new QName(
+            SP12Constants.SP_NS, SPConstants.XPATH_EXPR, SP12Constants.SP_PREFIX);
+
+    public static final QName ENCRYPTED_ELEMENTS = new QName(
+            SP12Constants.SP_NS, SPConstants.ENCRYPTED_ELEMENTS, SP12Constants.SP_PREFIX);
+
+    public static final QName REQUIRED_ELEMENTS = new QName(
+            SP12Constants.SP_NS, SPConstants.REQUIRED_ELEMENTS, SP12Constants.SP_PREFIX);
+
+    public static final QName REQUIRED_PARTS = new QName(
+            SP12Constants.SP_NS, SPConstants.REQUIRED_PARTS, SP12Constants.SP_PREFIX);
+
+    public static final QName CONTENT_ENCRYPTED_ELEMENTS = new QName(
+            SP12Constants.SP_NS, SPConstants.CONTENT_ENCRYPTED_ELEMENTS, SP12Constants.SP_PREFIX);
+
+    public static final QName USERNAME_TOKEN = new QName(
+            SP12Constants.SP_NS, SPConstants.USERNAME_TOKEN, SP12Constants.SP_PREFIX);
+
+    public static final QName WSS_USERNAME_TOKEN10 = new QName(
+            SP12Constants.SP_NS, SPConstants.USERNAME_TOKEN10, SP12Constants.SP_PREFIX);
+
+    public static final QName WSS_USERNAME_TOKEN11 = new QName(
+            SP12Constants.SP_NS, SPConstants.USERNAME_TOKEN11, SP12Constants.SP_PREFIX);
+
+    public static final QName ENCRYPTION_TOKEN = new QName(
+            SP12Constants.SP_NS, SPConstants.ENCRYPTION_TOKEN, SP12Constants.SP_PREFIX);
+
+    public static final QName X509_TOKEN = new QName(
+            SP12Constants.SP_NS, SPConstants.X509_TOKEN, SP12Constants.SP_PREFIX);
+
+    public static final QName WSS_X509_V1_TOKEN_10 = new QName(
+            SP12Constants.SP_NS, SPConstants.WSS_X509_V1_TOKEN10, SP12Constants.SP_PREFIX);
+
+    public static final QName WSS_X509_V3_TOKEN_10 = new QName(
+            SP12Constants.SP_NS, SPConstants.WSS_X509_V3_TOKEN10, SP12Constants.SP_PREFIX);
 
     public static final QName WSS_X509_PKCS7_TOKEN_10 = new QName(
-            SP12Constants.SP_NS, SPConstants.WSS_X509_PKCS7_TOKEN10 , SP12Constants.SP_PREFIX);
+            SP12Constants.SP_NS, SPConstants.WSS_X509_PKCS7_TOKEN10, SP12Constants.SP_PREFIX);
 
     public static final QName WSS_X509_PKI_PATH_V1_TOKEN_10 = new QName(
-            SP12Constants.SP_NS, SPConstants.WSS_X509_PKI_PATH_V1_TOKEN10 , SP12Constants.SP_PREFIX);
+            SP12Constants.SP_NS, SPConstants.WSS_X509_PKI_PATH_V1_TOKEN10, SP12Constants.SP_PREFIX);
 
-    public static final QName WSS_X509_V1_TOKEN_11 = new QName(SP12Constants.SP_NS,
-            SPConstants.WSS_X509_V1_TOKEN11, SP12Constants.SP_PREFIX);
+    public static final QName WSS_X509_V1_TOKEN_11 = new QName(
+            SP12Constants.SP_NS, SPConstants.WSS_X509_V1_TOKEN11, SP12Constants.SP_PREFIX);
 
-    public static final QName WSS_X509_V3_TOKEN_11 = new QName(SP12Constants.SP_NS,
-            SPConstants.WSS_X509_V3_TOKEN11 , SP12Constants.SP_PREFIX);
+    public static final QName WSS_X509_V3_TOKEN_11 = new QName(
+            SP12Constants.SP_NS, SPConstants.WSS_X509_V3_TOKEN11, SP12Constants.SP_PREFIX);
 
     public static final QName WSS_X509_PKCS7_TOKEN_11 = new QName(
             SP12Constants.SP_NS, SPConstants.WSS_X509_PKCS7_TOKEN11, SP12Constants.SP_PREFIX);
@@ -152,105 +218,110 @@ public class SP12Constants {
     public static final QName WSS_X509_PKI_PATH_V1_TOKEN_11 = new QName(
             SP12Constants.SP_NS, SPConstants.WSS_X509_PKI_PATH_V1_TOKEN11, SP12Constants.SP_PREFIX);
 
-    public static final QName ISSUED_TOKEN = new QName(SP12Constants.SP_NS,
-            SPConstants.ISSUED_TOKEN , SP12Constants.SP_PREFIX);
+    public static final QName ISSUED_TOKEN = new QName(
+            SP12Constants.SP_NS, SPConstants.ISSUED_TOKEN, SP12Constants.SP_PREFIX);
 
-    public static final QName SUPPORTING_TOKENS = new QName(SP12Constants.SP_NS,
-            SPConstants.SUPPORTING_TOKENS , SP12Constants.SP_PREFIX);
+    public static final QName SUPPORTING_TOKENS = new QName(
+            SP12Constants.SP_NS, SPConstants.SUPPORTING_TOKENS, SP12Constants.SP_PREFIX);
 
     public static final QName SIGNED_SUPPORTING_TOKENS = new QName(
-            SP12Constants.SP_NS, SPConstants.SIGNED_SUPPORTING_TOKENS , SP12Constants.SP_PREFIX);
+            SP12Constants.SP_NS, SPConstants.SIGNED_SUPPORTING_TOKENS, SP12Constants.SP_PREFIX);
 
     public static final QName ENDORSING_SUPPORTING_TOKENS = new QName(
-            SP12Constants.SP_NS, SPConstants.ENDORSING_SUPPORTING_TOKENS , SP12Constants.SP_PREFIX);
+            SP12Constants.SP_NS, SPConstants.ENDORSING_SUPPORTING_TOKENS, SP12Constants.SP_PREFIX);
 
     public static final QName SIGNED_ENDORSING_SUPPORTING_TOKENS = new QName(
-            SP12Constants.SP_NS, SPConstants.SIGNED_ENDORSING_SUPPORTING_TOKENS,
-            SP12Constants.SP_PREFIX);
-    
-    public static final QName ENCRYPTED_SUPPORTING_TOKENS = new QName(SP12Constants.SP_NS,
-            SPConstants.ENCRYPTED_SUPPORTING_TOKENS , SP12Constants.SP_PREFIX);
+            SP12Constants.SP_NS, SPConstants.SIGNED_ENDORSING_SUPPORTING_TOKENS, SP12Constants.SP_PREFIX);
+
+    public static final QName ENCRYPTED_SUPPORTING_TOKENS = new QName(
+            SP12Constants.SP_NS, SPConstants.ENCRYPTED_SUPPORTING_TOKENS, SP12Constants.SP_PREFIX);
 
     public static final QName SIGNED_ENCRYPTED_SUPPORTING_TOKENS = new QName(
-            SP12Constants.SP_NS, SPConstants.SIGNED_ENCRYPTED_SUPPORTING_TOKENS , SP12Constants.SP_PREFIX);
+            SP12Constants.SP_NS, SPConstants.SIGNED_ENCRYPTED_SUPPORTING_TOKENS, SP12Constants.SP_PREFIX);
 
     public static final QName ENDORSING_ENCRYPTED_SUPPORTING_TOKENS = new QName(
-            SP12Constants.SP_NS, SPConstants.ENDORSING_ENCRYPTED_SUPPORTING_TOKENS , SP12Constants.SP_PREFIX);
+            SP12Constants.SP_NS, SPConstants.ENDORSING_ENCRYPTED_SUPPORTING_TOKENS, SP12Constants.SP_PREFIX);
 
     public static final QName SIGNED_ENDORSING_ENCRYPTED_SUPPORTING_TOKENS = new QName(
-            SP12Constants.SP_NS, SPConstants.SIGNED_ENDORSING_ENCRYPTED_SUPPORTING_TOKENS,
-            SP12Constants.SP_PREFIX);
+            SP12Constants.SP_NS, SPConstants.SIGNED_ENDORSING_ENCRYPTED_SUPPORTING_TOKENS, SP12Constants.SP_PREFIX);
+
+    public static final QName PROTECTION_TOKEN = new QName(
+            SP12Constants.SP_NS, SPConstants.PROTECTION_TOKEN, SP12Constants.SP_PREFIX);
+
+    public static final QName ASYMMETRIC_BINDING = new QName(
+            SP12Constants.SP_NS, SPConstants.ASYMMETRIC_BINDING, SP12Constants.SP_PREFIX);
 
-    public static final QName PROTECTION_TOKEN = new QName(SP12Constants.SP_NS,
-            SPConstants.PROTECTION_TOKEN, SP12Constants.SP_PREFIX);
+    public static final QName SYMMETRIC_BINDING = new QName(
+            SP12Constants.SP_NS, SPConstants.SYMMETRIC_BINDING, SP12Constants.SP_PREFIX);
 
-    public static final QName ASYMMETRIC_BINDING = new QName(SP12Constants.SP_NS,
-            SPConstants.ASYMMETRIC_BINDING, SP12Constants.SP_PREFIX);
-    
-    public static final QName SYMMETRIC_BINDING = new QName(SP12Constants.SP_NS,
-            SPConstants.SYMMETRIC_BINDING, SP12Constants.SP_PREFIX);
+    public static final QName INITIATOR_TOKEN = new QName(
+            SP12Constants.SP_NS, SPConstants.INITIATOR_TOKEN, SP12Constants.SP_PREFIX);
 
-    public static final QName INITIATOR_TOKEN = new QName(SP12Constants.SP_NS,
-            SPConstants.INITIATOR_TOKEN , SP12Constants.SP_PREFIX);
+    public static final QName INITIATOR_SIGNATURE_TOKEN = new QName(
+            SP12Constants.SP_NS, SPConstants.INITIATOR_SIGNATURE_TOKEN, SP12Constants.SP_PREFIX);
 
-    public static final QName RECIPIENT_TOKEN = new QName(SP12Constants.SP_NS,
-            SPConstants.RECIPIENT_TOKEN , SP12Constants.SP_PREFIX);
+    public static final QName INITIATOR_ENCRYPTION_TOKEN = new QName(
+            SP12Constants.SP_NS, SPConstants.INITIATOR_ENCRYPTION_TOKEN, SP12Constants.SP_PREFIX);
 
-    public static final QName ENCRYPT_SIGNATURE = new QName(SP12Constants.SP_NS,
-            SPConstants.ENCRYPT_SIGNATURE , SP12Constants.SP_PREFIX);
+    public static final QName RECIPIENT_TOKEN = new QName(
+            SP12Constants.SP_NS, SPConstants.RECIPIENT_TOKEN, SP12Constants.SP_PREFIX);
 
-    public static final QName PROTECT_TOKENS = new QName(SP12Constants.SP_NS,
-            SPConstants.PROTECT_TOKENS, SP12Constants.SP_PREFIX);
+    public static final QName RECIPIENT_SIGNATURE_TOKEN = new QName(
+            SP12Constants.SP_NS, SPConstants.RECIPIENT_SIGNATURE_TOKEN, SP12Constants.SP_PREFIX);
+
+    public static final QName RECIPIENT_ENCRYPTION_TOKEN = new QName(
+            SP12Constants.SP_NS, SPConstants.RECIPIENT_ENCRYPTION_TOKEN, SP12Constants.SP_PREFIX);
+
+    public static final QName ENCRYPT_SIGNATURE = new QName(
+            SP12Constants.SP_NS, SPConstants.ENCRYPT_SIGNATURE, SP12Constants.SP_PREFIX);
+
+    public static final QName PROTECT_TOKENS = new QName(
+            SP12Constants.SP_NS, SPConstants.PROTECT_TOKENS, SP12Constants.SP_PREFIX);
 
     public static final QName REQUIRE_KEY_IDENTIFIRE_REFERENCE = new QName(
-            SP12Constants.SP_NS, SPConstants.REQUIRE_KEY_IDENTIFIRE_REFERENCE ,
-            SP12Constants.SP_PREFIX);
+            SP12Constants.SP_NS, SPConstants.REQUIRE_KEY_IDENTIFIER_REFERENCE, SP12Constants.SP_PREFIX);
 
     public static final QName REQUIRE_ISSUER_SERIAL_REFERENCE = new QName(
-            SP12Constants.SP_NS, SPConstants.REQUIRE_ISSUER_SERIAL_REFERENCE,
-            SP12Constants.SP_PREFIX);
+            SP12Constants.SP_NS, SPConstants.REQUIRE_ISSUER_SERIAL_REFERENCE, SP12Constants.SP_PREFIX);
 
     public static final QName REQUIRE_EMBEDDED_TOKEN_REFERENCE = new QName(
-            SP12Constants.SP_NS,SPConstants.REQUIRE_EMBEDDED_TOKEN_REFERENCE,
-            SP12Constants.SP_PREFIX);
+            SP12Constants.SP_NS, SPConstants.REQUIRE_EMBEDDED_TOKEN_REFERENCE, SP12Constants.SP_PREFIX);
 
     public static final QName REQUIRE_THUMBPRINT_REFERENCE = new QName(
-            SP12Constants.SP_NS, SPConstants.REQUIRE_THUMBPRINT_REFERENCE , SP12Constants.SP_PREFIX);
-
+            SP12Constants.SP_NS, SPConstants.REQUIRE_THUMBPRINT_REFERENCE, SP12Constants.SP_PREFIX);
 
     public static final QName MUST_SUPPORT_REF_KEY_IDENTIFIER = new QName(
-            SP12Constants.SP_NS, SPConstants.MUST_SUPPORT_REF_KEY_IDENTIFIER , SP12Constants.SP_PREFIX);
+            SP12Constants.SP_NS, SPConstants.MUST_SUPPORT_REF_KEY_IDENTIFIER, SP12Constants.SP_PREFIX);
 
     public static final QName MUST_SUPPORT_REF_ISSUER_SERIAL = new QName(
-            SP12Constants.SP_NS,SPConstants.MUST_SUPPORT_REF_ISSUER_SERIAL, SP12Constants.SP_PREFIX);
+            SP12Constants.SP_NS, SPConstants.MUST_SUPPORT_REF_ISSUER_SERIAL, SP12Constants.SP_PREFIX);
 
     public static final QName MUST_SUPPORT_REF_EXTERNAL_URI = new QName(
-            SP12Constants.SP_NS, SPConstants.MUST_SUPPORT_REF_EXTERNAL_URI , SP12Constants.SP_PREFIX);
+            SP12Constants.SP_NS, SPConstants.MUST_SUPPORT_REF_EXTERNAL_URI, SP12Constants.SP_PREFIX);
 
     public static final QName MUST_SUPPORT_REF_EMBEDDED_TOKEN = new QName(
             SP12Constants.SP_NS, SPConstants.MUST_SUPPORT_REF_EMBEDDED_TOKEN, SP12Constants.SP_PREFIX);
-    
+
     public static final QName MUST_SUPPORT_REF_THUMBPRINT = new QName(
             SP12Constants.SP_NS, SPConstants.MUST_SUPPORT_REF_THUMBPRINT, SP12Constants.SP_PREFIX);
 
     public static final QName MUST_SUPPORT_REF_ENCRYPTED_KEY = new QName(
             SP12Constants.SP_NS, SPConstants.MUST_SUPPORT_REF_ENCRYPTED_KEY, SP12Constants.SP_PREFIX);
 
-    public static final QName WSS10 = new QName(SP12Constants.SP_NS, SPConstants.WSS10 ,
-            SP12Constants.SP_PREFIX);
+    public static final QName WSS10 = new QName(
+            SP12Constants.SP_NS, SPConstants.WSS10, SP12Constants.SP_PREFIX);
 
-    public static final QName WSS11 = new QName(SP12Constants.SP_NS, SPConstants.WSS11,
-            SP12Constants.SP_PREFIX);
+    public static final QName WSS11 = new QName(
+            SP12Constants.SP_NS, SPConstants.WSS11, SP12Constants.SP_PREFIX);
 
     public static final QName REQUIRE_SIGNATURE_CONFIRMATION = new QName(
-            SP12Constants.SP_NS, SPConstants.REQUIRE_SIGNATURE_CONFIRMATION ,
-            SP12Constants.SP_PREFIX);
+            SP12Constants.SP_NS, SPConstants.REQUIRE_SIGNATURE_CONFIRMATION, SP12Constants.SP_PREFIX);
 
     public static final QName MUST_SUPPORT_CLIENT_CHALLENGE = new QName(
             SP12Constants.SP_NS, SPConstants.MUST_SUPPORT_CLIENT_CHALLENGE, SP12Constants.SP_PREFIX);
 
     public static final QName MUST_SUPPORT_SERVER_CHALLENGE = new QName(
-            SP12Constants.SP_NS,SPConstants.MUST_SUPPORT_SERVER_CHALLENGE , SP12Constants.SP_PREFIX);
+            SP12Constants.SP_NS, SPConstants.MUST_SUPPORT_SERVER_CHALLENGE, SP12Constants.SP_PREFIX);
 
     public static final QName REQUIRE_CLIENT_ENTROPY = new QName(
             SP12Constants.SP_NS, SPConstants.REQUIRE_CLIENT_ENTROPY, SP12Constants.SP_PREFIX);
@@ -259,98 +330,559 @@ public class SP12Constants {
             SP12Constants.SP_NS, SPConstants.REQUIRE_SERVER_ENTROPY, SP12Constants.SP_PREFIX);
 
     public static final QName MUST_SUPPORT_ISSUED_TOKENS = new QName(
-            SP12Constants.SP_NS, SPConstants.MUST_SUPPORT_ISSUED_TOKENS , SP12Constants.SP_PREFIX);
-    
+            SP12Constants.SP_NS, SPConstants.MUST_SUPPORT_ISSUED_TOKENS, SP12Constants.SP_PREFIX);
+
     public static final QName REQUIRE_REQUEST_SECURITY_TOKEN_COLLECTION = new QName(
-            SP12Constants.SP_NS, SPConstants.REQUIRE_REQUEST_SECURITY_TOKEN_COLLECTION , SP12Constants.SP_PREFIX);
-    
+            SP12Constants.SP_NS, SPConstants.REQUIRE_REQUEST_SECURITY_TOKEN_COLLECTION, SP12Constants.SP_PREFIX);
+
     public static final QName REQUIRE_APPLIES_TO = new QName(
             SP12Constants.SP_NS, SPConstants.REQUIRE_APPLIES_TO, SP12Constants.SP_PREFIX);
 
-    public static final QName ISSUER = new QName(SP12Constants.SP_NS, SPConstants.ISSUER ,
-            SP12Constants.SP_PREFIX);
+    public static final QName ISSUER = new QName(
+            SP12Constants.SP_NS, SPConstants.ISSUER, SP12Constants.SP_PREFIX);
+
+    public static final QName ISSUER_NAME = new QName(
+            SP12Constants.SP_NS, SPConstants.ISSUER_NAME, SP12Constants.SP_PREFIX);
+
+    public static final QName CLAIMS = new QName(
+            SP12Constants.WST_NS, SPConstants.CLAIMS, SP12Constants.WST_PREFIX);
+
+    public static final QName REQUIRE_DERIVED_KEYS = new QName(
+            SP12Constants.SP_NS, SPConstants.REQUIRE_DERIVED_KEYS, SP12Constants.SP_PREFIX);
+
+    public static final QName REQUIRE_IMPLIED_DERIVED_KEYS = new QName(
+            SP12Constants.SP_NS, SPConstants.REQUIRE_IMPLIED_DERIVED_KEYS, SP12Constants.SP_PREFIX);
+
+    public static final QName REQUIRE_EXPLICIT_DERIVED_KEYS = new QName(
+            SP12Constants.SP_NS, SPConstants.REQUIRE_EXPLICIT_DERIVED_KEYS, SP12Constants.SP_PREFIX);
 
-    public static final QName REQUIRE_DERIVED_KEYS = new QName(SP12Constants.SP_NS,
-            SPConstants.REQUIRE_DERIVED_KEYS, SP12Constants.SP_PREFIX);
-    
-    public static final QName REQUIRE_IMPLIED_DERIVED_KEYS = new QName(SP12Constants.SP_NS,
-            SPConstants.REQUIRE_IMPLIED_DERIVED_KEYS, SP12Constants.SP_PREFIX);
-    
-    public static final QName REQUIRE_EXPLICIT_DERIVED_KEYS = new QName(SP12Constants.SP_NS,
-            SPConstants.REQUIRE_EXPLICIT_DERIVED_KEYS, SP12Constants.SP_PREFIX);
-    
     public static final QName REQUIRE_EXTERNAL_URI_REFERNCE = new QName(
-            SP12Constants.SP_NS,SPConstants.REQUIRE_EXTERNAL_URI_REFERNCE, SP12Constants.SP_PREFIX);
+            SP12Constants.SP_NS, SPConstants.REQUIRE_EXTERNAL_URI_REFERNCE, SP12Constants.SP_PREFIX);
+
+    public static final QName SC13_SECURITY_CONTEXT_TOKEN = new QName(
+            SP12Constants.SP_NS, SPConstants.SC13_SECURITY_CONTEXT_TOKEN, SP12Constants.SP_PREFIX);
 
     public static final QName REQUIRE_EXTERNAL_REFERNCE = new QName(
-            SP12Constants.SP_NS, SPConstants.REQUIRE_EXTERNAL_REFERNCE , SP12Constants.SP_PREFIX);
+            SP12Constants.SP_NS, SPConstants.REQUIRE_EXTERNAL_REFERNCE, SP12Constants.SP_PREFIX);
 
     public static final QName REQUIRE_INTERNAL_REFERNCE = new QName(
-            SP12Constants.SP_NS, SPConstants.REQUIRE_INTERNAL_REFERNCE , SP12Constants.SP_PREFIX);
+            SP12Constants.SP_NS, SPConstants.REQUIRE_INTERNAL_REFERNCE, SP12Constants.SP_PREFIX);
 
     public static final QName REQUEST_SECURITY_TOKEN_TEMPLATE = new QName(
-            SP12Constants.SP_NS, SPConstants.REQUEST_SECURITY_TOKEN_TEMPLATE,
-            SP12Constants.SP_PREFIX);
+            SP12Constants.SP_NS, SPConstants.REQUEST_SECURITY_TOKEN_TEMPLATE, SP12Constants.SP_PREFIX);
+
+    public static final QName BOOTSTRAP_POLICY = new QName(
+            SP12Constants.SP_NS, SPConstants.BOOTSTRAP_POLICY, SP12Constants.SP_PREFIX);
+
+    public static final QName XPATH = new QName(
+            SP12Constants.SP_NS, SPConstants.XPATH_EXPR, SP12Constants.SP_PREFIX);
+
+    public static final QName NO_PASSWORD = new QName(
+            SP12Constants.SP_NS, SPConstants.NO_PASSWORD, SP12Constants.SP_PREFIX);
 
-    public static final QName SC10_SECURITY_CONTEXT_TOKEN = new QName(
-            SP12Constants.SP_NS, SPConstants.SC10_SECURITY_CONTEXT_TOKEN , SP12Constants.SP_PREFIX);
+    public static final QName HASH_PASSWORD = new QName(
+            SP12Constants.SP_NS, SPConstants.HASH_PASSWORD, SP12Constants.SP_PREFIX);
 
-    public static final QName BOOTSTRAP_POLICY = new QName(SP12Constants.SP_NS,
-            SPConstants.BOOTSTRAP_POLICY , SP12Constants.SP_PREFIX);
+    public static final QName HEADER = new QName(
+            SP12Constants.SP_NS, SPConstants.HEADER, SP12Constants.SP_PREFIX);
 
-    public final static QName XPATH = new QName(SP12Constants.SP_NS, SPConstants.XPATH_EXPR,
-            SP12Constants.SP_PREFIX);
-    
-    public static final QName NO_PASSWORD = new QName(SP12Constants.SP_NS, SPConstants.NO_PASSWORD,
-            SP12Constants.SP_PREFIX);
-    
-    public static final QName HASH_PASSWORD = new QName(SP12Constants.SP_NS, SPConstants.HASH_PASSWORD,
-            SP12Constants.SP_PREFIX);
-
-    // /////////////////////////////////////////////////////////////////////////////////////////////
-    
-    public static final QName HEADER = new QName(SP12Constants.SP_NS, SPConstants.HEADER);
-    
-    public static final QName BODY = new QName(SP12Constants.SP_NS, SPConstants.BODY);
-    
-    public static final QName ATTACHMENTS = new QName(SP12Constants.SP_NS, SPConstants.ATTACHMENTS);
-    
-    ////////////////////////////////////////////////////////////////////////////////////////////////
-    
-    public static int getInclusionFromAttributeValue(String value ) {
-        
-        if (INCLUDE_ALWAYS.equals(value)) {
-            return SPConstants.INCLUDE_TOEKN_ALWAYS;
+    public static final QName BODY = new QName(
+            SP12Constants.SP_NS, SPConstants.BODY, SP12Constants.SP_PREFIX);
+
+    public static final QName ATTACHMENTS = new QName(
+            SP12Constants.SP_NS, SPConstants.ATTACHMENTS, SP12Constants.SP_PREFIX);
+
+
+    @Override
+    public IncludeTokenType getInclusionFromAttributeValue(String value) {
+        if (StringUtils.isEmpty(value)) {
+            return IncludeTokenType.INCLUDE_TOKEN_ALWAYS;
+        } else if (INCLUDE_ALWAYS.equals(value)) {
+            return IncludeTokenType.INCLUDE_TOKEN_ALWAYS;
         } else if (INCLUDE_ALWAYS_TO_RECIPIENT.equals(value)) {
-            return SPConstants.INCLUDE_TOEKN_ALWAYS_TO_RECIPIENT;
-        } else if (INCLUDE_ALWAYS_TO_INITIATOR.equals(value)) { 
-            return SPConstants.INCLUDE_TOEKN_ALWAYS_TO_INITIATOR;
+            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 SPConstants.INCLUDE_TOKEN_NEVER;
+            return IncludeTokenType.INCLUDE_TOKEN_NEVER;
         } else if (INCLUDE_ONCE.equals(value)) {
-            return SPConstants.INCLUDE_TOKEN_ONCE;
-        } else {
-            return -1;
-        }   
-    }
-    
-    public static String getAttributeValueFromInclusion(int value) {
-        
-        switch(value) {
-            case SPConstants.INCLUDE_TOEKN_ALWAYS:
+            return IncludeTokenType.INCLUDE_TOKEN_ONCE;
+        }
+        throw new IllegalArgumentException(SPConstants.ERR_INVALID_POLICY);
+    }
+
+    @Override
+    public String getAttributeValueFromInclusion(IncludeTokenType value) {
+        switch (value) {
+            case INCLUDE_TOKEN_ALWAYS:
                 return SP12Constants.INCLUDE_ALWAYS;
-            case SPConstants.INCLUDE_TOEKN_ALWAYS_TO_RECIPIENT:
+            case INCLUDE_TOKEN_ALWAYS_TO_RECIPIENT:
                 return SP12Constants.INCLUDE_ALWAYS_TO_RECIPIENT;
-            case SPConstants.INCLUDE_TOEKN_ALWAYS_TO_INITIATOR:
+            case INCLUDE_TOKEN_ALWAYS_TO_INITIATOR:
                 return SP12Constants.INCLUDE_ALWAYS_TO_INITIATOR;
-            case SPConstants.INCLUDE_TOKEN_NEVER:
+            case INCLUDE_TOKEN_NEVER:
                 return SP12Constants.INCLUDE_NEVER;
-            case SPConstants.INCLUDE_TOKEN_ONCE:
+            case INCLUDE_TOKEN_ONCE:
                 return SP12Constants.INCLUDE_ONCE;
-            default :
-                return null;
+            default:
+                throw new IllegalArgumentException(SPConstants.ERR_INVALID_POLICY);
         }
-        
     }
 
+    @Override
+    public QName getIncludeToken() {
+        return INCLUDE_TOKEN;
+    }
+
+    @Override
+    public QName getIssuer() {
+        return ISSUER;
+    }
+
+    @Override
+    public QName getIssuerName() {
+        return ISSUER_NAME;
+    }
+
+    @Override
+    public QName getClaims() {
+        return CLAIMS;
+    }
+
+    @Override
+    public QName getX509Token() {
+        return X509_TOKEN;
+    }
+
+    @Override
+    public QName getRequireIssuerSerialReference() {
+        return REQUIRE_ISSUER_SERIAL_REFERENCE;
+    }
+
+    @Override
+    public QName getRequireEmbeddedTokenReference() {
+        return REQUIRE_EMBEDDED_TOKEN_REFERENCE;
+    }
+
+    @Override
+    public QName getRequireThumbprintReference() {
+        return REQUIRE_THUMBPRINT_REFERENCE;
+    }
+
+    @Override
+    public QName getHttpsToken() {
+        return HTTPS_TOKEN;
+    }
+
+    @Override
+    public QName getUsernameToken() {
+        return USERNAME_TOKEN;
+    }
+
+    @Override
+    public QName getCreated() {
+        return EMPTY_QNAME;
+    }
+
+    @Override
+    public QName getNonce() {
+        return EMPTY_QNAME;
+    }
+
+    @Override
+    public QName getIssuedToken() {
+        return ISSUED_TOKEN;
+    }
+
+    @Override
+    public QName getRequireExternalReference() {
+        return REQUIRE_EXTERNAL_REFERNCE;
+    }
+
+    @Override
+    public QName getRequireInternalReference() {
+        return REQUIRE_INTERNAL_REFERNCE;
+    }
+
+    @Override
+    public QName getRequestSecurityTokenTemplate() {
+        return REQUEST_SECURITY_TOKEN_TEMPLATE;
+    }
+
+    @Override
+    public QName getKerberosToken() {
+        return KERBEROS_TOKEN;
+    }
+
+    @Override
+    public QName getSpnegoContextToken() {
+        return SPNEGO_CONTEXT_TOKEN;
+    }
+
+    @Override
+    public QName getSecurityContextToken() {
+        return SECURITY_CONTEXT_TOKEN;
+    }
+
+    @Override
+    public QName getRequireExternalUriReference() {
+        return REQUIRE_EXTERNAL_URI_REFERNCE;
+    }
+
+    @Override
+    public QName getSc13SecurityContextToken() {
+        return SC13_SECURITY_CONTEXT_TOKEN;
+    }
+
+    @Override
+    public QName getSc10SecurityContextToken() {
+        return EMPTY_QNAME;
+    }
+
+    @Override
+    public QName getSecureConversationToken() {
+        return SECURE_CONVERSATION_TOKEN;
+    }
+
+    @Override
+    public QName getMustNotSendCancel() {
+        return MUST_NOT_SEND_CANCEL;
+    }
+
+    @Override
+    public QName getMustNotSendAmend() {
+        return MUST_NOT_SEND_AMEND;
+    }
+
+    @Override
+    public QName getMustNotSendRenew() {
+        return MUST_NOT_SEND_RENEW;
+    }
+
+    @Override
+    public QName getBootstrapPolicy() {
+        return BOOTSTRAP_POLICY;
+    }
+
+    @Override
+    public QName getSamlToken() {
+        return SAML_TOKEN;
+    }
+
+    @Override
+    public QName getRelToken() {
+        return REL_TOKEN;
+    }
+
+    @Override
+    public QName getRequireKeyIdentifierReference() {
+        return REQUIRE_KEY_IDENTIFIRE_REFERENCE;
+    }
+
+    @Override
+    public QName getKeyValueToken() {
+        return KEY_VALUE_TOKEN;
+    }
+
+    @Override
+    public QName getRsaKeyValue() {
+        return RSA_KEY_VALUE;
+    }
+
+    @Override
+    public QName getSignedParts() {
+        return SIGNED_PARTS;
+    }
+
+    @Override
+    public QName getSignedElements() {
+        return SIGNED_ELEMENTS;
+    }
+
+    @Override
+    public QName getXPathExpression() {
+        return XPATH_EXPR;
+    }
+
+    @Override
+    public QName getXPath2Expression() {
+        return EMPTY_QNAME;
+    }
+
+    @Override
+    public QName getEncryptedParts() {
+        return ENCRYPTED_PARTS;
+    }
+
+    @Override
+    public QName getEncryptedElements() {
+        return ENCRYPTED_ELEMENTS;
+    }
+
+    @Override
+    public QName getContentEncryptedElements() {
+        return CONTENT_ENCRYPTED_ELEMENTS;
+    }
+
+    @Override
+    public QName getRequiredElements() {
+        return REQUIRED_ELEMENTS;
+    }
+
+    @Override
+    public QName getRequiredParts() {
+        return REQUIRED_PARTS;
+    }
+
+    @Override
+    public QName getAlgorithmSuite() {
+        return ALGORITHM_SUITE;
+    }
+
+    @Override
+    public QName getLayout() {
+        return LAYOUT;
+    }
+
+    @Override
+    public QName getBody() {
+        return BODY;
+    }
+
+    @Override
+    public QName getAttachments() {
+        return ATTACHMENTS;
+    }
+
+    @Override
+    public QName getContentSignatureTransform() {
+        return EMPTY_QNAME;
+    }
+
+    @Override
+    public QName getAttachmentCompleteSignatureTransform() {
+        return EMPTY_QNAME;
+    }
+
+    @Override
+    public QName getHeader() {
+        return HEADER;
+    }
+
+    @Override
+    public QName getEncryptSignature() {
+        return ENCRYPT_SIGNATURE;
+    }
+
+    @Override
+    public QName getProtectTokens() {
+        return PROTECT_TOKENS;
+    }
+
+    @Override
+    public QName getOnlySignEntireHeadersAndBody() {
+        return ONLY_SIGN_ENTIRE_HEADERS_AND_BODY;
+    }
+
+    @Override
+    public QName getTransportBinding() {
+        return TRANSPORT_BINDING;
+    }
+
+    @Override
+    public QName getSymmetricBinding() {
+        return SYMMETRIC_BINDING;
+    }
+
+    @Override
+    public QName getAsymmetricBinding() {
+        return ASYMMETRIC_BINDING;
+    }
+
+    @Override
+    public QName getEncryptionToken() {
+        return ENCRYPTION_TOKEN;
+    }
+
+    @Override
+    public QName getSignatureToken() {
+        return SIGNATURE_TOKEN;
+    }
+
+    @Override
+    public QName getProtectionToken() {
+        return PROTECTION_TOKEN;
+    }
+
+    @Override
+    public QName getTransportToken() {
+        return TRANSPORT_TOKEN;
+    }
+
+    @Override
+    public QName getInitiatorToken() {
+        return INITIATOR_TOKEN;
+    }
+
+    @Override
+    public QName getInitiatorSignatureToken() {
+        return INITIATOR_SIGNATURE_TOKEN;
+    }
+
+    @Override
+    public QName getInitiatorEncryptionToken() {
+        return INITIATOR_ENCRYPTION_TOKEN;
+    }
+
+    @Override
+    public QName getRecipientToken() {
+        return RECIPIENT_TOKEN;
+    }
+
+    @Override
+    public QName getRecipientSignatureToken() {
+        return RECIPIENT_SIGNATURE_TOKEN;
+    }
+
+    @Override
+    public QName getRecipientEncryptionToken() {
+        return RECIPIENT_ENCRYPTION_TOKEN;
+    }
+
+    public enum SupportingTokenTypes implements SupportingTokenType {
+        SupportingTokens(SUPPORTING_TOKENS),
+        SignedSupportingTokens(SIGNED_SUPPORTING_TOKENS),
+        EndorsingSupportingTokens(ENDORSING_SUPPORTING_TOKENS),
+        SignedEndorsingSupportingTokens(SIGNED_ENDORSING_SUPPORTING_TOKENS),
+        SignedEncryptedSupportingTokens(SIGNED_ENCRYPTED_SUPPORTING_TOKENS),
+        EncryptedSupportingTokens(ENCRYPTED_SUPPORTING_TOKENS),
+        EndorsingEncryptedSupportingTokens(ENDORSING_ENCRYPTED_SUPPORTING_TOKENS),
+        SignedEndorsingEncryptedSupportingTokens(SIGNED_ENDORSING_ENCRYPTED_SUPPORTING_TOKENS);
+
+        private static final Map<QName, SupportingTokenTypes> lookup = new HashMap<QName, SupportingTokenTypes>();
+
+        static {
+            for (SupportingTokenTypes u : EnumSet.allOf(SupportingTokenTypes.class))
+                lookup.put(u.getName(), u);
+        }
+
+        public static SupportingTokenTypes lookUp(QName name) {
+            return lookup.get(name);
+        }
+
+        private QName name;
+
+        SupportingTokenTypes(QName name) {
+            this.name = name;
+        }
+
+        public QName getName() {
+            return name;
+        }
+    }
+
+    @Override
+    public SupportingTokenType getSupportingTokenType(QName name) {
+        return SupportingTokenTypes.lookUp(name);
+    }
+
+    @Override
+    public QName getTrust10() {
+        return EMPTY_QNAME;
+    }
+
+    @Override
+    public QName getTrust13() {
+        return TRUST_13;
+    }
+
+    @Override
+    public QName getScopePolicy15() {
+        return EMPTY_QNAME;
+    }
+
+    @Override
+    public QName getMustSupportClientChallenge() {
+        return MUST_SUPPORT_CLIENT_CHALLENGE;
+    }
+
+    @Override
+    public QName getMustSupportServerChallenge() {
+        return MUST_SUPPORT_SERVER_CHALLENGE;
+    }
+
+    @Override
+    public QName getRequireClientEntropy() {
+        return REQUIRE_CLIENT_ENTROPY;
+    }
+
+    @Override
+    public QName getRequireServerEntropy() {
+        return REQUIRE_SERVER_ENTROPY;
+    }
+
+    @Override
+    public QName getMustSupportIssuedTokens() {
+        return MUST_SUPPORT_ISSUED_TOKENS;
+    }
+
+    @Override
+    public QName getRequireRequestSecurityTokenCollection() {
+        return REQUIRE_REQUEST_SECURITY_TOKEN_COLLECTION;
+    }
+
+    @Override
+    public QName getRequireAppliesTo() {
+        return REQUIRE_APPLIES_TO;
+    }
+
+    @Override
+    public QName getMustSupportInteractiveChallenge() {
+        return EMPTY_QNAME;
+    }
+
+    @Override
+    public QName getWss10() {
+        return WSS10;
+    }
+
+    @Override
+    public QName getMustSupportRefKeyIdentifier() {
+        return MUST_SUPPORT_REF_KEY_IDENTIFIER;
+    }
+
+    @Override
+    public QName getMustSupportRefIssuerSerial() {
+        return MUST_SUPPORT_REF_ISSUER_SERIAL;
+    }
+
+    @Override
+    public QName getMustSupportRefExternalUri() {
+        return MUST_SUPPORT_REF_EXTERNAL_URI;
+    }
+
+    @Override
+    public QName getMustSupportRefEmbeddedToken() {
+        return MUST_SUPPORT_REF_EMBEDDED_TOKEN;
+    }
+
+    @Override
+    public QName getWss11() {
+        return WSS11;
+    }
+
+    @Override
+    public QName getMustSupportRefThumbprint() {
+        return MUST_SUPPORT_REF_THUMBPRINT;
+    }
+
+    @Override
+    public QName getMustSupportRefEncryptedKey() {
+        return MUST_SUPPORT_REF_ENCRYPTED_KEY;
+    }
+
+    @Override
+    public QName getRequireSignatureConfirmation() {
+        return REQUIRE_SIGNATURE_CONFIRMATION;
+    }
 }

Propchange: webservices/wss4j/branches/swssf/rampart-policy/src/main/java/org/apache/ws/secpolicy/SP12Constants.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Added: webservices/wss4j/branches/swssf/rampart-policy/src/main/java/org/apache/ws/secpolicy/SP13Constants.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/rampart-policy/src/main/java/org/apache/ws/secpolicy/SP13Constants.java?rev=1210203&view=auto
==============================================================================
--- webservices/wss4j/branches/swssf/rampart-policy/src/main/java/org/apache/ws/secpolicy/SP13Constants.java (added)
+++ webservices/wss4j/branches/swssf/rampart-policy/src/main/java/org/apache/ws/secpolicy/SP13Constants.java Sun Dec  4 20:33:05 2011
@@ -0,0 +1,100 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.ws.secpolicy;
+
+import javax.xml.namespace.QName;
+
+/**
+ * @author $Author$
+ * @version $Revision$ $Date$
+ */
+public class SP13Constants extends SP12Constants {
+
+    private static SP13Constants sp13Constants = null;
+
+    protected SP13Constants() {
+        super();
+    }
+
+    public static synchronized SP13Constants getInstance() {
+        if (sp13Constants == null) {
+            sp13Constants = new SP13Constants();
+        }
+        return sp13Constants;
+    }
+
+    public final static String SP_NS = "http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200802";
+    public final static String SP_PREFIX = "sp13";
+
+    public static final QName CONTENT_SIGNATURE_TRANSFORM = new QName(
+            SP13Constants.SP_NS, SPConstants.CONTENT_SIGNATURE_TRANSFORM, SP13Constants.SP_PREFIX);
+
+    public static final QName ATTACHMENT_COMPLETE_SIGNATURE_TRANSFORM = new QName(
+            SP13Constants.SP_NS, SPConstants.ATTACHMENT_COMPLETE_SIGNATURE_TRANSFORM, SP13Constants.SP_PREFIX);
+
+    public static final QName XPATH2_EXPR = new QName(
+            SP13Constants.SP_NS, SPConstants.XPATH2_EXPR, SP13Constants.SP_PREFIX);
+
+    public static final QName CREATED = new QName(
+            SP13Constants.SP_NS, SPConstants.CREATED, SP13Constants.SP_PREFIX);
+
+    public static final QName NONCE = new QName(
+            SP13Constants.SP_NS, SPConstants.NONCE, SP13Constants.SP_PREFIX);
+
+    public static final QName SCOPE_POLICY_15 = new QName(
+            SP13Constants.SP_NS, SPConstants.SCOPE_POLICY_15, SP13Constants.SP_PREFIX);
+
+    public static final QName MUST_SUPPORT_INTERACTIVE_CHALLENGE = new QName(
+            SP13Constants.SP_NS, SPConstants.MUST_SUPPORT_INTERACTIVE_CHALLENGE, SP13Constants.SP_PREFIX);
+
+    @Override
+    public QName getContentSignatureTransform() {
+        return CONTENT_SIGNATURE_TRANSFORM;
+    }
+
+    @Override
+    public QName getAttachmentCompleteSignatureTransform() {
+        return ATTACHMENT_COMPLETE_SIGNATURE_TRANSFORM;
+    }
+
+    @Override
+    public QName getXPath2Expression() {
+        return XPATH2_EXPR;
+    }
+
+    @Override
+    public QName getCreated() {
+        return CREATED;
+    }
+
+    @Override
+    public QName getNonce() {
+        return NONCE;
+    }
+
+    @Override
+    public QName getScopePolicy15() {
+        return SCOPE_POLICY_15;
+    }
+
+    @Override
+    public QName getMustSupportInteractiveChallenge() {
+        return MUST_SUPPORT_INTERACTIVE_CHALLENGE;
+    }
+}

Propchange: webservices/wss4j/branches/swssf/rampart-policy/src/main/java/org/apache/ws/secpolicy/SP13Constants.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Modified: webservices/wss4j/branches/swssf/rampart-policy/src/main/java/org/apache/ws/secpolicy/SPConstants.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/rampart-policy/src/main/java/org/apache/ws/secpolicy/SPConstants.java?rev=1210203&r1=1210202&r2=1210203&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/rampart-policy/src/main/java/org/apache/ws/secpolicy/SPConstants.java (original)
+++ webservices/wss4j/branches/swssf/rampart-policy/src/main/java/org/apache/ws/secpolicy/SPConstants.java Sun Dec  4 20:33:05 2011
@@ -1,37 +1,83 @@
-/*
- * Copyright 2004,2005 The Apache Software Foundation.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.apache.ws.secpolicy;
 
+import org.apache.ws.secpolicy.model.SupportingTokenType;
+
 import javax.xml.namespace.QName;
+import java.util.EnumSet;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @author $Author$
+ * @version $Revision$ $Date$
+ */
+public abstract class SPConstants {
+
+    public static final String ERR_INVALID_POLICY = "Invalid Policy";
+    public static final QName EMPTY_QNAME = new QName("", "", "");
+
+    public enum SPVersion {
+
+        SP11(SP11Constants.SP_NS, SP11Constants.SP_PREFIX, SP11Constants.getInstance()),
+        //this is not an error. We use SP13 for SP12NS because SP13 is an extension of SP12:
+        SP12(SP12Constants.SP_NS, SP12Constants.SP_PREFIX, SP13Constants.getInstance()),
+        SP13(SP13Constants.SP_NS, SP13Constants.SP_PREFIX, SP13Constants.getInstance());
+
+        private String prefix;
+        private String namespace;
+        private SPConstants spConstants;
+
+        SPVersion(String namespace, String prefix, SPConstants spConstants) {
+            this.namespace = namespace;
+            this.spConstants = spConstants;
+            this.prefix = prefix;
+        }
+
+        private static final Map<String, SPVersion> lookup = new HashMap<String, SPVersion>();
+
+        static {
+            for (SPVersion spVersion : EnumSet.allOf(SPVersion.class))
+                lookup.put(spVersion.namespace, spVersion);
+        }
+
+        public static SPVersion getSPVersion(String namespace) {
+            return lookup.get(namespace);
+        }
+
+        public SPConstants getSPConstants() {
+            return spConstants;
+        }
+
+        public String getNamespace() {
+            return namespace;
+        }
+
+        public String getPrefix() {
+            return prefix;
+        }
+    }
+
+    public static final String P_LOCALNAME = "Policy";
+
 
-public class SPConstants {
-    
-    public static final String P_NS = "http://schemas.xmlsoap.org/ws/2004/09/policy";
-
-    public static final String P_PREFIX = "wsp";
-
-    public static final QName POLICY = new QName(P_NS, "Policy", P_PREFIX);
-    
-    public static final int SP_V11 = 1;
-    
-    public static final int SP_V12 = 2;
-    
-    ////////////////////////////////////////////////////////////////////////////////////////////////
-    
     public final static String LAYOUT = "Layout";
 
     /**
@@ -53,7 +99,7 @@ public class SPConstants {
      * Security Header Layout : LaxTimestampLast
      */
     public final static String LAYOUT_LAX_TIMESTAMP_LAST = "LaxTimestampLast";
-    
+
     ////////////////////////////////////////////////////////////////////////////////////////////////
 
     /**
@@ -65,47 +111,51 @@ public class SPConstants {
      * Protection Order : SignBeforeEncrypting
      */
     public final static String SIGN_BEFORE_ENCRYPTING = "SignBeforeEncrypting";
-    
+
     ////////////////////////////////////////////////////////////////////////////////////////////////
-    
+
     public final static String ENCRYPT_SIGNATURE = "EncryptSignature";
-    
+
     ////////////////////////////////////////////////////////////////////////////////////////////////
-    
+
     public final static String PROTECT_TOKENS = "ProtectTokens";
-    
+
     ////////////////////////////////////////////////////////////////////////////////////////////////
 
     public final static String ONLY_SIGN_ENTIRE_HEADERS_AND_BODY = "OnlySignEntireHeadersAndBody";
-     
+
     ////////////////////////////////////////////////////////////////////////////////////////////////
-    
+
     public final static String INCLUDE_TIMESTAMP = "IncludeTimestamp";
-    
+
     ////////////////////////////////////////////////////////////////////////////////////////////////
-    
+
     public final static String SIGNED_PARTS = "SignedParts";
-    
+
     public final static String ENCRYPTED_PARTS = "EncryptedParts";
-    
+
     public final static String SIGNED_ELEMENTS = "SignedElements";
-    
+
     public final static String ENCRYPTED_ELEMENTS = "EncryptedElements";
-    
+
     public final static String REQUIRED_ELEMENTS = "RequiredElements";
-    
+
     public final static String CONTENT_ENCRYPTED_ELEMENTS = "ContentEncryptedElements";
-    
+
     public final static String REQUIRED_PARTS = "RequiredParts";
-    
+
     public final static String XPATH_VERSION = "XPathVersion";
-    
+
     public final static String XPATH_EXPR = "XPath";
-    
+
+    public final static String XPATH2_EXPR = "Xpath2";
+
+    public final static String FILTER = "Filter";
+
     ////////////////////////////////////////////////////////////////////////////////////////////////
-    
+
     // X509 Token types 
-    
+
     public final static String X509_TOKEN = "X509Token";
 
     public final static String WSS_X509_V1_TOKEN10 = "WssX509V1Token10";
@@ -123,85 +173,83 @@ public class SPConstants {
     public final static String WSS_X509_PKCS7_TOKEN11 = "WssX509Pkcs7Token11";
 
     public final static String WSS_X509_PKI_PATH_V1_TOKEN11 = "WssX509PkiPathV1Token11";
-    
-    
+
+
     public final static String USERNAME_TOKEN = "UsernameToken";
-    
+
     public final static String USERNAME_TOKEN10 = "WssUsernameToken10";
-    
+
     public final static String USERNAME_TOKEN11 = "WssUsernameToken11";
 
-    
+
     public final static String TRANSPORT_TOKEN = "TransportToken";
-    
+
     public final static String HTTPS_TOKEN = "HttpsToken";
-    
+
+    public final static String KERBEROS_TOKEN = "KerberosToken";
+
+    public final static String SPNEGO_CONTEXT_TOKEN = "SpnegoContextToken";
+
     public final static QName REQUIRE_CLIENT_CERTIFICATE = new QName("RequireClientCertificate");
-    
+
     public final static QName HTTP_BASIC_AUTHENTICATION = new QName("HttpBasicAuthentication");
-    
+
     public final static QName HTTP_DIGEST_AUTHENTICATION = new QName("HttpDigestAuthentication");
-    
+
     public final static String SECURITY_CONTEXT_TOKEN = "SecurityContextToken";
-    
+
     public final static String SECURE_CONVERSATION_TOKEN = "SecureConversationToken";
-    
+
+    public final static String SAML_TOKEN = "SamlToken";
+
+    public final static String REL_TOKEN = "RelToken";
+
+    public final static String KEY_VALUE_TOKEN = "KeyValueToken";
+
+    public final static String RSA_KEY_VALUE = "RsaKeyValue";
+
     public final static String ISSUED_TOKEN = "IssuedToken";
-    
+
 
     public final static String SIGNATURE_TOKEN = "SignatureToken";
-    
+
     public final static String ENCRYPTION_TOKEN = "EncryptionToken";
-    
+
     public final static String PROTECTION_TOKEN = "ProtectionToken";
-    
+
     public final static String INITIATOR_TOKEN = "InitiatorToken";
-    
+
+    public final static String INITIATOR_SIGNATURE_TOKEN = "InitiatorSignatureToken";
+
+    public final static String INITIATOR_ENCRYPTION_TOKEN = "InitiatorEncryptionToken";
+
     public final static String RECIPIENT_TOKEN = "RecipientToken";
-    
-    
-    
+
+    public final static String RECIPIENT_SIGNATURE_TOKEN = "RecipientSignatureToken";
+
+    public final static String RECIPIENT_ENCRYPTION_TOKEN = "RecipientEncryptionToken";
+
+
     public final static String SUPPORTING_TOKENS = "SupportingTokens";
-    
+
     public final static String SIGNED_SUPPORTING_TOKENS = "SignedSupportingTokens";
-    
+
     public final static String ENDORSING_SUPPORTING_TOKENS = "EndorsingSupportingTokens";
-    
+
     public final static String SIGNED_ENDORSING_SUPPORTING_TOKENS = "SignedEndorsingSupportingTokens";
-    
+
     public final static String ENCRYPTED_SUPPORTING_TOKENS = "EncryptedSupportingTokens";
-    
+
     public final static String SIGNED_ENCRYPTED_SUPPORTING_TOKENS = "SignedEncryptedSupportingTokens";
-    
+
     public final static String ENDORSING_ENCRYPTED_SUPPORTING_TOKENS = "EndorsingEncryptedSupportingTokens";
-    
-    public final static String SIGNED_ENDORSING_ENCRYPTED_SUPPORTING_TOKENS = "SignedEndorsingEncryptedSupportingTokens";   
-    
-    public final static int SUPPORTING_TOKEN_SUPPORTING = 1;
-
-    public final static int SUPPORTING_TOKEN_ENDORSING = 2;
-
-    public final static int SUPPORTING_TOKEN_SIGNED = 3;
-
-    public final static int SUPPORTING_TOKEN_SIGNED_ENDORSING = 4;
-    
-    public final static int SUPPORTING_TOKEN_SIGNED_ENCRYPTED = 5;
-    
-    public final static int SUPPORTING_TOKEN_ENCRYPTED = 6;
-    
-    public final static int SUPPORTING_TOKEN_ENDORSING_ENCRYPTED = 7;
-    
-    public final static int SUPPORTING_TOKEN_SIGNED_ENDORSING_ENCRYPTED = 8;
-    
-    ////////////////////////////////////////////////////////////////////////////////////////////////
-
-    
-    public final static String ALGO_SUITE = "AlgorithmSuite";
-    
-    
-    // /
-    // /Algorithm Suites
-    // /
+
+    public final static String SIGNED_ENDORSING_ENCRYPTED_SUPPORTING_TOKENS = "SignedEndorsingEncryptedSupportingTokens";
+
+    ////////////////////////////////////////////////////////////////////////////////////////////////
+
+    public final static String ALGORITHM_SUITE = "AlgorithmSuite";
+
     public final static String ALGO_SUITE_BASIC256 = "Basic256";
 
     public final static String ALGO_SUITE_BASIC192 = "Basic192";
@@ -240,11 +288,11 @@ public class SPConstants {
     public final static String HMAC_SHA1 = "http://www.w3.org/2000/09/xmldsig#hmac-sha1";
 
     public final static String RSA_SHA1 = "http://www.w3.org/2000/09/xmldsig#rsa-sha1";
-    
+
     public final static String RSA_SHA256 = "http://www.w3.org/2001/04/xmldsig-more#rsa-sha256";
-    
+
     public final static String RSA_SHA384 = "http://www.w3.org/2001/04/xmldsig-more#rsa-sha384";
-    
+
     public final static String RSA_SHA512 = "http://www.w3.org/2001/04/xmldsig-more#rsa-sha512";
 
     public final static String SHA1 = "http://www.w3.org/2000/09/xmldsig#sha1";
@@ -287,6 +335,8 @@ public class SPConstants {
 
     public final static String C14N = "http://www.w3.org/2001/10/xml-c14n#";
 
+    public final static String C14N11 = "http://www.w3.org/2006/12/xml-c14n11";
+
     public final static String EX_C14N = "http://www.w3.org/2001/10/xml-exc-c14n#";
 
     public final static String SNT = "http://www.w3.org/TR/soap12-n11n";
@@ -304,132 +354,342 @@ public class SPConstants {
     public static final String XPATH10 = "XPath10";
 
     public static final String XPATH_FILTER20 = "XPathFilter20";
-    
+
+    public static final String ABS_XPATH = "http://docs.oasis-open.org/...TBD.../AbsXPath";
+
     ////////////////////////////////////////////////////////////////////////////////////////////////
-    
+
     public final static String ATTR_INCLUDE_TOKEN = "IncludeToken";
-    
+
     public static final String INCLUDE_TOKEN_NEVER_SUFFIX = "/IncludeToken/Never";
-    
+
     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_TOEKN_ALWAYS_TO_INITIATOR_SUFFIX = "/IncludeToken/AlwaysToInitiator";
-    
+
     public static final String INCLUDE_TOEKN_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_TOEKN_ALWAYS_TO_INITIATOR = 4;
-    
+
     public static final int INCLUDE_TOEKN_ALWAYS = 5;
-    
-    
-    
+
+
     ////////////////////////////////////////////////////////////////////////////////////////////////
-    
+
     public static final String TRANSPORT_BINDING = "TransportBinding";
-    
+
     public static final String ASYMMETRIC_BINDING = "AsymmetricBinding";
-    
+
     public static final String SYMMETRIC_BINDING = "SymmetricBinding";
-    
+
     ////////////////////////////////////////////////////////////////////////////////////////////////
-    
-    public static final String REQUIRE_KEY_IDENTIFIRE_REFERENCE = "RequireKeyIdentifierReference";
-    
+
+    public static final String REQUIRE_KEY_IDENTIFIER_REFERENCE = "RequireKeyIdentifierReference";
+
     public static final String REQUIRE_ISSUER_SERIAL_REFERENCE = "RequireIssuerSerialReference";
-    
+
     public static final String REQUIRE_EMBEDDED_TOKEN_REFERENCE = "RequireEmbeddedTokenReference";
-    
+
     public static final String REQUIRE_THUMBPRINT_REFERENCE = "RequireThumbprintReference";
-    
+
     public static final String REQUIRE_SIGNATURE_CONFIRMATION = "RequireSignatureConfirmation";
-    
+
     ////////////////////////////////////////////////////////////////////////////////////////////////
-    
+
     public static final String MUST_SUPPORT_REF_KEY_IDENTIFIER = "MustSupportRefKeyIdentifier";
-    
+
     public static final String MUST_SUPPORT_REF_ISSUER_SERIAL = "MustSupportRefIssuerSerial";
-    
+
     public static final String MUST_SUPPORT_REF_EXTERNAL_URI = "MustSupportRefExternalURI";
-    
+
     public static final String MUST_SUPPORT_REF_EMBEDDED_TOKEN = "MustSupportRefEmbeddedToken";
-    
+
     public static final String MUST_SUPPORT_REF_THUMBPRINT = "MustSupportRefThumbprint";
-    
-    public static final String MUST_SUPPORT_REF_ENCRYPTED_KEY = "MustSupportRefEncryptedkey";
-    
+
+    public static final String MUST_SUPPORT_REF_ENCRYPTED_KEY = "MustSupportRefEncryptedKey";
+
     ////////////////////////////////////////////////////////////////////////////////////////////////
-    
+
     public static final String WSS10 = "Wss10";
-    
+
     public static final String WSS11 = "Wss11";
-    
+
     ////////////////////////////////////////////////////////////////////////////////////////////////
-    
+
     public static final String TRUST_10 = "Trust10";
-    
+
     public static final String TRUST_13 = "Trust13";
-    
-    public static final String MUST_SUPPORT_CLIENT_CHALLENGE = "MustSupportClientChanllenge";
-    
-    public static final String MUST_SUPPORT_SERVER_CHALLENGE = "MustSupportServerChanllenge";
-    
+
+    public static final String MUST_SUPPORT_CLIENT_CHALLENGE = "MustSupportClientChallenge";
+
+    public static final String MUST_SUPPORT_SERVER_CHALLENGE = "MustSupportServerChallenge";
+
     public static final String REQUIRE_CLIENT_ENTROPY = "RequireClientEntropy";
-    
+
     public static final String REQUIRE_SERVER_ENTROPY = "RequireServerEntropy";
-    
+
     public static final String MUST_SUPPORT_ISSUED_TOKENS = "MustSupportIssuedTokens";
-    
+
     public static final String REQUIRE_REQUEST_SECURITY_TOKEN_COLLECTION = "RequireRequestSecurityTokenCollection";
-    
+
     public static final String REQUIRE_APPLIES_TO = "RequireAppliesTo";
-    
+
+    public static final String SCOPE_POLICY_15 = "ScopePolicy15";
+    public static final String MUST_SUPPORT_INTERACTIVE_CHALLENGE = "MustSupportInteractiveChallenge";
+
     public static final String ISSUER = "Issuer";
-    
+
+    public static final String ISSUER_NAME = "IssuerName";
+
+    public static final String CLAIMS = "Claims";
+
     public static final String REQUIRE_DERIVED_KEYS = "RequireDerivedKeys";
-    
+
     public static final String REQUIRE_IMPLIED_DERIVED_KEYS = "RequireImpliedDerivedKeys";
-    
+
     public static final String REQUIRE_EXPLICIT_DERIVED_KEYS = "RequireExplicitDerivedKeys";
-    
+
     public static final String REQUIRE_EXTERNAL_URI_REFERNCE = "RequireExternalUriReference";
-    
+
     public static final String REQUIRE_EXTERNAL_REFERNCE = "RequireExternalReference";
-    
+
     public static final String REQUIRE_INTERNAL_REFERNCE = "RequireInternalReference";
-    
+
     public static final String REQUEST_SECURITY_TOKEN_TEMPLATE = "RequestSecurityTokenTemplate";
-    
+
     public static final String SC10_SECURITY_CONTEXT_TOKEN = "SC10SecurityContextToken";
-    
+
+    public static final String SC13_SECURITY_CONTEXT_TOKEN = "SC13SecurityContextToken";
+
     public static final String BOOTSTRAP_POLICY = "BootstrapPolicy";
-    
+
     ////////////////////////////////////////////////////////////////////////////////////////////////
-    
+
     public static final String HEADER = "Header";
-    
-    public static final String BODY = "Body" ;
-    
+
+    public static final String BODY = "Body";
+
     public static final String ATTACHMENTS = "Attachments";
-    
-    public static final QName NAME = new QName("Name");
-    
-    public static final QName NAMESPACE = new QName("Namespace");
-    
+    public static final String CONTENT_SIGNATURE_TRANSFORM = "ContentSignatureTransform";
+    public static final String ATTACHMENT_COMPLETE_SIGNATURE_TRANSFORM = "AttachmentCompleteSignatureTransform";
+
+    public static final String NAME = "Name";
+    public static final String NAMESPACE = "Namespace";
+
     ////////////////////////////////////////////////////////////////////////////////////////////////
-    
+
     public static final String NO_PASSWORD = "NoPassword";
-    
     public static final String HASH_PASSWORD = "HashPassword";
-    
 
-    
+    public static final String CREATED = "Created";
+    public static final String NONCE = "Nonce";
+
+    public static final String MUST_NOT_SEND_CANCEL = "MustNotSendCancel";
+    public static final String MUST_NOT_SEND_AMEND = "MustNotSendAmend";
+    public static final String MUST_NOT_SEND_RENEW = "MustNotSendRenew";
+
+    public static final String ATT_OPTIONAL = "Optional";
+
+    public static final String ATT_IGNORABLE = "Ignorable";
+
+    public enum IncludeTokenType {
+        INCLUDE_TOKEN_NEVER,
+        INCLUDE_TOKEN_ONCE,
+        INCLUDE_TOKEN_ALWAYS_TO_RECIPIENT,
+        INCLUDE_TOKEN_ALWAYS_TO_INITIATOR,
+        INCLUDE_TOKEN_ALWAYS;
+
+        private static final Map<String, IncludeTokenType> lookup = new HashMap<String, IncludeTokenType>();
+
+        static {
+            for (IncludeTokenType u : EnumSet.allOf(IncludeTokenType.class))
+                lookup.put(u.name(), u);
+        }
+
+        public static IncludeTokenType lookUp(String name) {
+            return lookup.get(name);
+        }
+    }
+
+    public abstract IncludeTokenType getInclusionFromAttributeValue(String value) throws IllegalArgumentException;
+
+    public abstract String getAttributeValueFromInclusion(IncludeTokenType value) throws IllegalArgumentException;
+
+    public abstract QName getIncludeToken();
+
+    public abstract QName getIssuer();
+
+    public abstract QName getIssuerName();
+
+    public abstract QName getClaims();
+
+    public abstract QName getX509Token();
+
+    public abstract QName getRequireIssuerSerialReference();
+
+    public abstract QName getRequireEmbeddedTokenReference();
+
+    public abstract QName getRequireThumbprintReference();
+
+    public abstract QName getHttpsToken();
+
+    public abstract QName getUsernameToken();
+
+    public abstract QName getCreated();
+
+    public abstract QName getNonce();
+
+    public abstract QName getIssuedToken();
+
+    public abstract QName getRequireExternalReference();
+
+    public abstract QName getRequireInternalReference();
+
+    public abstract QName getRequestSecurityTokenTemplate();
+
+    public abstract QName getKerberosToken();
+
+    public abstract QName getSpnegoContextToken();
+
+    public abstract QName getSecurityContextToken();
+
+    public abstract QName getRequireExternalUriReference();
+
+    public abstract QName getSc13SecurityContextToken();
+
+    public abstract QName getSc10SecurityContextToken();
+
+    public abstract QName getSecureConversationToken();
+
+    public abstract QName getMustNotSendCancel();
+
+    public abstract QName getMustNotSendAmend();
+
+    public abstract QName getMustNotSendRenew();
+
+    public abstract QName getBootstrapPolicy();
+
+    public abstract QName getSamlToken();
+
+    public abstract QName getRelToken();
+
+    public abstract QName getRequireKeyIdentifierReference();
+
+    public abstract QName getKeyValueToken();
+
+    public abstract QName getRsaKeyValue();
+
+    public abstract QName getSignedParts();
+
+    public abstract QName getSignedElements();
+
+    public abstract QName getXPathExpression();
+
+    public abstract QName getXPath2Expression();
+
+    public abstract QName getEncryptedParts();
+
+    public abstract QName getEncryptedElements();
+
+    public abstract QName getContentEncryptedElements();
+
+    public abstract QName getRequiredElements();
+
+    public abstract QName getRequiredParts();
+
+    public abstract QName getAlgorithmSuite();
+
+    public abstract QName getLayout();
+
+    public abstract QName getBody();
+
+    public abstract QName getAttachments();
+
+    public abstract QName getContentSignatureTransform();
+
+    public abstract QName getAttachmentCompleteSignatureTransform();
+
+    public abstract QName getHeader();
+
+    public abstract QName getEncryptSignature();
+
+    public abstract QName getProtectTokens();
+
+    public abstract QName getOnlySignEntireHeadersAndBody();
+
+    public abstract QName getTransportBinding();
+
+    public abstract QName getSymmetricBinding();
+
+    public abstract QName getAsymmetricBinding();
+
+    public abstract QName getEncryptionToken();
+
+    public abstract QName getSignatureToken();
+
+    public abstract QName getProtectionToken();
+
+    public abstract QName getTransportToken();
+
+    public abstract QName getInitiatorToken();
+
+    public abstract QName getInitiatorSignatureToken();
+
+    public abstract QName getInitiatorEncryptionToken();
+
+    public abstract QName getRecipientToken();
+
+    public abstract QName getRecipientSignatureToken();
+
+    public abstract QName getRecipientEncryptionToken();
+
+    public abstract SupportingTokenType getSupportingTokenType(QName name);
+
+    public abstract QName getTrust10();
+
+    public abstract QName getTrust13();
+
+    public abstract QName getScopePolicy15();
+
+    public abstract QName getMustSupportClientChallenge();
+
+    public abstract QName getMustSupportServerChallenge();
+
+    public abstract QName getRequireClientEntropy();
+
+    public abstract QName getRequireServerEntropy();
+
+    public abstract QName getMustSupportIssuedTokens();
+
+    public abstract QName getRequireRequestSecurityTokenCollection();
+
+    public abstract QName getRequireAppliesTo();
+
+    public abstract QName getMustSupportInteractiveChallenge();
+
+    public abstract QName getWss10();
+
+    public abstract QName getMustSupportRefKeyIdentifier();
+
+    public abstract QName getMustSupportRefIssuerSerial();
+
+    public abstract QName getMustSupportRefExternalUri();
+
+    public abstract QName getMustSupportRefEmbeddedToken();
+
+    public abstract QName getWss11();
+
+    public abstract QName getMustSupportRefThumbprint();
+
+    public abstract QName getMustSupportRefEncryptedKey();
 
+    public abstract QName getRequireSignatureConfirmation();
 }

Propchange: webservices/wss4j/branches/swssf/rampart-policy/src/main/java/org/apache/ws/secpolicy/SPConstants.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Added: webservices/wss4j/branches/swssf/rampart-policy/src/main/java/org/apache/ws/secpolicy/SPUtils.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/rampart-policy/src/main/java/org/apache/ws/secpolicy/SPUtils.java?rev=1210203&view=auto
==============================================================================
--- webservices/wss4j/branches/swssf/rampart-policy/src/main/java/org/apache/ws/secpolicy/SPUtils.java (added)
+++ webservices/wss4j/branches/swssf/rampart-policy/src/main/java/org/apache/ws/secpolicy/SPUtils.java Sun Dec  4 20:33:05 2011
@@ -0,0 +1,204 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.ws.secpolicy;
+
+import org.apache.commons.lang.StringUtils;
+import org.w3c.dom.*;
+
+import javax.xml.namespace.QName;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamWriter;
+
+/**
+ * @author $Author$
+ * @version $Revision$ $Date$
+ */
+public class SPUtils {
+
+    private SPUtils() {
+    }
+
+    public static boolean hasChildElements(Element element) {
+        NodeList nodeList = element.getChildNodes();
+        int elementCount = 0;
+        for (int i = 0; i < nodeList.getLength(); i++) {
+            Node node = nodeList.item(i);
+            if (node.getNodeType() == Node.ELEMENT_NODE) {
+                elementCount++;
+            }
+        }
+        return elementCount > 0;
+    }
+
+    public static Element getFirstPolicyChildElement(Element element) {
+        Element policy = getFirstChildElement(element, SPConstants.P_LOCALNAME);
+        if (policy != null && org.apache.neethi.Constants.isPolicyNS(policy.getNamespaceURI())) {
+            return policy;
+        }
+        return null;
+    }
+
+    public static boolean hasChildElementWithName(Element element, QName elementName) {
+        Element child = SPUtils.getFirstChildElement(element, elementName);
+        if (child != null) {
+            return true;
+        }
+        return false;
+    }
+
+    public static Element getFirstChildElement(Node parent, String childNodeName) {
+        Node node = parent.getFirstChild();
+        while (node != null && (Node.ELEMENT_NODE != node.getNodeType()
+                || !node.getLocalName().equals(childNodeName))) {
+            node = node.getNextSibling();
+        }
+        return (Element) node;
+    }
+
+    public static Element getFirstChildElement(Node parent, QName childNodeName) {
+        Node node = parent.getFirstChild();
+        while (node != null && (Node.ELEMENT_NODE != node.getNodeType()
+                || !(((node.getNamespaceURI() == null && childNodeName.getNamespaceURI() == null)
+                || (node.getNamespaceURI() != null && node.getNamespaceURI().equals(childNodeName.getNamespaceURI())))
+                && node.getLocalName().equals(childNodeName.getLocalPart())))) {
+            node = node.getNextSibling();
+        }
+        return (Element) node;
+    }
+
+    public static String getFirstChildElementText(Node parent, QName childNodeName) {
+        Element element = getFirstChildElement(parent, childNodeName);
+        return element != null ? element.getTextContent() : null;
+    }
+
+    public static Element getFirstChildElement(Node parent) {
+        Node node = parent.getFirstChild();
+        while (node != null && Node.ELEMENT_NODE != node.getNodeType()) {
+            node = node.getNextSibling();
+        }
+        return (Element) node;
+    }
+
+    public static Element getNextSiblingElement(Node node) {
+        Node n = node.getNextSibling();
+        while (n != null && Node.ELEMENT_NODE != n.getNodeType()) {
+            n = n.getNextSibling();
+        }
+        return (Element) n;
+    }
+
+    public static boolean isOptional(Element element) {
+        Attr attr = findOptionalAttribute(element);
+        if (attr != null) {
+            String v = attr.getValue();
+            return "true".equalsIgnoreCase(v) || "1".equals(v);
+        }
+        return false;
+    }
+
+    public static Attr findOptionalAttribute(Element element) {
+        NamedNodeMap attributes = element.getAttributes();
+        for (int x = 0; x < attributes.getLength(); x++) {
+            Attr attr = (Attr) attributes.item(x);
+            QName qName = new QName(attr.getNamespaceURI(), attr.getLocalName());
+            if (org.apache.neethi.Constants.isOptionalAttribute(qName)) {
+                return attr;
+            }
+        }
+        return null;
+    }
+
+    public static boolean isIgnorable(Element element) throws IllegalArgumentException {
+        Attr attr = findIgnorableAttribute(element);
+        if (attr != null) {
+            String value = attr.getValue();
+            if ("true".equalsIgnoreCase(value) || "1".equals(value)) {
+                if (SP13Constants.SP_NS.equals(element.getNamespaceURI())) {
+                    throw new IllegalArgumentException("Ignorable attribute not allowed. @see http://docs.oasis-open.org/ws-sx/ws-securitypolicy/v1.3/os/ws-securitypolicy-1.3-spec-os.html#_Toc212617792");
+                }
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public static Attr findIgnorableAttribute(Element element) {
+        NamedNodeMap attributes = element.getAttributes();
+        for (int x = 0; x < attributes.getLength(); x++) {
+            Attr attr = (Attr) attributes.item(x);
+            QName qName = new QName(attr.getNamespaceURI(), attr.getLocalName());
+            if (org.apache.neethi.Constants.isIgnorableAttribute(qName)) {
+                return attr;
+            }
+        }
+        return null;
+    }
+
+    public static String getAttribute(Element element, QName attName) {
+        Attr attr;
+        if (StringUtils.isEmpty(attName.getNamespaceURI())) {
+            attr = element.getAttributeNode(attName.getLocalPart());
+        } else {
+            attr = element.getAttributeNodeNS(attName.getNamespaceURI(), attName.getLocalPart());
+        }
+        return attr == null ? null : attr.getValue();
+    }
+
+    public static QName getElementQName(Element element) {
+        return new QName(element.getNamespaceURI(), element.getLocalName(), element.getPrefix());
+    }
+
+    public static void serialize(Node node, XMLStreamWriter xmlStreamWriter) throws XMLStreamException {
+        if (node.getNodeType() == Node.DOCUMENT_NODE) {
+            Document document = (org.w3c.dom.Document) node;
+            serialize(document.getDocumentElement(), xmlStreamWriter);
+        }
+        if (node.getNodeType() == Node.ELEMENT_NODE) {
+            Element element = (Element) node;
+            xmlStreamWriter.writeStartElement(element.getPrefix(), element.getLocalName(), element.getNamespaceURI());
+            NamedNodeMap namedNodeMap = element.getAttributes();
+            for (int i = 0; i < namedNodeMap.getLength(); i++) {
+                Attr attr = (Attr) namedNodeMap.item(i);
+                String prefix = attr.getPrefix();
+                if (prefix != null && "xmlns".equals(prefix)) {
+                    xmlStreamWriter.writeNamespace(attr.getLocalName(), attr.getValue());
+                } else if (prefix == null && "xmlns".equals(attr.getLocalName())) {
+                    xmlStreamWriter.writeDefaultNamespace(attr.getValue());
+                } else {
+                    xmlStreamWriter.writeAttribute(prefix, attr.getNamespaceURI(), attr.getLocalName(), attr.getValue());
+                }
+            }
+            //write ns after processing element namespaces to prevent redeclarations
+            if (element.getPrefix() != null) {
+                String ns = xmlStreamWriter.getNamespaceContext().getNamespaceURI(element.getPrefix());
+                if (ns == null) {
+                    xmlStreamWriter.writeNamespace(element.getPrefix(), element.getNamespaceURI());
+                }
+            }
+            NodeList childNodes = element.getChildNodes();
+            for (int i = 0; i < childNodes.getLength(); i++) {
+                serialize(childNodes.item(i), xmlStreamWriter);
+            }
+            xmlStreamWriter.writeEndElement();
+        } else if (node.getNodeType() == Node.TEXT_NODE) {
+            Text text = (Text) node;
+            xmlStreamWriter.writeCharacters(text.getData());
+        }
+    }
+}

Propchange: webservices/wss4j/branches/swssf/rampart-policy/src/main/java/org/apache/ws/secpolicy/SPUtils.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Modified: webservices/wss4j/branches/swssf/rampart-policy/src/main/java/org/apache/ws/secpolicy/WSSPolicyException.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/swssf/rampart-policy/src/main/java/org/apache/ws/secpolicy/WSSPolicyException.java?rev=1210203&r1=1210202&r2=1210203&view=diff
==============================================================================
--- webservices/wss4j/branches/swssf/rampart-policy/src/main/java/org/apache/ws/secpolicy/WSSPolicyException.java (original)
+++ webservices/wss4j/branches/swssf/rampart-policy/src/main/java/org/apache/ws/secpolicy/WSSPolicyException.java Sun Dec  4 20:33:05 2011
@@ -1,25 +1,31 @@
-/*
- * Copyright 2004,2005 The Apache Software Foundation.
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
-
 package org.apache.ws.secpolicy;
 
+/**
+ * @author $Author$
+ * @version $Revision$ $Date$
+ */
 public class WSSPolicyException extends Exception {
 
     private static final long serialVersionUID = 5904800255533588133L;
-    
+
     public WSSPolicyException(String message, Throwable e) {
         super(message, e);
     }

Propchange: webservices/wss4j/branches/swssf/rampart-policy/src/main/java/org/apache/ws/secpolicy/WSSPolicyException.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision