[java-identity-provider COMMIT] in /trunk: idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filte...

[noreply at shibboleth.net]

Author: scantor
Date: Fri Oct  7 16:52:20 2016
New Revision: 8474

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=8474&view=rev
Log:
Migrate Metrics support classes into opensaml-core.
Adjust wiring to inject logger-driven filter using OpenSAMLConfigBean.

Modified:
    trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/impl/AttributeFilterImpl.java
    trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/AbstractResolverPlugin.java
    trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolverImpl.java
    trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/AbstractValidationAction.java
    trunk/idp-conf/src/main/resources/conf/admin/metrics.xml
    trunk/idp-conf/src/main/resources/system/conf/general-admin-system.xml
    trunk/idp-conf/src/main/resources/system/conf/global-system.xml
    trunk/idp-conf/src/main/resources/system/flows/admin/admin-abstract-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/logout/logout-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/logout/logout-propagation-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-beans.xml
    trunk/idp-core/src/main/java/net/shibboleth/idp/metrics/FilteredMetricRegistry.java
    trunk/idp-core/src/main/java/net/shibboleth/idp/metrics/LoggerDrivenMetricFilter.java
    trunk/idp-core/src/main/java/net/shibboleth/idp/metrics/MetricsSupport.java
    trunk/idp-core/src/main/java/net/shibboleth/idp/metrics/impl/DisabledCounter.java
    trunk/idp-core/src/main/java/net/shibboleth/idp/metrics/impl/DisabledHistogram.java
    trunk/idp-core/src/main/java/net/shibboleth/idp/metrics/impl/DisabledMeter.java
    trunk/idp-core/src/main/java/net/shibboleth/idp/metrics/impl/DisabledMetric.java
    trunk/idp-core/src/main/java/net/shibboleth/idp/metrics/impl/DisabledTimer.java
    trunk/idp-core/src/main/java/net/shibboleth/idp/spring/OpenSAMLConfigBean.java
    trunk/idp-profile-api/src/main/java/net/shibboleth/idp/profile/AbstractProfileAction.java
    trunk/idp-profile-api/src/main/java/net/shibboleth/idp/profile/context/MetricContext.java
    trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/PopulateMetricContext.java
    trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/WebFlowMessageHandlerAdaptor.java
    trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/WebFlowProfileActionAdaptor.java

Modified: trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/impl/AttributeFilterImpl.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/impl/AttributeFilterImpl.java?rev=8474&r1=8473&r2=8474&view=diff
==============================================================================
--- trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/impl/AttributeFilterImpl.java	(original)
+++ trunk/idp-attribute-filter-impl/src/main/java/net/shibboleth/idp/attribute/filter/impl/AttributeFilterImpl.java	Fri Oct  7 16:52:20 2016
@@ -34,7 +34,6 @@
 import net.shibboleth.idp.attribute.filter.context.AttributeFilterContext;
 import net.shibboleth.idp.attribute.filter.context.AttributeFilterWorkContext;
 import net.shibboleth.idp.profile.context.RelyingPartyContext;
-import net.shibboleth.idp.profile.context.MetricContext;
 import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
 import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
 import net.shibboleth.utilities.java.support.annotation.constraint.NullableElements;
@@ -45,6 +44,7 @@
 import net.shibboleth.utilities.java.support.logic.Constraint;
 
 import org.opensaml.messaging.context.navigate.ParentContextLookup;
+import org.opensaml.profile.context.MetricContext;
 import org.opensaml.profile.context.ProfileRequestContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

Modified: trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/AbstractResolverPlugin.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/AbstractResolverPlugin.java?rev=8474&r1=8473&r2=8474&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/AbstractResolverPlugin.java	(original)
+++ trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/AbstractResolverPlugin.java	Fri Oct  7 16:52:20 2016
@@ -27,7 +27,6 @@
 
 import net.shibboleth.idp.attribute.resolver.context.AttributeResolutionContext;
 import net.shibboleth.idp.attribute.resolver.context.AttributeResolverWorkContext;
-import net.shibboleth.idp.profile.context.MetricContext;
 import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;

[... 425 lines stripped ...]