Revision: 30
http://amavisadmin.svn.sourceforge.net/amavisadmin/?rev=30&view=rev
Author: streindl
Date: 2007-01-18 13:48:44 -0800 (Thu, 18 Jan 2007)
Log Message:
-----------
Fix for #1638946: add more default entries.
Modified Paths:
--------------
amavisadmin/trunk/src/java/de/sreindl/amavisadmin/EditJobs.java
Modified: amavisadmin/trunk/src/java/de/sreindl/amavisadmin/EditJobs.java
===================================================================
--- amavisadmin/trunk/src/java/de/sreindl/amavisadmin/EditJobs.java 2007-01-18 21:47:06 UTC (rev 29)
+++ amavisadmin/trunk/src/java/de/sreindl/amavisadmin/EditJobs.java 2007-01-18 21:48:44 UTC (rev 30)
@@ -32,8 +32,11 @@
import com.sun.rave.web.ui.component.TableRowGroup;
import de.sreindl.amavisadmin.db.Job;
import de.sreindl.amavisadmin.db.util.HibernateSessionFactory;
+import de.sreindl.amavisadmin.jobs.AdminNotifierJob;
import de.sreindl.amavisadmin.jobs.BaseJob;
+import de.sreindl.amavisadmin.jobs.MailSendJob;
import de.sreindl.amavisadmin.jobs.MessagesCleanupJob;
+import de.sreindl.amavisadmin.jobs.ReminderJob;
import de.sreindl.amavisadmin.jobs.RetentionCleanupJob;
import java.io.IOException;
import javax.faces.FacesException;
@@ -494,18 +497,53 @@
trx = session.beginTransaction();
job = new Job();
job.setJobName("Message Cleanup");
- job.setDescription("Removes messages marked for deletion");
- job.setCronSettings("0 3/15 * * * ?");
+ job.setDescription("Removes messages marked for deletion or orphans");
+ job.setCronSettings("0 3 0/2 * * ?");
job.setJobClass(MessagesCleanupJob.class);
job.setEnabled(Boolean.FALSE);
session.save(job);
job = new Job();
job.setJobName("Message Retention");
- job.setDescription("Removes old mails according to configuration");
- job.setCronSettings("0 0/5 * * * ?");
+ job.setDescription("Marks mails as to be deleted according to user settings");
+ job.setCronSettings("0 3 1/2 * * ?");
job.setJobClass(RetentionCleanupJob.class);
job.setEnabled(Boolean.FALSE);
session.save(job);
+ job = new Job();
+ job.setJobName("Mail Delivery");
+ job.setDescription("Mail Delivery Job: Please review parameters before actually starting the job");
+ job.setCronSettings("0 0/15 * * * ?");
+ job.setJobClass(MailSendJob.class);
+ job.setEnabled(Boolean.FALSE);
+ session.save(job);
+ job = new Job();
+ job.setJobName("Mail Warnings");
+ job.setDescription("Send Warning mails to users about mails going to be deleted soon. Please Review parameters before starting this job");
+ job.setCronSettings("0 0 0 * * ?");
+ job.setJobClass(ReminderJob.class);
+ job.setEnabled(Boolean.FALSE);
+ session.save(job);
+ job = new Job();
+ job.setJobName("Admin Warnings Mo-Fr");
+ job.setDescription("Send Mails to admins during the week");
+ job.setCronSettings("0 0 8-16/2 ? * MON-FRI");
+ job.setJobClass(AdminNotifierJob.class);
+ job.setEnabled(Boolean.FALSE);
+ session.save(job);
+ job = new Job();
+ job.setJobName("Admin Warnings Weekend");
+ job.setDescription("Send Mails to admins during for the weekends");
+ job.setCronSettings("0 0 8,16 ? * SUN,SAT");
+ job.setJobClass(AdminNotifierJob.class);
+ job.setEnabled(Boolean.FALSE);
+ session.save(job);
+ job = new Job();
+ job.setJobName("New SPAM Mail Notifier");
+ job.setDescription("Send mails to users about new mails arrived. Please review parameters before enabling this job!");
+ job.setCronSettings("0 0 7 * * ?");
+ job.setJobClass(AdminNotifierJob.class);
+ job.setEnabled(Boolean.FALSE);
+ session.save(job);
trx.commit();
getSessionBean1().getJobsDataProvider().refresh();
StdSchedulerFactory factory =
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
