Return-Path: X-Original-To: apmail-sling-commits-archive@www.apache.org Delivered-To: apmail-sling-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 0940F60F4 for ; Thu, 21 Jul 2011 22:29:19 +0000 (UTC) Received: (qmail 23116 invoked by uid 500); 21 Jul 2011 22:29:18 -0000 Delivered-To: apmail-sling-commits-archive@sling.apache.org Received: (qmail 23050 invoked by uid 500); 21 Jul 2011 22:29:18 -0000 Mailing-List: contact commits-help@sling.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@sling.apache.org Delivered-To: mailing list commits@sling.apache.org Received: (qmail 23043 invoked by uid 99); 21 Jul 2011 22:29:17 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 21 Jul 2011 22:29:17 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 21 Jul 2011 22:29:14 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 04BC12388994; Thu, 21 Jul 2011 22:28:53 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1149390 - in /sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine: impl/RequestProcessorMBeanImpl.java impl/SlingMainServlet.java impl/SlingRequestProcessorImpl.java jmx/RequestProcessor.java jmx/RequestProcessorMBean.java Date: Thu, 21 Jul 2011 22:28:52 -0000 To: commits@sling.apache.org From: justin@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110721222853.04BC12388994@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: justin Date: Thu Jul 21 22:28:51 2011 New Revision: 1149390 URL: http://svn.apache.org/viewvc?rev=1149390&view=rev Log: SLING-1476 - renaming attributes per Bertrand's comments; moving mbean implementation to a non-exported class (helps to read the spec) Added: sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/RequestProcessorMBeanImpl.java - copied, changed from r1148949, sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/jmx/RequestProcessor.java Removed: sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/jmx/RequestProcessor.java Modified: sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/SlingMainServlet.java sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/SlingRequestProcessorImpl.java sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/jmx/RequestProcessorMBean.java Copied: sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/RequestProcessorMBeanImpl.java (from r1148949, sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/jmx/RequestProcessor.java) URL: http://svn.apache.org/viewvc/sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/RequestProcessorMBeanImpl.java?p2=sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/RequestProcessorMBeanImpl.java&p1=sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/jmx/RequestProcessor.java&r1=1148949&r2=1149390&rev=1149390&view=diff ============================================================================== --- sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/jmx/RequestProcessor.java (original) +++ sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/RequestProcessorMBeanImpl.java Thu Jul 21 22:28:51 2011 @@ -14,21 +14,22 @@ * License for the specific language governing permissions and limitations under * the License. */ -package org.apache.sling.engine.jmx; +package org.apache.sling.engine.impl; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; +import javax.management.StandardMBean; import org.apache.commons.math.stat.descriptive.SynchronizedSummaryStatistics; +import org.apache.sling.engine.jmx.RequestProcessorMBean; /** * This is the implementation of the management interface for the RequestProcessor. */ -public class RequestProcessor implements RequestProcessorMBean { +public class RequestProcessorMBeanImpl extends StandardMBean implements RequestProcessorMBean { private final SynchronizedSummaryStatistics durationStatistics; - public RequestProcessor() { + public RequestProcessorMBeanImpl() { + super(RequestProcessorMBean.class, false); this.durationStatistics = new SynchronizedSummaryStatistics(); } @@ -36,11 +37,11 @@ public class RequestProcessor implements durationStatistics.addValue(value); } - public long getCount() { + public long getRequestsCount() { return durationStatistics.getN(); } - public double getMeanRequestDuration() { + public double getMeanRequestDurationMsec() { return durationStatistics.getMean(); } Modified: sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/SlingMainServlet.java URL: http://svn.apache.org/viewvc/sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/SlingMainServlet.java?rev=1149390&r1=1149389&r2=1149390&view=diff ============================================================================== --- sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/SlingMainServlet.java (original) +++ sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/SlingMainServlet.java Thu Jul 21 22:28:51 2011 @@ -57,7 +57,6 @@ import org.apache.sling.engine.impl.para import org.apache.sling.engine.impl.request.RequestData; import org.apache.sling.engine.impl.request.RequestHistoryConsolePlugin; import org.apache.sling.engine.jmx.RequestProcessorMBean; -import org.apache.sling.engine.jmx.RequestProcessor; import org.apache.sling.engine.servlets.ErrorHandler; import org.osgi.framework.BundleContext; import org.osgi.framework.Constants; @@ -347,7 +346,7 @@ public class SlingMainServlet extends Ge Dictionary mbeanProps = new Hashtable(); mbeanProps.put("jmx.objectname", "org.apache.sling:type=engine,service=RequestProcessor"); - RequestProcessor mbean = new RequestProcessor(); + RequestProcessorMBeanImpl mbean = new RequestProcessorMBeanImpl(); bundleContext.registerService(RequestProcessorMBean.class.getName(), mbean, mbeanProps); requestProcessor.setMBean(mbean); } catch (Throwable t) { Modified: sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/SlingRequestProcessorImpl.java URL: http://svn.apache.org/viewvc/sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/SlingRequestProcessorImpl.java?rev=1149390&r1=1149389&r2=1149390&view=diff ============================================================================== --- sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/SlingRequestProcessorImpl.java (original) +++ sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/SlingRequestProcessorImpl.java Thu Jul 21 22:28:51 2011 @@ -57,7 +57,6 @@ import org.apache.sling.engine.impl.log. import org.apache.sling.engine.impl.request.ContentData; import org.apache.sling.engine.impl.request.RequestData; import org.apache.sling.engine.impl.request.RequestHistoryConsolePlugin; -import org.apache.sling.engine.jmx.RequestProcessor; import org.apache.sling.engine.servlets.ErrorHandler; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -79,7 +78,7 @@ public class SlingRequestProcessorImpl i private ServletFilterManager filterManager; - private RequestProcessor mbean; + private RequestProcessorMBeanImpl mbean; // ---------- helper setters @@ -121,7 +120,7 @@ public class SlingRequestProcessorImpl i this.filterManager = filterManager; } - void setMBean(final RequestProcessor mbean) { + void setMBean(final RequestProcessorMBeanImpl mbean) { this.mbean = mbean; } Modified: sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/jmx/RequestProcessorMBean.java URL: http://svn.apache.org/viewvc/sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/jmx/RequestProcessorMBean.java?rev=1149390&r1=1149389&r2=1149390&view=diff ============================================================================== --- sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/jmx/RequestProcessorMBean.java (original) +++ sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/jmx/RequestProcessorMBean.java Thu Jul 21 22:28:51 2011 @@ -22,9 +22,9 @@ package org.apache.sling.engine.jmx; */ public interface RequestProcessorMBean { - long getCount(); + long getRequestsCount(); - double getMeanRequestDuration(); + double getMeanRequestDurationMsec(); void resetStatistics();