ctakes-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chen...@apache.org
Subject svn commit: r1394625 [1/2] - in /incubator/ctakes/trunk: ./ ctakes-assertion/ ctakes-assertion/desc/ ctakes-assertion/src/main/resources/org/apache/ctakes/assertion/types/ ctakes-clinical-pipeline/desc/analysis_engine/ ctakes-constituency-parser/ ctake...
Date Fri, 05 Oct 2012 16:26:26 GMT
Author: chenpei
Date: Fri Oct  5 16:26:23 2012
New Revision: 1394625

URL: http://svn.apache.org/viewvc?rev=1394625&view=rev
Log:
- Added unique qualified names to TypeSystems such as org.apache.ctakes.typesystem.types.TypeSystem.
And reference them in imports via name instead of locations such as ../.. or ../../.. etc.
<import name="org.apache.ctakes.typesystem.types.TypeSystem"/>
<import location="../../../ctakes-type-system/desc/common_type_system.xml"/>
- Move Type System Descriptors to src/main/resources and have them automatically added to the classpath via maven.
- Made Type Systems auto detectable for uimaFIT via META-INF/org.uimafit/types.txt

Added:
    incubator/ctakes/trunk/ctakes-assertion/src/main/resources/org/apache/ctakes/assertion/types/
    incubator/ctakes/trunk/ctakes-assertion/src/main/resources/org/apache/ctakes/assertion/types/TypeSystem.xml
      - copied, changed from r1394192, incubator/ctakes/trunk/ctakes-assertion/desc/medfactsTypeSystem.xml
    incubator/ctakes/trunk/ctakes-constituency-parser/src/main/resources/org/apache/ctakes/constituency/parser/types/
      - copied from r1394192, incubator/ctakes/trunk/ctakes-constituency-parser/desc/types/
    incubator/ctakes/trunk/ctakes-coreference/src/main/resources/org/apache/ctakes/coreference/types/
      - copied from r1394192, incubator/ctakes/trunk/ctakes-coreference/desc/type-system/
    incubator/ctakes/trunk/ctakes-coreference/src/main/resources/org/apache/ctakes/coreference/types/TypeSystem.xml
      - copied unchanged from r1394192, incubator/ctakes/trunk/ctakes-coreference/desc/type-system/CorefTypes.xml
    incubator/ctakes/trunk/ctakes-drug-ner/src/main/resources/org/apache/ctakes/drugner/types/
      - copied from r1394192, incubator/ctakes/trunk/ctakes-drug-ner/desc/type_system/
    incubator/ctakes/trunk/ctakes-drug-ner/src/main/resources/org/apache/ctakes/drugner/types/TypeSystem.xml
      - copied unchanged from r1394192, incubator/ctakes/trunk/ctakes-drug-ner/desc/type_system/NERTypeSystem.xml
    incubator/ctakes/trunk/ctakes-pad-term-spotter/src/main/resources/org/apache/ctakes/padtermspotter/types/
      - copied from r1394192, incubator/ctakes/trunk/ctakes-pad-term-spotter/desc/type_system/
    incubator/ctakes/trunk/ctakes-pad-term-spotter/src/main/resources/org/apache/ctakes/padtermspotter/types/TypeSystem.xml
      - copied, changed from r1394192, incubator/ctakes/trunk/ctakes-pad-term-spotter/desc/type_system/PADSiteAndTerm.xml
    incubator/ctakes/trunk/ctakes-side-effect/src/main/resources/org/apache/ctakes/sideeffect/types/
      - copied from r1394192, incubator/ctakes/trunk/ctakes-side-effect/desc/type_system/
    incubator/ctakes/trunk/ctakes-side-effect/src/main/resources/org/apache/ctakes/sideeffect/types/TypeSystem.xml
      - copied, changed from r1394192, incubator/ctakes/trunk/ctakes-side-effect/desc/type_system/SideEffectTypeSystem.xml
    incubator/ctakes/trunk/ctakes-smoking-status/src/main/resources/org/apache/ctakes/smokingstatus/types/
      - copied from r1394192, incubator/ctakes/trunk/ctakes-smoking-status/desc/type_system/
    incubator/ctakes/trunk/ctakes-smoking-status/src/main/resources/org/apache/ctakes/smokingstatus/types/TypeSystem.xml
      - copied, changed from r1394192, incubator/ctakes/trunk/ctakes-smoking-status/desc/type_system/SmokingProductionTypeSystem.xml
    incubator/ctakes/trunk/ctakes-type-system/src/main/resources/
    incubator/ctakes/trunk/ctakes-type-system/src/main/resources/META-INF/
    incubator/ctakes/trunk/ctakes-type-system/src/main/resources/META-INF/org.uimafit/
    incubator/ctakes/trunk/ctakes-type-system/src/main/resources/META-INF/org.uimafit/types.txt
    incubator/ctakes/trunk/ctakes-type-system/src/main/resources/org/
    incubator/ctakes/trunk/ctakes-type-system/src/main/resources/org/apache/
    incubator/ctakes/trunk/ctakes-type-system/src/main/resources/org/apache/ctakes/
    incubator/ctakes/trunk/ctakes-type-system/src/main/resources/org/apache/ctakes/typesystem/
    incubator/ctakes/trunk/ctakes-type-system/src/main/resources/org/apache/ctakes/typesystem/types/
    incubator/ctakes/trunk/ctakes-type-system/src/main/resources/org/apache/ctakes/typesystem/types/TypeSystem.xml
Removed:
    incubator/ctakes/trunk/ctakes-assertion/desc/medfactsTypeSystem.xml
    incubator/ctakes/trunk/ctakes-constituency-parser/desc/types/
    incubator/ctakes/trunk/ctakes-coreference/desc/type-system/
    incubator/ctakes/trunk/ctakes-coreference/src/main/resources/org/apache/ctakes/coreference/types/CorefTypes.xml
    incubator/ctakes/trunk/ctakes-drug-ner/desc/type_system/
    incubator/ctakes/trunk/ctakes-drug-ner/src/main/resources/org/apache/ctakes/drugner/types/NERTypeSystem.xml
    incubator/ctakes/trunk/ctakes-pad-term-spotter/desc/type_system/
    incubator/ctakes/trunk/ctakes-pad-term-spotter/src/main/resources/org/apache/ctakes/padtermspotter/types/PADSiteAndTerm.xml
    incubator/ctakes/trunk/ctakes-side-effect/desc/type_system/
    incubator/ctakes/trunk/ctakes-side-effect/src/main/resources/org/apache/ctakes/sideeffect/types/SideEffectTypeSystem.xml
    incubator/ctakes/trunk/ctakes-smoking-status/desc/type_system/
    incubator/ctakes/trunk/ctakes-smoking-status/src/main/resources/org/apache/ctakes/smokingstatus/types/SmokingProductionTypeSystem.xml
    incubator/ctakes/trunk/ctakes-type-system/desc/common_type_system.xml
