ctakes-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chen...@apache.org
Subject svn commit: r1397648 - in /incubator/ctakes/trunk/ctakes-ne-contexts: ./ desc/test/ src/test/desc/ src/test/java/org/apache/ctakes/necontexts/
Date Fri, 12 Oct 2012 17:12:08 GMT
Author: chenpei
Date: Fri Oct 12 17:12:08 2012
New Revision: 1397648

URL: http://svn.apache.org/viewvc?rev=1397648&view=rev
Log:
Updating unit test cases
 -Moved to standard /src/java/test and /src/java/resources
 -Updated core pom.xml to allow test phase (some modules such as necontexts were dependant on TestUtil.java)
 -Updated obvious logical errors in test cases such as [].equals([])- not sure how that passed in the past.
 -Commented out test cases temporarily but could be fixed in the future- could be tracked here:
https://issues.apache.org/jira/browse/CTAKES-77
https://issues.apache.org/jira/browse/CTAKES-78
https://issues.apache.org/jira/browse/CTAKES-79

Added:
    incubator/ctakes/trunk/ctakes-ne-contexts/desc/test/
    incubator/ctakes/trunk/ctakes-ne-contexts/desc/test/NegationAnnotator.xml
      - copied, changed from r1396711, incubator/ctakes/trunk/ctakes-ne-contexts/src/test/desc/NegationAnnotator.xml
    incubator/ctakes/trunk/ctakes-ne-contexts/desc/test/SegmentTokenSentenceAggregate.xml
      - copied unchanged from r1396711, incubator/ctakes/trunk/ctakes-ne-contexts/src/test/desc/SegmentTokenSentenceAggregate.xml
    incubator/ctakes/trunk/ctakes-ne-contexts/desc/test/SentenceDetectorAnnotator.xml
      - copied, changed from r1396711, incubator/ctakes/trunk/ctakes-ne-contexts/src/test/desc/SentenceDetectorAnnotator.xml
    incubator/ctakes/trunk/ctakes-ne-contexts/desc/test/SimpleSegmentAnnotator.xml
      - copied unchanged from r1396711, incubator/ctakes/trunk/ctakes-ne-contexts/src/test/desc/SimpleSegmentAnnotator.xml
    incubator/ctakes/trunk/ctakes-ne-contexts/desc/test/StatusAnnotator.xml
      - copied, changed from r1396711, incubator/ctakes/trunk/ctakes-ne-contexts/src/test/desc/StatusAnnotator.xml
    incubator/ctakes/trunk/ctakes-ne-contexts/desc/test/TestContextAnnotator.xml
      - copied, changed from r1396711, incubator/ctakes/trunk/ctakes-ne-contexts/src/test/desc/TestContextAnnotator.xml
    incubator/ctakes/trunk/ctakes-ne-contexts/desc/test/TokenizerAnnotator.xml
      - copied, changed from r1396711, incubator/ctakes/trunk/ctakes-ne-contexts/src/test/desc/TokenizerAnnotator.xml
Removed:
    incubator/ctakes/trunk/ctakes-ne-contexts/src/test/desc/
Modified:
    incubator/ctakes/trunk/ctakes-ne-contexts/pom.xml
    incubator/ctakes/trunk/ctakes-ne-contexts/src/test/java/org/apache/ctakes/necontexts/ContextAnnotatorTests.java
    incubator/ctakes/trunk/ctakes-ne-contexts/src/test/java/org/apache/ctakes/necontexts/NegationAnnotatorTests.java
    incubator/ctakes/trunk/ctakes-ne-contexts/src/test/java/org/apache/ctakes/necontexts/StatusAnnotatorTests.java

Copied: incubator/ctakes/trunk/ctakes-ne-contexts/desc/test/NegationAnnotator.xml (from r1396711, incubator/ctakes/trunk/ctakes-ne-contexts/src/test/desc/NegationAnnotator.xml)
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-ne-contexts/desc/test/NegationAnnotator.xml?p2=incubator/ctakes/trunk/ctakes-ne-contexts/desc/test/NegationAnnotator.xml&p1=incubator/ctakes/trunk/ctakes-ne-contexts/src/test/desc/NegationAnnotator.xml&r1=1396711&r2=1397648&rev=1397648&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-ne-contexts/src/test/desc/NegationAnnotator.xml (original)
+++ incubator/ctakes/trunk/ctakes-ne-contexts/desc/test/NegationAnnotator.xml Fri Oct 12 17:12:08 2012
@@ -1,160 +1,159 @@
 <?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.
-
--->
+<!-- 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. -->
 <taeDescription xmlns="http://uima.apache.org/resourceSpecifier">
