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/06/05 13:46:02 UTC
svn commit: r1683717 - in
/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main:
java/org/apache/uima/ducc/ws/server/DuccHandler.java
webapp/root/submit.reservation.jsp
Author: degenaro
Date: Fri Jun 5 11:46:02 2015
New Revision: 1683717
URL: http://svn.apache.org/r1683717
Log:
UIMA-4447 DUCC Web Server (WS) request reservation hangs
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/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=1683717&r1=1683716&r2=1683717&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 Fri Jun 5 11:46:02 2015
@@ -4145,6 +4145,12 @@ public class DuccHandler extends DuccAbs
arg4 = memory_size;
}
}
+
+ String arg5a = "--wait_for_completion";
+ String arg5b = "false";
+ String arg6a = "--cancel_on_interrupt";
+ String arg6b = "false";
+
String arg7 = "";
String arg8 = "";
if(description != null) {
@@ -4157,7 +4163,7 @@ public class DuccHandler extends DuccAbs
String java = "/bin/java";
String jclass = "org.apache.uima.ducc.cli.DuccReservationSubmit";
String jhome = System.getProperty("java.home");
- String[] arglist = { "-u", userId, "--", jhome+java, "-cp", cp, jclass, arg1, arg2, arg3, arg4, /*arg5, arg6,*/ arg7, arg8 };
+ String[] arglist = { "-u", userId, "--", jhome+java, "-cp", cp, jclass, arg1, arg2, arg3, arg4, arg5a, arg5b, arg6a, arg6b, arg7, arg8 };
String result = DuccAsUser.duckling(userId, arglist);
response.getWriter().println(result);
} catch (Exception e) {
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=1683717&r1=1683716&r2=1683717&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 Fri Jun 5 11:46:02 2015
@@ -120,14 +120,14 @@ under the License.
<td align="right">
<td align="left" ><span id="memory_units_area">
</span>
- <tr>
+ <tr style="display: none;">
<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" /> Yes
- <td align="left"><input type="radio" id="wait_for_result_no" name="wait_for_result" value="no" checked /> No
+ <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
</table>
</span>
<tr>
@@ -138,7 +138,7 @@ under the License.
<tr>
<td align="left" ><span id="reservation_submit_button_area">
</span>
- <td align="left" ><input type="button" onclick="ducc_cancel_submit_reservation()" value="Cancel" />
+ <td align="left" ><input type="button" onclick="ducc_cancel_submit_reservation()" value="Close" />
</table>
<tr>
<td align="right"><span id="working_area" style="display:none;">