[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=bbd486a73be199175a4375bf6b86b1eea2b7d283

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

commit bbd486a73be199175a4375bf6b86b1eea2b7d283
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Thu Jul 23 10:02:00 2020 -0400

    IDP-1642 - Migrate configuration into jars where feasible
    
    https://issues.shibboleth.net/jira/browse/IDP-1642
    
    Migrate CAS flows.
---
 .../idp/cas/flows}/cas-abstract-beans.xml           |  0
 .../shibboleth/idp/cas/flows}/cas-abstract-flow.xml |  3 +--
 .../net/shibboleth/idp/cas/flows}/login-beans.xml   |  0
 .../net/shibboleth/idp/cas/flows}/login-flow.xml    |  0
 .../idp/cas/flows/logout/cas-logoutprop-beans.xml   |  0
 .../idp/cas/flows/logout/cas-logoutprop-flow.xml    |  2 +-
 .../net/shibboleth/idp/cas/flows}/proxy-beans.xml   |  0
 .../net/shibboleth/idp/cas/flows}/proxy-flow.xml    |  0
 .../idp/cas/flows}/proxyValidate-beans.xml          |  0
 .../idp/cas/flows}/proxyValidate-flow.xml           |  0
 .../idp/cas/flows}/samlValidate-beans.xml           |  0
 .../shibboleth/idp/cas/flows}/samlValidate-flow.xml |  0
 .../idp/cas/flows}/serviceValidate-beans.xml        |  0
 .../idp/cas/flows}/serviceValidate-flow.xml         |  0
 .../idp/cas/flows}/validate-abstract-beans.xml      |  0
 .../idp/cas/flows}/validate-abstract-flow.xml       |  3 +--
 .../shibboleth/idp/cas/flows}/validate-beans.xml    |  0
 .../net/shibboleth/idp/cas/flows}/validate-flow.xml |  0
 .../main/resources/system/conf/webflow-config.xml   | 21 +++++++++++----------
 19 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/idp-conf/src/main/resources/system/flows/cas/cas-abstract-beans.xml b/idp-cas-impl/src/main/resources/net/shibboleth/idp/cas/flows/cas-abstract-beans.xml
similarity index 100%
rename from idp-conf/src/main/resources/system/flows/cas/cas-abstract-beans.xml
rename to idp-cas-impl/src/main/resources/net/shibboleth/idp/cas/flows/cas-abstract-beans.xml
diff --git a/idp-conf/src/main/resources/system/flows/cas/cas-abstract-flow.xml b/idp-cas-impl/src/main/resources/net/shibboleth/idp/cas/flows/cas-abstract-flow.xml
similarity index 94%
rename from idp-conf/src/main/resources/system/flows/cas/cas-abstract-flow.xml
rename to idp-cas-impl/src/main/resources/net/shibboleth/idp/cas/flows/cas-abstract-flow.xml
index 64bc0e2de..7e20aebed 100644
--- a/idp-conf/src/main/resources/system/flows/cas/cas-abstract-flow.xml
+++ b/idp-cas-impl/src/main/resources/net/shibboleth/idp/cas/flows/cas-abstract-flow.xml
@@ -58,6 +58,5 @@
         <transition on="#{!'proceed'.equals(currentEvent.id)}" to="HandleError" />
     </global-transitions>
 
-    <!-- The import references the parent folder because the abstract flow is used only from one level down. -->
-    <bean-import resource="../cas-abstract-beans.xml" />
+    <bean-import resource="classpath:/net/shibboleth/idp/cas/flows/cas-abstract-beans.xml" />    
 </flow>
