Author: degenaro
Date: Fri May 6 13:22:10 2016
New Revision: 1742542
URL: http://svn.apache.org/viewvc?rev=1742542&view=rev
Log: (empty)
Added:
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/reservation.details.table.specification.jsp
(with props)
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/reservation.details.jsp
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/reservation.details.table.files.jsp
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/reservation.details.table.processes.jsp
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/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=1742542&r1=1742541&r2=1742542&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 May 6 13:22:10 2016
@@ -2583,19 +2583,6 @@ public class DuccHandler extends DuccAbs
map.put(key, key);
}
Iterator<String> iterator =
map.keySet().iterator();
- sb.append("<table id=\"specification_table\"
class=\"sortable\">");
- sb.append("<tr class=\"ducc-head\">");
- if(isProvided(usProperties, fsProperties)) {
- sb.append("<th title=\"system provided
if blank\">");
- sb.append(headProvider);
- }
- sb.append("<th>");
- sb.append("Key");
- sb.append("</th>");
- sb.append("<th>");
- sb.append("Value");
- sb.append("</th>");
- sb.append("</tr>");
int i = 0;
int counter = 0;
while(iterator.hasNext()) {
@@ -2611,9 +2598,6 @@ public class DuccHandler extends DuccAbs
String provider = getProvider(key,
usProperties, fsProperties);
putJobSpecEntry(properties, provider,
key, value, sb, counter++);
}
- sb.append("</table>");
- sb.append("<br>");
- sb.append("<br>");
}
catch(Throwable t) {
duccLogger.warn(methodName, null, t);
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=1742542&r1=1742541&r2=1742542&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
Fri May 6 13:22:10 2016
@@ -1173,6 +1173,7 @@ function ducc_init_reservation_specifica
}
}
+
var ms_load_reservation_specification_data = +new Date() - ms_reload_min;
var wip_reservation_specification_data = false;
@@ -1190,6 +1191,8 @@ function ducc_load_reservation_specifica
}
wip_reservation_specification_data = true;
try {
+ data = "<img src=\"opensources/images/indicator.gif\"
alt=\"waiting...\">";
+ $("#loading_specification_area").html(data);
var servlet = "/ducc-servlet/reservation-specification-data" +
location.search;
var tomsecs = ms_timeout;
$.ajax({
@@ -1199,6 +1202,8 @@ function ducc_load_reservation_specifica
wip_reservation_specification_data = false;
$("#specification_data_area").html(data);
hide_show();
+ data = "";
+ $("#loading_specification_area").html(data);
var table_style = ducc_preferences_get("table_style");
if (table_style == "scroll") {
sorttable.makeSortable(document.getElementById('specification_table'));
@@ -1207,10 +1212,14 @@ function ducc_load_reservation_specifica
ducc_console_success(fname);
}).fail(function(jqXHR, textStatus) {
wip_reservation_specification_data = false;
+ data = "";
+ $("#loading_specification_area").html(data);
ducc_console_fail(fname, textStatus);
- });
+ });
} catch (err) {
wip_reservation_specification_data = false;
+ data = "";
+ $("#loading_specification_area").html(data);
ducc_error(fname, err);
}
}
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/reservation.details.jsp
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/reservation.details.jsp?rev=1742542&r1=1742541&r2=1742542&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/reservation.details.jsp
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/reservation.details.jsp
Fri May 6 13:22:10 2016
@@ -83,9 +83,7 @@ under the License.
<%@ include
file="reservation.details.table.processes.jsp" %>
</div>
<div id="tabs-2">
- <div class="specification_data_div">
- <span
id="specification_data_area"></span>
- </div>
+ <%@ include
file="reservation.details.table.specification.jsp" %>
</div>
<div id="tabs-3">
<%@ include file="reservation.details.table.files.jsp" %>
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/reservation.details.table.files.jsp
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/reservation.details.table.files.jsp?rev=1742542&r1=1742541&r2=1742542&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/reservation.details.table.files.jsp
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/reservation.details.table.files.jsp
Fri May 6 13:22:10 2016
@@ -25,8 +25,8 @@ under the License.
<table class="sortable">
<thead>
<tr class="ducc-head">
- <th title="The file name">Name</th>
- <th title="The file size, in MB" class="sorttable_numeric">Size</th>
+ <th class="none" title="The file name">Name</th>
+ <th class="sorttable_numeric" title="The file size, in MB">Size</th>
</tr>
</thead>
<tbody id="files_data_area">
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/reservation.details.table.processes.jsp
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/reservation.details.table.processes.jsp?rev=1742542&r1=1742541&r2=1742542&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/reservation.details.table.processes.jsp
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/reservation.details.table.processes.jsp
Fri May 6 13:22:10 2016
@@ -23,42 +23,21 @@ under the License.
<table class="sortable">
<thead>
<tr class="ducc-head">
- <th title="The system assigned id for this process"
class="sorttable_numeric">Id</th>
- <th title="The log file name associated with this process">Log</th>
- <th title="The log file size, in MB"
class="sorttable_numeric">Log<br>Size</th>
- <th title="The host for this process">Host<br>Name</th>
- <!--
- <th title="The host IP for this process">Host<br>ip</th>
- -->
- <th title="The OS assigned PID for this process"
class="sorttable_numeric">PID</th>
- <th title="Process scheduling state">State<br>Scheduler</th>
- <th title="Process scheduling reason (for scheduling
state)">Reason<br>Scheduler<br><small>or extraordinary status</small></th>
- <th title="Process agent state">State<br>Agent</th>
- <th title="Process agent reason (for agent state)">Reason<br>Agent</th>
- <th title="Process exit code or signal">Exit</th>
- <!--
- <th title="Process initialization time, hh:mm:ss, as reported by the
agent managing the process. The agent reports initialization start and end
times. The time reported here is the difference between them, unless
initialization is ongoing then the end time is estimated as
now.">Time<br>Init</th>
- -->
- <th title="Process run time (not including process initialization
time), hh:mm:ss, as reported by the agent managing the process. The agent
reports run start and end times. The time reported here is the difference
between them, unless the process is still running then the end time is
estimated as now.">Time<br>Run</th>
- <!--
- <th title="Process total time spent performing garbage collections,
hh:mm:ss">Time<br>GC</th>
- <th title="Process total number of garbage collections that have
occurred">Count<br>GC</th>
- <th title="Process percentage of time spent in garbage collections,
relative to total of initialization + run times">%GC</th>
- -->
- <th title="Process count of major faults which required loading a
memory page from disk">PgIn</th>
- <th title="Process GB swapped out to disk, current if state=running or
maximum if state=completed" class="sorttable_numeric">Swap</th>
- <th title="%CPU time, as percentage of process lifetime"
class="sorttable_numeric" >%CPU</th>
- <th title="Resident Storage Size in GB, current if state=running or
maximum if state=completed" class="sorttable_numeric">RSS</th>
- <!--
- <th title="Average seconds per work item">Time<br>Avg</th>
- <th title="Maximum seconds for any work item">Time<br>Max</th>
- <th title="Minimum seconds for any work item">Time<br>Min</th>
- <th title="The number of work items that completed
successfully">Done</th>
- <th title="The number of work items that failed to complete
successfully">Error</th>
- <th title="The number of work items that were retried, excluding
preemptions">Retry</th>
- <th title="The number of work items that were
preempted">Pre-<br>empt</th>
- <th title="The JConsole URL for this process">JConsole<br>URL</th>
- -->
+ <th class="sorttable_numeric" title="The system assigned id for this
process">Id</th>
+ <th class="none" title="The log file name associated with
this process">Log</th>
+ <th class="sorttable_numeric" title="The log file size, in
MB">Log<br>Size</th>
+ <th class="none" title="The host for this
process">Host<br>Name</th>
+ <th class="sorttable_numeric" title="The OS assigned PID for this
process">PID</th>
+ <th class="none" title="Process scheduling
state">State<br>Scheduler</th>
+ <th class="none" title="Process scheduling reason (for
scheduling state)">Reason<br>Scheduler<br><small>or extraordinary
status</small></th>
+ <th class="none" title="Process agent
state">State<br>Agent</th>
+ <th class="none" title="Process agent reason (for agent
state)">Reason<br>Agent</th>
+ <th class="sorttable_numeric" title="Process exit code or
signal">Exit</th>
+ <th class="none" title="Process run time (not including
process initialization time), hh:mm:ss, as reported by the agent managing the
process. The agent reports run start and end times. The time reported here is
the difference between them, unless the process is still running then the end
time is estimated as now.">Time<br>Run</th>
+ <th class="sorttable_numeric" title="Process count of major faults
which required loading a memory page from disk">PgIn</th>
+ <th class="sorttable_numeric" title="Process GB swapped out to disk,
current if state=running or maximum if state=completed">Swap</th>
+ <th class="sorttable_numeric" title="%CPU time, as percentage of
process lifetime">%CPU</th>
+ <th class="sorttable_numeric" title="Resident Storage Size in GB,
current if state=running or maximum if state=completed">RSS</th>
</tr>
</thead>
<tbody id="processes_list_area">
Added:
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/reservation.details.table.specification.jsp
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/reservation.details.table.specification.jsp?rev=1742542&view=auto
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/reservation.details.table.specification.jsp
(added)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/reservation.details.table.specification.jsp
Fri May 6 13:22:10 2016
@@ -0,0 +1,37 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<div id=loading_specification_area>
+</div>
+<table>
+<caption><b>Specification</b><br><i><small>click column heading to
sort</small></i></caption>
+<tr>
+<td>
+ <table class="sortable">
+ <thead>
+ <tr class="ducc-head">
+ <th class="none" title="the specification variable
source">Provider</th>
+ <th class="none" title="the specification variable
name">Key</th>
+ <th class="none" title="the specification variable
value">Value</th>
+ </tr>
+ </thead>
+ <tbody id="specification_data_area">
+ </tbody>
+ </table>
+</table>
\ No newline at end of file
Propchange:
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/reservation.details.table.specification.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/reservation.details.table.specification.jsp
------------------------------------------------------------------------------
svn:mime-type = text/plain
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=1742542&r1=1742541&r2=1742542&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 6 13:22:10 2016
@@ -141,20 +141,20 @@ if (table_style.equals("classic")) {
<thead>
<tr class="ducc-head">
<th class="ducc-col-terminate"></th>
- <th title="The system assigned id for this
reservation">Id</th>
- <th title="The time this reservation was
submitted">Start</th>
- <th title="The time this reservation lasted, units
ddd:hh:mm:ss">Duration</th>
- <th class="ducc-no-filter" id="user_column_heading"
title="The user who submitted this reservation">User</th>
- <th title="The user specified class of this
reservation">Class</th>
- <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 combined number of PIDs on the assigned
resource(s) for user">User<br>Processes</th>
- <th title="The count of major faults which required
loading a memory page from disk">Pgin</th>
- <th title="The GB swapped out to disk, current if
state=running or maximum if state=completed">Swap</th>
- <th title="The memory allocation for this reservation,
in GB">Memory</th>
- <th title="The machine(s) assigned to this
reservation">Host<br>Names</th>
- <th title="The user specified description of this
reservation">Description</th>
+ <th class="sorttable_numeric" title="The system
assigned id for this reservation">Id</th>
+ <th class="none" title="The time this
reservation was submitted">Start</th>
+ <th class="none" title="The time this
reservation lasted, units ddd:hh:mm:ss">Duration</th>
+ <th class="ducc-no-filter" title="The user who
submitted this reservation" id="user_column_heading">User</th>
+ <th class="none" title="The user specified
class of this reservation">Class</th>
+ <th class="none" title="The type of this
reservation">Type</th>
+ <th class="none" title="The current state
of this reservation">State</th>
+ <th class="none" title="The reason for the
final state of this reservation, normally CanceledByUser">Reason</th>
+ <th class="sorttable_numeric" title="The combined
number of PIDs on the assigned resource(s) for user">User<br>Processes</th>
+ <th class="sorttable_numeric" title="The count of major
faults which required loading a memory page from disk">Pgin</th>
+ <th class="sorttable_numeric" title="The GB swapped out
to disk, current if state=running or maximum if state=completed">Swap</th>
+ <th class="sorttable_numeric" title="The memory
allocation for this reservation, in GB">Memory</th>
+ <th class="none" title="The machine(s)
assigned to this reservation">Host<br>Names</th>
+ <th class="none" title="The user specified
description of this reservation">Description</th>
</tr>
</thead>
<tbody id="reservations_list_area">
