[java-identity-provider] branch master updated: IDP-1642 - Migrate configuration into jars where feasible

Scott Cantor cantor.2 at osu.edu
Mon Jul 20 17:15:15 UTC 2020 

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

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

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

The following commit(s) were added to refs/heads/master by this push:
       new  6ae5b1b39 IDP-1642 - Migrate configuration into jars where feasible
6ae5b1b39 is described below

commit 6ae5b1b3923abfee5a07222a23accdabf3e9d807
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Mon Jul 20 13:15:45 2020 -0400

    IDP-1642 - Migrate configuration into jars where feasible
    
    https://issues.shibboleth.net/jira/browse/IDP-1642
    
    Move admin flows into idp-admin-impl.
    Auto-register all but the abstract parent flow.
---
 idp-admin-api/pom.xml                              |  6 +--
 idp-admin-impl/pom.xml                             | 61 +++++++++++++++++-----
 .../idp/flows/admin/hello}/hello-beans.xml         |  2 -
 .../idp/flows/admin/hello}/hello-flow.xml          |  0
 .../idp/flows/admin/lockout}/lockout-beans.xml     |  2 -
 .../idp/flows/admin/lockout}/lockout-flow.xml      |  0
 .../idp/flows/admin/mdquery}/mdquery-beans.xml     |  2 -
 .../idp/flows/admin/mdquery}/mdquery-flow.xml      |  0
 .../idp/flows/admin/metrics}/metrics-beans.xml     |  2 -
 .../idp/flows/admin/metrics}/metrics-flow.xml      |  0
 .../reload-metadata}/reload-metadata-beans.xml     |  2 -
 .../reload-metadata}/reload-metadata-flow.xml      |  0
 .../admin/reload-service}/reload-service-beans.xml |  2 -
 .../admin/reload-service}/reload-service-flow.xml  |  0
 .../admin/resolvertest}/resolvertest-beans.xml     |  2 -
 .../admin/resolvertest}/resolvertest-flow.xml      |  0
 .../idp/flows/admin/status}/status-beans.xml       |  2 -
 .../idp/flows/admin/status}/status-flow.xml        |  0
 .../idp/flows/admin/storage}/storage-beans.xml     |  2 -
 .../idp/flows/admin/storage}/storage-flow.xml      |  0
 .../flows/admin/unlock-keys}/unlock-keys-beans.xml |  2 -
 .../flows/admin/unlock-keys}/unlock-keys-flow.xml  |  0
 .../idp/admin/flows}/admin-abstract-beans.xml      |  0
 .../idp/admin/flows}/admin-abstract-flow.xml       |  1 +
 .../main/resources/system/conf/webflow-config.xml  | 21 ++------
 25 files changed, 57 insertions(+), 52 deletions(-)

diff --git a/idp-admin-api/pom.xml b/idp-admin-api/pom.xml
index 9e8e8aa58..ef6112f69 100644
--- a/idp-admin-api/pom.xml
+++ b/idp-admin-api/pom.xml
@@ -51,12 +51,12 @@
             <artifactId>opensaml-saml-api</artifactId>
         </dependency>
 
-	<dependency>
+        <dependency>
             <groupId>com.google.code.findbugs</groupId>
             <artifactId>jsr305</artifactId>
-	</dependency>
+        </dependency>
 
-	<dependency>
+        <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
         </dependency>
diff --git a/idp-admin-impl/pom.xml b/idp-admin-impl/pom.xml
index 79e593da9..162baa7e2 100644
--- a/idp-admin-impl/pom.xml
+++ b/idp-admin-impl/pom.xml
@@ -51,21 +51,30 @@
             <artifactId>opensaml-storage-api</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>net.shibboleth.ext</groupId>
+            <artifactId>spring-extensions</artifactId>
+        </dependency>
         <dependency>
             <groupId>net.shibboleth.utilities</groupId>
             <artifactId>java-support</artifactId>
         </dependency>
 
-	<dependency>
+        <dependency>
             <groupId>com.google.code.findbugs</groupId>
             <artifactId>jsr305</artifactId>
-	</dependency>
+        </dependency>
 
-	<dependency>
+        <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-core</artifactId>
@@ -112,10 +121,10 @@
             <artifactId>spring-webflow</artifactId>
         </dependency>
 
-	<dependency>
-	    <groupId>org.cryptacular</groupId>
-	    <artifactId>cryptacular</artifactId>
-	</dependency>
+        <dependency>
+            <groupId>org.cryptacular</groupId>
+            <artifactId>cryptacular</artifactId>
+        </dependency>
         
         <!-- Provided Dependencies -->
         <dependency>
