Skip to content

Commit

Permalink
Imcms-262 - Update Password Reset feature:
Browse files Browse the repository at this point in the history
- Correct webapp config in spring DispatcherServlet.
  • Loading branch information
Serg-Maximchuk committed Oct 9, 2017
1 parent f404890 commit 29f462a
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 12 deletions.
10 changes: 0 additions & 10 deletions src/main/java/com/imcode/imcms/config/ApplicationConfig.java
Expand Up @@ -42,16 +42,6 @@ public Config imageArchiveConfig(Environment environment) {
return config;
}

@Bean
public CustomEditorConfigurer customEditorConfigurer() {
CustomEditorConfigurer customEditorConfigurer = new CustomEditorConfigurer();
Map<Class<?>, Class<? extends PropertyEditor>> customEditors = new ManagedMap<>();
customEditors.put(File.class, FileEditor.class);
customEditors.put(File[].class, FileArrayEditor.class);
customEditorConfigurer.setCustomEditors(customEditors);
return customEditorConfigurer;
}

@Bean
public ReloadableResourceBundleMessageSource reloadableResourceBundleMessageSource() {
ReloadableResourceBundleMessageSource source = new ReloadableResourceBundleMessageSource();
Expand Down
1 change: 0 additions & 1 deletion src/main/java/com/imcode/imcms/config/MainConfig.java
Expand Up @@ -20,7 +20,6 @@
"com.imcode.imcms.imagearchive",
"com.imcode.imcms.api.linker",
"imcode.util",
"com.imcode.imcms.servlet.apis",
"com.imcode.imcms.document.text"
})
public class MainConfig {
Expand Down
4 changes: 4 additions & 0 deletions src/main/java/com/imcode/imcms/config/WebConfig.java
Expand Up @@ -2,6 +2,7 @@

import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
import org.springframework.core.env.Environment;
import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
Expand All @@ -12,6 +13,9 @@

@Configuration
@EnableWebMvc
@ComponentScan({
"com.imcode.imcms.servlet.apis"
})
public class WebConfig extends WebMvcConfigurerAdapter {

public final Environment environment;
Expand Down
2 changes: 1 addition & 1 deletion src/main/webapp/WEB-INF/web.xml
Expand Up @@ -144,7 +144,7 @@
and fully-qualified @Configuration classes -->
<init-param>
<param-name>contextConfigLocation</param-name>
<param-value>com.imcode.imcms.config.MainConfig</param-value>
<param-value>com.imcode.imcms.config.WebConfig</param-value>
</init-param>
</servlet>

Expand Down

0 comments on commit 29f462a

Please sign in to comment.