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 2007/01/24 19:31:38 UTC
svn commit: r499514 - in /incubator/uima/uimaj/trunk/uimaj-core/src:
main/java/org/apache/uima/analysis_engine/impl/
test/java/org/apache/uima/analysis_engine/impl/
test/resources/TextAnalysisEngineImplTest/
Author: alally
Date: Wed Jan 24 10:31:37 2007
New Revision: 499514
URL: http://svn.apache.org/viewvc?view=rev&rev=499514
Log:
Fixed doFullValidation for C++ AEs. Test case added.
UIMA-225: http://issues.apache.org/jira/browse/UIMA-225
Added:
incubator/uima/uimaj/trunk/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/TestUimaCppAe.xml
Modified:
incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/UimacppAnalysisEngineImpl.java
incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/AnalysisEngineDescription_implTest.java
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/UimacppAnalysisEngineImpl.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/UimacppAnalysisEngineImpl.java?view=diff&rev=499514&r1=499513&r2=499514
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/UimacppAnalysisEngineImpl.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/UimacppAnalysisEngineImpl.java Wed Jan 24 10:31:37 2007
@@ -169,7 +169,9 @@
initializeAnalysisComponent(mDescription);
- resetResultSpecificationToDefault();
+ if (!mVerificationMode) {
+ resetResultSpecificationToDefault();
+ }
getLogger().logrb(Level.CONFIG, CLASS_NAME.getName(), "initialize", LOG_RESOURCE_BUNDLE,
"UIMA_analysis_engine_init_successful__CONFIG", md.getName());
Modified: incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/AnalysisEngineDescription_implTest.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/AnalysisEngineDescription_implTest.java?view=diff&rev=499514&r1=499513&r2=499514
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/AnalysisEngineDescription_implTest.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/AnalysisEngineDescription_implTest.java Wed Jan 24 10:31:37 2007
@@ -440,6 +440,12 @@
File dataPathDir = JUnitExtension.getFile("TextAnalysisEngineImplTest/dataPathDir");
resMgr.setDataPath(dataPathDir.getCanonicalPath());
desc.doFullValidation(resMgr);
+
+ //test UIMA C++ descriptor (should succeed even though annotator library doesn't exist)
+ in = new XMLInputSource(JUnitExtension
+ .getFile("TextAnalysisEngineImplTest/TestUimaCppAE.xml"));
+ desc = UIMAFramework.getXMLParser().parseTaeDescription(in);
+ desc.doFullValidation();
}
public void testValidate() throws Exception {
Added: incubator/uima/uimaj/trunk/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/TestUimaCppAe.xml
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/TestUimaCppAe.xml?view=auto&rev=499514
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/TestUimaCppAe.xml (added)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/test/resources/TextAnalysisEngineImplTest/TestUimaCppAe.xml Wed Jan 24 10:31:37 2007
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ -->
+
+<!-- For testing only. -->
+
+<taeDescription xmlns="http://uima.apache.org/resourceSpecifier">
+<frameworkImplementation>org.apache.uima.cpp</frameworkImplementation>
+<primitive>true</primitive>
+<annotatorImplementationName>TestAnnotator</annotatorImplementationName>
+
+<analysisEngineMetaData>
+<name>Test UIMA C++ Primitive AE</name>
+<description>For descriptor testing only. The actual annotator code doesn't exist</description>
+<version>1.0</version>
+<vendor>The Apache Software Foundation</vendor>
+
+
+<!-- TypeSystem Definition -->
+<typeSystemDescription>
+<types>
+
+<typeDescription>
+<name>NamedEntity</name>
+<description>Anything that has a name.</description>
+<supertypeName>uima.tcas.Annotation</supertypeName>
+<features>
+ <featureDescription>
+ <name>CanonicalName</name>
+ <description>Canonical name for this entity.</description>
+ <rangeTypeName>uima.cas.String</rangeTypeName>
+ </featureDescription>
+</features>
+</typeDescription>
+
+<typeDescription>
+<name>Person</name>
+<description>A person.</description>
+<supertypeName>NamedEntity</supertypeName>
+</typeDescription>
+
+<typeDescription>
+<name>Place</name>
+<description>A place.</description>
+<supertypeName>NamedEntity</supertypeName>
+<features>
+ <featureDescription>
+ <name>SubType</name>
+ <description>Kind of place.</description>
+ <rangeTypeName>uima.cas.String</rangeTypeName>
+ </featureDescription>
+</features>
+</typeDescription>
+
+<typeDescription>
+<name>DocumentStructure</name>
+<description>Identifies document structure, such as sentence or paragraph.</description>
+<supertypeName>uima.tcas.Annotation</supertypeName>
+</typeDescription>
+
+<typeDescription>
+<name>Paragraph</name>
+<description>A paragraph.</description>
+<supertypeName>DocumentStructure</supertypeName>
+</typeDescription>
+
+<typeDescription>
+<name>Sentence</name>
+<description>A sentence.</description>
+<supertypeName>DocumentStructure</supertypeName>
+</typeDescription>
+
+</types>
+</typeSystemDescription>
+
+<typePriorities>
+ <priorityList>
+ <type>Paragraph</type>
+ <type>Sentence</type>
+ </priorityList>
+</typePriorities>
+
+<fsIndexes>
+ <fsIndexDescription>
+ <label>DocStructIndex</label>
+ <typeName>DocumentStructure</typeName>
+ <keys>
+ <fsIndexKey>
+ <featureName>begin</featureName>
+ <comparator>standard</comparator>
+ </fsIndexKey>
+ <fsIndexKey>
+ <typePriority/>
+ </fsIndexKey>
+ </keys>
+ </fsIndexDescription>
+</fsIndexes>
+
+<!-- Capabilities: Inputs and Outputs -->
+<capabilities>
+<capability>
+<outputs>
+<type allAnnotatorFeatures="true">DocumentStructure</type>
+<type allAnnotatorFeatures="true">NamedEntity</type>
+</outputs>
+<languagesSupported>
+<language>en</language>
+</languagesSupported>
+</capability>
+</capabilities>
+
+</analysisEngineMetaData>
+</taeDescription>