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

[noreply at shibboleth.net]

Author: tzeller
Date: Thu Apr  3 23:35:16 2014
New Revision: 5695

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5695&view=rev
Log:
Externalize LDAP connection properties.

Added:
    trunk/idp-conf/src/main/resources/conf/property-placeholder.xml   (with props)
Modified:
    trunk/idp-conf/src/main/resources/conf/attribute-params-config.xml
    trunk/idp-conf/src/main/resources/conf/attribute-resolver.xml
    trunk/idp-conf/src/main/resources/conf/idp.properties

Modified: trunk/idp-conf/src/main/resources/conf/attribute-params-config.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/attribute-params-config.xml?rev=5695&r1=5694&r2=5695&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/attribute-params-config.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/attribute-params-config.xml Thu Apr  3 23:35:16 2014
@@ -57,6 +57,7 @@
 
     <util:list id ="shibboleth.AttributeResolverResources">
         <value>file://${idp.home}/conf/attribute-resolver.xml</value>
+        <value>file://${idp.home}/conf/property-placeholder.xml</value>
     </util:list>
 
     <util:list id ="shibboleth.AttributeFilterResources">

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=5695&r1=5694&r2=5695&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/attribute-resolver.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/attribute-resolver.xml Thu Apr  3 23:35:16 2014
@@ -56,12 +56,11 @@
     <!-- ========================================== -->
     
     <!-- Example LDAP Connector -->
-    <!-- TODO tz Set properties via property replacement. -->
     <resolver:DataConnector id="myLDAP" xsi:type="dc:LDAPDirectory"
-        ldapURL="ldap://localhost:10389" 
-        baseDN="ou=people,dc=example,dc=org" 
-        principal="uid=myservice,ou=system"
-        principalCredential="myServicePassword">
+        ldapURL="${idp.attribute.resolver.myLDAP.ldapURL}" 
+        baseDN="${idp.attribute.resolver.myLDAP.baseDN}" 
+        principal="${idp.attribute.resolver.myLDAP.principal}"
+        principalCredential="${idp.attribute.resolver.myLDAP.principalCredential}">
         <dc:FilterTemplate>
             <![CDATA[
                 (uid=$requestContext.principalName)

Modified: trunk/idp-conf/src/main/resources/conf/idp.properties
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/idp.properties?rev=5695&r1=5694&r2=5695&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/idp.properties (original)
+++ trunk/idp-conf/src/main/resources/conf/idp.properties Thu Apr  3 23:35:16 2014
@@ -96,3 +96,9 @@
 # Failing the filter fast leaves no filters enabled.
 idp.service.attribute.filter.failFast=false
 idp.service.attribute.filter.checkInterval=PT5M
+
+# LDAP attribute configuration, see attribute-resolver.xml
+idp.attribute.resolver.myLDAP.ldapURL             = ldap://localhost:10389
+idp.attribute.resolver.myLDAP.baseDN              = ou=people,dc=example,dc=org 
+idp.attribute.resolver.myLDAP.principal           = uid=myservice,ou=system
+idp.attribute.resolver.myLDAP.principalCredential = myServicePassword