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/10 14:53:16 UTC
svn commit: r1637861 - 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/jd/
main/java/org/apache/uima/ducc/container/jd/config/
main/java/org/apache/uima...
Author: degenaro
Date: Mon Nov 10 13:53:16 2014
New Revision: 1637861
URL: http://svn.apache.org/r1637861
Log:
UIMA-4069 Redesign of JD toward the main goal of classpath separation for container (system) code.
Job Driver configuration interface.
Added:
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/JobDriver.java
- copied, changed from r1637833, 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/config/
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/config/IJobDriverConfig.java (with props)
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/config/JobDriverConfig.java (with props)
Removed:
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/JobDriverCommon.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/jd/fsm/wi/ActionEnd.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/main/java/org/apache/uima/ducc/container/jd/mh/Dispatcher.java
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/wi/RunningWorkItemStatistics.java
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/TestDispatcher.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=1637861&r1=1637860&r2=1637861&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 Mon Nov 10 13:53:16 2014
@@ -18,11 +18,9 @@
*/
package org.apache.uima.ducc.container.common;
-import org.apache.uima.ducc.container.jd.JobDriver;
-
public class Assertion {
- private static IContainerLogger logger = ContainerLogger.getLogger(JobDriver.class, IContainerLogger.Component.JD.name());
+ private static IContainerLogger logger = ContainerLogger.getLogger(Assertion.class, IContainerLogger.Component.JD.name());
public static void nonNegative(long value) {
String location = "nonNegative";
Copied: uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/JobDriver.java (from r1637833, 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/JobDriver.java?p2=uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/JobDriver.java&p1=uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/JobDriverCommon.java&r1=1637833&r2=1637861&rev=1637861&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/JobDriver.java Mon Nov 10 13:53:16 2014
@@ -24,23 +24,24 @@ 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.jd.cas.CasManager;
+import org.apache.uima.ducc.container.jd.config.IJobDriverConfig;
import org.apache.uima.ducc.container.jd.mh.iface.remote.IRemoteWorkerIdentity;
import org.apache.uima.ducc.container.jd.wi.IWorkItem;
import org.apache.uima.ducc.container.jd.wi.IWorkItemStatistics;
import org.apache.uima.ducc.container.jd.wi.WorkItemStatistics;
-public class JobDriverCommon {
+public class JobDriver {
- private static IContainerLogger logger = ContainerLogger.getLogger(JobDriverCommon.class, IContainerLogger.Component.JD.name());
+ private static IContainerLogger logger = ContainerLogger.getLogger(JobDriver.class, IContainerLogger.Component.JD.name());
- private static JobDriverCommon instance = new JobDriverCommon();
+ private static JobDriver instance = new JobDriver();
- public static JobDriverCommon getInstance() {
+ public static JobDriver getInstance() {
return instance;
}
- public static void setInstance(String[] classpath, String crXml, String crCfg) {
- instance.initialize(classpath, crXml, crCfg);
+ public static void setInstance(IJobDriverConfig jobDriverConfig) {
+ instance.initialize(jobDriverConfig);
}
private ConcurrentHashMap<IRemoteWorkerIdentity, IWorkItem> map = null;
@@ -48,12 +49,12 @@ public class JobDriverCommon {
private CasManager cm = null;
- public void initialize(String[] classpath, String crXml, String crCfg) {
+ public void initialize(IJobDriverConfig jdCfg) {
String location = "initialize";
try {
map = new ConcurrentHashMap<IRemoteWorkerIdentity, IWorkItem>();
wis = new WorkItemStatistics();
- cm = new CasManager(classpath, crXml, crCfg);
+ cm = new CasManager(jdCfg.getUserClasspath(), jdCfg.getCrXml(), jdCfg.getCrCfg());
}
catch(Exception e) {
logger.error(location, IEntityId.null_id, e);
Added: uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/config/IJobDriverConfig.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/config/IJobDriverConfig.java?rev=1637861&view=auto
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/config/IJobDriverConfig.java (added)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/config/IJobDriverConfig.java Mon Nov 10 13:53:16 2014
@@ -0,0 +1,37 @@
+/*
+ * 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.config;
+
+public interface IJobDriverConfig {
+
+ public void setUserClasspath(String[] value);
+ public String[] getUserClasspath();
+
+ public void setCrXml(String value);
+ public String getCrXml();
+
+ public void setCrCfg(String value);
+ public String getCrCfg();
+
+ public void setErrorHandlerClassName(String value);
+ public String getErrorHandlerClassName();
+
+ public void setErrorHandlerConfigurationParameters(String value);
+ public String getErrorHandlerConfigurationParameters();
+}
Propchange: uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/config/IJobDriverConfig.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/config/JobDriverConfig.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/config/JobDriverConfig.java?rev=1637861&view=auto
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/config/JobDriverConfig.java (added)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/config/JobDriverConfig.java Mon Nov 10 13:53:16 2014
@@ -0,0 +1,80 @@
+/*
+ * 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.config;
+
+public class JobDriverConfig implements IJobDriverConfig {
+
+ private String[] userClasspath = null;
+ private String crXml = null;
+ private String crCfg = null;
+
+ private String errorHandlerClassName = null;
+ private String errorHandlerConfigurationParameters = null;
+
+ @Override
+ public void setUserClasspath(String[] value) {
+ userClasspath = value;
+ }
+
+ @Override
+ public String[] getUserClasspath() {
+ return userClasspath;
+ }
+
+ @Override
+ public void setCrXml(String value) {
+ crXml = value;
+ }
+
+ @Override
+ public String getCrXml() {
+ return crXml;
+ }
+
+ @Override
+ public void setCrCfg(String value) {
+ crCfg = value;
+ }
+
+ @Override
+ public String getCrCfg() {
+ return crCfg;
+ }
+
+ @Override
+ public void setErrorHandlerClassName(String value) {
+ errorHandlerClassName = value;
+ }
+
+ @Override
+ public String getErrorHandlerClassName() {
+ return errorHandlerClassName;
+ }
+
+ @Override
+ public void setErrorHandlerConfigurationParameters(String value) {
+ errorHandlerConfigurationParameters = value;
+ }
+
+ @Override
+ public String getErrorHandlerConfigurationParameters() {
+ return errorHandlerConfigurationParameters;
+ }
+
+}
Propchange: uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/config/JobDriverConfig.java
------------------------------------------------------------------------------
svn:eol-style = native
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=1637861&r1=1637860&r2=1637861&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 Mon Nov 10 13:53:16 2014
@@ -24,7 +24,7 @@ import org.apache.uima.ducc.container.co
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.jd.JobDriverCommon;
+import org.apache.uima.ducc.container.jd.JobDriver;
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;
@@ -73,7 +73,7 @@ public class ActionEnd implements IActio
}
private void updateStatistics(IWorkItem wi) {
- IWorkItemStatistics wis = JobDriverCommon.getInstance().getWorkItemStatistics();
+ IWorkItemStatistics wis = JobDriver.getInstance().getWorkItemStatistics();
wis.ended(wi);
}
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=1637861&r1=1637860&r2=1637861&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 10 13:53:16 2014
@@ -26,7 +26,7 @@ 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.JobDriverCommon;
+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;
import org.apache.uima.ducc.container.jd.mh.iface.remote.IRemoteWorkerIdentity;
@@ -54,7 +54,7 @@ public class ActionGet implements IActio
IMetaCasTransaction trans = actionData.getMetaCasTransaction();
IRemoteWorkerIdentity rwi = new RemoteWorkerIdentity(trans);
//
- CasManager cm = JobDriverCommon.getInstance().getCasManager();
+ CasManager cm = JobDriver.getInstance().getCasManager();
IMetaCas metaCas = cm.getMetaCas();
trans.setMetaCas(metaCas);
//
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=1637861&r1=1637860&r2=1637861&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 10 13:53:16 2014
@@ -26,7 +26,7 @@ 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.JobDriverCommon;
+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;
import org.apache.uima.ducc.container.jd.mh.iface.remote.IRemoteWorkerIdentity;
@@ -54,7 +54,7 @@ public class ActionInProgress implements
IMetaCasTransaction trans = actionData.getMetaCasTransaction();
IRemoteWorkerIdentity rwi = new RemoteWorkerIdentity(trans);
//
- CasManager cm = JobDriverCommon.getInstance().getCasManager();
+ CasManager cm = JobDriver.getInstance().getCasManager();
IMetaCas metaCas = cm.getMetaCas();
trans.setMetaCas(metaCas);
//
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=1637861&r1=1637860&r2=1637861&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 10 13:53:16 2014
@@ -22,7 +22,7 @@ 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.JobDriverCommon;
+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;
import org.apache.uima.ducc.container.jd.wi.IWorkItem;
@@ -46,7 +46,7 @@ public class ActionPreempt implements IA
IWorkItem wi = actionData.getWorkItem();
IMetaCas metaCas = wi.getMetaCas();
//
- CasManager cm = JobDriverCommon.getInstance().getCasManager();
+ CasManager cm = JobDriver.getInstance().getCasManager();
cm.putMetaCas(metaCas, RetryReason.ProcessPreempt);
}
catch(Exception e) {
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/mh/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/mh/Dispatcher.java?rev=1637861&r1=1637860&r2=1637861&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/mh/Dispatcher.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/mh/Dispatcher.java Mon Nov 10 13:53:16 2014
@@ -28,7 +28,7 @@ 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.JobDriverCommon;
+import org.apache.uima.ducc.container.jd.JobDriver;
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.fsm.wi.ActionData;
@@ -59,7 +59,7 @@ public class Dispatcher {
IOperatingInfo retVal = null;
try {
IOperatingInfo oi = new OperatingInfo();
- JobDriverCommon jdc = JobDriverCommon.getInstance();
+ JobDriver jdc = JobDriver.getInstance();
CasManager cm = jdc.getCasManager();
CasManagerStats cms = cm.getCasManagerStats();
IWorkItemStatistics wis = jdc.getWorkItemStatistics();
@@ -95,7 +95,7 @@ public class Dispatcher {
public void handleDownNode(INodeInfo nodeInfo) {
String location = "handleDownNode";
try {
- ConcurrentHashMap<IRemoteWorkerIdentity, IWorkItem> map = JobDriverCommon.getInstance().getMap();
+ ConcurrentHashMap<IRemoteWorkerIdentity, IWorkItem> map = JobDriver.getInstance().getMap();
//TODO
}
catch(Exception e) {
@@ -106,7 +106,7 @@ public class Dispatcher {
public void handleDownProcess(IProcessInfo processInfo) {
String location = "handleDownProcess";
try {
- ConcurrentHashMap<IRemoteWorkerIdentity, IWorkItem> map = JobDriverCommon.getInstance().getMap();
+ ConcurrentHashMap<IRemoteWorkerIdentity, IWorkItem> map = JobDriver.getInstance().getMap();
//TODO
}
catch(Exception e) {
@@ -117,7 +117,7 @@ public class Dispatcher {
public void handlePreemptProcess(IProcessInfo processInfo) {
String location = "handlePreemptProcess";
try {
- ConcurrentHashMap<IRemoteWorkerIdentity, IWorkItem> map = JobDriverCommon.getInstance().getMap();
+ ConcurrentHashMap<IRemoteWorkerIdentity, IWorkItem> map = JobDriver.getInstance().getMap();
for(Entry<IRemoteWorkerIdentity, IWorkItem> entry : map.entrySet()) {
IRemoteWorkerIdentity rwi = entry.getKey();
if(rwi.comprises(processInfo)) {
@@ -174,7 +174,7 @@ public class Dispatcher {
private IWorkItem register(IRemoteWorkerIdentity rwi) {
String location = "register";
- ConcurrentHashMap<IRemoteWorkerIdentity, IWorkItem> map = JobDriverCommon.getInstance().getMap();
+ ConcurrentHashMap<IRemoteWorkerIdentity, IWorkItem> map = JobDriver.getInstance().getMap();
IWorkItem wi = map.get(rwi);
while(wi == null) {
IMetaCas metaCas = null;
@@ -190,7 +190,7 @@ public class Dispatcher {
private IWorkItem find(IRemoteWorkerIdentity rwi) {
String location = "find";
- ConcurrentHashMap<IRemoteWorkerIdentity, IWorkItem> map = JobDriverCommon.getInstance().getMap();
+ ConcurrentHashMap<IRemoteWorkerIdentity, IWorkItem> map = JobDriver.getInstance().getMap();
IWorkItem wi = map.get(rwi);
if(wi != null) {
MessageBuffer mb = new MessageBuffer();
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/wi/RunningWorkItemStatistics.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/wi/RunningWorkItemStatistics.java?rev=1637861&r1=1637860&r2=1637861&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/wi/RunningWorkItemStatistics.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/wi/RunningWorkItemStatistics.java Mon Nov 10 13:53:16 2014
@@ -21,7 +21,7 @@ package org.apache.uima.ducc.container.j
import java.util.Map.Entry;
import java.util.concurrent.ConcurrentHashMap;
-import org.apache.uima.ducc.container.jd.JobDriverCommon;
+import org.apache.uima.ducc.container.jd.JobDriver;
import org.apache.uima.ducc.container.jd.mh.iface.remote.IRemoteWorkerIdentity;
public class RunningWorkItemStatistics implements IRunningWorkItemStatistics {
@@ -35,7 +35,7 @@ public class RunningWorkItemStatistics i
long min = Long.MAX_VALUE;
long max = 0;
long todMrs = 0;
- ConcurrentHashMap<IRemoteWorkerIdentity, IWorkItem> map = JobDriverCommon.getInstance().getMap();
+ ConcurrentHashMap<IRemoteWorkerIdentity, IWorkItem> map = JobDriver.getInstance().getMap();
for(Entry<IRemoteWorkerIdentity, IWorkItem> entry : map.entrySet()) {
IWorkItem wi = entry.getValue();
long time = wi.getMillisOperating();
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/TestDispatcher.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/TestDispatcher.java?rev=1637861&r1=1637860&r2=1637861&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/TestDispatcher.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/TestDispatcher.java Mon Nov 10 13:53:16 2014
@@ -25,7 +25,9 @@ import java.io.File;
import java.net.URL;
import java.util.Random;
-import org.apache.uima.ducc.container.jd.JobDriverCommon;
+import org.apache.uima.ducc.container.jd.JobDriver;
+import org.apache.uima.ducc.container.jd.config.IJobDriverConfig;
+import org.apache.uima.ducc.container.jd.config.JobDriverConfig;
import org.apache.uima.ducc.container.jd.mh.Dispatcher;
import org.apache.uima.ducc.container.jd.mh.iface.IOperatingInfo;
import org.apache.uima.ducc.container.jd.mh.iface.IProcessInfo;
@@ -104,8 +106,12 @@ public class TestDispatcher extends ATes
File file = new File(urlXml.getFile());
String crXml = file.getAbsolutePath();
String crCfg = null;
- JobDriverCommon.setInstance(Utilities.userCP, crXml, crCfg);
- int size = JobDriverCommon.getInstance().getMap().size();
+ IJobDriverConfig jdCfg = new JobDriverConfig();
+ jdCfg.setUserClasspath(Utilities.userCP);
+ jdCfg.setCrXml(crXml);
+ jdCfg.setCrCfg(crCfg);
+ JobDriver.setInstance(jdCfg);
+ int size = JobDriver.getInstance().getMap().size();
debug("map size:"+size);
Dispatcher dispatcher = new Dispatcher();
ThreadInfoFactory tif = new ThreadInfoFactory(1,1,1);
@@ -147,8 +153,12 @@ public class TestDispatcher extends ATes
File file = new File(urlXml.getFile());
String crXml = file.getAbsolutePath();
String crCfg = null;
- JobDriverCommon.setInstance(Utilities.userCP, crXml, crCfg);
- int size = JobDriverCommon.getInstance().getMap().size();
+ IJobDriverConfig jdCfg = new JobDriverConfig();
+ jdCfg.setUserClasspath(Utilities.userCP);
+ jdCfg.setCrXml(crXml);
+ jdCfg.setCrCfg(crCfg);
+ JobDriver.setInstance(jdCfg);
+ int size = JobDriver.getInstance().getMap().size();
debug("map size:"+size);
Dispatcher dispatcher = new Dispatcher();
ThreadInfoFactory tif = new ThreadInfoFactory(2,2,2);
@@ -199,8 +209,12 @@ public class TestDispatcher extends ATes
File file = new File(urlXml.getFile());
String crXml = file.getAbsolutePath();
String crCfg = null;
- JobDriverCommon.setInstance(Utilities.userCP, crXml, crCfg);
- int size = JobDriverCommon.getInstance().getMap().size();
+ IJobDriverConfig jdCfg = new JobDriverConfig();
+ jdCfg.setUserClasspath(Utilities.userCP);
+ jdCfg.setCrXml(crXml);
+ jdCfg.setCrCfg(crCfg);
+ JobDriver.setInstance(jdCfg);
+ int size = JobDriver.getInstance().getMap().size();
debug("map size:"+size);
Dispatcher dispatcher = new Dispatcher();
ThreadInfoFactory tif = new ThreadInfoFactory(2,2,2);