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 2017/11/13 20:54:51 UTC
svn commit: r1815131 [1/2] - in /uima/uima-ducc/trunk:
uima-ducc-common/src/main/java/org/apache/uima/ducc/common/main/
uima-ducc-common/src/main/java/org/apache/uima/ducc/common/system/
uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/...
Author: degenaro
Date: Mon Nov 13 20:54:50 2017
New Revision: 1815131
URL: http://svn.apache.org/viewvc?rev=1815131&view=rev
Log:
UIMA-5648 DUCC Common code should not use components WS or OR directly for logging
Modified:
uima/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/main/DuccService.java
uima/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/system/SystemState.java
uima/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/AlienAbstract.java
uima/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/AlienFile.java
uima/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/ComponentHelper.java
uima/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/DuccLogger.java
uima/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/DuccLoggerComponents.java
uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/OrUtil.java
uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/OrchestratorCheckpoint.java
uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/OrchestratorCommonArea.java
uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/OrchestratorComponent.java
uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/OrchestratorHelper.java
uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/OrchestratorRecovery.java
uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/OrchestratorState.java
uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/ProcessAccounting.java
uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/ProcessToJobMap.java
uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/Reason.java
uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/ReservationFactory.java
uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/StateJobAccounting.java
uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/StateManager.java
uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/Validate.java
uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/config/OrchestratorConfiguration.java
uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/event/NodeInventoryEventLogger.java
uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/event/OrchestratorEventListener.java
uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/event/RMStateEventLogger.java
uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/factory/JobFactory.java
uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/factory/JobFactoryHelper.java
uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/jd/scheduler/JdHostProperties.java
uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/maintenance/HealthMonitor.java
uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/maintenance/MaintenanceThread.java
uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/maintenance/NodeAccounting.java
uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/user/DuccAsUser.java
uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/utilities/TrackSync.java
uima/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/jd/JobDriverStateExchanger.java
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/Distiller.java
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/DuccBoot.java
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/DuccDaemonsData.java
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/DuccData.java
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/DuccMachinesData.java
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/DuccNodes.java
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/DuccPlugins.java
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/MachineInfo.java
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/WebServerComponent.java
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/authentication/DuccAsUser.java
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/authentication/DuccAuthenticator.java
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/authentication/SecureFileAuthenticator.java
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/authentication/UserAuthenticate.java
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/config/WebServerConfiguration.java
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/db/DbQuery.java
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/event/WebServerEventListener.java
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/helper/BrokerHelper.java
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/helper/DatabaseHelper.java
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/helper/JmxHelper.java
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/registry/ServiceInterpreter.java
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/registry/ServicesHelper.java
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/registry/ServicesRegistry.java
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/registry/sort/ServicesSortCache.java
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/registry/sort/SortableService.java
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccAbstractHandler.java
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccCookies.java
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandler.java
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerClassic.java
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerHttpRequestFilter.java
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerJsonFormat.java
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerProxy.java
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerUserAuthentication.java
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerViz.java
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccWebMonitor.java
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccWebMonitorJob.java
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccWebMonitorManagedReservation.java
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccWebMonitorReservation.java
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccWebProperties.java
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccWebServer.java
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccWebServerHelper.java
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccWebSessionManager.java
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccWebUtil.java
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/Helper.java
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/HelperSpecifications.java
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/nodeviz/NodeViz.java
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/nodeviz/VisualizedHost.java
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/utils/HandlersHelper.java
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/utils/alien/AlienDirectory.java
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/utils/alien/EffectiveUser.java
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/utils/alien/OsProxy.java
uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/utils/commands/CmdId.java
Modified: uima/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/main/DuccService.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/main/DuccService.java?rev=1815131&r1=1815130&r2=1815131&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/main/DuccService.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/main/DuccService.java Mon Nov 13 20:54:50 2017
@@ -36,6 +36,7 @@ import org.apache.uima.ducc.common.compo
import org.apache.uima.ducc.common.exception.DuccComponentInitializationException;
import org.apache.uima.ducc.common.node.DuplicateDuccDaemonProcessDetector;
import org.apache.uima.ducc.common.utils.DuccLogger;
+import org.apache.uima.ducc.common.utils.IDuccLoggerComponents;
import org.apache.uima.ducc.common.utils.Utils;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.AnnotationConfigApplicationContext;
@@ -268,6 +269,20 @@ public class DuccService extends Abstrac
}
}
+ private static void setLoggerComponent() {
+ String deployFlag = "ducc.deploy.components";
+ String myType = System.getProperty(deployFlag);
+ System.out.println("myType:"+myType+".");
+ if(myType != null) {
+ if(myType.equals("ws")) {
+ DuccLogger.setDaemonComponent(IDuccLoggerComponents.abbrv_webServer);
+ }
+ if(myType.equals("or")) {
+ DuccLogger.setDaemonComponent(IDuccLoggerComponents.abbrv_orchestrator);
+ }
+ }
+ }
+
public static void main(String[] args) {
DuccService duccService = null;
try {
@@ -277,6 +292,8 @@ public class DuccService extends Abstrac
System.exit(-1);
}
+ setLoggerComponent();
+
// Run duplicate daemon detector to make sure we dont start
// multiple copies of Ducc daemons. It checks of this process
// is a duplicate of OR, WS, PM, RM, SM, or Agent. The code
Modified: uima/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/system/SystemState.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/system/SystemState.java?rev=1815131&r1=1815130&r2=1815131&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/system/SystemState.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/system/SystemState.java Mon Nov 13 20:54:50 2017
@@ -25,13 +25,11 @@ import java.util.Properties;
import org.apache.uima.ducc.common.IDuccEnv;
import org.apache.uima.ducc.common.utils.DuccLogger;
-import org.apache.uima.ducc.common.utils.DuccLoggerComponents;
import org.apache.uima.ducc.common.utils.id.DuccId;
-
public class SystemState {
- private static final DuccLogger logger = DuccLoggerComponents.getOrLogger(SystemState.class.getName());
+ private static final DuccLogger logger = DuccLogger.getLogger(SystemState.class);
private static SystemState instance = new SystemState();
Modified: uima/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/AlienAbstract.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/AlienAbstract.java?rev=1815131&r1=1815130&r2=1815131&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/AlienAbstract.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/AlienAbstract.java Mon Nov 13 20:54:50 2017
@@ -24,7 +24,7 @@ import org.apache.uima.ducc.common.utils
public abstract class AlienAbstract {
- private static DuccLogger duccLogger = DuccLoggerComponents.getWsLogger(AlienAbstract.class.getName());
+ private static DuccLogger duccLogger = DuccLogger.getLogger(AlienAbstract.class);
protected DuccId duccId = null;
Modified: uima/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/AlienFile.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/AlienFile.java?rev=1815131&r1=1815130&r2=1815131&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/AlienFile.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/AlienFile.java Mon Nov 13 20:54:50 2017
@@ -29,7 +29,7 @@ import java.util.zip.GZIPInputStream;
public class AlienFile extends AlienAbstract {
- private static DuccLogger duccLogger = DuccLoggerComponents.getWsLogger(AlienFile.class.getName());
+ private static DuccLogger duccLogger = DuccLogger.getLogger(AlienFile.class);
private static String ducc_ling =
Utils.resolvePlaceholderIfExists(
Modified: uima/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/ComponentHelper.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/ComponentHelper.java?rev=1815131&r1=1815130&r2=1815131&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/ComponentHelper.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/ComponentHelper.java Mon Nov 13 20:54:50 2017
@@ -29,7 +29,7 @@ import java.net.InetAddress;
public class ComponentHelper {
- private static final DuccLogger logger = DuccLoggerComponents.getOrLogger(ComponentHelper.class.getName());
+ private static final DuccLogger logger = DuccLogger.getLogger(ComponentHelper.class);
/**
* Abort component (at start-up) if already running, indicated by the existence of
Modified: uima/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/DuccLogger.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/DuccLogger.java?rev=1815131&r1=1815130&r2=1815131&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/DuccLogger.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/DuccLogger.java Mon Nov 13 20:54:50 2017
@@ -30,7 +30,6 @@ import java.util.concurrent.atomic.Atomi
import org.apache.log4j.Appender;
import org.apache.log4j.Category;
import org.apache.log4j.Level;
-import org.apache.log4j.LogManager;
import org.apache.log4j.Logger;
import org.apache.log4j.MDC;
import org.apache.log4j.spi.ErrorHandler;
@@ -49,6 +48,8 @@ public class DuccLogger
private Logger logger;
private String component = "";
+ private static String daemonComponent = null;
+
private static DuccLoggingThread log_thread = null;
private static LinkedBlockingQueue<DuccLoggingEvent> events = null;
private static AtomicBoolean threaded = new AtomicBoolean(false);
@@ -70,11 +71,20 @@ public class DuccLogger
}
}
+ static public void setDaemonComponent(String value) {
+ daemonComponent = value;
+ }
+
static public DuccLogger getLogger(@SuppressWarnings("rawtypes") Class claz, String component)
{
return new DuccLogger(claz, component);
}
+ static public DuccLogger getLogger(Class<?> claz)
+ {
+ return new DuccLogger(claz, null);
+ }
+
static public DuccLogger getLogger(String claz, String component)
{
return new DuccLogger(claz, component);
@@ -143,7 +153,27 @@ public class DuccLogger
threaded.set(true);
}
- public DuccLogger(String claz, String component)
+ private void resolveComponent(String requestComponent) {
+ if(requestComponent != null) {
+ this.component = requestComponent;
+ }
+ else {
+ String mdcComponent = (String) MDC.get("COMPONENT");
+ if(mdcComponent != null) {
+ this.component = mdcComponent;
+ }
+ else {
+ if(daemonComponent != null) {
+ this.component = daemonComponent;
+ }
+ else {
+ this.component = DEFAULT_COMPONENT;
+ }
+ }
+ }
+ }
+
+ public DuccLogger(String claz, String requestComponent)
{
// initLogger();
@@ -177,31 +207,8 @@ public class DuccLogger
}
}
- //
- // Try to set component from calling thread if not set.
- //
- // If all else fails, set it to "DUCC"
- //
- if ( debug) System.out.println("Creating logger '" + claz + "' with component " + component);
- if ( component == null ) {
- component = (String) MDC.get("COMPONENT");
- if ( component == null ) {
- component = DEFAULT_COMPONENT;
- }
- @SuppressWarnings("rawtypes")
- Enumeration all_loggers = LogManager.getCurrentLoggers();
- while (all_loggers.hasMoreElements() ) {
- Logger l = (Logger) all_loggers.nextElement();
- String n = l.getName();
- if ( debug ) System.out.println(" ===> Configured loggers " + n);
- if ( ! n.startsWith("org.apache.uima.ducc" ) ) {
- if ( debug ) System.out.println(" Special logger: " + n);
- nonDuccLoggers.add(l);
- }
- }
- }
-
- this.component = component;
+ resolveComponent(requestComponent);
+
this.logger = Logger.getLogger(claz);
MDC.put("COMPONENT", component);
Modified: uima/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/DuccLoggerComponents.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/DuccLoggerComponents.java?rev=1815131&r1=1815130&r2=1815131&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/DuccLoggerComponents.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/DuccLoggerComponents.java Mon Nov 13 20:54:50 2017
@@ -39,10 +39,10 @@ public class DuccLoggerComponents implem
return makeLogger(claz, abbrv_db);
}
- static public DuccLogger getOrLogger(String claz)
- {
- return makeLogger(claz, abbrv_orchestrator);
- }
+// static public DuccLogger getOrLogger(String claz)
+// {
+// return makeLogger(claz, abbrv_orchestrator);
+// }
// static public DuccLogger getTrLogger(String claz)
// {
Modified: uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/OrUtil.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/OrUtil.java?rev=1815131&r1=1815130&r2=1815131&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/OrUtil.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/OrUtil.java Mon Nov 13 20:54:50 2017
@@ -19,14 +19,13 @@
package org.apache.uima.ducc.orchestrator;
import org.apache.uima.ducc.common.utils.DuccLogger;
-import org.apache.uima.ducc.common.utils.DuccLoggerComponents;
import org.apache.uima.ducc.transport.event.common.IDuccProcess;
import org.apache.uima.ducc.transport.event.common.IDuccWorkJob;
import org.apache.uima.ducc.transport.event.common.IResourceState;
public class OrUtil {
- private static final DuccLogger logger = DuccLoggerComponents.getOrLogger(OrUtil.class.getName());
+ private static final DuccLogger logger = DuccLogger.getLogger(OrUtil.class);
public static void setResourceState(IDuccWorkJob job, IDuccProcess process, IResourceState.ResourceState value) {
String location = "setResourceState";
Modified: uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/OrchestratorCheckpoint.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/OrchestratorCheckpoint.java?rev=1815131&r1=1815130&r2=1815131&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/OrchestratorCheckpoint.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/OrchestratorCheckpoint.java Mon Nov 13 20:54:50 2017
@@ -31,7 +31,6 @@ import java.util.concurrent.ConcurrentHa
import org.apache.uima.ducc.common.Pair;
import org.apache.uima.ducc.common.internationalization.Messages;
import org.apache.uima.ducc.common.utils.DuccLogger;
-import org.apache.uima.ducc.common.utils.DuccLoggerComponents;
import org.apache.uima.ducc.common.utils.IOHelper;
import org.apache.uima.ducc.common.utils.id.DuccId;
import org.apache.uima.ducc.orchestrator.utilities.Checkpointable;
@@ -45,7 +44,7 @@ import org.apache.uima.ducc.transport.ev
public class OrchestratorCheckpoint {
- private static final DuccLogger logger = DuccLoggerComponents.getOrLogger(OrchestratorCheckpoint.class.getName());
+ private static final DuccLogger logger = DuccLogger.getLogger(OrchestratorCheckpoint.class);
private static OrchestratorCommonArea orchestratorCommonArea = OrchestratorCommonArea.getInstance();
private static Messages messages = orchestratorCommonArea.getSystemMessages();
Modified: uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/OrchestratorCommonArea.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/OrchestratorCommonArea.java?rev=1815131&r1=1815130&r2=1815131&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/OrchestratorCommonArea.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/OrchestratorCommonArea.java Mon Nov 13 20:54:50 2017
@@ -27,7 +27,6 @@ import org.apache.uima.ducc.common.persi
import org.apache.uima.ducc.common.persistence.PropertiesFileManager;
import org.apache.uima.ducc.common.utils.ComponentHelper;
import org.apache.uima.ducc.common.utils.DuccLogger;
-import org.apache.uima.ducc.common.utils.DuccLoggerComponents;
import org.apache.uima.ducc.common.utils.DuccPropertiesResolver;
import org.apache.uima.ducc.common.utils.IDuccLoggerComponents;
import org.apache.uima.ducc.common.utils.id.DuccId;
@@ -45,7 +44,7 @@ public class OrchestratorCommonArea {
private static OrchestratorCommonArea orchestratorCommonArea = null;
- private static final DuccLogger logger = DuccLoggerComponents.getOrLogger(OrchestratorCommonArea.class.getName());
+ private static final DuccLogger logger = DuccLogger.getLogger(OrchestratorCommonArea.class);
private static final DuccId jobid = null;
private static DuccPropertiesResolver dpr = DuccPropertiesResolver.getInstance();
Modified: uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/OrchestratorComponent.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/OrchestratorComponent.java?rev=1815131&r1=1815130&r2=1815131&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/OrchestratorComponent.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/OrchestratorComponent.java Mon Nov 13 20:54:50 2017
@@ -45,7 +45,6 @@ import org.apache.uima.ducc.common.persi
import org.apache.uima.ducc.common.persistence.or.TypedProperties;
import org.apache.uima.ducc.common.system.SystemState;
import org.apache.uima.ducc.common.utils.DuccLogger;
-import org.apache.uima.ducc.common.utils.DuccLoggerComponents;
import org.apache.uima.ducc.common.utils.DuccPropertiesResolver;
import org.apache.uima.ducc.common.utils.IDuccLoggerComponents;
import org.apache.uima.ducc.common.utils.TimeStamp;
@@ -110,7 +109,7 @@ import org.apache.uima.ducc.transport.ev
public class OrchestratorComponent extends AbstractDuccComponent
implements Orchestrator {
- private static final DuccLogger logger = DuccLoggerComponents.getOrLogger(OrchestratorComponent.class.getName());
+ private static final DuccLogger logger = DuccLogger.getLogger(OrchestratorComponent.class);
private static DuccId jobid = null;
private OrchestratorCommonArea orchestratorCommonArea = OrchestratorCommonArea.getInstance();
Modified: uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/OrchestratorHelper.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/OrchestratorHelper.java?rev=1815131&r1=1815130&r2=1815131&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/OrchestratorHelper.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/OrchestratorHelper.java Mon Nov 13 20:54:50 2017
@@ -23,7 +23,6 @@ import java.util.Properties;
import org.apache.uima.ducc.common.NodeConfiguration;
import org.apache.uima.ducc.common.utils.DuccLogger;
-import org.apache.uima.ducc.common.utils.DuccLoggerComponents;
import org.apache.uima.ducc.common.utils.DuccProperties;
import org.apache.uima.ducc.common.utils.DuccPropertiesResolver;
import org.apache.uima.ducc.common.utils.SystemPropertyResolver;
@@ -43,7 +42,7 @@ import org.apache.uima.ducc.transport.ev
public class OrchestratorHelper {
- private static DuccLogger logger = DuccLoggerComponents.getOrLogger(OrchestratorHelper.class.getName());
+ private static DuccLogger logger = DuccLogger.getLogger(OrchestratorHelper.class);
public static DuccId jobid = null;
Modified: uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/OrchestratorRecovery.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/OrchestratorRecovery.java?rev=1815131&r1=1815130&r2=1815131&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/OrchestratorRecovery.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/OrchestratorRecovery.java Mon Nov 13 20:54:50 2017
@@ -22,7 +22,6 @@ import java.util.List;
import java.util.Set;
import org.apache.uima.ducc.common.utils.DuccLogger;
-import org.apache.uima.ducc.common.utils.DuccLoggerComponents;
import org.apache.uima.ducc.common.utils.id.DuccId;
import org.apache.uima.ducc.transport.event.common.DuccWorkMap;
import org.apache.uima.ducc.transport.event.common.IDuccWorkJob;
@@ -34,7 +33,7 @@ import org.apache.uima.ducc.transport.ev
*/
public class OrchestratorRecovery {
- private static final DuccLogger logger = DuccLoggerComponents.getOrLogger(OrchestratorRecovery.class.getName());
+ private static final DuccLogger logger = DuccLogger.getLogger(OrchestratorRecovery.class);
private static final DuccId jobid = null;
IHistoryPersistenceManager historyPersistenceManager = null;
Modified: uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/OrchestratorState.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/OrchestratorState.java?rev=1815131&r1=1815130&r2=1815131&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/OrchestratorState.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/OrchestratorState.java Mon Nov 13 20:54:50 2017
@@ -28,7 +28,6 @@ import java.util.concurrent.atomic.Atomi
import org.apache.uima.ducc.common.NodeIdentity;
import org.apache.uima.ducc.common.utils.DuccLogger;
-import org.apache.uima.ducc.common.utils.DuccLoggerComponents;
import org.apache.uima.ducc.common.utils.id.DuccId;
import com.google.gson.Gson;
@@ -36,7 +35,7 @@ import com.google.gson.reflect.TypeToken
public class OrchestratorState {
- private static final DuccLogger logger = DuccLoggerComponents.getOrLogger(OrchestratorState.class.getName());
+ private static final DuccLogger logger = DuccLogger.getLogger(OrchestratorState.class);
private static OrchestratorCommonArea orchestratorCommonArea = OrchestratorCommonArea.getInstance();
private static String fileName = orchestratorCommonArea.getStateDirectory()+File.separator+"orchestrator-state.json";
Modified: uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/ProcessAccounting.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/ProcessAccounting.java?rev=1815131&r1=1815130&r2=1815131&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/ProcessAccounting.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/ProcessAccounting.java Mon Nov 13 20:54:50 2017
@@ -25,7 +25,6 @@ import java.util.List;
import org.apache.uima.ducc.common.internationalization.Messages;
import org.apache.uima.ducc.common.node.metrics.ProcessGarbageCollectionStats;
import org.apache.uima.ducc.common.utils.DuccLogger;
-import org.apache.uima.ducc.common.utils.DuccLoggerComponents;
import org.apache.uima.ducc.common.utils.TimeStamp;
import org.apache.uima.ducc.common.utils.id.DuccId;
import org.apache.uima.ducc.orchestrator.user.UserLogging;
@@ -51,7 +50,7 @@ import org.apache.uima.ducc.transport.ev
public class ProcessAccounting {
- private static final DuccLogger logger = DuccLoggerComponents.getOrLogger(ProcessAccounting.class.getName());
+ private static final DuccLogger logger = DuccLogger.getLogger(ProcessAccounting.class);
private OrchestratorCommonArea orchestratorCommonArea = OrchestratorCommonArea.getInstance();
private Messages messages = orchestratorCommonArea.getSystemMessages();
Modified: uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/ProcessToJobMap.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/ProcessToJobMap.java?rev=1815131&r1=1815130&r2=1815131&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/ProcessToJobMap.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/ProcessToJobMap.java Mon Nov 13 20:54:50 2017
@@ -22,7 +22,6 @@ import java.util.Map.Entry;
import java.util.concurrent.ConcurrentHashMap;
import org.apache.uima.ducc.common.utils.DuccLogger;
-import org.apache.uima.ducc.common.utils.DuccLoggerComponents;
import org.apache.uima.ducc.common.utils.id.DuccId;
/**
@@ -32,7 +31,7 @@ import org.apache.uima.ducc.common.utils
public class ProcessToJobMap {
- private static final DuccLogger logger = DuccLoggerComponents.getOrLogger(ProcessToJobMap.class.getName());
+ private static final DuccLogger logger = DuccLogger.getLogger(ProcessToJobMap.class);
private static final DuccId jobid = null;
private static ProcessToJobMap instance = new ProcessToJobMap();
Modified: uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/Reason.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/Reason.java?rev=1815131&r1=1815130&r2=1815131&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/Reason.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/Reason.java Mon Nov 13 20:54:50 2017
@@ -19,13 +19,12 @@
package org.apache.uima.ducc.orchestrator;
import org.apache.uima.ducc.common.utils.DuccLogger;
-import org.apache.uima.ducc.common.utils.DuccLoggerComponents;
import org.apache.uima.ducc.common.utils.id.DuccId;
import org.apache.uima.ducc.transport.event.cli.SpecificationProperties;
public class Reason {
- private static final DuccLogger logger = DuccLoggerComponents.getOrLogger(Reason.class.getName());
+ private static final DuccLogger logger = DuccLogger.getLogger(Reason.class);
private String user = null;
private String role = null;
Modified: uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/ReservationFactory.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/ReservationFactory.java?rev=1815131&r1=1815130&r2=1815131&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/ReservationFactory.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/ReservationFactory.java Mon Nov 13 20:54:50 2017
@@ -20,7 +20,6 @@ package org.apache.uima.ducc.orchestrato
import org.apache.uima.ducc.common.internationalization.Messages;
import org.apache.uima.ducc.common.utils.DuccLogger;
-import org.apache.uima.ducc.common.utils.DuccLoggerComponents;
import org.apache.uima.ducc.common.utils.TimeStamp;
import org.apache.uima.ducc.common.utils.id.IDuccIdFactory;
import org.apache.uima.ducc.orchestrator.utilities.MemorySpecification;
@@ -33,7 +32,7 @@ import org.apache.uima.ducc.transport.ev
public class ReservationFactory {
private static ReservationFactory reservationFactory = new ReservationFactory();
- private static final DuccLogger logger = DuccLoggerComponents.getOrLogger(ReservationFactory.class.getName());
+ private static final DuccLogger logger = DuccLogger.getLogger(ReservationFactory.class);
public static ReservationFactory getInstance() {
return reservationFactory;
Modified: uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/StateJobAccounting.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/StateJobAccounting.java?rev=1815131&r1=1815130&r2=1815131&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/StateJobAccounting.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/StateJobAccounting.java Mon Nov 13 20:54:50 2017
@@ -19,7 +19,6 @@
package org.apache.uima.ducc.orchestrator;
import org.apache.uima.ducc.common.utils.DuccLogger;
-import org.apache.uima.ducc.common.utils.DuccLoggerComponents;
import org.apache.uima.ducc.common.utils.IDuccLoggerComponents;
import org.apache.uima.ducc.common.utils.TimeStamp;
import org.apache.uima.ducc.orchestrator.system.events.log.SystemEventsLogger;
@@ -34,7 +33,7 @@ import org.apache.uima.ducc.transport.ev
public class StateJobAccounting {
- private static final DuccLogger logger = DuccLoggerComponents.getOrLogger(StateJobAccounting.class.getName());
+ private static final DuccLogger logger = DuccLogger.getLogger(StateJobAccounting.class);
private static StateJobAccounting instance = new StateJobAccounting();
Modified: uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/StateManager.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/StateManager.java?rev=1815131&r1=1815130&r2=1815131&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/StateManager.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/StateManager.java Mon Nov 13 20:54:50 2017
@@ -35,7 +35,6 @@ import org.apache.uima.ducc.common.inter
import org.apache.uima.ducc.common.jd.files.workitem.IRemoteLocation;
import org.apache.uima.ducc.common.jd.files.workitem.RemoteLocation;
import org.apache.uima.ducc.common.utils.DuccLogger;
-import org.apache.uima.ducc.common.utils.DuccLoggerComponents;
import org.apache.uima.ducc.common.utils.DuccPropertiesResolver;
import org.apache.uima.ducc.common.utils.DuccSchedulerClasses;
import org.apache.uima.ducc.common.utils.TimeStamp;
@@ -82,7 +81,7 @@ import org.apache.uima.ducc.transport.ev
import org.apache.uima.ducc.transport.event.sm.ServiceMap;
public class StateManager {
- private static final DuccLogger logger = DuccLoggerComponents.getOrLogger(StateManager.class.getName());
+ private static final DuccLogger logger = DuccLogger.getLogger(StateManager.class);
private static final DuccId jobid = null;
private static StateManager stateManager = new StateManager();
Modified: uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/Validate.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/Validate.java?rev=1815131&r1=1815130&r2=1815131&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/Validate.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/Validate.java Mon Nov 13 20:54:50 2017
@@ -22,11 +22,10 @@ import java.util.ArrayList;
import java.util.Properties;
import org.apache.uima.ducc.common.utils.DuccLogger;
-import org.apache.uima.ducc.common.utils.DuccLoggerComponents;
import org.apache.uima.ducc.common.utils.DuccPropertiesResolver;
import org.apache.uima.ducc.orchestrator.authentication.DuccWebAdministrators;
-import org.apache.uima.ducc.orchestrator.utilities.MemorySpecification;
import org.apache.uima.ducc.orchestrator.utilities.CliVersion;
+import org.apache.uima.ducc.orchestrator.utilities.MemorySpecification;
import org.apache.uima.ducc.transport.event.AbstractDuccOrchestratorEvent;
import org.apache.uima.ducc.transport.event.CancelJobDuccEvent;
import org.apache.uima.ducc.transport.event.CancelReservationDuccEvent;
@@ -43,7 +42,7 @@ import org.apache.uima.ducc.transport.ev
public class Validate {
- private static final DuccLogger logger = DuccLoggerComponents.getOrLogger(Validate.class.getName());
+ private static final DuccLogger logger = DuccLogger.getLogger(Validate.class);
private static DuccWebAdministrators duccWebAdministrators = new DuccWebAdministrators();
Modified: uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/config/OrchestratorConfiguration.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/config/OrchestratorConfiguration.java?rev=1815131&r1=1815130&r2=1815131&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/config/OrchestratorConfiguration.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/config/OrchestratorConfiguration.java Mon Nov 13 20:54:50 2017
@@ -29,7 +29,6 @@ import org.apache.uima.ducc.common.confi
import org.apache.uima.ducc.common.config.DuccBlastGuardPredicate;
import org.apache.uima.ducc.common.exception.DuccRuntimeException;
import org.apache.uima.ducc.common.utils.DuccLogger;
-import org.apache.uima.ducc.common.utils.DuccLoggerComponents;
import org.apache.uima.ducc.common.utils.IDuccLoggerComponents;
import org.apache.uima.ducc.common.utils.XStreamUtils;
import org.apache.uima.ducc.common.utils.id.DuccId;
@@ -73,7 +72,7 @@ public class OrchestratorConfiguration {
// Springframework magic to inject instance of {@link DuccTransportConfiguration}
@Autowired DuccTransportConfiguration orchestratorTransport;
- private DuccLogger duccLogger = DuccLoggerComponents.getOrLogger(OrchestratorConfiguration.class.getName());
+ private DuccLogger duccLogger = DuccLogger.getLogger(OrchestratorConfiguration.class);
private DuccId jobid = null;
/**
Modified: uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/event/NodeInventoryEventLogger.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/event/NodeInventoryEventLogger.java?rev=1815131&r1=1815130&r2=1815131&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/event/NodeInventoryEventLogger.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/event/NodeInventoryEventLogger.java Mon Nov 13 20:54:50 2017
@@ -23,7 +23,6 @@ import java.util.Iterator;
import org.apache.uima.ducc.common.internationalization.Messages;
import org.apache.uima.ducc.common.utils.DuccLogger;
-import org.apache.uima.ducc.common.utils.DuccLoggerComponents;
import org.apache.uima.ducc.common.utils.id.DuccId;
import org.apache.uima.ducc.orchestrator.OrchestratorCommonArea;
import org.apache.uima.ducc.transport.event.NodeInventoryUpdateDuccEvent;
@@ -32,7 +31,7 @@ import org.apache.uima.ducc.transport.ev
public class NodeInventoryEventLogger {
- private static final DuccLogger logger = DuccLoggerComponents.getOrLogger(NodeInventoryEventLogger.class.getName());
+ private static final DuccLogger logger = DuccLogger.getLogger(NodeInventoryEventLogger.class);
private static final OrchestratorCommonArea orchestratorCommonArea = OrchestratorCommonArea.getInstance();
private static final Messages messages = orchestratorCommonArea.getSystemMessages();
Modified: uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/event/OrchestratorEventListener.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/event/OrchestratorEventListener.java?rev=1815131&r1=1815130&r2=1815131&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/event/OrchestratorEventListener.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/event/OrchestratorEventListener.java Mon Nov 13 20:54:50 2017
@@ -24,7 +24,6 @@ import org.apache.camel.Body;
import org.apache.camel.CamelContext;
import org.apache.uima.ducc.common.internationalization.Messages;
import org.apache.uima.ducc.common.utils.DuccLogger;
-import org.apache.uima.ducc.common.utils.DuccLoggerComponents;
import org.apache.uima.ducc.orchestrator.Orchestrator;
import org.apache.uima.ducc.orchestrator.OrchestratorCommonArea;
import org.apache.uima.ducc.orchestrator.system.events.log.SystemEventsLogger;
@@ -48,7 +47,7 @@ import org.apache.uima.ducc.transport.ev
public class OrchestratorEventListener implements DuccEventDelegateListener {
- private static final DuccLogger logger = DuccLoggerComponents.getOrLogger(OrchestratorEventListener.class.getName());
+ private static final DuccLogger logger = DuccLogger.getLogger(OrchestratorEventListener.class);
private OrchestratorCommonArea orchestratorCommonArea = OrchestratorCommonArea.getInstance();
private Messages messages = orchestratorCommonArea.getSystemMessages();
Modified: uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/event/RMStateEventLogger.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/event/RMStateEventLogger.java?rev=1815131&r1=1815130&r2=1815131&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/event/RMStateEventLogger.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/event/RMStateEventLogger.java Mon Nov 13 20:54:50 2017
@@ -20,14 +20,13 @@ package org.apache.uima.ducc.orchestrato
import org.apache.uima.ducc.common.internationalization.Messages;
import org.apache.uima.ducc.common.utils.DuccLogger;
-import org.apache.uima.ducc.common.utils.DuccLoggerComponents;
import org.apache.uima.ducc.orchestrator.OrchestratorCommonArea;
import org.apache.uima.ducc.transport.event.RmStateDuccEvent;
public class RMStateEventLogger {
- private static final DuccLogger logger = DuccLoggerComponents.getOrLogger(RMStateEventLogger.class.getName());
+ private static final DuccLogger logger = DuccLogger.getLogger(RMStateEventLogger.class);
private static final OrchestratorCommonArea orchestratorCommonArea = OrchestratorCommonArea.getInstance();
private static final Messages messages = orchestratorCommonArea.getSystemMessages();
Modified: uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/factory/JobFactory.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/factory/JobFactory.java?rev=1815131&r1=1815130&r2=1815131&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/factory/JobFactory.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/factory/JobFactory.java Mon Nov 13 20:54:50 2017
@@ -29,7 +29,6 @@ import org.apache.uima.ducc.common.NodeI
import org.apache.uima.ducc.common.container.FlagsHelper;
import org.apache.uima.ducc.common.container.FlagsHelper.Name;
import org.apache.uima.ducc.common.utils.DuccLogger;
-import org.apache.uima.ducc.common.utils.DuccLoggerComponents;
import org.apache.uima.ducc.common.utils.DuccProperties;
import org.apache.uima.ducc.common.utils.DuccPropertiesResolver;
import org.apache.uima.ducc.common.utils.TimeStamp;
@@ -70,7 +69,7 @@ import org.apache.uima.ducc.user.common.
public class JobFactory implements IJobFactory {
private static JobFactory jobFactory = new JobFactory();
- private static final DuccLogger logger = DuccLoggerComponents.getOrLogger(JobFactory.class.getName());
+ private static final DuccLogger logger = DuccLogger.getLogger(JobFactory.class);
private DuccPropertiesResolver dpr = DuccPropertiesResolver.getInstance();
public static IJobFactory getInstance() {
Modified: uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/factory/JobFactoryHelper.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/factory/JobFactoryHelper.java?rev=1815131&r1=1815130&r2=1815131&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/factory/JobFactoryHelper.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/factory/JobFactoryHelper.java Mon Nov 13 20:54:50 2017
@@ -24,7 +24,6 @@ import java.util.Map;
import java.util.concurrent.atomic.AtomicLong;
import org.apache.uima.ducc.common.utils.DuccLogger;
-import org.apache.uima.ducc.common.utils.DuccLoggerComponents;
import org.apache.uima.ducc.common.utils.DuccPropertiesResolver;
import org.apache.uima.ducc.common.utils.id.DuccId;
import org.apache.uima.ducc.transport.event.cli.JobRequestProperties;
@@ -33,7 +32,7 @@ import org.apache.uima.ducc.user.common.
public class JobFactoryHelper {
- private static final DuccLogger logger = DuccLoggerComponents.getOrLogger(JobFactoryHelper.class.getName());
+ private static final DuccLogger logger = DuccLogger.getLogger(JobFactoryHelper.class);
private static final DuccId jobid = null;
public static long KB = 1024;
Modified: uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/jd/scheduler/JdHostProperties.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/jd/scheduler/JdHostProperties.java?rev=1815131&r1=1815130&r2=1815131&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/jd/scheduler/JdHostProperties.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/jd/scheduler/JdHostProperties.java Mon Nov 13 20:54:50 2017
@@ -19,13 +19,12 @@
package org.apache.uima.ducc.orchestrator.jd.scheduler;
import org.apache.uima.ducc.common.utils.DuccLogger;
-import org.apache.uima.ducc.common.utils.DuccLoggerComponents;
import org.apache.uima.ducc.common.utils.DuccPropertiesResolver;
import org.apache.uima.ducc.common.utils.id.DuccId;
public class JdHostProperties {
- private static final DuccLogger logger = DuccLoggerComponents.getOrLogger(JdHostProperties.class.getName());
+ private static final DuccLogger logger = DuccLogger.getLogger(JdHostProperties.class);
private static final DuccId jobid = null;
private static DuccPropertiesResolver dpr = DuccPropertiesResolver.getInstance();
Modified: uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/maintenance/HealthMonitor.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/maintenance/HealthMonitor.java?rev=1815131&r1=1815130&r2=1815131&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/maintenance/HealthMonitor.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/maintenance/HealthMonitor.java Mon Nov 13 20:54:50 2017
@@ -24,7 +24,6 @@ import java.util.Set;
import org.apache.uima.ducc.common.internationalization.Messages;
import org.apache.uima.ducc.common.utils.DuccLogger;
-import org.apache.uima.ducc.common.utils.DuccLoggerComponents;
import org.apache.uima.ducc.common.utils.id.DuccId;
import org.apache.uima.ducc.orchestrator.Constants;
import org.apache.uima.ducc.orchestrator.OrUtil;
@@ -48,7 +47,7 @@ import org.apache.uima.ducc.transport.ev
public class HealthMonitor {
- private static final DuccLogger logger = DuccLoggerComponents.getOrLogger(HealthMonitor.class.getName());
+ private static final DuccLogger logger = DuccLogger.getLogger(HealthMonitor.class);
private static HealthMonitor healthMonitor = new HealthMonitor();
Modified: uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/maintenance/MaintenanceThread.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/maintenance/MaintenanceThread.java?rev=1815131&r1=1815130&r2=1815131&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/maintenance/MaintenanceThread.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/maintenance/MaintenanceThread.java Mon Nov 13 20:54:50 2017
@@ -19,7 +19,6 @@
package org.apache.uima.ducc.orchestrator.maintenance;
import org.apache.uima.ducc.common.utils.DuccLogger;
-import org.apache.uima.ducc.common.utils.DuccLoggerComponents;
import org.apache.uima.ducc.common.utils.DuccPropertiesResolver;
import org.apache.uima.ducc.common.utils.id.DuccId;
import org.apache.uima.ducc.orchestrator.OrchestratorCommonArea;
@@ -29,7 +28,7 @@ import org.apache.uima.ducc.transport.ev
public class MaintenanceThread extends Thread {
- private static final DuccLogger logger = DuccLoggerComponents.getOrLogger(MaintenanceThread.class.getName());
+ private static final DuccLogger logger = DuccLogger.getLogger(MaintenanceThread.class);
private static MaintenanceThread instance = new MaintenanceThread();
Modified: uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/maintenance/NodeAccounting.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/maintenance/NodeAccounting.java?rev=1815131&r1=1815130&r2=1815131&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/maintenance/NodeAccounting.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/maintenance/NodeAccounting.java Mon Nov 13 20:54:50 2017
@@ -24,7 +24,6 @@ import java.util.concurrent.ConcurrentHa
import org.apache.uima.ducc.common.NodeIdentity;
import org.apache.uima.ducc.common.utils.DuccLogger;
-import org.apache.uima.ducc.common.utils.DuccLoggerComponents;
import org.apache.uima.ducc.common.utils.DuccPropertiesResolver;
import org.apache.uima.ducc.common.utils.id.DuccId;
import org.apache.uima.ducc.transport.event.common.IDuccProcess;
@@ -32,7 +31,7 @@ import org.apache.uima.ducc.transport.ev
public class NodeAccounting {
- private static final DuccLogger logger = DuccLoggerComponents.getOrLogger(NodeAccounting.class.getName());
+ private static final DuccLogger logger = DuccLogger.getLogger(NodeAccounting.class);
private static final DuccId jobid = null;
private static NodeAccounting instance = new NodeAccounting();
Modified: uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/user/DuccAsUser.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/user/DuccAsUser.java?rev=1815131&r1=1815130&r2=1815131&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/user/DuccAsUser.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/user/DuccAsUser.java Mon Nov 13 20:54:50 2017
@@ -26,13 +26,12 @@ import java.util.Map;
import org.apache.uima.ducc.common.internationalization.Messages;
import org.apache.uima.ducc.common.utils.DuccLogger;
-import org.apache.uima.ducc.common.utils.DuccLoggerComponents;
import org.apache.uima.ducc.common.utils.Utils;
public class DuccAsUser {
- private static DuccLogger duccLogger = DuccLoggerComponents.getOrLogger(DuccAsUser.class.getName());
+ private static DuccLogger duccLogger = DuccLogger.getLogger(DuccAsUser.class);
private static Messages messages = Messages.getInstance();
public static String magicString = "1001 Command launching...";
Modified: uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/utilities/TrackSync.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/utilities/TrackSync.java?rev=1815131&r1=1815130&r2=1815131&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/utilities/TrackSync.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/utilities/TrackSync.java Mon Nov 13 20:54:50 2017
@@ -23,7 +23,6 @@ import java.util.concurrent.ConcurrentSk
import java.util.concurrent.atomic.AtomicLong;
import org.apache.uima.ducc.common.utils.DuccLogger;
-import org.apache.uima.ducc.common.utils.DuccLoggerComponents;
import org.apache.uima.ducc.common.utils.id.DuccId;
/**
@@ -33,7 +32,7 @@ import org.apache.uima.ducc.common.utils
public class TrackSync {
- private static DuccLogger logger = DuccLoggerComponents.getOrLogger(TrackSync.class.getName());
+ private static DuccLogger logger = DuccLogger.getLogger(TrackSync.class);
private static DuccId jobid = null;
private static String sep = ".";
Modified: uima/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/jd/JobDriverStateExchanger.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/jd/JobDriverStateExchanger.java?rev=1815131&r1=1815130&r2=1815131&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/jd/JobDriverStateExchanger.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/jd/JobDriverStateExchanger.java Mon Nov 13 20:54:50 2017
@@ -50,7 +50,7 @@ public class JobDriverStateExchanger ext
private JobProcessBlacklist jobProcessBlacklist = JobProcessBlacklist.getInstance();
- private static final DuccLogger logger = DuccLoggerComponents.getOrLogger(JobDriverStateExchanger.class.getName());
+ private static final DuccLogger logger = DuccLoggerComponents.getJdOut(JobDriverStateExchanger.class.getName());
private static final DuccId jobid = null;
private JobDriverComponent jdc = null;
Modified: uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/Distiller.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/Distiller.java?rev=1815131&r1=1815130&r2=1815131&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/Distiller.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/Distiller.java Mon Nov 13 20:54:50 2017
@@ -8,7 +8,6 @@ import org.apache.uima.ducc.common.NodeI
import org.apache.uima.ducc.common.SizeBytes;
import org.apache.uima.ducc.common.SizeBytes.Type;
import org.apache.uima.ducc.common.utils.DuccLogger;
-import org.apache.uima.ducc.common.utils.DuccLoggerComponents;
import org.apache.uima.ducc.common.utils.id.DuccId;
import org.apache.uima.ducc.transport.event.OrchestratorStateDuccEvent;
import org.apache.uima.ducc.transport.event.common.IDuccProcess;
@@ -40,7 +39,7 @@ import org.apache.uima.ducc.transport.ev
*/
public class Distiller {
- private static DuccLogger logger = DuccLoggerComponents.getWsLogger(Distiller.class.getName());
+ private static DuccLogger logger = DuccLogger.getLogger(Distiller.class);
private static DuccId jobid = null;
// map of key = machine name, value = bytes allocated
Modified: uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/DuccBoot.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/DuccBoot.java?rev=1815131&r1=1815130&r2=1815131&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/DuccBoot.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/DuccBoot.java Mon Nov 13 20:54:50 2017
@@ -27,7 +27,6 @@ import org.apache.uima.ducc.common.IDucc
import org.apache.uima.ducc.common.config.CommonConfiguration;
import org.apache.uima.ducc.common.internationalization.Messages;
import org.apache.uima.ducc.common.utils.DuccLogger;
-import org.apache.uima.ducc.common.utils.DuccLoggerComponents;
import org.apache.uima.ducc.common.utils.DuccPropertiesResolver;
import org.apache.uima.ducc.common.utils.id.DuccId;
import org.apache.uima.ducc.transport.event.common.DuccWorkJob;
@@ -41,7 +40,7 @@ import org.apache.uima.ducc.transport.ev
public class DuccBoot extends Thread {
- private static DuccLogger logger = DuccLoggerComponents.getWsLogger(DuccBoot.class.getName());
+ private static DuccLogger logger = DuccLogger.getLogger(DuccBoot.class);
private static Messages messages = Messages.getInstance();
private static DuccPlugins duccPlugins = DuccPlugins.getInstance();
Modified: uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/DuccDaemonsData.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/DuccDaemonsData.java?rev=1815131&r1=1815130&r2=1815131&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/DuccDaemonsData.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/DuccDaemonsData.java Mon Nov 13 20:54:50 2017
@@ -23,7 +23,6 @@ import java.util.concurrent.ConcurrentHa
import org.apache.uima.ducc.common.boot.DuccDaemonRuntimeProperties.DaemonName;
import org.apache.uima.ducc.common.utils.DuccLogger;
-import org.apache.uima.ducc.common.utils.DuccLoggerComponents;
import org.apache.uima.ducc.common.utils.TimeStamp;
import org.apache.uima.ducc.transport.event.AbstractDuccEvent;
import org.apache.uima.ducc.transport.event.DuccEvent.EventType;
@@ -31,7 +30,7 @@ import org.apache.uima.ducc.ws.server.Du
public class DuccDaemonsData {
- private static DuccLogger duccLogger = DuccLoggerComponents.getWsLogger(DuccDaemonsData.class.getName());
+ private static DuccLogger duccLogger = DuccLogger.getLogger(DuccDaemonsData.class);
private static DuccDaemonsData duccDaemonsData = new DuccDaemonsData();
private static ConcurrentHashMap<DaemonName,String> mapCurr = new ConcurrentHashMap<DaemonName,String>();
Modified: uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/DuccData.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/DuccData.java?rev=1815131&r1=1815130&r2=1815131&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/DuccData.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/DuccData.java Mon Nov 13 20:54:50 2017
@@ -23,7 +23,6 @@ import java.util.Map.Entry;
import java.util.concurrent.ConcurrentSkipListMap;
import org.apache.uima.ducc.common.utils.DuccLogger;
-import org.apache.uima.ducc.common.utils.DuccLoggerComponents;
import org.apache.uima.ducc.common.utils.TimeStamp;
import org.apache.uima.ducc.common.utils.id.DuccId;
import org.apache.uima.ducc.transport.event.common.DuccWorkJob;
@@ -40,7 +39,7 @@ import org.apache.uima.ducc.transport.ev
public class DuccData {
- private static DuccLogger logger = DuccLoggerComponents.getWsLogger(DuccData.class.getName());
+ private static DuccLogger logger = DuccLogger.getLogger(DuccData.class);
private static DuccId jobid = null;
private static IDuccWorkMap duccWorkMap = new DuccWorkMap();
Modified: uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/DuccMachinesData.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/DuccMachinesData.java?rev=1815131&r1=1815130&r2=1815131&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/DuccMachinesData.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/DuccMachinesData.java Mon Nov 13 20:54:50 2017
@@ -35,7 +35,6 @@ import org.apache.uima.ducc.common.Node;
import org.apache.uima.ducc.common.node.metrics.NodeUsersInfo;
import org.apache.uima.ducc.common.node.metrics.NodeUsersInfo.NodeProcess;
import org.apache.uima.ducc.common.utils.DuccLogger;
-import org.apache.uima.ducc.common.utils.DuccLoggerComponents;
import org.apache.uima.ducc.common.utils.DuccPropertiesResolver;
import org.apache.uima.ducc.common.utils.TimeStamp;
import org.apache.uima.ducc.common.utils.id.DuccId;
@@ -60,7 +59,7 @@ import org.apache.uima.ducc.ws.utils.Dat
*/
public class DuccMachinesData {
- private static DuccLogger logger = DuccLoggerComponents.getWsLogger(DuccMachinesData.class.getName());
+ private static DuccLogger logger = DuccLogger.getLogger(DuccMachinesData.class);
private static DuccId jobid = null;
private static ConcurrentSkipListMap<MachineInfo,NodeId> sortedMachines = new ConcurrentSkipListMap<MachineInfo,NodeId>();
Modified: uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/DuccNodes.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/DuccNodes.java?rev=1815131&r1=1815130&r2=1815131&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/DuccNodes.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/DuccNodes.java Mon Nov 13 20:54:50 2017
@@ -27,7 +27,6 @@ import java.util.Iterator;
import org.apache.uima.ducc.common.IDuccEnv;
import org.apache.uima.ducc.common.utils.DuccLogger;
-import org.apache.uima.ducc.common.utils.DuccLoggerComponents;
import org.apache.uima.ducc.common.utils.id.DuccId;
/**
@@ -41,7 +40,7 @@ import org.apache.uima.ducc.common.utils
public class DuccNodes {
- private static DuccLogger logger = DuccLoggerComponents.getWsLogger(DuccNodes.class.getName());
+ private static DuccLogger logger = DuccLogger.getLogger(DuccNodes.class);
private static DuccId jobid = null;
private static DuccNodes duccNodes = new DuccNodes();
Modified: uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/DuccPlugins.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/DuccPlugins.java?rev=1815131&r1=1815130&r2=1815131&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/DuccPlugins.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/DuccPlugins.java Mon Nov 13 20:54:50 2017
@@ -21,7 +21,6 @@ package org.apache.uima.ducc.ws;
import java.util.ArrayList;
import org.apache.uima.ducc.common.utils.DuccLogger;
-import org.apache.uima.ducc.common.utils.DuccLoggerComponents;
import org.apache.uima.ducc.common.utils.id.DuccId;
import org.apache.uima.ducc.transport.event.common.IDuccWorkJob;
import org.apache.uima.ducc.transport.event.common.IDuccWorkMap;
@@ -32,7 +31,7 @@ import org.eclipse.jetty.server.Handler;
public class DuccPlugins {
- private static DuccLogger logger = DuccLoggerComponents.getWsLogger(DuccPlugins.class.getName());
+ private static DuccLogger logger = DuccLogger.getLogger(DuccPlugins.class);
private static DuccId jobid = null;
private static DuccPlugins instance = new DuccPlugins();
Modified: uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/MachineInfo.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/MachineInfo.java?rev=1815131&r1=1815130&r2=1815131&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/MachineInfo.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/MachineInfo.java Mon Nov 13 20:54:50 2017
@@ -23,7 +23,6 @@ import java.util.Iterator;
import java.util.List;
import org.apache.uima.ducc.common.utils.DuccLogger;
-import org.apache.uima.ducc.common.utils.DuccLoggerComponents;
import org.apache.uima.ducc.common.utils.id.DuccId;
import org.apache.uima.ducc.transport.event.ProcessInfo;
import org.apache.uima.ducc.ws.types.NodeId;
@@ -31,7 +30,7 @@ import org.apache.uima.ducc.ws.types.Nod
public class MachineInfo implements Comparable<MachineInfo> {
- private static DuccLogger logger = DuccLoggerComponents.getWsLogger(MachineInfo.class.getName());
+ private static DuccLogger logger = DuccLogger.getLogger(MachineInfo.class);
private static DuccId jobid = null;
public enum MachineStatus {
Modified: uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/WebServerComponent.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/WebServerComponent.java?rev=1815131&r1=1815130&r2=1815131&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/WebServerComponent.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/WebServerComponent.java Mon Nov 13 20:54:50 2017
@@ -34,7 +34,6 @@ import org.apache.uima.ducc.common.confi
import org.apache.uima.ducc.common.internationalization.Messages;
import org.apache.uima.ducc.common.main.DuccService;
import org.apache.uima.ducc.common.utils.DuccLogger;
-import org.apache.uima.ducc.common.utils.DuccLoggerComponents;
import org.apache.uima.ducc.common.utils.IDuccLoggerComponents.Daemon;
import org.apache.uima.ducc.common.utils.id.DuccId;
import org.apache.uima.ducc.transport.dispatcher.DuccEventDispatcher;
@@ -57,7 +56,7 @@ import org.apache.uima.ducc.ws.utils.Dat
public class WebServerComponent extends AbstractDuccComponent
implements IWebServer {
- private static DuccLogger duccLogger = DuccLoggerComponents.getWsLogger(WebServerComponent.class.getName());
+ private static DuccLogger duccLogger = DuccLogger.getLogger(WebServerComponent.class);
private static DuccId jobid = null;
Modified: uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/authentication/DuccAsUser.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/authentication/DuccAsUser.java?rev=1815131&r1=1815130&r2=1815131&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/authentication/DuccAsUser.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/authentication/DuccAsUser.java Mon Nov 13 20:54:50 2017
@@ -26,13 +26,12 @@ import java.util.Map;
import org.apache.uima.ducc.common.IDuccUser;
import org.apache.uima.ducc.common.utils.DuccLogger;
-import org.apache.uima.ducc.common.utils.DuccLoggerComponents;
import org.apache.uima.ducc.common.utils.DuccPropertiesResolver;
import org.apache.uima.ducc.common.utils.Utils;
public class DuccAsUser {
- private static DuccLogger duccLogger = DuccLoggerComponents.getWsLogger(DuccAsUser.class.getName());
+ private static DuccLogger duccLogger = DuccLogger.getLogger(DuccAsUser.class);
public static String magicString = "1001 Command launching...";
Modified: uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/authentication/DuccAuthenticator.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/authentication/DuccAuthenticator.java?rev=1815131&r1=1815130&r2=1815131&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/authentication/DuccAuthenticator.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/authentication/DuccAuthenticator.java Mon Nov 13 20:54:50 2017
@@ -21,13 +21,12 @@ package org.apache.uima.ducc.ws.authenti
import org.apache.uima.ducc.common.authentication.IAuthenticationManager;
import org.apache.uima.ducc.common.authentication.IAuthenticationResult;
import org.apache.uima.ducc.common.utils.DuccLogger;
-import org.apache.uima.ducc.common.utils.DuccLoggerComponents;
import org.apache.uima.ducc.common.utils.DuccPropertiesResolver;
import org.apache.uima.ducc.common.utils.id.DuccId;
public class DuccAuthenticator extends AbstractAuthenticator {
- private static DuccLogger duccLogger = DuccLoggerComponents.getWsLogger(DuccAuthenticator.class.getName());
+ private static DuccLogger duccLogger = DuccLogger.getLogger(DuccAuthenticator.class);
private static DuccId jobid = null;
private static DuccAuthenticator instance = new DuccAuthenticator();
Modified: uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/authentication/SecureFileAuthenticator.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/authentication/SecureFileAuthenticator.java?rev=1815131&r1=1815130&r2=1815131&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/authentication/SecureFileAuthenticator.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/authentication/SecureFileAuthenticator.java Mon Nov 13 20:54:50 2017
@@ -24,7 +24,6 @@ import org.apache.uima.ducc.common.authe
import org.apache.uima.ducc.common.authentication.IAuthenticationResult;
import org.apache.uima.ducc.common.utils.AlienFile;
import org.apache.uima.ducc.common.utils.DuccLogger;
-import org.apache.uima.ducc.common.utils.DuccLoggerComponents;
import org.apache.uima.ducc.common.utils.id.DuccId;
import org.apache.uima.ducc.ws.utils.HandlersHelper;
@@ -49,7 +48,7 @@ import org.apache.uima.ducc.ws.utils.Han
*/
public class SecureFileAuthenticator extends AbstractAuthenticator {
- private static DuccLogger duccLogger = DuccLoggerComponents.getWsLogger(SecureFileAuthenticator.class.getName());
+ private static DuccLogger duccLogger = DuccLogger.getLogger(SecureFileAuthenticator.class);
private static DuccId jobid = null;
private String version = "Secure File 1.0";
Modified: uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/authentication/UserAuthenticate.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/authentication/UserAuthenticate.java?rev=1815131&r1=1815130&r2=1815131&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/authentication/UserAuthenticate.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/authentication/UserAuthenticate.java Mon Nov 13 20:54:50 2017
@@ -19,12 +19,11 @@
package org.apache.uima.ducc.ws.authentication;
import org.apache.uima.ducc.common.utils.DuccLogger;
-import org.apache.uima.ducc.common.utils.DuccLoggerComponents;
import org.apache.uima.ducc.common.utils.DuccPropertiesResolver;
public class UserAuthenticate {
- private static DuccLogger duccLogger = DuccLoggerComponents.getWsLogger(UserAuthenticate.class.getName());
+ private static DuccLogger duccLogger = DuccLogger.getLogger(UserAuthenticate.class);
private String failure = "failure";
Modified: uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/config/WebServerConfiguration.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/config/WebServerConfiguration.java?rev=1815131&r1=1815130&r2=1815131&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/config/WebServerConfiguration.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/config/WebServerConfiguration.java Mon Nov 13 20:54:50 2017
@@ -32,7 +32,6 @@ import org.apache.camel.component.jms.Jm
import org.apache.uima.ducc.common.config.CommonConfiguration;
import org.apache.uima.ducc.common.config.DuccBlastGuardPredicate;
import org.apache.uima.ducc.common.utils.DuccLogger;
-import org.apache.uima.ducc.common.utils.DuccLoggerComponents;
import org.apache.uima.ducc.common.utils.id.DuccId;
import org.apache.uima.ducc.transport.DuccTransportConfiguration;
import org.apache.uima.ducc.transport.dispatcher.DuccEventDispatcher;
@@ -59,7 +58,7 @@ public class WebServerConfiguration {
// use Spring magic to autowire (instantiate and bind) DuccTransportConfiguration to a local variable
@Autowired DuccTransportConfiguration webServerTransport;
- private DuccLogger duccLogger = DuccLoggerComponents.getWsLogger(WebServerConfiguration.class.getName());
+ private DuccLogger duccLogger = DuccLogger.getLogger(WebServerConfiguration.class);
private DuccId jobid = null;
private AtomicBoolean singleton = new AtomicBoolean(false);
Modified: uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/db/DbQuery.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/db/DbQuery.java?rev=1815131&r1=1815130&r2=1815131&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/db/DbQuery.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/db/DbQuery.java Mon Nov 13 20:54:50 2017
@@ -26,7 +26,6 @@ import org.apache.uima.ducc.common.Pair;
import org.apache.uima.ducc.common.persistence.rm.IRmPersistence;
import org.apache.uima.ducc.common.persistence.rm.RmPersistenceFactory;
import org.apache.uima.ducc.common.utils.DuccLogger;
-import org.apache.uima.ducc.common.utils.DuccLoggerComponents;
import org.apache.uima.ducc.common.utils.DuccPropertiesResolver;
import org.apache.uima.ducc.common.utils.IDuccLoggerComponents;
import org.apache.uima.ducc.common.utils.id.DuccId;
@@ -36,7 +35,7 @@ import org.apache.uima.ducc.transport.ev
public class DbQuery {
- private static DuccLogger logger = DuccLoggerComponents.getWsLogger(DbQuery.class.getName());
+ private static DuccLogger logger = DuccLogger.getLogger(DbQuery.class);
private static DuccId jobid = null;
private static DbQuery instance = null;
Modified: uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/event/WebServerEventListener.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/event/WebServerEventListener.java?rev=1815131&r1=1815130&r2=1815131&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/event/WebServerEventListener.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/event/WebServerEventListener.java Mon Nov 13 20:54:50 2017
@@ -21,7 +21,6 @@ package org.apache.uima.ducc.ws.event;
import org.apache.camel.Body;
import org.apache.camel.Header;
import org.apache.uima.ducc.common.utils.DuccLogger;
-import org.apache.uima.ducc.common.utils.DuccLoggerComponents;
import org.apache.uima.ducc.common.utils.id.DuccId;
import org.apache.uima.ducc.transport.dispatcher.DuccEventDispatcher;
import org.apache.uima.ducc.transport.event.DuccJobsStateEvent;
@@ -36,7 +35,7 @@ import org.apache.uima.ducc.ws.self.mess
public class WebServerEventListener implements DuccEventDelegateListener {
- private DuccLogger duccLogger = DuccLoggerComponents.getWsLogger(WebServerEventListener.class.getName());
+ private DuccLogger duccLogger = DuccLogger.getLogger(WebServerEventListener.class);
private DuccId jobid = null;
private IWebServer webServer;
Modified: uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/helper/BrokerHelper.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/helper/BrokerHelper.java?rev=1815131&r1=1815130&r2=1815131&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/helper/BrokerHelper.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/helper/BrokerHelper.java Mon Nov 13 20:54:50 2017
@@ -41,14 +41,13 @@ import javax.management.remote.JMXConnec
import javax.management.remote.JMXServiceURL;
import org.apache.uima.ducc.common.utils.DuccLogger;
-import org.apache.uima.ducc.common.utils.DuccLoggerComponents;
import org.apache.uima.ducc.common.utils.DuccPropertiesResolver;
import org.apache.uima.ducc.common.utils.id.DuccId;
import org.apache.uima.ducc.ws.DuccDaemonsData;
public class BrokerHelper extends JmxHelper {
- private static DuccLogger logger = DuccLoggerComponents.getWsLogger(BrokerHelper.class.getName());
+ private static DuccLogger logger = DuccLogger.getLogger(BrokerHelper.class);
private static DuccId jobid = null;
public static BrokerHelper getInstance() {
Modified: uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/helper/DatabaseHelper.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/helper/DatabaseHelper.java?rev=1815131&r1=1815130&r2=1815131&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/helper/DatabaseHelper.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/helper/DatabaseHelper.java Mon Nov 13 20:54:50 2017
@@ -22,14 +22,13 @@ import javax.management.MBeanServerConne
import javax.management.ObjectName;
import org.apache.uima.ducc.common.utils.DuccLogger;
-import org.apache.uima.ducc.common.utils.DuccLoggerComponents;
import org.apache.uima.ducc.common.utils.DuccPropertiesResolver;
import org.apache.uima.ducc.common.utils.id.DuccId;
import org.apache.uima.ducc.ws.db.DbQuery;
public class DatabaseHelper extends JmxHelper {
- private static DuccLogger logger = DuccLoggerComponents.getWsLogger(DatabaseHelper.class.getName());
+ private static DuccLogger logger = DuccLogger.getLogger(DatabaseHelper.class);
private static DuccId jobid = null;
private static DatabaseHelper instance = new DatabaseHelper();
Modified: uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/helper/JmxHelper.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/helper/JmxHelper.java?rev=1815131&r1=1815130&r2=1815131&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/helper/JmxHelper.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/helper/JmxHelper.java Mon Nov 13 20:54:50 2017
@@ -27,12 +27,11 @@ import javax.management.remote.JMXConnec
import javax.management.remote.JMXServiceURL;
import org.apache.uima.ducc.common.utils.DuccLogger;
-import org.apache.uima.ducc.common.utils.DuccLoggerComponents;
import org.apache.uima.ducc.common.utils.id.DuccId;
public abstract class JmxHelper {
- private static DuccLogger logger = DuccLoggerComponents.getWsLogger(JmxHelper.class.getName());
+ private static DuccLogger logger = DuccLogger.getLogger(JmxHelper.class);
private static DuccId jobid = null;
private String jmxHost = "localhost";
Modified: uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/registry/ServiceInterpreter.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/registry/ServiceInterpreter.java?rev=1815131&r1=1815130&r2=1815131&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/registry/ServiceInterpreter.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/registry/ServiceInterpreter.java Mon Nov 13 20:54:50 2017
@@ -22,14 +22,13 @@ import java.util.ArrayList;
import java.util.Properties;
import org.apache.uima.ducc.common.utils.DuccLogger;
-import org.apache.uima.ducc.common.utils.DuccLoggerComponents;
import org.apache.uima.ducc.common.utils.id.DuccId;
import org.apache.uima.ducc.transport.event.sm.IService.ServiceState;
import org.apache.uima.ducc.ws.DuccDataHelper;
public class ServiceInterpreter {
- private static DuccLogger duccLogger = DuccLoggerComponents.getWsLogger(ServiceInterpreter.class.getName());
+ private static DuccLogger duccLogger = DuccLogger.getLogger(ServiceInterpreter.class);
private static DuccId jobid = null;
protected Properties svc;