You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ctakes.apache.org by se...@apache.org on 2019/11/30 19:15:35 UTC

svn commit: r1870642 - in /ctakes/trunk/ctakes-distribution: pom.xml src/main/assembly/bin.xml src/main/assembly/src.xml

Author: seanfinan
Date: Sat Nov 30 19:15:35 2019
New Revision: 1870642

URL: http://svn.apache.org/viewvc?rev=1870642&view=rev
Log:
Add tiny-rest to package.
Cleanup file set includes and excludes.

Modified:
    ctakes/trunk/ctakes-distribution/pom.xml
    ctakes/trunk/ctakes-distribution/src/main/assembly/bin.xml
    ctakes/trunk/ctakes-distribution/src/main/assembly/src.xml

Modified: ctakes/trunk/ctakes-distribution/pom.xml
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-distribution/pom.xml?rev=1870642&r1=1870641&r2=1870642&view=diff
==============================================================================
--- ctakes/trunk/ctakes-distribution/pom.xml (original)
+++ ctakes/trunk/ctakes-distribution/pom.xml Sat Nov 30 19:15:35 2019
@@ -142,6 +142,10 @@
          <groupId>org.apache.ctakes</groupId>
          <artifactId>ctakes-fhir</artifactId>
       </dependency>
+		<dependency>
+			<groupId>org.apache.ctakes</groupId>
+			<artifactId>ctakes-tiny-rest</artifactId>
+		</dependency>
 	</dependencies>
 
 	<build>

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=1870642&r1=1870641&r2=1870642&view=diff
==============================================================================
--- ctakes/trunk/ctakes-distribution/src/main/assembly/bin.xml (original)
+++ ctakes/trunk/ctakes-distribution/src/main/assembly/bin.xml Sat Nov 30 19:15:35 2019
@@ -57,6 +57,7 @@
 				<include>org.apache.ctakes:ctakes-smoking-status</include>
 				<include>org.apache.ctakes:ctakes-template-filler</include>
 				<include>org.apache.ctakes:ctakes-temporal</include>
+				<include>org.apache.ctakes:ctakes-tiny-rest</include>
 				<include>org.apache.ctakes:ctakes-type-system</include>
 				<include>org.apache.ctakes:ctakes-utils</include>
 				<include>org.apache.ctakes:ctakes-ytex</include>
@@ -67,10 +68,17 @@
 			
             <excludes>
 	        	<exclude>net.sourceforge.ctakesresources:*</exclude>
-	        	<!-- exclude assertion and lvg - they still need to be unpacked and not read from classpath yet -->
+					<!-- exclude resource modules that are unpacked and not read from classpath yet -->
 	        	<exclude>org.apache.ctakes:ctakes-assertion-res</exclude>
-	        	<exclude>org.apache.ctakes:ctakes-lvg-res</exclude>
-               <!-- exclude non-asf compliant dependencies used by ytex -->
+					<exclude>org.apache.ctakes:ctakes-assertion-zoner-res</exclude>
+					<exclude>org.apache.ctakes:ctakes-lvg-res</exclude>
+					<exclude>org.apache.ctakes:ctakes-clinical-pipeline-res</exclude>
+					<exclude>org.apache.ctakes:ctakes-dictionary-lookup-res</exclude>
+					<exclude>org.apache.ctakes:ctakes-dictionary-lookup-fast-res</exclude>
+					<exclude>org.apache.ctakes:ctakes-gui-res</exclude>
+					<exclude>org.apache.ctakes:ctakes-examples-res</exclude>
+					<exclude>org.apache.ctakes:ctakes-ne-contexts-res</exclude>
+					<!-- exclude non-asf compliant dependencies used by ytex -->
 				<exclude>org.hibernate:*</exclude>
 				<exclude>nz.ac.waikato.cms.weka:*</exclude>
 				<exclude>mysql:*</exclude>
@@ -164,19 +172,55 @@
 			<directoryMode>755</directoryMode>
     	</fileSet>
 		<fileSet>
