[Batchserver-cvs] batchserver/src/org/jmonks/batchserver/framework/config/db DBJobLoggingConfig.java,NONE,1.1 DBBasicJobControllerConfig.java,1.6,1.7 DBJobConfig.java,1.3,1.4 DBJobConfigFactory.java,1.4,1.5 DBJobControllerConfig.java,1.4,1.5 DBPoolJobControllerConfig.java,1.6,1.7

[Suresh <sur...@us...>]

Update of /cvsroot/batchserver/batchserver/src/org/jmonks/batchserver/framework/config/db
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30780/db

Modified Files:
	DBBasicJobControllerConfig.java DBJobConfig.java 
	DBJobConfigFactory.java DBJobControllerConfig.java 
	DBPoolJobControllerConfig.java 
Added Files:
	DBJobLoggingConfig.java 
Log Message:
no message

Index: DBJobConfigFactory.java
===================================================================
RCS file: /cvsroot/batchserver/batchserver/src/org/jmonks/batchserver/framework/config/db/DBJobConfigFactory.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** DBJobConfigFactory.java	13 Mar 2006 14:32:37 -0000	1.4
--- DBJobConfigFactory.java	14 Mar 2006 05:47:15 -0000	1.5
***************
*** 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;
--- 18,22 ----
  import java.util.HashMap;
  import java.util.Map;
! import org.apache.log4j.Logger;
  import org.jmonks.batchserver.framework.config.ConfigurationException;
  import org.jmonks.batchserver.framework.config.JobConfig;
***************
*** 78,82 ****
      private static final String JOB_CONFIG_QUERY = "select 1 from job_config where job_name=?";
      
