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

Scott Cantor cantor.2 at osu.edu
Thu Jul 23 00:29:17 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=16d9e85a213ab43fcd166baef0af04205a3eeb7d

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

commit 16d9e85a213ab43fcd166baef0af04205a3eeb7d
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Wed Jul 22 20:29:58 2020 -0400

    IDP-1642 - Migrate configuration into jars where feasible
    
    https://issues.shibboleth.net/jira/browse/IDP-1642
    
    Migrate SAML flows.
---
 .../main/resources/system/conf/webflow-config.xml  | 58 +++++++++++-----------
 .../saml/flows/logout/saml2-logoutprop-beans.xml   |  2 +-
 .../saml/flows/logout/saml2-logoutprop-flow.xml    |  2 +-
 .../idp/saml/flows}/saml-abstract-beans.xml        |  0
 .../idp/saml/flows}/saml-abstract-flow.xml         |  2 +
 .../flows}/saml1/artifact-resolution-beans.xml     |  0
 .../saml/flows}/saml1/artifact-resolution-flow.xml |  0
 .../saml/flows}/saml1/attribute-query-beans.xml    |  2 +-
 .../idp/saml/flows}/saml1/attribute-query-flow.xml |  0
 .../idp/saml/flows}/saml1/common-beans.xml         |  2 -
 .../idp/saml/flows}/saml1/sso-abstract-beans.xml   |  0
 .../idp/saml/flows}/saml1/sso-abstract-flow.xml    |  2 +-
 .../idp/saml/flows}/saml1/sso-security-flow.xml    |  2 -
 .../saml/flows}/saml1/sso-unsolicited-beans.xml    |  2 -
 .../idp/saml/flows}/saml1/sso-unsolicited-flow.xml |  0
 .../flows}/saml2/artifact-resolution-beans.xml     |  0
 .../saml/flows}/saml2/artifact-resolution-flow.xml |  0
 .../saml/flows}/saml2/attribute-query-beans.xml    |  2 +-
 .../idp/saml/flows}/saml2/attribute-query-flow.xml |  0
 .../idp/saml/flows}/saml2/common-beans.xml         |  2 -
 .../idp/saml/flows}/saml2/ecp-security-flow.xml    |  2 -
 .../idp/saml/flows}/saml2/idwsf-ssos-beans.xml     |  2 -
 .../idp/saml/flows}/saml2/idwsf-ssos-flow.xml      |  0
 .../flows}/saml2/idwsf-ssos-security-beans.xml     |  2 -
 .../saml/flows}/saml2/idwsf-ssos-security-flow.xml |  0
 .../idp/saml/flows}/saml2/slo-artifact-beans.xml   |  2 -
 .../idp/saml/flows}/saml2/slo-artifact-flow.xml    |  0
 .../idp/saml/flows}/saml2/slo-back-beans.xml       |  0
 .../idp/saml/flows}/saml2/slo-back-flow.xml        |  0
 .../saml/flows}/saml2/slo-front-abstract-beans.xml |  0
 .../saml/flows}/saml2/slo-front-abstract-flow.xml  |  2 +
 .../idp/saml/flows}/saml2/slo-post-beans.xml       |  2 -
 .../idp/saml/flows}/saml2/slo-post-flow.xml        |  0
 .../flows}/saml2/slo-post-simplesign-beans.xml     |  2 -
 .../saml/flows}/saml2/slo-post-simplesign-flow.xml |  0
 .../idp/saml/flows}/saml2/slo-redirect-beans.xml   |  2 -
 .../idp/saml/flows}/saml2/slo-redirect-flow.xml    |  0
 .../idp/saml/flows}/saml2/slo-security-flow.xml    |  2 -
 .../idp/saml/flows}/saml2/sso-abstract-beans.xml   |  0
 .../idp/saml/flows}/saml2/sso-abstract-flow.xml    |  1 +
 .../idp/saml/flows}/saml2/sso-artifact-beans.xml   |  2 -
 .../idp/saml/flows}/saml2/sso-artifact-flow.xml    |  0
 .../idp/saml/flows}/saml2/sso-ecp-beans.xml        |  2 -
 .../idp/saml/flows}/saml2/sso-ecp-flow.xml         |  0
 .../idp/saml/flows}/saml2/sso-post-beans.xml       |  2 -
 .../idp/saml/flows}/saml2/sso-post-flow.xml        |  0
 .../flows}/saml2/sso-post-simplesign-beans.xml     |  2 -
 .../saml/flows}/saml2/sso-post-simplesign-flow.xml |  0
 .../idp/saml/flows}/saml2/sso-redirect-beans.xml   |  2 -
 .../idp/saml/flows}/saml2/sso-redirect-flow.xml    |  0
 .../idp/saml/flows}/saml2/sso-security-flow.xml    |  2 -
 .../saml/flows}/saml2/sso-unsolicited-beans.xml    |  2 -
 .../idp/saml/flows}/saml2/sso-unsolicited-flow.xml |  0
 .../idp/saml/flows}/security-abstract-flow.xml     |  1 +
 .../shibboleth/idp/saml/flows}/security-beans.xml  |  0
 .../idp/saml/flows}/soap-security-flow.xml         |  2 -
 56 files changed, 40 insertions(+), 74 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 3eb075526..8e465c0c5 100644
--- a/idp-conf/src/main/resources/system/conf/webflow-config.xml
+++ b/idp-conf/src/main/resources/system/conf/webflow-config.xml
@@ -41,34 +41,34 @@
         
                 <!-- Logout propagation delegate flows. -->
                 <entry key="logoutprop/cas" value="../system/flows/logout/propagation/cas-flow.xml" />
-                <entry key="logoutprop/saml2" value="../system/flows/logout/propagation/saml2-flow.xml" />
+                <entry key="logoutprop/saml2" value="classpath:/net/shibboleth/idp/saml/flows/logout/saml2-logoutprop-flow.xml" />
         
                 <!-- Abstract flows underpinning SAML profiles. -->
