[java-identity-provider COMMIT] in /trunk/idp-conf/src/main/resources: conf/services.xml messages/authn-messages.prop...

[noreply at shibboleth.net]

Author: scantor
Date: Wed Apr  6 20:22:49 2016
New Revision: 8199

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=8199&view=rev
Log:
IDP-944 - Allowing administrators to centrally override messages/translations

https://issues.shibboleth.net/jira/browse/IDP-944

Added:
    trunk/idp-conf/src/main/resources/messages/messages.properties   (with props)
    trunk/idp-conf/src/main/resources/system/messages/
    trunk/idp-conf/src/main/resources/system/messages/messages.properties   (with props)
Modified:
    trunk/idp-conf/src/main/resources/conf/services.xml
    trunk/idp-conf/src/main/resources/messages/authn-messages.properties
    trunk/idp-conf/src/main/resources/messages/consent-messages.properties
    trunk/idp-conf/src/main/resources/messages/error-messages.properties

Modified: trunk/idp-conf/src/main/resources/conf/services.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/services.xml?rev=8199&r1=8198&r2=8199&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/services.xml	(original)
+++ trunk/idp-conf/src/main/resources/conf/services.xml	Wed Apr  6 20:22:49 2016
@@ -134,12 +134,11 @@
     <!--
     This collection of resources differs slightly in that it should not include the file extension.
     Message sources are internationalized, and Spring will search for a compatible language extension
-    and fall back to one with a .properties extension.
+    and fall back to one with only a .properties extension.
     -->
     <util:list id="shibboleth.MessageSourceResources">
-        <value>%{idp.home}/messages/authn-messages</value>
-        <value>%{idp.home}/messages/consent-messages</value>
-        <value>%{idp.home}/messages/error-messages</value>
+        <value>%{idp.home}/messages/messages</value>
+        <value>%{idp.home}/system/messages/messages</value>
     </util:list>
     
 </beans>