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

Scott Cantor cantor.2 at osu.edu
Tue Jul 21 20:35:50 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=44539131fde05d0600e7e3197c354ffc8e326c5d

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

commit 44539131fde05d0600e7e3197c354ffc8e326c5d
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Tue Jul 21 16:36:28 2020 -0400

    IDP-1642 - Migrate configuration into jars where feasible
    
    https://issues.shibboleth.net/jira/browse/IDP-1642
    
    Migrate authn flows.
---
 idp-authn-impl/pom.xml                             | 30 ++++++++++----------
 .../idp/authn/flows}/authn-abstract-flow.xml       |  0
 .../shibboleth/idp/authn/flows}/authn-beans.xml    |  0
 .../net/shibboleth/idp/authn/flows}/authn-flow.xml |  0
 .../idp/authn/flows}/discovery-beans.xml           |  2 +-
 .../shibboleth/idp/authn/flows}/discovery-flow.xml |  0
 .../idp/authn/flows}/duo-authn-beans.xml           |  2 +-
 .../shibboleth/idp/authn/flows}/duo-authn-flow.xml |  0
 .../idp/authn/flows}/external-authn-beans.xml      |  2 +-
 .../idp/authn/flows}/external-authn-flow.xml       |  0
 .../idp/authn/flows}/function-authn-beans.xml      |  2 +-
 .../idp/authn/flows}/function-authn-flow.xml       |  0
 .../idp/authn/flows}/ipaddress-authn-beans.xml     |  2 +-
 .../idp/authn/flows}/ipaddress-authn-flow.xml      |  0
 .../idp/authn/flows}/mfa-authn-beans.xml           |  2 +-
 .../shibboleth/idp/authn/flows}/mfa-authn-flow.xml |  0
 .../idp/authn/flows}/password-authn-beans.xml      |  4 +--
 .../idp/authn/flows}/password-authn-flow.xml       |  0
 .../idp/authn/flows}/remoteuser-authn-beans.xml    |  2 +-
 .../idp/authn/flows}/remoteuser-authn-flow.xml     |  0
 .../flows}/remoteuser-internal-authn-beans.xml     |  2 +-
 .../flows}/remoteuser-internal-authn-flow.xml      |  0
 .../idp/authn/flows}/spnego-authn-beans.xml        |  2 +-
 .../idp/authn/flows}/spnego-authn-flow.xml         |  0
 .../idp/authn/flows}/x509-authn-beans.xml          |  2 +-
 .../idp/authn/flows}/x509-authn-flow.xml           |  0
 .../idp/authn/flows}/x509-internal-authn-beans.xml |  2 +-
 .../idp/authn/flows}/x509-internal-authn-flow.xml  |  0
 .../main/resources/system/conf/webflow-config.xml  | 32 +++++++++++-----------
 .../idp/saml}/flows/authn/saml-authn-beans.xml     |  2 +-
 .../idp/saml}/flows/authn/saml-authn-flow.xml      |  0
 31 files changed, 44 insertions(+), 46 deletions(-)

diff --git a/idp-authn-impl/pom.xml b/idp-authn-impl/pom.xml
index f78ccb82d..92e6218f9 100644
--- a/idp-authn-impl/pom.xml
+++ b/idp-authn-impl/pom.xml
@@ -97,10 +97,10 @@
             <artifactId>java-support</artifactId>
         </dependency>
 
-	<dependency>
-	    <groupId>commons-codec</groupId>
-	    <artifactId>commons-codec</artifactId>
-	</dependency>
+        <dependency>
+            <groupId>commons-codec</groupId>
+            <artifactId>commons-codec</artifactId>
+        </dependency>
 
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
@@ -115,9 +115,9 @@
             <artifactId>jackson-databind</artifactId>
         </dependency>
 
-	<dependency>
-          <groupId>com.github.jasminb</groupId>
-          <artifactId>jsonapi-converter</artifactId>
+        <dependency>
+            <groupId>com.github.jasminb</groupId>
+            <artifactId>jsonapi-converter</artifactId>
         </dependency>
 
         <dependency>
