[Batchserver-cvs] batchserver/src/org/jmonks/batchserver/framework/config BasicJobControllerConfig.j
Brought to you by:
suresh_pragada
Menu
▾
▴
[Batchserver-cvs] batchserver/src/org/jmonks/batchserver/framework/config BasicJobControllerConfig.java,1.6,1.7 framework-config.xml,1.10,1.11 FrameworkConfig.java,1.7,1.8 JobConfig.java,1.6,1.7 JobConfigFactory.java,1.5,1.6 JobControllerConfig.java,1.5,1.6 PoolJobControllerConfig.java,1.6,1.7
|
From: Suresh <sur...@us...> - 2006-03-14 05:45:34
|
Update of /cvsroot/batchserver/batchserver/src/org/jmonks/batchserver/framework/config In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29740 Modified Files: BasicJobControllerConfig.java framework-config.xml FrameworkConfig.java JobConfig.java JobConfigFactory.java JobControllerConfig.java PoolJobControllerConfig.java Log Message: no message Index: JobConfig.java =================================================================== RCS file: /cvsroot/batchserver/batchserver/src/org/jmonks/batchserver/framework/config/JobConfig.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** JobConfig.java 11 Mar 2006 02:16:38 -0000 1.6 --- JobConfig.java 14 Mar 2006 05:45:25 -0000 1.7 *************** *** 40,43 **** --- 40,48 ---- /** + * Map holds the logger information. This will hold the logger + */ + protected JobLoggingConfig jobLoggingConfig=null; + + /** * Returns the Controller configuraiton of the job this JobConfig represents. * *************** *** 72,75 **** --- 77,91 ---- /** + * Returns job logging configuration. + * Job Loggers can be found by using the getLoggers method of this config object. + * + * @return Returns job logging configuraiton. + */ + public JobLoggingConfig getJobLoggingConfig() + { + return this.jobLoggingConfig; + } + + /** * <p> * Returns the string representation of JobConfig class in the format Index: BasicJobControllerConfig.java =================================================================== RCS file: /cvsroot/batchserver/batchserver/src/org/jmonks/batchserver/framework/config/BasicJobControllerConfig.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** BasicJobControllerConfig.java 13 Mar 2006 14:32:37 -0000 1.6 --- BasicJobControllerConfig.java 14 Mar 2006 05:45:25 -0000 1.7 *************** *** 14,18 **** import java.util.Iterator; import java.util.Map; ! import java.util.logging.Logger; /** --- 14,18 ---- import java.util.Iterator; import java.util.Map; ! import org.apache.log4j.Logger; /** *************** *** 45,49 **** protected int basicJobProcessorThreadCount=1; ! private static Logger logger=Logger.getLogger(BasicJobControllerConfig.class.getName()); /** * Gets the basic job processor class name. --- 45,49 ---- protected int basicJobProcessorThreadCount=1; ! private static Logger logger=Logger.getLogger(BasicJobControllerConfig.class); /** * Gets the basic job processor class name. *************** *** 87,91 **** public void overrideConfigProperties(Map newProps) { ! logger.entering(BasicJobControllerConfig.class.getName(),"overrideConfigProperties"); super.overrideConfigProperties(newProps); --- 87,91 ---- public void overrideConfigProperties(Map newProps) { ! logger.trace("Entering overrideConfigProperties"); super.overrideConfigProperties(newProps); *************** *** 99,106 **** { this.basicJobProcessorConfigProps.put(key, newProps.get(key)); ! logger.fine("Overriden the property " + key + " with " + newProps.get(key)); } } ! logger.exiting(BasicJobControllerConfig.class.getName(),"overrideConfigProperties"); } --- 99,106 ---- { this.basicJobProcessorConfigProps.put(key, newProps.get(key)); ! logger.debug("Overriden the property " + key + " with " + newProps.get(key)); } } ! logger.trace("Exiting overrideConfigProperties"); } Index: FrameworkConfig.java =================================================================== RCS file: /cvsroot/batchserver/batchserver/src/org/jmonks/batchserver/framework/config/FrameworkConfig.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** FrameworkConfig.java 13 Mar 2006 14:32:37 -0000 1.7 --- FrameworkConfig.java 14 Mar 2006 05:45:25 -0000 1.8 *************** *** 14,22 **** import java.util.HashMap; import java.util.Map; - import java.util.logging.Level; - 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.common.FrameworkUtil; import org.w3c.dom.Document; --- 14,21 ---- 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.common.FrameworkUtil; import org.w3c.dom.Document; *************** *** 42,46 **** public final class FrameworkConfig { ! private static Logger logger=Logger.getLogger(FrameworkConfig.class.getName()); /** * FrameworkConfig singleton instance varaible. --- 41,45 ---- public final class FrameworkConfig { ! private static Logger logger=Logger.getLogger(FrameworkConfig.class); /** * FrameworkConfig singleton instance varaible. *************** *** 90,94 **** private FrameworkConfig() { ! logger.entering(FrameworkConfig.class.getName(),"DefaultConstructor"); try { --- 89,93 ---- private FrameworkConfig() { ! logger.trace("Entering DefaultConstructor"); try { *************** *** 98,102 **** FrameworkConfig.FRAMEWORK_CONFIG_FILE + " cannot be accessed from the classpath."); ! logger.fine("Framework configuration file has been accessed"); if(System.getProperty("javax.xml.parsers.DocumentBuilderFactory")==null) System.setProperty("javax.xml.parsers.DocumentBuilderFactory", "org.apache.xerces.jaxp.DocumentBuilderFactoryImpl"); --- 97,101 ---- FrameworkConfig.FRAMEWORK_CONFIG_FILE + " cannot be accessed from the classpath."); ! logger.debug("Framework configuration file has been accessed"); if(System.getProperty("javax.xml.parsers.DocumentBuilderFactory")==null) System.setProperty("javax.xml.parsers.DocumentBuilderFactory", "org.apache.xerces.jaxp.DocumentBuilderFactoryImpl"); *************** *** 111,115 **** documentBuilder.setErrorHandler(new DefaultHandler()); Document document=documentBuilder.parse(configFileStream); ! logger.fine("Framework configuration file has been parsed."); Element frameworkConfigElement=document.getDocumentElement(); if(FrameworkConfig.FRAMEWORK_CONFIG_TAG_NAME.equals(frameworkConfigElement.getTagName())) --- 110,114 ---- documentBuilder.setErrorHandler(new DefaultHandler()); Document document=documentBuilder.parse(configFileStream); ! logger.debug("Framework configuration file has been parsed."); Element frameworkConfigElement=document.getDocumentElement(); if(FrameworkConfig.FRAMEWORK_CONFIG_TAG_NAME.equals(frameworkConfigElement.getTagName())) *************** *** 130,134 **** JobConfigFactoryConfig.TAG_NAME + " element(s) in the framework configuration, where only one such element is allowed."); } ! logger.config("Job Config Factory configuration has been loaded and the configuration is : " + this.configFactoryConfig); NodeList loggingConfigNodeList=frameworkConfigElement.getElementsByTagName(LoggingConfig.TAG_NAME); if(loggingConfigNodeList.getLength()==1) --- 129,133 ---- JobConfigFactoryConfig.TAG_NAME + " element(s) in the framework configuration, where only one such element is allowed."); } ! logger.debug("Job Config Factory configuration has been loaded and the configuration is : " + this.configFactoryConfig); NodeList loggingConfigNodeList=frameworkConfigElement.getElementsByTagName(LoggingConfig.TAG_NAME); if(loggingConfigNodeList.getLength()==1) *************** *** 141,145 **** LoggingConfig.TAG_NAME + " element(s) in the framework configuration, where only one such element is allowed."); } ! logger.config("Logging configuration has been loaded and the configuration is : " + this.logginConfig); NodeList mgmtMntrConfigNodeList=frameworkConfigElement.getElementsByTagName(MgmtMntrConfig.TAG_NAME); if(mgmtMntrConfigNodeList.getLength()==1) --- 140,144 ---- LoggingConfig.TAG_NAME + " element(s) in the framework configuration, where only one such element is allowed."); } ! logger.debug("Logging configuration has been loaded and the configuration is : " + this.logginConfig); NodeList mgmtMntrConfigNodeList=frameworkConfigElement.getElementsByTagName(MgmtMntrConfig.TAG_NAME); if(mgmtMntrConfigNodeList.getLength()==1) *************** *** 152,156 **** MgmtMntrConfig.TAG_NAME + " element(s) in the framework configuration, where only one such element is allowed."); } ! logger.config("MgmtMntr configuration has been loaded and the configuration is : " + this.mgmtMntrConfig); NodeList repositoryConfigNodeList=frameworkConfigElement.getElementsByTagName(RepositoryConfig.TAG_NAME); if(repositoryConfigNodeList.getLength()==1) --- 151,155 ---- MgmtMntrConfig.TAG_NAME + " element(s) in the framework configuration, where only one such element is allowed."); } ! logger.debug("MgmtMntr configuration has been loaded and the configuration is : " + this.mgmtMntrConfig); NodeList repositoryConfigNodeList=frameworkConfigElement.getElementsByTagName(RepositoryConfig.TAG_NAME); if(repositoryConfigNodeList.getLength()==1) *************** *** 163,167 **** RepositoryConfig.TAG_NAME + " element(s) in the framework configuration, where only one such element is allowed."); } ! logger.config("Repository configuration has been loaded and the configuration is : " + this.repositoryConfig); NodeList controllerConfigNodeList=frameworkConfigElement.getElementsByTagName(JobControllerConfig.TAG_NAME); if(controllerConfigNodeList.getLength()==1) --- 162,166 ---- RepositoryConfig.TAG_NAME + " element(s) in the framework configuration, where only one such element is allowed."); } ! logger.debug("Repository configuration has been loaded and the configuration is : " + this.repositoryConfig); NodeList controllerConfigNodeList=frameworkConfigElement.getElementsByTagName(JobControllerConfig.TAG_NAME); if(controllerConfigNodeList.getLength()==1) *************** *** 174,178 **** JobControllerConfig.TAG_NAME + " element(s) in the framework configuration, where only one such element is allowed."); } ! logger.config("Job Controller configuration has been loaded and the configuration is : " + this.controllerConfig); } catch(IOException ioException) --- 173,177 ---- JobControllerConfig.TAG_NAME + " element(s) in the framework configuration, where only one such element is allowed."); } ! logger.debug("Job Controller configuration has been loaded and the configuration is : " + this.controllerConfig); } catch(IOException ioException) *************** *** 191,195 **** throw new ConfigurationException(ConfigurationException.FRAMEWORK_CONFIG, saxException.getMessage()); } ! logger.exiting(FrameworkConfig.class.getName(), "DefaultConstrutor"); } --- 190,194 ---- throw new ConfigurationException(ConfigurationException.FRAMEWORK_CONFIG, saxException.getMessage()); } ! logger.trace("Exiting DefaultConstructor"); } *************** *** 310,314 **** private JobConfigFactoryConfig(Element jobConfigFactoryElement) { ! logger.entering(JobConfigFactoryConfig.class.getName(),"Constructor"); this.jobConfigFactoryClassName=jobConfigFactoryElement.getAttribute(JobConfigFactoryConfig.FACTORY_CLASS_ATTRIBUTE_NAME); if(this.jobConfigFactoryClassName==null || "".equals(this.jobConfigFactoryClassName)) --- 309,313 ---- private JobConfigFactoryConfig(Element jobConfigFactoryElement) { ! logger.trace("Entering Constructor"); this.jobConfigFactoryClassName=jobConfigFactoryElement.getAttribute(JobConfigFactoryConfig.FACTORY_CLASS_ATTRIBUTE_NAME); if(this.jobConfigFactoryClassName==null || "".equals(this.jobConfigFactoryClassName)) *************** *** 317,321 **** FrameworkUtil.loadPropertiesFromElementToMap(jobConfigFactoryElement,jobConfigFactoryProperties); ! logger.exiting(JobConfigFactoryConfig.class.getName(),"Constructor"); } --- 316,320 ---- FrameworkUtil.loadPropertiesFromElementToMap(jobConfigFactoryElement,jobConfigFactoryProperties); ! logger.trace("Exiting Constructor"); } *************** *** 383,391 **** * Attribute name defines the logging directory. */ ! private static final String LOGGING_DIRECTORY_ATTRIB_NAME = "logging-directory"; /** * Attribute name defines the logging level. */ ! private static final String LOGGING_LEVEL_ATTRIB_NAME = "logging-level"; /** * Attribute name defines the base package name. --- 382,390 ---- * Attribute name defines the logging directory. */ ! private static final String LOGGING_DIRECTORY_ATTRIB_NAME = "job-logging-directory"; /** * Attribute name defines the logging level. */ ! private static final String LOGGING_LEVEL_ATTRIB_NAME = "job-logging-level"; /** * Attribute name defines the base package name. *************** *** 399,403 **** * Logging level. */ ! private String loggingLevel="SEVERE"; /** * Base package name of the application(job). --- 398,402 ---- * Logging level. */ ! private String loggingLevel="ERROR"; /** * Base package name of the application(job). *************** *** 414,418 **** private LoggingConfig(Element loggingConfigElement) { ! logger.entering(LoggingConfig.class.getName(),"Constructor"); this.loggingDirectory=loggingConfigElement.getAttribute(LoggingConfig.LOGGING_DIRECTORY_ATTRIB_NAME); if(loggingDirectory==null || "".equals(loggingDirectory)) --- 413,417 ---- private LoggingConfig(Element loggingConfigElement) { ! logger.trace("Entering LoggingConfig Constructor"); this.loggingDirectory=loggingConfigElement.getAttribute(LoggingConfig.LOGGING_DIRECTORY_ATTRIB_NAME); if(loggingDirectory==null || "".equals(loggingDirectory)) *************** *** 421,427 **** this.loggingLevel=loggingConfigElement.getAttribute(LoggingConfig.LOGGING_LEVEL_ATTRIB_NAME); - this.setLoggingLevel(loggingLevel); this.basePackageName=loggingConfigElement.getAttribute(LoggingConfig.BASE_PACKAGE_ATTRIB_NAME); ! logger.exiting(LoggingConfig.class.getName(),"Constructor"); } --- 420,425 ---- this.loggingLevel=loggingConfigElement.getAttribute(LoggingConfig.LOGGING_LEVEL_ATTRIB_NAME); this.basePackageName=loggingConfigElement.getAttribute(LoggingConfig.BASE_PACKAGE_ATTRIB_NAME); ! logger.trace("Exiting LoggingConfig Constructor"); } *************** *** 458,483 **** /** - * This method validates the defined logging level and sets "SEVERE" - * if the defines logging level is not a valid one. - * - * @param loggingLevel Level defined framework logging configuration. - */ - private void setLoggingLevel(String loggingLevel) - { - try - { - /** - * Just to make sure Level could recognize the given level. - */ - Level.parse(loggingLevel); - this.loggingLevel=loggingLevel; - } - catch(Exception exception) - { - this.loggingLevel="SEVERE"; - logger.severe("Defined level of logging " + loggingLevel + " is not a valid and changed to default SEVERE level"); - } - } - /** * <p> * Returns the string representation of LoggingConfig class in the format --- 456,459 ---- *************** *** 545,549 **** private MgmtMntrConfig(Element mgmtMntrConfigElement) { ! logger.entering(MgmtMntrConfig.class.getName(),"Constructor"); this.mgmtMntrClassName=mgmtMntrConfigElement.getAttribute(MgmtMntrConfig.MGMT_MNTR_CLASS_ATTRIB_NAME); if(this.mgmtMntrClassName==null || "".equals(this.mgmtMntrClassName)) --- 521,525 ---- private MgmtMntrConfig(Element mgmtMntrConfigElement) { ! logger.trace("Entering MgmtMntrConfig Constructor"); this.mgmtMntrClassName=mgmtMntrConfigElement.getAttribute(MgmtMntrConfig.MGMT_MNTR_CLASS_ATTRIB_NAME); if(this.mgmtMntrClassName==null || "".equals(this.mgmtMntrClassName)) *************** *** 553,557 **** FrameworkUtil.loadPropertiesFromElementToMap(mgmtMntrConfigElement, this.mgmtMntrConfigProperties); ! logger.exiting(MgmtMntrConfig.class.getName(),"Constructor"); } --- 529,533 ---- FrameworkUtil.loadPropertiesFromElementToMap(mgmtMntrConfigElement, this.mgmtMntrConfigProperties); ! logger.trace("Exiting MgmtMntrConfig Constructor"); } *************** *** 644,648 **** private RepositoryConfig(Element repositoryConfigElement) { ! logger.entering(RepositoryConfig.class.getName(),"Constructor"); this.repositoryClassName=repositoryConfigElement.getAttribute(RepositoryConfig.REPOSITORY_CLASS_ATTRIB_NAME); if(this.repositoryClassName==null || "".equals(this.repositoryClassName)) --- 620,624 ---- private RepositoryConfig(Element repositoryConfigElement) { ! logger.trace("Entering RepositoryConfig Constructor"); this.repositoryClassName=repositoryConfigElement.getAttribute(RepositoryConfig.REPOSITORY_CLASS_ATTRIB_NAME); if(this.repositoryClassName==null || "".equals(this.repositoryClassName)) *************** *** 652,656 **** FrameworkUtil.loadPropertiesFromElementToMap(repositoryConfigElement, this.repositoryConfigProperties); ! logger.exiting(RepositoryConfig.class.getName(),"Constructor"); } --- 628,632 ---- FrameworkUtil.loadPropertiesFromElementToMap(repositoryConfigElement, this.repositoryConfigProperties); ! logger.trace("Exiting RepositoryConfig Constructor"); } *************** *** 735,739 **** private JobControllerConfig(Element controllerConfigElement) { ! logger.entering(JobControllerConfig.class.getName(),"Constructor"); NodeList controllerNodeList=controllerConfigElement.getElementsByTagName(JobControllerConfig.JOB_CONTROLLER_TAG_NAME); for(int i=0;i<controllerNodeList.getLength();i++) --- 711,715 ---- private JobControllerConfig(Element controllerConfigElement) { ! logger.trace("Entering JobControllerConfig Constructor"); NodeList controllerNodeList=controllerConfigElement.getElementsByTagName(JobControllerConfig.JOB_CONTROLLER_TAG_NAME); for(int i=0;i<controllerNodeList.getLength();i++) *************** *** 763,767 **** } } ! logger.exiting(JobControllerConfig.class.getName(),"Constructor"); } --- 739,743 ---- } } ! logger.trace("Exiting JobControllerConfig Constructor"); } Index: JobConfigFactory.java =================================================================== RCS file: /cvsroot/batchserver/batchserver/src/org/jmonks/batchserver/framework/config/JobConfigFactory.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** JobConfigFactory.java 13 Mar 2006 14:32:37 -0000 1.5 --- JobConfigFactory.java 14 Mar 2006 05:45:25 -0000 1.6 *************** *** 14,18 **** import java.lang.reflect.InvocationTargetException; import java.util.Map; ! import java.util.logging.Logger; /** --- 14,18 ---- import java.lang.reflect.InvocationTargetException; import java.util.Map; ! import org.apache.log4j.Logger; /** *************** *** 40,44 **** public abstract class JobConfigFactory { ! private static Logger logger=Logger.getLogger(JobConfigFactory.class.getName()); /** --- 40,44 ---- public abstract class JobConfigFactory { ! private static Logger logger=Logger.getLogger(JobConfigFactory.class); /** *************** *** 58,62 **** public static JobConfigFactory getJobConfigFactory(FrameworkConfig.JobConfigFactoryConfig factoryConfig) { ! logger.entering(JobConfigFactory.class.getName(),"getJobConfigFactory"); JobConfigFactory factoryObject=null; if(factoryConfig==null) --- 58,62 ---- public static JobConfigFactory getJobConfigFactory(FrameworkConfig.JobConfigFactoryConfig factoryConfig) { ! logger.trace("Entering getJobConfigFactory"); JobConfigFactory factoryObject=null; if(factoryConfig==null) *************** *** 75,79 **** throw new ConfigurationException(ConfigurationException.JOB_CONFIG_FACTORY_CONFIG, factoryClass + " is not assignable to the class " + JobConfigFactory.class.getName()); ! logger.info("Job Configuration factory has been created."); } catch(ClassNotFoundException exception) --- 75,79 ---- throw new ConfigurationException(ConfigurationException.JOB_CONFIG_FACTORY_CONFIG, factoryClass + " is not assignable to the class " + JobConfigFactory.class.getName()); ! logger.debug("Job Configuration factory has been created."); } catch(ClassNotFoundException exception) *************** *** 102,106 **** throw new ConfigurationException(ConfigurationException.JOB_CONFIG_FACTORY_CONFIG, exception.getMessage()); } ! logger.exiting(JobConfigFactory.class.getName(),"getJobConfigFactory"); return factoryObject; } --- 102,106 ---- throw new ConfigurationException(ConfigurationException.JOB_CONFIG_FACTORY_CONFIG, exception.getMessage()); } ! logger.trace("Exiting getJobConfigFactory"); return factoryObject; } Index: framework-config.xml =================================================================== RCS file: /cvsroot/batchserver/batchserver/src/org/jmonks/batchserver/framework/config/framework-config.xml,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** framework-config.xml 13 Mar 2006 14:32:37 -0000 1.10 --- framework-config.xml 14 Mar 2006 05:45:25 -0000 1.11 *************** *** 18,22 **** <property key="repository-filename">batchserver_repository.db</property> </repository-config> ! <logging-config logging-directory="/batchserver/logs" logging-level="CONFIG" job-base-package-name="com.mycompany.batch"/> <mgmt-mntr-config mgmt-mntr-class-name="org.jmonks.batchserver.framework.mgmtmntr.DefaultMgmtMntrManager"> <property key="port-range">15000-20000</property> --- 18,22 ---- <property key="repository-filename">batchserver_repository.db</property> </repository-config> ! <logging-config job-logging-directory="/batchserver/logs" job-base-package-name="com.mycompany.batch" job-logging-level="ERROR"/> <mgmt-mntr-config mgmt-mntr-class-name="org.jmonks.batchserver.framework.mgmtmntr.DefaultMgmtMntrManager"> <property key="port-range">15000-20000</property> Index: JobControllerConfig.java =================================================================== RCS file: /cvsroot/batchserver/batchserver/src/org/jmonks/batchserver/framework/config/JobControllerConfig.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** JobControllerConfig.java 13 Mar 2006 14:32:37 -0000 1.5 --- JobControllerConfig.java 14 Mar 2006 05:45:25 -0000 1.6 *************** *** 13,17 **** import java.util.Iterator; import java.util.Map; ! import java.util.logging.Logger; /** --- 13,17 ---- import java.util.Iterator; import java.util.Map; ! import org.apache.log4j.Logger; /** *************** *** 46,50 **** protected Map jobControllerConfigProps=new HashMap(); ! private static Logger logger=Logger.getLogger(JobControllerConfig.class.getName()); /** --- 46,50 ---- protected Map jobControllerConfigProps=new HashMap(); ! private static Logger logger=Logger.getLogger(JobControllerConfig.class); /** *************** *** 83,87 **** public void overrideConfigProperties(Map newProps) { ! logger.entering(JobControllerConfig.class.getName(),"overrideConfigProperties"); if(newProps==null ) return; --- 83,87 ---- public void overrideConfigProperties(Map newProps) { ! logger.trace("Entering overrideConfigProperties"); if(newProps==null ) return; *************** *** 95,99 **** { this.jobControllerConfigProps.put(key, newProps.get(key)); ! logger.fine("Overriden the property " + key + " with " + newProps.get(key)); } } --- 95,99 ---- { this.jobControllerConfigProps.put(key, newProps.get(key)); ! logger.debug("Overriden the property " + key + " with " + newProps.get(key)); } } *************** *** 113,121 **** { this.jobControllerConfigProps.put(key, newProps.get(key)); ! logger.fine("Overriden the property " + key + " with " + newProps.get(key)); } } ! logger.exiting(JobControllerConfig.class.getName(),"overrideConfigProperties"); } --- 113,121 ---- { this.jobControllerConfigProps.put(key, newProps.get(key)); ! logger.debug("Overriden the property " + key + " with " + newProps.get(key)); } } ! logger.trace("Entering overrideConfigProperties"); } Index: PoolJobControllerConfig.java =================================================================== RCS file: /cvsroot/batchserver/batchserver/src/org/jmonks/batchserver/framework/config/PoolJobControllerConfig.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** PoolJobControllerConfig.java 13 Mar 2006 14:32:37 -0000 1.6 --- PoolJobControllerConfig.java 14 Mar 2006 05:45:25 -0000 1.7 *************** *** 14,18 **** import java.util.Iterator; import java.util.Map; ! import java.util.logging.Logger; /** --- 14,18 ---- import java.util.Iterator; import java.util.Map; ! import org.apache.log4j.Logger; /** *************** *** 58,62 **** protected String poolClassName=null; ! private static Logger logger=Logger.getLogger(PoolJobControllerConfig.class.getName()); /** --- 58,62 ---- protected String poolClassName=null; ! private static Logger logger=Logger.getLogger(PoolJobControllerConfig.class); /** *************** *** 147,152 **** { super.overrideConfigProperties(newProps); ! ! logger.entering(PoolJobControllerConfig.class.getName(),"overrideConfigProperties"); if(newProps==null ) return; --- 147,151 ---- { super.overrideConfigProperties(newProps); ! logger.trace("Entering overrideConfigProperties"); if(newProps==null ) return; *************** *** 161,165 **** { this.poolJobLoaderConfigProps.put(key, newProps.get(key)); ! logger.fine("Overriden the property " + key + " with " + newProps.get(key)); } } --- 160,164 ---- { this.poolJobLoaderConfigProps.put(key, newProps.get(key)); ! logger.debug("Overriden the property " + key + " with " + newProps.get(key)); } } *************** *** 173,177 **** { this.poolJobProcessorConfigProps.put(key, newProps.get(key)); ! logger.fine("Overriden the property " + key + " with " + newProps.get(key)); } } --- 172,176 ---- { this.poolJobProcessorConfigProps.put(key, newProps.get(key)); ! logger.debug("Overriden the property " + key + " with " + newProps.get(key)); } } *************** *** 185,192 **** { this.poolConfigProps.put(key, newProps.get(key)); ! logger.fine("Overriden the property " + key + " with " + newProps.get(key)); } } ! logger.exiting(PoolJobControllerConfig.class.getName(),"overrideConfigProperties"); } --- 184,191 ---- { this.poolConfigProps.put(key, newProps.get(key)); ! logger.debug("Overriden the property " + key + " with " + newProps.get(key)); } } ! logger.trace("Exiting overrideConfigProperties"); } |
