[Jboss-svn-commits] JBL Code SVN: r1345 - in trunk/labs/kosmos: src/java/hu/midori/kosmos/model web-portlet/WEB-INF/classes/hu/midori/kosmos/portlet/cc web-portlet/pages

[<jbo...@li...>]

Author: aron.gombas
Date: 2005-10-08 14:52:43 -0400 (Sat, 08 Oct 2005)
New Revision: 1345

Modified:
   trunk/labs/kosmos/src/java/hu/midori/kosmos/model/CcProject.java
   trunk/labs/kosmos/web-portlet/WEB-INF/classes/hu/midori/kosmos/portlet/cc/ccmonitoringportlet.properties
   trunk/labs/kosmos/web-portlet/WEB-INF/classes/hu/midori/kosmos/portlet/cc/ccmonitoringportlet_hu.properties
   trunk/labs/kosmos/web-portlet/pages/cc_monitoring.jsp
Log:
CC: lastBuildAge property added

Modified: trunk/labs/kosmos/src/java/hu/midori/kosmos/model/CcProject.java
===================================================================
--- trunk/labs/kosmos/src/java/hu/midori/kosmos/model/CcProject.java	2005-10-08 18:51:54 UTC (rev 1344)
+++ trunk/labs/kosmos/src/java/hu/midori/kosmos/model/CcProject.java	2005-10-08 18:52:43 UTC (rev 1345)
@@ -86,7 +86,7 @@
 
     public Date getTimestamp() {
         return timestamp;
-    }
+    }    
 
     public int getModifications() {
         return modifications;
@@ -128,6 +128,11 @@
         return ((double)getTestsSucceded())/tests;
     }
     
+    /** Returns its age in milliseconds. */
+    public long getLastBuildAge() {
+        return new Date().getTime() - timestamp.getTime();
+    }   
+    
     @Override
     public String toString() {
         return String.format("%s, %s, %s, %s, %d, %s, %d/%d/%d, %s", name, buildLabel, status, timestamp, modifications, buildTime, tests, failures, errors, testsPerCategoryChartUrl);

Modified: trunk/labs/kosmos/web-portlet/WEB-INF/classes/hu/midori/kosmos/portlet/cc/ccmonitoringportlet.properties
===================================================================
--- trunk/labs/kosmos/web-portlet/WEB-INF/classes/hu/midori/kosmos/portlet/cc/ccmonitoringportlet.properties	2005-10-08 18:51:54 UTC (rev 1344)
+++ trunk/labs/kosmos/web-portlet/WEB-INF/classes/hu/midori/kosmos/portlet/cc/ccmonitoringportlet.properties	2005-10-08 18:52:43 UTC (rev 1345)
@@ -4,12 +4,13 @@
 portlet.help=This portlet monitors the continuous integration builds managed by <a href="http://cruisecontrol.sourceforge.net">CruiseControl</a>.<br/>Please see the manual for details about the features and configuration.
 
 ccproject.name=Project
-ccproject.buildLabel=Build Label
+ccproject.lastBuildLabel=Build Label
 ccproject.modifications=modifications
 ccproject.status=Status
 ccproject.successRate=Test Success Rate
 ccproject.testDetails=Test Details
 ccproject.timestamp=Timestamp
+ccproject.lastBuildAge=Last Build Age
 
 ccproject.buildTime=Build Time
 ccproject.testsSucceded=Tests Succeded

Modified: trunk/labs/kosmos/web-portlet/WEB-INF/classes/hu/midori/kosmos/portlet/cc/ccmonitoringportlet_hu.properties
===================================================================
--- trunk/labs/kosmos/web-portlet/WEB-INF/classes/hu/midori/kosmos/portlet/cc/ccmonitoringportlet_hu.properties	2005-10-08 18:51:54 UTC (rev 1344)
+++ trunk/labs/kosmos/web-portlet/WEB-INF/classes/hu/midori/kosmos/portlet/cc/ccmonitoringportlet_hu.properties	2005-10-08 18:52:43 UTC (rev 1345)
@@ -4,12 +4,13 @@
 portlet.help=Ez a portlet ki a <a href="http://cruisecontrol.sourceforge.net">CruiseControl</a> al menedzselt <i>continuous integration build</i>-eket.<br/>Olvasd el a kket, ha rletekre vagy kncsi a funkcil vagy a besokkal kapcsolatban.
 
 ccproject.name=Projekt
-ccproject.buildLabel=Build Ce
+ccproject.lastBuildLabel=Build Ce
 ccproject.modifications=voztat ccproject.status=Stsz
 ccproject.successRate=Unit Teszt Sikerar
 ccproject.testDetails=Unit Tesztek Rletesen
 ccproject.timestamp=Idcproject.lastBuildAge=Build Kora
 
 ccproject.buildTime=Build Idtam
 ccproject.testsSucceded=Sikeres Unit Tesztek

Modified: trunk/labs/kosmos/web-portlet/pages/cc_monitoring.jsp
===================================================================
--- trunk/labs/kosmos/web-portlet/pages/cc_monitoring.jsp	2005-10-08 18:51:54 UTC (rev 1344)
+++ trunk/labs/kosmos/web-portlet/pages/cc_monitoring.jsp	2005-10-08 18:52:43 UTC (rev 1345)
@@ -19,7 +19,7 @@
     </c:choose>
   </display:column>
   <display:column titleKey="ccproject.name" property="name" sortable="true"/>
-  <display:column titleKey="ccproject.buildLabel" sortProperty="buildLabel" sortable="true">
+  <display:column titleKey="ccproject.lastBuildLabel" sortProperty="buildLabel" sortable="true">
     <c:out value="${projectsIt.buildLabel}"/>
     &nbsp;(<c:out value="${projectsIt.modifications}"/>&nbsp;<fmt:message key="ccproject.modifications"/>)
   </display:column>
@@ -65,6 +65,9 @@
   <display:column titleKey="ccproject.timestamp" style="white-space:nowrap" sortProperty="timestamp" sortable="true">
     <fmt:formatDate value="${projectsIt.timestamp}" pattern="dd/MMM/yy hh:mm"/>
   </display:column>
+  <display:column titleKey="ccproject.lastBuildAge" style="white-space:nowrap" sortProperty="lastBuildAge" sortable="true">
+    <kosmos:age time="${projectsIt.lastBuildAge}"/>
+  </display:column>
   <display:footer>
     <%@include file="includes/table_footer.jsp"%>
   </display:footer>