@@ -174,12 +174,12 @@
             <version>${duoweb.version}</version>
         </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>
@@ -283,17 +283,17 @@
             <scope>test</scope>
         </dependency>
         
-	<dependency>
+        <dependency>
             <groupId>${spring.groupId}</groupId>
             <artifactId>spring-test</artifactId>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-	    <groupId>net.shibboleth.utilities</groupId>
-	    <artifactId>java-support</artifactId>
-	    <type>test-jar</type>
-	    <scope>test</scope>
+            <groupId>net.shibboleth.utilities</groupId>
+            <artifactId>java-support</artifactId>
+            <type>test-jar</type>
+            <scope>test</scope>
         </dependency>
 
     </dependencies>
diff --git a/idp-conf/src/main/resources/system/flows/authn/authn-abstract-flow.xml b/idp-authn-impl/src/main/resources/net/shibboleth/idp/authn/flows/authn-abstract-flow.xml
similarity index 100%
rename from idp-conf/src/main/resources/system/flows/authn/authn-abstract-flow.xml
rename to idp-authn-impl/src/main/resources/net/shibboleth/idp/authn/flows/authn-abstract-flow.xml
diff --git a/idp-conf/src/main/resources/system/flows/authn/authn-beans.xml b/idp-authn-impl/src/main/resources/net/shibboleth/idp/authn/flows/authn-beans.xml
similarity index 100%
rename from idp-conf/src/main/resources/system/flows/authn/authn-beans.xml
rename to idp-authn-impl/src/main/resources/net/shibboleth/idp/authn/flows/authn-beans.xml
diff --git a/idp-conf/src/main/resources/system/flows/authn/authn-flow.xml b/idp-authn-impl/src/main/resources/net/shibboleth/idp/authn/flows/authn-flow.xml
similarity index 100%
rename from idp-conf/src/main/resources/system/flows/authn/authn-flow.xml
rename to idp-authn-impl/src/main/resources/net/shibboleth/idp/authn/flows/authn-flow.xml
diff --git a/idp-conf/src/main/resources/system/flows/authn/discovery-beans.xml b/idp-authn-impl/src/main/resources/net/shibboleth/idp/authn/flows/discovery-beans.xml
similarity index 96%
rename from idp-conf/src/main/resources/system/flows/authn/discovery-beans.xml
rename to idp-authn-impl/src/main/resources/net/shibboleth/idp/authn/flows/discovery-beans.xml
index 27fa15f04..a137e684d 100644
--- a/idp-conf/src/main/resources/system/flows/authn/discovery-beans.xml
+++ b/idp-authn-impl/src/main/resources/net/shibboleth/idp/authn/flows/discovery-beans.xml
@@ -22,7 +22,7 @@
     <bean id="shibboleth.authn.discoveryURLStrategy" parent="shibboleth.Functions.Constant" lazy-init="true"
         c:target-ref="shibboleth.authn.discoveryURL" />
 
-    <import resource="../../../conf/authn/discovery-config.xml" />
+    <import resource="%{idp.home}/conf/authn/discovery-config.xml" />
 
     <bean id="DiscoveryProfileRequestFunction" lazy-init="true"
         class="net.shibboleth.idp.authn.proxy.impl.DiscoveryProfileRequestFunction"
