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/18 20:21:44 UTC
svn commit: r1667602 - in
/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main:
java/org/apache/uima/ducc/ws/server/DuccHandler.java webapp/root/js/ducc.js
webapp/root/submit.reservation.jsp
Author: degenaro
Date: Wed Mar 18 19:21:43 2015
New Revision: 1667602
URL: http://svn.apache.org/r1667602
Log:
UIMA-4293 DUCC Web Server (WS) reservation request improvements
- change from size pulldown to size box
- discontinue wait option
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandler.java
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/js/ducc.js
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/submit.reservation.jsp
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandler.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandler.java?rev=1667602&r1=1667601&r2=1667602&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandler.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandler.java Wed Mar 18 19:21:43 2015
@@ -3626,7 +3626,7 @@ public class DuccHandler extends DuccAbs
private void handleDuccServletReservationSchedulingClasses(String target,Request baseRequest,HttpServletRequest request,HttpServletResponse response)
throws Exception
{
- String methodName = "handleDuccServletReservationSchedulingCLasses";
+ String methodName = "handleDuccServletReservationSchedulingClasses";
duccLogger.trace(methodName, null, messages.fetch("enter"));
StringBuffer sb = new StringBuffer();
sb.append("<select id=\"scheduling_class\">");
@@ -3653,12 +3653,10 @@ public class DuccHandler extends DuccAbs
String methodName = "handleDuccServletReservationInstanceMemorySizes";
duccLogger.trace(methodName, null, messages.fetch("enter"));
StringBuffer sb = new StringBuffer();
- sb.append("<select id=\"instance_memory_size\">");
List<Long> machineSizes = DuccMachinesData.getInstance().getMachineSizes();
for(Long machineSize : machineSizes) {
- sb.append("<option value=\""+machineSize+"\">"+machineSize+"</option>");
+ sb.append("<option value=\""+machineSize+"\">");
}
- sb.append("</select>");
response.getWriter().println(sb);
duccLogger.trace(methodName, null, messages.fetch("exit"));
}
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/js/ducc.js
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/js/ducc.js?rev=1667602&r1=1667601&r2=1667602&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/js/ducc.js (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/js/ducc.js Wed Mar 18 19:21:43 2015
@@ -3575,7 +3575,7 @@ function ducc_submit_reservation() {
var e = document.getElementById("scheduling_class");
var scheduling_class = e.options[e.selectedIndex].value;
var e = document.getElementById("instance_memory_size");
- var instance_memory_size = e.options[e.selectedIndex].value;
+ var instance_memory_size = e.value;
var e = document.getElementById("instance_memory_units");
var instance_memory_units = e.options[e.selectedIndex].value;
var e = document.getElementById("number_of_instances");
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/submit.reservation.jsp
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/submit.reservation.jsp?rev=1667602&r1=1667601&r2=1667602&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/submit.reservation.jsp (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/submit.reservation.jsp Wed Mar 18 19:21:43 2015
@@ -108,12 +108,15 @@ under the License.
<td align="left" ><span id="scheduling_class_area">
</span>
<tr>
- <td align="right">instance memory size
+ <td align="right">memory size
<td align="right">
- <td align="left" ><span id="instance_memory_sizes_area">
+ <td align="left" ><input id="instance_memory_size" type="text" list="sizes">
+ <datalist id="sizes">
+ <span id="instance_memory_sizes_area">
</span>
+ </datalist>
<tr>
- <td align="right">instance memory units
+ <td align="right">memory units
<td align="right">
<td align="left" ><span id="instance_memory_units_area">
</span>
@@ -122,14 +125,14 @@ under the License.
<td align="right">
<td align="left" ><span id="number_of_instances_area">
</span>
- <tr>
+ <tr style="visibility: hidden;">
<td align="right">wait for result
<td align="right">
<td align="left" ><span id="wait_for_result_area">
<table>
<tr>
- <td align="left"><input type="radio" id="wait_for_result_yes" name="wait_for_result" value="yes" checked /> Yes
- <td align="left"><input type="radio" id="wait_for_result_no" name="wait_for_result" value="no" /> No
+ <td align="left"><input type="radio" id="wait_for_result_yes" name="wait_for_result" value="yes" /> Yes
+ <td align="left"><input type="radio" id="wait_for_result_no" name="wait_for_result" value="no" checked /> No
</table>
</span>
<tr>