[java-opensaml2 COMMIT] in /branches/REL_2: doc/RELEASE-NOTES.txt src/main/java/org/opensaml/saml1/core/AssertionArti...

[noreply at shibboleth.net]

Author: putmanb
Date: Thu Feb 20 20:56:55 2014
New Revision: 1664

URL: http://svn.shibboleth.net/view/java-opensaml2?rev=1664&view=rev
Log:
JOST-224: Superfluous/wrong type constants in SAML 1 and SAML 2 interfaces

Modified:
    branches/REL_2/doc/RELEASE-NOTES.txt
    branches/REL_2/src/main/java/org/opensaml/saml1/core/AssertionArtifact.java
    branches/REL_2/src/main/java/org/opensaml/saml1/core/StatusDetail.java
    branches/REL_2/src/main/java/org/opensaml/saml1/core/StatusMessage.java
    branches/REL_2/src/main/java/org/opensaml/saml1/core/Subject.java
    branches/REL_2/src/main/java/org/opensaml/saml2/core/RequestedAuthnContext.java

Modified: branches/REL_2/doc/RELEASE-NOTES.txt
URL: http://svn.shibboleth.net/view/java-opensaml2/branches/REL_2/doc/RELEASE-NOTES.txt?rev=1664&r1=1663&r2=1664&view=diff
==============================================================================
--- branches/REL_2/doc/RELEASE-NOTES.txt (original)
+++ branches/REL_2/doc/RELEASE-NOTES.txt Thu Feb 20 20:56:55 2014
@@ -1,6 +1,7 @@
 Changes in Release 2.6.2
 =============================================
 [JOST-223] - Misspelled error constant in SAML 1 StatusCode interface
+[JOST-224] - Superfluous/wrong type constants in SAML 1 and SAML 2 interfaces
 
 Changes in Release 2.6.1
 =============================================

Modified: branches/REL_2/src/main/java/org/opensaml/saml1/core/AssertionArtifact.java
URL: http://svn.shibboleth.net/view/java-opensaml2/branches/REL_2/src/main/java/org/opensaml/saml1/core/AssertionArtifact.java?rev=1664&r1=1663&r2=1664&view=diff
==============================================================================
--- branches/REL_2/src/main/java/org/opensaml/saml1/core/AssertionArtifact.java (original)
+++ branches/REL_2/src/main/java/org/opensaml/saml1/core/AssertionArtifact.java Thu Feb 20 20:56:55 2014
@@ -21,6 +21,7 @@
 
 import org.opensaml.common.SAMLObject;
 import org.opensaml.common.xml.SAMLConstants;
+import org.opensaml.xml.schema.XSString;
 
 /**
  * This interface is for the SAML1 <code> AssertionArtifact </code> extention point.
@@ -34,12 +35,15 @@
     public static final QName DEFAULT_ELEMENT_NAME = new QName(SAMLConstants.SAML10P_NS, DEFAULT_ELEMENT_LOCAL_NAME,
             SAMLConstants.SAML1P_PREFIX);
 
-    /** Local name of the XSI type. */
-    public static final String TYPE_LOCAL_NAME = "AssertionArtifactType";
+    /** Local name of the XSI type. 
+     * @deprecated no replacement
+     */
+    public static final String TYPE_LOCAL_NAME = XSString.TYPE_LOCAL_NAME;
 
-    /** QName of the XSI type. */
-    public static final QName TYPE_NAME = new QName(SAMLConstants.SAML10P_NS, TYPE_LOCAL_NAME,
-            SAMLConstants.SAML1P_PREFIX);
+    /** QName of the XSI type.
+     * @deprecated no replacement
+     */
+    public static final QName TYPE_NAME =  XSString.TYPE_NAME;
 
     /**
      * Get the contents of the artifact.

Modified: branches/REL_2/src/main/java/org/opensaml/saml1/core/StatusDetail.java
URL: http://svn.shibboleth.net/view/java-opensaml2/branches/REL_2/src/main/java/org/opensaml/saml1/core/StatusDetail.java?rev=1664&r1=1663&r2=1664&view=diff
==============================================================================
--- branches/REL_2/src/main/java/org/opensaml/saml1/core/StatusDetail.java (original)
+++ branches/REL_2/src/main/java/org/opensaml/saml1/core/StatusDetail.java Thu Feb 20 20:56:55 2014
@@ -37,7 +37,7 @@
     public final static QName DEFAULT_ELEMENT_NAME = new QName(SAMLConstants.SAML10P_NS, DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML1P_PREFIX);
     
     /** Local name of the XSI type */
-    public final static String TYPE_LOCAL_NAME = "StatusDetailype"; 
+    public final static String TYPE_LOCAL_NAME = "StatusDetailType"; 
         
     /** QName of the XSI type */
     public final static QName TYPE_NAME = new QName(SAMLConstants.SAML10P_NS, TYPE_LOCAL_NAME, SAMLConstants.SAML1P_PREFIX);

Modified: branches/REL_2/src/main/java/org/opensaml/saml1/core/StatusMessage.java
URL: http://svn.shibboleth.net/view/java-opensaml2/branches/REL_2/src/main/java/org/opensaml/saml1/core/StatusMessage.java?rev=1664&r1=1663&r2=1664&view=diff
==============================================================================
--- branches/REL_2/src/main/java/org/opensaml/saml1/core/StatusMessage.java (original)
+++ branches/REL_2/src/main/java/org/opensaml/saml1/core/StatusMessage.java Thu Feb 20 20:56:55 2014
@@ -21,6 +21,7 @@
 
 import org.opensaml.common.SAMLObject;
 import org.opensaml.common.xml.SAMLConstants;
+import org.opensaml.xml.schema.XSString;
 
 /**
  * This interface defines how the object representing a SAML1 <code> StatusMessage </code> element behaves. 
@@ -33,11 +34,15 @@
     /** Default element name */
     public final static QName DEFAULT_ELEMENT_NAME = new QName(SAMLConstants.SAML10P_NS, DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML1P_PREFIX);
     
-    /** Local name of the XSI type */
-    public final static String TYPE_LOCAL_NAME = "ActionType"; 
+    /** Local name of the XSI type 
+     * @deprecated no replacement
+     */

[... 42 lines stripped ...]