continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jmcconn...@apache.org
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 GMT
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 @@
           <type>String</type>
         </field>
         <field>
+          <name>numProjects</name>
+          <version>1.0.0</version>
+          <required>true</required>
+          <description>the number of projects in the project group</description>
+          <type>int</type>
+        </field>
+        <field>
+          <name>projectType</name>
+          <version>1.0.0</version>
+          <required>true</required>
+          <description>the type of project, maven2/maven1/ant/shell</description>
+          <type>String</type>
+        </field>
+        <field>
+          <name>statusMessage</name>
+          <version>1.0.0</version>
+          <required>false</required>
+          <description>a status message like, (building project X)</description>
+          <type>String</type>
+        </field>
+        <field>
+         <name>nextScheduledBuild</name>
+          <version>1.0.0</version>
+          <required>false</required>
+          <description>timestamp for the next scheduled build</description>
+          <type>String</type>
+        </field>
+        <field>
           <name>projects</name>
           <version>1.0.0</version>
           <description></description>

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 @@
         </tr>
         <tr>
           <td>Project Type:</td>
-          <td><- Maven2/Maven1/Ant/Shell -></td>
+          <td>${group.projectType}</td>
         </tr>
         <tr>
           <td>Number of Projects:</td>
-          <td><- 15 -></td>
+          <td>${group.numProjects}</td>
         </tr>
         <tr>
           <td>Build Status:</td>
@@ -66,11 +66,11 @@
         </tr>
         <tr>
           <td>Next Scheduled Build:</td>
-          <td><- timestamp -></td>
+          <td>${group.nextScheduledBuild}</td>
         </tr>
         <tr>
           <td>Status Message:</td>
-          <td><- currently building Module X -></td>
+          <td>${group.statusMessage}</td>
         </tr>
       </table>
       <hr/>



Mime
View raw message