Author: degenaro
Date: Wed Oct 29 19:55:04 2014
New Revision: 1635281
URL: http://svn.apache.org/r1635281
Log:
UIMA-4069 Redesign of JD toward the main goal of classpath separation for
container (system) code.
ContainerLogger (for now).
Added:
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/ContainerLogger.java
- copied, changed from r1635268,
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/DuccLogger.java
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/IContainerLogger.java
- copied, changed from r1635268,
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/IDuccLogger.java
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/IEntityId.java
- copied, changed from r1635268,
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/IDuccId.java
Removed:
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/DuccLogger.java
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/IDuccId.java
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/IDuccLogger.java
Modified:
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/JobDriverCasManager.java
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/JobDriverCommon.java
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/classload/JobDriverCollectionReader.java
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/dispatch/Dispatcher.java
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/dispatch/RemoteWorkerIdentity.java
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionAckCAS.java
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionEndCAS.java
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionGetCAS.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/ActionSendCAS.java
Copied:
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/ContainerLogger.java
(from r1635268,
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/DuccLogger.java)
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/ContainerLogger.java?p2=uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/ContainerLogger.java&p1=uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/DuccLogger.java&r1=1635268&r2=1635281&rev=1635281&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/DuccLogger.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/ContainerLogger.java
Wed Oct 29 19:55:04 2014
@@ -4,10 +4,10 @@ import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.Date;
-public class DuccLogger implements IDuccLogger {
+public class ContainerLogger implements IContainerLogger {
- static public DuccLogger getLogger(@SuppressWarnings("rawtypes") Class
clazz, String component) {
- return new DuccLogger(clazz, component);
+ static public ContainerLogger getLogger(@SuppressWarnings("rawtypes")
Class clazz, String component) {
+ return new ContainerLogger(clazz, component);
}
private static enum Type {
@@ -23,7 +23,7 @@ public class DuccLogger implements IDucc
private static SimpleDateFormat sdf = new SimpleDateFormat("EEE MMM dd
HH:mm:ss zzz yyyy");
- public DuccLogger(@SuppressWarnings("rawtypes") Class clazz, String
component) {
+ public ContainerLogger(@SuppressWarnings("rawtypes") Class clazz,
String component) {
setClazz(clazz);
setComponent(component);
}
@@ -59,7 +59,7 @@ public class DuccLogger implements IDucc
return text.toString().trim();
}
- private void log(Type type, String location, IDuccId jobid, Object...
args) {
+ private void log(Type type, String location, IEntityId jobid, Object...
args) {
StringBuffer text = new StringBuffer();
Date date = Calendar.getInstance().getTime();
text.append(sdf.format(date));
@@ -79,23 +79,23 @@ public class DuccLogger implements IDucc
}
@Override
- public void debug(String location, IDuccId jobid, Object... args) {
+ public void debug(String location, IEntityId eid, Object... args) {
if(Type.DEBUG.isActive()) {
- log(Type.DEBUG, location, jobid, args);
+ log(Type.DEBUG, location, eid, args);
}
}
@Override
- public void error(String location, IDuccId jobid, Object... args) {
+ public void error(String location, IEntityId eid, Object... args) {
if(Type.ERROR.isActive()) {
- log(Type.ERROR, location, jobid, args);
+ log(Type.ERROR, location, eid, args);
}
}
@Override
- public void info(String location, IDuccId jobid, Object... args) {
+ public void info(String location, IEntityId eid, Object... args) {
if(Type.INFO.isActive()) {
- log(Type.INFO, location, jobid, args);
+ log(Type.INFO, location, eid, args);
}
}
}
Copied:
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/IContainerLogger.java
(from r1635268,
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/IDuccLogger.java)
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/IContainerLogger.java?p2=uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/IContainerLogger.java&p1=uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/IDuccLogger.java&r1=1635268&r2=1635281&rev=1635281&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/IDuccLogger.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/IContainerLogger.java
Wed Oct 29 19:55:04 2014
@@ -1,11 +1,11 @@
package org.apache.uima.ducc.container.common;
-public interface IDuccLogger {
+public interface IContainerLogger {
- public enum Component { JD, OR, WS };
+ public enum Component { JD, JP };
- public void debug(String location, IDuccId jobid, Object ... args);
- public void error(String location, IDuccId jobid, Object ... args);
- public void info(String location, IDuccId jobid, Object ... args);
+ public void debug(String location, IEntityId jobid, Object ... args);
+ public void error(String location, IEntityId jobid, Object ... args);
+ public void info(String location, IEntityId jobid, Object ... args);
}
Copied:
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/IEntityId.java
(from r1635268,
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/IDuccId.java)
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/IEntityId.java?p2=uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/IEntityId.java&p1=uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/IDuccId.java&r1=1635268&r2=1635281&rev=1635281&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/IDuccId.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/IEntityId.java
Wed Oct 29 19:55:04 2014
@@ -1,6 +1,6 @@
package org.apache.uima.ducc.container.common;
-public interface IDuccId {
+public interface IEntityId {
- public static IDuccId null_id = null;
+ public static IEntityId null_id = null;
}
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=1635281&r1=1635280&r2=1635281&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
Wed Oct 29 19:55:04 2014
@@ -18,16 +18,16 @@
*/
package org.apache.uima.ducc.container.common.fsm;
-import org.apache.uima.ducc.container.common.DuccLogger;
-import org.apache.uima.ducc.container.common.IDuccId;
-import org.apache.uima.ducc.container.common.IDuccLogger;
+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;
public class Action implements IAction {
- private IDuccLogger logger = DuccLogger.getLogger(Action.class,
IDuccLogger.Component.JD.name());
+ private IContainerLogger logger =
ContainerLogger.getLogger(Action.class, IContainerLogger.Component.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, IDuccId.null_id, mb.toString());
+ logger.debug(location, IEntityId.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=1635281&r1=1635280&r2=1635281&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
Wed Oct 29 19:55:04 2014
@@ -20,9 +20,9 @@ package org.apache.uima.ducc.container.c
import java.util.concurrent.ConcurrentHashMap;
-import org.apache.uima.ducc.container.common.DuccLogger;
-import org.apache.uima.ducc.container.common.IDuccId;
-import org.apache.uima.ducc.container.common.IDuccLogger;
+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;
@@ -34,7 +34,7 @@ import org.apache.uima.ducc.container.co
public class Fsm implements IFsmBuilder {
- private static IDuccLogger logger = DuccLogger.getLogger(Fsm.class,
IDuccLogger.Component.JD.name());
+ private static IContainerLogger logger =
ContainerLogger.getLogger(Fsm.class, IContainerLogger.Component.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, IDuccId.null_id, mb.toString());
+ logger.debug(location, IEntityId.null_id, mb.toString());
}
@Override
@@ -90,7 +90,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, IDuccId.null_id, mb.toString());
+ logger.debug(location, IEntityId.null_id, mb.toString());
return map.putIfAbsent(key, value);
}
@@ -100,7 +100,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, IDuccId.null_id, mb.toString());
+ logger.debug(location, IEntityId.null_id, mb.toString());
IStateEventValue value = map.get(key);
return value;
}
@@ -129,7 +129,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, IDuccId.null_id,
mb.toString());
+ logger.info(location, IEntityId.null_id,
mb.toString());
}
}
catch(Exception e) {
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/JobDriverCasManager.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/JobDriverCasManager.java?rev=1635281&r1=1635280&r2=1635281&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/JobDriverCasManager.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/JobDriverCasManager.java
Wed Oct 29 19:55:04 2014
@@ -22,15 +22,15 @@ import java.net.URL;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.atomic.AtomicInteger;
-import org.apache.uima.ducc.container.common.DuccLogger;
-import org.apache.uima.ducc.container.common.IDuccId;
-import org.apache.uima.ducc.container.common.IDuccLogger;
+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.jd.classload.JobDriverCollectionReader;
import org.apache.uima.ducc.container.net.impl.MetaCas;
public class JobDriverCasManager {
- private IDuccLogger logger =
DuccLogger.getLogger(JobDriverCasManager.class,
IDuccLogger.Component.JD.name());
+ private IContainerLogger logger =
ContainerLogger.getLogger(JobDriverCasManager.class,
IContainerLogger.Component.JD.name());
private JobDriverCollectionReader jdcr = null;
@@ -56,7 +56,7 @@ public class JobDriverCasManager {
jdcr = new JobDriverCollectionReader(classLoaderUrls,
crXml, crCfg);
}
catch(JobDriverException e) {
- logger.error(location, IDuccId.null_id, e);
+ logger.error(location, IEntityId.null_id, e);
throw e;
}
}
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/JobDriverCommon.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/JobDriverCommon.java?rev=1635281&r1=1635280&r2=1635281&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/JobDriverCommon.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/JobDriverCommon.java
Wed Oct 29 19:55:04 2014
@@ -19,16 +19,17 @@
package org.apache.uima.ducc.container.jd;
import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.atomic.AtomicInteger;
-import org.apache.uima.ducc.container.common.DuccLogger;
-import org.apache.uima.ducc.container.common.IDuccId;
-import org.apache.uima.ducc.container.common.IDuccLogger;
+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.jd.dispatch.IRemoteWorkerIdentity;
import org.apache.uima.ducc.container.jd.dispatch.IWorkItem;
public class JobDriverCommon {
- private static IDuccLogger logger =
DuccLogger.getLogger(JobDriverCommon.class, IDuccLogger.Component.JD.name());
+ private static IContainerLogger logger =
ContainerLogger.getLogger(JobDriverCommon.class,
IContainerLogger.Component.JD.name());
private static JobDriverCommon instance = null;
@@ -36,6 +37,10 @@ public class JobDriverCommon {
return instance;
}
+ private AtomicInteger wiSuccess = new AtomicInteger(0);
+ private AtomicInteger wiFailure = new AtomicInteger(0);
+ private AtomicInteger wiRetry = new AtomicInteger(0);
+
private ConcurrentHashMap<IRemoteWorkerIdentity, IWorkItem> map = null;
private JobDriverCasManager jdcm = null;
@@ -53,7 +58,7 @@ public class JobDriverCommon {
jdcm = new JobDriverCasManager(classpath, crXml, crCfg);
}
catch(Exception e) {
- logger.error(location, IDuccId.null_id, e);
+ logger.error(location, IEntityId.null_id, e);
}
}
@@ -65,4 +70,33 @@ public class JobDriverCommon {
public JobDriverCasManager getCasManager() {
return jdcm;
}
+
+ //
+
+ public int getWorkItemCountSuccess() {
+ return wiSuccess.get();
+ }
+
+ public int getWorkItemCountFailure() {
+ return wiFailure.get();
+ }
+
+ public int getWorkItemCountRetry() {
+ return wiRetry.get();
+ }
+
+ //
+
+ public void workItemSuccess() {
+ wiSuccess.incrementAndGet();
+ }
+
+ public void workItemFailure() {
+ wiFailure.incrementAndGet();
+ }
+
+ public void workItemRetry() {
+ wiRetry.incrementAndGet();
+ }
+
}
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/classload/JobDriverCollectionReader.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/JobDriverCollectionReader.java?rev=1635281&r1=1635280&r2=1635281&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/classload/JobDriverCollectionReader.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/classload/JobDriverCollectionReader.java
Wed Oct 29 19:55:04 2014
@@ -24,9 +24,9 @@ import java.lang.reflect.Method;
import java.net.URL;
import java.net.URLClassLoader;
-import org.apache.uima.ducc.container.common.DuccLogger;
-import org.apache.uima.ducc.container.common.IDuccId;
-import org.apache.uima.ducc.container.common.IDuccLogger;
+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.jd.JobDriverException;
@@ -34,7 +34,7 @@ import org.apache.uima.ducc.container.ne
public class JobDriverCollectionReader {
- private IDuccLogger logger =
DuccLogger.getLogger(JobDriverCollectionReader.class,
IDuccLogger.Component.JD.name());
+ private IContainerLogger logger =
ContainerLogger.getLogger(JobDriverCollectionReader.class,
IContainerLogger.Component.JD.name());
private URLClassLoader urlClassLoader = null;
private String crXml = null;
@@ -183,7 +183,7 @@ public class JobDriverCollectionReader {
private void setURLClassLoader(URLClassLoader value) {
String location = "setURLClassLoader";
- logger.debug(location, IDuccId.null_id, value);
+ logger.debug(location, IEntityId.null_id, value);
urlClassLoader = value;
}
@@ -198,11 +198,11 @@ public class JobDriverCollectionReader {
private void loadClass(String className) throws JobDriverException {
String location = "loadClass";
try {
- logger.info(location, IDuccId.null_id, "loading
"+className);
+ logger.info(location, IEntityId.null_id, "loading
"+className);
Class<?> loadedClass =
urlClassLoader.loadClass(className);
MessageBuffer mb = new MessageBuffer();
mb.append(Standardize.Label.loaded.get()+loadedClass.getName());
- logger.debug(location, IDuccId.null_id, mb.toString());
+ logger.debug(location, IEntityId.null_id,
mb.toString());
} catch (ClassNotFoundException e) {
throw new JobDriverException(e);
}
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/dispatch/Dispatcher.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/dispatch/Dispatcher.java?rev=1635281&r1=1635280&r2=1635281&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/dispatch/Dispatcher.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/dispatch/Dispatcher.java
Wed Oct 29 19:55:04 2014
@@ -20,9 +20,9 @@ package org.apache.uima.ducc.container.j
import java.util.concurrent.ConcurrentHashMap;
-import org.apache.uima.ducc.container.common.DuccLogger;
-import org.apache.uima.ducc.container.common.IDuccId;
-import org.apache.uima.ducc.container.common.IDuccLogger;
+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.IEvent;
@@ -36,7 +36,7 @@ import org.apache.uima.ducc.container.ne
public class Dispatcher {
- private static IDuccLogger logger =
DuccLogger.getLogger(Dispatcher.class, IDuccLogger.Component.JD.name());
+ private static IContainerLogger logger =
ContainerLogger.getLogger(Dispatcher.class,
IContainerLogger.Component.JD.name());
public Dispatcher() {
}
@@ -60,7 +60,7 @@ public class Dispatcher {
MessageBuffer mb = new MessageBuffer();
mb.append(Standardize.Label.remote.get()+rwi.toString());
mb.append(Standardize.Label.type.get()+trans.getType());
- logger.info(location, IDuccId.null_id, mb.toString());
+ logger.info(location, IEntityId.null_id, mb.toString());
Type type = trans.getType();
switch(type) {
case Get:
@@ -77,7 +77,7 @@ public class Dispatcher {
}
}
catch(Exception e) {
- logger.error(location, IDuccId.null_id, e);
+ logger.error(location, IEntityId.null_id, e);
}
}
@@ -92,7 +92,7 @@ public class Dispatcher {
wi = map.get(rwi);
MessageBuffer mb = new MessageBuffer();
mb.append(Standardize.Label.remote.get()+rwi.toString());
- logger.debug(location, IDuccId.null_id, mb.toString());
+ logger.debug(location, IEntityId.null_id,
mb.toString());
}
return wi;
}
@@ -105,13 +105,13 @@ public class Dispatcher {
MessageBuffer mb = new MessageBuffer();
mb.append(Standardize.Label.remote.get()+rwi.toString());
mb.append(Standardize.Label.seqNo.get()+wi.getMetaCas().getSystemKey());
- logger.debug(location, IDuccId.null_id, mb.toString());
+ logger.debug(location, IEntityId.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, IDuccId.null_id, mb.toString());
+ logger.debug(location, IEntityId.null_id,
mb.toString());
}
return wi;
}
@@ -140,7 +140,7 @@ public class Dispatcher {
MessageBuffer mb = new MessageBuffer();
mb.append(Standardize.Label.remote.get()+rwi.toString());
mb.append("has no work assigned presently");
- logger.debug(location, IDuccId.null_id, mb.toString());
+ logger.debug(location, IEntityId.null_id,
mb.toString());
}
else {
trans.setMetaCas(wi.getMetaCas());
@@ -158,7 +158,7 @@ public class Dispatcher {
MessageBuffer mb = new MessageBuffer();
mb.append(Standardize.Label.remote.get()+rwi.toString());
mb.append("has no work assigned presently");
- logger.debug(location, IDuccId.null_id, mb.toString());
+ logger.debug(location, IEntityId.null_id,
mb.toString());
}
else {
trans.setMetaCas(wi.getMetaCas());
@@ -169,7 +169,7 @@ public class Dispatcher {
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, IDuccId.null_id, mb.toString());
+ logger.debug(location, IEntityId.null_id,
mb.toString());
}
}
}
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/dispatch/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/dispatch/RemoteWorkerIdentity.java?rev=1635281&r1=1635280&r2=1635281&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/dispatch/RemoteWorkerIdentity.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/dispatch/RemoteWorkerIdentity.java
Wed Oct 29 19:55:04 2014
@@ -18,14 +18,14 @@
*/
package org.apache.uima.ducc.container.jd.dispatch;
-import org.apache.uima.ducc.container.common.DuccLogger;
-import org.apache.uima.ducc.container.common.IDuccId;
-import org.apache.uima.ducc.container.common.IDuccLogger;
+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.net.iface.IMetaCasRequester;
public class RemoteWorkerIdentity implements IRemoteWorkerIdentity,
Comparable<Object> {
- private IDuccLogger logger =
DuccLogger.getLogger(RemoteWorkerIdentity.class,
IDuccLogger.Component.JD.name());
+ private IContainerLogger logger =
ContainerLogger.getLogger(RemoteWorkerIdentity.class,
IContainerLogger.Component.JD.name());
private String node = null;
private int pid = 0;
@@ -133,7 +133,7 @@ public class RemoteWorkerIdentity implem
}
}
catch(Exception e) {
- logger.error(location, IDuccId.null_id, e);
+ logger.error(location, IEntityId.null_id, e);
}
return retVal;
}
@@ -169,7 +169,7 @@ public class RemoteWorkerIdentity implem
}
}
catch(Exception e) {
- logger.error(location, IDuccId.null_id, e);
+ logger.error(location, IEntityId.null_id, e);
}
return retVal;
}
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionAckCAS.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/ActionAckCAS.java?rev=1635281&r1=1635280&r2=1635281&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionAckCAS.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionAckCAS.java
Wed Oct 29 19:55:04 2014
@@ -18,9 +18,9 @@
*/
package org.apache.uima.ducc.container.jd.fsm.wi;
-import org.apache.uima.ducc.container.common.DuccLogger;
-import org.apache.uima.ducc.container.common.IDuccId;
-import org.apache.uima.ducc.container.common.IDuccLogger;
+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;
@@ -32,7 +32,7 @@ import org.apache.uima.ducc.container.ne
public class ActionAckCAS implements IAction {
- private IDuccLogger logger = DuccLogger.getLogger(ActionAckCAS.class,
IDuccLogger.Component.JD.name());
+ private IContainerLogger logger =
ContainerLogger.getLogger(ActionAckCAS.class,
IContainerLogger.Component.JD.name());
@Override
public String getName() {
@@ -42,7 +42,7 @@ public class ActionAckCAS implements IAc
@Override
public void engage(Object objectData) {
String location = "engage";
- logger.debug(location, IDuccId.null_id, "");
+ logger.debug(location, IEntityId.null_id, "");
IActionData actionData = (IActionData) objectData;
try {
IWorkItem wi = actionData.getWorkItem();
@@ -57,15 +57,15 @@ public class ActionAckCAS implements IAc
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, IDuccId.null_id,
mb.toString());
+ logger.info(location, IEntityId.null_id,
mb.toString());
}
else {MessageBuffer mb = new MessageBuffer();
mb.append("No CAS found for processing");
- logger.info(location, IDuccId.null_id,
mb.toString());
+ logger.info(location, IEntityId.null_id,
mb.toString());
}
}
catch(Exception e) {
- logger.error(location, IDuccId.null_id, e);
+ logger.error(location, IEntityId.null_id, e);
}
}
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionEndCAS.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/ActionEndCAS.java?rev=1635281&r1=1635280&r2=1635281&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionEndCAS.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionEndCAS.java
Wed Oct 29 19:55:04 2014
@@ -18,9 +18,9 @@
*/
package org.apache.uima.ducc.container.jd.fsm.wi;
-import org.apache.uima.ducc.container.common.DuccLogger;
-import org.apache.uima.ducc.container.common.IDuccId;
-import org.apache.uima.ducc.container.common.IDuccLogger;
+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;
@@ -32,7 +32,7 @@ import org.apache.uima.ducc.container.ne
public class ActionEndCAS implements IAction {
- private IDuccLogger logger = DuccLogger.getLogger(ActionEndCAS.class,
IDuccLogger.Component.JD.name());
+ private IContainerLogger logger =
ContainerLogger.getLogger(ActionEndCAS.class,
IContainerLogger.Component.JD.name());
@Override
public String getName() {
@@ -42,7 +42,7 @@ public class ActionEndCAS implements IAc
@Override
public void engage(Object objectData) {
String location = "engage";
- logger.debug(location, IDuccId.null_id, "");
+ logger.debug(location, IEntityId.null_id, "");
IActionData actionData = (IActionData) objectData;
try {
IWorkItem wi = actionData.getWorkItem();
@@ -56,15 +56,15 @@ public class ActionEndCAS implements IAc
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, IDuccId.null_id,
mb.toString());
+ logger.info(location, IEntityId.null_id,
mb.toString());
}
else {MessageBuffer mb = new MessageBuffer();
mb.append("No CAS found for processing");
- logger.info(location, IDuccId.null_id,
mb.toString());
+ logger.info(location, IEntityId.null_id,
mb.toString());
}
}
catch(Exception e) {
- logger.error(location, IDuccId.null_id, e);
+ logger.error(location, IEntityId.null_id, e);
}
}
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionGetCAS.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/ActionGetCAS.java?rev=1635281&r1=1635280&r2=1635281&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionGetCAS.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionGetCAS.java
Wed Oct 29 19:55:04 2014
@@ -18,9 +18,9 @@
*/
package org.apache.uima.ducc.container.jd.fsm.wi;
-import org.apache.uima.ducc.container.common.DuccLogger;
-import org.apache.uima.ducc.container.common.IDuccId;
-import org.apache.uima.ducc.container.common.IDuccLogger;
+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;
@@ -34,7 +34,7 @@ import org.apache.uima.ducc.container.ne
public class ActionGetCAS implements IAction {
- private IDuccLogger logger = DuccLogger.getLogger(ActionGetCAS.class,
IDuccLogger.Component.JD.name());
+ private IContainerLogger logger =
ContainerLogger.getLogger(ActionGetCAS.class,
IContainerLogger.Component.JD.name());
@Override
public String getName() {
@@ -44,7 +44,7 @@ public class ActionGetCAS implements IAc
@Override
public void engage(Object objectData) {
String location = "engage";
- logger.debug(location, IDuccId.null_id, "");
+ logger.debug(location, IEntityId.null_id, "");
IActionData actionData = (IActionData) objectData;
try {
IWorkItem wi = actionData.getWorkItem();
@@ -61,16 +61,16 @@ public class ActionGetCAS implements IAc
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, IDuccId.null_id,
mb.toString());
+ logger.info(location, IEntityId.null_id,
mb.toString());
}
else {MessageBuffer mb = new MessageBuffer();
mb.append("No CAS found for processing");
- logger.info(location, IDuccId.null_id,
mb.toString());
+ logger.info(location, IEntityId.null_id,
mb.toString());
}
}
catch(Exception e) {
- logger.error(location, IDuccId.null_id, e);
+ logger.error(location, IEntityId.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=1635281&r1=1635280&r2=1635281&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
Wed Oct 29 19:55:04 2014
@@ -18,14 +18,14 @@
*/
package org.apache.uima.ducc.container.jd.fsm.wi;
-import org.apache.uima.ducc.container.common.DuccLogger;
-import org.apache.uima.ducc.container.common.IDuccId;
-import org.apache.uima.ducc.container.common.IDuccLogger;
+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;
public class ActionIgnore implements IAction {
- private IDuccLogger logger = DuccLogger.getLogger(ActionIgnore.class,
IDuccLogger.Component.JD.name());
+ private IContainerLogger logger =
ContainerLogger.getLogger(ActionIgnore.class,
IContainerLogger.Component.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, IDuccId.null_id, "");
+ logger.debug(location, IEntityId.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/ActionSendCAS.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/ActionSendCAS.java?rev=1635281&r1=1635280&r2=1635281&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionSendCAS.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionSendCAS.java
Wed Oct 29 19:55:04 2014
@@ -18,14 +18,14 @@
*/
package org.apache.uima.ducc.container.jd.fsm.wi;
-import org.apache.uima.ducc.container.common.DuccLogger;
-import org.apache.uima.ducc.container.common.IDuccId;
-import org.apache.uima.ducc.container.common.IDuccLogger;
+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;
public class ActionSendCAS implements IAction {
- private IDuccLogger logger = DuccLogger.getLogger(ActionSendCAS.class,
IDuccLogger.Component.JD.name());
+ private IContainerLogger logger =
ContainerLogger.getLogger(ActionSendCAS.class,
IContainerLogger.Component.JD.name());
@Override
public String getName() {
@@ -35,7 +35,7 @@ public class ActionSendCAS implements IA
@Override
public void engage(Object objectData) {
String location = "engage";
- logger.debug(location, IDuccId.null_id, "");
+ logger.debug(location, IEntityId.null_id, "");
IActionData actionData = (IActionData) objectData;
}
