You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ctakes.apache.org by ch...@apache.org on 2013/09/11 17:09:32 UTC
svn commit: r1521896 - in /ctakes/trunk: ctakes-chunker/desc/ ctakes-chunker/desc/test/ ctakes-drug-ner/desc/analysis_engine/ ctakes-pos-tagger/desc/

Author: chenpei
Date: Wed Sep 11 15:09:31 2013
New Revision: 1521896

URL: http://svn.apache.org/r1521896
Log:
CTAKES-243 Delete multiple copies of SentenceDetectorAnnotator.xml
Update any aggregates to use ../../ctakes-core/desc/analysis_engine/SenteceDetectorAnnotator.xml instead just like the rest of the desc.

Removed:
    ctakes/trunk/ctakes-chunker/desc/SentenceDetectorAnnotator.xml
    ctakes/trunk/ctakes-chunker/desc/test/SentenceDetectorAnnotator.xml
Modified:
    ctakes/trunk/ctakes-chunker/desc/AggregateAE.xml
    ctakes/trunk/ctakes-chunker/desc/ChunkerAggregate.xml
    ctakes/trunk/ctakes-chunker/desc/test/ChunkAdjusterAggregate.xml
    ctakes/trunk/ctakes-chunker/desc/test/ChunkerAggregate.xml
    ctakes/trunk/ctakes-chunker/desc/test/PhraseTypeChunkerAggregate.xml
    ctakes/trunk/ctakes-drug-ner/desc/analysis_engine/DrugMentionAnnotator.xml
    ctakes/trunk/ctakes-pos-tagger/desc/POSTaggerAggregate.xml

Modified: ctakes/trunk/ctakes-chunker/desc/AggregateAE.xml
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-chunker/desc/AggregateAE.xml?rev=1521896&r1=1521895&r2=1521896&view=diff
==============================================================================
--- ctakes/trunk/ctakes-chunker/desc/AggregateAE.xml (original)
+++ ctakes/trunk/ctakes-chunker/desc/AggregateAE.xml Wed Sep 11 15:09:31 2013
@@ -30,7 +30,7 @@
 <import location="Chunker.xml"/>
 </delegateAnalysisEngine>
 <delegateAnalysisEngine key="SentenceDetectorAnnotator">
-<import location="SentenceDetectorAnnotator.xml"/>
+<import location="../../ctakes-core/desc/analysis_engine/SentenceDetectorAnnotator.xml"/>
 </delegateAnalysisEngine>
 <delegateAnalysisEngine key="TokenizerAnnotator">
 <import location="../../ctakes-core/desc/analysis_engine/TokenizerAnnotator.xml"/>  

Modified: ctakes/trunk/ctakes-chunker/desc/ChunkerAggregate.xml
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-chunker/desc/ChunkerAggregate.xml?rev=1521896&r1=1521895&r2=1521896&view=diff
==============================================================================
--- ctakes/trunk/ctakes-chunker/desc/ChunkerAggregate.xml (original)
+++ ctakes/trunk/ctakes-chunker/desc/ChunkerAggregate.xml Wed Sep 11 15:09:31 2013
@@ -30,7 +30,7 @@
 <import location="Chunker.xml"/>
 </delegateAnalysisEngine>
 <delegateAnalysisEngine key="SentenceDetectorAnnotator">
-<import location="SentenceDetectorAnnotator.xml"/>
+<import location="../../ctakes-core/desc/analysis_engine/SentenceDetectorAnnotator.xml"/>
 </delegateAnalysisEngine>
 <delegateAnalysisEngine key="TokenizerAnnotator">
 <import location="../../ctakes-core/desc/analysis_engine/TokenizerAnnotator.xml"/>  

Modified: ctakes/trunk/ctakes-chunker/desc/test/ChunkAdjusterAggregate.xml
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-chunker/desc/test/ChunkAdjusterAggregate.xml?rev=1521896&r1=1521895&r2=1521896&view=diff
==============================================================================
--- ctakes/trunk/ctakes-chunker/desc/test/ChunkAdjusterAggregate.xml (original)
+++ ctakes/trunk/ctakes-chunker/desc/test/ChunkAdjusterAggregate.xml Wed Sep 11 15:09:31 2013
@@ -33,7 +33,7 @@
 <import location="Chunker.xml"/>
 </delegateAnalysisEngine>
 <delegateAnalysisEngine key="SentenceDetectorAnnotator">
