[java-identity-provider COMMIT] /trunk/idp-conf/src/main/resources/system/conf/webflow-config.xml

[noreply at shibboleth.net]

Author: scantor
Date: Mon Jul 21 14:03:16 2014
New Revision: 6324

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6324&view=rev
Log:
Try and collapse into one flow registry.

Modified:
    trunk/idp-conf/src/main/resources/system/conf/webflow-config.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=6324&r1=6323&r2=6324&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 Mon Jul 21 14:03:16 2014
@@ -14,77 +14,72 @@
     <!--
     Define custom flows by using the filesystem directly. Flows will be named based
     on the directories between the base-path and the flow file ending in -flow.xml
+    -->
+    <webflow:flow-registry id="flowRegistry" base-path="%{idp.home}/flows" flow-builder-services="flowBuilderServices">
+        <webflow:flow-location-pattern value="/**/*-flow.xml" />
 
-    NOTE: you cannot override named flows in the system registry below. If absolutely
-    necessary, you can comment out system flows to override them.
-    -->
-    <webflow:flow-registry id="userFlowRegistry" base-path="%{idp.home}/flows" flow-builder-services="flowBuilderServices">
-        <webflow:flow-location-pattern value="/**/*-flow.xml" />
-    </webflow:flow-registry>
-
-    <!-- System-supplied flows, do not modify. -->
-    <webflow:flow-registry id="flowRegistry" parent="userFlowRegistry" base-path="%{idp.home}/system/flows" flow-builder-services="flowBuilderServices">
+        <!-- System-supplied flows, do not modify. -->
 
         <!-- Status flow. -->
-        <webflow:flow-location id="status" path="/status/status-flow.xml" />
+        <webflow:flow-location id="status" path="../system/flows/status/status-flow.xml" />
 
         <!-- Abstract flows underpinning SAML profiles. -->
-        <webflow:flow-location id="saml.abstract" path="/saml/saml-abstract-flow.xml" />
-        <webflow:flow-location id="saml1.sso.abstract" path="/saml/saml1/sso-abstract-flow.xml" />
-        <webflow:flow-location id="saml2.sso.abstract" path="/saml/saml2/sso-abstract-flow.xml" />
+        <webflow:flow-location id="saml.abstract" path="../system/flows/saml/saml-abstract-flow.xml" />
+        <webflow:flow-location id="saml1.sso.abstract" path="../system/flows/saml/saml1/sso-abstract-flow.xml" />
+        <webflow:flow-location id="saml2.sso.abstract" path="../system/flows/saml/saml2/sso-abstract-flow.xml" />
 
         <!-- SAML profile flows. -->
-        <webflow:flow-location id="profile/Shibboleth/SSO" path="/saml/saml1/sso-unsolicited-flow.xml" />
-        <webflow:flow-location id="profile/SAML1/SOAP/AttributeQuery" path="/saml/saml1/attribute-query-flow.xml" />
-        <webflow:flow-location id="profile/SAML1/SOAP/ArtifactResolution" path="/saml/saml1/artifact-resolution-flow.xml" />
-        <webflow:flow-location id="profile/SAML2/POST/SSO" path="/saml/saml2/sso-post-flow.xml" />
-        <webflow:flow-location id="profile/SAML2/POST-SimpleSign/SSO" path="/saml/saml2/sso-post-flow.xml" />
-        <webflow:flow-location id="profile/SAML2/Redirect/SSO" path="/saml/saml2/sso-redirect-flow.xml" />
-        <webflow:flow-location id="profile/SAML2/Unsolicited/SSO" path="/saml/saml2/sso-unsolicited-flow.xml" />
-        <webflow:flow-location id="profile/SAML2/SOAP/ECP" path="/saml/saml2/sso-ecp-flow.xml" />
-        <webflow:flow-location id="profile/SAML2/SOAP/AttributeQuery" path="/saml/saml2/attribute-query-flow.xml" />
-        <webflow:flow-location id="profile/SAML2/SOAP/ArtifactResolution" path="/saml/saml2/artifact-resolution-flow.xml" />
+        <webflow:flow-location id="profile/Shibboleth/SSO" path="../system/flows/saml/saml1/sso-unsolicited-flow.xml" />
+        <webflow:flow-location id="profile/SAML1/SOAP/AttributeQuery" path="../system/flows/saml/saml1/attribute-query-flow.xml" />
+        <webflow:flow-location id="profile/SAML1/SOAP/ArtifactResolution" path="../system/flows/saml/saml1/artifact-resolution-flow.xml" />
+        <webflow:flow-location id="profile/SAML2/POST/SSO" path="../system/flows/saml/saml2/sso-post-flow.xml" />
+        <webflow:flow-location id="profile/SAML2/POST-SimpleSign/SSO" path="../system/flows/saml/saml2/sso-post-flow.xml" />
+        <webflow:flow-location id="profile/SAML2/Redirect/SSO" path="../system/flows/saml/saml2/sso-redirect-flow.xml" />
+        <webflow:flow-location id="profile/SAML2/Unsolicited/SSO" path="../system/flows/saml/saml2/sso-unsolicited-flow.xml" />
+        <webflow:flow-location id="profile/SAML2/SOAP/ECP" path="../system/flows/saml/saml2/sso-ecp-flow.xml" />
+        <webflow:flow-location id="profile/SAML2/SOAP/AttributeQuery" path="../system/flows/saml/saml2/attribute-query-flow.xml" />

[... 71 lines stripped ...]