Return-Path: Delivered-To: apmail-maven-continuum-commits-archive@www.apache.org Received: (qmail 2770 invoked from network); 21 Aug 2006 21:31:34 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 21 Aug 2006 21:31:34 -0000 Received: (qmail 69967 invoked by uid 500); 21 Aug 2006 21:31:34 -0000 Delivered-To: apmail-maven-continuum-commits-archive@maven.apache.org Received: (qmail 69939 invoked by uid 500); 21 Aug 2006 21:31:34 -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 69928 invoked by uid 99); 21 Aug 2006 21:31:34 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 21 Aug 2006 14:31:34 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 21 Aug 2006 14:31:33 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 2F38C1A981A; Mon, 21 Aug 2006 14:31:13 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r433367 - in /maven/continuum/trunk/continuum-webapp/src/main: java/org/apache/maven/continuum/web/action/GroupSummaryAction.java mdo/view-models.xml webapp/groupSummary.jsp Date: Mon, 21 Aug 2006 21:31:12 -0000 To: continuum-commits@maven.apache.org From: jmcconnell@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20060821213113.2F38C1A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: jmcconnell Date: Mon Aug 21 14:31:10 2006 New Revision: 433367 URL: http://svn.apache.org/viewvc?rev=433367&view=rev Log: fixed up the group summary page with more meaningful data, two parts are stubbed out as I hope kenney's work with build scheduling will make it easy to get the needed information Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/GroupSummaryAction.java maven/continuum/trunk/continuum-webapp/src/main/mdo/view-models.xml maven/continuum/trunk/continuum-webapp/src/main/webapp/groupSummary.jsp Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/GroupSummaryAction.java URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/GroupSummaryAction.java?rev=433367&r1=433366&r2=433367&view=diff ============================================================================== --- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/GroupSummaryAction.java (original) +++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/GroupSummaryAction.java Mon Aug 21 14:31:10 2006 @@ -62,6 +62,8 @@ //TODO: Create a summary jpox request so code will be more simple and performance will be better Collection projects = projectGroup.getProjects(); + groupModel.setNumProjects( projects.size() ); + Map buildResults = continuum.getLatestBuildResults(); Map buildResultsInSuccess = continuum.getBuildResultsInSuccess(); @@ -75,6 +77,11 @@ { Project project = (Project) i.next(); + if ( groupModel.getProjectType() == null ) + { + groupModel.setProjectType( project.getExecutorId() ); + } + ProjectSummary model = new ProjectSummary(); getLogger().debug( "GroupSummaryAction: building project model " + project.getName() ); @@ -136,6 +143,10 @@ getLogger().debug( "GroupSummaryAction: adding model to group " + model.getName() ); projectModels.add( model ); } + + //todo wire in the next scheduled build for the project group and a meaningful status message + groupModel.setNextScheduledBuild( "unknown" ); + groupModel.setStatusMessage( "none" ); groupModel.setNumSuccesses( numSuccesses ); groupModel.setNumFailures( numFailures ); Modified: maven/continuum/trunk/continuum-webapp/src/main/mdo/view-models.xml URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/mdo/view-models.xml?rev=433367&r1=433366&r2=433367&view=diff ============================================================================== --- maven/continuum/trunk/continuum-webapp/src/main/mdo/view-models.xml (original) +++ maven/continuum/trunk/continuum-webapp/src/main/mdo/view-models.xml Mon Aug 21 14:31:10 2006 @@ -153,6 +153,34 @@ String + numProjects + 1.0.0 + true + the number of projects in the project group + int + + + projectType + 1.0.0 + true + the type of project, maven2/maven1/ant/shell + String + + + statusMessage + 1.0.0 + false + a status message like, (building project X) + String + + + nextScheduledBuild + 1.0.0 + false + timestamp for the next scheduled build + String + + projects 1.0.0 Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/groupSummary.jsp URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/groupSummary.jsp?rev=433367&r1=433366&r2=433367&view=diff ============================================================================== --- maven/continuum/trunk/continuum-webapp/src/main/webapp/groupSummary.jsp (original) +++ maven/continuum/trunk/continuum-webapp/src/main/webapp/groupSummary.jsp Mon Aug 21 14:31:10 2006 @@ -36,11 +36,11 @@ Project Type: - <- Maven2/Maven1/Ant/Shell -> + ${group.projectType} Number of Projects: - <- 15 -> + ${group.numProjects} Build Status: @@ -66,11 +66,11 @@ Next Scheduled Build: - <- timestamp -> + ${group.nextScheduledBuild} Status Message: - <- currently building Module X -> + ${group.statusMessage}