Author: jmcconnell
Date: Mon Aug 21 13:55:47 2006
New Revision: 433355
URL: http://svn.apache.org/viewvc?rev=433355&view=rev
Log:
reworked the group summary page so it is more of an actually summary which links off to the projectGroupSummary which gives the detailed information about the particular project group. Left placeholders in spots on the front summary page as we will probably need to create another model object for rendering that those project group tables since they are a different aggregation of information then we have atm.
Added:
maven/continuum/trunk/continuum-webapp/src/main/webapp/projectGroupMembers.jsp (contents, props changed)
- copied, changed from r432677, maven/continuum/trunk/continuum-webapp/src/main/webapp/projectGroupView.jsp
maven/continuum/trunk/continuum-webapp/src/main/webapp/projectGroupSummary.jsp (with props)
Removed:
maven/continuum/trunk/continuum-webapp/src/main/webapp/projectGroupView.jsp
Modified:
maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectGroupAction.java
maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/SummaryAction.java
maven/continuum/trunk/continuum-webapp/src/main/resources/xwork.xml
maven/continuum/trunk/continuum-webapp/src/main/webapp/groupSummary.jsp
maven/continuum/trunk/continuum-webapp/src/main/webapp/projectGroupBuildDefinition.jsp
maven/continuum/trunk/continuum-webapp/src/main/webapp/projectGroupNotifier.jsp
maven/continuum/trunk/continuum-webapp/src/main/webapp/summary.jsp
Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectGroupAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectGroupAction.java?rev=433355&r1=433354&r2=433355&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectGroupAction.java (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectGroupAction.java Mon Aug 21 13:55:47 2006
@@ -37,7 +37,7 @@
private boolean confirmed;
- public String view()
+ public String summary()
{
try
{
@@ -52,18 +52,24 @@
return SUCCESS;
}
+ public String members()
+ {
+ return summary();
+ }
+
public String buildDefinitions()
{
- return view();
+ return summary();
}
public String notifiers()
{
- return view();
+ return summary();
}
public String remove()
{
+ //todo add confirm page like removing build definition
try
{
continuum.removeProjectGroup( projectGroupId );
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=433355&r1=433354&r2=433355&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 Aug 21 13:55:47 2006
@@ -30,15 +30,13 @@
/**
* @author Emmanuel Venisse
* @version $Id$
- *
- * @plexus.component
- * role="com.opensymphony.xwork.Action"
- * role-hint="summary"
+ * @plexus.component role="com.opensymphony.xwork.Action"
+ * role-hint="summary"
*/
public class SummaryAction
extends ContinuumActionSupport
-{
- private int projectGroupId = -1;
+{
+ private int projectGroupId;
private int nbSuccesses;
@@ -47,26 +45,14 @@
private int nbErrors;
private List summary;
-
+
public String execute()
throws ContinuumException
{
Collection projects;
- // original logic on this page shows all projects across project groups, however if projectGroupId
- // is set then display only those projects in the given group.
- if ( projectGroupId == -1 )
- {
- getLogger().debug("SummaryAction: serving up all projects");
- projects = continuum.getProjects();
- }
- else
- {
- getLogger().debug("SummaryAction: serving up project id -> " + projectGroupId );
-
- //TODO: Create a summary jpox request so code will be more simple and performance will be better
- projects = continuum.getProjectsInGroup( projectGroupId );
- }
+ //TODO: Create a summary jpox request so code will be more simple and performance will be better
+ projects = continuum.getProjectsInGroup( projectGroupId );
Map buildResults = continuum.getLatestBuildResults();
Modified: maven/continuum/trunk/continuum-webapp/src/main/resources/xwork.xml
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/resources/xwork.xml?rev=433355&r1=433354&r2=433355&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/resources/xwork.xml (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/resources/xwork.xml Mon Aug 21 13:55:47 2006
@@ -128,8 +128,12 @@
-
- projectGroupView.jsp
+
+ projectGroupMembers.jsp
+
+
+
+ projectGroupSummary.jsp
@@ -141,7 +145,7 @@
- projectGroupView
+ projectGroupSummary
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=433355&r1=433354&r2=433355&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 13:55:47 2006
@@ -10,68 +10,72 @@
+ 
+ 
+ 
+ 
-