[java-identity-provider] branch master updated: IDP-1642 - Migrate configuration into jars where feasible
Scott Cantor
cantor.2 at osu.edu
Tue Jul 21 19:28:07 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=5a666a0b6bcde03269fff888c19a15bf21ed3271
The following commit(s) were added to refs/heads/master by this push:
new 5a666a0b6 IDP-1642 - Migrate configuration into jars where feasible
5a666a0b6 is described below
commit 5a666a0b6bcde03269fff888c19a15bf21ed3271
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Tue Jul 21 15:28:45 2020 -0400
IDP-1642 - Migrate configuration into jars where feasible
https://issues.shibboleth.net/jira/browse/IDP-1642
Migrate post-login interceptors.
---
.../main/resources/system/conf/webflow-config.xml | 30 +++++++++++-----------
.../idp/consent/flows}/attribute-release-beans.xml | 2 +-
.../idp/consent/flows}/attribute-release-flow.xml | 0
.../flows}/attribute-release-query-beans.xml | 0
.../flows}/attribute-release-query-flow.xml | 0
.../idp/consent/flows}/terms-of-use-beans.xml | 2 +-
.../idp/consent/flows}/terms-of-use-flow.xml | 0
.../flows/intercept/context-check-beans.xml | 2 +-
.../flows/intercept/context-check-flow.xml | 0
.../flows/intercept/expiring-password-beans.xml | 2 +-
.../flows/intercept/expiring-password-flow.xml | 0
.../profile}/flows/intercept/external-beans.xml | 2 +-
.../idp/profile}/flows/intercept/external-flow.xml | 0
.../profile}/flows/intercept/impersonate-beans.xml | 2 +-
.../profile}/flows/intercept/impersonate-flow.xml | 0
.../flows/intercept/intercept-abstract-flow.xml | 0
.../profile}/flows/intercept/intercept-beans.xml | 0
.../profile}/flows/intercept/intercept-flow.xml | 0
.../idp/profile}/flows/intercept/warning-beans.xml | 2 +-
.../idp/profile}/flows/intercept/warning-flow.xml | 0
.../profile/flows/{ => logout}/logout-beans.xml | 0
.../idp/profile/flows/{ => logout}/logout-flow.xml | 0
.../{ => logout}/logout-propagation-beans.xml | 0
.../flows/{ => logout}/logout-propagation-flow.xml | 0
24 files changed, 22 insertions(+), 22 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 a17c6779d..6b7ee747f 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="classpath:/net/shibboleth/idp/profile/flows/logout-flow.xml" />
+ <entry key="Logout" value="classpath:/net/shibboleth/idp/profile/flows/logout/logout-flow.xml" />
<!-- Logout propagation driver flow. -->
- <entry key="PropagateLogout" value="classpath:/net/shibboleth/idp/profile/flows/logout-propagation-flow.xml" />
+ <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" />
@@ -117,20 +117,20 @@
<entry key="c14n/SAML1Transform" value="../system/flows/c14n/subject-c14n-saml-default-flow.xml" />
<entry key="c14n/LegacyPrincipalConnector" value="../system/flows/c14n/subject-c14n-saml-default-flow.xml" />
- <!-- Main intercept flow. -->
- <entry key="intercept.events" value="../conf/intercept/intercept-events-flow.xml" />
- <entry key="intercept.abstract" value="../system/flows/intercept/intercept-abstract-flow.xml" />
- <entry key="intercept" value="../system/flows/intercept/intercept-flow.xml" />
+ <!-- Main interceptor flow. -->
+ <entry key="intercept.events" value="%{idp.home}/conf/intercept/intercept-events-flow.xml" />
+ <entry key="intercept.abstract" value="classpath:/net/shibboleth/idp/profile/flows/intercept/intercept-abstract-flow.xml" />
+ <entry key="intercept" value="classpath:/net/shibboleth/idp/profile/flows/intercept/intercept-flow.xml" />
- <!-- Built-in intercept flows. -->
- <entry key="intercept/context-check" value="../system/flows/intercept/context-check-flow.xml" />
- <entry key="intercept/expiring-password" value="../system/flows/intercept/expiring-password-flow.xml" />
- <entry key="intercept/terms-of-use" value="../system/flows/intercept/terms-of-use-flow.xml" />
- <entry key="intercept/attribute-release" value="../system/flows/intercept/attribute-release-flow.xml" />
- <entry key="intercept/attribute-release-query" value="../system/flows/intercept/attribute-release-query-flow.xml" />
- <entry key="intercept/impersonate" value="../system/flows/intercept/impersonate-flow.xml" />
- <entry key="intercept/external" value="../system/flows/intercept/external-flow.xml" />
- <entry key="intercept/warning" value="../system/flows/intercept/warning-flow.xml" />
+ <!-- Built-in interceptor flows. -->
+ <entry key="intercept/terms-of-use" value="classpath:/net/shibboleth/idp/consent/flows/terms-of-use-flow.xml" />
+ <entry key="intercept/attribute-release" value="classpath:/net/shibboleth/idp/consent/flows/attribute-release-flow.xml" />
+ <entry key="intercept/attribute-release-query" value="classpath:/net/shibboleth/idp/consent/flows/attribute-release-query-flow.xml" />
+ <entry key="intercept/context-check" value="classpath:/net/shibboleth/idp/profile/flows/intercept/context-check-flow.xml" />
+ <entry key="intercept/expiring-password" value="classpath:/net/shibboleth/idp/profile/flows/intercept/expiring-password-flow.xml" />
+ <entry key="intercept/impersonate" value="classpath:/net/shibboleth/idp/profile/flows/intercept/impersonate-flow.xml" />
+ <entry key="intercept/external" value="classpath:/net/shibboleth/idp/profile/flows/intercept/external-flow.xml" />
+ <entry key="intercept/warning" value="classpath:/net/shibboleth/idp/profile/flows/intercept/warning-flow.xml" />
<!-- Inbound security processing of SAML messages, implemented as intercept flows. -->
<entry key="security-policy.abstract" value="../system/flows/saml/security-abstract-flow.xml" />
diff --git a/idp-conf/src/main/resources/system/flows/intercept/attribute-release-beans.xml b/idp-consent-impl/src/main/resources/net/shibboleth/idp/consent/flows/attribute-release-beans.xml
similarity index 99%
rename from idp-conf/src/main/resources/system/flows/intercept/attribute-release-beans.xml
rename to idp-consent-impl/src/main/resources/net/shibboleth/idp/consent/flows/attribute-release-beans.xml
index aac7ef2d3..e8e21f616 100644
--- a/idp-conf/src/main/resources/system/flows/intercept/attribute-release-beans.xml
+++ b/idp-consent-impl/src/main/resources/net/shibboleth/idp/consent/flows/attribute-release-beans.xml
@@ -14,7 +14,7 @@
<bean class="net.shibboleth.ext.spring.config.IdentifiableBeanPostProcessor" />
<bean class="net.shibboleth.idp.profile.impl.ProfileActionBeanPostProcessor" />
- <import resource="../../../conf/intercept/consent-intercept-config.xml" />
+ <import resource="%{idp.home}/conf/intercept/consent-intercept-config.xml" />
<bean class="net.shibboleth.ext.spring.util.DeprecatedBeanDetector" c:_1="consent-intercept-config.xml">
<constructor-arg index="0">
diff --git a/idp-conf/src/main/resources/system/flows/intercept/attribute-release-flow.xml b/idp-consent-impl/src/main/resources/net/shibboleth/idp/consent/flows/attribute-release-flow.xml
similarity index 100%
rename from idp-conf/src/main/resources/system/flows/intercept/attribute-release-flow.xml
rename to idp-consent-impl/src/main/resources/net/shibboleth/idp/consent/flows/attribute-release-flow.xml
diff --git a/idp-conf/src/main/resources/system/flows/intercept/attribute-release-query-beans.xml b/idp-consent-impl/src/main/resources/net/shibboleth/idp/consent/flows/attribute-release-query-beans.xml
similarity index 100%
rename from idp-conf/src/main/resources/system/flows/intercept/attribute-release-query-beans.xml
rename to idp-consent-impl/src/main/resources/net/shibboleth/idp/consent/flows/attribute-release-query-beans.xml
diff --git a/idp-conf/src/main/resources/system/flows/intercept/attribute-release-query-flow.xml b/idp-consent-impl/src/main/resources/net/shibboleth/idp/consent/flows/attribute-release-query-flow.xml
similarity index 100%
rename from idp-conf/src/main/resources/system/flows/intercept/attribute-release-query-flow.xml
rename to idp-consent-impl/src/main/resources/net/shibboleth/idp/consent/flows/attribute-release-query-flow.xml
diff --git a/idp-conf/src/main/resources/system/flows/intercept/terms-of-use-beans.xml b/idp-consent-impl/src/main/resources/net/shibboleth/idp/consent/flows/terms-of-use-beans.xml
similarity index 98%
rename from idp-conf/src/main/resources/system/flows/intercept/terms-of-use-beans.xml
rename to idp-consent-impl/src/main/resources/net/shibboleth/idp/consent/flows/terms-of-use-beans.xml
index 6188b07fa..7f9e2b73e 100644
--- a/idp-conf/src/main/resources/system/flows/intercept/terms-of-use-beans.xml
+++ b/idp-consent-impl/src/main/resources/net/shibboleth/idp/consent/flows/terms-of-use-beans.xml
@@ -14,7 +14,7 @@
<bean class="net.shibboleth.ext.spring.config.IdentifiableBeanPostProcessor" />
<bean class="net.shibboleth.idp.profile.impl.ProfileActionBeanPostProcessor" />
- <import resource="../../../conf/intercept/consent-intercept-config.xml" />
+ <import resource="%{idp.home}/conf/intercept/consent-intercept-config.xml" />
<bean id="TermsOfUseConsentFunction"
class="net.shibboleth.idp.consent.logic.impl.MessageSourceConsentFunction"
diff --git a/idp-conf/src/main/resources/system/flows/intercept/terms-of-use-flow.xml b/idp-consent-impl/src/main/resources/net/shibboleth/idp/consent/flows/terms-of-use-flow.xml
similarity index 100%
rename from idp-conf/src/main/resources/system/flows/intercept/terms-of-use-flow.xml
rename to idp-consent-impl/src/main/resources/net/shibboleth/idp/consent/flows/terms-of-use-flow.xml
diff --git a/idp-conf/src/main/resources/system/flows/intercept/context-check-beans.xml b/idp-profile-impl/src/main/resources/net/shibboleth/idp/profile/flows/intercept/context-check-beans.xml
similarity index 93%
rename from idp-conf/src/main/resources/system/flows/intercept/context-check-beans.xml
rename to idp-profile-impl/src/main/resources/net/shibboleth/idp/profile/flows/intercept/context-check-beans.xml
index 97d4967ac..585aafc60 100644
--- a/idp-conf/src/main/resources/system/flows/intercept/context-check-beans.xml
+++ b/idp-profile-impl/src/main/resources/net/shibboleth/idp/profile/flows/intercept/context-check-beans.xml
@@ -18,6 +18,6 @@
<bean class="net.shibboleth.ext.spring.config.IdentifiableBeanPostProcessor" />
<bean class="net.shibboleth.idp.profile.impl.ProfileActionBeanPostProcessor" />
- <import resource="../../../conf/intercept/context-check-intercept-config.xml" />
+ <import resource="%{idp.home}/conf/intercept/context-check-intercept-config.xml" />
</beans>
diff --git a/idp-conf/src/main/resources/system/flows/intercept/context-check-flow.xml b/idp-profile-impl/src/main/resources/net/shibboleth/idp/profile/flows/intercept/context-check-flow.xml
similarity index 100%
rename from idp-conf/src/main/resources/system/flows/intercept/context-check-flow.xml
rename to idp-profile-impl/src/main/resources/net/shibboleth/idp/profile/flows/intercept/context-check-flow.xml
diff --git a/idp-conf/src/main/resources/system/flows/intercept/expiring-password-beans.xml b/idp-profile-impl/src/main/resources/net/shibboleth/idp/profile/flows/intercept/expiring-password-beans.xml
similarity index 94%
rename from idp-conf/src/main/resources/system/flows/intercept/expiring-password-beans.xml
rename to idp-profile-impl/src/main/resources/net/shibboleth/idp/profile/flows/intercept/expiring-password-beans.xml
index 10141a379..4a0868c29 100644
--- a/idp-conf/src/main/resources/system/flows/intercept/expiring-password-beans.xml
+++ b/idp-profile-impl/src/main/resources/net/shibboleth/idp/profile/flows/intercept/expiring-password-beans.xml
@@ -18,7 +18,7 @@
<bean class="net.shibboleth.ext.spring.config.IdentifiableBeanPostProcessor" />
<bean class="net.shibboleth.idp.profile.impl.ProfileActionBeanPostProcessor" />
- <import resource="../../../conf/intercept/expiring-password-intercept-config.xml" />
+ <import resource="%{idp.home}/conf/intercept/expiring-password-intercept-config.xml" />
<!-- Simplifies flow definition expressions. -->
<alias name="shibboleth.expiring-password.Condition" alias="ExpiringPasswordPredicate"/>
diff --git a/idp-conf/src/main/resources/system/flows/intercept/expiring-password-flow.xml b/idp-profile-impl/src/main/resources/net/shibboleth/idp/profile/flows/intercept/expiring-password-flow.xml
similarity index 100%
rename from idp-conf/src/main/resources/system/flows/intercept/expiring-password-flow.xml
rename to idp-profile-impl/src/main/resources/net/shibboleth/idp/profile/flows/intercept/expiring-password-flow.xml
diff --git a/idp-conf/src/main/resources/system/flows/intercept/external-beans.xml b/idp-profile-impl/src/main/resources/net/shibboleth/idp/profile/flows/intercept/external-beans.xml
similarity index 94%
rename from idp-conf/src/main/resources/system/flows/intercept/external-beans.xml
rename to idp-profile-impl/src/main/resources/net/shibboleth/idp/profile/flows/intercept/external-beans.xml
index ebe1d9844..3997c8b1b 100644
--- a/idp-conf/src/main/resources/system/flows/intercept/external-beans.xml
+++ b/idp-profile-impl/src/main/resources/net/shibboleth/idp/profile/flows/intercept/external-beans.xml
@@ -22,6 +22,6 @@
<bean id="shibboleth.intercept.externalPathStrategy" parent="shibboleth.Functions.Constant"
c:target-ref="shibboleth.intercept.externalPath" />
- <import resource="../../../conf/intercept/external-intercept-config.xml" />
+ <import resource="%{idp.home}/conf/intercept/external-intercept-config.xml" />
</beans>
diff --git a/idp-conf/src/main/resources/system/flows/intercept/external-flow.xml b/idp-profile-impl/src/main/resources/net/shibboleth/idp/profile/flows/intercept/external-flow.xml
similarity index 100%
rename from idp-conf/src/main/resources/system/flows/intercept/external-flow.xml
rename to idp-profile-impl/src/main/resources/net/shibboleth/idp/profile/flows/intercept/external-flow.xml
diff --git a/idp-conf/src/main/resources/system/flows/intercept/impersonate-beans.xml b/idp-profile-impl/src/main/resources/net/shibboleth/idp/profile/flows/intercept/impersonate-beans.xml
similarity index 97%
rename from idp-conf/src/main/resources/system/flows/intercept/impersonate-beans.xml
rename to idp-profile-impl/src/main/resources/net/shibboleth/idp/profile/flows/intercept/impersonate-beans.xml
index 51f60b900..2f1993aea 100644
--- a/idp-conf/src/main/resources/system/flows/intercept/impersonate-beans.xml
+++ b/idp-profile-impl/src/main/resources/net/shibboleth/idp/profile/flows/intercept/impersonate-beans.xml
@@ -18,7 +18,7 @@
<bean class="net.shibboleth.ext.spring.config.IdentifiableBeanPostProcessor" />
<bean class="net.shibboleth.idp.profile.impl.ProfileActionBeanPostProcessor" />
- <import resource="../../../conf/intercept/impersonate-intercept-config.xml" />
+ <import resource="%{idp.home}/conf/intercept/impersonate-intercept-config.xml" />
<bean id="CheckGeneralAccess"
class="org.opensaml.profile.action.impl.CheckAccess" scope="prototype"
diff --git a/idp-conf/src/main/resources/system/flows/intercept/impersonate-flow.xml b/idp-profile-impl/src/main/resources/net/shibboleth/idp/profile/flows/intercept/impersonate-flow.xml
similarity index 100%
rename from idp-conf/src/main/resources/system/flows/intercept/impersonate-flow.xml
rename to idp-profile-impl/src/main/resources/net/shibboleth/idp/profile/flows/intercept/impersonate-flow.xml
diff --git a/idp-conf/src/main/resources/system/flows/intercept/intercept-abstract-flow.xml b/idp-profile-impl/src/main/resources/net/shibboleth/idp/profile/flows/intercept/intercept-abstract-flow.xml
similarity index 100%
rename from idp-conf/src/main/resources/system/flows/intercept/intercept-abstract-flow.xml
rename to idp-profile-impl/src/main/resources/net/shibboleth/idp/profile/flows/intercept/intercept-abstract-flow.xml
diff --git a/idp-conf/src/main/resources/system/flows/intercept/intercept-beans.xml b/idp-profile-impl/src/main/resources/net/shibboleth/idp/profile/flows/intercept/intercept-beans.xml
similarity index 100%
rename from idp-conf/src/main/resources/system/flows/intercept/intercept-beans.xml
rename to idp-profile-impl/src/main/resources/net/shibboleth/idp/profile/flows/intercept/intercept-beans.xml
diff --git a/idp-conf/src/main/resources/system/flows/intercept/intercept-flow.xml b/idp-profile-impl/src/main/resources/net/shibboleth/idp/profile/flows/intercept/intercept-flow.xml
similarity index 100%
rename from idp-conf/src/main/resources/system/flows/intercept/intercept-flow.xml
rename to idp-profile-impl/src/main/resources/net/shibboleth/idp/profile/flows/intercept/intercept-flow.xml
diff --git a/idp-conf/src/main/resources/system/flows/intercept/warning-beans.xml b/idp-profile-impl/src/main/resources/net/shibboleth/idp/profile/flows/intercept/warning-beans.xml
similarity index 94%
rename from idp-conf/src/main/resources/system/flows/intercept/warning-beans.xml
rename to idp-profile-impl/src/main/resources/net/shibboleth/idp/profile/flows/intercept/warning-beans.xml
index 314452cec..aa99966b3 100644
--- a/idp-conf/src/main/resources/system/flows/intercept/warning-beans.xml
+++ b/idp-profile-impl/src/main/resources/net/shibboleth/idp/profile/flows/intercept/warning-beans.xml
@@ -18,7 +18,7 @@
<bean class="net.shibboleth.ext.spring.config.IdentifiableBeanPostProcessor" />
<bean class="net.shibboleth.idp.profile.impl.ProfileActionBeanPostProcessor" />
- <import resource="../../../conf/intercept/warning-intercept-config.xml" />
+ <import resource="%{idp.home}/conf/intercept/warning-intercept-config.xml" />
<!-- Simplifies flow definition expressions. -->
<alias name="shibboleth.warning.ConditionMap" alias="WarningConditionMap" />
diff --git a/idp-conf/src/main/resources/system/flows/intercept/warning-flow.xml b/idp-profile-impl/src/main/resources/net/shibboleth/idp/profile/flows/intercept/warning-flow.xml
similarity index 100%
rename from idp-conf/src/main/resources/system/flows/intercept/warning-flow.xml
rename to idp-profile-impl/src/main/resources/net/shibboleth/idp/profile/flows/intercept/warning-flow.xml
diff --git a/idp-profile-impl/src/main/resources/net/shibboleth/idp/profile/flows/logout-beans.xml b/idp-profile-impl/src/main/resources/net/shibboleth/idp/profile/flows/logout/logout-beans.xml
similarity index 100%
rename from idp-profile-impl/src/main/resources/net/shibboleth/idp/profile/flows/logout-beans.xml
rename to idp-profile-impl/src/main/resources/net/shibboleth/idp/profile/flows/logout/logout-beans.xml
diff --git a/idp-profile-impl/src/main/resources/net/shibboleth/idp/profile/flows/logout-flow.xml b/idp-profile-impl/src/main/resources/net/shibboleth/idp/profile/flows/logout/logout-flow.xml
similarity index 100%
rename from idp-profile-impl/src/main/resources/net/shibboleth/idp/profile/flows/logout-flow.xml
rename to idp-profile-impl/src/main/resources/net/shibboleth/idp/profile/flows/logout/logout-flow.xml
diff --git a/idp-profile-impl/src/main/resources/net/shibboleth/idp/profile/flows/logout-propagation-beans.xml b/idp-profile-impl/src/main/resources/net/shibboleth/idp/profile/flows/logout/logout-propagation-beans.xml
similarity index 100%
rename from idp-profile-impl/src/main/resources/net/shibboleth/idp/profile/flows/logout-propagation-beans.xml
rename to idp-profile-impl/src/main/resources/net/shibboleth/idp/profile/flows/logout/logout-propagation-beans.xml
diff --git a/idp-profile-impl/src/main/resources/net/shibboleth/idp/profile/flows/logout-propagation-flow.xml b/idp-profile-impl/src/main/resources/net/shibboleth/idp/profile/flows/logout/logout-propagation-flow.xml
similarity index 100%
rename from idp-profile-impl/src/main/resources/net/shibboleth/idp/profile/flows/logout-propagation-flow.xml
rename to idp-profile-impl/src/main/resources/net/shibboleth/idp/profile/flows/logout/logout-propagation-flow.xml
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list