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

[noreply at shibboleth.net]

Author: dfisher
Date: Sun Oct 12 23:53:49 2014
New Revision: 6678

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6678&view=rev
Log:
Revert r6369, put the lazy-inits back.
Add name property to the connection pools to improve logging.

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

Modified: trunk/idp-conf/src/main/resources/conf/authn/ldap-authn-ad-config.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/authn/ldap-authn-ad-config.xml?rev=6678&r1=6677&r2=6678&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/authn/ldap-authn-ad-config.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/authn/ldap-authn-ad-config.xml Sun Oct 12 23:53:49 2014
@@ -19,8 +19,6 @@
     <bean id="formatDnResolver" class="org.ldaptive.auth.FormatDnResolver" p:format-ref="shibboleth.authn.LDAP.dn-format" />
     <bean id="bindConnectionConfig" parent="connectionConfig" />
     
-    <bean id="searchConnectionConfig" parent="connectionConfig" />
-
     <!-- Having SSL trust issues? Configure trust by adding
     <bean id="sslConfig" class="org.ldaptive.ssl.SslConfig">
         <property name="credentialConfig">

Modified: trunk/idp-conf/src/main/resources/conf/authn/ldap-authn-common-config.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/authn/ldap-authn-common-config.xml?rev=6678&r1=6677&r2=6678&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/authn/ldap-authn-common-config.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/authn/ldap-authn-common-config.xml Sun Oct 12 23:53:49 2014
@@ -10,20 +10,20 @@
 
     <bean id="searchDnResolver" class="org.ldaptive.auth.PooledSearchDnResolver" p:baseDn-ref="shibboleth.authn.LDAP.baseDn"
         p:subtreeSearch-ref="shibboleth.authn.LDAP.subtreeSearch" p:userFilter-ref="shibboleth.authn.LDAP.userFilter"
-        p:connectionFactory-ref="searchPooledConnectionFactory" />
+        p:connectionFactory-ref="searchPooledConnectionFactory" lazy-init="true" />
 
     <bean id="authHandler" class="org.ldaptive.auth.PooledBindAuthenticationHandler" p:connectionFactory-ref="bindPooledConnectionFactory" />
 
     <bean id="searchPooledConnectionFactory" class="org.ldaptive.pool.PooledConnectionFactory"
-        p:connectionPool-ref="searchConnectionPool" />
+        p:connectionPool-ref="searchConnectionPool" lazy-init="true" />
 
     <bean id="bindPooledConnectionFactory" class="org.ldaptive.pool.PooledConnectionFactory" p:connectionPool-ref="bindConnectionPool" />
 
     <bean id="searchConnectionPool" class="org.ldaptive.pool.BlockingConnectionPool" parent="connectionPool"
-        p:connectionFactory-ref="searchConnectionFactory" />
+        p:connectionFactory-ref="searchConnectionFactory" p:name="search-pool" lazy-init="true" />
 
     <bean id="bindConnectionPool" class="org.ldaptive.pool.BlockingConnectionPool" parent="connectionPool"
-        p:connectionFactory-ref="bindConnectionFactory" />
+        p:connectionFactory-ref="bindConnectionFactory" p:name="bind-pool" />
 
     <bean id="connectionPool" class="org.ldaptive.pool.BlockingConnectionPool" abstract="true" init-method="initialize"
         p:blockWaitTime-ref="shibboleth.authn.LDAP.pool.blockWaitTime" p:poolConfig-ref="poolConfig"
@@ -33,7 +33,7 @@
         p:maxPoolSize-ref="shibboleth.authn.LDAP.pool.maxSize" p:validateOnCheckOut-ref="shibboleth.authn.LDAP.pool.validateOnCheckout"
         p:validatePeriodically-ref="shibboleth.authn.LDAP.pool.validatePeriodically" p:validatePeriod-ref="shibboleth.authn.LDAP.pool.validatePeriod" />
 
-    <bean id="searchConnectionFactory" class="org.ldaptive.DefaultConnectionFactory" p:connectionConfig-ref="searchConnectionConfig" />
+    <bean id="searchConnectionFactory" class="org.ldaptive.DefaultConnectionFactory" p:connectionConfig-ref="searchConnectionConfig" lazy-init="true" />
 
     <bean id="bindConnectionFactory" class="org.ldaptive.DefaultConnectionFactory" p:connectionConfig-ref="bindConnectionConfig" />