-                <entry key="saml.abstract" value="../system/flows/saml/saml-abstract-flow.xml" />
-                <entry key="saml1.sso.abstract" value="../system/flows/saml/saml1/sso-abstract-flow.xml" />
-                <entry key="saml2.sso.abstract" value="../system/flows/saml/saml2/sso-abstract-flow.xml" />
-                <entry key="saml2.slo.front.abstract" value="../system/flows/saml/saml2/slo-front-abstract-flow.xml" />
+                <entry key="saml.abstract" value="classpath:/net/shibboleth/idp/saml/flows/saml-abstract-flow.xml" />
+                <entry key="saml1.sso.abstract" value="classpath:/net/shibboleth/idp/saml/flows/saml1/sso-abstract-flow.xml" />
+                <entry key="saml2.sso.abstract" value="classpath:/net/shibboleth/idp/saml/flows/saml2/sso-abstract-flow.xml" />
+                <entry key="saml2.slo.front.abstract" value="classpath:/net/shibboleth/idp/saml/flows/saml2/slo-front-abstract-flow.xml" />
         
                 <!-- SAML profile flows. -->
-                <entry key="Shibboleth/SSO" value="../system/flows/saml/saml1/sso-unsolicited-flow.xml" />
-                <entry key="SAML1/SOAP/AttributeQuery" value="../system/flows/saml/saml1/attribute-query-flow.xml" />
-                <entry key="SAML1/SOAP/ArtifactResolution" value="../system/flows/saml/saml1/artifact-resolution-flow.xml" />
-                <entry key="SAML2/POST/SSO" value="../system/flows/saml/saml2/sso-post-flow.xml" />
-                <entry key="SAML2/POST-SimpleSign/SSO" value="../system/flows/saml/saml2/sso-post-flow.xml" />
-                <entry key="SAML2/Redirect/SSO" value="../system/flows/saml/saml2/sso-redirect-flow.xml" />
-                <entry key="SAML2/Artifact/SSO" value="../system/flows/saml/saml2/sso-artifact-flow.xml" />
-                <entry key="SAML2/Unsolicited/SSO" value="../system/flows/saml/saml2/sso-unsolicited-flow.xml" />
-                <entry key="SAML2/SOAP/ECP" value="../system/flows/saml/saml2/sso-ecp-flow.xml" />
-                <entry key="SAML2/POST/SLO" value="../system/flows/saml/saml2/slo-post-flow.xml" />
-                <entry key="SAML2/POST-SimpleSign/SLO" value="../system/flows/saml/saml2/slo-post-flow.xml" />
-                <entry key="SAML2/Redirect/SLO" value="../system/flows/saml/saml2/slo-redirect-flow.xml" />
-                <entry key="SAML2/Artifact/SLO" value="../system/flows/saml/saml2/slo-artifact-flow.xml" />
-                <entry key="SAML2/SOAP/SLO" value="../system/flows/saml/saml2/slo-back-flow.xml" />
-                <entry key="SAML2/SOAP/AttributeQuery" value="../system/flows/saml/saml2/attribute-query-flow.xml" />
-                <entry key="SAML2/SOAP/ArtifactResolution" value="../system/flows/saml/saml2/artifact-resolution-flow.xml" />
+                <entry key="Shibboleth/SSO" value="classpath:/net/shibboleth/idp/saml/flows/saml1/sso-unsolicited-flow.xml" />
+                <entry key="SAML1/SOAP/AttributeQuery" value="classpath:/net/shibboleth/idp/saml/flows/saml1/attribute-query-flow.xml" />
+                <entry key="SAML1/SOAP/ArtifactResolution" value="classpath:/net/shibboleth/idp/saml/flows/saml1/artifact-resolution-flow.xml" />
+                <entry key="SAML2/POST/SSO" value="classpath:/net/shibboleth/idp/saml/flows/saml2/sso-post-flow.xml" />
+                <entry key="SAML2/POST-SimpleSign/SSO" value="classpath:/net/shibboleth/idp/saml/flows/saml2/sso-post-flow.xml" />
+                <entry key="SAML2/Redirect/SSO" value="classpath:/net/shibboleth/idp/saml/flows/saml2/sso-redirect-flow.xml" />
+                <entry key="SAML2/Artifact/SSO" value="classpath:/net/shibboleth/idp/saml/flows/saml2/sso-artifact-flow.xml" />
+                <entry key="SAML2/Unsolicited/SSO" value="classpath:/net/shibboleth/idp/saml/flows/saml2/sso-unsolicited-flow.xml" />
+                <entry key="SAML2/SOAP/ECP" value="classpath:/net/shibboleth/idp/saml/flows/saml2/sso-ecp-flow.xml" />
+                <entry key="SAML2/POST/SLO" value="classpath:/net/shibboleth/idp/saml/flows/saml2/slo-post-flow.xml" />
+                <entry key="SAML2/POST-SimpleSign/SLO" value="classpath:/net/shibboleth/idp/saml/flows/saml2/slo-post-flow.xml" />
+                <entry key="SAML2/Redirect/SLO" value="classpath:/net/shibboleth/idp/saml/flows/saml2/slo-redirect-flow.xml" />
+                <entry key="SAML2/Artifact/SLO" value="classpath:/net/shibboleth/idp/saml/flows/saml2/slo-artifact-flow.xml" />
+                <entry key="SAML2/SOAP/SLO" value="classpath:/net/shibboleth/idp/saml/flows/saml2/slo-back-flow.xml" />
+                <entry key="SAML2/SOAP/AttributeQuery" value="classpath:/net/shibboleth/idp/saml/flows/saml2/attribute-query-flow.xml" />
+                <entry key="SAML2/SOAP/ArtifactResolution" value="classpath:/net/shibboleth/idp/saml/flows/saml2/artifact-resolution-flow.xml" />
                 
                 <!-- Liberty IDWSF SSOS flow (for SAML 2 delegation) -->
-                <entry key="IDWSF/SSOS" value="../system/flows/saml/saml2/idwsf-ssos-flow.xml" />
+                <entry key="IDWSF/SSOS" value="classpath:/net/shibboleth/idp/saml/flows/saml2/idwsf-ssos-flow.xml" />
         
                 <!-- Main flow for authentication. -->
                 <entry key="authn.events" value="%{idp.home}/conf/authn/authn-events-flow.xml" />
