You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@gump.apache.org by st...@apache.org on 2006/03/23 23:22:14 UTC
svn commit: r388284 - in /gump/branches/Gump3/dynagump/src/main:
java/org/apache/gump/dynagump/actions/ webapp/ webapp/WEB-INF/
webapp/restricted/ webapp/results/
Author: stefano
Date: Thu Mar 23 14:22:11 2006
New Revision: 388284
URL: http://svn.apache.org/viewcvs?rev=388284&view=rev
Log:
now dynagump works
Added:
gump/branches/Gump3/dynagump/src/main/java/org/apache/gump/dynagump/actions/WorkspacesAction.java
- copied, changed from r387040, gump/branches/Gump3/dynagump/src/main/java/org/apache/gump/dynagump/actions/BuildsAction.java
gump/branches/Gump3/dynagump/src/main/webapp/error.jsp
- copied, changed from r387040, gump/branches/Gump3/dynagump/src/main/webapp/restricted/error/error.jsp
gump/branches/Gump3/dynagump/src/main/webapp/results/projectStatus.jsp
- copied, changed from r387040, gump/branches/Gump3/dynagump/src/main/webapp/restricted/results/projectStatus.jsp
gump/branches/Gump3/dynagump/src/main/webapp/results/projects.jsp
- copied, changed from r387040, gump/branches/Gump3/dynagump/src/main/webapp/restricted/results/projects.jsp
gump/branches/Gump3/dynagump/src/main/webapp/results/runStatus.jsp
- copied, changed from r387040, gump/branches/Gump3/dynagump/src/main/webapp/restricted/results/runStatus.jsp
gump/branches/Gump3/dynagump/src/main/webapp/results/runs.jsp
- copied, changed from r387040, gump/branches/Gump3/dynagump/src/main/webapp/restricted/results/runs.jsp
gump/branches/Gump3/dynagump/src/main/webapp/results/showProjectBuilds.jsp
- copied, changed from r387040, gump/branches/Gump3/dynagump/src/main/webapp/restricted/results/showProjectBuilds.jsp
gump/branches/Gump3/dynagump/src/main/webapp/results/topMenu.inc
gump/branches/Gump3/dynagump/src/main/webapp/results/workspaces.jsp
Removed:
gump/branches/Gump3/dynagump/src/main/java/org/apache/gump/dynagump/actions/BuildsAction.java
gump/branches/Gump3/dynagump/src/main/webapp/restricted/
Modified:
gump/branches/Gump3/dynagump/src/main/java/org/apache/gump/dynagump/actions/ListProjectBuilds.java
gump/branches/Gump3/dynagump/src/main/java/org/apache/gump/dynagump/actions/ProjectListAction.java
gump/branches/Gump3/dynagump/src/main/java/org/apache/gump/dynagump/actions/ProjectStatusAction.java
gump/branches/Gump3/dynagump/src/main/java/org/apache/gump/dynagump/actions/ShowRunsAction.java
gump/branches/Gump3/dynagump/src/main/java/org/apache/gump/dynagump/actions/StatusRunAction.java
gump/branches/Gump3/dynagump/src/main/webapp/WEB-INF/struts-config.xml
gump/branches/Gump3/dynagump/src/main/webapp/WEB-INF/struts-html.tld
gump/branches/Gump3/dynagump/src/main/webapp/leftBar.inc
gump/branches/Gump3/dynagump/src/main/webapp/results/index.jsp
Modified: gump/branches/Gump3/dynagump/src/main/java/org/apache/gump/dynagump/actions/ListProjectBuilds.java
URL: http://svn.apache.org/viewcvs/gump/branches/Gump3/dynagump/src/main/java/org/apache/gump/dynagump/actions/ListProjectBuilds.java?rev=388284&r1=388283&r2=388284&view=diff
==============================================================================
--- gump/branches/Gump3/dynagump/src/main/java/org/apache/gump/dynagump/actions/ListProjectBuilds.java (original)
+++ gump/branches/Gump3/dynagump/src/main/java/org/apache/gump/dynagump/actions/ListProjectBuilds.java Thu Mar 23 14:22:11 2006
@@ -56,7 +56,7 @@
return mapping.findForward("success");
} else {
request.getSession().setAttribute("errorMsg", errorMsg);
- return mapping.findForward("errorPriv");
+ return mapping.findForward("error");
}
}
}
Modified: gump/branches/Gump3/dynagump/src/main/java/org/apache/gump/dynagump/actions/ProjectListAction.java
URL: http://svn.apache.org/viewcvs/gump/branches/Gump3/dynagump/src/main/java/org/apache/gump/dynagump/actions/ProjectListAction.java?rev=388284&r1=388283&r2=388284&view=diff
==============================================================================
--- gump/branches/Gump3/dynagump/src/main/java/org/apache/gump/dynagump/actions/ProjectListAction.java (original)
+++ gump/branches/Gump3/dynagump/src/main/java/org/apache/gump/dynagump/actions/ProjectListAction.java Thu Mar 23 14:22:11 2006
@@ -50,7 +50,7 @@
return mapping.findForward("success");
} else {
request.getSession().setAttribute("errorMsg", errorMsg);
- return mapping.findForward("errorPriv");
+ return mapping.findForward("error");
}
}
}
Modified: gump/branches/Gump3/dynagump/src/main/java/org/apache/gump/dynagump/actions/ProjectStatusAction.java
URL: http://svn.apache.org/viewcvs/gump/branches/Gump3/dynagump/src/main/java/org/apache/gump/dynagump/actions/ProjectStatusAction.java?rev=388284&r1=388283&r2=388284&view=diff
==============================================================================
--- gump/branches/Gump3/dynagump/src/main/java/org/apache/gump/dynagump/actions/ProjectStatusAction.java (original)
+++ gump/branches/Gump3/dynagump/src/main/java/org/apache/gump/dynagump/actions/ProjectStatusAction.java Thu Mar 23 14:22:11 2006
@@ -71,7 +71,7 @@
return mapping.findForward("success");
} else {
request.getSession().setAttribute("errorMsg", errorMsg);
- return mapping.findForward("errorPriv");
+ return mapping.findForward("error");
}
}
}
Modified: gump/branches/Gump3/dynagump/src/main/java/org/apache/gump/dynagump/actions/ShowRunsAction.java
URL: http://svn.apache.org/viewcvs/gump/branches/Gump3/dynagump/src/main/java/org/apache/gump/dynagump/actions/ShowRunsAction.java?rev=388284&r1=388283&r2=388284&view=diff
==============================================================================
--- gump/branches/Gump3/dynagump/src/main/java/org/apache/gump/dynagump/actions/ShowRunsAction.java (original)
+++ gump/branches/Gump3/dynagump/src/main/java/org/apache/gump/dynagump/actions/ShowRunsAction.java Thu Mar 23 14:22:11 2006
@@ -59,7 +59,7 @@
if (forward == true) {
return mapping.findForward("success");
} else {
- request.getSession().setAttribute("errorMsg", errorMsg);
+ request.getSession().setAttribute("error", errorMsg);
return mapping.findForward("errorPriv");
}
}
Modified: gump/branches/Gump3/dynagump/src/main/java/org/apache/gump/dynagump/actions/StatusRunAction.java
URL: http://svn.apache.org/viewcvs/gump/branches/Gump3/dynagump/src/main/java/org/apache/gump/dynagump/actions/StatusRunAction.java?rev=388284&r1=388283&r2=388284&view=diff
==============================================================================
--- gump/branches/Gump3/dynagump/src/main/java/org/apache/gump/dynagump/actions/StatusRunAction.java (original)
+++ gump/branches/Gump3/dynagump/src/main/java/org/apache/gump/dynagump/actions/StatusRunAction.java Thu Mar 23 14:22:11 2006
@@ -63,7 +63,7 @@
return mapping.findForward("success");
} else {
request.getSession().setAttribute("errorMsg", errorMsg);
- return mapping.findForward("errorPriv");
+ return mapping.findForward("error");
}
}
}
Copied: gump/branches/Gump3/dynagump/src/main/java/org/apache/gump/dynagump/actions/WorkspacesAction.java (from r387040, gump/branches/Gump3/dynagump/src/main/java/org/apache/gump/dynagump/actions/BuildsAction.java)
URL: http://svn.apache.org/viewcvs/gump/branches/Gump3/dynagump/src/main/java/org/apache/gump/dynagump/actions/WorkspacesAction.java?p2=gump/branches/Gump3/dynagump/src/main/java/org/apache/gump/dynagump/actions/WorkspacesAction.java&p1=gump/branches/Gump3/dynagump/src/main/java/org/apache/gump/dynagump/actions/BuildsAction.java&r1=387040&r2=388284&rev=388284&view=diff
==============================================================================
--- gump/branches/Gump3/dynagump/src/main/java/org/apache/gump/dynagump/actions/BuildsAction.java (original)
+++ gump/branches/Gump3/dynagump/src/main/java/org/apache/gump/dynagump/actions/WorkspacesAction.java Thu Mar 23 14:22:11 2006
@@ -23,9 +23,9 @@
*
*/
// TODO Change the name to workspaceAction
-public class BuildsAction extends Action {
+public class WorkspacesAction extends Action {
- private static Log log = LogFactory.getLog(BuildsAction.class);
+ private static Log log = LogFactory.getLog(WorkspacesAction.class);
public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) {
@@ -50,7 +50,7 @@
return mapping.findForward("success");
} else {
request.getSession().setAttribute("errorMsg", errorMsg);
- return mapping.findForward("errorPriv");
+ return mapping.findForward("error");
}
}
Modified: gump/branches/Gump3/dynagump/src/main/webapp/WEB-INF/struts-config.xml
URL: http://svn.apache.org/viewcvs/gump/branches/Gump3/dynagump/src/main/webapp/WEB-INF/struts-config.xml?rev=388284&r1=388283&r2=388284&view=diff
==============================================================================
--- gump/branches/Gump3/dynagump/src/main/webapp/WEB-INF/struts-config.xml (original)
+++ gump/branches/Gump3/dynagump/src/main/webapp/WEB-INF/struts-config.xml Thu Mar 23 14:22:11 2006
@@ -17,44 +17,8 @@
corresponding "name" and "type" attributes, as shown here.
-->
-
<struts-config>
-<!-- ============================================ Data Source Configuration -->
-<!--
-<data-sources>
-<data-source type="org.apache.commons.dbcp.BasicDataSource">
- <set-property
- property="driverClassName"
- value="org.postgresql.Driver" />
- <set-property
- property="url"
- value="jdbc:postgresql://localhost/mydatabase" />
- <set-property
- property="username"
- value="me" />
- <set-property
- property="password"
- value="test" />
- <set-property
- property="maxActive"
- value="10" />
- <set-property
- property="maxWait"
- value="5000" />
- <set-property
- property="defaultAutoCommit"
- value="false" />
- <set-property
- property="defaultReadOnly"
- value="false" />
- <set-property
- property="validationQuery"
- value="SELECT COUNT(*) FROM market" />
-</data-source>
-</data-sources>
--->
-
<!-- ================================================ Form Bean Definitions -->
<form-beans>
@@ -103,23 +67,8 @@
<!-- =========================================== Global Forward Definitions -->
<global-forwards>
-
- <forward
- name="welcome"
- path="/Welcome.do"/>
- <forward
- name="welcomePriv"
- path="/WelcomePriv.do"/>
- <forward
- name="error"
- path="/Error.do"/>
- <forward
- name="errorPriv"
- path="/ErrorPriv.do"/>
- <forward
- name="/results/"
- path="/results/results.jsp"/>
-
+ <forward name="welcome" path="/"/>
+ <forward name="error" path="/error.jsp"/>
</global-forwards>
@@ -127,77 +76,41 @@
<action-mappings>
-<!-- <action
- path="/Welcome"
- forward="/index.jsp"/>
- <action roles="admin,user"
- path="/WelcomePriv"
- forward="/WEB-INF/index.jsp"/>
- <action
- path="/Error"
- forward="/error.jsp"/>
- <action
- path="/ErrorPriv"
- forward="/WEB-INF/errorPriv.jsp"/>
- <action
- path="/Login"
- forward="/WEB-INF/index.jsp"/>
-
- <action roles="admin,user"
- path="/Test"
- type="com.sysadmin.web.action.NopAction">
- <forward name="success" path="/WEB-INF/index.jsp"/>
- </action>
-
- <action roles="admin,user"
- path="/Logout"
- type="com.sysadmin.web.action.LogoutAction">
- <forward name="success" path="/WEB-INF/logoutSucc.jsp"/>
- </action>
--->
<action
path="/results/ListProjects"
type="org.apache.gump.dynagump.actions.ProjectListAction"
scope="session">
- <forward name="success" path="/WEB-INF/results/projects.jsp"/>
- <forward name="errorPriv" path="/WEB-INF/error/error.jsp"/>
+ <forward name="success" path="/results/projects.jsp"/>
</action>
<action
- path="/results/Builds"
- type="org.apache.gump.dynagump.actions.BuildsAction"
+ path="/results/Workspaces"
+ type="org.apache.gump.dynagump.actions.WorkspacesAction"
scope="session">
- <forward name="success" path="/WEB-INF/results/builds.jsp"/>
- <forward name="errorPriv" path="/WEB-INF/error/error.jsp"/>
+ <forward name="success" path="/results/workspaces.jsp"/>
</action>
<action
path="/results/ProjectStatus"
type="org.apache.gump.dynagump.actions.ProjectStatusAction"
scope="session">
- <forward name="success" path="/WEB-INF/results/projectStatus.jsp"/>
- <forward name="errorPriv" path="/WEB-INF/error/error.jsp"/>
+ <forward name="success" path="/results/projectStatus.jsp"/>
</action>
<action
path="/results/StatusRun"
type="org.apache.gump.dynagump.actions.StatusRunAction"
scope="session">
- <forward name="success" path="/WEB-INF/results/runStatus.jsp"/>
- <forward name="errorPriv" path="/WEB-INF/error/error.jsp"/>
+ <forward name="success" path="/results/runStatus.jsp"/>
</action>
-
<action
path="/results/ShowRuns"
type="org.apache.gump.dynagump.actions.ShowRunsAction"
scope="session">
- <forward name="success" path="/WEB-INF/results/runs.jsp"/>
- <forward name="errorPriv" path="/WEB-INF/error/error.jsp"/>
+ <forward name="success" path="/results/runs.jsp"/>
</action>
-
<action
path="/results/ListProjectBuild"
type="org.apache.gump.dynagump.actions.ListProjectBuilds"
scope="session">
- <forward name="success" path="/WEB-INF/results/showProjectBuilds.jsp"/>
- <forward name="errorPriv" path="/WEB-INF/error/error.jsp"/>
+ <forward name="success" path="/results/showProjectBuilds.jsp"/>
</action>
<!--
Modified: gump/branches/Gump3/dynagump/src/main/webapp/WEB-INF/struts-html.tld
URL: http://svn.apache.org/viewcvs/gump/branches/Gump3/dynagump/src/main/webapp/WEB-INF/struts-html.tld?rev=388284&r1=388283&r2=388284&view=diff
==============================================================================
--- gump/branches/Gump3/dynagump/src/main/webapp/WEB-INF/struts-html.tld (original)
+++ gump/branches/Gump3/dynagump/src/main/webapp/WEB-INF/struts-html.tld Thu Mar 23 14:22:11 2006
@@ -1,11 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
-
-
-
<!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN" "http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_1.dtd">
<taglib>
<tlibversion>1.2</tlibversion>
Copied: gump/branches/Gump3/dynagump/src/main/webapp/error.jsp (from r387040, gump/branches/Gump3/dynagump/src/main/webapp/restricted/error/error.jsp)
URL: http://svn.apache.org/viewcvs/gump/branches/Gump3/dynagump/src/main/webapp/error.jsp?p2=gump/branches/Gump3/dynagump/src/main/webapp/error.jsp&p1=gump/branches/Gump3/dynagump/src/main/webapp/restricted/error/error.jsp&r1=387040&r2=388284&rev=388284&view=diff
==============================================================================
--- gump/branches/Gump3/dynagump/src/main/webapp/restricted/error/error.jsp (original)
+++ gump/branches/Gump3/dynagump/src/main/webapp/error.jsp Thu Mar 23 14:22:11 2006
@@ -1,38 +1,23 @@
<%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
<%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
-
-
-
-<%@ include file="/results/top.inc" %>
-
-
-<div id="top">
- <ul class="path">
- Error Page
- </ul>
-</div>
+<%@ include file="/top.inc" %>
<div id="center">
-<%@ include file="/results/topMenu.inc" %>
-
-
-
-
<div id="body">
- <h1>Error!!</h1><br />
- <p>
- <ul>
- An Error has occured!<br />
+ <h1>Error!!</h1>
+
+ <p>An Error has occured!</p>
+
<p>
-<!-- <logic:present name="errorMsg">
+ <logic:present name="errorMsg">
<bean:write name="errorMsg"/>
- </logic:present>
- <logic:notPresent> -->
- An error has accured one reason might be that the session has expired.<br /> Please try again!
-<!-- </logic:notPresent> -->
+ </logic:present>
+ <logic:notPresent>
+ An error has accured one reason might be that the session has expired.<br /> Please try again!
+ </logic:notPresent>
</p>
</ul>
</p>
@@ -40,7 +25,7 @@
</div>
-<%@ include file="/results/bottom.inc" %>
+<%@ include file="/bottom.inc" %>
Modified: gump/branches/Gump3/dynagump/src/main/webapp/leftBar.inc
URL: http://svn.apache.org/viewcvs/gump/branches/Gump3/dynagump/src/main/webapp/leftBar.inc?rev=388284&r1=388283&r2=388284&view=diff
==============================================================================
--- gump/branches/Gump3/dynagump/src/main/webapp/leftBar.inc (original)
+++ gump/branches/Gump3/dynagump/src/main/webapp/leftBar.inc Thu Mar 23 14:22:11 2006
@@ -3,7 +3,7 @@
<ul id="nav">
<li>
- <a href="Builds.gump"><strong>Browse by Build</strong>
+ <a href="Workspaces.gump"><strong>Browse by Build</strong>
<br/><span class="description">Here is where you browse the data generated by gump given most importance to the various types of builds</span>
</a>
</li>
Modified: gump/branches/Gump3/dynagump/src/main/webapp/results/index.jsp
URL: http://svn.apache.org/viewcvs/gump/branches/Gump3/dynagump/src/main/webapp/results/index.jsp?rev=388284&r1=388283&r2=388284&view=diff
==============================================================================
--- gump/branches/Gump3/dynagump/src/main/webapp/results/index.jsp (original)
+++ gump/branches/Gump3/dynagump/src/main/webapp/results/index.jsp Thu Mar 23 14:22:11 2006
@@ -8,20 +8,10 @@
</div>
<div id="center">
+
+<%@ include file="topMenu.inc" %>
-<div id="header">
- <h1><a href="/gump3/" title="Apache Gump" accesskey="1">Apache Gump</a></h1>
- <ul>
- <li class="current"><span>Results</span></li>
- <li><a href="../index.jsp" title="Home">Home</a></li>
- </ul>
- <div class="searchbox">
- <label> </label>
- <!--input type="text" width="10" onkeyup="act(event)"/-->
- </div>
-</div>
-
-<%@ include file="../leftBar.inc" %>
+<%@ include file="/leftBar.inc" %>
<div id="body" class="withside">
<h1>Results</h1>
@@ -30,7 +20,7 @@
</div>
-<%@ include file="../bottom.inc" %>
+<%@ include file="/bottom.inc" %>
Copied: gump/branches/Gump3/dynagump/src/main/webapp/results/projectStatus.jsp (from r387040, gump/branches/Gump3/dynagump/src/main/webapp/restricted/results/projectStatus.jsp)
URL: http://svn.apache.org/viewcvs/gump/branches/Gump3/dynagump/src/main/webapp/results/projectStatus.jsp?p2=gump/branches/Gump3/dynagump/src/main/webapp/results/projectStatus.jsp&p1=gump/branches/Gump3/dynagump/src/main/webapp/restricted/results/projectStatus.jsp&r1=387040&r2=388284&rev=388284&view=diff
==============================================================================
--- gump/branches/Gump3/dynagump/src/main/webapp/restricted/results/projectStatus.jsp (original)
+++ gump/branches/Gump3/dynagump/src/main/webapp/results/projectStatus.jsp Thu Mar 23 14:22:11 2006
@@ -1,11 +1,7 @@
<%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
<%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
-
-
-
-<%@ include file="/results/top.inc" %>
-
+<%@ include file="/top.inc" %>
<div id="top">
<ul class="path">
@@ -14,7 +10,7 @@
<li><a href="Builds.gump" title="By Builds">By Builds</a></li>
<li><a href="ShowRuns.gump?workspace=<bean:write name="currentWorkspace"/>" title="Select Run">Select Run</a></li>
<li><a href="StatusRun.gump?id=<bean:write name="currentRun"/>" title="Results for this run">Build Results</a></li>
- <bean:write name="project" property="projectName"/>
+ <li class="current"><bean:write name="project" property="projectName"/></li>
</ul>
</div>
@@ -22,49 +18,33 @@
<%@ include file="/results/topMenu.inc" %>
-
<div id="body">
- <h1>Package <bean:write name="project" property="projectName"/></h1><br />
- <p>
- <ul>
- <p>
- <h3>description</h3>
- <p>
- <bean:write name="project" property="description"/>
- </p>
+ <h1>Package <bean:write name="project" property="projectName"/></h1>
+
+ <h3>description</h3>
+ <p><bean:write name="project" property="description"/></p>
- </p>
- <p>
- <h3>State</h3>
- <p>
- <ul>
+ <h3>State</h3>
+ <ul>
<li>Current State: <bean:write name="project" property="resultString"/></li>
<li>Reason: </li>
<li>Start Time: <bean:write name="project" property="startTime" /></li>
<li>End Time: <bean:write name="project" property="endTime" /></li>
-
- </ul>
- </p>
- </p>
- <p>
- <h3>Log</h3>
- <p>
- <bean:write name="project" property="log"/>
- </p>
-
- </p>
- <p>
- <h3>Details</h3>
- <p>
- <ul>
- <li>Containing Module: <bean:write name="project" property="module" /></li>
- <li>Classpath: Not Implemented.</li>
- </ul>
- </p>
- </p>
- <p>
- <h3>Dependencies</h3>
+ </ul>
+
+ <h3>Log</h3>
+
+ <p><bean:write name="project" property="log"/></p>
+
+ <h3>Details</h3>
+ <ul>
+ <li>Containing Module: <bean:write name="project" property="module" /></li>
+ <li>Classpath: Not Implemented.</li>
+ </ul>
+
+ <h3>Dependencies</h3>
+
<p>
This package depends on:
<ul>
@@ -79,15 +59,14 @@
<logic:iterate id="dependees" name="project" property="dependeesList">
<li><a href="ProjectStatus.gump?id=<bean:write name="dependees" property="id"/>"><bean:write name="dependees" property="projectName"/></a></li>
</logic:iterate>
-
</ul>
</p>
</p>
- <p>
- <h3>History</h3>
- <bean:define id="history" name="project" property="history" />
- <p>
- <table>
+
+ <h3>History</h3>
+ <p><bean:define id="history" name="project" property="history" /></p>
+
+ <table>
<tr><td>Current State:</td><td><bean:write name="history" property="currentStateString"/></td></tr>
<tr><td>Duration of State:</td><td><bean:write name="history" property="durationInState"/></td></tr>
<tr><td>Start of State:</td><td><bean:write name="history" property="startOfState"/></td></tr>
@@ -97,16 +76,12 @@
<tr><td>Number of Stalled:</td><td><bean:write name="history" property="numberOfStalled"/></td></tr>
<tr><td>Last Success:</td><td><bean:write name="history" property="lastSuccess"/></td></tr>
<tr><td>First Success:</td><td><bean:write name="history" property="firsSuccess"/></td></tr>
- </table>
- </p>
- </p>
- </ul>
- </p>
+ </table>
</div>
</div>
-<%@ include file="/results/bottom.inc" %>
+<%@ include file="/bottom.inc" %>
Copied: gump/branches/Gump3/dynagump/src/main/webapp/results/projects.jsp (from r387040, gump/branches/Gump3/dynagump/src/main/webapp/restricted/results/projects.jsp)
URL: http://svn.apache.org/viewcvs/gump/branches/Gump3/dynagump/src/main/webapp/results/projects.jsp?p2=gump/branches/Gump3/dynagump/src/main/webapp/results/projects.jsp&p1=gump/branches/Gump3/dynagump/src/main/webapp/restricted/results/projects.jsp&r1=387040&r2=388284&rev=388284&view=diff
==============================================================================
--- gump/branches/Gump3/dynagump/src/main/webapp/restricted/results/projects.jsp (original)
+++ gump/branches/Gump3/dynagump/src/main/webapp/results/projects.jsp Thu Mar 23 14:22:11 2006
@@ -1,17 +1,13 @@
<%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
<%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
-
-
-
-<%@ include file="/results/top.inc" %>
-
+<%@ include file="/top.inc" %>
<div id="top">
<ul class="path">
<li><a href="../index.jsp" title="Home">Home</a></li>
<li><a href="./" title="Results">Results</a></li>
- Project List
+ <li class="current">Project List</li>
</ul>
</div>
@@ -19,31 +15,36 @@
<%@ include file="/results/topMenu.inc" %>
-
<div id="body">
- <h1>Projects</h1><br />
- <p>
- <ul>
- <table>
- <tr><th>Project name</th><th>Description</th><th>module</th></tr>
+ <h1>Projects</h1>
+
+ <table class="data">
+ <thead>
+ <tr><th>Project name</th><th>Description</th><th>module</th></tr>
+ </thead>
+ <tbody>
<logic:iterate id="project" name="projects">
- <tr><td>
+ <tr>
+ <td>
<a href="ListProjectBuild.gump?id=<bean:write name="project" property="projectId"/>"><bean:write name="project" property="name"/></a>
- </td><td>
+ </td>
+ <td>
<bean:write name="project" property="description"/>
- </td><td>
+ </td>
+ <td>
<bean:write name="project" property="moduleName"/>
- </td></tr>
- </logic:iterate>
+ </td>
+ </tr>
+ </logic:iterate>
+ </tbody>
</table>
- </ul>
- </p>
+
</div>
</div>
-<%@ include file="/results/bottom.inc" %>
+<%@ include file="/bottom.inc" %>
Copied: gump/branches/Gump3/dynagump/src/main/webapp/results/runStatus.jsp (from r387040, gump/branches/Gump3/dynagump/src/main/webapp/restricted/results/runStatus.jsp)
URL: http://svn.apache.org/viewcvs/gump/branches/Gump3/dynagump/src/main/webapp/results/runStatus.jsp?p2=gump/branches/Gump3/dynagump/src/main/webapp/results/runStatus.jsp&p1=gump/branches/Gump3/dynagump/src/main/webapp/restricted/results/runStatus.jsp&r1=387040&r2=388284&rev=388284&view=diff
==============================================================================
--- gump/branches/Gump3/dynagump/src/main/webapp/restricted/results/runStatus.jsp (original)
+++ gump/branches/Gump3/dynagump/src/main/webapp/results/runStatus.jsp Thu Mar 23 14:22:11 2006
@@ -1,11 +1,7 @@
<%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
<%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
-
-
-
-<%@ include file="/results/top.inc" %>
-
+<%@ include file="/top.inc" %>
<div id="top">
<ul class="path">
@@ -13,7 +9,7 @@
<li><a href="./" title="Results">Results</a></li>
<li><a href="Builds.gump" title="By Builds">By Builds</a></li>
<logic:present name="currentWorkspace"><li><a href="ShowRuns.gump?workspace=<bean:write name="currentWorkspace"/>" title="Select Run">Select Run</a></li></logic:present>
- Build Results
+ <li class="current">Build Results</li>
</ul>
</div>
@@ -21,18 +17,15 @@
<%@ include file="/results/topMenu.inc" %>
-
<div id="body">
- <h1>Build Results</h1><br />
- <p>
- <ul>
- <p>
- <h3>Over all Statistic</h3>
- <p>
- A short presentation of how many package succeded. faild and stalled for this build.
- </p>
- <table cellspacing="0">
+ <h1>Build Results</h1>
+
+ <h3>Over all Statistic</h3>
+
+ <p>A short presentation of how many package succeded. faild and stalled for this build.</p>
+
+ <table class="data">
<tr>
<logic:iterate id="overAll" name="runsStatus" property="overAll">
<td class="<bean:write name="overAll" property="name"/>-left">
@@ -44,13 +37,14 @@
</logic:iterate>
</tr>
</table>
- </p>
- <p>
+
<h3>Project status</h3>
- </p>
- <p>
- <table cellspacing="0">
- <tr><th>Project Name</th><th>dependees</th><th>direct dependees</th><th>start</th><th>end</th><th>result</th></tr>
+
+ <table class="data">
+ <thead>
+ <tr><th>Project Name</th><th>dependees</th><th>direct dependees</th><th>start</th><th>end</th><th>result</th></tr>
+ </thead>
+ <tbody>
<logic:iterate id="build" indexId="index2" name="runsStatus" property="builds">
<bean:define id="cssClass" name="build" property="resultString"/>
<tr>
@@ -60,22 +54,12 @@
<td class="<bean:write name="cssClass" />"><bean:write name="build" property="startTime"/></td>
<td class="<bean:write name="cssClass" />"><bean:write name="build" property="endTime"/></td>
<td class="<bean:write name="cssClass" />"><bean:write name="build" property="resultString"/></td>
-
</tr>
- </logic:iterate>
- </table>
- </p>
- </ul>
- </p>
+ </logic:iterate>
+ </tbody>
+ </table>
</div>
</div>
-<%@ include file="/results/bottom.inc" %>
-
-
-
-
-
-
-
+<%@ include file="/bottom.inc" %>
Copied: gump/branches/Gump3/dynagump/src/main/webapp/results/runs.jsp (from r387040, gump/branches/Gump3/dynagump/src/main/webapp/restricted/results/runs.jsp)
URL: http://svn.apache.org/viewcvs/gump/branches/Gump3/dynagump/src/main/webapp/results/runs.jsp?p2=gump/branches/Gump3/dynagump/src/main/webapp/results/runs.jsp&p1=gump/branches/Gump3/dynagump/src/main/webapp/restricted/results/runs.jsp&r1=387040&r2=388284&rev=388284&view=diff
==============================================================================
--- gump/branches/Gump3/dynagump/src/main/webapp/restricted/results/runs.jsp (original)
+++ gump/branches/Gump3/dynagump/src/main/webapp/results/runs.jsp Thu Mar 23 14:22:11 2006
@@ -1,19 +1,15 @@
<%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
<%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
-
-
-
-<%@ include file="/results/top.inc" %>
+<%@ include file="/top.inc" %>
<div id="top">
<ul class="path">
<li><a href="../index.jsp" title="Home">Home</a></li>
<li><a href="./" title="Results">Results</a></li>
- <li><a href="Builds.gump" title="By Builds">By Builds</a></li>
- Select Run
-
+ <li><a href="Builds.gump" title="By Builds">By Builds</a></li>
+ <li class="current">Runs</li>
</ul>
</div>
@@ -21,32 +17,31 @@
<%@ include file="/results/topMenu.inc" %>
-
<%@ include file="/leftBar.inc" %>
-
<div id="body" class="withside">
- <h1>Select Run</h1><br />
- <p>
- <ul>
- <table>
- <tr><th>Name</th><th>start</th><th>end</th></tr>
+ <h1>Select Run</h1>
+
+ <table class="data">
+ <thead>
+ <tr><th>Name</th><th>start</th><th>end</th></tr>
+ </thead>
+ <tbody>
<logic:iterate id="run" indexId="index" name="runs">
<tr>
<td><a href="StatusRun.gump?id=<bean:write name="run" property="id"/>"><bean:write name="run" property="name"/></a></td>
<td><bean:write name="run" property="start"/></td>
<td><bean:write name="run" property="end"/></td>
</tr>
- </logic:iterate>
+ </logic:iterate>
+ </tbody>
</table>
- </ul>
- </p>
</div>
</div>
-<%@ include file="/results/bottom.inc" %>
+<%@ include file="/bottom.inc" %>
Copied: gump/branches/Gump3/dynagump/src/main/webapp/results/showProjectBuilds.jsp (from r387040, gump/branches/Gump3/dynagump/src/main/webapp/restricted/results/showProjectBuilds.jsp)
URL: http://svn.apache.org/viewcvs/gump/branches/Gump3/dynagump/src/main/webapp/results/showProjectBuilds.jsp?p2=gump/branches/Gump3/dynagump/src/main/webapp/results/showProjectBuilds.jsp&p1=gump/branches/Gump3/dynagump/src/main/webapp/restricted/results/showProjectBuilds.jsp&r1=387040&r2=388284&rev=388284&view=diff
==============================================================================
--- gump/branches/Gump3/dynagump/src/main/webapp/restricted/results/showProjectBuilds.jsp (original)
+++ gump/branches/Gump3/dynagump/src/main/webapp/results/showProjectBuilds.jsp Thu Mar 23 14:22:11 2006
@@ -1,18 +1,14 @@
<%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
<%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
-
-
-
-<%@ include file="/results/top.inc" %>
-
+<%@ include file="/top.inc" %>
<div id="top">
<ul class="path">
<li><a href="../index.jsp" title="Home">Home</a></li>
<li><a href="./" title="Results">Results</a></li>
<li><a href="">Project List</a></li>
- Project Builds
+ <li class="current">Project Builds</li>
</ul>
</div>
@@ -20,45 +16,55 @@
<%@ include file="/results/topMenu.inc" %>
-
<div id="body">
- <h1>Project Builds</h1><br />
- <p>
- <ul>
- <table>
- <tr><th>Project name</th><th>depends on</th><th>dependees</th><th>Start time</th><th>Workspace</th><th>Run</th><th>Result</th><th>module</th></tr>
+ <h1>Project Builds</h1>
+
+ <table class="data">
+ <thead>
+ <tr><th>Project name</th><th>depends on</th><th>dependees</th><th>Start time</th><th>Workspace</th><th>Run</th><th>Result</th><th>module</th></tr>
+ </thead>
+ <tbody>
<logic:iterate id="project" name="projects">
- <tr><td>
+ <tr>
+ <td>
<bean:write name="project" property="name" />
- </td><td>
+ </td>
+ <td>
<bean:write name="project" property="numbersOfDependant" />
- </td><td>
+ </td>
+ <td>
<bean:write name="project" property="numbersOfDependees" />
- </td><td>
+ </td>
+ <td>
<bean:write name="project" property="start_time" />
- </td><td>
+ </td>
+ <td>
<a href="ShowRuns.gump?workspace=<bean:write name="project" property="workspace_id"/>">
<bean:write name="project" property="workspace_name" />
</a>
- </td><td>
+ </td>
+ <td>
<a href="StatusRun.gump?id=<bean:write name="project" property="run_id"/>">
<bean:write name="project" property="run_name" />
</a>
- </td><td>
+ </td>
+ <td>
<bean:write name="project" property="resultString" />
- </td><td>
+ </td>
+ <td>
<bean:write name="project" property="module_name" />
- </td></tr>
- </logic:iterate>
+ </td>
+ </tr>
+ </logic:iterate>
+ </tbody>
</table>
- </ul>
- </p>
+
</div>
</div>
-<%@ include file="/results/bottom.inc" %>
+<%@ include file="/bottom.inc" %>
Added: gump/branches/Gump3/dynagump/src/main/webapp/results/topMenu.inc
URL: http://svn.apache.org/viewcvs/gump/branches/Gump3/dynagump/src/main/webapp/results/topMenu.inc?rev=388284&view=auto
==============================================================================
--- gump/branches/Gump3/dynagump/src/main/webapp/results/topMenu.inc (added)
+++ gump/branches/Gump3/dynagump/src/main/webapp/results/topMenu.inc Thu Mar 23 14:22:11 2006
@@ -0,0 +1,11 @@
+<div id="header">
+ <h1><a href="/gump3/" title="Apache Gump" accesskey="1">Apache Gump</a></h1>
+ <ul>
+ <li class="current"><span>Results</span></li>
+ <li><a href="../index.jsp" title="Home">Home</a></li>
+ </ul>
+ <div class="searchbox">
+ <label> </label>
+ <!--input type="text" width="10" onkeyup="act(event)"/-->
+ </div>
+</div>
Added: gump/branches/Gump3/dynagump/src/main/webapp/results/workspaces.jsp
URL: http://svn.apache.org/viewcvs/gump/branches/Gump3/dynagump/src/main/webapp/results/workspaces.jsp?rev=388284&view=auto
==============================================================================
--- gump/branches/Gump3/dynagump/src/main/webapp/results/workspaces.jsp (added)
+++ gump/branches/Gump3/dynagump/src/main/webapp/results/workspaces.jsp Thu Mar 23 14:22:11 2006
@@ -0,0 +1,49 @@
+<%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
+<%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
+
+<%@ include file="/top.inc" %>
+
+<div id="top">
+ <ul class="path">
+ <li><a href="../index.jsp" title="Home">Home</a></li>
+ <li><a href="./" title="Results">Results</a></li>
+ <li class="current">By Builds</li>
+ </ul>
+</div>
+
+<div id="center">
+
+<%@ include file="topMenu.inc" %>
+
+<%@ include file="/leftBar.inc" %>
+
+<div id="body" class="withside">
+
+ <h1>Select Workspace</h1>
+
+ <ul>
+ <logic:iterate id="host" indexId="index" name="workspaces">
+ <p><b><bean:write name="host" property="name"/> - <bean:write name="host" property="description"/></b>
+ <p>
+ <logic:iterate id="workspace" indexId="index2" name="host" property="workspaces">
+ <ul>
+ <li>
+ <a href="ShowRuns.gump?workspace=<bean:write name="workspace" property="id"/>"><bean:write name="workspace" property="name"/></a> - <bean:write name="workspace" property="description"/>
+ </li>
+ </ul>
+ </logic:iterate>
+ </p>
+ </logic:iterate>
+ </ul>
+</div>
+
+</div>
+
+<%@ include file="/bottom.inc" %>
+
+
+
+
+
+
+