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

[Shane Bryzak]

  User: sbryzak2
  Date: 07/02/22 08:16:55

  Modified:    src/main/org/jboss/seam/security  Identity.java
  Log:
  allow user to override messages
  
  Revision  Changes    Path
  1.68      +35 -6     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.67
  retrieving revision 1.68
  diff -u -b -r1.67 -r1.68
  --- Identity.java	22 Feb 2007 03:57:12 -0000	1.67
  +++ Identity.java	22 Feb 2007 13:16:55 -0000	1.68
  @@ -59,6 +59,9 @@
      private String username;
      private String password;
      
  +   private String loginSuccessfulKey = "org.jboss.seam.loginSuccessful";
  +   private String loginFailedKey = "org.jboss.seam.loginFailed";
  +   
      private MethodBinding authenticateMethod;
   
      private Principal principal;   
  @@ -188,17 +191,23 @@
   
      protected void addLoginFailedMessage(LoginException ex)
      {
  +      if (!Strings.isEmpty(loginFailedKey))
  +      {
         FacesMessages.instance().addFromResourceBundleOrDefault(
  -               FacesMessage.SEVERITY_INFO, "org.jboss.seam.loginFailed", 
  +                  FacesMessage.SEVERITY_INFO, loginFailedKey, 
                  "Login failed", ex);
      }
  +   }
   
      protected void addLoginSuccessfulMessage()
      {
  +      if (!Strings.isEmpty(loginSuccessfulKey))
  +      {
         FacesMessages.instance().addFromResourceBundleOrDefault(
  -               FacesMessage.SEVERITY_INFO, "org.jboss.seam.loginSuccessful", 
  +                  FacesMessage.SEVERITY_INFO, loginSuccessfulKey, 
                  "Welcome, #0", getUsername());
      }
  +   }
      
      public void authenticate() throws LoginException
      {
  @@ -522,6 +531,26 @@
         this.jaasConfigName = jaasConfigName;
      }
   
  +   public String getLoginSuccessfulKey()
  +   {
  +      return loginSuccessfulKey;
  +   }
  +   
  +   public void setLoginSuccessfulKey(String loginSuccessfulKey)
  +   {
  +      this.loginSuccessfulKey = loginSuccessfulKey;
  +   }
  +   
  +   public String getLoginFailedKey()
  +   {
  +      return loginFailedKey;
  +   }
  +   
  +   public void setLoginFailedKey(String loginFailedKey)
  +   {
  +      this.loginFailedKey = loginFailedKey;
  +   }
  +
      public void checkEntityPermission(Object entity, EntityAction action)
      {      
         Entity e = (Entity) Model.forClass(entity.getClass());