Update of /cvsroot/batchserver/batchserver/src/org/jmonks/batch/framework/config/xml
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv24524/framework/config/xml
Modified Files:
XMLJobConfig.java XMLJobLoggingConfig.java
Log Message:
no message
Index: XMLJobConfig.java
===================================================================
RCS file: /cvsroot/batchserver/batchserver/src/org/jmonks/batch/framework/config/xml/XMLJobConfig.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** XMLJobConfig.java 15 Sep 2006 20:06:20 -0000 1.1
--- XMLJobConfig.java 23 Oct 2006 23:41:00 -0000 1.2
***************
*** 93,99 ****
logger.info("Job logging configuration = " + this.jobLoggingConfig);
}
else
! throw new ConfigurationException(ConfigurationException.JOB_CONFIG, "Found " + jobLoggingConfigNodeList.getLength()
! + XMLJobLoggingConfig.JOB_LOGGING_CONFIG_ELEMENT_NAME + " element(s) in configuration of job " + jobName + ".");
NodeList controllerConfigNodeList=jobConfigElement.getElementsByTagName(XMLJobControllerConfig.JOB_CONTROLLER_ELEMENT_NAME);
--- 93,102 ----
logger.info("Job logging configuration = " + this.jobLoggingConfig);
}
+ else if(jobLoggingConfigNodeList.getLength()==0)
+ this.jobLoggingConfig=new XMLJobLoggingConfig(null);
else
! throw new ConfigurationException(ConfigurationException.JOB_CONFIG, "Found multiple " + jobLoggingConfigNodeList.getLength()
! + " "+ XMLJobLoggingConfig.JOB_LOGGING_CONFIG_ELEMENT_NAME + " element(s) in configuration of job " + jobName + ".");
!
NodeList controllerConfigNodeList=jobConfigElement.getElementsByTagName(XMLJobControllerConfig.JOB_CONTROLLER_ELEMENT_NAME);
Index: XMLJobLoggingConfig.java
===================================================================
RCS file: /cvsroot/batchserver/batchserver/src/org/jmonks/batch/framework/config/xml/XMLJobLoggingConfig.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** XMLJobLoggingConfig.java 15 Sep 2006 20:06:20 -0000 1.1
--- XMLJobLoggingConfig.java 23 Oct 2006 23:41:00 -0000 1.2
***************
*** 61,76 ****
public XMLJobLoggingConfig(Element jobLoggingConfigElement)
{
! logger.trace("Entering constructor");
! NodeList jobLoggerConfigNodeList=jobLoggingConfigElement.getElementsByTagName(XMLJobLoggingConfig.JOB_LOGGER_CONFIG_ELEMENT_NAME);
! for(int i=0;i<jobLoggerConfigNodeList.getLength();i++)
{
! Element jobLoggerConfigElement=(Element)jobLoggerConfigNodeList.item(i);
! 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);
}
logger.trace("Exiting constructor");
! }
!
}
--- 61,80 ----
public XMLJobLoggingConfig(Element jobLoggingConfigElement)
{
! logger.trace("Entering constructor = " + (jobLoggingConfigElement!=null));
! if(jobLoggingConfigElement!=null)
{
! NodeList jobLoggerConfigNodeList=jobLoggingConfigElement.getElementsByTagName(XMLJobLoggingConfig.JOB_LOGGER_CONFIG_ELEMENT_NAME);
! for(int i=0;i<jobLoggerConfigNodeList.getLength();i++)
! {
! Element jobLoggerConfigElement=(Element)jobLoggerConfigNodeList.item(i);
! 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);
! }
}
+ else
+ logger.debug("No loggers have been defined for this job.");
logger.trace("Exiting constructor");
! }
}
|
