[java-identity-provider COMMIT] in /trunk/idp-attribute-resolver-spring/src/test/resources: logback-test.xml net/shib...

[noreply at shibboleth.net]

Author: rdw
Date: Mon Sep  2 11:02:06 2013
New Revision: 4737

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4737&view=rev
Log:
IDP-273 Widen out the AttributeResolverTest: Add in the LDAP connector

Modified:
    trunk/idp-attribute-resolver-spring/src/test/resources/logback-test.xml
    trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/attribute-resolver.xml

Modified: trunk/idp-attribute-resolver-spring/src/test/resources/logback-test.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-spring/src/test/resources/logback-test.xml?rev=4737&r1=4736&r2=4737&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-spring/src/test/resources/logback-test.xml (original)
+++ trunk/idp-attribute-resolver-spring/src/test/resources/logback-test.xml Mon Sep  2 11:02:06 2013
@@ -2,8 +2,7 @@
 
 <configuration>
     <logger name="net.shibboleth.idp.attribute.resolver.spring" level="TRACE"/>
-    <logger name="net.shibboleth.idp.attribute.resolver.api" level="DEBUG"/>
-    <logger name="net.shibboleth.idp.attribute.resolver.impl" level="DEBUG"/>
+    <logger name="net.shibboleth.idp.attribute.resolver" level="DEBUG"/>
     <logger name="net.shibboleth.idp.service" level="DEBUG"/>
 
     <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">

Modified: trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/attribute-resolver.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/attribute-resolver.xml?rev=4737&r1=4736&r2=4737&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/attribute-resolver.xml (original)
+++ trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/attribute-resolver.xml Mon Sep  2 11:02:06 2013
@@ -51,7 +51,7 @@
         <resolver:AttributeEncoder xsi:type="enc:SAML2String" name="urn:oid:0.9.2342.19200300.100.1.3" friendlyName="mail" />
     </resolver:AttributeDefinition>
 
-    <resolver:AttributeDefinition xsi:type="ad:Simple" id="homePhone" sourceAttributeID="homePhone">
+    <resolver:AttributeDefinition xsi:type="ad:Simple" id="homePhone" sourceAttributeID="homephone">
         <resolver:Dependency ref="myLDAP" />
         <resolver:AttributeEncoder xsi:type="enc:SAML1String" name="urn:mace:dir:attribute-def:homePhone" />
         <resolver:AttributeEncoder xsi:type="enc:SAML2String" name="urn:oid:0.9.2342.19200300.100.1.20" friendlyName="homePhone" />
@@ -141,7 +141,7 @@
         <resolver:AttributeEncoder xsi:type="enc:SAML2String" name="urn:oid:2.5.4.18" friendlyName="postOfficeBox" />
     </resolver:AttributeDefinition>
 
-    <resolver:AttributeDefinition xsi:type="ad:Simple" id="telephoneNumber" sourceAttributeID="telephoneNumber">
+    <resolver:AttributeDefinition xsi:type="ad:Simple" id="telephoneNumber" sourceAttributeID="phone">
         <resolver:Dependency ref="myLDAP" />
         <resolver:AttributeEncoder xsi:type="enc:SAML1String" name="urn:mace:dir:attribute-def:telephoneNumber" />
         <resolver:AttributeEncoder xsi:type="enc:SAML2String" name="urn:oid:2.5.4.20" friendlyName="telephoneNumber" />
@@ -321,10 +321,8 @@
     </resolver:DataConnector>
      -->
      
-   <resolver:DataConnector id="myLDAP" xsi:type="dc:Static"/>
 
     <!-- Example LDAP Connector -->
-    <!-- TODO
     <resolver:DataConnector id="myLDAP" xsi:type="dc:LDAPDirectory"
         ldapURL="ldap://localhost:10391" 
         baseDN="dc=shibboleth,dc=net" 
@@ -332,11 +330,10 @@
         principalCredential="password">
         <dc:FilterTemplate>
             <![CDATA[
-                (uid=$requestContext.uid)
+                (uid=$requestContext.principalName)
             ]]>
         </dc:FilterTemplate>
     </resolver:DataConnector>
-    -->
     <!-- Computed targeted ID connector -->
 
     <resolver:DataConnector xsi:type="dc:ComputedId"