svn commit: r1450112 - in /uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server: DuccHandlerJsonFormat.java DuccHandlerLegacy.java

[degenaro]

Author: degenaro
Date: Tue Feb 26 10:34:31 2013
New Revision: 1450112

URL: http://svn.apache.org/r1450112
Log:
UIMA-2642 DUCC webserver (WS) Show MonitorActive or MonitorWarning, as the case 
may be

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

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=1450112&r1=1450111&r2=1450112&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
 Tue Feb 26 10:34:31 2013
@@ -224,11 +224,11 @@ public class DuccHandlerJsonFormat exten
                                }
                                if(expiry > expiryWarnTime) {
                                        sb.append("<span class=\"health_green\" 
title=\""+text+"\">");
-                                       sb.append("TimeoutMonitorNominal");
+                                       sb.append("MonitorActive");
                                }
                                else {
                                        sb.append("<span class=\"health_red\" 
title=\""+text+"\">");
-                                       sb.append("TimeoutMonitorWarning");
+                                       sb.append("MonitorWarning");
                                }
                                sb.append("</span>");
                        }

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=1450112&r1=1450111&r2=1450112&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
 Tue Feb 26 10:34:31 2013
@@ -207,11 +207,11 @@ public class DuccHandlerLegacy extends D
                                }
                                if(expiry > expiryWarnTime) {
                                        sb.append("<span class=\"health_green\" 
title=\""+text+"\">");
-                                       sb.append("TimeoutMonitorNominal");
+                                       sb.append("MonitorActive");
                                }
                                else {
                                        sb.append("<span class=\"health_red\" 
title=\""+text+"\">");
-                                       sb.append("TimeoutMonitorWarning");
+                                       sb.append("MonitorWarning");
                                }
                                sb.append("</span>");
                        }