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/03/19 18:11:39 UTC
svn commit: r1667819 - in
/uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli:
DuccReservationSubmit.java DuccUiConstants.java IUiOptions.java
Author: degenaro
Date: Thu Mar 19 17:11:39 2015
New Revision: 1667819
URL: http://svn.apache.org/r1667819
Log:
UIMA-4293 DUCC Web Server (WS) reservation request improvements
[cli]
- get rid of "instance" for reservations
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccReservationSubmit.java
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccUiConstants.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/DuccReservationSubmit.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccReservationSubmit.java?rev=1667819&r1=1667818&r2=1667819&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccReservationSubmit.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccReservationSubmit.java Thu Mar 19 17:11:39 2015
@@ -76,7 +76,6 @@ public class DuccReservationSubmit
UiOption.Description,
UiOption.SchedulingClass,
- UiOption.NumberOfInstances,
UiOption.Specification,
UiOption.ReservationMemorySize,
};
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccUiConstants.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccUiConstants.java?rev=1667819&r1=1667818&r2=1667819&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccUiConstants.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccUiConstants.java Thu Mar 19 17:11:39 2015
@@ -430,21 +430,14 @@ public class DuccUiConstants {
/*
* submit Reservation
*/
-
- public static final String name_instance_memory_size = ReservationSpecificationProperties.key_instance_memory_size;
- public static final String parm_instance_memory_size = "size[KB|MB|GB|TB]";
- public static final String desc_instance_memory_size = "Size of instance's memory, defaults to GB if units omitted.";
- public static final String labl_instance_memory_size = "instance Memory Size";
- public static final String exmp_instance_memory_size = "64GB";
- public static final String dval_instance_memory_size = "";
-
- public static final String name_number_of_instances = ReservationSpecificationProperties.key_number_of_instances;
- public static final String parm_number_of_instances = "integer";
- public static final String desc_number_of_instances = "Number of instances to reserve.";
- public static final String labl_number_of_instances = "Number of instances";
- public static final String exmp_number_of_instances = "1";
- public static final String dval_number_of_instances = "1";
+ public static final String name_memory_size = ReservationSpecificationProperties.key_memory_size;
+ public static final String parm_memory_size = "size[KB|MB|GB|TB]";
+ public static final String desc_memory_size = "Size of instance's memory, defaults to GB if units omitted.";
+ public static final String labl_memory_size = "instance Memory Size";
+ public static final String exmp_memory_size = "64GB";
+ public static final String dval_memory_size = "";
+
public static final String name_service_dependency = JobSpecificationProperties.key_service_dependency;;
public static final String parm_service_dependency = "list";
public static final String desc_service_dependency = "Comma-delimeted list of service descriptor strings.";
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=1667819&r1=1667818&r2=1667819&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 Thu Mar 19 17:11:39 2015
@@ -244,6 +244,8 @@ public interface IUiOptions
public boolean required() { return true; }
},
+ /*
+ @Deprecated
NumberOfInstances {
public String pname() { return ReservationSpecificationProperties.key_number_of_instances; }
public String argname() { return "integer"; }
@@ -251,6 +253,7 @@ public interface IUiOptions
public String example() { return "1"; }
public String deflt() { return "1"; }
},
+ */
Quiet {
public String pname() { return "quiet"; }
@@ -526,14 +529,25 @@ public interface IUiOptions
public String example() { return "Back to the drawing board"; }
},
- ReservationMemorySize {
+ /*
+ @Deprecated
+ ReservationInstanceMemorySize {
public String pname() { return ReservationSpecificationProperties.key_instance_memory_size; }
public String argname() { return "size-in-GB"; }
public String description() { return "Size of instance's memory, in GB."; }
public String example() { return "64"; }
public boolean required() { return true; }
},
-
+ */
+
+ ReservationMemorySize {
+ public String pname() { return ReservationSpecificationProperties.key_memory_size; }
+ public String argname() { return "size-in-GB"; }
+ public String description() { return "Size of instance's memory, in GB."; }
+ public String example() { return "64"; }
+ public boolean required() { return true; }
+ },
+
ReservationNodeList {
// generated, not public
public String pname() { return ReservationRequestProperties.key_node_list; }