continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From eveni...@apache.org
Subject svn commit: r430004 - in /maven/continuum/trunk: continuum-api/src/main/java/org/apache/maven/continuum/ continuum-core/src/main/java/org/apache/maven/continuum/ continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ continuum-webapp/src...
Date Wed, 09 Aug 2006 09:01:53 GMT
Author: evenisse
Date: Wed Aug  9 02:01:52 2006
New Revision: 430004

URL: http://svn.apache.org/viewvc?rev=430004&view=rev
Log:
[CONTINUUM-284] Add group display on front page
Submitted by: Jesse McConnell

Added:
    maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/GroupSummaryAction.java
  (with props)
    maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/model/GroupSummaryModel.java
  (with props)
    maven/continuum/trunk/continuum-webapp/src/main/webapp/groupSummary.jsp   (with props)
Modified:
    maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/Continuum.java
    maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java
    maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/SummaryAction.java
    maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/model/SummaryProjectModel.java
    maven/continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties
    maven/continuum/trunk/continuum-webapp/src/main/resources/webwork.properties
    maven/continuum/trunk/continuum-webapp/src/main/resources/xwork.xml
    maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/web.xml
    maven/continuum/trunk/continuum-webapp/src/main/webapp/css/tigris.css
    maven/continuum/trunk/continuum-webapp/src/main/webapp/navigations/Menu.jsp
    maven/continuum/trunk/continuum-webapp/src/main/webapp/summary.jsp

Modified: maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/Continuum.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/Continuum.java?rev=430004&r1=430003&r2=430004&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/Continuum.java
(original)
+++ maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/Continuum.java
Wed Aug  9 02:01:52 2006
@@ -43,6 +43,15 @@
     String ROLE = Continuum.class.getName();
 
     // ----------------------------------------------------------------------
+    // Project Groups
+    // ----------------------------------------------------------------------
+
+    public Collection getAllProjectGroupsWithProjects();
+
+    public Collection getProjectsInGroup( int projectGroupId )
+        throws ContinuumException;
+    
+    // ----------------------------------------------------------------------
     // Project
     // ----------------------------------------------------------------------
 

Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java?rev=430004&r1=430003&r2=430004&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java
(original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java
Wed Aug  9 02:01:52 2006
@@ -2258,6 +2258,31 @@
         }
     }
 
+    public Collection getAllProjectGroupsWithProjects()
+    {
+        // todo check why this interface isn't throwing exceptions on this guy
+        return store.getAllProjectGroupsWithProjects();
+
+    }
+
+    public Collection getProjectsInGroup( int projectGroupId )
+        throws ContinuumException
+    {
+        try
+        {
+            return store.getProjectGroupWithProjects( projectGroupId ).getProjects();
+        }
+        catch ( ContinuumObjectNotFoundException e )
+        {
+            throw new ContinuumException( "Unable to find the requested project", e );
+        }
+        catch ( ContinuumStoreException e )
+        {
+            throw new ContinuumException( "Error retrieving the requested project", e );
+        }
+    }
+
+
     // ----------------------------------------------------------------------
     // Private Utilities
     // ----------------------------------------------------------------------

