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 2014/11/20 11:06:33 UTC
svn commit: r1640705 - in
/uima/sandbox/uima-ducc/trunk/uima-ducc-container/src:
main/java/org/apache/uima/ducc/container/common/
main/java/org/apache/uima/ducc/container/common/fsm/
main/java/org/apache/uima/ducc/container/common/logger/ main/java/org...
Author: degenaro
Date: Thu Nov 20 10:06:32 2014
New Revision: 1640705
URL: http://svn.apache.org/r1640705
Log:
UIMA-4069 Redesign of JD toward the main goal of classpath separation for container (system) code.
Container to Ducc logging reconsidered.
Added:
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/logger/
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/logger/IComponent.java (with props)
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/logger/ILogger.java (with props)
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/logger/Logger.java (with props)
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/logger/id/
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/logger/id/Id.java (with props)
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/logger/id/Transform.java (with props)
Removed:
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/ContainerLogger.java
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/IContainerLogger.java
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/IEntityId.java
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/Assertion.java
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/JdFlagsExtendedHelper.java
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/fsm/Action.java
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/fsm/Fsm.java
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/JobDriver.java
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/JobDriverHelper.java
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/cas/CasManager.java
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/classload/ProxyJobDriverCollectionReader.java
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/classload/ProxyJobDriverDirective.java
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/classload/ProxyJobDriverErrorHandler.java
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionAck.java
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionEnd.java
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionError.java
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionGet.java
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionIgnore.java
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionInProgress.java
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionPreempt.java
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionSend.java
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/mh/MessageHandler.java
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/mh/RemoteWorkerIdentity.java
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/ATest.java
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/Assertion.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/Assertion.java?rev=1640705&r1=1640704&r2=1640705&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/Assertion.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/Assertion.java Thu Nov 20 10:06:32 2014
@@ -18,14 +18,18 @@
*/
package org.apache.uima.ducc.container.common;
+import org.apache.uima.ducc.container.common.logger.IComponent;
+import org.apache.uima.ducc.container.common.logger.ILogger;
+import org.apache.uima.ducc.container.common.logger.Logger;
+
public class Assertion {
- private static IContainerLogger logger = ContainerLogger.getLogger(Assertion.class, IContainerLogger.Component.JD.name());
+ private static Logger logger = Logger.getLogger(Assertion.class, IComponent.Id.JD.name());
public static void nonNegative(long value) {
String location = "nonNegative";
if(value < 0) {
- logger.error(location, IEntityId.null_id, value);
+ logger.error(location, ILogger.null_id, value);
throw new RuntimeException();
}
}
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/JdFlagsExtendedHelper.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/JdFlagsExtendedHelper.java?rev=1640705&r1=1640704&r2=1640705&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/JdFlagsExtendedHelper.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/JdFlagsExtendedHelper.java Thu Nov 20 10:06:32 2014
@@ -19,10 +19,13 @@
package org.apache.uima.ducc.container.common;
import org.apache.uima.ducc.common.jd.JdFlagsHelper;
+import org.apache.uima.ducc.container.common.logger.IComponent;
+import org.apache.uima.ducc.container.common.logger.ILogger;
+import org.apache.uima.ducc.container.common.logger.Logger;
public class JdFlagsExtendedHelper extends JdFlagsHelper {
- private IContainerLogger logger = ContainerLogger.getLogger(JdFlagsExtendedHelper.class, IContainerLogger.Component.JD.name());
+ private static Logger logger = Logger.getLogger(JdFlagsExtendedHelper.class, IComponent.Id.JD.name());
private static JdFlagsExtendedHelper instance = new JdFlagsExtendedHelper();
@@ -37,11 +40,11 @@ public class JdFlagsExtendedHelper exten
String[] list = retVal.split(":");
if(list != null) {
if(list.length > 0) {
- logger.debug(location, IEntityId.null_id, JdFlagsHelper.Name.UserClasspath.name());
+ logger.debug(location, ILogger.null_id, JdFlagsHelper.Name.UserClasspath.name());
int index = 0;
for(String item : list) {
String text = "["+index+"]"+" "+item;
- logger.debug(location, IEntityId.null_id, text);
+ logger.debug(location, ILogger.null_id, text);
index++;
}
}
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/fsm/Action.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/fsm/Action.java?rev=1640705&r1=1640704&r2=1640705&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/fsm/Action.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/fsm/Action.java Thu Nov 20 10:06:32 2014
@@ -18,16 +18,16 @@
*/
package org.apache.uima.ducc.container.common.fsm;
-import org.apache.uima.ducc.container.common.ContainerLogger;
-import org.apache.uima.ducc.container.common.IEntityId;
-import org.apache.uima.ducc.container.common.IContainerLogger;
import org.apache.uima.ducc.container.common.MessageBuffer;
import org.apache.uima.ducc.container.common.Standardize;
import org.apache.uima.ducc.container.common.fsm.iface.IAction;
+import org.apache.uima.ducc.container.common.logger.IComponent;
+import org.apache.uima.ducc.container.common.logger.ILogger;
+import org.apache.uima.ducc.container.common.logger.Logger;
public class Action implements IAction {
- private IContainerLogger logger = ContainerLogger.getLogger(Action.class, IContainerLogger.Component.JD.name());
+ private static Logger logger = Logger.getLogger(Action.class, IComponent.Id.JD.name());
@Override
public String getName() {
@@ -39,7 +39,7 @@ public class Action implements IAction {
String location = "engage";
MessageBuffer mb = new MessageBuffer();
mb.append(Standardize.Label.action.get()+getName());
- logger.debug(location, IEntityId.null_id, mb.toString());
+ logger.debug(location, ILogger.null_id, mb.toString());
}
}
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/fsm/Fsm.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/fsm/Fsm.java?rev=1640705&r1=1640704&r2=1640705&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/fsm/Fsm.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/fsm/Fsm.java Thu Nov 20 10:06:32 2014
@@ -20,9 +20,6 @@ package org.apache.uima.ducc.container.c
import java.util.concurrent.ConcurrentHashMap;
-import org.apache.uima.ducc.container.common.ContainerLogger;
-import org.apache.uima.ducc.container.common.IEntityId;
-import org.apache.uima.ducc.container.common.IContainerLogger;
import org.apache.uima.ducc.container.common.MessageBuffer;
import org.apache.uima.ducc.container.common.Standardize;
import org.apache.uima.ducc.container.common.fsm.iface.IAction;
@@ -31,10 +28,13 @@ import org.apache.uima.ducc.container.co
import org.apache.uima.ducc.container.common.fsm.iface.IState;
import org.apache.uima.ducc.container.common.fsm.iface.IStateEventKey;
import org.apache.uima.ducc.container.common.fsm.iface.IStateEventValue;
+import org.apache.uima.ducc.container.common.logger.IComponent;
+import org.apache.uima.ducc.container.common.logger.ILogger;
+import org.apache.uima.ducc.container.common.logger.Logger;
public class Fsm implements IFsmBuilder {
-
- private static IContainerLogger logger = ContainerLogger.getLogger(Fsm.class, IContainerLogger.Component.JD.name());
+
+ private static Logger logger = Logger.getLogger(Fsm.class, IComponent.Id.JD.name());
private ConcurrentHashMap<IStateEventKey, IStateEventValue> map = new ConcurrentHashMap<IStateEventKey, IStateEventValue>();
@@ -57,7 +57,7 @@ public class Fsm implements IFsmBuilder
MessageBuffer mb = new MessageBuffer();
mb.append(Standardize.Label.state.get()+current.getName());
mb.append(Standardize.Label.event.get()+event.getName());
- logger.debug(location, IEntityId.null_id, mb.toString());
+ logger.debug(location, ILogger.null_id, mb.toString());
}
@Override
@@ -95,7 +95,7 @@ public class Fsm implements IFsmBuilder
mb.append(Standardize.Label.state.get()+key.getState().getName());
mb.append(Standardize.Label.event.get()+key.getEvent().getName());
mb.append(Standardize.Label.hash.get()+key.hashCode());
- logger.debug(location, IEntityId.null_id, mb.toString());
+ logger.debug(location, ILogger.null_id, mb.toString());
return map.putIfAbsent(key, value);
}
@@ -105,7 +105,7 @@ public class Fsm implements IFsmBuilder
mb.append(Standardize.Label.state.get()+key.getState().getName());
mb.append(Standardize.Label.event.get()+key.getEvent().getName());
mb.append(Standardize.Label.hash.get()+key.hashCode());
- logger.debug(location, IEntityId.null_id, mb.toString());
+ logger.debug(location, ILogger.null_id, mb.toString());
IStateEventValue value = map.get(key);
return value;
}
@@ -132,7 +132,7 @@ public class Fsm implements IFsmBuilder
MessageBuffer mb = new MessageBuffer();
mb.append(Standardize.Label.curr.get()+_stateCurrent.getName());
mb.append(Standardize.Label.prev.get()+_statePrevious.getName());
- logger.info(location, IEntityId.null_id, mb.toString());
+ logger.info(location, ILogger.null_id, mb.toString());
IAction action = value.getAction();
action.engage(actionData);
}
Added: uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/logger/IComponent.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/logger/IComponent.java?rev=1640705&view=auto
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/logger/IComponent.java (added)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/logger/IComponent.java Thu Nov 20 10:06:32 2014
@@ -0,0 +1,23 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+*/
+package org.apache.uima.ducc.container.common.logger;
+
+public interface IComponent {
+ public enum Id { JD, JP };
+}
Propchange: uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/logger/IComponent.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/logger/ILogger.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/logger/ILogger.java?rev=1640705&view=auto
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/logger/ILogger.java (added)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/logger/ILogger.java Thu Nov 20 10:06:32 2014
@@ -0,0 +1,57 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+*/
+package org.apache.uima.ducc.container.common.logger;
+
+import org.apache.uima.ducc.container.common.logger.id.Id;
+
+public interface ILogger {
+
+ public Id null_id = Id.null_id;
+
+ public void fatal(String location, Id jobId, Object ... args);
+ public void fatal(String location, Id jobId, Throwable t, Object ... args);
+ public void fatal(String location, Id jobId, Id processId, Object ... args);
+ public void fatal(String location, Id jobId, Id processId, Throwable t, Object ... args);
+
+ public void debug(String location, Id jobId, Object ... args);
+ public void debug(String location, Id jobId, Throwable t, Object ... args);
+ public void debug(String location, Id jobId, Id processId, Object ... args);
+ public void debug(String location, Id jobId, Id processId, Throwable t, Object ... args);
+
+ public void error(String location, Id jobId, Object ... args);
+ public void error(String location, Id jobId, Throwable t, Object ... args);
+ public void error(String location, Id jobId, Id processId, Object ... args);
+ public void error(String location, Id jobId, Id processId, Throwable t, Object ... args);
+
+ public void info(String location, Id jobId, Object ... args);
+ public void info(String location, Id jobId, Throwable t, Object ... args);
+ public void info(String location, Id jobId, Id processId, Object ... args);
+ public void info(String location, Id jobId, Id processId, Throwable t, Object ... args);
+
+ public void trace(String location, Id jobId, Object ... args);
+ public void trace(String location, Id jobId, Throwable t, Object ... args);
+ public void trace(String location, Id jobId, Id processId, Object ... args);
+ public void trace(String location, Id jobId, Id processId, Throwable t, Object ... args);
+
+ public void warn(String location, Id jobId, Object ... args);
+ public void warn(String location, Id jobId, Throwable t, Object ... args);
+ public void warn(String location, Id jobId, Id processId, Object ... args);
+ public void warn(String location, Id jobId, Id processId, Throwable t, Object ... args);
+
+}
Propchange: uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/logger/ILogger.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/logger/Logger.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/logger/Logger.java?rev=1640705&view=auto
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/logger/Logger.java (added)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/logger/Logger.java Thu Nov 20 10:06:32 2014
@@ -0,0 +1,176 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+*/
+package org.apache.uima.ducc.container.common.logger;
+
+import org.apache.log4j.Level;
+import org.apache.uima.ducc.common.utils.DuccLogger;
+import org.apache.uima.ducc.common.utils.id.DuccId;
+import org.apache.uima.ducc.container.common.logger.id.Id;
+
+public class Logger implements ILogger {
+
+ private DuccLogger duccLogger = null;
+ private Level level = Level.DEBUG;
+
+ public static Logger getLogger(Class<?> clazz) {
+ return new Logger(clazz, null);
+ }
+
+ public static Logger getLogger(Class<?> clazz, String component) {
+ return new Logger(clazz, component);
+ }
+
+ private static DuccId toDuccId(Id id) {
+ DuccId retVal = null;
+ try {
+ Long value = Long.parseLong(id.toString());
+ retVal = new DuccId(value);
+ }
+ catch(Exception e) {
+ }
+ return retVal;
+ }
+
+ private Logger(Class<?> clazz, String component) {
+ duccLogger = DuccLogger.getLogger(clazz, component);
+ duccLogger.setLevel(level);
+
+ }
+
+ @Override
+ public void fatal(String location, Id jobId, Object... args) {
+ duccLogger.fatal(location, toDuccId(jobId), args);
+ }
+
+ @Override
+ public void fatal(String location, Id jobId, Throwable t, Object... args) {
+ duccLogger.fatal(location, toDuccId(jobId), t, args);
+ }
+
+ @Override
+ public void fatal(String location, Id jobId, Id processId, Object... args) {
+ duccLogger.fatal(location, toDuccId(jobId), toDuccId(processId), args);
+ }
+
+ @Override
+ public void fatal(String location, Id jobId, Id processId, Throwable t, Object... args) {
+ duccLogger.fatal(location, toDuccId(jobId), toDuccId(processId), t, args);
+ }
+
+ @Override
+ public void debug(String location, Id jobId, Object... args) {
+ duccLogger.debug(location, toDuccId(jobId), args);
+ }
+
+ @Override
+ public void debug(String location, Id jobId, Throwable t, Object... args) {
+ duccLogger.debug(location, toDuccId(jobId), t, args);
+ }
+
+ @Override
+ public void debug(String location, Id jobId, Id processId, Object... args) {
+ duccLogger.debug(location, toDuccId(jobId), toDuccId(processId), args);
+ }
+
+ @Override
+ public void debug(String location, Id jobId, Id processId, Throwable t, Object... args) {
+ duccLogger.debug(location, toDuccId(jobId), toDuccId(processId), t, args);
+ }
+
+ @Override
+ public void error(String location, Id jobId, Object... args) {
+ duccLogger.error(location, toDuccId(jobId), args);
+ }
+
+ @Override
+ public void error(String location, Id jobId, Throwable t, Object... args) {
+ duccLogger.error(location, toDuccId(jobId), t, args);
+ }
+
+ @Override
+ public void error(String location, Id jobId, Id processId, Object... args) {
+ duccLogger.error(location, toDuccId(jobId), toDuccId(processId), args);
+ }
+
+ @Override
+ public void error(String location, Id jobId, Id processId, Throwable t, Object... args) {
+ duccLogger.error(location, toDuccId(jobId), toDuccId(processId), t, args);
+ }
+
+ @Override
+ public void info(String location, Id jobId, Object... args) {
+ duccLogger.info(location, toDuccId(jobId), args);
+ }
+
+ @Override
+ public void info(String location, Id jobId, Throwable t, Object... args) {
+ duccLogger.info(location, toDuccId(jobId), t, args);
+ }
+
+ @Override
+ public void info(String location, Id jobId, Id processId, Object... args) {
+ duccLogger.info(location, toDuccId(jobId), toDuccId(processId), args);
+ }
+
+ @Override
+ public void info(String location, Id jobId, Id processId, Throwable t, Object... args) {
+ duccLogger.info(location, toDuccId(jobId), toDuccId(processId), t, args);
+ }
+
+ @Override
+ public void trace(String location, Id jobId, Object... args) {
+ duccLogger.trace(location, toDuccId(jobId), args);
+ }
+
+ @Override
+ public void trace(String location, Id jobId, Throwable t, Object... args) {
+ duccLogger.trace(location, toDuccId(jobId), t, args);
+ }
+
+ @Override
+ public void trace(String location, Id jobId, Id processId, Object... args) {
+ duccLogger.trace(location, toDuccId(jobId), toDuccId(processId), args);
+ }
+
+ @Override
+ public void trace(String location, Id jobId, Id processId, Throwable t, Object... args) {
+ duccLogger.trace(location, toDuccId(jobId), toDuccId(processId), t, args);
+ }
+
+ @Override
+ public void warn(String location, Id jobId, Object... args) {
+ duccLogger.warn(location, toDuccId(jobId), args);
+ }
+
+ @Override
+ public void warn(String location, Id jobId, Throwable t, Object... args) {
+ duccLogger.warn(location, toDuccId(jobId), t, args);
+ }
+
+ @Override
+ public void warn(String location, Id jobId, Id processId, Object... args) {
+ duccLogger.warn(location, toDuccId(jobId), toDuccId(processId), args);
+ }
+
+ @Override
+ public void warn(String location, Id jobId, Id processId, Throwable t, Object... args) {
+ duccLogger.warn(location, toDuccId(jobId), toDuccId(processId), t, args);
+ }
+
+}
Propchange: uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/logger/Logger.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/logger/id/Id.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/logger/id/Id.java?rev=1640705&view=auto
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/logger/id/Id.java (added)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/logger/id/Id.java Thu Nov 20 10:06:32 2014
@@ -0,0 +1,39 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+*/
+package org.apache.uima.ducc.container.common.logger.id;
+
+public class Id {
+
+ public static Id null_id = new Id(null);;
+
+ private String id = null;
+
+ public Id(String id) {
+ setId(id);
+ }
+
+ private void setId(String value) {
+ id = value;
+ }
+
+ @Override
+ public String toString() {
+ return id;
+ }
+}
Propchange: uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/logger/id/Id.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/logger/id/Transform.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/logger/id/Transform.java?rev=1640705&view=auto
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/logger/id/Transform.java (added)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/logger/id/Transform.java Thu Nov 20 10:06:32 2014
@@ -0,0 +1,36 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+*/
+package org.apache.uima.ducc.container.common.logger.id;
+
+
+public class Transform {
+
+ public static Id toId(String value) {
+ Id retVal = new Id(value);
+ return retVal;
+ }
+
+ public static String toString(Id value) {
+ String retVal = null;
+ if(value != null) {
+ retVal = value.toString();
+ }
+ return retVal;
+ }
+}
Propchange: uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/logger/id/Transform.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/JobDriver.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/JobDriver.java?rev=1640705&r1=1640704&r2=1640705&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/JobDriver.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/JobDriver.java Thu Nov 20 10:06:32 2014
@@ -20,10 +20,10 @@ package org.apache.uima.ducc.container.j
import java.util.concurrent.ConcurrentHashMap;
-import org.apache.uima.ducc.container.common.ContainerLogger;
import org.apache.uima.ducc.container.common.JdFlagsExtendedHelper;
-import org.apache.uima.ducc.container.common.IContainerLogger;
-import org.apache.uima.ducc.container.common.IEntityId;
+import org.apache.uima.ducc.container.common.logger.IComponent;
+import org.apache.uima.ducc.container.common.logger.ILogger;
+import org.apache.uima.ducc.container.common.logger.Logger;
import org.apache.uima.ducc.container.jd.cas.CasManager;
import org.apache.uima.ducc.container.jd.classload.ProxyJobDriverErrorHandler;
import org.apache.uima.ducc.container.jd.mh.IMessageHandler;
@@ -35,7 +35,7 @@ import org.apache.uima.ducc.container.jd
public class JobDriver {
- private static IContainerLogger logger = ContainerLogger.getLogger(JobDriver.class, IContainerLogger.Component.JD.name());
+ private static Logger logger = Logger.getLogger(JobDriver.class, IComponent.Id.JD.name());
private static JobDriver instance = null;
@@ -79,7 +79,7 @@ public class JobDriver {
mh = new MessageHandler();
}
catch(Exception e) {
- logger.error(location, IEntityId.null_id, e);
+ logger.error(location, ILogger.null_id, e);
throw new JobDriverException(e);
}
}
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/JobDriverHelper.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/JobDriverHelper.java?rev=1640705&r1=1640704&r2=1640705&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/JobDriverHelper.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/JobDriverHelper.java Thu Nov 20 10:06:32 2014
@@ -22,11 +22,11 @@ import java.util.ArrayList;
import java.util.Map.Entry;
import java.util.concurrent.ConcurrentHashMap;
-import org.apache.uima.ducc.container.common.ContainerLogger;
-import org.apache.uima.ducc.container.common.IContainerLogger;
-import org.apache.uima.ducc.container.common.IEntityId;
import org.apache.uima.ducc.container.common.MessageBuffer;
import org.apache.uima.ducc.container.common.Standardize;
+import org.apache.uima.ducc.container.common.logger.IComponent;
+import org.apache.uima.ducc.container.common.logger.ILogger;
+import org.apache.uima.ducc.container.common.logger.Logger;
import org.apache.uima.ducc.container.jd.mh.iface.IWorkItemInfo;
import org.apache.uima.ducc.container.jd.mh.iface.remote.IRemoteWorkerIdentity;
import org.apache.uima.ducc.container.jd.mh.impl.WorkItemInfo;
@@ -34,7 +34,7 @@ import org.apache.uima.ducc.container.jd
public class JobDriverHelper {
- private static IContainerLogger logger = ContainerLogger.getLogger(JobDriverHelper.class, IContainerLogger.Component.JD.name());
+ private static Logger logger = Logger.getLogger(JobDriverHelper.class, IComponent.Id.JD.name());
private static JobDriverHelper instance = new JobDriverHelper();
@@ -64,7 +64,7 @@ public class JobDriverHelper {
mb.append(Standardize.Label.pid.get()+wii.getPid());
mb.append(Standardize.Label.tid.get()+wii.getTid());
mb.append(Standardize.Label.operatingMillis.get()+wii.getOperatingMillis());
- logger.debug(location, IEntityId.null_id, mb);
+ logger.debug(location, ILogger.null_id, mb);
}
return list;
}
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/cas/CasManager.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/cas/CasManager.java?rev=1640705&r1=1640704&r2=1640705&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/cas/CasManager.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/cas/CasManager.java Thu Nov 20 10:06:32 2014
@@ -20,9 +20,9 @@ package org.apache.uima.ducc.container.j
import java.util.concurrent.LinkedBlockingQueue;
-import org.apache.uima.ducc.container.common.ContainerLogger;
-import org.apache.uima.ducc.container.common.IContainerLogger;
-import org.apache.uima.ducc.container.common.IEntityId;
+import org.apache.uima.ducc.container.common.logger.IComponent;
+import org.apache.uima.ducc.container.common.logger.ILogger;
+import org.apache.uima.ducc.container.common.logger.Logger;
import org.apache.uima.ducc.container.jd.JobDriverException;
import org.apache.uima.ducc.container.jd.cas.CasManagerStats.RetryReason;
import org.apache.uima.ducc.container.jd.classload.ProxyJobDriverCollectionReader;
@@ -30,7 +30,7 @@ import org.apache.uima.ducc.container.ne
public class CasManager {
- private IContainerLogger logger = ContainerLogger.getLogger(CasManager.class, IContainerLogger.Component.JD.name());
+ private static Logger logger = Logger.getLogger(CasManager.class, IComponent.Id.JD.name());
private ProxyJobDriverCollectionReader pjdcr = null;
@@ -49,7 +49,7 @@ public class CasManager {
casManagerStats.setCrTotal(pjdcr.getTotal());
}
catch(JobDriverException e) {
- logger.error(location, IEntityId.null_id, e);
+ logger.error(location, ILogger.null_id, e);
throw e;
}
}
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/classload/ProxyJobDriverCollectionReader.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/classload/ProxyJobDriverCollectionReader.java?rev=1640705&r1=1640704&r2=1640705&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/classload/ProxyJobDriverCollectionReader.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/classload/ProxyJobDriverCollectionReader.java Thu Nov 20 10:06:32 2014
@@ -24,19 +24,19 @@ import java.net.URL;
import java.net.URLClassLoader;
import org.apache.uima.ducc.common.utils.DuccLogger;
-import org.apache.uima.ducc.container.common.ContainerLogger;
-import org.apache.uima.ducc.container.common.IContainerLogger;
-import org.apache.uima.ducc.container.common.IEntityId;
import org.apache.uima.ducc.container.common.JdFlagsExtendedHelper;
import org.apache.uima.ducc.container.common.MessageBuffer;
import org.apache.uima.ducc.container.common.Standardize;
import org.apache.uima.ducc.container.common.classloader.PrivateClassLoader;
+import org.apache.uima.ducc.container.common.logger.IComponent;
+import org.apache.uima.ducc.container.common.logger.ILogger;
+import org.apache.uima.ducc.container.common.logger.Logger;
import org.apache.uima.ducc.container.jd.JobDriverException;
import org.apache.uima.ducc.container.net.impl.MetaCas;
public class ProxyJobDriverCollectionReader {
- private IContainerLogger logger = ContainerLogger.getLogger(ProxyJobDriverCollectionReader.class, IContainerLogger.Component.JD.name());
+ private static Logger logger = Logger.getLogger(ProxyJobDriverCollectionReader.class, IComponent.Id.JD.name());
private URLClassLoader urlClassLoader = null;
@@ -88,7 +88,7 @@ public class ProxyJobDriverCollectionRea
retVal = PrivateClassLoader.create(userClasspath);
}
catch(Exception e) {
- logger.error(location, IEntityId.null_id, e);
+ logger.error(location, ILogger.null_id, e);
}
return retVal;
}
@@ -100,7 +100,7 @@ public class ProxyJobDriverCollectionRea
retVal = (Integer)method_getTotal.invoke(instance_JdUserCollectionReader, nullObjectArray);
}
catch (Exception e) {
- logger.error(location, IEntityId.null_id, e);
+ logger.error(location, ILogger.null_id, e);
throw new JobDriverException(e);
}
return retVal;
@@ -124,7 +124,7 @@ public class ProxyJobDriverCollectionRea
}
}
catch (Exception e) {
- logger.error(location, IEntityId.null_id, e);
+ logger.error(location, ILogger.null_id, e);
throw new JobDriverException(e);
}
return retVal;
@@ -140,13 +140,13 @@ public class ProxyJobDriverCollectionRea
String location = "setup";
if(urlClassLoader == null) {
JobDriverException e = new JobDriverException("missing URLClassLoader");
- logger.error(location, IEntityId.null_id, e);
+ logger.error(location, ILogger.null_id, e);
throw e;
}
setURLClassLoader(urlClassLoader);
if(crXml == null) {
JobDriverException e = new JobDriverException("missing CollectionReader xml");
- logger.error(location, IEntityId.null_id, e);
+ logger.error(location, ILogger.null_id, e);
throw e;
}
setCrXml(crXml);
@@ -170,14 +170,14 @@ public class ProxyJobDriverCollectionRea
method_getJdUserMetaCas = class_JdUserCollectionReader.getMethod(name_getJdUserMetaCas, nullClassArray);
}
catch (Exception e) {
- logger.error(location, IEntityId.null_id, e);
+ logger.error(location, ILogger.null_id, e);
throw new JobDriverException(e);
}
}
private void setURLClassLoader(URLClassLoader value) {
String location = "setURLClassLoader";
- logger.debug(location, IEntityId.null_id, value);
+ logger.debug(location, ILogger.null_id, value);
urlClassLoader = value;
}
@@ -194,20 +194,20 @@ public class ProxyJobDriverCollectionRea
try {
MessageBuffer mb1 = new MessageBuffer();
mb1.append(Standardize.Label.loading.get()+className);
- logger.debug(location, IEntityId.null_id, mb1.toString());
+ logger.debug(location, ILogger.null_id, mb1.toString());
URL[] urls = urlClassLoader.getURLs();
for(URL url : urls) {
- logger.debug(location, IEntityId.null_id, url);
+ logger.debug(location, ILogger.null_id, url);
}
Class<?> loadedClass = urlClassLoader.loadClass(className);
MessageBuffer mb2 = new MessageBuffer();
mb2.append(Standardize.Label.loaded.get()+loadedClass.getName());
- logger.trace(location, IEntityId.null_id, mb2.toString());
+ logger.trace(location, ILogger.null_id, mb2.toString());
}
catch (Exception e) {
DuccLogger duccLogger = DuccLogger.getLogger(ProxyJobDriverCollectionReader.class, "JD");
duccLogger.error(location, null, e);
- logger.error(location, IEntityId.null_id, e);
+ logger.error(location, ILogger.null_id, e);
throw new JobDriverException(e);
}
}
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/classload/ProxyJobDriverDirective.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/classload/ProxyJobDriverDirective.java?rev=1640705&r1=1640704&r2=1640705&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/classload/ProxyJobDriverDirective.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/classload/ProxyJobDriverDirective.java Thu Nov 20 10:06:32 2014
@@ -18,15 +18,15 @@
*/
package org.apache.uima.ducc.container.jd.classload;
-import org.apache.uima.ducc.container.common.ContainerLogger;
-import org.apache.uima.ducc.container.common.IContainerLogger;
-import org.apache.uima.ducc.container.common.IEntityId;
import org.apache.uima.ducc.container.common.MessageBuffer;
import org.apache.uima.ducc.container.common.Standardize;
+import org.apache.uima.ducc.container.common.logger.IComponent;
+import org.apache.uima.ducc.container.common.logger.ILogger;
+import org.apache.uima.ducc.container.common.logger.Logger;
public class ProxyJobDriverDirective {
- private IContainerLogger logger = ContainerLogger.getLogger(ProxyJobDriverDirective.class, IContainerLogger.Component.JD.name());
+ private static Logger logger = Logger.getLogger(ProxyJobDriverDirective.class, IComponent.Id.JD.name());
private boolean killJob = false;
private boolean killProcess = false;
@@ -45,7 +45,7 @@ public class ProxyJobDriverDirective {
mb.append(Standardize.Label.killJob.get()+killJob);
mb.append(Standardize.Label.killProcess.get()+killProcess);
mb.append(Standardize.Label.killWorkItem.get()+killWorkItem);
- logger.debug(location, IEntityId.null_id, mb);
+ logger.debug(location, ILogger.null_id, mb);
}
private void setKillJob(boolean value) {
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/classload/ProxyJobDriverErrorHandler.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/classload/ProxyJobDriverErrorHandler.java?rev=1640705&r1=1640704&r2=1640705&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/classload/ProxyJobDriverErrorHandler.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/classload/ProxyJobDriverErrorHandler.java Thu Nov 20 10:06:32 2014
@@ -23,15 +23,15 @@ import java.lang.reflect.Type;
import java.net.URLClassLoader;
import org.apache.uima.ducc.common.jd.JdFlagsHelper;
-import org.apache.uima.ducc.container.common.ContainerLogger;
-import org.apache.uima.ducc.container.common.IContainerLogger;
-import org.apache.uima.ducc.container.common.IEntityId;
import org.apache.uima.ducc.container.common.classloader.PrivateClassLoader;
+import org.apache.uima.ducc.container.common.logger.IComponent;
+import org.apache.uima.ducc.container.common.logger.ILogger;
+import org.apache.uima.ducc.container.common.logger.Logger;
import org.apache.uima.ducc.container.jd.JobDriverException;
public class ProxyJobDriverErrorHandler {
- private IContainerLogger logger = ContainerLogger.getLogger(ProxyJobDriverErrorHandler.class, IContainerLogger.Component.JD.name());
+ private static Logger logger = Logger.getLogger(ProxyJobDriverErrorHandler.class, IComponent.Id.JD.name());
private URLClassLoader classLoader = null;
@@ -102,7 +102,7 @@ public class ProxyJobDriverErrorHandler
}
}
catch (Exception e) {
- logger.error(location, IEntityId.null_id, e);
+ logger.error(location, ILogger.null_id, e);
throw new JobDriverException(e);
}
}
@@ -114,7 +114,7 @@ public class ProxyJobDriverErrorHandler
retVal = PrivateClassLoader.create(userClasspath);
}
catch(Exception e) {
- logger.error(location, IEntityId.null_id, e);
+ logger.error(location, ILogger.null_id, e);
}
return retVal;
}
@@ -133,7 +133,7 @@ public class ProxyJobDriverErrorHandler
retVal = new ProxyJobDriverDirective(isKillJob, isKillProcess, isKillWorkItem);
}
catch (Exception e) {
- logger.error(location, IEntityId.null_id, e);
+ logger.error(location, ILogger.null_id, e);
throw new JobDriverException(e);
}
return retVal;
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionAck.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionAck.java?rev=1640705&r1=1640704&r2=1640705&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionAck.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionAck.java Thu Nov 20 10:06:32 2014
@@ -18,12 +18,12 @@
*/
package org.apache.uima.ducc.container.jd.fsm.wi;
-import org.apache.uima.ducc.container.common.ContainerLogger;
-import org.apache.uima.ducc.container.common.IEntityId;
-import org.apache.uima.ducc.container.common.IContainerLogger;
import org.apache.uima.ducc.container.common.MessageBuffer;
import org.apache.uima.ducc.container.common.Standardize;
import org.apache.uima.ducc.container.common.fsm.iface.IAction;
+import org.apache.uima.ducc.container.common.logger.IComponent;
+import org.apache.uima.ducc.container.common.logger.ILogger;
+import org.apache.uima.ducc.container.common.logger.Logger;
import org.apache.uima.ducc.container.jd.mh.RemoteWorkerIdentity;
import org.apache.uima.ducc.container.jd.mh.iface.remote.IRemoteWorkerIdentity;
import org.apache.uima.ducc.container.jd.wi.IWorkItem;
@@ -31,8 +31,8 @@ import org.apache.uima.ducc.container.ne
import org.apache.uima.ducc.container.net.iface.IMetaCasTransaction;
public class ActionAck implements IAction {
-
- private IContainerLogger logger = ContainerLogger.getLogger(ActionAck.class, IContainerLogger.Component.JD.name());
+
+ private static Logger logger = Logger.getLogger(ActionAck.class, IComponent.Id.JD.name());
@Override
public String getName() {
@@ -42,7 +42,7 @@ public class ActionAck implements IActio
@Override
public void engage(Object objectData) {
String location = "engage";
- logger.debug(location, IEntityId.null_id, "");
+ logger.debug(location, ILogger.null_id, "");
IActionData actionData = (IActionData) objectData;
try {
IWorkItem wi = actionData.getWorkItem();
@@ -57,15 +57,15 @@ public class ActionAck implements IActio
mb.append(Standardize.Label.transNo.get()+trans.getTransactionId().toString());
mb.append(Standardize.Label.seqNo.get()+metaCas.getSystemKey());
mb.append(Standardize.Label.remote.get()+rwi.toString());
- logger.info(location, IEntityId.null_id, mb.toString());
+ logger.info(location, ILogger.null_id, mb.toString());
}
else {MessageBuffer mb = new MessageBuffer();
mb.append("No CAS found for processing");
- logger.info(location, IEntityId.null_id, mb.toString());
+ logger.info(location, ILogger.null_id, mb.toString());
}
}
catch(Exception e) {
- logger.error(location, IEntityId.null_id, e);
+ logger.error(location, ILogger.null_id, e);
}
}
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionEnd.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionEnd.java?rev=1640705&r1=1640704&r2=1640705&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionEnd.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionEnd.java Thu Nov 20 10:06:32 2014
@@ -18,12 +18,12 @@
*/
package org.apache.uima.ducc.container.jd.fsm.wi;
-import org.apache.uima.ducc.container.common.ContainerLogger;
-import org.apache.uima.ducc.container.common.IEntityId;
-import org.apache.uima.ducc.container.common.IContainerLogger;
import org.apache.uima.ducc.container.common.MessageBuffer;
import org.apache.uima.ducc.container.common.Standardize;
import org.apache.uima.ducc.container.common.fsm.iface.IAction;
+import org.apache.uima.ducc.container.common.logger.IComponent;
+import org.apache.uima.ducc.container.common.logger.ILogger;
+import org.apache.uima.ducc.container.common.logger.Logger;
import org.apache.uima.ducc.container.jd.JobDriver;
import org.apache.uima.ducc.container.jd.cas.CasManager;
import org.apache.uima.ducc.container.jd.cas.CasManagerStats.RetryReason;
@@ -37,8 +37,8 @@ import org.apache.uima.ducc.container.ne
import org.apache.uima.ducc.container.net.iface.IMetaCasTransaction;
public class ActionEnd implements IAction {
-
- private IContainerLogger logger = ContainerLogger.getLogger(ActionEnd.class, IContainerLogger.Component.JD.name());
+
+ private static Logger logger = Logger.getLogger(ActionEnd.class, IComponent.Id.JD.name());
@Override
public String getName() {
@@ -52,7 +52,7 @@ public class ActionEnd implements IActio
mb.append(Standardize.Label.transNo.get()+trans.getTransactionId().toString());
mb.append(Standardize.Label.seqNo.get()+metaCas.getSystemKey());
mb.append(Standardize.Label.remote.get()+rwi.toString());
- logger.info(location, IEntityId.null_id, mb.toString());
+ logger.info(location, ILogger.null_id, mb.toString());
}
private void retryWorkItem(CasManager cm, IWorkItem wi, IMetaCasTransaction trans, IMetaCas metaCas, IRemoteWorkerIdentity rwi) {
@@ -63,7 +63,7 @@ public class ActionEnd implements IActio
mb.append(Standardize.Label.transNo.get()+trans.getTransactionId().toString());
mb.append(Standardize.Label.seqNo.get()+metaCas.getSystemKey());
mb.append(Standardize.Label.remote.get()+rwi.toString());
- logger.info(location, IEntityId.null_id, mb.toString());
+ logger.info(location, ILogger.null_id, mb.toString());
}
private void killWorkItem(CasManager cm, IWorkItem wi, IMetaCasTransaction trans, IMetaCas metaCas, IRemoteWorkerIdentity rwi) {
@@ -73,7 +73,7 @@ public class ActionEnd implements IActio
mb.append(Standardize.Label.transNo.get()+trans.getTransactionId().toString());
mb.append(Standardize.Label.seqNo.get()+metaCas.getSystemKey());
mb.append(Standardize.Label.remote.get()+rwi.toString());
- logger.info(location, IEntityId.null_id, mb.toString());
+ logger.info(location, ILogger.null_id, mb.toString());
}
private void successWorkItem(CasManager cm, IWorkItem wi, IMetaCasTransaction trans, IMetaCas metaCas, IRemoteWorkerIdentity rwi) {
@@ -85,13 +85,13 @@ public class ActionEnd implements IActio
mb.append(Standardize.Label.transNo.get()+trans.getTransactionId().toString());
mb.append(Standardize.Label.seqNo.get()+metaCas.getSystemKey());
mb.append(Standardize.Label.remote.get()+rwi.toString());
- logger.info(location, IEntityId.null_id, mb.toString());
+ logger.info(location, ILogger.null_id, mb.toString());
}
@Override
public void engage(Object objectData) {
String location = "engage";
- logger.debug(location, IEntityId.null_id, "");
+ logger.debug(location, ILogger.null_id, "");
IActionData actionData = (IActionData) objectData;
try {
IWorkItem wi = actionData.getWorkItem();
@@ -129,11 +129,11 @@ public class ActionEnd implements IActio
}
else {MessageBuffer mb = new MessageBuffer();
mb.append("No CAS found for processing");
- logger.info(location, IEntityId.null_id, mb.toString());
+ logger.info(location, ILogger.null_id, mb.toString());
}
}
catch(Exception e) {
- logger.error(location, IEntityId.null_id, e);
+ logger.error(location, ILogger.null_id, e);
}
}
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionError.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionError.java?rev=1640705&r1=1640704&r2=1640705&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionError.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionError.java Thu Nov 20 10:06:32 2014
@@ -18,14 +18,14 @@
*/
package org.apache.uima.ducc.container.jd.fsm.wi;
-import org.apache.uima.ducc.container.common.ContainerLogger;
-import org.apache.uima.ducc.container.common.IEntityId;
-import org.apache.uima.ducc.container.common.IContainerLogger;
import org.apache.uima.ducc.container.common.fsm.iface.IAction;
+import org.apache.uima.ducc.container.common.logger.IComponent;
+import org.apache.uima.ducc.container.common.logger.ILogger;
+import org.apache.uima.ducc.container.common.logger.Logger;
public class ActionError implements IAction {
-
- private IContainerLogger logger = ContainerLogger.getLogger(ActionError.class, IContainerLogger.Component.JD.name());
+
+ private static Logger logger = Logger.getLogger(ActionError.class, IComponent.Id.JD.name());
@Override
public String getName() {
@@ -35,7 +35,7 @@ public class ActionError implements IAct
@Override
public void engage(Object objectData) {
String location = "engage";
- logger.debug(location, IEntityId.null_id, "");
+ logger.debug(location, ILogger.null_id, "");
IActionData actionData = (IActionData) objectData;
}
}
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionGet.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionGet.java?rev=1640705&r1=1640704&r2=1640705&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionGet.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionGet.java Thu Nov 20 10:06:32 2014
@@ -18,14 +18,14 @@
*/
package org.apache.uima.ducc.container.jd.fsm.wi;
-import org.apache.uima.ducc.container.common.ContainerLogger;
-import org.apache.uima.ducc.container.common.IEntityId;
-import org.apache.uima.ducc.container.common.IContainerLogger;
import org.apache.uima.ducc.container.common.MessageBuffer;
import org.apache.uima.ducc.container.common.Standardize;
import org.apache.uima.ducc.container.common.fsm.iface.IAction;
import org.apache.uima.ducc.container.common.fsm.iface.IEvent;
import org.apache.uima.ducc.container.common.fsm.iface.IFsm;
+import org.apache.uima.ducc.container.common.logger.IComponent;
+import org.apache.uima.ducc.container.common.logger.ILogger;
+import org.apache.uima.ducc.container.common.logger.Logger;
import org.apache.uima.ducc.container.jd.JobDriver;
import org.apache.uima.ducc.container.jd.cas.CasManager;
import org.apache.uima.ducc.container.jd.mh.RemoteWorkerIdentity;
@@ -35,8 +35,8 @@ import org.apache.uima.ducc.container.ne
import org.apache.uima.ducc.container.net.iface.IMetaCasTransaction;
public class ActionGet implements IAction {
-
- private IContainerLogger logger = ContainerLogger.getLogger(ActionGet.class, IContainerLogger.Component.JD.name());
+
+ private static Logger logger = Logger.getLogger(ActionGet.class, IComponent.Id.JD.name());
@Override
public String getName() {
@@ -46,7 +46,7 @@ public class ActionGet implements IActio
@Override
public void engage(Object objectData) {
String location = "engage";
- logger.debug(location, IEntityId.null_id, "");
+ logger.debug(location, ILogger.null_id, "");
IActionData actionData = (IActionData) objectData;
try {
IWorkItem wi = actionData.getWorkItem();
@@ -68,19 +68,19 @@ public class ActionGet implements IActio
mb.append(Standardize.Label.transNo.get()+trans.getTransactionId().toString());
mb.append(Standardize.Label.seqNo.get()+metaCas.getSystemKey());
mb.append(Standardize.Label.remote.get()+rwi.toString());
- logger.info(location, IEntityId.null_id, mb.toString());
+ logger.info(location, ILogger.null_id, mb.toString());
}
else {
event = WiFsm.CAS_Unavailable;
MessageBuffer mb = new MessageBuffer();
mb.append("No CAS found for processing");
- logger.info(location, IEntityId.null_id, mb.toString());
+ logger.info(location, ILogger.null_id, mb.toString());
}
//
fsm.transition(event, actionData);
}
catch(Exception e) {
- logger.error(location, IEntityId.null_id, e);
+ logger.error(location, ILogger.null_id, e);
}
}
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionIgnore.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionIgnore.java?rev=1640705&r1=1640704&r2=1640705&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionIgnore.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionIgnore.java Thu Nov 20 10:06:32 2014
@@ -18,14 +18,14 @@
*/
package org.apache.uima.ducc.container.jd.fsm.wi;
-import org.apache.uima.ducc.container.common.ContainerLogger;
-import org.apache.uima.ducc.container.common.IEntityId;
-import org.apache.uima.ducc.container.common.IContainerLogger;
import org.apache.uima.ducc.container.common.fsm.iface.IAction;
+import org.apache.uima.ducc.container.common.logger.IComponent;
+import org.apache.uima.ducc.container.common.logger.ILogger;
+import org.apache.uima.ducc.container.common.logger.Logger;
public class ActionIgnore implements IAction {
-
- private IContainerLogger logger = ContainerLogger.getLogger(ActionIgnore.class, IContainerLogger.Component.JD.name());
+
+ private static Logger logger = Logger.getLogger(ActionIgnore.class, IComponent.Id.JD.name());
@Override
public String getName() {
@@ -35,7 +35,7 @@ public class ActionIgnore implements IAc
@Override
public void engage(Object objectData) {
String location = "engage";
- logger.debug(location, IEntityId.null_id, "");
+ logger.debug(location, ILogger.null_id, "");
IActionData actionData = (IActionData) objectData;
}
}
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionInProgress.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionInProgress.java?rev=1640705&r1=1640704&r2=1640705&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionInProgress.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionInProgress.java Thu Nov 20 10:06:32 2014
@@ -18,14 +18,14 @@
*/
package org.apache.uima.ducc.container.jd.fsm.wi;
-import org.apache.uima.ducc.container.common.ContainerLogger;
-import org.apache.uima.ducc.container.common.IEntityId;
-import org.apache.uima.ducc.container.common.IContainerLogger;
import org.apache.uima.ducc.container.common.MessageBuffer;
import org.apache.uima.ducc.container.common.Standardize;
import org.apache.uima.ducc.container.common.fsm.iface.IAction;
import org.apache.uima.ducc.container.common.fsm.iface.IEvent;
import org.apache.uima.ducc.container.common.fsm.iface.IFsm;
+import org.apache.uima.ducc.container.common.logger.IComponent;
+import org.apache.uima.ducc.container.common.logger.ILogger;
+import org.apache.uima.ducc.container.common.logger.Logger;
import org.apache.uima.ducc.container.jd.JobDriver;
import org.apache.uima.ducc.container.jd.cas.CasManager;
import org.apache.uima.ducc.container.jd.mh.RemoteWorkerIdentity;
@@ -35,8 +35,8 @@ import org.apache.uima.ducc.container.ne
import org.apache.uima.ducc.container.net.iface.IMetaCasTransaction;
public class ActionInProgress implements IAction {
-
- private IContainerLogger logger = ContainerLogger.getLogger(ActionInProgress.class, IContainerLogger.Component.JD.name());
+
+ private static Logger logger = Logger.getLogger(ActionInProgress.class, IComponent.Id.JD.name());
@Override
public String getName() {
@@ -46,7 +46,7 @@ public class ActionInProgress implements
@Override
public void engage(Object objectData) {
String location = "engage";
- logger.debug(location, IEntityId.null_id, "");
+ logger.debug(location, ILogger.null_id, "");
IActionData actionData = (IActionData) objectData;
try {
IWorkItem wi = actionData.getWorkItem();
@@ -67,19 +67,19 @@ public class ActionInProgress implements
mb.append(Standardize.Label.transNo.get()+trans.getTransactionId().toString());
mb.append(Standardize.Label.seqNo.get()+metaCas.getSystemKey());
mb.append(Standardize.Label.remote.get()+rwi.toString());
- logger.info(location, IEntityId.null_id, mb.toString());
+ logger.info(location, ILogger.null_id, mb.toString());
}
else {
event = WiFsm.CAS_Unavailable;
MessageBuffer mb = new MessageBuffer();
mb.append("No CAS found for processing");
- logger.info(location, IEntityId.null_id, mb.toString());
+ logger.info(location, ILogger.null_id, mb.toString());
}
//
fsm.transition(event, actionData);
}
catch(Exception e) {
- logger.error(location, IEntityId.null_id, e);
+ logger.error(location, ILogger.null_id, e);
}
}
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionPreempt.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionPreempt.java?rev=1640705&r1=1640704&r2=1640705&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionPreempt.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionPreempt.java Thu Nov 20 10:06:32 2014
@@ -18,10 +18,10 @@
*/
package org.apache.uima.ducc.container.jd.fsm.wi;
-import org.apache.uima.ducc.container.common.ContainerLogger;
-import org.apache.uima.ducc.container.common.IContainerLogger;
-import org.apache.uima.ducc.container.common.IEntityId;
import org.apache.uima.ducc.container.common.fsm.iface.IAction;
+import org.apache.uima.ducc.container.common.logger.IComponent;
+import org.apache.uima.ducc.container.common.logger.ILogger;
+import org.apache.uima.ducc.container.common.logger.Logger;
import org.apache.uima.ducc.container.jd.JobDriver;
import org.apache.uima.ducc.container.jd.cas.CasManager;
import org.apache.uima.ducc.container.jd.cas.CasManagerStats.RetryReason;
@@ -29,8 +29,8 @@ import org.apache.uima.ducc.container.jd
import org.apache.uima.ducc.container.net.iface.IMetaCas;
public class ActionPreempt implements IAction {
-
- private IContainerLogger logger = ContainerLogger.getLogger(ActionPreempt.class, IContainerLogger.Component.JD.name());
+
+ private static Logger logger = Logger.getLogger(ActionPreempt.class, IComponent.Id.JD.name());
@Override
public String getName() {
@@ -40,7 +40,7 @@ public class ActionPreempt implements IA
@Override
public void engage(Object objectData) {
String location = "engage";
- logger.debug(location, IEntityId.null_id, "");
+ logger.debug(location, ILogger.null_id, "");
IActionData actionData = (IActionData) objectData;
try {
IWorkItem wi = actionData.getWorkItem();
@@ -50,7 +50,7 @@ public class ActionPreempt implements IA
cm.putMetaCas(metaCas, RetryReason.ProcessPreempt);
}
catch(Exception e) {
- logger.error(location, IEntityId.null_id, e);
+ logger.error(location, ILogger.null_id, e);
}
}
}
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionSend.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionSend.java?rev=1640705&r1=1640704&r2=1640705&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionSend.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionSend.java Thu Nov 20 10:06:32 2014
@@ -18,17 +18,17 @@
*/
package org.apache.uima.ducc.container.jd.fsm.wi;
-import org.apache.uima.ducc.container.common.ContainerLogger;
-import org.apache.uima.ducc.container.common.IEntityId;
-import org.apache.uima.ducc.container.common.IContainerLogger;
import org.apache.uima.ducc.container.common.fsm.iface.IAction;
+import org.apache.uima.ducc.container.common.logger.IComponent;
+import org.apache.uima.ducc.container.common.logger.ILogger;
+import org.apache.uima.ducc.container.common.logger.Logger;
import org.apache.uima.ducc.container.jd.wi.IWorkItem;
import org.apache.uima.ducc.container.net.iface.IMetaCas;
import org.apache.uima.ducc.container.net.iface.IMetaCasTransaction;
public class ActionSend implements IAction {
-
- private IContainerLogger logger = ContainerLogger.getLogger(ActionSend.class, IContainerLogger.Component.JD.name());
+
+ private static Logger logger = Logger.getLogger(ActionSend.class, IComponent.Id.JD.name());
@Override
public String getName() {
@@ -38,7 +38,7 @@ public class ActionSend implements IActi
@Override
public void engage(Object objectData) {
String location = "engage";
- logger.debug(location, IEntityId.null_id, "");
+ logger.debug(location, ILogger.null_id, "");
IActionData actionData = (IActionData) objectData;
try {
IWorkItem wi = actionData.getWorkItem();
@@ -47,7 +47,7 @@ public class ActionSend implements IActi
wi.setMetaCas(metaCas);
}
catch(Exception e) {
- logger.error(location, IEntityId.null_id, e);
+ logger.error(location, ILogger.null_id, e);
}
}
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/mh/MessageHandler.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/mh/MessageHandler.java?rev=1640705&r1=1640704&r2=1640705&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/mh/MessageHandler.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/mh/MessageHandler.java Thu Nov 20 10:06:32 2014
@@ -21,13 +21,15 @@ package org.apache.uima.ducc.container.j
import java.util.Map.Entry;
import java.util.concurrent.ConcurrentHashMap;
-import org.apache.uima.ducc.container.common.ContainerLogger;
-import org.apache.uima.ducc.container.common.IContainerLogger;
-import org.apache.uima.ducc.container.common.IEntityId;
import org.apache.uima.ducc.container.common.MessageBuffer;
import org.apache.uima.ducc.container.common.Standardize;
import org.apache.uima.ducc.container.common.fsm.iface.IEvent;
import org.apache.uima.ducc.container.common.fsm.iface.IFsm;
+import org.apache.uima.ducc.container.common.logger.IComponent;
+import org.apache.uima.ducc.container.common.logger.ILogger;
+import org.apache.uima.ducc.container.common.logger.Logger;
+import org.apache.uima.ducc.container.common.logger.id.Id;
+import org.apache.uima.ducc.container.common.logger.id.Transform;
import org.apache.uima.ducc.container.jd.JobDriver;
import org.apache.uima.ducc.container.jd.JobDriverHelper;
import org.apache.uima.ducc.container.jd.cas.CasManager;
@@ -50,15 +52,16 @@ import org.apache.uima.ducc.container.ne
public class MessageHandler implements IMessageHandler {
- private static IContainerLogger logger = ContainerLogger.getLogger(MessageHandler.class, IContainerLogger.Component.JD.name());
+ private static ILogger logger = Logger.getLogger(MessageHandler.class, IComponent.Id.JD.name());
@Override
public IOperatingInfo handleGetOperatingInfo() {
String location = "handleGetOperatingInfo";
IOperatingInfo retVal = null;
+ JobDriver jd = JobDriver.getInstance();
+ Id jobid = Transform.toId(jd.getJobId());
try {
IOperatingInfo oi = new OperatingInfo();
- JobDriver jd = JobDriver.getInstance();
JobDriverHelper jdh = JobDriverHelper.getInstance();
CasManager cm = jd.getCasManager();
CasManagerStats cms = cm.getCasManagerStats();
@@ -94,11 +97,11 @@ public class MessageHandler implements I
mb.append(Standardize.Label.runningMillisMin.get()+oi.getWorkItemRunningMillisMin());
mb.append(Standardize.Label.runningMillisMax.get()+oi.getWorkItemRunningMillisMax());
mb.append(Standardize.Label.todMostRecentStart.get()+oi.getWorkItemTodMostRecentStart());
- logger.debug(location, IEntityId.null_id, mb.toString());
+ logger.debug(location, jobid, mb.toString());
retVal = oi;
}
catch(Exception e) {
- logger.error(location, IEntityId.null_id, e);
+ logger.error(location, jobid, e);
}
return retVal;
}
@@ -111,7 +114,7 @@ public class MessageHandler implements I
//TODO
}
catch(Exception e) {
- logger.error(location, IEntityId.null_id, e);
+ logger.error(location, ILogger.null_id, e);
}
}
@@ -123,7 +126,7 @@ public class MessageHandler implements I
//TODO
}
catch(Exception e) {
- logger.error(location, IEntityId.null_id, e);
+ logger.error(location, ILogger.null_id, e);
}
}
@@ -138,7 +141,7 @@ public class MessageHandler implements I
MessageBuffer mb = new MessageBuffer();
mb.append(Standardize.Label.remote.get()+rwi.toString());
mb.append(Boolean.TRUE.toString());
- logger.debug(location, IEntityId.null_id, mb.toString());
+ logger.debug(location, ILogger.null_id, mb.toString());
IWorkItem wi = entry.getValue();
IFsm fsm = wi.getFsm();
IEvent event = WiFsm.Process_Preempt;
@@ -149,12 +152,12 @@ public class MessageHandler implements I
MessageBuffer mb = new MessageBuffer();
mb.append(Standardize.Label.remote.get()+rwi.toString());
mb.append(Boolean.FALSE.toString());
- logger.trace(location, IEntityId.null_id, mb.toString());
+ logger.trace(location, ILogger.null_id, mb.toString());
}
}
}
catch(Exception e) {
- logger.error(location, IEntityId.null_id, e);
+ logger.error(location, ILogger.null_id, e);
}
}
@@ -166,7 +169,7 @@ public class MessageHandler implements I
MessageBuffer mb = new MessageBuffer();
mb.append(Standardize.Label.remote.get()+rwi.toString());
mb.append(Standardize.Label.type.get()+trans.getType());
- logger.info(location, IEntityId.null_id, mb.toString());
+ logger.info(location, ILogger.null_id, mb.toString());
Type type = trans.getType();
switch(type) {
case Get:
@@ -183,7 +186,7 @@ public class MessageHandler implements I
}
}
catch(Exception e) {
- logger.error(location, IEntityId.null_id, e);
+ logger.error(location, ILogger.null_id, e);
}
}
@@ -198,7 +201,7 @@ public class MessageHandler implements I
wi = map.get(rwi);
MessageBuffer mb = new MessageBuffer();
mb.append(Standardize.Label.remote.get()+rwi.toString());
- logger.debug(location, IEntityId.null_id, mb.toString());
+ logger.debug(location, ILogger.null_id, mb.toString());
}
return wi;
}
@@ -211,13 +214,13 @@ public class MessageHandler implements I
MessageBuffer mb = new MessageBuffer();
mb.append(Standardize.Label.remote.get()+rwi.toString());
mb.append(Standardize.Label.seqNo.get()+wi.getMetaCas().getSystemKey());
- logger.debug(location, IEntityId.null_id, mb.toString());
+ logger.debug(location, ILogger.null_id, mb.toString());
}
else {
MessageBuffer mb = new MessageBuffer();
mb.append(Standardize.Label.remote.get()+rwi.toString());
mb.append("has no work assigned presently");
- logger.debug(location, IEntityId.null_id, mb.toString());
+ logger.debug(location, ILogger.null_id, mb.toString());
}
return wi;
}
@@ -237,7 +240,7 @@ public class MessageHandler implements I
MessageBuffer mb = new MessageBuffer();
mb.append(Standardize.Label.remote.get()+rwi.toString());
mb.append("has no work assigned presently");
- logger.debug(location, IEntityId.null_id, mb.toString());
+ logger.debug(location, ILogger.null_id, mb.toString());
}
else {
trans.setMetaCas(wi.getMetaCas());
@@ -255,7 +258,7 @@ public class MessageHandler implements I
MessageBuffer mb = new MessageBuffer();
mb.append(Standardize.Label.remote.get()+rwi.toString());
mb.append("has no work assigned presently");
- logger.debug(location, IEntityId.null_id, mb.toString());
+ logger.debug(location, ILogger.null_id, mb.toString());
}
else {
trans.setMetaCas(wi.getMetaCas());
@@ -266,7 +269,7 @@ public class MessageHandler implements I
MessageBuffer mb = new MessageBuffer();
mb.append(Standardize.Label.AckMsecs.get()+(wi.getTodAck()-wi.getTodGet()));
mb.append(Standardize.Label.EndMsecs.get()+(wi.getTodEnd()-wi.getTodAck()));
- logger.debug(location, IEntityId.null_id, mb.toString());
+ logger.debug(location, ILogger.null_id, mb.toString());
}
}
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/mh/RemoteWorkerIdentity.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/mh/RemoteWorkerIdentity.java?rev=1640705&r1=1640704&r2=1640705&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/mh/RemoteWorkerIdentity.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/mh/RemoteWorkerIdentity.java Thu Nov 20 10:06:32 2014
@@ -18,17 +18,17 @@
*/
package org.apache.uima.ducc.container.jd.mh;
-import org.apache.uima.ducc.container.common.ContainerLogger;
-import org.apache.uima.ducc.container.common.IEntityId;
-import org.apache.uima.ducc.container.common.IContainerLogger;
+import org.apache.uima.ducc.container.common.logger.IComponent;
+import org.apache.uima.ducc.container.common.logger.ILogger;
+import org.apache.uima.ducc.container.common.logger.Logger;
import org.apache.uima.ducc.container.jd.mh.iface.remote.IRemoteNode;
import org.apache.uima.ducc.container.jd.mh.iface.remote.IRemotePid;
import org.apache.uima.ducc.container.jd.mh.iface.remote.IRemoteWorkerIdentity;
import org.apache.uima.ducc.container.net.iface.IMetaCasRequester;
public class RemoteWorkerIdentity implements IRemoteWorkerIdentity, Comparable<Object> {
-
- private IContainerLogger logger = ContainerLogger.getLogger(RemoteWorkerIdentity.class, IContainerLogger.Component.JD.name());
+
+ private static Logger logger = Logger.getLogger(RemoteWorkerIdentity.class, IComponent.Id.JD.name());
private String nodeName = null;
private String nodeAddress = null;
@@ -149,7 +149,7 @@ public class RemoteWorkerIdentity implem
}
}
catch(Exception e) {
- logger.error(location, IEntityId.null_id, e);
+ logger.error(location, ILogger.null_id, e);
}
return retVal;
}
@@ -185,7 +185,7 @@ public class RemoteWorkerIdentity implem
}
}
catch(Exception e) {
- logger.error(location, IEntityId.null_id, e);
+ logger.error(location, ILogger.null_id, e);
}
return retVal;
}
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/ATest.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/ATest.java?rev=1640705&r1=1640704&r2=1640705&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/ATest.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/ATest.java Thu Nov 20 10:06:32 2014
@@ -22,7 +22,6 @@ import java.util.Map;
import org.apache.uima.ducc.common.jd.JdFlagsHelper;
import org.apache.uima.ducc.common.jd.JdFlagsHelper.Name;
-import org.apache.uima.ducc.container.common.ContainerLogger;
import org.apache.uima.ducc.container.jd.JobDriver;
import org.junit.After;
import org.junit.AfterClass;
@@ -58,12 +57,6 @@ public abstract class ATest {
debug = true;
}
}
- if(!isVerbose()) {
- ContainerLogger.setSilentRunning();
- }
- else {
- ContainerLogger.resetSilentRunning();
- }
}
public boolean isDisabled(String name ) {