\ No newline at end of file
diff --git a/idp-conf/src/main/resources/system/flows/cas/login/login-beans.xml b/idp-cas-impl/src/main/resources/net/shibboleth/idp/cas/flows/login-beans.xml
similarity index 100%
rename from idp-conf/src/main/resources/system/flows/cas/login/login-beans.xml
rename to idp-cas-impl/src/main/resources/net/shibboleth/idp/cas/flows/login-beans.xml
diff --git a/idp-conf/src/main/resources/system/flows/cas/login/login-flow.xml b/idp-cas-impl/src/main/resources/net/shibboleth/idp/cas/flows/login-flow.xml
similarity index 100%
rename from idp-conf/src/main/resources/system/flows/cas/login/login-flow.xml
rename to idp-cas-impl/src/main/resources/net/shibboleth/idp/cas/flows/login-flow.xml
diff --git a/idp-conf/src/main/resources/system/flows/logout/propagation/cas-beans.xml b/idp-cas-impl/src/main/resources/net/shibboleth/idp/cas/flows/logout/cas-logoutprop-beans.xml
similarity index 100%
rename from idp-conf/src/main/resources/system/flows/logout/propagation/cas-beans.xml
rename to idp-cas-impl/src/main/resources/net/shibboleth/idp/cas/flows/logout/cas-logoutprop-beans.xml
diff --git a/idp-conf/src/main/resources/system/flows/logout/propagation/cas-flow.xml b/idp-cas-impl/src/main/resources/net/shibboleth/idp/cas/flows/logout/cas-logoutprop-flow.xml
similarity index 95%
rename from idp-conf/src/main/resources/system/flows/logout/propagation/cas-flow.xml
rename to idp-cas-impl/src/main/resources/net/shibboleth/idp/cas/flows/logout/cas-logoutprop-flow.xml
index 9178e199d..dc18567fa 100644
--- a/idp-conf/src/main/resources/system/flows/logout/propagation/cas-flow.xml
+++ b/idp-cas-impl/src/main/resources/net/shibboleth/idp/cas/flows/logout/cas-logoutprop-flow.xml
@@ -21,6 +21,6 @@
         </on-entry>
     </end-state>
 
-    <bean-import resource="cas-beans.xml" />
+    <bean-import resource="cas-logoutprop-beans.xml" />
 
 </flow>
