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

[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=fcc2cb076b0aa226fce6aedeefd771fb3a160371

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

commit fcc2cb076b0aa226fce6aedeefd771fb3a160371
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Tue Sep 22 14:18:08 2020 -0400

    IDP-1642 - Migrate configuration into jars where feasible
    
    https://issues.shibboleth.net/jira/browse/IDP-1642
    
    Convert external interceptor into property-driven flow.
---
 .../idp/flows/intercept/external-beans.xml         |  5 +++--
 .../conf/intercept/external-intercept-config.xml   | 25 ----------------------
 2 files changed, 3 insertions(+), 27 deletions(-)

diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/intercept/external-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/intercept/external-beans.xml
index 3997c8b1b..e46f94dbd 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/intercept/external-beans.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/intercept/external-beans.xml
@@ -20,8 +20,9 @@
 
     <!-- Default strategy function to obtain the external path. -->
     <bean id="shibboleth.intercept.externalPathStrategy" parent="shibboleth.Functions.Constant"
-        c:target-ref="shibboleth.intercept.externalPath" />
+        c:target="#{getObject('shibboleth.intercept.externalPath') ?: '%{idp.intercept.External.externalPath:contextRelative:intercept.jsp}'.trim()}" />
 
-    <import resource="%{idp.home}/conf/intercept/external-intercept-config.xml" />
+    <!-- Legacy compatibility. -->
+    <import resource="conditional:%{idp.home}/conf/intercept/external-intercept-config.xml" />
 
 </beans>
diff --git a/idp-conf/src/main/resources/conf/intercept/external-intercept-config.xml b/idp-conf/src/main/resources/conf/intercept/external-intercept-config.xml
deleted file mode 100644
index 1d0fc299d..000000000
--- a/idp-conf/src/main/resources/conf/intercept/external-intercept-config.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:context="http://www.springframework.org/schema/context"
-       xmlns:util="http://www.springframework.org/schema/util"
-       xmlns:p="http://www.springframework.org/schema/p"
-       xmlns:c="http://www.springframework.org/schema/c"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-                           http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
-                           http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
-                           
-       default-init-method="initialize"
-       default-destroy-method="destroy">
-
-    <!-- Servlet context-relative path to wherever your implementation lives. -->
-    <bean id="shibboleth.intercept.externalPath" class="java.lang.String"
-        c:_0="contextRelative:intercept.jsp" />
-
-    <!--
-    Default is to always use the path in the bean above. If you want to determine it
-    dynamically, define a bean called "shibboleth.intercept.externalPathStrategy"
-    of type Function<ProfileRequestContext,String> that returns the path to use.
-    -->
-    
-</beans>

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