[java-identity-provider] branch main updated: Assume default client storage services and remove config file.

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

The following commit(s) were added to refs/heads/main by this push:
       new  cdcd74122 Assume default client storage services and remove config file.
cdcd74122 is described below

commit cdcd74122328f023f1857949c5ba4c2587bb4fee
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Mon Sep 21 16:34:24 2020 -0400

    Assume default client storage services and remove config file.
---
 .../net/shibboleth/idp/conf/global-system.xml      |  2 --
 .../shibboleth/idp/conf/session-manager-system.xml |  2 +-
 .../src/main/resources/conf/session-manager.xml    | 23 ----------------------
 3 files changed, 1 insertion(+), 26 deletions(-)

diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/global-system.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/global-system.xml
index 09791c8a4..6750acea4 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/global-system.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/global-system.xml
@@ -244,8 +244,6 @@
 
     <!--
     Default list of ClientStorageService plugins needed for injection into storage read/write flows.
-    Declared here for compatibility with pre-3.2 installs that don't declare this list inside
-    session-manager.xml
     -->
     <bean id="shibboleth.DefaultClientStorageServices" lazy-init="true"
             class="org.springframework.beans.factory.config.ListFactoryBean">
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/session-manager-system.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/session-manager-system.xml
index ff0de2094..643daa159 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/session-manager-system.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/session-manager-system.xml
@@ -99,6 +99,6 @@
           c:flows="#{@'shibboleth.LogoutPropagationFlowDescriptorManager'.getComponents()}" />
 
     <!-- The import is at the bottom to avoid a depends-on in a user-editable file. -->
-    <import resource="${idp.home}/conf/session-manager.xml" />
+    <import resource="conditional:${idp.home}/conf/session-manager.xml" />
 
 </beans>
diff --git a/idp-conf/src/main/resources/conf/session-manager.xml b/idp-conf/src/main/resources/conf/session-manager.xml
deleted file mode 100644
index e79624436..000000000
--- a/idp-conf/src/main/resources/conf/session-manager.xml
+++ /dev/null
@@ -1,23 +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">
-
-    <!--
-    List of client-side storage service plugins. If you use server-side storage and don't need these
-    services, you can remove or comment out the <ref> elements, but don't remove the list bean or
-    a default list will be substituted for backward compatibility.
-    -->
-    <util:list id="shibboleth.ClientStorageServices">
-        <ref bean="shibboleth.ClientSessionStorageService" />
-        <ref bean="shibboleth.ClientPersistentStorageService" />
-    </util:list>
-    
-</beans>

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