You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by ev...@apache.org on 2006/12/04 15:19:56 UTC
svn commit: r482182 - in /maven/continuum/trunk/continuum-webapp/src/main:
java/org/apache/maven/continuum/web/action/ webapp/WEB-INF/jsp/
webapp/WEB-INF/jsp/components/ webapp/WEB-INF/jsp/navigations/
Author: evenisse
Date: Mon Dec 4 06:19:55 2006
New Revision: 482182
URL: http://svn.apache.org/viewvc?view=rev&rev=482182
Log:
Add 'Project Group Summary' tab in project tabs
Modified:
maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildResultAction.java
maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildResultsListAction.java
maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/WorkingCopyAction.java
maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildResults.jsp
maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectGroupTabComponent.jsp
maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/navigations/ProjectMenu.jsp
maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectView.jsp
Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildResultAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildResultAction.java?view=diff&rev=482182&r1=482181&r2=482182
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildResultAction.java (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildResultAction.java Mon Dec 4 06:19:55 2006
@@ -48,6 +48,8 @@
private int projectId;
+ private int projectGroupId;
+
private String projectName;
private List changeSet;
@@ -111,6 +113,16 @@
public void setProjectName( String projectName )
{
this.projectName = projectName;
+ }
+
+ public int getProjectGroupId()
+ {
+ return projectGroupId;
+ }
+
+ public void setProjectGroupId( int projectGroupId )
+ {
+ this.projectGroupId = projectGroupId;
}
public BuildResult getBuildResult()
Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildResultsListAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildResultsListAction.java?view=diff&rev=482182&r1=482181&r2=482182
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildResultsListAction.java (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildResultsListAction.java Mon Dec 4 06:19:55 2006
@@ -35,6 +35,8 @@
private int projectId;
+ private int projectGroupId;
+
private String projectName;
public String execute()
@@ -53,6 +55,16 @@
public void setProjectId( int projectId )
{
this.projectId = projectId;
+ }
+
+ public int getProjectGroupId()
+ {
+ return projectGroupId;
+ }
+
+ public void setProjectGroupId( int projectGroupId )
+ {
+ this.projectGroupId = projectGroupId;
}
public Collection getBuildResults()
Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/WorkingCopyAction.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/WorkingCopyAction.java?view=diff&rev=482182&r1=482181&r2=482182
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/WorkingCopyAction.java (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/WorkingCopyAction.java Mon Dec 4 06:19:55 2006
@@ -48,6 +48,8 @@
private int projectId;
+ private int projectGroupId;
+
private String userDirectory;
private String currentFile;
@@ -136,6 +138,16 @@
public String getProjectName()
{
return projectName;
+ }
+
+ public int getProjectGroupId()
+ {
+ return projectGroupId;
+ }
+
+ public void setProjectGroupId( int projectGroupId )
+ {
+ this.projectGroupId = projectGroupId;
}
public String getUserDirectory()
Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildResults.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildResults.jsp?view=diff&rev=482182&r1=482181&r2=482182
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildResults.jsp (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildResults.jsp Mon Dec 4 06:19:55 2006
@@ -40,6 +40,7 @@
<ww:param name="projectId" value="${projectId}"/>
<ww:param name="projectName" value="%{projectName}"/>
<ww:param name="buildId" value="${buildResult.id}"/>
+ <ww:param name="projectGroupId" value="${projectGroupId}"/>
</ww:url>
<ww:a href="%{buildResultUrl}">Result</ww:a>
</ec:column>
Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectGroupTabComponent.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectGroupTabComponent.jsp?view=diff&rev=482182&r1=482181&r2=482182
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectGroupTabComponent.jsp (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectGroupTabComponent.jsp Mon Dec 4 06:19:55 2006
@@ -6,7 +6,7 @@
<div id="h3">
<div>
<p style="border-top: 1px solid transparent; border-bottom: 1px solid #DFDEDE;">
- <ww:url id="projectGroupSummaryUrl" action="projectGroupSummary" includeParams="none">
+ <ww:url id="projectGroupSummaryUrl" action="projectGroupSummary" includeParams="none">
<ww:param name="projectGroupId" value="projectGroupId"/>
</ww:url>
<ww:url id="projectGroupMembersUrl" action="projectGroupMembers" includeParams="none">
Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/navigations/ProjectMenu.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/navigations/ProjectMenu.jsp?view=diff&rev=482182&r1=482181&r2=482182
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/navigations/ProjectMenu.jsp (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/navigations/ProjectMenu.jsp Mon Dec 4 06:19:55 2006
@@ -5,19 +5,26 @@
<div>
<p style="border-top: 1px solid transparent; border-bottom: 1px solid #DFDEDE;">
+ <ww:url id="projectGroupSummaryUrl" action="projectGroupSummary" includeParams="none">
+ <ww:param name="projectGroupId" value="projectGroupId"/>
+ </ww:url>
<ww:url id="viewUrl" action="projectView" includeParams="none">
<ww:param name="projectId" value="projectId"/>
<ww:param name="tab" value="view"/>
+ <ww:param name="projectGroupId" value="projectGroupId"/>
</ww:url>
<ww:url id="buildResultsUrl" action="buildResults" includeParams="none">
<ww:param name="projectId" value="projectId"/>
<ww:param name="tab" value="buildResults"/>
+ <ww:param name="projectGroupId" value="projectGroupId"/>
</ww:url>
<ww:url id="workingCopyUrl" action="workingCopy" includeParams="none">
<ww:param name="projectId" value="projectId"/>
<ww:param name="tab" value="workingCopy"/>
+ <ww:param name="projectGroupId" value="projectGroupId"/>
</ww:url>
+ <a style="border: 1px solid #DFDEDE; padding-left: 1em; padding-right: 1em; text-decoration: none;" href="${projectGroupSummaryUrl}">Project Group Summary</a>
<c:choose>
<c:when test="${param.tab == 'view'}">
<b style="border: 1px solid #DFDEDE; padding-left: 1em; padding-right: 1em;"><ww:text name="info"/></b>
Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectView.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectView.jsp?view=diff&rev=482182&r1=482181&r2=482182
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectView.jsp (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectView.jsp Mon Dec 4 06:19:55 2006
@@ -14,6 +14,7 @@
<jsp:include page="/WEB-INF/jsp/navigations/ProjectMenu.jsp">
<jsp:param name="tab" value="view"/>
+ <jsp:param name="projectGroupId" value="%{project.projectGroup.id}"/>
</jsp:include>
<h3><ww:text name="projectView.section.title"/></h3>