!     private static Logger logger=Logger.getLogger(DBJobConfigFactory.class.getName());
      
      /**
--- 78,82 ----
      private static final String JOB_CONFIG_QUERY = "select 1 from job_config where job_name=?";
      
!     private static Logger logger=Logger.getLogger(DBJobConfigFactory.class);
      
      /**
***************
*** 92,96 ****
      public DBJobConfigFactory(Map configFactoryProps) 
      {
!         logger.entering(DBJobConfigFactory.class.getName(),"Constructor");
          this.configFactoryProps=new HashMap(configFactoryProps);
          /**
--- 92,96 ----
      public DBJobConfigFactory(Map configFactoryProps) 
      {
!         logger.trace("Entering constructor");
          this.configFactoryProps=new HashMap(configFactoryProps);
          /**
***************
*** 111,117 ****
              {
                  sqle.printStackTrace();
              }
          }
!         logger.exiting(DBJobConfigFactory.class.getName(),"Constructor");        
      }
      
--- 111,118 ----
              {
                  sqle.printStackTrace();
+                 logger.error(sqle.getMessage(),sqle);
              }
          }
!         logger.trace("Exiting constructor");
      }
      
***************
*** 130,134 ****
      public JobConfig getJobConfig(String jobName)
      {
!         logger.entering(DBJobConfigFactory.class.getName(),"getJobConfig");        
          JobConfig jobConfig=null;
          if(jobName==null)
--- 131,135 ----
      public JobConfig getJobConfig(String jobName)
      {
!         logger.trace("Entering getJobConfig");
          JobConfig jobConfig=null;
          if(jobName==null)
***************
*** 156,159 ****
--- 157,161 ----
          {
              exception.printStackTrace();
+             logger.error(exception.getMessage(),exception);
          }
          finally
***************
*** 161,165 ****
              try{  connection.close();    } catch(Exception exception){  exception.printStackTrace();    }
          }
!         logger.exiting(DBJobConfigFactory.class.getName(),"getJobConfig", jobConfig);        
          return jobConfig;
      }
--- 163,167 ----
              try{  connection.close();    } catch(Exception exception){  exception.printStackTrace();    }
          }
!         logger.trace("ExitinggetJobConfig");
          return jobConfig;
      }
***************
*** 174,179 ****
      private Connection getConnection()
      {
!         logger.entering(DBJobConfigFactory.class.getName(),"getConnection");        
!         logger.config("Connection configuration : " + this.configFactoryProps);
  
          Connection connection=null;
--- 176,181 ----
      private Connection getConnection()
      {
!         logger.trace("Exiting getConnection");
!         logger.info("Connection configuration : " + this.configFactoryProps);
  
          Connection connection=null;
***************
*** 201,208 ****
              {
                  exception.printStackTrace();
                  connection=null;
              }
          }
!         logger.exiting(DBJobConfigFactory.class.getName(),"getConnection");                
          return connection;
      }
--- 203,211 ----
              {
                  exception.printStackTrace();
+                 logger.error(exception.getMessage(), exception);
                  connection=null;
              }
          }
!         logger.trace("Exiting getConnection");
          return connection;
      }

Index: DBJobConfig.java
===================================================================
RCS file: /cvsroot/batchserver/batchserver/src/org/jmonks/batchserver/framework/config/db/DBJobConfig.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** DBJobConfig.java	13 Mar 2006 14:32:37 -0000	1.3
--- DBJobConfig.java	14 Mar 2006 05:47:15 -0000	1.4
***************
*** 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;
--- 15,19 ----
  import java.sql.ResultSet;
  import java.sql.SQLException;
! import org.apache.log4j.Logger;
  import org.jmonks.batchserver.framework.config.ConfigurationException;
  import org.jmonks.batchserver.framework.config.JobConfig;
***************
*** 47,51 ****
      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());
  
      /**
--- 47,51 ----
      private static final String JOB_CONFIG_QUERY = "select job_status from job_config where job_name=?";
      
!     private static Logger logger=Logger.getLogger(DBJobConfig.class);
  
      /**
***************
*** 59,63 ****
      DBJobConfig(String jobName,Connection connection) 
      {
!         logger.entering(DBJobConfig.class.getName(),"Constructor");
          this.jobName=jobName;
          
--- 59,63 ----
      DBJobConfig(String jobName,Connection connection) 
      {
!         logger.trace("Entering constructor");
          this.jobName=jobName;
          
***************
*** 71,75 ****
                  int status=resultSet.getInt(1);
                  this.jobStatus=(status==1?true:false);
!                 
                  this.jobControllerConfig=DBJobControllerConfig.getJobControllerConfig(jobName, connection);
              }
--- 71,75 ----
                  int status=resultSet.getInt(1);
                  this.jobStatus=(status==1?true:false);
!                 this.jobLoggingConfig=new DBJobLoggingConfig(jobName, connection);
                  this.jobControllerConfig=DBJobControllerConfig.getJobControllerConfig(jobName, connection);
              }
***************
*** 85,91 ****
          {
              exception.printStackTrace();
              throw new ConfigurationException(ConfigurationException.JOB_CONFIG, exception.getMessage());
          }
!         logger.exiting(DBJobConfig.class.getName(),"Constructor");        
      }
  }
--- 85,92 ----
          {
              exception.printStackTrace();
+             logger.error(exception.getMessage(), exception);
              throw new ConfigurationException(ConfigurationException.JOB_CONFIG, exception.getMessage());
          }
!         logger.trace("Exiting constructor");
      }
  }

Index: DBPoolJobControllerConfig.java
===================================================================
RCS file: /cvsroot/batchserver/batchserver/src/org/jmonks/batchserver/framework/config/db/DBPoolJobControllerConfig.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** DBPoolJobControllerConfig.java	13 Mar 2006 14:32:37 -0000	1.6
--- DBPoolJobControllerConfig.java	14 Mar 2006 05:47:15 -0000	1.7
***************
*** 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;
--- 15,19 ----
  import java.sql.ResultSet;
  import java.sql.SQLException;
! import org.apache.log4j.Logger;
  import org.jmonks.batchserver.framework.common.FrameworkUtil;
  import org.jmonks.batchserver.framework.config.ConfigurationException;
***************
*** 60,64 ****
              "where job_name=?";
      
!     private static Logger logger=Logger.getLogger(DBPoolJobControllerConfig.class.getName());
      /** 
       *  Loads the pool job controller configuration from table pool_job_controller_config 
--- 60,64 ----
              "where job_name=?";
      
!     private static Logger logger=Logger.getLogger(DBPoolJobControllerConfig.class);
      /** 
       *  Loads the pool job controller configuration from table pool_job_controller_config 
***************
*** 72,76 ****
      public DBPoolJobControllerConfig(String jobName,Connection connection)
      {
!         logger.entering(DBPoolJobControllerConfig.class.getName(),"Constructor");                        
          try
          {
--- 72,76 ----
      public DBPoolJobControllerConfig(String jobName,Connection connection)
      {
!         logger.trace("Entering constructor");
          try
          {
***************
*** 90,93 ****
--- 90,94 ----
                   *  Surprising!!!!!!!!!
                   */