-  <frameworkImplementation>org.apache.uima.java</frameworkImplementation>
-  <primitive>true</primitive>
-  <annotatorImplementationName>org.apache.ctakes.necontexts.ContextAnnotator</annotatorImplementationName>
-  <analysisEngineMetaData>
-    <name>NegationAnnotator</name>
-    <configurationParameters>
-      <configurationParameter>
-        <name>MaxLeftScopeSize</name>
-        <description/>
-        <type>Integer</type>
-        <multiValued>false</multiValued>
-        <mandatory>true</mandatory>
-      </configurationParameter>
-      <configurationParameter>
-        <name>MaxRightScopeSize</name>
-        <description/>
-        <type>Integer</type>
-        <multiValued>false</multiValued>
-        <mandatory>true</mandatory>
-      </configurationParameter>
-      <configurationParameter>
-        <name>ScopeOrder</name>
-        <description/>
-        <type>String</type>
-        <multiValued>true</multiValued>
-        <mandatory>true</mandatory>
-      </configurationParameter>
-      <configurationParameter>
-        <name>ContextAnalyzerClass</name>
-        <type>String</type>
-        <multiValued>false</multiValued>
-        <mandatory>true</mandatory>
-      </configurationParameter>
-      <configurationParameter>
-        <name>ContextHitConsumerClass</name>
-        <description/>
-        <type>String</type>
-        <multiValued>false</multiValued>
-        <mandatory>true</mandatory>
-      </configurationParameter>
-      <configurationParameter>
-        <name>WindowAnnotationClass</name>
-        <type>String</type>
-        <multiValued>false</multiValued>
-        <mandatory>true</mandatory>
-      </configurationParameter>
-      <configurationParameter>
-        <name>FocusAnnotationClass</name>
-        <type>String</type>
-        <multiValued>false</multiValued>
-        <mandatory>true</mandatory>
-      </configurationParameter>
-      <configurationParameter>
-        <name>ContextAnnotationClass</name>
-        <type>String</type>
-        <multiValued>false</multiValued>
-        <mandatory>true</mandatory>
-      </configurationParameter>
-    </configurationParameters>
-    <configurationParameterSettings>
-      <nameValuePair>
-        <name>MaxLeftScopeSize</name>
-        <value>
-          <integer>10</integer>
-        </value>
-      </nameValuePair>
-      <nameValuePair>
-        <name>MaxRightScopeSize</name>
-        <value>
-          <integer>10</integer>
-        </value>
-      </nameValuePair>
-      <nameValuePair>
-        <name>ScopeOrder</name>
-        <value>
-          <array>
-            <string>LEFT</string>
-            <string>RIGHT</string>
-          </array>
-        </value>
-      </nameValuePair>
-      <nameValuePair>
-        <name>ContextHitConsumerClass</name>
-        <value>
-          <string>org.apache.ctakes.necontexts.negation.NegationContextHitConsumer</string>
-        </value>
-      </nameValuePair>
-      <nameValuePair>
-        <name>WindowAnnotationClass</name>
-        <value>
-          <string>org.apache.ctakes.typesystem.type.textspan.Sentence</string>
-        </value>
-      </nameValuePair>
-      <nameValuePair>
-        <name>FocusAnnotationClass</name>
-        <value>
-          <string>org.apache.ctakes.typesystem.type.textsem.IdentifiedAnnotation</string>
-        </value>
-      </nameValuePair>
-      <nameValuePair>
-        <name>ContextAnnotationClass</name>
-        <value>
-          <string>org.apache.ctakes.typesystem.type.syntax.BaseToken</string>
-        </value>
-      </nameValuePair>
-      <nameValuePair>
-        <name>ContextAnalyzerClass</name>
-        <value>
-          <string>org.apache.ctakes.necontexts.negation.NegationContextAnalyzer</string>
-        </value>
-      </nameValuePair>
-    </configurationParameterSettings>
-    <typeSystemDescription>
-      <imports>
-      </imports>
-    </typeSystemDescription>
-    <typePriorities/>
-    <fsIndexCollection/>
-    <capabilities>
-      <capability>
-        <inputs>
-          <type allAnnotatorFeatures="true">org.apache.ctakes.typesystem.type.textsem.IdentifiedAnnotation</type>
-          <type allAnnotatorFeatures="true">org.apache.ctakes.typesystem.type.syntax.BaseToken</type>
-        </inputs>
-        <outputs>
-          <type allAnnotatorFeatures="true">org.apache.ctakes.necontexts.type.ContextAnnotation</type>
-        </outputs>
-        <languagesSupported/>
-      </capability>
-    </capabilities>
-    <operationalProperties>
-      <modifiesCas>true</modifiesCas>
-      <multipleDeploymentAllowed>true</multipleDeploymentAllowed>
-      <outputsNewCASes>false</outputsNewCASes>
-    </operationalProperties>
-  </analysisEngineMetaData>
-  <resourceManagerConfiguration/>
+	<frameworkImplementation>org.apache.uima.java</frameworkImplementation>
+	<primitive>true</primitive>
+	<annotatorImplementationName>org.apache.ctakes.necontexts.ContextAnnotator
+	</annotatorImplementationName>
+	<analysisEngineMetaData>
+		<name>NegationAnnotator</name>
+		<configurationParameters>
+			<configurationParameter>
+				<name>MaxLeftScopeSize</name>
+				<description />
+				<type>Integer</type>
+				<multiValued>false</multiValued>
+				<mandatory>true</mandatory>
+			</configurationParameter>
+			<configurationParameter>
+				<name>MaxRightScopeSize</name>
+				<description />
+				<type>Integer</type>
+				<multiValued>false</multiValued>
+				<mandatory>true</mandatory>
+			</configurationParameter>
+			<configurationParameter>
+				<name>ScopeOrder</name>
+				<description />
+				<type>String</type>
+				<multiValued>true</multiValued>
+				<mandatory>true</mandatory>
+			</configurationParameter>
+			<configurationParameter>
+				<name>ContextAnalyzerClass</name>
+				<type>String</type>
+				<multiValued>false</multiValued>
+				<mandatory>true</mandatory>
+			</configurationParameter>
+			<configurationParameter>
+				<name>ContextHitConsumerClass</name>
+				<description />
+				<type>String</type>
+				<multiValued>false</multiValued>
+				<mandatory>true</mandatory>
+			</configurationParameter>
+			<configurationParameter>
+				<name>WindowAnnotationClass</name>
+				<type>String</type>
+				<multiValued>false</multiValued>
+				<mandatory>true</mandatory>
+			</configurationParameter>
+			<configurationParameter>
+				<name>FocusAnnotationClass</name>
+				<type>String</type>
+				<multiValued>false</multiValued>
+				<mandatory>true</mandatory>
+			</configurationParameter>
+			<configurationParameter>
+				<name>ContextAnnotationClass</name>
+				<type>String</type>
+				<multiValued>false</multiValued>
+				<mandatory>true</mandatory>
+			</configurationParameter>
+		</configurationParameters>
+		<configurationParameterSettings>
+			<nameValuePair>
+				<name>MaxLeftScopeSize</name>
+				<value>
+					<integer>10</integer>
+				</value>
+			</nameValuePair>
+			<nameValuePair>
+				<name>MaxRightScopeSize</name>
+				<value>
+					<integer>10</integer>
+				</value>
+			</nameValuePair>
+			<nameValuePair>
+				<name>ScopeOrder</name>
+				<value>
+					<array>
+						<string>LEFT</string>
+						<string>RIGHT</string>
+					</array>
+				</value>
+			</nameValuePair>
+			<nameValuePair>
+				<name>ContextHitConsumerClass</name>
+				<value>
+					<string>org.apache.ctakes.necontexts.negation.NegationContextHitConsumer
+					</string>
+				</value>
+			</nameValuePair>
+			<nameValuePair>
+				<name>WindowAnnotationClass</name>
+				<value>
+					<string>org.apache.ctakes.typesystem.type.textspan.Sentence
+					</string>
+				</value>
+			</nameValuePair>
+			<nameValuePair>
+				<name>FocusAnnotationClass</name>
+				<value>
+					<string>org.apache.ctakes.typesystem.type.textsem.IdentifiedAnnotation
+					</string>
+				</value>
+			</nameValuePair>
+			<nameValuePair>
+				<name>ContextAnnotationClass</name>
+				<value>
+					<string>org.apache.ctakes.typesystem.type.syntax.BaseToken</string>
+				</value>
+			</nameValuePair>
+			<nameValuePair>
+				<name>ContextAnalyzerClass</name>
+				<value>
+					<string>org.apache.ctakes.necontexts.negation.NegationContextAnalyzer
+					</string>
+				</value>
+			</nameValuePair>
+		</configurationParameterSettings>
+		<typeSystemDescription>
+			<imports>
+				<import name="org.apache.ctakes.typesystem.types.TypeSystem" />
+			</imports>
+		</typeSystemDescription>
+		<typePriorities />
+		<fsIndexCollection />
+		<capabilities>
+			<capability>
+				<inputs>
+					<type allAnnotatorFeatures="true">org.apache.ctakes.typesystem.type.textsem.IdentifiedAnnotation
+					</type>
+					<type allAnnotatorFeatures="true">org.apache.ctakes.typesystem.type.syntax.BaseToken
+					</type>
+				</inputs>
+				<outputs>
+					<type allAnnotatorFeatures="true">org.apache.ctakes.necontexts.type.ContextAnnotation
+					</type>
+				</outputs>
+				<languagesSupported />
+			</capability>
+		</capabilities>
+		<operationalProperties>
+			<modifiesCas>true</modifiesCas>
+			<multipleDeploymentAllowed>true</multipleDeploymentAllowed>
+			<outputsNewCASes>false</outputsNewCASes>
+		</operationalProperties>
+	</analysisEngineMetaData>
+	<resourceManagerConfiguration />
 </taeDescription>