diff --git a/idp-conf/src/main/resources/system/flows/authn/discovery-flow.xml b/idp-authn-impl/src/main/resources/net/shibboleth/idp/authn/flows/discovery-flow.xml
similarity index 100%
rename from idp-conf/src/main/resources/system/flows/authn/discovery-flow.xml
rename to idp-authn-impl/src/main/resources/net/shibboleth/idp/authn/flows/discovery-flow.xml
diff --git a/idp-conf/src/main/resources/system/flows/authn/duo-authn-beans.xml b/idp-authn-impl/src/main/resources/net/shibboleth/idp/authn/flows/duo-authn-beans.xml
similarity index 98%
rename from idp-conf/src/main/resources/system/flows/authn/duo-authn-beans.xml
rename to idp-authn-impl/src/main/resources/net/shibboleth/idp/authn/flows/duo-authn-beans.xml
index c36d97a4f..f4973c13d 100644
--- a/idp-conf/src/main/resources/system/flows/authn/duo-authn-beans.xml
+++ b/idp-authn-impl/src/main/resources/net/shibboleth/idp/authn/flows/duo-authn-beans.xml
@@ -38,7 +38,7 @@
         class="net.shibboleth.idp.session.context.navigate.CanonicalUsernameLookupStrategy" />
 
     <!-- Can override one or more of the beans above. -->
-    <import resource="../../../conf/authn/duo-authn-config.xml" />
+    <import resource="%{idp.home}/conf/authn/duo-authn-config.xml" />
 
     <alias name="shibboleth.authn.Duo.UsernameLookupStrategy" alias="CanonicalUsernameStrategy" />
 
diff --git a/idp-conf/src/main/resources/system/flows/authn/duo-authn-flow.xml b/idp-authn-impl/src/main/resources/net/shibboleth/idp/authn/flows/duo-authn-flow.xml
similarity index 100%
rename from idp-conf/src/main/resources/system/flows/authn/duo-authn-flow.xml
rename to idp-authn-impl/src/main/resources/net/shibboleth/idp/authn/flows/duo-authn-flow.xml
diff --git a/idp-conf/src/main/resources/system/flows/authn/external-authn-beans.xml b/idp-authn-impl/src/main/resources/net/shibboleth/idp/authn/flows/external-authn-beans.xml
similarity index 96%
rename from idp-conf/src/main/resources/system/flows/authn/external-authn-beans.xml
rename to idp-authn-impl/src/main/resources/net/shibboleth/idp/authn/flows/external-authn-beans.xml
index 8d0a17ab2..ca3ae91cc 100644
--- a/idp-conf/src/main/resources/system/flows/authn/external-authn-beans.xml
+++ b/idp-authn-impl/src/main/resources/net/shibboleth/idp/authn/flows/external-authn-beans.xml
@@ -22,7 +22,7 @@
     <bean id="shibboleth.authn.External.externalAuthnPathStrategy" parent="shibboleth.Functions.Constant"
         c:target-ref="shibboleth.authn.External.externalAuthnPath" />
 
-    <import resource="../../../conf/authn/external-authn-config.xml" />
+    <import resource="%{idp.home}/conf/authn/external-authn-config.xml" />
 
     <bean id="ValidateExternalAuthentication"
         class="net.shibboleth.idp.authn.impl.ValidateExternalAuthentication" scope="prototype"
diff --git a/idp-conf/src/main/resources/system/flows/authn/external-authn-flow.xml b/idp-authn-impl/src/main/resources/net/shibboleth/idp/authn/flows/external-authn-flow.xml
similarity index 100%
rename from idp-conf/src/main/resources/system/flows/authn/external-authn-flow.xml
rename to idp-authn-impl/src/main/resources/net/shibboleth/idp/authn/flows/external-authn-flow.xml
diff --git a/idp-conf/src/main/resources/system/flows/authn/function-authn-beans.xml b/idp-authn-impl/src/main/resources/net/shibboleth/idp/authn/flows/function-authn-beans.xml
similarity index 96%
rename from idp-conf/src/main/resources/system/flows/authn/function-authn-beans.xml
rename to idp-authn-impl/src/main/resources/net/shibboleth/idp/authn/flows/function-authn-beans.xml
index 7b2cc6189..6f5c00821 100644
--- a/idp-conf/src/main/resources/system/flows/authn/function-authn-beans.xml
+++ b/idp-authn-impl/src/main/resources/net/shibboleth/idp/authn/flows/function-authn-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/authn/function-authn-config.xml" />
+    <import resource="%{idp.home}/conf/authn/function-authn-config.xml" />
             
     <bean id="ValidateFunctionResult" class="net.shibboleth.idp.authn.impl.ValidateFunctionResult" scope="prototype"
         p:addDefaultPrincipals="#{getObject('shibboleth.authn.Function.addDefaultPrincipals') ?: true}"