Modified:
    incubator/ctakes/trunk/ctakes-assertion/desc/GenericAttributeAnalysisEngine.xml
    incubator/ctakes/trunk/ctakes-assertion/desc/SubjectAttributeAnalysisEngine.xml
    incubator/ctakes/trunk/ctakes-assertion/desc/assertionAnalysisEngine.xml
    incubator/ctakes/trunk/ctakes-assertion/desc/conceptConverterAnalysisEngine.xml
    incubator/ctakes/trunk/ctakes-assertion/pom.xml
    incubator/ctakes/trunk/ctakes-clinical-pipeline/desc/analysis_engine/SectionSegmentAnnotator.xml
    incubator/ctakes/trunk/ctakes-constituency-parser/desc/ConstituencyParserAnnotator.xml
    incubator/ctakes/trunk/ctakes-constituency-parser/desc/analysis_engine/ParserEvaluatorAnnotator.xml
    incubator/ctakes/trunk/ctakes-constituency-parser/pom.xml
    incubator/ctakes/trunk/ctakes-constituency-parser/src/main/resources/org/apache/ctakes/constituency/parser/types/LabeledTree.xml
    incubator/ctakes/trunk/ctakes-core/desc/analysis_engine/CopyAnnotator.xml
    incubator/ctakes/trunk/ctakes-core/desc/analysis_engine/SimpleSegmentAnnotator.xml
    incubator/ctakes/trunk/ctakes-core/desc/analysis_engine/SimpleSegmentWithTagsAnnotator.xml
    incubator/ctakes/trunk/ctakes-core/desc/analysis_engine/TokenizerAnnotator.xml
    incubator/ctakes/trunk/ctakes-core/desc/analysis_engine/TokenizerAnnotatorVersion1.xml
    incubator/ctakes/trunk/ctakes-core/desc/cas_consumer/XCasWriterCasConsumer.xml
    incubator/ctakes/trunk/ctakes-coreference/desc/MipacqMarkableCreator.xml
    incubator/ctakes/trunk/ctakes-coreference/desc/MipacqMarkableExpander.xml
    incubator/ctakes/trunk/ctakes-coreference/desc/cas_consumer/ODIEVectorFileWriterCasConsumer.xml
    incubator/ctakes/trunk/ctakes-coreference/pom.xml
    incubator/ctakes/trunk/ctakes-dependency-parser/desc/analysis_engine/ClearParserDependencyParserAE.xml
    incubator/ctakes/trunk/ctakes-dependency-parser/desc/analysis_engine/ClearParserDependencyParserPlaintextAggregate.xml
    incubator/ctakes/trunk/ctakes-dependency-parser/desc/analysis_engine/ClearParserDependencyParserTokenizedAggregate.xml
    incubator/ctakes/trunk/ctakes-dependency-parser/desc/analysis_engine/ClearParserDependencyParserTokenizedInfPosAggregate.xml
    incubator/ctakes/trunk/ctakes-dependency-parser/desc/analysis_engine/ClearParserSRLPlaintextAggregate.xml
    incubator/ctakes/trunk/ctakes-dependency-parser/desc/analysis_engine/ClearParserSRLTokenizedAggregate.xml
    incubator/ctakes/trunk/ctakes-dependency-parser/desc/analysis_engine/ClearParserSRLTokenizedInfPosAggregate.xml
    incubator/ctakes/trunk/ctakes-dependency-parser/desc/analysis_engine/ClearParserSemanticRoleLabelerAE.xml
    incubator/ctakes/trunk/ctakes-drug-ner/pom.xml
    incubator/ctakes/trunk/ctakes-pad-term-spotter/pom.xml
    incubator/ctakes/trunk/ctakes-pad-term-spotter/src/main/resources/org/apache/ctakes/padtermspotter/types/SubSection.xml
    incubator/ctakes/trunk/ctakes-side-effect/desc/analysis_engine/DictionaryLookupAnnotator_sideEffect.xml
    incubator/ctakes/trunk/ctakes-side-effect/pom.xml
    incubator/ctakes/trunk/ctakes-smoking-status/pom.xml
    incubator/ctakes/trunk/ctakes-smoking-status/src/main/resources/org/apache/ctakes/smokingstatus/types/I2b2TypeSystem.xml
    incubator/ctakes/trunk/ctakes-smoking-status/src/main/resources/org/apache/ctakes/smokingstatus/types/LibSVMTypeSystem.xml
    incubator/ctakes/trunk/ctakes-type-system/pom.xml
    incubator/ctakes/trunk/pom.xml

Modified: incubator/ctakes/trunk/ctakes-assertion/desc/GenericAttributeAnalysisEngine.xml
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-assertion/desc/GenericAttributeAnalysisEngine.xml?rev=1394625&r1=1394624&r2=1394625&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-assertion/desc/GenericAttributeAnalysisEngine.xml (original)
+++ incubator/ctakes/trunk/ctakes-assertion/desc/GenericAttributeAnalysisEngine.xml Fri Oct  5 16:26:23 2012
@@ -32,7 +32,7 @@
     <configurationParameterSettings/>
     <typeSystemDescription>
       <imports>
-        <import location="../../ctakes-type-system/desc/common_type_system.xml"/>
+        <import name="org.apache.ctakes.typesystem.types.TypeSystem"/>
       </imports>
     </typeSystemDescription>
     <typePriorities/>

Modified: incubator/ctakes/trunk/ctakes-assertion/desc/SubjectAttributeAnalysisEngine.xml
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-assertion/desc/SubjectAttributeAnalysisEngine.xml?rev=1394625&r1=1394624&r2=1394625&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-assertion/desc/SubjectAttributeAnalysisEngine.xml (original)
+++ incubator/ctakes/trunk/ctakes-assertion/desc/SubjectAttributeAnalysisEngine.xml Fri Oct  5 16:26:23 2012
@@ -32,7 +32,7 @@
     <configurationParameterSettings/>
     <typeSystemDescription>
       <imports>
-        <import location="../../ctakes-type-system/desc/common_type_system.xml"/>
+        <import name="org.apache.ctakes.typesystem.types.TypeSystem"/>
       </imports>
     </typeSystemDescription>
     <typePriorities/>

Modified: incubator/ctakes/trunk/ctakes-assertion/desc/assertionAnalysisEngine.xml
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-assertion/desc/assertionAnalysisEngine.xml?rev=1394625&r1=1394624&r2=1394625&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-assertion/desc/assertionAnalysisEngine.xml (original)
+++ incubator/ctakes/trunk/ctakes-assertion/desc/assertionAnalysisEngine.xml Fri Oct  5 16:26:23 2012
@@ -32,8 +32,8 @@
     <configurationParameterSettings/>
     <typeSystemDescription>
       <imports>
-        <import location="medfactsTypeSystem.xml"/>
-        <import location="../../ctakes-type-system/desc/common_type_system.xml"/>
+        <import name="org.apache.ctakes.assertion.types.TypeSystem"/>
+        <import name="org.apache.ctakes.typesystem.types.TypeSystem"/>
       </imports>
     </typeSystemDescription>
     <typePriorities/>

