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

[noreply at shibboleth.net]

Author: dfisher
Date: Wed Oct 21 23:17:31 2015
New Revision: 7854

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7854&view=rev
Log:
IDP-825 - replace requestContext legacy syntax

Replace $requestContext.principalName with $resolutionContext.principal

Modified:
    trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/attribute-resolver.xml
    trunk/idp-conf/src/main/resources/conf/attribute-resolver-full.xml
    trunk/idp-conf/src/main/resources/conf/ldap.properties

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=7854&r1=7853&r2=7854&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	Wed Oct 21 23:17:31 2015
@@ -328,7 +328,7 @@
 	        jdbcPassword="" />
         <dc:QueryTemplate>
             <![CDATA[ 
-                SELECT * FROM student WHERE userid = '$requestContext.principalName'
+                SELECT * FROM student WHERE userid = '$resolutionContext.principal'
             ]]>
         </dc:QueryTemplate>
     </resolver:DataConnector>
@@ -342,7 +342,7 @@
         principalCredential="password">
         <dc:FilterTemplate>
             <![CDATA[
-                (uid=$requestContext.principalName)
+                (uid=$resolutionContext.principal)
             ]]>
         </dc:FilterTemplate>
     </resolver:DataConnector>

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=7854&r1=7853&r2=7854&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	Wed Oct 21 23:17:31 2015
@@ -264,7 +264,7 @@
                                          jdbcPassword="mypassword" />
         <dc:QueryTemplate>
             <![CDATA[
-                SELECT * FROM student WHERE gzbtpid = '$requestContext.principalName'
+                SELECT * FROM student WHERE gzbtpid = '$resolutionContext.principal'
             ]]>
         </dc:QueryTemplate>
 

Modified: trunk/idp-conf/src/main/resources/conf/ldap.properties
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/ldap.properties?rev=7854&r1=7853&r2=7854&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/ldap.properties	(original)
+++ trunk/idp-conf/src/main/resources/conf/ldap.properties	Wed Oct 21 23:17:31 2015
@@ -45,7 +45,7 @@
 idp.attribute.resolver.LDAP.bindDNCredential    = %{idp.authn.LDAP.bindDNCredential:undefined}
 idp.attribute.resolver.LDAP.useStartTLS         = %{idp.authn.LDAP.useStartTLS:true}
 idp.attribute.resolver.LDAP.trustCertificates   = %{idp.authn.LDAP.trustCertificates:undefined}
-idp.attribute.resolver.LDAP.searchFilter        = (uid=$requestContext.principalName)
+idp.attribute.resolver.LDAP.searchFilter        = (uid=$resolutionContext.principal)
 idp.attribute.resolver.LDAP.returnAttributes    = cn,homephone,mail
 
 # LDAP pool configuration, used for both authn and DN resolution