diff --git a/idp-conf/src/main/resources/system/flows/authn/function-authn-flow.xml b/idp-authn-impl/src/main/resources/net/shibboleth/idp/authn/flows/function-authn-flow.xml
similarity index 100%
rename from idp-conf/src/main/resources/system/flows/authn/function-authn-flow.xml
rename to idp-authn-impl/src/main/resources/net/shibboleth/idp/authn/flows/function-authn-flow.xml
diff --git a/idp-conf/src/main/resources/system/flows/authn/ipaddress-authn-beans.xml b/idp-authn-impl/src/main/resources/net/shibboleth/idp/authn/flows/ipaddress-authn-beans.xml
similarity index 96%
rename from idp-conf/src/main/resources/system/flows/authn/ipaddress-authn-beans.xml
rename to idp-authn-impl/src/main/resources/net/shibboleth/idp/authn/flows/ipaddress-authn-beans.xml
index 908a47a05..6ccb669f7 100644
--- a/idp-conf/src/main/resources/system/flows/authn/ipaddress-authn-beans.xml
+++ b/idp-authn-impl/src/main/resources/net/shibboleth/idp/authn/flows/ipaddress-authn-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/authn/ipaddress-authn-config.xml" />
+    <import resource="%{idp.home}/conf/authn/ipaddress-authn-config.xml" />
     
     <bean id="ExtractUserAgentAddress" class="net.shibboleth.idp.authn.impl.ExtractUserAgentAddress" scope="prototype"
         p:httpServletRequest-ref="shibboleth.HttpServletRequest"
diff --git a/idp-conf/src/main/resources/system/flows/authn/ipaddress-authn-flow.xml b/idp-authn-impl/src/main/resources/net/shibboleth/idp/authn/flows/ipaddress-authn-flow.xml
similarity index 100%
rename from idp-conf/src/main/resources/system/flows/authn/ipaddress-authn-flow.xml
rename to idp-authn-impl/src/main/resources/net/shibboleth/idp/authn/flows/ipaddress-authn-flow.xml
diff --git a/idp-conf/src/main/resources/system/flows/authn/mfa-authn-beans.xml b/idp-authn-impl/src/main/resources/net/shibboleth/idp/authn/flows/mfa-authn-beans.xml
similarity index 97%
rename from idp-conf/src/main/resources/system/flows/authn/mfa-authn-beans.xml
rename to idp-authn-impl/src/main/resources/net/shibboleth/idp/authn/flows/mfa-authn-beans.xml
index e31322e6b..09f033831 100644
--- a/idp-conf/src/main/resources/system/flows/authn/mfa-authn-beans.xml
+++ b/idp-authn-impl/src/main/resources/net/shibboleth/idp/authn/flows/mfa-authn-beans.xml
@@ -24,7 +24,7 @@
     <bean id="shibboleth.authn.MFA.TransitionMapStrategy" parent="shibboleth.Functions.Constant"
         c:target-ref="shibboleth.authn.MFA.TransitionMap" />
 
-    <import resource="../../../conf/authn/mfa-authn-config.xml" />
+    <import resource="%{idp.home}/conf/authn/mfa-authn-config.xml" />
 
     <bean id="PopulateMultiFactorAuthenticationContext" scope="prototype"
         class="net.shibboleth.idp.authn.impl.PopulateMultiFactorAuthenticationContext"
