[java-identity-provider] branch maint-4 updated: Add ConditionalResource parent bean.

[Scott Cantor]

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

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

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

The following commit(s) were added to refs/heads/maint-4 by this push:
     new e1e7fc931 Add ConditionalResource parent bean.
e1e7fc931 is described below

commit e1e7fc931d48d0eb4e5717e43888f209e8f4acf3
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Wed Sep 14 14:39:46 2022 -0400

    Add ConditionalResource parent bean.
---
 .../src/main/resources/net/shibboleth/idp/conf/primitives.xml          | 3 +++
 .../src/main/resources/net/shibboleth/idp/conf/services-system.xml     | 2 +-
 .../src/main/resources/net/shibboleth/idp/flows/admin/hello-beans.xml  | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/primitives.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/primitives.xml
index 1cf52fb0c..a8f5817cd 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/primitives.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/primitives.xml
@@ -32,6 +32,9 @@
 
     <!-- Resource beans. -->    
 
+    <bean id="shibboleth.ConditionalReesource" abstract="true"
+        class="net.shibboleth.ext.spring.resource.ConditionalResource" />
+
     <bean id="shibboleth.RunnableFileSystemResource" abstract="true"
         class="net.shibboleth.ext.spring.resource.RunnableFileSystemResource" />
 
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/services-system.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/services-system.xml
index c7e961378..7afc0f356 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/services-system.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/services-system.xml
@@ -192,7 +192,7 @@
     
     <!-- This default populates the service with an empty CAS registry as a substitute for a real config. -->
     <util:list id="shibboleth.DefaultCASServiceRegistryResources">
-        <bean class="net.shibboleth.ext.spring.resource.ConditionalResource" c:wrapped="%{idp.home}/conf/cas-protocol.xml">
+        <bean parent="shibboleth.ConditionalReesource" c:wrapped="%{idp.home}/conf/cas-protocol.xml">
             <property name="defaultContent">
                 <value>
                 <![CDATA[
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/hello-beans.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/hello-beans.xml
index 596a495b2..bddabeccd 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/hello-beans.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/flows/admin/hello-beans.xml
@@ -38,7 +38,7 @@
     
     <bean id="ScriptedAction" class="net.shibboleth.idp.profile.ScriptedAction" factory-method="resourceScript" scope="prototype">
         <constructor-arg>
-            <bean class="net.shibboleth.ext.spring.resource.ConditionalResource"
+            <bean parent="shibboleth.ConditionalReesource"
                 c:_0="%{idp.home}/conf/admin/hello-world.js"
                 p:defaultContent="null;" />
         </constructor-arg>

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