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

[noreply at shibboleth.net]

Author: scantor
Date: Mon Jun 22 20:09:14 2015
New Revision: 7594

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7594&view=rev
Log:
First attempt to split idp.home from webflow base loc, with idp.webflows property

Modified:
    trunk/idp-conf/src/main/resources/conf/idp.properties
    trunk/idp-conf/src/main/resources/system/conf/webflow-config.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=7594&r1=7593&r2=7594&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/idp.properties	(original)
+++ trunk/idp-conf/src/main/resources/conf/idp.properties	Mon Jun 22 20:09:14 2015
@@ -13,6 +13,9 @@
 #idp.cookie.domain =
 #idp.cookie.path =
 #idp.cookie.maxAge = 31536000
+
+# Set the location of user-supplied web flow definitions
+#idp.webflows = %{idp.home}/flows
 
 # Set the location of Velocity view templates
 #idp.views = %{idp.home}/views

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=7594&r1=7593&r2=7594&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 Jun 22 20:09:14 2015
@@ -15,7 +15,7 @@
     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-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. -->