Added: 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=430004&view=auto
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/GroupSummaryAction.java
(added)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/GroupSummaryAction.java
Wed Aug  9 02:01:52 2006
@@ -0,0 +1,174 @@
+package org.apache.maven.continuum.web.action;
+
+import org.codehaus.plexus.xwork.action.PlexusActionSupport;
+import org.apache.maven.continuum.Continuum;
+import org.apache.maven.continuum.web.model.SummaryProjectModel;
+import org.apache.maven.continuum.web.model.GroupSummaryModel;
+import org.apache.maven.continuum.model.project.Project;
+import org.apache.maven.continuum.model.project.BuildResult;
+import org.apache.maven.continuum.model.project.ProjectGroup;
+
+import java.util.List;
+import java.util.Collection;
+import java.util.Map;
+import java.util.ArrayList;
+import java.util.Iterator;
+/*
+ * Copyright 2005 The Codehaus.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
+ * @version $Id$
+ *
+ * @plexus.component
+ *   role="com.opensymphony.xwork.Action"
+ *   role-hint="groupSummary"
+ */
+public class GroupSummaryAction
+    extends PlexusActionSupport
+{
+    /**
+     * @plexus.requirement
+     */
+    private Continuum continuum;
+
+    
+
+    private List groups;
+
+    public String execute()
+        throws Exception
+    {
+        try
+        {
+            groups = new ArrayList();
+
+            Collection projectGroups = continuum.getAllProjectGroupsWithProjects();
+
+            for ( Iterator j = projectGroups.iterator(); j.hasNext(); )
+            {
+                ProjectGroup projectGroup = (ProjectGroup) j.next();
+
+                getLogger().info("GroupSummaryAction: building group " + projectGroup.getName()
);
+
+                GroupSummaryModel groupModel = new GroupSummaryModel();
+                groupModel.setId( projectGroup.getId() );
+                groupModel.setGroupId( projectGroup.getGroupId() );
+                groupModel.setName( projectGroup.getName() );
+                groupModel.setDescription( projectGroup.getDescription() );
+
+                //TODO: Create a summary jpox request so code will be more simple and performance
will be better
+                Collection projects = projectGroup.getProjects();
+
+                Map buildResults = continuum.getLatestBuildResults();
+
+                Map buildResultsInSuccess = continuum.getBuildResultsInSuccess();
+
+                List projectModels = new ArrayList();
+                int numSuccesses = 0;
+                int numFailures = 0;
+                int numErrors = 0;
+
+                for ( Iterator i = projects.iterator(); i.hasNext(); )
+                {
+                    Project project = (Project) i.next();
+
+                    SummaryProjectModel model = new SummaryProjectModel();
+
+                    getLogger().info("GroupSummaryAction: building project model " + project.getName()
);
+
+                    model.setId( project.getId() );
+
+                    model.setName( project.getName() );
+
+                    model.setVersion( project.getVersion() );
+
+                    model.setProjectGroupName( project.getProjectGroup().getName() );
+
+                    if ( continuum.isInBuildingQueue( project.getId() ) ||
+                        continuum.isInCheckoutQueue( project.getId() ) )
+                    {
+                        model.setInQueue( true );
+                    }
+                    else
+                    {
+                        model.setInQueue( false );
+                    }
+
+                    model.setState( project.getState() );
+
+                    if ( project.getState() == 2 )
+                    {
+                        numSuccesses++;
+                    }
+                    else if ( project.getState() == 3 )
+                    {
+                        numFailures++;
+                    }
+                    else if ( project.getState() == 4 )
+                    {
+                        numErrors++;
+                    }
+
+                    model.setBuildNumber( project.getBuildNumber() );
+
+                    if ( buildResultsInSuccess != null )
+                    {
+                        BuildResult buildInSuccess =
+                            (BuildResult) buildResultsInSuccess.get( new Integer( project.getId()
) );
+
+                        if ( buildInSuccess != null )
+                        {
+                            model.setBuildInSuccessId( buildInSuccess.getId() );
+                        }
+                    }
+
+                    if ( buildResults != null )
+                    {
+                        BuildResult latestBuild = (BuildResult) buildResults.get( new Integer(
project.getId() ) );
+
+                        if ( latestBuild != null )
+                        {
+                            model.setLatestBuildId( latestBuild.getId() );
+                        }
+                    }
+                    getLogger().info( "GroupSummaryAction: adding model to group " + model.getName()
);
+                    projectModels.add( model );
+                }
+
+                groupModel.setNumSuccesses( numSuccesses );
+                groupModel.setNumFailures( numFailures );
+                groupModel.setNumErrors( numErrors );
+                groupModel.setProjects( projectModels );
+                getLogger().info( "GroupSummaryAction: adding group to groups list " + groupModel.getName()
);
+                groups.add( groupModel );
+            }
+
+        }
+        catch ( Exception e )
+        {
+            e.printStackTrace();
+        }
+
+        return SUCCESS;
+    }
+
+    public List getGroups()
+    {
+        return groups;
+    }
+
+}

Propchange: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/GroupSummaryAction.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/GroupSummaryAction.java
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

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=430004&r1=430003&r2=430004&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
Wed Aug  9 02:01:52 2006
@@ -44,6 +44,8 @@
      */
     private Continuum continuum;
 
+    private int projectGroupId = -1;
+
     private int nbSuccesses;
 
     private int nbFailures;
@@ -57,8 +59,22 @@
     {
         try
         {
-            //TODO: Create a summary jpox request so code will be more simple and performance
will be better
-            Collection projects = continuum.getProjects();
+            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 );
+            }
 
             Map buildResults = continuum.getLatestBuildResults();
 
@@ -155,5 +171,16 @@
     public List getProjects()
     {
         return summary;
+    }
+
+
+    public int getProjectGroupId()
+    {
+        return projectGroupId;
+    }
+
+    public void setProjectGroupId( int projectGroupId )
+    {
+        this.projectGroupId = projectGroupId;
     }
 }