Modified: incubator/ctakes/trunk/ctakes-assertion/desc/conceptConverterAnalysisEngine.xml
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-assertion/desc/conceptConverterAnalysisEngine.xml?rev=1394625&r1=1394624&r2=1394625&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-assertion/desc/conceptConverterAnalysisEngine.xml (original)
+++ incubator/ctakes/trunk/ctakes-assertion/desc/conceptConverterAnalysisEngine.xml Fri Oct  5 16:26:23 2012
@@ -32,8 +32,8 @@
     <configurationParameterSettings/>
     <typeSystemDescription>
       <imports>
-        <import location="medfactsTypeSystem.xml"/>
-        <import location="../../ctakes-type-system/desc/common_type_system.xml"/>
+        <import name="org.apache.ctakes.assertion.types.TypeSystem"/>
+        <import name="org.apache.ctakes.typesystem.types.TypeSystem"/>
       </imports>
     </typeSystemDescription>
     <typePriorities/>

Modified: incubator/ctakes/trunk/ctakes-assertion/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-assertion/pom.xml?rev=1394625&r1=1394624&r2=1394625&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-assertion/pom.xml (original)
+++ incubator/ctakes/trunk/ctakes-assertion/pom.xml Fri Oct  5 16:26:23 2012
@@ -9,7 +9,7 @@
 		<version>3.0.0-SNAPSHOT</version>
 	</parent>
 	<properties>
-		<jcasgen.typesystem>desc/medfactsTypeSystem.xml</jcasgen.typesystem>
+		<jcasgen.typesystem>org/apache/ctakes/assertion/types/TypeSystem.xml</jcasgen.typesystem>
 	</properties>
 	<dependencies>
 		<dependency>

Copied: incubator/ctakes/trunk/ctakes-assertion/src/main/resources/org/apache/ctakes/assertion/types/TypeSystem.xml (from r1394192, incubator/ctakes/trunk/ctakes-assertion/desc/medfactsTypeSystem.xml)
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-assertion/src/main/resources/org/apache/ctakes/assertion/types/TypeSystem.xml?p2=incubator/ctakes/trunk/ctakes-assertion/src/main/resources/org/apache/ctakes/assertion/types/TypeSystem.xml&p1=incubator/ctakes/trunk/ctakes-assertion/desc/medfactsTypeSystem.xml&r1=1394192&r2=1394625&rev=1394625&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-assertion/desc/medfactsTypeSystem.xml (original)
+++ incubator/ctakes/trunk/ctakes-assertion/src/main/resources/org/apache/ctakes/assertion/types/TypeSystem.xml Fri Oct  5 16:26:23 2012
@@ -20,7 +20,7 @@
 
 -->
 <typeSystemDescription xmlns="http://uima.apache.org/resourceSpecifier">
-  <name>medfactsTypeSystem</name>
+  <name>org.apache.ctakes.assertion.types.TypeSystem</name>
   <description/>
   <version>1.0</version>
   <vendor/>

Modified: incubator/ctakes/trunk/ctakes-clinical-pipeline/desc/analysis_engine/SectionSegmentAnnotator.xml
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-clinical-pipeline/desc/analysis_engine/SectionSegmentAnnotator.xml?rev=1394625&r1=1394624&r2=1394625&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-clinical-pipeline/desc/analysis_engine/SectionSegmentAnnotator.xml (original)
+++ incubator/ctakes/trunk/ctakes-clinical-pipeline/desc/analysis_engine/SectionSegmentAnnotator.xml Fri Oct  5 16:26:23 2012
@@ -53,7 +53,7 @@
     </configurationParameterSettings>
     <typeSystemDescription>
       <imports>
-        <import location="../../../ctakes-type-system/desc/common_type_system.xml"/>
+<import name="org.apache.ctakes.typesystem.types.TypeSystem"/>
       </imports>
     </typeSystemDescription>
     <typePriorities/>

Modified: incubator/ctakes/trunk/ctakes-constituency-parser/desc/ConstituencyParserAnnotator.xml
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-constituency-parser/desc/ConstituencyParserAnnotator.xml?rev=1394625&r1=1394624&r2=1394625&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-constituency-parser/desc/ConstituencyParserAnnotator.xml (original)
+++ incubator/ctakes/trunk/ctakes-constituency-parser/desc/ConstituencyParserAnnotator.xml Fri Oct  5 16:26:23 2012
@@ -46,7 +46,7 @@
     </configurationParameterSettings>
     <typeSystemDescription>
       <imports>
-        <import location="../../ctakes-type-system/desc/common_type_system.xml"/>
+        <import name="org.apache.ctakes.typesystem.types.TypeSystem"/>
       </imports>
     </typeSystemDescription>
     <typePriorities/>

Modified: incubator/ctakes/trunk/ctakes-constituency-parser/desc/analysis_engine/ParserEvaluatorAnnotator.xml
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-constituency-parser/desc/analysis_engine/ParserEvaluatorAnnotator.xml?rev=1394625&r1=1394624&r2=1394625&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-constituency-parser/desc/analysis_engine/ParserEvaluatorAnnotator.xml (original)
+++ incubator/ctakes/trunk/ctakes-constituency-parser/desc/analysis_engine/ParserEvaluatorAnnotator.xml Fri Oct  5 16:26:23 2012
@@ -1,69 +1,60 @@
 <?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. -->
 <analysisEngineDescription xmlns="http://uima.apache.org/resourceSpecifier">
-  <frameworkImplementation>org.apache.uima.java</frameworkImplementation>
-  <primitive>true</primitive>
-  <annotatorImplementationName>org.apache.ctakes.constituency.parser.ae.ParserEvaluationAnnotator</annotatorImplementationName>
-  <analysisEngineMetaData>
-    <name>ParserEvaluatorAnnotator</name>
-    <description/>
-    <version>1.0</version>
-    <vendor/>
-    <configurationParameters>
-      <configurationParameter>
-        <name>modelDir</name>
-        <type>String</type>
-        <multiValued>false</multiValued>
-        <mandatory>true</mandatory>
-      </configurationParameter>
-    </configurationParameters>
-    <configurationParameterSettings>
-      <nameValuePair>
-        <name>modelDir</name>
-        <value>
-          <string>change me</string>
-        </value>
-      </nameValuePair>
-    </configurationParameterSettings>
-    <typeSystemDescription>
-      <imports>
-        <import location="../../../ctakes-type-system/desc/common_type_system.xml"/>
-        <import location="../TypeSystem.xml"/>
-      </imports>
-    </typeSystemDescription>
-    <typePriorities/>
-    <fsIndexCollection/>
-    <capabilities>
-      <capability>
-        <inputs/>
-        <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.constituency.parser.ae.ParserEvaluationAnnotator
+	</annotatorImplementationName>
+	<analysisEngineMetaData>
+		<name>ParserEvaluatorAnnotator</name>
+		<description />
+		<version>1.0</version>
+		<vendor />
+		<configurationParameters>
+			<configurationParameter>
+				<name>modelDir</name>
+				<type>String</type>
+				<multiValued>false</multiValued>
+				<mandatory>true</mandatory>
+			</configurationParameter>
+		</configurationParameters>
+		<configurationParameterSettings>
+			<nameValuePair>
+				<name>modelDir</name>
+				<value>
+					<string>change me</string>
+				</value>
+			</nameValuePair>
+		</configurationParameterSettings>
+		<typeSystemDescription>
+			<imports>
+				<import name="org.apache.ctakes.typesystem.types.TypeSystem" />
+				<import name="org.apache.ctakes.constituency.parser.types.LabeledTree" />
+			</imports>
+		</typeSystemDescription>
+		<typePriorities />
+		<fsIndexCollection />
+		<capabilities>
+			<capability>
+				<inputs />
+				<outputs />
+				<languagesSupported />
+			</capability>
+		</capabilities>
+		<operationalProperties>
+			<modifiesCas>true</modifiesCas>
+			<multipleDeploymentAllowed>true</multipleDeploymentAllowed>
+			<outputsNewCASes>false</outputsNewCASes>
+		</operationalProperties>
+	</analysisEngineMetaData>
+	<resourceManagerConfiguration />
 </analysisEngineDescription>

