[java-identity-provider COMMIT] in /trunk/idp-conf/src/main/resources/flows/authn: ipaddress-authn-beans.xml jaas-bas...

[noreply at shibboleth.net]

Author: scantor
Date: Mon Oct 21 16:41:01 2013
New Revision: 4894

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4894&view=rev
Log:
Sync with testbed

Modified:
    trunk/idp-conf/src/main/resources/flows/authn/ipaddress-authn-beans.xml
    trunk/idp-conf/src/main/resources/flows/authn/jaas-basic-authn-beans.xml
    trunk/idp-conf/src/main/resources/flows/authn/jaas-form-authn-beans.xml
    trunk/idp-conf/src/main/resources/flows/authn/remoteuser-authn-beans.xml

Modified: trunk/idp-conf/src/main/resources/flows/authn/ipaddress-authn-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/flows/authn/ipaddress-authn-beans.xml?rev=4894&r1=4893&r2=4894&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/flows/authn/ipaddress-authn-beans.xml (original)
+++ trunk/idp-conf/src/main/resources/flows/authn/ipaddress-authn-beans.xml Mon Oct 21 16:41:01 2013
@@ -24,6 +24,7 @@
         p:transforms-ref="shibboleth.authn.IPAddress.Transforms" />
         
     <bean id="ValidateUserAgentAddress" class="net.shibboleth.idp.authn.impl.ValidateUserAgentAddress" scope="prototype"
-        p:mappings-ref="shibboleth.authn.IPAddress.Mappings" />
+        p:mappings-ref="shibboleth.authn.IPAddress.Mappings"
+        p:resultCachingPredicate="#{getObject('shibboleth.authn.IPAddress.resultCachingPredicate')}" />
 
 </beans>

Modified: trunk/idp-conf/src/main/resources/flows/authn/jaas-basic-authn-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/flows/authn/jaas-basic-authn-beans.xml?rev=4894&r1=4893&r2=4894&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/flows/authn/jaas-basic-authn-beans.xml (original)
+++ trunk/idp-conf/src/main/resources/flows/authn/jaas-basic-authn-beans.xml Mon Oct 21 16:41:01 2013
@@ -24,7 +24,8 @@
         p:transforms-ref="shibboleth.authn.JAAS.Transforms" />
         
     <bean id="ValidateUsernamePasswordAgainstJAAS" class="net.shibboleth.idp.authn.impl.ValidateUsernamePasswordAgainstJAAS" scope="prototype"
-            p:loginConfigName-ref="shibboleth.authn.JAAS.LoginConfigName" p:loginConfigType="JavaLoginConfig">
+            p:loginConfigName-ref="shibboleth.authn.JAAS.LoginConfigName" p:loginConfigType="JavaLoginConfig"
+            p:resultCachingPredicate="#{getObject('shibboleth.authn.JAAS.resultCachingPredicate')}" >
         <property name="loginConfigParameters">
             <bean class="java.security.URIParameter">
                 <constructor-arg ref="shibboleth.authn.JAAS.JAASConfigURI" />

Modified: trunk/idp-conf/src/main/resources/flows/authn/jaas-form-authn-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/flows/authn/jaas-form-authn-beans.xml?rev=4894&r1=4893&r2=4894&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/flows/authn/jaas-form-authn-beans.xml (original)
+++ trunk/idp-conf/src/main/resources/flows/authn/jaas-form-authn-beans.xml Mon Oct 21 16:41:01 2013
@@ -26,7 +26,8 @@
         p:transforms-ref="shibboleth.authn.JAAS.Transforms" />
         
     <bean id="ValidateUsernamePasswordAgainstJAAS" class="net.shibboleth.idp.authn.impl.ValidateUsernamePasswordAgainstJAAS" scope="prototype"
-            p:loginConfigName-ref="shibboleth.authn.JAAS.LoginConfigName" p:loginConfigType="JavaLoginConfig">
+            p:loginConfigName-ref="shibboleth.authn.JAAS.LoginConfigName" p:loginConfigType="JavaLoginConfig"
+            p:resultCachingPredicate="#{getObject('shibboleth.authn.JAAS.resultCachingPredicate')}">
         <property name="loginConfigParameters">
             <bean class="java.security.URIParameter">
                 <constructor-arg ref="shibboleth.authn.JAAS.JAASConfigURI" />

Modified: trunk/idp-conf/src/main/resources/flows/authn/remoteuser-authn-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/flows/authn/remoteuser-authn-beans.xml?rev=4894&r1=4893&r2=4894&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/flows/authn/remoteuser-authn-beans.xml (original)
+++ trunk/idp-conf/src/main/resources/flows/authn/remoteuser-authn-beans.xml Mon Oct 21 16:41:01 2013
@@ -29,6 +29,7 @@
     <bean id="ValidateRemoteUser" class="net.shibboleth.idp.authn.impl.ValidateRemoteUser" scope="prototype"
         p:matchExpression="#{getObject('shibboleth.authn.RemoteUser.matchExpression')}"
         p:whitelistedUsernames-ref="shibboleth.authn.RemoteUser.whitelistedUsernames"
-        p:blacklistedUsernames-ref="shibboleth.authn.RemoteUser.blacklistedUsernames" />
+        p:blacklistedUsernames-ref="shibboleth.authn.RemoteUser.blacklistedUsernames"
+        p:resultCachingPredicate="#{getObject('shibboleth.authn.RemoteUser.resultCachingPredicate')}" />
 
 </beans>