lenya/src/java/org/apache/lenya/cms/scheduler LoadQuartzServlet.java,1.23,1.24 TaskJob.java,1.17,1.18

Update of /repository/lenya/src/java/org/apache/lenya/cms/scheduler
In directory erbium:/tmp/cvs-serv310/src/java/org/apache/lenya/cms/scheduler

Modified Files:
	LoadQuartzServlet.java TaskJob.java 
Log Message:
- formatted TreePublisher
- added assertion in DefaultSiteTree
- NumberFormatException only for add/modify in LoadQuartzServlet
- using Publication in TaskJob

Index: LoadQuartzServlet.java
===================================================================
RCS file: /repository/lenya/src/java/org/apache/lenya/cms/scheduler/LoadQuartzServlet.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** LoadQuartzServlet.java	24 Apr 2003 13:52:59 -0000	1.23
--- LoadQuartzServlet.java	16 May 2003 18:34:29 -0000	1.24
***************
*** 256,290 ****
          }
  
-         String startDay = request.getParameter("trigger.startDay");
-         String startMonth = request.getParameter("trigger.startMonth");
-         String startYear = request.getParameter("trigger.startYear");
-         String startHour = request.getParameter("trigger.startHour");
-         String startMin = request.getParameter("trigger.startMin");
- 
-         Date startTime = null;
- 
-         try {
-             startTime = new GregorianCalendar(Integer.parseInt(startYear),
-                     
-                 // Month value is 0-based
-                 Integer.parseInt(startMonth) - 1, Integer.parseInt(startDay),
-                     Integer.parseInt(startHour), Integer.parseInt(startMin)).getTime();
-         } catch (NumberFormatException e) {
-             log.error("NumberFormatException with parameters " +
-                 "startYear, startMonth, startDay, startHour, startMin: " + startDay + ", " +
-                 startMonth + ", " + startDay + ", " + startHour + ", " + startMin);
-         }
- 
          // check if the request wants to submit, modify or delete a job.
          if (action == null) {
              // simply return all scheduled jobs, which is done below
          }
!         else if (action.equals("Add")) {
!             getScheduler().addJob(documentUri, publicationId, startTime, request);
!             log.debug(".handleRequest() Add : server-port:" + request.getServerPort());
!         }
!         else if (action.equals("Modify")) {
!             getScheduler().deleteJob(jobId, publicationId);
!             getScheduler().addJob(documentUri, publicationId, startTime, request);
          }
          else if (action.equals("Delete")) {
--- 256,297 ----
          }
  
          // check if the request wants to submit, modify or delete a job.
          if (action == null) {
              // simply return all scheduled jobs, which is done below
          }
!         
!         else if (action.equals("Add") || action.equals("Modify")) {
!         
!             String startDay = request.getParameter("trigger.startDay");
!             String startMonth = request.getParameter("trigger.startMonth");
!             String startYear = request.getParameter("trigger.startYear");
!             String startHour = request.getParameter("trigger.startHour");
!             String startMin = request.getParameter("trigger.startMin");
! 
!             Date startTime = null;
! 
!             try {
!                 startTime = new GregorianCalendar(
!                     Integer.parseInt(startYear),
!                     Integer.parseInt(startMonth) - 1,  // Month value is 0-based
!                     Integer.parseInt(startDay),
!                     Integer.parseInt(startHour),
!                     Integer.parseInt(startMin)).getTime();
!             } catch (NumberFormatException e) {
!                 log.error("NumberFormatException with parameters " +
!                     "startYear, startMonth, startDay, startHour, startMin: " + startDay + ", " +
!                     startMonth + ", " + startDay + ", " + startHour + ", " + startMin, e);
!                 throw new IOException("Parsing scheduling date/time failed!");
!             }
! 
!             if (action.equals("Add")) {
!                 getScheduler().addJob(documentUri, publicationId, startTime, request);
!                 log.debug(".handleRequest() Add : server-port:" + request.getServerPort());
!             }
!             else if (action.equals("Modify")) {
!                 getScheduler().deleteJob(jobId, publicationId);
!                 getScheduler().addJob(documentUri, publicationId, startTime, request);
!             }
!         
          }
          else if (action.equals("Delete")) {

Index: TaskJob.java
===================================================================
RCS file: /repository/lenya/src/java/org/apache/lenya/cms/scheduler/TaskJob.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** TaskJob.java	24 Apr 2003 13:52:59 -0000	1.17
--- TaskJob.java	16 May 2003 18:34:29 -0000	1.18
***************
*** 58,62 ****
  import org.quartz.JobExecutionException;
  
- import org.apache.lenya.cms.publishing.PublishingEnvironment;
  import org.apache.lenya.cms.task.AbstractTask;
  import org.apache.lenya.cms.task.Task;
--- 58,61 ----
***************
*** 69,72 ****
--- 68,72 ----
  import javax.servlet.http.HttpServletRequest;
  import org.apache.avalon.framework.parameters.ParameterException;
+ import org.apache.lenya.cms.publication.Publication;
  import org.w3c.dom.Element;
  import org.apache.lenya.cms.task.ExecutionException;
***************
*** 88,95 ****
      protected Parameters getParameters(String servletContextPath, HttpServletRequest request) {
          String taskId = request.getParameter(JobDataMapWrapper.getFullName(TASK_PREFIX, TASK_ID));
! 
!         if ((taskId == null) || taskId.equals("")) {
!             log.error("No task-id is provided!", new IllegalStateException());
!         }
  
          log.debug("Creating data map for job " + taskId);
--- 88,94 ----
      protected Parameters getParameters(String servletContextPath, HttpServletRequest request) {
          String taskId = request.getParameter(JobDataMapWrapper.getFullName(TASK_PREFIX, TASK_ID));
!         
!         assert taskId != null;
!         assert !"".equals(taskId);
  
          log.debug("Creating data map for job " + taskId);
***************
*** 101,113 ****
          String publicationId = (String) request.getSession().getAttribute("org.apache.lenya.cms.cocoon.acting.Authenticator.id");
  
!         if ((publicationId == null) || publicationId.equals("")) {
!             log.error("No publication ID provided! ", new IllegalStateException());
!             publicationId = "no_such_publication";
!         }
! 
!         // FIXME: Don't translate parameters
!         String publicationPath = servletContextPath + PublishingEnvironment.PUBLICATION_PREFIX +
!             publicationId + File.separator;
! 
          Parameters parameters = new Parameters();
  
--- 100,106 ----
          String publicationId = (String) request.getSession().getAttribute("org.apache.lenya.cms.cocoon.acting.Authenticator.id");
  
!         assert publicationId != null;
!         assert !"".equals(publicationId);
!         
          Parameters parameters = new Parameters();
  
***************
*** 193,198 ****
          String contextPath = map.get(Task.PARAMETER_SERVLET_CONTEXT);
          String publicationId = map.get(Task.PARAMETER_PUBLICATION_ID);
!         String publicationPath = PublishingEnvironment.getPublicationPath(contextPath, publicationId);
!         TaskManager manager = new TaskManager(publicationPath);
          Task task = manager.getTask(taskId);
  
--- 186,192 ----
          String contextPath = map.get(Task.PARAMETER_SERVLET_CONTEXT);
          String publicationId = map.get(Task.PARAMETER_PUBLICATION_ID);
!         
!         Publication publication = new Publication(publicationId, contextPath);
!         TaskManager manager = new TaskManager(publication.getDirectory().getAbsolutePath());
          Task task = manager.getTask(taskId);