[java-identity-provider COMMIT] /branches/3.1/idp-conf/src/main/resources/system/conf/global-system.xml

[noreply at shibboleth.net]

Author: rdw
Date: Thu Jun 25 05:06:27 2015
New Revision: 7606

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7606&view=rev
Log:
IDP-663 - added utility bean for a non-caching HTTP client

https://issues.shibboleth.net/jira/browse/IDP-663

Merge back  http://svn.shibboleth.net/view/java-identity-provider?view=revision&revision=7602

Modified:
    branches/3.1/idp-conf/src/main/resources/system/conf/global-system.xml

Modified: branches/3.1/idp-conf/src/main/resources/system/conf/global-system.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/branches/3.1/idp-conf/src/main/resources/system/conf/global-system.xml?rev=7606&r1=7605&r2=7606&view=diff
==============================================================================
--- branches/3.1/idp-conf/src/main/resources/system/conf/global-system.xml	(original)
+++ branches/3.1/idp-conf/src/main/resources/system/conf/global-system.xml	Thu Jun 25 05:06:27 2015
@@ -255,6 +255,14 @@
         factory-method="buildBasicInlineKeyInfoCredentialResolver" />
         
     <!--  These are the common caching HttpClients wired to by multiple components, such as HTTPResources. -->
+
+    <bean id="shibboleth.NonCachingHttpClient"
+        lazy-init="true"
+        class="net.shibboleth.idp.profile.spring.relyingparty.metadata.HttpClientFactoryBean"
+        p:tLSSocketFactory="#{ %{idp.httpclient.useTrustEngineTLSSocketFactory:false} ? @'shibboleth.TrustEngineTLSSocketFactory' : null }"
+        p:connectionDisregardTLSCertificate="%{idp.httpclient.connectionDisregardTLSCertificate:false}"
+        p:connectionTimeout="%{idp.httpclient.connectionTimeout:-1}" />
+    
     <bean id="shibboleth.FileCachingHttpClient"
         lazy-init="true"
         class="net.shibboleth.idp.profile.spring.relyingparty.metadata.FileCachingHttpClientFactoryBean"