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

[noreply at shibboleth.net]

Author: scantor
Date: Wed Dec 17 10:57:51 2014
New Revision: 7145

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7145&view=rev
Log:
Move httpclient props into services.properties since they'll be used mainly with service resources.

Modified:
    trunk/idp-conf/src/main/resources/conf/idp.properties
    trunk/idp-conf/src/main/resources/conf/services.properties
    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=7145&r1=7144&r2=7145&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/idp.properties (original)
+++ trunk/idp-conf/src/main/resources/conf/idp.properties Wed Dec 17 10:57:51 2014
@@ -155,16 +155,3 @@
 # Languages to use if not match can be found with the browser supported languages.
 # List is semicolon-delimited, defaults to an empty list.
 idp.ui.fallbackLanguages=en;fr;de
-
-# Parameters for pre-defined HttpClient instances which perform in-memory and filesystem caching.
-# These are used with components which are explicitly wired with these client instances,
-# *not* by default with HTTP metadata resolvers.
-#idp.httpclient.memorycaching.connectionDisregardTLSCertificate = false
-#idp.httpclient.memorycaching.connectionTimeout = -1
-#idp.httpclient.memorycaching.maxCacheEntries = 50
-#idp.httpclient.memorycaching.maxCacheEntrySize = 1048576
-#idp.httpclient.filecaching.connectionDisregardTLSCertificate = false
-#idp.httpclient.filecaching.connectionTimeout = -1
-#idp.httpclient.filecaching.maxCacheEntries = 100
-#idp.httpclient.filecaching.maxCacheEntrySize = 10485760
-idp.httpclient.filecaching.cacheDirectory = %{idp.home}/tmp/httpClientCache

Modified: trunk/idp-conf/src/main/resources/conf/services.properties
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/services.properties?rev=7145&r1=7144&r2=7145&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/services.properties (original)
+++ trunk/idp-conf/src/main/resources/conf/services.properties Wed Dec 17 10:57:51 2014
@@ -35,3 +35,14 @@
 
 #idp.message.resources=shibboleth.MessageSourceResources
 #idp.message.cacheSeconds = 300
+
+# Parameters for pre-defined HttpClient instances which perform in-memory and filesystem caching.
+# These are used with components such as remote configuration resources that are explicitly wired
+# with these client instances, *not* by default with HTTP metadata resolvers.
+#idp.httpclient.connectionDisregardTLSCertificate = false
+#idp.httpclient.connectionTimeout = -1
+#idp.httpclient.memorycaching.maxCacheEntries = 50
+#idp.httpclient.memorycaching.maxCacheEntrySize = 1048576
+#idp.httpclient.filecaching.maxCacheEntries = 100
+#idp.httpclient.filecaching.maxCacheEntrySize = 10485760
+idp.httpclient.filecaching.cacheDirectory = %{idp.home}/tmp/httpClientCache

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=7145&r1=7144&r2=7145&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 Wed Dec 17 10:57:51 2014
@@ -238,8 +238,8 @@
     <bean id="shibboleth.FileCachingHttpClient"
         lazy-init="true"
         class="net.shibboleth.idp.profile.spring.relyingparty.metadata.FileCachingHttpClientFactoryBean"
-        p:connectionDisregardTLSCertificate="%{idp.httpclient.filecaching.connectionDisregardTLSCertificate:false}"
-        p:connectionTimeout="%{idp.httpclient.filecaching.connectionTimeout:-1}"
+        p:connectionDisregardTLSCertificate="%{idp.httpclient.connectionDisregardTLSCertificate:false}"
+        p:connectionTimeout="%{idp.httpclient.connectionTimeout:-1}"
         p:cacheDirectory="%{idp.httpclient.filecaching.cacheDirectory}"
         p:maxCacheEntries="%{idp.httpclient.filecaching.maxCacheEntries:100}"
         p:maxCacheEntrySize="%{idp.httpclient.filecaching.maxCacheEntrySize:10485760}" />
@@ -247,8 +247,8 @@
     <bean id="shibboleth.MemoryCachingHttpClient"
         lazy-init="true"
         class="net.shibboleth.idp.profile.spring.relyingparty.metadata.InMemoryCachingHttpClientFactoryBean"
-        p:connectionDisregardTLSCertificate="%{idp.httpclient.memorycaching.connectionDisregardTLSCertificate:false}"
-        p:connectionTimeout="%{idp.httpclient.memorycaching.connectionTimeout:-1}"
+        p:connectionDisregardTLSCertificate="%{idp.httpclient.connectionDisregardTLSCertificate:false}"
+        p:connectionTimeout="%{idp.httpclient.connectionTimeout:-1}"
         p:maxCacheEntries="%{idp.httpclient.memorycaching.maxCacheEntries:50}"

[... 3 lines stripped ...]