Return-Path: 
 <commits-return-5397-apmail-continuum-commits-archive=continuum.apache.org@continuum.apache.org>
Delivered-To: apmail-continuum-commits-archive@www.apache.org
Received: (qmail 42789 invoked from network); 23 May 2009 00:32:41 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3)
  by minotaur.apache.org with SMTP; 23 May 2009 00:32:41 -0000
Received: (qmail 73800 invoked by uid 500); 23 May 2009 00:32:54 -0000
Delivered-To: apmail-continuum-commits-archive@continuum.apache.org
Received: (qmail 73741 invoked by uid 500); 23 May 2009 00:32:54 -0000
Mailing-List: contact commits-help@continuum.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@continuum.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@continuum.apache.org>
List-Post: <mailto:commits@continuum.apache.org>
List-Id: <commits.continuum.apache.org>
Reply-To: dev@continuum.apache.org
Delivered-To: mailing list commits@continuum.apache.org
Received: (qmail 73729 invoked by uid 99); 23 May 2009 00:32:54 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 23 May 2009 00:32:54 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 23 May 2009 00:32:49 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 1168E238886C; Sat, 23 May 2009 00:32:28 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r777753 - in
 /continuum/branches/continuum-1.3.x/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin:
 buildQueueView.jsp viewDistributedBuilds.jsp
Date: Sat, 23 May 2009 00:32:27 -0000
To: commits@continuum.apache.org
From: ctan@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20090523003228.1168E238886C@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: ctan
Date: Sat May 23 00:32:27 2009
New Revision: 777753

URL: http://svn.apache.org/viewvc?rev=777753&view=rev
Log:
[CONTINUUM-2231] added link in project group columns of prepare build queue and reorder queues in the Queues page when distributed build is enabled

Modified:
    continuum/branches/continuum-1.3.x/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/buildQueueView.jsp
    continuum/branches/continuum-1.3.x/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/viewDistributedBuilds.jsp

Modified: continuum/branches/continuum-1.3.x/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/buildQueueView.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/buildQueueView.jsp?rev=777753&r1=777752&r2=777753&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/buildQueueView.jsp (original)
+++ continuum/branches/continuum-1.3.x/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/buildQueueView.jsp Sat May 23 00:32:27 2009
@@ -256,7 +256,12 @@
                       sortable="false"
                       filterable="false">
               <ec:row>
-                <ec:column property="projectGroupName" title="prepareBuildQueue.table.projectGroupName"/>
+                <ec:column property="projectGroupUrl" title="prepareBuildQueue.table.projectGroupName">
+                  <s:url id="viewUrl" action="projectGroupSummary">
+                    <s:param name="projectGroupId">${pageScope.currentPrepareBuild.projectGroupId}</s:param>
+                  </s:url>
+                  <s:a href="%{viewUrl}">${pageScope.currentPrepareBuild.projectGroupName}</s:a>
+                </ec:column>
                 <ec:column property="scmRootAddress" title="prepareBuildQueue.table.scmRootAddress"/>
               </ec:row>
             </ec:table>
@@ -287,7 +292,12 @@
                     <input type="checkbox" name="selectedPrepareBuildTaskHashCodes" value="${pageScope.prepareBuildQueue.hashCode}" />
                   </ec:column>             
                 </redback:ifAuthorized>
-                <ec:column property="projectGroupName" title="prepareBuildQueue.table.projectGroupName"/>
+                <ec:column property="projectGroupUrl" title="prepareBuildQueue.table.projectGroupName">
+                  <s:url id="viewUrl" action="projectGroupSummary">
+                    <s:param name="projectGroupId">${pageScope.currentPrepareBuild.projectGroupId}</s:param>
+                  </s:url>
+                  <s:a href="%{viewUrl}">${pageScope.currentPrepareBuild.projectGroupName}</s:a>
+                </ec:column>
                 <ec:column property="scmRootAddress" title="prepareBuildQueue.table.scmRootAddress"/>
                 <ec:column property="cancelEntry" title="&nbsp;" width="1%">
                   <redback:ifAuthorized permission="continuum-manage-queues">

Modified: continuum/branches/continuum-1.3.x/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/viewDistributedBuilds.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/viewDistributedBuilds.jsp?rev=777753&r1=777752&r2=777753&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/viewDistributedBuilds.jsp (original)
+++ continuum/branches/continuum-1.3.x/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/viewDistributedBuilds.jsp Sat May 23 00:32:27 2009
@@ -36,29 +36,7 @@
         </div>
       </c:if>
       
