You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by an...@apache.org on 2003/08/18 19:13:41 UTC
cvs commit: cocoon-lenya/src/java/org/apache/lenya/cms/scheduler SchedulerWrapper.java ServletJob.java TaskJob.java LoadQuartzServlet.java
andreas 2003/08/18 10:13:41
Modified: src/java/org/apache/lenya/cms/scheduler
SchedulerWrapper.java ServletJob.java TaskJob.java
LoadQuartzServlet.java
Log:
code and javadoc cleanup
Revision Changes Path
1.18 +5 -6 cocoon-lenya/src/java/org/apache/lenya/cms/scheduler/SchedulerWrapper.java
Index: SchedulerWrapper.java
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/java/org/apache/lenya/cms/scheduler/SchedulerWrapper.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- SchedulerWrapper.java 18 Aug 2003 12:23:32 -0000 1.17
+++ SchedulerWrapper.java 18 Aug 2003 17:13:40 -0000 1.18
@@ -101,7 +101,6 @@
public static final String JOB_PREFIX = "job";
public static final String DOCUMENT_URL = "document-url";
public static final String JOB_ID = "id";
- public static final String JOB_GROUP = "group";
public static final String JOB_CLASS = "class";
private static int jobId = 0;
public static final String JOB_GROUP_ELEMENT = "job-group";
@@ -236,7 +235,6 @@
log.debug("Job ID: [" + uniqueJobId + "]");
mapWrapper.put(JOB_ID, uniqueJobId);
- mapWrapper.put(JOB_GROUP, jobGroup);
mapWrapper.put(JOB_CLASS, jobClass.getName());
mapWrapper.put(DOCUMENT_URL, documentUri);
@@ -584,7 +582,7 @@
Element[] jobElements = helper.getChildren(jobsElement, "job");
for (int i = 0; i < jobElements.length; i++) {
- restoreJob(jobElements[i]);
+ restoreJob(jobElements[i], jobGroup);
}
}
} catch (Exception e) {
@@ -596,8 +594,9 @@
/**
* Restores the jobs from a certain XML element.
* @param jobElement The XML element.
+ * @param jobGroup The job group the job belongs to.
*/
- protected void restoreJob(Element jobElement) {
+ protected void restoreJob(Element jobElement, String jobGroup) {
log.debug("\n Restoring job ");
String className = null;
@@ -616,7 +615,7 @@
try {
Class cl = Class.forName(className);
ServletJob job = (ServletJob) cl.newInstance();
- JobDetail jobDetail = job.load(jobElement, getServletContextPath());
+ JobDetail jobDetail = job.load(jobElement, getServletContextPath(), jobGroup);
Element triggerElement = helper.getFirstChild(jobElement, "trigger");
1.13 +3 -2 cocoon-lenya/src/java/org/apache/lenya/cms/scheduler/ServletJob.java
Index: ServletJob.java
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/java/org/apache/lenya/cms/scheduler/ServletJob.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ServletJob.java 18 Aug 2003 12:23:32 -0000 1.12
+++ ServletJob.java 18 Aug 2003 17:13:40 -0000 1.13
@@ -85,10 +85,11 @@
* Loads the job data from an XML element.
* @param element An XML element.
* @param servletContext The servlet context path.
+ * @param jobGroup The job group the job belongs to.
* @return A job detail object.
* @throws SchedulerException when something went wrong.
*/
- public abstract JobDetail load(Element element, String servletContext)
+ public abstract JobDetail load(Element element, String servletContext, String jobGroup)
throws SchedulerException;
/**
1.28 +7 -7 cocoon-lenya/src/java/org/apache/lenya/cms/scheduler/TaskJob.java
Index: TaskJob.java
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/java/org/apache/lenya/cms/scheduler/TaskJob.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- TaskJob.java 18 Aug 2003 12:23:32 -0000 1.27
+++ TaskJob.java 18 Aug 2003 17:13:40 -0000 1.28
@@ -238,14 +238,15 @@
}
/**
- * DOCUMENT ME!
+ * Loads a job details object from an XML element.
*
- * @param jobElement DOCUMENT ME!
- * @param servletContext DOCUMENT ME!
+ * @param jobElement The XML element.
+ * @param servletContext The servlet context.
+ * @param jobGroup The job group the job belongs to.
*
- * @return DOCUMENT ME!
+ * @return A job details object.
*/
- public JobDetail load(Element jobElement, String servletContext) {
+ public JobDetail load(Element jobElement, String servletContext, String jobGroup) {
JobDataMap map = new JobDataMap();
NamespaceHelper helper = SchedulerWrapper.getNamespaceHelper();
Element taskElement = helper.getFirstChild(jobElement, "task");
@@ -293,7 +294,6 @@
Class cl = null;
String jobId = jobMap.get(SchedulerWrapper.JOB_ID);
- String jobGroup = jobMap.get(SchedulerWrapper.JOB_GROUP);
try {
cl = Class.forName(jobMap.get(SchedulerWrapper.JOB_CLASS));
1.29 +3 -3 cocoon-lenya/src/java/org/apache/lenya/cms/scheduler/LoadQuartzServlet.java
Index: LoadQuartzServlet.java
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/java/org/apache/lenya/cms/scheduler/LoadQuartzServlet.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- LoadQuartzServlet.java 18 Aug 2003 12:23:32 -0000 1.28
+++ LoadQuartzServlet.java 18 Aug 2003 17:13:40 -0000 1.29
@@ -124,7 +124,7 @@
process();
log.info("OK");
} catch (Exception e) {
- log.error("Init of LoadQuartzServlet failed");
+ log.error("Init of LoadQuartzServlet failed", e);
throw new ServletException(e);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: lenya-cvs-unsubscribe@cocoon.apache.org
For additional commands, e-mail: lenya-cvs-help@cocoon.apache.org