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

[noreply at shibboleth.net]

Author: scantor
Date: Wed Dec 17 11:22:44 2014
New Revision: 7147

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7147&view=rev
Log:
Default properties.

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

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=7147&r1=7146&r2=7147&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 Wed Dec 17 11:22:44 2014
@@ -10,7 +10,7 @@
        default-destroy-method="destroy"
        default-lazy-init="true">
 
-    <alias name="%{idp.authn.LDAP.authenticator}" alias="shibboleth.authn.LDAP.authenticator" />
+    <alias name="%{idp.authn.LDAP.authenticator:anonSearchAuthenticator}" alias="shibboleth.authn.LDAP.authenticator" />
     <bean id="shibboleth.authn.LDAP.returnAttributes" class="org.springframework.util.StringUtils" factory-method="commaDelimitedListToStringArray">
         <constructor-arg type="java.lang.String" value="%{idp.authn.LDAP.returnAttributes}" />
     </bean>
@@ -19,10 +19,12 @@
 
     <!-- Connection Configuration -->
     <bean id="connectionConfig" class="org.ldaptive.ConnectionConfig" abstract="true" p:ldapUrl="%{idp.authn.LDAP.ldapURL}"
-        p:useStartTLS="%{idp.authn.LDAP.useStartTLS}" p:useSSL="%{idp.authn.LDAP.useSSL}" p:connectTimeout="%{idp.authn.LDAP.connectTimeout}"
+        p:useStartTLS="%{idp.authn.LDAP.useStartTLS:true}"
+        p:useSSL="%{idp.authn.LDAP.useSSL:false}"
+        p:connectTimeout="%{idp.authn.LDAP.connectTimeout:3000}"
         p:sslConfig-ref="sslConfig" />
 
-    <alias name="%{idp.authn.LDAP.sslConfig}" alias="sslConfig" />
+    <alias name="%{idp.authn.LDAP.sslConfig:defaultTrust}" alias="sslConfig" />
 
     <bean id="defaultTrust" class="org.ldaptive.ssl.SslConfig" />
     <bean id="certificateTrust" class="org.ldaptive.ssl.SslConfig">
@@ -48,14 +50,21 @@
     <bean id="formatDnResolver" class="org.ldaptive.auth.FormatDnResolver" p:format="%{idp.authn.LDAP.dnFormat}" />
 
     <!-- Pool Configuration -->
-    <bean id="connectionPool" class="org.ldaptive.pool.BlockingConnectionPool" abstract="true" init-method="initialize"
-        p:blockWaitTime="%{idp.pool.LDAP.blockWaitTime}" p:poolConfig-ref="poolConfig" p:pruneStrategy-ref="pruneStrategy"
-        p:validator-ref="searchValidator" p:failFastInitialize="%{idp.pool.LDAP.failFastInitialize}" />
-    <bean id="poolConfig" class="org.ldaptive.pool.PoolConfig" p:minPoolSize="%{idp.pool.LDAP.minSize}"
-        p:maxPoolSize="%{idp.pool.LDAP.maxSize}" p:validateOnCheckOut="%{idp.pool.LDAP.validateOnCheckout}"
-        p:validatePeriodically="%{idp.pool.LDAP.validatePeriodically}" p:validatePeriod="%{idp.pool.LDAP.validatePeriod}" />
-    <bean id="pruneStrategy" class="org.ldaptive.pool.IdlePruneStrategy" p:prunePeriod="%{idp.pool.LDAP.prunePeriod}"
-        p:idleTime="%{idp.pool.LDAP.idleTime}" />
+    <bean id="connectionPool" class="org.ldaptive.pool.BlockingConnectionPool" abstract="true"
+        p:blockWaitTime="%{idp.pool.LDAP.blockWaitTime:3000}"
+        p:poolConfig-ref="poolConfig"
+        p:pruneStrategy-ref="pruneStrategy"
+        p:validator-ref="searchValidator"
+        p:failFastInitialize="%{idp.pool.LDAP.failFastInitialize:false}" />
+    <bean id="poolConfig" class="org.ldaptive.pool.PoolConfig"
+        p:minPoolSize="%{idp.pool.LDAP.minSize:3}"
+        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}" />
+    <bean id="pruneStrategy" class="org.ldaptive.pool.IdlePruneStrategy"
+        p:prunePeriod="%{idp.pool.LDAP.prunePeriod:300}"
+        p:idleTime="%{idp.pool.LDAP.idleTime:600}" />
     <bean id="searchValidator" class="org.ldaptive.pool.SearchValidator" />
 
     <!-- Anonymous Search Configuration -->
@@ -79,7 +88,7 @@
         <constructor-arg index="1" ref="authHandler" />
     </bean>
     <bean id="bindSearchDnResolver" class="org.ldaptive.auth.PooledSearchDnResolver" p:baseDn="%{idp.authn.LDAP.baseDN}"
-        p:subtreeSearch="%{idp.authn.LDAP.subtreeSearch}" p:userFilter="%{idp.authn.LDAP.userFilter}"
+        p:subtreeSearch="%{idp.authn.LDAP.subtreeSearch:false}" p:userFilter="%{idp.authn.LDAP.userFilter}"
         p:connectionFactory-ref="bindSearchPooledConnectionFactory" />
     <bean id="bindSearchPooledConnectionFactory" class="org.ldaptive.pool.PooledConnectionFactory"
         p:connectionPool-ref="bindSearchConnectionPool" />