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

[noreply at shibboleth.net]

Author: tzeller
Date: Fri Sep 16 14:55:23 2016
New Revision: 8396

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=8396&view=rev
Log:
IDP-1044 - Add default LDAP pool properties

Add default LDAP connection pool properties to attribute-resolver-ldap.xml
Set default connect and response timeouts to 3000
Add some comments about pool properties to note milliseconds vs seconds

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

Modified:
    trunk/idp-conf/src/main/resources/conf/attribute-resolver-ldap.xml
    trunk/idp-conf/src/main/resources/conf/ldap.properties

Modified: trunk/idp-conf/src/main/resources/conf/attribute-resolver-ldap.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/attribute-resolver-ldap.xml?rev=8396&r1=8395&r2=8396&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/attribute-resolver-ldap.xml	(original)
+++ trunk/idp-conf/src/main/resources/conf/attribute-resolver-ldap.xml	Fri Sep 16 14:55:23 2016
@@ -83,13 +83,13 @@
         </FilterTemplate>
         <ReturnAttributes>%{idp.attribute.resolver.LDAP.returnAttributes}</ReturnAttributes>
 	<ConnectionPool
-            minPoolSize="%{idp.pool.LDAP.minSize}"
-            maxPoolSize="%{idp.pool.LDAP.maxSize}"
-            blockWaitTime="%{idp.pool.LDAP.blockWaitTime}"
-            validatePeriodically="%{idp.pool.LDAP.validatePeriodically}"
-            validateTimerPeriod="%{idp.pool.LDAP.validatePeriod}"
-            expirationTime="%{idp.pool.LDAP.idleTime}"
-            failFastInitialize="%{idp.pool.LDAP.failFastInitialize}" />
+            minPoolSize="%{idp.pool.LDAP.minSize:3}"
+            maxPoolSize="%{idp.pool.LDAP.maxSize:10}"
+            blockWaitTime="%{idp.pool.LDAP.blockWaitTime:PT3S}"
+            validatePeriodically="%{idp.pool.LDAP.validatePeriodically:true}"
+            validateTimerPeriod="%{idp.pool.LDAP.validatePeriod:PT5M}"
+            expirationTime="%{idp.pool.LDAP.idleTime:PT10M}"
+            failFastInitialize="%{idp.pool.LDAP.failFastInitialize:false}" />
     </DataConnector>
 
 </AttributeResolver>

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=8396&r1=8395&r2=8396&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/ldap.properties	(original)
+++ trunk/idp-conf/src/main/resources/conf/ldap.properties	Fri Sep 16 14:55:23 2016
@@ -8,7 +8,9 @@
 idp.authn.LDAP.ldapURL                          = ldap://localhost:10389
 #idp.authn.LDAP.useStartTLS                     = true
 #idp.authn.LDAP.useSSL                          = false
+# Time in milliseconds that connects will block
 #idp.authn.LDAP.connectTimeout                  = 3000
+# Time in milliseconds to wait for responses
 #idp.authn.LDAP.responseTimeout                 = 3000
 
 ## SSL configuration, either jvmTrust, certificateTrust, or keyStoreTrust
@@ -41,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:undefined}
-idp.attribute.resolver.LDAP.responseTimeout     = %{idp.authn.LDAP.responseTimeout:undefined}
+idp.attribute.resolver.LDAP.connectTimeout      = %{idp.authn.LDAP.connectTimeout:3000}
+idp.attribute.resolver.LDAP.responseTimeout     = %{idp.authn.LDAP.responseTimeout:3000}
 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}
@@ -52,6 +54,8 @@
 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
 #idp.pool.LDAP.maxSize                          = 10
 #idp.pool.LDAP.validateOnCheckout               = false