[java-identity-provider COMMIT] in /trunk/idp-conf/src/main/resources: conf/authn/authn-events-flow.xml conf/c14n/sub...

[noreply at shibboleth.net]

Author: scantor
Date: Sun Nov  2 18:07:58 2014
New Revision: 6820

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6820&view=rev
Log:
Reserve parent flows for custom authn and c14n events.

Added:
    trunk/idp-conf/src/main/resources/conf/authn/authn-events-flow.xml   (with props)
    trunk/idp-conf/src/main/resources/conf/c14n/subject-c14n-events-flow.xml   (with props)
Modified:
    trunk/idp-conf/src/main/resources/system/conf/webflow-config.xml
    trunk/idp-conf/src/main/resources/system/flows/authn/authn-abstract-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/c14n/subject-c14n-abstract-flow.xml

Modified: trunk/idp-conf/src/main/resources/system/conf/webflow-config.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/conf/webflow-config.xml?rev=6820&r1=6819&r2=6820&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/conf/webflow-config.xml (original)
+++ trunk/idp-conf/src/main/resources/system/conf/webflow-config.xml Sun Nov  2 18:07:58 2014
@@ -63,6 +63,7 @@
         <webflow:flow-location id="security-policy/soap" path="../system/flows/saml/soap-security-flow.xml" />
 
         <!-- Master flow for authentication. -->
+        <webflow:flow-location id="authn.events" path="../conf/authn/authn-events-flow.xml" />
         <webflow:flow-location id="authn.abstract" path="../system/flows/authn/authn-abstract-flow.xml" />
         <webflow:flow-location id="authn-initial" path="../system/flows/authn/initial-authn-flow.xml" />
         <webflow:flow-location id="authn" path="../system/flows/authn/authn-flow.xml" />
@@ -77,6 +78,7 @@
         <webflow:flow-location id="authn/External" path="../system/flows/authn/external-authn-flow.xml" />
 
         <!-- Master flows for post-authn and SAML subject c14n. -->
+        <webflow:flow-location id="c14n.events" path="../conf/c14n/subject-c14n-events-flow.xml" />
         <webflow:flow-location id="c14n.abstract" path="../system/flows/c14n/subject-c14n-abstract-flow.xml" />
         <webflow:flow-location id="c14n/authn" path="../system/flows/c14n/subject-c14n-authn-flow.xml" />
         <webflow:flow-location id="c14n/saml" path="../system/flows/c14n/subject-c14n-saml-flow.xml" />

Modified: trunk/idp-conf/src/main/resources/system/flows/authn/authn-abstract-flow.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/authn/authn-abstract-flow.xml?rev=6820&r1=6819&r2=6820&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/authn/authn-abstract-flow.xml (original)
+++ trunk/idp-conf/src/main/resources/system/flows/authn/authn-abstract-flow.xml Sun Nov  2 18:07:58 2014
@@ -1,7 +1,7 @@
 <flow xmlns="http://www.springframework.org/schema/webflow"
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xsi:schemaLocation="http://www.springframework.org/schema/webflow http://www.springframework.org/schema/webflow/spring-webflow.xsd"
-      abstract="true">
+      abstract="true" parent="authn.events">
 
     <!-- Rudimentary impediment to direct execution of subflow. -->
     <input name="calledAsSubflow" type="boolean" required="true" />

Modified: trunk/idp-conf/src/main/resources/system/flows/c14n/subject-c14n-abstract-flow.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/c14n/subject-c14n-abstract-flow.xml?rev=6820&r1=6819&r2=6820&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/c14n/subject-c14n-abstract-flow.xml (original)
+++ trunk/idp-conf/src/main/resources/system/flows/c14n/subject-c14n-abstract-flow.xml Sun Nov  2 18:07:58 2014
@@ -1,7 +1,7 @@
 <flow xmlns="http://www.springframework.org/schema/webflow"
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xsi:schemaLocation="http://www.springframework.org/schema/webflow http://www.springframework.org/schema/webflow/spring-webflow.xsd"
-      abstract="true">
+      abstract="true" parent="c14n.events">
 
     <!-- Rudimentary impediment to direct execution of subflow. -->
     <input name="calledAsSubflow" type="boolean" required="true" />