@@ -133,13 +133,13 @@
                 <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" />
-                <entry key="intercept/security-policy/shibboleth-sso" value="../system/flows/saml/saml1/sso-security-flow.xml" />
-                <entry key="intercept/security-policy/saml2-sso" value="../system/flows/saml/saml2/sso-security-flow.xml" />
-                <entry key="intercept/security-policy/saml2-ecp" value="../system/flows/saml/saml2/ecp-security-flow.xml" />
-                <entry key="intercept/security-policy/saml2-slo" value="../system/flows/saml/saml2/slo-security-flow.xml" />
-                <entry key="intercept/security-policy/saml2-idwsf-ssos" value="../system/flows/saml/saml2/idwsf-ssos-security-flow.xml" />
-                <entry key="intercept/security-policy/saml-soap" value="../system/flows/saml/soap-security-flow.xml" />
+                <entry key="security-policy.abstract" value="classpath:/net/shibboleth/idp/saml/flows/security-abstract-flow.xml" />
+                <entry key="intercept/security-policy/shibboleth-sso" value="classpath:/net/shibboleth/idp/saml/flows/saml1/sso-security-flow.xml" />
+                <entry key="intercept/security-policy/saml2-sso" value="classpath:/net/shibboleth/idp/saml/flows/saml2/sso-security-flow.xml" />
+                <entry key="intercept/security-policy/saml2-ecp" value="classpath:/net/shibboleth/idp/saml/flows/saml2/ecp-security-flow.xml" />
+                <entry key="intercept/security-policy/saml2-slo" value="classpath:/net/shibboleth/idp/saml/flows/saml2/slo-security-flow.xml" />
+                <entry key="intercept/security-policy/saml2-idwsf-ssos" value="classpath:/net/shibboleth/idp/saml/flows/saml2/idwsf-ssos-security-flow.xml" />
+                <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" />
diff --git a/idp-conf/src/main/resources/system/flows/logout/propagation/saml2-beans.xml b/idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/logout/saml2-logoutprop-beans.xml
similarity index 98%
rename from idp-conf/src/main/resources/system/flows/logout/propagation/saml2-beans.xml
rename to idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/logout/saml2-logoutprop-beans.xml
index 1bbab4f86..1b7fbd746 100644
--- a/idp-conf/src/main/resources/system/flows/logout/propagation/saml2-beans.xml
+++ b/idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/logout/saml2-logoutprop-beans.xml
@@ -17,7 +17,7 @@
     <bean class="net.shibboleth.ext.spring.config.IdentifiableBeanPostProcessor" />
     <bean class="net.shibboleth.idp.profile.impl.ProfileActionBeanPostProcessor" />
 
-    <import resource="../../saml/saml-abstract-beans.xml" />
+    <import resource="../saml-abstract-beans.xml" />
 
     <util:constant id="shibboleth.EndpointType"
         static-field="org.opensaml.saml.saml2.metadata.SingleLogoutService.DEFAULT_ELEMENT_NAME" />
diff --git a/idp-conf/src/main/resources/system/flows/logout/propagation/saml2-flow.xml b/idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/logout/saml2-logoutprop-flow.xml
similarity index 98%
rename from idp-conf/src/main/resources/system/flows/logout/propagation/saml2-flow.xml
rename to idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/logout/saml2-logoutprop-flow.xml
index 9d54e5e86..9416d19da 100644
--- a/idp-conf/src/main/resources/system/flows/logout/propagation/saml2-flow.xml
+++ b/idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/logout/saml2-logoutprop-flow.xml
@@ -117,6 +117,6 @@
         <transition on="#{!'proceed'.equals(currentEvent.id)}" to="proceed" />
     </global-transitions>
     
-    <bean-import resource="saml2-beans.xml" />
+    <bean-import resource="saml2-logoutprop-beans.xml" />
 
 </flow>
diff --git a/idp-conf/src/main/resources/system/flows/saml/saml-abstract-beans.xml b/idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml-abstract-beans.xml
similarity index 100%
rename from idp-conf/src/main/resources/system/flows/saml/saml-abstract-beans.xml
rename to idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml-abstract-beans.xml
diff --git a/idp-conf/src/main/resources/system/flows/saml/saml-abstract-flow.xml b/idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml-abstract-flow.xml
similarity index 98%
rename from idp-conf/src/main/resources/system/flows/saml/saml-abstract-flow.xml
rename to idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml-abstract-flow.xml
index 0ded5b7a5..76f5874d0 100644
--- a/idp-conf/src/main/resources/system/flows/saml/saml-abstract-flow.xml
+++ b/idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml-abstract-flow.xml
@@ -192,5 +192,7 @@
         <transition on-exception="java.lang.RuntimeException" to="LogRuntimeException" />
         <transition on="#{!'proceed'.equals(currentEvent.id)}" to="HandleError" />
     </global-transitions>
+    
+    <bean-import resource="classpath:/net/shibboleth/idp/saml/flows/saml-abstract-beans.xml"/>
 
 </flow>
diff --git a/idp-conf/src/main/resources/system/flows/saml/saml1/artifact-resolution-beans.xml b/idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml1/artifact-resolution-beans.xml
similarity index 100%
rename from idp-conf/src/main/resources/system/flows/saml/saml1/artifact-resolution-beans.xml
rename to idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml1/artifact-resolution-beans.xml
diff --git a/idp-conf/src/main/resources/system/flows/saml/saml1/artifact-resolution-flow.xml b/idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml1/artifact-resolution-flow.xml
similarity index 100%
rename from idp-conf/src/main/resources/system/flows/saml/saml1/artifact-resolution-flow.xml
rename to idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml1/artifact-resolution-flow.xml
diff --git a/idp-conf/src/main/resources/system/flows/saml/saml1/attribute-query-beans.xml b/idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml1/attribute-query-beans.xml
similarity index 98%
rename from idp-conf/src/main/resources/system/flows/saml/saml1/attribute-query-beans.xml
rename to idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml1/attribute-query-beans.xml
index 974d005ce..9d0743dbf 100644
--- a/idp-conf/src/main/resources/system/flows/saml/saml1/attribute-query-beans.xml
+++ b/idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml1/attribute-query-beans.xml
@@ -16,7 +16,7 @@
         p:placeholderPrefix="%{" p:placeholderSuffix="}" />
 
     <import resource="common-beans.xml" />
