ctakes-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chen...@apache.org
Subject svn commit: r1602878 - in /ctakes/trunk: ctakes-dictionary-lookup/desc/analysis_engine/DictionaryLookupAnnotatorUMLS.xml ctakes-distribution/src/main/assembly/bin.xml
Date Mon, 16 Jun 2014 14:27:25 GMT
Author: chenpei
Date: Mon Jun 16 14:27:25 2014
New Revision: 1602878

URL: http://svn.apache.org/r1602878
Log:
CTAKES-297 - DictionaryLookupAnnotatorUMLS.xml still had a Lucene impl config.  Updating to
use default jdbc (hsqldb).
CTAKES-121 - We no longer need to copy resources for most of the projects now, can be read
directly from the jars.

Modified:
    ctakes/trunk/ctakes-dictionary-lookup/desc/analysis_engine/DictionaryLookupAnnotatorUMLS.xml
    ctakes/trunk/ctakes-distribution/src/main/assembly/bin.xml

Modified: ctakes/trunk/ctakes-dictionary-lookup/desc/analysis_engine/DictionaryLookupAnnotatorUMLS.xml
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-dictionary-lookup/desc/analysis_engine/DictionaryLookupAnnotatorUMLS.xml?rev=1602878&r1=1602877&r2=1602878&view=diff
==============================================================================
--- ctakes/trunk/ctakes-dictionary-lookup/desc/analysis_engine/DictionaryLookupAnnotatorUMLS.xml
(original)
+++ ctakes/trunk/ctakes-dictionary-lookup/desc/analysis_engine/DictionaryLookupAnnotatorUMLS.xml
Mon Jun 16 14:27:25 2014
@@ -142,13 +142,13 @@
     <externalResourceDependency>
       <key>RxnormIndexReader</key>
       <description/>
-      <interfaceName>org.apache.ctakes.core.resource.LuceneIndexReaderResource</interfaceName>
+      <interfaceName>org.apache.ctakes.core.resource.JdbcConnectionResource</interfaceName>
       <optional>false</optional>
     </externalResourceDependency>
     <externalResourceDependency>
       <key>OrangeBookIndexReader</key>
       <description/>
-      <interfaceName>org.apache.ctakes.core.resource.LuceneIndexReaderResource</interfaceName>
+      <interfaceName>org.apache.ctakes.core.resource.JdbcConnectionResource</interfaceName>
       <optional>false</optional>
     </externalResourceDependency>
   </externalResourceDependencies>

Modified: ctakes/trunk/ctakes-distribution/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-distribution/src/main/assembly/bin.xml?rev=1602878&r1=1602877&r2=1602878&view=diff
==============================================================================
--- ctakes/trunk/ctakes-distribution/src/main/assembly/bin.xml (original)
+++ ctakes/trunk/ctakes-distribution/src/main/assembly/bin.xml Mon Jun 16 14:27:25 2014
@@ -91,7 +91,43 @@
 				<include>jcarafe-core_2.9.1-0.9.8.3.RC4.jar</include>
 				<include>jcarafe-ext_2.9.1-0.9.8.3.RC4.jar</include>
 			</includes>
