Project

General

Profile

« Previous | Next » 

Revision 56962

View differences:

ValidatorManagerImpl.java
32 32
@Transactional
33 33
public class ValidatorManagerImpl implements ValidatorManager {
34 34

  
35
        private Emailer emailer;
36
        private Validator validator;
35
	private Emailer emailer;
36
	private Validator validator;
37 37
	private JobsDAO jobsDao;
38 38
	private RulesetsDAO rulesetsDao;
39 39
	private RulesDAO rulesDao;
......
43 43
	private static Logger logger = Logger.getLogger(ValidatorManagerImpl.class);
44 44

  
45 45
	private ListenersManager listenersManager;
46
//	this.restartJobs();
47 46
	public void start() {
48 47
		logger.info("Initializing Validator Manager module");
49 48
		if (valRestore.isAutoRestoreOnStartup()) {
......
301 300
			Map<String, Set<Rule>> entityChosenRulesMapReferential = null;
302 301
			
303 302
			if (job.isCris()) {
304
				entityChosenRulesMap = new HashMap<String, Set<Rule>>();
305
				entityChosenRulesMapReferential = new HashMap<String, Set<Rule>>();
303
				entityChosenRulesMap = new HashMap<>();
304
				entityChosenRulesMapReferential = new HashMap<>();
306 305
				this.prepareCrisJobs(job, entityChosenRulesMap, entityChosenRulesMapReferential);
307 306
				newJob.setGroupByXpath("//header/setSpec");
308 307
				contentJobs = entityChosenRulesMap.keySet().size() + entityChosenRulesMapReferential.keySet().size();
......
337 336
			RegistrationListener regListener = null;
338 337
			if (job.isRegistration()) {
339 338
				regListener = listenersManager.createRegListener();
340
				regListener.setActivationId(job.getActivationId());
341
				regListener.setBaseUrl(job.getBaseUrl());
342
				regListener.setActivationId(job.getActivationId());
343
				regListener.setAdminEmails(job.getAdminEmails());
344
				regListener.setOfficialName(job.getOfficialName());
339
//				regListener.setActivationId(job.getActivationId());
340
//				regListener.setBaseUrl(job.getBaseUrl());
341
//				regListener.setActivationId(job.getActivationId());
342
//				regListener.setAdminEmails(job.getAdminEmails());
343
//				regListener.setOfficialName(job.getOfficialName());
345 344
				regListener.setUserMail(job.getUserEmail());
346 345
				regListener.setDatasourceId(job.getDatasourceId());
347 346
				regListener.setInterfaceId(job.getInterfaceId());
348
				regListener.setValidationSet(job.getValidationSet());
349
				regListener.setDesiredCompLevel(job.getDesiredCompatibilityLevel());
350
				regListener.setRepoType(job.getRepoType());
351
				regListener.setInterfaceIdOld(job.getInterfaceIdOld());
347
//				regListener.setValidationSet(job.getValidationSet());
348
//				regListener.setDesiredCompLevel(job.getDesiredCompatibilityLevel());
349
//				regListener.setRepoType(job.getRepoType());
350
//				regListener.setInterfaceIdOld(job.getInterfaceIdOld());
352 351
				regListener.setUpdateExisting(job.isUpdateExisting());	
353 352
				regListener.setTotalJobs(usageJobs + contentJobs);
354 353
			}

Also available in: Unified diff