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

[noreply at shibboleth.net]

Author: scantor
Date: Tue Jul 19 16:12:08 2016
New Revision: 8300

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

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

Define a WKL for plugin flows, and verify by altering idp-conf test flow.

Added:
    trunk/idp-conf/src/test/resources/META-INF/
    trunk/idp-conf/src/test/resources/META-INF/net/
    trunk/idp-conf/src/test/resources/META-INF/net/shibboleth/
    trunk/idp-conf/src/test/resources/META-INF/net/shibboleth/idp/
    trunk/idp-conf/src/test/resources/META-INF/net/shibboleth/idp/flows/
    trunk/idp-conf/src/test/resources/META-INF/net/shibboleth/idp/flows/resolveAndFilter/
    trunk/idp-conf/src/test/resources/META-INF/net/shibboleth/idp/flows/resolveAndFilter/beans.xml
      - copied unchanged from r8297, trunk/idp-conf/src/test/resources/mapping/webflows/beans.xml
    trunk/idp-conf/src/test/resources/META-INF/net/shibboleth/idp/flows/resolveAndFilter/resolveAndFilter-flow.xml
      - copied unchanged from r8297, trunk/idp-conf/src/test/resources/mapping/webflows/resolveAndFilter-flow.xml
Modified:
    trunk/idp-conf/src/main/resources/system/conf/webflow-config.xml
    trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows/mapper/MappingTest.java
    trunk/idp-conf/src/test/resources/mapping/test-webflow-config.xml
    trunk/idp-conf/src/test/resources/mapping/webflows/

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=8300&r1=8299&r2=8300&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	Tue Jul 19 16:12:08 2016
@@ -146,9 +146,14 @@
         class="org.springframework.beans.factory.config.MapFactoryBean">
         <property name="sourceMap">
             <map>
+                <!-- Load user flows out of config directory relative to base path property. -->
                 <entry key="/**/*-flow.xml">
                     <null/>
                 </entry>
+                
+                <!-- Load plugin-defined flows from well-known classpath location. -->
+                <entry key="classpath*:/META-INF/net/shibboleth/idp/flows/**/*-flow.xml"
+                    value="/META-INF/net/shibboleth/idp/flows" />
             </map>
         </property>
     </bean>

Modified: trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows/mapper/MappingTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows/mapper/MappingTest.java?rev=8300&r1=8299&r2=8300&view=diff
==============================================================================
--- trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows/mapper/MappingTest.java	(original)
+++ trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows/mapper/MappingTest.java	Tue Jul 19 16:12:08 2016
@@ -26,13 +26,13 @@
 /**
  *
  */
- at ContextConfiguration({"classpath:/mapping/test-webflow-config.xml", "classpath:/mapping/configs/override.xml", })
+ at ContextConfiguration({"classpath:/mapping/configs/override.xml", })
 public class MappingTest extends AbstractFlowTest {
     @Test public void testResolveAndFilter() {
 
-        final FlowExecutionResult result = flowExecutor.launchExecution("testResolveAndFilter", null, externalContext);
+        final FlowExecutionResult result = flowExecutor.launchExecution("resolveAndFilter", null, externalContext);
 
-        assertFlowExecutionResult(result, "testResolveAndFilter");
+        assertFlowExecutionResult(result, "resolveAndFilter");
         assertFlowExecutionOutcome(result.getOutcome());
     }