-      <form id="queuesForm" action="none" method="post">
-        <div id="h3">
-          <h3><s:text name="distributedBuilds.currentPrepareBuild.section.title"/></h3>
-          <c:if test="${not empty currentDistributedPrepareBuilds}">
-            <s:set name="currentDistributedPrepareBuilds" value="currentDistributedPrepareBuilds" scope="request"/>
-            <ec:table items="currentDistributedPrepareBuilds"
-                      var="currentPrepareBuild"
-                      showExports="false"
-                      showPagination="false"
-                      showStatusBar="false"
-                      sortable="false"
-                      filterable="false">
-              <ec:row>
-                <ec:column property="projectGroupName" title="distributedPrepareBuild.table.projectGroupName"/>
-                <ec:column property="scmRootAddress" title="distributedPrepareBuild.table.scmRootAddress"/>
-                <ec:column property="buildAgentUrl" title="distributedPrepareBuild.table.agentUrl"/>
-              </ec:row>
-            </ec:table>
-          </c:if>
-          <c:if test="${empty currentDistributedPrepareBuilds}">
-            <s:text name="distributedPrepareBuilds.no.currentTasks"/>
-          </c:if>
-        </div>
+      <s:form id="buildForm" action="none" method="post">
         <div id="h3">
           <h3><s:text name="distributedBuilds.currentBuild.section.title"/></h3>
           <c:if test="${not empty currentDistributedBuilds}">
@@ -71,7 +49,12 @@
                       sortable="false"
                       filterable="false">
               <ec:row>
-                <ec:column property="projectName" title="distributedBuild.table.projectName"/>
+                <ec:column property="projectUrl" title="distributedBuild.table.projectName">
+                  <s:url id="viewUrl" action="buildResults">
+                    <s:param name="projectId">${pageScope.currentBuild.projectId}</s:param>
+                  </s:url>
+                  <s:a href="%{viewUrl}">${pageScope.currentBuild.projectName}</s:a>
+                </ec:column>
                 <ec:column property="buildDefinitionLabel" title="distributedBuild.table.buildDefinitionLabel"/>
                 <ec:column property="projectGroupName" title="distributedBuild.table.projectGroupName"/>
                 <ec:column property="buildAgentUrl" title="distributedBuild.table.agentUrl"/>
@@ -93,16 +76,16 @@
             <s:text name="distributedBuilds.no.currentTasks"/>
           </c:if>
         </div>
-      </form>
-      <form id="removePrepareBuildForm" action="removeDistributedPrepareBuildEntries.action" method="post">
+      </s:form>
+      <s:form id="removeBuildForm" action="removeDistributedBuildEntries.action" method="post">
         <div id="h3">
           <h3>
-            <s:text name="distributedBuilds.prepareBuildQueue.section.title"/>
+            <s:text name="distributedBuilds.buildQueue.section.title"/>
           </h3>
-          <c:if test="${not empty distributedPrepareBuildQueues}">
-            <s:set name="distributedPrepareBuildQueues" value="distributedPrepareBuildQueues" scope="request"/>
-            <ec:table items="distributedPrepareBuildQueues"
-                      var="prepareBuildQueue"
+          <c:if test="${not empty distributedBuildQueues}">
+            <s:set name="distributedBuildQueues" value="distributedBuildQueues" scope="request"/>
+            <ec:table items="distributedBuildQueues"
+                      var="buildQueue"
                       showExports="false"
                       showPagination="false"
                       showStatusBar="false"
@@ -110,19 +93,25 @@
                       filterable="false">
               <ec:row>
                 <redback:ifAuthorized permission="continuum-manage-queues">
-                  <ec:column alias="selectedPrepareBuildTaskHashCodes" title="&nbsp;" style="width:5px" filterable="false" sortable="false" width="1%" headerCell="selectAll">
-                    <input type="checkbox" name="selectedPrepareBuildTaskHashCodes" value="${pageScope.prepareBuildQueue.hashCode}" />
+                  <ec:column alias="selectedBuildTaskHashCodes" title=" " style="width:5px" filterable="false" sortable="false" headerCell="selectAll">
+                    <input type="checkbox" name="selectedBuildTaskHashCodes" value="${pageScope.buildQueue.hashCode}" />
                   </ec:column>              
                 </redback:ifAuthorized>
-                <ec:column property="projectGroupName" title="distributedPrepareBuild.table.projectGroupName"/>
-                <ec:column property="scmRootAddress" title="distributedPrepareBuild.table.scmRootAddress"/>
-                <ec:column property="buildAgentUrl" title="distributedPrepareBuild.table.agentUrl"/>
+                <ec:column property="projectUrl" title="distributedBuild.table.projectName">
+                  <s:url id="viewUrl" action="buildResults">
+                    <s:param name="projectId">${pageScope.currentBuild.projectId}</s:param>
+                  </s:url>
+                  <s:a href="%{viewUrl}">${pageScope.currentBuild.projectName}</s:a>
+                </ec:column>
+                <ec:column property="buildDefinitionLabel" title="distributedBuild.table.buildDefinitionLabel"/>
+                <ec:column property="projectGroupName" title="distributedBuild.table.projectGroupName"/>
+                <ec:column property="buildAgentUrl" title="distributedBuild.table.agentUrl"/>
                 <ec:column property="cancelEntry" title="&nbsp;" width="1%">
                   <redback:ifAuthorized permission="continuum-manage-queues">