Modified: incubator/ctakes/trunk/ctakes-constituency-parser/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-constituency-parser/pom.xml?rev=1394625&r1=1394624&r2=1394625&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-constituency-parser/pom.xml (original)
+++ incubator/ctakes/trunk/ctakes-constituency-parser/pom.xml Fri Oct  5 16:26:23 2012
@@ -8,6 +8,9 @@
 		<artifactId>ctakes</artifactId>
 		<version>3.0.0-SNAPSHOT</version>
 	</parent>
+	<properties>
+		<jcasgen.typesystem>org/apache/ctakes/constituency/parser/types/LabeledTree.xml</jcasgen.typesystem>
+	</properties>	
 	<dependencies>
 		<dependency>
 			<groupId>org.apache.ctakes</groupId>
@@ -38,4 +41,17 @@
 			<artifactId>junit</artifactId>
 		</dependency>
 	</dependencies>
+		<build>
+		<plugins>
+			<!-- Invoke JCasGen on the type system (see properties above) -->
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>exec-maven-plugin</artifactId>
+			</plugin>
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>build-helper-maven-plugin</artifactId>
+			</plugin>
+		</plugins>
+	</build>
 </project>

Modified: incubator/ctakes/trunk/ctakes-constituency-parser/src/main/resources/org/apache/ctakes/constituency/parser/types/LabeledTree.xml
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-constituency-parser/src/main/resources/org/apache/ctakes/constituency/parser/types/LabeledTree.xml?rev=1394625&r1=1394192&r2=1394625&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-constituency-parser/src/main/resources/org/apache/ctakes/constituency/parser/types/LabeledTree.xml (original)
+++ incubator/ctakes/trunk/ctakes-constituency-parser/src/main/resources/org/apache/ctakes/constituency/parser/types/LabeledTree.xml Fri Oct  5 16:26:23 2012
@@ -20,13 +20,10 @@
 
 -->
 <typeSystemDescription xmlns="http://uima.apache.org/resourceSpecifier">
-  <name>LabeledTree</name>
+  <name>org.apache.ctakes.constituency.parser.types.LabeledTree</name>
   <description/>
   <version>1.0</version>
   <vendor/>
-  <imports>
-    <import location="../TypeSystem.xml"/>
-  </imports>
   <types>
     <typeDescription>
       <name>org.apache.ctakes.constituency.parser.uima.type.BooleanLabeledTree</name>

Modified: incubator/ctakes/trunk/ctakes-core/desc/analysis_engine/CopyAnnotator.xml
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-core/desc/analysis_engine/CopyAnnotator.xml?rev=1394625&r1=1394624&r2=1394625&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-core/desc/analysis_engine/CopyAnnotator.xml (original)
+++ incubator/ctakes/trunk/ctakes-core/desc/analysis_engine/CopyAnnotator.xml Fri Oct  5 16:26:23 2012
@@ -76,7 +76,7 @@
     </configurationParameterSettings>
     <typeSystemDescription>
       <imports>
-        <import location="../../../ctakes-type-system/desc/common_type_system.xml"/>
+<import name="org.apache.ctakes.typesystem.types.TypeSystem"/>
       </imports>
       <types>
         <typeDescription>

Modified: incubator/ctakes/trunk/ctakes-core/desc/analysis_engine/SimpleSegmentAnnotator.xml
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-core/desc/analysis_engine/SimpleSegmentAnnotator.xml?rev=1394625&r1=1394624&r2=1394625&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-core/desc/analysis_engine/SimpleSegmentAnnotator.xml (original)
+++ incubator/ctakes/trunk/ctakes-core/desc/analysis_engine/SimpleSegmentAnnotator.xml Fri Oct  5 16:26:23 2012
@@ -40,7 +40,7 @@
 <configurationParameterSettings/>
 <typeSystemDescription>
 <imports>
-<import location="../../../ctakes-type-system/desc/common_type_system.xml"/>
+<import name="org.apache.ctakes.typesystem.types.TypeSystem"/>
 </imports>
 </typeSystemDescription>
 <typePriorities/>

Modified: incubator/ctakes/trunk/ctakes-core/desc/analysis_engine/SimpleSegmentWithTagsAnnotator.xml
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-core/desc/analysis_engine/SimpleSegmentWithTagsAnnotator.xml?rev=1394625&r1=1394624&r2=1394625&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-core/desc/analysis_engine/SimpleSegmentWithTagsAnnotator.xml (original)
+++ incubator/ctakes/trunk/ctakes-core/desc/analysis_engine/SimpleSegmentWithTagsAnnotator.xml Fri Oct  5 16:26:23 2012
@@ -48,7 +48,7 @@ However, the section ids are specific to
     </configurationParameterSettings>
     <typeSystemDescription>
       <imports>
-        <import location="../../../ctakes-type-system/desc/common_type_system.xml"/>
+<import name="org.apache.ctakes.typesystem.types.TypeSystem"/>
       </imports>
     </typeSystemDescription>
     <typePriorities/>

Modified: incubator/ctakes/trunk/ctakes-core/desc/analysis_engine/TokenizerAnnotator.xml
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-core/desc/analysis_engine/TokenizerAnnotator.xml?rev=1394625&r1=1394624&r2=1394625&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-core/desc/analysis_engine/TokenizerAnnotator.xml (original)
+++ incubator/ctakes/trunk/ctakes-core/desc/analysis_engine/TokenizerAnnotator.xml Fri Oct  5 16:26:23 2012
@@ -47,7 +47,7 @@
 </configurationParameterSettings>
 <typeSystemDescription>
 <imports>
-<import location="../../../ctakes-type-system/desc/common_type_system.xml"/>
+<import name="org.apache.ctakes.typesystem.types.TypeSystem"/>
 </imports>
 </typeSystemDescription>
 <typePriorities/>

