[java-identity-provider] branch master updated: IDP-1322 Align attribute resolver files

[Rod Widdowson]

This is an automated email from the git hooks/post-receive script.

rdw pushed a commit to branch master
in repository java-identity-provider.

View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=1e14ee497559f811c2b8d3f6ea478a4ac792e601

The following commit(s) were added to refs/heads/master by this push:
       new  1e14ee4   IDP-1322 Align attribute resolver files
1e14ee4 is described below

commit 1e14ee497559f811c2b8d3f6ea478a4ac792e601
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Thu Sep 6 14:01:21 2018 +0100

    IDP-1322 Align attribute resolver files
    
    https://issues.shibboleth.net/jira/browse/IDP-1322
    
    attribute-resolver-full and attribute-resolver.ldap
---
 idp-conf/src/main/resources/conf/attribute-resolver-full.xml | 8 ++++++++
 idp-conf/src/main/resources/conf/attribute-resolver-ldap.xml | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/idp-conf/src/main/resources/conf/attribute-resolver-full.xml b/idp-conf/src/main/resources/conf/attribute-resolver-full.xml
index 017b118..42881d2 100644
--- a/idp-conf/src/main/resources/conf/attribute-resolver-full.xml
+++ b/idp-conf/src/main/resources/conf/attribute-resolver-full.xml
@@ -282,6 +282,14 @@
                 %{idp.attribute.resolver.LDAP.searchFilter}
             ]]>
         </FilterTemplate>
+	    <ConnectionPool
+            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>
 -->
 
diff --git a/idp-conf/src/main/resources/conf/attribute-resolver-ldap.xml b/idp-conf/src/main/resources/conf/attribute-resolver-ldap.xml
index 611d214..69154c0 100644
--- a/idp-conf/src/main/resources/conf/attribute-resolver-ldap.xml
+++ b/idp-conf/src/main/resources/conf/attribute-resolver-ldap.xml
@@ -81,7 +81,7 @@
                 %{idp.attribute.resolver.LDAP.searchFilter}
             ]]>
         </FilterTemplate>
-	<ConnectionPool
+	    <ConnectionPool
             minPoolSize="%{idp.pool.LDAP.minSize:3}"
             maxPoolSize="%{idp.pool.LDAP.maxSize:10}"
             blockWaitTime="%{idp.pool.LDAP.blockWaitTime:PT3S}"

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.