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 2015/04/06 12:15:18 UTC

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

Author: degenaro
Date: Mon Apr  6 10:15:18 2015
New Revision: 1671504

URL: http://svn.apache.org/r1671504
Log:
UIMA-4325 DUCC Web Server (WS) remove db daemon from Daemons page display

Modified:
    uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccAbstractHandler.java
    uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerClassic.java
    uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerJsonFormat.java

Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccAbstractHandler.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccAbstractHandler.java?rev=1671504&r1=1671503&r2=1671504&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccAbstractHandler.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccAbstractHandler.java Mon Apr  6 10:15:18 2015
@@ -72,8 +72,6 @@ public abstract class DuccAbstractHandle
 	public static DuccWebAdministrators duccWebAdministrators = DuccWebAdministrators.getInstance();
 	public static DuccWebSessionManager duccWebSessionManager = DuccWebSessionManager.getInstance();
 	
-	public final String version110 = "1.1.0";
-	
 	public final String duccUimaInitializationReport		  = "uima-initialization-report.html";
 	
 	public final String duccContext = "/ducc-servlet";
@@ -102,6 +100,7 @@ public abstract class DuccAbstractHandle
 	public String dir_home = Utils.findDuccHome();
 	public String dir_resources = "resources";
 
+	protected boolean db = false;
 	protected boolean terminateEnabled = true;
 	protected boolean buttonsEnabled = true;
 	

Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerClassic.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerClassic.java?rev=1671504&r1=1671503&r2=1671504&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerClassic.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerClassic.java Mon Apr  6 10:15:18 2015
@@ -51,7 +51,6 @@ import org.apache.uima.ducc.common.utils
 import org.apache.uima.ducc.common.utils.DuccPropertiesResolver;
 import org.apache.uima.ducc.common.utils.DuccSchedulerClasses;
 import org.apache.uima.ducc.common.utils.TimeStamp;
-import org.apache.uima.ducc.common.utils.Version;
 import org.apache.uima.ducc.common.utils.id.DuccId;
 import org.apache.uima.ducc.transport.Constants;
 import org.apache.uima.ducc.transport.event.DbComponentPropertiesHelper;
@@ -1248,7 +1247,7 @@ public class DuccHandlerClassic extends
 			String heartbeat = "*";
 			String heartmax = "*";
 			Properties properties = DuccDaemonRuntimeProperties.getInstance().get(daemonName);
-			if(Version.version().startsWith(version110)) {
+			if(db) {
 				switch(daemonName) {
 				case DbManager:
 					continue daemons;

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=1671504&r1=1671503&r2=1671504&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 Apr  6 10:15:18 2015
@@ -54,7 +54,6 @@ import org.apache.uima.ducc.common.utils
 import org.apache.uima.ducc.common.utils.DuccPropertiesResolver;
 import org.apache.uima.ducc.common.utils.DuccSchedulerClasses;
 import org.apache.uima.ducc.common.utils.TimeStamp;
-import org.apache.uima.ducc.common.utils.Version;
 import org.apache.uima.ducc.common.utils.id.DuccId;
 import org.apache.uima.ducc.transport.Constants;
 import org.apache.uima.ducc.transport.event.DbComponentPropertiesHelper;
@@ -1782,7 +1781,7 @@ public class DuccHandlerJsonFormat exten
 			String heartbeat = "*";
 			String heartmax = "*";
 			Properties properties = DuccDaemonRuntimeProperties.getInstance().get(daemonName);
-			if(Version.version().startsWith(version110)) {
+			if(db) {
 				switch(daemonName) {
 				case DbManager:
 					continue daemons;