From continuum-commits-return-3588-apmail-maven-continuum-commits-archive=maven.apache.org@maven.apache.org Mon Oct 22 12:49:30 2007 Return-Path: Delivered-To: apmail-maven-continuum-commits-archive@www.apache.org Received: (qmail 67099 invoked from network); 22 Oct 2007 12:49:30 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 22 Oct 2007 12:49:30 -0000 Received: (qmail 14271 invoked by uid 500); 22 Oct 2007 12:49:18 -0000 Delivered-To: apmail-maven-continuum-commits-archive@maven.apache.org Received: (qmail 14240 invoked by uid 500); 22 Oct 2007 12:49:18 -0000 Mailing-List: contact continuum-commits-help@maven.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: continuum-dev@maven.apache.org Delivered-To: mailing list continuum-commits@maven.apache.org Received: (qmail 14227 invoked by uid 99); 22 Oct 2007 12:49:17 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 22 Oct 2007 05:49:17 -0700 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 22 Oct 2007 12:49:29 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 556BF1A9832; Mon, 22 Oct 2007 05:48:39 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r587078 - in /maven/continuum/trunk/continuum-webapp/src/main: java/org/apache/maven/continuum/web/action/SummaryAction.java mdo/view-models.mdo webapp/WEB-INF/jsp/components/projectSummaryComponent.jsp Date: Mon, 22 Oct 2007 12:48:36 -0000 To: continuum-commits@maven.apache.org From: evenisse@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20071022124839.556BF1A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: evenisse Date: Mon Oct 22 05:48:33 2007 New Revision: 587078 URL: http://svn.apache.org/viewvc?rev=587078&view=rev Log: Fix rendering of the latest build end time when the project is building Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/SummaryAction.java maven/continuum/trunk/continuum-webapp/src/main/mdo/view-models.mdo maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectSummaryComponent.jsp Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/SummaryAction.java URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/SummaryAction.java?rev=587078&r1=587077&r2=587078&view=diff ============================================================================== --- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/SummaryAction.java (original) +++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/SummaryAction.java Mon Oct 22 05:48:33 2007 @@ -19,16 +19,6 @@ * under the License. */ -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.Comparator; -import java.util.Date; -import java.util.Iterator; -import java.util.List; -import java.util.Map; - import org.apache.maven.continuum.ContinuumException; import org.apache.maven.continuum.model.project.BuildResult; import org.apache.maven.continuum.model.project.Project; @@ -37,6 +27,14 @@ import org.apache.maven.continuum.web.model.GroupSummary; import org.apache.maven.continuum.web.model.ProjectSummary; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.Comparator; +import java.util.Iterator; +import java.util.List; +import java.util.Map; + /** * Used to render the list of projects in the project group page. * @@ -72,7 +70,7 @@ //TODO: Create a summary jpox request so code will be more simple and performance will be better projectsInGroup = getContinuum().getProjectsInGroup( projectGroupId ); - + Map buildResults = getContinuum().getLatestBuildResults( projectGroupId ); Map buildResultsInSuccess = getContinuum().getBuildResultsInSuccess( projectGroupId ); @@ -138,7 +136,8 @@ { model.setLatestBuildId( latestBuild.getId() ); populateGroupSummary( latestBuild ); - model.setLastBuildDateTime( dateFormatter.format( new Date( latestBuild.getEndTime() ) ) ); + model.setLastBuildDateTime( latestBuild.getEndTime() ); + model.setLastBuildDuration( latestBuild.getDurationTime() ); } } Modified: maven/continuum/trunk/continuum-webapp/src/main/mdo/view-models.mdo URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/mdo/view-models.mdo?rev=587078&r1=587077&r2=587078&view=diff ============================================================================== --- maven/continuum/trunk/continuum-webapp/src/main/mdo/view-models.mdo (original) +++ maven/continuum/trunk/continuum-webapp/src/main/mdo/view-models.mdo Mon Oct 22 05:48:33 2007 @@ -148,7 +148,14 @@ 1.0.0 true last build dateTime of the project - String + long + + + lastBuildDuration + 1.0.0 + true + last build duration of the project + String Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectSummaryComponent.jsp URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectSummaryComponent.jsp?rev=587078&r1=587077&r2=587078&view=diff ============================================================================== --- maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectSummaryComponent.jsp (original) +++ maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectSummaryComponent.jsp Mon Oct 22 05:48:33 2007 @@ -98,7 +98,7 @@ - +