You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by oc...@apache.org on 2010/05/06 11:23:34 UTC
svn commit: r941625 [23/24] - in
/continuum/branches/continuum-flat-multi-module: ./ continuum-api/
continuum-api/src/main/java/org/apache/continuum/builder/distributed/
continuum-api/src/main/java/org/apache/continuum/builder/distributed/manager/
cont...
Modified: continuum/branches/continuum-flat-multi-module/continuum-webapp/src/main/resources/log4j.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-flat-multi-module/continuum-webapp/src/main/resources/log4j.xml?rev=941625&r1=941624&r2=941625&view=diff
==============================================================================
--- continuum/branches/continuum-flat-multi-module/continuum-webapp/src/main/resources/log4j.xml (original)
+++ continuum/branches/continuum-flat-multi-module/continuum-webapp/src/main/resources/log4j.xml Thu May 6 09:23:13 2010
@@ -58,116 +58,96 @@
<appender-ref ref="redbackAuditLog" />
</logger>
- <!-- Help identify bugs during testing -->
+<!--
<logger name="org.apache.maven">
<level value="info"/>
- <appender-ref ref="rolling" />
</logger>
<logger name="org.apache.continuum">
<level value="info" />
- <appender-ref ref="rolling" />
</logger>
<logger name="org.codehaus.plexus.redback">
<level value="info"/>
- <appender-ref ref="rolling" />
- </logger>
-
- <!-- squelch noisy objects (for now) -->
- <logger name="org.apache.commons">
- <level value="warn"/>
- <appender-ref ref="rolling" />
- </logger>
-
- <logger name="net.sf.ehcache">
- <level value="warn"/>
- <appender-ref ref="rolling" />
</logger>
<logger name="org.codehaus.plexus.mailsender.MailSender">
<level value="info"/>
- <appender-ref ref="rolling" />
- </logger>
-
- <logger name="org.codehaus.plexus.velocity">
- <level value="error"/>
- <appender-ref ref="rolling" />
</logger>
<logger name="org.quartz">
<level value="info"/>
- <appender-ref ref="rolling" />
</logger>
<logger name="org.apache.jasper">
<level value="info"/>
- <appender-ref ref="rolling" />
</logger>
<logger name="com.opensymphony.xwork">
<level value="info"/>
- <appender-ref ref="rolling" />
</logger>
- <!-- CONTINUUM-1228 -->
- <logger name="com.opensymphony.xwork2.util.OgnlUtil">
+ <logger name="org.codehaus.plexus.PlexusContainer">
+ <level value="info"/>
+ </logger>
+-->
+
+ <!-- squelch noisy objects (for now) -->
+ <logger name="org.apache.commons">
+ <level value="warn"/>
+ </logger>
+
+ <logger name="net.sf.ehcache">
+ <level value="warn"/>
+ </logger>
+
+ <logger name="org.codehaus.plexus.velocity">
<level value="error"/>
- <appender-ref ref="rolling" />
</logger>
- <logger name="org.codehaus.plexus.PlexusContainer">
- <level value="info"/>
- <appender-ref ref="rolling" />
+ <logger name="com.opensymphony.xwork2.util.OgnlUtil">
+ <level value="error"/>
</logger>
<logger name="JPOX">
<level value="warn"/>
- <appender-ref ref="rolling" />
</logger>
<logger name="JPOX.MetaData">
<level value="error"/>
- <appender-ref ref="rolling" />
</logger>
<logger name="JPOX.RDBMS.SQL">
<level value="error"/>
- <appender-ref ref="rolling" />
</logger>
<logger name="SQL">
<level value="error"/>
- <appender-ref ref="rolling" />
</logger>
<logger name="freemarker">
<level value="warn"/>
- <appender-ref ref="rolling" />
</logger>
<logger name="org.codehaus.plexus.component.manager.ClassicSingletonComponentManager">
<level value="error"/>
- <appender-ref ref="rolling" />
</logger>
<logger name="org.springframework.beans.factory.xml.XmlBeanDefinitionReader">
<level value="error"/>
- <appender-ref ref="rolling" />
</logger>
<logger name="org.springframework.beans.factory.support.DefaultListableBeanFactory">
<level value="error"/>
- <appender-ref ref="rolling" />
</logger>
<logger name="net.sf.dozer.util.mapping.util.XMLParser">
<level value="warn"/>
- <appender-ref ref="rolling" />
</logger>
<root>
<priority value="info" />
+ <appender-ref ref="rolling" />
</root>
</log4j:configuration>
Modified: continuum/branches/continuum-flat-multi-module/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/BuildDefinitionTemplateAction.properties
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-flat-multi-module/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/BuildDefinitionTemplateAction.properties?rev=941625&r1=941624&r2=941625&view=diff
==============================================================================
--- continuum/branches/continuum-flat-multi-module/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/BuildDefinitionTemplateAction.properties (original)
+++ continuum/branches/continuum-flat-multi-module/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/admin/BuildDefinitionTemplateAction.properties Thu May 6 09:23:13 2010
@@ -16,6 +16,7 @@
# specific language governing permissions and limitations
# under the License.
#
+buildDefintionTemplate.name.exists = Name already exists
buildDefintionTemplate.name.required = Name is required
buildDefintion.buildFile.required = BuildFile is required
-buildDefintion.description.required = Description is required
\ No newline at end of file
+buildDefintion.description.required = Description is required
Modified: continuum/branches/continuum-flat-multi-module/continuum-webapp/src/main/resources/struts.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-flat-multi-module/continuum-webapp/src/main/resources/struts.xml?rev=941625&r1=941624&r2=941625&view=diff
==============================================================================
--- continuum/branches/continuum-flat-multi-module/continuum-webapp/src/main/resources/struts.xml (original)
+++ continuum/branches/continuum-flat-multi-module/continuum-webapp/src/main/resources/struts.xml Thu May 6 09:23:13 2010
@@ -67,6 +67,20 @@
<param name="excludeMethods">input,back,cancel,browse,edit</param>
</interceptor-ref>
</interceptor-stack>
+
+ <interceptor-stack name="storeStack">
+ <interceptor-ref name="configuredContinuumStack"/>
+ <interceptor-ref name="store">
+ <param name="operationMode">STORE</param>
+ </interceptor-ref>
+ </interceptor-stack>
+
+ <interceptor-stack name="retrieveStack">
+ <interceptor-ref name="configuredContinuumStack"/>
+ <interceptor-ref name="store">
+ <param name="operationMode">RETRIEVE</param>
+ </interceptor-ref>
+ </interceptor-stack>
</interceptors>
<default-interceptor-ref name="configuredContinuumStack"/>
@@ -147,14 +161,18 @@
allowing plexus-security to call out from its own set of actions
into the application webapp, using global result names. -->
<action name="redbackRedirect" class="redback-redirect" method="redirect">
+ <interceptor-ref name="retrieveStack"/>
<result type="redirect-action">groupSummary</result>
</action>
+ <action name="httpError" class="httpError">
+ <result name="success">/WEB-INF/jsp/error/httpError.jsp</result>
+ </action>
+
<action name="about" class="about">
<result name="success">/WEB-INF/jsp/about.jsp</result>
</action>
-
<action name="companyInfo" class="companyInfo">
<result name="success">/WEB-INF/jsp/components/companyLogo.jsp</result>
<interceptor-ref name="basicStack" />
@@ -167,6 +185,7 @@
<action name="groupSummary" class="groupSummary">
+ <interceptor-ref name="retrieveStack"/>
<result name="success">/WEB-INF/jsp/groupSummary.jsp</result>
</action>
@@ -223,6 +242,7 @@
</action>
<action name="deleteProject" class="deleteProject">
+ <interceptor-ref name="storeStack"/>
<result name="delete">/WEB-INF/jsp/deleteProject.jsp</result>
<result name="success" type="redirect-action">
<param name="actionName">projectGroupSummary</param>
@@ -231,6 +251,7 @@
</action>
<action name="ProjectsList" class="projects">
+ <interceptor-ref name="storeStack"/>
<result name="confirmRemove">/WEB-INF/jsp/confirmDeleteProjects.jsp</result>
<result name="success" type="redirect-action">
<param name="actionName">projectGroupSummary</param>
@@ -239,6 +260,7 @@
</action>
<action name="buildProject" class="buildProject">
+ <interceptor-ref name="storeStack"/>
<result name="success" type="chain">groupSummary</result>
<result name="to_group_page" type="redirect-action">
<param name="actionName">projectGroupSummary</param>
@@ -300,7 +322,11 @@
* project group actions
-->
<action name="projectGroupSummary" class="projectGroup" method="summary">
+ <interceptor-ref name="retrieveStack"/>
<result name="success">/WEB-INF/jsp/projectGroupSummary.jsp</result>
+ <result name="to_summary_page" type="redirect-action">
+ <param name="actionName">groupSummary</param>
+ </result>
</action>
<action name="projectGroupMembers" class="projectGroup" method="members">
@@ -316,6 +342,7 @@
</action>
<action name="buildProjectGroup" class="projectGroup" method="build">
+ <interceptor-ref name="storeStack"/>
<result name="success" type="redirect-action">
<param name="actionName">projectGroupSummary</param>
<param name="projectGroupId">${projectGroupId}</param>
@@ -324,6 +351,7 @@
</action>
<action name="removeProjectGroup" class="projectGroup" method="remove">
+ <interceptor-ref name="storeStack"/>
<result name="confirm">/WEB-INF/jsp/confirmGroupRemoval.jsp</result>
<result name="success" type="redirect-action">
<param name="actionName">groupSummary</param>
@@ -331,6 +359,7 @@
</action>
<action name="releaseProjectGroup" class="projectGroup" method="release">
+ <interceptor-ref name="storeStack"/>
<result name="input" type="redirect-action">
<param name="actionName">projectGroupSummary</param>
<param name="projectGroupId">${projectGroupId}</param>
@@ -362,10 +391,12 @@
* build results, test reporting, working copy actions
-->
<action name="buildResults" class="buildResults">
+ <interceptor-ref name="retrieveStack"/>
<result name="success">/WEB-INF/jsp/buildResults.jsp</result>
</action>
<action name="removeBuildResults" class="buildResults" method="remove">
+ <interceptor-ref name="storeStack"/>
<result name="success" type="redirect-action">
<param name="actionName">buildResults</param>
<param name="projectId">${projectId}</param>
@@ -374,6 +405,7 @@
</action>
<action name="buildResult" class="buildResult">
+ <interceptor-ref name="storeStack"/>
<result name="success">/WEB-INF/jsp/buildResult.jsp</result>
<result name="error" type="redirect-action">
<param name="actionName">projectGroupSummary</param>
@@ -389,6 +421,7 @@
</action>
<action name="removeBuildResult" class="buildResult" method="remove">
+ <interceptor-ref name="storeStack"/>
<result name="success" type="redirect-action">
<param name="actionName">buildResults</param>
<param name="projectId">${projectId}</param>
@@ -404,7 +437,7 @@
<result name="success">/WEB-INF/jsp/workingCopy.jsp</result>
<result name="stream" type="stream">
<param name="contentType">application/octet-stream</param>
- <param name="contentDisposition">filename="${downloadFilename}"</param>
+ <param name="contentDisposition">attachment; filename="${downloadFilename}"</param>
<param name="contentLength">${fileLength}</param>
</result>
</action>
@@ -648,6 +681,7 @@
-->
<action name="buildEnvList" class="profileAdministration" method="list">
+ <interceptor-ref name="retrieveStack"/>
<result name="success">/WEB-INF/jsp/admin/profilesList.jsp</result>
</action>
@@ -661,17 +695,12 @@
</action>
<action name="deleteBuildEnv" class="profileAdministration" method="delete">
+ <interceptor-ref name="storeStack"/>
<result name="success" type="redirect-action">
<param name="actionName">buildEnvList</param>
<param name="namespace">/admin</param>
<param name="method">list</param>
</result>
- <result name="error" type="redirect-action">
- <param name="actionName">buildEnvList</param>
- <param name="namespace">/admin</param>
- <param name="method">list</param>
- <param name="errorMessage">${message}</param>
- </result>
</action>
<action name="confirmDeleteBuildEnv" class="profileAdministration" method="confirmDelete">
@@ -818,6 +847,18 @@
<param name="actionName">displayQueues</param>
</result>
</action>
+
+ <action name="removePrepareBuildEntry" class="queues" method="removePrepareBuildEntry">
+ <result name="success" type="redirect-action">
+ <param name="actionName">displayQueues</param>
+ </result>
+ </action>
+
+ <action name="removePrepareBuildEntries" class="queues" method="removePrepareBuildEntries">
+ <result name="success" type="redirect-action">
+ <param name="actionName">displayQueues</param>
+ </result>
+ </action>
<action name="cancelDistributedBuild" class="queues" method="cancelDistributedBuild">
<result name="success" type="redirect-action">
@@ -825,12 +866,24 @@
</result>
</action>
+ <action name="removeDistributedPrepareBuildEntry" class="queues" method="removeDistributedPrepareBuildEntry">
+ <result name="success" type="redirect-action">
+ <param name="actionName">displayQueues</param>
+ </result>
+ </action>
+
+ <action name="removeDistributedPrepareBuildEntries" class="queues" method="removeDistributedPrepareBuildEntries">
+ <result name="success" type="redirect-action">
+ <param name="actionName">displayQueues</param>
+ </result>
+ </action>
+
<action name="removeDistributedBuildEntries" class="queues" method="removeDistributedBuildEntries">
<result name="success" type="redirect-action">
<param name="actionName">displayQueues</param>
</result>
</action>
-
+
<action name="removeDistributedBuildEntry" class="queues" method="removeDistributedBuildEntry">
<result name="success" type="redirect-action">
<param name="actionName">displayQueues</param>
@@ -867,6 +920,7 @@
-->
<action name="repositoryList" class="localRepository" method="list">
+ <interceptor-ref name="retrieveStack"/>
<result name="success">/WEB-INF/jsp/admin/localRepositoriesList.jsp</result>
</action>
@@ -884,10 +938,7 @@
</action>
<action name="removeRepository" class="localRepository" method="remove">
- <result name="error" type="redirect-action">
- <param name="actionName">repositoryList</param>
- <param name="errorMessage">${message}</param>
- </result>
+ <interceptor-ref name="storeStack"/>
<result name="confirm">/WEB-INF/jsp/admin/confirmDeleteLocalRepository.jsp</result>
<result name="success" type="redirect-action">
<param name="actionName">repositoryList</param>
@@ -895,13 +946,10 @@
</action>
<action name="purgeRepository" class="localRepository" method="doPurge">
+ <interceptor-ref name="storeStack"/>
<result name="success" type="redirect-action">
<param name="actionName">repositoryList</param>
</result>
- <result name="error" type="redirect-action">
- <param name="actionName">repositoryList</param>
- <param name="errorMessage">${message}</param>
- </result>
</action>
<!--
Propchange: continuum/branches/continuum-flat-multi-module/continuum-webapp/src/main/webapp/WEB-INF/
('svn:ignore' removed)
Modified: continuum/branches/continuum-flat-multi-module/continuum-webapp/src/main/webapp/WEB-INF/applicationContext.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-flat-multi-module/continuum-webapp/src/main/webapp/WEB-INF/applicationContext.xml?rev=941625&r1=941624&r2=941625&view=diff
==============================================================================
--- continuum/branches/continuum-flat-multi-module/continuum-webapp/src/main/webapp/WEB-INF/applicationContext.xml (original)
+++ continuum/branches/continuum-flat-multi-module/continuum-webapp/src/main/webapp/WEB-INF/applicationContext.xml Thu May 6 09:23:13 2010
@@ -66,7 +66,7 @@
</bean>
<bean id="masterBuildAgentTransportServer" class="org.apache.continuum.distributed.transport.master.MasterBuildAgentTransportServer">
- <constructor-arg ref="distributedBuildManager"/>
+ <constructor-arg ref="distributedBuildService"/>
</bean>
<bean name="xmlrpcServicesList" class="java.util.ArrayList">
Modified: continuum/branches/continuum-flat-multi-module/continuum-webapp/src/main/webapp/WEB-INF/jsp/addMavenTwoProject.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-flat-multi-module/continuum-webapp/src/main/webapp/WEB-INF/jsp/addMavenTwoProject.jsp?rev=941625&r1=941624&r2=941625&view=diff
==============================================================================
--- continuum/branches/continuum-flat-multi-module/continuum-webapp/src/main/webapp/WEB-INF/jsp/addMavenTwoProject.jsp (original)
+++ continuum/branches/continuum-flat-multi-module/continuum-webapp/src/main/webapp/WEB-INF/jsp/addMavenTwoProject.jsp Thu May 6 09:23:13 2010
@@ -82,7 +82,6 @@
</c:otherwise>
</c:choose>
<s:checkbox label="%{getText('add.m2.project.nonRecursiveProject')}" name="nonRecursiveProject" />
- <s:checkbox label="%{getText('add.m2.project.checkoutInSingleDirectory')}" name="checkoutInSingleDirectory" />
<s:select label="%{getText('add.m2.project.buildDefinitionTemplate')}" name="buildDefinitionTemplateId"
list="buildDefinitionTemplates" listKey="id" listValue="name" headerKey="-1"
headerValue="%{getText('add.m2.project.defaultBuildDefinition')}"/>
Modified: continuum/branches/continuum-flat-multi-module/continuum-webapp/src/main/webapp/WEB-INF/jsp/addProject.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-flat-multi-module/continuum-webapp/src/main/webapp/WEB-INF/jsp/addProject.jsp?rev=941625&r1=941624&r2=941625&view=diff
==============================================================================
--- continuum/branches/continuum-flat-multi-module/continuum-webapp/src/main/webapp/WEB-INF/jsp/addProject.jsp (original)
+++ continuum/branches/continuum-flat-multi-module/continuum-webapp/src/main/webapp/WEB-INF/jsp/addProject.jsp Thu May 6 09:23:13 2010
@@ -86,6 +86,14 @@
<s:select label="%{getText('projectGroup.name.label')}" name="selectedProjectGroup" list="projectGroups" listKey="id" listValue="name"/>
</c:otherwise>
</c:choose>
+ <c:choose>
+ <c:when test="${!empty projectGroups}">
+ <s:hidden name="emptyProjectGroups" value="false"/>
+ </c:when>
+ <c:otherwise>
+ <s:hidden name="emptyProjectGroups" value="true"/>
+ </c:otherwise>
+ </c:choose>
<s:select label="%{getText('add.project.buildDefinitionTemplate')}" name="buildDefinitionTemplateId"
list="buildDefinitionTemplates" listKey="id" listValue="name" headerKey="-1"
headerValue="%{getText('add.project.defaultBuildDefinition')}"/>
Modified: continuum/branches/continuum-flat-multi-module/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/appearance.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-flat-multi-module/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/appearance.jsp?rev=941625&r1=941624&r2=941625&view=diff
==============================================================================
--- continuum/branches/continuum-flat-multi-module/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/appearance.jsp (original)
+++ continuum/branches/continuum-flat-multi-module/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/appearance.jsp Thu May 6 09:23:13 2010
@@ -24,7 +24,6 @@
<s:i18n name="localization.Continuum">
<head>
<title><s:text name="appearance.page.title"/></title>
- <s:head/>
</head>
<body>
Modified: continuum/branches/continuum-flat-multi-module/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/buildQueueView.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-flat-multi-module/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/buildQueueView.jsp?rev=941625&r1=941624&r2=941625&view=diff
==============================================================================
--- continuum/branches/continuum-flat-multi-module/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/buildQueueView.jsp (original)
+++ continuum/branches/continuum-flat-multi-module/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/buildQueueView.jsp Thu May 6 09:23:13 2010
@@ -30,216 +30,202 @@
<meta http-equiv="refresh" content="60"/>
</head>
<body>
- <s:form id="removeForm" action="none" method="post">
+ <s:form id="buildQueueForm" action="none" method="post">
<div id="h3">
<h3>
<s:text name="buildQueue.currentTask.section.title"/>
- </h3>
- <table width="100%">
- <s:if test="%{currentBuildProjectTasks != null}">
- <tbody>
- <tr>
- <th><s:text name="buildQueue.currentTask.buildQueue"/></th>
- <th><s:text name="buildQueue.currentTask.projectName"/></th>
- <th><s:text name="buildQueue.currentTask.buildDefinition"/></th>
- <th> </th>
- </tr>
- <c:forEach var="element" items="${currentBuildProjectTasks}">
- <tr>
- <td width="20%">${element.key}</td>
- <td width="20%">
- <s:url id="viewUrl" action="buildResults">
- <s:param name="projectId">${element.value.projectId}</s:param>
+ </h3>
+ <c:if test="${not empty currentBuildProjectTasks}">
+ <s:set name="currentBuildProjectTasks" value="currentBuildProjectTasks" scope="request"/>
+ <ec:table items="currentBuildProjectTasks"
+ var="queue"
+ showExports="false"
+ showPagination="false"
+ showStatusBar="false"
+ sortable="false"
+ filterable="false">
+ <ec:row>
+ <ec:column property="name" title="buildQueue.currentTask.buildQueue" width="29%"/>
+ <ec:column property="projectUrl" title="buildQueue.currentTask.projectName" width="50%">
+ <s:url id="viewUrl" action="buildResults">
+ <s:param name="projectId">${queue.task.projectId}</s:param>
+ </s:url>
+ <s:a href="%{viewUrl}">${queue.task.projectName}</s:a>
+ </ec:column>
+ <ec:column property="task.buildDefinitionLabel" title="buildQueue.currentTask.buildDefinition" width="19%"/>
+ <ec:column property="cancelAction" title=" " width="1%">
+ <redback:ifAuthorized permission="continuum-manage-queues">
+ <s:url id="cancelUrl" action="cancelCurrentBuildTask" method="cancelCurrent" namespace="/">
+ <s:param name="projectId">${queue.task.projectId}</s:param>
</s:url>
- <s:a href="%{viewUrl}">${element.value.projectName}</s:a>
- </td>
- <td width="29%">${element.value.buildDefinitionLabel}</td>
- <td width="1%">
- <redback:ifAuthorized permission="continuum-manage-queues">
- <s:url id="cancelUrl" action="cancelCurrentBuildTask" method="cancelCurrent" namespace="/">
- <s:param name="projectId">${element.value.projectId}</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>
- </td>
- </tr>
- </c:forEach>
- </tbody>
- </s:if>
- <s:else>
- <s:text name="buildQueue.no.currentTaks" />
- </s:else>
- </table>
- </div>
-
+ <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 currentBuildProjectTasks}">
+ <s:text name="buildQueue.no.currentTaks" />
+ </c:if>
+ </div>
+ </s:form>
+
+ <s:form id="removeBuildForm" action="removeBuildQueueEntries!removeBuildEntries.action" method="post">
<div id="h3">
<h3>
<s:text name="buildQueue.section.title"/>
- </h3>
- <table width="100%">
- <s:if test="%{buildsInQueue != null}">
- <tbody>
- <tr>
+ </h3>
+ <c:if test="${not empty buildsInQueue}">
+ <s:set name="buildsInQueue" value="buildsInQueue" scope="request"/>
+ <ec:table items="buildsInQueue"
+ var="queue"
+ showExports="false"
+ showPagination="false"
+ showStatusBar="false"
+ sortable="false"
+ filterable="false">
+ <ec:row>
<redback:ifAuthorized permission="continuum-manage-queues">
- <th> </th>
+ <ec:column alias="selectedBuildTaskHashCodes" title=" " style="width:5px" filterable="false" sortable="false" headerCell="selectAll">
+ <input type="checkbox" name="selectedBuildTaskHashCodes" value="${queue.task.hashCode}" />
+ </ec:column>
</redback:ifAuthorized>
- <th><s:text name="buildQueue.currentTask.buildQueue"/></th>
- <th><s:text name="buildQueue.currentTask.projectName"/></th>
- <th><s:text name="buildQueue.currentTask.buildDefinition"/></th>
- <th> </th>
- </tr>
- <c:forEach var="element" items="${buildsInQueue}">
- <c:forEach var="buildTask" items="${element.value}">
- <tr>
- <td width="1%">
- <redback:ifAuthorized permission="continuum-manage-queues">
- <input type="checkbox" name="selectedBuildTaskHashCodes" value="${buildTask.hashCode}" />
- </redback:ifAuthorized>
- </td>
- <td width="29%">${element.key}</td>
- <td width="50%">
- <s:url id="viewUrl" action="buildResults">
- <s:param name="projectId">${buildTask.projectId}</s:param>
- </s:url>
- <s:a href="%{viewUrl}">${buildTask.projectName}</s:a>
- </td>
- <td width="19%">${buildTask.buildDefinitionLabel}</td>
- <td width="1%">
- <redback:ifAuthorized permission="continuum-manage-queues">
- <s:url id="cancelUrl" action="removeBuildQueueEntry" method="remove" namespace="/">
- <s:param name="projectId">${pageScope.buildTask.projectId}</s:param>
- <s:param name="buildDefinitionId">${pageScope.buildTask.buildDefinitionId}</s:param>
- <s:param name="trigger">${pageScope.buildTask.trigger}</s:param>
- <s:param name="projectName">${pageScope.buildTask.projectName}</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>
- </td>
- </tr>
- </c:forEach>
- </c:forEach>
- </tbody>
- </s:if>
- <s:else>
- <s:text name="buildQueue.empty"/>
- </s:else>
- </table>
- </div>
+ <ec:column property="name" title="buildQueue.currentTask.buildQueue" width="29%"/>
+ <ec:column property="projectUrl" title="buildQueue.currentTask.projectName" width="50%">
+ <s:url id="viewUrl" action="buildResults">
+ <s:param name="projectId">${queue.task.projectId}</s:param>
+ </s:url>
+ <s:a href="%{viewUrl}">${queue.task.projectName}</s:a>
+ </ec:column>
+ <ec:column property="task.buildDefinitionLabel" title="buildQueue.currentTask.buildDefinition" width="19%"/>
+ <ec:column property="cancelAction" title=" " width="1%">
+ <redback:ifAuthorized permission="continuum-manage-queues">
+ <s:url id="cancelUrl" action="removeBuildQueueEntry" method="remove" namespace="/">
+ <s:param name="projectId">${queue.task.projectId}</s:param>
+ <s:param name="buildDefinitionId">${queue.task.buildDefinitionId}</s:param>
+ <s:param name="trigger">${queue.task.buildTrigger.trigger}</s:param>
+ <s:param name="projectName">${queue.task.projectName}</s:param>
+ <s:param name="projectGroupId">${queue.task.projectGroupId}</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>
+ <c:if test="${empty buildsInQueue}">
+ <s:text name="buildQueue.empty"/>
+ </c:if>
+ </div>
<c:if test="${not empty buildsInQueue}">
<div class="functnbar3">
<table>
<tbody>
<tr>
<td>
- <input type="submit" value="<s:text name="buildQueue.removeEntries"/>"
- onclick="$('removeForm').action='removeBuildQueueEntries!removeBuildEntries.action';$('removeForm').submit();" />
+ <input type="button" value="<s:text name="buildQueue.removeEntries"/>" onclick="document.forms.removeBuildForm.submit();" />
</td>
</tr>
</tbody>
</table>
</div>
- </c:if>
-
- <!-- checkout queue -->
+ </c:if>
+ </s:form>
+
+ <s:form id="checkoutForm" action="none" method="post">
+ <%-- checkout queue --%>
<div id="h3">
<h3>
<s:text name="checkoutQueue.currentTask.section.title"/>
- </h3>
- <table width="100%">
- <s:if test="%{currentCheckoutTasks != null}">
- <tbody>
- <tr>
- <th><s:text name="checkoutQueue.currentTask.buildQueue"/></th>
- <th><s:text name="checkoutQueue.currentTask.projectName"/></th>
- <th> </th>
- </tr>
- <c:forEach var="element" items="${currentCheckoutTasks}">
- <tr>
- <td width="30%">${element.key}</td>
- <td width="69%">
- <s:url id="viewUrl" action="projectView">
- <s:param name="projectId">${element.value.projectId}</s:param>
- </s:url>
- <s:a href="%{viewUrl}">${element.value.projectName}</s:a>
- </td>
- <td width="1%">
+ </h3>
+ <c:if test="${not empty currentCheckoutTasks}">
+ <s:set name="currentCheckoutTasks" value="currentCheckoutTasks" scope="request"/>
+ <ec:table items="currentCheckoutTasks"
+ var="queue"
+ showExports="false"
+ showPagination="false"
+ showStatusBar="false"
+ sortable="false"
+ filterable="false">
+ <ec:row>
+ <ec:column property="name" title="checkoutQueue.currentTask.buildQueue" width="29%"/>
+ <ec:column property="projectUrl" title="checkoutQueue.currentTask.projectName" width="69%">
+ <s:url id="viewUrl" action="projectView">
+ <s:param name="projectId">${queue.task.projectId}</s:param>
+ </s:url>
+ <s:a href="%{viewUrl}">${queue.task.projectName}</s:a>
+ </ec:column>
+ <ec:column property="cancelAction" title=" " width="1%">
<redback:ifAuthorized permission="continuum-manage-queues">
<s:url id="cancelUrl" action="cancelCurrentQueueTask" method="cancelCurrentCheckout" namespace="/">
- <s:param name="projectId">${element.value.projectId}</s:param>
+ <s:param name="projectId">${queue.task.projectId}</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>
- </td>
- </tr>
- </c:forEach>
- </tbody>
- </s:if>
- <s:else>
- <s:text name="checkoutQueue.no.currentTaks" />
- </s:else>
- </table>
- </div>
+ </redback:elseAuthorized>
+ </ec:column>
+ </ec:row>
+ </ec:table>
+ </c:if>
+ <c:if test="${empty currentCheckoutTasks}">
+ <s:text name="checkoutQueue.no.currentTaks" />
+ </c:if>
+ </div>
+ </s:form>
+ <s:form id="removeCheckoutForm" action="removeCheckoutQueueEntries!removeCheckoutEntries.action" method="post">
<div id="h3">
<h3>
<s:text name="checkoutQueue.section.title"/>
- </h3>
- <table width="100%">
- <s:if test="%{checkoutsInQueue != null}">
- <tbody>
- <tr>
+ </h3>
+ <c:if test="${not empty checkoutsInQueue}">
+ <s:set name="checkoutsInQueue" value="checkoutsInQueue" scope="request"/>
+ <ec:table items="checkoutsInQueue"
+ var="queue"
+ showExports="false"
+ showPagination="false"
+ showStatusBar="false"
+ sortable="false"
+ filterable="false">
+ <ec:row>
<redback:ifAuthorized permission="continuum-manage-queues">
- <th> </th>
+ <ec:column alias="selectedCheckOutTaskHashCodes" title=" " style="width:5px" filterable="false" sortable="false" headerCell="selectAll">
+ <input type="checkbox" name="selectedCheckOutTaskHashCodes" value="${queue.task.hashCode}" />
+ </ec:column>
</redback:ifAuthorized>
- <th><s:text name="checkoutQueue.currentTask.buildQueue"/></th>
- <th><s:text name="checkoutQueue.currentTask.projectName"/></th>
- <th> </th>
- </tr>
- <c:forEach var="element" items="${checkoutsInQueue}">
- <c:forEach var="checkoutTask" items="${element.value}">
- <tr>
- <td width="1%">
- <redback:ifAuthorized permission="continuum-manage-queues">
- <input type="checkbox" name="selectedCheckOutTaskHashCodes" value="${checkoutTask.hashCode}" />
- </redback:ifAuthorized>
- </td>
- <td width="29%">${element.key}</td>
- <td width="69%">
- <s:url id="viewUrl" action="projectView">
- <s:param name="projectId">${checkoutTask.projectId}</s:param>
- </s:url>
- <s:a href="%{viewUrl}">${checkoutTask.projectName}</s:a>
- </td>
- <td width="1%">
- <redback:ifAuthorized permission="continuum-manage-queues">
- <s:url id="cancelUrl" action="removeCheckoutQueueEntry" method="removeCheckout">
- <s:param name="projectId">${checkoutTask.projectId}</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>
- </td>
- </tr>
- </c:forEach>
- </c:forEach>
- </tbody>
- </s:if>
- <s:else>
- <s:text name="checkoutQueue.no.currentTaks" />
- </s:else>
- </table>
- </div>
+ <ec:column property="name" title="checkoutQueue.currentTask.buildQueue" width="29%"/>
+ <ec:column property="projectUrl" title="checkoutQueue.currentTask.projectName" width="69%">
+ <s:url id="viewUrl" action="projectView">
+ <s:param name="projectId">${queue.task.projectId}</s:param>
+ </s:url>
+ <s:a href="%{viewUrl}">${queue.task.projectName}</s:a>
+ </ec:column>
+ <ec:column property="cancelAction" title=" " width="1%">
+ <redback:ifAuthorized permission="continuum-manage-queues">
+ <s:url id="cancelUrl" action="removeCheckoutQueueEntry" method="removeCheckout" namespace="/">
+ <s:param name="projectId">${queue.task.projectId}</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>
+ <c:if test="${empty checkoutsInQueue}">
+ <s:text name="checkoutQueue.empty" />
+ </c:if>
+ </div>
<c:if test="${not empty checkoutsInQueue}">
<div class="functnbar3">
<table>
@@ -247,17 +233,105 @@
<tr>
<td>
<redback:ifAuthorized permission="continuum-manage-queues">
- <input type="submit" value="<s:text name="checkoutQueue.removeEntries"/>"
- onclick="$('removeForm').action='removeCheckoutQueueEntries!removeCheckoutEntries.action';$('removeForm').submit();" />
+ <input type="submit" value="<s:text name="checkoutQueue.removeEntries"/>" onclick="document.forms.removeCheckoutForm.submit();" />
</redback:ifAuthorized>
</td>
</tr>
</tbody>
</table>
</div>
+ </c:if>
+ </s:form>
+
+ <s:form id="prepareBuildForm" action="none" method="post">
+ <div id="h3">
+ <h3><s:text name="prepareBuildQueue.currentTask.section.title"/></h3>
+ <c:if test="${not empty currentPrepareBuilds}">
+ <s:set name="currentPrepareBuilds" value="currentPrepareBuilds" scope="request"/>
+ <ec:table items="currentPrepareBuilds"
+ var="currentPrepareBuild"
+ showExports="false"
+ showPagination="false"
+ showStatusBar="false"
+ sortable="false"
+ filterable="false">
+ <ec:row>
+ <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>
+ </c:if>
+ <c:if test="${empty currentPrepareBuilds}">
+ <s:text name="prepareBuildQueue.no.currentTasks"/>
+ </c:if>
+ </div>
+ </s:form>
+
+ <s:form id="removePrepareBuildForm" action="removePrepareBuildEntries.action" method="post">
+ <div id="h3">
+ <h3>
+ <s:text name="prepareBuildQueue.section.title"/>
+ </h3>
+ <c:if test="${not empty prepareBuildQueues}">
+ <s:set name="prepareBuildQueues" value="prepareBuildQueues" scope="request"/>
+ <ec:table items="prepareBuildQueues"
+ var="prepareBuildQueue"
+ showExports="false"
+ showPagination="false"
+ showStatusBar="false"
+ sortable="false"
+ filterable="false">
+ <ec:row>
+ <redback:ifAuthorized permission="continuum-manage-queues">
+ <ec:column alias="selectedPrepareBuildTaskHashCodes" title=" " 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="projectGroupUrl" title="prepareBuildQueue.table.projectGroupName">
+ <s:url id="viewUrl" action="projectGroupSummary">
+ <s:param name="projectGroupId">${pageScope.prepareBuildQueue.projectGroupId}</s:param>
+ </s:url>
+ <s:a href="%{viewUrl}">${pageScope.prepareBuildQueue.projectGroupName}</s:a>
+ </ec:column>
+ <ec:column property="scmRootAddress" title="prepareBuildQueue.table.scmRootAddress"/>
+ <ec:column property="cancelEntry" title=" " width="1%">
+ <redback:ifAuthorized permission="continuum-manage-queues">
+ <s:url id="cancelUrl" action="removePrepareBuildEntry" method="removePrepareBuildEntry" namespace="/">
+ <s:param name="projectGroupId">${pageScope.prepareBuildQueue.projectGroupId}</s:param>
+ <s:param name="scmRootId">${pageScope.prepareBuildQueue.scmRootId}</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 prepareBuildQueues}">
+ <div class="functnbar3">
+ <table>
+ <tbody>
+ <tr>
+ <td>
+ <input type="button" name="remove-prepare-build-queues" value="<s:text name="prepareBuildQueue.removeEntries"/>" onclick="document.forms.removePrepareBuildForm.submit();" />
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ </c:if>
+ <c:if test="${empty prepareBuildQueues}">
+ <s:text name="prepareBuildQueue.empty"/>
</c:if>
-
</s:form>
</body>
</s:i18n>
-</html>
\ No newline at end of file
+</html>
Propchange: continuum/branches/continuum-flat-multi-module/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteBuildAgent.jsp
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 6 09:23:13 2010
@@ -1,2 +1,2 @@
/continuum/branches/continuum-1.2.x/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/configurationDeleteBuildAgent.jsp:690684,690689-690799,698449-698533,698817-698819,699529,700250,700273,700936,705894,705910,708339
-/continuum/branches/continuum-1.3.x/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteBuildAgent.jsp:766106,766120-766121,766641,766645,766669,766977,767397,767792,767796,768222
+/continuum/branches/continuum-1.3.x/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteBuildAgent.jsp:760767-900271,915354,915760,915848-915864,916073-916074
Modified: continuum/branches/continuum-flat-multi-module/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editAppearance.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-flat-multi-module/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editAppearance.jsp?rev=941625&r1=941624&r2=941625&view=diff
==============================================================================
--- continuum/branches/continuum-flat-multi-module/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editAppearance.jsp (original)
+++ continuum/branches/continuum-flat-multi-module/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editAppearance.jsp Thu May 6 09:23:13 2010
@@ -22,7 +22,6 @@
<s:i18n name="localization.Continuum">
<head>
<title><s:text name="appearance.page.title"/></title>
- <s:head/>
</head>
<body>
Modified: continuum/branches/continuum-flat-multi-module/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editBuildDefinitionAsTemplate.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-flat-multi-module/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editBuildDefinitionAsTemplate.jsp?rev=941625&r1=941624&r2=941625&view=diff
==============================================================================
--- continuum/branches/continuum-flat-multi-module/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editBuildDefinitionAsTemplate.jsp (original)
+++ continuum/branches/continuum-flat-multi-module/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editBuildDefinitionAsTemplate.jsp Thu May 6 09:23:13 2010
@@ -79,6 +79,9 @@
listKey="id" headerKey="-1" headerValue=""/>
</s:else>
<s:select label="%{getText('buildDefinition.type.label')}" name="buildDefinition.type" list="buildDefinitionTypes"/>
+ <s:if test="buildDefinition.type != 'ant' || buildDefinition.type != 'shell'">
+ <s:select label="%{getText('buildDefinition.updatePolicy.label')}" name="buildDefinition.updatePolicy" list="buildDefinitionUpdatePolicies"/>
+ </s:if>
<s:textfield label="%{getText('buildDefinition.description.label')}" name="buildDefinition.description" required="true"/>
</tbody>
</table>
Modified: continuum/branches/continuum-flat-multi-module/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editPom.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-flat-multi-module/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editPom.jsp?rev=941625&r1=941624&r2=941625&view=diff
==============================================================================
--- continuum/branches/continuum-flat-multi-module/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editPom.jsp (original)
+++ continuum/branches/continuum-flat-multi-module/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editPom.jsp Thu May 6 09:23:13 2010
@@ -22,7 +22,6 @@
<s:i18n name="localization.Continuum">
<head>
<title><s:text name="companyPom.page.title"/></title>
- <s:head/>
</head>
<body>
Modified: continuum/branches/continuum-flat-multi-module/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editPurgeConfiguration.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-flat-multi-module/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editPurgeConfiguration.jsp?rev=941625&r1=941624&r2=941625&view=diff
==============================================================================
--- continuum/branches/continuum-flat-multi-module/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editPurgeConfiguration.jsp (original)
+++ continuum/branches/continuum-flat-multi-module/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editPurgeConfiguration.jsp Thu May 6 09:23:13 2010
@@ -68,6 +68,7 @@
<s:select label="%{getText('purgeConfig.schedule.label')}" name="scheduleId" list="schedules"
headerKey="-1" headerValue=""/>
<s:textfield label="%{getText('purgeConfig.description.label')}" name="description"/>
+ <s:checkbox label="%{getText('purgeConfig.enabled.label')}" name="enabled"/>
</table>
<s:hidden name="purgeConfigId"/>
<s:hidden name="purgeType"/>
Modified: continuum/branches/continuum-flat-multi-module/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/viewDistributedBuilds.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-flat-multi-module/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/viewDistributedBuilds.jsp?rev=941625&r1=941624&r2=941625&view=diff
==============================================================================
--- continuum/branches/continuum-flat-multi-module/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/viewDistributedBuilds.jsp (original)
+++ continuum/branches/continuum-flat-multi-module/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/viewDistributedBuilds.jsp Thu May 6 09:23:13 2010
@@ -26,65 +26,67 @@
<s:i18n name="localization.Continuum">
<head>
<title><s:text name="distributedBuilds.page.title"/></title>
+ <meta http-equiv="refresh" content="60"/>
</head>
<body>
- <s:form id="removeForm" action="none" method="post">
+ <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="buildForm" 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.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="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="scmRootAddress" title="distributedBuild.table.scmRootAddress"/>
- <ec:column property="url" title="distributedBuild.table.agentUrl"/>
+ <ec:column property="buildAgentUrl" title="distributedBuild.table.buildAgentUrl"/>
<ec:column property="cancelEntry" title=" " 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="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}">
- <s:text name="distributedBuilds.empty"/>
+ <c:if test="${empty currentDistributedBuilds}">
+ <s:text name="distributedBuilds.no.currentTasks"/>
</c:if>
</div>
+ </s:form>
+ <s:form id="removeBuildForm" action="removeDistributedBuildEntries.action" method="post">
<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"
@@ -92,17 +94,25 @@
filterable="false">
<ec:row>
<redback:ifAuthorized permission="continuum-manage-queues">
- <ec:column alias="selectedDistributedBuildTaskHashCodes" title=" " style="width:5px" filterable="false" sortable="false" width="1%" headerCell="selectAll">
- <input type="checkbox" name="selectedDistributedBuildTaskHashCodes" value="${pageScope.distributedBuildQueue.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="projectUrl" title="distributedBuild.table.projectName">
+ <s:url id="viewUrl" action="buildResults">
+ <s:param name="projectId">${pageScope.buildQueue.projectId}</s:param>
+ </s:url>
+ <s:a href="%{viewUrl}">${pageScope.buildQueue.projectName}</s:a>
+ </ec:column>
+ <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.buildAgentUrl"/>
<ec:column property="cancelEntry" title=" " 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>
@@ -120,15 +130,110 @@
<tbody>
<tr>
<td>
- <input type="submit" value="<s:text name="distributedBuilds.removeEntries"/>"
- onclick="$('removeForm').action='removeDistributedBuildEntries!removeDistributedBuildEntries.action';$('removeForm').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 distributedBuildQueues}">
+ <s:text name="distributedBuilds.empty"/>
+ </c:if>
+ </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.buildAgentUrl"/>
+ </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.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="selectedPrepareBuildTaskHashCodes" title=" " 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="projectGroupUrl" title="distributedPrepareBuild.table.projectGroupName">
+ <s:url id="viewUrl" action="projectGroupSummary">
+ <s:param name="projectGroupId">${pageScope.prepareBuildQueue.projectGroupId}</s:param>
+ </s:url>
+ <s:a href="%{viewUrl}">${pageScope.prepareBuildQueue.projectGroupName}</s:a>
+ </ec:column>
+ <ec:column property="scmRootAddress" title="distributedPrepareBuild.table.scmRootAddress"/>
+ <ec:column property="buildAgentUrl" title="distributedPrepareBuild.table.buildAgentUrl"/>
+ <ec:column property="cancelEntry" title=" " 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="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 distributedPrepareBuildQueues}">
+ <s:text name="distributedPrepareBuilds.empty"/>
+ </c:if>
</s:form>
+
</body>
</s:i18n>
-</html>
\ No newline at end of file
+</html>
Modified: continuum/branches/continuum-flat-multi-module/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildDefinitionEdit.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-flat-multi-module/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildDefinitionEdit.jsp?rev=941625&r1=941624&r2=941625&view=diff
==============================================================================
--- continuum/branches/continuum-flat-multi-module/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildDefinitionEdit.jsp (original)
+++ continuum/branches/continuum-flat-multi-module/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildDefinitionEdit.jsp Thu May 6 09:23:13 2010
@@ -30,7 +30,7 @@
<h3><s:text name="buildDefinition.section.title"/></h3>
<div class="axial">
- <s:form action="saveBuildDefinition" method="get">
+ <s:form action="saveBuildDefinition" method="post">
<c:choose>
<c:when test="${!empty actionErrors}">
@@ -79,6 +79,9 @@
<s:select label="%{getText('buildDefinition.profile.label')}" name="profileId" list="profiles" listValue="name"
listKey="id" headerKey="-1" headerValue=""/>
<s:select label="%{getText('buildDefinition.type.label')}" name="buildDefinitionType" list="buildDefinitionTypes"/>
+ <s:if test="executor != 'ant' || executor != 'shell'">
+ <s:select label="%{getText('buildDefinition.updatePolicy.label')}" name="updatePolicy" list="buildDefinitionUpdatePolicies"/>
+ </s:if>
<s:textfield label="%{getText('buildDefinition.description.label')}" name="description" />
</tbody>
</table>
Modified: continuum/branches/continuum-flat-multi-module/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildResult.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-flat-multi-module/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildResult.jsp?rev=941625&r1=941624&r2=941625&view=diff
==============================================================================
--- continuum/branches/continuum-flat-multi-module/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildResult.jsp (original)
+++ continuum/branches/continuum-flat-multi-module/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildResult.jsp Thu May 6 09:23:13 2010
@@ -66,6 +66,9 @@
</s:else>
</s:param>
</c1:data>
+ <c1:data label="%{getText('buildResult.username')}">
+ <s:param name="after"><s:property value="buildResult.username"/></s:param>
+ </c1:data>
</table>
</div>
<div class="functnbar3">
Modified: continuum/branches/continuum-flat-multi-module/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildResults.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-flat-multi-module/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildResults.jsp?rev=941625&r1=941624&r2=941625&view=diff
==============================================================================
--- continuum/branches/continuum-flat-multi-module/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildResults.jsp (original)
+++ continuum/branches/continuum-flat-multi-module/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildResults.jsp Thu May 6 09:23:13 2010
@@ -39,6 +39,15 @@
<s:param><s:property value="project.name"/></s:param>
</s:text>
</h3>
+
+ <c:if test="${!empty actionErrors}">
+ <div class="errormessage">
+ <s:iterator value="actionErrors">
+ <p><s:property/></p>
+ </s:iterator>
+ </div>
+ </c:if>
+
<form id="buildResultsForm" action="removeBuildResults.action" method="post">
<s:hidden name="projectGroupId"/>
<s:hidden name="projectId"/>
Modified: continuum/branches/continuum-flat-multi-module/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionGroupSummaryComponent.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-flat-multi-module/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionGroupSummaryComponent.jsp?rev=941625&r1=941624&r2=941625&view=diff
==============================================================================
--- continuum/branches/continuum-flat-multi-module/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionGroupSummaryComponent.jsp (original)
+++ continuum/branches/continuum-flat-multi-module/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionGroupSummaryComponent.jsp Thu May 6 09:23:13 2010
@@ -66,6 +66,7 @@
<s:url id="buildUrl" action="buildProject" namespace="/">
<s:param name="projectGroupId">${pageScope.buildDefinitionSummary.projectGroupId}</s:param>
<s:param name="buildDefinitionId">${pageScope.buildDefinitionSummary.id}</s:param>
+ <s:param name="fromGroupPage" value="true"/>
</s:url>
<s:a href="%{buildUrl}"><img src="<s:url value='/images/buildnow.gif' includeParams="none"/>" alt="<s:text name='build'/>" title="<s:text name='build'/>" border="0"></s:a>
</redback:ifAuthorized>
Modified: continuum/branches/continuum-flat-multi-module/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/companyLogo.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-flat-multi-module/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/companyLogo.jsp?rev=941625&r1=941624&r2=941625&view=diff
==============================================================================
--- continuum/branches/continuum-flat-multi-module/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/companyLogo.jsp (original)
+++ continuum/branches/continuum-flat-multi-module/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/companyLogo.jsp Thu May 6 09:23:13 2010
@@ -21,15 +21,16 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<s:set name="companyLogo" value="companyLogo"/>
<c:if test="${!empty (companyLogo)}">
+ <s:set name="companyName" value="companyName"/>
<s:set name="companyUrl" value="companyUrl"/>
<c:choose>
<c:when test="${!empty (companyUrl)}">
<a href="${companyUrl}">
- <img src="${companyLogo}" title="${companyName}" border="0" alt=""/>
+ <img src="${companyLogo}" title="${companyName}" border="0" alt="${companyName}"/>
</a>
</c:when>
<c:otherwise>
- <img src="${companyLogo}" title="${companyName}" border="0" alt=""/>
+ <img src="${companyLogo}" title="${companyName}" border="0" alt="${companyName}"/>
</c:otherwise>
</c:choose>
</c:if>
Modified: continuum/branches/continuum-flat-multi-module/continuum-webapp/src/main/webapp/WEB-INF/jsp/editSchedule.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-flat-multi-module/continuum-webapp/src/main/webapp/WEB-INF/jsp/editSchedule.jsp?rev=941625&r1=941624&r2=941625&view=diff
==============================================================================
--- continuum/branches/continuum-flat-multi-module/continuum-webapp/src/main/webapp/WEB-INF/jsp/editSchedule.jsp (original)
+++ continuum/branches/continuum-flat-multi-module/continuum-webapp/src/main/webapp/WEB-INF/jsp/editSchedule.jsp Thu May 6 09:23:13 2010
@@ -32,7 +32,7 @@
<h3><s:text name="editSchedule.section.title"/></h3>
<div class="axial">
- <s:form action="saveSchedule" method="post" validate="true">
+ <s:form action="saveSchedule" method="post" validate="false" name="scheduleForm">
<c:if test="${!empty actionErrors}">
<div class="errormessage">
<s:iterator value="actionErrors">
@@ -74,14 +74,27 @@
</s:textfield>
<c1:ifBuildTypeEnabled buildType="parallel">
- <s:optiontransferselect label="%{getText('schedule.buildqueues.label')}" name="availableBuildQueues"
- list="availableBuildQueues" size="8" multiple="true" emptyOption="false"
- doubleName="selectedBuildQueues" doubleList="selectedBuildQueues" doubleSize="8"
- doubleMultiple="true" doubleEmptyOption="false"
- addAllToRightOnclick="selectAllOptions(document.getElementById('saveSchedule_availableBuildQueues'));selectAllOptions(document.getElementById('saveSchedule_selectedBuildQueues'));"
- addToRightOnclick="selectAllOptions(document.getElementById('saveSchedule_availableBuildQueues'));selectAllOptions(document.getElementById('saveSchedule_selectedBuildQueues'));"
- addAllToLeftOnclick="selectAllOptions(document.getElementById('saveSchedule_availableBuildQueues'));selectAllOptions(document.getElementById('saveSchedule_selectedBuildQueues'));"
- addToLeftOnclick="selectAllOptions(document.getElementById('saveSchedule_availableBuildQueues'));selectAllOptions(document.getElementById('saveSchedule_selectedBuildQueues'));"
+ <s:optiontransferselect
+ label="%{getText('schedule.buildqueues.label')}"
+ name="availableBuildQueuesIds"
+ list="availableBuildQueues"
+ listKey="id"
+ listValue="name"
+ headerKey="-1"
+ headerValue="%{getText('schedule.available.buildqueues')}"
+ multiple="true"
+ size="8"
+ emptyOption="false"
+ doubleName="selectedBuildQueuesIds"
+ doubleList="selectedBuildQueues"
+ doubleListKey="id"
+ doubleListValue="name"
+ doubleHeaderKey="-1"
+ doubleSize="8"
+ doubleMultiple="true"
+ doubleEmptyOption="false"
+ doubleHeaderValue="%{getText('schedule.available.buildqueues.used')}"
+ formName="scheduleForm"
/>
</c1:ifBuildTypeEnabled>
Modified: continuum/branches/continuum-flat-multi-module/continuum-webapp/src/main/webapp/WEB-INF/jsp/error/error.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-flat-multi-module/continuum-webapp/src/main/webapp/WEB-INF/jsp/error/error.jsp?rev=941625&r1=941624&r2=941625&view=diff
==============================================================================
--- continuum/branches/continuum-flat-multi-module/continuum-webapp/src/main/webapp/WEB-INF/jsp/error/error.jsp (original)
+++ continuum/branches/continuum-flat-multi-module/continuum-webapp/src/main/webapp/WEB-INF/jsp/error/error.jsp Thu May 6 09:23:13 2010
@@ -24,7 +24,6 @@
<s:i18n name="localization.Continuum">
<head>
<title><s:text name="errorOccured.page.title"/></title>
- <s:head />
<script language=javascript type='text/javascript'>
<!--
var state = 'none';
Modified: continuum/branches/continuum-flat-multi-module/continuum-webapp/src/main/webapp/WEB-INF/jsp/error/httpError.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-flat-multi-module/continuum-webapp/src/main/webapp/WEB-INF/jsp/error/httpError.jsp?rev=941625&r1=941624&r2=941625&view=diff
==============================================================================
--- continuum/branches/continuum-flat-multi-module/continuum-webapp/src/main/webapp/WEB-INF/jsp/error/httpError.jsp (original)
+++ continuum/branches/continuum-flat-multi-module/continuum-webapp/src/main/webapp/WEB-INF/jsp/error/httpError.jsp Thu May 6 09:23:13 2010
@@ -33,79 +33,52 @@
<c:when test="${param.errorCode == 404}">
<s:text name="error.404.title"/>
</c:when>
- <c:when test="${param.errorCode == 405}">
- <s:text name="error.405.title"/>
+ <c:when test="${param.errorCode == 500}">
+ <s:text name="error.500.title"/>
</c:when>
<c:otherwise>
<s:text name="error.page.title"/>
</c:otherwise>
</c:choose>
</title>
- <link rel="stylesheet" type="text/css" href="<s:url value="/css/tigris.css" includeParams="none"/>" media="screen"/>
- <link rel="stylesheet" type="text/css" href="<s:url value="/css/print.css" includeParams="none"/>" media="print"/>
- <link rel="stylesheet" type="text/css" href="<s:url value="/css/extremecomponents.css" includeParams="none"/>" media="screen"/>
- <link rel="shortcut icon" href="<s:url value="/favicon.ico" includeParams="none"/>" type="image/x-icon"/>
-
- <script src="<s:url value="/scripts/tigris.js" includeParams="none"/>" type="text/javascript"></script>
</head>
-<body onload="focus()" marginwidth="0" marginheight="0" class="composite">
-<s:include value="/WEB-INF/jsp/navigations/DefaultTop.jsp"/>
-
-<table id="main" border="0" cellpadding="4" cellspacing="0" width="100%">
- <tbody>
- <tr valign="top">
- <td id="leftcol" width="180">
- <br/> <br/>
- <s:include value="/WEB-INF/jsp/navigations/Menu.jsp"/>
- </td>
- <td width="86%">
- <br/>
-
- <div id="bodycol">
- <div class="app">
- <div id="axial" class="h3">
- <h3>
- <c:choose>
- <c:when test="${param.errorCode == 403}">
- <s:text name="error.403.section.title"/>
- </c:when>
- <c:when test="${param.errorCode == 404}">
- <s:text name="error.404.section.title"/>
- </c:when>
- <c:when test="${param.errorCode == 405}">
- <s:text name="error.405.section.title"/>
- </c:when>
- <c:otherwise>
- The URL requested results to an unknown error.
- </c:otherwise>
- </c:choose>
- </h3>
+<body>
+ <div id="h3">
+ <h3>
+ <c:choose>
+ <c:when test="${param.errorCode == 403}">
+ <s:text name="error.403.section.title"/>
+ </c:when>
+ <c:when test="${param.errorCode == 404}">
+ <s:text name="error.404.section.title"/>
+ </c:when>
+ <c:when test="${param.errorCode == 500}">
+ <s:text name="error.500.section.title"/>
+ </c:when>
+ <c:otherwise>
+ The URL requested results to an unknown error (Error <s:property value="errorCode"/>).
+ </c:otherwise>
+ </c:choose>
+ </h3>
- <div class="errormessage">
- <c:choose>
- <c:when test="${param.errorCode == 403}">
- <s:text name="error.403.message"/>
- </c:when>
- <c:when test="${param.errorCode == 404}">
- <s:text name="error.404.message"/>
- </c:when>
- <c:when test="${param.errorCode == 405}">
- <s:text name="error.405.message"/>
- </c:when>
- <c:otherwise>
- The URL requested results to an unknown error.
- </c:otherwise>
- </c:choose>
- </div>
- </div>
- </div>
- </div>
- </td>
- </tr>
- </tbody>
-</table>
-<s:include value="/WEB-INF/jsp/navigations/DefaultBottom.jsp"/>
+ <div class="errormessage">
+ <c:choose>
+ <c:when test="${param.errorCode == 403}">
+ <s:text name="error.403.message"/>
+ </c:when>
+ <c:when test="${param.errorCode == 404}">
+ <s:text name="error.404.message"/>
+ </c:when>
+ <c:when test="${param.errorCode == 500}">
+ <s:text name="error.500.message"/>
+ </c:when>
+ <c:otherwise>
+ The URL requested results to an unknown error (Error <s:property value="errorCode"/>).
+ </c:otherwise>
+ </c:choose>
+ </div>
+ </div>
</body>
</html>
</s:i18n>
\ No newline at end of file
Modified: continuum/branches/continuum-flat-multi-module/continuum-webapp/src/main/webapp/WEB-INF/jsp/groupSummary.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-flat-multi-module/continuum-webapp/src/main/webapp/WEB-INF/jsp/groupSummary.jsp?rev=941625&r1=941624&r2=941625&view=diff
==============================================================================
--- continuum/branches/continuum-flat-multi-module/continuum-webapp/src/main/webapp/WEB-INF/jsp/groupSummary.jsp (original)
+++ continuum/branches/continuum-flat-multi-module/continuum-webapp/src/main/webapp/WEB-INF/jsp/groupSummary.jsp Thu May 6 09:23:13 2010
@@ -39,6 +39,14 @@
<h3><s:text name="groups.page.section.title"/></h3>
</s:else>
+ <c:if test="${!empty actionErrors}">
+ <div class="errormessage">
+ <s:iterator value="actionErrors">
+ <p><s:property/></p>
+ </s:iterator>
+ </div>
+ </c:if>
+
<c:if test="${empty groups}">
<s:text name="groups.page.list.empty"/>
</c:if>
Modified: continuum/branches/continuum-flat-multi-module/continuum-webapp/src/main/webapp/WEB-INF/jsp/navigations/wait.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-flat-multi-module/continuum-webapp/src/main/webapp/WEB-INF/jsp/navigations/wait.jsp?rev=941625&r1=941624&r2=941625&view=diff
==============================================================================
--- continuum/branches/continuum-flat-multi-module/continuum-webapp/src/main/webapp/WEB-INF/jsp/navigations/wait.jsp (original)
+++ continuum/branches/continuum-flat-multi-module/continuum-webapp/src/main/webapp/WEB-INF/jsp/navigations/wait.jsp Thu May 6 09:23:13 2010
@@ -22,11 +22,11 @@
<html>
<s:i18n name="localization.Continuum">
<head>
- <META HTTP-EQUIV="refresh" CONTENT="2;url=<s:url includeParams="all"/>"/>
+ <META HTTP-EQUIV="refresh" CONTENT="2;url=<s:url includeParams="NONE"/>"/>
</head>
<body>
<img src="images/wait.gif">
<b><s:text name="wait.addprocessing.processing"/></b>
</body>
</s:i18n>
-</html>
\ No newline at end of file
+</html>
Modified: continuum/branches/continuum-flat-multi-module/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierMail.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-flat-multi-module/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierMail.jsp?rev=941625&r1=941624&r2=941625&view=diff
==============================================================================
--- continuum/branches/continuum-flat-multi-module/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierMail.jsp (original)
+++ continuum/branches/continuum-flat-multi-module/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierMail.jsp Thu May 6 09:23:13 2010
@@ -57,6 +57,7 @@
<tbody>
<s:textfield label="%{getText('notifier.mail.recipient.address.label')}" name="address" />
<s:checkbox label="%{getText('notifier.mail.recipient.committers.label')}" name="committers" value="committers" fieldValue="true"/>
+ <s:checkbox label="%{getText('notifier.mail.recipient.developers.label')}" name="developers" value="developers" fieldValue="true"/>
<s:checkbox label="%{getText('notifier.event.sendOnSuccess')}" name="sendOnSuccess" value="sendOnSuccess" fieldValue="true"/>
<s:checkbox label="%{getText('notifier.event.sendOnFailure')}" name="sendOnFailure" value="sendOnFailure" fieldValue="true"/>
<s:checkbox label="%{getText('notifier.event.sendOnError')}" name="sendOnError" value="sendOnError" fieldValue="true"/>