[java-identity-provider] branch main updated: Move internal HTTP client bean into the new Spring file.

[Scott Cantor]

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

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

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

The following commit(s) were added to refs/heads/main by this push:
       new  664209454 Move internal HTTP client bean into the new Spring file.
664209454 is described below

commit 664209454adbfaf46321f5e79975677ff613b8e4
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Fri Aug 28 09:24:12 2020 -0400

    Move internal HTTP client bean into the new Spring file.
---
 .../net/shibboleth/idp/conf/global-system.xml      | 16 +--------------
 .../net/shibboleth/idp/conf/http-client.xml        | 23 ++++++++++++++++------
 2 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/global-system.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/global-system.xml
index fd443d9b4..b82d33b7d 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/global-system.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/global-system.xml
@@ -286,21 +286,7 @@
             </map>
         </constructor-arg>
     </bean>
-        
-    <!--
-    This is a default client for embedded system use but should NOT be used by deployers OR
-    within the IdP within any reloadable service child contexts.
-    -->
-    
-    <bean id="shibboleth.InternalHttpClient" parent="shibboleth.HttpClientFactory" lazy-init="true"
-        p:tLSSocketFactory="#{ %{idp.httpclient.useTrustEngineTLSSocketFactory:false} or %{idp.httpclient.useSecurityEnhancedTLSSocketFactory:false} ? @'shibboleth.SecurityEnhancedTLSSocketFactory' : null }"
-        p:connectionDisregardTLSCertificate="%{idp.httpclient.connectionDisregardTLSCertificate:false}"
-        p:connectionTimeout="%{idp.httpclient.connectionTimeout:PT1M}"
-        p:connectionRequestTimeout="%{idp.httpclient.connectionRequestTimeout:PT1M}"
-        p:socketTimeout="%{idp.httpclient.socketTimeout:PT1M}" 
-        p:maxConnectionsTotal="%{idp.httpclient.maxConnectionsTotal:100}"
-        p:maxConnectionsPerRoute="%{idp.httpclient.maxConnectionsPerRoute:100}" />
-                
+
     <!-- Default Jackson ObjectMapper. -->
     
     <bean id="shibboleth.JSONObjectMapper" class="com.fasterxml.jackson.databind.ObjectMapper" />
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/http-client.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/http-client.xml
index 669bb6c80..5255e68d4 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/http-client.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/http-client.xml
@@ -44,11 +44,24 @@
         lazy-init="true"
         class="org.opensaml.security.httpclient.impl.SecurityEnhancedHttpClientSupport"
         factory-method="buildTLSSocketFactoryWithClientTLSOnly" />
+
+    <!--
+    This is a default client for embedded system use but should NOT be used by deployers OR
+    within the IdP within any reloadable service child contexts.
+    -->
+    <bean id="shibboleth.InternalHttpClient" parent="shibboleth.HttpClientFactory" lazy-init="true"
+        p:tLSSocketFactory="#{ %{idp.httpclient.useTrustEngineTLSSocketFactory:false} or %{idp.httpclient.useSecurityEnhancedTLSSocketFactory:false} ? @'shibboleth.SecurityEnhancedTLSSocketFactory' : null }"
+        p:connectionDisregardTLSCertificate="%{idp.httpclient.connectionDisregardTLSCertificate:false}"
+        p:connectionTimeout="%{idp.httpclient.connectionTimeout:PT1M}"
+        p:connectionRequestTimeout="%{idp.httpclient.connectionRequestTimeout:PT1M}"
+        p:socketTimeout="%{idp.httpclient.socketTimeout:PT1M}" 
+        p:maxConnectionsTotal="%{idp.httpclient.maxConnectionsTotal:100}"
+        p:maxConnectionsPerRoute="%{idp.httpclient.maxConnectionsPerRoute:100}" />
+
                     
     <!-- These are deprecated because using them triggers Spring bugs when contexts reload. -->
 
-    <bean id="shibboleth.NonCachingHttpClient"
-        lazy-init="true"
+    <bean id="shibboleth.NonCachingHttpClient" lazy-init="true"
         class="net.shibboleth.idp.profile.spring.relyingparty.metadata.impl.HttpClientFactoryBean"
         p:tLSSocketFactory="#{ %{idp.httpclient.useTrustEngineTLSSocketFactory:false} or %{idp.httpclient.useSecurityEnhancedTLSSocketFactory:false} ? @'shibboleth.SecurityEnhancedTLSSocketFactory' : null }"
         p:connectionDisregardTLSCertificate="%{idp.httpclient.connectionDisregardTLSCertificate:false}"
@@ -58,8 +71,7 @@
         p:maxConnectionsTotal="%{idp.httpclient.maxConnectionsTotal:100}"
         p:maxConnectionsPerRoute="%{idp.httpclient.maxConnectionsPerRoute:100}" />
     
-    <bean id="shibboleth.FileCachingHttpClient"
-        lazy-init="true"
+    <bean id="shibboleth.FileCachingHttpClient" lazy-init="true"
         class="net.shibboleth.idp.profile.spring.relyingparty.metadata.impl.FileCachingHttpClientFactoryBean"
         p:tLSSocketFactory="#{ %{idp.httpclient.useTrustEngineTLSSocketFactory:false} or %{idp.httpclient.useSecurityEnhancedTLSSocketFactory:false} ? @'shibboleth.SecurityEnhancedTLSSocketFactory' : null }"
         p:connectionDisregardTLSCertificate="%{idp.httpclient.connectionDisregardTLSCertificate:false}"
@@ -72,8 +84,7 @@
         p:maxCacheEntries="%{idp.httpclient.filecaching.maxCacheEntries:100}"
         p:maxCacheEntrySize="%{idp.httpclient.filecaching.maxCacheEntrySize:10485760}" />
         
-    <bean id="shibboleth.MemoryCachingHttpClient"
-        lazy-init="true"
+    <bean id="shibboleth.MemoryCachingHttpClient" lazy-init="true"
         class="net.shibboleth.idp.profile.spring.relyingparty.metadata.impl.InMemoryCachingHttpClientFactoryBean"
         p:tLSSocketFactory="#{ %{idp.httpclient.useTrustEngineTLSSocketFactory:false} or %{idp.httpclient.useSecurityEnhancedTLSSocketFactory:false} ? @'shibboleth.SecurityEnhancedTLSSocketFactory' : null }"
         p:connectionDisregardTLSCertificate="%{idp.httpclient.connectionDisregardTLSCertificate:false}"

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