[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: Tue Nov 19 12:24:46 2013
New Revision: 4958

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4958&view=rev
Log:
IDP-337:  Allow override of determination of which results are active for reuse

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=4958&r1=4957&r2=4958&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/idp.properties (original)
+++ trunk/idp-conf/src/main/resources/conf/idp.properties Tue Nov 19 12:24:46 2013
@@ -41,6 +41,9 @@
 # Support lookup by SP for SAML logout
 idp.session.secondaryServiceIndex = false
 
+# Select implementation for step that determines what results are active
+idp.session.activeResultExtraction = net.shibboleth.idp.session.impl.ExtractActiveAuthenticationResults 
+
 # Regular expression expressing flows to enable 
 idp.authn.flows = IPAddress|JAASForm
 

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=4958&r1=4957&r2=4958&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 Tue Nov 19 12:24:46 2013
@@ -27,7 +27,7 @@
         p:httpServletRequest-ref="shibboleth.HttpServletRequest"
         p:sessionResolver-ref="shibboleth.SessionManager" />
     
-    <bean id="ExtractActiveAuthenticationResults" class="net.shibboleth.idp.session.impl.ExtractActiveAuthenticationResults" scope="prototype" />
+    <bean id="ExtractActiveAuthenticationResults" class="${idp.session.activeResultExtraction}" scope="prototype" />
 
     <bean id="FilterFlowsByForcedAuthn" class="net.shibboleth.idp.authn.impl.FilterFlowsByForcedAuthn" scope="prototype" />