@@ -125,6 +134,38 @@
         </dependency>
 
         <!-- Runtime Dependencies -->
+        <!--
+        These are strictly correct due to the embedded flows,
+        but primarily present for Eclipse class lookup.
+        -->
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>idp-authn-impl</artifactId>
+            <version>${project.version}</version>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>idp-profile-impl</artifactId>
+            <version>${project.version}</version>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>idp-saml-impl</artifactId>
+            <version>${project.version}</version>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>${opensaml.groupId}</groupId>
+            <artifactId>opensaml-profile-impl</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>${opensaml.groupId}</groupId>
+            <artifactId>opensaml-storage-impl</artifactId>
+            <scope>runtime</scope>
+        </dependency>
 
         <!-- Test Dependencies -->
         <dependency>
@@ -140,12 +181,6 @@
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>${opensaml.groupId}</groupId>
-            <artifactId>opensaml-saml-impl</artifactId>
-            <scope>test</scope>
-        </dependency>
-
         <dependency>
             <groupId>${spring.groupId}</groupId>
             <artifactId>spring-test</artifactId>
diff --git a/idp-conf/src/main/resources/system/flows/admin/hello-beans.xml b/idp-admin-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/admin/hello/hello-beans.xml
similarity index 97%
rename from idp-conf/src/main/resources/system/flows/admin/hello-beans.xml
rename to idp-admin-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/admin/hello/hello-beans.xml
index f8f6d34f3..596a495b2 100644
--- a/idp-conf/src/main/resources/system/flows/admin/hello-beans.xml
+++ b/idp-admin-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/admin/hello/hello-beans.xml
@@ -15,8 +15,6 @@
     <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"
         p:placeholderPrefix="%{" p:placeholderSuffix="}" />
 
-    <import resource="admin-abstract-beans.xml" />
-
     <!-- Profile ID for flow. -->    
     <bean id="shibboleth.AdminProfileId" class="java.lang.String" c:_0="http://shibboleth.net/ns/profiles/hello" />
     
diff --git a/idp-conf/src/main/resources/system/flows/admin/hello-flow.xml b/idp-admin-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/admin/hello/hello-flow.xml
similarity index 100%
rename from idp-conf/src/main/resources/system/flows/admin/hello-flow.xml
rename to idp-admin-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/admin/hello/hello-flow.xml
diff --git a/idp-conf/src/main/resources/system/flows/admin/lockout-beans.xml b/idp-admin-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/admin/lockout/lockout-beans.xml
similarity index 97%
rename from idp-conf/src/main/resources/system/flows/admin/lockout-beans.xml
rename to idp-admin-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/admin/lockout/lockout-beans.xml
index e7ea00653..c488f82bd 100644
--- a/idp-conf/src/main/resources/system/flows/admin/lockout-beans.xml
+++ b/idp-admin-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/admin/lockout/lockout-beans.xml
@@ -15,8 +15,6 @@
     <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"
         p:placeholderPrefix="%{" p:placeholderSuffix="}" />
 
-    <import resource="admin-abstract-beans.xml" />
-
     <!-- Profile ID for flow. -->    
     <bean id="shibboleth.AdminProfileId" class="java.lang.String" c:_0="http://shibboleth.net/ns/profiles/lockout-manager" />
     
diff --git a/idp-conf/src/main/resources/system/flows/admin/lockout-flow.xml b/idp-admin-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/admin/lockout/lockout-flow.xml
similarity index 100%
rename from idp-conf/src/main/resources/system/flows/admin/lockout-flow.xml
rename to idp-admin-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/admin/lockout/lockout-flow.xml
diff --git a/idp-conf/src/main/resources/system/flows/admin/mdquery-beans.xml b/idp-admin-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/admin/mdquery/mdquery-beans.xml
similarity index 98%
rename from idp-conf/src/main/resources/system/flows/admin/mdquery-beans.xml
rename to idp-admin-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/admin/mdquery/mdquery-beans.xml
index e97e3d546..970eaffb6 100644
--- a/idp-conf/src/main/resources/system/flows/admin/mdquery-beans.xml
+++ b/idp-admin-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/admin/mdquery/mdquery-beans.xml
@@ -15,8 +15,6 @@
     <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"
         p:placeholderPrefix="%{" p:placeholderSuffix="}" />
 