diff --git a/idp-conf/src/main/resources/system/flows/authn/mfa-authn-flow.xml b/idp-authn-impl/src/main/resources/net/shibboleth/idp/authn/flows/mfa-authn-flow.xml
similarity index 100%
rename from idp-conf/src/main/resources/system/flows/authn/mfa-authn-flow.xml
rename to idp-authn-impl/src/main/resources/net/shibboleth/idp/authn/flows/mfa-authn-flow.xml
diff --git a/idp-conf/src/main/resources/system/flows/authn/password-authn-beans.xml b/idp-authn-impl/src/main/resources/net/shibboleth/idp/authn/flows/password-authn-beans.xml
similarity index 99%
rename from idp-conf/src/main/resources/system/flows/authn/password-authn-beans.xml
rename to idp-authn-impl/src/main/resources/net/shibboleth/idp/authn/flows/password-authn-beans.xml
index a6a3cc5dc..0c8ca9b49 100644
--- a/idp-conf/src/main/resources/system/flows/authn/password-authn-beans.xml
+++ b/idp-authn-impl/src/main/resources/net/shibboleth/idp/authn/flows/password-authn-beans.xml
@@ -18,9 +18,7 @@
     <bean class="net.shibboleth.ext.spring.config.IdentifiableBeanPostProcessor" />
     <bean class="net.shibboleth.idp.profile.impl.ProfileActionBeanPostProcessor" />
 
-
-
-    <import resource="../../../conf/authn/password-authn-config.xml" />
+    <import resource="%{idp.home}/conf/authn/password-authn-config.xml" />
 
     <bean id="ExtractUsernamePasswordFromBasicAuth"
         class="net.shibboleth.idp.authn.impl.ExtractUsernamePasswordFromBasicAuth" scope="prototype"
diff --git a/idp-conf/src/main/resources/system/flows/authn/password-authn-flow.xml b/idp-authn-impl/src/main/resources/net/shibboleth/idp/authn/flows/password-authn-flow.xml
similarity index 100%
rename from idp-conf/src/main/resources/system/flows/authn/password-authn-flow.xml
rename to idp-authn-impl/src/main/resources/net/shibboleth/idp/authn/flows/password-authn-flow.xml
diff --git a/idp-conf/src/main/resources/system/flows/authn/remoteuser-authn-beans.xml b/idp-authn-impl/src/main/resources/net/shibboleth/idp/authn/flows/remoteuser-authn-beans.xml
similarity index 96%
rename from idp-conf/src/main/resources/system/flows/authn/remoteuser-authn-beans.xml
rename to idp-authn-impl/src/main/resources/net/shibboleth/idp/authn/flows/remoteuser-authn-beans.xml
index 89a7a2bb7..259bd71d1 100644
--- a/idp-conf/src/main/resources/system/flows/authn/remoteuser-authn-beans.xml
+++ b/idp-authn-impl/src/main/resources/net/shibboleth/idp/authn/flows/remoteuser-authn-beans.xml
@@ -22,7 +22,7 @@
     <bean id="shibboleth.authn.RemoteUser.externalAuthnPathStrategy" parent="shibboleth.Functions.Constant"
         c:target-ref="shibboleth.authn.RemoteUser.externalAuthnPath" />
     
-    <import resource="../../../conf/authn/remoteuser-authn-config.xml" />
+    <import resource="%{idp.home}/conf/authn/remoteuser-authn-config.xml" />
 
     <bean id="ValidateExternalAuthentication"
         class="net.shibboleth.idp.authn.impl.ValidateExternalAuthentication" scope="prototype"
diff --git a/idp-conf/src/main/resources/system/flows/authn/remoteuser-authn-flow.xml b/idp-authn-impl/src/main/resources/net/shibboleth/idp/authn/flows/remoteuser-authn-flow.xml
similarity index 100%
rename from idp-conf/src/main/resources/system/flows/authn/remoteuser-authn-flow.xml
rename to idp-authn-impl/src/main/resources/net/shibboleth/idp/authn/flows/remoteuser-authn-flow.xml
diff --git a/idp-conf/src/main/resources/system/flows/authn/remoteuser-internal-authn-beans.xml b/idp-authn-impl/src/main/resources/net/shibboleth/idp/authn/flows/remoteuser-internal-authn-beans.xml
similarity index 97%
rename from idp-conf/src/main/resources/system/flows/authn/remoteuser-internal-authn-beans.xml
rename to idp-authn-impl/src/main/resources/net/shibboleth/idp/authn/flows/remoteuser-internal-authn-beans.xml
index 42cad4a76..8f8a72c4d 100644
--- a/idp-conf/src/main/resources/system/flows/authn/remoteuser-internal-authn-beans.xml
+++ b/idp-authn-impl/src/main/resources/net/shibboleth/idp/authn/flows/remoteuser-internal-authn-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/authn/remoteuser-internal-authn-config.xml" />
+    <import resource="%{idp.home}/conf/authn/remoteuser-internal-authn-config.xml" />
 
     <bean class="net.shibboleth.ext.spring.util.DeprecatedBeanDetector" c:_1="remoteuser-internal-authn-config.xml">
         <constructor-arg index="0">
