[java-identity-provider COMMIT] in /trunk/idp-conf/src/main/resources/conf: attribute-resolver-full.xml attribute-res...

[noreply at shibboleth.net]

Author: scantor
Date: Mon Oct  6 12:31:16 2014
New Revision: 6638

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6638&view=rev
Log:
Add LDAP authn properties, align names.

Modified:
    trunk/idp-conf/src/main/resources/conf/attribute-resolver-full.xml
    trunk/idp-conf/src/main/resources/conf/attribute-resolver.xml
    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/attribute-resolver-full.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/attribute-resolver-full.xml?rev=6638&r1=6637&r2=6638&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/attribute-resolver-full.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/attribute-resolver-full.xml Mon Oct  6 12:31:16 2014
@@ -310,8 +310,8 @@
     <resolver:DataConnector id="myLDAP" xsi:type="dc:LDAPDirectory"
         ldapURL="%{idp.attribute.resolver.LDAP.ldapURL}"
         baseDN="%{idp.attribute.resolver.LDAP.baseDN}" 
-        principal="%{idp.attribute.resolver.LDAP.principal}"
-        principalCredential="%{idp.attribute.resolver.LDAP.principalCredential}">
+        principal="%{idp.attribute.resolver.LDAP.bindDN}"
+        principalCredential="%{idp.attribute.resolver.LDAP.bindDNCredential}">
         <dc:FilterTemplate>
             <![CDATA[
                 (uid=${requestContext.principalName})

Modified: trunk/idp-conf/src/main/resources/conf/attribute-resolver.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/attribute-resolver.xml?rev=6638&r1=6637&r2=6638&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/attribute-resolver.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/attribute-resolver.xml Mon Oct  6 12:31:16 2014
@@ -77,8 +77,8 @@
     <resolver:DataConnector id="myLDAP" xsi:type="dc:LDAPDirectory"
         ldapURL="%{idp.attribute.resolver.LDAP.ldapURL}"
         baseDN="%{idp.attribute.resolver.LDAP.baseDN}" 
-        principal="%{idp.attribute.resolver.LDAP.principal}"
-        principalCredential="%{idp.attribute.resolver.LDAP.principalCredential}">
+        principal="%{idp.attribute.resolver.LDAP.bindDN}"
+        principalCredential="%{idp.attribute.resolver.LDAP.bindDNCredential}">
         <dc:FilterTemplate>
             <![CDATA[
                 (uid=${requestContext.principalName})

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=6638&r1=6637&r2=6638&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 Mon Oct  6 12:31:16 2014
@@ -20,20 +20,20 @@
     <!-- <import resource="ldap-authn-ad-config.xml" /> -->
 
     <!-- Common LDAP authn configuration -->
-    <bean id="shibboleth.authn.LDAP.ldapUrl" class="java.lang.String" c:_0="ldap://localhost:10389" />
+    <bean id="shibboleth.authn.LDAP.ldapUrl" class="java.lang.String" c:_0="%{idp.authn.LDAP.ldapURL}" />
     <util:constant id="shibboleth.authn.LDAP.useStartTLS" static-field="java.lang.Boolean.FALSE"/>
     <util:constant id="shibboleth.authn.LDAP.useSSL" static-field="java.lang.Boolean.FALSE"/>
-    <bean id="shibboleth.authn.LDAP.baseDn" class="java.lang.String" c:_0="ou=people,dc=example,dc=org" />
+    <bean id="shibboleth.authn.LDAP.baseDn" class="java.lang.String" c:_0="%{idp.authn.LDAP.baseDN}" />
     <util:constant id="shibboleth.authn.LDAP.subtreeSearch" static-field="java.lang.Boolean.FALSE"/>
     <bean id="shibboleth.authn.LDAP.userFilter" class="java.lang.String" c:_0="(uid={user})" />
     <bean id="shibboleth.authn.LDAP.connectTimeout" class="java.lang.Integer" c:_0="3000" />
 
-    <!-- Required for ldap-authn-bind-config -->
-    <bean id="shibboleth.authn.LDAP.bindDN" class="java.lang.String" c:_0="cn=manager" />
-    <bean id="shibboleth.authn.LDAP.bindCredential" class="java.lang.String" c:_0="password" />
+    <!-- Required for ldap-authn-bind-search-config -->
+    <bean id="shibboleth.authn.LDAP.bindDN" class="java.lang.String" c:_0="%{idp.authn.LDAP.bindDN}" />
+    <bean id="shibboleth.authn.LDAP.bindCredential" class="java.lang.String" c:_0="%{idp.authn.LDAP.bindDNCredential}" />
 
     <!-- Required for ldap-authn-direct-config and ldap-authn-ad-config; use %s at domain.com for AD -->
-    <bean id="shibboleth.authn.LDAP.dn-format" class="java.lang.String" c:_0="uid=%s,ou=people,dc=example,dc=org" />
+    <bean id="shibboleth.authn.LDAP.dn-format" class="java.lang.String" c:_0="uid=%s,%{idp.authn.LDAP.baseDN}" />
 
     <!-- Common pooling configuration used for DN resolution and binding -->

[... 27 lines stripped ...]