[cvs] expresso commit by mtraum: jobqueue entries are now deleted when

[JCorporate Ltd]

Log Message:
-----------
jobqueue entries are now deleted when requesting user is deleted

Modified Files:
--------------
    expresso/expresso-web/expresso/doc:
        ChangeLog.xml
    expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/services/dbobj:
        JobQueue.java

Revision Data
-------------
Index: ChangeLog.xml
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/expresso/doc/ChangeLog.xml,v
retrieving revision 1.291
retrieving revision 1.292
diff -Lexpresso-web/expresso/doc/ChangeLog.xml -Lexpresso-web/expresso/doc/ChangeLog.xml -u -r1.291 -r1.292
--- expresso-web/expresso/doc/ChangeLog.xml
+++ expresso-web/expresso/doc/ChangeLog.xml
@@ -5,6 +5,11 @@
 	<project name="Expresso">
 		<version name="5.6.1" releaseDate="Not released yet">
 			<comment>Continued Updates</comment>
+            <bug-fix title="JobQueue entries are now deleted when requesting user is deleted">
+                <explanation>When a user was deleted, their JobQueue entries were not. This is now fixed.
+                </explanation>
+                <contributor>Mike Traum</contributor>
+            </bug-fix>
             <misc-change title="Removed 'Self-Registered Users' link from Admin setup page">
                 <explanation>'Self-Registered Users' users was specific to a registration domain, so it has been
                 removed. This information can now be accessed through 'User Information'.</explanation>
Index: JobQueue.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/services/dbobj/JobQueue.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/dbobj/JobQueue.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/dbobj/JobQueue.java -u -r1.16 -r1.17
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/services/dbobj/JobQueue.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/services/dbobj/JobQueue.java
@@ -72,6 +72,7 @@
 import com.jcorporate.expresso.core.misc.ConfigManager;
 import com.jcorporate.expresso.core.misc.DateTime;
 import com.jcorporate.expresso.core.security.User;
+import com.jcorporate.expresso.core.security.UserListener;
 import com.jcorporate.expresso.kernel.util.FastStringBuffer;
 
 import java.util.Hashtable;
@@ -92,7 +93,8 @@
  * @version $Revision$  $Date$
  */
 public class JobQueue
-        extends SecuredDBObject {
+        extends SecuredDBObject 
+        implements UserListener {
     private Hashtable valuesCoded = null;
     private Vector myParams = null;
     public static final String FLD_JOBOSNAME = "JobOSName";
@@ -442,6 +444,57 @@
         sb.append(year);
         setField(FLD_JOBCRON_PARAMS, sb.toString());
     }
+    
+    /**
+     * This method is called just before a user is deleted
+     *
+     * @param user The user that is deleted
+     * @throws DBException upon data access error
+     */
+    public void deletedUser(User user)
+            throws DBException {
+        JobQueue jq = new JobQueue();
+        jq.setDataContext(user.getDataContext());
+        jq.setField(FLD_UID, user.getUid());
+        jq.deleteAll();
+    }
+    
+    /**
+     * This method is called just after a new user is added
+     *
+     * @param user com.jcorporate.expresso.core.security.User
+     */
+    public void addedUser(User user)
+            throws DBException {
+    }
+    
+    /**
+     * This method is called just before a user is logged off
+     *
+     * @param user com.jcorporate.expresso.core.security.User
+     */
+    public void loggedOffUser(User user)
+            throws DBException {
+    }
+
+    /**
+     * This method is called just after a user is logged on
+     *
+     * @param user com.jcorporate.expresso.core.security.User
+     */
+    public void loggedOnUser(User user)
+            throws DBException {
+    }
+
+    /**
+     * This method is called just after a user is modified
+     *
+     * @param user com.jcorporate.expresso.core.security.User
+     */
+    public void modifiedUser(User user)
+            throws DBException {
+    }
+
 }
 
 /* JobQueue */