[Batchserver-cvs] batchserver/src/org/jmonks/batchserver/framework/config framework-config.xml,1.13,1.14 JobConfigFactory.java,1.6,1.7

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

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

Modified Files:
	framework-config.xml JobConfigFactory.java 
Log Message:
no message

Index: JobConfigFactory.java
===================================================================
RCS file: /cvsroot/batchserver/batchserver/src/org/jmonks/batchserver/framework/config/JobConfigFactory.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** JobConfigFactory.java	14 Mar 2006 05:45:25 -0000	1.6
--- JobConfigFactory.java	17 Mar 2006 05:14:13 -0000	1.7
***************
*** 67,74 ****
          {
              Class factoryClass=Class.forName(factoryClassName);
-             Constructor factoryConstructor=factoryClass.getConstructor(new Class[]{Map.class});
              if(JobConfigFactory.class.isAssignableFrom(factoryClass))
              {
!                 factoryObject=(JobConfigFactory)factoryConstructor.newInstance(new Object[]{factoryConfig.getJobConfigFactoryProperties()});
              }
              else
--- 67,74 ----
          {
              Class factoryClass=Class.forName(factoryClassName);
              if(JobConfigFactory.class.isAssignableFrom(factoryClass))
              {
!                 factoryObject=(JobConfigFactory)factoryClass.newInstance();
!                 factoryObject.init(factoryConfig.getJobConfigFactoryProperties());
              }
              else
***************
*** 80,88 ****
          {
              exception.printStackTrace();
!             throw new ConfigurationException(ConfigurationException.JOB_CONFIG_FACTORY_CONFIG, exception.getMessage());
!         }
!         catch(NoSuchMethodException exception)
!         {
!             exception.printStackTrace();
              throw new ConfigurationException(ConfigurationException.JOB_CONFIG_FACTORY_CONFIG, exception.getMessage());
          }
--- 80,84 ----
          {
              exception.printStackTrace();
!             logger.error(exception.getMessage(),exception);
              throw new ConfigurationException(ConfigurationException.JOB_CONFIG_FACTORY_CONFIG, exception.getMessage());
          }
***************
*** 90,93 ****
--- 86,90 ----
          {
              exception.printStackTrace();
+             logger.error(exception.getMessage(),exception);            
              throw new ConfigurationException(ConfigurationException.JOB_CONFIG_FACTORY_CONFIG, exception.getMessage());
          }
***************
*** 95,103 ****
          {
              exception.printStackTrace();
!             throw new ConfigurationException(ConfigurationException.JOB_CONFIG_FACTORY_CONFIG, exception.getMessage());
!         }
!         catch(InvocationTargetException exception)
!         {
!             exception.printStackTrace();
              throw new ConfigurationException(ConfigurationException.JOB_CONFIG_FACTORY_CONFIG, exception.getMessage());
          }
--- 92,96 ----
          {
              exception.printStackTrace();
!             logger.error(exception.getMessage(),exception);            
              throw new ConfigurationException(ConfigurationException.JOB_CONFIG_FACTORY_CONFIG, exception.getMessage());
          }
***************
*** 115,117 ****
--- 108,121 ----
       */
      public abstract JobConfig getJobConfig(String jobName);
+     
+     /**
+      * Method to initialize the factory using properies defined for this factory
+      * in framework configuration file. All the properties defined for this 
+      * configuration factory will be passed as map to this method.
+      *
+      * @param    configFactoryProps  Map consists of all the properties defined for this factory.
+      *
+      * @throws   ConfigurationException  If required properties by the factory are missing.
+      */
+     protected abstract void init(Map configFactoryProps);
  }

Index: framework-config.xml
===================================================================
RCS file: /cvsroot/batchserver/batchserver/src/org/jmonks/batchserver/framework/config/framework-config.xml,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** framework-config.xml	15 Mar 2006 04:36:50 -0000	1.13
--- framework-config.xml	17 Mar 2006 05:14:13 -0000	1.14
***************
*** 14,18 ****
      </job-config-factory-config>     -->
  
!     <repository-config repository-class-name="org.jmonks.batchserver.framework.DefaultRepository">
          <property key="repository-location">/batchserver/repository</property>
      </repository-config>
--- 14,18 ----
      </job-config-factory-config>     -->
  
!     <repository-config repository-class-name="org.jmonks.batchserver.framework.repository.db4o.Db4oRepository">
          <property key="repository-location">/batchserver/repository</property>
      </repository-config>