[java-identity-provider] branch main updated: Move flow registration customization to mvc-beans.xml.

[Scott Cantor]

This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to branch main
in repository java-identity-provider.

View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=b6680ad595a497ccc8bf42fd083126cc045a6e5e

The following commit(s) were added to refs/heads/main by this push:
     new b6680ad59 Move flow registration customization to mvc-beans.xml.
b6680ad59 is described below

commit b6680ad595a497ccc8bf42fd083126cc045a6e5e
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Tue May 9 13:53:20 2023 -0400

    Move flow registration customization to mvc-beans.xml.
---
 .../spring/IdPPropertiesApplicationContextInitializerTest.java |  2 +-
 idp-conf/src/test/resources/conf/global.xml                    | 10 ----------
 idp-conf/src/test/resources/conf/mvc-beans.xml                 | 10 ++++++++++
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/idp-conf/src/test/java/net/shibboleth/idp/test/spring/IdPPropertiesApplicationContextInitializerTest.java b/idp-conf/src/test/java/net/shibboleth/idp/test/spring/IdPPropertiesApplicationContextInitializerTest.java
index 66b9a0286..66cd40c1f 100644
--- a/idp-conf/src/test/java/net/shibboleth/idp/test/spring/IdPPropertiesApplicationContextInitializerTest.java
+++ b/idp-conf/src/test/java/net/shibboleth/idp/test/spring/IdPPropertiesApplicationContextInitializerTest.java
@@ -46,7 +46,7 @@ public class IdPPropertiesApplicationContextInitializerTest {
     @BeforeMethod public void setUp() {
         sc = new MockServletContext("");
         sc.addInitParameter(ContextLoader.CONTEXT_CLASS_PARAM, "net.shibboleth.ext.spring.context.DelimiterAwareApplicationContext");
-        sc.addInitParameter(ContextLoader.CONFIG_LOCATION_PARAM, "classpath:/net/shibboleth/idp/conf/global-system.xml,classpath:/net/shibboleth/idp/conf/webflow-config.xml,classpath:/net/shibboleth/idp/conf/mvc-beans.xml");
+        sc.addInitParameter(ContextLoader.CONFIG_LOCATION_PARAM, "classpath:/net/shibboleth/idp/conf/global-system.xml");
         sc.addInitParameter(ContextLoader.CONTEXT_INITIALIZER_CLASSES_PARAM,
                 IdPPropertiesApplicationContextInitializer.class.getName());
         listener = new ContextLoaderListener();
diff --git a/idp-conf/src/test/resources/conf/global.xml b/idp-conf/src/test/resources/conf/global.xml
index befcd87e4..9c2678528 100644
--- a/idp-conf/src/test/resources/conf/global.xml
+++ b/idp-conf/src/test/resources/conf/global.xml
@@ -92,16 +92,6 @@
         <jdbc:script location="classpath:/test/test-jdbc.sql"/>
     </jdbc:initialize-database>
 
-    <!-- Allows flows to run out of the module source tree. -->
-    <bean id="shibboleth.FlowPatterns" parent="shibboleth.DefaultFlowPatterns">
-        <property name="sourceMap">
-            <map merge="true">
-                <entry key="classpath*:/net/shibboleth/idp/module/flows/**/*-flow.xml"
-                    value="/net/shibboleth/idp/module/flows" />
-            </map>
-        </property>
-    </bean>
-    
     <!--
     <bean id="shibboleth.authn.TOTP.SeedSource" parent="shibboleth.authn.TOTP.StaticSeedSource">
         <property name="seeds">
diff --git a/idp-conf/src/test/resources/conf/mvc-beans.xml b/idp-conf/src/test/resources/conf/mvc-beans.xml
index 32b0b8c80..60d5a7114 100644
--- a/idp-conf/src/test/resources/conf/mvc-beans.xml
+++ b/idp-conf/src/test/resources/conf/mvc-beans.xml
@@ -24,4 +24,14 @@
         <property name="defaultLocale" value="en"/>
     </bean>
     
+    <!-- Allows flows to run out of the module source tree. -->
+    <bean id="shibboleth.FlowPatterns" parent="shibboleth.DefaultFlowPatterns">
+        <property name="sourceMap">
+            <map merge="true">
+                <entry key="classpath*:/net/shibboleth/idp/module/flows/**/*-flow.xml"
+                    value="/net/shibboleth/idp/module/flows" />
+            </map>
+        </property>
+    </bean>
+        
 </beans>

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.