You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by de...@apache.org on 2014/05/14 21:52:52 UTC
svn commit: r1594688 - in
/uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli:
DuccJobMonitor.java DuccManagedReservationMonitor.java
Author: degenaro
Date: Wed May 14 19:52:52 2014
New Revision: 1594688
URL: http://svn.apache.org/r1594688
Log:
UIMA-3432 DUCC Web Server (WS) to show better Reason (rationale) on hover for cancellation: Monitor ended; Monitor ping overdue; Terminate button pressed
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccJobMonitor.java
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccManagedReservationMonitor.java
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccJobMonitor.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccJobMonitor.java?rev=1594688&r1=1594687&r2=1594688&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccJobMonitor.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccJobMonitor.java Wed May 14 19:52:52 2014
@@ -23,6 +23,7 @@ import java.util.ArrayList;
import org.apache.commons.cli.HelpFormatter;
import org.apache.commons.cli.Options;
import org.apache.uima.ducc.cli.IUiOptions.UiOption;
+import org.apache.uima.ducc.common.CancelReasons.CancelReason;
import org.apache.uima.ducc.transport.event.IDuccContext.DuccContext;
public class DuccJobMonitor extends DuccMonitor implements IDuccMonitor {
@@ -69,7 +70,8 @@ public class DuccJobMonitor extends Ducc
arrayList.add("--"+UiOption.JobId.pname());
arrayList.add(getId());
arrayList.add("--"+UiOption.Reason.pname());
- arrayList.add("\"submitter was terminated via interrupt\"");
+ String reason = CancelReason.MonitorEnded.getText();
+ arrayList.add("\""+reason+"\"");
String[] argList = arrayList.toArray(new String[0]);
DuccJobCancel jobCancel = new DuccJobCancel(argList);
boolean retVal = jobCancel.execute();
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccManagedReservationMonitor.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccManagedReservationMonitor.java?rev=1594688&r1=1594687&r2=1594688&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccManagedReservationMonitor.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccManagedReservationMonitor.java Wed May 14 19:52:52 2014
@@ -23,6 +23,7 @@ import java.util.ArrayList;
import org.apache.commons.cli.HelpFormatter;
import org.apache.commons.cli.Options;
import org.apache.uima.ducc.cli.IUiOptions.UiOption;
+import org.apache.uima.ducc.common.CancelReasons.CancelReason;
import org.apache.uima.ducc.transport.event.IDuccContext.DuccContext;
public class DuccManagedReservationMonitor extends DuccMonitor implements IDuccMonitor {
@@ -68,7 +69,8 @@ public class DuccManagedReservationMonit
arrayList.add("--"+UiOption.ManagedReservationId.pname());
arrayList.add(getId());
arrayList.add("--"+UiOption.Reason.pname());
- arrayList.add("\"submitter was terminated via interrupt\"");
+ String reason = CancelReason.MonitorEnded.getText();
+ arrayList.add("\""+reason+"\"");
String[] argList = arrayList.toArray(new String[0]);
DuccManagedReservationCancel managedReservationCancel = new DuccManagedReservationCancel(argList);
boolean retVal = managedReservationCancel.execute();