[Batchserver-cvs] batchserver/src/org/jmonks/batchserver/framework/config/xml XMLBasicJobControllerConfig.java, 1.9, 1.10 XMLJobConfig.java, 1.9, 1.10 XMLJobConfigFactory.java, 1.12, 1.13 XMLJobControllerConfig.java, 1.7, 1.8 XMLJobLoggingConfig.java, 1.2, 1.3 XMLPoolJobControllerConfig.java, 1.9, 1.10

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

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

Modified Files:
	XMLBasicJobControllerConfig.java XMLJobConfig.java 
	XMLJobConfigFactory.java XMLJobControllerConfig.java 
	XMLJobLoggingConfig.java XMLPoolJobControllerConfig.java 
Log Message:
no message

Index: XMLJobConfig.java
===================================================================
RCS file: /cvsroot/batchserver/batchserver/src/org/jmonks/batchserver/framework/config/xml/XMLJobConfig.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** XMLJobConfig.java	17 Mar 2006 14:04:38 -0000	1.9
--- XMLJobConfig.java	14 Sep 2006 23:05:13 -0000	1.10
***************
*** 20,24 ****
   * <p>
   * XMLJobConfig provides the implementation of JobConfig by reading the 
!  * job configuration from XML DOM element &lt;job-config&gt configured in the
   * job configuration file. This reads and represents the following piece of XML 
   * block from job configuration file.
--- 20,24 ----
   * <p>
   * XMLJobConfig provides the implementation of JobConfig by reading the 
!  * job configuration from XML DOM element &lt;job-config&gt; configured in the
   * job configuration file. This reads and represents the following piece of XML 
   * block from job configuration file.