-		</fileSet>	    
+		</fileSet>
+		<fileSet>
+		    <directory>../ctakes-assertion/src/main/resources</directory>
+		    <outputDirectory>resources</outputDirectory>
+			<fileMode>644</fileMode>
+			<directoryMode>755</directoryMode>
+    	</fileSet>
+		<fileSet>
+		    <directory>../ctakes-assertion-res/src/main/resources</directory>
+		    <outputDirectory>resources</outputDirectory>
+			<fileMode>644</fileMode>
+			<directoryMode>755</directoryMode>
+    	</fileSet>    
+		<fileSet>
+		    <directory>../ctakes-assertion-zoner/src/main/resources</directory>
+		    <outputDirectory>resources</outputDirectory>
+			<fileMode>644</fileMode>
+			<directoryMode>755</directoryMode>
+    	</fileSet>
+		<fileSet>
+		    <directory>../ctakes-assertion-zoner-res/src/main/resources</directory>
+		    <outputDirectory>resources</outputDirectory>
+			<fileMode>644</fileMode>
+			<directoryMode>755</directoryMode>
+    	</fileSet> 
+		<fileSet>
+		    <directory>../ctakes-dictionary-lookup-res/src/main/resources</directory>
+		    <outputDirectory>resources</outputDirectory>
+			<fileMode>644</fileMode>
+			<directoryMode>755</directoryMode>
+    	</fileSet>    		
+		<fileSet>
+		    <directory>../ctakes-lvg-res/src/main/resources</directory>
+		    <outputDirectory>resources</outputDirectory>
+			<fileMode>644</fileMode>
+			<directoryMode>755</directoryMode>
+    	</fileSet>     			
 		<fileSet>
 			<directory>../</directory>
 			<outputDirectory></outputDirectory>
