[Batchserver-cvs] batchserver/src/org/jmonks/batchserver/framework/config BasicJobControllerConfig.java,1.2,1.3 JobControllerConfig.java,1.2,1.3 PoolJobControllerConfig.java,1.2,1.3

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

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

Modified Files:
	BasicJobControllerConfig.java JobControllerConfig.java 
	PoolJobControllerConfig.java 
Log Message:
no message

Index: JobControllerConfig.java
===================================================================
RCS file: /cvsroot/batchserver/batchserver/src/org/jmonks/batchserver/framework/config/JobControllerConfig.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** JobControllerConfig.java	8 Mar 2006 05:18:55 -0000	1.2
--- JobControllerConfig.java	8 Mar 2006 23:20:57 -0000	1.3
***************
*** 71,75 ****
       * If any property defined newProps starting with controller config prefix, 
       * doesnt exist in controller defined props, it will add that property to the
!      * controller map.
       *
       * @param   newProps    Map contains the new properties.
--- 71,77 ----
       * If any property defined newProps starting with controller config prefix, 
       * doesnt exist in controller defined props, it will add that property to the
!      * controller map. This also overrides the properties common to the controller
!      * which starts with "job-controller-". This will be used to override some common
!      * properties like "job-controller-restart".
       *
       * @param   newProps    Map contains the new properties.
***************
*** 79,83 ****
          if(newProps==null )
              return;
! 
          String configPrefix=this.getJobControllerConfigPropertyPrefix();
          if(configPrefix==null)
--- 81,99 ----
          if(newProps==null )
              return;
!         /**
!          *  Override controller common properties like restart of the controller.
!          */
!         for(Iterator iterator=newProps.keySet().iterator();iterator.hasNext();)
!         {
!             String key=(String)iterator.next();
!             if(key.startsWith("job-controller-"))
!             {
!                 this.jobControllerConfigProps.put(key, newProps.get(key));
!             }
!         }
!         /**
!          *  Override controller specific properties by getting the prefix from 
!          *  specific controller.
!          */
          String configPrefix=this.getJobControllerConfigPropertyPrefix();
          if(configPrefix==null)

Index: BasicJobControllerConfig.java
===================================================================
RCS file: /cvsroot/batchserver/batchserver/src/org/jmonks/batchserver/framework/config/BasicJobControllerConfig.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** BasicJobControllerConfig.java	8 Mar 2006 05:18:55 -0000	1.2
--- BasicJobControllerConfig.java	8 Mar 2006 23:20:57 -0000	1.3
***************
*** 11,14 ****
--- 11,15 ----
  package org.jmonks.batchserver.framework.config;
  
+ import java.util.Iterator;
  import java.util.Map;
  
***************
*** 69,75 ****
      
      /**
!      * Base implementation overrides the properties in controller config props only.
!      * So, override all the props like loader, process and pool here along with controller
!      * config props.
       *
       *  @param  newProps    Map contains new properties.
--- 70,77 ----
      
      /**
!      *  Override the properties controller and controller sub componenets.
!      *  JobControllerConfig provides the implementation of overriding common controller
!      *  properties and controller specific properties. So, this will override
!      *  the properties of controller sub componenents like basic job processor.
       *
       *  @param  newProps    Map contains new properties.
***************
*** 80,86 ****
          
          /**
!          * Override the processor here.
           */
      }
      
  }
--- 82,115 ----
          
          /**
!          *  Override basic job processor config properites.
           */
+         for(Iterator iterator=newProps.keySet().iterator();iterator.hasNext();)
+         {
+             String key=(String)iterator.next();
+             if(key.startsWith("basic-job-processor-"))
+             {
+                 this.basicJobProcessorConfigProps.put(key, newProps.get(key));
+             }
+         }
      }
      
+     /**
+      * <p>
+      *  Returns the string representation of BasicJobControllerConfig class in the format 
+      *  <br> {BasicJobControllerConfig [controllerClassName = value] [controllerConfigProps = value]
+      *          [basicJobProcessorClassName = value] [basicJobProcessorConfigProps = value]}
+      * </p>
+      *
+      * @return  Returns the string representation of BasicJobControllerConfig.
+      */
+     public String toString()
+     {
+         StringBuffer stringValue=new StringBuffer("{BasicJobControllerConfig ");
+         stringValue.append("[controllerClassName = " + this.jobControllerClassName + "]");
+         stringValue.append("[controllerConfigProps = " + this.jobControllerConfigProps + "]");        
+         stringValue.append("[basicJobProcessorClassName = " + this.basicJobProcessorClassName + "]");        
+         stringValue.append("[basicJobProcessorConfigProps = " + this.basicJobProcessorConfigProps + "]");                
+         stringValue.append("}");
+         return stringValue.toString();
+     }    
  }

