[java-identity-provider COMMIT] in /trunk/idp-conf/src/main/resources: conf/authn/ldap-authn-config.xml system/conf/u...

[noreply at shibboleth.net]

Author: scantor
Date: Fri Dec 19 15:35:11 2014
New Revision: 7184

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7184&view=rev
Log:
Add a utility bean for Spring helper function.

Modified:
    trunk/idp-conf/src/main/resources/conf/authn/ldap-authn-config.xml
    trunk/idp-conf/src/main/resources/system/conf/utilities.xml

Modified: trunk/idp-conf/src/main/resources/conf/authn/ldap-authn-config.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/authn/ldap-authn-config.xml?rev=7184&r1=7183&r2=7184&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/authn/ldap-authn-config.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/authn/ldap-authn-config.xml Fri Dec 19 15:35:11 2014
@@ -11,7 +11,7 @@
        default-lazy-init="true">
 
     <alias name="%{idp.authn.LDAP.authenticator:anonSearchAuthenticator}" alias="shibboleth.authn.LDAP.authenticator" />
-    <bean id="shibboleth.authn.LDAP.returnAttributes" class="org.springframework.util.StringUtils" factory-method="commaDelimitedListToStringArray">
+    <bean id="shibboleth.authn.LDAP.returnAttributes" parent="shibboleth.CommaDelimStringArray">
         <constructor-arg type="java.lang.String" value="%{idp.authn.LDAP.returnAttributes}" />
     </bean>
 

Modified: trunk/idp-conf/src/main/resources/system/conf/utilities.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/conf/utilities.xml?rev=7184&r1=7183&r2=7184&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/conf/utilities.xml (original)
+++ trunk/idp-conf/src/main/resources/system/conf/utilities.xml Fri Dec 19 15:35:11 2014
@@ -14,9 +14,15 @@
 
     <bean id="shibboleth.Pair" class="net.shibboleth.utilities.java.support.collection.Pair" abstract="true" />
     
-    <bean id="shibboleth.Conditions.AND" class="com.google.common.base.Predicates" factory-method="and" abstract="true" />
-    <bean id="shibboleth.Conditions.NOT" class="com.google.common.base.Predicates" factory-method="not" abstract="true" />
-    <bean id="shibboleth.Conditions.OR" class="com.google.common.base.Predicates" factory-method="or" abstract="true" />
+    <bean id="shibboleth.CommaDelimStringArray"
+        class="org.springframework.util.StringUtils" factory-method="commaDelimitedListToStringArray" abstract="true" />
+    
+    <bean id="shibboleth.Conditions.AND"
+        class="com.google.common.base.Predicates" factory-method="and" abstract="true" />
+    <bean id="shibboleth.Conditions.NOT"
+        class="com.google.common.base.Predicates" factory-method="not" abstract="true" />
+    <bean id="shibboleth.Conditions.OR"
+        class="com.google.common.base.Predicates" factory-method="or" abstract="true" />
     
     <bean id="shibboleth.Conditions.RelyingPartyId"
         class="net.shibboleth.idp.profile.logic.RelyingPartyIdPredicate" abstract="true" />