-    <import resource="../../../../conf/intercept/consent-intercept-config.xml" />
+    <import resource="%{idp.home}/conf/intercept/consent-intercept-config.xml" />
     
     <bean id="InitializeProfileRequestContext"
         class="net.shibboleth.idp.profile.impl.InitializeProfileRequestContext" scope="prototype"
diff --git a/idp-conf/src/main/resources/system/flows/saml/saml1/attribute-query-flow.xml b/idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml1/attribute-query-flow.xml
similarity index 100%
rename from idp-conf/src/main/resources/system/flows/saml/saml1/attribute-query-flow.xml
rename to idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml1/attribute-query-flow.xml
diff --git a/idp-conf/src/main/resources/system/flows/saml/saml1/common-beans.xml b/idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml1/common-beans.xml
similarity index 98%
rename from idp-conf/src/main/resources/system/flows/saml/saml1/common-beans.xml
rename to idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml1/common-beans.xml
index 5f866932d..1086b9e6a 100644
--- a/idp-conf/src/main/resources/system/flows/saml/saml1/common-beans.xml
+++ b/idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml1/common-beans.xml
@@ -12,8 +12,6 @@
     default-init-method="initialize"
     default-destroy-method="destroy">
 
-    <import resource="../saml-abstract-beans.xml" />
-
     <util:constant id="shibboleth.MetadataLookup.Protocol"
         static-field="org.opensaml.saml.common.xml.SAMLConstants.SAML11P_NS" />
 
diff --git a/idp-conf/src/main/resources/system/flows/saml/saml1/sso-abstract-beans.xml b/idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml1/sso-abstract-beans.xml
similarity index 100%
rename from idp-conf/src/main/resources/system/flows/saml/saml1/sso-abstract-beans.xml
rename to idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml1/sso-abstract-beans.xml
diff --git a/idp-conf/src/main/resources/system/flows/saml/saml1/sso-abstract-flow.xml b/idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml1/sso-abstract-flow.xml
similarity index 98%
rename from idp-conf/src/main/resources/system/flows/saml/saml1/sso-abstract-flow.xml
rename to idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml1/sso-abstract-flow.xml
index 7308b5c11..c68c97ea7 100644
--- a/idp-conf/src/main/resources/system/flows/saml/saml1/sso-abstract-flow.xml
+++ b/idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml1/sso-abstract-flow.xml
@@ -154,6 +154,6 @@
         </on-entry>
     </end-state>
 
-    <bean-import resource="sso-abstract-beans.xml" />
+    <bean-import resource="classpath:/net/shibboleth/idp/saml/flows/saml1/sso-abstract-beans.xml" />
 
 </flow>
diff --git a/idp-conf/src/main/resources/system/flows/saml/saml1/sso-security-flow.xml b/idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml1/sso-security-flow.xml
similarity index 93%
rename from idp-conf/src/main/resources/system/flows/saml/saml1/sso-security-flow.xml
rename to idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml1/sso-security-flow.xml
index c37a7f303..18b011144 100644
--- a/idp-conf/src/main/resources/system/flows/saml/saml1/sso-security-flow.xml
+++ b/idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml1/sso-security-flow.xml
@@ -14,6 +14,4 @@
         <transition on="proceed" to="proceed" />
     </action-state>
 
-    <bean-import resource="../security-beans.xml" />
-
 </flow>
diff --git a/idp-conf/src/main/resources/system/flows/saml/saml1/sso-unsolicited-beans.xml b/idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml1/sso-unsolicited-beans.xml
similarity index 96%
rename from idp-conf/src/main/resources/system/flows/saml/saml1/sso-unsolicited-beans.xml
rename to idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml1/sso-unsolicited-beans.xml
index b605d4ddd..3f603b21e 100644
--- a/idp-conf/src/main/resources/system/flows/saml/saml1/sso-unsolicited-beans.xml
+++ b/idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml1/sso-unsolicited-beans.xml
@@ -11,8 +11,6 @@
        default-init-method="initialize"
        default-destroy-method="destroy">
 
-    <import resource="sso-abstract-beans.xml" />
-
     <bean id="DecodeMessage" class="org.opensaml.profile.action.impl.DecodeMessage" scope="prototype">
         <constructor-arg>
             <bean class="net.shibboleth.idp.saml.saml1.profile.impl.IdPInitiatedSSORequestMessageDecoder" scope="prototype"
diff --git a/idp-conf/src/main/resources/system/flows/saml/saml1/sso-unsolicited-flow.xml b/idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml1/sso-unsolicited-flow.xml
similarity index 100%
rename from idp-conf/src/main/resources/system/flows/saml/saml1/sso-unsolicited-flow.xml
rename to idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml1/sso-unsolicited-flow.xml
diff --git a/idp-conf/src/main/resources/system/flows/saml/saml2/artifact-resolution-beans.xml b/idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/artifact-resolution-beans.xml
similarity index 100%
rename from idp-conf/src/main/resources/system/flows/saml/saml2/artifact-resolution-beans.xml
rename to idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/artifact-resolution-beans.xml
diff --git a/idp-conf/src/main/resources/system/flows/saml/saml2/artifact-resolution-flow.xml b/idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/artifact-resolution-flow.xml
similarity index 100%
rename from idp-conf/src/main/resources/system/flows/saml/saml2/artifact-resolution-flow.xml
rename to idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/artifact-resolution-flow.xml
diff --git a/idp-conf/src/main/resources/system/flows/saml/saml2/attribute-query-beans.xml b/idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/attribute-query-beans.xml
similarity index 98%
rename from idp-conf/src/main/resources/system/flows/saml/saml2/attribute-query-beans.xml
rename to idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/attribute-query-beans.xml
index 27bd70d60..d38583a03 100644
--- a/idp-conf/src/main/resources/system/flows/saml/saml2/attribute-query-beans.xml
+++ b/idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/attribute-query-beans.xml
@@ -16,7 +16,7 @@
         p:placeholderPrefix="%{" p:placeholderSuffix="}" />
     
     <import resource="common-beans.xml" />