+                 logger.error("no controller configuration found");
              }
              
***************
*** 121,127 ****
          {
              exception.printStackTrace();
              throw new ConfigurationException(ConfigurationException.JOB_CONTROLLER_CONFIG, exception.getMessage());
          }
!         logger.exiting(DBPoolJobControllerConfig.class.getName(),"Constructor");                                
      }
      
--- 122,129 ----
          {
              exception.printStackTrace();
+             logger.error(exception.getMessage(),exception);
              throw new ConfigurationException(ConfigurationException.JOB_CONTROLLER_CONFIG, exception.getMessage());
          }
!         logger.trace("Exiting constructor");
      }
      

Index: DBJobControllerConfig.java
===================================================================
RCS file: /cvsroot/batchserver/batchserver/src/org/jmonks/batchserver/framework/config/db/DBJobControllerConfig.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** DBJobControllerConfig.java	13 Mar 2006 14:32:37 -0000	1.4
--- DBJobControllerConfig.java	14 Mar 2006 05:47:15 -0000	1.5
***************
*** 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;
--- 17,21 ----
  import java.sql.ResultSet;
  import java.sql.SQLException;
! import org.apache.log4j.Logger;
  import org.jmonks.batchserver.framework.config.ConfigurationException;
  import org.jmonks.batchserver.framework.config.FrameworkConfig;
***************
*** 41,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());
          
      /**
--- 41,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);
          
      /**
***************
*** 58,62 ****
      public static JobControllerConfig getJobControllerConfig(String jobName,Connection connection)
      {
!         logger.entering(DBJobControllerConfig.class.getName(),"getJobControllerConfig");                
          JobControllerConfig controllerConfig=null;
  
--- 58,62 ----
      public static JobControllerConfig getJobControllerConfig(String jobName,Connection connection)
      {
!         logger.trace("Entering getJobControllerConfig");
          JobControllerConfig controllerConfig=null;
  
***************
*** 85,88 ****
--- 85,89 ----
                  {
                      exception.printStackTrace();
+                     logger.error(exception.getMessage(),exception);                    
                      throw new ConfigurationException(ConfigurationException.JOB_CONTROLLER_CONFIG, exception.getMessage());
                  }
***************
*** 90,93 ****
--- 91,95 ----
                  {
                      exception.printStackTrace();
+                     logger.error(exception.getMessage(),exception);                    
                      throw new ConfigurationException(ConfigurationException.JOB_CONTROLLER_CONFIG, exception.getMessage());
                  }
***************
*** 95,98 ****
--- 97,101 ----
                  {
                      exception.printStackTrace();
+                     logger.error(exception.getMessage(),exception);                    
                      throw new ConfigurationException(ConfigurationException.JOB_CONTROLLER_CONFIG, exception.getMessage());
                  }
***************
*** 100,103 ****
--- 103,107 ----
                  {
                      exception.printStackTrace();
+                     logger.error(exception.getMessage(),exception);
                      throw new ConfigurationException(ConfigurationException.JOB_CONTROLLER_CONFIG, exception.getMessage());
                  }
***************
*** 105,108 ****
--- 109,113 ----
                  {
                      exception.printStackTrace();
+                     logger.error(exception.getMessage(),exception);                    
                      throw new ConfigurationException(ConfigurationException.JOB_CONTROLLER_CONFIG, exception.getMessage());
                  }
***************
*** 112,118 ****
          {
              exception.printStackTrace();
              throw new ConfigurationException(ConfigurationException.JOB_CONTROLLER_CONFIG, exception.getMessage());
          }
!         logger.exiting(DBJobControllerConfig.class.getName(),"getJobControllerConfig", controllerConfig);                        
          return controllerConfig;
      }
--- 117,124 ----
          {
              exception.printStackTrace();
+             logger.error(exception.getMessage(),exception);
              throw new ConfigurationException(ConfigurationException.JOB_CONTROLLER_CONFIG, exception.getMessage());
          }
!         logger.trace("Exiting getJobControllerConfig");
          return controllerConfig;
      }

Index: DBBasicJobControllerConfig.java
===================================================================
RCS file: /cvsroot/batchserver/batchserver/src/org/jmonks/batchserver/framework/config/db/DBBasicJobControllerConfig.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** DBBasicJobControllerConfig.java	13 Mar 2006 14:32:37 -0000	1.6
--- DBBasicJobControllerConfig.java	14 Mar 2006 05:47:15 -0000	1.7
***************
*** 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;
--- 15,19 ----
  import java.sql.ResultSet;
  import java.sql.SQLException;
! import org.apache.log4j.Logger;
  import org.jmonks.batchserver.framework.common.FrameworkUtil;
  import org.jmonks.batchserver.framework.config.BasicJobControllerConfig;
***************
*** 52,56 ****
      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());
      
      /** 
--- 52,56 ----
      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);
      
      /** 
***************
*** 65,69 ****
      public DBBasicJobControllerConfig(String jobName,Connection connection) 
      {
!         logger.entering(DBBasicJobControllerConfig.class.getName(),"Constructor");                        
          try
          {
--- 65,69 ----
      public DBBasicJobControllerConfig(String jobName,Connection connection) 
      {
!         logger.trace("Entering constructor");
          try
          {
***************
*** 83,87 ****
                   *  Surprising!!!!!!!!!
                   */
