[jboss-cvs] jboss-seam/src/main/org/jboss/seam/security ...

[Gavin King]

  User: gavin   
  Date: 07/02/08 13:15:57

  Modified:    src/main/org/jboss/seam/security  Identity.java
  Log:
  allow msg overriding
  
  Revision  Changes    Path
  1.55      +12 -2     jboss-seam/src/main/org/jboss/seam/security/Identity.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Identity.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/security/Identity.java,v
  retrieving revision 1.54
  retrieving revision 1.55
  diff -u -b -r1.54 -r1.55
  --- Identity.java	7 Feb 2007 21:34:49 -0000	1.54
  +++ Identity.java	8 Feb 2007 18:15:57 -0000	1.55
  @@ -183,17 +183,27 @@
         {
            authenticate();
            log.debug("Login successful for: #0" + getUsername());
  -         FacesMessages.instance().addFromResourceBundle(FacesMessage.SEVERITY_INFO, "org.jboss.seam.loginSuccessful", "Welcome, #0", getUsername());
  +         addLoginSuccessfulMessage();
            return "success";
         }
         catch (LoginException ex)
         {
            log.debug("Login failed for:" + getUsername(), ex);
  -         FacesMessages.instance().addFromResourceBundle(FacesMessage.SEVERITY_INFO, "org.jboss.seam.loginFailed", "Login failed", ex);
  +         addLoginFailedMessage(ex);
            return null;
         }
      }
      
  +   protected void addLoginFailedMessage(LoginException ex)
  +   {
  +      FacesMessages.instance().addFromResourceBundle(FacesMessage.SEVERITY_INFO, "org.jboss.seam.loginFailed", "Login failed", ex);
  +   }
  +
  +   protected void addLoginSuccessfulMessage()
  +   {
  +      FacesMessages.instance().addFromResourceBundle(FacesMessage.SEVERITY_INFO, "org.jboss.seam.loginSuccessful", "Welcome, #0", getUsername());
  +   }
  +   
      public void authenticate() throws LoginException
      {
         authenticate( getLoginContext() );