Subversion Repositories SmartDukaan

Rev

Rev 35803 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 35803 Rev 35830
Line 110... Line 110...
110 
    @Bean
 110 
    @Bean
111 
    public static PropertySourcesPlaceholderConfigurer propertyConfigurer1() {
 111 
    public static PropertySourcesPlaceholderConfigurer propertyConfigurer1() {
112 
        LOGGER.info("Called Configuration");
 112 
        LOGGER.info("Called Configuration");
113 
        PropertySourcesPlaceholderConfigurer propertySourcesPlaceholderConfigurer = new PropertySourcesPlaceholderConfigurer();
 113 
        PropertySourcesPlaceholderConfigurer propertySourcesPlaceholderConfigurer = new PropertySourcesPlaceholderConfigurer();
114 
 
 114 
 
115 
        // Load shared properties from dao first, then app-specific (app-specific can override)
 - 
 
116 
        Resource sharedResource = new ClassPathResource("/shared-dev.properties");
 - 
 
117 
        Resource appResource = new ClassPathResource("/META-INF/env.properties");
 115 
        Resource appResource = new ClassPathResource("/META-INF/env.properties");
118 
 
 116 
 
119 
        propertySourcesPlaceholderConfigurer.setLocations(sharedResource, appResource);
 117 
        propertySourcesPlaceholderConfigurer.setLocations(appResource);
120 
        propertySourcesPlaceholderConfigurer.setIgnoreResourceNotFound(true);
 118 
        propertySourcesPlaceholderConfigurer.setIgnoreResourceNotFound(true);
121 
 
 119 
 
122 
        return propertySourcesPlaceholderConfigurer;
 120 
        return propertySourcesPlaceholderConfigurer;
123 
    }
 121 
    }
124 
 
 122