-    <import resource="../../../../conf/intercept/consent-intercept-config.xml" />
+    <import resource="%{idp.home}/conf/intercept/consent-intercept-config.xml" />
 
     <bean id="InitializeProfileRequestContext"
         class="net.shibboleth.idp.profile.impl.InitializeProfileRequestContext" scope="prototype"
diff --git a/idp-conf/src/main/resources/system/flows/saml/saml2/attribute-query-flow.xml b/idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/attribute-query-flow.xml
similarity index 100%
rename from idp-conf/src/main/resources/system/flows/saml/saml2/attribute-query-flow.xml
rename to idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/attribute-query-flow.xml
diff --git a/idp-conf/src/main/resources/system/flows/saml/saml2/common-beans.xml b/idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/common-beans.xml
similarity index 99%
rename from idp-conf/src/main/resources/system/flows/saml/saml2/common-beans.xml
rename to idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/common-beans.xml
index d15549093..2d17e7da5 100644
--- a/idp-conf/src/main/resources/system/flows/saml/saml2/common-beans.xml
+++ b/idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/common-beans.xml
@@ -12,8 +12,6 @@
     default-init-method="initialize"
     default-destroy-method="destroy">
     
-    <import resource="../saml-abstract-beans.xml" />
-    
     <util:constant id="shibboleth.MetadataLookup.Protocol"
         static-field="org.opensaml.saml.common.xml.SAMLConstants.SAML20P_NS" />
 
diff --git a/idp-conf/src/main/resources/system/flows/saml/saml2/ecp-security-flow.xml b/idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/ecp-security-flow.xml
similarity index 95%
rename from idp-conf/src/main/resources/system/flows/saml/saml2/ecp-security-flow.xml
rename to idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/ecp-security-flow.xml
index b120bba35..e7abc7b31 100644
--- a/idp-conf/src/main/resources/system/flows/saml/saml2/ecp-security-flow.xml
+++ b/idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/ecp-security-flow.xml
@@ -20,7 +20,5 @@
 
         <transition on="proceed" to="proceed" />
     </action-state>
-    
-    <bean-import resource="../security-beans.xml" />
 
 </flow>
diff --git a/idp-conf/src/main/resources/system/flows/saml/saml2/idwsf-ssos-beans.xml b/idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/idwsf-ssos-beans.xml
similarity index 99%
rename from idp-conf/src/main/resources/system/flows/saml/saml2/idwsf-ssos-beans.xml
rename to idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/idwsf-ssos-beans.xml
index dbb19399e..3def23862 100644
--- a/idp-conf/src/main/resources/system/flows/saml/saml2/idwsf-ssos-beans.xml
+++ b/idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/idwsf-ssos-beans.xml
@@ -11,8 +11,6 @@
        default-init-method="initialize"
        default-destroy-method="destroy">
 
-    <import resource="sso-abstract-beans.xml" />
-
     <bean id="InitializeProfileRequestContext"
         class="net.shibboleth.idp.profile.impl.InitializeProfileRequestContext" scope="prototype"
         p:profileId="#{T(net.shibboleth.idp.saml.idwsf.profile.config.SSOSProfileConfiguration).PROFILE_ID}"
diff --git a/idp-conf/src/main/resources/system/flows/saml/saml2/idwsf-ssos-flow.xml b/idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/idwsf-ssos-flow.xml
similarity index 100%
rename from idp-conf/src/main/resources/system/flows/saml/saml2/idwsf-ssos-flow.xml
rename to idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/idwsf-ssos-flow.xml
diff --git a/idp-conf/src/main/resources/system/flows/saml/saml2/idwsf-ssos-security-beans.xml b/idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/idwsf-ssos-security-beans.xml
similarity index 99%
rename from idp-conf/src/main/resources/system/flows/saml/saml2/idwsf-ssos-security-beans.xml
rename to idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/idwsf-ssos-security-beans.xml
index db8bc372e..d9fd28799 100644
--- a/idp-conf/src/main/resources/system/flows/saml/saml2/idwsf-ssos-security-beans.xml
+++ b/idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/idwsf-ssos-security-beans.xml
@@ -15,8 +15,6 @@
     <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"
         p:placeholderPrefix="%{" p:placeholderSuffix="}" />
     
-    <import resource="../security-beans.xml" />
-    
     <bean id="SAMLMDClientCertAuthSecurityHandlerForPresenter"
             class="net.shibboleth.idp.profile.impl.WebFlowMessageHandlerAdaptor" scope="prototype"
             c:executionDirection="INBOUND">
diff --git a/idp-conf/src/main/resources/system/flows/saml/saml2/idwsf-ssos-security-flow.xml b/idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/idwsf-ssos-security-flow.xml
similarity index 100%
rename from idp-conf/src/main/resources/system/flows/saml/saml2/idwsf-ssos-security-flow.xml
rename to idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/idwsf-ssos-security-flow.xml
diff --git a/idp-conf/src/main/resources/system/flows/saml/saml2/slo-artifact-beans.xml b/idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/slo-artifact-beans.xml
similarity index 97%
rename from idp-conf/src/main/resources/system/flows/saml/saml2/slo-artifact-beans.xml
rename to idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/slo-artifact-beans.xml
index bf9a111db..9e8dbfe55 100644
--- a/idp-conf/src/main/resources/system/flows/saml/saml2/slo-artifact-beans.xml
+++ b/idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/slo-artifact-beans.xml
@@ -11,8 +11,6 @@
        default-init-method="initialize"
        default-destroy-method="destroy">
 
