Return-Path: Delivered-To: apmail-archiva-commits-archive@www.apache.org Received: (qmail 99218 invoked from network); 6 Dec 2010 16:35:14 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 6 Dec 2010 16:35:14 -0000 Received: (qmail 11451 invoked by uid 500); 6 Dec 2010 16:35:14 -0000 Delivered-To: apmail-archiva-commits-archive@archiva.apache.org Received: (qmail 11396 invoked by uid 500); 6 Dec 2010 16:35:13 -0000 Mailing-List: contact commits-help@archiva.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@archiva.apache.org Delivered-To: mailing list commits@archiva.apache.org Received: (qmail 11389 invoked by uid 99); 6 Dec 2010 16:35:13 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 06 Dec 2010 16:35:13 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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; Mon, 06 Dec 2010 16:35:12 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id E66542388993; Mon, 6 Dec 2010 16:34:52 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1042712 - /archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/systemStatus.jsp Date: Mon, 06 Dec 2010 16:34:52 -0000 To: commits@archiva.apache.org From: brett@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20101206163452.E66542388993@eris.apache.org> Author: brett Date: Mon Dec 6 16:34:52 2010 New Revision: 1042712 URL: http://svn.apache.org/viewvc?rev=1042712&view=rev Log: [MRM-1440] add current time as well, for comparison when troubleshooting captured results Merged from: r1042711 Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/systemStatus.jsp Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/systemStatus.jsp URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/systemStatus.jsp?rev=1042712&r1=1042711&r2=1042712&view=diff ============================================================================== --- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/systemStatus.jsp (original) +++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/systemStatus.jsp Mon Dec 6 16:34:52 2010 @@ -1,3 +1,4 @@ +<%@ page import="java.util.Date" %> <%-- ~ Licensed to the Apache Software Foundation (ASF) under one ~ or more contributor license agreements. See the NOTICE file @@ -122,10 +123,14 @@ -

Memory

+

Free Memory

${memoryStatus}

+

Current Time

+ +

<%= new Date() %>

+