[Batchserver-cvs] batchserver/src/org/jmonks/batchserver/framework/config/db DBBasicJobControllerCon
Brought to you by:
suresh_pragada
Menu
▾
▴
[Batchserver-cvs] batchserver/src/org/jmonks/batchserver/framework/config/db DBBasicJobControllerConfig.java,1.5,1.6 DBJobConfig.java,1.2,1.3 DBJobConfigFactory.java,1.3,1.4 DBJobControllerConfig.java,1.3,1.4 DBPoolJobControllerConfig.java,1.5,1.6
Update of /cvsroot/batchserver/batchserver/src/org/jmonks/batchserver/framework/config/db In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19442/config/db Modified Files: DBBasicJobControllerConfig.java DBJobConfig.java DBJobConfigFactory.java DBJobControllerConfig.java DBPoolJobControllerConfig.java Log Message: no message Index: DBJobConfig.java =================================================================== RCS file: /cvsroot/batchserver/batchserver/src/org/jmonks/batchserver/framework/config/db/DBJobConfig.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** DBJobConfig.java 10 Mar 2006 08:15:16 -0000 1.2 --- DBJobConfig.java 13 Mar 2006 14:32:37 -0000 1.3 *************** *** 15,19 **** import java.sql.ResultSet; import java.sql.SQLException; ! import org.jmonks.batchserver.framework.common.ErrorCode; import org.jmonks.batchserver.framework.config.ConfigurationException; import org.jmonks.batchserver.framework.config.JobConfig; --- 15,19 ---- import java.sql.ResultSet; import java.sql.SQLException; ! import java.util.logging.Logger; import org.jmonks.batchserver.framework.config.ConfigurationException; import org.jmonks.batchserver.framework.config.JobConfig; *************** *** 46,49 **** --- 46,52 ---- */ private static final String JOB_CONFIG_QUERY = "select job_status from job_config where job_name=?"; + + private static Logger logger=Logger.getLogger(DBJobConfig.class.getName()); + /** * Loads the job name and controller configuration into the job configuration object. *************** *** 56,59 **** --- 59,63 ---- DBJobConfig(String jobName,Connection connection) { + logger.entering(DBJobConfig.class.getName(),"Constructor"); this.jobName=jobName; *************** *** 81,86 **** { exception.printStackTrace(); ! throw new ConfigurationException(ErrorCode.CANNOT_CREATE_DB_JOB_CONFIG); } } } --- 85,91 ---- { exception.printStackTrace(); ! throw new ConfigurationException(ConfigurationException.JOB_CONFIG, exception.getMessage()); } + logger.exiting(DBJobConfig.class.getName(),"Constructor"); } } Index: DBJobConfigFactory.java =================================================================== RCS file: /cvsroot/batchserver/batchserver/src/org/jmonks/batchserver/framework/config/db/DBJobConfigFactory.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** DBJobConfigFactory.java 10 Mar 2006 08:57:18 -0000 1.3 --- DBJobConfigFactory.java 13 Mar 2006 14:32:37 -0000 1.4 *************** *** 18,22 **** import java.util.HashMap; import java.util.Map; ! import org.jmonks.batchserver.framework.common.ErrorCode; import org.jmonks.batchserver.framework.config.ConfigurationException; import org.jmonks.batchserver.framework.config.JobConfig; --- 18,22 ---- import java.util.HashMap; import java.util.Map; ! import java.util.logging.Logger; import org.jmonks.batchserver.framework.config.ConfigurationException; import org.jmonks.batchserver.framework.config.JobConfig; *************** *** 77,80 **** --- 77,83 ---- */ private static final String JOB_CONFIG_QUERY = "select 1 from job_config where job_name=?"; + + private static Logger logger=Logger.getLogger(DBJobConfigFactory.class.getName()); + /** * This constructor initializes the factory by accepting the required properties *************** *** 89,92 **** --- 92,96 ---- public DBJobConfigFactory(Map configFactoryProps) { + logger.entering(DBJobConfigFactory.class.getName(),"Constructor"); this.configFactoryProps=new HashMap(configFactoryProps); /** *************** *** 96,100 **** Connection connection=this.getConnection(); if(connection==null) ! throw new ConfigurationException(ErrorCode.DB_JOB_CONFIG_FACTORY_PROPERTIES_INVALID); else { --- 100,105 ---- Connection connection=this.getConnection(); if(connection==null) ! throw new ConfigurationException(ConfigurationException.JOB_CONFIG_FACTORY_CONFIG, "Unable to establish the database " + ! "connection with the properties " + this.configFactoryProps +"."); else { *************** *** 108,111 **** --- 113,117 ---- } } + logger.exiting(DBJobConfigFactory.class.getName(),"Constructor"); } *************** *** 124,127 **** --- 130,134 ---- public JobConfig getJobConfig(String jobName) { + logger.entering(DBJobConfigFactory.class.getName(),"getJobConfig"); JobConfig jobConfig=null; if(jobName==null) *************** *** 154,158 **** try{ connection.close(); } catch(Exception exception){ exception.printStackTrace(); } } ! return jobConfig; } --- 161,165 ---- try{ connection.close(); } catch(Exception exception){ exception.printStackTrace(); } } ! logger.exiting(DBJobConfigFactory.class.getName(),"getJobConfig", jobConfig); return jobConfig; } *************** *** 167,170 **** --- 174,180 ---- private Connection getConnection() { + logger.entering(DBJobConfigFactory.class.getName(),"getConnection"); + logger.config("Connection configuration : " + this.configFactoryProps); + Connection connection=null; *************** *** 194,197 **** --- 204,208 ---- } } + logger.exiting(DBJobConfigFactory.class.getName(),"getConnection"); return connection; } Index: DBBasicJobControllerConfig.java =================================================================== RCS file: /cvsroot/batchserver/batchserver/src/org/jmonks/batchserver/framework/config/db/DBBasicJobControllerConfig.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** DBBasicJobControllerConfig.java 11 Mar 2006 02:16:19 -0000 1.5 --- DBBasicJobControllerConfig.java 13 Mar 2006 14:32:37 -0000 1.6 *************** *** 15,19 **** import java.sql.ResultSet; import java.sql.SQLException; ! import org.jmonks.batchserver.framework.common.ErrorCode; import org.jmonks.batchserver.framework.common.FrameworkUtil; import org.jmonks.batchserver.framework.config.BasicJobControllerConfig; --- 15,19 ---- import java.sql.ResultSet; import java.sql.SQLException; ! import java.util.logging.Logger; import org.jmonks.batchserver.framework.common.FrameworkUtil; import org.jmonks.batchserver.framework.config.BasicJobControllerConfig; *************** *** 51,54 **** --- 51,57 ---- */ private static final String BASIC_JOB_CONTROLLER_CONFIG_QUERY = "select basic_job_processor_class_name, basic_job_processor_thread_cnt, basic_job_processor_props from basic_job_controller_config where job_name=?"; + + private static Logger logger=Logger.getLogger(DBBasicJobControllerConfig.class.getName()); + /** * Loads the basic job controller configuration from table basic_job_controller_config *************** *** 62,65 **** --- 65,69 ---- public DBBasicJobControllerConfig(String jobName,Connection connection) { + logger.entering(DBBasicJobControllerConfig.class.getName(),"Constructor"); try { *************** *** 79,82 **** --- 83,87 ---- * Surprising!!!!!!!!! */ + logger.severe("Job configuration not found with the name " + jobName); } *************** *** 94,98 **** else { ! throw new ConfigurationException(ErrorCode.BASIC_JOB_CONTROLLER_CONFIG_NOT_FOUND); } } --- 99,103 ---- else { ! throw new ConfigurationException(ConfigurationException.JOB_CONTROLLER_CONFIG, "Controller configuration is not defined for the job " + jobName); } } *************** *** 100,105 **** { exception.printStackTrace(); ! throw new ConfigurationException(ErrorCode.DB_CONNECTIVITY_ERROR); } } --- 105,111 ---- { exception.printStackTrace(); ! throw new ConfigurationException(ConfigurationException.JOB_CONTROLLER_CONFIG, exception.getMessage()); } + logger.exiting(DBBasicJobControllerConfig.class.getName(),"Constructor"); } Index: DBPoolJobControllerConfig.java =================================================================== RCS file: /cvsroot/batchserver/batchserver/src/org/jmonks/batchserver/framework/config/db/DBPoolJobControllerConfig.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** DBPoolJobControllerConfig.java 11 Mar 2006 02:16:19 -0000 1.5 --- DBPoolJobControllerConfig.java 13 Mar 2006 14:32:37 -0000 1.6 *************** *** 15,19 **** import java.sql.ResultSet; import java.sql.SQLException; ! import org.jmonks.batchserver.framework.common.ErrorCode; import org.jmonks.batchserver.framework.common.FrameworkUtil; import org.jmonks.batchserver.framework.config.ConfigurationException; --- 15,19 ---- import java.sql.ResultSet; import java.sql.SQLException; ! import java.util.logging.Logger; import org.jmonks.batchserver.framework.common.FrameworkUtil; import org.jmonks.batchserver.framework.config.ConfigurationException; *************** *** 59,62 **** --- 59,64 ---- "pool_job_loader_props, job_pool_class_name, job_pool_props from pool_job_controller_config " + "where job_name=?"; + + private static Logger logger=Logger.getLogger(DBPoolJobControllerConfig.class.getName()); /** * Loads the pool job controller configuration from table pool_job_controller_config *************** *** 70,74 **** public DBPoolJobControllerConfig(String jobName,Connection connection) { ! try { --- 72,76 ---- public DBPoolJobControllerConfig(String jobName,Connection connection) { ! logger.entering(DBPoolJobControllerConfig.class.getName(),"Constructor"); try { *************** *** 113,117 **** else { ! throw new ConfigurationException(ErrorCode.POOL_JOB_CONTROLLER_CONFIG_NOT_FOUND); } } --- 115,119 ---- else { ! throw new ConfigurationException(ConfigurationException.JOB_CONTROLLER_CONFIG, "Controller configuration is not defined for the job " + jobName + "."); } } *************** *** 119,125 **** { exception.printStackTrace(); ! throw new ConfigurationException(ErrorCode.DB_CONNECTIVITY_ERROR); } ! } --- 121,127 ---- { exception.printStackTrace(); ! throw new ConfigurationException(ConfigurationException.JOB_CONTROLLER_CONFIG, exception.getMessage()); } ! logger.exiting(DBPoolJobControllerConfig.class.getName(),"Constructor"); } Index: DBJobControllerConfig.java =================================================================== RCS file: /cvsroot/batchserver/batchserver/src/org/jmonks/batchserver/framework/config/db/DBJobControllerConfig.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** DBJobControllerConfig.java 11 Mar 2006 02:16:19 -0000 1.3 --- DBJobControllerConfig.java 13 Mar 2006 14:32:37 -0000 1.4 *************** *** 17,22 **** import java.sql.ResultSet; import java.sql.SQLException; ! import org.jmonks.batchserver.framework.common.ErrorCode; ! import org.jmonks.batchserver.framework.common.FrameworkUtil; import org.jmonks.batchserver.framework.config.ConfigurationException; import org.jmonks.batchserver.framework.config.FrameworkConfig; --- 17,21 ---- import java.sql.ResultSet; import java.sql.SQLException; ! import java.util.logging.Logger; import org.jmonks.batchserver.framework.config.ConfigurationException; import org.jmonks.batchserver.framework.config.FrameworkConfig; *************** *** 41,44 **** --- 40,45 ---- */ public static final String JOB_CONTROLLER_CONFIG_FACTORY_CLASS_ATTRIBUTE_NAME = "db-factory-config-class-name"; + + private static Logger logger=Logger.getLogger(DBJobControllerConfig.class.getName()); /** *************** *** 57,60 **** --- 58,62 ---- public static JobControllerConfig getJobControllerConfig(String jobName,Connection connection) { + logger.entering(DBJobControllerConfig.class.getName(),"getJobControllerConfig"); JobControllerConfig controllerConfig=null; *************** *** 71,75 **** String controllerConfigClassName=FrameworkConfig.getInstance().getJobControllerConfig().getConfigClassName(controllerClassName, DBJobControllerConfig.JOB_CONTROLLER_CONFIG_FACTORY_CLASS_ATTRIBUTE_NAME); if(controllerConfigClassName==null) ! throw new ConfigurationException(ErrorCode.JOB_CONTROLLER_CLASS_NOT_DEFINED); else { --- 73,78 ---- String controllerConfigClassName=FrameworkConfig.getInstance().getJobControllerConfig().getConfigClassName(controllerClassName, DBJobControllerConfig.JOB_CONTROLLER_CONFIG_FACTORY_CLASS_ATTRIBUTE_NAME); if(controllerConfigClassName==null) ! throw new ConfigurationException(ConfigurationException.JOB_CONTROLLER_CONFIG, "Could not found controller config class for the controller " + controllerClassName + ! " for the factory " + DBJobControllerConfig.JOB_CONTROLLER_CONFIG_FACTORY_CLASS_ATTRIBUTE_NAME + "."); else { *************** *** 82,106 **** { exception.printStackTrace(); ! throw new ConfigurationException(ErrorCode.JOB_CONTROLLER_CONFIG_CLASS_NOT_VALID); } catch(NoSuchMethodException exception) { exception.printStackTrace(); ! throw new ConfigurationException(ErrorCode.JOB_CONTROLLER_CONFIG_CLASS_NOT_VALID); } catch(ClassNotFoundException exception) { exception.printStackTrace(); ! throw new ConfigurationException(ErrorCode.JOB_CONTROLLER_CONFIG_CLASS_NOT_VALID); } catch(IllegalAccessException exception) { exception.printStackTrace(); ! throw new ConfigurationException(ErrorCode.JOB_CONTROLLER_CONFIG_CLASS_NOT_VALID); } catch(InvocationTargetException exception) { exception.printStackTrace(); ! throw new ConfigurationException(ErrorCode.JOB_CONTROLLER_CONFIG_CLASS_NOT_VALID); } } --- 85,109 ---- { exception.printStackTrace(); ! throw new ConfigurationException(ConfigurationException.JOB_CONTROLLER_CONFIG, exception.getMessage()); } catch(NoSuchMethodException exception) { exception.printStackTrace(); ! throw new ConfigurationException(ConfigurationException.JOB_CONTROLLER_CONFIG, exception.getMessage()); } catch(ClassNotFoundException exception) { exception.printStackTrace(); ! throw new ConfigurationException(ConfigurationException.JOB_CONTROLLER_CONFIG, exception.getMessage()); } catch(IllegalAccessException exception) { exception.printStackTrace(); ! throw new ConfigurationException(ConfigurationException.JOB_CONTROLLER_CONFIG, exception.getMessage()); } catch(InvocationTargetException exception) { exception.printStackTrace(); ! throw new ConfigurationException(ConfigurationException.JOB_CONTROLLER_CONFIG, exception.getMessage()); } } *************** *** 109,114 **** { exception.printStackTrace(); ! throw new ConfigurationException(ErrorCode.CANNOT_CREATE_DB_JOB_CONFIG); } return controllerConfig; } --- 112,118 ---- { exception.printStackTrace(); ! throw new ConfigurationException(ConfigurationException.JOB_CONTROLLER_CONFIG, exception.getMessage()); } + logger.exiting(DBJobControllerConfig.class.getName(),"getJobControllerConfig", controllerConfig); return controllerConfig; } |
