[MMBASE CVS] applications/crontab/src/org/mmbase/applications/crontab/builders NodeCronEntry.java CronJobs.java

[Michiel Meeuwissen]

Update of 
/var/cvs/applications/crontab/src/org/mmbase/applications/crontab/builders
In directory james.mmbase.org:/tmp/cvs-serv7341/builders

Modified Files:
        NodeCronEntry.java CronJobs.java 
Log Message:
javadoc, MMB-1797


See also: 
http://cvs.mmbase.org/viewcvs/applications/crontab/src/org/mmbase/applications/crontab/builders
See also: http://www.mmbase.org/jira/browse/MMB-1797


Index: NodeCronEntry.java
===================================================================
RCS file: 
/var/cvs/applications/crontab/src/org/mmbase/applications/crontab/builders/NodeCronEntry.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- NodeCronEntry.java  9 Dec 2008 13:38:10 -0000       1.6
+++ NodeCronEntry.java  1 Apr 2009 09:20:49 -0000       1.7
@@ -15,9 +15,11 @@
 import org.mmbase.util.logging.*;
 
 /**
+ * CronEntries defined by nodes of the type 'cronjobs' store several aspects 
of the cron entries in
+ * fields. {...@link #isActive} is implemented using related 'mmservers' 
objects.
  *
  * @author Michiel Meeuwissen
- * @version $Id: NodeCronEntry.java,v 1.6 2008/12/09 13:38:10 michiel Exp $
+ * @version $Id: NodeCronEntry.java,v 1.7 2009/04/01 09:20:49 michiel Exp $
  * @since MMBase-1.8.6
  */
 
@@ -58,8 +60,12 @@
     }
 
     @Override public boolean isActive() {
-        NodeIterator servers = 
getNode().getRelatedNodes("mmservers").nodeIterator();
-        if (! servers.hasNext()) return true;
+        Node jobNode = getNode();
+        NodeIterator servers = 
jobNode.getRelatedNodes("mmservers").nodeIterator();
+        if (! servers.hasNext() &&
+            ! 
"true".equals(jobNode.getNodeManager().getProperty(CronJobs.MMSERVERS_REQUIRED)))
 {
+            return true;
+        }
 
         String machineName = 
org.mmbase.module.core.MMBaseContext.getMachineName();
         while (servers.hasNext()) {


Index: CronJobs.java
===================================================================
RCS file: 
/var/cvs/applications/crontab/src/org/mmbase/applications/crontab/builders/CronJobs.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- CronJobs.java       9 Dec 2008 13:38:49 -0000       1.12
+++ CronJobs.java       1 Apr 2009 09:20:49 -0000       1.13
@@ -20,12 +20,14 @@
  *  The builder also starts the CronDeamon. on startup the list of cronjobs is 
loaded into memory.
  *  <b>The builder uses the bridge to get a cloud using class security.</b>
  * @author Kees Jongenburger
- * @version $Id: CronJobs.java,v 1.12 2008/12/09 13:38:49 michiel Exp $
+ * @version $Id: CronJobs.java,v 1.13 2009/04/01 09:20:49 michiel Exp $
  */
 public class CronJobs extends MMObjectBuilder  {
 
     private static final Logger log = 
Logging.getLoggerInstance(CronJobs.class);
 
+    public static String MMSERVERS_REQUIRED = "RelatedMMServersRequired";
+
     /**
      * Adds all the crontEntries to the CronDaemon
      */
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs