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 2015/05/05 14:04:49 UTC
svn commit: r1677792 - in
/uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli:
DuccMonitor.java IUiOptions.java
Author: degenaro
Date: Tue May 5 12:04:48 2015
New Revision: 1677792
URL: http://svn.apache.org/r1677792
Log:
UIMA-4358 DUCC Job Driver (JD) remove obsolete code [for 2.0]
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccMonitor.java
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/IUiOptions.java
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccMonitor.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccMonitor.java?rev=1677792&r1=1677791&r2=1677792&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccMonitor.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccMonitor.java Tue May 5 12:04:48 2015
@@ -87,14 +87,6 @@ public abstract class DuccMonitor {
private IUiOption[] optsMonitorJob = new UiOption[] { UiOption.Help,
UiOption.Debug, UiOption.Quiet, UiOption.Timestamp, UiOption.JobId, };
- private IUiOption[] optsSubmitReservation = new UiOption[] {
- UiOption.Help, UiOption.Debug, UiOption.Quiet, UiOption.Timestamp,
- UiOption.ReservationId, UiOption.CancelOnInterrupt, };
-
- private IUiOption[] optsMonitorReservation = new UiOption[] {
- UiOption.Help, UiOption.Debug, UiOption.Quiet, UiOption.Timestamp,
- UiOption.ReservationId, };
-
private IUiOption[] optsSubmitManagedReservation = new UiOption[] {
UiOption.Help, UiOption.Debug, UiOption.Quiet, UiOption.Timestamp,
UiOption.ManagedReservationId, UiOption.CancelOnInterrupt, };
@@ -152,13 +144,6 @@ public abstract class DuccMonitor {
opts = optsMonitorJob;
}
break;
- case Reservation:
- if (submit) {
- opts = optsSubmitReservation;
- } else {
- opts = optsMonitorReservation;
- }
- break;
case ManagedReservation:
if (submit) {
opts = optsSubmitManagedReservation;
@@ -310,14 +295,9 @@ public abstract class DuccMonitor {
}
if (command_line.contains(UiOption.JobId)) {
id = command_line.get(UiOption.JobId);
- }
- else if (command_line.contains(UiOption.ManagedReservationId)) {
+ } else if (command_line.contains(UiOption.ManagedReservationId)) {
id = command_line.get(UiOption.ManagedReservationId);
- }
- else if (command_line.contains(UiOption.ReservationId)) {
- id = command_line.get(UiOption.ReservationId);
- }
- else {
+ } else {
System.out.println(command_line.formatHelp(DuccJobMonitor.class.getName()));
return RC_HELP;
}
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/IUiOptions.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/IUiOptions.java?rev=1677792&r1=1677791&r2=1677792&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/IUiOptions.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/IUiOptions.java Tue May 5 12:04:48 2015
@@ -271,13 +271,6 @@ public interface IUiOptions
public String description() { return "Register a service."; }
},
- ReservationId {
- public String pname() { return JobRequestProperties.key_id; }
- public String argname() { return "string"; }
- public String description() { return "The id of the reservation"; }
- public boolean required() { return true; }
- },
-
ServicePingArguments {
public String pname() { return "service_ping_arguments"; }
public String argname() { return "string"; }