[java-sp-server] branch main updated: Start prepping parent bean(s) for defining copies of services.

[Scott Cantor]

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

scantor pushed a commit to branch main
in repository java-sp-server.

View the commit online:
http://git.shibboleth.net/view/?p=java-sp-server.git;a=commit;h=8988efe548060f83f509b18ee089a8ca42c8b2d4

The following commit(s) were added to refs/heads/main by this push:
     new 8988efe  Start prepping parent bean(s) for defining copies of services.
8988efe is described below

commit 8988efe548060f83f509b18ee089a8ca42c8b2d4
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Thu May 26 15:18:27 2022 -0400

    Start prepping parent bean(s) for defining copies of services.
---
 .../resources/net/shibboleth/sp/conf/services-system.xml | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/sp-conf-impl/src/main/resources/net/shibboleth/sp/conf/services-system.xml b/sp-conf-impl/src/main/resources/net/shibboleth/sp/conf/services-system.xml
index fea9fa7..e6b31c2 100644
--- a/sp-conf-impl/src/main/resources/net/shibboleth/sp/conf/services-system.xml
+++ b/sp-conf-impl/src/main/resources/net/shibboleth/sp/conf/services-system.xml
@@ -12,6 +12,16 @@
        default-init-method="initialize"
        default-destroy-method="destroy">
 
+    <!-- Parent beans for defining services. -->
+    
+    <bean id="shibboleth.ReloadableService" abstract="true"
+        class="net.shibboleth.ext.spring.service.ReloadableSpringService" 
+        p:failFast="%{sp.service.failFast:false}"
+        p:reloadCheckDelay="PT0S"
+        p:beanPostProcessors-ref="shibboleth.IdentifiableBeanPostProcessor"
+        p:beanFactoryPostProcessors-ref="shibboleth.PropertySourcesPlaceholderConfigurer" />
+
+
     <!--
     These are beans that define reloadable services. The actual Spring resources that configure the
     services are generally defined in the services.xml file edited by deployers.
@@ -24,13 +34,11 @@
         p:reloadCheckDelay="%{sp.service.logging.checkInterval:PT0S}"
         p:failFast="%{sp.service.logging.failFast:%{sp.service.failFast:true}}" />
 
-    <bean id="shibboleth.ServiceProvider" class="net.shibboleth.ext.spring.service.ReloadableSpringService" 
+    <bean id="shibboleth.ServiceProvider" parent="shibboleth.ReloadableService" 
         c:claz="net.shibboleth.sp.remoting.EndpointManager"
         p:serviceConfigurations-ref="ExtendedServiceProviderResources"
         p:failFast="%{sp.service.provider.failFast:%{sp.service.failFast:false}}"
-        p:reloadCheckDelay="%{sp.service.provider.checkInterval:PT0S}"
-        p:beanPostProcessors-ref="shibboleth.IdentifiableBeanPostProcessor"
-        p:beanFactoryPostProcessors-ref="shibboleth.PropertySourcesPlaceholderConfigurer" />
+        p:reloadCheckDelay="%{sp.service.provider.checkInterval:PT0S}" />
             
     <!-- Auto-append system config file to resource set. -->
     <bean id ="ExtendedServiceProviderResources" class="net.shibboleth.ext.spring.factory.CombiningListFactoryBean"

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