Added: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/model/GroupSummaryModel.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/model/GroupSummaryModel.java?rev=430004&view=auto
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/model/GroupSummaryModel.java
(added)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/model/GroupSummaryModel.java
Wed Aug  9 02:01:52 2006
@@ -0,0 +1,145 @@
+package org.apache.maven.continuum.web.model;
+
+import java.util.List;
+import java.io.Serializable;
+
+/*
+ * Copyright 2004-2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+/**
+ * GroupSummaryModel:
+ *
+ * @author: Jesse McConnell <jmcconnell@apache.org>
+ * @version: $ID:$
+ */
+public class GroupSummaryModel
+    implements Serializable
+{
+    /**
+     * Field id
+     */
+    private int id;
+
+    /**
+     * Field groupId
+     */
+    private String groupId;
+
+
+    /**
+     * Field name
+     */
+    private String name;
+
+    /**
+     * Field description
+     */
+    private String description;
+
+    /**
+     * Field projects
+     */
+    private List projects;
+
+    private int numSuccesses;
+
+    private int numFailures;
+
+    private int numErrors;
+
+    public int getId()
+    {
+        return id;
+    }
+
+    public void setId( int id )
+    {
+        this.id = id;
+    }
+
+    public String getGroupId()
+    {
+        return groupId;
+    }
+
+    public void setGroupId( String groupId )
+    {
+        this.groupId = groupId;
+    }
+
+    public String getName()
+    {
+        return name;
+    }
+
+    public void setName( String name )
+    {
+        this.name = name;
+    }
+
+    public String getDescription()
+    {
+        return description;
+    }
+
+    public void setDescription( String description )
+    {
+        this.description = description;
+    }
+
+
+    public List getProjects()
+    {
+        return projects;
+    }
+
+    public void setProjects( List projects )
+    {
+        this.projects = projects;
+    }
+
+
+    public int getNumSuccesses()
+    {
+        return numSuccesses;
+    }
+
+    public void setNumSuccesses( int numSuccesses )
+    {
+        this.numSuccesses = numSuccesses;
+    }
+
+    public int getNumFailures()
+    {
+        return numFailures;
+    }
+
+    public void setNumFailures( int numFailures )
+    {
+        this.numFailures = numFailures;
+    }
+
+    public int getNumErrors()
+    {
+        return numErrors;
+    }
+
+    public void setNumErrors( int numErrors )
+    {
+        this.numErrors = numErrors;
+    }
+}

