Author: degenaro
Date: Fri May 6 17:42:07 2016
New Revision: 1742567
URL: http://svn.apache.org/viewvc?rev=1742567&view=rev
Log:
UIMA-4918 DUCC Web Server (WS) numeric values column sorting is inconsistent
Added:
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/service.details.table.registry.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/service.details.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/services.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=1742567&r1=1742566&r2=1742567&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 17:42:07 2016
@@ -2714,15 +2714,6 @@ public class DuccHandler extends DuccAbs
ServicesRegistryMapPayload payload =
servicesRegistry.findService(name);
String hint = getLoginRefreshHint(request, response);
String enable_or_disable =
getEnabledOrDisabled(request, response);;
- sb.append("<table>");
- sb.append("<tr class=\"ducc-head\">");
- sb.append("<th>");
- sb.append("Key");
- sb.append("</th>");
- sb.append("<th>");
- sb.append("Value");
- sb.append("</th>");
- sb.append("</tr>");
Properties properties;
if(payload != null) {
properties = payload.meta;
@@ -2837,9 +2828,6 @@ public class DuccHandler extends DuccAbs
}
putJobSpecEntry(properties, prefix+key,
value, sb, counter++);
}
- sb.append("</table>");
- sb.append("<br>");
- sb.append("<br>");
}
else {
sb.append("<tr>");
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/service.details.jsp
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/service.details.jsp?rev=1742567&r1=1742566&r2=1742567&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/service.details.jsp
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/service.details.jsp
Fri May 6 17:42:07 2016
@@ -90,9 +90,7 @@ under the License.
<div id="service_update_form_button">
<button title="Hint: Login" disabled
style="font-size:8pt;">Update</button>
</div>
- <div class="registry_data_div">
- <span id="registry_data_area"></span>
- </div>
+ <%@ include
file="service.details.table.registry.jsp" %>
</div>
<div id="tabs-3">
<%@ include file="service.details.table.files.jsp" %>
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=1742567&r1=1742566&r2=1742567&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 May 6 17:42:07 2016
@@ -23,36 +23,27 @@ 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 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"
class="sorttable_numeric">Log<br/>Size</th>
- <th title="The host for this process">Host<br>Name</th>
+ <th class="sorttable_numeric" title="The system assigned id for this
process">Id</th>
+ <th class="none" title="The state of this service
instance">State</th>
+ <th class="none" title="The current state of service
dependencies">Services</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="sorttable_numeric" title="The service process actual memory
size (GB)">Memory</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, ddd:hh:mm:ss">Time<br>Init</th>
- <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" 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="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 initialization time,
ddd:hh:mm:ss">Time<br>Init</th>
+ <th class="none" title="Process run time (not including
process initialization time), ddd:hh:mm:ss">Time<br>Run</th>
+ <th class="none" title="Process total time spent
performing garbage collections, hh:mm:ss">Time<br>GC</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>
+ <th class="none" title="The JConsole URL for this
process">JConsole<br>URL</th>
</tr>
</thead>
<tbody id="deployments_list_area">
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=1742567&r1=1742566&r2=1742567&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 May 6 17:42:07 2016
@@ -25,10 +25,10 @@ under the License.
<table class="sortable">
<thead>
<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" class="sorttable_numeric">Size</th>
- <th title="The file date">Date</th>
+ <th class="sorttable_numeric" title="The service deployment id">Id</th>
+ <th class="none" title="The file name">Name</th>
+ <th class="sorttable_numeric" title="The file size, in MB">Size</th>
+ <th class="none" title="The file date">Date</th>
</tr>
</thead>
<tbody id="files_data_area">
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=1742567&r1=1742566&r2=1742567&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 May 6 17:42:07 2016
@@ -25,10 +25,10 @@ under the License.
<table class="sortable">
<thead>
<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" class="sorttable_numeric">Size</th>
- <th title="The file date">Date</th>
+ <th class="sorttable_numeric" title="The service deployment id">Id</th>
+ <th class="none" title="The file name">Name</th>
+ <th class="sorttable_numeric" title="The file size, in MB">Size</th>
+ <th class="none" title="The file date">Date</th>
</tr>
</thead>
<tbody id="history_data_area">
Added:
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/service.details.table.registry.jsp
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/service.details.table.registry.jsp?rev=1742567&view=auto
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/service.details.table.registry.jsp
(added)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/service.details.table.registry.jsp
Fri May 6 17:42:07 2016
@@ -0,0 +1,36 @@
+<!--
+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_registry_area>
+</div>
+<table>
+<caption><b>Registry</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 registry variable
name">Key</th>
+ <th class="none" title="the registry variable
value">Value</th>
+ </tr>
+ </thead>
+ <tbody id="registry_data_area">
+ </tbody>
+ </table>
+</table>
\ No newline at end of file
Propchange:
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/service.details.table.registry.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/service.details.table.registry.jsp
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/services.jsp
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/services.jsp?rev=1742567&r1=1742566&r2=1742567&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/services.jsp
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/services.jsp
Fri May 6 17:42:07 2016
@@ -146,21 +146,21 @@ if (table_style.equals("classic")) {
<th class="ducc-col-button"></th>
<th class="ducc-col-button"></th>
<th class="sorttable_numeric" title="The service Id">Id</th>
- <th title="The service name">Name</th>
- <th title="The service state">State</th>
- <th title="The time this service was last used">Last Use</th>
- <th title="The service number of instances registered">Instances</th>
- <th title="The service number of processes currently
started">Deployments</th>
- <th title="The service start state">Start<br>State</th>
- <th class="ducc-no-filter" id="user_column_heading" title="The
service owning user">User</th>
- <th title="The service scheduling class">Class</th>
+ <th class="none" title="The service name">Name</th>
+ <th class="none" title="The service
state">State</th>
+ <th class="none" title="The time this service was
last used">Last Use</th>
+ <th class="sorttable_numeric" title="The service number of instances
registered">Instances</th>
+ <th class="sorttable_numeric" title="The service number of processes
currently started">Deployments</th>
+ <th class="none" title="The service start
state">Start<br>State</th>
+ <th class="ducc-no-filter" title="The service owning user"
id="user_column_heading" >User</th>
+ <th class="none" title="The service scheduling
class">Class</th>
<th class="sorttable_numeric" title="The count for all service
processes of major faults which required loading a memory page from
disk">PgIn</th>
<th class="sorttable_numeric" title="The GB swapped out to disk
for all initializing/running service processes">Swap</th>
<th class="sorttable_numeric" title="The service process
registered memory size (GB)">Memory<br/><small>(registered)</small></th>
<th class="sorttable_numeric" title="The number of active Jobs
that depend on this service">Jobs</th>
<th class="sorttable_numeric" title="The number of active
Services that depend on this service">Ser-<br>vices</th>
<th class="sorttable_numeric" title="The number of active
Reservations that depend on this service">Reser-<br>vations</th>
- <th title="The service description">Description</th>
+ <th class="none" title="The service
description">Description</th>
</tr>
</thead>
<tbody id="services_list_area">
