Author: degenaro
Date: Fri May 6 18:14:19 2016
New Revision: 1742576
URL: http://svn.apache.org/viewvc?rev=1742576&view=rev
Log:
UIMA-4918 DUCC Web Server (WS) numeric values column sorting is inconsistent
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/system.broker.jsp
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/system.classes.jsp
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/system.daemons.jsp
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/system.machines.jsp
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/system.broker.jsp
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/system.broker.jsp?rev=1742576&r1=1742575&r2=1742576&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/system.broker.jsp
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/system.broker.jsp
Fri May 6 18:14:19 2016
@@ -131,11 +131,11 @@ if (table_style.equals("classic")) {
<table class="sortable">
<thead>
<tr class="ducc-head">
- <th align="center" >Name</th>
- <th align="center" >Type</th>
- <th align="center" >ConsumerCount</th>
- <th align="center" >QueueSize</th>
- <th align="center" >MaxEnqueueTime</th>
+ <th align="center" class="none" >Name</th>
+ <th align="center" class="none" >Type</th>
+ <th align="center" class="sorttable_numeric">ConsumerCount</th>
+ <th align="center" class="sorttable_numeric">QueueSize</th>
+ <th align="center" class="sorttable_numeric">MaxEnqueueTime</th>
<th align="center" class="sorttable_numeric">AverageEnqueueTime</th>
<th align="center" class="sorttable_numeric">MemoryPercentUsage</th>
</tr>
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/system.classes.jsp
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/system.classes.jsp?rev=1742576&r1=1742575&r2=1742576&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/system.classes.jsp
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/system.classes.jsp
Fri May 6 18:14:19 2016
@@ -122,13 +122,13 @@ if (table_style.equals("classic")) {
<table class="sortable">
<thead>
<tr class="ducc-head">
- <th align="left">Name</th>
- <th align="left">Nodepool</th>
- <th align="left">Policy</th>
- <th align="left">Quantum</th>
- <th align="left">Weight</th>
- <th align="left">Priority</th>
- <th align="left" title="corresponding non-preemptable
specific [or default] class name, if any">Non-preemptable Class</th>
+ <th align="left" class="none" >Name</th>
+ <th align="left" class="none" >Nodepool</th>
+ <th align="left" class="none" >Policy</th>
+ <th align="left" class="sorttable_numeric">Quantum</th>
+ <th align="left" class="sorttable_numeric">Weight</th>
+ <th align="left" class="sorttable_numeric">Priority</th>
+ <th align="left" class="none"
title="corresponding non-preemptable specific [or default] class name, if
any">Non-preemptable Class</th>
</tr>
</thead>
<tbody id="system_classes_list_area">
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/system.daemons.jsp
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/system.daemons.jsp?rev=1742576&r1=1742575&r2=1742576&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/system.daemons.jsp
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/system.daemons.jsp
Fri May 6 18:14:19 2016
@@ -137,18 +137,18 @@ if (table_style.equals("classic")) {
<table class="sortable">
<thead>
<tr class="ducc-head">
- <th align="left" style="width: 75px;" title="The
current status">Status</th>
- <th align="left" title="The daemon name">Daemon
Name</th>
- <th align="left" style="width: 150px;" title="The
date+time this daemon was booted">Boot Time</th>
- <th align="left" style="width: 75px;"title="The host IP
for this daemon">Host IP</th>
- <th align="left" title="The host name for this
daemon">Host Name</th>
- <th align="left" class="sorttable_numeric"
style="width: 75px;" title="The OS assigned PID for this daemon">PID</th>
- <th align="left" class="sorttable_numeric"
style="width: 75px;"title="The size (in bytes) of the most recent publication
by this daemon">Publication Size (last)</th>
- <th align="left" class="sorttable_numeric"
style="width: 75px;"title="The size (in bytes) of the largest publication by
this daemon">Publication Size (max)</th>
- <th align="left" class="sorttable_numeric" title="The
elapsed time (in seconds) since the last heartbeat from this daemon">Heartbeat
(last)</th>
- <th align="left" class="sorttable_numeric" title="The
elapsed time (in seconds) of the longest heartbeat from this daemon">Heartbeat
(max)</th>
- <th align="left" title="The TOD when the longest
heartbeat from this daemon occurred">Heartbeat (max) TOD</th>
- <th align="left" style="width: 300px;" title="The
JConsole URL for this daemon">JConsole: URL</th>
+ <th align="left" class="none"
style="width: 75px;" title="The current status">Status</th>
+ <th align="left" class="none"
title="The daemon name">Daemon Name</th>
+ <th align="left" class="none"
style="width: 150px;" title="The date+time this daemon was booted">Boot
Time</th>
+ <th align="left" class="none"
style="width: 75px;" title="The host IP for this daemon">Host IP</th>
+ <th align="left" class="none"
title="The host name for this daemon">Host Name</th>
+ <th align="left" class="sorttable_numeric"
style="width: 75px;" title="The OS assigned PID for this daemon">PID</th>
+ <th align="left" class="sorttable_numeric"
style="width: 75px;" title="The size (in bytes) of the most recent publication
by this daemon">Publication Size (last)</th>
+ <th align="left" class="sorttable_numeric"
style="width: 75px;" title="The size (in bytes) of the largest publication by
this daemon">Publication Size (max)</th>
+ <th align="left" class="sorttable_numeric"
title="The elapsed time (in seconds) since the last heartbeat from
this daemon">Heartbeat (last)</th>
+ <th align="left" class="sorttable_numeric"
title="The elapsed time (in seconds) of the longest heartbeat from
this daemon">Heartbeat (max)</th>
+ <th align="left" class="none"
title="The TOD when the longest heartbeat from this daemon
occurred">Heartbeat (max) TOD</th>
+ <th align="left" class="none"
style="width: 300px;" title="The JConsole URL for this daemon">JConsole:
URL</th>
</tr>
</thead>
<tbody id="system_daemons_list_area">
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/system.machines.jsp
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/system.machines.jsp?rev=1742576&r1=1742575&r2=1742576&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/system.machines.jsp
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/system.machines.jsp
Fri May 6 18:14:19 2016
@@ -132,18 +132,18 @@ if (table_style.equals("classic")) {
<table class="sortable">
<thead>
<tr class="ducc-head">
- <th align="left" title="The current status">Status</th>
- <th align="left" title="The host IP">IP</th>
- <th align="left" title="The host name">Name</th>
- <th align="left" title="The host node pool">Nodepool</th>
- <th class="sorttable_numeric" align="left" title="The host
usable memory size, in GB" >Memory(GB):usable</th>
- <th class="sorttable_numeric" align="left" title="The host free
memory size, in GB" >Memory(GB):free</th>
- <th class="sorttable_numeric" align="left" title="The host CPU
load average" >%CPU</th>
- <th class="sorttable_numeric" align="left" title="The host
inuse swap size, in GB" >Swap(GB):inuse</th>
- <th class="sorttable_numeric" align="left" title="The host free
swap size, in GB" >Swap(GB):free</th>
- <th align="left" title="The host C-Groups status" >C-Groups</th>
- <th class="sorttable_numeric" align="left" title="The number of
alien PIDs (those processes not associated with a user running jobs or having a
reservation)" >Alien PIDs</th>
- <th class="sorttable_numeric" align="left" title="The elapsed
time (in seconds) since the last heartbeat" >Heartbeat (last)</th>
+ <th align="left" class="none" title="The current
status">Status</th>
+ <th align="left" class="none" title="The host
IP">IP</th>
+ <th align="left" class="none" title="The host
name">Name</th>
+ <th align="left" class="none" title="The host node
pool">Nodepool</th>
+ <th align="left" class="sorttable_numeric" title="The host
usable memory size, in GB" >Memory(GB):usable</th>
+ <th align="left" class="sorttable_numeric" title="The host free
memory size, in GB" >Memory(GB):free</th>
+ <th align="left" class="sorttable_numeric" title="The host CPU
load average" >%CPU</th>
+ <th align="left" class="sorttable_numeric" title="The host
inuse swap size, in GB" >Swap(GB):inuse</th>
+ <th align="left" class="sorttable_numeric" title="The host free
swap size, in GB" >Swap(GB):free</th>
+ <th align="left" class="none" title="The host
C-Groups status" >C-Groups</th>
+ <th align="left" class="sorttable_numeric" title="The number of
alien PIDs (those processes not associated with a user running jobs or having a
reservation)" >Alien PIDs</th>
+ <th align="left" class="sorttable_numeric" title="The elapsed
time (in seconds) since the last heartbeat" >Heartbeat (last)</th>
</tr>
</thead>
<tbody id="machines_list_area">
