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

[noreply at shibboleth.net]

Author: scantor
Date: Fri Oct  7 18:32:03 2016
New Revision: 8476

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=8476&view=rev
Log:
Fix tests by overriding MetricRegistry in ConfigurationService.

Modified:
    trunk/idp-conf/src/main/resources/system/conf/general-admin-system.xml
    trunk/idp-conf/src/main/resources/system/conf/global-system.xml

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=8476&r1=8475&r2=8476&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	Fri Oct  7 18:32:03 2016
@@ -35,17 +35,16 @@
         </property>
     </bean>
     
-    <!-- MetricFilter we can control with logging categories. -->
+    <!-- MetricRegistry we can control with logging categories. -->
+    <bean id="shibboleth.metrics.MetricRegistry"
+        class="org.opensaml.core.metrics.FilteredMetricRegistry"
+        p:metricFilter-ref="shibboleth.metrics.LoggerDrivenMetricFilter" />
+        
     <bean id="shibboleth.metrics.LoggerDrivenMetricFilter"
         class="org.opensaml.core.metrics.LoggerDrivenMetricFilter"
         c:_0="metrics."
         c:_1="#{getObject('shibboleth.metrics.MetricLevelMap')}" />
         
-    <!-- Pull MetricRegistry out of OpenSAML Configuration. -->
-    <bean id="shibboleth.metrics.MetricRegistry"
-        class="org.opensaml.core.config.ConfigurationService" factory-method="get"
-        c:_0="#{T(com.codahale.metrics.MetricRegistry)}" />
-
     <!-- Parent beans for registering MetricSets and Metrics. -->
     
     <bean id="shibboleth.metrics.RegisterMetricSets" abstract="true"

Modified: trunk/idp-conf/src/main/resources/system/conf/global-system.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/conf/global-system.xml?rev=8476&r1=8475&r2=8476&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/conf/global-system.xml	(original)
+++ trunk/idp-conf/src/main/resources/system/conf/global-system.xml	Fri Oct  7 18:32:03 2016
@@ -51,9 +51,9 @@
     <import resource="utilities.xml" />
 
     <bean id="shibboleth.OpenSAMLConfig" class="net.shibboleth.idp.spring.OpenSAMLConfigBean"
-        depends-on="shibboleth.LoggingService,shibboleth.ParserPool,shibboleth.metrics.LoggerDrivenMetricFilter"
+        depends-on="shibboleth.LoggingService,shibboleth.ParserPool,shibboleth.metrics.MetricRegistry"
         p:parserPool-ref="shibboleth.ParserPool"
-        p:metricFilter-ref="shibboleth.metrics.LoggerDrivenMetricFilter" />
+        p:metricRegistry-ref="shibboleth.metrics.MetricRegistry" />
 
     <bean id="shibboleth.VelocityEngine" class="org.springframework.ui.velocity.VelocityEngineFactoryBean"
             depends-on="shibboleth.LoggingService">