Index: PoolJobControllerConfig.java
===================================================================
RCS file: /cvsroot/batchserver/batchserver/src/org/jmonks/batchserver/framework/config/PoolJobControllerConfig.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** PoolJobControllerConfig.java	8 Mar 2006 05:18:55 -0000	1.2
--- PoolJobControllerConfig.java	8 Mar 2006 23:20:57 -0000	1.3
***************
*** 11,14 ****
--- 11,15 ----
  package org.jmonks.batchserver.framework.config;
  
+ import java.util.Iterator;
  import java.util.Map;
  
***************
*** 126,134 ****
      
      /**
!      * Base implementation overrides the properties in controller config props only.
!      * So, override all the props like loader, process and pool here along with controller
!      * config props.
       *
!      *  @param  newProps    Properties needs to be overriden.
       */
      public void overrideConfigProperties(Map newProps)
--- 127,137 ----
      
      /**
!      *  Override the properties controller and controller sub componenets.
!      *  JobControllerConfig provides the implementation of overriding common controller
!      *  properties and controller specific properties. So, this will override
!      *  the properties of controller sub componenents like pool job processor,
!      *  pool job loader and job pool.
       *
!      *  @param  newProps    Map contains new properties.
       */
      public void overrideConfigProperties(Map newProps)
***************
*** 136,142 ****
          super.overrideConfigProperties(newProps);
          
          /**
!          * Override the loader, processor and pool here.
           */
      }
  }
--- 139,209 ----
          super.overrideConfigProperties(newProps);
          
+         if(newProps==null )
+             return;
+ 
          /**
!          *  Override pool job loader properties.
           */
+         for(Iterator iterator=newProps.keySet().iterator();iterator.hasNext();)
+         {
+             String key=(String)iterator.next();
+             if(key.startsWith("pool-job-loader-"))
+             {
+                 this.poolJobLoaderConfigProps.put(key, newProps.get(key));
+             }
+         }
+         /**
+          *  Override pool job processor properties.
+          */
+         for(Iterator iterator=newProps.keySet().iterator();iterator.hasNext();)
+         {
+             String key=(String)iterator.next();
+             if(key.startsWith("pool-job-processor-"))
+             {
+                 this.poolJobProcessorConfigProps.put(key, newProps.get(key));
+             }
+         }
+         /**
+          *  Override pool job loader properties.
+          */
+         for(Iterator iterator=newProps.keySet().iterator();iterator.hasNext();)
+         {
+             String key=(String)iterator.next();
+             if(key.startsWith("job-pool-"))
+             {
+                 this.poolConfigProps.put(key, newProps.get(key));
+             }
+         }
+         
+         
      }
+     
+     /**
+      * <p>
+      *  Returns the string representation of PoolJobControllerConfig class in the format 
+      *  <br> {PoolJobControllerConfig [controllerClassName = value] [controllerConfigProps = value]
+      *          [poolJobProcessorClassName = value] [poolJobProcessorConfigProps = value]
+      *          [poolJobLoaderClassName = value] [poolJobLoaderConfigProps = value]
+      *          [jobPoolClassName = value] [jobPoolConfigProps = value]}
+      * </p>
+      *
+      * @return  Returns the string representation of PoolJobControllerConfig.
+      */
+     public String toString()
+     {
+         StringBuffer stringValue=new StringBuffer("{PoolJobControllerConfig ");
+         
+         stringValue.append("[controllerClassName = " + this.jobControllerClassName + "]");
+         stringValue.append("[controllerConfigProps = " + this.jobControllerConfigProps + "]");        
+         stringValue.append("[poolJobProcessorClassName = " + this.poolJobProcessorClassName + "]");        
+         stringValue.append("[poolJobProcessorConfigProps = " + this.poolJobProcessorConfigProps + "]");                
+         stringValue.append("[poolJobLoaderClassName = " + this.poolJobLoaderClassName + "]");        
+         stringValue.append("[poolJobLoaderConfigProps = " + this.poolJobLoaderConfigProps + "]");                
+         stringValue.append("[jobPoolClassName = " + this.poolClassName + "]");        
+         stringValue.append("[jobPoolConfigProps = " + this.poolConfigProps + "]");                
+         stringValue.append("}");
+         
+         return stringValue.toString();
+     }    
+     
  }