You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by bu...@apache.org on 2016/11/18 22:39:41 UTC
svn commit: r1770445 - in /uima/uima-ducc/trunk/uima-ducc-web/src/main:
java/org/apache/uima/ducc/ws/server/ webapp/root/
Author: burn
Date: Fri Nov 18 22:39:41 2016
New Revision: 1770445
URL: http://svn.apache.org/viewvc?rev=1770445&view=rev
Log:
UIMA-5182 Use blank for system-added entries on service registry page, to match job & AP specs, and initially sort user first
Modified:
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandler.java
uima/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/job.details.table.specification.jsp
uima/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/reservation.details.table.specification.jsp
uima/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/service.details.table.registry.jsp
Modified: uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandler.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandler.java?rev=1770445&r1=1770444&r2=1770445&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandler.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandler.java Fri Nov 18 22:39:41 2016
@@ -217,11 +217,6 @@ public class DuccHandler extends DuccAbs
private String duccReservationSchedulingClasses = duccContext+"/reservation-scheduling-classes";
private String duccReservationInstanceMemoryUnits = duccContext+"/reservation-memory-units";
- protected String providerUser = "user";
- protected String providerFile = "file";
- protected String providerSystem = "";
- protected String providerUnknown = null;
-
private String _window_login_logout = "_window_login_logout";
private String _window_file_pager = "_window_file_pager";
private String _window_reservation_request = "_window_reservation_request";
@@ -2028,11 +2023,11 @@ public class DuccHandler extends DuccAbs
private void putJobSpecEntry(Properties properties, String provider, String key, String value, StringBuffer sb, int counter) {
if(value != null) {
- sb.append(trGet(counter));
- if(provider != null) {
- sb.append("<td>");
- sb.append(provider);
- }
+ sb.append(trGet(counter));
+ // Sort "user" before the system key "" with: <td sorttable_customkey="false|true"\>user</td>
+ sb.append("<td sorttable_customkey=\"" + provider.isEmpty() + "\">");
+ sb.append(provider);
+ sb.append("</td>");
sb.append("<td>");
sb.append(key);
sb.append("</td>");
@@ -2069,8 +2064,8 @@ public class DuccHandler extends DuccAbs
int i = 0;
int counter = 0;
for (String key : list) {
- // Determine the origin of the property, User vs. default or meta
- String provider = "User";
+ // Determine the origin of the property, user vs. default or meta
+ String provider = "user";
String value = usProperties.getProperty(key);
if (value == null) {
value = properties.getProperty(key);
Modified: uima/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/job.details.table.specification.jsp
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/job.details.table.specification.jsp?rev=1770445&r1=1770444&r2=1770445&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/job.details.table.specification.jsp (original)
+++ uima/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/job.details.table.specification.jsp Fri Nov 18 22:39:41 2016
@@ -26,12 +26,12 @@ under the License.
<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>
+ <th class="none" title="The specification variable source: user or system">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
+</table>
Modified: uima/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/reservation.details.table.specification.jsp
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/reservation.details.table.specification.jsp?rev=1770445&r1=1770444&r2=1770445&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/reservation.details.table.specification.jsp (original)
+++ uima/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/reservation.details.table.specification.jsp Fri Nov 18 22:39:41 2016
@@ -26,12 +26,12 @@ under the License.
<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>
+ <th class="none" title="The specification variable source: user or system">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
+</table>
Modified: uima/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/service.details.table.registry.jsp
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/service.details.table.registry.jsp?rev=1770445&r1=1770444&r2=1770445&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/service.details.table.registry.jsp (original)
+++ uima/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/service.details.table.registry.jsp Fri Nov 18 22:39:41 2016
@@ -26,9 +26,9 @@ under the License.
<table class="sortable">
<thead>
<tr class="ducc-head">
- <th class="none" title="the registry variable source">Provider</th>
- <th class="none" title="the registry variable name">Key</th>
- <th class="none" title="the registry variable value">Value</th>
+ <th class="none" title="The registry variable source: user or system">Provider</th>
+ <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">