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

[noreply at shibboleth.net]

Author: tzeller
Date: Wed May 20 13:52:44 2015
New Revision: 7524

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7524&view=rev
Log:
IDP-594 Some work on local storage read and write subflows with tests.

Added:
    trunk/idp-conf/src/main/resources/system/flows/local-storage/
    trunk/idp-conf/src/main/resources/system/flows/local-storage/local-storage-read-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/local-storage/local-storage-write-flow.xml
    trunk/idp-conf/src/main/resources/system/views/local-storage/
    trunk/idp-conf/src/main/resources/system/views/local-storage/local-storage-read.js   (with props)
    trunk/idp-conf/src/main/resources/system/views/local-storage/local-storage-read.vm   (with props)
    trunk/idp-conf/src/main/resources/system/views/local-storage/local-storage-write.js   (with props)
    trunk/idp-conf/src/main/resources/system/views/local-storage/local-storage-write.vm   (with props)
    trunk/idp-conf/src/test/java/net/shibboleth/idp/test/PreferFileSystemApplicationContextInitializer.java   (with props)
    trunk/idp-conf/src/test/resources/flows/
    trunk/idp-conf/src/test/resources/flows/test/
    trunk/idp-conf/src/test/resources/flows/test/local-storage/
    trunk/idp-conf/src/test/resources/flows/test/local-storage/local-storage-test-beans.xml
    trunk/idp-conf/src/test/resources/flows/test/local-storage/read/
    trunk/idp-conf/src/test/resources/flows/test/local-storage/read/local-storage-read-test-flow.xml
    trunk/idp-conf/src/test/resources/flows/test/local-storage/write/
    trunk/idp-conf/src/test/resources/flows/test/local-storage/write/local-storage-write-test-flow.xml
    trunk/idp-conf/src/test/resources/views-test/
    trunk/idp-conf/src/test/resources/views-test/local-storage-test/
    trunk/idp-conf/src/test/resources/views-test/local-storage-test/local-storage-display.js   (with props)
    trunk/idp-conf/src/test/resources/views-test/local-storage-test/local-storage-display.vm   (with props)
Modified:
    trunk/idp-conf/src/main/resources/system/conf/webflow-config.xml
    trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows/AbstractFlowTest.java

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=7524&r1=7523&r2=7524&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	Wed May 20 13:52:44 2015
@@ -123,6 +123,10 @@
         <webflow:flow-location id="cas/proxyValidate" path="../system/flows/cas/proxyValidate/proxyValidate-flow.xml" />
         <webflow:flow-location id="cas/samlValidate" path="../system/flows/cas/samlValidate/samlValidate-flow.xml" />
 
+        <!-- Local storage flows. -->
+        <webflow:flow-location id="local-storage/read" path="../system/flows/local-storage/local-storage-read-flow.xml" />
+        <webflow:flow-location id="local-storage/write" path="../system/flows/local-storage/local-storage-write-flow.xml" />
+
     </webflow:flow-registry>
 
     <webflow:flow-executor id="flowExecutor">

Modified: trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows/AbstractFlowTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows/AbstractFlowTest.java?rev=7524&r1=7523&r2=7524&view=diff
==============================================================================
--- trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows/AbstractFlowTest.java	(original)
+++ trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows/AbstractFlowTest.java	Wed May 20 13:52:44 2015
@@ -27,6 +27,7 @@
 import net.shibboleth.ext.spring.factory.X509CertificateFactoryBean;
 import net.shibboleth.idp.spring.IdPPropertiesApplicationContextInitializer;
 import net.shibboleth.idp.test.InMemoryDirectory;
+import net.shibboleth.idp.test.PreferFileSystemApplicationContextInitializer;
 import net.shibboleth.idp.test.PreferFileSystemContextLoader;
 import net.shibboleth.utilities.java.support.annotation.constraint.NonnullAfterInit;
 import net.shibboleth.utilities.java.support.logic.Constraint;
@@ -87,8 +88,9 @@
  * Abstract flow test.
  */
 @ContextConfiguration(locations = {"/system/conf/global-system.xml", "/system/conf/mvc-beans.xml",
-        "/system/conf/webflow-config.xml", "/test/test-beans.xml", "/test/override-beans.xml", },
-        initializers = IdPPropertiesApplicationContextInitializer.class, loader = PreferFileSystemContextLoader.class)
+        "/system/conf/webflow-config.xml", "/test/test-beans.xml", "/test/override-beans.xml",}, initializers = {
+        PreferFileSystemApplicationContextInitializer.class, IdPPropertiesApplicationContextInitializer.class},
+        loader = PreferFileSystemContextLoader.class)
 @WebAppConfiguration
 public abstract class AbstractFlowTest extends AbstractTestNGSpringContextTests {
 

[... 10 lines stripped ...]