You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ctakes.apache.org by ja...@apache.org on 2013/11/25 20:20:40 UTC
svn commit: r1545373 - in /ctakes/branches/ctakes-3.1.1: ./
ctakes-distribution/src/main/assembly/bin.xml
Author: james-masanz
Date: Mon Nov 25 19:20:40 2013
New Revision: 1545373
URL: http://svn.apache.org/r1545373
Log:
merge CTAKES-269 and CTAKES-270 r1544577 and r1545363 respectively into 3.1.1 branch
Modified:
ctakes/branches/ctakes-3.1.1/ (props changed)
ctakes/branches/ctakes-3.1.1/ctakes-distribution/src/main/assembly/bin.xml
Propchange: ctakes/branches/ctakes-3.1.1/
------------------------------------------------------------------------------
svn:mergeinfo = /ctakes/trunk:1544577,1545363
Modified: ctakes/branches/ctakes-3.1.1/ctakes-distribution/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/ctakes/branches/ctakes-3.1.1/ctakes-distribution/src/main/assembly/bin.xml?rev=1545373&r1=1545372&r2=1545373&view=diff
==============================================================================
--- ctakes/branches/ctakes-3.1.1/ctakes-distribution/src/main/assembly/bin.xml (original)
+++ ctakes/branches/ctakes-3.1.1/ctakes-distribution/src/main/assembly/bin.xml Mon Nov 25 19:20:40 2013
@@ -35,6 +35,7 @@
<dependencySet>
<includes>
<include>org.apache.ctakes:ctakes-assertion</include>
+ <include>org.apache.ctakes:ctakes-assertion-zoner</include>
<include>org.apache.ctakes:ctakes-chunker</include>
<include>org.apache.ctakes:ctakes-clinical-pipeline</include>
<include>org.apache.ctakes:ctakes-constituency-parser</include>
@@ -72,7 +73,7 @@
<fileSets>
<fileSet>
- <!-- Temporary workaround: Adding in the system scoped libaries. Remove
+ <!-- Temporary workaround: Adding in the system scoped libraries. Remove
these once they are in Maven Central -->
<directory>../ctakes-assertion/lib</directory>
<outputDirectory>lib</outputDirectory>
@@ -131,7 +132,7 @@
<!-- Copy a default log4j config that could be overridden during runtime -->
<fileSet>
- <directory>../ctakes-core/src/main/resources</directory>
+ <directory>../ctakes-core-res/src/main/resources</directory>
<fileMode>644</fileMode>
<directoryMode>755</directoryMode>
<includes>