[jboss-cvs] Picketlink SVN: r225 - in federation/trunk: picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust and 5 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Fri Apr 30 10:41:06 EDT 2010


Author: sguilhen at redhat.com
Date: 2010-04-30 10:41:05 -0400 (Fri, 30 Apr 2010)
New Revision: 225

Modified:
   federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/util/IDFedLSInputResolver.java
   federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/WSTrustConstants.java
   federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/wrappers/RequestSecurityToken.java
   federation/trunk/picketlink-fed-core/src/test/resources/wstrust/ws-trust-request.xml
   federation/trunk/picketlink-fed-core/src/test/resources/wstrust/ws-trust-response.xml
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/ws/trust/ObjectFactory.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/ws/trust/package-info.java
   federation/trunk/picketlink-fed-model/src/main/resources/schema/wstrust/v1_3/ws-trust-1.3.xsd
   federation/trunk/picketlink-fed-model/src/test/resources/wstrust/collection-request.xml
   federation/trunk/picketlink-fed-model/src/test/resources/wstrust/simple-request.xml
Log:
PLFED-63: fixed the ws-trust-1.3.xsd namespace and updated the JAXB model to use the correct namespace. WSTrustConstants and other places that used the old namespace have also been updated.

Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/util/IDFedLSInputResolver.java
===================================================================
--- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/util/IDFedLSInputResolver.java	2010-04-30 02:11:39 UTC (rev 224)
+++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/util/IDFedLSInputResolver.java	2010-04-30 14:41:05 UTC (rev 225)
@@ -46,7 +46,7 @@
       schemaLocationMap.put("saml-schema-assertion-2.0.xsd", "schema/saml/v2/saml-schema-assertion-2.0.xsd");
       
       //WS-T