diff --git a/idp-conf/src/main/resources/system/flows/cas/proxy/proxy-beans.xml b/idp-cas-impl/src/main/resources/net/shibboleth/idp/cas/flows/proxy-beans.xml
similarity index 100%
rename from idp-conf/src/main/resources/system/flows/cas/proxy/proxy-beans.xml
rename to idp-cas-impl/src/main/resources/net/shibboleth/idp/cas/flows/proxy-beans.xml
diff --git a/idp-conf/src/main/resources/system/flows/cas/proxy/proxy-flow.xml b/idp-cas-impl/src/main/resources/net/shibboleth/idp/cas/flows/proxy-flow.xml
similarity index 100%
rename from idp-conf/src/main/resources/system/flows/cas/proxy/proxy-flow.xml
rename to idp-cas-impl/src/main/resources/net/shibboleth/idp/cas/flows/proxy-flow.xml
diff --git a/idp-conf/src/main/resources/system/flows/cas/proxyValidate/proxyValidate-beans.xml b/idp-cas-impl/src/main/resources/net/shibboleth/idp/cas/flows/proxyValidate-beans.xml
similarity index 100%
rename from idp-conf/src/main/resources/system/flows/cas/proxyValidate/proxyValidate-beans.xml
rename to idp-cas-impl/src/main/resources/net/shibboleth/idp/cas/flows/proxyValidate-beans.xml
diff --git a/idp-conf/src/main/resources/system/flows/cas/proxyValidate/proxyValidate-flow.xml b/idp-cas-impl/src/main/resources/net/shibboleth/idp/cas/flows/proxyValidate-flow.xml
similarity index 100%
rename from idp-conf/src/main/resources/system/flows/cas/proxyValidate/proxyValidate-flow.xml
rename to idp-cas-impl/src/main/resources/net/shibboleth/idp/cas/flows/proxyValidate-flow.xml
diff --git a/idp-conf/src/main/resources/system/flows/cas/samlValidate/samlValidate-beans.xml b/idp-cas-impl/src/main/resources/net/shibboleth/idp/cas/flows/samlValidate-beans.xml
similarity index 100%
rename from idp-conf/src/main/resources/system/flows/cas/samlValidate/samlValidate-beans.xml
rename to idp-cas-impl/src/main/resources/net/shibboleth/idp/cas/flows/samlValidate-beans.xml
diff --git a/idp-conf/src/main/resources/system/flows/cas/samlValidate/samlValidate-flow.xml b/idp-cas-impl/src/main/resources/net/shibboleth/idp/cas/flows/samlValidate-flow.xml
similarity index 100%
rename from idp-conf/src/main/resources/system/flows/cas/samlValidate/samlValidate-flow.xml
rename to idp-cas-impl/src/main/resources/net/shibboleth/idp/cas/flows/samlValidate-flow.xml
diff --git a/idp-conf/src/main/resources/system/flows/cas/serviceValidate/serviceValidate-beans.xml b/idp-cas-impl/src/main/resources/net/shibboleth/idp/cas/flows/serviceValidate-beans.xml
similarity index 100%
rename from idp-conf/src/main/resources/system/flows/cas/serviceValidate/serviceValidate-beans.xml
rename to idp-cas-impl/src/main/resources/net/shibboleth/idp/cas/flows/serviceValidate-beans.xml
diff --git a/idp-conf/src/main/resources/system/flows/cas/serviceValidate/serviceValidate-flow.xml b/idp-cas-impl/src/main/resources/net/shibboleth/idp/cas/flows/serviceValidate-flow.xml
similarity index 100%
rename from idp-conf/src/main/resources/system/flows/cas/serviceValidate/serviceValidate-flow.xml
rename to idp-cas-impl/src/main/resources/net/shibboleth/idp/cas/flows/serviceValidate-flow.xml
diff --git a/idp-conf/src/main/resources/system/flows/cas/validate-abstract-beans.xml b/idp-cas-impl/src/main/resources/net/shibboleth/idp/cas/flows/validate-abstract-beans.xml
similarity index 100%
rename from idp-conf/src/main/resources/system/flows/cas/validate-abstract-beans.xml
rename to idp-cas-impl/src/main/resources/net/shibboleth/idp/cas/flows/validate-abstract-beans.xml
diff --git a/idp-conf/src/main/resources/system/flows/cas/validate-abstract-flow.xml b/idp-cas-impl/src/main/resources/net/shibboleth/idp/cas/flows/validate-abstract-flow.xml
similarity index 96%
rename from idp-conf/src/main/resources/system/flows/cas/validate-abstract-flow.xml
rename to idp-cas-impl/src/main/resources/net/shibboleth/idp/cas/flows/validate-abstract-flow.xml
index 03228e873..10b637964 100644
--- a/idp-conf/src/main/resources/system/flows/cas/validate-abstract-flow.xml
+++ b/idp-cas-impl/src/main/resources/net/shibboleth/idp/cas/flows/validate-abstract-flow.xml
@@ -107,6 +107,5 @@
         </on-entry>
     </end-state>
 
-    <!-- The import references the parent folder because the abstract flow is used only from one level down. -->
-    <bean-import resource="../validate-abstract-beans.xml" />
+    <bean-import resource="classpath:/net/shibboleth/idp/cas/flows/validate-abstract-beans.xml" />
 </flow>
