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

[noreply at shibboleth.net]

Author: scantor
Date: Wed Jun 24 13:21:16 2015
New Revision: 7602

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

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

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=7602&r1=7601&r2=7602&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 Jun 24 13:21:16 2015
@@ -1,5 +1,5 @@
+<beans xmlns="http://www.springframework.org/schema/beans"
 <?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:context="http://www.springframework.org/schema/context"
        xmlns:util="http://www.springframework.org/schema/util"
        xmlns:p="http://www.springframework.org/schema/p"
@@ -254,7 +254,15 @@
         class="org.opensaml.xmlsec.config.DefaultSecurityConfigurationBootstrap"
         factory-method="buildBasicInlineKeyInfoCredentialResolver" />
         
-    <!--  These are the common caching HttpClients wired to by multiple components, such as HTTPResources. -->
+    <!--  These are the common 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"