Author: pkluegl
Date: Fri Jun 14 11:43:58 2013
New Revision: 1493036
URL: http://svn.apache.org/r1493036
Log:
UIMA-2994
- delegate collectionProcessComplete and batchProcessComplete
Modified:
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/engine/RutaEngine.java
uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/launching/RutaLauncher.java
Modified:
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/engine/RutaEngine.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/engine/RutaEngine.java?rev=1493036&r1=1493035&r2=1493036&view=diff
==============================================================================
---
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/engine/RutaEngine.java
(original)
+++
uima/sandbox/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/engine/RutaEngine.java
Fri Jun 14 11:43:58 2013
@@ -181,8 +181,6 @@ public class RutaEngine extends JCasAnno
private Boolean removeBasics;
- private Map<String, TypeSystemDescription> localTSDMap;
-
private Boolean dynamicAnchoring;
private Boolean reloadScript;
@@ -253,8 +251,6 @@ public class RutaEngine extends JCasAnno
engineLoader = new RutaEngineLoader();
verbalizer = new RutaVerbalizer();
- localTSDMap = new HashMap<String, TypeSystemDescription>();
-
if (!factory.isInitialized()) {
initializeExtensionWithClassPath();
}
@@ -491,8 +487,6 @@ public class RutaEngine extends JCasAnno
// Class clazz =
this.getClass().getClassLoader().loadClass(eachUimafitEngine) ;
Class<? extends AnalysisComponent> uimafitClass = (Class<? extends
AnalysisComponent>) Class
.forName(eachUimafitEngine);
- TypeSystemDescription createTypeSystemDescription =
TypeSystemDescriptionFactory
- .createTypeSystemDescription();
eachEngine = AnalysisEngineFactory.createPrimitive(uimafitClass);
} catch (ClassNotFoundException e) {
throw new AnalysisEngineProcessException(e);
@@ -669,46 +663,6 @@ public class RutaEngine extends JCasAnno
}
}
- private TypeSystemDescription getLocalTSD(String toLoad) throws
InvalidXMLException, IOException {
- TypeSystemDescription localTSD = localTSDMap.get(toLoad);
- if (localTSD == null) {
- String locateTSD = locate(toLoad, descriptorPaths, "TypeSystem.xml",
true);
- if (locateTSD != null) {
- localTSD = UIMAFramework.getXMLParser().parseTypeSystemDescription(
- new XMLInputSource(locateTSD));
- } else {
- // TODO this won't work for lazy applies
- try {
- // cannot load it with descriptor paths
- String typeSystemLocation = toLoad.replaceAll("\\.", "/") +
"TypeSystem.xml";
- InputStream tsInputStream =
getClass().getClassLoader().getResourceAsStream(
- typeSystemLocation);
- localTSD = UIMAFramework.getXMLParser().parseTypeSystemDescription(
- new XMLInputSource(tsInputStream, null));
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
- if (localTSD != null) {
- ResourceManager resMgr = UIMAFramework.newDefaultResourceManager();
- resMgr.setDataPath(getDataPath());
- localTSD.resolveImports(resMgr);
- localTSDMap.put(toLoad, localTSD);
- }
- }
- return localTSD;
- }
-
- private String getDataPath() {
- String result = "";
- String sep = System.getProperty("path.separator");
- for (String each : descriptorPaths) {
- result += each + sep;
- }
- result = result.substring(0, result.length() - 1);
- return result;
- }
-
private RutaModule loadScript(String scriptLocation) throws IOException,
RecognitionException {
File scriptFile = new File(scriptLocation);
CharStream st = new ANTLRFileStream(scriptLocation, scriptEncoding);
@@ -747,7 +701,7 @@ public class RutaEngine extends JCasAnno
return engineLoader;
}
- private String collectionToString(Collection collection) {
+ private String collectionToString(Collection<?> collection) {
StringBuilder collectionSB = new StringBuilder();
collectionSB.append("{");
for (Object element : collection) {
@@ -760,4 +714,23 @@ public class RutaEngine extends JCasAnno
private String collectionToString(Object[] collection) {
return collectionToString(Arrays.asList(collection));
}
+
+ public void batchProcessComplete() throws AnalysisEngineProcessException {
+ super.batchProcessComplete();
+ Collection<AnalysisEngine> values = script.getEngines().values();
+ for (AnalysisEngine each : values) {
+ each.batchProcessComplete();
+ }
+ }
+
+ public void collectionProcessComplete() throws
AnalysisEngineProcessException {
+ super.collectionProcessComplete();
+ Collection<AnalysisEngine> values = script.getEngines().values();
+ for (AnalysisEngine each : values) {
+ each.collectionProcessComplete();
+ }
+ }
+
+
+
}
Modified:
uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/launching/RutaLauncher.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/launching/RutaLauncher.java?rev=1493036&r1=1493035&r2=1493036&view=diff
==============================================================================
---
uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/launching/RutaLauncher.java
(original)
+++
uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/launching/RutaLauncher.java
Fri Jun 14 11:43:58 2013
@@ -125,6 +125,7 @@ public class RutaLauncher {
processFile(file, ae, cas);
}
+ ae.batchProcessComplete(new ProcessTrace_impl());
ae.collectionProcessComplete(new ProcessTrace_impl());
cas.release();
ae.destroy();
