[Batchserver-cvs] batchserver/src/org/jmonks/batchserver/framework/config BasicJobControllerConfig.j
Brought to you by:
suresh_pragada
Menu
▾
▴
[Batchserver-cvs] batchserver/src/org/jmonks/batchserver/framework/config BasicJobControllerConfig.java,1.3,1.4 framework-config.xml,1.6,1.7 FrameworkConfig.java,1.5,1.6 JobControllerConfig.java,1.3,1.4 PoolJobControllerConfig.java,1.3,1.4 batch-config.xml,1.5,NONE
|
From: Suresh <sur...@us...> - 2006-03-09 04:44:10
|
Update of /cvsroot/batchserver/batchserver/src/org/jmonks/batchserver/framework/config In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9186 Modified Files: BasicJobControllerConfig.java framework-config.xml FrameworkConfig.java JobControllerConfig.java PoolJobControllerConfig.java Removed Files: batch-config.xml Log Message: no message Index: BasicJobControllerConfig.java =================================================================== RCS file: /cvsroot/batchserver/batchserver/src/org/jmonks/batchserver/framework/config/BasicJobControllerConfig.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** BasicJobControllerConfig.java 8 Mar 2006 23:20:57 -0000 1.3 --- BasicJobControllerConfig.java 9 Mar 2006 04:44:07 -0000 1.4 *************** *** 11,14 **** --- 11,15 ---- package org.jmonks.batchserver.framework.config; + import java.util.HashMap; import java.util.Iterator; import java.util.Map; *************** *** 36,40 **** * Map contains the properties required by the basic job processor. */ ! protected Map basicJobProcessorConfigProps=null; /** --- 37,41 ---- * Map contains the properties required by the basic job processor. */ ! protected Map basicJobProcessorConfigProps=new HashMap(); /** --- batch-config.xml DELETED --- Index: FrameworkConfig.java =================================================================== RCS file: /cvsroot/batchserver/batchserver/src/org/jmonks/batchserver/framework/config/FrameworkConfig.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** FrameworkConfig.java 8 Mar 2006 05:18:55 -0000 1.5 --- FrameworkConfig.java 9 Mar 2006 04:44:07 -0000 1.6 *************** *** 689,693 **** * Skip the controller-class-name attribute here. */ ! if(!controllerClassName.equals(attribName)) { controllerPropertyMap.put(attribName,controllerAttribute.getNodeValue()); --- 689,693 ---- * Skip the controller-class-name attribute here. */ ! if(!JobControllerConfig.JOB_CONTROLLER_CLASS_ATTRIB_NAME.equals(attribName)) { controllerPropertyMap.put(attribName,controllerAttribute.getNodeValue()); Index: framework-config.xml =================================================================== RCS file: /cvsroot/batchserver/batchserver/src/org/jmonks/batchserver/framework/config/framework-config.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** framework-config.xml 8 Mar 2006 05:18:55 -0000 1.6 --- framework-config.xml 9 Mar 2006 04:44:07 -0000 1.7 *************** *** 1,5 **** <framework-config> <job-config-factory-config job-config-factory-class-name="org.jmonks.batchserver.framework.config.xml.XMLJobConfigFactory"> ! <property key="job-config-file-absolute-location">/batchserver/config/batch-config.xml</property> <!-- Following is the another way to configure the XML Job configuration. --- 1,6 ---- <framework-config> <job-config-factory-config job-config-factory-class-name="org.jmonks.batchserver.framework.config.xml.XMLJobConfigFactory"> ! <!-- <property key="job-config-file-absolute-location">/batchserver/batch-config.xml</property> --> ! <property key="job-config-file-classpath-location">batch-config.xml</property> <!-- Following is the another way to configure the XML Job configuration. *************** *** 7,18 **** --> </job-config-factory-config> - <repository-config repository-class-name="org.jmonks.batchserver.framework.DefaultRepository"> - <property key="repository-location">/batchserver/repository</property> - <property key="repository-filename">batchserver_repository.db</property> - </repository-config> - <logging-config logging-direcotry="/batchserver/logs" logging-level="DEBUG" job-base-package-name="com.mycompany.batch"/> - <mgmt-mntr-config mgmt-mntr-class-name="org.jmonks.batchserver.framework.mgmtmntr.DefaultMgmtMntrManager"> - <property key="port-range">15000-20000</property> - </mgmt-mntr-config> <!-- Following is the sample configuration to read the job configuration from the database. --- 8,11 ---- *************** *** 24,35 **** <property key="config-db-password">tiger</property> </job-config-reader-config> ! --> <job-controller-config> <job-controller controller-class-name="org.jmonks.batchserver.framework.controller.pool.PoolJobController" ! xml-factory-config-class-name="org.jmonks.batchserver.framework.config.xml.XMLPoolJobController" ! db-factory-config-class-name="org.jmonks.batchserver.framework.config.xml.DBPoolJobController"/> ! <job-controller controller-class-name="org.jmonks.batchserver.framework.controller.pool.BasicJobController" ! xml-factory-config-class-name="org.jmonks.batchserver.framework.config.xml.XMLBasicJobController" ! db-factory-config-class-name="org.jmonks.batchserver.framework.config.xml.DBBasicJobController"/> </job-controller-config> </framework-config> \ No newline at end of file --- 17,36 ---- <property key="config-db-password">tiger</property> </job-config-reader-config> ! --> ! <repository-config repository-class-name="org.jmonks.batchserver.framework.DefaultRepository"> ! <property key="repository-location">/batchserver/repository</property> ! <property key="repository-filename">batchserver_repository.db</property> ! </repository-config> ! <logging-config logging-direcotry="/batchserver/logs" logging-level="DEBUG" job-base-package-name="com.mycompany.batch"/> ! <mgmt-mntr-config mgmt-mntr-class-name="org.jmonks.batchserver.framework.mgmtmntr.DefaultMgmtMntrManager"> ! <property key="port-range">15000-20000</property> ! </mgmt-mntr-config> <job-controller-config> <job-controller controller-class-name="org.jmonks.batchserver.framework.controller.pool.PoolJobController" ! xml-factory-config-class-name="org.jmonks.batchserver.framework.config.xml.XMLPoolJobControllerConfig" ! db-factory-config-class-name="org.jmonks.batchserver.framework.config.db.DBPoolJobControllerConfig"/> ! <job-controller controller-class-name="org.jmonks.batchserver.framework.controller.basic.BasicJobController" ! xml-factory-config-class-name="org.jmonks.batchserver.framework.config.xml.XMLBasicJobControllerConfig" ! db-factory-config-class-name="org.jmonks.batchserver.framework.config.db.DBBasicJobControllerConfig"/> </job-controller-config> </framework-config> \ No newline at end of file Index: JobControllerConfig.java =================================================================== RCS file: /cvsroot/batchserver/batchserver/src/org/jmonks/batchserver/framework/config/JobControllerConfig.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** JobControllerConfig.java 8 Mar 2006 23:20:57 -0000 1.3 --- JobControllerConfig.java 9 Mar 2006 04:44:07 -0000 1.4 *************** *** 10,13 **** --- 10,14 ---- package org.jmonks.batchserver.framework.config; + import java.util.HashMap; import java.util.Iterator; import java.util.Map; *************** *** 42,46 **** * Map holds the required properties support the specified controller. */ ! protected Map jobControllerConfigProps=null; /** --- 43,47 ---- * Map holds the required properties support the specified controller. */ ! protected Map jobControllerConfigProps=new HashMap(); /** Index: PoolJobControllerConfig.java =================================================================== RCS file: /cvsroot/batchserver/batchserver/src/org/jmonks/batchserver/framework/config/PoolJobControllerConfig.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** PoolJobControllerConfig.java 8 Mar 2006 23:20:57 -0000 1.3 --- PoolJobControllerConfig.java 9 Mar 2006 04:44:07 -0000 1.4 *************** *** 11,14 **** --- 11,15 ---- package org.jmonks.batchserver.framework.config; + import java.util.HashMap; import java.util.Iterator; import java.util.Map; *************** *** 38,42 **** * Map contains the properties needed by pool job loader. */ ! protected Map poolJobLoaderConfigProps=null; /** * Pool job processor class name. --- 39,43 ---- * Map contains the properties needed by pool job loader. */ ! protected Map poolJobLoaderConfigProps=new HashMap(); /** * Pool job processor class name. *************** *** 46,50 **** * Map contains the properties needed by pool job processor. */ ! protected Map poolJobProcessorConfigProps=null; /** * Pool class name. --- 47,51 ---- * Map contains the properties needed by pool job processor. */ ! protected Map poolJobProcessorConfigProps=new HashMap(); /** * Pool class name. *************** *** 54,58 **** * Map contains the properties needed by pool class. */ ! protected Map poolConfigProps=null; /** --- 55,59 ---- * Map contains the properties needed by pool class. */ ! protected Map poolConfigProps=new HashMap(); /** |
