Commit 4d738cda authored by Matija Obreza's avatar Matija Obreza

Include genesys.properties in propertyPlaceholderConfigurer

parent 650d22b4
......@@ -33,11 +33,17 @@ public class SpringCommonConfig {
@Bean
public PropertyPlaceholderConfigurer propertyPlaceholderConfigurer() {
final PropertyPlaceholderConfigurer propertyPlaceholderConfigurer = new PropertyPlaceholderConfigurer();
// Need to ignore "genesys.properties" if not found
propertyPlaceholderConfigurer.setIgnoreResourceNotFound(true);
propertyPlaceholderConfigurer.setLocation(new ClassPathResource("application.properties"));
propertyPlaceholderConfigurer.setLocation(new ClassPathResource("spring/spring.properties"));
// Include genesys.properties
propertyPlaceholderConfigurer.setLocation(new ClassPathResource("genesys.properties"));
return propertyPlaceholderConfigurer;
}
......
......@@ -87,9 +87,15 @@ public class SpringServletConfig extends WebMvcConfigurerAdapter {
public PropertyPlaceholderConfigurer propertyPlaceholderConfigurer() {
final PropertyPlaceholderConfigurer propertyPlaceholderConfigurer = new PropertyPlaceholderConfigurer();
// Need to ignore "genesys.properties" if not found
propertyPlaceholderConfigurer.setIgnoreResourceNotFound(true);
propertyPlaceholderConfigurer.setLocation(new ClassPathResource("application.properties"));
propertyPlaceholderConfigurer.setLocation(new ClassPathResource("spring/spring.properties"));
// Include genesys.properties
propertyPlaceholderConfigurer.setLocation(new ClassPathResource("genesys.properties"));
return propertyPlaceholderConfigurer;
}
......@@ -114,7 +120,7 @@ public class SpringServletConfig extends WebMvcConfigurerAdapter {
@Bean
public BetterSessionLocaleResolver localeResolver() {
final Set<String> supportedLocales = new HashSet();
final Set<String> supportedLocales = new HashSet<String>();
supportedLocales.add("en");
supportedLocales.add("ar");
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment