Author: michiel
Date: 2010-05-03 11:06:58 +0200 (Mon, 03 May 2010)
New Revision: 42079
Modified:
mmbase/trunk/applications/crontab/src/main/java/org/mmbase/applications/crontab/AbstractCronJob.java
mmbase/trunk/applications/crontab/src/main/java/org/mmbase/applications/crontab/CronDaemon.java
mmbase/trunk/applications/crontab/src/main/java/org/mmbase/applications/crontab/CronEntry.java
mmbase/trunk/applications/crontab/src/main/java/org/mmbase/applications/crontab/CronEntryField.java
mmbase/trunk/applications/crontab/src/main/java/org/mmbase/applications/crontab/CronJob.java
mmbase/trunk/applications/crontab/src/main/java/org/mmbase/applications/crontab/Events.java
mmbase/trunk/applications/crontab/src/main/java/org/mmbase/applications/crontab/Interruptable.java
mmbase/trunk/applications/crontab/src/main/java/org/mmbase/applications/crontab/MMBaseCacheClearerJob.java
mmbase/trunk/applications/crontab/src/main/java/org/mmbase/applications/crontab/MMBaseQueryJob.java
mmbase/trunk/applications/crontab/src/main/java/org/mmbase/applications/crontab/MMBaseStatsJob.java
mmbase/trunk/applications/crontab/src/main/java/org/mmbase/applications/crontab/MemoryWarner.java
mmbase/trunk/applications/crontab/src/main/java/org/mmbase/applications/crontab/ProposedJobs.java
mmbase/trunk/applications/crontab/src/main/java/org/mmbase/applications/crontab/RunnableCronJob.java
mmbase/trunk/applications/crontab/src/main/java/org/mmbase/applications/crontab/RunningCronEntry.java
mmbase/trunk/applications/crontab/src/main/java/org/mmbase/applications/crontab/SampleCronJob.java
mmbase/trunk/applications/crontab/src/main/java/org/mmbase/applications/crontab/TestCronJob.java
mmbase/trunk/applications/crontab/src/main/java/org/mmbase/applications/crontab/builders/CronJobs.java
mmbase/trunk/applications/crontab/src/main/java/org/mmbase/applications/crontab/builders/NodeCronEntry.java
mmbase/trunk/applications/crontab/src/main/java/org/mmbase/applications/crontab/modules/CrontabModule.java
Log:
@Override's. Cleaning imports
Modified:
mmbase/trunk/applications/crontab/src/main/java/org/mmbase/applications/crontab/AbstractCronJob.java
===================================================================
---
mmbase/trunk/applications/crontab/src/main/java/org/mmbase/applications/crontab/AbstractCronJob.java
2010-04-29 13:50:23 UTC (rev 42078)
+++
mmbase/trunk/applications/crontab/src/main/java/org/mmbase/applications/crontab/AbstractCronJob.java
2010-05-03 09:06:58 UTC (rev 42079)
@@ -23,6 +23,7 @@
* Stores the CronEntry in protected member cronEntry. So extensions
should override
* {...@link #init()} instead (in which they can use the cronEntry member).
*/
+ @Override
public final void init(CronEntry cronEntry) {
this.cronEntry = cronEntry;
init();
@@ -37,14 +38,17 @@
/**
* Empty implementation (probably that's what you want)
*/
+ @Override
public void stop() {}
- public CronEntry getEntry() {
+ @Override
+ public final CronEntry getEntry() {
return cronEntry;
}
/**
* Implement this.
*/
+ @Override
public abstract void run();
}
Modified:
mmbase/trunk/applications/crontab/src/main/java/org/mmbase/applications/crontab/CronDaemon.java
===================================================================
---
mmbase/trunk/applications/crontab/src/main/java/org/mmbase/applications/crontab/CronDaemon.java
2010-04-29 13:50:23 UTC (rev 42078)
+++
mmbase/trunk/applications/crontab/src/main/java/org/mmbase/applications/crontab/CronDaemon.java
2010-05-03 09:06:58 UTC (rev 42079)
@@ -53,6 +53,7 @@
}
+ @Override
public void notify(ProposedJobs.Event event) {
log.debug("Received " + event);
if (proposedJobs != null) {
@@ -84,6 +85,7 @@
log.service("Ignored " + event + " because we don't have jobs of
type " + CronEntry.Type.BALANCE);
}
}
+ @Override
public void notify(Events.Event event) {
synchronized(runningJobs) {
switch (event.getType()) {
@@ -215,11 +217,21 @@
if ((entry.getType() == CronEntry.Type.BALANCE || entry.getType() ==
CronEntry.Type.BALANCE_MUSTBEONE)
&& proposedJobs == null) {
proposedJobs = new DelayQueue<ProposedJobs.Event>();
- proposedFuture = ThreadPools.scheduler.scheduleAtFixedRate(new
Runnable() { public void run() {CronDaemon.this.consumeJobs();} }, getFirst(),
60 * 1000, TimeUnit.MILLISECONDS);
+ proposedFuture = ThreadPools.scheduler.scheduleAtFixedRate(new
Runnable() {
+ @Override
+ public void run() {
+ CronDaemon.this.consumeJobs();
+ }
+ }, getFirst(), 60 * 1000, TimeUnit.MILLISECONDS);
ThreadPools.identify(proposedFuture, "Crontab's poposed balanced
job consumer");
}
if (failedFuture == null) {
- failedFuture = ThreadPools.scheduler.scheduleAtFixedRate(new
Runnable() { public void run() {CronDaemon.this.detectFailedJobs();} },
getFirst(), 60 * 1000, TimeUnit.MILLISECONDS);
+ failedFuture = ThreadPools.scheduler.scheduleAtFixedRate(new
Runnable() {
+ @Override
+ public void run() {
+ CronDaemon.this.detectFailedJobs();
+ }
+ }, getFirst(), 60 * 1000, TimeUnit.MILLISECONDS);
ThreadPools.identify(failedFuture, "Crontab's failed job detector
(unfinished)");
}
cronEntries.add(entry);
@@ -270,7 +282,12 @@
log.info("Starting CronDaemon");
long first = getFirst();
log.debug("First run at " + first);
- future = ThreadPools.scheduler.scheduleAtFixedRate(new Runnable() {
public void run() {CronDaemon.this.run();} }, first, 60 * 1000,
TimeUnit.MILLISECONDS);
+ future = ThreadPools.scheduler.scheduleAtFixedRate(new Runnable() {
+ @Override
+ public void run() {
+ CronDaemon.this.run();
+ }
+ }, first, 60 * 1000, TimeUnit.MILLISECONDS);
ThreadPools.identify(future, "Crontab's job kicker");
}
@@ -376,6 +393,7 @@
return Collections.unmodifiableSet(cronEntries);
}
+ @Override
public String toString() {
return "MMBase Cron Daemon";
}
@@ -399,9 +417,7 @@
d.add(new CronEntry("1", "*/2 5-23 * * *", "every 2 minute from 5 till
11 pm", "org.mmbase.applications.crontab.TestCronJob", null));
//d.add(new CronEntry("40-45,50-59 * * * *","test
40-45,50-60","Dummy",null));
- try {
- Thread.sleep(240 * 1000 * 60);
- } catch (Exception e) {};
+ Thread.sleep(240 * 1000 * 60);
d.stop();
}
}
Modified:
mmbase/trunk/applications/crontab/src/main/java/org/mmbase/applications/crontab/CronEntry.java
===================================================================
---
mmbase/trunk/applications/crontab/src/main/java/org/mmbase/applications/crontab/CronEntry.java
2010-04-29 13:50:23 UTC (rev 42078)
+++
mmbase/trunk/applications/crontab/src/main/java/org/mmbase/applications/crontab/CronEntry.java
2010-05-03 09:06:58 UTC (rev 42079)
@@ -399,6 +399,7 @@
result = HashCodeUtil.hashCode(result, name);
result = HashCodeUtil.hashCode(result, className);
result = HashCodeUtil.hashCode(result, cronTime);
+ result = HashCodeUtil.hashCode(result, configuration);
return result;
}
Modified:
mmbase/trunk/applications/crontab/src/main/java/org/mmbase/applications/crontab/CronEntryField.java
===================================================================
---
mmbase/trunk/applications/crontab/src/main/java/org/mmbase/applications/crontab/CronEntryField.java
2010-04-29 13:50:23 UTC (rev 42078)
+++
mmbase/trunk/applications/crontab/src/main/java/org/mmbase/applications/crontab/CronEntryField.java
2010-05-03 09:06:58 UTC (rev 42079)
@@ -83,10 +83,12 @@
return valid[otherValue];
}
+ @Override
public int hashCode() {
return content.hashCode();
}
+ @Override
public boolean equals(Object o) {
if (! (o instanceof CronEntryField)) {
return false;
Modified:
mmbase/trunk/applications/crontab/src/main/java/org/mmbase/applications/crontab/CronJob.java
===================================================================
---
mmbase/trunk/applications/crontab/src/main/java/org/mmbase/applications/crontab/CronJob.java
2010-04-29 13:50:23 UTC (rev 42078)
+++
mmbase/trunk/applications/crontab/src/main/java/org/mmbase/applications/crontab/CronJob.java
2010-05-03 09:06:58 UTC (rev 42079)
@@ -33,6 +33,7 @@
* {...@inheritdoc}
* This is the method which is repeatedly called.
*/
+ @Override
void run();
CronEntry getEntry();
Modified:
mmbase/trunk/applications/crontab/src/main/java/org/mmbase/applications/crontab/Events.java
===================================================================
---
mmbase/trunk/applications/crontab/src/main/java/org/mmbase/applications/crontab/Events.java
2010-04-29 13:50:23 UTC (rev 42078)
+++
mmbase/trunk/applications/crontab/src/main/java/org/mmbase/applications/crontab/Events.java
2010-05-03 09:06:58 UTC (rev 42079)
@@ -10,9 +10,7 @@
package org.mmbase.applications.crontab;
import org.mmbase.core.event.*;
-import java.util.concurrent.*;
-import org.mmbase.util.logging.*;
/**
@@ -41,6 +39,7 @@
}
+ @Override
public String toString() {
return getMachine() + ":" + entry;
}
@@ -61,17 +60,21 @@
*/
public static class Broker extends AbstractEventBroker {
+ @Override
public boolean canBrokerForListener(EventListener listener) {
return listener instanceof Events.Listener;
}
+ @Override
public boolean canBrokerForEvent(org.mmbase.core.event.Event event) {
return event instanceof Events.Event;
}
+ @Override
protected void notifyEventListener(org.mmbase.core.event.Event event,
EventListener listener) {
Events.Event ne = (Events.Event) event; //!!!!!
Listener nel = (Listener) listener;
nel.notify(ne);
}
+ @Override
public String toString() {
return "Crontab Events Broker";
}
Modified:
mmbase/trunk/applications/crontab/src/main/java/org/mmbase/applications/crontab/Interruptable.java
===================================================================
---
mmbase/trunk/applications/crontab/src/main/java/org/mmbase/applications/crontab/Interruptable.java
2010-04-29 13:50:23 UTC (rev 42078)
+++
mmbase/trunk/applications/crontab/src/main/java/org/mmbase/applications/crontab/Interruptable.java
2010-05-03 09:06:58 UTC (rev 42079)
@@ -31,7 +31,7 @@
private Throwable throwable;
- static interface CallBack {
+ public static interface CallBack {
void run(Interruptable i);
}
@@ -54,6 +54,7 @@
return sequence;
}
+ @Override
public void run() {
if (runThread != null) {
throw new IllegalStateException();
Modified:
mmbase/trunk/applications/crontab/src/main/java/org/mmbase/applications/crontab/MMBaseCacheClearerJob.java
===================================================================
---
mmbase/trunk/applications/crontab/src/main/java/org/mmbase/applications/crontab/MMBaseCacheClearerJob.java
2010-04-29 13:50:23 UTC (rev 42078)
+++
mmbase/trunk/applications/crontab/src/main/java/org/mmbase/applications/crontab/MMBaseCacheClearerJob.java
2010-05-03 09:06:58 UTC (rev 42079)
@@ -23,10 +23,12 @@
private static final Logger log =
Logging.getLoggerInstance(MMBaseCacheClearerJob.class);
protected String[] caches = null;
+ @Override
protected void init() {
caches = cronEntry.getConfiguration() != null ? caches =
cronEntry.getConfiguration().split(",") : null;
}
+ @Override
public final void run() {
if (caches != null && caches.length > 0) {
log.service("Clearing " + java.util.Arrays.asList(caches));
Modified:
mmbase/trunk/applications/crontab/src/main/java/org/mmbase/applications/crontab/MMBaseQueryJob.java
===================================================================
---
mmbase/trunk/applications/crontab/src/main/java/org/mmbase/applications/crontab/MMBaseQueryJob.java
2010-04-29 13:50:23 UTC (rev 42078)
+++
mmbase/trunk/applications/crontab/src/main/java/org/mmbase/applications/crontab/MMBaseQueryJob.java
2010-05-03 09:06:58 UTC (rev 42079)
@@ -25,12 +25,14 @@
private static final Logger log =
Logging.getLoggerInstance(MMBaseQueryJob.class);
private String sql;
+ @Override
protected void init() {
// determin what needs to be done in run().
sql = cronEntry.getConfiguration();
}
+ @Override
public final void run() {
try {
MMBase mmbase = MMBase.getMMBase();
Modified:
mmbase/trunk/applications/crontab/src/main/java/org/mmbase/applications/crontab/MMBaseStatsJob.java
===================================================================
---
mmbase/trunk/applications/crontab/src/main/java/org/mmbase/applications/crontab/MMBaseStatsJob.java
2010-04-29 13:50:23 UTC (rev 42078)
+++
mmbase/trunk/applications/crontab/src/main/java/org/mmbase/applications/crontab/MMBaseStatsJob.java
2010-05-03 09:06:58 UTC (rev 42079)
@@ -49,6 +49,7 @@
private Logger statsLogger;
+ @Override
protected void init() {
// determin what needs to be done in run().
String what = cronEntry.getConfiguration();
@@ -56,50 +57,57 @@
String w = what.toUpperCase();
if (w.equals("MEMORY")) {
job = new Runnable() {
- public void run() {
- Runtime runtime = Runtime.getRuntime();
- statsLogger.service("" + runtime.freeMemory() + "\t" +
runtime.totalMemory());
- }
- };
+ @Override
+ public void run() {
+ Runtime runtime = Runtime.getRuntime();
+ statsLogger.service("" + runtime.freeMemory() + "\t" +
runtime.totalMemory());
+ }
+ };
} else if (w.equals("QUERIES")) {
job = new Runnable() {
- public void run() {
- statsLogger.service("" +
org.mmbase.module.database.MultiConnectionImplementation.queries);
- }
- };
+ @Override
+ public void run() {
+ statsLogger.service("" +
org.mmbase.module.database.MultiConnectionImplementation.queries);
+ }
+ };
} else if (w.equals("JOBSPOOL")) {
job = new Runnable() {
- public void run() {
- statsLogger.service("" +
ThreadPools.jobsExecutor.getCompletedTaskCount() + '\t' +
-
ThreadPools.jobsExecutor.getActiveCount() + '\t'+
-
ThreadPools.jobsExecutor.getQueue().size() + '\t' +
-
ThreadPools.jobsExecutor.getPoolSize() + '\t' +
-
ThreadPools.jobsExecutor.getLargestPoolSize() + '\t' +
-
ThreadPools.jobsExecutor.getCorePoolSize() + '\t' +
-
ThreadPools.jobsExecutor.getMaximumPoolSize());
+ @Override
+ public void run() {
+ statsLogger.service("" +
ThreadPools.jobsExecutor.getCompletedTaskCount() + '\t'
+ + ThreadPools.jobsExecutor.getActiveCount() + '\t'
+ + ThreadPools.jobsExecutor.getQueue().size() + '\t'
+ + ThreadPools.jobsExecutor.getPoolSize() + '\t'
+ + ThreadPools.jobsExecutor.getLargestPoolSize() +
'\t'
+ + ThreadPools.jobsExecutor.getCorePoolSize() + '\t'
+ + ThreadPools.jobsExecutor.getMaximumPoolSize());
}
};
} else if (w.startsWith("CACHE.")) {
job = new Runnable() {
- private Cache cache = getCache();
- {
- if (cache == null) {
- log.info("No cache with name " +
cronEntry.getConfiguration().substring(6) + " found (yet).");
- }
+ private Cache cache = getCache();
+ {
+ if (cache == null) {
+ log.info("No cache with name " +
cronEntry.getConfiguration().substring(6) + " found (yet).");
}
- public void run() {
- if (cache == null) cache = getCache();
- if (cache != null) {
- long h = cache.getHits();
- statsLogger.service("" + h + "\t" + (h +
cache.getMisses()));
- }
+ }
+ @Override
+ public void run() {
+ if (cache == null) {
+ cache = getCache();
}
- };
+ if (cache != null) {
+ long h = cache.getHits();
+ statsLogger.service("" + h + "\t" + (h +
cache.getMisses()));
+ }
+ }
+ };
} else {
job = new Runnable() {
- public void run() {
- }
- };
+ @Override
+ public void run() {
+ }
+ };
}
}
@@ -112,6 +120,7 @@
return CacheManager.getCache(cacheName);
}
+ @Override
public final void run() {
job.run();
}
Modified:
mmbase/trunk/applications/crontab/src/main/java/org/mmbase/applications/crontab/MemoryWarner.java
===================================================================
---
mmbase/trunk/applications/crontab/src/main/java/org/mmbase/applications/crontab/MemoryWarner.java
2010-04-29 13:50:23 UTC (rev 42078)
+++
mmbase/trunk/applications/crontab/src/main/java/org/mmbase/applications/crontab/MemoryWarner.java
2010-05-03 09:06:58 UTC (rev 42079)
@@ -32,6 +32,7 @@
private static final Logger log =
Logging.getLoggerInstance(MemoryWarner.class);
+ @Override
public final void run() {
try {
String[] config = cronEntry.getConfiguration().split(";");
Modified:
mmbase/trunk/applications/crontab/src/main/java/org/mmbase/applications/crontab/ProposedJobs.java
===================================================================
---
mmbase/trunk/applications/crontab/src/main/java/org/mmbase/applications/crontab/ProposedJobs.java
2010-04-29 13:50:23 UTC (rev 42078)
+++
mmbase/trunk/applications/crontab/src/main/java/org/mmbase/applications/crontab/ProposedJobs.java
2010-05-03 09:06:58 UTC (rev 42079)
@@ -48,6 +48,7 @@
ready = true;
}
+ @Override
public boolean equals(Object o) {
if (o instanceof Event) {
Event other = (Event) o;
@@ -59,21 +60,25 @@
return false;
}
}
+ @Override
public int hashCode() {
int result = entry.hashCode();
result = HashCodeUtil.hashCode(result, cronStart);
return result;
}
+ @Override
public long getDelay(TimeUnit unit) {
long delay = cronStart.getTime() + WAIT -
System.currentTimeMillis();
if (delay < 0) delay = 0;
return unit.convert(delay, TimeUnit.MILLISECONDS);
}
+ @Override
public int compareTo(Delayed d) {
return (int) (getDelay(TimeUnit.MILLISECONDS) -
d.getDelay(TimeUnit.MILLISECONDS));
}
+ @Override
public String toString() {
return getMachine() + ":" + cronStart + ":" + entry;
}
@@ -94,17 +99,21 @@
*/
public static class Broker extends AbstractEventBroker {
+ @Override
public boolean canBrokerForListener(EventListener listener) {
return listener instanceof ProposedJobs.Listener;
}
+ @Override
public boolean canBrokerForEvent(org.mmbase.core.event.Event event) {
return event instanceof ProposedJobs.Event;
}
+ @Override
protected void notifyEventListener(org.mmbase.core.event.Event event,
EventListener listener) {
ProposedJobs.Event ne = (ProposedJobs.Event) event; //!!!!!
Listener nel = (Listener) listener;
nel.notify(ne);
}
+ @Override
public String toString() {
return "Crontab Proposed Jobs Broker";
}
Modified:
mmbase/trunk/applications/crontab/src/main/java/org/mmbase/applications/crontab/RunnableCronJob.java
===================================================================
---
mmbase/trunk/applications/crontab/src/main/java/org/mmbase/applications/crontab/RunnableCronJob.java
2010-04-29 13:50:23 UTC (rev 42078)
+++
mmbase/trunk/applications/crontab/src/main/java/org/mmbase/applications/crontab/RunnableCronJob.java
2010-05-03 09:06:58 UTC (rev 42079)
@@ -31,6 +31,7 @@
public RunnableCronJob(Runnable run) {
runnable = run;
}
+ @Override
public void run() {
runnable.run();
}
Modified:
mmbase/trunk/applications/crontab/src/main/java/org/mmbase/applications/crontab/RunningCronEntry.java
===================================================================
---
mmbase/trunk/applications/crontab/src/main/java/org/mmbase/applications/crontab/RunningCronEntry.java
2010-04-29 13:50:23 UTC (rev 42078)
+++
mmbase/trunk/applications/crontab/src/main/java/org/mmbase/applications/crontab/RunningCronEntry.java
2010-05-03 09:06:58 UTC (rev 42079)
@@ -9,11 +9,9 @@
*/
package org.mmbase.applications.crontab;
-import org.mmbase.core.event.*;
import java.util.concurrent.*;
import java.util.Date;
-import org.mmbase.util.logging.*;
/**
*
@@ -80,11 +78,13 @@
return false;
}
}
+ @Override
public long getDelay(TimeUnit unit) {
long delay = getStart().getTime() + entry.getMaxDuration() -
System.currentTimeMillis();
if (delay < 0) delay = 0;
return unit.convert(delay, TimeUnit.MILLISECONDS);
}
+ @Override
public int compareTo(Delayed d) {
return (int) (getDelay(TimeUnit.MILLISECONDS) -
d.getDelay(TimeUnit.MILLISECONDS));
}
Modified:
mmbase/trunk/applications/crontab/src/main/java/org/mmbase/applications/crontab/SampleCronJob.java
===================================================================
---
mmbase/trunk/applications/crontab/src/main/java/org/mmbase/applications/crontab/SampleCronJob.java
2010-04-29 13:50:23 UTC (rev 42078)
+++
mmbase/trunk/applications/crontab/src/main/java/org/mmbase/applications/crontab/SampleCronJob.java
2010-05-03 09:06:58 UTC (rev 42079)
@@ -29,6 +29,7 @@
log.info("The constructor of a cronjob is only called once");
}
+ @Override
public void run() {
log.info("The job has been started by the cronEntry" + cronEntry);
log.info("the entry has this configuration " +
cronEntry.getConfiguration());
Modified:
mmbase/trunk/applications/crontab/src/main/java/org/mmbase/applications/crontab/TestCronJob.java
===================================================================
---
mmbase/trunk/applications/crontab/src/main/java/org/mmbase/applications/crontab/TestCronJob.java
2010-04-29 13:50:23 UTC (rev 42078)
+++
mmbase/trunk/applications/crontab/src/main/java/org/mmbase/applications/crontab/TestCronJob.java
2010-05-03 09:06:58 UTC (rev 42079)
@@ -29,6 +29,7 @@
}
+ @Override
public void run() {
Cloud cloud =
ContextProvider.getDefaultCloudContext().getCloud("mmbase", "class", null); //
testing Class Security
//Cloud cloud =
ContextProvider.getDefaultCloudContext().getCloud("mmbase", "anonymous", null);
Modified:
mmbase/trunk/applications/crontab/src/main/java/org/mmbase/applications/crontab/builders/CronJobs.java
===================================================================
---
mmbase/trunk/applications/crontab/src/main/java/org/mmbase/applications/crontab/builders/CronJobs.java
2010-04-29 13:50:23 UTC (rev 42078)
+++
mmbase/trunk/applications/crontab/src/main/java/org/mmbase/applications/crontab/builders/CronJobs.java
2010-05-03 09:06:58 UTC (rev 42079)
@@ -35,10 +35,11 @@
@Override public boolean init() {
boolean res = super.init();
org.mmbase.util.ThreadPools.jobsExecutor.execute(new Runnable() {
- public void run() {
- CronJobs.this.readJobs();
- }
- });
+ @Override
+ public void run() {
+ CronJobs.this.readJobs();
+ }
+ });
return res;
}
Modified:
mmbase/trunk/applications/crontab/src/main/java/org/mmbase/applications/crontab/builders/NodeCronEntry.java
===================================================================
---
mmbase/trunk/applications/crontab/src/main/java/org/mmbase/applications/crontab/builders/NodeCronEntry.java
2010-04-29 13:50:23 UTC (rev 42078)
+++
mmbase/trunk/applications/crontab/src/main/java/org/mmbase/applications/crontab/builders/NodeCronEntry.java
2010-05-03 09:06:58 UTC (rev 42079)
@@ -47,7 +47,8 @@
return
org.mmbase.bridge.ContextProvider.getDefaultCloudContext().getCloud("mmbase",
"class", null).getNode(getId());
}
- @Override public String getServers() {
+ @Override
+ public String getServers() {
Node jobNode = getNode();
NodeIterator servers =
jobNode.getRelatedNodes("mmservers").nodeIterator();
@@ -64,7 +65,8 @@
}
- @Override public boolean isActive() {
+ @Override
+ public boolean isActive() {
Node jobNode = getNode();
NodeIterator servers =
jobNode.getRelatedNodes("mmservers").nodeIterator();
if (! servers.hasNext() &&
@@ -87,7 +89,8 @@
return false;
}
- @Override protected void setCronTime(String ct) {
+ @Override
+ protected void setCronTime(String ct) {
String prev = cronTime;
super.setCronTime(ct);
if (prev == null) {
@@ -98,14 +101,16 @@
}
- @Override public void setConfiguration(String conf) {
+ @Override
+ public void setConfiguration(String conf) {
super.setConfiguration(conf);
Node n = getNode();
n.setStringValue("config", conf);
n.commit();
}
- @Override protected void setLastRun(Date d) {
+ @Override
+ protected void setLastRun(Date d) {
super.setLastRun(d);
Node node = getNode();
if (node.getNodeManager().hasField("lastrun")) {
@@ -117,7 +122,8 @@
}
}
- @Override protected void incCount() {
+ @Override
+ protected void incCount() {
super.incCount();
Node node = getNode();
if (node.getNodeManager().hasField("count")) {
@@ -127,7 +133,8 @@
}
}
- @Override protected void setLastCost(int i) {
+ @Override
+ protected void setLastCost(int i) {
super.setLastCost(i);
Node node = getNode();
if (node.getNodeManager().hasField("lastcost")) {
@@ -140,7 +147,8 @@
}
- @Override public String toString() {
+ @Override
+ public String toString() {
return "NODE: " + super.toString();
}
Modified:
mmbase/trunk/applications/crontab/src/main/java/org/mmbase/applications/crontab/modules/CrontabModule.java
===================================================================
---
mmbase/trunk/applications/crontab/src/main/java/org/mmbase/applications/crontab/modules/CrontabModule.java
2010-04-29 13:50:23 UTC (rev 42078)
+++
mmbase/trunk/applications/crontab/src/main/java/org/mmbase/applications/crontab/modules/CrontabModule.java
2010-05-03 09:06:58 UTC (rev 42079)
@@ -74,6 +74,7 @@
[<configuration-string>]
</pre>
*/
+ @Override
public void init() {
for (Map.Entry<String, String> entry : ((Map<String, String>)
getInitParameters()).entrySet()) {
addJob(entry);
@@ -81,6 +82,7 @@
readMoreJobs();
}
+ @Override
protected void shutdown() {
cronDaemon.stop();
}
@@ -102,16 +104,16 @@
log.error("No className " + value);
return;
}
- String description = null;
+ String descr = null;
String configString = null;
String type = null;
Pattern servers = CronEntry.ALL;
if (tokens.length > 2) {
- description = tokens[2].trim();
+ descr = tokens[2].trim();
}
- if (description == null || description.length() == 0) {
- description = entry.getKey();
+ if (descr == null || descr.length() == 0) {
+ descr = entry.getKey();
}
if (tokens.length > 3) {
@@ -126,14 +128,14 @@
}
try {
- CronEntry job = new CronEntry(entry.getKey(), times, description,
className, configString, type, servers);
+ CronEntry job = new CronEntry(entry.getKey(), times, descr,
className, configString, type, servers);
log.debug("Found job: " + job);
myEntries.add(job);
cronDaemon.add(job);
} catch (ClassNotFoundException cnfe) {
- log.info("Ignoring " + entry.getKey() + "|" + times + "|" +
description + "|" + className + " because " + cnfe.getClass().getName() + ": "
+ cnfe.getMessage());;
+ log.info("Ignoring " + entry.getKey() + "|" + times + "|" + descr
+ "|" + className + " because " + cnfe.getClass().getName() + ": " +
cnfe.getMessage());
} catch (Exception e) {
- log.error("Could not add to CronDaemon " + entry.getKey() + "|" +
times + "|" + description + "|" + className + " " + e.getClass().getName() + ":
" + e.getMessage(), e);
+ log.error("Could not add to CronDaemon " + entry.getKey() + "|" +
times + "|" + descr + "|" + className + " " + e.getClass().getName() + ": " +
e.getMessage(), e);
}
}
@@ -143,6 +145,7 @@
* All previously added entries are removed from the cron-daemon and the
currently configured
* ones are added (init is called).
*/
+ @Override
public void reload() {
log.info("Reloading crontab");
for (CronEntry e : myEntries) {
@@ -157,7 +160,12 @@
init();
}
- private UtilReader reader = new UtilReader("crontab.xml", new Runnable() {
public void run() { reload();}});
+ private UtilReader reader = new UtilReader("crontab.xml", new Runnable() {
+ @Override
+ public void run() {
+ reload();
+ }
+ });
private Map<String, String> utilProperties = reader.getProperties();
private Map<String, Collection<Map.Entry<String, String>>> utilMaps =
reader.getMaps();
@@ -171,26 +179,28 @@
* @since MMBase-1.8
*/
protected Function<Set<CronEntry>> listFunction = new
AbstractFunction<Set<CronEntry>>("list") {
- public Set<CronEntry> getFunctionValue(Parameters arguments) {
- return cronDaemon.getEntries();
- }
+ @Override
+ public Set<CronEntry> getFunctionValue(Parameters arguments) {
+ return cronDaemon.getEntries();
+ }
- };
+ };
{
- addFunction(listFunction);
+ addFunction(listFunction);
}
- protected final static Parameter<String> ENTRY = new
Parameter<String>("entry", String.class, true);
- protected final static Parameter<Integer> THREAD = new
Parameter<Integer>("thread", Integer.class, Integer.valueOf(0));
- protected final static Parameter<String> MACHINE = new
Parameter<String>("machine", String.class);
+ public final static Parameter<String> ENTRY = new
Parameter<String>("entry", String.class, true);
+ public final static Parameter<Integer> THREAD = new
Parameter<Integer>("thread", Integer.class, Integer.valueOf(0));
+ public final static Parameter<String> MACHINE = new
Parameter<String>("machine", String.class);
/**
* @since MMBase-1.8
*/
protected Function<Boolean> kickFunction = new
AbstractFunction<Boolean>("kick", ENTRY) {
- public Boolean getFunctionValue(Parameters arguments) {
- String id = (String) arguments.get(ENTRY);
- return
cronDaemon.getCronEntry(id).kick(DynamicDate.eval("tominute"));
- }
+ @Override
+ public Boolean getFunctionValue(Parameters arguments) {
+ String id = (String) arguments.get(ENTRY);
+ return
cronDaemon.getCronEntry(id).kick(DynamicDate.eval("tominute"));
+ }
};
{
@@ -200,15 +210,16 @@
/**
* @since MMBase-1.8
*/
- protected Function<Boolean> interruptFunction = new
AbstractFunction<Boolean>("interrupt", ENTRY, THREAD, MACHINE) {
- public Boolean getFunctionValue(Parameters arguments) {
- String id = (String) arguments.get(ENTRY);
- Integer thread = (Integer) arguments.get(THREAD);
- String machine = (String) arguments.get(MACHINE);
- return cronDaemon.interrupt(machine, id, thread);
- }
+ public Function<Boolean> interruptFunction = new
AbstractFunction<Boolean>("interrupt", ENTRY, THREAD, MACHINE) {
+ @Override
+ public Boolean getFunctionValue(Parameters arguments) {
+ String id = (String) arguments.get(ENTRY);
+ Integer thread = (Integer) arguments.get(THREAD);
+ String machine = (String) arguments.get(MACHINE);
+ return cronDaemon.interrupt(machine, id, thread);
+ }
- };
+ };
{
addFunction(interruptFunction);
}
@@ -218,11 +229,12 @@
* @since MMBase-1.8
*/
protected Function<Boolean> aliveFunction = new
AbstractFunction<Boolean>("alive") {
- public Boolean getFunctionValue(Parameters arguments) {
- return cronDaemon.isAlive();
- }
+ @Override
+ public Boolean getFunctionValue(Parameters arguments) {
+ return cronDaemon.isAlive();
+ }
- };
+ };
{
addFunction(aliveFunction);
}
@@ -231,12 +243,13 @@
* @since MMBase-1.8
*/
protected Function<Boolean> stopFunction = new
AbstractFunction<Boolean>("stop") {
- public Boolean getFunctionValue(Parameters arguments) {
- cronDaemon.stop();
- return cronDaemon.isAlive();
- }
+ @Override
+ public Boolean getFunctionValue(Parameters arguments) {
+ cronDaemon.stop();
+ return cronDaemon.isAlive();
+ }
- };
+ };
{
addFunction(stopFunction);
}
@@ -245,12 +258,13 @@
* @since MMBase-1.8
*/
protected Function<Boolean> startFunction = new
AbstractFunction<Boolean>("start") {
- public Boolean getFunctionValue(Parameters arguments) {
- cronDaemon.start();
- return cronDaemon.isAlive();
- }
+ @Override
+ public Boolean getFunctionValue(Parameters arguments) {
+ cronDaemon.start();
+ return cronDaemon.isAlive();
+ }
- };
+ };
{
addFunction(startFunction);
}
@@ -259,26 +273,29 @@
* @since MMBase-1.8
*/
protected Function<Boolean> reloadFunction = new
AbstractFunction<Boolean>("reload") {
- public Boolean getFunctionValue(Parameters arguments) {
- reload();
- return cronDaemon.isAlive();
- }
+ @Override
+ public Boolean getFunctionValue(Parameters arguments) {
+ reload();
+ return cronDaemon.isAlive();
+ }
- };
+ };
{
addFunction(reloadFunction);
addFunction(new AbstractFunction<List<ProposedJobs.Event>>("queue") {
- public List<ProposedJobs.Event> getFunctionValue(Parameters
arguments) {
- return cronDaemon.getQueue();
- }
+ @Override
+ public List<ProposedJobs.Event> getFunctionValue(Parameters
arguments) {
+ return cronDaemon.getQueue();
+ }
});
addFunction(new AbstractFunction<List<RunningCronEntry>>("running") {
- public List<RunningCronEntry> getFunctionValue(Parameters
arguments) {
- return cronDaemon.getRunning();
- }
+ @Override
+ public List<RunningCronEntry> getFunctionValue(Parameters
arguments) {
+ return cronDaemon.getRunning();
+ }
});
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