-                    <s:url id="cancelUrl" action="removeDistributedPrepareBuildEntry" method="removeDistributedPrepareBuildEntry" namespace="/">
-                      <s:param name="projectGroupId">${pageScope.prepareBuildQueue.projectGroupId}</s:param>
-                      <s:param name="scmRootId">${pageScope.prepareBuildQueue.scmRootId}</s:param>
-                      <s:param name="buildAgentUrl">${pageScope.prepareBuildQueue.buildAgentUrl}</s:param>
+                    <s:url id="cancelUrl" action="removeDistributedBuildEntry" method="removeDistributedBuildEntry" namespace="/">
+                      <s:param name="projectId">${pageScope.buildQueue.projectId}</s:param>
+                      <s:param name="buildDefinitionId">${pageScope.buildQueue.buildDefinitionId}</s:param>
+                      <s:param name="buildAgentUrl">${pageScope.buildQueue.buildAgentUrl}</s:param>
                     </s:url>
                     <s:a href="%{cancelUrl}"><img src="<s:url value='/images/cancelbuild.gif' includeParams="none"/>" alt="<s:text name='cancel'/>" title="<s:text name='cancel'/>" border="0"></s:a>
                   </redback:ifAuthorized>
@@ -134,32 +123,62 @@
             </ec:table>
           </c:if>
         </div>
-        <c:if test="${not empty distributedPrepareBuildQueues}">
+        <c:if test="${not empty distributedBuildQueues}">
           <div class="functnbar3">
             <table>
               <tbody>
                 <tr>
                   <td>
-                    <input type="button" name="remove-prepare-build-queues" value="<s:text name="distributedPrepareBuilds.removeEntries"/>" onclick="document.forms.removePrepareBuildForm.submit();" /> 
+                    <input type="button" name="remove-build-queues" value="<s:text name="distributedBuilds.removeEntries"/>" onclick="document.forms.removeBuildForm.submit();" /> 
                   </td>
                 </tr>
               </tbody>
             </table>
           </div>
         </c:if>
-        <c:if test="${empty distributedPrepareBuildQueues}">
-          <s:text name="distributedPrepareBuilds.empty"/>
+        <c:if test="${empty distributedBuildQueues}">
+          <s:text name="distributedBuilds.empty"/>
         </c:if>
-      </form>
-      <form id="removeBuildForm" action="removeDistributedBuildEntries.action" method="post">
+      </s:form>
+      <s:form id="prepareForm" action="none" method="post">
+        <div id="h3">
+          <h3><s:text name="distributedBuilds.currentPrepareBuild.section.title"/></h3>
+          <c:if test="${not empty currentDistributedPrepareBuilds}">
+            <s:set name="currentDistributedPrepareBuilds" value="currentDistributedPrepareBuilds" scope="request"/>
+            <ec:table items="currentDistributedPrepareBuilds"
+                      var="currentPrepareBuild"
+                      showExports="false"
+                      showPagination="false"
+                      showStatusBar="false"
+                      sortable="false"
+                      filterable="false">
+              <ec:row>
+                <ec:column property="projectGroupUrl" title="distributedPrepareBuild.table.projectGroupName">
+                  <s:url id="viewUrl" action="projectGroupSummary">
+                    <s:param name="projectGroupId">${pageScope.currentPrepareBuild.projectGroupId}</s:param>
+                  </s:url>
+                  <s:a href="%{viewUrl}">${pageScope.currentPrepareBuild.projectGroupName}</s:a>
+                </ec:column>
+                <ec:column property="scmRootAddress" title="distributedPrepareBuild.table.scmRootAddress"/>
+                <ec:column property="buildAgentUrl" title="distributedPrepareBuild.table.agentUrl"/>
+              </ec:row>
+            </ec:table>
+          </c:if>
+          <c:if test="${empty currentDistributedPrepareBuilds}">
+            <s:text name="distributedPrepareBuilds.no.currentTasks"/>
+          </c:if>
+        </div>
+      </s:form>
+      
+      <s:form id="removePrepareBuildForm" action="removeDistributedPrepareBuildEntries.action" method="post">
         <div id="h3">
           <h3>
-            <s:text name="distributedBuilds.buildQueue.section.title"/>
+            <s:text name="distributedBuilds.prepareBuildQueue.section.title"/>
           </h3>
