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

[Shane Bryzak]

  User: sbryzak2
  Date: 07/02/22 09:36:59

  Modified:    src/main/org/jboss/seam/security  Identity.java
  Log:
  rollback
  
  Revision  Changes    Path
  1.69      +8 -36     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.68
  retrieving revision 1.69
  diff -u -b -r1.68 -r1.69
  --- Identity.java	22 Feb 2007 13:16:55 -0000	1.68
  +++ Identity.java	22 Feb 2007 14:36:59 -0000	1.69
  @@ -59,9 +59,6 @@
      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;   
  @@ -191,25 +188,20 @@
   
      protected void addLoginFailedMessage(LoginException ex)
      {
  -      if (!Strings.isEmpty(loginFailedKey))
  -      {
            FacesMessages.instance().addFromResourceBundleOrDefault(
  -                  FacesMessage.SEVERITY_INFO, loginFailedKey, 
  +               FacesMessage.SEVERITY_INFO, "org.jboss.seam.loginFailed", 
                     "Login failed", ex);
         }
  -   }
   
      protected void addLoginSuccessfulMessage()
      {
  -      if (!Strings.isEmpty(loginSuccessfulKey))
  -      {
            FacesMessages.instance().addFromResourceBundleOrDefault(
  -                  FacesMessage.SEVERITY_INFO, loginSuccessfulKey, 
  +               FacesMessage.SEVERITY_INFO, "org.jboss.seam.loginSuccessful", 
                     "Welcome, #0", getUsername());
         }
  -   }
      
  -   public void authenticate() throws LoginException
  +   public void authenticate() 
  +      throws LoginException
      {
         authenticate( getLoginContext() );
      }
  @@ -531,26 +523,6 @@
         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());