[java-identity-provider COMMIT] in /trunk/idp-conf/src/main/resources/conf: authn/ldap-authn-config.xml ldap.properties

[noreply at shibboleth.net]

Author: dfisher
Date: Thu Oct  6 23:27:38 2016
New Revision: 8473

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=8473&view=rev
Log:
IDP-1059

Update LDAP authn configuration to use new duration syntax setters.
Depends on latest ldaptive 1.0.8-SNAPSHOT.

Modified:
    trunk/idp-conf/src/main/resources/conf/authn/ldap-authn-config.xml
    trunk/idp-conf/src/main/resources/conf/ldap.properties

Modified: trunk/idp-conf/src/main/resources/conf/authn/ldap-authn-config.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/authn/ldap-authn-config.xml?rev=8473&r1=8472&r2=8473&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/authn/ldap-authn-config.xml	(original)
+++ trunk/idp-conf/src/main/resources/conf/authn/ldap-authn-config.xml	Thu Oct  6 23:27:38 2016
@@ -21,8 +21,8 @@
     <bean id="connectionConfig" class="org.ldaptive.ConnectionConfig" abstract="true" p:ldapUrl="%{idp.authn.LDAP.ldapURL}"
         p:useStartTLS="%{idp.authn.LDAP.useStartTLS:true}"
         p:useSSL="%{idp.authn.LDAP.useSSL:false}"
-        p:connectTimeout="%{idp.authn.LDAP.connectTimeout:3000}"
-        p:responseTimeout="%{idp.authn.LDAP.responseTimeout:3000}"
+        p:connectTimeoutDuration="%{idp.authn.LDAP.connectTimeout:PT3S}"
+        p:responseTimeoutDuration="%{idp.authn.LDAP.responseTimeout:PT3S}"
         p:sslConfig-ref="sslConfig" />
 
     <alias name="%{idp.authn.LDAP.sslConfig:certificateTrust}" alias="sslConfig" />
@@ -52,7 +52,7 @@
 
     <!-- Pool Configuration -->
     <bean id="connectionPool" class="org.ldaptive.pool.BlockingConnectionPool" abstract="true"
-        p:blockWaitTime="%{idp.pool.LDAP.blockWaitTime:3000}"
+        p:blockWaitTimeDuration="%{idp.pool.LDAP.blockWaitTime:PT3S}"
         p:poolConfig-ref="poolConfig"
         p:pruneStrategy-ref="pruneStrategy"
         p:validator-ref="searchValidator"
@@ -62,10 +62,10 @@
         p:maxPoolSize="%{idp.pool.LDAP.maxSize:10}"
         p:validateOnCheckOut="%{idp.pool.LDAP.validateOnCheckout:false}"
         p:validatePeriodically="%{idp.pool.LDAP.validatePeriodically:true}"
-        p:validatePeriod="%{idp.pool.LDAP.validatePeriod:300}" />
+        p:validatePeriodDuration="%{idp.pool.LDAP.validatePeriod:PT5M}" />
     <bean id="pruneStrategy" class="org.ldaptive.pool.IdlePruneStrategy"
-        p:prunePeriod="%{idp.pool.LDAP.prunePeriod:300}"
-        p:idleTime="%{idp.pool.LDAP.idleTime:600}" />
+        p:prunePeriodDuration="%{idp.pool.LDAP.prunePeriod:PT5M}"
+        p:idleTimeDuration="%{idp.pool.LDAP.idleTime:PT10M}" />
     <bean id="searchValidator" class="org.ldaptive.pool.SearchValidator" />
 
     <!-- Anonymous Search Configuration -->

Modified: trunk/idp-conf/src/main/resources/conf/ldap.properties
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/ldap.properties?rev=8473&r1=8472&r2=8473&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/ldap.properties	(original)
+++ trunk/idp-conf/src/main/resources/conf/ldap.properties	Thu Oct  6 23:27:38 2016
@@ -9,9 +9,9 @@
 #idp.authn.LDAP.useStartTLS                     = true
 #idp.authn.LDAP.useSSL                          = false
 # Time in milliseconds that connects will block
-#idp.authn.LDAP.connectTimeout                  = 3000
+#idp.authn.LDAP.connectTimeout                  = PT3S
 # Time in milliseconds to wait for responses
-#idp.authn.LDAP.responseTimeout                 = 3000
+#idp.authn.LDAP.responseTimeout                 = PT3S
 
 ## SSL configuration, either jvmTrust, certificateTrust, or keyStoreTrust
 #idp.authn.LDAP.sslConfig                       = certificateTrust
@@ -43,8 +43,8 @@
 # LDAP attribute configuration, see attribute-resolver.xml
 # Note, this likely won't apply to the use of legacy V2 resolver configurations
 idp.attribute.resolver.LDAP.ldapURL             = %{idp.authn.LDAP.ldapURL}
-idp.attribute.resolver.LDAP.connectTimeout      = %{idp.authn.LDAP.connectTimeout:3000}
-idp.attribute.resolver.LDAP.responseTimeout     = %{idp.authn.LDAP.responseTimeout:3000}
+idp.attribute.resolver.LDAP.connectTimeout      = %{idp.authn.LDAP.connectTimeout:PT3S}
+idp.attribute.resolver.LDAP.responseTimeout     = %{idp.authn.LDAP.responseTimeout:PT3S}
 idp.attribute.resolver.LDAP.baseDN              = %{idp.authn.LDAP.baseDN:undefined}
 idp.attribute.resolver.LDAP.bindDN              = %{idp.authn.LDAP.bindDN:undefined}
 idp.attribute.resolver.LDAP.bindDNCredential    = %{idp.authn.LDAP.bindDNCredential:undefined}
@@ -54,14 +54,12 @@
 idp.attribute.resolver.LDAP.returnAttributes    = cn,homephone,mail
 
 # LDAP pool configuration, used for both authn and DN resolution
-# Note that blockWaitTime is milliseconds, while validatePeriod, prunePeriod, and idleTime are seconds
-# See http://www.ldaptive.org/docs/guide/connections/pooling.html
 #idp.pool.LDAP.minSize                          = 3

[... 13 lines stripped ...]