Move definition of MessageSource bean to ApplicationContext.

No functional changes.

Author: php-coder

src/main/java/ru/mystamps/web/config/ApplicationContext.java

@@ -17,8 +17,11 @@
  */
 package ru.mystamps.web.config;
 
+import org.springframework.context.MessageSource;
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
+import org.springframework.context.support.ReloadableResourceBundleMessageSource;
 
 @Configuration
 @Import({
@@ -29,4 +32,17 @@
 	StrategiesConfig.class
 })
 public class ApplicationContext {
+	
+	@Bean(name = "messageSource")
+	public MessageSource getMessageSource() {
+		ReloadableResourceBundleMessageSource messageSource =
+			new ReloadableResourceBundleMessageSource();
+		
+		messageSource.setBasename("classpath:ru/mystamps/i18n/SpringSecurityMessages");
+		messageSource.setDefaultEncoding("UTF-8");
+		messageSource.setFallbackToSystemLocale(false);
+		
+		return messageSource;
+	}
+	
 }

src/main/java/ru/mystamps/web/config/SecurityConfig.java

@@ -23,8 +23,6 @@
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.ImportResource;
 import org.springframework.context.ApplicationListener;
-import org.springframework.context.MessageSource;
-import org.springframework.context.support.ReloadableResourceBundleMessageSource;
 
 import org.springframework.security.authentication.encoding.PasswordEncoder;
 import org.springframework.security.authentication.encoding.ShaPasswordEncoder;
@@ -43,18 +41,6 @@ public class SecurityConfig {
 	@Inject
 	private ServicesConfig servicesConfig;
 
-	@Bean(name = "messageSource")
-	public MessageSource getMessageSource() {
-		ReloadableResourceBundleMessageSource messageSource =
-			new ReloadableResourceBundleMessageSource();
-		
-		messageSource.setBasename("classpath:ru/mystamps/i18n/SpringSecurityMessages");
-		messageSource.setDefaultEncoding("UTF-8");
-		messageSource.setFallbackToSystemLocale(false);
-		
-		return messageSource;
-	}
-	
 	@Bean
 	public ApplicationListener<AuthenticationFailureBadCredentialsEvent> getApplicationListener() {
 		return new AuthenticationFailureListener();