-    <import resource="admin-abstract-beans.xml" />
-
     <!-- Profile ID for flow. -->    
     <bean id="shibboleth.AdminProfileId" class="java.lang.String"
         c:_0="http://shibboleth.net/ns/profiles/mdquery" />
diff --git a/idp-conf/src/main/resources/system/flows/admin/mdquery-flow.xml b/idp-admin-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/admin/mdquery/mdquery-flow.xml
similarity index 100%
rename from idp-conf/src/main/resources/system/flows/admin/mdquery-flow.xml
rename to idp-admin-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/admin/mdquery/mdquery-flow.xml
diff --git a/idp-conf/src/main/resources/system/flows/admin/metrics-beans.xml b/idp-admin-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/admin/metrics/metrics-beans.xml
similarity index 97%
rename from idp-conf/src/main/resources/system/flows/admin/metrics-beans.xml
rename to idp-admin-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/admin/metrics/metrics-beans.xml
index 9d1a08f32..809c564be 100644
--- a/idp-conf/src/main/resources/system/flows/admin/metrics-beans.xml
+++ b/idp-admin-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/admin/metrics/metrics-beans.xml
@@ -15,8 +15,6 @@
     <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"
         p:placeholderPrefix="%{" p:placeholderSuffix="}" />
 
-    <import resource="admin-abstract-beans.xml" />
-
     <!-- Profile ID for flow. -->    
     <bean id="shibboleth.AdminProfileId" class="java.lang.String"
         c:_0="http://shibboleth.net/ns/profiles/metrics" />
diff --git a/idp-conf/src/main/resources/system/flows/admin/metrics-flow.xml b/idp-admin-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/admin/metrics/metrics-flow.xml
similarity index 100%
rename from idp-conf/src/main/resources/system/flows/admin/metrics-flow.xml
rename to idp-admin-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/admin/metrics/metrics-flow.xml
diff --git a/idp-conf/src/main/resources/system/flows/admin/reload-metadata-beans.xml b/idp-admin-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/admin/reload-metadata/reload-metadata-beans.xml
similarity index 97%
rename from idp-conf/src/main/resources/system/flows/admin/reload-metadata-beans.xml
rename to idp-admin-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/admin/reload-metadata/reload-metadata-beans.xml
index 8eb94d6e9..c8bcd97f5 100644
--- a/idp-conf/src/main/resources/system/flows/admin/reload-metadata-beans.xml
+++ b/idp-admin-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/admin/reload-metadata/reload-metadata-beans.xml
@@ -15,8 +15,6 @@
     <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"
         p:placeholderPrefix="%{" p:placeholderSuffix="}" />
 
-    <import resource="admin-abstract-beans.xml" />
-
     <!-- Profile ID for flow. -->    
     <bean id="shibboleth.AdminProfileId" class="java.lang.String"
         c:_0="http://shibboleth.net/ns/profiles/reload-metadata" />
diff --git a/idp-conf/src/main/resources/system/flows/admin/reload-metadata-flow.xml b/idp-admin-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/admin/reload-metadata/reload-metadata-flow.xml
similarity index 100%
rename from idp-conf/src/main/resources/system/flows/admin/reload-metadata-flow.xml
rename to idp-admin-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/admin/reload-metadata/reload-metadata-flow.xml
diff --git a/idp-conf/src/main/resources/system/flows/admin/reload-service-beans.xml b/idp-admin-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/admin/reload-service/reload-service-beans.xml
similarity index 97%
rename from idp-conf/src/main/resources/system/flows/admin/reload-service-beans.xml
rename to idp-admin-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/admin/reload-service/reload-service-beans.xml
index e5696d69d..df1b5b969 100644
--- a/idp-conf/src/main/resources/system/flows/admin/reload-service-beans.xml
+++ b/idp-admin-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/admin/reload-service/reload-service-beans.xml
@@ -15,8 +15,6 @@
     <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"
         p:placeholderPrefix="%{" p:placeholderSuffix="}" />
 
-    <import resource="admin-abstract-beans.xml" />
-
     <!-- Profile ID for flow. -->    
     <bean id="shibboleth.AdminProfileId" class="java.lang.String"
         c:_0="http://shibboleth.net/ns/profiles/reload-service-configuration" />
