Subversion Repositories SmartDukaan

Rev

Rev 35385 | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 35385 Rev 35832
Line 34... Line 34...
34
	private static final String PATH_PREFIX = "/WEB-INF/views/";
34
	private static final String PATH_PREFIX = "/WEB-INF/views/";
35
	private static final String PATH_SUFFIX = ".jsp";
35
	private static final String PATH_SUFFIX = ".jsp";
36
	private static final String MESSAGE_PATH_SOURCE_NAME = "classpath:message";
36
	private static final String MESSAGE_PATH_SOURCE_NAME = "classpath:message";
37
	private static final Logger LOGGER = LogManager.getLogger(AppConfig.class);
37
	private static final Logger LOGGER = LogManager.getLogger(AppConfig.class);
38
	private static Resource resource;
38
	private static Resource resource;
-
 
39
	private static Resource sharedResource;
39
 
40
 
40
	public static Resource getResource() {
41
	public static Resource getResource() {
41
		return resource;
42
		return resource;
42
	}
43
	}
43
 
44
 
-
 
45
	public static Resource getSharedResource() {
-
 
46
		return sharedResource;
-
 
47
	}
-
 
48
 
44
	public void setResource(Resource resource) {
49
	public void setResource(Resource resource) {
45
		AppConfig.resource = resource;
50
		AppConfig.resource = resource;
46
	}
51
	}
47
 
52
 
48
	/*
53
	/*
Line 99... Line 104...
99
			appResource = new ClassPathResource("/META-INF/dev.properties");
104
			appResource = new ClassPathResource("/META-INF/dev.properties");
100
			sharedResource = new ClassPathResource("/shared-dev.properties");
105
			sharedResource = new ClassPathResource("/shared-dev.properties");
101
		}
106
		}
102
 
107
 
103
		resource = appResource;
108
		resource = appResource;
-
 
109
		AppConfig.sharedResource = sharedResource;
104
 
110
 
105
		// Load shared properties from dao first, then app-specific (app-specific can override)
111
		// Load shared properties from dao first, then app-specific (app-specific can override)
106
		propertySourcesPlaceholderConfigurer.setLocations(sharedResource, appResource);
112
		propertySourcesPlaceholderConfigurer.setLocations(sharedResource, appResource);
107
		propertySourcesPlaceholderConfigurer.setIgnoreResourceNotFound(true);
113
		propertySourcesPlaceholderConfigurer.setIgnoreResourceNotFound(true);
108
 
114