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

[noreply at shibboleth.net]

Author: scantor
Date: Fri Dec 30 11:37:02 2016
New Revision: 8587

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=8587&view=rev
Log:
Fix HTTP client timeout defaults to use duration syntax.

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

Modified: trunk/idp-conf/src/main/resources/conf/services.properties
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/services.properties?rev=8587&r1=8586&r2=8587&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/services.properties	(original)
+++ trunk/idp-conf/src/main/resources/conf/services.properties	Fri Dec 30 11:37:02 2016
@@ -53,9 +53,9 @@
 #idp.httpclient.useTrustEngineTLSSocketFactory = false
 #idp.httpclient.useSecurityEnhancedTLSSocketFactory = false
 #idp.httpclient.connectionDisregardTLSCertificate = false
-#idp.httpclient.connectionRequestTimeout = 60000
-#idp.httpclient.connectionTimeout = 60000
-#idp.httpclient.socketTimeout = 60000
+#idp.httpclient.connectionRequestTimeout = PT1M
+#idp.httpclient.connectionTimeout = PT1M
+#idp.httpclient.socketTimeout = PT1M
 #idp.httpclient.maxConnectionsTotal = 100
 #idp.httpclient.maxConnectionsPerRoute = 100
 #idp.httpclient.memorycaching.maxCacheEntries = 50

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=8587&r1=8586&r2=8587&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	Fri Dec 30 11:37:02 2016
@@ -302,9 +302,9 @@
         class="net.shibboleth.idp.profile.spring.relyingparty.metadata.HttpClientFactoryBean"
         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:60000}"
-        p:connectionRequestTimeout="%{idp.httpclient.connectionRequestTimeout:60000}"
-        p:socketTimeout="%{idp.httpclient.socketTimeout:60000}" 
+        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}" />
     
@@ -313,9 +313,9 @@
         class="net.shibboleth.idp.profile.spring.relyingparty.metadata.FileCachingHttpClientFactoryBean"
         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:60000}"
-        p:connectionRequestTimeout="%{idp.httpclient.connectionRequestTimeout:60000}"
-        p:socketTimeout="%{idp.httpclient.socketTimeout:60000}" 
+        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}"
         p:cacheDirectory="%{idp.httpclient.filecaching.cacheDirectory}"
@@ -327,9 +327,9 @@
         class="net.shibboleth.idp.profile.spring.relyingparty.metadata.InMemoryCachingHttpClientFactoryBean"
         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:60000}"
-        p:connectionRequestTimeout="%{idp.httpclient.connectionRequestTimeout:60000}"
-        p:socketTimeout="%{idp.httpclient.socketTimeout:60000}" 
+        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}"

[... 2 lines stripped ...]