Author: degenaro
Date: Mon Nov 3 10:27:25 2014
New Revision: 1636307
URL: http://svn.apache.org/r1636307
Log:
UIMA-4069 Redesign of JD toward the main goal of classpath separation for
container (system) code.
Relocate CasManager to cas package.
Added:
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/JobDriver.java
(with props)
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/cas/
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/cas/CasManager.java
- copied, changed from r1636124,
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/cas/CasManagerStats.java
- copied, changed from r1636127,
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/CasManagerStats.java
Removed:
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/CasManagerStats.java
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/JobDriverCasManager.java
Modified:
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/dispatch/Dispatcher.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/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/test/java/org/apache/uima/ducc/container/jd/test/TestSuite.java
Added:
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=1636307&view=auto
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/JobDriver.java
(added)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/JobDriver.java
Mon Nov 3 10:27:25 2014
@@ -0,0 +1,48 @@
+/*
+ * 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.jd;
+
+import org.apache.uima.ducc.container.common.ContainerLogger;
+import org.apache.uima.ducc.container.common.IContainerLogger;
+import org.apache.uima.ducc.container.common.IEntityId;
+
+public class JobDriver {
+
+ private static IContainerLogger logger =
ContainerLogger.getLogger(JobDriver.class,
IContainerLogger.Component.JD.name());
+
+ private JobDriver() {
+ }
+
+ private void mainline(String[] args) {
+ String location = "mainline";
+ try {
+ //TODO
+ }
+ catch(Exception e) {
+ logger.error(location, IEntityId.null_id, e);
+ }
+ }
+
+ public static void main(String[] args) {
+ JobDriver jobDriver = new JobDriver();
+ jobDriver.mainline(args);
+
+ }
+
+}
Propchange:
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/JobDriver.java
------------------------------------------------------------------------------
svn:eol-style = native
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=1636307&r1=1636306&r2=1636307&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
Mon Nov 3 10:27:25 2014
@@ -23,6 +23,7 @@ import java.util.concurrent.ConcurrentHa
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.jd.cas.CasManager;
import org.apache.uima.ducc.container.jd.dispatch.iface.IRemoteWorkerIdentity;
import org.apache.uima.ducc.container.jd.dispatch.iface.IWorkItem;
@@ -41,13 +42,13 @@ public class JobDriverCommon {
}
private ConcurrentHashMap<IRemoteWorkerIdentity, IWorkItem> map = null;
- private JobDriverCasManager jdcm = null;
+ private CasManager cm = null;
public void initialize(String[] classpath, String crXml, String crCfg) {
String location = "initialize";
try {
map = new ConcurrentHashMap<IRemoteWorkerIdentity,
IWorkItem>();
- jdcm = new JobDriverCasManager(classpath, crXml, crCfg);
+ cm = new CasManager(classpath, crXml, crCfg);
}
catch(Exception e) {
logger.error(location, IEntityId.null_id, e);
@@ -58,8 +59,8 @@ public class JobDriverCommon {
return map;
}
- public JobDriverCasManager getCasManager() {
- return jdcm;
+ public CasManager getCasManager() {
+ return cm;
}
}
Copied:
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/cas/CasManager.java
(from r1636124,
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/cas/CasManager.java?p2=uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/cas/CasManager.java&p1=uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/JobDriverCasManager.java&r1=1636124&r2=1636307&rev=1636307&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/cas/CasManager.java
Mon Nov 3 10:27:25 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.uima.ducc.container.jd;
+package org.apache.uima.ducc.container.jd.cas;
import java.net.URL;
import java.util.concurrent.LinkedBlockingQueue;
@@ -24,13 +24,14 @@ import java.util.concurrent.LinkedBlocki
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.jd.CasManagerStats.RetryReason;
+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.JobDriverCollectionReader;
import org.apache.uima.ducc.container.net.iface.IMetaCas;
-public class JobDriverCasManager {
+public class CasManager {
- private IContainerLogger logger =
ContainerLogger.getLogger(JobDriverCasManager.class,
IContainerLogger.Component.JD.name());
+ private IContainerLogger logger =
ContainerLogger.getLogger(CasManager.class,
IContainerLogger.Component.JD.name());
private JobDriverCollectionReader jdcr = null;
@@ -38,7 +39,7 @@ public class JobDriverCasManager {
private CasManagerStats casManagerStats = new CasManagerStats();
- public JobDriverCasManager(String[] classpath, String crXml, String
crCfg) throws JobDriverException {
+ public CasManager(String[] classpath, String crXml, String crCfg)
throws JobDriverException {
initialize(classpath, crXml, crCfg);
}
Copied:
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/cas/CasManagerStats.java
(from r1636127,
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/CasManagerStats.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/CasManagerStats.java?p2=uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/cas/CasManagerStats.java&p1=uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/CasManagerStats.java&r1=1636127&r2=1636307&rev=1636307&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/CasManagerStats.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/cas/CasManagerStats.java
Mon Nov 3 10:27:25 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.uima.ducc.container.jd;
+package org.apache.uima.ducc.container.jd.cas;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicInteger;
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=1636307&r1=1636306&r2=1636307&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
Mon Nov 3 10:27:25 2014
@@ -28,9 +28,9 @@ import org.apache.uima.ducc.container.co
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.jd.CasManagerStats;
-import org.apache.uima.ducc.container.jd.JobDriverCasManager;
import org.apache.uima.ducc.container.jd.JobDriverCommon;
+import org.apache.uima.ducc.container.jd.cas.CasManagerStats;
+import org.apache.uima.ducc.container.jd.cas.CasManager;
import org.apache.uima.ducc.container.jd.dispatch.iface.IRemoteWorkerIdentity;
import org.apache.uima.ducc.container.jd.dispatch.iface.IWorkItem;
import org.apache.uima.ducc.container.jd.fsm.wi.ActionData;
@@ -55,8 +55,8 @@ public class Dispatcher {
IOperatingInfo retVal = null;
try {
retVal = new OperatingInfo();
- JobDriverCasManager jdcm =
JobDriverCommon.getInstance().getCasManager();
- CasManagerStats cms = jdcm.getCasManagerStats();
+ CasManager cm =
JobDriverCommon.getInstance().getCasManager();
+ CasManagerStats cms = cm.getCasManagerStats();
retVal.setWorkItemCrTotal(cms.getCrTotal());
retVal.setWorkItemCrFetches(cms.getCrGets());
retVal.setWorkItemPreemptions(cms.getNumberOfPreemptions());
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=1636307&r1=1636306&r2=1636307&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
Mon Nov 3 10:27:25 2014
@@ -26,8 +26,8 @@ import org.apache.uima.ducc.container.co
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.jd.JobDriverCasManager;
import org.apache.uima.ducc.container.jd.JobDriverCommon;
+import org.apache.uima.ducc.container.jd.cas.CasManager;
import org.apache.uima.ducc.container.jd.dispatch.RemoteWorkerIdentity;
import org.apache.uima.ducc.container.jd.dispatch.iface.IRemoteWorkerIdentity;
import org.apache.uima.ducc.container.jd.dispatch.iface.IWorkItem;
@@ -54,8 +54,8 @@ public class ActionGet implements IActio
IMetaCasTransaction trans =
actionData.getMetaCasTransaction();
IRemoteWorkerIdentity rwi = new
RemoteWorkerIdentity(trans);
//
- JobDriverCasManager jdcm =
JobDriverCommon.getInstance().getCasManager();
- IMetaCas metaCas = jdcm.getMetaCas();
+ CasManager cm =
JobDriverCommon.getInstance().getCasManager();
+ IMetaCas metaCas = cm.getMetaCas();
trans.setMetaCas(metaCas);
//
IEvent event = null;
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=1636307&r1=1636306&r2=1636307&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
Mon Nov 3 10:27:25 2014
@@ -26,8 +26,8 @@ import org.apache.uima.ducc.container.co
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.jd.JobDriverCasManager;
import org.apache.uima.ducc.container.jd.JobDriverCommon;
+import org.apache.uima.ducc.container.jd.cas.CasManager;
import org.apache.uima.ducc.container.jd.dispatch.RemoteWorkerIdentity;
import org.apache.uima.ducc.container.jd.dispatch.iface.IRemoteWorkerIdentity;
import org.apache.uima.ducc.container.jd.dispatch.iface.IWorkItem;
@@ -54,8 +54,8 @@ public class ActionInProgress implements
IMetaCasTransaction trans =
actionData.getMetaCasTransaction();
IRemoteWorkerIdentity rwi = new
RemoteWorkerIdentity(trans);
//
- JobDriverCasManager jdcm =
JobDriverCommon.getInstance().getCasManager();
- IMetaCas metaCas = jdcm.getMetaCas();
+ CasManager cm =
JobDriverCommon.getInstance().getCasManager();
+ IMetaCas metaCas = cm.getMetaCas();
trans.setMetaCas(metaCas);
//
IEvent event = null;
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=1636307&r1=1636306&r2=1636307&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
Mon Nov 3 10:27:25 2014
@@ -22,9 +22,9 @@ import org.apache.uima.ducc.container.co
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.jd.CasManagerStats.RetryReason;
-import org.apache.uima.ducc.container.jd.JobDriverCasManager;
import org.apache.uima.ducc.container.jd.JobDriverCommon;
+import org.apache.uima.ducc.container.jd.cas.CasManager;
+import org.apache.uima.ducc.container.jd.cas.CasManagerStats.RetryReason;
import org.apache.uima.ducc.container.jd.dispatch.iface.IWorkItem;
import org.apache.uima.ducc.container.net.iface.IMetaCas;
@@ -46,8 +46,8 @@ public class ActionPreempt implements IA
IWorkItem wi = actionData.getWorkItem();
IMetaCas metaCas = wi.getMetaCas();
//
- JobDriverCasManager jdcm =
JobDriverCommon.getInstance().getCasManager();
- jdcm.putMetaCas(metaCas, RetryReason.ProcessPreempt);
+ CasManager cm =
JobDriverCommon.getInstance().getCasManager();
+ cm.putMetaCas(metaCas, RetryReason.ProcessPreempt);
}
catch(Exception e) {
logger.error(location, IEntityId.null_id, e);
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/TestSuite.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/TestSuite.java?rev=1636307&r1=1636306&r2=1636307&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/TestSuite.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/TestSuite.java
Mon Nov 3 10:27:25 2014
@@ -24,9 +24,9 @@ import static org.junit.Assert.fail;
import java.io.File;
import java.net.URL;
-import org.apache.uima.ducc.container.jd.CasManagerStats.RetryReason;
-import org.apache.uima.ducc.container.jd.JobDriverCasManager;
import org.apache.uima.ducc.container.jd.JobDriverException;
+import org.apache.uima.ducc.container.jd.cas.CasManager;
+import org.apache.uima.ducc.container.jd.cas.CasManagerStats.RetryReason;
import org.apache.uima.ducc.container.jd.classload.JobDriverCollectionReader;
import org.apache.uima.ducc.container.jd.dispatch.RemoteWorkerIdentity;
import org.apache.uima.ducc.container.jd.mh.impl.OperatingInfo;
@@ -347,23 +347,23 @@ public class TestSuite {
String crXml = file.getAbsolutePath();
String crCfg = null;
String[] jarList = jarList260;
- JobDriverCasManager jdcm = new
JobDriverCasManager(jarList, crXml, crCfg);
- int total = jdcm.getCasManagerStats().getCrTotal();
+ CasManager cm = new CasManager(jarList, crXml, crCfg);
+ int total = cm.getCasManagerStats().getCrTotal();
assertTrue(total == 100);
- IMetaCas metaCas = jdcm.getMetaCas();
+ IMetaCas metaCas = cm.getMetaCas();
int retrys = 3;
while(metaCas != null) {
-
if(jdcm.getCasManagerStats().getRetryQueuePuts() < retrys) {
- jdcm.putMetaCas(metaCas,
RetryReason.ProcessPreempt);
+ if(cm.getCasManagerStats().getRetryQueuePuts()
< retrys) {
+ cm.putMetaCas(metaCas,
RetryReason.ProcessPreempt);
}
- metaCas = jdcm.getMetaCas();
+ metaCas = cm.getMetaCas();
}
- int crGets = jdcm.getCasManagerStats().getCrGets();
+ int crGets = cm.getCasManagerStats().getCrGets();
debug("crGets:"+crGets);
assertTrue(crGets == total);
- int rqPuts =
jdcm.getCasManagerStats().getRetryQueuePuts();
+ int rqPuts =
cm.getCasManagerStats().getRetryQueuePuts();
debug("rqPuts:"+rqPuts);
- int rqGets =
jdcm.getCasManagerStats().getRetryQueueGets();
+ int rqGets =
cm.getCasManagerStats().getRetryQueueGets();
debug("rqGets:"+rqGets);
assertTrue(rqPuts == retrys);
assertTrue(rqGets == rqPuts);
