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/04/19 15:12:28 UTC
svn commit: r1469816 - 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: Fri Apr 19 13:12:28 2013
New Revision: 1469816
URL: http://svn.apache.org/r1469816
Log:
UIMA-2821 DUCC webserver (WS) Services page 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/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=1469816&r1=1469815&r2=1469816&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 Fri Apr 19 13:12:28 2013
@@ -995,11 +995,11 @@ public class DuccHandlerJsonFormat exten
}
row.add(new JsonPrimitive(s0+s1+s2));
// Pinging
- String pinging = DuccHandlerUtils.getInterpretedYesNo(state, propertiesMeta, IServicesRegistry.ping_active);
+ String pinging = DuccHandlerUtils.getInterpretedUpDown(state, propertiesMeta, IServicesRegistry.ping_active);
String decoratedPinging = DuccHandlerUtils.getDecorated(pinging);
row.add(new JsonPrimitive(decoratedPinging));
// Health
- String health = DuccHandlerUtils.getInterpretedGoodPoor(state, propertiesMeta, IServicesRegistry.service_healthy);
+ String health = DuccHandlerUtils.getInterpretedUpDown(state, propertiesMeta, IServicesRegistry.service_healthy);
String statistics = null;
if(state.equalsIgnoreCase(IServicesRegistry.constant_Available)) {
statistics = propertiesMeta.getProperty(IServicesRegistry.service_statistics);
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=1469816&r1=1469815&r2=1469816&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 Fri Apr 19 13:12:28 2013
@@ -855,13 +855,13 @@ public class DuccHandlerLegacy extends D
sb.append("</td>");
// Pinging
sb.append("<td>");
- String pinging = DuccHandlerUtils.getInterpretedYesNo(state, propertiesMeta, IServicesRegistry.ping_active);
+ String pinging = DuccHandlerUtils.getInterpretedUpDown(state, propertiesMeta, IServicesRegistry.ping_active);
String decoratedPinging = DuccHandlerUtils.getDecorated(pinging,null);
sb.append(decoratedPinging);
sb.append("</td>");
// Health
sb.append("<td>");
- String health = DuccHandlerUtils.getInterpretedGoodPoor(state, propertiesMeta, IServicesRegistry.service_healthy);
+ String health = DuccHandlerUtils.getInterpretedUpDown(state, propertiesMeta, IServicesRegistry.service_healthy);
String statistics = null;
if(state.equalsIgnoreCase(IServicesRegistry.constant_Available)) {
statistics = propertiesMeta.getProperty(IServicesRegistry.service_statistics);
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=1469816&r1=1469815&r2=1469816&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 Fri Apr 19 13:12:28 2013
@@ -27,14 +27,10 @@ public class DuccHandlerUtils {
private static String valueTrue = "True";
private static String valueFalse = "False";
- private static String valueYes = "Yes";
- private static String valueNo = "No";
+ private static String valueUp = "Up";
+ private static String valueDown = "Down";
-
- private static String valueGood = "Good";
- private static String valuePoor = "Poor";
-
- private static String health_neutral = "health_neutral";
+ //private static String health_neutral = "health_neutral";
private static String health_green = "health_green";
private static String health_red = "health_red";
@@ -53,37 +49,17 @@ public class DuccHandlerUtils {
return retVal;
}
- public static String getInterpretedYesNo(String state, Properties propertiesMeta, String key) {
- String retVal = "";
- if(state != null) {
- if(state.equals(stateAvailable)) {
- String value = getUninterpreted(propertiesMeta, key);
- value = value.trim();
- if(value.equalsIgnoreCase(valueTrue)) {
- retVal = valueYes;
- }
- else if(value.equalsIgnoreCase(valueFalse)) {
- retVal = valueNo;
- }
- else {
- retVal = value;
- }
- }
- }
- return retVal;
- }
-
- public static String getInterpretedGoodPoor(String state, Properties propertiesMeta, String key) {
+ public static String getInterpretedUpDown(String state, Properties propertiesMeta, String key) {
String retVal = "";
if(state != null) {
if(state.equals(stateAvailable)) {
String value = getUninterpreted(propertiesMeta, key);
value = value.trim();
if(value.equalsIgnoreCase(valueTrue)) {
- retVal = valueGood;
+ retVal = valueUp;
}
else if(value.equalsIgnoreCase(valueFalse)) {
- retVal = valuePoor;
+ retVal = valueDown;
}
else {
retVal = value;
@@ -127,34 +103,20 @@ public class DuccHandlerUtils {
String retVal = "";
if(value != null) {
String tValue = value.trim();
- if(tValue.equalsIgnoreCase(valueYes)) {
- StringBuffer sb = new StringBuffer();
- sb.append(openSpan(health_neutral, popup));
- sb.append(tValue);
- sb.append(closeSpan());
- retVal = sb.toString();
- }
- else if(tValue.equalsIgnoreCase(valueNo)) {
+ if(tValue.equalsIgnoreCase(valueDown)) {
StringBuffer sb = new StringBuffer();
sb.append(openSpan(health_red, popup));
sb.append(tValue);
sb.append(closeSpan());
retVal = sb.toString();
}
- else if(tValue.equalsIgnoreCase(valueGood)) {
+ else if(tValue.equalsIgnoreCase(valueUp)) {
StringBuffer sb = new StringBuffer();
sb.append(openSpan(health_green, popup));
sb.append(tValue);
sb.append(closeSpan());
retVal = sb.toString();
}
- else if(tValue.equalsIgnoreCase(valuePoor)) {
- StringBuffer sb = new StringBuffer();
- sb.append(openSpan(health_red, popup));
- sb.append(tValue);
- sb.append(closeSpan());
- retVal = sb.toString();
- }
else {
retVal = value;
}