You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by al...@apache.org on 2006/12/01 22:56:04 UTC
svn commit: r481416 - in /incubator/uima/uimaj/trunk/uimaj-cpe/src:
main/java/org/apache/uima/collection/impl/cpm/container/CPEFactory.java
test/java/org/apache/uima/collection/impl/cpm/CpmStopTest.java
test/resources/CpmTests/SlowAnnotator.xml
Author: alally
Date: Fri Dec 1 13:56:03 2006
New Revision: 481416
URL: http://svn.apache.org/viewvc?view=rev&rev=481416
Log:
UIMA-24: improved error message given when descriptor has an invalid frameworkImplementation.
Also removed the support for "JEDII" and "TAF" as framework implementations,
and create constants holding the correct framework implementation names rather than
having the string literals repeated in several places.
https://issues.apache.org/jira/browse/UIMA-24?page=comments
Modified:
incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/CPEFactory.java
incubator/uima/uimaj/trunk/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/cpm/CpmStopTest.java
incubator/uima/uimaj/trunk/uimaj-cpe/src/test/resources/CpmTests/SlowAnnotator.xml
Modified: incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/CPEFactory.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/CPEFactory.java?view=diff&rev=481416&r1=481415&r2=481416
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/CPEFactory.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-cpe/src/main/java/org/apache/uima/collection/impl/cpm/container/CPEFactory.java Fri Dec 1 13:56:03 2006
@@ -633,7 +633,7 @@
return false;
}
- if (frameworkName.startsWith("org.apache.uima.cpp") || frameworkName.startsWith("TAF")) {
+ if (frameworkName.startsWith(org.apache.uima.Constants.CPP_FRAMEWORK_NAME)) {
validDefinition = true;
} else {
// String className = ((CasConsumerDescription) resourceSpecifier).getImplementationName();
Modified: incubator/uima/uimaj/trunk/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/cpm/CpmStopTest.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/cpm/CpmStopTest.java?view=diff&rev=481416&r1=481415&r2=481416
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/cpm/CpmStopTest.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/cpm/CpmStopTest.java Fri Dec 1 13:56:03 2006
@@ -168,53 +168,48 @@
CpeDescription cpeDesc = null;
CollectionProcessingEngine cpe = null;
- try {
- String colReaderBase = junitTestBasePath + "CpmTests" + separator
- + "ErrorTestCollectionReader.xml";
- String taeBase = junitTestBasePath + "CpmTests" + separator + "ErrorTestAnnotator.xml";
- String casConsumerBase = junitTestBasePath + "CpmTests" + separator
- + "ErrorTestCasConsumer.xml";
-
- // created needed descriptors
- String colReaderDesc = DescriptorMakeUtil.makeCollectionReader(colReaderBase, documentCount);
- String taeDesc = DescriptorMakeUtil.makeAnalysisEngine(taeBase);
- String casConsumerDesc = DescriptorMakeUtil.makeCasConsumer(casConsumerBase);
-
- // create cpm descriptor
- cpeDesc = CpeDescriptorFactory.produceDescriptor();
- cpeDesc.setInputQueueSize(2);
- cpeDesc.setOutputQueueSize(2);
- cpeDesc.setProcessingUnitThreadCount(threadCount);
-
- // add tae
- CpeIntegratedCasProcessor integratedProcessor = CpeDescriptorFactory
- .produceCasProcessor("ErrorTestAnnotator");
- integratedProcessor.setDescriptor(taeDesc);
- cpeDesc.addCasProcessor(integratedProcessor);
-
- // add slow annotator if requested
- if (useSlowAnnotator) {
- CpeIntegratedCasProcessor slowProcessor = CpeDescriptorFactory
- .produceCasProcessor("SlowAnnotator");
- slowProcessor.setDescriptor(junitTestBasePath + "CpmTests" + separator
- + "SlowAnnotator.xml");
- cpeDesc.addCasProcessor(slowProcessor);
- }
-
- // add casConsumer
- CpeIntegratedCasProcessor casConsumer = CpeDescriptorFactory
- .produceCasProcessor("ErrorTest CasConsumer");
- casConsumer.setDescriptor(casConsumerDesc);
- cpeDesc.addCasProcessor(casConsumer);
-
- // add collectionReader
- cpeDesc.addCollectionReader(colReaderDesc);
-
- // produce cpe
- cpe = UIMAFramework.produceCollectionProcessingEngine(cpeDesc, null, null);
- } catch (Exception e) {
- e.printStackTrace();
+ String colReaderBase = junitTestBasePath + "CpmTests" + separator
+ + "ErrorTestCollectionReader.xml";
+ String taeBase = junitTestBasePath + "CpmTests" + separator + "ErrorTestAnnotator.xml";
+ String casConsumerBase = junitTestBasePath + "CpmTests" + separator
+ + "ErrorTestCasConsumer.xml";
+
+ // created needed descriptors
+ String colReaderDesc = DescriptorMakeUtil.makeCollectionReader(colReaderBase, documentCount);
+ String taeDesc = DescriptorMakeUtil.makeAnalysisEngine(taeBase);
+ String casConsumerDesc = DescriptorMakeUtil.makeCasConsumer(casConsumerBase);
+
+ // create cpm descriptor
+ cpeDesc = CpeDescriptorFactory.produceDescriptor();
+ cpeDesc.setInputQueueSize(2);
+ cpeDesc.setOutputQueueSize(2);
+ cpeDesc.setProcessingUnitThreadCount(threadCount);
+
+ // add tae
+ CpeIntegratedCasProcessor integratedProcessor = CpeDescriptorFactory
+ .produceCasProcessor("ErrorTestAnnotator");
+ integratedProcessor.setDescriptor(taeDesc);
+ cpeDesc.addCasProcessor(integratedProcessor);
+
+ // add slow annotator if requested
+ if (useSlowAnnotator) {
+ CpeIntegratedCasProcessor slowProcessor = CpeDescriptorFactory
+ .produceCasProcessor("SlowAnnotator");
+ slowProcessor.setDescriptor(junitTestBasePath + "CpmTests" + separator + "SlowAnnotator.xml");
+ cpeDesc.addCasProcessor(slowProcessor);
}
+
+ // add casConsumer
+ CpeIntegratedCasProcessor casConsumer = CpeDescriptorFactory
+ .produceCasProcessor("ErrorTest CasConsumer");
+ casConsumer.setDescriptor(casConsumerDesc);
+ cpeDesc.addCasProcessor(casConsumer);
+
+ // add collectionReader
+ cpeDesc.addCollectionReader(colReaderDesc);
+
+ // produce cpe
+ cpe = UIMAFramework.produceCollectionProcessingEngine(cpeDesc, null, null);
return cpe;
}
Modified: incubator/uima/uimaj/trunk/uimaj-cpe/src/test/resources/CpmTests/SlowAnnotator.xml
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-cpe/src/test/resources/CpmTests/SlowAnnotator.xml?view=diff&rev=481416&r1=481415&r2=481416
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-cpe/src/test/resources/CpmTests/SlowAnnotator.xml (original)
+++ incubator/uima/uimaj/trunk/uimaj-cpe/src/test/resources/CpmTests/SlowAnnotator.xml Fri Dec 1 13:56:03 2006
@@ -19,7 +19,7 @@
-->
<taeDescription xmlns="http://uima.apache.org/resourceSpecifier">
- <frameworkImplementation>JEDII</frameworkImplementation>
+ <frameworkImplementation>org.apache.uima.java</frameworkImplementation>
<primitive>true</primitive>
<annotatorImplementationName>org.apache.uima.collection.impl.cpm.utils.SlowAnnotator</annotatorImplementationName>
<analysisEngineMetaData>