[java-idp-testbed COMMIT] in /trunk/src/main/config: conf/webflow-config.xml flows/authn/ flows/authn/account-locked-...

[noreply at shibboleth.net]

Author: scantor
Date: Tue Dec 10 17:38:03 2013
New Revision: 76

URL: http://svn.shibboleth.net/view/java-idp-testbed?rev=76&view=rev
Log:
Reorganize flow inheritance to give user control of login event handling.

Added:
    trunk/src/main/config/flows/authn/
    trunk/src/main/config/flows/authn/account-locked-flow.xml   (with props)
    trunk/src/main/config/flows/authn/authn-conditions-flow.xml   (with props)
    trunk/src/main/config/flows/authn/expired-password-flow.xml   (with props)
    trunk/src/main/config/flows/authn/expiring-password-flow.xml
      - copied, changed from r73, trunk/src/main/config/system/flows/authn/placeholder-flow.xml
Modified:
    trunk/src/main/config/conf/webflow-config.xml
    trunk/src/main/config/system/flows/authn/jaas-authn-flow.xml
    trunk/src/main/config/system/flows/authn/ldap-authn-flow.xml
    trunk/src/main/config/system/flows/authn/placeholder-flow.xml

Modified: trunk/src/main/config/conf/webflow-config.xml
URL: http://svn.shibboleth.net/view/java-idp-testbed/trunk/src/main/config/conf/webflow-config.xml?rev=76&r1=75&r2=76&view=diff
==============================================================================
--- trunk/src/main/config/conf/webflow-config.xml (original)
+++ trunk/src/main/config/conf/webflow-config.xml Tue Dec 10 17:38:03 2013
@@ -9,28 +9,32 @@
     <context:property-placeholder location="file://${idp.home}/conf/idp.properties" />
 
     <!-- Define custom flows, or override system flows, inside here. -->
-    <webflow:flow-registry id="flowRegistry" parent="systemFlowRegistry" base-path="file://${idp.home}/flows" flow-builder-services="flowBuilderServices">
+    <webflow:flow-registry id="userFlowRegistry" base-path="file://${idp.home}/flows" flow-builder-services="flowBuilderServices">
+    
+        <!-- Directs event handling during the login process to custom flows like those below. -->
+        <webflow:flow-location id="Authentication.Conditions" path="/authn/authn-conditions-flow.xml" />
+
+        <!-- Login error/warning subflows that can be customized. -->
+        <webflow:flow-location id="Authentication.ExpiringPassword" path="/authn/expiring-password-flow.xml" />
+        <webflow:flow-location id="Authentication.ExpiredPassword" path="/authn/expired-password-flow.xml" />
+        <webflow:flow-location id="Authentication.AccountLocked" path="/authn/account-locked-flow.xml" />
     </webflow:flow-registry>
 
     <!-- System-supplied flows, do not modify. -->
-    <webflow:flow-registry id="systemFlowRegistry" base-path="file://${idp.home}/system/flows" flow-builder-services="flowBuilderServices">
+    <webflow:flow-registry id="flowRegistry" parent="userFlowRegistry" base-path="file://${idp.home}/system/flows" flow-builder-services="flowBuilderServices">
 
         <!-- Use dot-separated convention for abstract flows. -->
-        <webflow:flow-location id="SAML2.SSO.Abstract" path="/saml2/sso-abstract-flow.xml"  />
+        <webflow:flow-location id="SAML2.SSO.Abstract" path="/saml2/sso-abstract-flow.xml" />
         
         <!-- Use slash-separated convention for web-executable flows. -->
-        <webflow:flow-location id="SAML2/Redirect/SSO" path="/saml2/sso-redirect-flow.xml"  />
+        <webflow:flow-location id="SAML2/Redirect/SSO" path="/saml2/sso-redirect-flow.xml" />
         <webflow:flow-location id="SAML2/POST/SSO" path="/saml2/sso-post-flow.xml"  />
         <webflow:flow-location id="SAML2/Unsolicited/SSO" path="/saml2/sso-unsolicited-flow.xml"  />
     
         <webflow:flow-location id="Authentication.Abstract" path="/authn/authn-abstract-flow.xml" />
         <webflow:flow-location id="Authentication.Subflow.Abstract" path="/authn/authn-subflow-abstract-flow.xml" />
+
         <webflow:flow-location id="Authentication" path="/authn/authn-flow.xml" />
-
-        <!-- Login error subflows. -->
-        <webflow:flow-location id="Authentication.ExpiredPassword" path="/authn/placeholder-flow.xml" />
-        <webflow:flow-location id="Authentication.ExpiringPassword" path="/authn/placeholder-flow.xml" />
-        <webflow:flow-location id="Authentication.AccountLocked" path="/authn/placeholder-flow.xml" />
         
         <!-- Login methods. -->
         <webflow:flow-location id="AuthenticationFlow/IPAddress" path="/authn/ipaddress-authn-flow.xml" />

Copied: trunk/src/main/config/flows/authn/expiring-password-flow.xml (from r73, trunk/src/main/config/system/flows/authn/placeholder-flow.xml)
URL: http://svn.shibboleth.net/view/java-idp-testbed/trunk/src/main/config/flows/authn/expiring-password-flow.xml?p2=trunk/src/main/config/flows/authn/expiring-password-flow.xml&p1=trunk/src/main/config/system/flows/authn/placeholder-flow.xml&r1=73&r2=76&rev=76&view=diff
==============================================================================
--- trunk/src/main/config/system/flows/authn/placeholder-flow.xml (original)
+++ trunk/src/main/config/flows/authn/expiring-password-flow.xml Tue Dec 10 17:38:03 2013
@@ -1,15 +1,13 @@
 <flow xmlns="http://www.springframework.org/schema/webflow"

[... 124 lines stripped ...]