Copied: incubator/ctakes/trunk/ctakes-ne-contexts/desc/test/SentenceDetectorAnnotator.xml (from r1396711, incubator/ctakes/trunk/ctakes-ne-contexts/src/test/desc/SentenceDetectorAnnotator.xml)
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-ne-contexts/desc/test/SentenceDetectorAnnotator.xml?p2=incubator/ctakes/trunk/ctakes-ne-contexts/desc/test/SentenceDetectorAnnotator.xml&p1=incubator/ctakes/trunk/ctakes-ne-contexts/src/test/desc/SentenceDetectorAnnotator.xml&r1=1396711&r2=1397648&rev=1397648&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-ne-contexts/src/test/desc/SentenceDetectorAnnotator.xml (original)
+++ incubator/ctakes/trunk/ctakes-ne-contexts/desc/test/SentenceDetectorAnnotator.xml Fri Oct 12 17:12:08 2012
@@ -65,7 +65,7 @@
 <name>MaxentModelFile</name>
 <description></description>
 <fileResourceSpecifier>
-<fileUrl>file:sentdetect/sample_sd_included.mod</fileUrl>
+<fileUrl>file:org/apache/ctakes/core/sentdetect/sample_sd_included.mod</fileUrl>
 </fileResourceSpecifier>
 <implementationName>org.apache.ctakes.core.resource.SuffixMaxentModelResourceImpl</implementationName>
 </externalResource>

Copied: incubator/ctakes/trunk/ctakes-ne-contexts/desc/test/StatusAnnotator.xml (from r1396711, incubator/ctakes/trunk/ctakes-ne-contexts/src/test/desc/StatusAnnotator.xml)
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-ne-contexts/desc/test/StatusAnnotator.xml?p2=incubator/ctakes/trunk/ctakes-ne-contexts/desc/test/StatusAnnotator.xml&p1=incubator/ctakes/trunk/ctakes-ne-contexts/src/test/desc/StatusAnnotator.xml&r1=1396711&r2=1397648&rev=1397648&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-ne-contexts/src/test/desc/StatusAnnotator.xml (original)
+++ incubator/ctakes/trunk/ctakes-ne-contexts/desc/test/StatusAnnotator.xml Fri Oct 12 17:12:08 2012
@@ -1,161 +1,161 @@
 <?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.
-
--->
+<!-- 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. -->
 <taeDescription xmlns="http://uima.apache.org/resourceSpecifier">
