continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From car...@apache.org
Subject svn commit: r443449 - in /maven/continuum/branches/continuum-acegi/continuum-webapp/src/main: java/org/apache/maven/continuum/web/view/StateCell.java webapp/editSchedule.jsp webapp/schedules.jsp
Date Thu, 14 Sep 2006 19:36:47 GMT
Author: carlos
Date: Thu Sep 14 12:36:46 2006
New Revision: 443449

URL: http://svn.apache.org/viewvc?view=rev&rev=443449
Log:
Comment out the cancel build/timeout feature until it's fully tested

Modified:
    maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/StateCell.java
    maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/editSchedule.jsp
    maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/schedules.jsp

Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/StateCell.java
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/StateCell.java?view=diff&rev=443449&r1=443448&r2=443449
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/StateCell.java
(original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/java/org/apache/maven/continuum/web/view/StateCell.java
Thu Sep 14 12:36:46 2006
@@ -62,8 +62,9 @@
 
             case ContinuumProjectState.BUILDING:
             {
-                return StateGenerator.generate( project.getState(), tableModel.getContext().getContextPath()
) + " "
-                    + createActionLink( "cancelBuild", project, "(cancel)" );
+                return StateGenerator.generate( project.getState(), tableModel.getContext().getContextPath()
);
+                // TODO enable cancel button
+                // + " " + createActionLink( "cancelBuild", project, "(cancel)" );
             }
 
             default:

Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/editSchedule.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/editSchedule.jsp?view=diff&rev=443449&r1=443448&r2=443449
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/editSchedule.jsp
(original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/editSchedule.jsp
Thu Sep 14 12:36:46 2006
@@ -38,9 +38,11 @@
               </td>
             </tr>
 
+<%--
             <ww:textfield label="%{getText('schedule.maxJobExecutionTime.label')}" name="maxJobExecutionTime"
required="true">
                 <ww:param name="desc"><p><ww:text name="schedule.maxJobExecutionTime.message"/></p></ww:param>
             </ww:textfield>
+--%>
             <ww:textfield label="%{getText('schedule.quietPeriod.label')}" name="delay">
                 <ww:param name="desc"><p><ww:text name="schedule.quietPeriod.message"/></p></ww:param>
             </ww:textfield>

Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/schedules.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/schedules.jsp?view=diff&rev=443449&r1=443448&r2=443449
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/schedules.jsp
(original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/webapp/schedules.jsp
Thu Sep 14 12:36:46 2006
@@ -21,7 +21,7 @@
             <ec:column property="description" title="schedules.table.description"/>
             <ec:column property="delay" title="schedules.table.delay"/>
             <ec:column property="cronExpression" title="schedules.table.cronExpression"/>
-            <ec:column property="maxJobExecutionTime" title="schedules.table.maxJobExecutionTime"/>
+            <%-- <ec:column property="maxJobExecutionTime" title="schedules.table.maxJobExecutionTime"/>
--%>
             <ec:column property="actions" title="&nbsp;">
                 <ww:url id="editScheduleUrl" action="schedule">
                   <ww:param name="id" value="${pageScope.schedule.id}"/>



Mime
View raw message