You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by ev...@apache.org on 2007/07/12 12:10:05 UTC
svn commit: r555562 - in /maven/continuum/trunk/continuum-webapp/src/main:
resources/localization/Continuum.properties
webapp/WEB-INF/jsp/buildResult.jsp webapp/WEB-INF/jsp/buildResults.jsp
Author: evenisse
Date: Thu Jul 12 03:10:00 2007
New Revision: 555562
URL: http://svn.apache.org/viewvc?view=rev&rev=555562
Log:
Readd duration time that was in 1.0.3
Modified:
maven/continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties
maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildResult.jsp
maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildResults.jsp
Modified: maven/continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties?view=diff&rev=555562&r1=555561&r2=555562
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties Thu Jul 12 03:10:00 2007
@@ -413,6 +413,8 @@
buildResults.buildNumber = Build #
buildResults.startTime = Start Time
buildResults.endTime = End Time
+buildResults.duration = Duration
+buildResults.startedSince = Started since
buildResults.state = State
# ----------------------------------------------------------------------
@@ -422,6 +424,8 @@
buildResult.section.title = Build result for {0}
buildResult.startTime = Start Time
buildResult.endTime = End Time
+buildResult.duration = Duration
+buildResult.startedSince = Started since
buildResult.trigger = Build Trigger
buildResult.state = State
buildResult.buildNumber = Build#
Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildResult.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildResult.jsp?view=diff&rev=555562&r1=555561&r2=555562
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildResult.jsp (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildResult.jsp Thu Jul 12 03:10:00 2007
@@ -46,6 +46,10 @@
<c1:data label="%{getText('buildResult.endTime')}">
<ww:param name="after"><c1:date name="buildResult.endTime"/></ww:param>
</c1:data>
+ <c1:data label="%{getText('buildResult.duration')}">
+ <ww:param name="after">
+ <ww:if test="${buildResult.endTime == 0}"><ww:text name="buildResult.startedSince"/></ww:if> <ww:property value="buildResult.durationTime"/></ww:param>
+ </c1:data>
<c1:data label="%{getText('buildResult.trigger')}">
<ww:param name="after"><ww:text name="buildResult.trigger.%{buildResult.trigger}"/></ww:param>
</c1:data>
Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildResults.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildResults.jsp?view=diff&rev=555562&r1=555561&r2=555562
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildResults.jsp (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildResults.jsp Thu Jul 12 03:10:00 2007
@@ -61,6 +61,16 @@
</ec:column>
<ec:column property="startTime" title="buildResults.startTime" cell="date"/>
<ec:column property="endTime" title="buildResults.endTime" cell="date"/>
+ <ec:column property="duration" title=" ">
+ <c:choose>
+ <c:when test="${buildResult.endTime gt 0}">
+ <ww:text name="buildResults.duration"/> : ${buildResult.durationTime}
+ </c:when>
+ <c:otherwise>
+ <ww:text name="buildResults.startedSince"/> : ${buildResult.elapsedTime}
+ </c:otherwise>
+ </c:choose>
+ </ec:column>
<ec:column property="state" title="buildResults.state" cell="org.apache.maven.continuum.web.view.buildresults.StateCell"/>
<ec:column property="actions" title=" ">
<ww:url id="buildResultUrl" action="buildResult">