diff --git a/idp-conf/src/main/resources/system/flows/admin/reload-service-flow.xml b/idp-admin-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/admin/reload-service/reload-service-flow.xml
similarity index 100%
rename from idp-conf/src/main/resources/system/flows/admin/reload-service-flow.xml
rename to idp-admin-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/admin/reload-service/reload-service-flow.xml
diff --git a/idp-conf/src/main/resources/system/flows/admin/resolvertest-beans.xml b/idp-admin-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/admin/resolvertest/resolvertest-beans.xml
similarity index 99%
rename from idp-conf/src/main/resources/system/flows/admin/resolvertest-beans.xml
rename to idp-admin-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/admin/resolvertest/resolvertest-beans.xml
index 4d0174942..7d31e7c4a 100644
--- a/idp-conf/src/main/resources/system/flows/admin/resolvertest-beans.xml
+++ b/idp-admin-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/admin/resolvertest/resolvertest-beans.xml
@@ -15,8 +15,6 @@
     <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"
         p:placeholderPrefix="%{" p:placeholderSuffix="}" />
 
-    <import resource="admin-abstract-beans.xml" />
-
     <!-- Profile ID for flow. -->    
     <bean id="shibboleth.AdminProfileId" class="java.lang.String"
         c:_0="http://shibboleth.net/ns/profiles/resolvertest" />
diff --git a/idp-conf/src/main/resources/system/flows/admin/resolvertest-flow.xml b/idp-admin-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/admin/resolvertest/resolvertest-flow.xml
similarity index 100%
rename from idp-conf/src/main/resources/system/flows/admin/resolvertest-flow.xml
rename to idp-admin-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/admin/resolvertest/resolvertest-flow.xml
diff --git a/idp-conf/src/main/resources/system/flows/admin/status-beans.xml b/idp-admin-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/admin/status/status-beans.xml
similarity index 96%
rename from idp-conf/src/main/resources/system/flows/admin/status-beans.xml
rename to idp-admin-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/admin/status/status-beans.xml
index a7e20bc82..6112dc0c2 100644
--- a/idp-conf/src/main/resources/system/flows/admin/status-beans.xml
+++ b/idp-admin-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/admin/status/status-beans.xml
@@ -15,8 +15,6 @@
     <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"
         p:placeholderPrefix="%{" p:placeholderSuffix="}" />
 
-    <import resource="admin-abstract-beans.xml" />
-
     <!-- Profile ID for flow. -->    
     <bean id="shibboleth.AdminProfileId" class="java.lang.String" c:_0="http://shibboleth.net/ns/profiles/status" />
     
diff --git a/idp-conf/src/main/resources/system/flows/admin/status-flow.xml b/idp-admin-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/admin/status/status-flow.xml
similarity index 100%
rename from idp-conf/src/main/resources/system/flows/admin/status-flow.xml
rename to idp-admin-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/admin/status/status-flow.xml
diff --git a/idp-conf/src/main/resources/system/flows/admin/storage-beans.xml b/idp-admin-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/admin/storage/storage-beans.xml
similarity index 97%
rename from idp-conf/src/main/resources/system/flows/admin/storage-beans.xml
rename to idp-admin-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/admin/storage/storage-beans.xml
index 62e8f1fce..a3415fa3d 100644
--- a/idp-conf/src/main/resources/system/flows/admin/storage-beans.xml
+++ b/idp-admin-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/admin/storage/storage-beans.xml
@@ -15,8 +15,6 @@
     <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"
         p:placeholderPrefix="%{" p:placeholderSuffix="}" />
 
-    <import resource="admin-abstract-beans.xml" />
-
     <!-- Profile ID for flow. -->    
     <bean id="shibboleth.AdminProfileId" class="java.lang.String" c:_0="http://shibboleth.net/ns/profiles/storage" />
     
diff --git a/idp-conf/src/main/resources/system/flows/admin/storage-flow.xml b/idp-admin-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/admin/storage/storage-flow.xml
similarity index 100%
rename from idp-conf/src/main/resources/system/flows/admin/storage-flow.xml
rename to idp-admin-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/admin/storage/storage-flow.xml
diff --git a/idp-conf/src/main/resources/system/flows/admin/unlock-keys-beans.xml b/idp-admin-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/admin/unlock-keys/unlock-keys-beans.xml
similarity index 97%
rename from idp-conf/src/main/resources/system/flows/admin/unlock-keys-beans.xml
rename to idp-admin-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/admin/unlock-keys/unlock-keys-beans.xml
index f76937624..41a0dc4fd 100644
--- a/idp-conf/src/main/resources/system/flows/admin/unlock-keys-beans.xml
+++ b/idp-admin-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/admin/unlock-keys/unlock-keys-beans.xml
@@ -15,8 +15,6 @@
     <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"
         p:placeholderPrefix="%{" p:placeholderSuffix="}" />
 
