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

[noreply at shibboleth.net]

Author: dfisher
Date: Fri Oct  2 01:28:03 2015
New Revision: 7794

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7794&view=rev
Log:
IDP-826 - Add default LDAP property values

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

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=7794&r1=7793&r2=7794&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	Fri Oct  2 01:28:03 2015
@@ -12,7 +12,7 @@
 
     <alias name="%{idp.authn.LDAP.authenticator:anonSearchAuthenticator}" alias="shibboleth.authn.LDAP.authenticator" />
     <bean id="shibboleth.authn.LDAP.returnAttributes" parent="shibboleth.CommaDelimStringArray">
-        <constructor-arg type="java.lang.String" value="%{idp.authn.LDAP.returnAttributes}" />
+        <constructor-arg type="java.lang.String" value="%{idp.authn.LDAP.returnAttributes:1.1}" />
     </bean>
 
     <alias name="ValidateUsernamePasswordAgainstLDAP" alias="ValidateUsernamePassword" />
@@ -29,12 +29,12 @@
     <bean id="jvmTrust" class="org.ldaptive.ssl.SslConfig" />
     <bean id="certificateTrust" class="org.ldaptive.ssl.SslConfig">
         <property name="credentialConfig">
-            <bean parent="shibboleth.X509ResourceCredentialConfig" p:trustCertificates="%{idp.authn.LDAP.trustCertificates}" /> 
+            <bean parent="shibboleth.X509ResourceCredentialConfig" p:trustCertificates="%{idp.authn.LDAP.trustCertificates:undefined}" /> 
         </property>
     </bean>
     <bean id="keyStoreTrust" class="org.ldaptive.ssl.SslConfig">
         <property name="credentialConfig">
-            <bean parent="shibboleth.KeystoreResourceCredentialConfig" p:truststore="%{idp.authn.LDAP.trustStore}" /> 
+            <bean parent="shibboleth.KeystoreResourceCredentialConfig" p:truststore="%{idp.authn.LDAP.trustStore:undefined}" /> 
         </property>
     </bean>
 
@@ -47,7 +47,7 @@
     <bean id="bindConnectionConfig" parent="connectionConfig" />
 
     <!-- Format DN resolution -->
-    <bean id="formatDnResolver" class="org.ldaptive.auth.FormatDnResolver" p:format="%{idp.authn.LDAP.dnFormat}" />
+    <bean id="formatDnResolver" class="org.ldaptive.auth.FormatDnResolver" p:format="%{idp.authn.LDAP.dnFormat:undefined}" />
 
     <!-- Pool Configuration -->
     <bean id="connectionPool" class="org.ldaptive.pool.BlockingConnectionPool" abstract="true"
@@ -73,9 +73,9 @@
         <constructor-arg index="1" ref="authHandler" />
     </bean>
     <bean id="anonSearchDnResolver" class="org.ldaptive.auth.PooledSearchDnResolver"
-        p:baseDn="#{'%{idp.authn.LDAP.baseDN}'.trim()}"
+        p:baseDn="#{'%{idp.authn.LDAP.baseDN:undefined}'.trim()}"
         p:subtreeSearch="%{idp.authn.LDAP.subtreeSearch:false}"
-        p:userFilter="#{'%{idp.authn.LDAP.userFilter}'.trim()}"
+        p:userFilter="#{'%{idp.authn.LDAP.userFilter:undefined}'.trim()}"
         p:connectionFactory-ref="anonSearchPooledConnectionFactory" />
     <bean id="anonSearchPooledConnectionFactory" class="org.ldaptive.pool.PooledConnectionFactory"
         p:connectionPool-ref="anonSearchConnectionPool" />
@@ -90,9 +90,9 @@
         <constructor-arg index="1" ref="authHandler" />
     </bean>
     <bean id="bindSearchDnResolver" class="org.ldaptive.auth.PooledSearchDnResolver"
-        p:baseDn="#{'%{idp.authn.LDAP.baseDN}'.trim()}"
+        p:baseDn="#{'%{idp.authn.LDAP.baseDN:undefined}'.trim()}"
         p:subtreeSearch="%{idp.authn.LDAP.subtreeSearch:false}"
-        p:userFilter="#{'%{idp.authn.LDAP.userFilter}'.trim()}"
+        p:userFilter="#{'%{idp.authn.LDAP.userFilter:undefined}'.trim()}"
         p:connectionFactory-ref="bindSearchPooledConnectionFactory" />
     <bean id="bindSearchPooledConnectionFactory" class="org.ldaptive.pool.PooledConnectionFactory"
         p:connectionPool-ref="bindSearchConnectionPool" />
@@ -101,10 +101,10 @@
     <bean id="bindSearchConnectionFactory" class="org.ldaptive.DefaultConnectionFactory" p:connectionConfig-ref="bindSearchConnectionConfig" />
     <bean id="bindSearchConnectionConfig" parent="connectionConfig" p:connectionInitializer-ref="bindConnectionInitializer" />
     <bean id="bindConnectionInitializer" class="org.ldaptive.BindConnectionInitializer"
-            p:bindDn="#{'%{idp.authn.LDAP.bindDN}'.trim()}">
+            p:bindDn="#{'%{idp.authn.LDAP.bindDN:undefined}'.trim()}">
         <property name="bindCredential">
             <bean class="org.ldaptive.Credential">
-                <constructor-arg value="%{idp.authn.LDAP.bindDNCredential}" />
+                <constructor-arg value="%{idp.authn.LDAP.bindDNCredential:undefined}" />
             </bean>
         </property>
     </bean>


[... 22 lines stripped ...]