-    <import resource="slo-front-abstract-beans.xml" />
-
     <bean id="DecodeMessage" class="org.opensaml.profile.action.impl.DecodeMessage" scope="prototype">
         <constructor-arg>
             <bean class="org.opensaml.saml.saml2.binding.decoding.impl.HTTPArtifactDecoder" scope="prototype"
diff --git a/idp-conf/src/main/resources/system/flows/saml/saml2/slo-artifact-flow.xml b/idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/slo-artifact-flow.xml
similarity index 100%
rename from idp-conf/src/main/resources/system/flows/saml/saml2/slo-artifact-flow.xml
rename to idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/slo-artifact-flow.xml
diff --git a/idp-conf/src/main/resources/system/flows/saml/saml2/slo-back-beans.xml b/idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/slo-back-beans.xml
similarity index 100%
rename from idp-conf/src/main/resources/system/flows/saml/saml2/slo-back-beans.xml
rename to idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/slo-back-beans.xml
diff --git a/idp-conf/src/main/resources/system/flows/saml/saml2/slo-back-flow.xml b/idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/slo-back-flow.xml
similarity index 100%
rename from idp-conf/src/main/resources/system/flows/saml/saml2/slo-back-flow.xml
rename to idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/slo-back-flow.xml
diff --git a/idp-conf/src/main/resources/system/flows/saml/saml2/slo-front-abstract-beans.xml b/idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/slo-front-abstract-beans.xml
similarity index 100%
rename from idp-conf/src/main/resources/system/flows/saml/saml2/slo-front-abstract-beans.xml
rename to idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/slo-front-abstract-beans.xml
diff --git a/idp-conf/src/main/resources/system/flows/saml/saml2/slo-front-abstract-flow.xml b/idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/slo-front-abstract-flow.xml
similarity index 99%
rename from idp-conf/src/main/resources/system/flows/saml/saml2/slo-front-abstract-flow.xml
rename to idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/slo-front-abstract-flow.xml
index cbad3941a..1d1eeca2a 100644
--- a/idp-conf/src/main/resources/system/flows/saml/saml2/slo-front-abstract-flow.xml
+++ b/idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/slo-front-abstract-flow.xml
@@ -261,5 +261,7 @@
                 : externalContext.nativeResponse.setContentType('application/json')" />
         </on-entry>
     </end-state>
+    
+    <bean-import resource="classpath:/net/shibboleth/idp/saml/flows/saml2/slo-front-abstract-beans.xml" />
 
 </flow>
diff --git a/idp-conf/src/main/resources/system/flows/saml/saml2/slo-post-beans.xml b/idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/slo-post-beans.xml
similarity index 95%
rename from idp-conf/src/main/resources/system/flows/saml/saml2/slo-post-beans.xml
rename to idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/slo-post-beans.xml
index 4b7034670..d6775c20b 100644
--- a/idp-conf/src/main/resources/system/flows/saml/saml2/slo-post-beans.xml
+++ b/idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/slo-post-beans.xml
@@ -11,8 +11,6 @@
        default-init-method="initialize"
        default-destroy-method="destroy">
 
-    <import resource="slo-front-abstract-beans.xml" />
-
     <bean id="DecodeMessage" class="org.opensaml.profile.action.impl.DecodeMessage" scope="prototype">
         <constructor-arg>
             <bean class="org.opensaml.saml.saml2.binding.decoding.impl.HTTPPostDecoder" scope="prototype"
diff --git a/idp-conf/src/main/resources/system/flows/saml/saml2/slo-post-flow.xml b/idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/slo-post-flow.xml
similarity index 100%
rename from idp-conf/src/main/resources/system/flows/saml/saml2/slo-post-flow.xml
rename to idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/slo-post-flow.xml
diff --git a/idp-conf/src/main/resources/system/flows/saml/saml2/slo-post-simplesign-beans.xml b/idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/slo-post-simplesign-beans.xml
similarity index 95%
rename from idp-conf/src/main/resources/system/flows/saml/saml2/slo-post-simplesign-beans.xml
rename to idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/slo-post-simplesign-beans.xml
index ea474ffa9..0f7a04f15 100644
--- a/idp-conf/src/main/resources/system/flows/saml/saml2/slo-post-simplesign-beans.xml
+++ b/idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/slo-post-simplesign-beans.xml
@@ -11,8 +11,6 @@
        default-init-method="initialize"
        default-destroy-method="destroy">
 
-    <import resource="slo-front-abstract-beans.xml" />
-
     <bean id="DecodeMessage" class="org.opensaml.profile.action.impl.DecodeMessage" scope="prototype">
         <constructor-arg>
             <bean class="org.opensaml.saml.saml2.binding.decoding.impl.HTTPPostSimpleSignDecoder" scope="prototype"
diff --git a/idp-conf/src/main/resources/system/flows/saml/saml2/slo-post-simplesign-flow.xml b/idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/slo-post-simplesign-flow.xml
similarity index 100%
rename from idp-conf/src/main/resources/system/flows/saml/saml2/slo-post-simplesign-flow.xml
rename to idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/slo-post-simplesign-flow.xml
diff --git a/idp-conf/src/main/resources/system/flows/saml/saml2/slo-redirect-beans.xml b/idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/slo-redirect-beans.xml
similarity index 95%
rename from idp-conf/src/main/resources/system/flows/saml/saml2/slo-redirect-beans.xml
rename to idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/slo-redirect-beans.xml
index 11ae8d141..8e2078281 100644
--- a/idp-conf/src/main/resources/system/flows/saml/saml2/slo-redirect-beans.xml
+++ b/idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/slo-redirect-beans.xml
@@ -11,8 +11,6 @@
        default-init-method="initialize"
        default-destroy-method="destroy">
         
-    <import resource="slo-front-abstract-beans.xml" />
-        
     <bean id="DecodeMessage" class="org.opensaml.profile.action.impl.DecodeMessage" scope="prototype">
         <constructor-arg>
             <bean class="org.opensaml.saml.saml2.binding.decoding.impl.HTTPRedirectDeflateDecoder" scope="prototype"
