continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From c...@apache.org
Subject svn commit: r775693 [5/5] - in /continuum/branches/continuum-1.3.x: continuum-api/src/main/java/org/apache/continuum/builder/distributed/ continuum-api/src/main/java/org/apache/continuum/builder/distributed/manager/ continuum-api/src/main/java/org/apac...
Date Sun, 17 May 2009 16:14:24 GMT
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=775693&r1=775692&r2=775693&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
Sun May 17 16:14:22 2009
@@ -28,63 +28,134 @@
       <title><s:text name="distributedBuilds.page.title"/></title>
     </head>
     <body>
+      <c:if test="${!empty actionErrors}">
+        <div class="errormessage">
+          <s:iterator value="actionErrors">
+            <p><s:text name="<s:property/>" /></p>
+          </s:iterator>
+        </div>
+      </c:if>
+      
       <s:form id="removeForm" action="none" method="post">
         <div id="h3">
-          <h3><s:text name="distributedBuilds.section.title"/></h3>
-          <c:if test="${!empty actionErrors}">
-            <div class="errormessage">
-              <s:iterator value="actionErrors">
-                <p><s:text name="<s:property/>" /></p>
-              </s:iterator>
-            </div>
-          </c:if>
-          <c:if test="${not empty distributedBuildSummary}">
-            <s:set name="distributedBuildSummary" value="distributedBuildSummary" scope="request"/>
-            <ec:table items="distributedBuildSummary"
-                      var="distributedBuild"
+          <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.empty"/>
+          </c:if>
+        </div>
+        <div id="h3">
+          <h3><s:text name="distributedBuilds.currentBuild.section.title"/></h3>
+          <c:if test="${not empty currentDistributedBuilds}">
+            <s:set name="currentDistributedBuilds" value="currentDistributedBuilds" scope="request"/>
+            <ec:table items="currentDistributedBuilds"
+                      var="currentBuild"
                       showExports="false"
                       showPagination="false"
                       showStatusBar="false"
                       sortable="false"
                       filterable="false">
               <ec:row>
+                <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="scmRootAddress" title="distributedBuild.table.scmRootAddress"/>
-                <ec:column property="url" title="distributedBuild.table.agentUrl"/>
+                <ec:column property="buildAgentUrl" title="distributedBuild.table.agentUrl"/>
                 <ec:column property="cancelEntry" title="&nbsp;" width="1%">
-                  <c:choose>
-                    <c:when test="${pageScope.distributedBuild.cancelEnabled}">
-                      <s:url id="cancelUrl" action="cancelDistributedBuild" method="cancelDistributedBuild"
namespace="/">
-                        <s:param name="projectGroupId">${pageScope.distributedBuild.projectGroupId}</s:param>
-                        <s:param name="scmRootAddress">${pageScope.distributedBuild.scmRootAddress}</s:param>
-                        <s:param name="buildAgentUrl">${pageScope.distributedBuild.url}</s:param>
-                      </s:url>
-                      <redback:ifAuthorized permission="continuum-manage-queues">
-                        <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>
-                      <redback:elseAuthorized>
-                        <img src="<s:url value='/images/cancelbuild_disabled.gif' includeParams="none"/>"
alt="<s:text name='cancel'/>" title="<s:text name='cancel'/>" border="0">
-                      </redback:elseAuthorized>
-                    </c:when>
-                    <c:otherwise>
-                      <img src="<s:url value='/images/cancelbuild_disabled.gif' includeParams="none"/>"
alt="<s:text name='cancel'/>" title="<s:text name='cancel'/>" border="0">
-                    </c:otherwise>
-                  </c:choose>
+                  <s:url id="cancelUrl" action="cancelDistributedBuild" method="cancelDistributedBuild"
namespace="/">
+                    <s:param name="projectId">${pageScope.currentBuild.projectId}</s:param>
+                    <s:param name="buildDefinitionId">${pageScope.currentBuild.buildDefinitionId}</s:param>
+                    <s:param name="buildAgentUrl">${pageScope.currentBuild.buildAgentUrl}</s:param>
+                  </s:url>
+                  <redback:ifAuthorized permission="continuum-manage-queues">
+                    <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>
+                  <redback:elseAuthorized>
+                    <img src="<s:url value='/images/cancelbuild_disabled.gif' includeParams="none"/>"
alt="<s:text name='cancel'/>" title="<s:text name='cancel'/>" border="0">
+                  </redback:elseAuthorized>
                 </ec:column>
               </ec:row>
             </ec:table>
           </c:if>
