[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 16:34:09 2016
New Revision: 8467

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=8467&view=rev
Log:
Move implementation classes into an impl package.

Added:
    trunk/idp-core/src/main/java/net/shibboleth/idp/metrics/impl/
    trunk/idp-core/src/main/java/net/shibboleth/idp/metrics/impl/CoreGaugeSet.java
      - copied, changed from r8465, trunk/idp-core/src/main/java/net/shibboleth/idp/metrics/CoreGaugeSet.java
    trunk/idp-core/src/main/java/net/shibboleth/idp/metrics/impl/DisabledCounter.java
      - copied, changed from r8460, trunk/idp-core/src/main/java/net/shibboleth/idp/metrics/DisabledCounter.java
    trunk/idp-core/src/main/java/net/shibboleth/idp/metrics/impl/DisabledHistogram.java
      - copied, changed from r8460, trunk/idp-core/src/main/java/net/shibboleth/idp/metrics/DisabledHistogram.java
    trunk/idp-core/src/main/java/net/shibboleth/idp/metrics/impl/DisabledMeter.java
      - copied, changed from r8460, trunk/idp-core/src/main/java/net/shibboleth/idp/metrics/DisabledMeter.java
    trunk/idp-core/src/main/java/net/shibboleth/idp/metrics/impl/DisabledMetric.java
      - copied, changed from r8460, trunk/idp-core/src/main/java/net/shibboleth/idp/metrics/DisabledMetric.java
    trunk/idp-core/src/main/java/net/shibboleth/idp/metrics/impl/DisabledTimer.java
      - copied, changed from r8460, trunk/idp-core/src/main/java/net/shibboleth/idp/metrics/DisabledTimer.java
    trunk/idp-core/src/main/java/net/shibboleth/idp/metrics/impl/IdPGaugeSet.java
      - copied, changed from r8466, trunk/idp-core/src/main/java/net/shibboleth/idp/metrics/IdPGaugeSet.java
    trunk/idp-core/src/main/java/net/shibboleth/idp/metrics/impl/package-info.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/CoreGaugeSet.java
    trunk/idp-core/src/main/java/net/shibboleth/idp/metrics/DisabledCounter.java
    trunk/idp-core/src/main/java/net/shibboleth/idp/metrics/DisabledHistogram.java
    trunk/idp-core/src/main/java/net/shibboleth/idp/metrics/DisabledMeter.java
    trunk/idp-core/src/main/java/net/shibboleth/idp/metrics/DisabledMetric.java
    trunk/idp-core/src/main/java/net/shibboleth/idp/metrics/DisabledTimer.java
    trunk/idp-core/src/main/java/net/shibboleth/idp/metrics/FilteredMetricRegistry.java
    trunk/idp-core/src/main/java/net/shibboleth/idp/metrics/IdPGaugeSet.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=8467&r1=8466&r2=8467&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 16:34:09 2016
@@ -65,9 +65,9 @@
     
     <!-- Some predefined metric sets, only created if installed by user. -->
     
-    <bean id="shibboleth.metrics.CoreGaugeSet" class="net.shibboleth.idp.metrics.CoreGaugeSet" lazy-init="true" />
+    <bean id="shibboleth.metrics.CoreGaugeSet" class="net.shibboleth.idp.metrics.impl.CoreGaugeSet" lazy-init="true" />
     
-    <bean id="shibboleth.metrics.IdPGaugeSet" class="net.shibboleth.idp.metrics.IdPGaugeSet" lazy-init="true" />
+    <bean id="shibboleth.metrics.IdPGaugeSet" class="net.shibboleth.idp.metrics.impl.IdPGaugeSet" lazy-init="true" />
     
     <bean id="shibboleth.metrics.LoggingGaugeSet"
         class="net.shibboleth.idp.metrics.ReloadableServiceGaugeSet" lazy-init="true"

Modified: trunk/idp-core/src/main/java/net/shibboleth/idp/metrics/FilteredMetricRegistry.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-core/src/main/java/net/shibboleth/idp/metrics/FilteredMetricRegistry.java?rev=8467&r1=8466&r2=8467&view=diff
==============================================================================
--- trunk/idp-core/src/main/java/net/shibboleth/idp/metrics/FilteredMetricRegistry.java	(original)
+++ trunk/idp-core/src/main/java/net/shibboleth/idp/metrics/FilteredMetricRegistry.java	Wed Oct  5 16:34:09 2016
@@ -32,6 +32,10 @@
 import com.google.common.base.Predicates;
 import com.google.common.collect.Collections2;
 
+import net.shibboleth.idp.metrics.impl.DisabledCounter;
+import net.shibboleth.idp.metrics.impl.DisabledHistogram;
+import net.shibboleth.idp.metrics.impl.DisabledMeter;
+import net.shibboleth.idp.metrics.impl.DisabledTimer;
 import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
 import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
 import net.shibboleth.utilities.java.support.component.ComponentSupport;

Copied: trunk/idp-core/src/main/java/net/shibboleth/idp/metrics/impl/CoreGaugeSet.java (from r8465, trunk/idp-core/src/main/java/net/shibboleth/idp/metrics/CoreGaugeSet.java)

[... 104 lines stripped ...]