[java-identity-provider] branch main updated: Reorder some properties/beans.

[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=88ded9889129660b0f05be6e24b70715b8cf1410

The following commit(s) were added to refs/heads/main by this push:
     new 88ded9889 Reorder some properties/beans.
88ded9889 is described below

commit 88ded9889129660b0f05be6e24b70715b8cf1410
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Tue Jun 20 12:08:54 2023 -0400

    Reorder some properties/beans.
---
 .../main/resources/net/shibboleth/idp/conf/admin-system.xml  | 12 ++++++------
 .../net/shibboleth/idp/module/conf/admin/metrics.xml         |  2 +-
 .../resources/net/shibboleth/idp/module/conf/idp.properties  |  7 ++++---
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/admin-system.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/admin-system.xml
index 92238f547..6fc786194 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/admin-system.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/conf/admin-system.xml
@@ -289,6 +289,12 @@
 
     <bean id="shibboleth.metrics.IdPGaugeSet" class="net.shibboleth.idp.metrics.impl.IdPGaugeSet" lazy-init="true"
         p:exposedProperties="#{getObject('shibboleth.metrics.ExposedProperties')}" />
+
+    <bean id="shibboleth.metrics.InstallableComponents"
+        class="net.shibboleth.idp.admin.impl.InstallableComponentGuageSet" lazy-init="true"
+       p:idpUpdateUrls-ref="%{idp.updateCheck.urls:shibboleth.IdPUpdateCheckUrls}"
+       p:httpClient-ref="%{idp.updateCheck.httpClient:shibboleth.InternalHttpClient}"
+       p:securityParams="#{ environment.containsProperty('idp.updateCheck.httpSecurityParameters') ? getObject('idp.updateCheck.httpSecurityParameters') :null}"/>
     
     <bean id="shibboleth.metrics.LoggingGaugeSet"
         class="net.shibboleth.shared.service.ReloadableServiceGaugeSet" lazy-init="true"
@@ -340,12 +346,6 @@
         c:metricName="net.shibboleth.idp.managedbean"
         p:service-ref="shibboleth.ManagedBeanService" />
 
-    <bean id="shibboleth.metrics.InstallableComponents"
-        class="net.shibboleth.idp.admin.impl.InstallableComponentGuageSet" lazy-init="true"
-       p:idpUpdateUrls-ref="%{idp.updateCheck.urls:shibboleth.IdPUpdateCheckUrls}"
-       p:httpClient-ref="%{idp.updateCheck.httpClient:shibboleth.InternalHttpClient}"
-       p:securityParams="#{ environment.containsProperty('idp.updateCheck.httpSecurityParameters') ? getObject('idp.updateCheck.httpSecurityParameters') :null}"/>
-
     <util:list id="shibboleth.IdPUpdateCheckUrls">
         <value>https://shibboleth.net/downloads/identity-provider/plugins/idp-versions.properties</value>
         <value>http://plugins.shibboleth.net/idp-versions.properties</value>
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/admin/metrics.xml b/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/admin/metrics.xml
index 0bdbe39b6..7ac0735dc 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/admin/metrics.xml
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/admin/metrics.xml
@@ -59,6 +59,7 @@
     <util:map id="shibboleth.metrics.MetricGroups">
         <entry key="core" value-ref="shibboleth.metrics.CoreGaugeSet" />
         <entry key="idp" value-ref="shibboleth.metrics.IdPGaugeSet" />
+        <entry key="updates" value-ref="shibboleth.metrics.InstallableComponents" />
         <entry key="logging" value-ref="shibboleth.metrics.LoggingGaugeSet" />
         <entry key="access" value-ref="shibboleth.metrics.AccessControlGaugeSet" />
         <entry key="metadata" value-ref="shibboleth.metrics.MetadataGaugeSet" />
@@ -69,7 +70,6 @@
         <entry key="filter" value-ref="shibboleth.metrics.AttributeFilterGaugeSet" />
         <entry key="cas" value-ref="shibboleth.metrics.CASServiceRegistryGaugeSet" />
         <entry key="bean" value-ref="shibboleth.metrics.ManagedBeanGaugeSet" />
-        <entry key="updates" value-ref="shibboleth.metrics.InstallableComponents" />
     </util:map>
 
     <!-- Add any desired properties into set to expose them as IdP metrics. -->
diff --git a/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/idp.properties b/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/idp.properties
index 3e2af2ba3..d91c58d67 100644
--- a/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/idp.properties
+++ b/idp-conf-impl/src/main/resources/net/shibboleth/idp/module/conf/idp.properties
@@ -1,3 +1,7 @@
+# Set false if you do not want the IdP to check (asynchronously) whether
+# it can be updated or not when the container starts
+#idp.updateCheck.enable=true
+
 # Auto-load all files matching conf/**/*.properties
 # Disable if you want to manually maintain a list of sources.
 idp.searchForProperties = true
@@ -253,6 +257,3 @@ idp.ui.fallbackLanguages=en,fr,de
 
 # Set false if you want SAML bindings "spelled out" in audit log
 idp.audit.shortenBindings = true
-
-# Set false if you do not want the IdP to check (asynchronously) whether it can be updated when the container starts
-#idp.updateCheck.enable=true

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