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

[noreply at shibboleth.net]

Author: scantor
Date: Mon Jul 18 23:05:47 2016
New Revision: 8297

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=8297&view=rev
Log:
IDP-966 - Provide a mechanism for adding webflows programmatically

https://issues.shibboleth.net/jira/browse/IDP-966

Create our own SWF flow registry factory bean so we can customize it.

Added:
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/factory/FlowDefinitionRegistryFactoryBean.java   (with props)
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/factory/FlowDefinitionResourceFactory.java   (with props)
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=8297&r1=8296&r2=8297&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 18 23:05:47 2016
@@ -11,135 +11,152 @@
     <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"
         p:placeholderPrefix="%{" p:placeholderSuffix="}" />
 
-    <!--
-    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.webflows:%{idp.home}/flows}" flow-builder-services="flowBuilderServices">
-        <webflow:flow-location-pattern value="/**/*-flow.xml" />
-
-        <!-- Abstract base flow for admin flows. -->
-        <webflow:flow-location id="admin.abstract" path="../system/flows/admin/admin-abstract-flow.xml" />
-
-        <!-- Status flow (location is for backward compatibility). -->
-        <webflow:flow-location id="status" path="../system/flows/admin/status-flow.xml" />
-
-        <!-- New administrative and debugging flows. -->
-        <webflow:flow-location id="admin/resolvertest" path="../system/flows/admin/resolvertest-flow.xml" />
-        <webflow:flow-location id="admin/reload-service" path="../system/flows/admin/reload-service-flow.xml" />
-        <webflow:flow-location id="admin/reload-metadata" path="../system/flows/admin/reload-metadata-flow.xml" />
+    <!-- Default flow mappings. -->
+    <bean id="shibboleth.DefaultFlowMap" lazy-init="true"
+            class="org.springframework.beans.factory.config.MapFactoryBean">
+        <property name="sourceMap">
+            <map>
+                <!-- Abstract base flow for admin flows. -->
+                <entry key="admin.abstract" value="../system/flows/admin/admin-abstract-flow.xml"/>
+                
+                <!-- Status flow (location is for backward compatibility). -->
+                <entry key="status" value="../system/flows/admin/status-flow.xml" />
         
-        <!-- Proprietary logout flow. -->
-        <webflow:flow-location id="Logout" path="../system/flows/logout/logout-flow.xml" />
-
-        <!-- Logout propagation master flow. -->
-        <webflow:flow-location id="PropagateLogout" path="../system/flows/logout/logout-propagation-flow.xml" />
-
-        <!-- Logout propagation delegate flows. -->
-        <webflow:flow-location id="logoutprop/cas" path="../system/flows/logout/propagation/cas-flow.xml" />
-        <webflow:flow-location id="logoutprop/saml2" path="../system/flows/logout/propagation/saml2-flow.xml" />
-
-        <!-- Abstract flows underpinning SAML profiles. -->
-        <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" />
-        <webflow:flow-location id="saml2.slo.front.abstract" path="../system/flows/saml/saml2/slo-front-abstract-flow.xml" />
-
-        <!-- SAML profile flows. -->
-        <webflow:flow-location id="Shibboleth/SSO" path="../system/flows/saml/saml1/sso-unsolicited-flow.xml" />
-        <webflow:flow-location id="SAML1/SOAP/AttributeQuery" path="../system/flows/saml/saml1/attribute-query-flow.xml" />
-        <webflow:flow-location id="SAML1/SOAP/ArtifactResolution" path="../system/flows/saml/saml1/artifact-resolution-flow.xml" />
-        <webflow:flow-location id="SAML2/POST/SSO" path="../system/flows/saml/saml2/sso-post-flow.xml" />
-        <webflow:flow-location id="SAML2/POST-SimpleSign/SSO" path="../system/flows/saml/saml2/sso-post-flow.xml" />
-        <webflow:flow-location id="SAML2/Redirect/SSO" path="../system/flows/saml/saml2/sso-redirect-flow.xml" />
-        <webflow:flow-location id="SAML2/Unsolicited/SSO" path="../system/flows/saml/saml2/sso-unsolicited-flow.xml" />

[... 225 lines stripped ...]