[java-identity-provider] branch master updated: Deprecate caching HttpClient properties.

[Scott Cantor]

This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to branch master
in repository java-identity-provider.

View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=dd483d676fb4c64857ba09d9f5ac12f484249eb8

The following commit(s) were added to refs/heads/master by this push:
       new  dd483d6   Deprecate caching HttpClient properties.
dd483d6 is described below

commit dd483d676fb4c64857ba09d9f5ac12f484249eb8
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Wed Mar 4 14:10:38 2020 -0500

    Deprecate caching HttpClient properties.
---
 idp-conf/src/main/resources/conf/services.properties    | 10 +++++++---
 .../src/main/resources/system/conf/global-system.xml    | 17 ++++++++++++++++-
 2 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/idp-conf/src/main/resources/conf/services.properties b/idp-conf/src/main/resources/conf/services.properties
index 9dc3dff..6edb015 100644
--- a/idp-conf/src/main/resources/conf/services.properties
+++ b/idp-conf/src/main/resources/conf/services.properties
@@ -62,9 +62,8 @@ idp.service.managedBean.checkInterval = PT15M
 #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.
+# These settings impact the behavior of the internal HTTP Client used by default
+# with some internal components, but notably *not* for metadata acquisition.
 #idp.httpclient.useSecurityEnhancedTLSSocketFactory = false
 #idp.httpclient.connectionDisregardTLSCertificate = false
 #idp.httpclient.connectionRequestTimeout = PT1M
@@ -72,6 +71,11 @@ idp.service.managedBean.checkInterval = PT15M
 #idp.httpclient.socketTimeout = PT1M
 #idp.httpclient.maxConnectionsTotal = 100
 #idp.httpclient.maxConnectionsPerRoute = 100
+
+# These are deprecated properties that configure the old caching HttpClient
+# beans that are no longer supported. If you want to manually configure
+# the caching clients, you should define the beans yourself and if desired
+# rely on properties of your own devising.
 #idp.httpclient.memorycaching.maxCacheEntries = 50
 #idp.httpclient.memorycaching.maxCacheEntrySize = 1048576
 #idp.httpclient.filecaching.maxCacheEntries = 100
diff --git a/idp-conf/src/main/resources/system/conf/global-system.xml b/idp-conf/src/main/resources/system/conf/global-system.xml
index 8849e30..1854212 100644
--- a/idp-conf/src/main/resources/system/conf/global-system.xml
+++ b/idp-conf/src/main/resources/system/conf/global-system.xml
@@ -77,7 +77,22 @@
                 </entry>
                 <entry key="idp.consent.userStorageKey" value="idp.consent.attribute-release.userStorageKey" />
                 <entry key="idp.consent.userStorageKeyAttribute" value="idp.consent.attribute-release.userStorageKeyAttribute" />
-            </map>
+                <entry key="idp.httpclient.memorycaching.maxCacheEntries">
+                    <null/>
+                </entry>
+                <entry key="idp.httpclient.memorycaching.maxCacheEntrySize">
+                    <null/>
+                </entry>
+                <entry key="idp.httpclient.filecaching.maxCacheEntries">
+                    <null/>
+                </entry>
+                <entry key="idp.httpclient.filecaching.maxCacheEntrySize">
+                    <null/>
+                </entry>
+                <entry key="idp.httpclient.filecaching.cacheDirectory">
+                    <null/>
+                </entry>
+             </map>
         </property>
         <property name="deadProperties">
             <list>

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.