[java-identity-provider COMMIT] in /trunk: idp-conf/src/main/resources/system/conf/general-admin-system.xml idp-core/...

[noreply at shibboleth.net]

Author: scantor
Date: Wed Oct  5 19:05:23 2016
New Revision: 8468

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=8468&view=rev
Log:
IDP-857 - Create a status page with JSON output

https://issues.shibboleth.net/jira/browse/IDP-857

Add metadata service subclass to extract gauges from embedded resolvers.

Added:
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/metadata/impl/MetadataResolverServiceGaugeSet.java   (with props)
Modified:
    trunk/idp-conf/src/main/resources/system/conf/general-admin-system.xml
    trunk/idp-core/src/main/java/net/shibboleth/idp/metrics/ReloadableServiceGaugeSet.java

Modified: trunk/idp-conf/src/main/resources/system/conf/general-admin-system.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/conf/general-admin-system.xml?rev=8468&r1=8467&r2=8468&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/conf/general-admin-system.xml	(original)
+++ trunk/idp-conf/src/main/resources/system/conf/general-admin-system.xml	Wed Oct  5 19:05:23 2016
@@ -80,7 +80,7 @@
         p:service-ref="shibboleth.ReloadableAccessControlService" />
 
     <bean id="shibboleth.metrics.MetadataGaugeSet"
-        class="net.shibboleth.idp.metrics.ReloadableServiceGaugeSet" lazy-init="true"
+        class="net.shibboleth.idp.saml.metadata.impl.MetadataResolverServiceGaugeSet" lazy-init="true"
         c:metricName="metadata"
         p:service-ref="shibboleth.MetadataResolverService" />
 

Modified: trunk/idp-core/src/main/java/net/shibboleth/idp/metrics/ReloadableServiceGaugeSet.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-core/src/main/java/net/shibboleth/idp/metrics/ReloadableServiceGaugeSet.java?rev=8468&r1=8467&r2=8468&view=diff
==============================================================================
--- trunk/idp-core/src/main/java/net/shibboleth/idp/metrics/ReloadableServiceGaugeSet.java	(original)
+++ trunk/idp-core/src/main/java/net/shibboleth/idp/metrics/ReloadableServiceGaugeSet.java	Wed Oct  5 19:05:23 2016
@@ -47,7 +47,7 @@
 public class ReloadableServiceGaugeSet extends AbstractInitializableComponent implements MetricSet, MetricFilter {
 
     /** Default prefix for metrics. */
-    @Nonnull @NotEmpty private static final String DEFAULT_METRIC_NAME = "net.shibboleth.idp";
+    @Nonnull @NotEmpty protected static final String DEFAULT_METRIC_NAME = "net.shibboleth.idp";
 
     /** The map of gauges. */
     @Nonnull @NonnullElements private final Map<String,Metric> gauges;