[Batchserver-cvs] batchserver/src/org/jmonks/batchserver/framework/config/xml batch-config.xml,1.4,1
Brought to you by:
suresh_pragada
Menu
▾
▴
[Batchserver-cvs] batchserver/src/org/jmonks/batchserver/framework/config/xml batch-config.xml,1.4,1.5 XMLBasicJobControllerConfig.java,1.7,1.8 XMLJobConfig.java,1.7,1.8 XMLJobConfigFactory.java,1.7,1.8 XMLJobControllerConfig.java,1.6,1.7 XMLJobLoggingConfig.java,1.1,1.2 XMLPoolJobControllerConfig.java,1.7,1.8
|
From: Suresh <sur...@us...> - 2006-03-14 23:05:35
|
Update of /cvsroot/batchserver/batchserver/src/org/jmonks/batchserver/framework/config/xml In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20471 Modified Files: batch-config.xml XMLBasicJobControllerConfig.java XMLJobConfig.java XMLJobConfigFactory.java XMLJobControllerConfig.java XMLJobLoggingConfig.java XMLPoolJobControllerConfig.java Log Message: no message Index: XMLJobConfig.java =================================================================== RCS file: /cvsroot/batchserver/batchserver/src/org/jmonks/batchserver/framework/config/xml/XMLJobConfig.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** XMLJobConfig.java 14 Mar 2006 05:47:15 -0000 1.7 --- XMLJobConfig.java 14 Mar 2006 23:05:25 -0000 1.8 *************** *** 69,72 **** --- 69,73 ---- logger.trace("Entering Constructor"); this.jobName=jobConfigElement.getAttribute(XMLJobConfig.JOB_NAME_ATTRIBUTE_NAME); + logger.info("Job name = " + this.jobName); String jobStatusInStr=jobConfigElement.getAttribute(XMLJobConfig.JOB_STATUS_ATTRIBUTE_NAME); *************** *** 79,89 **** this.jobStatus=false; } ! NodeList jobLoggingConfigNodeList=jobConfigElement.getElementsByTagName(XMLJobLoggingConfig.JOB_LOGGING_CONFIG_ELEMENT_NAME); if(jobLoggingConfigNodeList.getLength()==1) { Element jobLoggingConfigElement=(Element)jobLoggingConfigNodeList.item(0); this.jobLoggingConfig=new XMLJobLoggingConfig(jobLoggingConfigElement); ! logger.info("Read job logging configuration : " + this.jobLoggingConfig); } else --- 80,92 ---- this.jobStatus=false; } ! logger.info("Job status = " + this.jobStatus); ! NodeList jobLoggingConfigNodeList=jobConfigElement.getElementsByTagName(XMLJobLoggingConfig.JOB_LOGGING_CONFIG_ELEMENT_NAME); if(jobLoggingConfigNodeList.getLength()==1) { Element jobLoggingConfigElement=(Element)jobLoggingConfigNodeList.item(0); + logger.trace("Creating the XML Job logging configuration object"); this.jobLoggingConfig=new XMLJobLoggingConfig(jobLoggingConfigElement); ! logger.info("Job logging configuration = " + this.jobLoggingConfig); } else *************** *** 95,101 **** { Element controllerConfigElement=(Element)controllerConfigNodeList.item(0); ! logger.info("Requesting controller config factory to get the controller configuration object"); this.jobControllerConfig=XMLJobControllerConfig.getJobControllerConfig(controllerConfigElement); ! logger.info("Returned controller configuration : " + this.jobControllerConfig); } else --- 98,104 ---- { Element controllerConfigElement=(Element)controllerConfigNodeList.item(0); ! logger.trace("Requesting controller config factory to get the controller configuration object"); this.jobControllerConfig=XMLJobControllerConfig.getJobControllerConfig(controllerConfigElement); ! logger.info("Job controller configuration = " + this.jobControllerConfig); } else Index: batch-config.xml =================================================================== RCS file: /cvsroot/batchserver/batchserver/src/org/jmonks/batchserver/framework/config/xml/batch-config.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** batch-config.xml 14 Mar 2006 05:47:15 -0000 1.4 --- batch-config.xml 14 Mar 2006 23:05:25 -0000 1.5 *************** *** 28,31 **** --- 28,32 ---- <job-logger-config logger-name="com.mycompany.batch.xyz" logger-level="DEBUG"/> <job-logger-config logger-name="com.mycompany.batch.abc.processor" logger-level="ERROR"/> + <job-logger-config logger-name="org.jmonks.batchserver.framework" logger-level="ERROR"/> </job-logging-config> </job-config> Index: XMLJobLoggingConfig.java =================================================================== RCS file: /cvsroot/batchserver/batchserver/src/org/jmonks/batchserver/framework/config/xml/XMLJobLoggingConfig.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** XMLJobLoggingConfig.java 14 Mar 2006 05:47:15 -0000 1.1 --- XMLJobLoggingConfig.java 14 Mar 2006 23:05:25 -0000 1.2 *************** *** 68,71 **** --- 68,72 ---- String loggerName=jobLoggerConfigElement.getAttribute(XMLJobLoggingConfig.LOGGER_NAME_ATTRIBUTE_NAME); String loggerLevel=jobLoggerConfigElement.getAttribute(XMLJobLoggingConfig.LOGGER_LEVEL_ATTRIBUTE_NAME); + logger.trace("Adding the logger information = " + loggerName + " " + loggerLevel); this.addLogger(loggerName,loggerLevel); } Index: XMLPoolJobControllerConfig.java =================================================================== RCS file: /cvsroot/batchserver/batchserver/src/org/jmonks/batchserver/framework/config/xml/XMLPoolJobControllerConfig.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** XMLPoolJobControllerConfig.java 14 Mar 2006 05:47:15 -0000 1.7 --- XMLPoolJobControllerConfig.java 14 Mar 2006 23:05:25 -0000 1.8 *************** *** 95,98 **** --- 95,99 ---- * Load pool job loader configuration. */ + logger.trace("Started reading the pool job loader configuration"); NodeList xmlPoolJobLoaderNodeList=controllerConfigElement.getElementsByTagName(XMLPoolJobControllerConfig.POOL_JOB_LOADER_ELEMENT_NAME); if(xmlPoolJobLoaderNodeList.getLength()==1) *************** *** 111,118 **** throw new ConfigurationException(ConfigurationException.JOB_CONTROLLER_CONFIG, "Found " + xmlPoolJobLoaderNodeList.getLength() + " element(s) in the pool job controller configuration."); ! /** * Load pool job procesor configuration. */ NodeList xmlPoolJobProcessorNodeList=controllerConfigElement.getElementsByTagName(XMLPoolJobControllerConfig.POOL_JOB_PROCESSOR_ELEMENT_NAME); if(xmlPoolJobProcessorNodeList.getLength()==1) --- 112,120 ---- throw new ConfigurationException(ConfigurationException.JOB_CONTROLLER_CONFIG, "Found " + xmlPoolJobLoaderNodeList.getLength() + " element(s) in the pool job controller configuration."); ! logger.trace("Finished reading the pool job loader configuration"); /** * Load pool job procesor configuration. */ + logger.trace("Started reading the pool job processor configuration"); NodeList xmlPoolJobProcessorNodeList=controllerConfigElement.getElementsByTagName(XMLPoolJobControllerConfig.POOL_JOB_PROCESSOR_ELEMENT_NAME); if(xmlPoolJobProcessorNodeList.getLength()==1) *************** *** 132,139 **** throw new ConfigurationException(ConfigurationException.JOB_CONTROLLER_CONFIG, "Found " + xmlPoolJobProcessorNodeList.getLength() + " element(s) in the pool job controller configuration."); ! /** * Load job pool configuration. */ NodeList xmlJobPoolNodeList=controllerConfigElement.getElementsByTagName(XMLPoolJobControllerConfig.POOL_JOB_POOL_ELEMENT_NAME); if(xmlJobPoolNodeList.getLength()==1) --- 134,142 ---- throw new ConfigurationException(ConfigurationException.JOB_CONTROLLER_CONFIG, "Found " + xmlPoolJobProcessorNodeList.getLength() + " element(s) in the pool job controller configuration."); ! logger.trace("Finished reading the pool job processor configuration"); /** * Load job pool configuration. */ + logger.trace("Started reading the job pool configuration"); NodeList xmlJobPoolNodeList=controllerConfigElement.getElementsByTagName(XMLPoolJobControllerConfig.POOL_JOB_POOL_ELEMENT_NAME); if(xmlJobPoolNodeList.getLength()==1) *************** *** 152,156 **** throw new ConfigurationException(ConfigurationException.JOB_CONTROLLER_CONFIG, "Found " + xmlJobPoolNodeList.getLength() + " element(s) in the pool job controller configuration."); ! logger.trace("Exiting Constructor"); } --- 155,159 ---- throw new ConfigurationException(ConfigurationException.JOB_CONTROLLER_CONFIG, "Found " + xmlJobPoolNodeList.getLength() + " element(s) in the pool job controller configuration."); ! logger.trace("Finished reading the job pool configuration"); logger.trace("Exiting Constructor"); } Index: XMLJobControllerConfig.java =================================================================== RCS file: /cvsroot/batchserver/batchserver/src/org/jmonks/batchserver/framework/config/xml/XMLJobControllerConfig.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** XMLJobControllerConfig.java 14 Mar 2006 05:47:15 -0000 1.6 --- XMLJobControllerConfig.java 14 Mar 2006 23:05:25 -0000 1.7 *************** *** 69,72 **** --- 69,74 ---- String controllerClassName=controllerConfigElement.getAttribute(XMLJobControllerConfig.JOB_CONTROLLER_CLASS_ATTRIBUTE_NAME); + logger.debug("Controller class name = " + controllerClassName); + if(controllerClassName==null) throw new ConfigurationException(ConfigurationException.JOB_CONTROLLER_CONFIG, XMLJobControllerConfig.JOB_CONTROLLER_CLASS_ATTRIBUTE_NAME *************** *** 77,80 **** --- 79,84 ---- { String controllerConfigClassName=FrameworkConfig.getInstance().getJobControllerConfig().getConfigClassName(controllerClassName, XMLJobControllerConfig.JOB_CONTROLLER_CONFIG_FACTORY_CLASS_ATTRIBUTE_NAME); + logger.debug("Controller configuration class name = " + controllerConfigClassName); + if(controllerConfigClassName==null) throw new ConfigurationException(ConfigurationException.JOB_CONTROLLER_CONFIG, Index: XMLJobConfigFactory.java =================================================================== RCS file: /cvsroot/batchserver/batchserver/src/org/jmonks/batchserver/framework/config/xml/XMLJobConfigFactory.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** XMLJobConfigFactory.java 14 Mar 2006 05:47:15 -0000 1.7 --- XMLJobConfigFactory.java 14 Mar 2006 23:05:25 -0000 1.8 *************** *** 141,145 **** else { ! logger.debug("Would be able to read the configuration from class path : " + classpathLocation); if(!this.createBatchConfigElement(inputStream)) throw new ConfigurationException(ConfigurationException.JOB_CONFIG_FACTORY_CONFIG, --- 141,145 ---- else { ! logger.debug("Would be able to read the configuration from class path location : " + classpathLocation); if(!this.createBatchConfigElement(inputStream)) throw new ConfigurationException(ConfigurationException.JOB_CONFIG_FACTORY_CONFIG, *************** *** 149,153 **** } } ! logger.trace("ExitingConstructor"); } --- 149,153 ---- } } ! logger.trace("Exiting Constructor"); } *************** *** 166,170 **** public JobConfig getJobConfig(String jobName) { ! logger.trace("Entering getJobConfig"); JobConfig jobConfig=null; /** --- 166,170 ---- public JobConfig getJobConfig(String jobName) { ! logger.trace("Entering getJobConfig " + jobName); JobConfig jobConfig=null; /** *************** *** 179,182 **** --- 179,183 ---- NodeList jobConfigNodeList=this.batchConfigElement.getElementsByTagName(XMLJobConfig.JOB_CONFIG_ELEMENT_NAME); + logger.trace("Number of job-config elements found in job configuration file = " + jobConfigNodeList.getLength()); for(int i=0;i<jobConfigNodeList.getLength();i++) { *************** *** 185,188 **** --- 186,190 ---- if(jobName.equals(elementJobName)) { + logger.trace("Found the job-config matching the job name"); jobConfig=new XMLJobConfig(jobConfigElement); break; Index: XMLBasicJobControllerConfig.java =================================================================== RCS file: /cvsroot/batchserver/batchserver/src/org/jmonks/batchserver/framework/config/xml/XMLBasicJobControllerConfig.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** XMLBasicJobControllerConfig.java 14 Mar 2006 05:47:15 -0000 1.7 --- XMLBasicJobControllerConfig.java 14 Mar 2006 23:05:25 -0000 1.8 *************** *** 71,74 **** --- 71,75 ---- FrameworkUtil.loadPropertiesFromElementToMap(controllerConfigElement, this.jobControllerConfigProps); + logger.trace("Started reading the basic job processor configuration"); NodeList xmlBasicJobProcessorNodeList=controllerConfigElement.getElementsByTagName(XMLBasicJobControllerConfig.BASIC_JOB_PROCESSOR_ELEMENT_NAME); if(xmlBasicJobProcessorNodeList.getLength()==1) *************** *** 88,92 **** throw new ConfigurationException(ConfigurationException.JOB_CONTROLLER_CONFIG, "Found " + xmlBasicJobProcessorNodeList.getLength() + " element(s) in the basic job controller configuration."); ! logger.trace("Exiting Constructor"); } --- 89,94 ---- throw new ConfigurationException(ConfigurationException.JOB_CONTROLLER_CONFIG, "Found " + xmlBasicJobProcessorNodeList.getLength() + " element(s) in the basic job controller configuration."); ! logger.trace("Finished reading the basic job processor configuration"); ! logger.trace("Exiting Constructor"); } |
