java/code/src/com/redhat/rhn/frontend/action/tasko/BunchDetailAction.java | 21
++++++----
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml | 2
java/code/src/com/redhat/rhn/taskomatic/TaskoQuartzHelper.java | 5 --
java/code/src/com/redhat/rhn/taskomatic/TaskoRun.hbm.xml | 2
java/code/src/com/redhat/rhn/taskomatic/TaskoSchedule.java | 8 +++
java/code/src/com/redhat/rhn/taskomatic/TaskoXmlRpcHandler.java | 6 ++
java/code/webapp/WEB-INF/pages/admin/bunchDetail.jsp | 7 ++-
java/code/webapp/WEB-INF/pages/admin/scheduleDetail.jsp | 3 -
java/code/webapp/WEB-INF/pages/admin/schedules.jsp | 3 -
9 files changed, 40 insertions(+), 17 deletions(-)
New commits:
commit c24eb1255b64166095a76825afa483ee7a16e39c
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri May 6 18:33:08 2011 +0200
659138 - change runs ordering
not sure, what is better
diff --git a/java/code/src/com/redhat/rhn/taskomatic/TaskoRun.hbm.xml
b/java/code/src/com/redhat/rhn/taskomatic/TaskoRun.hbm.xml
index 5459391..e1c2888 100644
--- a/java/code/src/com/redhat/rhn/taskomatic/TaskoRun.hbm.xml
+++ b/java/code/src/com/redhat/rhn/taskomatic/TaskoRun.hbm.xml
@@ -42,7 +42,7 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
</query>
<query name="TaskoRun.listByBunch">
- <![CDATA[FROM com.redhat.rhn.taskomatic.TaskoRun WHERE template.bunch.name
= :bunch_name ORDER BY startTime DESC, template.ordering DESC, endTime DESC]]>
+ <![CDATA[FROM com.redhat.rhn.taskomatic.TaskoRun WHERE template.bunch.name
= :bunch_name ORDER BY startTime DESC, id DESC]]>
</query>
<query name="TaskoRun.listRunsWithStatus">
commit 488d4180232ee5d2fa180b923ab86f60416135fa
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri May 6 18:31:20 2011 +0200
659138 - first schedule, then display
comsmetic issue - more user friendly
diff --git a/java/code/src/com/redhat/rhn/frontend/action/tasko/BunchDetailAction.java
b/java/code/src/com/redhat/rhn/frontend/action/tasko/BunchDetailAction.java
index 27b1e2d..89475e7 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/tasko/BunchDetailAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/tasko/BunchDetailAction.java
@@ -58,10 +58,6 @@ public class BunchDetailAction extends RhnAction implements Listable {
request.setAttribute("label", bunchLabel);
request.setAttribute("bunchdescription",
LocalizationService.getInstance().
getMessage("bunch.jsp.description." + bunchLabel));
- ListHelper helper = new ListHelper(this, request);
- helper.setListName(LIST_NAME);
- helper.setParentUrl(request.getRequestURI() + "?label=" + bunchLabel);
- helper.execute();
if (ctx.isSubmitted()) {
try {
@@ -78,7 +74,10 @@ public class BunchDetailAction extends RhnAction implements Listable {
"repos.jsp.message.taskomaticdown", null);
}
}
-
+ ListHelper helper = new ListHelper(this, request);
+ helper.setListName(LIST_NAME);
+ helper.setParentUrl(request.getRequestURI() + "?label=" + bunchLabel);
+ helper.execute();
return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
commit eed3e5c9fa86b834b0b88cc096731c232b4fb2a6
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri May 6 18:17:57 2011 +0200
659138 - update single run action message
diff --git a/java/code/src/com/redhat/rhn/frontend/action/tasko/BunchDetailAction.java
b/java/code/src/com/redhat/rhn/frontend/action/tasko/BunchDetailAction.java
index 2bf580e..27b1e2d 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/tasko/BunchDetailAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/tasko/BunchDetailAction.java
@@ -27,8 +27,11 @@ import com.redhat.rhn.taskomatic.TaskomaticApiException;
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
+import org.apache.struts.action.ActionMessage;
+import org.apache.struts.action.ActionMessages;
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -62,8 +65,13 @@ public class BunchDetailAction extends RhnAction implements Listable {
if (ctx.isSubmitted()) {
try {
- new TaskomaticApi().scheduleSingleSatBunch(loggedInUser, bunchLabel);
- createSuccessMessage(request, "message.bunch.singlescheduled",
bunchLabel);
+ Date date = new TaskomaticApi().scheduleSingleSatBunch(loggedInUser,
+ bunchLabel);
+ ActionMessages msgs = new ActionMessages();
+ msgs.add(ActionMessages.GLOBAL_MESSAGE,
+ new ActionMessage("message.bunch.singlescheduled",
bunchLabel,
+ LocalizationService.getInstance().formatCustomDate(date)));
+ saveMessages(request, msgs);
}
catch (TaskomaticApiException e) {
createErrorMessage(request,
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml
b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml
index bafe513..abac563 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml
@@ -8655,7 +8655,7 @@ Follow this url to see the full list of inactive systems:
<source>Per-User subscription restrictions may be applied in the
Subscribers tab</source>
</trans-unit>
<trans-unit id="message.bunch.singlescheduled">
- <source>Single run of <strong>{0}</strong>
bunch was scheduled.</source>
+ <source>Single run of <strong>{0}</strong>
bunch was scheduled for {1}.</source>
</trans-unit>
<trans-unit id="message.schedulecreated">
<source>Schedule <strong>{0}</strong>
created.</source>
commit c657393b9d13bf855eb8950d1e618941c5a2c9b7
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri May 6 18:16:57 2011 +0200
659138 - display times in current timezone
diff --git a/java/code/webapp/WEB-INF/pages/admin/bunchDetail.jsp
b/java/code/webapp/WEB-INF/pages/admin/bunchDetail.jsp
index 8ceb73c..3e5b704 100644
--- a/java/code/webapp/WEB-INF/pages/admin/bunchDetail.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/bunchDetail.jsp
@@ -3,6 +3,7 @@
<%@ taglib
uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib
uri="http://struts.apache.org/tags-bean" prefix="bean"
%>
<%@ taglib
uri="http://rhn.redhat.com/tags/list" prefix="rl"
%>
+<%@ taglib
uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"
%>
<html:xhtml/>
<html>
@@ -52,13 +53,15 @@
<rl:column bound="false"
headerkey="task.edit.jsp.stattime"
sortattr="start_time" >
- <a
href="/rhn/admin/ScheduleDetail.do?schid=${current.schedule_id}">${current.start_time}</a>
+ <a
href="/rhn/admin/ScheduleDetail.do?schid=${current.schedule_id}">
+ <fmt:formatDate pattern="yyyy-MM-dd HH:mm:ss z"
value="${current.start_time}"/>
+ </a>
</rl:column>
<rl:column bound="false"
headerkey="task.edit.jsp.endtime"
sortattr="end_time" >
- <c:out value="${current.end_time}" />
+ <fmt:formatDate pattern="yyyy-MM-dd HH:mm:ss z"
value="${current.end_time}"/>
</rl:column>
<rl:column bound="false"
diff --git a/java/code/webapp/WEB-INF/pages/admin/scheduleDetail.jsp
b/java/code/webapp/WEB-INF/pages/admin/scheduleDetail.jsp
index 2aa6ffe..bcf226e 100644
--- a/java/code/webapp/WEB-INF/pages/admin/scheduleDetail.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/scheduleDetail.jsp
@@ -2,6 +2,7 @@
<%@ taglib
uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib
uri="http://struts.apache.org/tags-bean" prefix="bean"
%>
<%@ taglib
uri="http://struts.apache.org/tags-html" prefix="html"
%>
+<%@ taglib
uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"
%>
<html>
<body>
@@ -92,7 +93,7 @@
<bean:message key="schedule.edit.jsp.activetill"/>:
</th>
<td class="small-form">
- <c:out value="${activetill}"/>
+ <fmt:formatDate pattern="yyyy-MM-dd HH:mm:ss z"
value="${activetill}"/>
</td>
</tr>
</c:if>
diff --git a/java/code/webapp/WEB-INF/pages/admin/schedules.jsp
b/java/code/webapp/WEB-INF/pages/admin/schedules.jsp
index 976a815..1ea7ddf 100644
--- a/java/code/webapp/WEB-INF/pages/admin/schedules.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/schedules.jsp
@@ -3,6 +3,7 @@
<%@ taglib
uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib
uri="http://struts.apache.org/tags-bean" prefix="bean"
%>
<%@ taglib
uri="http://rhn.redhat.com/tags/list" prefix="rl"
%>
+<%@ taglib
uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"
%>
<html:xhtml/>
<html>
@@ -42,7 +43,7 @@
bound="false"
headerkey="schedule.edit.jsp.activefrom"
sortattr="active_from" >
- <c:out value="${current.active_from}" />
+ <fmt:formatDate pattern="yyyy-MM-dd HH:mm:ss z"
value="${current.active_from}"/>
</rl:column>
<rl:column bound="false"
commit 38c7ca120d5fc655b91525335aacd3236a4970c0
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu May 5 23:07:41 2011 +0200
659138 - fix scheduling of single runs for specific time
diff --git a/java/code/src/com/redhat/rhn/taskomatic/TaskoQuartzHelper.java
b/java/code/src/com/redhat/rhn/taskomatic/TaskoQuartzHelper.java
index 899d105..85b92bf 100644
--- a/java/code/src/com/redhat/rhn/taskomatic/TaskoQuartzHelper.java
+++ b/java/code/src/com/redhat/rhn/taskomatic/TaskoQuartzHelper.java
@@ -68,15 +68,12 @@ public class TaskoQuartzHelper {
if (isCronExpressionEmpty(schedule.getCronExpr())) {
trigger = new SimpleTrigger(schedule.getJobLabel(),
getGroupName(schedule.getOrgId()), 1, 1);
- trigger.setEndTime(new Date());
}
else {
try {
trigger = new CronTrigger(schedule.getJobLabel(),
getGroupName(schedule.getOrgId()),
schedule.getCronExpr());
- trigger.setStartTime(schedule.getActiveFrom());
- trigger.setEndTime(schedule.getActiveTill());
}
catch (ParseException e) {
throw new InvalidParamException("Invalid cron expression " +
@@ -84,6 +81,8 @@ public class TaskoQuartzHelper {
}
}
+ trigger.setStartTime(schedule.getActiveFrom());
+ trigger.setEndTime(schedule.getActiveTill());
// create job
JobDetail jobDetail = new JobDetail(schedule.getJobLabel(),
getGroupName(schedule.getOrgId()), TaskoJob.class);
commit 14c180f1ce0723b765dba618de8e58517594d2a3
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu May 5 22:01:29 2011 +0200
659138 - reinit for possible single task schedules
diff --git a/java/code/src/com/redhat/rhn/taskomatic/TaskoSchedule.java
b/java/code/src/com/redhat/rhn/taskomatic/TaskoSchedule.java
index 7b7781f..ee595e7 100644
--- a/java/code/src/com/redhat/rhn/taskomatic/TaskoSchedule.java
+++ b/java/code/src/com/redhat/rhn/taskomatic/TaskoSchedule.java
@@ -295,4 +295,12 @@ public class TaskoSchedule {
public void setCronExpr(String cronExprIn) {
cronExpr = cronExprIn;
}
+
+ /**
+ * checks whether cron expression is defined
+ * @return true, if it's a cron schedule
+ */
+ public boolean isCronSchedule() {
+ return (cronExpr != null) && !cronExpr.isEmpty();
+ }
}
diff --git a/java/code/src/com/redhat/rhn/taskomatic/TaskoXmlRpcHandler.java
b/java/code/src/com/redhat/rhn/taskomatic/TaskoXmlRpcHandler.java
index fbeb506..2be64cb 100644
--- a/java/code/src/com/redhat/rhn/taskomatic/TaskoXmlRpcHandler.java
+++ b/java/code/src/com/redhat/rhn/taskomatic/TaskoXmlRpcHandler.java
@@ -499,7 +499,11 @@ public class TaskoXmlRpcHandler {
List<TaskoSchedule> schedules = new ArrayList<TaskoSchedule>();
for (TaskoSchedule schedule : TaskoFactory.listFuture()) {
TaskoQuartzHelper.destroyJob(schedule.getOrgId(), schedule.getJobLabel());
- schedule.setActiveFrom(new Date());
+ Date now = new Date();
+ schedule.setActiveFrom(now);
+ if (!schedule.isCronSchedule()) {
+ schedule.setActiveTill(now);
+ }
TaskoFactory.save(schedule);
try {
TaskoQuartzHelper.createJob(schedule);