You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2016/03/29 08:58:13 UTC
[4/4] wicket git commit: Revert "WiCKET-6127 WICKET-6128 Use
IInitializer and ServletContext to store the MetricRegistry"
Revert "WiCKET-6127 WICKET-6128 Use IInitializer and ServletContext to store the MetricRegistry"
This reverts commit 6078966e604e6b61846a182cd3af0c729e45106d.
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/d01a07d5
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/d01a07d5
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/d01a07d5
Branch: refs/heads/master
Commit: d01a07d51a57b4d66c5ad97ad1de3ee286ea64b7
Parents: 8beb530
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Tue Mar 29 08:55:54 2016 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Tue Mar 29 08:55:54 2016 +0200
----------------------------------------------------------------------
.../org/apache/wicket/metrics/Initializer.java | 40 --------------------
.../aspects/session/SessionCountListener.java | 32 ++++------------
.../services/org.apache.wicket.IInitializer | 1 -
3 files changed, 8 insertions(+), 65 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/d01a07d5/wicket-experimental/wicket-metrics/src/main/java/org/apache/wicket/metrics/Initializer.java
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-metrics/src/main/java/org/apache/wicket/metrics/Initializer.java b/wicket-experimental/wicket-metrics/src/main/java/org/apache/wicket/metrics/Initializer.java
deleted file mode 100644
index 7c3a451..0000000
--- a/wicket-experimental/wicket-metrics/src/main/java/org/apache/wicket/metrics/Initializer.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package org.apache.wicket.metrics;
-
-import javax.servlet.ServletContext;
-
-import com.codahale.metrics.MetricRegistry;
-import org.apache.wicket.Application;
-import org.apache.wicket.IInitializer;
-import org.apache.wicket.MetaDataKey;
-import org.apache.wicket.protocol.http.WebApplication;
-
-/**
- * Creates an instance of {@link MetricRegistry} and saves it in the
- * {@link Application#getMetaData(MetaDataKey) meta data} and in the
- * {@link ServletContext}
- */
-public class Initializer implements IInitializer
-{
- public static final String METRICS_SERVLET_REGISTRY = "com.codahale.metrics.servlets.MetricsServlet.registry";
-
- @Override
- public void init(Application application)
- {
- WebApplication webApplication = (WebApplication) application;
- MetricRegistry metricRegistry = new MetricRegistry();
- application.setMetaData(WicketMetrics.METRIC_REGISTRY, metricRegistry);
-
- ServletContext servletContext = webApplication.getServletContext();
- servletContext.setAttribute(METRICS_SERVLET_REGISTRY, metricRegistry);
- }
-
- @Override
- public void destroy(Application application)
- {
- WebApplication webApplication = (WebApplication) application;
- webApplication.setMetaData(WicketMetrics.METRIC_REGISTRY, null);
-
- ServletContext servletContext = webApplication.getServletContext();
- servletContext.setAttribute(METRICS_SERVLET_REGISTRY, null);
- }
-}
http://git-wip-us.apache.org/repos/asf/wicket/blob/d01a07d5/wicket-experimental/wicket-metrics/src/main/java/org/apache/wicket/metrics/aspects/session/SessionCountListener.java
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-metrics/src/main/java/org/apache/wicket/metrics/aspects/session/SessionCountListener.java b/wicket-experimental/wicket-metrics/src/main/java/org/apache/wicket/metrics/aspects/session/SessionCountListener.java
index 3f89ca3..6aacfee 100644
--- a/wicket-experimental/wicket-metrics/src/main/java/org/apache/wicket/metrics/aspects/session/SessionCountListener.java
+++ b/wicket-experimental/wicket-metrics/src/main/java/org/apache/wicket/metrics/aspects/session/SessionCountListener.java
@@ -16,15 +16,10 @@
*/
package org.apache.wicket.metrics.aspects.session;
-import static org.apache.wicket.metrics.Initializer.METRICS_SERVLET_REGISTRY;
-
-import javax.servlet.ServletContext;
import javax.servlet.annotation.WebListener;
import javax.servlet.http.HttpSessionEvent;
import javax.servlet.http.HttpSessionListener;
-import com.codahale.metrics.MetricRegistry;
-
/**
* Listener that counts the current active sessions
@@ -35,47 +30,36 @@ import com.codahale.metrics.MetricRegistry;
@WebListener
public class SessionCountListener implements HttpSessionListener
{
+
@Override
public void sessionDestroyed(HttpSessionEvent event)
{
- ServletContext servletContext = event.getSession().getServletContext();
- MetricRegistry metricRegistry = (MetricRegistry) servletContext.getAttribute(METRICS_SERVLET_REGISTRY);
- if (metricRegistry != null)
- {
- dec(event, metricRegistry);
- }
+ dec(event);
}
@Override
public void sessionCreated(HttpSessionEvent event)
{
- ServletContext servletContext = event.getSession().getServletContext();
- MetricRegistry metricRegistry = (MetricRegistry) servletContext.getAttribute(METRICS_SERVLET_REGISTRY);
- if (metricRegistry != null)
- {
- inc(event, metricRegistry);
- }
+ inc(event);
}
/**
* Used to wire an aspect around
- *
+ *
* @param event the http session event
- * @param metricRegistry
*/
- public void dec(HttpSessionEvent event, MetricRegistry metricRegistry)
+ public void dec(HttpSessionEvent event)
{
// NOOP for aspect usage
}
/**
* Used to wire an aspect around
- *
+ *
* @param event the http session event
- * @param metricRegistry
*/
- public void inc(HttpSessionEvent event, MetricRegistry metricRegistry)
+ public void inc(HttpSessionEvent event)
{
// NOOP for aspect usage
}
-}
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/wicket/blob/d01a07d5/wicket-experimental/wicket-metrics/src/main/resources/META-INF/services/org.apache.wicket.IInitializer
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-metrics/src/main/resources/META-INF/services/org.apache.wicket.IInitializer b/wicket-experimental/wicket-metrics/src/main/resources/META-INF/services/org.apache.wicket.IInitializer
deleted file mode 100644
index 70dfbbd..0000000
--- a/wicket-experimental/wicket-metrics/src/main/resources/META-INF/services/org.apache.wicket.IInitializer
+++ /dev/null
@@ -1 +0,0 @@
-org.apache.wicket.metrics.Initializer