Modified: incubator/ctakes/trunk/ctakes-core/desc/analysis_engine/TokenizerAnnotatorVersion1.xml
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-core/desc/analysis_engine/TokenizerAnnotatorVersion1.xml?rev=1394625&r1=1394624&r2=1394625&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-core/desc/analysis_engine/TokenizerAnnotatorVersion1.xml (original)
+++ incubator/ctakes/trunk/ctakes-core/desc/analysis_engine/TokenizerAnnotatorVersion1.xml Fri Oct  5 16:26:23 2012
@@ -60,7 +60,7 @@
 </configurationParameterSettings>
 <typeSystemDescription>
 <imports>
-<import location="../../../ctakes-type-system/desc/common_type_system.xml"/>
+<import name="org.apache.ctakes.typesystem.types.TypeSystem"/>
 </imports>
 </typeSystemDescription>
 <typePriorities/>

Modified: incubator/ctakes/trunk/ctakes-core/desc/cas_consumer/XCasWriterCasConsumer.xml
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-core/desc/cas_consumer/XCasWriterCasConsumer.xml?rev=1394625&r1=1394624&r2=1394625&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-core/desc/cas_consumer/XCasWriterCasConsumer.xml (original)
+++ incubator/ctakes/trunk/ctakes-core/desc/cas_consumer/XCasWriterCasConsumer.xml Fri Oct  5 16:26:23 2012
@@ -46,7 +46,7 @@
     </configurationParameterSettings>
     <typeSystemDescription>
       <imports>
-        <import location="../../../ctakes-type-system/desc/common_type_system.xml"/>
+<import name="org.apache.ctakes.typesystem.types.TypeSystem"/>
         <import name="org.apache.uima.examples.SourceDocumentInformation"/>
       </imports>
     </typeSystemDescription>

Modified: incubator/ctakes/trunk/ctakes-coreference/desc/MipacqMarkableCreator.xml
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-coreference/desc/MipacqMarkableCreator.xml?rev=1394625&r1=1394624&r2=1394625&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-coreference/desc/MipacqMarkableCreator.xml (original)
+++ incubator/ctakes/trunk/ctakes-coreference/desc/MipacqMarkableCreator.xml Fri Oct  5 16:26:23 2012
@@ -102,7 +102,7 @@
     <typeSystemDescription>
       <imports>
         <import location="type-system/CorefTypes.xml"/>
-        <import location="../../ctakes-type-system/desc/common_type_system.xml"/>
+        <import name="org.apache.ctakes.typesystem.types.TypeSystem"/>
       </imports>
     </typeSystemDescription>
     <typePriorities/>

Modified: incubator/ctakes/trunk/ctakes-coreference/desc/MipacqMarkableExpander.xml
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-coreference/desc/MipacqMarkableExpander.xml?rev=1394625&r1=1394624&r2=1394625&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-coreference/desc/MipacqMarkableExpander.xml (original)
+++ incubator/ctakes/trunk/ctakes-coreference/desc/MipacqMarkableExpander.xml Fri Oct  5 16:26:23 2012
@@ -32,7 +32,7 @@
     <configurationParameterSettings/>
     <typeSystemDescription>
       <imports>
-        <import location="../../ctakes-type-system/desc/common_type_system.xml"/>
+        <import name="org.apache.ctakes.typesystem.types.TypeSystem"/>
         <import location="type-system/CorefTypes.xml"/>
       </imports>
     </typeSystemDescription>

Modified: incubator/ctakes/trunk/ctakes-coreference/desc/cas_consumer/ODIEVectorFileWriterCasConsumer.xml
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-coreference/desc/cas_consumer/ODIEVectorFileWriterCasConsumer.xml?rev=1394625&r1=1394624&r2=1394625&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-coreference/desc/cas_consumer/ODIEVectorFileWriterCasConsumer.xml (original)
+++ incubator/ctakes/trunk/ctakes-coreference/desc/cas_consumer/ODIEVectorFileWriterCasConsumer.xml Fri Oct  5 16:26:23 2012
@@ -96,7 +96,7 @@
     </configurationParameterSettings>
     <typeSystemDescription>
       <imports>
-        <import location="../../../ctakes-type-system/desc/common_type_system.xml"/>
+<import name="org.apache.ctakes.typesystem.types.TypeSystem"/>
       </imports>
     </typeSystemDescription>
     <typePriorities/>

Modified: incubator/ctakes/trunk/ctakes-coreference/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-coreference/pom.xml?rev=1394625&r1=1394624&r2=1394625&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-coreference/pom.xml (original)
+++ incubator/ctakes/trunk/ctakes-coreference/pom.xml Fri Oct  5 16:26:23 2012
@@ -10,7 +10,7 @@
 	</parent>
 	
 	<properties>
-	<jcasgen.typesystem>desc/type-system/CorefTypes.xml</jcasgen.typesystem>
+	<jcasgen.typesystem>org/apache/ctakes/coreference/types/TypeSystem.xml</jcasgen.typesystem>
 	</properties>
 		
 	<dependencies>

Modified: incubator/ctakes/trunk/ctakes-dependency-parser/desc/analysis_engine/ClearParserDependencyParserAE.xml
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-dependency-parser/desc/analysis_engine/ClearParserDependencyParserAE.xml?rev=1394625&r1=1394624&r2=1394625&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-dependency-parser/desc/analysis_engine/ClearParserDependencyParserAE.xml (original)
+++ incubator/ctakes/trunk/ctakes-dependency-parser/desc/analysis_engine/ClearParserDependencyParserAE.xml Fri Oct  5 16:26:23 2012
@@ -67,7 +67,7 @@
         </configurationParameterSettings>
         <typeSystemDescription>
             <imports>
-                <import location="../../../ctakes-type-system/desc/common_type_system.xml"/>
+        <import name="org.apache.ctakes.typesystem.types.TypeSystem"/>
             </imports>
         </typeSystemDescription>
         <fsIndexCollection/>

Modified: incubator/ctakes/trunk/ctakes-dependency-parser/desc/analysis_engine/ClearParserDependencyParserPlaintextAggregate.xml
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-dependency-parser/desc/analysis_engine/ClearParserDependencyParserPlaintextAggregate.xml?rev=1394625&r1=1394624&r2=1394625&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-dependency-parser/desc/analysis_engine/ClearParserDependencyParserPlaintextAggregate.xml (original)
+++ incubator/ctakes/trunk/ctakes-dependency-parser/desc/analysis_engine/ClearParserDependencyParserPlaintextAggregate.xml Fri Oct  5 16:26:23 2012
@@ -72,7 +72,7 @@
                     </configurationParameterSettings>
                     <typeSystemDescription>
                         <imports>
-                            <import location="../../../ctakes-type-system/desc/common_type_system.xml"/>
+                    <import name="org.apache.ctakes.typesystem.types.TypeSystem"/>
                         </imports>
                     </typeSystemDescription>
                     <fsIndexCollection/>
@@ -363,7 +363,7 @@
                     </configurationParameterSettings>
                     <typeSystemDescription>
                         <imports>
-                            <import location="../../../ctakes-type-system/desc/common_type_system.xml"/>
+                    <import name="org.apache.ctakes.typesystem.types.TypeSystem"/>
                         </imports>
                     </typeSystemDescription>
                     <typePriorities/>

