continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From eveni...@apache.org
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 GMT
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 @@
           <version>1.0.0</version>
           <required>true</required>
           <description>last build dateTime of the project</description>
-          <type>String</type>          
+          <type>long</type>
+        </field>
+        <field>
+          <name>lastBuildDuration</name>
+          <version>1.0.0</version>
+          <required>true</required>
+          <description>last build duration of the project</description>
+          <type>String</type>
         </field>
       </fields>
     </class>

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 @@
           </c:otherwise>
         </c:choose>
       </ec:column>
-      <ec:column property="lastBuildDateTime" title="summary.projectTable.lastBuildDateTime"
width="30%"/> 
+      <ec:column property="lastBuildDateTime" title="summary.projectTable.lastBuildDateTime"
width="30%" cell="date"/>
       <ec:column property="buildNowAction" title="&nbsp;" width="1%">
         <c:choose>
           <c:when test="${project.inBuildingQueue}">



Mime
View raw message