diff --git a/idp-conf/src/main/resources/system/flows/saml/saml2/slo-redirect-flow.xml b/idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/slo-redirect-flow.xml
similarity index 100%
rename from idp-conf/src/main/resources/system/flows/saml/saml2/slo-redirect-flow.xml
rename to idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/slo-redirect-flow.xml
diff --git a/idp-conf/src/main/resources/system/flows/saml/saml2/slo-security-flow.xml b/idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/slo-security-flow.xml
similarity index 95%
rename from idp-conf/src/main/resources/system/flows/saml/saml2/slo-security-flow.xml
rename to idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/slo-security-flow.xml
index 9dd9c5935..e7ae170d8 100644
--- a/idp-conf/src/main/resources/system/flows/saml/saml2/slo-security-flow.xml
+++ b/idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/slo-security-flow.xml
@@ -21,6 +21,4 @@
         <transition on="proceed" to="proceed" />
     </action-state>
     
-    <bean-import resource="../security-beans.xml" />
-
 </flow>
diff --git a/idp-conf/src/main/resources/system/flows/saml/saml2/sso-abstract-beans.xml b/idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/sso-abstract-beans.xml
similarity index 100%
rename from idp-conf/src/main/resources/system/flows/saml/saml2/sso-abstract-beans.xml
rename to idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/sso-abstract-beans.xml
diff --git a/idp-conf/src/main/resources/system/flows/saml/saml2/sso-abstract-flow.xml b/idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/sso-abstract-flow.xml
similarity index 98%
rename from idp-conf/src/main/resources/system/flows/saml/saml2/sso-abstract-flow.xml
rename to idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/sso-abstract-flow.xml
index 6037d77b0..a88579c52 100644
--- a/idp-conf/src/main/resources/system/flows/saml/saml2/sso-abstract-flow.xml
+++ b/idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/sso-abstract-flow.xml
@@ -204,4 +204,5 @@
         </on-entry>
     </end-state>
 
+    <bean-import resource="classpath:/net/shibboleth/idp/saml/flows/saml2/sso-abstract-beans.xml" />
 </flow>
diff --git a/idp-conf/src/main/resources/system/flows/saml/saml2/sso-artifact-beans.xml b/idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/sso-artifact-beans.xml
similarity index 97%
rename from idp-conf/src/main/resources/system/flows/saml/saml2/sso-artifact-beans.xml
rename to idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/sso-artifact-beans.xml
index 74d252942..4d2bb54a9 100644
--- a/idp-conf/src/main/resources/system/flows/saml/saml2/sso-artifact-beans.xml
+++ b/idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/sso-artifact-beans.xml
@@ -11,8 +11,6 @@
        default-init-method="initialize"
        default-destroy-method="destroy">
 
-    <import resource="sso-abstract-beans.xml" />
-
     <bean id="InitializeProfileRequestContext"
         class="net.shibboleth.idp.profile.impl.InitializeProfileRequestContext" scope="prototype"
         p:profileId="#{T(net.shibboleth.idp.saml.saml2.profile.config.BrowserSSOProfileConfiguration).PROFILE_ID}"
diff --git a/idp-conf/src/main/resources/system/flows/saml/saml2/sso-artifact-flow.xml b/idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/sso-artifact-flow.xml
similarity index 100%
rename from idp-conf/src/main/resources/system/flows/saml/saml2/sso-artifact-flow.xml
rename to idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/sso-artifact-flow.xml
diff --git a/idp-conf/src/main/resources/system/flows/saml/saml2/sso-ecp-beans.xml b/idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/sso-ecp-beans.xml
similarity index 98%
rename from idp-conf/src/main/resources/system/flows/saml/saml2/sso-ecp-beans.xml
rename to idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/sso-ecp-beans.xml
index 96651d44d..30e4b3dbe 100644
--- a/idp-conf/src/main/resources/system/flows/saml/saml2/sso-ecp-beans.xml
+++ b/idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/sso-ecp-beans.xml
@@ -11,8 +11,6 @@
        default-init-method="initialize"
        default-destroy-method="destroy">
 
-    <import resource="sso-abstract-beans.xml" />
-
     <bean id="InitializeProfileRequestContext"
         class="net.shibboleth.idp.profile.impl.InitializeProfileRequestContext" scope="prototype"
         p:profileId="#{T(net.shibboleth.idp.saml.saml2.profile.config.ECPProfileConfiguration).PROFILE_ID}"
diff --git a/idp-conf/src/main/resources/system/flows/saml/saml2/sso-ecp-flow.xml b/idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/sso-ecp-flow.xml
similarity index 100%
rename from idp-conf/src/main/resources/system/flows/saml/saml2/sso-ecp-flow.xml
rename to idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/sso-ecp-flow.xml
diff --git a/idp-conf/src/main/resources/system/flows/saml/saml2/sso-post-beans.xml b/idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/sso-post-beans.xml
similarity index 97%
rename from idp-conf/src/main/resources/system/flows/saml/saml2/sso-post-beans.xml
rename to idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/sso-post-beans.xml
index 466828846..9e9684090 100644
--- a/idp-conf/src/main/resources/system/flows/saml/saml2/sso-post-beans.xml
+++ b/idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/sso-post-beans.xml
@@ -11,8 +11,6 @@
        default-init-method="initialize"
        default-destroy-method="destroy">
 
-    <import resource="sso-abstract-beans.xml" />
-
     <bean id="InitializeProfileRequestContext"
         class="net.shibboleth.idp.profile.impl.InitializeProfileRequestContext" scope="prototype"
         p:profileId="#{T(net.shibboleth.idp.saml.saml2.profile.config.BrowserSSOProfileConfiguration).PROFILE_ID}"
diff --git a/idp-conf/src/main/resources/system/flows/saml/saml2/sso-post-flow.xml b/idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/sso-post-flow.xml
similarity index 100%
rename from idp-conf/src/main/resources/system/flows/saml/saml2/sso-post-flow.xml
rename to idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/sso-post-flow.xml
diff --git a/idp-conf/src/main/resources/system/flows/saml/saml2/sso-post-simplesign-beans.xml b/idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/sso-post-simplesign-beans.xml
similarity index 97%
rename from idp-conf/src/main/resources/system/flows/saml/saml2/sso-post-simplesign-beans.xml
rename to idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/sso-post-simplesign-beans.xml
index a96410247..a3cc77323 100644
--- a/idp-conf/src/main/resources/system/flows/saml/saml2/sso-post-simplesign-beans.xml
+++ b/idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/sso-post-simplesign-beans.xml
@@ -11,8 +11,6 @@
        default-init-method="initialize"
        default-destroy-method="destroy">
 