Modified: incubator/ctakes/trunk/ctakes-dependency-parser/desc/analysis_engine/ClearParserDependencyParserTokenizedAggregate.xml
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-dependency-parser/desc/analysis_engine/ClearParserDependencyParserTokenizedAggregate.xml?rev=1394625&r1=1394624&r2=1394625&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-dependency-parser/desc/analysis_engine/ClearParserDependencyParserTokenizedAggregate.xml (original)
+++ incubator/ctakes/trunk/ctakes-dependency-parser/desc/analysis_engine/ClearParserDependencyParserTokenizedAggregate.xml Fri Oct  5 16:26:23 2012
@@ -72,7 +72,7 @@
                     </configurationParameterSettings>
                     <typeSystemDescription>
                         <imports>
-                            <import location="../../../ctakes-type-system/desc/common_type_system.xml"/>
+                    <import name="org.apache.ctakes.typesystem.types.TypeSystem"/>
                         </imports>
                     </typeSystemDescription>
                     <fsIndexCollection/>

Modified: incubator/ctakes/trunk/ctakes-dependency-parser/desc/analysis_engine/ClearParserDependencyParserTokenizedInfPosAggregate.xml
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-dependency-parser/desc/analysis_engine/ClearParserDependencyParserTokenizedInfPosAggregate.xml?rev=1394625&r1=1394624&r2=1394625&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-dependency-parser/desc/analysis_engine/ClearParserDependencyParserTokenizedInfPosAggregate.xml (original)
+++ incubator/ctakes/trunk/ctakes-dependency-parser/desc/analysis_engine/ClearParserDependencyParserTokenizedInfPosAggregate.xml Fri Oct  5 16:26:23 2012
@@ -72,7 +72,7 @@
                     </configurationParameterSettings>
                     <typeSystemDescription>
                         <imports>
-                            <import location="../../../ctakes-type-system/desc/common_type_system.xml"/>
+                    <import name="org.apache.ctakes.typesystem.types.TypeSystem"/>
                         </imports>
                     </typeSystemDescription>
                     <fsIndexCollection/>

Modified: incubator/ctakes/trunk/ctakes-dependency-parser/desc/analysis_engine/ClearParserSRLPlaintextAggregate.xml
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-dependency-parser/desc/analysis_engine/ClearParserSRLPlaintextAggregate.xml?rev=1394625&r1=1394624&r2=1394625&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-dependency-parser/desc/analysis_engine/ClearParserSRLPlaintextAggregate.xml (original)
+++ incubator/ctakes/trunk/ctakes-dependency-parser/desc/analysis_engine/ClearParserSRLPlaintextAggregate.xml Fri Oct  5 16:26:23 2012
@@ -72,7 +72,7 @@
                     </configurationParameterSettings>
                     <typeSystemDescription>
                         <imports>
-                            <import location="../../../ctakes-type-system/desc/common_type_system.xml"/>
+                    <import name="org.apache.ctakes.typesystem.types.TypeSystem"/>
                         </imports>
                     </typeSystemDescription>
                     <fsIndexCollection/>
@@ -363,7 +363,7 @@
                     </configurationParameterSettings>
                     <typeSystemDescription>
                         <imports>
-                            <import location="../../../ctakes-type-system/desc/common_type_system.xml"/>
+                    <import name="org.apache.ctakes.typesystem.types.TypeSystem"/>
                         </imports>
                     </typeSystemDescription>
                     <typePriorities/>
@@ -424,7 +424,7 @@
                     </configurationParameterSettings>
                     <typeSystemDescription>
                         <imports>
-                            <import location="../../../ctakes-type-system/desc/common_type_system.xml"/>
+                    <import name="org.apache.ctakes.typesystem.types.TypeSystem"/>
                         </imports>
                     </typeSystemDescription>
                     <fsIndexCollection/>

Modified: incubator/ctakes/trunk/ctakes-dependency-parser/desc/analysis_engine/ClearParserSRLTokenizedAggregate.xml
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-dependency-parser/desc/analysis_engine/ClearParserSRLTokenizedAggregate.xml?rev=1394625&r1=1394624&r2=1394625&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-dependency-parser/desc/analysis_engine/ClearParserSRLTokenizedAggregate.xml (original)
+++ incubator/ctakes/trunk/ctakes-dependency-parser/desc/analysis_engine/ClearParserSRLTokenizedAggregate.xml Fri Oct  5 16:26:23 2012
@@ -72,7 +72,7 @@
                     </configurationParameterSettings>
                     <typeSystemDescription>
                         <imports>
-                            <import location="../../../ctakes-type-system/desc/common_type_system.xml"/>
+                    <import name="org.apache.ctakes.typesystem.types.TypeSystem"/>
                         </imports>
                     </typeSystemDescription>
                     <fsIndexCollection/>
@@ -370,7 +370,7 @@
                     </configurationParameterSettings>
                     <typeSystemDescription>
                         <imports>
-                            <import location="../../../ctakes-type-system/desc/common_type_system.xml"/>
+                    <import name="org.apache.ctakes.typesystem.types.TypeSystem"/>
                         </imports>
                     </typeSystemDescription>
                     <fsIndexCollection/>

Modified: incubator/ctakes/trunk/ctakes-dependency-parser/desc/analysis_engine/ClearParserSRLTokenizedInfPosAggregate.xml
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-dependency-parser/desc/analysis_engine/ClearParserSRLTokenizedInfPosAggregate.xml?rev=1394625&r1=1394624&r2=1394625&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-dependency-parser/desc/analysis_engine/ClearParserSRLTokenizedInfPosAggregate.xml (original)
+++ incubator/ctakes/trunk/ctakes-dependency-parser/desc/analysis_engine/ClearParserSRLTokenizedInfPosAggregate.xml Fri Oct  5 16:26:23 2012
@@ -72,7 +72,7 @@
                     </configurationParameterSettings>
                     <typeSystemDescription>
                         <imports>
-                            <import location="../../../ctakes-type-system/desc/common_type_system.xml"/>
+                    <import name="org.apache.ctakes.typesystem.types.TypeSystem"/>
                         </imports>
                     </typeSystemDescription>
                     <fsIndexCollection/>
@@ -370,7 +370,7 @@
                     </configurationParameterSettings>
                     <typeSystemDescription>
                         <imports>
-                            <import location="../../../ctakes-type-system/desc/common_type_system.xml"/>
+                    <import name="org.apache.ctakes.typesystem.types.TypeSystem"/>
                         </imports>
                     </typeSystemDescription>
                     <fsIndexCollection/>

Modified: incubator/ctakes/trunk/ctakes-dependency-parser/desc/analysis_engine/ClearParserSemanticRoleLabelerAE.xml
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-dependency-parser/desc/analysis_engine/ClearParserSemanticRoleLabelerAE.xml?rev=1394625&r1=1394624&r2=1394625&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-dependency-parser/desc/analysis_engine/ClearParserSemanticRoleLabelerAE.xml (original)
+++ incubator/ctakes/trunk/ctakes-dependency-parser/desc/analysis_engine/ClearParserSemanticRoleLabelerAE.xml Fri Oct  5 16:26:23 2012
@@ -54,7 +54,7 @@
         </configurationParameterSettings>
         <typeSystemDescription>
             <imports>
