[Batchserver-cvs] batchserver/src/org/jmonks/batchserver/framework/controller/basic BasicJobController.java, 1.14, 1.15 BasicJobProcessor.java, 1.11, 1.12

[Suresh <sur...@us...>]

Update of /cvsroot/batchserver/batchserver/src/org/jmonks/batchserver/framework/controller/basic
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv25427/framework/controller/basic

Modified Files:
	BasicJobController.java BasicJobProcessor.java 
Log Message:
no message

Index: BasicJobProcessor.java
===================================================================
RCS file: /cvsroot/batchserver/batchserver/src/org/jmonks/batchserver/framework/controller/basic/BasicJobProcessor.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** BasicJobProcessor.java	13 Sep 2006 04:49:46 -0000	1.11
--- BasicJobProcessor.java	13 Sep 2006 23:29:45 -0000	1.12
***************
*** 1,6 ****
  package org.jmonks.batchserver.framework.controller.basic;
- import java.util.Map;
  import org.apache.log4j.Logger;
  import org.jmonks.batchserver.framework.ErrorCode;
  import org.jmonks.batchserver.framework.management.ProcessorStatus;
  
--- 1,6 ----
  package org.jmonks.batchserver.framework.controller.basic;
  import org.apache.log4j.Logger;
  import org.jmonks.batchserver.framework.ErrorCode;
+ import org.jmonks.batchserver.framework.JobContext;
  import org.jmonks.batchserver.framework.management.ProcessorStatus;
  
***************
*** 134,138 ****
       *  @return Returns the appropriate error code needs to be passed to the invocation layer.
       */
!     public abstract ErrorCode process(Map configProps);
      
      /**
--- 134,138 ----
       *  @return Returns the appropriate error code needs to be passed to the invocation layer.
       */
!     public abstract ErrorCode process(JobContext jobContext);
      
      /**

Index: BasicJobController.java
===================================================================
RCS file: /cvsroot/batchserver/batchserver/src/org/jmonks/batchserver/framework/controller/basic/BasicJobController.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** BasicJobController.java	13 Sep 2006 04:49:46 -0000	1.14
--- BasicJobController.java	13 Sep 2006 23:29:45 -0000	1.15
***************
*** 4,8 ****
  import EDU.oswego.cs.dl.util.concurrent.FutureResult;
  import java.util.Calendar;
- import java.util.HashMap;
  import java.util.Hashtable;
  import java.util.Iterator;
--- 4,7 ----
***************
*** 11,14 ****
--- 10,14 ----
  import org.jmonks.batchserver.framework.JobStatistics;
  import org.jmonks.batchserver.framework.ErrorCode;
+ import org.jmonks.batchserver.framework.JobContext;
  import org.jmonks.batchserver.framework.config.BasicJobControllerConfig;
  import org.jmonks.batchserver.framework.config.ConfigurationException;
***************
*** 66,71 ****
      public ErrorCode process()   
      {
!         logger.info("Entering process in basic job controller = " + super.getJobName());
!         BasicJobControllerConfig basicJobControllerConfig=(BasicJobControllerConfig)super.getJobControllerConfig();
          int threadCount=basicJobControllerConfig.getBasicJobProcessThreadCount();
          /**
--- 66,71 ----
      public ErrorCode process()   
      {
!         logger.info("Entering process in basic job controller = " + super.jobContext.getJobName());
!         BasicJobControllerConfig basicJobControllerConfig=(BasicJobControllerConfig)getJobContext().getJobConfig().getJobControllerConfig();
          int threadCount=basicJobControllerConfig.getBasicJobProcessThreadCount();
          /**
***************
*** 75,87 ****
          CountDown countDownLock=new CountDown(threadCount);
          logger.debug("Going to create " + threadCount + " basic job processor(s)");
!         this.jobStatistics=new JobStatistics(super.getJobName());
          this.jobStatistics.setStartTime(Calendar.getInstance().getTime());
          for(int i=0;i<threadCount;i++)
          {
!             String threadID=super.getJobName()+"_"+(i+1);            
              BasicJobProcessor jobProcessor=this.getBasicJobProcessor(basicJobControllerConfig.getBasicJobProcessorClassName());
              FutureResult result=new FutureResult();
              Thread processorThread=new Thread(result.setter(this.getCallableProcessor
!                     (countDownLock,jobProcessor,basicJobControllerConfig.getBasicJobProcessorConfigProperties())), threadID);
              processorThread.start();
              this.jobProcessorsMap.put(threadID,jobProcessor);
--- 75,87 ----
          CountDown countDownLock=new CountDown(threadCount);
          logger.debug("Going to create " + threadCount + " basic job processor(s)");
!         this.jobStatistics=new JobStatistics(super.jobContext.getJobName());
          this.jobStatistics.setStartTime(Calendar.getInstance().getTime());
          for(int i=0;i<threadCount;i++)
          {
!             String threadID=super.jobContext.getJobName()+"_"+(i+1);            
              BasicJobProcessor jobProcessor=this.getBasicJobProcessor(basicJobControllerConfig.getBasicJobProcessorClassName());
              FutureResult result=new FutureResult();
              Thread processorThread=new Thread(result.setter(this.getCallableProcessor
!                     (countDownLock,jobProcessor,super.jobContext)), threadID);
              processorThread.start();
              this.jobProcessorsMap.put(threadID,jobProcessor);
***************
*** 90,94 ****
          }
          ErrorCode returnCode=hybernate(countDownLock);
!         logger.info("Exiting process in basic job controller = " + super.getJobName() + " with return code = " + returnCode);
          return returnCode;
      }
--- 90,94 ----
          }
          ErrorCode returnCode=hybernate(countDownLock);
!         logger.info("Exiting process in basic job controller = " + super.jobContext.getJobName() + " with return code = " + returnCode);
          return returnCode;
      }
***************
*** 294,298 ****
       *  @return Returns the runnable instance.
       */
!     private Callable getCallableProcessor(final CountDown countDownLock,final BasicJobProcessor jobProcessor,final Map configProps)
      {
          logger.trace("Entering getCallableProcessor");
--- 294,298 ----
       *  @return Returns the runnable instance.
       */
!     private Callable getCallableProcessor(final CountDown countDownLock,final BasicJobProcessor jobProcessor,final JobContext jobContext)
      {
          logger.trace("Entering getCallableProcessor");
***************
*** 306,310 ****
                      logger.debug("Status of registering thread with the processor = " + registered);
                      logger.trace("Going to call the process method");
!                     returnCode=jobProcessor.process(new HashMap(configProps));
                      logger.debug("Done calling the process method");
                  }
--- 306,310 ----
                      logger.debug("Status of registering thread with the processor = " + registered);
                      logger.trace("Going to call the process method");
!                     returnCode=jobProcessor.process(jobContext);
                      logger.debug("Done calling the process method");
                  }