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/22 15:44:26 UTC

svn commit: r1681116 - in /uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main: java/org/apache/uima/ducc/ws/server/DuccHandlerClassic.java java/org/apache/uima/ducc/ws/server/DuccHandlerJsonFormat.java webapp/root/reservations.jsp

Author: degenaro
Date: Fri May 22 13:44:26 2015
New Revision: 1681116

URL: http://svn.apache.org/r1681116
Log:
UIMA-4421 DUCC Web Server (WS) Reservations page Allocation column is extraneous

Modified:
    uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerClassic.java
    uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerJsonFormat.java
    uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/reservations.jsp

Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerClassic.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerClassic.java?rev=1681116&r1=1681115&r2=1681116&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerClassic.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerClassic.java Fri May 22 13:44:26 2015
@@ -643,9 +643,11 @@ public class DuccHandlerClassic extends
 			sb.append("</td>");
 		}
 		// Allocation
+		/*
 		sb.append("<td align=\"right\">");
 		sb.append(duccwork.getSchedulingInfo().getInstancesCount());
 		sb.append("</td>");
+		*/
 		// User Processes
 		sb.append("<td align=\"right\">");
 		TreeMap<String,Integer> nodeMap = new TreeMap<String,Integer>();

Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerJsonFormat.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerJsonFormat.java?rev=1681116&r1=1681115&r2=1681116&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerJsonFormat.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerJsonFormat.java Fri May 22 13:44:26 2015
@@ -739,11 +739,13 @@ public class DuccHandlerJsonFormat exten
 		}
 		row.add(new JsonPrimitive(sb.toString()));
 		// Allocation
+		/*
 		sb = new StringBuffer();
 		sb.append("<span>");
 		sb.append(duccwork.getSchedulingInfo().getInstancesCount());
 		sb.append("</span>");
 		row.add(new JsonPrimitive(sb.toString()));
+		*/
 		// User Processes
 		sb = new StringBuffer();
 		TreeMap<String,Integer> nodeMap = new TreeMap<String,Integer>();

Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/reservations.jsp
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/reservations.jsp?rev=1681116&r1=1681115&r2=1681116&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/reservations.jsp (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/reservations.jsp Fri May 22 13:44:26 2015
@@ -114,7 +114,9 @@ if (table_style.equals("scroll")) {
 			<th title="The type of this reservation">Type</th>
 			<th title="The current state of this reservation">State</th>
 			<th title="The reason for the final state of this reservation, normally CanceledByUser">Reason</th>
+			<!--
 			<th title="The number of resources (machines or shares, depending on class) assigned to this reservation">Allocation</th>
+			-->
 			<th title="The combined number of PIDs on the assigned resource(s) for user">User<br>Processes</th>
 			<th title="The memory allocation per resource for this reservation, in GB">Size</th>
 			<th title="The machine(s) assigned to this reservation">Host<br>Names</th>
@@ -146,7 +148,9 @@ if (table_style.equals("classic")) {
 			<th title="The type of this reservation">Type</th>
 			<th title="The current state of this reservation">State</th>
 			<th title="The reason for the final state of this reservation, normally CanceledByUser">Reason</th>
+			<!--
 			<th title="The number of resources (machines or shares, depending on class) assigned to this reservation">Allocation</th>
+			-->
 			<th title="The combined number of PIDs on the assigned resource(s) for user">User<br>Processes</th>
 			<th title="The memory allocation per resource for this reservation, in GB">Size</th>
 			<th title="The machine(s) assigned to this reservation">Host<br>Names</th>