[java-identity-provider] branch master updated: IDP-1534 Display all services on status page

[Rod Widdowson]

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

rdw pushed a commit to branch master
in repository java-identity-provider.

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

The following commit(s) were added to refs/heads/master by this push:
       new  2b6f639   IDP-1534 Display all services on status page
2b6f639 is described below

commit 2b6f6390e5da265a3906ddac53d19ba3962eb215
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Fri Jan 24 13:12:24 2020 +0000

    IDP-1534 Display all services on status page
    
    https://issues.shibboleth.net/jira/browse/IDP-1534
    
    Populate the list of services by asking the abstract context for them, rather than
    relying on a static list.
---
 .../src/main/resources/system/flows/admin/status-beans.xml  | 13 -------------
 .../src/main/resources/system/flows/admin/status-flow.xml   |  2 +-
 2 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/idp-conf/src/main/resources/system/flows/admin/status-beans.xml b/idp-conf/src/main/resources/system/flows/admin/status-beans.xml
index 75da1bf..a7e20bc 100644
--- a/idp-conf/src/main/resources/system/flows/admin/status-beans.xml
+++ b/idp-conf/src/main/resources/system/flows/admin/status-beans.xml
@@ -26,17 +26,4 @@
         
     <bean id="shibboleth.AdminResourceLookupStrategy" parent="shibboleth.Functions.Constant" c:target="status" />
     
-    <util:list id="ServiceCollection">
-        <ref bean="shibboleth.LoggingService" />
-        <ref bean="shibboleth.ReloadableAccessControlService" />
-        <ref bean="shibboleth.MetadataResolverService" />
-        <ref bean="shibboleth.RelyingPartyResolverService" />
-        <ref bean="shibboleth.NameIdentifierGenerationService" />
-        <ref bean="shibboleth.AttributeRegistryService" />
-        <ref bean="shibboleth.AttributeResolverService" />
-        <ref bean="shibboleth.AttributeFilterService" />
-        <ref bean="shibboleth.ReloadableCASServiceRegistry" />
-        <ref bean="shibboleth.ManagedBeanService" />
-    </util:list>
-
 </beans>
diff --git a/idp-conf/src/main/resources/system/flows/admin/status-flow.xml b/idp-conf/src/main/resources/system/flows/admin/status-flow.xml
index ae1f600..4e592f3 100644
--- a/idp-conf/src/main/resources/system/flows/admin/status-flow.xml
+++ b/idp-conf/src/main/resources/system/flows/admin/status-flow.xml
@@ -28,7 +28,7 @@
     <end-state id="Status" view="status">
         <on-entry>
             <evaluate expression="WriteAuditLog" />
-            <evaluate expression="ServiceCollection" result="requestScope.services" />
+            <evaluate expression="T(org.springframework.beans.factory.BeanFactoryUtils).beansOfTypeIncludingAncestors(flowRequestContext.getActiveFlow().getApplicationContext(), T(net.shibboleth.utilities.java.support.service.AbstractReloadableService)).values()" result="requestScope.services" />            <evaluate expression="ServiceCollection" result="requestScope.services" />
             <evaluate expression="environment" result="requestScope.environment" />
             <evaluate expression="flowRequestContext.getActiveFlow().getApplicationContext().getBean('shibboleth.metrics.AttributeResolverGaugeSet')" result="requestScope.attributeResolverGaugeSet" />
             <evaluate expression="flowRequestContext.getActiveFlow().getApplicationContext().getBean('shibboleth.metrics.MetadataGaugeSet')" result="requestScope.metadataResolverGaugeSet" />            

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