diff --git a/idp-conf/src/main/resources/system/flows/authn/remoteuser-internal-authn-flow.xml b/idp-authn-impl/src/main/resources/net/shibboleth/idp/authn/flows/remoteuser-internal-authn-flow.xml
similarity index 100%
rename from idp-conf/src/main/resources/system/flows/authn/remoteuser-internal-authn-flow.xml
rename to idp-authn-impl/src/main/resources/net/shibboleth/idp/authn/flows/remoteuser-internal-authn-flow.xml
diff --git a/idp-conf/src/main/resources/system/flows/authn/spnego-authn-beans.xml b/idp-authn-impl/src/main/resources/net/shibboleth/idp/authn/flows/spnego-authn-beans.xml
similarity index 97%
rename from idp-conf/src/main/resources/system/flows/authn/spnego-authn-beans.xml
rename to idp-authn-impl/src/main/resources/net/shibboleth/idp/authn/flows/spnego-authn-beans.xml
index d742d99dc..80e3b3a39 100644
--- a/idp-conf/src/main/resources/system/flows/authn/spnego-authn-beans.xml
+++ b/idp-authn-impl/src/main/resources/net/shibboleth/idp/authn/flows/spnego-authn-beans.xml
@@ -28,7 +28,7 @@
     <bean id="shibboleth.authn.SPNEGO.externalAuthnPathStrategy" parent="shibboleth.Functions.Constant"
         c:target-ref="shibboleth.authn.SPNEGO.externalAuthnPath" />
 
-    <import resource="../../../conf/authn/spnego-authn-config.xml" />
+    <import resource="%{idp.home}/conf/authn/spnego-authn-config.xml" />
 
     <!-- Make configurable values available in flow. -->
     
diff --git a/idp-conf/src/main/resources/system/flows/authn/spnego-authn-flow.xml b/idp-authn-impl/src/main/resources/net/shibboleth/idp/authn/flows/spnego-authn-flow.xml
similarity index 100%
rename from idp-conf/src/main/resources/system/flows/authn/spnego-authn-flow.xml
rename to idp-authn-impl/src/main/resources/net/shibboleth/idp/authn/flows/spnego-authn-flow.xml
diff --git a/idp-conf/src/main/resources/system/flows/authn/x509-authn-beans.xml b/idp-authn-impl/src/main/resources/net/shibboleth/idp/authn/flows/x509-authn-beans.xml
similarity index 96%
rename from idp-conf/src/main/resources/system/flows/authn/x509-authn-beans.xml
rename to idp-authn-impl/src/main/resources/net/shibboleth/idp/authn/flows/x509-authn-beans.xml
index 5995612df..690243ab7 100644
--- a/idp-conf/src/main/resources/system/flows/authn/x509-authn-beans.xml
+++ b/idp-authn-impl/src/main/resources/net/shibboleth/idp/authn/flows/x509-authn-beans.xml
@@ -22,7 +22,7 @@
     <bean id="shibboleth.authn.X509.externalAuthnPathStrategy" parent="shibboleth.Functions.Constant"
         c:target-ref="shibboleth.authn.X509.externalAuthnPath" />
 