-    <import resource="admin-abstract-beans.xml" />
-
     <!-- Profile ID for flow. -->    
     <bean id="shibboleth.AdminProfileId" class="java.lang.String" c:_0="http://shibboleth.net/ns/profiles/unlock-keys" />
     
diff --git a/idp-conf/src/main/resources/system/flows/admin/unlock-keys-flow.xml b/idp-admin-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/admin/unlock-keys/unlock-keys-flow.xml
similarity index 100%
rename from idp-conf/src/main/resources/system/flows/admin/unlock-keys-flow.xml
rename to idp-admin-impl/src/main/resources/META-INF/net/shibboleth/idp/flows/admin/unlock-keys/unlock-keys-flow.xml
diff --git a/idp-conf/src/main/resources/system/flows/admin/admin-abstract-beans.xml b/idp-admin-impl/src/main/resources/net/shibboleth/idp/admin/flows/admin-abstract-beans.xml
similarity index 100%
rename from idp-conf/src/main/resources/system/flows/admin/admin-abstract-beans.xml
rename to idp-admin-impl/src/main/resources/net/shibboleth/idp/admin/flows/admin-abstract-beans.xml
diff --git a/idp-conf/src/main/resources/system/flows/admin/admin-abstract-flow.xml b/idp-admin-impl/src/main/resources/net/shibboleth/idp/admin/flows/admin-abstract-flow.xml
similarity index 98%
rename from idp-conf/src/main/resources/system/flows/admin/admin-abstract-flow.xml
rename to idp-admin-impl/src/main/resources/net/shibboleth/idp/admin/flows/admin-abstract-flow.xml
index cc327ae45..e0a455492 100644
--- a/idp-conf/src/main/resources/system/flows/admin/admin-abstract-flow.xml
+++ b/idp-admin-impl/src/main/resources/net/shibboleth/idp/admin/flows/admin-abstract-flow.xml
@@ -144,4 +144,5 @@
         <transition on="#{!'proceed'.equals(currentEvent.id)}" to="HandleError" />
     </global-transitions>
 
+    <bean-import resource="classpath:/net/shibboleth/idp/admin/flows/admin-abstract-beans.xml" />   
 </flow>
diff --git a/idp-conf/src/main/resources/system/conf/webflow-config.xml b/idp-conf/src/main/resources/system/conf/webflow-config.xml
index 4cac85aeb..4f4ff1361 100644
--- a/idp-conf/src/main/resources/system/conf/webflow-config.xml
+++ b/idp-conf/src/main/resources/system/conf/webflow-config.xml
@@ -17,22 +17,11 @@
         <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" />
-        
-                <!-- Administrative and debugging flows. -->
-                <entry key="admin/hello" value="../system/flows/admin/hello-flow.xml" />
-                <entry key="admin/resolvertest" value="../system/flows/admin/resolvertest-flow.xml" />
-                <entry key="admin/reload-service" value="../system/flows/admin/reload-service-flow.xml" />
-                <entry key="admin/reload-metadata" value="../system/flows/admin/reload-metadata-flow.xml" />
-                <entry key="admin/lockout" value="../system/flows/admin/lockout-flow.xml" />
-                <entry key="admin/mdquery" value="../system/flows/admin/mdquery-flow.xml" />
-                <entry key="admin/metrics" value="../system/flows/admin/metrics-flow.xml" />
-                <entry key="admin/storage" value="../system/flows/admin/storage-flow.xml" />
-                <entry key="admin/unlock-keys" value="../system/flows/admin/unlock-keys-flow.xml" />
+                <entry key="admin.abstract" value="classpath:/net/shibboleth/idp/admin/flows/admin-abstract-flow.xml"/>
                 
+                <!-- Status flow (extra location is for backward compatibility). -->
+                <entry key="status" value="classpath:/META-INF/net/shibboleth/idp/flows/admin/status/status-flow.xml" />
+                        
                 <!-- Proprietary logout flow. -->
                 <entry key="Logout" value="../system/flows/logout/logout-flow.xml" />
         
@@ -169,7 +158,7 @@
                     <null/>
                 </entry>
                 
-                <!-- Load plugin-defined flows from well-known classpath location. -->
+                <!-- Load plugin-defined flows from well-known classpath locations. -->
                 <entry key="classpath*:/META-INF/net/shibboleth/idp/flows/**/*-flow.xml"
                     value="/META-INF/net/shibboleth/idp/flows" />
             </map>

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

More information about the commits mailing list