-                <import location="../../../ctakes-type-system/desc/common_type_system.xml"/>
+        <import name="org.apache.ctakes.typesystem.types.TypeSystem"/>
             </imports>
         </typeSystemDescription>
         <fsIndexCollection/>

Modified: incubator/ctakes/trunk/ctakes-drug-ner/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-drug-ner/pom.xml?rev=1394625&r1=1394624&r2=1394625&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-drug-ner/pom.xml (original)
+++ incubator/ctakes/trunk/ctakes-drug-ner/pom.xml Fri Oct  5 16:26:23 2012
@@ -11,7 +11,7 @@
 	
 	
 	<properties>
-		<jcasgen.typesystem>desc/type_system/NERTypeSystem.xml</jcasgen.typesystem>
+		<jcasgen.typesystem>org/apache/ctakes/drugner/types/TypeSystem.xml</jcasgen.typesystem>
 	</properties>
 	
 	<dependencies>

Modified: incubator/ctakes/trunk/ctakes-pad-term-spotter/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-pad-term-spotter/pom.xml?rev=1394625&r1=1394624&r2=1394625&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-pad-term-spotter/pom.xml (original)
+++ incubator/ctakes/trunk/ctakes-pad-term-spotter/pom.xml Fri Oct  5 16:26:23 2012
@@ -10,7 +10,7 @@
 	</parent>
 
 	<properties>
-	<jcasgen.typesystem>desc/type_system/PADSiteAndTerm.xml</jcasgen.typesystem>
+	<jcasgen.typesystem>org/apache/ctakes/padtermspotter/types/TypeSystem.xml</jcasgen.typesystem>
 	</properties>
 		
 	<dependencies>

Modified: incubator/ctakes/trunk/ctakes-pad-term-spotter/src/main/resources/org/apache/ctakes/padtermspotter/types/SubSection.xml
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-pad-term-spotter/src/main/resources/org/apache/ctakes/padtermspotter/types/SubSection.xml?rev=1394625&r1=1394192&r2=1394625&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-pad-term-spotter/src/main/resources/org/apache/ctakes/padtermspotter/types/SubSection.xml (original)
+++ incubator/ctakes/trunk/ctakes-pad-term-spotter/src/main/resources/org/apache/ctakes/padtermspotter/types/SubSection.xml Fri Oct  5 16:26:23 2012
@@ -20,7 +20,7 @@
 
 -->
 <typeSystemDescription xmlns="http://uima.apache.org/resourceSpecifier">
-<name>SubSection</name>
+<name>org.apache.ctakes.padtermspotter.types.SubSection</name>
 <description></description>
 <version>1.0</version>
 <vendor></vendor>

Copied: incubator/ctakes/trunk/ctakes-pad-term-spotter/src/main/resources/org/apache/ctakes/padtermspotter/types/TypeSystem.xml (from r1394192, incubator/ctakes/trunk/ctakes-pad-term-spotter/desc/type_system/PADSiteAndTerm.xml)
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-pad-term-spotter/src/main/resources/org/apache/ctakes/padtermspotter/types/TypeSystem.xml?p2=incubator/ctakes/trunk/ctakes-pad-term-spotter/src/main/resources/org/apache/ctakes/padtermspotter/types/TypeSystem.xml&p1=incubator/ctakes/trunk/ctakes-pad-term-spotter/desc/type_system/PADSiteAndTerm.xml&r1=1394192&r2=1394625&rev=1394625&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-pad-term-spotter/desc/type_system/PADSiteAndTerm.xml (original)
+++ incubator/ctakes/trunk/ctakes-pad-term-spotter/src/main/resources/org/apache/ctakes/padtermspotter/types/TypeSystem.xml Fri Oct  5 16:26:23 2012
@@ -20,13 +20,13 @@
 
 -->
 <typeSystemDescription xmlns="http://uima.apache.org/resourceSpecifier">
-  <name>PADSiteAndTerm</name>
+  <name>org.apache.ctakes.padtermspotter.types.TypeSystem</name>
   <description>Represents Term and Location entities required for PAD project.</description>
   <version>1.0</version>
   <vendor>Mayo</vendor>
   <imports>
-    <import location="../../../ctakes-type-system/desc/common_type_system.xml"/>
-    <import location="SubSection.xml"/>
+    <import name="org.apache.ctakes.typesystem.types.TypeSystem"/>
+    <import name="org.apache.ctakes.padtermspotter.types.SubSection"/>
   </imports>
   <types>
     <typeDescription>

Modified: incubator/ctakes/trunk/ctakes-side-effect/desc/analysis_engine/DictionaryLookupAnnotator_sideEffect.xml
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-side-effect/desc/analysis_engine/DictionaryLookupAnnotator_sideEffect.xml?rev=1394625&r1=1394624&r2=1394625&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-side-effect/desc/analysis_engine/DictionaryLookupAnnotator_sideEffect.xml (original)
+++ incubator/ctakes/trunk/ctakes-side-effect/desc/analysis_engine/DictionaryLookupAnnotator_sideEffect.xml Fri Oct  5 16:26:23 2012
@@ -32,7 +32,7 @@
     <configurationParameterSettings/>
     <typeSystemDescription>
       <imports>
-        <import location="../../../ctakes-type-system/desc/common_type_system.xml"/>
+<import name="org.apache.ctakes.typesystem.types.TypeSystem"/>
       </imports>
     </typeSystemDescription>
     <capabilities>

Modified: incubator/ctakes/trunk/ctakes-side-effect/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-side-effect/pom.xml?rev=1394625&r1=1394624&r2=1394625&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-side-effect/pom.xml (original)
+++ incubator/ctakes/trunk/ctakes-side-effect/pom.xml Fri Oct  5 16:26:23 2012
@@ -10,7 +10,7 @@
 	</parent>
 	
 	<properties>
-	<jcasgen.typesystem>desc/type_system/SideEffectTypeSystem.xml</jcasgen.typesystem>
+	<jcasgen.typesystem>org/apache/ctakes/sideeffect/types/TypeSystem.xml</jcasgen.typesystem>
 	</properties>
 
 	<dependencies>

Copied: incubator/ctakes/trunk/ctakes-side-effect/src/main/resources/org/apache/ctakes/sideeffect/types/TypeSystem.xml (from r1394192, incubator/ctakes/trunk/ctakes-side-effect/desc/type_system/SideEffectTypeSystem.xml)
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-side-effect/src/main/resources/org/apache/ctakes/sideeffect/types/TypeSystem.xml?p2=incubator/ctakes/trunk/ctakes-side-effect/src/main/resources/org/apache/ctakes/sideeffect/types/TypeSystem.xml&p1=incubator/ctakes/trunk/ctakes-side-effect/desc/type_system/SideEffectTypeSystem.xml&r1=1394192&r2=1394625&rev=1394625&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-side-effect/desc/type_system/SideEffectTypeSystem.xml (original)
+++ incubator/ctakes/trunk/ctakes-side-effect/src/main/resources/org/apache/ctakes/sideeffect/types/TypeSystem.xml Fri Oct  5 16:26:23 2012
@@ -24,7 +24,7 @@
   <description/>
   <version>1.0</version>
   <imports>