@@ -159,223 +195,7 @@
 		      <includes>
 		        <include>*/desc/**</include>
 		      </includes>			
-		</fileSet>
-		
-		<fileSet>
-		    <directory>../ctakes-assertion/src/main/resources</directory>
-		    <outputDirectory>resources</outputDirectory>
-			<fileMode>644</fileMode>
-			<directoryMode>755</directoryMode>
-    	</fileSet>
-		<fileSet>
-		    <directory>../ctakes-assertion-res/src/main/resources</directory>
-		    <outputDirectory>resources</outputDirectory>
-			<fileMode>644</fileMode>
-			<directoryMode>755</directoryMode>
-    	</fileSet>    
-		<fileSet>
-		    <directory>../ctakes-assertion-zoner/src/main/resources</directory>
-		    <outputDirectory>resources</outputDirectory>
-			<fileMode>644</fileMode>
-			<directoryMode>755</directoryMode>
-    	</fileSet>
-		<fileSet>
-		    <directory>../ctakes-assertion-zoner-res/src/main/resources</directory>
-		    <outputDirectory>resources</outputDirectory>
-			<fileMode>644</fileMode>
-			<directoryMode>755</directoryMode>
-    	</fileSet>      		
-		<fileSet>
-		    <directory>../ctakes-chunker/src/main/resources</directory>
-		    <outputDirectory>resources</outputDirectory>
-			<fileMode>644</fileMode>
-			<directoryMode>755</directoryMode>
-    	</fileSet>
-		<fileSet>
-		    <directory>../ctakes-chunker-res/src/main/resources</directory>
-		    <outputDirectory>resources</outputDirectory>
-			<fileMode>644</fileMode>
-			<directoryMode>755</directoryMode>
-    	</fileSet>    	
-		<fileSet>
-		    <directory>../ctakes-clinical-pipeline/src/main/resources</directory>
-		    <outputDirectory>resources</outputDirectory>
-			<fileMode>644</fileMode>
-			<directoryMode>755</directoryMode>
-    	</fileSet>    	
-		<fileSet>
-		    <directory>../ctakes-constituency-parser/src/main/resources</directory>
-		    <outputDirectory>resources</outputDirectory>
-			<fileMode>644</fileMode>
-			<directoryMode>755</directoryMode>
-    	</fileSet>   
-		<fileSet>
-		    <directory>../ctakes-constituency-parser-res/src/main/resources</directory>
-		    <outputDirectory>resources</outputDirectory>
-			<fileMode>644</fileMode>
-			<directoryMode>755</directoryMode>
-    	</fileSet>     	 	
-		<fileSet>
-		    <directory>../ctakes-context-tokenizer/src/main/resources</directory>
-		    <outputDirectory>resources</outputDirectory>
-			<fileMode>644</fileMode>
-			<directoryMode>755</directoryMode>
-    	</fileSet>    	
-		<fileSet>
-		    <directory>../ctakes-core/src/main/resources</directory>
-		    <outputDirectory>resources</outputDirectory>
-			<fileMode>644</fileMode>
-			<directoryMode>755</directoryMode>
-			<excludes><exclude>log4j.xml</exclude></excludes>
-    	</fileSet>
-		<fileSet>
-		    <directory>../ctakes-core-res/src/main/resources</directory>
-		    <outputDirectory>resources</outputDirectory>
-			<fileMode>644</fileMode>
-			<directoryMode>755</directoryMode>
-			<excludes><exclude>log4j.xml</exclude></excludes>
-    	</fileSet>    	
-		<fileSet>
-		    <directory>../ctakes-coreference/src/main/resources</directory>
-		    <outputDirectory>resources</outputDirectory>
-			<fileMode>644</fileMode>
-			<directoryMode>755</directoryMode>
-    	</fileSet>
-		<fileSet>
-		    <directory>../ctakes-coreference-res/src/main/resources</directory>
-		    <outputDirectory>resources</outputDirectory>
-			<fileMode>644</fileMode>
-			<directoryMode>755</directoryMode>
-    	</fileSet>      	    	   
-		<fileSet>
-		    <directory>../ctakes-dependency-parser/src/main/resources</directory>
-		    <outputDirectory>resources</outputDirectory>
-			<fileMode>644</fileMode>
-			<directoryMode>755</directoryMode>
-    	</fileSet>   
-		<fileSet>
-		    <directory>../ctakes-dependency-parser-res/src/main/resources</directory>
-		    <outputDirectory>resources</outputDirectory>
-			<fileMode>644</fileMode>
-			<directoryMode>755</directoryMode>
-    	</fileSet>      	 	
-		<fileSet>
-		    <directory>../ctakes-dictionary-lookup/src/main/resources</directory>
-		    <outputDirectory>resources</outputDirectory>
-			<fileMode>644</fileMode>
-			<directoryMode>755</directoryMode>
-    	</fileSet>    	 
-		<fileSet>
-		    <directory>../ctakes-dictionary-lookup-res/src/main/resources</directory>
-		    <outputDirectory>resources</outputDirectory>
-			<fileMode>644</fileMode>
-			<directoryMode>755</directoryMode>
-    	</fileSet>      		
-		<fileSet>
-		    <directory>../ctakes-drug-ner/src/main/resources</directory>
-		    <outputDirectory>resources</outputDirectory>
-			<fileMode>644</fileMode>
-			<directoryMode>755</directoryMode>
-    	</fileSet>    	
-		<fileSet>
-		    <directory>../ctakes-drug-ner-res/src/main/resources</directory>
-		    <outputDirectory>resources</outputDirectory>
-			<fileMode>644</fileMode>
-			<directoryMode>755</directoryMode>
-    	</fileSet>        	
-		<fileSet>
-		    <directory>../ctakes-lvg/src/main/resources</directory>
-		    <outputDirectory>resources</outputDirectory>
-			<fileMode>644</fileMode>
-			<directoryMode>755</directoryMode>
-    	</fileSet>    
-		<fileSet>
-		    <directory>../ctakes-lvg-res/src/main/resources</directory>
-		    <outputDirectory>resources</outputDirectory>
-			<fileMode>644</fileMode>
-			<directoryMode>755</directoryMode>
-    	</fileSet>     		
-		<fileSet>
-		    <directory>../ctakes-ne-contexts/src/main/resources</directory>
-		    <outputDirectory>resources</outputDirectory>
-			<fileMode>644</fileMode>
-			<directoryMode>755</directoryMode>
-    	</fileSet>   
-		<fileSet>
-		    <directory>../ctakes-ne-contexts-res/src/main/resources</directory>
-		    <outputDirectory>resources</outputDirectory>
-			<fileMode>644</fileMode>
-			<directoryMode>755</directoryMode>
-    	</fileSet>      	 	
-		<fileSet>
-		    <directory>../ctakes-pos-tagger/src/main/resources</directory>
-		    <outputDirectory>resources</outputDirectory>
-			<fileMode>644</fileMode>
-			<directoryMode>755</directoryMode>
-    	</fileSet>   
-		<fileSet>
-		    <directory>../ctakes-pos-tagger-res/src/main/resources</directory>
-		    <outputDirectory>resources</outputDirectory>
-			<fileMode>644</fileMode>
-			<directoryMode>755</directoryMode>
-    	</fileSet>        	 
-		<fileSet>
-		    <directory>../ctakes-preprocessor/src/main/resources</directory>
-		    <outputDirectory>resources</outputDirectory>
-			<fileMode>644</fileMode>
-			<directoryMode>755</directoryMode>
-    	</fileSet>    	
-		<fileSet>
-		    <directory>../ctakes-relation-extractor/src/main/resources</directory>
-		    <outputDirectory>resources</outputDirectory>
-			<fileMode>644</fileMode>
-			<directoryMode>755</directoryMode>
-    	</fileSet>  
-		<fileSet>
-		    <directory>../ctakes-relation-extractor-res/src/main/resources</directory>
-		    <outputDirectory>resources</outputDirectory>
-			<fileMode>644</fileMode>
-			<directoryMode>755</directoryMode>
-    	</fileSet>    	
-		<fileSet>
-		    <directory>../ctakes-side-effect/src/main/resources</directory>
-		    <outputDirectory>resources</outputDirectory>
-			<fileMode>644</fileMode>
-			<directoryMode>755</directoryMode>
-    	</fileSet>    	
-		<fileSet>
-		    <directory>../ctakes-side-effect-res/src/main/resources</directory>
-		    <outputDirectory>resources</outputDirectory>
-			<fileMode>644</fileMode>
-			<directoryMode>755</directoryMode>
-    	</fileSet>       	  		
-		<fileSet>
-		    <directory>../ctakes-smoking-status/src/main/resources</directory>
-		    <outputDirectory>resources</outputDirectory>
-			<fileMode>644</fileMode>
-			<directoryMode>755</directoryMode>
-    	</fileSet>
-		<fileSet>
-		    <directory>../ctakes-smoking-status-res/src/main/resources</directory>
-		    <outputDirectory>resources</outputDirectory>
-			<fileMode>644</fileMode>
-			<directoryMode>755</directoryMode>
-    	</fileSet>    	
-    	<!-- Type System types should already be in the jar -->
-    	<!-- 
-		<fileSet>
-		    <directory>../ctakes-type-system/src/main/resources</directory>
-		    <outputDirectory>resources</outputDirectory>
-			<fileMode>644</fileMode>
-			<directoryMode>755</directoryMode>
-    	</fileSet>   
-    	--> 	
-		<fileSet>
-		    <directory>../ctakes-utils/src/main/resources</directory>
-		    <outputDirectory>resources</outputDirectory>
-			<fileMode>644</fileMode>
-			<directoryMode>755</directoryMode>
-    	</fileSet>    	    	
+		</fileSet>	
 		<fileSet>
 			<directory>../ctakes-ytex-web/src/main/webapp</directory>
 			<outputDirectory>desc/ctakes-ytex-web</outputDirectory>
@@ -383,18 +203,6 @@
 			<directoryMode>755</directoryMode>
 		</fileSet>
 		<fileSet>
-			<directory>../ctakes-ytex-res/src/main/resources</directory>
-			<outputDirectory>resources</outputDirectory>
-			<fileMode>644</fileMode>
-			<directoryMode>755</directoryMode>
-		</fileSet>
-		<fileSet>
-			<directory>../ctakes-ytex-uima/src/main/resources</directory>
-			<outputDirectory>resources</outputDirectory>
-			<fileMode>644</fileMode>
-			<directoryMode>755</directoryMode>
-		</fileSet>
-		<fileSet>
 			<directory>../ctakes-ytex/scripts</directory>
 			<outputDirectory>bin/ctakes-ytex/scripts</outputDirectory>
 			<fileMode>644</fileMode>



Mime
View raw message