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/27 17:43:37 UTC
svn commit: r1450838 - in
/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server:
DuccHandlerJsonFormat.java DuccHandlerLegacy.java DuccHandlerUtils.java
Author: degenaro
Date: Wed Feb 27 16:43:36 2013
New Revision: 1450838
URL: http://svn.apache.org/r1450838
Log:
UIMA-2676 DUCC webserver (WS) Services presentation improvements...display statistics on hover over service's health
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/java/org/apache/uima/ducc/ws/server/DuccHandlerLegacy.java
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerUtils.java
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=1450838&r1=1450837&r2=1450838&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 Wed Feb 27 16:43:36 2013
@@ -1131,15 +1131,34 @@ public class DuccHandlerJsonFormat exten
row.add(new JsonPrimitive(type));
// State
String state = DuccHandlerUtils.getUninterpreted(propertiesMeta, IServicesRegistry.service_state);
- row.add(new JsonPrimitive(state));
+ String s0 = "<span>";
+ String s1 = state;
+ String s2 = "<span>";
+ if(state.equalsIgnoreCase(IServicesRegistry.constant_Available)) {
+ String statistics = propertiesMeta.getProperty(IServicesRegistry.service_statistics);
+ if(statistics != null) {
+ statistics = statistics.trim();
+ if(statistics.length() > 0) {
+ s0 = "<span title=\""+statistics+"\">";
+ }
+ }
+ }
+ row.add(new JsonPrimitive(s0+s1+s2));
// Pinging
String pinging = DuccHandlerUtils.getInterpretedYesNo(state, propertiesMeta, IServicesRegistry.ping_active);
String decoratedPinging = DuccHandlerUtils.getDecorated(pinging);
row.add(new JsonPrimitive(decoratedPinging));
// Health
- String healthy = DuccHandlerUtils.getInterpretedGoodPoor(state, propertiesMeta, IServicesRegistry.service_healthy);
- String decoratedHealthy = DuccHandlerUtils.getDecorated(healthy);
- row.add(new JsonPrimitive(decoratedHealthy));
+ String health = DuccHandlerUtils.getInterpretedGoodPoor(state, propertiesMeta, IServicesRegistry.service_healthy);
+ String statistics = null;
+ if(state.equalsIgnoreCase(IServicesRegistry.constant_Available)) {
+ statistics = propertiesMeta.getProperty(IServicesRegistry.service_statistics);
+ if(statistics != null) {
+ statistics = statistics.trim();
+ }
+ }
+ String decoratedHealth = DuccHandlerUtils.getDecorated(health,statistics);
+ row.add(new JsonPrimitive(decoratedHealth));
// Instances
row.add(new JsonPrimitive(instances));
// Deployments
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerLegacy.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerLegacy.java?rev=1450838&r1=1450837&r2=1450838&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerLegacy.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerLegacy.java Wed Feb 27 16:43:36 2013
@@ -986,14 +986,21 @@ public class DuccHandlerLegacy extends D
// Pinging
sb.append("<td>");
String pinging = DuccHandlerUtils.getInterpretedYesNo(state, propertiesMeta, IServicesRegistry.ping_active);
- String decoratedPinging = DuccHandlerUtils.getDecorated(pinging);
+ String decoratedPinging = DuccHandlerUtils.getDecorated(pinging,null);
sb.append(decoratedPinging);
sb.append("</td>");
- // Healthy
+ // Health
sb.append("<td>");
- String healthy = DuccHandlerUtils.getInterpretedGoodPoor(state, propertiesMeta, IServicesRegistry.service_healthy);
- String decoratedHealthy = DuccHandlerUtils.getDecorated(healthy);
- sb.append(decoratedHealthy);
+ String health = DuccHandlerUtils.getInterpretedGoodPoor(state, propertiesMeta, IServicesRegistry.service_healthy);
+ String statistics = null;
+ if(state.equalsIgnoreCase(IServicesRegistry.constant_Available)) {
+ statistics = propertiesMeta.getProperty(IServicesRegistry.service_statistics);
+ if(statistics != null) {
+ statistics = statistics.trim();
+ }
+ }
+ String decoratedHealth = DuccHandlerUtils.getDecorated(health,statistics);
+ sb.append(decoratedHealth);
sb.append("</td>");
// No. of Instances
sb.append("<td align=\"right\">");
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerUtils.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerUtils.java?rev=1450838&r1=1450837&r2=1450838&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerUtils.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerUtils.java Wed Feb 27 16:43:36 2013
@@ -34,10 +34,9 @@ public class DuccHandlerUtils {
private static String valueGood = "Good";
private static String valuePoor = "Poor";
- private static String decorateOpenNeutral = "<span class=\"health_neutral\">";
- private static String decorateOpenGreen = "<span class=\"health_green\">";
- private static String decorateOpenRed = "<span class=\"health_red\">";
- private static String decorateClose = "</span>";
+ private static String health_neutral = "health_neutral";
+ private static String health_green = "health_green";
+ private static String health_red = "health_red";
public static String getUninterpreted(Properties propertiesMeta, String key) {
String retVal = "";
@@ -94,35 +93,66 @@ public class DuccHandlerUtils {
return retVal;
}
+ private static String openSpan(String spanClass, String spanTitle) {
+ StringBuffer sb = new StringBuffer();
+ sb.append("<");
+ sb.append("span");
+ if(spanClass != null) {
+ sb.append(" ");
+ sb.append("class=");
+ sb.append("\"");
+ sb.append(spanClass);
+ sb.append("\"");
+ }
+ if(spanTitle != null) {
+ sb.append(" ");
+ sb.append("title=");
+ sb.append("\"");
+ sb.append(spanTitle);
+ sb.append("\"");
+ }
+ sb.append(">");
+ return sb.toString();
+ }
+
+ private static String closeSpan() {
+ return "</span>";
+ }
+
public static String getDecorated(String value) {
+ return getDecorated(value,null);
+ }
+
+ public static String getDecorated(String value, String popup) {
String retVal = "";
if(value != null) {
- if(value.equalsIgnoreCase(valueYes)) {
+ String tValue = value.trim();
+ if(tValue.equalsIgnoreCase(valueYes)) {
StringBuffer sb = new StringBuffer();
- sb.append(decorateOpenNeutral);
- sb.append(value);
- sb.append(decorateClose);
+ sb.append(openSpan(health_neutral, popup));
+ sb.append(tValue);
+ sb.append(closeSpan());
retVal = sb.toString();
}
- else if(value.equalsIgnoreCase(valueNo)) {
+ else if(tValue.equalsIgnoreCase(valueNo)) {
StringBuffer sb = new StringBuffer();
- sb.append(decorateOpenRed);
- sb.append(value);
- sb.append(decorateClose);
+ sb.append(openSpan(health_red, popup));
+ sb.append(tValue);
+ sb.append(closeSpan());
retVal = sb.toString();
}
- else if(value.equalsIgnoreCase(valueGood)) {
+ else if(tValue.equalsIgnoreCase(valueGood)) {
StringBuffer sb = new StringBuffer();
- sb.append(decorateOpenGreen);
- sb.append(value);
- sb.append(decorateClose);
+ sb.append(openSpan(health_green, popup));
+ sb.append(tValue);
+ sb.append(closeSpan());
retVal = sb.toString();
}
- else if(value.equalsIgnoreCase(valuePoor)) {
+ else if(tValue.equalsIgnoreCase(valuePoor)) {
StringBuffer sb = new StringBuffer();
- sb.append(decorateOpenRed);
- sb.append(value);
- sb.append(decorateClose);
+ sb.append(openSpan(health_red, popup));
+ sb.append(tValue);
+ sb.append(closeSpan());
retVal = sb.toString();
}
else {