-  <frameworkImplementation>org.apache.uima.java</frameworkImplementation>
-  <primitive>true</primitive>
-  <annotatorImplementationName>org.apache.ctakes.necontexts.ContextAnnotator</annotatorImplementationName>
-  <analysisEngineMetaData>
-    <name>StatusAnnotator</name>
-    <configurationParameters>
-      <configurationParameter>
-        <name>MaxLeftScopeSize</name>
-        <description/>
-        <type>Integer</type>
-        <multiValued>false</multiValued>
-        <mandatory>true</mandatory>
-      </configurationParameter>
-      <configurationParameter>
-        <name>MaxRightScopeSize</name>
-        <description/>
-        <type>Integer</type>
-        <multiValued>false</multiValued>
-        <mandatory>true</mandatory>
-      </configurationParameter>
-      <configurationParameter>
-        <name>ScopeOrder</name>
-        <description/>
-        <type>String</type>
-        <multiValued>true</multiValued>
-        <mandatory>true</mandatory>
-      </configurationParameter>
-      <configurationParameter>
-        <name>ContextAnalyzerClass</name>
-        <type>String</type>
-        <multiValued>false</multiValued>
-        <mandatory>true</mandatory>
-      </configurationParameter>
-      <configurationParameter>
-        <name>ContextHitConsumerClass</name>
-        <description/>
-        <type>String</type>
-        <multiValued>false</multiValued>
-        <mandatory>true</mandatory>
-      </configurationParameter>
-      <configurationParameter>
-        <name>WindowAnnotationClass</name>
-        <type>String</type>
-        <multiValued>false</multiValued>
-        <mandatory>true</mandatory>
-      </configurationParameter>
-      <configurationParameter>
-        <name>FocusAnnotationClass</name>
-        <type>String</type>
-        <multiValued>false</multiValued>
-        <mandatory>true</mandatory>
-      </configurationParameter>
-      <configurationParameter>
-        <name>ContextAnnotationClass</name>
-        <type>String</type>
-        <multiValued>false</multiValued>
-        <mandatory>true</mandatory>
-      </configurationParameter>
-    </configurationParameters>
-    <configurationParameterSettings>
-      <nameValuePair>
-        <name>MaxLeftScopeSize</name>
-        <value>
-          <integer>7</integer>
-        </value>
-      </nameValuePair>
-      <nameValuePair>
-        <name>MaxRightScopeSize</name>
-        <value>
-          <integer>7</integer>
-        </value>
-      </nameValuePair>
-      <nameValuePair>
-        <name>ScopeOrder</name>
-        <value>
-          <array>
-            <string>LEFT</string>
-            <string>RIGHT</string>
-          </array>
-        </value>
-      </nameValuePair>
-      <nameValuePair>
-        <name>ContextHitConsumerClass</name>
-        <value>
-          <string>org.apache.ctakes.necontexts.status.StatusContextHitConsumer</string>
-        </value>
-      </nameValuePair>
-      <nameValuePair>
-        <name>WindowAnnotationClass</name>
-        <value>
-          <string>org.apache.ctakes.typesystem.type.textspan.Sentence</string>
-        </value>
-      </nameValuePair>
-      <nameValuePair>
-        <name>FocusAnnotationClass</name>
-        <value>
-          <string>org.apache.ctakes.typesystem.type.textsem.IdentifiedAnnotation</string>
-        </value>
-      </nameValuePair>
-      <nameValuePair>
-        <name>ContextAnnotationClass</name>
-        <value>
-          <string>org.apache.ctakes.typesystem.type.syntax.BaseToken</string>
-        </value>
-      </nameValuePair>
-      <nameValuePair>
-        <name>ContextAnalyzerClass</name>
-        <value>
-          <string>org.apache.ctakes.necontexts.status.StatusContextAnalyzer</string>
-        </value>
-      </nameValuePair>
-    </configurationParameterSettings>
-    <typeSystemDescription>
-      <imports>
-      </imports>
-    </typeSystemDescription>
-    <typePriorities/>
-    <fsIndexCollection/>
-    <capabilities>
-      <capability>
-        <inputs>
-          <type allAnnotatorFeatures="true">org.apache.ctakes.typesystem.type.textspan.Sentence</type>
-          <type allAnnotatorFeatures="true">org.apache.ctakes.typesystem.type.textsem.IdentifiedAnnotation</type>
-          <type allAnnotatorFeatures="true">org.apache.ctakes.typesystem.type.syntax.BaseToken</type>
-        </inputs>
-        <outputs>
-          <type allAnnotatorFeatures="true">org.apache.ctakes.necontexts.type.ContextAnnotation</type>
-        </outputs>
-        <languagesSupported/>
-      </capability>
-    </capabilities>
-    <operationalProperties>
-      <modifiesCas>true</modifiesCas>
-      <multipleDeploymentAllowed>true</multipleDeploymentAllowed>
-      <outputsNewCASes>false</outputsNewCASes>
-    </operationalProperties>
-  </analysisEngineMetaData>
-  <resourceManagerConfiguration/>
+	<frameworkImplementation>org.apache.uima.java</frameworkImplementation>
+	<primitive>true</primitive>
+	<annotatorImplementationName>org.apache.ctakes.necontexts.ContextAnnotator
+	</annotatorImplementationName>
+	<analysisEngineMetaData>
+		<name>StatusAnnotator</name>
+		<configurationParameters>
+			<configurationParameter>
+				<name>MaxLeftScopeSize</name>
+				<description />
+				<type>Integer</type>
+				<multiValued>false</multiValued>
+				<mandatory>true</mandatory>
+			</configurationParameter>
+			<configurationParameter>
+				<name>MaxRightScopeSize</name>
+				<description />
+				<type>Integer</type>
+				<multiValued>false</multiValued>
+				<mandatory>true</mandatory>
+			</configurationParameter>
+			<configurationParameter>
+				<name>ScopeOrder</name>
+				<description />
+				<type>String</type>
+				<multiValued>true</multiValued>
+				<mandatory>true</mandatory>
+			</configurationParameter>
+			<configurationParameter>
+				<name>ContextAnalyzerClass</name>
+				<type>String</type>
+				<multiValued>false</multiValued>
+				<mandatory>true</mandatory>
+			</configurationParameter>
+			<configurationParameter>
+				<name>ContextHitConsumerClass</name>
+				<description />
+				<type>String</type>
+				<multiValued>false</multiValued>
+				<mandatory>true</mandatory>
+			</configurationParameter>
+			<configurationParameter>
+				<name>WindowAnnotationClass</name>
+				<type>String</type>
+				<multiValued>false</multiValued>
+				<mandatory>true</mandatory>
+			</configurationParameter>
+			<configurationParameter>
+				<name>FocusAnnotationClass</name>
+				<type>String</type>
+				<multiValued>false</multiValued>
+				<mandatory>true</mandatory>
+			</configurationParameter>
+			<configurationParameter>
+				<name>ContextAnnotationClass</name>
+				<type>String</type>
+				<multiValued>false</multiValued>
+				<mandatory>true</mandatory>
+			</configurationParameter>
+		</configurationParameters>
+		<configurationParameterSettings>
+			<nameValuePair>
+				<name>MaxLeftScopeSize</name>
+				<value>
+					<integer>7</integer>
+				</value>
+			</nameValuePair>
+			<nameValuePair>
+				<name>MaxRightScopeSize</name>
+				<value>
+					<integer>7</integer>
+				</value>
+			</nameValuePair>
+			<nameValuePair>
+				<name>ScopeOrder</name>
+				<value>
+					<array>
+						<string>LEFT</string>
+						<string>RIGHT</string>
+					</array>
+				</value>
+			</nameValuePair>
+			<nameValuePair>
+				<name>ContextHitConsumerClass</name>
+				<value>
+					<string>org.apache.ctakes.necontexts.status.StatusContextHitConsumer
+					</string>
+				</value>
+			</nameValuePair>
+			<nameValuePair>
+				<name>WindowAnnotationClass</name>
+				<value>
+					<string>org.apache.ctakes.typesystem.type.textspan.Sentence
+					</string>
+				</value>
+			</nameValuePair>
+			<nameValuePair>
+				<name>FocusAnnotationClass</name>
+				<value>
+					<string>org.apache.ctakes.typesystem.type.textsem.IdentifiedAnnotation
+					</string>
+				</value>
+			</nameValuePair>
+			<nameValuePair>
+				<name>ContextAnnotationClass</name>
+				<value>
+					<string>org.apache.ctakes.typesystem.type.syntax.BaseToken</string>
+				</value>
+			</nameValuePair>
+			<nameValuePair>
+				<name>ContextAnalyzerClass</name>
+				<value>
+					<string>org.apache.ctakes.necontexts.status.StatusContextAnalyzer
+					</string>
+				</value>
+			</nameValuePair>
+		</configurationParameterSettings>
+		<typeSystemDescription>
+			<imports>
+				<import name="org.apache.ctakes.typesystem.types.TypeSystem" />
+			</imports>
+		</typeSystemDescription>
+		<typePriorities />
+		<fsIndexCollection />
+		<capabilities>
+			<capability>
+				<inputs>
+					<type allAnnotatorFeatures="true">org.apache.ctakes.typesystem.type.textspan.Sentence
+					</type>
+					<type allAnnotatorFeatures="true">org.apache.ctakes.typesystem.type.textsem.IdentifiedAnnotation
+					</type>
+					<type allAnnotatorFeatures="true">org.apache.ctakes.typesystem.type.syntax.BaseToken
+					</type>
+				</inputs>
+				<outputs>
+					<type allAnnotatorFeatures="true">org.apache.ctakes.necontexts.type.ContextAnnotation
+					</type>
+				</outputs>
+				<languagesSupported />
+			</capability>
+		</capabilities>
+		<operationalProperties>
+			<modifiesCas>true</modifiesCas>
+			<multipleDeploymentAllowed>true</multipleDeploymentAllowed>
+			<outputsNewCASes>false</outputsNewCASes>
+		</operationalProperties>
+	</analysisEngineMetaData>
+	<resourceManagerConfiguration />
 </taeDescription>

Copied: incubator/ctakes/trunk/ctakes-ne-contexts/desc/test/TestContextAnnotator.xml (from r1396711, incubator/ctakes/trunk/ctakes-ne-contexts/src/test/desc/TestContextAnnotator.xml)
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-ne-contexts/desc/test/TestContextAnnotator.xml?p2=incubator/ctakes/trunk/ctakes-ne-contexts/desc/test/TestContextAnnotator.xml&p1=incubator/ctakes/trunk/ctakes-ne-contexts/src/test/desc/TestContextAnnotator.xml&r1=1396711&r2=1397648&rev=1397648&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-ne-contexts/src/test/desc/TestContextAnnotator.xml (original)
+++ incubator/ctakes/trunk/ctakes-ne-contexts/desc/test/TestContextAnnotator.xml Fri Oct 12 17:12:08 2012
@@ -1,161 +1,159 @@
 <?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.
-
--->
+<!-- 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. -->
 <taeDescription xmlns="http://uima.apache.org/resourceSpecifier">