!                 logger.severe("Job configuration not found with the name " + jobName);
              }
              
--- 83,87 ----
                   *  Surprising!!!!!!!!!
                   */
!                 logger.error("Job configuration not found with the name " + jobName);
              }
              
***************
*** 105,111 ****
          {
              exception.printStackTrace();
              throw new ConfigurationException(ConfigurationException.JOB_CONTROLLER_CONFIG, exception.getMessage());
          }
!         logger.exiting(DBBasicJobControllerConfig.class.getName(),"Constructor");                                
      }
      
--- 105,112 ----
          {
              exception.printStackTrace();
+             logger.error(exception.getMessage(), exception);
              throw new ConfigurationException(ConfigurationException.JOB_CONTROLLER_CONFIG, exception.getMessage());
          }
!         logger.trace("Exiting constructor");
      }
      

--- NEW FILE: DBJobLoggingConfig.java ---
/*
 * DBJobLoggingConfig.java
 *
 * Created on March 13, 2006, 8:17 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.db;

import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import org.apache.log4j.Logger;
import org.jmonks.batchserver.framework.config.ConfigurationException;
import org.jmonks.batchserver.framework.config.JobLoggingConfig;

/**
 * <p>
 * DBJobLoggingConfig reads the job logging configuration from the table "job_logging_config".
 * Below is the schema of job_logging_config table.
 * <br><br>
 * <pre>
 *      <table>
 *          <tr><td><b>Column Name</b></td><td><b>Data Type</b></td></tr>
 *          <tr><td>JOB_NAME</td><td>VARCHAR2(64)</td></tr>
 *          <tr><td>JOB_LOGGER_NAME</td><td>VARCHAR2(256)</td></tr>
 *          <tr><td>JOB_LOGGER_LEVEL</td><td>VARCHAR2(32)</td></tr>
 *      </table>
 * </pre>
 * </p>
 * @author  Suresh Pragada
 * @version 1.0
 * @since   1.0
 */
public class DBJobLoggingConfig extends JobLoggingConfig
{
    private static final String JOB_LOGGING_CONFIG_QUERY="select job_logger_name,job_logger_level from job_logging_config where job_name=?";
    
    private static Logger logger=Logger.getLogger(DBJobLoggingConfig.class);
    
    /** 
     *  Reads the configuration from the table job_logging_config and add
     *  each record as JobLoggerConfig object.
     *
     *  @param  jobName Name of the job.
     *  @param  connection  Database connection to the defined database.
     */
    public DBJobLoggingConfig(String jobName,Connection connection)
    {
        logger.trace("Entering constructor");
        try
        {
            PreparedStatement statement=connection.prepareStatement(DBJobLoggingConfig.JOB_LOGGING_CONFIG_QUERY);
            statement.setString(1, jobName);
            ResultSet resultSet=statement.executeQuery();
            while(resultSet.next())
            {
                String loggerName=resultSet.getString(1);
                String loggerLevel=resultSet.getString(2);
                this.addLogger(loggerName,loggerLevel);
            }
        }
        catch(SQLException exception)
        {
            exception.printStackTrace();
            logger.error(exception.getMessage(),exception);
            throw new ConfigurationException(ConfigurationException.JOB_CONFIG, exception.getMessage());
        }
        logger.trace("Exiting constructor");        
    }
    
}