[Batchserver-cvs] batchserver/src/org/jmonks/batchserver/framework/config/db DBBasicJobControllerConfig.java,1.4,1.5 DBJobControllerConfig.java,1.2,1.3 DBPoolJobControllerConfig.java,1.4,1.5

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

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

Modified Files:
	DBBasicJobControllerConfig.java DBJobControllerConfig.java 
	DBPoolJobControllerConfig.java 
Log Message:
no message

Index: DBBasicJobControllerConfig.java
===================================================================
RCS file: /cvsroot/batchserver/batchserver/src/org/jmonks/batchserver/framework/config/db/DBBasicJobControllerConfig.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** DBBasicJobControllerConfig.java	10 Mar 2006 08:57:18 -0000	1.4
--- DBBasicJobControllerConfig.java	11 Mar 2006 02:16:19 -0000	1.5
***************
*** 44,47 ****
--- 44,51 ----
  {
      /**
+      *  SQL Query retrieves the job controller class name and controller properites from job_config.
+      */ 
+     private static final String JOB_CONFIG_QUERY = "select job_controller_class_name,job_controller_props from job_config where job_name=?";    
+     /**
       *  SQL Query pulls the information basic_job_controller_config table.
       */
***************
*** 58,72 ****
      public DBBasicJobControllerConfig(String jobName,Connection connection) 
      {
- 
          try
          {
!             PreparedStatement statement=connection.prepareStatement(DBBasicJobControllerConfig.BASIC_JOB_CONTROLLER_CONFIG_QUERY);
!             statement.setString(1,jobName);
!             ResultSet resultSet=statement.executeQuery();
!             if(resultSet.next())
              {
!                 this.basicJobProcessorClassName=resultSet.getString(1);
!                 this.basicJobProcessorThreadCount=resultSet.getInt(2);
!                 String processorConfigProps=resultSet.getString(3);
                  if(processorConfigProps!=null)
                      FrameworkUtil.loadPropertiesFromStringToMap(processorConfigProps,this.basicJobProcessorConfigProps);
--- 62,92 ----
      public DBBasicJobControllerConfig(String jobName,Connection connection) 
      {
          try
          {
!             PreparedStatement jobConfigStatement=connection.prepareStatement(DBBasicJobControllerConfig.JOB_CONFIG_QUERY);
!             jobConfigStatement.setString(1, jobName);
!             ResultSet jobConfigResultSet=jobConfigStatement.executeQuery();
!             if(jobConfigResultSet.next())
              {
!                 this.jobControllerClassName=jobConfigResultSet.getString(1);
!                 String controllerConfigProps=jobConfigResultSet.getString(2);
!                 if(controllerConfigProps!=null)
!                     FrameworkUtil.loadPropertiesFromStringToMap(controllerConfigProps, this.jobControllerConfigProps);
!             }
!             else
!             {
!                 /**
!                  *  Surprising!!!!!!!!!
!                  */
!             }
!             
!             PreparedStatement controllerConfigStatement=connection.prepareStatement(DBBasicJobControllerConfig.BASIC_JOB_CONTROLLER_CONFIG_QUERY);
!             controllerConfigStatement.setString(1,jobName);
!             ResultSet controllerConfigResultSet=controllerConfigStatement.executeQuery();
!             if(controllerConfigResultSet.next())
!             {
!                 this.basicJobProcessorClassName=controllerConfigResultSet.getString(1);
!                 this.basicJobProcessorThreadCount=controllerConfigResultSet.getInt(2);
!                 String processorConfigProps=controllerConfigResultSet.getString(3);
                  if(processorConfigProps!=null)
                      FrameworkUtil.loadPropertiesFromStringToMap(processorConfigProps,this.basicJobProcessorConfigProps);

Index: DBPoolJobControllerConfig.java
===================================================================
RCS file: /cvsroot/batchserver/batchserver/src/org/jmonks/batchserver/framework/config/db/DBPoolJobControllerConfig.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** DBPoolJobControllerConfig.java	10 Mar 2006 08:57:18 -0000	1.4
--- DBPoolJobControllerConfig.java	11 Mar 2006 02:16:19 -0000	1.5
***************
*** 49,52 ****
--- 49,56 ----
  {
      /**
+      *  SQL Query retrieves the job controller class name and controller properites from job_config.
+      */ 
+     private static final String JOB_CONFIG_QUERY = "select job_controller_class_name,job_controller_props from job_config where job_name=?";        
+     /**
       *  SQL Query pulls the information pool_job_controller_config table.
       */
***************
*** 69,90 ****
          try
          {
!             PreparedStatement statement=connection.prepareStatement(DBPoolJobControllerConfig.POOL_JOB_CONTROLLER_CONFIG_QUERY);
!             statement.setString(1,jobName);
!             ResultSet resultSet=statement.executeQuery();
!             if(resultSet.next())
              {
!                 this.poolJobProcessorClassName=resultSet.getString(1);
!                 this.poolJobProcessorThreadCount=resultSet.getInt(2);
!                 String processorConfigProps=resultSet.getString(3);
                  if(processorConfigProps!=null)
                      FrameworkUtil.loadPropertiesFromStringToMap(processorConfigProps,this.poolJobProcessorConfigProps);
  
!                 this.poolJobLoaderClassName=resultSet.getString(4);
!                 String loaderConfigProps=resultSet.getString(5);
                  if(loaderConfigProps!=null)
                      FrameworkUtil.loadPropertiesFromStringToMap(loaderConfigProps,this.poolJobLoaderConfigProps);
  
!                 this.poolClassName=resultSet.getString(6);
!                 String poolConfigProps=resultSet.getString(7);
                  if(poolConfigProps!=null)
                      FrameworkUtil.loadPropertiesFromStringToMap(poolConfigProps,this.poolConfigProps);
--- 73,111 ----
          try
          {
!             PreparedStatement jobConfigStatement=connection.prepareStatement(DBPoolJobControllerConfig.JOB_CONFIG_QUERY);
!             jobConfigStatement.setString(1, jobName);
!             ResultSet jobConfigResultSet=jobConfigStatement.executeQuery();
!             if(jobConfigResultSet.next())
              {
!                 this.jobControllerClassName=jobConfigResultSet.getString(1);
!                 String controllerConfigProps=jobConfigResultSet.getString(2);
!                 if(controllerConfigProps!=null)
!                     FrameworkUtil.loadPropertiesFromStringToMap(controllerConfigProps, this.jobControllerConfigProps);
!             }
!             else
!             {
!                 /**
!                  *  Surprising!!!!!!!!!
!                  */
!             }
!             
!             PreparedStatement controllerConfigStatement=connection.prepareStatement(DBPoolJobControllerConfig.POOL_JOB_CONTROLLER_CONFIG_QUERY);
!             controllerConfigStatement.setString(1,jobName);
!             ResultSet controllerConfigResultSet=controllerConfigStatement.executeQuery();
!             if(controllerConfigResultSet.next())
!             {
!                 this.poolJobProcessorClassName=controllerConfigResultSet.getString(1);
!                 this.poolJobProcessorThreadCount=controllerConfigResultSet.getInt(2);
!                 String processorConfigProps=controllerConfigResultSet.getString(3);
                  if(processorConfigProps!=null)
                      FrameworkUtil.loadPropertiesFromStringToMap(processorConfigProps,this.poolJobProcessorConfigProps);
  
!                 this.poolJobLoaderClassName=controllerConfigResultSet.getString(4);
!                 String loaderConfigProps=controllerConfigResultSet.getString(5);
                  if(loaderConfigProps!=null)
                      FrameworkUtil.loadPropertiesFromStringToMap(loaderConfigProps,this.poolJobLoaderConfigProps);
  
!                 this.poolClassName=controllerConfigResultSet.getString(6);
!                 String poolConfigProps=controllerConfigResultSet.getString(7);
                  if(poolConfigProps!=null)
                      FrameworkUtil.loadPropertiesFromStringToMap(poolConfigProps,this.poolConfigProps);

Index: DBJobControllerConfig.java
===================================================================
RCS file: /cvsroot/batchserver/batchserver/src/org/jmonks/batchserver/framework/config/db/DBJobControllerConfig.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** DBJobControllerConfig.java	10 Mar 2006 08:15:16 -0000	1.2
--- DBJobControllerConfig.java	11 Mar 2006 02:16:19 -0000	1.3
***************
*** 18,21 ****
--- 18,22 ----
  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;
***************
*** 40,44 ****
       */
      public static final String JOB_CONTROLLER_CONFIG_FACTORY_CLASS_ATTRIBUTE_NAME = "db-factory-config-class-name";
!     
      /**
       *  <p>
--- 41,45 ----
       */
      public static final String JOB_CONTROLLER_CONFIG_FACTORY_CLASS_ATTRIBUTE_NAME = "db-factory-config-class-name";
!         
      /**
       *  <p>