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 2016/03/11 15:06:00 UTC
svn commit: r1734569 -
/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/
Author: degenaro
Date: Fri Mar 11 14:06:00 2016
New Revision: 1734569
URL: http://svn.apache.org/viewvc?rev=1734569&view=rev
Log:
UIMA-4834 DUCC Web Server (WS) sort fields with decimal points need to be marked as class="sortable_numeric"
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/job.details.table.files.jsp
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/job.details.table.processes.jsp
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/jobs.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/service.details.table.deployments.jsp
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/service.details.table.files.jsp
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/service.details.table.history.jsp
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/system.broker.jsp
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/job.details.table.files.jsp
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/job.details.table.files.jsp?rev=1734569&r1=1734568&r2=1734569&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/job.details.table.files.jsp (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/job.details.table.files.jsp Fri Mar 11 14:06:00 2016
@@ -26,7 +26,7 @@ under the License.
<thead>
<tr class="ducc-head">
<th title="The file name">Name</th>
- <th title="The file size, in MB">Size</th>
+ <th title="The file size, in MB" class="sorttable_numeric">Size</th>
</tr>
</thead>
<tbody id="files_data_area">
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/job.details.table.processes.jsp
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/job.details.table.processes.jsp?rev=1734569&r1=1734568&r2=1734569&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/job.details.table.processes.jsp (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/job.details.table.processes.jsp Fri Mar 11 14:06:00 2016
@@ -27,7 +27,7 @@ under the License.
<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">Log<br/>Size</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 OS assigned PID for this process"class="sorttable_numeric">PID</th>
<th title="Process scheduling state">State<br>Scheduler</th>
@@ -39,9 +39,9 @@ under the License.
<th title="Process run time (not including process initialization time), ddd:hh:mm:ss">Time<br>Run</th>
<th title="Process total time spent performing garbage collections, hh:mm:ss">Time<br>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">Swap</th>
- <th title="%CPU time, as percentage of process (over last reporting interval if active, else over lifetime)">%CPU</th>
- <th title="Resident Storage Size in GB, current if state=running or maximum if state=completed">RSS</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 (over last reporting interval if active, else over 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>
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/jobs.jsp
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/jobs.jsp?rev=1734569&r1=1734568&r2=1734569&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/jobs.jsp (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/jobs.jsp Fri Mar 11 14:06:00 2016
@@ -162,7 +162,7 @@ if (table_style.equals("classic")) {
<th title="The number of job processes that failed during initialization">Init<br>Fails</th>
<th title="The number of job processes that failed during runtime (post-initialization)">Run<br>Fails</th>
<th title="The count for all job processes of major faults which required loading a memory page from disk">Pgin</th>
- <th title="The GB swapped out to disk for all job processes, current if state=running or maximum if state=completed">Swap</th>
+ <th title="The GB swapped out to disk for all job processes, current if state=running or maximum if state=completed" class="sorttable_numeric">Swap</th>
<th title="Each job process size, in GB">Memory</th>
<th title="The total number of work items for this job">Total</th>
<th title="The number of work items that completed successfully">Done</th>
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=1734569&r1=1734568&r2=1734569&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 Mar 11 14:06:00 2016
@@ -26,7 +26,7 @@ under the License.
<thead>
<tr class="ducc-head">
<th title="The file name">Name</th>
- <th title="The file size, in MB">Size</th>
+ <th title="The file size, in MB" class="sorttable_numeric">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=1734569&r1=1734568&r2=1734569&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 Mar 11 14:06:00 2016
@@ -25,12 +25,12 @@ under the License.
<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">Log<br>Size</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="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>
@@ -46,9 +46,9 @@ under the License.
<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">Swap</th>
- <th title="%CPU time, as percentage of process lifetime">%CPU</th>
- <th title="Resident Storage Size in GB, current if state=running or maximum if state=completed">RSS</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>
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/service.details.table.deployments.jsp
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/service.details.table.deployments.jsp?rev=1734569&r1=1734568&r2=1734569&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/service.details.table.deployments.jsp (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/service.details.table.deployments.jsp Fri Mar 11 14:06:00 2016
@@ -27,7 +27,7 @@ under the License.
<th title="The state of this service instance">State</th>
<th title="The current state of service dependencies">Services</th>
<th title="The log file name associated with this process">Log</th>
- <th title="The log file size, in MB">Log<br/>Size</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 class="sorttable_numeric" title="The OS assigned PID for this process">PID</th>
<th class="sorttable_numeric" title="The service process actual memory size (GB)">Memory</th>
@@ -40,9 +40,9 @@ under the License.
<th title="Process run time (not including process initialization time), ddd:hh:mm:ss">Time<br>Run</th>
<th title="Process total time spent performing garbage collections, hh:mm:ss">Time<br>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">Swap</th>
- <th title="%CPU time, as percentage of process lifetime">%CPU</th>
- <th title="Resident Storage Size in GB, current if state=running or maximum if state=completed">RSS</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>
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/service.details.table.files.jsp
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/service.details.table.files.jsp?rev=1734569&r1=1734568&r2=1734569&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/service.details.table.files.jsp (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/service.details.table.files.jsp Fri Mar 11 14:06:00 2016
@@ -27,7 +27,7 @@ under the License.
<tr class="ducc-head">
<th title="The service deployment id">Id</th>
<th title="The file name">Name</th>
- <th title="The file size, in MB">Size</th>
+ <th title="The file size, in MB" class="sorttable_numeric">Size</th>
<th title="The file date">Date</th>
</tr>
</thead>
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/service.details.table.history.jsp
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/service.details.table.history.jsp?rev=1734569&r1=1734568&r2=1734569&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/service.details.table.history.jsp (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/service.details.table.history.jsp Fri Mar 11 14:06:00 2016
@@ -27,7 +27,7 @@ under the License.
<tr class="ducc-head">
<th title="The service deployment id">Id</th>
<th title="The file name">Name</th>
- <th title="The file size, in MB">Size</th>
+ <th title="The file size, in MB" class="sorttable_numeric">Size</th>
<th title="The file date">Date</th>
</tr>
</thead>
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=1734569&r1=1734568&r2=1734569&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 Mar 11 14:06:00 2016
@@ -136,8 +136,8 @@ if (table_style.equals("classic")) {
<th align="center" >ConsumerCount</th>
<th align="center" >QueueSize</th>
<th align="center" >MaxEnqueueTime</th>
- <th align="center" >AverageEnqueueTime</th>
- <th align="center" >MemoryPercentUsage</th>
+ <th align="center" class="sorttable_numeric">AverageEnqueueTime</th>
+ <th align="center" class="sorttable_numeric">MemoryPercentUsage</th>
</tr>
</thead>
<tbody id="system_broker_list_area">