Author: degenaro
Date: Thu Nov 6 20:52:29 2014
New Revision: 1637216
URL: http://svn.apache.org/r1637216
Log:
UIMA-4069 Redesign of JD toward the main goal of classpath separation for
container (system) code.
Mini-reorg of ducc-user jd packaging.
Added:
uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/jd/JdUserCollectionReader.java
- copied, changed from r1637197,
uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/jd/JdUserCollectionReaderManager.java
Removed:
uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/jd/JdUserCollectionReaderManager.java
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/classload/JobDriverCollectionReader.java
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/TestSuite.java
uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/test/java/org/apache/uima/ducc/user/jd/test/TestSuite.java
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/classload/JobDriverCollectionReader.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/classload/JobDriverCollectionReader.java?rev=1637216&r1=1637215&r2=1637216&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/classload/JobDriverCollectionReader.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/classload/JobDriverCollectionReader.java
Thu Nov 6 20:52:29 2014
@@ -59,7 +59,7 @@ public class JobDriverCollectionReader {
private String name_getSerializedCas = "getSerializedCas";
private String[] requiredClasses = {
-
"org.apache.uima.ducc.user.jd.iface.JdUserCollectionReader",
+ "org.apache.uima.ducc.user.jd.JdUserCollectionReader",
"org.apache.uima.aae.UimaSerializer",
"org.apache.uima.cas.CAS",
"com.thoughtworks.xstream.XStream",
@@ -151,11 +151,11 @@ public class JobDriverCollectionReader {
private void initialize() throws JobDriverException {
try {
- class_JdUserCollectionReader =
urlClassLoader.loadClass("org.apache.uima.ducc.user.jd.iface.JdUserCollectionReader");
+ class_JdUserCollectionReader =
urlClassLoader.loadClass("org.apache.uima.ducc.user.jd.JdUserCollectionReader");
Constructor<?> constructor_JdUserCollectionReader =
class_JdUserCollectionReader.getConstructor(String.class,String.class);
instance_JdUserCollectionReader =
constructor_JdUserCollectionReader.newInstance(new Object[] { crXml, crCfg });
method_getTotal =
class_JdUserCollectionReader.getMethod(name_getTotal, nullClassArray);
- class_JdUserMetaCas =
urlClassLoader.loadClass("org.apache.uima.ducc.user.jd.iface.JdUserMetaCas");
+ class_JdUserMetaCas =
urlClassLoader.loadClass("org.apache.uima.ducc.user.jd.JdUserMetaCas");
method_getJdUserMetaCas =
class_JdUserCollectionReader.getMethod(name_getJdUserMetaCas, nullClassArray);
} catch (ClassNotFoundException e) {
JobDriverException jobDriverException = new
JobDriverException(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=1637216&r1=1637215&r2=1637216&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
Thu Nov 6 20:52:29 2014
@@ -206,8 +206,8 @@ public class TestSuite {
classLoaderUrls[i] =
this.getClass().getResource(jar);
i++;
}
- JobDriverCollectionReader jdui = new
JobDriverCollectionReader(classLoaderUrls, crXml, crCfg);
- int total = jdui.getTotal();
+ JobDriverCollectionReader jdcr = new
JobDriverCollectionReader(classLoaderUrls, crXml, crCfg);
+ int total = jdcr.getTotal();
assertTrue(total == 100);
debug("total: "+total);
}
@@ -237,8 +237,8 @@ public class TestSuite {
classLoaderUrls[i] =
this.getClass().getResource(jar);
i++;
}
- JobDriverCollectionReader jdui = new
JobDriverCollectionReader(classLoaderUrls, crXml, crCfg);
- MetaCas mc = jdui.getMetaCas();
+ JobDriverCollectionReader jdcr = new
JobDriverCollectionReader(classLoaderUrls, crXml, crCfg);
+ MetaCas mc = jdcr.getMetaCas();
int seqNo = mc.getSeqNo();
asExpected("seqNo = "+seqNo);
assertTrue(seqNo == 1);
@@ -267,9 +267,9 @@ public class TestSuite {
getMetaCas(Utilities.userCP, crXml, crCfg);
}
- private void getMetaCases(JobDriverCollectionReader jdui, int total)
throws JobDriverException {
+ private void getMetaCases(JobDriverCollectionReader jdcr, int total)
throws JobDriverException {
for(int c=1; c <= total; c++) {
- MetaCas mc = jdui.getMetaCas();
+ MetaCas mc = jdcr.getMetaCas();
int seqNo = mc.getSeqNo();
asExpected("seqNo = "+seqNo);
assertTrue(seqNo == c);
@@ -290,12 +290,12 @@ public class TestSuite {
classLoaderUrls[i] =
this.getClass().getResource(jar);
i++;
}
- JobDriverCollectionReader jdui = new
JobDriverCollectionReader(classLoaderUrls, crXml, crCfg);
- int total = jdui.getTotal();
- getMetaCases(jdui, total);
+ JobDriverCollectionReader jdcr = new
JobDriverCollectionReader(classLoaderUrls, crXml, crCfg);
+ int total = jdcr.getTotal();
+ getMetaCases(jdcr, total);
if(extra > 0) {
for(int j=0; j<extra; j++) {
- MetaCas mc = jdui.getMetaCas();
+ MetaCas mc = jdcr.getMetaCas();
assertTrue(mc == null);
}
}
Copied:
uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/jd/JdUserCollectionReader.java
(from r1637197,
uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/jd/JdUserCollectionReaderManager.java)
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/jd/JdUserCollectionReader.java?p2=uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/jd/JdUserCollectionReader.java&p1=uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/jd/JdUserCollectionReaderManager.java&r1=1637197&r2=1637216&rev=1637216&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/jd/JdUserCollectionReaderManager.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/jd/JdUserCollectionReader.java
Thu Nov 6 20:52:29 2014
@@ -49,7 +49,7 @@ import org.apache.uima.util.XMLInputSour
import org.apache.uima.util.XMLParser;
import org.xml.sax.SAXException;
-public class JdUserCollectionReaderManager {
+public class JdUserCollectionReader {
private static UimaSerializer uimaSerializer = new UimaSerializer();
private static XmiSerializationSharedData xmiSerializationSharedData =
new XmiSerializationSharedData();
@@ -66,7 +66,7 @@ public class JdUserCollectionReaderManag
private AtomicInteger seqNo = new AtomicInteger(0);
- public JdUserCollectionReaderManager(String crXml, String crCfg) throws
JdUserException {
+ public JdUserCollectionReader(String crXml, String crCfg) throws
JdUserException {
initialize(crXml, crCfg);
}
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/test/java/org/apache/uima/ducc/user/jd/test/TestSuite.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/test/java/org/apache/uima/ducc/user/jd/test/TestSuite.java?rev=1637216&r1=1637215&r2=1637216&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/test/java/org/apache/uima/ducc/user/jd/test/TestSuite.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/test/java/org/apache/uima/ducc/user/jd/test/TestSuite.java
Thu Nov 6 20:52:29 2014
@@ -26,7 +26,7 @@ import java.net.URL;
import java.util.Properties;
import org.apache.uima.cas.CAS;
-import org.apache.uima.ducc.user.jd.JdUserCollectionReaderManager;
+import org.apache.uima.ducc.user.jd.JdUserCollectionReader;
import org.apache.uima.ducc.user.jd.JdUserException;
import org.apache.uima.ducc.user.jd.JdUserMetaCas;
import org.apache.uima.ducc.user.jd.iface.IJdUserErrorHandler;
@@ -106,8 +106,8 @@ public class TestSuite {
String crXml = file.getAbsolutePath();
debug(crXml);
String crCfg = null;
- JdUserCollectionReaderManager crm = new
JdUserCollectionReaderManager(crXml, crCfg);
- int total = crm.getTotal();
+ JdUserCollectionReader jdcr = new
JdUserCollectionReader(crXml, crCfg);
+ int total = jdcr.getTotal();
assertTrue(total == 100);
}
catch(Exception e) {
@@ -124,18 +124,18 @@ public class TestSuite {
String crXml = file.getAbsolutePath();
debug(crXml);
String crCfg = null;
- JdUserCollectionReaderManager crm = new
JdUserCollectionReaderManager(crXml, crCfg);
- int total = crm.getTotal();
+ JdUserCollectionReader jdcr = new
JdUserCollectionReader(crXml, crCfg);
+ int total = jdcr.getTotal();
assertTrue(total == 100);
int counter = 0;
- JdUserMetaCas jdUserMetaCas = crm.getJdUserMetaCas();
+ JdUserMetaCas jdUserMetaCas = jdcr.getJdUserMetaCas();
while(jdUserMetaCas != null) {
jdUserMetaCas.printMe();
counter++;
if(counter > 100) {
fail("Too many CASes: "+counter);
}
- jdUserMetaCas = crm.getJdUserMetaCas();
+ jdUserMetaCas = jdcr.getJdUserMetaCas();
}
if(counter < 100) {
fail("Not enough CASes: "+counter);
@@ -155,17 +155,17 @@ public class TestSuite {
String crXml = file.getAbsolutePath();
debug(crXml);
String crCfg = null;
- JdUserCollectionReaderManager crm = new
JdUserCollectionReaderManager(crXml, crCfg);
- int total = crm.getTotal();
+ JdUserCollectionReader jdcr = new
JdUserCollectionReader(crXml, crCfg);
+ int total = jdcr.getTotal();
assertTrue(total == 100);
JdUserMetaCas jdUserMetaCas = null;
int counter = 0;
for(int i=0; i<total; i++) {
- jdUserMetaCas = crm.getJdUserMetaCas();
+ jdUserMetaCas = jdcr.getJdUserMetaCas();
assertTrue(jdUserMetaCas != null);
counter++;
}
- jdUserMetaCas = crm.getJdUserMetaCas();
+ jdUserMetaCas = jdcr.getJdUserMetaCas();
assertTrue(jdUserMetaCas == null);
assertTrue(counter == 100);
}
@@ -202,15 +202,15 @@ public class TestSuite {
String crXml = file.getAbsolutePath();
debug(crXml);
String crCfg = null;
- JdUserCollectionReaderManager crm = new
JdUserCollectionReaderManager(crXml, crCfg);
- int total = crm.getTotal();
+ JdUserCollectionReader jdcr = new
JdUserCollectionReader(crXml, crCfg);
+ int total = jdcr.getTotal();
assertTrue(total == 100);
JdUserMetaCas jdUserMetaCas = null;
- jdUserMetaCas = crm.getJdUserMetaCas();
+ jdUserMetaCas = jdcr.getJdUserMetaCas();
assertTrue(jdUserMetaCas != null);
String serializedCas = jdUserMetaCas.getSerializedCas();
assertTrue(serializedCas != null);
- CAS cas = crm.deserialize(serializedCas);
+ CAS cas = jdcr.deserialize(serializedCas);
JdUserErrorHandler eh = new JdUserErrorHandler();
Exception exception = null;
Properties properties = eh.handle(cas, exception);
@@ -228,7 +228,7 @@ public class TestSuite {
key = HandleKey.killProcessReason.name();
value = properties.getProperty(key);
debug(key+": "+value);
- crm.recycle(cas);
+ jdcr.recycle(cas);
}
catch(Exception e) {
e.printStackTrace();
@@ -244,15 +244,15 @@ public class TestSuite {
String crXml = file.getAbsolutePath();
debug(crXml);
String crCfg = null;
- JdUserCollectionReaderManager crm = new
JdUserCollectionReaderManager(crXml, crCfg);
- int total = crm.getTotal();
+ JdUserCollectionReader jdcr = new
JdUserCollectionReader(crXml, crCfg);
+ int total = jdcr.getTotal();
assertTrue(total == 100);
JdUserMetaCas jdUserMetaCas = null;
- jdUserMetaCas = crm.getJdUserMetaCas();
+ jdUserMetaCas = jdcr.getJdUserMetaCas();
assertTrue(jdUserMetaCas != null);
String serializedCas = jdUserMetaCas.getSerializedCas();
assertTrue(serializedCas != null);
- CAS cas = crm.deserialize(serializedCas);
+ CAS cas = jdcr.deserialize(serializedCas);
JdUserErrorHandler eh = new JdUserErrorHandler();
Exception exception = new RuntimeException();
Properties properties = eh.handle(cas, exception);
@@ -271,7 +271,7 @@ public class TestSuite {
value = properties.getProperty(key);
debug(key+": "+value);
assertTrue(!properties.containsKey(HandleKey.killJobFlag));
- crm.recycle(cas);
+ jdcr.recycle(cas);
}
catch(Exception e) {
e.printStackTrace();