-    <import location="../../../ctakes-type-system/desc/common_type_system.xml"/>
+    <import name="org.apache.ctakes.typesystem.types.TypeSystem"/>
   </imports>
   <types>
     <typeDescription>

Modified: incubator/ctakes/trunk/ctakes-smoking-status/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-smoking-status/pom.xml?rev=1394625&r1=1394624&r2=1394625&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-smoking-status/pom.xml (original)
+++ incubator/ctakes/trunk/ctakes-smoking-status/pom.xml Fri Oct  5 16:26:23 2012
@@ -10,7 +10,7 @@
 	</parent>
 	
 	<properties>
-	<jcasgen.typesystem>desc/type_system/SmokingProductionTypeSystem.xml</jcasgen.typesystem>
+	<jcasgen.typesystem>org/apache/ctakes/smokingstatus/types/TypeSystem.xml</jcasgen.typesystem>
 	</properties>
 
 	<dependencies>

Modified: incubator/ctakes/trunk/ctakes-smoking-status/src/main/resources/org/apache/ctakes/smokingstatus/types/I2b2TypeSystem.xml
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-smoking-status/src/main/resources/org/apache/ctakes/smokingstatus/types/I2b2TypeSystem.xml?rev=1394625&r1=1394192&r2=1394625&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-smoking-status/src/main/resources/org/apache/ctakes/smokingstatus/types/I2b2TypeSystem.xml (original)
+++ incubator/ctakes/trunk/ctakes-smoking-status/src/main/resources/org/apache/ctakes/smokingstatus/types/I2b2TypeSystem.xml Fri Oct  5 16:26:23 2012
@@ -20,7 +20,7 @@
 
 -->
 <typeSystemDescription xmlns="http://uima.apache.org/resourceSpecifier">
-<name>I2B2TypeSystem</name>
+<name>org.apache.ctakes.smokingstatus.types.I2B2TypeSystem</name>
 <description></description>
 <version>1.0</version>
 <types>

Modified: incubator/ctakes/trunk/ctakes-smoking-status/src/main/resources/org/apache/ctakes/smokingstatus/types/LibSVMTypeSystem.xml
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-smoking-status/src/main/resources/org/apache/ctakes/smokingstatus/types/LibSVMTypeSystem.xml?rev=1394625&r1=1394192&r2=1394625&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-smoking-status/src/main/resources/org/apache/ctakes/smokingstatus/types/LibSVMTypeSystem.xml (original)
+++ incubator/ctakes/trunk/ctakes-smoking-status/src/main/resources/org/apache/ctakes/smokingstatus/types/LibSVMTypeSystem.xml Fri Oct  5 16:26:23 2012
@@ -20,7 +20,7 @@
 
 -->
 <typeSystemDescription xmlns="http://uima.apache.org/resourceSpecifier">
-<name>LibSVM Type System</name>
+<name>org.apache.ctakes.smokingstatus.types.LibSVMTypeSystem</name>
 <description></description>
 <version>1.0</version>
 <vendor></vendor>

Copied: incubator/ctakes/trunk/ctakes-smoking-status/src/main/resources/org/apache/ctakes/smokingstatus/types/TypeSystem.xml (from r1394192, incubator/ctakes/trunk/ctakes-smoking-status/desc/type_system/SmokingProductionTypeSystem.xml)
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-smoking-status/src/main/resources/org/apache/ctakes/smokingstatus/types/TypeSystem.xml?p2=incubator/ctakes/trunk/ctakes-smoking-status/src/main/resources/org/apache/ctakes/smokingstatus/types/TypeSystem.xml&p1=incubator/ctakes/trunk/ctakes-smoking-status/desc/type_system/SmokingProductionTypeSystem.xml&r1=1394192&r2=1394625&rev=1394625&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-smoking-status/desc/type_system/SmokingProductionTypeSystem.xml (original)
+++ incubator/ctakes/trunk/ctakes-smoking-status/src/main/resources/org/apache/ctakes/smokingstatus/types/TypeSystem.xml Fri Oct  5 16:26:23 2012
@@ -25,9 +25,9 @@
   <version>1.0</version>
   <vendor/>
   <imports>
-    <import location="../../../ctakes-type-system/desc/common_type_system.xml"/>
-    <import location="LibSVMTypeSystem.xml"/>
-    <import location="I2b2TypeSystem.xml"/>
+    <import name="org.apache.ctakes.typesystem.types.TypeSystem"/>
+    <import name="org.apache.ctakes.smokingstatus.types.LibSVMTypeSystem"/>
+    <import name="org.apache.ctakes.smokingstatus.types.I2B2TypeSystem"/>
   </imports>
   <types>
     <typeDescription>

Modified: incubator/ctakes/trunk/ctakes-type-system/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-type-system/pom.xml?rev=1394625&r1=1394624&r2=1394625&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-type-system/pom.xml (original)
+++ incubator/ctakes/trunk/ctakes-type-system/pom.xml Fri Oct  5 16:26:23 2012
@@ -10,7 +10,7 @@
 		<version>3.0.0-SNAPSHOT</version>
 	</parent>
 	<properties>
-		<jcasgen.typesystem>desc/common_type_system.xml</jcasgen.typesystem>
+		<jcasgen.typesystem>org/apache/ctakes/typesystem/types/TypeSystem.xml</jcasgen.typesystem>
 	</properties>
 	<dependencies>
 		<dependency>

Added: incubator/ctakes/trunk/ctakes-type-system/src/main/resources/META-INF/org.uimafit/types.txt
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-type-system/src/main/resources/META-INF/org.uimafit/types.txt?rev=1394625&view=auto
==============================================================================
--- incubator/ctakes/trunk/ctakes-type-system/src/main/resources/META-INF/org.uimafit/types.txt (added)
+++ incubator/ctakes/trunk/ctakes-type-system/src/main/resources/META-INF/org.uimafit/types.txt Fri Oct  5 16:26:23 2012
@@ -0,0 +1,8 @@
+classpath*:org/apache/ctakes/typesystem/types/TypeSystem.xml
+classpath*:org/apache/ctakes/assertion/types/TypeSystem.xml
+classpath*:org/apache/ctakes/constituency/parser/types/LabeledTree.xml
+classpath*:org/apache/ctakes/coreference/types/TypeSystem.xml
+classpath*:org/apache/ctakes/drugner/types/TypeSystem.xml
+classpath*:org/apache/ctakes/padtermspotter/types/TypeSystem.xml
+classpath*:org/apache/ctakes/smokingstatus/types/TypeSystem.xml
+classpath*:org/apache/ctakes/sideeffect/types/TypeSystem.xml
\ No newline at end of file



Mime
View raw message