Project

General

Profile

« Previous | Next » 

Revision 35186

Added by Nikon Gasparis about 9 years ago

*updated dnetProvider
*fixed a bug with the standalone mode

View differences:

ValidatorServiceContextLoaderListener.java
32 32
		Properties props = this.loadProperties();
33 33
		String repoMode = props.getProperty("services.validator.mode.repo");
34 34
		String userMode = props.getProperty("services.validator.mode.user");
35
		String dbMode = props.getProperty("services.validator.mode.db");
35
		String dnetWorkflow = props.getProperty("services.validator.dnetWorkflow");
36 36
		Boolean standaloneMode = Boolean.parseBoolean(props.getProperty("services.validator.mode.standalone"));
37 37
		
38
		logger.debug("User mode: " + userMode);
39
		logger.debug("Repo mode: " + repoMode);
40
		logger.debug("Dnet workflow enabled: " + repoMode);
38
//		logger.debug("User mode: " + userMode);
39
//		logger.debug("Repo mode: " + repoMode);
40
		logger.debug("Dnet workflow enabled: " + dnetWorkflow);
41
		String serviceMode= "";
42
		if (standaloneMode) 
43
			serviceMode = "standalone";
44
		else
45
			serviceMode = "IS";
46
		logger.debug("Service mode: " + serviceMode);
41 47
		XmlWebApplicationContext ctx = new XmlWebApplicationContext();
42 48
//		AbstractApplicationContext ctxP = 
43 49
//			    new ClassPathXmlApplicationContext("classpath:WEB-INF/applicationContext.xml");
......
48 54

  
49 55
		ctx.setServletContext(servletContext);
50 56
		
51
		
52 57
		String[] springContextCore = new String[] {
53 58
				
54 59
				"classpath*:/eu/dnetlib/validator/service/config/springContext-validator-config.xml",
......
56 61
				"classpath:META-INF/cxf/cxf-extension-soap.xml",
57 62
				"classpath:META-INF/cxf/cxf-extension-jaxws.xml",
58 63
				"classpath:META-INF/cxf/cxf-servlet.xml",
59
				"classpath*:/cxf.xml",
60 64
				"classpath*:/eu/dnetlib/soap/cxf/applicationContext-eprbuilders.xml",
61 65
				"classpath*:/eu/dnetlib/validator/commons/dao/springContext-validator-dao-datasource.xml",
62 66
				"classpath*:/eu/dnetlib/validator/commons/dao/springContext-validator-dao.xml",
......
65 69
				"classpath*:/eu/dnetlib/validator/service/providers/springContext-validator-providers.xml",
66 70
				"classpath*:/eu/dnetlib/validator/service/springContext-validator-library.xml",
67 71
				"classpath*:/eu/dnetlib/validator/service/springContext-validator-manager.xml",
68
				"classpath*:/eu/dnetlib/validator/service/springContext-validator-service-standalone.xml"
72
				"classpath*:/eu/dnetlib/validator/service/springContext-validator-service-"+serviceMode+".xml"
69 73
		};
70 74
		
71 75
		String[] springContextForIS = new String[] {
76
				"classpath*:/gr/uoa/di/driver/util/springContext-locators.xml",
77
				"classpath*:/eu/dnetlib/clients/ws/springContext-locatorFactory.xml",
78
				"classpath*:/gr/uoa/di/driver/app/springContext-commons.xml",
72 79
				"classpath*:/gr/uoa/di/driver/app/springContext-lookupFactory.xml",
73 80
				"classpath*:/gr/uoa/di/driver/app/springContext-lookupClients.xml",
81
				"classpath*:/gr/uoa/di/driver/app/springContext-registrator.xml",
74 82
				"classpath*:/eu/dnetlib/enabling/hcm/springContext-hcmService.xml",
75
				"classpath*:/gr/uoa/di/driver/app/springContext-commons.xml",
76
				"classpath*:/gr/uoa/di/driver/util/springContext-locators.xml",
77
				"classpath*:/eu/dnetlib/clients/ws/springContext-locatorFactory.xml",
78
				"classpath*:/gr/uoa/di/driver/app/springContext-registrator.xml",
79
				"classpath*:/eu/dnetlib/validator/service/springContext-validator-blackboard.xml",
80
				"classpath*:/eu/dnetlib/validator/service/springContext-validator-service.xml"
83
				"classpath*:/eu/dnetlib/validator/service/springContext-validator-blackboard.xml"
84
//				"classpath*:/eu/dnetlib/validator/service/springContext-validator-service-IS.xml"
81 85
		};
82 86
		
83 87
		if (standaloneMode) {

Also available in: Unified diff