***************
*** 46,58 ****
  {
      /**
!      *  Element name that identifies the job configuration.
       */
      public static final String JOB_CONFIG_ELEMENT_NAME = "job-config";
      /**
!      * Attribute name that identifies the job name.
       */
      public static final String JOB_NAME_ATTRIBUTE_NAME = "job-name";
      /**
!      * Attribute name that identifies the job status.
       */
      public static final String JOB_STATUS_ATTRIBUTE_NAME = "job-status";    
--- 46,58 ----
  {
      /**
!      *  Element name that identifies the job configuration which is <code>job-config</code>.
       */
      public static final String JOB_CONFIG_ELEMENT_NAME = "job-config";
      /**
!      * Attribute name that identifies the job name which is <code>job-name</code>.
       */
      public static final String JOB_NAME_ATTRIBUTE_NAME = "job-name";
      /**
!      * Attribute name that identifies the job status which is <code>job-status</code>.
       */
      public static final String JOB_STATUS_ATTRIBUTE_NAME = "job-status";    

Index: XMLJobLoggingConfig.java
===================================================================
RCS file: /cvsroot/batchserver/batchserver/src/org/jmonks/batchserver/framework/config/xml/XMLJobLoggingConfig.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** XMLJobLoggingConfig.java	14 Mar 2006 23:05:25 -0000	1.2
--- XMLJobLoggingConfig.java	14 Sep 2006 23:05:13 -0000	1.3
***************
*** 26,42 ****
  {
      /**
!      *  Element name represents the job logging config.
       */
      public static final String JOB_LOGGING_CONFIG_ELEMENT_NAME = "job-logging-config";
      /**
!      *  Element name represents the job logger config.
       */
      private static final String JOB_LOGGER_CONFIG_ELEMENT_NAME = "job-logger-config";
      /**
!      *  Atrribute name represents the logger name in job logger config.
       */
      private static final String LOGGER_NAME_ATTRIBUTE_NAME = "logger-name";
      /**
!      *  Atrribute name represents the logger level in job logger config.
       */
      private static final String LOGGER_LEVEL_ATTRIBUTE_NAME = "logger-level";    
--- 26,42 ----
  {
      /**
!      *  Element name represents the job logging config which is <code>job-logging-config</code>.
       */
      public static final String JOB_LOGGING_CONFIG_ELEMENT_NAME = "job-logging-config";
      /**
!      *  Element name represents the job logger config which is <code>job-logger-config</code>.
       */
      private static final String JOB_LOGGER_CONFIG_ELEMENT_NAME = "job-logger-config";
      /**
!      *  Atrribute name represents the logger name in job logger config which is <code>logger-name</code>.
       */
      private static final String LOGGER_NAME_ATTRIBUTE_NAME = "logger-name";
      /**
!      *  Atrribute name represents the logger level in job logger config which is <code>logger-level</code>.
       */
      private static final String LOGGER_LEVEL_ATTRIBUTE_NAME = "logger-level";    

Index: XMLPoolJobControllerConfig.java
===================================================================
RCS file: /cvsroot/batchserver/batchserver/src/org/jmonks/batchserver/framework/config/xml/XMLPoolJobControllerConfig.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** XMLPoolJobControllerConfig.java	29 Aug 2006 02:01:33 -0000	1.9
--- XMLPoolJobControllerConfig.java	14 Sep 2006 23:05:13 -0000	1.10
***************
*** 45,73 ****
  {
      /**
!      *  XML Element name defines the pool job loader configuration.
       */
      private static final String POOL_JOB_LOADER_ELEMENT_NAME = "pool-job-loader";
      /**
!      *  XML Attribute name defines the pool job loader class name.
       */
      private static final String POOL_JOB_LOADER_CLASS_ATTRIBUTE_NAME = "pool-job-loader-class-name";
      /**
!      *  XML Element name defines the job pool configuration.
       */
      private static final String POOL_JOB_POOL_ELEMENT_NAME = "job-pool";
      /**
!      *  XML Attribute name defines the job pool class name.
       */
      private static final String POOL_JOB_POOL_CLASS_ATTRIBUTE_NAME = "job-pool-class-name";
      /**
!      *  XML Element name defines the pool job processor configuration.
       */
      private static final String POOL_JOB_PROCESSOR_ELEMENT_NAME = "pool-job-processor";
      /**
!      *  XML Attribute name defines the pool job processor class name.
       */
      private static final String POOL_JOB_PROCESSOR_CLASS_ATTRIBUTE_NAME = "pool-job-processor-class-name";
      /**
!      * XML Attribute name defines the thread count of the job processor.
       */
      private static final String THREAD_COUNT_ATTRIBUTE_NAME = "thread-count";
--- 45,73 ----
  {
      /**
!      *  XML Element name defines the pool job loader configuration which is <code>pool-job-loader</code>.
       */
      private static final String POOL_JOB_LOADER_ELEMENT_NAME = "pool-job-loader";
      /**
!      *  XML Attribute name defines the pool job loader class name which is <code>pool-job-loader-class-name</code>.
       */
      private static final String POOL_JOB_LOADER_CLASS_ATTRIBUTE_NAME = "pool-job-loader-class-name";
      /**
!      *  XML Element name defines the job pool configuration which is <code>job-pool</code>.
       */
      private static final String POOL_JOB_POOL_ELEMENT_NAME = "job-pool";
      /**
!      *  XML Attribute name defines the job pool class name which is <code>job-pool-class-name</code>.
       */
      private static final String POOL_JOB_POOL_CLASS_ATTRIBUTE_NAME = "job-pool-class-name";
      /**
!      *  XML Element name defines the pool job processor configuration which is <code>pool-job-processor</code>.
       */
      private static final String POOL_JOB_PROCESSOR_ELEMENT_NAME = "pool-job-processor";
      /**
!      *  XML Attribute name defines the pool job processor class name which is <code>pool-job-processor-class-name</code>.
       */
      private static final String POOL_JOB_PROCESSOR_CLASS_ATTRIBUTE_NAME = "pool-job-processor-class-name";
      /**
!      * XML Attribute name defines the thread count of the job processor which is <code>thread-count</code>.
       */
      private static final String THREAD_COUNT_ATTRIBUTE_NAME = "thread-count";

Index: XMLJobControllerConfig.java
===================================================================
RCS file: /cvsroot/batchserver/batchserver/src/org/jmonks/batchserver/framework/config/xml/XMLJobControllerConfig.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** XMLJobControllerConfig.java	14 Mar 2006 23:05:25 -0000	1.7
--- XMLJobControllerConfig.java	14 Sep 2006 23:05:13 -0000	1.8
***************
*** 21,25 ****
  /**
   * XMLJobControllerConfig responsible to build the controller specific 
!  * JobControllerConfig objects from the given XML. 
   * 
   *  @author     Suresh Pragada
--- 21,26 ----
  /**
   * XMLJobControllerConfig responsible to build the controller specific 
!  * JobControllerConfig objects from the given XML. Look at {@link #getJobControllerConfig(Element)}
!  * to understand on how this is going to get the correct job controller config instance.
   * 
   *  @author     Suresh Pragada
***************
*** 30,42 ****
  {
      /**
!      *  Element name that identifies the job controller configuration.
       */
      public static final String JOB_CONTROLLER_ELEMENT_NAME = "job-controller";
      /**
!      *  Attribute name that identifies the job controller class name.
       */
      public static final String JOB_CONTROLLER_CLASS_ATTRIBUTE_NAME = "job-controller-class-name";
      /**
!      *  Element name that identifies the job controller configuration class name.
       */
      public static final String JOB_CONTROLLER_CONFIG_FACTORY_CLASS_ATTRIBUTE_NAME = "xml-factory-config-class-name";
--- 31,43 ----
  {
      /**
!      *  Element name that identifies the job controller configuration which is <code>job-controller</code>.
       */
      public static final String JOB_CONTROLLER_ELEMENT_NAME = "job-controller";
      /**
!      *  Attribute name that identifies the job controller class name which is <code>job-controller-class-name</code>.
       */
      public static final String JOB_CONTROLLER_CLASS_ATTRIBUTE_NAME = "job-controller-class-name";
      /**
!      *  Element name that identifies the job controller configuration class name which is <code>xml-factory-config-class-name</code>.
       */
      public static final String JOB_CONTROLLER_CONFIG_FACTORY_CLASS_ATTRIBUTE_NAME = "xml-factory-config-class-name";

Index: XMLJobConfigFactory.java
===================================================================
RCS file: /cvsroot/batchserver/batchserver/src/org/jmonks/batchserver/framework/config/xml/XMLJobConfigFactory.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** XMLJobConfigFactory.java	14 Sep 2006 05:04:34 -0000	1.12
--- XMLJobConfigFactory.java	14 Sep 2006 23:05:13 -0000	1.13
***************
*** 34,38 ****
   * XMLJobConfigFactory reads the job configuration from XML file to create the 
   * configuration objects needed by the job. This factory looks for few properties
!  * in the config properties map to identify the source of the XML file. The source of 
   * the XML file can be defined as absolute path on the file system or resource on the
   * class path.
--- 34,38 ----
   * XMLJobConfigFactory reads the job configuration from XML file to create the 
   * configuration objects needed by the job. This factory looks for few properties
!  * in the factory config properties map to identify the source of the XML file. The source of 
   * the XML file can be defined as absolute path on the file system or resource on the
   * class path.
***************
*** 46,50 ****
   *  <tr><td>job-config-file-classpath-location</td><td>batch-config.xml</td></tr>
   * </table>
!  * These properties can be configured using &lt;property&gt; element in the &lt;job-config-factory-config&gt; element
   * in the framework configuration file.
   * </p>
--- 46,50 ----
   *  <tr><td>job-config-file-classpath-location</td><td>batch-config.xml</td></tr>
   * </table>
!  * These properties can be configured using &lt;property&gt; attribute in the &lt;job-config-factory-config&gt; element
   * in the framework configuration file.
   * </p>
***************
*** 57,65 ****
  {
      /**
!      *  Constant defines the property name of config file absolute location.
       */
      private static final String PROPERTY_JOB_CONFIG_FILE_ABSOLUTE_LOCATION = "job-config-file-absolute-location";
      /**
!      *  Constant defines the property name of config file classpath location.
       */
      private static final String PROPERTY_JOB_CONFIG_FILE_CLASSPATH_LOCATION = "job-config-file-classpath-location";    
--- 57,65 ----
  {
      /**
!      *  Constant defines the property name of config file absolute location which is <code>job-config-file-absolute-location</code>.
       */
      private static final String PROPERTY_JOB_CONFIG_FILE_ABSOLUTE_LOCATION = "job-config-file-absolute-location";
      /**
!      *  Constant defines the property name of config file classpath location which is <code>job-config-file-classpath-location</code>.
       */
      private static final String PROPERTY_JOB_CONFIG_FILE_CLASSPATH_LOCATION = "job-config-file-classpath-location";    
***************
*** 68,72 ****
       */
      private Map configFactoryProps=null;
-     
      /**
       *  batch-config element in the XML configuration file.
--- 68,71 ----
***************
*** 168,172 ****
      /**
       * Returns the requested job configuration as JobConfig object. The requested job
!      * name should be passed as a parameter. If it doesnt find the configuration of 
       * the requested jobName in the job configuration file, it returns null.
       *
--- 167,171 ----
      /**
       * Returns the requested job configuration as JobConfig object. The requested job
!      * name should be passed as a parameter. If it does not find the configuration of 
       * the requested jobName in the job configuration file, it returns null.
       *
***************
*** 214,217 ****
--- 213,217 ----
       *
       *  @param  jobConfigStream InputStream of XML job configuration file.
+      *
       *  @return Returns true, if it could load the element from the given inputstream, false, otherwise.
       */

Index: XMLBasicJobControllerConfig.java
===================================================================
RCS file: /cvsroot/batchserver/batchserver/src/org/jmonks/batchserver/framework/config/xml/XMLBasicJobControllerConfig.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** XMLBasicJobControllerConfig.java	29 Aug 2006 02:01:33 -0000	1.9
--- XMLBasicJobControllerConfig.java	14 Sep 2006 23:05:13 -0000	1.10
***************
*** 40,52 ****
  {
      /**
!      *  XML Element name defiens the basic job processor configuration.
       */
      private static final String BASIC_JOB_PROCESSOR_ELEMENT_NAME = "basic-job-processor";
      /**
!      *  XML Attribute name defines the basic job processor class name.
       */
      private static final String BASIC_JOB_PROCESSOR_CLASS_ATTRIBUTE_NAME = "basic-job-processor-class-name";
      /**
!      * XML Attribute name defines the thread count of the job processor.
       */
      private static final String THREAD_COUNT_ATTRIBUTE_NAME = "thread-count";
--- 40,52 ----
  {
      /**
!      *  XML Element name defiens the basic job processor configuration which is <code>basic-job-processor</code>.
       */
      private static final String BASIC_JOB_PROCESSOR_ELEMENT_NAME = "basic-job-processor";
      /**
!      *  XML Attribute name defines the basic job processor class name which is <code>basic-job-processor-class-name</code>.
       */
      private static final String BASIC_JOB_PROCESSOR_CLASS_ATTRIBUTE_NAME = "basic-job-processor-class-name";
      /**
!      * XML Attribute name defines the thread count of the job processor which is <code>thread-count</code>.
       */
      private static final String THREAD_COUNT_ATTRIBUTE_NAME = "thread-count";