[Batchserver-cvs] batchserver/src/org/jmonks/batchserver/framework Main.java,1.7,1.8

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

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

Modified Files:
	Main.java 
Log Message:
no message

Index: Main.java
===================================================================
RCS file: /cvsroot/batchserver/batchserver/src/org/jmonks/batchserver/framework/Main.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Main.java	28 Mar 2006 04:53:33 -0000	1.7
--- Main.java	19 May 2006 18:55:17 -0000	1.8
***************
*** 5,12 ****
--- 5,18 ----
  import org.apache.log4j.Logger;
  import org.jmonks.batchserver.framework.common.ErrorCode;
+ import org.jmonks.batchserver.framework.common.FrameworkUtil;
+ import org.jmonks.batchserver.framework.config.FrameworkConfig;
+ import org.jmonks.batchserver.framework.config.JobConfig;
+ import org.jmonks.batchserver.framework.config.JobConfigFactory;
+ import org.jmonks.batchserver.framework.controller.JobController;
  import org.jmonks.batchserver.framework.management.JobManagementAgent;
  
  
  
+ 
  /**
   * <p>
***************
*** 25,30 ****
      private static Logger logger=Logger.getLogger(Main.class);
      
-     private JobManagementAgent mMgmtMntrManager;
-     
      public Main()
      {
--- 31,34 ----
***************
*** 55,61 ****
      {
          logger.trace("Entering process");
!         
          logger.trace("Exiting process");
!         return null;
      }
      
--- 59,85 ----
      {
          logger.trace("Entering process");
!         ErrorCode returnCode=ErrorCode.JOB_COMPLETED_SUCCESSFULLY;
!         try
!         {
!             String jobName=(String)configMap.get("job-name");
!             FrameworkConfig frameworkConfig=FrameworkConfig.getInstance();
!             LoggingManager.initializeFrameworkLogging(frameworkConfig.getFrameworkLoggingConfig());
!             JobConfigFactory jobConfigFactory=JobConfigFactory.getJobConfigFactory(frameworkConfig.getJobConfigFactoryConfig());
!             JobConfig jobConfig=jobConfigFactory.getJobConfig(jobName);
!             LoggingManager.initializeJobLogging(jobName,frameworkConfig.getFrameworkLoggingConfig(), jobConfig.getJobLoggingConfig());
!             JobController jobController=JobController.getJobController(jobName, jobConfig.getJobControllerConfig());
!             JobManagementAgent jobManagementAgent=JobManagementAgent.getJobManagementAgent();
!             jobManagementAgent.start(jobName, jobController);
!             returnCode=jobController.process();
!             jobManagementAgent.stop(returnCode);
!         }
!         catch(Throwable exception)
!         {
!             exception.printStackTrace();
!             logger.fatal("Exception while processing the job = " + exception.getMessage(),exception);
!             returnCode=ErrorCode.JOB_COMPLETED_WITH_ERRORS.appendMessage(exception.getMessage());
!         }
          logger.trace("Exiting process");
!         return returnCode;
      }
      
***************
*** 78,91 ****
      public static void main(String args[])
      {
!         
          Map configMap=new HashMap();
!         /**
!          * parse command line parameters and populate the map.
!          **/
          Main main=new Main();
          ErrorCode errorCode=main.process(configMap);
          System.exit(errorCode.getCode());
      }
- 
- 
  }
--- 102,127 ----
      public static void main(String args[])
      {
!         logger.info("Job started");
          Map configMap=new HashMap();
!         try
!         {
!             StringBuffer commandLineConfiguration=new StringBuffer();
!             for(int i=0;i<args.length;i++)
!             {
!                 commandLineConfiguration.append(args[i]+":");
!             }            
!             FrameworkUtil.loadPropertiesFromStringToMap(commandLineConfiguration.toString(),configMap);
!         }
!         catch(IllegalArgumentException exception)
!         {
!             exception.printStackTrace();
!             logger.fatal("Exception while parsing the command line parameters = " + exception.getMessage(),exception);
!             System.exit(ErrorCode.JOB_INVOKATION_CONFIGURAION_ERROR.getCode());
!         }
!         
          Main main=new Main();
          ErrorCode errorCode=main.process(configMap);
+         logger.info("Job finished = " + errorCode);
          System.exit(errorCode.getCode());
      }
  }