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

Scott Cantor cantor.2 at osu.edu
Tue Jul 21 22:17:53 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=2fba79e7ed03acd1a7c69d63eb972c523797ed6b

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

commit 2fba79e7ed03acd1a7c69d63eb972c523797ed6b
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Tue Jul 21 18:18:32 2020 -0400

    IDP-1642 - Migrate configuration into jars where feasible
    
    https://issues.shibboleth.net/jira/browse/IDP-1642
    
    Migrate c14n flows.
---
 .../attribute-sourced-subject-c14n-beans.xml       |  2 +-
 .../flows}/attribute-sourced-subject-c14n-flow.xml |  0
 .../idp/c14n/flows}/simple-subject-c14n-beans.xml  |  2 +-
 .../idp/c14n/flows}/simple-subject-c14n-flow.xml   |  0
 .../idp/c14n/flows}/subject-c14n-abstract-flow.xml |  0
 .../idp/c14n/flows}/subject-c14n-beans.xml         |  0
 .../idp/c14n/flows}/subject-c14n-flow.xml          |  0
 .../idp/c14n/flows}/x500-subject-c14n-beans.xml    |  2 +-
 .../idp/c14n/flows}/x500-subject-c14n-flow.xml     |  0
 .../main/resources/system/conf/webflow-config.xml  | 30 +++++++++++-----------
 .../flows/c14n/subject-c14n-saml-default-beans.xml |  0
 .../flows/c14n/subject-c14n-saml-default-flow.xml  |  0
 12 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/idp-conf/src/main/resources/system/flows/c14n/attribute-sourced-subject-c14n-beans.xml b/idp-authn-impl/src/main/resources/net/shibboleth/idp/c14n/flows/attribute-sourced-subject-c14n-beans.xml
similarity index 96%
rename from idp-conf/src/main/resources/system/flows/c14n/attribute-sourced-subject-c14n-beans.xml
rename to idp-authn-impl/src/main/resources/net/shibboleth/idp/c14n/flows/attribute-sourced-subject-c14n-beans.xml
index 7576996bd..f66f465ef 100644
--- a/idp-conf/src/main/resources/system/flows/c14n/attribute-sourced-subject-c14n-beans.xml
+++ b/idp-authn-impl/src/main/resources/net/shibboleth/idp/c14n/flows/attribute-sourced-subject-c14n-beans.xml
@@ -15,7 +15,7 @@
     <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"
         p:placeholderPrefix="%{" p:placeholderSuffix="}" />
 
-    <import resource="../../../conf/c14n/attribute-sourced-subject-c14n-config.xml" />
+    <import resource="%{idp.home}/conf/c14n/attribute-sourced-subject-c14n-config.xml" />
 
     <bean class="net.shibboleth.ext.spring.config.IdentifiableBeanPostProcessor" />
     <bean class="net.shibboleth.idp.profile.impl.ProfileActionBeanPostProcessor" />
diff --git a/idp-conf/src/main/resources/system/flows/c14n/attribute-sourced-subject-c14n-flow.xml b/idp-authn-impl/src/main/resources/net/shibboleth/idp/c14n/flows/attribute-sourced-subject-c14n-flow.xml
similarity index 100%
rename from idp-conf/src/main/resources/system/flows/c14n/attribute-sourced-subject-c14n-flow.xml
rename to idp-authn-impl/src/main/resources/net/shibboleth/idp/c14n/flows/attribute-sourced-subject-c14n-flow.xml
diff --git a/idp-conf/src/main/resources/system/flows/c14n/simple-subject-c14n-beans.xml b/idp-authn-impl/src/main/resources/net/shibboleth/idp/c14n/flows/simple-subject-c14n-beans.xml
similarity index 94%
rename from idp-conf/src/main/resources/system/flows/c14n/simple-subject-c14n-beans.xml
rename to idp-authn-impl/src/main/resources/net/shibboleth/idp/c14n/flows/simple-subject-c14n-beans.xml
index d007ca00b..336049011 100644
--- a/idp-conf/src/main/resources/system/flows/c14n/simple-subject-c14n-beans.xml
+++ b/idp-authn-impl/src/main/resources/net/shibboleth/idp/c14n/flows/simple-subject-c14n-beans.xml
@@ -12,7 +12,7 @@
        default-init-method="initialize"
        default-destroy-method="destroy">
 
-    <import resource="../../../conf/c14n/simple-subject-c14n-config.xml" />
+    <import resource="%{idp.home}/conf/c14n/simple-subject-c14n-config.xml" />
 
     <bean class="net.shibboleth.ext.spring.config.IdentifiableBeanPostProcessor" />
     <bean class="net.shibboleth.idp.profile.impl.ProfileActionBeanPostProcessor" />