Propchange: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/model/GroupSummaryModel.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/model/GroupSummaryModel.java
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/model/SummaryProjectModel.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/model/SummaryProjectModel.java?rev=430004&r1=430003&r2=430004&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/model/SummaryProjectModel.java
(original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/model/SummaryProjectModel.java
Wed Aug  9 02:01:52 2006
@@ -1,5 +1,7 @@
 package org.apache.maven.continuum.web.model;
 
+import java.io.Serializable;
+
 /*
  * Copyright 2004-2005 The Apache Software Foundation.
  *
@@ -21,6 +23,7 @@
  * @version $Id$
  */
 public class SummaryProjectModel
+    implements Serializable
 {
     private int id = -1;
     private String name;

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?rev=430004&r1=430003&r2=430004&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties
(original)
+++ maven/continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties
Wed Aug  9 02:01:52 2006
@@ -70,6 +70,13 @@
 summary.buildNow = Build Now
 
 # ----------------------------------------------------------------------
+# Page: Group Summary
+# ----------------------------------------------------------------------
+groups.page.title = Continuum - Group Summary
+groups.section.title = Project Group:
+groups.manage.label = Manage Group 
+
+# ----------------------------------------------------------------------
 # Page: Configuration
 # ----------------------------------------------------------------------
 configuration.page.title = Continuum - Configuration

Modified: maven/continuum/trunk/continuum-webapp/src/main/resources/webwork.properties
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/resources/webwork.properties?rev=430004&r1=430003&r2=430004&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/resources/webwork.properties (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/resources/webwork.properties Wed Aug 
9 02:01:52 2006
@@ -1,3 +1,4 @@
+webwork.mapper.class =  com.opensymphony.webwork.dispatcher.mapper.DefaultActionMapper
 webwork.objectFactory = org.codehaus.plexus.xwork.PlexusObjectFactory
 #webwork.tag.altSyntax = true
 

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=430004&r1=430003&r2=430004&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/resources/xwork.xml (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/resources/xwork.xml Wed Aug  9 02:01:52
2006
@@ -48,6 +48,10 @@
       <result name="success">summary.jsp</result>
     </action>
 
+    <action name="groupSummary" class="groupSummary">
+      <result name="success">groupSummary.jsp</result>
+    </action>
+
     <action name="addMavenTwoProject" class="addMavenTwoProject">
       <result name="input">addMavenTwoProject.jsp</result>
       <result name="success" type="redirect">summary.action</result>

Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/web.xml?rev=430004&r1=430003&r2=430004&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/web.xml (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/web.xml Wed Aug  9 02:01:52
2006
@@ -6,7 +6,7 @@
 
 <web-app>
 
-  <display-name>Plexus and WebWork Test App</display-name>
+  <display-name>Continuum Webapp</display-name>
 
   <context-param>
     <param-name>extremecomponentsPreferencesLocation</param-name>
@@ -19,11 +19,6 @@
   </context-param>
 
   <filter>
-    <filter-name>webwork-cleanup</filter-name>
-    <filter-class>com.opensymphony.webwork.dispatcher.ActionContextCleanUp</filter-class>
-  </filter>
-
-  <filter>
     <filter-name>sitemesh</filter-name>
     <filter-class>com.opensymphony.module.sitemesh.filter.PageFilter</filter-class>
   </filter>
@@ -34,11 +29,6 @@
   </filter>
 
   <filter-mapping>
-    <filter-name>webwork-cleanup</filter-name>
-    <url-pattern>/*</url-pattern>
-  </filter-mapping>
-
-  <filter-mapping>
     <filter-name>sitemesh</filter-name>
     <url-pattern>/*</url-pattern>
   </filter-mapping>
@@ -52,9 +42,28 @@
     <listener-class>org.codehaus.plexus.xwork.PlexusLifecycleListener</listener-class>
   </listener>
 
-  <welcome-file-list>
-    <welcome-file>Index.action</welcome-file>
+<!--  <listener>
+    <listener-class>org.codehaus.plexus.webwork.servlet.PlexusWebWorkApplicationLifecycleListener</listener-class>
+  </listener>
+ 
+  <listener>
+    <listener-class>org.codehaus.plexus.webwork.servlet.PlexusWebWorkSessionLifecycleListener</listener-class>
+  </listener>
+-->
+  <servlet>
+    <servlet-name>webwork</servlet-name>
+    <servlet-class>com.opensymphony.webwork.dispatcher.ServletDispatcher</servlet-class>
+  </servlet>
+
+  <servlet-mapping>
+    <servlet-name>webwork</servlet-name>
+    <url-pattern>*.action</url-pattern>
+  </servlet-mapping>
+<!--
+ <welcome-file-list>
+    <welcome-file>summary.action</welcome-file>
   </welcome-file-list>
+  -->
 
   <taglib>
     <taglib-uri>continuum</taglib-uri>

Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/css/tigris.css
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/css/tigris.css?rev=430004&r1=430003&r2=430004&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/css/tigris.css (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/css/tigris.css Wed Aug  9 02:01:52
2006
@@ -100,8 +100,9 @@
 
 
 .app h3 a:link, .app h3 a:visited, .app h4 a:link, .app h4 a:visited {
-	color: #fff !important;
-	/*text-decoration: underline;*/
+	color:black !important;
+    /* TODO was #fff causing white on white issues for me, so set it black */
+    /*text-decoration: underline;*/
 }
 
 .app h4 {
@@ -874,4 +875,4 @@
 .tablehead {color: #FFFFFF;
 }
 
-#footer {background: url(../images/footerborder.gif) 0 5px; padding: 10px 0px 8px 0px;}
\ No newline at end of file
+#footer {background: url(../images/footerborder.gif) 0 5px; padding: 10px 0px 8px 0px;}

Added: 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=430004&view=auto
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/groupSummary.jsp (added)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/groupSummary.jsp Wed Aug  9 02:01:52
2006
@@ -0,0 +1,79 @@
+<%@ taglib uri="/webwork" prefix="ww" %>
+<%@ taglib uri="/tld/extremecomponents" prefix="ec" %>
+<%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c' %>
+<html>
+<ww:i18n name="localization.Continuum">
+  <head>
+    <title><ww:text name="groups.page.title"/></title>
+  </head>
+
+  <body>
+  <div id="h3">
+
+    <c:forEach items="${groups}" var="group">
+
+      <ww:set name="group" value="${group}"/> 
+      <ww:url id="projectSummaryUrl" action="summary" namespace="/">
+        <ww:param name="projectGroupId" value="%{'${group.id}'}"/>
+      </ww:url>
+
+      <h3><ww:text name="groups.section.title"/>&nbsp;<ww:a href="%{projectSummaryUrl}">${group.name}</ww:a></h3>
+
+      <ec:table items="group.projects"
+                var="project"
+                showExports="false"
+                showPagination="false"
+                showStatusBar="false"
+                filterable="false">
+        <ec:row highlightRow="true">
+          <ec:column property="state" title="&nbsp;" width="1%" cell="org.apache.maven.continuum.web.view.StateCell"/>
+          <ec:column property="name" title="summary.projectTable.name" width="48%">
+            <c:url var="projectViewUrl" value="/projectView.action">
+              <c:param name="projectId" value="${project.id}"/>
+            </c:url>
+            <a href="<c:out value='${projectViewUrl}'/>">${project.name}</a>
+          </ec:column>
+          <ec:column property="version" title="summary.projectTable.version" width="13%"/>
+          <ec:column property="buildNumber" title="summary.projectTable.build" width="5%"
+                     cell="org.apache.maven.continuum.web.view.BuildCell"/>
+          <ec:column property="buildNowAction" title="&nbsp;" width="1%"
+                     cell="org.apache.maven.continuum.web.view.BuildNowCell" sortable="false"/>
+          <ec:column property="buildHistoryAction" title="&nbsp;" width="1%" sortable="false">
+            <c:choose>
+              <c:when test="${pageScope.project.latestBuildId > 0}">
+                <a href="<ww:url value="/buildResults.action?projectId="/>${pageScope.project.id}&projectName=${pageScope.project.name}"><img
+                    src="<ww:url value="/images/buildhistory.gif"/>" alt="Build History"
title="Build History"
+                    border="0"></a>
+              </c:when>
+              <c:otherwise>
+                <img src="<ww:url value="/images/buildhistory_disabled.gif"/>" alt="Build
History" title="Build History"
+                     border="0">
+              </c:otherwise>
+            </c:choose>
+          </ec:column>
+        </ec:row>
+      </ec:table>
+      <div class="functnbar3">
+        <ww:form action="buildProject.action" method="post">
+          <ww:submit value="%{getText('summary.buildAll')}">
+            <ww:param name="before">
+              <img src="<ww:url value="/images/icon_success_sml.gif"/>" alt="<ww:text
name="message.success"/>"
+                   title="<ww:text name="message.success"/>"/>
+              <ww:property value="${group.numSuccesses}"/>
+              <img src="<ww:url value="/images/icon_warning_sml.gif"/>" alt="<ww:text
name="message.failed"/>"
+                   title="<ww:text name="message.failed"/>"/>
+              <ww:property value="${group.numFailures}"/>
+              <img src="<ww:url value="/images/icon_error_sml.gif"/>" alt="<ww:text
name="message.error"/>"
+                   title="<ww:text name="message.error"/>"/>
+              <ww:property value="${group.numErrors}"/>
+            </ww:param>
+          </ww:submit>
+        </ww:form>
+      </div>
+    </c:forEach>
+
+
+  </div>
+  </body>
+</ww:i18n>
+</html>

Propchange: maven/continuum/trunk/continuum-webapp/src/main/webapp/groupSummary.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/continuum/trunk/continuum-webapp/src/main/webapp/groupSummary.jsp
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/navigations/Menu.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/navigations/Menu.jsp?rev=430004&r1=430003&r2=430004&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/navigations/Menu.jsp (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/navigations/Menu.jsp Wed Aug  9
02:01:52 2006
@@ -10,6 +10,9 @@
       <div class="body">
         <a href="<ww:url value="/summary.action"/>"><ww:text name="menu.continuum.showProjects"/></a>
       </div>
+      <div class="body">
+        <a href="<ww:url value="/groupSummary.action"/>"><ww:text name="menu.continuum.showProjectGroups"/></a>
+      </div>
     </div>
   </div>
   <div id="projectmenu" class="toolgroup">

Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/summary.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/summary.jsp?rev=430004&r1=430003&r2=430004&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/summary.jsp (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/summary.jsp Wed Aug  9 02:01:52
2006
@@ -9,7 +9,7 @@
     <body>
       <div id="h3">
         <h3><ww:text name="summary.section.title"/></h3>
-        <ww:set name="projects" value="projects" scope="request"/>
+        <%--<ww:set name="projects" value="projects" scope="request"/>--%>
         <ec:table items="projects"
                   var="project"
                   showExports="false"



Mime
View raw message