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/24 19:51:03 UTC
svn commit: r1641444 - 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/
test/java/org/apache/u...
Author: degenaro
Date: Mon Nov 24 18:51:03 2014
New Revision: 1641444
URL: http://svn.apache.org/r1641444
Log:
UIMA-4069 Redesign of JD toward the main goal of classpath separation for container (system) code.
jd/JdFlagsHelper -> container/FlagsHelper
Added:
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/FlagsExtendedHelper.java
- copied, changed from r1640991, uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/JdFlagsExtendedHelper.java
Removed:
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/JdFlagsExtendedHelper.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/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/FlagsExtendedHelper.java (from r1640991, uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/JdFlagsExtendedHelper.java)
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/FlagsExtendedHelper.java?p2=uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/FlagsExtendedHelper.java&p1=uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/JdFlagsExtendedHelper.java&r1=1640991&r2=1641444&rev=1641444&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/JdFlagsExtendedHelper.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/FlagsExtendedHelper.java Mon Nov 24 18:51:03 2014
@@ -18,18 +18,18 @@
*/
package org.apache.uima.ducc.container.common;
-import org.apache.uima.ducc.common.jd.JdFlagsHelper;
+import org.apache.uima.ducc.common.container.FlagsHelper;
import org.apache.uima.ducc.container.common.logger.IComponent;
import org.apache.uima.ducc.container.common.logger.ILogger;
import org.apache.uima.ducc.container.common.logger.Logger;
-public class JdFlagsExtendedHelper extends JdFlagsHelper {
+public class FlagsExtendedHelper extends FlagsHelper {
- private static Logger logger = Logger.getLogger(JdFlagsExtendedHelper.class, IComponent.Id.JD.name());
+ private static Logger logger = Logger.getLogger(FlagsExtendedHelper.class, IComponent.Id.JD.name());
- private static JdFlagsExtendedHelper instance = new JdFlagsExtendedHelper();
+ private static FlagsExtendedHelper instance = new FlagsExtendedHelper();
- public static JdFlagsExtendedHelper getInstance() {
+ public static FlagsExtendedHelper getInstance() {
return instance;
}
@@ -40,7 +40,7 @@ public class JdFlagsExtendedHelper exten
String[] list = retVal.split(":");
if(list != null) {
if(list.length > 0) {
- logger.debug(location, ILogger.null_id, JdFlagsHelper.Name.UserClasspath.name());
+ logger.debug(location, ILogger.null_id, FlagsHelper.Name.UserClasspath.pname());
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=1641444&r1=1641443&r2=1641444&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 Mon Nov 24 18:51:03 2014
@@ -20,7 +20,7 @@ package org.apache.uima.ducc.container.j
import java.util.concurrent.ConcurrentHashMap;
-import org.apache.uima.ducc.container.common.JdFlagsExtendedHelper;
+import org.apache.uima.ducc.container.common.FlagsExtendedHelper;
import org.apache.uima.ducc.container.common.logger.IComponent;
import org.apache.uima.ducc.container.common.logger.ILogger;
import org.apache.uima.ducc.container.common.logger.Logger;
@@ -74,7 +74,7 @@ public class JobDriver {
String location = "initialize";
try {
jdState = JdState.Initializing;
- JdFlagsExtendedHelper feh = JdFlagsExtendedHelper.getInstance();
+ FlagsExtendedHelper feh = FlagsExtendedHelper.getInstance();
jobId = feh.getJobId();
map = new ConcurrentHashMap<IRemoteWorkerIdentity, IWorkItem>();
wis = new WorkItemStatistics();
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=1641444&r1=1641443&r2=1641444&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 Mon Nov 24 18:51:03 2014
@@ -24,7 +24,7 @@ import java.net.URL;
import java.net.URLClassLoader;
import org.apache.uima.ducc.common.utils.DuccLogger;
-import org.apache.uima.ducc.container.common.JdFlagsExtendedHelper;
+import org.apache.uima.ducc.container.common.FlagsExtendedHelper;
import org.apache.uima.ducc.container.common.MessageBuffer;
import org.apache.uima.ducc.container.common.Standardize;
import org.apache.uima.ducc.container.common.classloader.PrivateClassLoader;
@@ -73,7 +73,7 @@ public class ProxyJobDriverCollectionRea
}
private void initialize() throws JobDriverException {
- JdFlagsExtendedHelper feh = JdFlagsExtendedHelper.getInstance();
+ FlagsExtendedHelper feh = FlagsExtendedHelper.getInstance();
String userClasspath = feh.getUserClasspath();
URLClassLoader classLoader = createClassLoader(userClasspath);
String crXml = feh.getCollectionReaderXml();
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=1641444&r1=1641443&r2=1641444&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 Mon Nov 24 18:51:03 2014
@@ -22,7 +22,7 @@ import java.lang.reflect.Method;
import java.lang.reflect.Type;
import java.net.URLClassLoader;
-import org.apache.uima.ducc.common.jd.JdFlagsHelper;
+import org.apache.uima.ducc.common.container.FlagsHelper;
import org.apache.uima.ducc.container.common.classloader.PrivateClassLoader;
import org.apache.uima.ducc.container.common.logger.IComponent;
import org.apache.uima.ducc.container.common.logger.ILogger;
@@ -53,7 +53,7 @@ public class ProxyJobDriverErrorHandler
private void initialize() throws JobDriverException {
String location = "initialize";
try {
- JdFlagsHelper sph = JdFlagsHelper.getInstance();
+ FlagsHelper sph = FlagsHelper.getInstance();
String userClasspath = sph.getUserClasspath();
String[] classpath = sph.stringToArray(userClasspath);
String className = sph.getUserErrorHandlerClassname();
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=1641444&r1=1641443&r2=1641444&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 Mon Nov 24 18:51:03 2014
@@ -20,8 +20,8 @@ package org.apache.uima.ducc.container.j
import java.util.Map;
-import org.apache.uima.ducc.common.jd.JdFlagsHelper;
-import org.apache.uima.ducc.common.jd.JdFlagsHelper.Name;
+import org.apache.uima.ducc.common.container.FlagsHelper;
+import org.apache.uima.ducc.common.container.FlagsHelper.Name;
import org.apache.uima.ducc.container.jd.JobDriver;
import org.junit.After;
import org.junit.AfterClass;
@@ -41,8 +41,12 @@ public abstract class ATest {
}
public void clear() {
- for(Name name : JdFlagsHelper.Name.values()) {
- System.clearProperty(name.name());
+ for(Name name : FlagsHelper.Name.values()) {
+ try {
+ System.clearProperty(name.pname());
+ }
+ catch(Exception e) {
+ }
debug("clear: "+name.name());
}
}
@@ -106,6 +110,13 @@ public abstract class ATest {
}
}
+ protected void announce(String text) {
+ if(isVerbose()) {
+ String message = text;
+ out_println(message);
+ }
+ }
+
protected void asExpected(String text) {
if(isVerbose()) {
String message = "as expected: "+text;
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=1641444&r1=1641443&r2=1641444&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 Mon Nov 24 18:51:03 2014
@@ -28,7 +28,7 @@ import java.net.URISyntaxException;
import java.net.URL;
import java.net.URLClassLoader;
-import org.apache.uima.ducc.common.jd.JdFlagsHelper;
+import org.apache.uima.ducc.common.container.FlagsHelper;
import org.apache.uima.ducc.container.common.classloader.PrivateClassLoader;
import org.apache.uima.ducc.container.jd.classload.ProxyJobDriverCollectionReader;
import org.apache.uima.ducc.container.jd.classload.ProxyJobDriverDirective;
@@ -46,7 +46,7 @@ public class TestClassLoading extends AT
}
try {
String userClasspath = Utilities.getInstance().getUserCP();
- System.setProperty(JdFlagsHelper.Name.UserClasspath.name(), userClasspath);
+ System.setProperty(FlagsHelper.Name.UserClasspath.pname(), userClasspath);
ProxyJobDriverErrorHandler pjdeh = new ProxyJobDriverErrorHandler();
Object serializedCAS = null;
Object exception = null;
@@ -65,11 +65,11 @@ public class TestClassLoading extends AT
}
try {
String userClasspath = Utilities.getInstance().getUserCP();
- System.setProperty(JdFlagsHelper.Name.UserClasspath.name(), userClasspath);
+ System.setProperty(FlagsHelper.Name.UserClasspath.pname(), userClasspath);
URL urlXml = this.getClass().getResource("/CR100.xml");
File file = new File(urlXml.getFile());
String crXml = file.getAbsolutePath();
- System.setProperty(JdFlagsHelper.Name.CollectionReaderXml.name(), crXml);
+ System.setProperty(FlagsHelper.Name.CollectionReaderXml.pname(), crXml);
ProxyJobDriverCollectionReader pjdcr = new ProxyJobDriverCollectionReader();
MetaCas mc = pjdcr.getMetaCas();
Object serializedCAS = mc.getSerializedCas();
@@ -90,17 +90,17 @@ public class TestClassLoading extends AT
}
try {
String userClasspath = Utilities.getInstance().getUserCP();
- System.setProperty(JdFlagsHelper.Name.UserClasspath.name(), userClasspath);
+ System.setProperty(FlagsHelper.Name.UserClasspath.pname(), userClasspath);
URL urlXml = this.getClass().getResource("/CR100.xml");
File file = new File(urlXml.getFile());
String crXml = file.getAbsolutePath();
- System.setProperty(JdFlagsHelper.Name.CollectionReaderXml.name(), crXml);
+ System.setProperty(FlagsHelper.Name.CollectionReaderXml.pname(), 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(JdFlagsHelper.Name.UserErrorHandlerClassname.name(), className);
+ System.setProperty(FlagsHelper.Name.UserErrorHandlerClassname.pname(), 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=1641444&r1=1641443&r2=1641444&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 Mon Nov 24 18:51:03 2014
@@ -26,7 +26,7 @@ import java.net.URL;
import java.util.ArrayList;
import java.util.Random;
-import org.apache.uima.ducc.common.jd.JdFlagsHelper;
+import org.apache.uima.ducc.common.container.FlagsHelper;
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;
@@ -102,13 +102,14 @@ public class TestMessageHandler extends
if(isDisabled(this.getClass().getName())) {
return;
}
+ announce("test_01");
try {
URL urlXml = this.getClass().getResource("/CR100.xml");
File file = new File(urlXml.getFile());
String crXml = file.getAbsolutePath();
- System.setProperty(JdFlagsHelper.Name.CollectionReaderXml.name(), crXml);
+ System.setProperty(FlagsHelper.Name.CollectionReaderXml.pname(), crXml);
String userClasspath = Utilities.getInstance().getUserCP();
- System.setProperty(JdFlagsHelper.Name.UserClasspath.name(), userClasspath);
+ System.setProperty(FlagsHelper.Name.UserClasspath.pname(), userClasspath);
JobDriver.createInstance();
int size = JobDriver.getInstance().getMap().size();
debug("map size:"+size);
@@ -147,13 +148,14 @@ public class TestMessageHandler extends
if(isDisabled(this.getClass().getName())) {
return;
}
+ announce("test_02a");
try {
URL urlXml = this.getClass().getResource("/CR100.xml");
File file = new File(urlXml.getFile());
String crXml = file.getAbsolutePath();
- System.setProperty(JdFlagsHelper.Name.CollectionReaderXml.name(), crXml);
+ System.setProperty(FlagsHelper.Name.CollectionReaderXml.pname(), crXml);
String userClasspath = Utilities.getInstance().getUserCP();
- System.setProperty(JdFlagsHelper.Name.UserClasspath.name(), userClasspath);
+ System.setProperty(FlagsHelper.Name.UserClasspath.pname(), userClasspath);
JobDriver.createInstance();
int size = JobDriver.getInstance().getMap().size();
debug("map size:"+size);
@@ -201,13 +203,14 @@ public class TestMessageHandler extends
if(isDisabled(this.getClass().getName())) {
return;
}
+ announce("test_2b");
try {
URL urlXml = this.getClass().getResource("/CR100.xml");
File file = new File(urlXml.getFile());
String crXml = file.getAbsolutePath();
- System.setProperty(JdFlagsHelper.Name.CollectionReaderXml.name(), crXml);
+ System.setProperty(FlagsHelper.Name.CollectionReaderXml.pname(), crXml);
String userClasspath = Utilities.getInstance().getUserCP();
- System.setProperty(JdFlagsHelper.Name.UserClasspath.name(), userClasspath);
+ System.setProperty(FlagsHelper.Name.UserClasspath.pname(), userClasspath);
JobDriver.createInstance();
int size = JobDriver.getInstance().getMap().size();
debug("map size:"+size);
@@ -252,13 +255,14 @@ public class TestMessageHandler extends
if(isDisabled(this.getClass().getName())) {
return;
}
+ announce("test_03");
try {
URL urlXml = this.getClass().getResource("/CR100.xml");
File file = new File(urlXml.getFile());
String crXml = file.getAbsolutePath();
- System.setProperty(JdFlagsHelper.Name.CollectionReaderXml.name(), crXml);
+ System.setProperty(FlagsHelper.Name.CollectionReaderXml.pname(), crXml);
String userClasspath = Utilities.getInstance().getUserCP();
- System.setProperty(JdFlagsHelper.Name.UserClasspath.name(), userClasspath);
+ System.setProperty(FlagsHelper.Name.UserClasspath.pname(), userClasspath);
JobDriver.createInstance();
int size = JobDriver.getInstance().getMap().size();
debug("map size:"+size);
@@ -333,13 +337,14 @@ public class TestMessageHandler extends
if(isDisabled(this.getClass().getName())) {
return;
}
+ announce("test_04");
try {
URL urlXml = this.getClass().getResource("/CR100.xml");
File file = new File(urlXml.getFile());
String crXml = file.getAbsolutePath();
- System.setProperty(JdFlagsHelper.Name.CollectionReaderXml.name(), crXml);
+ System.setProperty(FlagsHelper.Name.CollectionReaderXml.pname(), crXml);
String userClasspath = Utilities.getInstance().getUserCP();
- System.setProperty(JdFlagsHelper.Name.UserClasspath.name(), userClasspath);
+ System.setProperty(FlagsHelper.Name.UserClasspath.pname(), userClasspath);
JobDriver.createInstance();
int size = JobDriver.getInstance().getMap().size();
debug("map size:"+size);
@@ -418,13 +423,14 @@ public class TestMessageHandler extends
if(isDisabled(this.getClass().getName())) {
return;
}
+ announce("test_05a");
try {
URL urlXml = this.getClass().getResource("/CR100.xml");
File file = new File(urlXml.getFile());
String crXml = file.getAbsolutePath();
- System.setProperty(JdFlagsHelper.Name.CollectionReaderXml.name(), crXml);
+ System.setProperty(FlagsHelper.Name.CollectionReaderXml.pname(), crXml);
String userClasspath = Utilities.getInstance().getUserCP();
- System.setProperty(JdFlagsHelper.Name.UserClasspath.name(), userClasspath);
+ System.setProperty(FlagsHelper.Name.UserClasspath.pname(), userClasspath);
JobDriver.createInstance();
int size = JobDriver.getInstance().getMap().size();
debug("map size:"+size);
@@ -480,16 +486,17 @@ public class TestMessageHandler extends
if(isDisabled(this.getClass().getName())) {
return;
}
+ announce("test_05b");
try {
URL urlXml = this.getClass().getResource("/CR100.xml");
File file = new File(urlXml.getFile());
String crXml = file.getAbsolutePath();
- System.setProperty(JdFlagsHelper.Name.CollectionReaderXml.name(), crXml);
+ System.setProperty(FlagsHelper.Name.CollectionReaderXml.pname(), crXml);
String userClasspath = Utilities.getInstance().getUserCP();
- System.setProperty(JdFlagsHelper.Name.UserClasspath.name(), userClasspath);
+ System.setProperty(FlagsHelper.Name.UserClasspath.pname(), userClasspath);
//
String ehcp = "KillJobLimit="+2;
- System.setProperty(JdFlagsHelper.Name.UserErrorHandlerCfg.name(), ehcp);
+ System.setProperty(FlagsHelper.Name.UserErrorHandlerCfg.pname(), ehcp);
//
JobDriver.createInstance();
int size = JobDriver.getInstance().getMap().size();
@@ -563,16 +570,17 @@ public class TestMessageHandler extends
if(isDisabled(this.getClass().getName())) {
return;
}
+ announce("test_06");
try {
URL urlXml = this.getClass().getResource("/CR100.xml");
File file = new File(urlXml.getFile());
String crXml = file.getAbsolutePath();
- System.setProperty(JdFlagsHelper.Name.CollectionReaderXml.name(), crXml);
+ System.setProperty(FlagsHelper.Name.CollectionReaderXml.pname(), crXml);
String userClasspath = Utilities.getInstance().getUserCP();
- System.setProperty(JdFlagsHelper.Name.UserClasspath.name(), userClasspath);
+ System.setProperty(FlagsHelper.Name.UserClasspath.pname(), userClasspath);
//
String eh = "org.apache.uima.ducc.user.jd.test.helper.TestJdContainerErrorHandlerRandomRetry";
- System.setProperty(JdFlagsHelper.Name.UserErrorHandlerClassname.name(), eh);
+ System.setProperty(FlagsHelper.Name.UserErrorHandlerClassname.pname(), 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=1641444&r1=1641443&r2=1641444&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 24 18:51:03 2014
@@ -25,7 +25,7 @@ import java.io.File;
import java.net.URL;
import java.util.ArrayList;
-import org.apache.uima.ducc.common.jd.JdFlagsHelper;
+import org.apache.uima.ducc.common.container.FlagsHelper;
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(JdFlagsHelper.Name.CollectionReaderXml.name(), crXml);
+ System.setProperty(FlagsHelper.Name.CollectionReaderXml.pname(), crXml);
String userClasspath = Utilities.getInstance().getUserCP();
- System.setProperty(JdFlagsHelper.Name.UserClasspath.name(), userClasspath);
+ System.setProperty(FlagsHelper.Name.UserClasspath.pname(), 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(JdFlagsHelper.Name.CollectionReaderXml.name(), crXml);
+ System.setProperty(FlagsHelper.Name.CollectionReaderXml.pname(), crXml);
String userClasspath = Utilities.getInstance().getUserCP();
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(JdFlagsHelper.Name.UserClasspath.name(), userPartialClasspath);
+ System.setProperty(FlagsHelper.Name.UserClasspath.pname(), userPartialClasspath);
new ProxyJobDriverCollectionReader();
fail("Exception missing...?");
}
@@ -127,7 +127,7 @@ public class TestSuite extends ATest {
private void testNoXml() {
try {
String userClasspath = Utilities.getInstance().getUserCP();
- System.setProperty(JdFlagsHelper.Name.UserClasspath.name(), userClasspath);
+ System.setProperty(FlagsHelper.Name.UserClasspath.pname(), userClasspath);
new ProxyJobDriverCollectionReader();
fail("Exception missing...?");
}