-  <frameworkImplementation>org.apache.uima.java</frameworkImplementation>
-  <primitive>true</primitive>
-  <annotatorImplementationName>org.apache.ctakes.necontexts.ContextAnnotator</annotatorImplementationName>
-  <analysisEngineMetaData>
-    <name>NegationAnnotator</name>
-    <configurationParameters>
-      <configurationParameter>
-        <name>MaxLeftScopeSize</name>
-        <description/>
-        <type>Integer</type>
-        <multiValued>false</multiValued>
-        <mandatory>true</mandatory>
-      </configurationParameter>
-      <configurationParameter>
-        <name>MaxRightScopeSize</name>
-        <description/>
-        <type>Integer</type>
-        <multiValued>false</multiValued>
-        <mandatory>true</mandatory>
-      </configurationParameter>
-      <configurationParameter>
-        <name>ScopeOrder</name>
-        <description/>
-        <type>String</type>
-        <multiValued>true</multiValued>
-        <mandatory>true</mandatory>
-      </configurationParameter>
-      <configurationParameter>
-        <name>ContextAnalyzerClass</name>
-        <type>String</type>
-        <multiValued>false</multiValued>
-        <mandatory>true</mandatory>
-      </configurationParameter>
-      <configurationParameter>
-        <name>ContextHitConsumerClass</name>
-        <description/>
-        <type>String</type>
-        <multiValued>false</multiValued>
-        <mandatory>true</mandatory>
-      </configurationParameter>
-      <configurationParameter>
-        <name>WindowAnnotationClass</name>
-        <type>String</type>
-        <multiValued>false</multiValued>
-        <mandatory>true</mandatory>
-      </configurationParameter>
-      <configurationParameter>
-        <name>FocusAnnotationClass</name>
-        <type>String</type>
-        <multiValued>false</multiValued>
-        <mandatory>true</mandatory>
-      </configurationParameter>
-      <configurationParameter>
-        <name>ContextAnnotationClass</name>
-        <type>String</type>
-        <multiValued>false</multiValued>
-        <mandatory>true</mandatory>
-      </configurationParameter>
-    </configurationParameters>
-    <configurationParameterSettings>
-      <nameValuePair>
-        <name>MaxLeftScopeSize</name>
-        <value>
-          <integer>8</integer>
-        </value>
-      </nameValuePair>
-      <nameValuePair>
-        <name>MaxRightScopeSize</name>
-        <value>
-          <integer>4</integer>
-        </value>
-      </nameValuePair>
-      <nameValuePair>
-        <name>ScopeOrder</name>
-        <value>
-          <array>
-            <string>LEFT</string>
-            <string>RIGHT</string>
-            <string>MIDDLE</string>
-          </array>
-        </value>
-      </nameValuePair>
-      <nameValuePair>
-        <name>ContextHitConsumerClass</name>
-        <value>
-          <string>org.apache.ctakes.necontexts.ContextHitConsumerAdapter</string>
-        </value>
-      </nameValuePair>
-      <nameValuePair>
-        <name>WindowAnnotationClass</name>
-        <value>
-          <string>org.apache.ctakes.typesystem.type.textspan.Sentence</string>
-        </value>
-      </nameValuePair>
-      <nameValuePair>
-        <name>FocusAnnotationClass</name>
-        <value>
-          <string>org.apache.ctakes.typesystem.type.syntax.BaseToken</string>
-        </value>
-      </nameValuePair>
-      <nameValuePair>
-        <name>ContextAnnotationClass</name>
-        <value>
-          <string>org.apache.ctakes.typesystem.type.syntax.BaseToken</string>
-        </value>
-      </nameValuePair>
-      <nameValuePair>
-        <name>ContextAnalyzerClass</name>
-        <value>
-          <string>org.apache.ctakes.necontexts.ContextAnalyzerAdapter</string>
-        </value>
-      </nameValuePair>
-    </configurationParameterSettings>
-    <typeSystemDescription>
-      <imports>
-      </imports>
-    </typeSystemDescription>
-    <typePriorities/>
-    <fsIndexCollection/>
-    <capabilities>
-      <capability>
-        <inputs>
-          <type allAnnotatorFeatures="true">org.apache.ctakes.typesystem.type.textsem.IdentifiedAnnotation</type>
-          <type allAnnotatorFeatures="true">org.apache.ctakes.typesystem.type.syntax.BaseToken</type>
-        </inputs>
-        <outputs>
-          <type allAnnotatorFeatures="true">org.apache.ctakes.necontexts.type.ContextAnnotation</type>
-        </outputs>
-        <languagesSupported/>
-      </capability>
-    </capabilities>
-    <operationalProperties>
-      <modifiesCas>true</modifiesCas>
-      <multipleDeploymentAllowed>true</multipleDeploymentAllowed>
-      <outputsNewCASes>false</outputsNewCASes>
-    </operationalProperties>
-  </analysisEngineMetaData>
-  <resourceManagerConfiguration/>
+	<frameworkImplementation>org.apache.uima.java</frameworkImplementation>
+	<primitive>true</primitive>
+	<annotatorImplementationName>org.apache.ctakes.necontexts.ContextAnnotator
+	</annotatorImplementationName>
+	<analysisEngineMetaData>
+		<name>NegationAnnotator</name>
+		<configurationParameters>
+			<configurationParameter>
+				<name>MaxLeftScopeSize</name>
+				<description />
+				<type>Integer</type>
+				<multiValued>false</multiValued>
+				<mandatory>true</mandatory>
+			</configurationParameter>
+			<configurationParameter>
+				<name>MaxRightScopeSize</name>
+				<description />
+				<type>Integer</type>
+				<multiValued>false</multiValued>
+				<mandatory>true</mandatory>
+			</configurationParameter>
+			<configurationParameter>
+				<name>ScopeOrder</name>
+				<description />
+				<type>String</type>
+				<multiValued>true</multiValued>
+				<mandatory>true</mandatory>
+			</configurationParameter>
+			<configurationParameter>
+				<name>ContextAnalyzerClass</name>
+				<type>String</type>
+				<multiValued>false</multiValued>
+				<mandatory>true</mandatory>
+			</configurationParameter>
+			<configurationParameter>
+				<name>ContextHitConsumerClass</name>
+				<description />
+				<type>String</type>
+				<multiValued>false</multiValued>
+				<mandatory>true</mandatory>
+			</configurationParameter>
+			<configurationParameter>
+				<name>WindowAnnotationClass</name>
+				<type>String</type>
+				<multiValued>false</multiValued>
+				<mandatory>true</mandatory>
+			</configurationParameter>
+			<configurationParameter>
+				<name>FocusAnnotationClass</name>
+				<type>String</type>
+				<multiValued>false</multiValued>
+				<mandatory>true</mandatory>
+			</configurationParameter>
+			<configurationParameter>
+				<name>ContextAnnotationClass</name>
+				<type>String</type>
+				<multiValued>false</multiValued>
+				<mandatory>true</mandatory>
+			</configurationParameter>
+		</configurationParameters>
+		<configurationParameterSettings>
+			<nameValuePair>
+				<name>MaxLeftScopeSize</name>
+				<value>
+					<integer>8</integer>
+				</value>
+			</nameValuePair>
+			<nameValuePair>
+				<name>MaxRightScopeSize</name>
+				<value>
+					<integer>4</integer>
+				</value>
+			</nameValuePair>
+			<nameValuePair>
+				<name>ScopeOrder</name>
+				<value>
+					<array>
+						<string>LEFT</string>
+						<string>RIGHT</string>
+						<string>MIDDLE</string>
+					</array>
+				</value>
+			</nameValuePair>
+			<nameValuePair>
+				<name>ContextHitConsumerClass</name>
+				<value>
+					<string>org.apache.ctakes.necontexts.ContextHitConsumerAdapter
+					</string>
+				</value>
+			</nameValuePair>
+			<nameValuePair>
+				<name>WindowAnnotationClass</name>
+				<value>
+					<string>org.apache.ctakes.typesystem.type.textspan.Sentence
+					</string>
+				</value>
+			</nameValuePair>
+			<nameValuePair>
+				<name>FocusAnnotationClass</name>
+				<value>
+					<string>org.apache.ctakes.typesystem.type.syntax.BaseToken</string>
+				</value>
+			</nameValuePair>
+			<nameValuePair>
+				<name>ContextAnnotationClass</name>
+				<value>
+					<string>org.apache.ctakes.typesystem.type.syntax.BaseToken</string>
+				</value>
+			</nameValuePair>
+			<nameValuePair>
+				<name>ContextAnalyzerClass</name>
+				<value>
+					<string>org.apache.ctakes.necontexts.ContextAnalyzerAdapter
+					</string>
+				</value>
+			</nameValuePair>
+		</configurationParameterSettings>
+		<typeSystemDescription>
+			<imports>
+				<import name="org.apache.ctakes.typesystem.types.TypeSystem" />
+			</imports>
+		</typeSystemDescription>
+		<typePriorities />
+		<fsIndexCollection />
+		<capabilities>
+			<capability>
+				<inputs>
+					<type allAnnotatorFeatures="true">org.apache.ctakes.typesystem.type.textsem.IdentifiedAnnotation
+					</type>
+					<type allAnnotatorFeatures="true">org.apache.ctakes.typesystem.type.syntax.BaseToken
+					</type>
+				</inputs>
+				<outputs>
+					<type allAnnotatorFeatures="true">org.apache.ctakes.necontexts.type.ContextAnnotation
+					</type>
+				</outputs>
+				<languagesSupported />
+			</capability>
+		</capabilities>
+		<operationalProperties>
+			<modifiesCas>true</modifiesCas>
+			<multipleDeploymentAllowed>true</multipleDeploymentAllowed>
+			<outputsNewCASes>false</outputsNewCASes>
+		</operationalProperties>
+	</analysisEngineMetaData>
+	<resourceManagerConfiguration />
 </taeDescription>

