Author: degenaro
Date: Thu Nov 6 19:45:44 2014
New Revision: 1637196
URL: http://svn.apache.org/r1637196
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/JdUserCasManager.java
- copied, changed from r1636990,
uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/jd/CasManager.java
uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/jd/JdUserCollectionReaderManager.java
- copied, changed from r1636990,
uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/jd/CollectionReaderManager.java
uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/jd/JdUserException.java
- copied, changed from r1636990,
uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/jd/iface/JdUserException.java
uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/jd/JdUserMetaCas.java
- copied, changed from r1637131,
uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/jd/iface/JdUserMetaCas.java
Removed:
uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/jd/CasManager.java
uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/jd/CollectionReaderManager.java
uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/jd/iface/JdUserCollectionReader.java
uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/jd/iface/JdUserException.java
uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/jd/iface/JdUserMetaCas.java
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/test/java/org/apache/uima/ducc/user/jd/test/TestSuite.java
Copied:
uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/jd/JdUserCasManager.java
(from r1636990,
uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/jd/CasManager.java)
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/jd/JdUserCasManager.java?p2=uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/jd/JdUserCasManager.java&p1=uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/jd/CasManager.java&r1=1636990&r2=1637196&rev=1637196&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/jd/CasManager.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/jd/JdUserCasManager.java
Thu Nov 6 19:45:44 2014
@@ -30,7 +30,7 @@ import org.apache.uima.resource.metadata
import org.apache.uima.resource.metadata.TypeSystemDescription;
import org.apache.uima.util.CasCreationUtils;
-public class CasManager {
+public class JdUserCasManager {
private String CAS_INITIAL_HEAP_SIZE = "1000";
@@ -43,7 +43,7 @@ public class CasManager {
private FsIndexDescription[] fid;
private Properties crProperties = new Properties();
- public CasManager(CollectionReader cr) {
+ public JdUserCasManager(CollectionReader cr) {
setTypeSystemDescription(cr.getProcessingResourceMetaData().getTypeSystem());
setTypePriorities(cr.getProcessingResourceMetaData().getTypePriorities());
setFsIndexDescription(cr.getProcessingResourceMetaData().getFsIndexes());
Copied:
uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/jd/JdUserCollectionReaderManager.java
(from r1636990,
uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/jd/CollectionReaderManager.java)
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/jd/JdUserCollectionReaderManager.java?p2=uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/jd/JdUserCollectionReaderManager.java&p1=uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/jd/CollectionReaderManager.java&r1=1636990&r2=1637196&rev=1637196&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/jd/CollectionReaderManager.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/jd/JdUserCollectionReaderManager.java
Thu Nov 6 19:45:44 2014
@@ -36,8 +36,6 @@ import org.apache.uima.collection.Collec
import org.apache.uima.collection.CollectionReader;
import org.apache.uima.ducc.user.common.QuotedOptions;
import org.apache.uima.ducc.user.common.UimaUtils;
-import org.apache.uima.ducc.user.jd.iface.JdUserException;
-import org.apache.uima.ducc.user.jd.iface.JdUserMetaCas;
import org.apache.uima.resource.ResourceConfigurationException;
import org.apache.uima.resource.ResourceCreationSpecifier;
import org.apache.uima.resource.ResourceInitializationException;
@@ -51,7 +49,7 @@ import org.apache.uima.util.XMLInputSour
import org.apache.uima.util.XMLParser;
import org.xml.sax.SAXException;
-public class CollectionReaderManager {
+public class JdUserCollectionReaderManager {
private static UimaSerializer uimaSerializer = new UimaSerializer();
private static XmiSerializationSharedData xmiSerializationSharedData =
new XmiSerializationSharedData();
@@ -59,7 +57,7 @@ public class CollectionReaderManager {
private String crXml = null;
private String crCfg = null;
- private CasManager cm = null;
+ private JdUserCasManager cm = null;
private CollectionReader cr = null;
private HashMap<String, String> overrides = new HashMap<String,
String>();
@@ -68,7 +66,7 @@ public class CollectionReaderManager {
private AtomicInteger seqNo = new AtomicInteger(0);
- public CollectionReaderManager(String crXml, String crCfg) throws
JdUserException {
+ public JdUserCollectionReaderManager(String crXml, String crCfg) throws
JdUserException {
initialize(crXml, crCfg);
}
@@ -127,7 +125,7 @@ public class CollectionReaderManager {
setCr(UIMAFramework.produceCollectionReader(crrs));
initTotal();
// CasManager
- cm = new CasManager(cr);
+ cm = new JdUserCasManager(cr);
}
public int getTotal() {
Copied:
uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/jd/JdUserException.java
(from r1636990,
uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/jd/iface/JdUserException.java)
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/jd/JdUserException.java?p2=uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/jd/JdUserException.java&p1=uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/jd/iface/JdUserException.java&r1=1636990&r2=1637196&rev=1637196&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/jd/iface/JdUserException.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/jd/JdUserException.java
Thu Nov 6 19:45:44 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.uima.ducc.user.jd.iface;
+package org.apache.uima.ducc.user.jd;
public class JdUserException extends Exception {
Copied:
uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/jd/JdUserMetaCas.java
(from r1637131,
uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/jd/iface/JdUserMetaCas.java)
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/jd/JdUserMetaCas.java?p2=uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/jd/JdUserMetaCas.java&p1=uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/jd/iface/JdUserMetaCas.java&r1=1637131&r2=1637196&rev=1637196&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/jd/iface/JdUserMetaCas.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-user/src/main/java/org/apache/uima/ducc/user/jd/JdUserMetaCas.java
Thu Nov 6 19:45:44 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.uima.ducc.user.jd.iface;
+package org.apache.uima.ducc.user.jd;
public class JdUserMetaCas {
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=1637196&r1=1637195&r2=1637196&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 19:45:44 2014
@@ -26,13 +26,12 @@ import java.net.URL;
import java.util.Properties;
import org.apache.uima.cas.CAS;
-import org.apache.uima.ducc.user.jd.CollectionReaderManager;
+import org.apache.uima.ducc.user.jd.JdUserCollectionReaderManager;
+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;
import org.apache.uima.ducc.user.jd.iface.IJdUserErrorHandler.HandleKey;
-import org.apache.uima.ducc.user.jd.iface.JdUserCollectionReader;
import org.apache.uima.ducc.user.jd.iface.JdUserErrorHandler;
-import org.apache.uima.ducc.user.jd.iface.JdUserException;
-import org.apache.uima.ducc.user.jd.iface.JdUserMetaCas;
import org.junit.After;
import org.junit.AfterClass;
import org.junit.Before;
@@ -107,8 +106,8 @@ public class TestSuite {
String crXml = file.getAbsolutePath();
debug(crXml);
String crCfg = null;
- JdUserCollectionReader jdUserCollectionReader = new
JdUserCollectionReader(crXml, crCfg);
- int total = jdUserCollectionReader.getTotal();
+ JdUserCollectionReaderManager crm = new
JdUserCollectionReaderManager(crXml, crCfg);
+ int total = crm.getTotal();
assertTrue(total == 100);
}
catch(Exception e) {
@@ -125,18 +124,18 @@ public class TestSuite {
String crXml = file.getAbsolutePath();
debug(crXml);
String crCfg = null;
- JdUserCollectionReader jdUserCollectionReader = new
JdUserCollectionReader(crXml, crCfg);
- int total = jdUserCollectionReader.getTotal();
+ JdUserCollectionReaderManager crm = new
JdUserCollectionReaderManager(crXml, crCfg);
+ int total = crm.getTotal();
assertTrue(total == 100);
int counter = 0;
- JdUserMetaCas jdUserMetaCas =
jdUserCollectionReader.getJdUserMetaCas();
+ JdUserMetaCas jdUserMetaCas = crm.getJdUserMetaCas();
while(jdUserMetaCas != null) {
jdUserMetaCas.printMe();
counter++;
if(counter > 100) {
fail("Too many CASes: "+counter);
}
- jdUserMetaCas =
jdUserCollectionReader.getJdUserMetaCas();
+ jdUserMetaCas = crm.getJdUserMetaCas();
}
if(counter < 100) {
fail("Not enough CASes: "+counter);
@@ -156,17 +155,17 @@ public class TestSuite {
String crXml = file.getAbsolutePath();
debug(crXml);
String crCfg = null;
- JdUserCollectionReader jdUserCollectionReader = new
JdUserCollectionReader(crXml, crCfg);
- int total = jdUserCollectionReader.getTotal();
+ JdUserCollectionReaderManager crm = new
JdUserCollectionReaderManager(crXml, crCfg);
+ int total = crm.getTotal();
assertTrue(total == 100);
JdUserMetaCas jdUserMetaCas = null;
int counter = 0;
for(int i=0; i<total; i++) {
- jdUserMetaCas =
jdUserCollectionReader.getJdUserMetaCas();
+ jdUserMetaCas = crm.getJdUserMetaCas();
assertTrue(jdUserMetaCas != null);
counter++;
}
- jdUserMetaCas =
jdUserCollectionReader.getJdUserMetaCas();
+ jdUserMetaCas = crm.getJdUserMetaCas();
assertTrue(jdUserMetaCas == null);
assertTrue(counter == 100);
}
@@ -203,15 +202,14 @@ public class TestSuite {
String crXml = file.getAbsolutePath();
debug(crXml);
String crCfg = null;
- JdUserCollectionReader jdUserCollectionReader = new
JdUserCollectionReader(crXml, crCfg);
- int total = jdUserCollectionReader.getTotal();
+ JdUserCollectionReaderManager crm = new
JdUserCollectionReaderManager(crXml, crCfg);
+ int total = crm.getTotal();
assertTrue(total == 100);
JdUserMetaCas jdUserMetaCas = null;
- jdUserMetaCas =
jdUserCollectionReader.getJdUserMetaCas();
+ jdUserMetaCas = crm.getJdUserMetaCas();
assertTrue(jdUserMetaCas != null);
String serializedCas = jdUserMetaCas.getSerializedCas();
assertTrue(serializedCas != null);
- CollectionReaderManager crm =
jdUserCollectionReader.getCollectionReaderManager();
CAS cas = crm.deserialize(serializedCas);
JdUserErrorHandler eh = new JdUserErrorHandler();
Exception exception = null;
@@ -246,15 +244,14 @@ public class TestSuite {
String crXml = file.getAbsolutePath();
debug(crXml);
String crCfg = null;
- JdUserCollectionReader jdUserCollectionReader = new
JdUserCollectionReader(crXml, crCfg);
- int total = jdUserCollectionReader.getTotal();
+ JdUserCollectionReaderManager crm = new
JdUserCollectionReaderManager(crXml, crCfg);
+ int total = crm.getTotal();
assertTrue(total == 100);
JdUserMetaCas jdUserMetaCas = null;
- jdUserMetaCas =
jdUserCollectionReader.getJdUserMetaCas();
+ jdUserMetaCas = crm.getJdUserMetaCas();
assertTrue(jdUserMetaCas != null);
String serializedCas = jdUserMetaCas.getSerializedCas();
assertTrue(serializedCas != null);
- CollectionReaderManager crm =
jdUserCollectionReader.getCollectionReaderManager();
CAS cas = crm.deserialize(serializedCas);
JdUserErrorHandler eh = new JdUserErrorHandler();
Exception exception = new RuntimeException();