diff --git a/idp-conf/src/main/resources/system/flows/c14n/simple-subject-c14n-flow.xml b/idp-authn-impl/src/main/resources/net/shibboleth/idp/c14n/flows/simple-subject-c14n-flow.xml
similarity index 100%
rename from idp-conf/src/main/resources/system/flows/c14n/simple-subject-c14n-flow.xml
rename to idp-authn-impl/src/main/resources/net/shibboleth/idp/c14n/flows/simple-subject-c14n-flow.xml
diff --git a/idp-conf/src/main/resources/system/flows/c14n/subject-c14n-abstract-flow.xml b/idp-authn-impl/src/main/resources/net/shibboleth/idp/c14n/flows/subject-c14n-abstract-flow.xml
similarity index 100%
rename from idp-conf/src/main/resources/system/flows/c14n/subject-c14n-abstract-flow.xml
rename to idp-authn-impl/src/main/resources/net/shibboleth/idp/c14n/flows/subject-c14n-abstract-flow.xml
diff --git a/idp-conf/src/main/resources/system/flows/c14n/subject-c14n-beans.xml b/idp-authn-impl/src/main/resources/net/shibboleth/idp/c14n/flows/subject-c14n-beans.xml
similarity index 100%
rename from idp-conf/src/main/resources/system/flows/c14n/subject-c14n-beans.xml
rename to idp-authn-impl/src/main/resources/net/shibboleth/idp/c14n/flows/subject-c14n-beans.xml
diff --git a/idp-conf/src/main/resources/system/flows/c14n/subject-c14n-flow.xml b/idp-authn-impl/src/main/resources/net/shibboleth/idp/c14n/flows/subject-c14n-flow.xml
similarity index 100%
rename from idp-conf/src/main/resources/system/flows/c14n/subject-c14n-flow.xml
rename to idp-authn-impl/src/main/resources/net/shibboleth/idp/c14n/flows/subject-c14n-flow.xml
diff --git a/idp-conf/src/main/resources/system/flows/c14n/x500-subject-c14n-beans.xml b/idp-authn-impl/src/main/resources/net/shibboleth/idp/c14n/flows/x500-subject-c14n-beans.xml
similarity index 95%
rename from idp-conf/src/main/resources/system/flows/c14n/x500-subject-c14n-beans.xml
rename to idp-authn-impl/src/main/resources/net/shibboleth/idp/c14n/flows/x500-subject-c14n-beans.xml
index a60a90138..b9f819e8a 100644
--- a/idp-conf/src/main/resources/system/flows/c14n/x500-subject-c14n-beans.xml
+++ b/idp-authn-impl/src/main/resources/net/shibboleth/idp/c14n/flows/x500-subject-c14n-beans.xml
@@ -12,7 +12,7 @@
        default-init-method="initialize"
        default-destroy-method="destroy">
 
-    <import resource="../../../conf/c14n/x500-subject-c14n-config.xml" />
+    <import resource="%{idp.home}/conf/c14n/x500-subject-c14n-config.xml" />
 
     <bean class="net.shibboleth.ext.spring.config.IdentifiableBeanPostProcessor" />
     <bean class="net.shibboleth.idp.profile.impl.ProfileActionBeanPostProcessor" />
diff --git a/idp-conf/src/main/resources/system/flows/c14n/x500-subject-c14n-flow.xml b/idp-authn-impl/src/main/resources/net/shibboleth/idp/c14n/flows/x500-subject-c14n-flow.xml
similarity index 100%
rename from idp-conf/src/main/resources/system/flows/c14n/x500-subject-c14n-flow.xml
rename to idp-authn-impl/src/main/resources/net/shibboleth/idp/c14n/flows/x500-subject-c14n-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 4a058eacd..3eb075526 100644
--- a/idp-conf/src/main/resources/system/conf/webflow-config.xml
+++ b/idp-conf/src/main/resources/system/conf/webflow-config.xml
@@ -93,29 +93,29 @@
                 <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" />
-                <entry key="c14n.abstract" value="../system/flows/c14n/subject-c14n-abstract-flow.xml" />
-                <entry key="c14n" value="../system/flows/c14n/subject-c14n-flow.xml" />
+                <entry key="c14n.events" value="%{idp.home}/conf/c14n/subject-c14n-events-flow.xml" />
+                <entry key="c14n.abstract" value="classpath:/net/shibboleth/idp/c14n/flows/subject-c14n-abstract-flow.xml" />
+                <entry key="c14n" value="classpath:/net/shibboleth/idp/c14n/flows/subject-c14n-flow.xml" />
         
                 <!-- Standard post-login C14N methods. -->