-          <c:if test="${empty distributedBuildSummary}">
+          <c:if test="${empty currentDistributedBuilds}">
             <s:text name="distributedBuilds.empty"/>
           </c:if>
         </div>
         <div id="h3">
           <h3>
+            <s:text name="distributedBuilds.prepareBuildQueue.section.title"/>
+          </h3>
+          <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"
+                      sortable="false"
+                      filterable="false">
+              <ec:row>
+                <redback:ifAuthorized permission="continuum-manage-queues">
+                  <ec:column alias="selectedDistributedPrepareBuildTaskHashCodes" title="&nbsp;"
style="width:5px" filterable="false" sortable="false" width="1%" headerCell="selectAll">
+                    <input type="checkbox" name="selectedDistributedPrepareBuildTaskHashCodes"
value="${pageScope.prepareBuildQueue.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="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>
+                    <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>
+                  <redback:elseAuthorized>
+                    <img src="<s:url value='/images/cancelbuild_disabled.gif' includeParams="none"/>"
alt="<s:text name='cancel'/>" title="<s:text name='cancel'/>" border="0">
+                  </redback:elseAuthorized>
+                </ec:column>
+              </ec:row>
+            </ec:table>
+          </c:if>
+        </div>
+        <c:if test="${not empty distributedPrepareBuildQueues}">
+          <div class="functnbar3">
+            <table>
+              <tbody>
+                <tr>
+                  <td>
+                    <input type="submit" value="<s:text name="distributedPrepareBuilds.removeEntries"/>"
+                           onclick="document.forms.removeForm.action='removeDistributedPrepareBuildEntries.action';document.forms.removeForm.submit();"
/> 
+                  </td>
+                </tr>
+              </tbody>
+            </table>
+          </div>
+        </c:if>
+        <div id="h3">
+          <h3>
             <s:text name="distributedBuilds.buildQueue.section.title"/>
           </h3>
           <c:if test="${not empty distributedBuildQueues}">
+            <s:set name="distributedBuildQueues" value="distributedBuildQueues" scope="request"/>
             <ec:table items="distributedBuildQueues"
-                      var="distributedBuildQueue"
+                      var="buildQueue"
                       showExports="false"
                       showPagination="false"
                       showStatusBar="false"
@@ -93,16 +164,19 @@
               <ec:row>
                 <redback:ifAuthorized permission="continuum-manage-queues">
                   <ec:column alias="selectedDistributedBuildTaskHashCodes" title="&nbsp;"
style="width:5px" filterable="false" sortable="false" width="1%" headerCell="selectAll">
-                    <input type="checkbox" name="selectedDistributedBuildTaskHashCodes"
value="${pageScope.distributedBuildQueue.hashCode}" />
+                    <input type="checkbox" name="selectedDistributedBuildTaskHashCodes"
value="${pageScope.buildQueue.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="scmRootAddress" title="distributedBuild.table.scmRootAddress"/>
+                <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="removeDistributedBuildEntry" method="removeDistributedBuildEntry"
namespace="/">
-                      <s:param name="projectGroupId">${pageScope.distributedBuildQueue.projectGroupId}</s:param>
-                      <s:param name="scmRootAddress">${pageScope.distributedBuildQueue.scmRootAddress}</s:param>
+                      <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>
@@ -121,7 +195,7 @@
                 <tr>
                   <td>
                     <input type="submit" value="<s:text name="distributedBuilds.removeEntries"/>"
-                           onclick="$('removeForm').action='removeDistributedBuildEntries!removeDistributedBuildEntries.action';$('removeForm').submit();"
/> 
+                           onclick="document.forms.removeForm.action='removeDistributedBuildEntries.action';document.forms.removeForm.submit();"
/> 
                   </td>
                 </tr>
               </tbody>



Mime
View raw message