-      schemaLocationMap.put("http://docs.oasis-open.org/ws-sx/ws-trust/200512/", 
+      schemaLocationMap.put("http://docs.oasis-open.org/ws-sx/ws-trust/200512", 
             "schema/wstrust/v1_3/ws-trust-1.3.xsd");
       schemaLocationMap.put("http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd", 
             "schema/wstrust/v1_3/oasis-200401-wss-wssecurity-secext-1.0.xsd");

Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/WSTrustConstants.java
===================================================================
--- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/WSTrustConstants.java	2010-04-30 02:11:39 UTC (rev 224)
+++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/WSTrustConstants.java	2010-04-30 14:41:05 UTC (rev 225)
@@ -32,31 +32,31 @@
  */
 public class WSTrustConstants
 {
-   public static final String BASE_NAMESPACE = "http://docs.oasis-open.org/ws-sx/ws-trust/200512/";
+   public static final String BASE_NAMESPACE = "http://docs.oasis-open.org/ws-sx/ws-trust/200512";
 
    // WS-Trust request types.
-   public static final String ISSUE_REQUEST = BASE_NAMESPACE + "Issue";
-   public static final String RENEW_REQUEST = BASE_NAMESPACE + "Renew";
-   public static final String CANCEL_REQUEST = BASE_NAMESPACE + "Cancel";
-   public static final String VALIDATE_REQUEST = BASE_NAMESPACE + "Validate";
+   public static final String ISSUE_REQUEST = BASE_NAMESPACE + "/Issue";
+   public static final String RENEW_REQUEST = BASE_NAMESPACE + "/Renew";
+   public static final String CANCEL_REQUEST = BASE_NAMESPACE + "/Cancel";
+   public static final String VALIDATE_REQUEST = BASE_NAMESPACE + "/Validate";
    
    // WS-Trust validation constants.
-   public static final String STATUS_TYPE = BASE_NAMESPACE + "RSTR/Status";
-   public static final String STATUS_CODE_VALID = BASE_NAMESPACE + "status/valid";
-   public static final String STATUS_CODE_INVALID = BASE_NAMESPACE + "status/invalid";
+   public static final String STATUS_TYPE = BASE_NAMESPACE + "/RSTR/Status";
+   public static final String STATUS_CODE_VALID = BASE_NAMESPACE + "/status/valid";
+   public static final String STATUS_CODE_INVALID = BASE_NAMESPACE + "/status/invalid";
    
    // WS-Trust key types.
-   public static final String KEY_TYPE_BEARER = BASE_NAMESPACE + "Bearer";
-   public static final String KEY_TYPE_SYMMETRIC = BASE_NAMESPACE + "SymmetricKey";
-   public static final String KEY_TYPE_PUBLIC = BASE_NAMESPACE + "PublicKey"; 
+   public static final String KEY_TYPE_BEARER = BASE_NAMESPACE + "/Bearer";
+   public static final String KEY_TYPE_SYMMETRIC = BASE_NAMESPACE + "/SymmetricKey";
+   public static final String KEY_TYPE_PUBLIC = BASE_NAMESPACE + "/PublicKey"; 
    
    // WS-Trust binary secret types.
-   public static final String BS_TYPE_ASYMMETRIC = BASE_NAMESPACE + "AsymmetricKey";
-   public static final String BS_TYPE_SYMMETRIC = BASE_NAMESPACE + "SymmetricKey";
-   public static final String BS_TYPE_NONCE = BASE_NAMESPACE + "Nonce";
+   public static final String BS_TYPE_ASYMMETRIC = BASE_NAMESPACE + "/AsymmetricKey";
+   public static final String BS_TYPE_SYMMETRIC = BASE_NAMESPACE + "/SymmetricKey";
+   public static final String BS_TYPE_NONCE = BASE_NAMESPACE + "/Nonce";
    
    // WS-Trust computed key types.
-   public static final String CK_PSHA1 = BASE_NAMESPACE + "CK/PSHA1";
+   public static final String CK_PSHA1 = BASE_NAMESPACE + "/CK/PSHA1";
    
    // WSS namespaces values.
    public static final String WSA_NS = "http://www.w3.org/2005/08/addressing";

Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/wrappers/RequestSecurityToken.java
===================================================================
--- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/wrappers/RequestSecurityToken.java	2010-04-30 02:11:39 UTC (rev 224)
+++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/wrappers/RequestSecurityToken.java	2010-04-30 14:41:05 UTC (rev 225)
@@ -1090,7 +1090,7 @@
       if (rstDocument == null)
          throw new IllegalStateException("RST Document is null");
 
-      String ns = "http://docs.oasis-open.org/ws-sx/ws-trust/200512/";
+      String ns = "http://docs.oasis-open.org/ws-sx/ws-trust/200512";
       String localPart = "ValidateTarget";
 
       NodeList nodeList = rstDocument.getElementsByTagNameNS(ns, localPart);
@@ -1112,7 +1112,7 @@
    {
       if (this.rstDocument == null)
          throw new IllegalStateException("RST Document is null");
-      String ns = "http://docs.oasis-open.org/ws-sx/ws-trust/200512/";
+      String ns = "http://docs.oasis-open.org/ws-sx/ws-trust/200512";
       String localName = "RenewTarget";
 
       NodeList nodeList = rstDocument.getElementsByTagNameNS(ns, localName);
@@ -1134,7 +1134,7 @@
    {
       if (this.rstDocument == null)
          throw new IllegalStateException("RST Document is null");
-      String ns = "http://docs.oasis-open.org/ws-sx/ws-trust/200512/";
+      String ns = "http://docs.oasis-open.org/ws-sx/ws-trust/200512";
       String localName = "CancelTarget";
 
       NodeList nodeList = rstDocument.getElementsByTagNameNS(ns, localName);

Modified: federation/trunk/picketlink-fed-core/src/test/resources/wstrust/ws-trust-request.xml
===================================================================
--- federation/trunk/picketlink-fed-core/src/test/resources/wstrust/ws-trust-request.xml	2010-04-30 02:11:39 UTC (rev 224)
+++ federation/trunk/picketlink-fed-core/src/test/resources/wstrust/ws-trust-request.xml	2010-04-30 14:41:05 UTC (rev 225)
@@ -1,4 +1,4 @@
-<wst:RequestSecurityToken xmlns:wst="http://docs.oasis-open.org/ws-sx/ws-trust/200512/" Context="testcontext">
+<wst:RequestSecurityToken xmlns:wst="http://docs.oasis-open.org/ws-sx/ws-trust/200512" Context="testcontext">
    <wst:TokenType>http://www.tokens.org/SpecialToken</wst:TokenType>
    <wst:RequestType>http://docs.oasis-open.org/ws-sx/ws-trust/200512/Issue</wst:RequestType>
 </wst:RequestSecurityToken>
\ No newline at end of file

Modified: federation/trunk/picketlink-fed-core/src/test/resources/wstrust/ws-trust-response.xml
===================================================================
--- federation/trunk/picketlink-fed-core/src/test/resources/wstrust/ws-trust-response.xml	2010-04-30 02:11:39 UTC (rev 224)
+++ federation/trunk/picketlink-fed-core/src/test/resources/wstrust/ws-trust-response.xml	2010-04-30 14:41:05 UTC (rev 225)
@@ -1,5 +1,5 @@
 <wst:RequestSecurityTokenResponseCollection 
-	xmlns:wst="http://docs.oasis-open.org/ws-sx/ws-trust/200512/">
+	xmlns:wst="http://docs.oasis-open.org/ws-sx/ws-trust/200512">
    <wst:RequestSecurityTokenResponse Context="testcontext">
       <wst:TokenType>http://www.tokens.org/SpecialToken</wst:TokenType>
       <wst:Forwardable>false</wst:Forwardable>

Modified: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/ws/trust/ObjectFactory.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/ws/trust/ObjectFactory.java	2010-04-30 02:11:39 UTC (rev 224)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/ws/trust/ObjectFactory.java	2010-04-30 14:41:05 UTC (rev 225)
@@ -33,56 +33,56 @@
 @XmlRegistry
 public class ObjectFactory {
 
-    private final static QName _RequestSecurityTokenResponseCollection_QNAME = new QName("http://docs.oasis-open.org/ws-sx/ws-trust/200512/", "RequestSecurityTokenResponseCollection");
-    private final static QName _Lifetime_QNAME = new QName("http://docs.oasis-open.org/ws-sx/ws-trust/200512/", "Lifetime");
-    private final static QName _KeyType_QNAME = new QName("http://docs.oasis-open.org/ws-sx/ws-trust/200512/", "KeyType");
-    private final static QName _DelegateTo_QNAME = new QName("http://docs.oasis-open.org/ws-sx/ws-trust/200512/", "DelegateTo");
-    private final static QName _ValidateTarget_QNAME = new QName("http://docs.oasis-open.org/ws-sx/ws-trust/200512/", "ValidateTarget");
-    private final static QName _Issuer_QNAME = new QName("http://docs.oasis-open.org/ws-sx/ws-trust/200512/", "Issuer");
-    private final static QName _SignChallenge_QNAME = new QName("http://docs.oasis-open.org/ws-sx/ws-trust/200512/", "SignChallenge");
-    private final static QName _Forwardable_QNAME = new QName("http://docs.oasis-open.org/ws-sx/ws-trust/200512/", "Forwardable");
-    private final static QName _IssuedTokens_QNAME = new QName("http://docs.oasis-open.org/ws-sx/ws-trust/200512/", "IssuedTokens");
-    private final static QName _RequestSecurityTokenCollection_QNAME = new QName("http://docs.oasis-open.org/ws-sx/ws-trust/200512/", "RequestSecurityTokenCollection");
-    private final static QName _SignatureAlgorithm_QNAME = new QName("http://docs.oasis-open.org/ws-sx/ws-trust/200512/", "SignatureAlgorithm");
-    private final static QName _RequestType_QNAME = new QName("http://docs.oasis-open.org/ws-sx/ws-trust/200512/", "RequestType");
-    private final static QName _RequestedProofToken_QNAME = new QName("http://docs.oasis-open.org/ws-sx/ws-trust/200512/", "RequestedProofToken");
-    private final static QName _KeyExchangeToken_QNAME = new QName("http://docs.oasis-open.org/ws-sx/ws-trust/200512/", "KeyExchangeToken");
-    private final static QName _ComputedKey_QNAME = new QName("http://docs.oasis-open.org/ws-sx/ws-trust/200512/", "ComputedKey");
-    private final static QName _RequestedSecurityToken_QNAME = new QName("http://docs.oasis-open.org/ws-sx/ws-trust/200512/", "RequestedSecurityToken");
-    private final static QName _KeySize_QNAME = new QName("http://docs.oasis-open.org/ws-sx/ws-trust/200512/", "KeySize");
-    private final static QName _Participants_QNAME = new QName("http://docs.oasis-open.org/ws-sx/ws-trust/200512/", "Participants");
-    private final static QName _Claims_QNAME = new QName("http://docs.oasis-open.org/ws-sx/ws-trust/200512/", "Claims");
-    private final static QName _CancelTarget_QNAME = new QName("http://docs.oasis-open.org/ws-sx/ws-trust/200512/", "CancelTarget");
-    private final static QName _EncryptionAlgorithm_QNAME = new QName("http://docs.oasis-open.org/ws-sx/ws-trust/200512/", "EncryptionAlgorithm");
-    private final static QName _CombinedHash_QNAME = new QName("http://docs.oasis-open.org/ws-sx/ws-trust/200512/", "CombinedHash");
-    private final static QName _Challenge_QNAME = new QName("http://docs.oasis-open.org/ws-sx/ws-trust/200512/", "Challenge");
-    private final static QName _Status_QNAME = new QName("http://docs.oasis-open.org/ws-sx/ws-trust/200512/", "Status");
-    private final static QName _CanonicalizationAlgorithm_QNAME = new QName("http://docs.oasis-open.org/ws-sx/ws-trust/200512/", "CanonicalizationAlgorithm");
-    private final static QName _RenewTarget_QNAME = new QName("http://docs.oasis-open.org/ws-sx/ws-trust/200512/", "RenewTarget");
-    private final static QName _RequestSecurityToken_QNAME = new QName("http://docs.oasis-open.org/ws-sx/ws-trust/200512/", "RequestSecurityToken");
-    private final static QName _KeyWrapAlgorithm_QNAME = new QName("http://docs.oasis-open.org/ws-sx/ws-trust/200512/", "KeyWrapAlgorithm");
-    private final static QName _ProofEncryption_QNAME = new QName("http://docs.oasis-open.org/ws-sx/ws-trust/200512/", "ProofEncryption");
-    private final static QName _BinaryExchange_QNAME = new QName("http://docs.oasis-open.org/ws-sx/ws-trust/200512/", "BinaryExchange");
-    private final static QName _Delegatable_QNAME = new QName("http://docs.oasis-open.org/ws-sx/ws-trust/200512/", "Delegatable");
-    private final static QName _Entropy_QNAME = new QName("http://docs.oasis-open.org/ws-sx/ws-trust/200512/", "Entropy");
-    private final static QName _RequestSecurityTokenResponse_QNAME = new QName("http://docs.oasis-open.org/ws-sx/ws-trust/200512/", "RequestSecurityTokenResponse");
-    private final static QName _Authenticator_QNAME = new QName("http://docs.oasis-open.org/ws-sx/ws-trust/200512/", "Authenticator");
-    private final static QName _RequestKET_QNAME = new QName("http://docs.oasis-open.org/ws-sx/ws-trust/200512/", "RequestKET");
-    private final static QName _Renewing_QNAME = new QName("http://docs.oasis-open.org/ws-sx/ws-trust/200512/", "Renewing");
-    private final static QName _BinarySecret_QNAME = new QName("http://docs.oasis-open.org/ws-sx/ws-trust/200512/", "BinarySecret");
-    private final static QName _RequestedAttachedReference_QNAME = new QName("http://docs.oasis-open.org/ws-sx/ws-trust/200512/", "RequestedAttachedReference");
-    private final static QName _ComputedKeyAlgorithm_QNAME = new QName("http://docs.oasis-open.org/ws-sx/ws-trust/200512/", "ComputedKeyAlgorithm");
-    private final static QName _SignWith_QNAME = new QName("http://docs.oasis-open.org/ws-sx/ws-trust/200512/", "SignWith");
-    private final static QName _AuthenticationType_QNAME = new QName("http://docs.oasis-open.org/ws-sx/ws-trust/200512/", "AuthenticationType");
-    private final static QName _Encryption_QNAME = new QName("http://docs.oasis-open.org/ws-sx/ws-trust/200512/", "Encryption");
-    private final static QName _RequestedUnattachedReference_QNAME = new QName("http://docs.oasis-open.org/ws-sx/ws-trust/200512/", "RequestedUnattachedReference");
-    private final static QName _EncryptWith_QNAME = new QName("http://docs.oasis-open.org/ws-sx/ws-trust/200512/", "EncryptWith");
-    private final static QName _SignChallengeResponse_QNAME = new QName("http://docs.oasis-open.org/ws-sx/ws-trust/200512/", "SignChallengeResponse");
-    private final static QName _AllowPostdating_QNAME = new QName("http://docs.oasis-open.org/ws-sx/ws-trust/200512/", "AllowPostdating");
-    private final static QName _OnBehalfOf_QNAME = new QName("http://docs.oasis-open.org/ws-sx/ws-trust/200512/", "OnBehalfOf");
-    private final static QName _RequestedTokenCancelled_QNAME = new QName("http://docs.oasis-open.org/ws-sx/ws-trust/200512/", "RequestedTokenCancelled");
-    private final static QName _TokenType_QNAME = new QName("http://docs.oasis-open.org/ws-sx/ws-trust/200512/", "TokenType");
-    private final static QName _UseKey_QNAME = new QName("http://docs.oasis-open.org/ws-sx/ws-trust/200512/", "UseKey");
+    private final static QName _RequestSecurityTokenResponseCollection_QNAME = new QName("http://docs.oasis-open.org/ws-sx/ws-trust/200512", "RequestSecurityTokenResponseCollection");
+    private final static QName _Lifetime_QNAME = new QName("http://docs.oasis-open.org/ws-sx/ws-trust/200512", "Lifetime");
+    private final static QName _KeyType_QNAME = new QName("http://docs.oasis-open.org/ws-sx/ws-trust/200512", "KeyType");
+    private final static QName _DelegateTo_QNAME = new QName("http://docs.oasis-open.org/ws-sx/ws-trust/200512", "DelegateTo");
+    private final static QName _ValidateTarget_QNAME = new QName("http://docs.oasis-open.org/ws-sx/ws-trust/200512", "ValidateTarget");
+    private final static QName _Issuer_QNAME = new QName("http://docs.oasis-open.org/ws-sx/ws-trust/200512", "Issuer");
+    private final static QName _SignChallenge_QNAME = new QName("http://docs.oasis-open.org/ws-sx/ws-trust/200512", "SignChallenge");
+    private final static QName _Forwardable_QNAME = new QName("http://docs.oasis-open.org/ws-sx/ws-trust/200512", "Forwardable");
+    private final static QName _IssuedTokens_QNAME = new QName("http://docs.oasis-open.org/ws-sx/ws-trust/200512", "IssuedTokens");
+    private final static QName _RequestSecurityTokenCollection_QNAME = new QName("http://docs.oasis-open.org/ws-sx/ws-trust/200512", "RequestSecurityTokenCollection");
+    private final static QName _SignatureAlgorithm_QNAME = new QName("http://docs.oasis-open.org/ws-sx/ws-trust/200512", "SignatureAlgorithm");
+    private final static QName _RequestType_QNAME = new QName("http://docs.oasis-open.org/ws-sx/ws-trust/200512", "RequestType");
+    private final static QName _RequestedProofToken_QNAME = new QName("http://docs.oasis-open.org/ws-sx/ws-trust/200512", "RequestedProofToken");
+    private final static QName _KeyExchangeToken_QNAME = new QName("http://docs.oasis-open.org/ws-sx/ws-trust/200512", "KeyExchangeToken");
+    private final static QName _ComputedKey_QNAME = new QName("http://docs.oasis-open.org/ws-sx/ws-trust/200512", "ComputedKey");
+    private final static QName _RequestedSecurityToken_QNAME = new QName("http://docs.oasis-open.org/ws-sx/ws-trust/200512", "RequestedSecurityToken");
+    private final static QName _KeySize_QNAME = new QName("http://docs.oasis-open.org/ws-sx/ws-trust/200512", "KeySize");
+    private final static QName _Participants_QNAME = new QName("http://docs.oasis-open.org/ws-sx/ws-trust/200512", "Participants");
+    private final static QName _Claims_QNAME = new QName("http://docs.oasis-open.org/ws-sx/ws-trust/200512", "Claims");
+    private final static QName _CancelTarget_QNAME = new QName("http://docs.oasis-open.org/ws-sx/ws-trust/200512", "CancelTarget");
+    private final static QName _EncryptionAlgorithm_QNAME = new QName("http://docs.oasis-open.org/ws-sx/ws-trust/200512", "EncryptionAlgorithm");
+    private final static QName _CombinedHash_QNAME = new QName("http://docs.oasis-open.org/ws-sx/ws-trust/200512", "CombinedHash");
+    private final static QName _Challenge_QNAME = new QName("http://docs.oasis-open.org/ws-sx/ws-trust/200512", "Challenge");
+    private final static QName _Status_QNAME = new QName("http://docs.oasis-open.org/ws-sx/ws-trust/200512", "Status");
+    private final static QName _CanonicalizationAlgorithm_QNAME = new QName("http://docs.oasis-open.org/ws-sx/ws-trust/200512", "CanonicalizationAlgorithm");
+    private final static QName _RenewTarget_QNAME = new QName("http://docs.oasis-open.org/ws-sx/ws-trust/200512", "RenewTarget");
+    private final static QName _RequestSecurityToken_QNAME = new QName("http://docs.oasis-open.org/ws-sx/ws-trust/200512", "RequestSecurityToken");
+    private final static QName _KeyWrapAlgorithm_QNAME = new QName("http://docs.oasis-open.org/ws-sx/ws-trust/200512", "KeyWrapAlgorithm");
+    private final static QName _ProofEncryption_QNAME = new QName("http://docs.oasis-open.org/ws-sx/ws-trust/200512", "ProofEncryption");
+    private final static QName _BinaryExchange_QNAME = new QName("http://docs.oasis-open.org/ws-sx/ws-trust/200512", "BinaryExchange");
+    private final static QName _Delegatable_QNAME = new QName("http://docs.oasis-open.org/ws-sx/ws-trust/200512", "Delegatable");
+    private final static QName _Entropy_QNAME = new QName("http://docs.oasis-open.org/ws-sx/ws-trust/200512", "Entropy");
+    private final static QName _RequestSecurityTokenResponse_QNAME = new QName("http://docs.oasis-open.org/ws-sx/ws-trust/200512", "RequestSecurityTokenResponse");
+    private final static QName _Authenticator_QNAME = new QName("http://docs.oasis-open.org/ws-sx/ws-trust/200512", "Authenticator");
+    private final static QName _RequestKET_QNAME = new QName("http://docs.oasis-open.org/ws-sx/ws-trust/200512", "RequestKET");
+    private final static QName _Renewing_QNAME = new QName("http://docs.oasis-open.org/ws-sx/ws-trust/200512", "Renewing");
+    private final static QName _BinarySecret_QNAME = new QName("http://docs.oasis-open.org/ws-sx/ws-trust/200512", "BinarySecret");
+    private final static QName _RequestedAttachedReference_QNAME = new QName("http://docs.oasis-open.org/ws-sx/ws-trust/200512", "RequestedAttachedReference");
+    private final static QName _ComputedKeyAlgorithm_QNAME = new QName("http://docs.oasis-open.org/ws-sx/ws-trust/200512", "ComputedKeyAlgorithm");
+    private final static QName _SignWith_QNAME = new QName("http://docs.oasis-open.org/ws-sx/ws-trust/200512", "SignWith");
+    private final static QName _AuthenticationType_QNAME = new QName("http://docs.oasis-open.org/ws-sx/ws-trust/200512", "AuthenticationType");
+    private final static QName _Encryption_QNAME = new QName("http://docs.oasis-open.org/ws-sx/ws-trust/200512", "Encryption");
+    private final static QName _RequestedUnattachedReference_QNAME = new QName("http://docs.oasis-open.org/ws-sx/ws-trust/200512", "RequestedUnattachedReference");
+    private final static QName _EncryptWith_QNAME = new QName("http://docs.oasis-open.org/ws-sx/ws-trust/200512", "EncryptWith");
+    private final static QName _SignChallengeResponse_QNAME = new QName("http://docs.oasis-open.org/ws-sx/ws-trust/200512", "SignChallengeResponse");
+    private final static QName _AllowPostdating_QNAME = new QName("http://docs.oasis-open.org/ws-sx/ws-trust/200512", "AllowPostdating");
+    private final static QName _OnBehalfOf_QNAME = new QName("http://docs.oasis-open.org/ws-sx/ws-trust/200512", "OnBehalfOf");
+    private final static QName _RequestedTokenCancelled_QNAME = new QName("http://docs.oasis-open.org/ws-sx/ws-trust/200512", "RequestedTokenCancelled");
+    private final static QName _TokenType_QNAME = new QName("http://docs.oasis-open.org/ws-sx/ws-trust/200512", "TokenType");
+    private final static QName _UseKey_QNAME = new QName("http://docs.oasis-open.org/ws-sx/ws-trust/200512", "UseKey");
 
     /**
      * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.oasis_open.docs.ws_sx.ws_trust._200512
@@ -335,7 +335,7 @@
      * Create an instance of {@link JAXBElement }{@code <}{@link RequestSecurityTokenResponseCollectionType }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://docs.oasis-open.org/ws-sx/ws-trust/200512/", name = "RequestSecurityTokenResponseCollection")
+    @XmlElementDecl(namespace = "http://docs.oasis-open.org/ws-sx/ws-trust/200512", name = "RequestSecurityTokenResponseCollection")
     public JAXBElement<RequestSecurityTokenResponseCollectionType> createRequestSecurityTokenResponseCollection(RequestSecurityTokenResponseCollectionType value) {
         return new JAXBElement<RequestSecurityTokenResponseCollectionType>(_RequestSecurityTokenResponseCollection_QNAME, RequestSecurityTokenResponseCollectionType.class, null, value);
     }
@@ -344,7 +344,7 @@
      * Create an instance of {@link JAXBElement }{@code <}{@link LifetimeType }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://docs.oasis-open.org/ws-sx/ws-trust/200512/", name = "Lifetime")
+    @XmlElementDecl(namespace = "http://docs.oasis-open.org/ws-sx/ws-trust/200512", name = "Lifetime")
     public JAXBElement<LifetimeType> createLifetime(LifetimeType value) {
         return new JAXBElement<LifetimeType>(_Lifetime_QNAME, LifetimeType.class, null, value);
     }
@@ -353,7 +353,7 @@
      * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://docs.oasis-open.org/ws-sx/ws-trust/200512/", name = "KeyType")
+    @XmlElementDecl(namespace = "http://docs.oasis-open.org/ws-sx/ws-trust/200512", name = "KeyType")
     public JAXBElement<String> createKeyType(String value) {
         return new JAXBElement<String>(_KeyType_QNAME, String.class, null, value);
     }
@@ -362,7 +362,7 @@
      * Create an instance of {@link JAXBElement }{@code <}{@link DelegateToType }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://docs.oasis-open.org/ws-sx/ws-trust/200512/", name = "DelegateTo")
+    @XmlElementDecl(namespace = "http://docs.oasis-open.org/ws-sx/ws-trust/200512", name = "DelegateTo")
     public JAXBElement<DelegateToType> createDelegateTo(DelegateToType value) {
         return new JAXBElement<DelegateToType>(_DelegateTo_QNAME, DelegateToType.class, null, value);
     }
@@ -371,7 +371,7 @@
      * Create an instance of {@link JAXBElement }{@code <}{@link ValidateTargetType }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://docs.oasis-open.org/ws-sx/ws-trust/200512/", name = "ValidateTarget")
+    @XmlElementDecl(namespace = "http://docs.oasis-open.org/ws-sx/ws-trust/200512", name = "ValidateTarget")
     public JAXBElement<ValidateTargetType> createValidateTarget(ValidateTargetType value) {
         return new JAXBElement<ValidateTargetType>(_ValidateTarget_QNAME, ValidateTargetType.class, null, value);
     }
@@ -380,7 +380,7 @@
      * Create an instance of {@link JAXBElement }{@code <}{@link EndpointReferenceType }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://docs.oasis-open.org/ws-sx/ws-trust/200512/", name = "Issuer")
+    @XmlElementDecl(namespace = "http://docs.oasis-open.org/ws-sx/ws-trust/200512", name = "Issuer")
     public JAXBElement<EndpointReferenceType> createIssuer(EndpointReferenceType value) {
         return new JAXBElement<EndpointReferenceType>(_Issuer_QNAME, EndpointReferenceType.class, null, value);
     }
@@ -389,7 +389,7 @@
      * Create an instance of {@link JAXBElement }{@code <}{@link SignChallengeType }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://docs.oasis-open.org/ws-sx/ws-trust/200512/", name = "SignChallenge")
+    @XmlElementDecl(namespace = "http://docs.oasis-open.org/ws-sx/ws-trust/200512", name = "SignChallenge")
     public JAXBElement<SignChallengeType> createSignChallenge(SignChallengeType value) {
         return new JAXBElement<SignChallengeType>(_SignChallenge_QNAME, SignChallengeType.class, null, value);
     }
@@ -398,7 +398,7 @@
      * Create an instance of {@link JAXBElement }{@code <}{@link Boolean }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://docs.oasis-open.org/ws-sx/ws-trust/200512/", name = "Forwardable")
+    @XmlElementDecl(namespace = "http://docs.oasis-open.org/ws-sx/ws-trust/200512", name = "Forwardable")
     public JAXBElement<Boolean> createForwardable(Boolean value) {
         return new JAXBElement<Boolean>(_Forwardable_QNAME, Boolean.class, null, value);
     }
@@ -407,7 +407,7 @@
      * Create an instance of {@link JAXBElement }{@code <}{@link RequestSecurityTokenResponseCollectionType }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://docs.oasis-open.org/ws-sx/ws-trust/200512/", name = "IssuedTokens")
+    @XmlElementDecl(namespace = "http://docs.oasis-open.org/ws-sx/ws-trust/200512", name = "IssuedTokens")
     public JAXBElement<RequestSecurityTokenResponseCollectionType> createIssuedTokens(RequestSecurityTokenResponseCollectionType value) {
         return new JAXBElement<RequestSecurityTokenResponseCollectionType>(_IssuedTokens_QNAME, RequestSecurityTokenResponseCollectionType.class, null, value);
     }
@@ -416,7 +416,7 @@
      * Create an instance of {@link JAXBElement }{@code <}{@link RequestSecurityTokenCollectionType }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://docs.oasis-open.org/ws-sx/ws-trust/200512/", name = "RequestSecurityTokenCollection")
+    @XmlElementDecl(namespace = "http://docs.oasis-open.org/ws-sx/ws-trust/200512", name = "RequestSecurityTokenCollection")
     public JAXBElement<RequestSecurityTokenCollectionType> createRequestSecurityTokenCollection(RequestSecurityTokenCollectionType value) {
         return new JAXBElement<RequestSecurityTokenCollectionType>(_RequestSecurityTokenCollection_QNAME, RequestSecurityTokenCollectionType.class, null, value);
     }
@@ -425,7 +425,7 @@
      * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://docs.oasis-open.org/ws-sx/ws-trust/200512/", name = "SignatureAlgorithm")
+    @XmlElementDecl(namespace = "http://docs.oasis-open.org/ws-sx/ws-trust/200512", name = "SignatureAlgorithm")
     public JAXBElement<String> createSignatureAlgorithm(String value) {
         return new JAXBElement<String>(_SignatureAlgorithm_QNAME, String.class, null, value);
     }
@@ -434,7 +434,7 @@
      * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://docs.oasis-open.org/ws-sx/ws-trust/200512/", name = "RequestType")
+    @XmlElementDecl(namespace = "http://docs.oasis-open.org/ws-sx/ws-trust/200512", name = "RequestType")
     public JAXBElement<String> createRequestType(String value) {
         return new JAXBElement<String>(_RequestType_QNAME, String.class, null, value);
     }
@@ -443,7 +443,7 @@
      * Create an instance of {@link JAXBElement }{@code <}{@link RequestedProofTokenType }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://docs.oasis-open.org/ws-sx/ws-trust/200512/", name = "RequestedProofToken")
+    @XmlElementDecl(namespace = "http://docs.oasis-open.org/ws-sx/ws-trust/200512", name = "RequestedProofToken")
     public JAXBElement<RequestedProofTokenType> createRequestedProofToken(RequestedProofTokenType value) {
         return new JAXBElement<RequestedProofTokenType>(_RequestedProofToken_QNAME, RequestedProofTokenType.class, null, value);
     }
@@ -452,7 +452,7 @@
      * Create an instance of {@link JAXBElement }{@code <}{@link KeyExchangeTokenType }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://docs.oasis-open.org/ws-sx/ws-trust/200512/", name = "KeyExchangeToken")
+    @XmlElementDecl(namespace = "http://docs.oasis-open.org/ws-sx/ws-trust/200512", name = "KeyExchangeToken")
     public JAXBElement<KeyExchangeTokenType> createKeyExchangeToken(KeyExchangeTokenType value) {
         return new JAXBElement<KeyExchangeTokenType>(_KeyExchangeToken_QNAME, KeyExchangeTokenType.class, null, value);
     }
@@ -461,7 +461,7 @@
      * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://docs.oasis-open.org/ws-sx/ws-trust/200512/", name = "ComputedKey")
+    @XmlElementDecl(namespace = "http://docs.oasis-open.org/ws-sx/ws-trust/200512", name = "ComputedKey")
     public JAXBElement<String> createComputedKey(String value) {
         return new JAXBElement<String>(_ComputedKey_QNAME, String.class, null, value);
     }
@@ -470,7 +470,7 @@
      * Create an instance of {@link JAXBElement }{@code <}{@link RequestedSecurityTokenType }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://docs.oasis-open.org/ws-sx/ws-trust/200512/", name = "RequestedSecurityToken")
+    @XmlElementDecl(namespace = "http://docs.oasis-open.org/ws-sx/ws-trust/200512", name = "RequestedSecurityToken")
     public JAXBElement<RequestedSecurityTokenType> createRequestedSecurityToken(RequestedSecurityTokenType value) {
         return new JAXBElement<RequestedSecurityTokenType>(_RequestedSecurityToken_QNAME, RequestedSecurityTokenType.class, null, value);
     }
@@ -479,7 +479,7 @@
      * Create an instance of {@link JAXBElement }{@code <}{@link Long }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://docs.oasis-open.org/ws-sx/ws-trust/200512/", name = "KeySize")
+    @XmlElementDecl(namespace = "http://docs.oasis-open.org/ws-sx/ws-trust/200512", name = "KeySize")
     public JAXBElement<Long> createKeySize(Long value) {
         return new JAXBElement<Long>(_KeySize_QNAME, Long.class, null, value);
     }
@@ -488,7 +488,7 @@
      * Create an instance of {@link JAXBElement }{@code <}{@link ParticipantsType }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://docs.oasis-open.org/ws-sx/ws-trust/200512/", name = "Participants")
+    @XmlElementDecl(namespace = "http://docs.oasis-open.org/ws-sx/ws-trust/200512", name = "Participants")
     public JAXBElement<ParticipantsType> createParticipants(ParticipantsType value) {
         return new JAXBElement<ParticipantsType>(_Participants_QNAME, ParticipantsType.class, null, value);
     }
@@ -497,7 +497,7 @@
      * Create an instance of {@link JAXBElement }{@code <}{@link ClaimsType }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://docs.oasis-open.org/ws-sx/ws-trust/200512/", name = "Claims")
+    @XmlElementDecl(namespace = "http://docs.oasis-open.org/ws-sx/ws-trust/200512", name = "Claims")
     public JAXBElement<ClaimsType> createClaims(ClaimsType value) {
         return new JAXBElement<ClaimsType>(_Claims_QNAME, ClaimsType.class, null, value);
     }
@@ -506,7 +506,7 @@
      * Create an instance of {@link JAXBElement }{@code <}{@link CancelTargetType }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://docs.oasis-open.org/ws-sx/ws-trust/200512/", name = "CancelTarget")
+    @XmlElementDecl(namespace = "http://docs.oasis-open.org/ws-sx/ws-trust/200512", name = "CancelTarget")
     public JAXBElement<CancelTargetType> createCancelTarget(CancelTargetType value) {
         return new JAXBElement<CancelTargetType>(_CancelTarget_QNAME, CancelTargetType.class, null, value);
     }
@@ -515,7 +515,7 @@
      * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://docs.oasis-open.org/ws-sx/ws-trust/200512/", name = "EncryptionAlgorithm")
+    @XmlElementDecl(namespace = "http://docs.oasis-open.org/ws-sx/ws-trust/200512", name = "EncryptionAlgorithm")
     public JAXBElement<String> createEncryptionAlgorithm(String value) {
         return new JAXBElement<String>(_EncryptionAlgorithm_QNAME, String.class, null, value);
     }
@@ -524,7 +524,7 @@
      * Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://docs.oasis-open.org/ws-sx/ws-trust/200512/", name = "CombinedHash")
+    @XmlElementDecl(namespace = "http://docs.oasis-open.org/ws-sx/ws-trust/200512", name = "CombinedHash")
     public JAXBElement<byte[]> createCombinedHash(byte[] value) {
         return new JAXBElement<byte[]>(_CombinedHash_QNAME, byte[].class, null, ((byte[]) value));
     }
@@ -533,7 +533,7 @@
      * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://docs.oasis-open.org/ws-sx/ws-trust/200512/", name = "Challenge")
+    @XmlElementDecl(namespace = "http://docs.oasis-open.org/ws-sx/ws-trust/200512", name = "Challenge")
     public JAXBElement<String> createChallenge(String value) {
         return new JAXBElement<String>(_Challenge_QNAME, String.class, null, value);
     }
@@ -542,7 +542,7 @@
      * Create an instance of {@link JAXBElement }{@code <}{@link StatusType }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://docs.oasis-open.org/ws-sx/ws-trust/200512/", name = "Status")
+    @XmlElementDecl(namespace = "http://docs.oasis-open.org/ws-sx/ws-trust/200512", name = "Status")
     public JAXBElement<StatusType> createStatus(StatusType value) {
         return new JAXBElement<StatusType>(_Status_QNAME, StatusType.class, null, value);
     }
@@ -551,7 +551,7 @@
      * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://docs.oasis-open.org/ws-sx/ws-trust/200512/", name = "CanonicalizationAlgorithm")
+    @XmlElementDecl(namespace = "http://docs.oasis-open.org/ws-sx/ws-trust/200512", name = "CanonicalizationAlgorithm")
     public JAXBElement<String> createCanonicalizationAlgorithm(String value) {
         return new JAXBElement<String>(_CanonicalizationAlgorithm_QNAME, String.class, null, value);
     }
@@ -560,7 +560,7 @@
      * Create an instance of {@link JAXBElement }{@code <}{@link RenewTargetType }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://docs.oasis-open.org/ws-sx/ws-trust/200512/", name = "RenewTarget")
+    @XmlElementDecl(namespace = "http://docs.oasis-open.org/ws-sx/ws-trust/200512", name = "RenewTarget")
     public JAXBElement<RenewTargetType> createRenewTarget(RenewTargetType value) {
         return new JAXBElement<RenewTargetType>(_RenewTarget_QNAME, RenewTargetType.class, null, value);
     }
@@ -569,7 +569,7 @@
      * Create an instance of {@link JAXBElement }{@code <}{@link RequestSecurityTokenType }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://docs.oasis-open.org/ws-sx/ws-trust/200512/", name = "RequestSecurityToken")
+    @XmlElementDecl(namespace = "http://docs.oasis-open.org/ws-sx/ws-trust/200512", name = "RequestSecurityToken")
     public JAXBElement<RequestSecurityTokenType> createRequestSecurityToken(RequestSecurityTokenType value) {
         return new JAXBElement<RequestSecurityTokenType>(_RequestSecurityToken_QNAME, RequestSecurityTokenType.class, null, value);
     }
@@ -578,7 +578,7 @@
      * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://docs.oasis-open.org/ws-sx/ws-trust/200512/", name = "KeyWrapAlgorithm")
+    @XmlElementDecl(namespace = "http://docs.oasis-open.org/ws-sx/ws-trust/200512", name = "KeyWrapAlgorithm")
     public JAXBElement<String> createKeyWrapAlgorithm(String value) {
         return new JAXBElement<String>(_KeyWrapAlgorithm_QNAME, String.class, null, value);
     }
@@ -587,7 +587,7 @@
      * Create an instance of {@link JAXBElement }{@code <}{@link ProofEncryptionType }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://docs.oasis-open.org/ws-sx/ws-trust/200512/", name = "ProofEncryption")
+    @XmlElementDecl(namespace = "http://docs.oasis-open.org/ws-sx/ws-trust/200512", name = "ProofEncryption")
     public JAXBElement<ProofEncryptionType> createProofEncryption(ProofEncryptionType value) {
         return new JAXBElement<ProofEncryptionType>(_ProofEncryption_QNAME, ProofEncryptionType.class, null, value);
     }
@@ -596,7 +596,7 @@
      * Create an instance of {@link JAXBElement }{@code <}{@link BinaryExchangeType }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://docs.oasis-open.org/ws-sx/ws-trust/200512/", name = "BinaryExchange")
+    @XmlElementDecl(namespace = "http://docs.oasis-open.org/ws-sx/ws-trust/200512", name = "BinaryExchange")
     public JAXBElement<BinaryExchangeType> createBinaryExchange(BinaryExchangeType value) {
         return new JAXBElement<BinaryExchangeType>(_BinaryExchange_QNAME, BinaryExchangeType.class, null, value);
     }
@@ -605,7 +605,7 @@
      * Create an instance of {@link JAXBElement }{@code <}{@link Boolean }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://docs.oasis-open.org/ws-sx/ws-trust/200512/", name = "Delegatable")
+    @XmlElementDecl(namespace = "http://docs.oasis-open.org/ws-sx/ws-trust/200512", name = "Delegatable")
     public JAXBElement<Boolean> createDelegatable(Boolean value) {
         return new JAXBElement<Boolean>(_Delegatable_QNAME, Boolean.class, null, value);
     }
@@ -614,7 +614,7 @@
      * Create an instance of {@link JAXBElement }{@code <}{@link EntropyType }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://docs.oasis-open.org/ws-sx/ws-trust/200512/", name = "Entropy")
+    @XmlElementDecl(namespace = "http://docs.oasis-open.org/ws-sx/ws-trust/200512", name = "Entropy")
     public JAXBElement<EntropyType> createEntropy(EntropyType value) {
         return new JAXBElement<EntropyType>(_Entropy_QNAME, EntropyType.class, null, value);
     }
@@ -623,7 +623,7 @@
      * Create an instance of {@link JAXBElement }{@code <}{@link RequestSecurityTokenResponseType }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://docs.oasis-open.org/ws-sx/ws-trust/200512/", name = "RequestSecurityTokenResponse")
+    @XmlElementDecl(namespace = "http://docs.oasis-open.org/ws-sx/ws-trust/200512", name = "RequestSecurityTokenResponse")
     public JAXBElement<RequestSecurityTokenResponseType> createRequestSecurityTokenResponse(RequestSecurityTokenResponseType value) {
         return new JAXBElement<RequestSecurityTokenResponseType>(_RequestSecurityTokenResponse_QNAME, RequestSecurityTokenResponseType.class, null, value);
     }
@@ -632,7 +632,7 @@
      * Create an instance of {@link JAXBElement }{@code <}{@link AuthenticatorType }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://docs.oasis-open.org/ws-sx/ws-trust/200512/", name = "Authenticator")
+    @XmlElementDecl(namespace = "http://docs.oasis-open.org/ws-sx/ws-trust/200512", name = "Authenticator")
     public JAXBElement<AuthenticatorType> createAuthenticator(AuthenticatorType value) {
         return new JAXBElement<AuthenticatorType>(_Authenticator_QNAME, AuthenticatorType.class, null, value);
     }
@@ -641,7 +641,7 @@
      * Create an instance of {@link JAXBElement }{@code <}{@link RequestKETType }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://docs.oasis-open.org/ws-sx/ws-trust/200512/", name = "RequestKET")
+    @XmlElementDecl(namespace = "http://docs.oasis-open.org/ws-sx/ws-trust/200512", name = "RequestKET")
     public JAXBElement<RequestKETType> createRequestKET(RequestKETType value) {
         return new JAXBElement<RequestKETType>(_RequestKET_QNAME, RequestKETType.class, null, value);
     }
@@ -650,7 +650,7 @@
      * Create an instance of {@link JAXBElement }{@code <}{@link RenewingType }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://docs.oasis-open.org/ws-sx/ws-trust/200512/", name = "Renewing")
+    @XmlElementDecl(namespace = "http://docs.oasis-open.org/ws-sx/ws-trust/200512", name = "Renewing")
     public JAXBElement<RenewingType> createRenewing(RenewingType value) {
         return new JAXBElement<RenewingType>(_Renewing_QNAME, RenewingType.class, null, value);
     }
@@ -659,7 +659,7 @@
      * Create an instance of {@link JAXBElement }{@code <}{@link BinarySecretType }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://docs.oasis-open.org/ws-sx/ws-trust/200512/", name = "BinarySecret")
+    @XmlElementDecl(namespace = "http://docs.oasis-open.org/ws-sx/ws-trust/200512", name = "BinarySecret")
     public JAXBElement<BinarySecretType> createBinarySecret(BinarySecretType value) {
         return new JAXBElement<BinarySecretType>(_BinarySecret_QNAME, BinarySecretType.class, null, value);
     }
@@ -668,7 +668,7 @@
      * Create an instance of {@link JAXBElement }{@code <}{@link RequestedReferenceType }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://docs.oasis-open.org/ws-sx/ws-trust/200512/", name = "RequestedAttachedReference")
+    @XmlElementDecl(namespace = "http://docs.oasis-open.org/ws-sx/ws-trust/200512", name = "RequestedAttachedReference")
     public JAXBElement<RequestedReferenceType> createRequestedAttachedReference(RequestedReferenceType value) {
         return new JAXBElement<RequestedReferenceType>(_RequestedAttachedReference_QNAME, RequestedReferenceType.class, null, value);
     }
@@ -677,7 +677,7 @@
      * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://docs.oasis-open.org/ws-sx/ws-trust/200512/", name = "ComputedKeyAlgorithm")
+    @XmlElementDecl(namespace = "http://docs.oasis-open.org/ws-sx/ws-trust/200512", name = "ComputedKeyAlgorithm")
     public JAXBElement<String> createComputedKeyAlgorithm(String value) {
         return new JAXBElement<String>(_ComputedKeyAlgorithm_QNAME, String.class, null, value);
     }
@@ -686,7 +686,7 @@
      * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://docs.oasis-open.org/ws-sx/ws-trust/200512/", name = "SignWith")
+    @XmlElementDecl(namespace = "http://docs.oasis-open.org/ws-sx/ws-trust/200512", name = "SignWith")
     public JAXBElement<String> createSignWith(String value) {
         return new JAXBElement<String>(_SignWith_QNAME, String.class, null, value);
     }
@@ -695,7 +695,7 @@
      * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://docs.oasis-open.org/ws-sx/ws-trust/200512/", name = "AuthenticationType")
+    @XmlElementDecl(namespace = "http://docs.oasis-open.org/ws-sx/ws-trust/200512", name = "AuthenticationType")
     public JAXBElement<String> createAuthenticationType(String value) {
         return new JAXBElement<String>(_AuthenticationType_QNAME, String.class, null, value);
     }
@@ -704,7 +704,7 @@
      * Create an instance of {@link JAXBElement }{@code <}{@link EncryptionType }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://docs.oasis-open.org/ws-sx/ws-trust/200512/", name = "Encryption")
+    @XmlElementDecl(namespace = "http://docs.oasis-open.org/ws-sx/ws-trust/200512", name = "Encryption")
     public JAXBElement<EncryptionType> createEncryption(EncryptionType value) {
         return new JAXBElement<EncryptionType>(_Encryption_QNAME, EncryptionType.class, null, value);
     }
@@ -713,7 +713,7 @@
      * Create an instance of {@link JAXBElement }{@code <}{@link RequestedReferenceType }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://docs.oasis-open.org/ws-sx/ws-trust/200512/", name = "RequestedUnattachedReference")
+    @XmlElementDecl(namespace = "http://docs.oasis-open.org/ws-sx/ws-trust/200512", name = "RequestedUnattachedReference")
     public JAXBElement<RequestedReferenceType> createRequestedUnattachedReference(RequestedReferenceType value) {
         return new JAXBElement<RequestedReferenceType>(_RequestedUnattachedReference_QNAME, RequestedReferenceType.class, null, value);
     }
@@ -722,7 +722,7 @@
      * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://docs.oasis-open.org/ws-sx/ws-trust/200512/", name = "EncryptWith")
+    @XmlElementDecl(namespace = "http://docs.oasis-open.org/ws-sx/ws-trust/200512", name = "EncryptWith")
     public JAXBElement<String> createEncryptWith(String value) {
         return new JAXBElement<String>(_EncryptWith_QNAME, String.class, null, value);
     }
@@ -731,7 +731,7 @@
      * Create an instance of {@link JAXBElement }{@code <}{@link SignChallengeType }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://docs.oasis-open.org/ws-sx/ws-trust/200512/", name = "SignChallengeResponse")
+    @XmlElementDecl(namespace = "http://docs.oasis-open.org/ws-sx/ws-trust/200512", name = "SignChallengeResponse")
     public JAXBElement<SignChallengeType> createSignChallengeResponse(SignChallengeType value) {
         return new JAXBElement<SignChallengeType>(_SignChallengeResponse_QNAME, SignChallengeType.class, null, value);
     }
@@ -740,7 +740,7 @@
      * Create an instance of {@link JAXBElement }{@code <}{@link AllowPostdatingType }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://docs.oasis-open.org/ws-sx/ws-trust/200512/", name = "AllowPostdating")
+    @XmlElementDecl(namespace = "http://docs.oasis-open.org/ws-sx/ws-trust/200512", name = "AllowPostdating")
     public JAXBElement<AllowPostdatingType> createAllowPostdating(AllowPostdatingType value) {
         return new JAXBElement<AllowPostdatingType>(_AllowPostdating_QNAME, AllowPostdatingType.class, null, value);
     }
@@ -749,7 +749,7 @@
      * Create an instance of {@link JAXBElement }{@code <}{@link OnBehalfOfType }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://docs.oasis-open.org/ws-sx/ws-trust/200512/", name = "OnBehalfOf")
+    @XmlElementDecl(namespace = "http://docs.oasis-open.org/ws-sx/ws-trust/200512", name = "OnBehalfOf")
     public JAXBElement<OnBehalfOfType> createOnBehalfOf(OnBehalfOfType value) {
         return new JAXBElement<OnBehalfOfType>(_OnBehalfOf_QNAME, OnBehalfOfType.class, null, value);
     }
@@ -758,7 +758,7 @@
      * Create an instance of {@link JAXBElement }{@code <}{@link RequestedTokenCancelledType }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://docs.oasis-open.org/ws-sx/ws-trust/200512/", name = "RequestedTokenCancelled")
+    @XmlElementDecl(namespace = "http://docs.oasis-open.org/ws-sx/ws-trust/200512", name = "RequestedTokenCancelled")
     public JAXBElement<RequestedTokenCancelledType> createRequestedTokenCancelled(RequestedTokenCancelledType value) {
         return new JAXBElement<RequestedTokenCancelledType>(_RequestedTokenCancelled_QNAME, RequestedTokenCancelledType.class, null, value);
     }
@@ -767,7 +767,7 @@
      * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://docs.oasis-open.org/ws-sx/ws-trust/200512/", name = "TokenType")
+    @XmlElementDecl(namespace = "http://docs.oasis-open.org/ws-sx/ws-trust/200512", name = "TokenType")
     public JAXBElement<String> createTokenType(String value) {
         return new JAXBElement<String>(_TokenType_QNAME, String.class, null, value);
     }
@@ -776,7 +776,7 @@
      * Create an instance of {@link JAXBElement }{@code <}{@link UseKeyType }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://docs.oasis-open.org/ws-sx/ws-trust/200512/", name = "UseKey")
+    @XmlElementDecl(namespace = "http://docs.oasis-open.org/ws-sx/ws-trust/200512", name = "UseKey")
     public JAXBElement<UseKeyType> createUseKey(UseKeyType value) {
         return new JAXBElement<UseKeyType>(_UseKey_QNAME, UseKeyType.class, null, value);
     }

Modified: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/ws/trust/package-info.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/ws/trust/package-info.java	2010-04-30 02:11:39 UTC (rev 224)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/ws/trust/package-info.java	2010-04-30 14:41:05 UTC (rev 225)
@@ -5,5 +5,5 @@
 // Generated on: 2008.12.17 at 12:32:20 PM CST 
 //
 
- at javax.xml.bind.annotation.XmlSchema(namespace = "http://docs.oasis-open.org/ws-sx/ws-trust/200512/", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
+ at javax.xml.bind.annotation.XmlSchema(namespace = "http://docs.oasis-open.org/ws-sx/ws-trust/200512", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
 package org.picketlink.identity.federation.ws.trust;

Modified: federation/trunk/picketlink-fed-model/src/main/resources/schema/wstrust/v1_3/ws-trust-1.3.xsd
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/resources/schema/wstrust/v1_3/ws-trust-1.3.xsd	2010-04-30 02:11:39 UTC (rev 224)
+++ federation/trunk/picketlink-fed-model/src/main/resources/schema/wstrust/v1_3/ws-trust-1.3.xsd	2010-04-30 14:41:05 UTC (rev 225)
@@ -12,8 +12,8 @@
 xmlns:wsu='http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd'
 xmlns:wsp='http://schemas.xmlsoap.org/ws/2004/09/policy' 
 xmlns:wsa='http://www.w3.org/2005/08/addressing'
-xmlns:wst='http://docs.oasis-open.org/ws-sx/ws-trust/200512/'
-targetNamespace='http://docs.oasis-open.org/ws-sx/ws-trust/200512/'
+xmlns:wst='http://docs.oasis-open.org/ws-sx/ws-trust/200512'
+targetNamespace='http://docs.oasis-open.org/ws-sx/ws-trust/200512'
 elementFormDefault='qualified' >
 
   <xs:import namespace='http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd' 

Modified: federation/trunk/picketlink-fed-model/src/test/resources/wstrust/collection-request.xml
===================================================================
--- federation/trunk/picketlink-fed-model/src/test/resources/wstrust/collection-request.xml	2010-04-30 02:11:39 UTC (rev 224)
+++ federation/trunk/picketlink-fed-model/src/test/resources/wstrust/collection-request.xml	2010-04-30 14:41:05 UTC (rev 225)
@@ -1,5 +1,5 @@
-<wst:RequestSecurityTokenCollection xmlns:wst="http://docs.oasis-open.org/ws-sx/ws-trust/200512/" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy/" 
-   xmlns:wsa="http://www.w3.org/2005/08/addressing/">
+<wst:RequestSecurityTokenCollection xmlns:wst="http://docs.oasis-open.org/ws-sx/ws-trust/200512" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy" 
+   xmlns:wsa="http://www.w3.org/2005/08/addressing">
 
    <!-- identity token request -->
    <wst:RequestSecurityToken Context="http://www.example.com/1">
@@ -16,7 +16,7 @@
    <!-- certification claim token request -->
    <wst:RequestSecurityToken Context="http://www.example.com/2">
       <wst:TokenType>http://docs.oasis-open.org/wss/oasis-wss-saml-token-profile-1.1#SAMLV2.0</wst:TokenType>
-      <wst:RequestType>http://docs.oasis-open.org/ws-sx/ws-trust/200512 /BatchIssue</wst:RequestType>
+      <wst:RequestType>http://docs.oasis-open.org/ws-sx/ws-trust/200512/BatchIssue</wst:RequestType>
       <wst:Claims>http://manufacturer.example.com/certification</wst:Claims>
       <wsp:PolicyReference URI="http://certificationbody.example.org/certificationPolicy"/>
    </wst:RequestSecurityToken>

Modified: federation/trunk/picketlink-fed-model/src/test/resources/wstrust/simple-request.xml
===================================================================
--- federation/trunk/picketlink-fed-model/src/test/resources/wstrust/simple-request.xml	2010-04-30 02:11:39 UTC (rev 224)
+++ federation/trunk/picketlink-fed-model/src/test/resources/wstrust/simple-request.xml	2010-04-30 14:41:05 UTC (rev 225)
@@ -1,4 +1,4 @@
-<wst:RequestSecurityToken xmlns:wst="http://docs.oasis-open.org/ws-sx/ws-trust/200512/">
+<wst:RequestSecurityToken xmlns:wst="http://docs.oasis-open.org/ws-sx/ws-trust/200512">
    <wst:TokenType>http://example.org/mySpecialToken</wst:TokenType>
    <wst:RequestType>http://docs.oasis-open.org/ws-sx/ws-trust/200512/Issue</wst:RequestType>
 </wst:RequestSecurityToken>
\ No newline at end of file




More information about the jboss-cvs-commits mailing list