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

[Scott Cantor]

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=73a6310079f959411a5563229e6a379732ca1a6f

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

commit 73a6310079f959411a5563229e6a379732ca1a6f
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Tue Jul 21 14:38:36 2020 -0400

    IDP-1642 - Migrate configuration into jars where feasible
    
    https://issues.shibboleth.net/jira/browse/IDP-1642
    
    Move logout and master propagation flows into idp-profile-impl.
---
 idp-conf/src/main/resources/system/conf/webflow-config.xml  |  4 ++--
 idp-profile-impl/pom.xml                                    | 13 +++++++++++++
 .../net/shibboleth/idp/profile/flows}/logout-beans.xml      |  0
 .../net/shibboleth/idp/profile/flows}/logout-flow.xml       |  0
 .../idp/profile/flows}/logout-propagation-beans.xml         |  0
 .../idp/profile/flows}/logout-propagation-flow.xml          |  0
 6 files changed, 15 insertions(+), 2 deletions(-)

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 21de85d49..a17c6779d 100644
--- a/idp-conf/src/main/resources/system/conf/webflow-config.xml
+++ b/idp-conf/src/main/resources/system/conf/webflow-config.xml
@@ -34,10 +34,10 @@
                 <entry key="admin/unlock-keys" value="classpath:/net/shibboleth/idp/admin/flows/unlock-keys-flow.xml" />
                         
                 <!-- Proprietary logout flow. -->
-                <entry key="Logout" value="../system/flows/logout/logout-flow.xml" />
+                <entry key="Logout" value="classpath:/net/shibboleth/idp/profile/flows/logout-flow.xml" />
         
                 <!-- Logout propagation driver flow. -->
-                <entry key="PropagateLogout" value="../system/flows/logout/logout-propagation-flow.xml" />
+                <entry key="PropagateLogout" value="classpath:/net/shibboleth/idp/profile/flows/logout-propagation-flow.xml" />
         
                 <!-- Logout propagation delegate flows. -->
                 <entry key="logoutprop/cas" value="../system/flows/logout/propagation/cas-flow.xml" />
diff --git a/idp-profile-impl/pom.xml b/idp-profile-impl/pom.xml
index 6fd2f6834..444ae18a1 100644
--- a/idp-profile-impl/pom.xml
+++ b/idp-profile-impl/pom.xml
@@ -113,6 +113,19 @@
         </dependency>
 
         <!-- Runtime Dependencies -->
+        <!-- Supports Eclipse class lookup from within flow files. -->
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>idp-session-impl</artifactId>
+            <version>${project.version}</version>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>idp-ui</artifactId>
+            <version>${project.version}</version>
+            <scope>runtime</scope>
+        </dependency>
 
         <!-- Test Dependencies -->
         <dependency>
diff --git a/idp-conf/src/main/resources/system/flows/logout/logout-beans.xml b/idp-profile-impl/src/main/resources/net/shibboleth/idp/profile/flows/logout-beans.xml
similarity index 100%
rename from idp-conf/src/main/resources/system/flows/logout/logout-beans.xml
rename to idp-profile-impl/src/main/resources/net/shibboleth/idp/profile/flows/logout-beans.xml
diff --git a/idp-conf/src/main/resources/system/flows/logout/logout-flow.xml b/idp-profile-impl/src/main/resources/net/shibboleth/idp/profile/flows/logout-flow.xml
similarity index 100%
rename from idp-conf/src/main/resources/system/flows/logout/logout-flow.xml
rename to idp-profile-impl/src/main/resources/net/shibboleth/idp/profile/flows/logout-flow.xml
diff --git a/idp-conf/src/main/resources/system/flows/logout/logout-propagation-beans.xml b/idp-profile-impl/src/main/resources/net/shibboleth/idp/profile/flows/logout-propagation-beans.xml
similarity index 100%
rename from idp-conf/src/main/resources/system/flows/logout/logout-propagation-beans.xml
rename to idp-profile-impl/src/main/resources/net/shibboleth/idp/profile/flows/logout-propagation-beans.xml
diff --git a/idp-conf/src/main/resources/system/flows/logout/logout-propagation-flow.xml b/idp-profile-impl/src/main/resources/net/shibboleth/idp/profile/flows/logout-propagation-flow.xml
similarity index 100%
rename from idp-conf/src/main/resources/system/flows/logout/logout-propagation-flow.xml
rename to idp-profile-impl/src/main/resources/net/shibboleth/idp/profile/flows/logout-propagation-flow.xml

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