[Batchserver-cvs] batchserver/src/org/jmonks/batchserver/framework/config/xml batch-config.xml,NONE,1.1 XMLBasicJobControllerConfig.java,1.3,1.4 XMLJobConfigFactory.java,1.3,1.4 XMLPoolJobControllerConfig.java,1.3,1.4

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

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

Modified Files:
	XMLBasicJobControllerConfig.java XMLJobConfigFactory.java 
	XMLPoolJobControllerConfig.java 
Added Files:
	batch-config.xml 
Log Message:
no message

Index: XMLBasicJobControllerConfig.java
===================================================================
RCS file: /cvsroot/batchserver/batchserver/src/org/jmonks/batchserver/framework/config/xml/XMLBasicJobControllerConfig.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** XMLBasicJobControllerConfig.java	8 Mar 2006 23:21:13 -0000	1.3
--- XMLBasicJobControllerConfig.java	9 Mar 2006 04:45:08 -0000	1.4
***************
*** 54,58 ****
       *  @throws ConfigurationException  If controller class name or job processor name doest not found.
       */
!     XMLBasicJobControllerConfig(Element controllerConfigElement) 
      {
          this.jobControllerClassName=controllerConfigElement.getAttribute(XMLJobControllerConfig.JOB_CONTROLLER_CLASS_ATTRIBUTE_NAME);
--- 54,58 ----
       *  @throws ConfigurationException  If controller class name or job processor name doest not found.
       */
!     public XMLBasicJobControllerConfig(Element controllerConfigElement) 
      {
          this.jobControllerClassName=controllerConfigElement.getAttribute(XMLJobControllerConfig.JOB_CONTROLLER_CLASS_ATTRIBUTE_NAME);

Index: XMLPoolJobControllerConfig.java
===================================================================
RCS file: /cvsroot/batchserver/batchserver/src/org/jmonks/batchserver/framework/config/xml/XMLPoolJobControllerConfig.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** XMLPoolJobControllerConfig.java	8 Mar 2006 23:21:14 -0000	1.3
--- XMLPoolJobControllerConfig.java	9 Mar 2006 04:45:08 -0000	1.4
***************
*** 28,32 ****
   *                      <property key="pool-job-loader-key1">loader-value1</property>
   *                  </pool-job-loader>
!  *                  <pool-job-processor pool-job-processor-class-name="com.mycompany.batch.processfileabc.AbcJobLoader" thread-count="1">
   *                      <property key="pool-job-processor-key1">processor-value1</property>
   *                  </pool-job-processor>
--- 28,32 ----
   *                      <property key="pool-job-loader-key1">loader-value1</property>
   *                  </pool-job-loader>
!  *                  <pool-job-processor pool-job-processor-class-name="com.mycompany.batch.processfileabc.AbcJobProcessor" thread-count="1">
   *                      <property key="pool-job-processor-key1">processor-value1</property>
   *                  </pool-job-processor>
***************
*** 76,80 ****
       *  @throws ConfigurationException  If controller class name not defined or required controller properties missing.
       */
!     XMLPoolJobControllerConfig(Element controllerConfigElement) 
      {
          this.jobControllerClassName=controllerConfigElement.getAttribute(XMLJobControllerConfig.JOB_CONTROLLER_CLASS_ATTRIBUTE_NAME);
--- 76,80 ----
       *  @throws ConfigurationException  If controller class name not defined or required controller properties missing.
       */
!     public XMLPoolJobControllerConfig(Element controllerConfigElement) 
      {
          this.jobControllerClassName=controllerConfigElement.getAttribute(XMLJobControllerConfig.JOB_CONTROLLER_CLASS_ATTRIBUTE_NAME);
***************
*** 92,96 ****
              Element xmlPoolJobLoaderElement=(Element)xmlPoolJobLoaderNodeList.item(0);
              this.poolJobLoaderClassName=xmlPoolJobLoaderElement.getAttribute(XMLPoolJobControllerConfig.POOL_JOB_LOADER_CLASS_ATTRIBUTE_NAME);
!             if(this.poolJobProcessorClassName==null)
                  throw new ConfigurationException(ErrorCode.POOL_JOB_LOADER_CLASS_NAME_NOT_DEFINED);
              else
--- 92,96 ----
              Element xmlPoolJobLoaderElement=(Element)xmlPoolJobLoaderNodeList.item(0);
              this.poolJobLoaderClassName=xmlPoolJobLoaderElement.getAttribute(XMLPoolJobControllerConfig.POOL_JOB_LOADER_CLASS_ATTRIBUTE_NAME);
!             if(this.poolJobLoaderClassName==null)
                  throw new ConfigurationException(ErrorCode.POOL_JOB_LOADER_CLASS_NAME_NOT_DEFINED);
              else

--- NEW FILE: batch-config.xml ---
<?xml version="1.0" encoding="UTF-8"?>
<batch-config>
    <job-config job-name="process_file_abc">
        <job-controller job-controller-class-name="org.jmonks.batchserver.framework.controller.pool.PoolJobController">
            <pool-job-loader pool-job-loader-class-name="com.mycompany.batch.processfileabc.AbcJobLoader">
                <property key="pool-job-loader-key1">loader-value1</property>
            </pool-job-loader>
            <pool-job-processor pool-job-processor-class-name="com.mycompany.batch.processfileabc.AbcJobProcessor" thread-count="1">
                <property key="pool-job-processor-key1">processor-value1</property>
            </pool-job-processor>
            <job-pool job-pool-class-name="org.jmonks.batchserver.framework.controller.pool.DefaultJobPool">
                <property key="job-pool-size">50000</property>
            </job-pool>
            <property key="pool-job-controller-restart">true</property>
        </job-controller>
    </job-config>
    <job-config job-name="process_file_xyz">
        <job-controller job-controller-class-name="org.jmonks.batchserver.framework.controller.basic.BasicJobController">
            <basic-job-processor basic-job-processor-class-name="com.mycompany.batch.processfilexyz.XyzProcessor">
                <property key="basic-job-processor-key1">processor-value1</property>
            </basic-job-processor>
            <property key="basic-job-controller-restart">true</property>
        </job-controller>
    </job-config>
</batch-config>
Index: XMLJobConfigFactory.java
===================================================================
RCS file: /cvsroot/batchserver/batchserver/src/org/jmonks/batchserver/framework/config/xml/XMLJobConfigFactory.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** XMLJobConfigFactory.java	8 Mar 2006 00:31:12 -0000	1.3
--- XMLJobConfigFactory.java	9 Mar 2006 04:45:08 -0000	1.4
***************
*** 121,125 ****
               *  If we dont find this file on classpath, throw configuration exception.
               */
!             InputStream inputStream=XMLJobConfigFactory.class.getClassLoader().getResourceAsStream(classpathLocation);
              if(inputStream==null)
                  throw new ConfigurationException(ErrorCode.XML_JOB_CONFIG_FACTORY_INVALID_CLASSPATH_LOCATION);
--- 121,125 ----
               *  If we dont find this file on classpath, throw configuration exception.
               */
!             InputStream inputStream=XMLJobConfigFactory.class.getResourceAsStream(classpathLocation);
              if(inputStream==null)
                  throw new ConfigurationException(ErrorCode.XML_JOB_CONFIG_FACTORY_INVALID_CLASSPATH_LOCATION);