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

[noreply at shibboleth.net]

Author: putmanb
Date: Tue Dec 16 17:02:18 2014
New Revision: 7125

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7125&view=rev
Log:
Uncomment and flesh out in-memory and file caching HttpClient instances defined in global system.  Primarily for use with HTTPResources.

Modified:
    trunk/idp-conf/src/main/resources/conf/idp.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=7125&r1=7124&r2=7125&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/idp.properties (original)
+++ trunk/idp-conf/src/main/resources/conf/idp.properties Tue Dec 16 17:02:18 2014
@@ -149,3 +149,16 @@
 # 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/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=7125&r1=7124&r2=7125&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 Tue Dec 16 17:02:18 2014
@@ -235,19 +235,21 @@
         factory-method="buildBasicInlineKeyInfoCredentialResolver" />
         
     <!--  These are the common caching HttpClients wired to by multiple components, such as HTTPResources. -->
-    <!-- TODO expose other properties by default? -->
-    <!-- TODO toggle to build only one or the other, etc? -->
-    <!--
     <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:cacheDirectory="%{idp.httpclient.filecaching.cacheDirectory}"
-        p:maxCacheEntries="%{idp.httpclient.filecaching.maxCacheEntries}"
-        p:maxCacheEntrySize="%{idp.httpclient.filecaching.maxCacheEntrySize}" />
+        p:maxCacheEntries="%{idp.httpclient.filecaching.maxCacheEntries:100}"
+        p:maxCacheEntrySize="%{idp.httpclient.filecaching.maxCacheEntrySize:10485760}" />
         
     <bean id="shibboleth.MemoryCachingHttpClient"
+        lazy-init="true"
         class="net.shibboleth.idp.profile.spring.relyingparty.metadata.InMemoryCachingHttpClientFactoryBean"
-        p:maxCacheEntries="%{idp.httpclient.memorycaching.maxCacheEntries}"
-        p:maxCacheEntrySize="%{idp.httpclient.memorycaching.maxCacheEntrySize}" />
-    -->
+        p:connectionDisregardTLSCertificate="%{idp.httpclient.memorycaching.connectionDisregardTLSCertificate:false}"
+        p:connectionTimeout="%{idp.httpclient.memorycaching.connectionTimeout:-1}"
+        p:maxCacheEntries="%{idp.httpclient.memorycaching.maxCacheEntries:50}"
+        p:maxCacheEntrySize="%{idp.httpclient.memorycaching.maxCacheEntrySize:1048576}" />
     
  </beans>