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

[noreply at shibboleth.net]

Author: tzeller
Date: Tue Dec 31 10:30:49 2013
New Revision: 5117

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5117&view=rev
Log:
For the testbed, default to resolving attributes from the in-memory directory server, which needs to be instantiated before the attribute resolver. Add a default service account to test/ldap.ldif.

Modified:
    trunk/idp-conf/src/main/resources/conf/attribute-resolver.xml

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=5117&r1=5116&r2=5117&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/attribute-resolver.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/attribute-resolver.xml Tue Dec 31 10:30:49 2013
@@ -39,7 +39,6 @@
         </dc:Attribute>
     </resolver:DataConnector>
     
-    <!-- 
     <resolver:AttributeDefinition xsi:type="ad:Simple" id="uid" sourceAttributeID="uid">
         <resolver:Dependency ref="myLDAP" />
         <resolver:AttributeEncoder xsi:type="enc:SAML1String" name="urn:mace:dir:attribute-def:uid" />
@@ -51,16 +50,15 @@
         <resolver:AttributeEncoder xsi:type="enc:SAML1String" name="urn:mace:dir:attribute-def:mail" />
         <resolver:AttributeEncoder xsi:type="enc:SAML2String" name="urn:oid:0.9.2342.19200300.100.1.3" friendlyName="mail" />
     </resolver:AttributeDefinition>    
-    -->
         
     <!-- ========================================== -->
     <!--      Data Connectors                       -->
     <!-- ========================================== -->
     
     <!-- Example LDAP Connector -->
-    <!-- 
+    <!-- TODO tz Set properties via property replacement. -->
     <resolver:DataConnector id="myLDAP" xsi:type="dc:LDAPDirectory"
-        ldapURL="ldap://ldap.example.org" 
+        ldapURL="ldap://localhost:10389" 
         baseDN="ou=people,dc=example,dc=org" 
         principal="uid=myservice,ou=system"
         principalCredential="myServicePassword">
@@ -70,6 +68,5 @@
             ]]>
         </dc:FilterTemplate>
     </resolver:DataConnector>
-    -->
 
 </resolver:AttributeResolver>