[Batchserver-cvs] batchserver/src/org/jmonks/batchserver/framework/repository/db4o Db4oRepository.
Brought to you by:
suresh_pragada
Menu
▾
▴
[Batchserver-cvs] batchserver/src/org/jmonks/batchserver/framework/repository/db4o Db4oRepository.java, 1.8, 1.9
|
From: Suresh <sur...@us...> - 2006-09-12 23:23:34
|
Update of /cvsroot/batchserver/batchserver/src/org/jmonks/batchserver/framework/repository/db4o In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv21429 Modified Files: Db4oRepository.java Log Message: no message Index: Db4oRepository.java =================================================================== RCS file: /cvsroot/batchserver/batchserver/src/org/jmonks/batchserver/framework/repository/db4o/Db4oRepository.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** Db4oRepository.java 12 Sep 2006 04:07:55 -0000 1.8 --- Db4oRepository.java 12 Sep 2006 23:23:31 -0000 1.9 *************** *** 116,132 **** /** ! * @see org.jmonks.batchserver.framework.repository Repository#sendDataToNextJob(String,String,String,Object) */ ! public boolean sendDataToNextJob(String dataIdentifier, String sourceJobName, String targetJobName, final Object data) { logger.trace("Entering sendDataToNextJob);"); ! logger.debug("data identifier = " + dataIdentifier + " source job name = " + sourceJobName + " target job name = " + targetJobName + " data = " + data); ! if(dataIdentifier==null || sourceJobName==null || targetJobName==null || data==null) throw new IllegalArgumentException("No arguments cannot be null to the sendDataToNextJob method."); final String finalDataIdentifier=dataIdentifier; ! final String finalSourceJobName=sourceJobName; ! final String finalTargetJobName=targetJobName; boolean dataSaved=false; --- 116,132 ---- /** ! * @see org.jmonks.batchserver.framework.repository Repository#sendDataToNextJob(String,String,Object) */ ! public boolean sendDataToNextJob(String dataIdentifier, String nextJobName, final Object data) { logger.trace("Entering sendDataToNextJob);"); ! logger.debug("data identifier = " + dataIdentifier + " next job name = " + nextJobName + " data = " + data); ! if(dataIdentifier==null || nextJobName==null || data==null) throw new IllegalArgumentException("No arguments cannot be null to the sendDataToNextJob method."); final String finalDataIdentifier=dataIdentifier; ! final String finalSourceJobName=this.jobName; ! final String finalNextJobName=nextJobName; boolean dataSaved=false; *************** *** 144,148 **** if(finalDataIdentifier.equals(jobDataTransfer.getDataIdentifier()) && finalSourceJobName.equals(jobDataTransfer.getSourceJobName()) && ! finalTargetJobName.equals(jobDataTransfer.getTargetJobName())) return true; else --- 144,148 ---- if(finalDataIdentifier.equals(jobDataTransfer.getDataIdentifier()) && finalSourceJobName.equals(jobDataTransfer.getSourceJobName()) && ! finalNextJobName.equals(jobDataTransfer.getTargetJobName())) return true; else *************** *** 155,167 **** } container.commit(); ! logger.trace("deleted the data identified by " + dataIdentifier + " from the job name " + sourceJobName); /** * Add the new entry. */ ! Db4oJobDataTransferHolder dataTransfer=new Db4oJobDataTransferHolder(dataIdentifier, sourceJobName, targetJobName, data); container.set(dataTransfer); container.commit(); ! logger.trace("data has been added with the identifier " + dataIdentifier + " from job name " + sourceJobName); dataSaved=true; } --- 155,167 ---- } container.commit(); ! logger.trace("deleted the data identified by " + dataIdentifier + " from the job name " + this.jobName + " to " + nextJobName); /** * Add the new entry. */ ! Db4oJobDataTransferHolder dataTransfer=new Db4oJobDataTransferHolder(dataIdentifier, this.jobName, nextJobName, data); container.set(dataTransfer); container.commit(); ! logger.trace("data has been added with the identifier " + dataIdentifier + " from job name " + this.jobName); dataSaved=true; } *************** *** 171,188 **** /** ! * @see org.jmonks.batchserver.framework.repository.Repository#getDataFromPreviousJob(String,String,String) */ ! public Object getDataFromPreviousJob(String dataIdentifier, String sourceJobName, String targetJobName) { logger.trace("Entering getDataFromPreviousJob"); ! logger.debug("data identifier = " + dataIdentifier + " source job name = " + sourceJobName + " target job name = " + targetJobName); ! if(dataIdentifier==null || sourceJobName==null || targetJobName==null) ! throw new IllegalArgumentException("Data identifer, source job name and target job name cannot be null " + "to get the data from previous job."); final String finalDataIdentifier=dataIdentifier; ! final String finalSourceJobName=sourceJobName; ! final String finalTargetJobName=targetJobName; Object data=null; --- 171,188 ---- /** ! * @see org.jmonks.batchserver.framework.repository.Repository#getDataFromPreviousJob(String,String) */ ! public Object getDataFromPreviousJob(String dataIdentifier, String previousJobName) { logger.trace("Entering getDataFromPreviousJob"); ! logger.debug("data identifier = " + dataIdentifier + " target job name = " + previousJobName); ! if(dataIdentifier==null || previousJobName==null) ! throw new IllegalArgumentException("Data identifer and previous job name cannot be null " + "to get the data from previous job."); final String finalDataIdentifier=dataIdentifier; ! final String finalPreviousJobName=previousJobName; ! final String finalTargetJobName=this.jobName; Object data=null; *************** *** 196,200 **** { if(finalDataIdentifier.equals(jobDataTransfer.getDataIdentifier()) && ! finalSourceJobName.equals(jobDataTransfer.getSourceJobName()) && finalTargetJobName.equals(jobDataTransfer.getTargetJobName())) { --- 196,200 ---- { if(finalDataIdentifier.equals(jobDataTransfer.getDataIdentifier()) && ! finalPreviousJobName.equals(jobDataTransfer.getSourceJobName()) && finalTargetJobName.equals(jobDataTransfer.getTargetJobName())) { *************** *** 209,213 **** { data=((Db4oJobDataTransferHolder)dataTransferResultSet.next()).getData(); ! logger.debug("data identified by " + dataIdentifier + " has been found from the source job name " + sourceJobName); } else --- 209,213 ---- { data=((Db4oJobDataTransferHolder)dataTransferResultSet.next()).getData(); ! logger.debug("data identified by " + dataIdentifier + " has been found from the source job name " + previousJobName); } else *************** *** 219,233 **** /** ! * @see org.jmonks.batchserver.framework.repository.Repository#clearDataTransferredToNextJob(String) */ ! public boolean clearDataTransferredFromThisJob(String jobName) { logger.trace("Entering clearDataTransferredToNextJob"); - logger.debug("clearDataTransferredToNextJob :: job name = " + jobName); - - if(jobName==null) - throw new IllegalArgumentException("job name cannot be null."); ! final String finalJobName=jobName; boolean dataCleared=false; if(container==null) --- 219,229 ---- /** ! * @see org.jmonks.batchserver.framework.repository.Repository#clearDataTransferredToNextJob() */ ! public boolean clearDataTransferredFromThisJob() { logger.trace("Entering clearDataTransferredToNextJob"); ! final String finalJobName=this.jobName; boolean dataCleared=false; if(container==null) *************** *** 259,271 **** /** ! * @see org.jmonks.batchserver.framework.repository.Repository#registerJobMgmtMntrInfo(String,Object) */ ! public boolean registerJobMgmtMntrInfo(String jobName, final Object registrationInfo) { logger.trace("Entering registerJobMgmtMntrInfo"); ! logger.debug("job name = " + jobName + " registratinfo = " + registrationInfo); - if(jobName==null) - throw new IllegalArgumentException("Job name cannot be null to register the job in repository."); if(registrationInfo==null) throw new IllegalArgumentException("Job registration information cannot be null to register the job in repository."); --- 255,265 ---- /** ! * @see org.jmonks.batchserver.framework.repository.Repository#registerJobMgmtMntrInfo(Object) */ ! public boolean registerJobMgmtMntrInfo(final Object registrationInfo) { logger.trace("Entering registerJobMgmtMntrInfo"); ! logger.debug("registratinfo = " + registrationInfo); if(registrationInfo==null) throw new IllegalArgumentException("Job registration information cannot be null to register the job in repository."); *************** *** 277,290 **** else { ! ObjectSet mgmtMntrInfoHolderResultSet=container.query(new Db4oJobMgmtMntrInfoHolderPredicate(jobName)); while(mgmtMntrInfoHolderResultSet.hasNext()) container.delete(mgmtMntrInfoHolderResultSet.next()); container.commit(); ! logger.trace(jobName + " previous mgmt and mntr information has been deleted"); ! container.set(new Db4oJobMgmtMntrInfoHolder(jobName, registrationInfo)); container.commit(); ! logger.trace(jobName + " mgmt and mntr information has been added to the repository"); registered=true; } --- 271,284 ---- else { ! ObjectSet mgmtMntrInfoHolderResultSet=container.query(new Db4oJobMgmtMntrInfoHolderPredicate(this.jobName)); while(mgmtMntrInfoHolderResultSet.hasNext()) container.delete(mgmtMntrInfoHolderResultSet.next()); container.commit(); ! logger.trace(this.jobName + " previous mgmt and mntr information has been deleted"); ! container.set(new Db4oJobMgmtMntrInfoHolder(this.jobName, registrationInfo)); container.commit(); ! logger.trace(this.jobName + " mgmt and mntr information has been added to the repository"); registered=true; } *************** *** 294,335 **** /** ! * @see org.jmonks.batchserver.framework.repository.Repository#lookupJobMgmtMntrInfo(String) ! */ ! public Object lookupJobMgmtMntrInfo(String jobName) ! { ! logger.trace("Entering lookupJobMgmtMntrInfo"); ! logger.debug("lookupJobMgmtMntrInfo :: job name = " + jobName); ! ! if(jobName==null) ! throw new IllegalArgumentException("jobName cannot be null to lookup the mgmt and mntr information."); ! ! Object registratInfo=null; ! if(container==null) ! registratInfo=null; ! else ! { ! ObjectSet mgmtMntrInfoHolderResultSet=container.query(new Db4oJobMgmtMntrInfoHolderPredicate(jobName)); ! if(mgmtMntrInfoHolderResultSet.hasNext()) ! { ! registratInfo=((Db4oJobMgmtMntrInfoHolder)mgmtMntrInfoHolderResultSet.next()).getMgmtMntrInfo(); ! logger.debug(jobName + " management and monitoring information has been found and being returned"); ! } ! else ! registratInfo=null; ! } ! logger.trace("Exiting lookupJobMgmtMntrInfo"); ! return registratInfo; ! } ! ! /** ! * @see org.jmonks.batchserver.framework.repository.Repository#unregisterJobMgmtMntrInfo(String) */ ! public boolean unregisterJobMgmtMntrInfo(String jobName) { logger.trace("Entering unregisterJobMgmtMntrInfo"); - logger.debug("unregisterJobMgmtMntrInfo :: job name = " + jobName); - - if(jobName==null) - throw new IllegalArgumentException("jobName cannot be null to unregister the mgmt and mntr information."); boolean unregistered=false; --- 288,296 ---- /** ! * @see org.jmonks.batchserver.framework.repository.Repository#unregisterJobMgmtMntrInfo() */ ! public boolean unregisterJobMgmtMntrInfo() { logger.trace("Entering unregisterJobMgmtMntrInfo"); boolean unregistered=false; *************** *** 339,348 **** else { ! ObjectSet mgmtMntrInfoHolderResultSet=container.query(new Db4oJobMgmtMntrInfoHolderPredicate(jobName)); if(mgmtMntrInfoHolderResultSet.hasNext()) { container.delete(mgmtMntrInfoHolderResultSet.next()); container.commit(); ! logger.debug(jobName + " mgmt and mntr information has been deleted."); unregistered=true; } --- 300,309 ---- else { ! ObjectSet mgmtMntrInfoHolderResultSet=container.query(new Db4oJobMgmtMntrInfoHolderPredicate(this.jobName)); if(mgmtMntrInfoHolderResultSet.hasNext()) { container.delete(mgmtMntrInfoHolderResultSet.next()); container.commit(); ! logger.debug(this.jobName + " mgmt and mntr information has been deleted."); unregistered=true; } *************** *** 355,383 **** /** - * @see org.jmonks.batchserver.framework.repository.Repository#getAllRegisteredMgmtMntrInfo() - */ - public Map getAllRegisteredMgmtMntrInfo() - { - logger.trace("Entering getAllRegisteredMgmtMntrInfo"); - - Map registeredJobs=new HashMap(); - if(container==null) - { - // ObjectContainer is not initialized properly. Return the empty map. - } - else - { - ObjectSet mgmtMntrInfoHolderResultSet=container.query(Db4oJobMgmtMntrInfoHolder.class); - while(mgmtMntrInfoHolderResultSet.hasNext()) - { - Db4oJobMgmtMntrInfoHolder mgmtMntrInfoHolder=((Db4oJobMgmtMntrInfoHolder)mgmtMntrInfoHolderResultSet.next()); - registeredJobs.put(mgmtMntrInfoHolder.getJobName(), mgmtMntrInfoHolder.getMgmtMntrInfo()); - } - } - logger.trace("Exiting getAllRegisteredMgmtMntrInfo"); - return registeredJobs; - } - - /** * * @see org.jmonks.batchserver.framework.repository.Repository#logStatistics(org.jmonks.batchserver.framework.JobStatistics) --- 316,319 ---- *************** *** 389,392 **** --- 325,330 ---- if(statistics==null) throw new IllegalArgumentException("Null statistic objects will not be saved in repository"); + if(!statistics.getJobname().equals(this.jobName)) + throw new IllegalArgumentException("Statistics object is not related to the job configured for this repository."); boolean logged=false; *************** *** 403,524 **** return logged; } - - /** - * @see org.jmonks.batchserver.framework.repository.Repository#getStatistics(String) - */ - public JobStatistics[] getStatistics(String jobName) - { - logger.trace("Entering getStatistics"); - logger.debug("getStatistics :: job name = " + jobName); - - if(jobName==null) - throw new IllegalArgumentException("job name cannot be null for querying the job statistics."); - - JobStatistics[] statistics=null; - - if(container==null) - statistics=new JobStatistics[0]; - else - { - ObjectSet statisticsResultSet=container.query(new Db4oJobStatisticsPredicate(jobName)); - logger.debug("Number of statistics objects = " + statisticsResultSet.size()); - statistics=new JobStatistics[statisticsResultSet.size()]; - for(int i=0;statisticsResultSet.hasNext();i++) - statistics[i]=(JobStatistics)statisticsResultSet.next(); - } - logger.trace("Exiting getStatistics"); - return statistics; - } - - //////// /** - //////// * @see org.jmonks.batchserver.framework.repository.Repository#saveController(String,org.jmonks.batchserver.framework.controller.JobController) - //////// */ - //////// public boolean saveController(String jobName, final JobController controller) - //////// { - //////// logger.trace("Entering saveController"); - //////// logger.debug("saveController :: job name = " + jobName + " controller = " + controller); - //////// if(jobName==null || controller==null) - //////// throw new IllegalArgumentException("job name and controller cannot be null to save the controller."); - //////// - //////// boolean saved=true; - //////// - //////// if(container==null) - //////// saved=false; - //////// else - //////// { - //////// ObjectSet jobControllerHolderResultSet=container.query(new Db4oJobControllerHolderPredicate(jobName)); - //////// - //////// while(jobControllerHolderResultSet.hasNext()) - //////// container.delete(jobControllerHolderResultSet.next()); - //////// container.commit(); - //////// - //////// container.set(new Db4oJobControllerHolder(jobName, controller)); - //////// container.commit(); - //////// logger.debug(jobName + " controller has been added to the repository."); - //////// saved=true; - //////// } - //////// logger.trace("Exiting saveController"); - //////// return saved; - //////// } - //////// - //////// /** - //////// * @see org.jmonks.batchserver.framework.repository.Repository#loadController(String) - //////// */ - //////// public JobController loadController(String jobName) - //////// { - //////// logger.trace("Entering loadController"); - //////// logger.debug(" loadController :: job name = " + jobName); - //////// - //////// if(jobName==null) - //////// throw new IllegalArgumentException("jobName cannot be null to load the controller."); - //////// - //////// JobController controller=null; - //////// if(container==null) - //////// controller=null; - //////// else - //////// { - //////// ObjectSet jobControllerHolderResultSet=container.query(new Db4oJobControllerHolderPredicate(jobName)); - //////// if(jobControllerHolderResultSet.hasNext()) - //////// { - //////// controller=((Db4oJobControllerHolder)jobControllerHolderResultSet.next()).getJobController(); - //////// logger.debug(jobName + " controller found and being returned"); - //////// } - //////// else - //////// controller=null; - //////// } - //////// logger.trace("Exiting loadController"); - //////// return controller; - //////// } - //////// - //////// /** - //////// * @see org.jmonks.batchserver.framework.repository.Repository#releaseController(String) - //////// */ - //////// public boolean releaseController(String jobName) - //////// { - //////// logger.trace("Entering releaseController"); - //////// logger.debug(" releaseController :: job name = " + jobName); - //////// - //////// if(jobName==null) - //////// throw new IllegalArgumentException("jobName cannot be null to release the controller."); - //////// - //////// boolean released=false; - //////// - //////// if(container==null) - //////// released=false; - //////// else - //////// { - //////// ObjectSet jobControllerHolderResultSet=container.query(new Db4oJobControllerHolderPredicate(jobName)); - //////// if(jobControllerHolderResultSet.hasNext()) - //////// { - //////// container.delete(jobControllerHolderResultSet.next()); - //////// container.commit(); - //////// logger.debug(jobName + " controller has been released"); - //////// released=true; - //////// } - //////// else - //////// released=false; - //////// } - //////// logger.trace("Exiting releaseController"); - //////// return released; - //////// } } --- 341,343 ---- |
