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

[noreply at shibboleth.net]

Author: lajoie
Date: Thu Mar 29 12:15:26 2012
New Revision: 4146

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4146&view=rev
Log:
Getting started on authn impl work

Added:
    trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/AbstractAuthenticationAction.java   (with props)
    trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/DisplayUsernamePasswordPage.java   (contents, props changed)
      - copied, changed from r4130, trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/PresentUsernamePasswordCollectionPage.java
    trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/ExtractUsernamePasswordFromFormResponse.java   (with props)
    trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/package-info.java   (with props)
Removed:
    trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/PresentUsernamePasswordCollectionPage.java
Modified:
    trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/KerberosTicketContext.java
    trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/UsernamePasswordContext.java
    trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/X509CertificateContext.java
    trunk/idp-authn-api/src/test/java/net/shibboleth/idp/authn/UsernamePasswordContextTest.java
    trunk/idp-authn-impl/pom.xml

Modified: trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/KerberosTicketContext.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/KerberosTicketContext.java?rev=4146&r1=4145&r2=4146&view=diff
==============================================================================
--- trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/KerberosTicketContext.java (original)
+++ trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/KerberosTicketContext.java Thu Mar 29 12:15:26 2012
@@ -31,16 +31,7 @@
 public class KerberosTicketContext extends BaseContext {
 
     /** Kerberos ticket to be validated. */
-    private final KerberosTicket ticket;
-
-    /**
-     * Constructor.
-     * 
-     * @param kerbTicket the Kerberos ticket to be validated
-     */
-    public KerberosTicketContext(@Nonnull final KerberosTicket kerbTicket) {
-        ticket = Assert.isNotNull(kerbTicket, "Kerberos ticket can not be null");
-    }
+    private KerberosTicket ticket;
 
     /**
      * Gets the Kerberos ticket to be validated.
@@ -50,4 +41,13 @@
     @Nonnull public KerberosTicket getTicket() {
         return ticket;
     }
+    
+    /**
+     * Sets the Kerberos ticket to be validated.
+     * 
+     * @param kerbTicket the Kerberos ticket to be validated
+     */
+    public void setTicket(@Nonnull final KerberosTicket kerbTicket){
+        ticket = Assert.isNotNull(kerbTicket, "Kerberos ticket can not be null");
+    }
 }

Modified: trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/UsernamePasswordContext.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/UsernamePasswordContext.java?rev=4146&r1=4145&r2=4146&view=diff
==============================================================================
--- trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/UsernamePasswordContext.java (original)
+++ trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/UsernamePasswordContext.java Thu Mar 29 12:15:26 2012
@@ -18,10 +18,9 @@
 package net.shibboleth.idp.authn;
 
 import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 
-import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
 import net.shibboleth.utilities.java.support.logic.Assert;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
 import org.opensaml.messaging.context.BaseContext;
 
@@ -32,29 +31,27 @@
 public class UsernamePasswordContext extends BaseContext {
 
     /** The username. */
-    private final String username;
+    private String username;
 
     /** The password associated with the username. */
-    private final String password;
-
-    /**
-     * Constructor.
-     * 
-     * @param user the username
-     * @param pass the password
-     */
-    public UsernamePasswordContext(@Nonnull @NotEmpty final String user, @Nonnull @NotEmpty final String pass) {
-        username = Assert.isNotNull(StringSupport.trimOrNull(user), "Username can not be null");
-        password = Assert.isNotNull(StringSupport.trimOrNull(pass), "Password can not be null");
-    }
+    private String password;
 
     /**
      * Gets the username.
      * 
      * @return the username
      */
-    @Nonnull @NotEmpty public String getUsername() {
+    @Nullable public String getUsername() {
         return username;
+    }
+
+    /**
+     * Sets the username.
+     * 
+     * @param name the username
+     */
+    public void setUsername(@Nonnull final String name) {
+        username = Assert.isNotNull(name, "Username can not be null");
     }
 
     /**
@@ -62,7 +59,16 @@
      * 
      * @return password associated with the username
      */

[... 328 lines stripped ...]