-                <entry key="c14n/simple" value="../system/flows/c14n/simple-subject-c14n-flow.xml" />
-                <entry key="c14n/x500" value="../system/flows/c14n/x500-subject-c14n-flow.xml" />
-                <entry key="c14n/attribute" value="../system/flows/c14n/attribute-sourced-subject-c14n-flow.xml" />
+                <entry key="c14n/simple" value="classpath:/net/shibboleth/idp/c14n/flows/simple-subject-c14n-flow.xml" />
+                <entry key="c14n/x500" value="classpath:/net/shibboleth/idp/c14n/flows/x500-subject-c14n-flow.xml" />
+                <entry key="c14n/attribute" value="classpath:/net/shibboleth/idp/c14n/flows/attribute-sourced-subject-c14n-flow.xml" />
         
                 <!--
                 Standard SAML C14N methods, including one supporting legacy use of the attribute resolver.
                 These all map to the same flow, and they derive the bean ID of an action to run based on the
                 flow id after the slash.
                 -->
-                <entry key="c14n/SAML2Transient" value="../system/flows/c14n/subject-c14n-saml-default-flow.xml" />
-                <entry key="c14n/SAML2CryptoTransient" value="../system/flows/c14n/subject-c14n-saml-default-flow.xml" />
-                <entry key="c14n/SAML2Persistent" value="../system/flows/c14n/subject-c14n-saml-default-flow.xml" />
-                <entry key="c14n/SAML2Transform" value="../system/flows/c14n/subject-c14n-saml-default-flow.xml" />
-                <entry key="c14n/SAML2ProxyTransform" value="../system/flows/c14n/subject-c14n-saml-default-flow.xml" />
-                <entry key="c14n/SAML1Transient" value="../system/flows/c14n/subject-c14n-saml-default-flow.xml" />
-                <entry key="c14n/SAML1CryptoTransient" value="../system/flows/c14n/subject-c14n-saml-default-flow.xml" />
-                <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" />
+                <entry key="c14n/SAML2Transient" value="classpath:/net/shibboleth/idp/saml/flows/c14n/subject-c14n-saml-default-flow.xml" />
+                <entry key="c14n/SAML2CryptoTransient" value="classpath:/net/shibboleth/idp/saml/flows/c14n/subject-c14n-saml-default-flow.xml" />
+                <entry key="c14n/SAML2Persistent" value="classpath:/net/shibboleth/idp/saml/flows/c14n/subject-c14n-saml-default-flow.xml" />
+                <entry key="c14n/SAML2Transform" value="classpath:/net/shibboleth/idp/saml/flows/c14n/subject-c14n-saml-default-flow.xml" />
+                <entry key="c14n/SAML2ProxyTransform" value="classpath:/net/shibboleth/idp/saml/flows/c14n/subject-c14n-saml-default-flow.xml" />
+                <entry key="c14n/SAML1Transient" value="classpath:/net/shibboleth/idp/saml/flows/c14n/subject-c14n-saml-default-flow.xml" />
+                <entry key="c14n/SAML1CryptoTransient" value="classpath:/net/shibboleth/idp/saml/flows/c14n/subject-c14n-saml-default-flow.xml" />
+                <entry key="c14n/SAML1Transform" value="classpath:/net/shibboleth/idp/saml/flows/c14n/subject-c14n-saml-default-flow.xml" />
+                <entry key="c14n/LegacyPrincipalConnector" value="classpath:/net/shibboleth/idp/saml/flows/c14n/subject-c14n-saml-default-flow.xml" />
         
                 <!-- Main interceptor flow. -->
                 <entry key="intercept.events" value="%{idp.home}/conf/intercept/intercept-events-flow.xml" />
diff --git a/idp-conf/src/main/resources/system/flows/c14n/subject-c14n-saml-default-beans.xml b/idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/c14n/subject-c14n-saml-default-beans.xml
similarity index 100%
rename from idp-conf/src/main/resources/system/flows/c14n/subject-c14n-saml-default-beans.xml
rename to idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/c14n/subject-c14n-saml-default-beans.xml
diff --git a/idp-conf/src/main/resources/system/flows/c14n/subject-c14n-saml-default-flow.xml b/idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/c14n/subject-c14n-saml-default-flow.xml
similarity index 100%
rename from idp-conf/src/main/resources/system/flows/c14n/subject-c14n-saml-default-flow.xml
rename to idp-saml-impl/src/main/resources/net/shibboleth/idp/saml/flows/c14n/subject-c14n-saml-default-flow.xml

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

More information about the commits mailing list