batchserver-cvs

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

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

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.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** DBJobConfig.java	14 Mar 2006 05:47:15 -0000	1.4
--- DBJobConfig.java	14 Mar 2006 23:04:09 -0000	1.5
***************
*** 59,65 ****
      DBJobConfig(String jobName,Connection connection) 
      {
!         logger.trace("Entering constructor");
          this.jobName=jobName;
!         
          try
          {
--- 59,65 ----
      DBJobConfig(String jobName,Connection connection) 
      {
!         logger.trace("Entering constructor " + jobName);
          this.jobName=jobName;
!         logger.debug("Job Name = " + this.jobName);
          try
          {
***************
*** 71,76 ****
--- 71,79 ----
                  int status=resultSet.getInt(1);
                  this.jobStatus=(status==1?true:false);
+                 logger.debug("Job Status = " + this.jobStatus);
                  this.jobLoggingConfig=new DBJobLoggingConfig(jobName, connection);
+                 logger.debug("Job Logging configuration = " + this.jobLoggingConfig);
                  this.jobControllerConfig=DBJobControllerConfig.getJobControllerConfig(jobName, connection);
+                 logger.debug("Job Controller configuration = " + this.jobControllerConfig);
              }
              else
***************
*** 79,82 ****
--- 82,86 ----
                   *  How can this is possible? Just now.. I could see this entry in job_config.
                   */
+                 logger.error("Could not find entry in job_config with job name " + jobName);
                  throw new IllegalStateException("Surprisingly.. Could not find entry in job_config with job_name " + jobName);
              }

Index: DBJobConfigFactory.java
===================================================================
RCS file: /cvsroot/batchserver/batchserver/src/org/jmonks/batchserver/framework/config/db/DBJobConfigFactory.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** DBJobConfigFactory.java	14 Mar 2006 05:47:15 -0000	1.5
--- DBJobConfigFactory.java	14 Mar 2006 23:04:09 -0000	1.6
***************
*** 131,135 ****
      public JobConfig getJobConfig(String jobName)
      {
!         logger.trace("Entering getJobConfig");
          JobConfig jobConfig=null;
          if(jobName==null)
--- 131,135 ----
      public JobConfig getJobConfig(String jobName)
      {
!         logger.trace("Entering getJobConfig " + jobName);
          JobConfig jobConfig=null;
          if(jobName==null)
***************
*** 149,156 ****
--- 149,161 ----
              if(resultSet.next())
              {
+                 logger.debug("Job found in database configuration");
                  jobConfig=new DBJobConfig(jobName,connection);
+                 logger.trace("Would be able to read the job configuration from database");
              }
              else
+             {
                  jobConfig=null;
+                 logger.error("Could not find an entry in table job_config with the job name " + jobName);
+             }
          }
          catch(SQLException exception)

Index: DBBasicJobControllerConfig.java
===================================================================
RCS file: /cvsroot/batchserver/batchserver/src/org/jmonks/batchserver/framework/config/db/DBBasicJobControllerConfig.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** DBBasicJobControllerConfig.java	14 Mar 2006 05:47:15 -0000	1.7
--- DBBasicJobControllerConfig.java	14 Mar 2006 23:04:09 -0000	1.8
***************
*** 65,69 ****
      public DBBasicJobControllerConfig(String jobName,Connection connection) 
      {
!         logger.trace("Entering constructor");
          try
          {
--- 65,69 ----
      public DBBasicJobControllerConfig(String jobName,Connection connection) 
      {
!         logger.trace("Entering constructor " + jobName);
          try
          {
***************
*** 75,78 ****
--- 75,79 ----
                  this.jobControllerClassName=jobConfigResultSet.getString(1);
                  String controllerConfigProps=jobConfigResultSet.getString(2);
+                 logger.debug("controller configuration props = " + controllerConfigProps);
                  if(controllerConfigProps!=null)
                      FrameworkUtil.loadPropertiesFromStringToMap(controllerConfigProps, this.jobControllerConfigProps);
***************
*** 85,89 ****
                  logger.error("Job configuration not found with the name " + jobName);
              }
!             
              PreparedStatement controllerConfigStatement=connection.prepareStatement(DBBasicJobControllerConfig.BASIC_JOB_CONTROLLER_CONFIG_QUERY);
              controllerConfigStatement.setString(1,jobName);
--- 86,90 ----
                  logger.error("Job configuration not found with the name " + jobName);
              }
!             logger.trace("Started loading basic job processor configuration");
              PreparedStatement controllerConfigStatement=connection.prepareStatement(DBBasicJobControllerConfig.BASIC_JOB_CONTROLLER_CONFIG_QUERY);
              controllerConfigStatement.setString(1,jobName);
***************
*** 101,104 ****
--- 102,106 ----
                  throw new ConfigurationException(ConfigurationException.JOB_CONTROLLER_CONFIG, "Controller configuration is not defined for the job " + jobName);
              }
+             logger.trace("Finished loading basic job processor configuration");            
          }
          catch(SQLException exception)

Index: DBPoolJobControllerConfig.java
===================================================================
RCS file: /cvsroot/batchserver/batchserver/src/org/jmonks/batchserver/framework/config/db/DBPoolJobControllerConfig.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** DBPoolJobControllerConfig.java	14 Mar 2006 05:47:15 -0000	1.7
--- DBPoolJobControllerConfig.java	14 Mar 2006 23:04:09 -0000	1.8
***************
*** 72,76 ****
      public DBPoolJobControllerConfig(String jobName,Connection connection)
      {
!         logger.trace("Entering constructor");
          try
          {
--- 72,76 ----
      public DBPoolJobControllerConfig(String jobName,Connection connection)
      {
!         logger.trace("Entering constructor " + jobName);
          try
          {
***************
*** 93,96 ****
--- 93,97 ----
              }
              
+             logger.trace("Started loading pool job controller configuration");            
              PreparedStatement controllerConfigStatement=connection.prepareStatement(DBPoolJobControllerConfig.POOL_JOB_CONTROLLER_CONFIG_QUERY);
              controllerConfigStatement.setString(1,jobName);
***************
*** 118,121 ****
--- 119,123 ----
                  throw new ConfigurationException(ConfigurationException.JOB_CONTROLLER_CONFIG, "Controller configuration is not defined for the job " + jobName + ".");
              }
+             logger.trace("Finished loading pool job controller configuration");                        
          }
          catch(SQLException exception)

Index: DBJobControllerConfig.java
===================================================================
RCS file: /cvsroot/batchserver/batchserver/src/org/jmonks/batchserver/framework/config/db/DBJobControllerConfig.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** DBJobControllerConfig.java	14 Mar 2006 05:47:15 -0000	1.5
--- DBJobControllerConfig.java	14 Mar 2006 23:04:09 -0000	1.6
***************
*** 58,62 ****
      public static JobControllerConfig getJobControllerConfig(String jobName,Connection connection)
      {
!         logger.trace("Entering getJobControllerConfig");
          JobControllerConfig controllerConfig=null;
  
--- 58,62 ----
      public static JobControllerConfig getJobControllerConfig(String jobName,Connection connection)
      {
!         logger.trace("Entering getJobControllerConfig " + jobName);
          JobControllerConfig controllerConfig=null;
  
***************
*** 69,76 ****
              {
                  String controllerClassName=resultSet.getString(1);
                  try
                  {
                      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 + ".");
--- 69,78 ----
              {
                  String controllerClassName=resultSet.getString(1);
+                 logger.debug("Controller class name = " + controllerClassName);
                  try
                  {
                      String controllerConfigClassName=FrameworkConfig.getInstance().getJobControllerConfig().getConfigClassName(controllerClassName, DBJobControllerConfig.JOB_CONTROLLER_CONFIG_FACTORY_CLASS_ATTRIBUTE_NAME);
!                     logger.debug("Controller config class name = " + controllerConfigClassName);
!                     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 + ".");