[java-identity-provider COMMIT] in /trunk/idp-conf/src/main/resources: conf/idp.properties conf/services.xml system/c...

[noreply at shibboleth.net]

Author: scantor
Date: Mon Aug  4 10:59:32 2014
New Revision: 6386

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6386&view=rev
Log:
Move message source resources out of global-system.

Modified:
    trunk/idp-conf/src/main/resources/conf/idp.properties
    trunk/idp-conf/src/main/resources/conf/services.xml
    trunk/idp-conf/src/main/resources/system/conf/global-system.xml

Modified: trunk/idp-conf/src/main/resources/conf/idp.properties
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/idp.properties?rev=6386&r1=6385&r2=6386&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/idp.properties (original)
+++ trunk/idp-conf/src/main/resources/conf/idp.properties Mon Aug  4 10:59:32 2014
@@ -50,6 +50,9 @@
 
 # Set if a different default view name for events and exceptions is needed
 #idp.errors.defaultView = error
+
+# Time in seconds between if-modified checks of message property source(s)
+#idp.errors.cacheSeconds = 300
 
 # Set to shibboleth.StoredTransientIdGenerator for server-side storage
 #idp.transientId.generator = shibboleth.CryptoTransientIdGenerator

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=6386&r1=6385&r2=6386&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/services.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/services.xml Mon Aug  4 10:59:32 2014
@@ -54,7 +54,7 @@
     -->
     
     <!--
-    Otherwise by default we look at files whose names are derived from %{idp.home}. Services not configured
+    Otherwise by default we look at resources whose names are derived from %{idp.home}. Services not configured
     using native Spring syntax also need to load the property-placeholder file in order to pull settings from
     property sources.
     -->
@@ -99,4 +99,13 @@
         <value>%{idp.home}/system/conf/access-control-system.xml</value>
     </util:list>
 
-</beans>
+    <!--
+    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.
+    -->
+    <util:list id="shibboleth.MessageSourceResources">
+        <value>%{idp.home}/conf/messages</value>
+    </util:list>
+    
+</beans>

Modified: trunk/idp-conf/src/main/resources/system/conf/global-system.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/conf/global-system.xml?rev=6386&r1=6385&r2=6386&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/conf/global-system.xml (original)
+++ trunk/idp-conf/src/main/resources/system/conf/global-system.xml Mon Aug  4 10:59:32 2014
@@ -32,7 +32,8 @@
     <bean class="net.shibboleth.ext.spring.config.IdentifiableBeanPostProcessor" />
 
     <bean id="messageSource" class="org.springframework.context.support.ReloadableResourceBundleMessageSource"
-            p:cacheSeconds="300" p:basename="%{idp.home}/conf/messages" />
+            p:cacheSeconds="%{idp.errors.cacheSeconds:300}"
+            p:basenames-ref="shibboleth.MessageSourceResources" />
 
     <import resource="general-authn-system.xml" />
     <import resource="session-manager.xml" />