Copied: incubator/ctakes/trunk/ctakes-ne-contexts/desc/test/TokenizerAnnotator.xml (from r1396711, incubator/ctakes/trunk/ctakes-ne-contexts/src/test/desc/TokenizerAnnotator.xml)
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-ne-contexts/desc/test/TokenizerAnnotator.xml?p2=incubator/ctakes/trunk/ctakes-ne-contexts/desc/test/TokenizerAnnotator.xml&p1=incubator/ctakes/trunk/ctakes-ne-contexts/src/test/desc/TokenizerAnnotator.xml&r1=1396711&r2=1397648&rev=1397648&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-ne-contexts/src/test/desc/TokenizerAnnotator.xml (original)
+++ incubator/ctakes/trunk/ctakes-ne-contexts/desc/test/TokenizerAnnotator.xml Fri Oct 12 17:12:08 2012
@@ -1,110 +1,108 @@
 <?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.
-
--->
+<!-- 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. -->
 <taeDescription xmlns="http://uima.apache.org/resourceSpecifier">
-  <frameworkImplementation>org.apache.uima.java</frameworkImplementation>
-  <primitive>true</primitive>
-  <annotatorImplementationName>org.apache.ctakes.core.ae.TokenizerAnnotator</annotatorImplementationName>
-  <analysisEngineMetaData>
-    <name>TokenizerAnnotator</name>
-    <description>Discovers tokens in the given text.  These tokens consist of words, punctuation, etc...</description>
-    <version>2.1</version>
-    <vendor>Mayo Clinic</vendor>
-    <configurationParameters>
-      <configurationParameter>
-        <name>SegmentsToSkip</name>
-        <description>Segments to skip.</description>
-        <type>String</type>
-        <multiValued>true</multiValued>
-        <mandatory>false</mandatory>
-      </configurationParameter>
-      <configurationParameter>
-        <name>FreqCutoff</name>
-        <description>Frequency cutoff for hyphen entries.</description>
-        <type>Integer</type>
-        <multiValued>false</multiValued>
-        <mandatory>true</mandatory>
-      </configurationParameter>
-    </configurationParameters>
-    <configurationParameterSettings>
-      <nameValuePair>
-        <name>SegmentsToSkip</name>
-        <value>
-          <array/>
-        </value>
-      </nameValuePair>
-      <nameValuePair>
-        <name>FreqCutoff</name>
-        <value>
-          <integer>0</integer>
-        </value>
-      </nameValuePair>
-    </configurationParameterSettings>
-    <typeSystemDescription>
-      <imports>
-      </imports>
-    </typeSystemDescription>
-    <typePriorities/>
-    <fsIndexCollection/>
-    <capabilities>
-      <capability>
-        <inputs>
-          <type allAnnotatorFeatures="true">org.apache.ctakes.typesystem.type.textspan.Segment</type>
-        </inputs>
-        <outputs>
-          <type allAnnotatorFeatures="true">org.apache.ctakes.typesystem.type.syntax.BaseToken</type>
-        </outputs>
-        <languagesSupported/>
-      </capability>
-    </capabilities>
-    <operationalProperties>
-      <modifiesCas>true</modifiesCas>
-      <multipleDeploymentAllowed>true</multipleDeploymentAllowed>
-      <outputsNewCASes>false</outputsNewCASes>
-    </operationalProperties>
-  </analysisEngineMetaData>
-  <externalResourceDependencies>
-    <externalResourceDependency>
-      <key>HyphFreqTable</key>
-      <description/>
-      <interfaceName>org.apache.ctakes.core.resource.StringIntegerMapResource</interfaceName>
-      <optional>true</optional>
-    </externalResourceDependency>
-  </externalResourceDependencies>
-  <resourceManagerConfiguration>
-    <externalResources>
-      <externalResource>
-        <name>HyphFreqFile</name>
-        <description/>
-        <fileResourceSpecifier>
-          <fileUrl>file:tokenizer/hyphenated.txt</fileUrl>
-        </fileResourceSpecifier>
-        <implementationName>org.apache.ctakes.core.resource.StringIntegerMapResourceImpl</implementationName>
-      </externalResource>
-    </externalResources>
-    <externalResourceBindings>
-      <externalResourceBinding>
-        <key>HyphFreqTable</key>
-        <resourceName>HyphFreqFile</resourceName>
-      </externalResourceBinding>
-    </externalResourceBindings>
-  </resourceManagerConfiguration>
+	<frameworkImplementation>org.apache.uima.java</frameworkImplementation>
+	<primitive>true</primitive>
+	<annotatorImplementationName>org.apache.ctakes.core.ae.TokenizerAnnotator
+	</annotatorImplementationName>
+	<analysisEngineMetaData>
+		<name>TokenizerAnnotator</name>
+		<description>Discovers tokens in the given text. These tokens consist
+			of words, punctuation, etc...</description>
+		<version>2.1</version>
+		<vendor>Mayo Clinic</vendor>
+		<configurationParameters>
+			<configurationParameter>
+				<name>SegmentsToSkip</name>
+				<description>Segments to skip.</description>
+				<type>String</type>
+				<multiValued>true</multiValued>
+				<mandatory>false</mandatory>
+			</configurationParameter>
+			<configurationParameter>
+				<name>FreqCutoff</name>
+				<description>Frequency cutoff for hyphen entries.</description>
+				<type>Integer</type>
+				<multiValued>false</multiValued>
+				<mandatory>true</mandatory>
+			</configurationParameter>
+		</configurationParameters>
+		<configurationParameterSettings>
+			<nameValuePair>
+				<name>SegmentsToSkip</name>
+				<value>
+					<array />
+				</value>
+			</nameValuePair>
+			<nameValuePair>
+				<name>FreqCutoff</name>
+				<value>
+					<integer>0</integer>
+				</value>
+			</nameValuePair>
+		</configurationParameterSettings>
+		<typeSystemDescription>
+			<imports>
+				<import name="org.apache.ctakes.typesystem.types.TypeSystem" />
+			</imports>
+		</typeSystemDescription>
+		<typePriorities />
+		<fsIndexCollection />
+		<capabilities>
+			<capability>
+				<inputs>
+					<type allAnnotatorFeatures="true">org.apache.ctakes.typesystem.type.textspan.Segment
+					</type>
+				</inputs>
+				<outputs>
+					<type allAnnotatorFeatures="true">org.apache.ctakes.typesystem.type.syntax.BaseToken
+					</type>
+				</outputs>
+				<languagesSupported />
+			</capability>
+		</capabilities>
+		<operationalProperties>
+			<modifiesCas>true</modifiesCas>
+			<multipleDeploymentAllowed>true</multipleDeploymentAllowed>
+			<outputsNewCASes>false</outputsNewCASes>
+		</operationalProperties>
+	</analysisEngineMetaData>
+	<externalResourceDependencies>
+		<externalResourceDependency>
+			<key>HyphFreqTable</key>
+			<description />
+			<interfaceName>org.apache.ctakes.core.resource.StringIntegerMapResource
+			</interfaceName>
+			<optional>true</optional>
+		</externalResourceDependency>
+	</externalResourceDependencies>
+	<resourceManagerConfiguration>
+		<externalResources>
+			<externalResource>
+				<name>HyphFreqFile</name>
+				<description />
+				<fileResourceSpecifier>
+					<fileUrl>file:org/apache/ctakes/core/tokenizer/hyphenated.txt
+					</fileUrl>
+				</fileResourceSpecifier>
+				<implementationName>org.apache.ctakes.core.resource.StringIntegerMapResourceImpl
+				</implementationName>
+			</externalResource>
+		</externalResources>
+		<externalResourceBindings>
+			<externalResourceBinding>
+				<key>HyphFreqTable</key>
+				<resourceName>HyphFreqFile</resourceName>
+			</externalResourceBinding>
+		</externalResourceBindings>
+	</resourceManagerConfiguration>
 </taeDescription>