-    <import resource="sso-abstract-beans.xml" />
-
     <bean id="InitializeProfileRequestContext"
         class="net.shibboleth.idp.profile.impl.InitializeProfileRequestContext" scope="prototype"
         p:profileId="#{T(net.shibboleth.idp.saml.saml2.profile.config.BrowserSSOProfileConfiguration).PROFILE_ID}"
diff --git a/idp-conf/src/main/resources/system/flows/saml/saml2/sso-post-simplesign-flow.xml b/idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/sso-post-simplesign-flow.xml
similarity index 100%
rename from idp-conf/src/main/resources/system/flows/saml/saml2/sso-post-simplesign-flow.xml
rename to idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/sso-post-simplesign-flow.xml
diff --git a/idp-conf/src/main/resources/system/flows/saml/saml2/sso-redirect-beans.xml b/idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/sso-redirect-beans.xml
similarity index 97%
rename from idp-conf/src/main/resources/system/flows/saml/saml2/sso-redirect-beans.xml
rename to idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/sso-redirect-beans.xml
index 7d3988ea8..dab50ca35 100644
--- a/idp-conf/src/main/resources/system/flows/saml/saml2/sso-redirect-beans.xml
+++ b/idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/sso-redirect-beans.xml
@@ -10,8 +10,6 @@
                            http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
        default-init-method="initialize"
        default-destroy-method="destroy">
-
-    <import resource="sso-abstract-beans.xml" />
     
     <bean id="InitializeProfileRequestContext"
         class="net.shibboleth.idp.profile.impl.InitializeProfileRequestContext" scope="prototype"
diff --git a/idp-conf/src/main/resources/system/flows/saml/saml2/sso-redirect-flow.xml b/idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/sso-redirect-flow.xml
similarity index 100%
rename from idp-conf/src/main/resources/system/flows/saml/saml2/sso-redirect-flow.xml
rename to idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/sso-redirect-flow.xml
diff --git a/idp-conf/src/main/resources/system/flows/saml/saml2/sso-security-flow.xml b/idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/sso-security-flow.xml
similarity index 95%
rename from idp-conf/src/main/resources/system/flows/saml/saml2/sso-security-flow.xml
rename to idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/sso-security-flow.xml
index 633e2f3bf..cac9dd656 100644
--- a/idp-conf/src/main/resources/system/flows/saml/saml2/sso-security-flow.xml
+++ b/idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/sso-security-flow.xml
@@ -19,6 +19,4 @@
         <transition on="proceed" to="proceed" />
     </action-state>
     
-    <bean-import resource="../security-beans.xml" />
-
 </flow>
diff --git a/idp-conf/src/main/resources/system/flows/saml/saml2/sso-unsolicited-beans.xml b/idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/sso-unsolicited-beans.xml
similarity index 97%
rename from idp-conf/src/main/resources/system/flows/saml/saml2/sso-unsolicited-beans.xml
rename to idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/sso-unsolicited-beans.xml
index 532882883..c1d5ec25c 100644
--- a/idp-conf/src/main/resources/system/flows/saml/saml2/sso-unsolicited-beans.xml
+++ b/idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/sso-unsolicited-beans.xml
@@ -11,8 +11,6 @@
        default-init-method="initialize"
        default-destroy-method="destroy">
 
-    <import resource="sso-abstract-beans.xml" />
-
     <bean id="InitializeProfileRequestContext"
         class="net.shibboleth.idp.profile.impl.InitializeProfileRequestContext" scope="prototype"
         p:profileId="#{T(net.shibboleth.idp.saml.saml2.profile.config.BrowserSSOProfileConfiguration).PROFILE_ID}"
diff --git a/idp-conf/src/main/resources/system/flows/saml/saml2/sso-unsolicited-flow.xml b/idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/sso-unsolicited-flow.xml
similarity index 100%
rename from idp-conf/src/main/resources/system/flows/saml/saml2/sso-unsolicited-flow.xml
rename to idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/saml2/sso-unsolicited-flow.xml
diff --git a/idp-conf/src/main/resources/system/flows/saml/security-abstract-flow.xml b/idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/security-abstract-flow.xml
similarity index 92%
rename from idp-conf/src/main/resources/system/flows/saml/security-abstract-flow.xml
rename to idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/security-abstract-flow.xml
index c57dccbaa..59eadd0a1 100644
--- a/idp-conf/src/main/resources/system/flows/saml/security-abstract-flow.xml
+++ b/idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/security-abstract-flow.xml
@@ -23,4 +23,5 @@
         <transition on="MessageAuthenticationError" to="MessageAuthenticationError" />
     </global-transitions>
 
+    <bean-import resource="classpath:/net/shibboleth/idp/saml/flows/security-beans.xml"/>
 </flow>
diff --git a/idp-conf/src/main/resources/system/flows/saml/security-beans.xml b/idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/security-beans.xml
similarity index 100%
rename from idp-conf/src/main/resources/system/flows/saml/security-beans.xml
rename to idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/security-beans.xml
diff --git a/idp-conf/src/main/resources/system/flows/saml/soap-security-flow.xml b/idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/soap-security-flow.xml
similarity index 95%
rename from idp-conf/src/main/resources/system/flows/saml/soap-security-flow.xml
rename to idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/soap-security-flow.xml
index 7853ac90a..0e40e5f47 100644
--- a/idp-conf/src/main/resources/system/flows/saml/soap-security-flow.xml
+++ b/idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/soap-security-flow.xml
@@ -19,6 +19,4 @@
         <transition on="proceed" to="proceed" />
     </action-state>
 
-    <bean-import resource="security-beans.xml" />
-
 </flow>

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

More information about the commits mailing list