[UIMA-1832] merge trunk -> branch (picked up changes in xml descriptors for activemq tests)
diff --git a/uimaj-as-activemq/src/test/resources/deployment/Deploy_EmailRecognizer.xml b/uimaj-as-activemq/src/test/resources/deployment/Deploy_EmailRecognizer.xml
index 9b247c1..f24efdc 100644
--- a/uimaj-as-activemq/src/test/resources/deployment/Deploy_EmailRecognizer.xml
+++ b/uimaj-as-activemq/src/test/resources/deployment/Deploy_EmailRecognizer.xml
@@ -32,7 +32,7 @@
<service>
<inputQueue endpoint="EmailRecognizerQueue" brokerURL="tcp://localhost:8118" prefetch="1"/>
<topDescriptor>
- <import location="C:/uima/releases/2.3.3-04/apache-uima/examples/descriptors/analysis_engine/SimpleEmailRecognizer_RegEx_TAE.xml"/>
+ <import location="../descriptors/analysis_engine/SimpleEmailRecognizer_RegEx_TAE.xml"/>
</topDescriptor>
<analysisEngine>
<asyncPrimitiveErrorConfiguration>
diff --git a/uimaj-as-activemq/src/test/resources/deployment/Deploy_GovernmentOfficialRecognizer.xml b/uimaj-as-activemq/src/test/resources/deployment/Deploy_GovernmentOfficialRecognizer.xml
index 8347ab6..8ac91e6 100644
--- a/uimaj-as-activemq/src/test/resources/deployment/Deploy_GovernmentOfficialRecognizer.xml
+++ b/uimaj-as-activemq/src/test/resources/deployment/Deploy_GovernmentOfficialRecognizer.xml
@@ -32,7 +32,7 @@
<service>
<inputQueue endpoint="GovOfficialRecognizerQueue" brokerURL="tcp://localhost:8118" prefetch="1"/>
<topDescriptor>
- <import location="C:/uima/releases/2.3.3-04/apache-uima/examples/descriptors/analysis_engine/GovernmentOfficialRecognizer_RegEx_TAE.xml"/>
+ <import location="../descriptors/analysis_engine/GovernmentOfficialRecognizer_RegEx_TAE.xml"/>
</topDescriptor>
<analysisEngine>
<asyncPrimitiveErrorConfiguration>
diff --git a/uimaj-as-activemq/src/test/resources/deployment/Deploy_TokenSentenceRecognizer.xml b/uimaj-as-activemq/src/test/resources/deployment/Deploy_TokenSentenceRecognizer.xml
index 2d5ecde..9a15495 100644
--- a/uimaj-as-activemq/src/test/resources/deployment/Deploy_TokenSentenceRecognizer.xml
+++ b/uimaj-as-activemq/src/test/resources/deployment/Deploy_TokenSentenceRecognizer.xml
@@ -32,11 +32,10 @@
<service>
<inputQueue endpoint="TokenSentenceRecognizerQueue" brokerURL="tcp://localhost:8118" prefetch="1"/>
<topDescriptor>
- <import location="C:/uima/releases/2.3.3-04/apache-uima/examples/descriptors/analysis_engine/SimpleTokenAndSentenceAnnotator.xml"/>
+ <import location="../descriptors/analysis_engine/SimpleTokenAndSentenceAnnotator.xml"/>
</topDescriptor>
<analysisEngine>
<asyncPrimitiveErrorConfiguration>
- <!-- <processCasErrors thresholdCount="4" thresholdWindow="10" thresholdAction="terminate" /> -->
<collectionProcessCompleteErrors additionalErrorAction="terminate" />
</asyncPrimitiveErrorConfiguration>
</analysisEngine>
diff --git a/uimaj-as-activemq/src/test/resources/descriptors/analysis_engine/PersonTitleAnnotator_WithinNamesOnly.xml b/uimaj-as-activemq/src/test/resources/descriptors/analysis_engine/PersonTitleAnnotator_WithinNamesOnly.xml
new file mode 100644
index 0000000..f6fdb4c
--- /dev/null
+++ b/uimaj-as-activemq/src/test/resources/descriptors/analysis_engine/PersonTitleAnnotator_WithinNamesOnly.xml
@@ -0,0 +1,175 @@
+<?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.
+ ***************************************************************
+ -->
+
+<analysisEngineDescription xmlns="http://uima.apache.org/resourceSpecifier">
+ <frameworkImplementation>org.apache.uima.java</frameworkImplementation>
+ <primitive>true</primitive>
+ <annotatorImplementationName>org.apache.uima.examples.cas.PersonTitleAnnotator</annotatorImplementationName>
+ <analysisEngineMetaData>
+ <name>Person Title Annotator - Within Names only</name>
+ <description>A configuration of the PersonTitleAnnotator that looks for Person Titles only
+ within existing Name annotations. See also PersonTitleAnnotator.xml.</description>
+ <version>1.0</version>
+ <vendor>The Apache Software Foundation</vendor>
+ <configurationParameters>
+ <configurationParameter>
+ <name>CivilianTitles</name>
+ <description>List of Civilian Titles to be annotated.</description>
+ <type>String</type>
+ <multiValued>true</multiValued>
+ <mandatory>true</mandatory>
+ </configurationParameter>
+ <configurationParameter>
+ <name>MilitaryTitles</name>
+ <description>List of Military Titles to be annotated.</description>
+ <type>String</type>
+ <multiValued>true</multiValued>
+ <mandatory>true</mandatory>
+ </configurationParameter>
+ <configurationParameter>
+ <name>GovernmentTitles</name>
+ <description>List of Government Titles to be annotated.</description>
+ <type>String</type>
+ <multiValued>true</multiValued>
+ <mandatory>true</mandatory>
+ </configurationParameter>
+ <configurationParameter>
+ <name>ContainingAnnotationType</name>
+ <description>Annotation type within which to search for Person Titles. If no value is specified,
+ the entire document will be searched.</description>
+ <type>String</type>
+ <multiValued>false</multiValued>
+ <mandatory>false</mandatory>
+ </configurationParameter>
+ </configurationParameters>
+ <configurationParameterSettings>
+ <nameValuePair>
+ <name>CivilianTitles</name>
+ <value>
+ <array>
+ <string>Mr.</string>
+ <string>Ms.</string>
+ <string>Mrs.</string>
+ <string>Dr.</string>
+ </array>
+ </value>
+ </nameValuePair>
+ <nameValuePair>
+ <name>MilitaryTitles</name>
+ <value>
+ <array>
+ <string>Gen.</string>
+ <string>Col.</string>
+ <string>Maj.</string>
+ <string>Capt.</string>
+ <string>Lt. Gen.</string>
+ <string>Lt Col.</string>
+ <string>Lt.</string>
+ </array>
+ </value>
+ </nameValuePair>
+ <nameValuePair>
+ <name>GovernmentTitles</name>
+ <value>
+ <array>
+ <string>Vice President</string>
+ <string>President</string>
+ <string>Vice Pres.</string>
+ <string>Pres.</string>
+ <string>Governor</string>
+ <string>Lt. Governor</string>
+ <string>Gov.</string>
+ <string>Lt. Gov.</string>
+ <string>Senator</string>
+ <string>Sen.</string>
+ </array>
+ </value>
+ </nameValuePair>
+ <nameValuePair>
+ <name>ContainingAnnotationType</name>
+ <value>
+ <string>example.Name</string>
+ </value>
+ </nameValuePair>
+ </configurationParameterSettings>
+ <typeSystemDescription>
+ <types>
+ <typeDescription>
+ <name>example.PersonTitle</name>
+ <description>A Personal Title.</description>
+ <supertypeName>uima.tcas.Annotation</supertypeName>
+ <features>
+ <featureDescription>
+ <name>Kind</name>
+ <description>The kind of title - Civilian, Military, or Government.</description>
+ <rangeTypeName>example.PersonTitleKind</rangeTypeName>
+ </featureDescription>
+ </features>
+ </typeDescription>
+ <typeDescription>
+ <name>example.PersonTitleKind</name>
+ <description>A kind of person title - Civilian, Military, or Government.</description>
+ <supertypeName>uima.cas.String</supertypeName>
+ <allowedValues>
+ <value>
+ <string>Civilian</string>
+ <description>Title of a person not in military or government service.</description>
+ </value>
+ <value>
+ <string>Military</string>
+ <description>Title of a person in the military.</description>
+ </value>
+ <value>
+ <string>Government</string>
+ <description>Title of a government official.</description>
+ </value>
+ </allowedValues>
+ </typeDescription>
+ <typeDescription>
+ <name>example.Name</name>
+ <description>A proper name.</description>
+ <supertypeName>uima.tcas.Annotation</supertypeName>
+ </typeDescription>
+ </types>
+ </typeSystemDescription>
+ <capabilities>
+ <capability>
+ <inputs>
+ <type>example.Name</type>
+ </inputs>
+ <outputs>
+ <type>example.PersonTitle</type>
+ <feature>example.PersonTitle:Kind</feature>
+ </outputs>
+ <languagesSupported>
+ <language>en</language>
+ </languagesSupported>
+ </capability>
+ </capabilities>
+ <operationalProperties>
+ <modifiesCas>true</modifiesCas>
+ <multipleDeploymentAllowed>true</multipleDeploymentAllowed>
+ <outputsNewCASes>false</outputsNewCASes>
+ </operationalProperties>
+ </analysisEngineMetaData>
+</analysisEngineDescription>
diff --git a/uimaj-as-activemq/src/test/resources/descriptors/analysis_engine/SimpleNameRecognizer_RegEx_TAE.xml b/uimaj-as-activemq/src/test/resources/descriptors/analysis_engine/SimpleNameRecognizer_RegEx_TAE.xml
new file mode 100644
index 0000000..5a8d608
--- /dev/null
+++ b/uimaj-as-activemq/src/test/resources/descriptors/analysis_engine/SimpleNameRecognizer_RegEx_TAE.xml
@@ -0,0 +1,110 @@
+<?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.
+ ***************************************************************
+ -->
+
+<analysisEngineDescription xmlns="http://uima.apache.org/resourceSpecifier">
+ <frameworkImplementation>org.apache.uima.java</frameworkImplementation>
+ <primitive>true</primitive>
+ <annotatorImplementationName>org.apache.uima.examples.cas.RegExAnnotator</annotatorImplementationName>
+ <analysisEngineMetaData>
+ <name>Simple Name Recognizer using Regular Expressions</name>
+ <description>Detects Names using a simple regular expression.</description>
+ <configurationParameters>
+ <configurationParameter>
+ <name>Patterns</name>
+ <description>Regular expression patterns to match. The language is that supported by Java 1.4.</description>
+ <type>String</type>
+ <multiValued>true</multiValued>
+ <mandatory>false</mandatory>
+ </configurationParameter>
+ <configurationParameter>
+ <name>TypeNames</name>
+ <description>Names of CAS Types to create for the patterns found. The indexes of this array
+correspond to the indexes of the Patterns or PatternFiles arrays. If a match is found for
+Patterns[i], it will result in an annotation of type
+TypeNames[i].</description>
+ <type>String</type>
+ <multiValued>true</multiValued>
+ <mandatory>false</mandatory>
+ </configurationParameter>
+ <configurationParameter>
+ <name>ContainingAnnotationTypes</name>
+ <description>Names of CAS Input Types within which annotations should be created.</description>
+ <type>String</type>
+ <multiValued>true</multiValued>
+ <mandatory>false</mandatory>
+ </configurationParameter>
+ <configurationParameter>
+ <name>AnnotateEntireContainingAnnotation</name>
+ <description>When the ContainingAnnoationTypes parameter is specified, a value of true for this
+ parameter will cause the entire containing annotation to be used as the span of the new
+ annotation, rather than just the span of the regular expression match. This can be used
+ to "classify" previously created annotations according to whether or not they contain
+ text matching a regular expression.</description>
+ <type>Boolean</type>
+ <multiValued>false</multiValued>
+ <mandatory>false</mandatory>
+ </configurationParameter>
+ </configurationParameters>
+ <configurationParameterSettings>
+ <nameValuePair>
+ <name>Patterns</name>
+ <value>
+ <array>
+ <string>\p{Upper}\w*(\.?\s\p{Upper}\w*)+</string>
+ </array>
+ </value>
+ </nameValuePair>
+ <nameValuePair>
+ <name>TypeNames</name>
+ <value>
+ <array>
+ <string>example.Name</string>
+ </array>
+ </value>
+ </nameValuePair>
+ </configurationParameterSettings>
+ <typeSystemDescription>
+ <types>
+ <typeDescription>
+ <name>example.Name</name>
+ <description>A proper name.</description>
+ <supertypeName>uima.tcas.Annotation</supertypeName>
+ </typeDescription>
+ </types>
+ </typeSystemDescription>
+ <capabilities>
+ <capability>
+ <inputs/>
+ <outputs>
+ <type>example.Name</type>
+ </outputs>
+ <languagesSupported/>
+ </capability>
+ </capabilities>
+ <operationalProperties>
+ <modifiesCas>true</modifiesCas>
+ <multipleDeploymentAllowed>true</multipleDeploymentAllowed>
+ <outputsNewCASes>false</outputsNewCASes>
+ </operationalProperties>
+ </analysisEngineMetaData>
+</analysisEngineDescription>