Modified: incubator/ctakes/trunk/ctakes-ne-contexts/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-ne-contexts/pom.xml?rev=1397648&r1=1397647&r2=1397648&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-ne-contexts/pom.xml (original)
+++ incubator/ctakes/trunk/ctakes-ne-contexts/pom.xml Fri Oct 12 17:12:08 2012
@@ -19,6 +19,13 @@
 		</dependency>
 		<dependency>
 			<groupId>org.apache.ctakes</groupId>
+			<artifactId>ctakes-core</artifactId>
+			<version>${ctakes.version}</version>
+			<type>test-jar</type>
+			<scope>test</scope>
+		</dependency>		
+		<dependency>
+			<groupId>org.apache.ctakes</groupId>
 			<artifactId>ctakes-utils</artifactId>
 		</dependency>
 		<dependency>

Modified: incubator/ctakes/trunk/ctakes-ne-contexts/src/test/java/org/apache/ctakes/necontexts/ContextAnnotatorTests.java
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-ne-contexts/src/test/java/org/apache/ctakes/necontexts/ContextAnnotatorTests.java?rev=1397648&r1=1397647&r2=1397648&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-ne-contexts/src/test/java/org/apache/ctakes/necontexts/ContextAnnotatorTests.java (original)
+++ incubator/ctakes/trunk/ctakes-ne-contexts/src/test/java/org/apache/ctakes/necontexts/ContextAnnotatorTests.java Fri Oct 12 17:12:08 2012
@@ -40,7 +40,7 @@ import org.apache.ctakes.typesystem.type
 
 public class ContextAnnotatorTests {
 
-	static String unexpectedParamValueMsg = "unexpected parameter value for descriptor file test/desc/ContextTestAnnotator.xml for param: ";
+	static String unexpectedParamValueMsg = "unexpected parameter value for descriptor file desc/test/ContextTestAnnotator.xml for param: ";
 
 	/**
 	 * This test tests ContextAnnotator.getLeftScopeTokens(JCas, Annotation,
@@ -56,7 +56,7 @@ public class ContextAnnotatorTests {
 	@Test
 	public void testLeftScopeTokens() throws ResourceInitializationException, AnalysisEngineProcessException {
 
-		String descriptor = "test/desc/TestContextAnnotator.xml";
+		String descriptor = "desc/test/TestContextAnnotator.xml";
 		AnalysisEngine contextAE = TestUtil.getAE(new File(descriptor));
 		UimaContext uimaContext = contextAE.getUimaContext();
 		ContextAnnotator contextAnnotator = new ContextAnnotator();
@@ -65,7 +65,7 @@ public class ContextAnnotatorTests {
 		TestUtil.testConfigParam(uimaContext, descriptor, ContextAnnotator.MAX_LEFT_SCOPE_SIZE_PARAM, new Integer(8));
 		TestUtil.testConfigParam(uimaContext, descriptor, ContextAnnotator.CONTEXT_ANNOTATION_CLASS_PARAM, "org.apache.ctakes.typesystem.type.syntax.BaseToken");
 
-		AnalysisEngine segmentTokenSentenceAE = TestUtil.getAE(new File("test/desc/SegmentTokenSentenceAggregate.xml"));
+		AnalysisEngine segmentTokenSentenceAE = TestUtil.getAE(new File("desc/test/SegmentTokenSentenceAggregate.xml"));
 		// this gives us a JCas that has segments, tokens, and sentences
 		JCas jCas = TestUtil
 				.processAE(
@@ -244,7 +244,7 @@ public class ContextAnnotatorTests {
 	@Test
 	public void testRightScopeTokens() throws ResourceInitializationException, AnalysisEngineProcessException {
 
-		String descriptor = "test/desc/TestContextAnnotator.xml";
+		String descriptor = "desc/test/TestContextAnnotator.xml";
 		AnalysisEngine contextAE = TestUtil.getAE(new File(descriptor));
 		UimaContext uimaContext = contextAE.getUimaContext();
 		ContextAnnotator contextAnnotator = new ContextAnnotator();
@@ -253,7 +253,7 @@ public class ContextAnnotatorTests {
 		TestUtil.testConfigParam(uimaContext, descriptor, ContextAnnotator.MAX_RIGHT_SCOPE_SIZE_PARAM, new Integer(4));
 		TestUtil.testConfigParam(uimaContext, descriptor, ContextAnnotator.CONTEXT_ANNOTATION_CLASS_PARAM, "org.apache.ctakes.typesystem.type.syntax.BaseToken");
 
-		AnalysisEngine segmentTokenSentenceAE = TestUtil.getAE(new File("test/desc/SegmentTokenSentenceAggregate.xml"));
+		AnalysisEngine segmentTokenSentenceAE = TestUtil.getAE(new File("desc/test/SegmentTokenSentenceAggregate.xml"));
 		// this gives us a JCas that has segments, tokens, and sentences
 		JCas jCas = TestUtil
 				.processAE(
@@ -409,8 +409,10 @@ public class ContextAnnotatorTests {
 	 */
 	@Test
 	public void testMiddleScopeTokens() throws ResourceInitializationException, AnalysisEngineProcessException {
-
-		String descriptor = "test/desc/TestContextAnnotator.xml";
+		//TODO: Pei- For unit tests, we should wire up the pipeline programmatically.
+		//We can use uimafit instead of xml descriptor files.
+		
+		String descriptor = "desc/test/TestContextAnnotator.xml";
 		AnalysisEngine contextAE = TestUtil.getAE(new File(descriptor));
 		UimaContext uimaContext = contextAE.getUimaContext();
 		ContextAnnotator contextAnnotator = new ContextAnnotator();
@@ -419,7 +421,7 @@ public class ContextAnnotatorTests {
 		TestUtil.testConfigParam(uimaContext, descriptor, ContextAnnotator.CONTEXT_ANNOTATION_CLASS_PARAM, "org.apache.ctakes.typesystem.type.syntax.BaseToken");
 
 
-		AnalysisEngine segmentTokenSentenceAE = TestUtil.getAE(new File("test/desc/SegmentTokenSentenceAggregate.xml"));
+		AnalysisEngine segmentTokenSentenceAE = TestUtil.getAE(new File("desc/test/SegmentTokenSentenceAggregate.xml"));
 		// this gives us a JCas that has segments, tokens, and sentences
 		JCas jCas = TestUtil
 				.processAE(

Modified: incubator/ctakes/trunk/ctakes-ne-contexts/src/test/java/org/apache/ctakes/necontexts/NegationAnnotatorTests.java
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-ne-contexts/src/test/java/org/apache/ctakes/necontexts/NegationAnnotatorTests.java?rev=1397648&r1=1397647&r2=1397648&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-ne-contexts/src/test/java/org/apache/ctakes/necontexts/NegationAnnotatorTests.java (original)
+++ incubator/ctakes/trunk/ctakes-ne-contexts/src/test/java/org/apache/ctakes/necontexts/NegationAnnotatorTests.java Fri Oct 12 17:12:08 2012
@@ -34,12 +34,14 @@ import org.apache.ctakes.typesystem.type
 
 public class NegationAnnotatorTests {
 
-	static String unexpectedParamValueMsg = "unexpected parameter value for descriptor file test/desc/NegationAnnotator.xml for param: ";
+	static String unexpectedParamValueMsg = "unexpected parameter value for descriptor file desc/test/NegationAnnotator.xml for param: ";
 
 	@Test
 	public void testNegationExamples() throws ResourceInitializationException, AnalysisEngineProcessException {
+		//TODO: Pei- For unit tests, we should wire up the pipeline programmatically.
+		//We can use uimafit instead of xml descriptor files.
 
-		String descriptor = "test/desc/NegationAnnotator.xml";
+		String descriptor = "desc/test/NegationAnnotator.xml";
 		AnalysisEngine contextAE = TestUtil.getAE(new File(descriptor));
 		UimaContext uimaContext = contextAE.getUimaContext();
 		ContextAnnotator negationAnnotator = new ContextAnnotator();
@@ -55,7 +57,7 @@ public class NegationAnnotatorTests {
 		TestUtil.testConfigParam(uimaContext, descriptor, ContextAnnotator.FOCUS_ANNOTATION_CLASS_PARAM, "org.apache.ctakes.typesystem.type.textsem.IdentifiedAnnotation");
 		TestUtil.testConfigParam(uimaContext, descriptor, ContextAnnotator.CONTEXT_ANNOTATION_CLASS_PARAM, "org.apache.ctakes.typesystem.type.syntax.BaseToken");
 
-		AnalysisEngine segmentTokenSentenceAE = TestUtil.getAE(new File("test/desc/SegmentTokenSentenceAggregate.xml"));
+		AnalysisEngine segmentTokenSentenceAE = TestUtil.getAE(new File("desc/test/SegmentTokenSentenceAggregate.xml"));
 
 		String text;
 		JCas jCas;

Modified: incubator/ctakes/trunk/ctakes-ne-contexts/src/test/java/org/apache/ctakes/necontexts/StatusAnnotatorTests.java
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-ne-contexts/src/test/java/org/apache/ctakes/necontexts/StatusAnnotatorTests.java?rev=1397648&r1=1397647&r2=1397648&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-ne-contexts/src/test/java/org/apache/ctakes/necontexts/StatusAnnotatorTests.java (original)
+++ incubator/ctakes/trunk/ctakes-ne-contexts/src/test/java/org/apache/ctakes/necontexts/StatusAnnotatorTests.java Fri Oct 12 17:12:08 2012
@@ -36,8 +36,9 @@ public class StatusAnnotatorTests {
 
 	@Test
 	public void testNegationExamples() throws ResourceInitializationException, AnalysisEngineProcessException {
-
-		String descriptor = "test/desc/StatusAnnotator.xml";
+		//TODO: Pei- For unit tests, we should wire up the pipeline programmatically.
+		//We can use uimafit instead of xml descriptor files.
+		String descriptor = "desc/test/StatusAnnotator.xml";
 		AnalysisEngine contextAE = TestUtil.getAE(new File(descriptor));
 		UimaContext uimaContext = contextAE.getUimaContext();
 		ContextAnnotator statusAnnotator = new ContextAnnotator();
@@ -50,10 +51,10 @@ public class StatusAnnotatorTests {
 		TestUtil.testConfigParam(uimaContext, descriptor, ContextAnnotator.CONTEXT_ANALYZER_CLASS_PARAM, "org.apache.ctakes.necontexts.status.StatusContextAnalyzer");
 		TestUtil.testConfigParam(uimaContext, descriptor, ContextAnnotator.CONTEXT_HIT_CONSUMER_CLASS_PARAM, "org.apache.ctakes.necontexts.status.StatusContextHitConsumer");
 		TestUtil.testConfigParam(uimaContext, descriptor, ContextAnnotator.WINDOW_ANNOTATION_CLASS_PARAM, "org.apache.ctakes.typesystem.type.textspan.Sentence");
-		TestUtil.testConfigParam(uimaContext, descriptor, ContextAnnotator.FOCUS_ANNOTATION_CLASS_PARAM, "org.apache.ctakes.typesystem.type.IdentifiedAnnotation");
+		TestUtil.testConfigParam(uimaContext, descriptor, ContextAnnotator.FOCUS_ANNOTATION_CLASS_PARAM, "org.apache.ctakes.typesystem.type.textsem.IdentifiedAnnotation");
 		TestUtil.testConfigParam(uimaContext, descriptor, ContextAnnotator.CONTEXT_ANNOTATION_CLASS_PARAM, "org.apache.ctakes.typesystem.type.syntax.BaseToken");
 
-		AnalysisEngine segmentTokenSentenceAE = TestUtil.getAE(new File("test/desc/SegmentTokenSentenceAggregate.xml"));
+		AnalysisEngine segmentTokenSentenceAE = TestUtil.getAE(new File("desc/test/SegmentTokenSentenceAggregate.xml"));
 
 		String text;
 		JCas jCas;



Mime
View raw message