-<import location="SentenceDetectorAnnotator.xml"/>
+<import location="../../../ctakes-core/desc/analysis_engine/SentenceDetectorAnnotator.xml"/>
 </delegateAnalysisEngine>
 <delegateAnalysisEngine key="TokenizerAnnotator">
 <import location="TokenizerAnnotator.xml"/>

Modified: ctakes/trunk/ctakes-chunker/desc/test/ChunkerAggregate.xml
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-chunker/desc/test/ChunkerAggregate.xml?rev=1521896&r1=1521895&r2=1521896&view=diff
==============================================================================
--- ctakes/trunk/ctakes-chunker/desc/test/ChunkerAggregate.xml (original)
+++ ctakes/trunk/ctakes-chunker/desc/test/ChunkerAggregate.xml Wed Sep 11 15:09:31 2013
@@ -30,7 +30,7 @@
 <import location="Chunker.xml"/>
 </delegateAnalysisEngine>
 <delegateAnalysisEngine key="SentenceDetectorAnnotator">
-<import location="SentenceDetectorAnnotator.xml"/>
+<import location="../../../ctakes-core/desc/analysis_engine/SentenceDetectorAnnotator.xml"/>
 </delegateAnalysisEngine>
 <delegateAnalysisEngine key="TokenizerAnnotator">
 <import location="TokenizerAnnotator.xml"/>

Modified: ctakes/trunk/ctakes-chunker/desc/test/PhraseTypeChunkerAggregate.xml
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-chunker/desc/test/PhraseTypeChunkerAggregate.xml?rev=1521896&r1=1521895&r2=1521896&view=diff
==============================================================================
--- ctakes/trunk/ctakes-chunker/desc/test/PhraseTypeChunkerAggregate.xml (original)
+++ ctakes/trunk/ctakes-chunker/desc/test/PhraseTypeChunkerAggregate.xml Wed Sep 11 15:09:31 2013
@@ -30,7 +30,7 @@
       <import location="TokenizerAnnotator.xml"/>
     </delegateAnalysisEngine>
     <delegateAnalysisEngine key="SentenceDetectorAnnotator">
-      <import location="SentenceDetectorAnnotator.xml"/>
+      <import location="../../../ctakes-core/desc/analysis_engine/SentenceDetectorAnnotator.xml"/>
     </delegateAnalysisEngine>
     <delegateAnalysisEngine key="SimpleSegmentAnnotator">
       <import location="SimpleSegmentAnnotator.xml"/>

Modified: ctakes/trunk/ctakes-drug-ner/desc/analysis_engine/DrugMentionAnnotator.xml
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-drug-ner/desc/analysis_engine/DrugMentionAnnotator.xml?rev=1521896&r1=1521895&r2=1521896&view=diff
==============================================================================
--- ctakes/trunk/ctakes-drug-ner/desc/analysis_engine/DrugMentionAnnotator.xml (original)
+++ ctakes/trunk/ctakes-drug-ner/desc/analysis_engine/DrugMentionAnnotator.xml Wed Sep 11 15:09:31 2013
@@ -118,7 +118,12 @@
         </value>
       </nameValuePair>
     </configurationParameterSettings>
-    <typeSystemDescription/>
+<typeSystemDescription>    
+       <imports>
+         <import name="org.apache.ctakes.drugner.types.TypeSystem"/>
+       </imports>
+</typeSystemDescription>
+
     <typePriorities/>
     <fsIndexCollection/>
     <capabilities>

Modified: ctakes/trunk/ctakes-pos-tagger/desc/POSTaggerAggregate.xml
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-pos-tagger/desc/POSTaggerAggregate.xml?rev=1521896&r1=1521895&r2=1521896&view=diff
==============================================================================
--- ctakes/trunk/ctakes-pos-tagger/desc/POSTaggerAggregate.xml (original)
+++ ctakes/trunk/ctakes-pos-tagger/desc/POSTaggerAggregate.xml Wed Sep 11 15:09:31 2013
@@ -27,7 +27,7 @@
 <import location="SimpleSegmentAnnotator.xml"/>
 </delegateAnalysisEngine>
 <delegateAnalysisEngine key="SentenceDetectorAnnotator">
-<import location="SentenceDetectorAnnotator.xml"/>
+<import location="../../ctakes-core/desc/analysis_engine/SentenceDetectorAnnotator.xml"/>
 </delegateAnalysisEngine>
 <delegateAnalysisEngine key="TokenizerAnnotator">
 <import location="../../ctakes-core/desc/analysis_engine/TokenizerAnnotator.xml"/>