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/18 14:17:05 UTC
svn commit: r1640334 - 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/classload/
main/java/org/apache/u...
Author: degenaro
Date: Tue Nov 18 13:17:04 2014
New Revision: 1640334
URL: http://svn.apache.org/r1640334
Log:
UIMA-4069 Redesign of JD toward the main goal of classpath separation for container (system) code.
JobDriverReport (incomplete) - add JobId.
JdFlagsHelper.
Added:
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/JdFlagsExtendedHelper.java
- copied, changed from r1640322, uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/ContainerPropertiesHelper.java
Removed:
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/ContainerPropertiesHelper.java
Modified:
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/classload/ProxyJobDriverCollectionReader.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/mh/MessageHandler.java
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/mh/iface/IOperatingInfo.java
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/mh/impl/OperatingInfo.java
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/ATest.java
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/TestClassLoading.java
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/TestMessageHandler.java
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/TestSuite.java
Copied: uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/JdFlagsExtendedHelper.java (from r1640322, uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/ContainerPropertiesHelper.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?p2=uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/JdFlagsExtendedHelper.java&p1=uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/ContainerPropertiesHelper.java&r1=1640322&r2=1640334&rev=1640334&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/ContainerPropertiesHelper.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/JdFlagsExtendedHelper.java Tue Nov 18 13:17:04 2014
@@ -18,15 +18,15 @@
*/
package org.apache.uima.ducc.container.common;
-import org.apache.uima.ducc.common.config.SystemPropertiesHelper;
+import org.apache.uima.ducc.common.jd.JdFlagsHelper;
-public class ContainerPropertiesHelper extends SystemPropertiesHelper {
+public class JdFlagsExtendedHelper extends JdFlagsHelper {
- private IContainerLogger logger = ContainerLogger.getLogger(ContainerPropertiesHelper.class, IContainerLogger.Component.JD.name());
+ private IContainerLogger logger = ContainerLogger.getLogger(JdFlagsExtendedHelper.class, IContainerLogger.Component.JD.name());
- private static ContainerPropertiesHelper instance = new ContainerPropertiesHelper();
+ private static JdFlagsExtendedHelper instance = new JdFlagsExtendedHelper();
- public static ContainerPropertiesHelper getInstance() {
+ public static JdFlagsExtendedHelper getInstance() {
return instance;
}
@@ -37,7 +37,7 @@ public class ContainerPropertiesHelper e
String[] list = retVal.split(":");
if(list != null) {
if(list.length > 0) {
- logger.debug(location, IEntityId.null_id, SystemPropertiesHelper.Name.UserClasspath.name());
+ logger.debug(location, IEntityId.null_id, JdFlagsHelper.Name.UserClasspath.name());
int index = 0;
for(String item : list) {
String text = "["+index+"]"+" "+item;
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=1640334&r1=1640333&r2=1640334&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 Tue Nov 18 13:17:04 2014
@@ -21,6 +21,7 @@ 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.jd.cas.CasManager;
@@ -55,6 +56,7 @@ public class JobDriver {
instance = null;
}
+ private String jobId = null;
private ConcurrentHashMap<IRemoteWorkerIdentity, IWorkItem> map = null;
private IWorkItemStatistics wis = null;
private CasManager cm = null;
@@ -68,6 +70,8 @@ public class JobDriver {
private void initialize() throws JobDriverException {
String location = "initialize";
try {
+ JdFlagsExtendedHelper feh = JdFlagsExtendedHelper.getInstance();
+ jobId = feh.getJobId();
map = new ConcurrentHashMap<IRemoteWorkerIdentity, IWorkItem>();
wis = new WorkItemStatistics();
cm = new CasManager();
@@ -80,6 +84,10 @@ public class JobDriver {
}
}
+ public String getJobId() {
+ return jobId;
+ }
+
public ConcurrentHashMap<IRemoteWorkerIdentity, IWorkItem> getMap() {
return map;
}
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=1640334&r1=1640333&r2=1640334&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 Tue Nov 18 13:17:04 2014
@@ -25,7 +25,7 @@ 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.ContainerPropertiesHelper;
+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.MessageBuffer;
@@ -83,10 +83,10 @@ public class ProxyJobDriverCollectionRea
private void initialize(ClassLoader baseClassLoader) throws JobDriverException {
String location = "initialize";
- ContainerPropertiesHelper cph = ContainerPropertiesHelper.getInstance();
- String userClasspath = cph.getUserClasspath();
+ JdFlagsExtendedHelper feh = JdFlagsExtendedHelper.getInstance();
+ String userClasspath = feh.getUserClasspath();
String resolvedUserCP = ClassLoaderUtil.resolveClasspathWildcards(userClasspath);
- String[] classpath = cph.stringToArray(resolvedUserCP);
+ String[] classpath = feh.stringToArray(resolvedUserCP);
URL[] classLoaderUrls = new URL[classpath.length];
logger.info(location, IEntityId.null_id, "classpath");
int i = 0;
@@ -97,8 +97,8 @@ public class ProxyJobDriverCollectionRea
i++;
}
URLClassLoader classLoader = new URLClassLoader(classLoaderUrls, baseClassLoader);
- String crXml = cph.getCollectionReaderXml();
- String crCfg = cph.getCollectionReaderCfg();
+ String crXml = feh.getCollectionReaderXml();
+ String crCfg = feh.getCollectionReaderCfg();
construct(classLoader, crXml, crCfg);
}
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=1640334&r1=1640333&r2=1640334&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 Tue Nov 18 13:17:04 2014
@@ -23,7 +23,7 @@ import java.lang.reflect.Type;
import java.net.URL;
import java.net.URLClassLoader;
-import org.apache.uima.ducc.common.config.SystemPropertiesHelper;
+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;
@@ -54,7 +54,7 @@ public class ProxyJobDriverErrorHandler
private void initialize() throws JobDriverException {
String location = "initialize";
try {
- SystemPropertiesHelper sph = SystemPropertiesHelper.getInstance();
+ JdFlagsHelper sph = JdFlagsHelper.getInstance();
String userClasspath = sph.getUserClasspath();
String[] classpath = sph.stringToArray(userClasspath);
String className = sph.getUserErrorHandlerClassname();
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=1640334&r1=1640333&r2=1640334&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 Tue Nov 18 13:17:04 2014
@@ -64,6 +64,7 @@ public class MessageHandler implements I
CasManagerStats cms = cm.getCasManagerStats();
IWorkItemStatistics wis = jd.getWorkItemStatistics();
IRunningWorkItemStatistics rwis = RunningWorkItemStatistics.getCurrent();
+ oi.setJobId(jd.getJobId());
oi.setWorkItemCrTotal(cms.getCrTotal());
oi.setWorkItemCrFetches(cms.getCrGets());
oi.setWorkItemEndSuccesses(cms.getEndSuccess());
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/mh/iface/IOperatingInfo.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/iface/IOperatingInfo.java?rev=1640334&r1=1640333&r2=1640334&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/mh/iface/IOperatingInfo.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/mh/iface/IOperatingInfo.java Tue Nov 18 13:17:04 2014
@@ -22,6 +22,9 @@ import java.util.ArrayList;
public interface IOperatingInfo {
+ public void setJobId(String value);
+ public String getJobId();
+
public void setWorkItemCrTotal(int value);
public int getWorkItemCrTotal();
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/mh/impl/OperatingInfo.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/impl/OperatingInfo.java?rev=1640334&r1=1640333&r2=1640334&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/mh/impl/OperatingInfo.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/mh/impl/OperatingInfo.java Tue Nov 18 13:17:04 2014
@@ -25,6 +25,8 @@ import org.apache.uima.ducc.container.jd
public class OperatingInfo implements IOperatingInfo {
+ private String jobId = null;
+
private int crTotal = 0;
private int crFetches = 0;
private int jpSends = 0;
@@ -50,6 +52,16 @@ public class OperatingInfo implements IO
private ArrayList<IWorkItemInfo> activeWorkItemInfo = null;
@Override
+ public void setJobId(String value) {
+ jobId = value;
+ }
+
+ @Override
+ public String getJobId() {
+ return jobId;
+ }
+
+ @Override
public void setWorkItemCrTotal(int value) {
crTotal = value;
}
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=1640334&r1=1640333&r2=1640334&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 Tue Nov 18 13:17:04 2014
@@ -20,8 +20,8 @@ package org.apache.uima.ducc.container.j
import java.util.Map;
-import org.apache.uima.ducc.common.config.SystemPropertiesHelper;
-import org.apache.uima.ducc.common.config.SystemPropertiesHelper.Name;
+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;
@@ -42,7 +42,7 @@ public abstract class ATest {
}
public void clear() {
- for(Name name : SystemPropertiesHelper.Name.values()) {
+ for(Name name : JdFlagsHelper.Name.values()) {
System.clearProperty(name.name());
debug("clear: "+name.name());
}
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/TestClassLoading.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/TestClassLoading.java?rev=1640334&r1=1640333&r2=1640334&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/TestClassLoading.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/TestClassLoading.java Tue Nov 18 13:17:04 2014
@@ -24,7 +24,7 @@ import static org.junit.Assert.fail;
import java.io.File;
import java.net.URL;
-import org.apache.uima.ducc.common.config.SystemPropertiesHelper;
+import org.apache.uima.ducc.common.jd.JdFlagsHelper;
import org.apache.uima.ducc.container.jd.classload.ProxyJobDriverCollectionReader;
import org.apache.uima.ducc.container.jd.classload.ProxyJobDriverDirective;
import org.apache.uima.ducc.container.jd.classload.ProxyJobDriverErrorHandler;
@@ -41,7 +41,7 @@ public class TestClassLoading extends AT
}
try {
String userClasspath = Utilities.userCP;
- System.setProperty(SystemPropertiesHelper.Name.UserClasspath.name(), userClasspath);
+ System.setProperty(JdFlagsHelper.Name.UserClasspath.name(), userClasspath);
ProxyJobDriverErrorHandler pjdeh = new ProxyJobDriverErrorHandler();
Object serializedCAS = null;
Object exception = null;
@@ -60,11 +60,11 @@ public class TestClassLoading extends AT
}
try {
String userClasspath = Utilities.userCP;
- System.setProperty(SystemPropertiesHelper.Name.UserClasspath.name(), userClasspath);
+ System.setProperty(JdFlagsHelper.Name.UserClasspath.name(), userClasspath);
URL urlXml = this.getClass().getResource("/CR100.xml");
File file = new File(urlXml.getFile());
String crXml = file.getAbsolutePath();
- System.setProperty(SystemPropertiesHelper.Name.CollectionReaderXml.name(), crXml);
+ System.setProperty(JdFlagsHelper.Name.CollectionReaderXml.name(), crXml);
ProxyJobDriverCollectionReader pjdcr = new ProxyJobDriverCollectionReader();
MetaCas mc = pjdcr.getMetaCas();
Object serializedCAS = mc.getSerializedCas();
@@ -85,17 +85,17 @@ public class TestClassLoading extends AT
}
try {
String userClasspath = Utilities.userCP;
- System.setProperty(SystemPropertiesHelper.Name.UserClasspath.name(), userClasspath);
+ System.setProperty(JdFlagsHelper.Name.UserClasspath.name(), userClasspath);
URL urlXml = this.getClass().getResource("/CR100.xml");
File file = new File(urlXml.getFile());
String crXml = file.getAbsolutePath();
- System.setProperty(SystemPropertiesHelper.Name.CollectionReaderXml.name(), crXml);
+ System.setProperty(JdFlagsHelper.Name.CollectionReaderXml.name(), crXml);
ProxyJobDriverCollectionReader pjdcr = new ProxyJobDriverCollectionReader();
MetaCas mc = pjdcr.getMetaCas();
Object serializedCAS = mc.getSerializedCas();
Object exception = null;
String className = "org.apache.uima.ducc.user.jd.test.helper.TestJdContainerErrorHandler";
- System.setProperty(SystemPropertiesHelper.Name.UserErrorHandlerClassname.name(), className);
+ System.setProperty(JdFlagsHelper.Name.UserErrorHandlerClassname.name(), className);
ProxyJobDriverErrorHandler pjdeh = new ProxyJobDriverErrorHandler();
ProxyJobDriverDirective directive = pjdeh.handle(serializedCAS, exception);
assertTrue(directive.isKillJob() == true);
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/TestMessageHandler.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/TestMessageHandler.java?rev=1640334&r1=1640333&r2=1640334&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/TestMessageHandler.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/TestMessageHandler.java Tue Nov 18 13:17:04 2014
@@ -26,7 +26,7 @@ import java.net.URL;
import java.util.ArrayList;
import java.util.Random;
-import org.apache.uima.ducc.common.config.SystemPropertiesHelper;
+import org.apache.uima.ducc.common.jd.JdFlagsHelper;
import org.apache.uima.ducc.container.jd.JobDriver;
import org.apache.uima.ducc.container.jd.mh.MessageHandler;
import org.apache.uima.ducc.container.jd.mh.iface.IOperatingInfo;
@@ -106,9 +106,9 @@ public class TestMessageHandler extends
URL urlXml = this.getClass().getResource("/CR100.xml");
File file = new File(urlXml.getFile());
String crXml = file.getAbsolutePath();
- System.setProperty(SystemPropertiesHelper.Name.CollectionReaderXml.name(), crXml);
+ System.setProperty(JdFlagsHelper.Name.CollectionReaderXml.name(), crXml);
String userClasspath = Utilities.userCP;
- System.setProperty(SystemPropertiesHelper.Name.UserClasspath.name(), userClasspath);
+ System.setProperty(JdFlagsHelper.Name.UserClasspath.name(), userClasspath);
JobDriver.createInstance();
int size = JobDriver.getInstance().getMap().size();
debug("map size:"+size);
@@ -151,9 +151,9 @@ public class TestMessageHandler extends
URL urlXml = this.getClass().getResource("/CR100.xml");
File file = new File(urlXml.getFile());
String crXml = file.getAbsolutePath();
- System.setProperty(SystemPropertiesHelper.Name.CollectionReaderXml.name(), crXml);
+ System.setProperty(JdFlagsHelper.Name.CollectionReaderXml.name(), crXml);
String userClasspath = Utilities.userCP;
- System.setProperty(SystemPropertiesHelper.Name.UserClasspath.name(), userClasspath);
+ System.setProperty(JdFlagsHelper.Name.UserClasspath.name(), userClasspath);
JobDriver.createInstance();
int size = JobDriver.getInstance().getMap().size();
debug("map size:"+size);
@@ -205,9 +205,9 @@ public class TestMessageHandler extends
URL urlXml = this.getClass().getResource("/CR100.xml");
File file = new File(urlXml.getFile());
String crXml = file.getAbsolutePath();
- System.setProperty(SystemPropertiesHelper.Name.CollectionReaderXml.name(), crXml);
+ System.setProperty(JdFlagsHelper.Name.CollectionReaderXml.name(), crXml);
String userClasspath = Utilities.userCP;
- System.setProperty(SystemPropertiesHelper.Name.UserClasspath.name(), userClasspath);
+ System.setProperty(JdFlagsHelper.Name.UserClasspath.name(), userClasspath);
JobDriver.createInstance();
int size = JobDriver.getInstance().getMap().size();
debug("map size:"+size);
@@ -256,9 +256,9 @@ public class TestMessageHandler extends
URL urlXml = this.getClass().getResource("/CR100.xml");
File file = new File(urlXml.getFile());
String crXml = file.getAbsolutePath();
- System.setProperty(SystemPropertiesHelper.Name.CollectionReaderXml.name(), crXml);
+ System.setProperty(JdFlagsHelper.Name.CollectionReaderXml.name(), crXml);
String userClasspath = Utilities.userCP;
- System.setProperty(SystemPropertiesHelper.Name.UserClasspath.name(), userClasspath);
+ System.setProperty(JdFlagsHelper.Name.UserClasspath.name(), userClasspath);
JobDriver.createInstance();
int size = JobDriver.getInstance().getMap().size();
debug("map size:"+size);
@@ -337,9 +337,9 @@ public class TestMessageHandler extends
URL urlXml = this.getClass().getResource("/CR100.xml");
File file = new File(urlXml.getFile());
String crXml = file.getAbsolutePath();
- System.setProperty(SystemPropertiesHelper.Name.CollectionReaderXml.name(), crXml);
+ System.setProperty(JdFlagsHelper.Name.CollectionReaderXml.name(), crXml);
String userClasspath = Utilities.userCP;
- System.setProperty(SystemPropertiesHelper.Name.UserClasspath.name(), userClasspath);
+ System.setProperty(JdFlagsHelper.Name.UserClasspath.name(), userClasspath);
JobDriver.createInstance();
int size = JobDriver.getInstance().getMap().size();
debug("map size:"+size);
@@ -422,9 +422,9 @@ public class TestMessageHandler extends
URL urlXml = this.getClass().getResource("/CR100.xml");
File file = new File(urlXml.getFile());
String crXml = file.getAbsolutePath();
- System.setProperty(SystemPropertiesHelper.Name.CollectionReaderXml.name(), crXml);
+ System.setProperty(JdFlagsHelper.Name.CollectionReaderXml.name(), crXml);
String userClasspath = Utilities.userCP;
- System.setProperty(SystemPropertiesHelper.Name.UserClasspath.name(), userClasspath);
+ System.setProperty(JdFlagsHelper.Name.UserClasspath.name(), userClasspath);
JobDriver.createInstance();
int size = JobDriver.getInstance().getMap().size();
debug("map size:"+size);
@@ -484,12 +484,12 @@ public class TestMessageHandler extends
URL urlXml = this.getClass().getResource("/CR100.xml");
File file = new File(urlXml.getFile());
String crXml = file.getAbsolutePath();
- System.setProperty(SystemPropertiesHelper.Name.CollectionReaderXml.name(), crXml);
+ System.setProperty(JdFlagsHelper.Name.CollectionReaderXml.name(), crXml);
String userClasspath = Utilities.userCP;
- System.setProperty(SystemPropertiesHelper.Name.UserClasspath.name(), userClasspath);
+ System.setProperty(JdFlagsHelper.Name.UserClasspath.name(), userClasspath);
//
String ehcp = "KillJobLimit="+2;
- System.setProperty(SystemPropertiesHelper.Name.UserErrorHandlerCfg.name(), ehcp);
+ System.setProperty(JdFlagsHelper.Name.UserErrorHandlerCfg.name(), ehcp);
//
JobDriver.createInstance();
int size = JobDriver.getInstance().getMap().size();
@@ -567,12 +567,12 @@ public class TestMessageHandler extends
URL urlXml = this.getClass().getResource("/CR100.xml");
File file = new File(urlXml.getFile());
String crXml = file.getAbsolutePath();
- System.setProperty(SystemPropertiesHelper.Name.CollectionReaderXml.name(), crXml);
+ System.setProperty(JdFlagsHelper.Name.CollectionReaderXml.name(), crXml);
String userClasspath = Utilities.userCP;
- System.setProperty(SystemPropertiesHelper.Name.UserClasspath.name(), userClasspath);
+ System.setProperty(JdFlagsHelper.Name.UserClasspath.name(), userClasspath);
//
String eh = "org.apache.uima.ducc.user.jd.test.helper.TestJdContainerErrorHandlerRandomRetry";
- System.setProperty(SystemPropertiesHelper.Name.UserErrorHandlerClassname.name(), eh);
+ System.setProperty(JdFlagsHelper.Name.UserErrorHandlerClassname.name(), eh);
//
JobDriver.createInstance();
int size = JobDriver.getInstance().getMap().size();
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=1640334&r1=1640333&r2=1640334&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 Tue Nov 18 13:17:04 2014
@@ -25,7 +25,7 @@ import java.io.File;
import java.net.URL;
import java.util.ArrayList;
-import org.apache.uima.ducc.common.config.SystemPropertiesHelper;
+import org.apache.uima.ducc.common.jd.JdFlagsHelper;
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;
@@ -51,9 +51,9 @@ public class TestSuite extends ATest {
URL urlXml = this.getClass().getResource("/CR100.xml");
File file = new File(urlXml.getFile());
String crXml = file.getAbsolutePath();
- System.setProperty(SystemPropertiesHelper.Name.CollectionReaderXml.name(), crXml);
+ System.setProperty(JdFlagsHelper.Name.CollectionReaderXml.name(), crXml);
String userClasspath = Utilities.userCP;
- System.setProperty(SystemPropertiesHelper.Name.UserClasspath.name(), userClasspath);
+ System.setProperty(JdFlagsHelper.Name.UserClasspath.name(), userClasspath);
}
private void testIncludeAll() {
@@ -80,7 +80,7 @@ public class TestSuite extends ATest {
URL urlXml = this.getClass().getResource("/CR100.xml");
File file = new File(urlXml.getFile());
String crXml = file.getAbsolutePath();
- System.setProperty(SystemPropertiesHelper.Name.CollectionReaderXml.name(), crXml);
+ System.setProperty(JdFlagsHelper.Name.CollectionReaderXml.name(), crXml);
String userClasspath = Utilities.userCP;
String[] classpathParts = userClasspath.split(File.pathSeparator);
StringBuffer sb = new StringBuffer();
@@ -97,7 +97,7 @@ public class TestSuite extends ATest {
}
try {
String userPartialClasspath = sb.toString();
- System.setProperty(SystemPropertiesHelper.Name.UserClasspath.name(), userPartialClasspath);
+ System.setProperty(JdFlagsHelper.Name.UserClasspath.name(), userPartialClasspath);
new ProxyJobDriverCollectionReader(true);
fail("Exception missing...?");
}
@@ -126,7 +126,7 @@ public class TestSuite extends ATest {
private void testNoXml() {
try {
String userClasspath = Utilities.userCP;
- System.setProperty(SystemPropertiesHelper.Name.UserClasspath.name(), userClasspath);
+ System.setProperty(JdFlagsHelper.Name.UserClasspath.name(), userClasspath);
new ProxyJobDriverCollectionReader();
fail("Exception missing...?");
}