externalize locale and message resolver configuration

openid-connect-common/src/main/java/org/mitre/openid/connect/config/ConfigurationBeanLocaleResolver.java

@@ -38,7 +38,6 @@ import org.springframework.web.servlet.i18n.AbstractLocaleContextResolver;
  * @author jricher
  *
  */
-@Component("localeResolver")
 public class ConfigurationBeanLocaleResolver extends AbstractLocaleContextResolver {
 
 	@Autowired

openid-connect-server-webapp/src/main/webapp/WEB-INF/application-context.xml

@@ -198,10 +198,7 @@
 	<bean id="clientAssertionAuthenticationProvider" class="org.mitre.openid.connect.assertion.JWTBearerAuthenticationProvider" />
 
 	<!-- Configure locale information -->
-	<bean id="messageSource" class="org.mitre.openid.connect.config.JsonMessageSource">
-		<property name="baseDirectory" value="/resources/js/locale/" />
-		<property name="useCodeAsDefaultMessage" value="true" />
-	</bean>
+	<import resource="locale-config.xml" />
 
 	<!-- user services -->
 	<import resource="user-context.xml" />

openid-connect-server-webapp/src/main/webapp/WEB-INF/locale-config.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+
+	<bean id="messageSource" class="org.mitre.openid.connect.config.JsonMessageSource">
+		<property name="baseDirectory" value="/resources/js/locale/" />
+		<property name="useCodeAsDefaultMessage" value="true" />
+	</bean>
+
+	<bean id="localeResolver" class="org.mitre.openid.connect.config.ConfigurationBeanLocaleResolver" />
+
+</beans>