[java-identity-provider COMMIT] in /trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn: ExternalAuthenticatio...

[noreply at shibboleth.net]

Author: scantor
Date: Tue May 27 12:29:36 2014
New Revision: 5969

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5969&view=rev
Log:
Remove authnMethod from external login interface

Modified:
    trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/ExternalAuthentication.java
    trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/context/ExternalAuthenticationContext.java

Modified: trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/ExternalAuthentication.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/ExternalAuthentication.java?rev=5969&r1=5968&r2=5969&view=diff
==============================================================================
--- trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/ExternalAuthentication.java (original)
+++ trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/ExternalAuthentication.java Tue May 27 12:29:36 2014
@@ -25,9 +25,7 @@
 
 import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
 
-/**
- * Constants supporting external authentication outside the webflow engine.
- */
+/** Public interface supporting external authentication outside the webflow engine. */
 public class ExternalAuthentication {
 
     /** Parameter supplied to identify the per-conversation structure in the session. */
@@ -41,9 +39,6 @@
 
     /** Request attribute to which user's subject should be bound. */
     @Nonnull @NotEmpty public static final String SUBJECT_KEY = "subject";
-
-    /** Request attribute to which an authentication method URI may be bound. */
-    @Nonnull @NotEmpty public static final String AUTHENTICATION_METHOD_KEY = "authnMethod";
 
     /** Request attribute to which an authentication timestamp may be bound. */
     @Nonnull @NotEmpty public static final String AUTHENTICATION_INSTANT_KEY = "authnInstant";

Modified: trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/context/ExternalAuthenticationContext.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/context/ExternalAuthenticationContext.java?rev=5969&r1=5968&r2=5969&view=diff
==============================================================================
--- trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/context/ExternalAuthenticationContext.java (original)
+++ trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/context/ExternalAuthenticationContext.java Tue May 27 12:29:36 2014
@@ -42,9 +42,6 @@
 
     /** Name of a {@link Subject} that was authenticated. */
     @Nullable private Subject subject;
-
-    /** Method used to authenticate. */
-    @Nullable private String authnMethod;
 
     /** Time of authentication. */
     @Nullable private DateTime authnInstant;
@@ -129,24 +126,6 @@
     }
 
     /**
-     * Get the authentication method used.
-     * 
-     * @return the authentication method
-     */
-    @Nullable public String getAuthnMethod() {
-        return authnMethod;
-    }
-
-    /**
-     * Set the authentication method used.
-     * 
-     * @param method authentication method used
-     */
-    public void setAuthnMethod(@Nullable final String method) {
-        authnMethod = method;
-    }
-
-    /**
      * Get the time of authentication.
      * 
      * @return time of authentication