\ No newline at end of file
diff --git a/idp-conf/src/main/resources/system/flows/cas/validate/validate-beans.xml b/idp-cas-impl/src/main/resources/net/shibboleth/idp/cas/flows/validate-beans.xml
similarity index 100%
rename from idp-conf/src/main/resources/system/flows/cas/validate/validate-beans.xml
rename to idp-cas-impl/src/main/resources/net/shibboleth/idp/cas/flows/validate-beans.xml
diff --git a/idp-conf/src/main/resources/system/flows/cas/validate/validate-flow.xml b/idp-cas-impl/src/main/resources/net/shibboleth/idp/cas/flows/validate-flow.xml
similarity index 100%
rename from idp-conf/src/main/resources/system/flows/cas/validate/validate-flow.xml
rename to idp-cas-impl/src/main/resources/net/shibboleth/idp/cas/flows/validate-flow.xml
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 8e465c0c5..2eee79800 100644
--- a/idp-conf/src/main/resources/system/conf/webflow-config.xml
+++ b/idp-conf/src/main/resources/system/conf/webflow-config.xml
@@ -40,7 +40,7 @@
                 <entry key="PropagateLogout" value="classpath:/net/shibboleth/idp/profile/flows/logout/logout-propagation-flow.xml" />
         
                 <!-- Logout propagation delegate flows. -->
-                <entry key="logoutprop/cas" value="../system/flows/logout/propagation/cas-flow.xml" />
+                <entry key="logoutprop/cas" value="classpath:/net/shibboleth/idp/cas/flows/logout/cas-logoutprop-flow.xml" />
                 <entry key="logoutprop/saml2" value="classpath:/net/shibboleth/idp/saml/flows/logout/saml2-logoutprop-flow.xml" />
         
                 <!-- Abstract flows underpinning SAML profiles. -->
@@ -142,15 +142,16 @@
                 <entry key="intercept/security-policy/saml-soap" value="classpath:/net/shibboleth/idp/saml/flows/soap-security-flow.xml" />
         
                 <!-- CAS protocol flows. -->
-                <entry key="cas.abstract" value="../system/flows/cas/cas-abstract-flow.xml" />
-                <entry key="cas.abstractValidate" value="../system/flows/cas/validate-abstract-flow.xml" />
-                <entry key="cas/login" value="../system/flows/cas/login/login-flow.xml" />
-                <entry key="cas/proxy" value="../system/flows/cas/proxy/proxy-flow.xml" />
-                <entry key="cas/serviceValidate" value="../system/flows/cas/serviceValidate/serviceValidate-flow.xml" />
-                <entry key="cas/proxyValidate" value="../system/flows/cas/proxyValidate/proxyValidate-flow.xml" />
-                <entry key="cas/samlValidate" value="../system/flows/cas/samlValidate/samlValidate-flow.xml" />
-                <entry key="cas/validate" value="../system/flows/cas/validate/validate-flow.xml" />
-                <entry key="cas/logout" value="../system/flows/logout/logout-flow.xml" />
+                <entry key="cas.abstract" value="classpath:/net/shibboleth/idp/cas/flows/cas-abstract-flow.xml" />
+                <entry key="cas.abstractValidate" value="classpath:/net/shibboleth/idp/cas/flows/validate-abstract-flow.xml" />
+                <entry key="cas/login" value="classpath:/net/shibboleth/idp/cas/flows/login-flow.xml" />
+                <entry key="cas/proxy" value="classpath:/net/shibboleth/idp/cas/flows/proxy-flow.xml" />
+                <entry key="cas/serviceValidate" value="classpath:/net/shibboleth/idp/cas/flows/serviceValidate-flow.xml" />
+                <entry key="cas/proxyValidate" value="classpath:/net/shibboleth/idp/cas/flows/proxyValidate-flow.xml" />
+                <entry key="cas/samlValidate" value="classpath:/net/shibboleth/idp/cas/flows/samlValidate-flow.xml" />
+                <entry key="cas/validate" value="classpath:/net/shibboleth/idp/cas/flows/validate-flow.xml" />
+                <!-- Dual mount of logout flow to CAS location. -->
+                <entry key="cas/logout" value="classpath:/net/shibboleth/idp/profile/flows/logout/logout-flow.xml" />
         
                 <!-- Client storage flows. -->
                 <entry key="client-storage/read" value="classpath:/net/shibboleth/idp/session/flows/client-storage-read-flow.xml" />

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