-    <import resource="../../../conf/authn/x509-authn-config.xml" />
+    <import resource="%{idp.home}/conf/authn/x509-authn-config.xml" />
 
     <bean id="ValidateExternalAuthentication"
         class="net.shibboleth.idp.authn.impl.ValidateExternalAuthentication" scope="prototype"
diff --git a/idp-conf/src/main/resources/system/flows/authn/x509-authn-flow.xml b/idp-authn-impl/src/main/resources/net/shibboleth/idp/authn/flows/x509-authn-flow.xml
similarity index 100%
rename from idp-conf/src/main/resources/system/flows/authn/x509-authn-flow.xml
rename to idp-authn-impl/src/main/resources/net/shibboleth/idp/authn/flows/x509-authn-flow.xml
diff --git a/idp-conf/src/main/resources/system/flows/authn/x509-internal-authn-beans.xml b/idp-authn-impl/src/main/resources/net/shibboleth/idp/authn/flows/x509-internal-authn-beans.xml
similarity index 96%
rename from idp-conf/src/main/resources/system/flows/authn/x509-internal-authn-beans.xml
rename to idp-authn-impl/src/main/resources/net/shibboleth/idp/authn/flows/x509-internal-authn-beans.xml
index 3d1578768..981ea2d88 100644
--- a/idp-conf/src/main/resources/system/flows/authn/x509-internal-authn-beans.xml
+++ b/idp-authn-impl/src/main/resources/net/shibboleth/idp/authn/flows/x509-internal-authn-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/authn/x509-internal-authn-config.xml" />
+    <import resource="%{idp.home}/conf/authn/x509-internal-authn-config.xml" />
     
     <bean id="ExtractX509CertificateFromRequest"
         class="net.shibboleth.idp.authn.impl.ExtractX509CertificateFromRequest" scope="prototype"
diff --git a/idp-conf/src/main/resources/system/flows/authn/x509-internal-authn-flow.xml b/idp-authn-impl/src/main/resources/net/shibboleth/idp/authn/flows/x509-internal-authn-flow.xml
similarity index 100%
rename from idp-conf/src/main/resources/system/flows/authn/x509-internal-authn-flow.xml
rename to idp-authn-impl/src/main/resources/net/shibboleth/idp/authn/flows/x509-internal-authn-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 6b7ee747f..4a058eacd 100644
--- a/idp-conf/src/main/resources/system/conf/webflow-config.xml
+++ b/idp-conf/src/main/resources/system/conf/webflow-config.xml
@@ -71,26 +71,26 @@
                 <entry key="IDWSF/SSOS" value="../system/flows/saml/saml2/idwsf-ssos-flow.xml" />
         
                 <!-- Main flow for authentication. -->
-                <entry key="authn.events" value="../conf/authn/authn-events-flow.xml" />
-                <entry key="authn.abstract" value="../system/flows/authn/authn-abstract-flow.xml" />
-                <entry key="authn" value="../system/flows/authn/authn-flow.xml" />
+                <entry key="authn.events" value="%{idp.home}/conf/authn/authn-events-flow.xml" />
+                <entry key="authn.abstract" value="classpath:/net/shibboleth/idp/authn/flows/authn-abstract-flow.xml" />
+                <entry key="authn" value="classpath:/net/shibboleth/idp/authn/flows/authn-flow.xml" />
         
                 <!-- Login methods. -->
