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 2013/02/26 00:08:33 UTC
svn commit: r1449955 - in
/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main:
java/org/apache/uima/ducc/ws/server/DuccHandlerJsonFormat.java
webapp/root/reservations.jsp
Author: degenaro
Date: Mon Feb 25 23:08:32 2013
New Revision: 1449955
URL: http://svn.apache.org/r1449955
Log:
UIMA-2676 DUCC webserver (WS) Services presentation improvements
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerJsonFormat.java
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/DuccHandlerJsonFormat.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerJsonFormat.java?rev=1449955&r1=1449954&r2=1449955&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerJsonFormat.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerJsonFormat.java Mon Feb 25 23:08:32 2013
@@ -474,6 +474,8 @@ public class DuccHandlerJsonFormat exten
row.add(new JsonPrimitive(""));
// Reason
row.add(new JsonPrimitive(""));
+ // Services
+ row.add(new JsonPrimitive(""));
// Processes
row.add(new JsonPrimitive(""));
// Init Fails
@@ -1083,7 +1085,7 @@ public class DuccHandlerJsonFormat exten
// Id
String id = "<a href=\"service.details.html?name="+name+"\">"+key+"</a>";
row.add(new JsonPrimitive(id));
- // Endpoint
+ // Name
row.add(new JsonPrimitive(name));
// Type
row.add(new JsonPrimitive(type));
@@ -1094,7 +1096,7 @@ public class DuccHandlerJsonFormat exten
String pinging = DuccHandlerUtils.getInterpretedYesNo(state, propertiesMeta, IServicesRegistry.ping_active);
String decoratedPinging = DuccHandlerUtils.getDecorated(pinging);
row.add(new JsonPrimitive(decoratedPinging));
- // Healthy
+ // Health
String healthy = DuccHandlerUtils.getInterpretedGoodPoor(state, propertiesMeta, IServicesRegistry.service_healthy);
String decoratedHealthy = DuccHandlerUtils.getDecorated(healthy);
row.add(new JsonPrimitive(decoratedHealthy));
@@ -1102,9 +1104,9 @@ public class DuccHandlerJsonFormat exten
row.add(new JsonPrimitive(instances));
// Deployments
row.add(new JsonPrimitive(deployments));
- // Owning User
+ // User
row.add(new JsonPrimitive(getValue(propertiesMeta,IStateServices.user,"")));
- // Scheduling Class
+ // Class
row.add(new JsonPrimitive(getValue(propertiesSvc,IStateServices.scheduling_class,"")));
// Size
row.add(new JsonPrimitive(getValue(propertiesSvc,IStateServices.process_memory_size,"")));
@@ -1115,15 +1117,29 @@ public class DuccHandlerJsonFormat exten
}
else {
JsonArray row = new JsonArray();
+ // Start
+ row.add(new JsonPrimitive(""));
+ // Stop
+ row.add(new JsonPrimitive(""));
// Id
row.add(new JsonPrimitive(""));
- // Endpoint
+ // Name
+ row.add(new JsonPrimitive(""));
+ // Type
+ row.add(new JsonPrimitive(""));
+ // State
+ row.add(new JsonPrimitive(""));
+ // Pinging
+ row.add(new JsonPrimitive(""));
+ // Health
row.add(new JsonPrimitive(""));
// Instances
row.add(new JsonPrimitive(""));
- // Owning User
+ // Deployments
+ row.add(new JsonPrimitive(""));
+ // User
row.add(new JsonPrimitive(""));
- // Scheduling Class
+ // Class
row.add(new JsonPrimitive(""));
// Size
row.add(new JsonPrimitive(""));
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=1449955&r1=1449954&r2=1449955&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 Mon Feb 25 23:08:32 2013
@@ -139,6 +139,7 @@ if (table_style.equals("classic")) {
<th title="The time this reservation was finished">End</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 number of resources (machines or shares, depending on class) assigned to this reservation">Allocation</th>