Thread: [Batchserver-cvs] batchserver/src/org/jmonks/batchserver/framework/config/xml XMLJobLoggingConfig.ja
Brought to you by:
suresh_pragada
Menu
▾
▴
batchserver-cvs
|
From: Suresh <sur...@us...> - 2006-03-14 05:47:18
|
Update of /cvsroot/batchserver/batchserver/src/org/jmonks/batchserver/framework/config/xml In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30780/xml Modified Files: batch-config.xml XMLBasicJobControllerConfig.java XMLJobConfig.java XMLJobConfigFactory.java XMLJobControllerConfig.java XMLPoolJobControllerConfig.java Added Files: XMLJobLoggingConfig.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.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** XMLJobConfig.java 13 Mar 2006 14:32:37 -0000 1.6 --- XMLJobConfig.java 14 Mar 2006 05:47:15 -0000 1.7 *************** *** 10,14 **** package org.jmonks.batchserver.framework.config.xml; ! import java.util.logging.Logger; import org.jmonks.batchserver.framework.config.ConfigurationException; import org.jmonks.batchserver.framework.config.JobConfig; --- 10,15 ---- package org.jmonks.batchserver.framework.config.xml; ! ! import org.apache.log4j.Logger; import org.jmonks.batchserver.framework.config.ConfigurationException; import org.jmonks.batchserver.framework.config.JobConfig; *************** *** 54,58 **** public static final String JOB_STATUS_ATTRIBUTE_NAME = "job-status"; ! private static Logger logger=Logger.getLogger(XMLJobConfig.class.getName()); /** --- 55,59 ---- public static final String JOB_STATUS_ATTRIBUTE_NAME = "job-status"; ! private static Logger logger=Logger.getLogger(XMLJobConfig.class); /** *************** *** 66,70 **** XMLJobConfig(Element jobConfigElement) { ! logger.entering(XMLJobConfig.class.getName(),"Constructor"); this.jobName=jobConfigElement.getAttribute(XMLJobConfig.JOB_NAME_ATTRIBUTE_NAME); --- 67,71 ---- XMLJobConfig(Element jobConfigElement) { ! logger.trace("Entering Constructor"); this.jobName=jobConfigElement.getAttribute(XMLJobConfig.JOB_NAME_ATTRIBUTE_NAME); *************** *** 78,81 **** --- 79,93 ---- 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 + 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); *************** *** 83,89 **** { Element controllerConfigElement=(Element)controllerConfigNodeList.item(0); ! logger.fine("Requesting controller config factory to get the controller configuration object"); this.jobControllerConfig=XMLJobControllerConfig.getJobControllerConfig(controllerConfigElement); ! logger.config("Returned controller configuration : " + this.jobControllerConfig); } 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 *************** *** 91,95 **** + XMLJobControllerConfig.JOB_CONTROLLER_ELEMENT_NAME + " element(s) in configuration of job " + jobName + "."); ! logger.exiting(XMLJobConfig.class.getName(),"Constructor"); } --- 103,107 ---- + XMLJobControllerConfig.JOB_CONTROLLER_ELEMENT_NAME + " element(s) in configuration of job " + jobName + "."); ! logger.trace("Exiting Constructor"); } Index: batch-config.xml =================================================================== RCS file: /cvsroot/batchserver/batchserver/src/org/jmonks/batchserver/framework/config/xml/batch-config.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** batch-config.xml 13 Mar 2006 14:32:37 -0000 1.3 --- batch-config.xml 14 Mar 2006 05:47:15 -0000 1.4 *************** *** 14,17 **** --- 14,20 ---- <property key="pool-job-controller-restart">true</property> </job-controller> + <job-logging-config> + <job-logger-config logger-name="com.mycompany.batch.abc" logger-level="DEBUG"/> + </job-logging-config> </job-config> <job-config job-name="process_file_xyz" job-status="active"> *************** *** 22,25 **** --- 25,32 ---- <property key="basic-job-controller-restart">true</property> </job-controller> + <job-logging-config> + <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-logging-config> </job-config> </batch-config> \ No newline at end of file --- NEW FILE: XMLJobLoggingConfig.java --- /* * XMLJobLoggingConfig.java * * Created on March 13, 2006, 7:27 PM * * To change this template, choose Tools | Options and locate the template under * the Source Creation and Management node. Right-click the template and choose * Open. You can then make changes to the template in the Source Editor. */ package org.jmonks.batchserver.framework.config.xml; import org.apache.log4j.Logger; import org.jmonks.batchserver.framework.config.JobLoggingConfig; import org.w3c.dom.Element; import org.w3c.dom.NodeList; /** * Reads the job logging configuration from the XML job configuration file. * * @author Suresh Pragada * @version 1.0 * @since 1.0 */ public class XMLJobLoggingConfig extends JobLoggingConfig { /** * Element name represents the job logging config. */ public static final String JOB_LOGGING_CONFIG_ELEMENT_NAME = "job-logging-config"; /** * Element name represents the job logger config. */ private static final String JOB_LOGGER_CONFIG_ELEMENT_NAME = "job-logger-config"; /** * Atrribute name represents the logger name in job logger config. */ private static final String LOGGER_NAME_ATTRIBUTE_NAME = "logger-name"; /** * Atrribute name represents the logger level in job logger config. */ private static final String LOGGER_LEVEL_ATTRIBUTE_NAME = "logger-level"; private static Logger logger=Logger.getLogger(XMLJobLoggingConfig.class); /** * <p> * Loads the job logging config object from the input element represents * job-logging-config element. This element represents the following XML block. * <br><br> * <pre> * <job-logging-config> * <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-logging-config> * </pre> * </p> * * @param jobLoggingConfigElement XML DOM Element represents the job-logging-config element. */ 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); this.addLogger(loggerName,loggerLevel); } logger.trace("Exiting constructor"); } } Index: XMLPoolJobControllerConfig.java =================================================================== RCS file: /cvsroot/batchserver/batchserver/src/org/jmonks/batchserver/framework/config/xml/XMLPoolJobControllerConfig.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** XMLPoolJobControllerConfig.java 13 Mar 2006 14:32:37 -0000 1.6 --- XMLPoolJobControllerConfig.java 14 Mar 2006 05:47:15 -0000 1.7 *************** *** 10,14 **** package org.jmonks.batchserver.framework.config.xml; ! import java.util.logging.Logger; import org.jmonks.batchserver.framework.common.FrameworkUtil; import org.jmonks.batchserver.framework.config.ConfigurationException; --- 10,15 ---- package org.jmonks.batchserver.framework.config.xml; ! ! import org.apache.log4j.Logger; import org.jmonks.batchserver.framework.common.FrameworkUtil; import org.jmonks.batchserver.framework.config.ConfigurationException; *************** *** 72,76 **** private static final String THREAD_COUNT_ATTRIBUTE_NAME = "thread-count"; ! private static Logger logger=Logger.getLogger(XMLPoolJobControllerConfig.class.getName()); /** --- 73,77 ---- private static final String THREAD_COUNT_ATTRIBUTE_NAME = "thread-count"; ! private static Logger logger=Logger.getLogger(XMLPoolJobControllerConfig.class); /** *************** *** 83,87 **** public XMLPoolJobControllerConfig(Element controllerConfigElement) { ! logger.entering(XMLPoolJobControllerConfig.class.getName(),"Constructor"); this.jobControllerClassName=controllerConfigElement.getAttribute(XMLJobControllerConfig.JOB_CONTROLLER_CLASS_ATTRIBUTE_NAME); if(this.jobControllerClassName==null) --- 84,88 ---- public XMLPoolJobControllerConfig(Element controllerConfigElement) { ! logger.trace("Entering Constructor"); this.jobControllerClassName=controllerConfigElement.getAttribute(XMLJobControllerConfig.JOB_CONTROLLER_CLASS_ATTRIBUTE_NAME); if(this.jobControllerClassName==null) *************** *** 152,156 **** "Found " + xmlJobPoolNodeList.getLength() + " element(s) in the pool job controller configuration."); ! logger.exiting(XMLPoolJobControllerConfig.class.getName(),"Constructor"); } --- 153,157 ---- "Found " + xmlJobPoolNodeList.getLength() + " element(s) in the pool job controller 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.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** XMLJobControllerConfig.java 13 Mar 2006 14:32:37 -0000 1.5 --- XMLJobControllerConfig.java 14 Mar 2006 05:47:15 -0000 1.6 *************** *** 13,17 **** import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; ! import java.util.logging.Logger; import org.jmonks.batchserver.framework.config.ConfigurationException; import org.jmonks.batchserver.framework.config.FrameworkConfig; --- 13,17 ---- import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; ! import org.apache.log4j.Logger; import org.jmonks.batchserver.framework.config.ConfigurationException; import org.jmonks.batchserver.framework.config.FrameworkConfig; *************** *** 42,46 **** public static final String JOB_CONTROLLER_CONFIG_FACTORY_CLASS_ATTRIBUTE_NAME = "xml-factory-config-class-name"; ! private static Logger logger=Logger.getLogger(XMLJobControllerConfig.class.getName()); /** --- 42,46 ---- public static final String JOB_CONTROLLER_CONFIG_FACTORY_CLASS_ATTRIBUTE_NAME = "xml-factory-config-class-name"; ! private static Logger logger=Logger.getLogger(XMLJobControllerConfig.class); /** *************** *** 65,69 **** public static JobControllerConfig getJobControllerConfig(Element controllerConfigElement) { ! logger.entering(XMLJobControllerConfig.class.getName(),"getJobControllerConfig"); JobControllerConfig controllerConfig=null; --- 65,69 ---- public static JobControllerConfig getJobControllerConfig(Element controllerConfigElement) { ! logger.trace("Entering getJobControllerConfig"); JobControllerConfig controllerConfig=null; *************** *** 87,91 **** Constructor constructor=configClass.getConstructor(new Class[]{Element.class}); controllerConfig=(JobControllerConfig)constructor.newInstance(new Object[]{controllerConfigElement}); ! logger.fine("Got the controller configuration : " + controllerConfig); } } --- 87,91 ---- Constructor constructor=configClass.getConstructor(new Class[]{Element.class}); controllerConfig=(JobControllerConfig)constructor.newInstance(new Object[]{controllerConfigElement}); ! logger.debug("Got the controller configuration : " + controllerConfig); } } *************** *** 93,96 **** --- 93,97 ---- { exception.printStackTrace(); + logger.error(exception.getMessage(), exception); throw new ConfigurationException(ConfigurationException.JOB_CONTROLLER_CONFIG, exception.getMessage()); } *************** *** 98,101 **** --- 99,103 ---- { exception.printStackTrace(); + logger.error(exception.getMessage(), exception); throw new ConfigurationException(ConfigurationException.JOB_CONTROLLER_CONFIG, exception.getMessage()); } *************** *** 103,106 **** --- 105,109 ---- { exception.printStackTrace(); + logger.error(exception.getMessage(), exception); throw new ConfigurationException(ConfigurationException.JOB_CONTROLLER_CONFIG, exception.getMessage()); } *************** *** 108,111 **** --- 111,115 ---- { exception.printStackTrace(); + logger.error(exception.getMessage(), exception); throw new ConfigurationException(ConfigurationException.JOB_CONTROLLER_CONFIG, exception.getMessage()); } *************** *** 113,120 **** { exception.printStackTrace(); throw new ConfigurationException(ConfigurationException.JOB_CONTROLLER_CONFIG, exception.getMessage()); } } ! logger.exiting(XMLJobControllerConfig.class.getName(),"getJobControllerConfig"); return controllerConfig; } --- 117,125 ---- { exception.printStackTrace(); + logger.error(exception.getMessage(), exception); throw new ConfigurationException(ConfigurationException.JOB_CONTROLLER_CONFIG, exception.getMessage()); } } ! logger.trace("Exiting getJobControllerConfig"); return controllerConfig; } Index: XMLJobConfigFactory.java =================================================================== RCS file: /cvsroot/batchserver/batchserver/src/org/jmonks/batchserver/framework/config/xml/XMLJobConfigFactory.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** XMLJobConfigFactory.java 13 Mar 2006 14:32:37 -0000 1.6 --- XMLJobConfigFactory.java 14 Mar 2006 05:47:15 -0000 1.7 *************** *** 18,25 **** import java.util.HashMap; import java.util.Map; - import java.util.logging.Logger; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; import org.jmonks.batchserver.framework.config.ConfigurationException; import org.jmonks.batchserver.framework.config.JobConfig; --- 18,25 ---- import java.util.HashMap; import java.util.Map; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; + import org.apache.log4j.Logger; import org.jmonks.batchserver.framework.config.ConfigurationException; import org.jmonks.batchserver.framework.config.JobConfig; *************** *** 74,78 **** private Element batchConfigElement=null; ! private static Logger logger=Logger.getLogger(XMLJobConfigFactory.class.getName()); /** --- 74,78 ---- private Element batchConfigElement=null; ! private static Logger logger=Logger.getLogger(XMLJobConfigFactory.class); /** *************** *** 87,91 **** public XMLJobConfigFactory(Map configFactoryProps) { ! logger.entering(XMLJobConfigFactory.class.getName(),"Constructor"); this.configFactoryProps=new HashMap(configFactoryProps); --- 87,91 ---- public XMLJobConfigFactory(Map configFactoryProps) { ! logger.trace("Entering Constructor"); this.configFactoryProps=new HashMap(configFactoryProps); *************** *** 93,97 **** String classpathLocation=(String)this.configFactoryProps.get(XMLJobConfigFactory.PROPERTY_JOB_CONFIG_FILE_CLASSPATH_LOCATION); ! logger.fine("Absolute location : " + absoluteLocation + " classpath location : " + classpathLocation); if(absoluteLocation==null && classpathLocation==null) throw new ConfigurationException(ConfigurationException.JOB_CONFIG_FACTORY_CONFIG, "XML Job configuration location is not specified " + --- 93,97 ---- String classpathLocation=(String)this.configFactoryProps.get(XMLJobConfigFactory.PROPERTY_JOB_CONFIG_FILE_CLASSPATH_LOCATION); ! logger.debug("Absolute location : " + absoluteLocation + " classpath location : " + classpathLocation); if(absoluteLocation==null && classpathLocation==null) throw new ConfigurationException(ConfigurationException.JOB_CONFIG_FACTORY_CONFIG, "XML Job configuration location is not specified " + *************** *** 109,113 **** { InputStream inputStream=new FileInputStream(jobConfigFile); ! logger.fine("Would be able to read the configuration stream from absolute path " + absoluteLocation); if(!this.createBatchConfigElement(inputStream)) throw new ConfigurationException(ConfigurationException.JOB_CONFIG_FACTORY_CONFIG, --- 109,113 ---- { InputStream inputStream=new FileInputStream(jobConfigFile); ! logger.debug("Would be able to read the configuration stream from absolute path " + absoluteLocation); if(!this.createBatchConfigElement(inputStream)) throw new ConfigurationException(ConfigurationException.JOB_CONFIG_FACTORY_CONFIG, *************** *** 123,126 **** --- 123,127 ---- { exception.printStackTrace(); + logger.error(exception.getMessage(), exception); throw new ConfigurationException(ConfigurationException.JOB_CONFIG_FACTORY_CONFIG, "XML job configuration file " + absoluteLocation + " cannot be found"); *************** *** 140,144 **** else { ! logger.fine("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 : " + classpathLocation); if(!this.createBatchConfigElement(inputStream)) throw new ConfigurationException(ConfigurationException.JOB_CONFIG_FACTORY_CONFIG, *************** *** 148,152 **** } } ! logger.exiting(XMLJobConfigFactory.class.getName(),"Constructor"); } --- 149,153 ---- } } ! logger.trace("ExitingConstructor"); } *************** *** 165,169 **** public JobConfig getJobConfig(String jobName) { ! logger.entering(XMLJobConfigFactory.class.getName(),"getJobConfig"); JobConfig jobConfig=null; /** --- 166,170 ---- public JobConfig getJobConfig(String jobName) { ! logger.trace("Entering getJobConfig"); JobConfig jobConfig=null; /** *************** *** 188,192 **** } } ! logger.exiting(XMLJobConfigFactory.class.getName(),"getJobConfig", jobConfig); return jobConfig; } --- 189,193 ---- } } ! logger.trace("Exiting getJobConfig"); return jobConfig; } *************** *** 217,230 **** { exception.printStackTrace(); } catch(SAXException exception) { exception.printStackTrace(); } catch(IOException exception) { exception.printStackTrace(); } - return created; } --- 218,233 ---- { exception.printStackTrace(); + logger.error(exception.getMessage(), exception); } catch(SAXException exception) { exception.printStackTrace(); + logger.error(exception.getMessage(), exception); } catch(IOException exception) { exception.printStackTrace(); + logger.error(exception.getMessage(), exception); } return created; } Index: XMLBasicJobControllerConfig.java =================================================================== RCS file: /cvsroot/batchserver/batchserver/src/org/jmonks/batchserver/framework/config/xml/XMLBasicJobControllerConfig.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** XMLBasicJobControllerConfig.java 13 Mar 2006 14:32:37 -0000 1.6 --- XMLBasicJobControllerConfig.java 14 Mar 2006 05:47:15 -0000 1.7 *************** *** 10,14 **** package org.jmonks.batchserver.framework.config.xml; ! import java.util.logging.Logger; import org.jmonks.batchserver.framework.common.FrameworkUtil; import org.jmonks.batchserver.framework.config.BasicJobControllerConfig; --- 10,15 ---- package org.jmonks.batchserver.framework.config.xml; ! ! import org.apache.log4j.Logger; import org.jmonks.batchserver.framework.common.FrameworkUtil; import org.jmonks.batchserver.framework.config.BasicJobControllerConfig; *************** *** 51,55 **** private static final String THREAD_COUNT_ATTRIBUTE_NAME = "thread-count"; ! private static Logger logger=Logger.getLogger(XMLBasicJobControllerConfig.class.getName()); /** --- 52,56 ---- private static final String THREAD_COUNT_ATTRIBUTE_NAME = "thread-count"; ! private static Logger logger=Logger.getLogger(XMLBasicJobControllerConfig.class); /** *************** *** 62,66 **** public XMLBasicJobControllerConfig(Element controllerConfigElement) { ! logger.entering(XMLBasicJobControllerConfig.class.getName(),"Constructor"); this.jobControllerClassName=controllerConfigElement.getAttribute(XMLJobControllerConfig.JOB_CONTROLLER_CLASS_ATTRIBUTE_NAME); if(this.jobControllerClassName==null) --- 63,67 ---- public XMLBasicJobControllerConfig(Element controllerConfigElement) { ! logger.trace("Entering Constructor"); this.jobControllerClassName=controllerConfigElement.getAttribute(XMLJobControllerConfig.JOB_CONTROLLER_CLASS_ATTRIBUTE_NAME); if(this.jobControllerClassName==null) *************** *** 88,92 **** "Found " + xmlBasicJobProcessorNodeList.getLength() + " element(s) in the basic job controller configuration."); ! logger.exiting(XMLBasicJobControllerConfig.class.getName(),"Constructor"); } } --- 89,93 ---- "Found " + xmlBasicJobProcessorNodeList.getLength() + " element(s) in the basic job controller configuration."); ! logger.trace("Exiting Constructor"); } } |
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X