-                <entry key="authn/IPAddress" value="../system/flows/authn/ipaddress-authn-flow.xml" />
-                <entry key="authn/RemoteUserInternal" value="../system/flows/authn/remoteuser-internal-authn-flow.xml" />
-                <entry key="authn/Password" value="../system/flows/authn/password-authn-flow.xml" />
-                <entry key="authn/RemoteUser" value="../system/flows/authn/remoteuser-authn-flow.xml" />
-                <entry key="authn/X509" value="../system/flows/authn/x509-authn-flow.xml" />
-                <entry key="authn/X509Internal" value="../system/flows/authn/x509-internal-authn-flow.xml" />
-                <entry key="authn/SPNEGO" value="../system/flows/authn/spnego-authn-flow.xml" />
-                <entry key="authn/External" value="../system/flows/authn/external-authn-flow.xml" />
-                <entry key="authn/Duo" value="../system/flows/authn/duo-authn-flow.xml" />
-                <entry key="authn/MFA" value="../system/flows/authn/mfa-authn-flow.xml" />
-                <entry key="authn/Function" value="../system/flows/authn/function-authn-flow.xml" />
-                <entry key="authn/SAML" value="../system/flows/authn/saml-authn-flow.xml" />
+                <entry key="authn/IPAddress" value="classpath:/net/shibboleth/idp/authn/flows/ipaddress-authn-flow.xml" />
+                <entry key="authn/RemoteUserInternal" value="classpath:/net/shibboleth/idp/authn/flows/remoteuser-internal-authn-flow.xml" />
+                <entry key="authn/Password" value="classpath:/net/shibboleth/idp/authn/flows/password-authn-flow.xml" />
+                <entry key="authn/RemoteUser" value="classpath:/net/shibboleth/idp/authn/flows/remoteuser-authn-flow.xml" />
+                <entry key="authn/X509" value="classpath:/net/shibboleth/idp/authn/flows/x509-authn-flow.xml" />
+                <entry key="authn/X509Internal" value="classpath:/net/shibboleth/idp/authn/flows/x509-internal-authn-flow.xml" />
+                <entry key="authn/SPNEGO" value="classpath:/net/shibboleth/idp/authn/flows/spnego-authn-flow.xml" />
+                <entry key="authn/External" value="classpath:/net/shibboleth/idp/authn/flows/external-authn-flow.xml" />
+                <entry key="authn/Duo" value="classpath:/net/shibboleth/idp/authn/flows/duo-authn-flow.xml" />
+                <entry key="authn/MFA" value="classpath:/net/shibboleth/idp/authn/flows/mfa-authn-flow.xml" />
+                <entry key="authn/Function" value="classpath:/net/shibboleth/idp/authn/flows/function-authn-flow.xml" />
+                <entry key="authn/SAML" value="classpath:/net/shibboleth/idp/saml/flows/authn/saml-authn-flow.xml" />
           
                 <!-- One-off flow for discovery. -->
-                <entry key="authn/Discovery" value="../system/flows/authn/discovery-flow.xml" />
+                <entry key="authn/Discovery" value="classpath:/net/shibboleth/idp/authn/flows/discovery-flow.xml" />
           
                 <!-- Main flow for subject c14n. -->
                 <entry key="c14n.events" value="../conf/c14n/subject-c14n-events-flow.xml" />
diff --git a/idp-conf/src/main/resources/system/flows/authn/saml-authn-beans.xml b/idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/authn/saml-authn-beans.xml
similarity index 99%
rename from idp-conf/src/main/resources/system/flows/authn/saml-authn-beans.xml
rename to idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/authn/saml-authn-beans.xml
index 4fe516002..921564b91 100644
--- a/idp-conf/src/main/resources/system/flows/authn/saml-authn-beans.xml
+++ b/idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/authn/saml-authn-beans.xml
@@ -24,7 +24,7 @@
     <bean id="shibboleth.authn.SAML.externalAuthnPathStrategy" parent="shibboleth.Functions.Constant"
         c:target-ref="shibboleth.authn.SAML.externalAuthnPath" />
 
-    <import resource="../../../conf/authn/saml-authn-config.xml" />
+    <import resource="%{idp.home}/conf/authn/saml-authn-config.xml" />
     
     <!-- Parent beans for indirecting into nested PRC. -->
     
diff --git a/idp-conf/src/main/resources/system/flows/authn/saml-authn-flow.xml b/idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/authn/saml-authn-flow.xml
similarity index 100%
rename from idp-conf/src/main/resources/system/flows/authn/saml-authn-flow.xml
rename to idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/authn/saml-authn-flow.xml

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

More information about the commits mailing list