-          <c:if test="${not empty distributedBuildQueues}">
-            <s:set name="distributedBuildQueues" value="distributedBuildQueues" scope="request"/>
-            <ec:table items="distributedBuildQueues"
-                      var="buildQueue"
+          <c:if test="${not empty distributedPrepareBuildQueues}">
+            <s:set name="distributedPrepareBuildQueues" value="distributedPrepareBuildQueues" scope="request"/>
+            <ec:table items="distributedPrepareBuildQueues"
+                      var="prepareBuildQueue"
                       showExports="false"
                       showPagination="false"
                       showStatusBar="false"
@@ -167,20 +186,24 @@
                       filterable="false">
               <ec:row>
                 <redback:ifAuthorized permission="continuum-manage-queues">
-                  <ec:column alias="selectedBuildTaskHashCodes" title=" " style="width:5px" filterable="false" sortable="false" headerCell="selectAll">
-                    <input type="checkbox" name="selectedBuildTaskHashCodes" value="${pageScope.buildQueue.hashCode}" />
+                  <ec:column alias="selectedPrepareBuildTaskHashCodes" title="&nbsp;" style="width:5px" filterable="false" sortable="false" width="1%" headerCell="selectAll">
+                    <input type="checkbox" name="selectedPrepareBuildTaskHashCodes" value="${pageScope.prepareBuildQueue.hashCode}" />
                   </ec:column>              
                 </redback:ifAuthorized>
-                <ec:column property="projectName" title="distributedBuild.table.projectName"/>
-                <ec:column property="buildDefinitionLabel" title="distributedBuild.table.buildDefinitionLabel"/>
-                <ec:column property="projectGroupName" title="distributedBuild.table.projectGroupName"/>
-                <ec:column property="buildAgentUrl" title="distributedBuild.table.agentUrl"/>
+                <ec:column property="projectGroupUrl" title="distributedPrepareBuild.table.projectGroupName">
+                  <s:url id="viewUrl" action="projectGroupSummary">
+                    <s:param name="projectGroupId">${pageScope.currentPrepareBuild.projectGroupId}</s:param>
+                    <s:a href="%{viewUrl}">${pageScope.currentPrepareBuild.projectGroupName}</s:a>
+                  </s:url>
+                </ec:column>
+                <ec:column property="scmRootAddress" title="distributedPrepareBuild.table.scmRootAddress"/>
+                <ec:column property="buildAgentUrl" title="distributedPrepareBuild.table.agentUrl"/>
                 <ec:column property="cancelEntry" title="&nbsp;" width="1%">
                   <redback:ifAuthorized permission="continuum-manage-queues">
-                    <s:url id="cancelUrl" action="removeDistributedBuildEntry" method="removeDistributedBuildEntry" namespace="/">
-                      <s:param name="projectId">${pageScope.buildQueue.projectId}</s:param>
-                      <s:param name="buildDefinitionId">${pageScope.buildQueue.buildDefinitionId}</s:param>
-                      <s:param name="buildAgentUrl">${pageScope.buildQueue.buildAgentUrl}</s:param>
+                    <s:url id="cancelUrl" action="removeDistributedPrepareBuildEntry" method="removeDistributedPrepareBuildEntry" namespace="/">
+                      <s:param name="projectGroupId">${pageScope.prepareBuildQueue.projectGroupId}</s:param>
+                      <s:param name="scmRootId">${pageScope.prepareBuildQueue.scmRootId}</s:param>
+                      <s:param name="buildAgentUrl">${pageScope.prepareBuildQueue.buildAgentUrl}</s:param>
                     </s:url>
                     <s:a href="%{cancelUrl}"><img src="<s:url value='/images/cancelbuild.gif' includeParams="none"/>" alt="<s:text name='cancel'/>" title="<s:text name='cancel'/>" border="0"></s:a>
                   </redback:ifAuthorized>
@@ -192,23 +215,24 @@
             </ec:table>
           </c:if>
         </div>
-        <c:if test="${not empty distributedBuildQueues}">
+        <c:if test="${not empty distributedPrepareBuildQueues}">
           <div class="functnbar3">
             <table>
               <tbody>
                 <tr>
                   <td>
-                    <input type="button" name="remove-build-queues" value="<s:text name="distributedBuilds.removeEntries"/>" onclick="document.forms.removeBuildForm.submit();" /> 
+                    <input type="button" name="remove-prepare-build-queues" value="<s:text name="distributedPrepareBuilds.removeEntries"/>" onclick="document.forms.removePrepareBuildForm.submit();" /> 
                   </td>
                 </tr>
               </tbody>
             </table>
           </div>
         </c:if>
-        <c:if test="${empty distributedBuildQueues}">
-          <s:text name="distributedBuilds.empty"/>
+        <c:if test="${empty distributedPrepareBuildQueues}">
+          <s:text name="distributedPrepareBuilds.empty"/>
         </c:if>
-      </form>
+      </s:form>
+      
     </body>
   </s:i18n>
 </html>
\ No newline at end of file