[java-identity-provider] branch main updated: Conditionalize consent import.

[Scott Cantor]

This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to branch main
in repository java-identity-provider.

View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=5e08ed5ec2d368444c556625435a94f40549ae4a

The following commit(s) were added to refs/heads/main by this push:
       new  5e08ed5ec Conditionalize consent import.
5e08ed5ec is described below

commit 5e08ed5ec2d368444c556625435a94f40549ae4a
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Tue Sep 22 18:54:35 2020 -0400

    Conditionalize consent import.
---
 .../net/shibboleth/idp/flows/saml/saml1/attribute-query-beans.xml       | 2 +-
 .../net/shibboleth/idp/flows/saml/saml2/attribute-query-beans.xml       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml1/attribute-query-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml1/attribute-query-beans.xml
index 9d0743dbf..661cf97af 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml1/attribute-query-beans.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml1/attribute-query-beans.xml
@@ -16,7 +16,7 @@
         p:placeholderPrefix="%{" p:placeholderSuffix="}" />
 
     <import resource="common-beans.xml" />
-    <import resource="%{idp.home}/conf/intercept/consent-intercept-config.xml" />
+    <import resource="conditional:%{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-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/attribute-query-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/attribute-query-beans.xml
index d38583a03..3de40872d 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/attribute-query-beans.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/saml/saml2/attribute-query-beans.xml
@@ -16,7 +16,7 @@
         p:placeholderPrefix="%{" p:placeholderSuffix="}" />
     
     <import resource="common-beans.xml" />
-    <import resource="%{idp.home}/conf/intercept/consent-intercept-config.xml" />
+    <import resource="conditional:%{idp.home}/conf/intercept/consent-intercept-config.xml" />
 
     <bean id="InitializeProfileRequestContext"
         class="net.shibboleth.idp.profile.impl.InitializeProfileRequestContext" scope="prototype"

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