+			<directory>../ctakes-core-res/src/main/resources/org/apache/ctakes/core/pipeline</directory>
+			<fileMode>644</fileMode>
+			<directoryMode>755</directoryMode>
+			<!--<includes>-->
+			<!--<include>DefaultTokenizerPipeline.piper</include>-->
+			<!--</includes>-->
+			<outputDirectory>resources/org/apache/ctakes/core/pipeline</outputDirectory>
+		</fileSet>
+		<fileSet>
+			<directory>../ctakes-core-res/src/main/resources/org/apache/ctakes/core/sections</directory>
+			<fileMode>644</fileMode>
+			<directoryMode>755</directoryMode>
+			<outputDirectory>resources/org/apache/ctakes/core/sections</outputDirectory>
+		</fileSet>
+		<fileSet>
+			<directory>../ctakes-core-res/src/main/resources/org/apache/ctakes/core/list</directory>
+			<fileMode>644</fileMode>
+			<directoryMode>755</directoryMode>
+			<outputDirectory>resources/org/apache/ctakes/core/list</outputDirectory>
+		</fileSet>
+		<fileSet>
 			<directory>../ctakes-chunker-res/src/main/resources/org/apache/ctakes/chunker/pipeline</directory>
 			<outputDirectory>resources/org/apache/ctakes/chunker/pipeline</outputDirectory>
 			<fileMode>644</fileMode>
 			<directoryMode>755</directoryMode>
 		</fileSet>
 		<fileSet>
-			<directory>../ctakes-core-res/src/main/resources/org/apache/ctakes/core/pipeline</directory>
+			<directory>../ctakes-temporal-res/src/main/resources/org/apache/ctakes/temporal/pipeline</directory>
+			<outputDirectory>resources/org/apache/ctakes/temporal/pipeline</outputDirectory>
+			<fileMode>644</fileMode>
+			<directoryMode>755</directoryMode>
+		</fileSet>
+		<fileSet>
+			<directory>../ctakes-temporal-res/src/main/resources/org/apache/ctakes/temporal/ae/section</directory>
+			<outputDirectory>resources/org/apache/ctakes/temporal/ae/section</outputDirectory>
+			<fileMode>644</fileMode>
+			<directoryMode>755</directoryMode>
+		</fileSet>
+		<fileSet>
+			<directory>../ctakes-coreference-res/src/main/resources/org/apache/ctakes/coreference/pipeline</directory>
+			<outputDirectory>resources/org/apache/ctakes/coreference/pipeline</outputDirectory>
+			<fileMode>644</fileMode>
+			<directoryMode>755</directoryMode>
+		</fileSet>
+		<fileSet>
+			<directory>../ctakes-relation-extractor-res/src/main/resources/org/apache/ctakes/relationextractor/pipeline</directory>
+			<outputDirectory>resources/org/apache/ctakes/relationextractor/pipeline</outputDirectory>
 			<fileMode>644</fileMode>
 			<directoryMode>755</directoryMode>
-			<includes>
-				<include>DefaultTokenizerPipeline.piper</include>
-			</includes>
-			<outputDirectory>resources/org/apache/ctakes/core/pipeline</outputDirectory>
 		</fileSet>
 		<fileSet>
 			<directory>src/main/bin</directory>

Modified: ctakes/trunk/ctakes-distribution/src/main/assembly/src.xml
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-distribution/src/main/assembly/src.xml?rev=1870642&r1=1870641&r2=1870642&view=diff
==============================================================================
--- ctakes/trunk/ctakes-distribution/src/main/assembly/src.xml (original)
+++ ctakes/trunk/ctakes-distribution/src/main/assembly/src.xml Sat Nov 30 19:15:35 2019
@@ -38,6 +38,8 @@
         <exclude>**/.*/**</exclude>
         <exclude>**/pom.xml.releaseBackup</exclude>
         <exclude>**/release.properties</exclude>
+        <exclude>**/*.yml</exclude>
+        <exclude>**/*.iml</exclude>
       </excludes>
     </fileSet>
   </fileSets>