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

[noreply at shibboleth.net]

Author: dfisher
Date: Wed Jul 30 23:35:15 2014
New Revision: 6369

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6369&view=rev
Log:
Remove authenticator beans from system flows.
Remove lazy-init from various ldaptive components.
Fixes IDP-441.

Modified:
    trunk/idp-conf/src/main/resources/conf/authn/ldap-authn-common-config.xml
    trunk/idp-conf/src/main/resources/system/flows/authn/password-authn-beans.xml

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=6369&r1=6368&r2=6369&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 Wed Jul 30 23:35:15 2014
@@ -10,17 +10,17 @@
 
     <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" lazy-init="true" />
+        p:connectionFactory-ref="searchPooledConnectionFactory" />
 
     <bean id="authHandler" class="org.ldaptive.auth.PooledBindAuthenticationHandler" p:connectionFactory-ref="bindPooledConnectionFactory" />
 
     <bean id="searchPooledConnectionFactory" class="org.ldaptive.pool.PooledConnectionFactory"
-        p:connectionPool-ref="searchConnectionPool" lazy-init="true" />
+        p:connectionPool-ref="searchConnectionPool" />
 
     <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" lazy-init="true" />
+        p:connectionFactory-ref="searchConnectionFactory" />
 
     <bean id="bindConnectionPool" class="org.ldaptive.pool.BlockingConnectionPool" parent="connectionPool"
         p:connectionFactory-ref="bindConnectionFactory" />
@@ -33,8 +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"
-        lazy-init="true" />
+    <bean id="searchConnectionFactory" class="org.ldaptive.DefaultConnectionFactory" p:connectionConfig-ref="searchConnectionConfig" />
 
     <bean id="bindConnectionFactory" class="org.ldaptive.DefaultConnectionFactory" p:connectionConfig-ref="bindConnectionConfig" />
 

Modified: trunk/idp-conf/src/main/resources/system/flows/authn/password-authn-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/authn/password-authn-beans.xml?rev=6369&r1=6368&r2=6369&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/authn/password-authn-beans.xml (original)
+++ trunk/idp-conf/src/main/resources/system/flows/authn/password-authn-beans.xml Wed Jul 30 23:35:15 2014
@@ -67,54 +67,4 @@
         p:resultCachingPredicate="#{getObject('shibboleth.authn.Password.resultCachingPredicate')}"
         p:returnAttributes-ref="shibboleth.authn.LDAP.returnAttributes" />
 
-    <bean name="authenticator" class="org.ldaptive.auth.Authenticator" lazy-init="true"
-            p:resolveEntryOnFailure="true">
-        <constructor-arg index="0">
-            <bean class="org.ldaptive.auth.SearchDnResolver"
-                p:baseDn-ref="shibboleth.authn.LDAP.baseDn"
-                p:subtreeSearch-ref="shibboleth.authn.LDAP.subtreeSearch"
-                p:userFilter-ref="shibboleth.authn.LDAP.userFilter"
-                p:connectionFactory-ref="connectionFactory" />
-        </constructor-arg>
-        <constructor-arg index="1">
-            <bean class="org.ldaptive.auth.BindAuthenticationHandler"
-                p:connectionFactory-ref="connectionFactory" />
-        </constructor-arg>
-        <!-- used to test account states
-             see businessCategory in src/test/config/ldap.ldif
-        <property name="authenticationResponseHandlers">
-          <bean class="common.MockAuthenticationResponseHandler">
-            <constructor-arg>
-              <array>
-              <bean class="org.ldaptive.auth.AccountState">
-                <constructor-arg>
-                  <bean class="org.ldaptive.auth.AccountState.DefaultWarning">
-                    <constructor-arg index="0">

[... 29 lines stripped ...]