Author: scantor
Date: Wed Jan 29 16:16:52 2014
New Revision: 3585
URL: http://svn.shibboleth.net/view/java-opensaml?rev=3585&view=rev
Log:
IDP-127/128: Action to add SubjectConfirmation
Added:
trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml1/profile/impl/AddSubjectConfirmationToSubjects.java (with props)
trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/profile/impl/AddSubjectConfirmationToSubjects.java (with props)
trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml1/profile/impl/AddSubjectConfirmationToSubjectsTest.java (with props)
trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/AddSubjectConfirmationToSubjectsTest.java (with props)
Modified:
trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/saml1/core/ConfirmationMethod.java
trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/saml1/core/SubjectConfirmation.java
Modified: trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/saml1/core/ConfirmationMethod.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/saml1/core/ConfirmationMethod.java?rev=3585&r1=3584&r2=3585&view=diff
==============================================================================
--- trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/saml1/core/ConfirmationMethod.java (original)
+++ trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/saml1/core/ConfirmationMethod.java Wed Jan 29 16:16:52 2014
@@ -31,16 +31,34 @@
public interface ConfirmationMethod extends SAMLObject {
/** Element name, no namespace. */
- public final static String DEFAULT_ELEMENT_LOCAL_NAME = "ConfirmationMethod";
+ public static final String DEFAULT_ELEMENT_LOCAL_NAME = "ConfirmationMethod";
- /** Default element name */
- public final static QName DEFAULT_ELEMENT_NAME = new QName(SAMLConstants.SAML1_NS, DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML1_PREFIX);
+ /** Default element name. */
+ public static final QName DEFAULT_ELEMENT_NAME =
+ new QName(SAMLConstants.SAML1_NS, DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML1_PREFIX);
- /** Local name of the XSI type */
- public final static String TYPE_LOCAL_NAME = "ConfirmationMethodType";
+ /** Local name of the XSI type. */
+ public static final String TYPE_LOCAL_NAME = "ConfirmationMethodType";
- /** QName of the XSI type */
- public final static QName TYPE_NAME = new QName(SAMLConstants.SAML1_NS, TYPE_LOCAL_NAME, SAMLConstants.SAML1_PREFIX);
+ /** QName of the XSI type. */
+ public static final QName TYPE_NAME =
+ new QName(SAMLConstants.SAML1_NS, TYPE_LOCAL_NAME, SAMLConstants.SAML1_PREFIX);
+
+ /** Bearer confirmation method. */
+ public static final String METHOD_BEARER = "urn:oasis:names:tc:SAML:1.0:cm:bearer";
+
+ /** Artifact confirmation method. */
+ public static final String METHOD_ARTIFACT = "urn:oasis:names:tc:SAML:1.0:cm:artifact";
+
+ /** Deprecated Artifact confirmation method. */
+ @Deprecated
+ public static final String METHOD_ARTIFACT_DEPRECATED = "urn:oasis:names:tc:SAML:1.0:cm:artifact-01";
+
+ /** Holder of Key confirmation method. */
+ public static final String METHOD_HOLDER_OF_KEY = "urn:oasis:names:tc:SAML:1.0:cm:holder-of-key";
+
+ /** Sender-Vouches confirmation method. */
+ public static final String METHOD_SENDER_VOUCHES = "urn:oasis:names:tc:SAML:1.0:cm:sender-vouches";
/**
* Gets the confirmation method.
@@ -55,4 +73,4 @@
* @param confirmationMethod the confirmation method
*/
public void setConfirmationMethod(String confirmationMethod);
-}
+}
Modified: trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/saml1/core/SubjectConfirmation.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/saml1/core/SubjectConfirmation.java?rev=3585&r1=3584&r2=3585&view=diff
==============================================================================
--- trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/saml1/core/SubjectConfirmation.java (original)
+++ trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/saml1/core/SubjectConfirmation.java Wed Jan 29 16:16:52 2014
@@ -31,29 +31,43 @@
import org.opensaml.xmlsec.signature.KeyInfo;
/**
- * Interface to define how a SubjectConfirmation element behaves
+ * Interface to define how a SubjectConfirmation element behaves.
*/
public interface SubjectConfirmation extends SAMLObject {
/** Element name, no namespace. */
- public final static String DEFAULT_ELEMENT_LOCAL_NAME = "SubjectConfirmation";
+ public static final String DEFAULT_ELEMENT_LOCAL_NAME = "SubjectConfirmation";
- /** Default element name */
- public final static QName DEFAULT_ELEMENT_NAME = new QName(SAMLConstants.SAML1_NS, DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML1_PREFIX);
+ /** Default element name. */
+ public static final QName DEFAULT_ELEMENT_NAME =
[... 40 lines stripped ...]