[java-identity-provider COMMIT] in /trunk/idp-conf/src/main/resources: conf/idp.properties system/flows/authn/authn-b...

[noreply at shibboleth.net]

Author: scantor
Date: Fri Dec 19 16:39:37 2014
New Revision: 7187

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7187&view=rev
Log:
Use Spring util function to simplify attribute list property.

Modified:
    trunk/idp-conf/src/main/resources/conf/idp.properties
    trunk/idp-conf/src/main/resources/system/flows/authn/authn-beans.xml

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=7187&r1=7186&r2=7187&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/idp.properties (original)
+++ trunk/idp-conf/src/main/resources/conf/idp.properties Fri Dec 19 16:39:37 2014
@@ -100,7 +100,7 @@
 
 # Set to a quoted attribute ID to resolve prior to selecting authentication flows;
 # its values are used to filter the flows to allow.
-#idp.authn.resolveAttribute = 'eduPersonAssurance'
+#idp.authn.resolveAttribute = eduPersonAssurance
 
 # Default lifetime and timeout of various authentication methods
 #idp.authn.defaultLifetime = PT60M

Modified: trunk/idp-conf/src/main/resources/system/flows/authn/authn-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/authn/authn-beans.xml?rev=7187&r1=7186&r2=7187&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/authn/authn-beans.xml (original)
+++ trunk/idp-conf/src/main/resources/system/flows/authn/authn-beans.xml Fri Dec 19 16:39:37 2014
@@ -41,8 +41,10 @@
     <bean id="ResolveAttributes"
             class="net.shibboleth.idp.profile.impl.ResolveAttributes" scope="prototype"
             c:resolverService-ref="shibboleth.AttributeResolverService"
-            p:activationCondition="#{ %{idp.authn.resolveAttribute:null} != null }"
-            p:attributesToResolve="#{ { %{idp.authn.resolveAttribute:null} } }">
+            p:activationCondition="#{ '%{idp.authn.resolveAttribute:null}' != 'null' }">
+        <property name="attributesToResolve">
+            <bean parent="shibboleth.CommaDelimStringArray" c:_0="%{idp.authn.resolveAttribute:null}" />
+        </property>
         <property name="principalNameLookupStrategy">
             <bean class="com.google.common.base.Functions" factory-method="compose"
                 c:g-ref="shibboleth.PrincipalNameLookup.Session"
@@ -56,9 +58,9 @@
     </bean>
 
     <bean id="FilterFlowsByAttribute"
-            class="net.shibboleth.idp.authn.impl.FilterFlowsByAttribute" scope="prototype"
-            p:activationCondition="#{ %{idp.authn.resolveAttribute:null} != null }"
-            p:attributeId="#{ { %{idp.authn.resolveAttribute:null} }.get(0) }" />
+        class="net.shibboleth.idp.authn.impl.FilterFlowsByAttribute" scope="prototype"
+        p:activationCondition="#{ '%{idp.authn.resolveAttribute:null}' != 'null' }"
+        p:attributeId="#{ T(org.springframework.util.StringUtils).commaDelimitedListToStringArray('%{idp.authn.resolveAttribute:null}')[0] }"/>
 
     <bean id="FilterFlowsByForcedAuthn"
         class="net.shibboleth.idp.authn.impl.FilterFlowsByForcedAuthn" scope="prototype" />