You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by ta...@apache.org on 2002/02/23 03:05:05 UTC

cvs commit: jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/portlets/security UserUpdateAction.java

taylor      02/02/22 18:05:05

  Modified:    src/java/org/apache/jetspeed/modules/actions
                        JLogoutUser.java JetspeedAccessController.java
               src/java/org/apache/jetspeed/modules/actions/portlets/security
                        UserUpdateAction.java
  Log:
  - update the inmemory state of the admin user if that admin user happens to be the same one as being edited by UserForm
  
  Revision  Changes    Path
  1.2       +2 -0      jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/JLogoutUser.java
  
  Index: JLogoutUser.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/JLogoutUser.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- JLogoutUser.java	9 Jan 2002 12:14:20 -0000	1.1
  +++ JLogoutUser.java	23 Feb 2002 02:05:05 -0000	1.2
  @@ -75,6 +75,8 @@
   
       public void doPerform( RunData data ) throws Exception
       {
  +        System.out.println("Entering action JLogoutUser");
  +
           Log.info("Entering action JLogoutUser");
   
           // if automatic login is enabled, then remove cookies when user logs out
  
  
  
  1.2       +1 -2      jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/JetspeedAccessController.java
  
  Index: JetspeedAccessController.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/JetspeedAccessController.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- JetspeedAccessController.java	13 Feb 2002 20:31:08 -0000	1.1
  +++ JetspeedAccessController.java	23 Feb 2002 02:05:05 -0000	1.2
  @@ -72,7 +72,7 @@
       in order to get the cached ACL list from logon
     
   @author <a href="mailto:taylor@apache.org">David Sean Taylor</a>
  -@version $Id: JetspeedAccessController.java,v 1.1 2002/02/13 20:31:08 taylor Exp $
  +@version $Id: JetspeedAccessController.java,v 1.2 2002/02/23 02:05:05 taylor Exp $
   */
   
   public class JetspeedAccessController extends AccessController
  @@ -80,7 +80,6 @@
       public void doPerform( RunData data ) throws Exception
       {
           super.doPerform(data);
  -        System.out.println("in acl");
           JetspeedRunData jdata = null;
           
           try
  
  
  
  1.5       +9 -0      jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/portlets/security/UserUpdateAction.java
  
  Index: UserUpdateAction.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/portlets/security/UserUpdateAction.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- UserUpdateAction.java	19 Nov 2001 07:51:06 -0000	1.4
  +++ UserUpdateAction.java	23 Feb 2002 02:05:05 -0000	1.5
  @@ -495,6 +495,15 @@
               //
               JetspeedSecurity.saveUser(user);
   
  +            User currentUser = rundata.getUser();
  +            if (currentUser.getUserName().equals(user.getUserName()))
  +            {
  +                // same user as admin -- need to update in memory
  +                currentUser.setPassword(user.getPassword());
  +                currentUser.setFirstName(user.getFirstName());
  +                currentUser.setLastName(user.getLastName());                
  +                currentUser.setEmail(user.getEmail());
  +            }
               //
               // success -- bring user back to user browser
               //
  
  
  

--
To unsubscribe, e-mail:   <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>