You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by bu...@apache.org on 2013/05/11 16:32:19 UTC
svn commit: r1481332 - in /uima/sandbox/uima-ducc/trunk:
uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/aio/
uima-ducc-common/src/main/java/org/apache/uima/ducc/common/uima/
Author: burn
Date: Sat May 11 14:32:19 2013
New Revision: 1481332
URL: http://svn.apache.org/r1481332
Log:
UIMA-2879 Get correct FC and destroy AE on exit
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/aio/AllInOne.java
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/aio/CasPipeline.java
uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/uima/UimaUtils.java
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/aio/AllInOne.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/aio/AllInOne.java?rev=1481332&r1=1481331&r2=1481332&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/aio/AllInOne.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/aio/AllInOne.java Sat May 11 14:32:19 2013
@@ -116,6 +116,7 @@ public class AllInOne extends CliBase {
casPipeline.process(cas);
count++;
}
+ casPipeline.destroy();
mh.frameworkTrace(cid, mid, "exit");
}
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/aio/CasPipeline.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/aio/CasPipeline.java?rev=1481332&r1=1481331&r2=1481332&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/aio/CasPipeline.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/aio/CasPipeline.java Sat May 11 14:32:19 2013
@@ -138,6 +138,9 @@ public class CasPipeline {
else if(descriptors.size() == 1) {
aed = UimaUtils.createAggregateDescription(false, overrides, descriptors.get(0));
}
+ System.out.println("Created descriptor:");
+ aed.toXML(System.out);
+ System.out.println("");
aed.toXML(baos);
ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
File file = null;
@@ -165,6 +168,10 @@ public class CasPipeline {
return cas;
}
+ public void destroy() {
+ ae.destroy();
+ }
+
public void dumpStatistics(PrintStream out) {
out.println("");
out.println("+---------------------------+");
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/uima/UimaUtils.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/uima/UimaUtils.java?rev=1481332&r1=1481331&r2=1481332&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/uima/UimaUtils.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/uima/UimaUtils.java Sat May 11 14:32:19 2013
@@ -35,6 +35,7 @@ import org.apache.uima.analysis_engine.m
import org.apache.uima.analysis_engine.metadata.FlowControllerDeclaration;
import org.apache.uima.analysis_engine.metadata.impl.FixedFlow_impl;
import org.apache.uima.analysis_engine.metadata.impl.FlowControllerDeclaration_impl;
+import org.apache.uima.ducc.common.utils.DuccPropertiesResolver;
import org.apache.uima.ducc.common.utils.Utils;
import org.apache.uima.resource.RelativePathResolver;
import org.apache.uima.resource.ResourceConfigurationException;
@@ -345,7 +346,7 @@ public class UimaUtils {
}
String fcsn;
- if ( (fcsn = System.getProperty(FlowControllerResourceSpecifier)) != null ) {
+ if ( (fcsn = DuccPropertiesResolver.getInstance().getProperty(FlowControllerResourceSpecifier)) != null ) {
FlowControllerDeclaration fcd = new FlowControllerDeclaration_impl();
desc.setFlowControllerDeclaration(fcd);
fcd.setImport(new Import_impl());