You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by re...@apache.org on 2014/04/18 21:43:25 UTC

svn commit: r1588551 - in /uima/uimafit/trunk: ./ uimafit-docbook/src/docbook/tools.uimafit.book.xml uimafit-docbook/src/docbook/tools.uimafit.packaging.xml uimafit-docbook/src/docbook/tools.uimafit.typesystem.xml

Author: rec
Date: Fri Apr 18 19:43:25 2014
New Revision: 1588551

URL: http://svn.apache.org/r1588551
Log:
[UIMA-3385] Make meta data discovery compatible with fat jars

Added:
    uima/uimafit/trunk/uimafit-docbook/src/docbook/tools.uimafit.packaging.xml
      - copied unchanged from r1588543, uima/uimafit/branches/2.0.x/uimafit-docbook/src/docbook/tools.uimafit.packaging.xml
Modified:
    uima/uimafit/trunk/   (props changed)
    uima/uimafit/trunk/uimafit-docbook/src/docbook/tools.uimafit.book.xml
    uima/uimafit/trunk/uimafit-docbook/src/docbook/tools.uimafit.typesystem.xml

Propchange: uima/uimafit/trunk/
------------------------------------------------------------------------------
  Merged /uima/uimafit/branches/2.0.x:r1588543

Modified: uima/uimafit/trunk/uimafit-docbook/src/docbook/tools.uimafit.book.xml
URL: http://svn.apache.org/viewvc/uima/uimafit/trunk/uimafit-docbook/src/docbook/tools.uimafit.book.xml?rev=1588551&r1=1588550&r2=1588551&view=diff
==============================================================================
--- uima/uimafit/trunk/uimafit-docbook/src/docbook/tools.uimafit.book.xml (original)
+++ uima/uimafit/trunk/uimafit-docbook/src/docbook/tools.uimafit.book.xml Fri Apr 18 19:43:25 2014
@@ -41,6 +41,8 @@ under the License.
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="tools.uimafit.typesystem.xml"/>
 
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="tools.uimafit.packaging.xml"/>
+
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="tools.uimafit.maven.xml"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="tools.uimafit.migration.xml"/>

Modified: uima/uimafit/trunk/uimafit-docbook/src/docbook/tools.uimafit.typesystem.xml
URL: http://svn.apache.org/viewvc/uima/uimafit/trunk/uimafit-docbook/src/docbook/tools.uimafit.typesystem.xml?rev=1588551&r1=1588550&r2=1588551&view=diff
==============================================================================
--- uima/uimafit/trunk/uimafit-docbook/src/docbook/tools.uimafit.typesystem.xml (original)
+++ uima/uimafit/trunk/uimafit-docbook/src/docbook/tools.uimafit.typesystem.xml Fri Apr 18 19:43:25 2014
@@ -35,6 +35,13 @@
         <filename>org/apache/uima/fit/type/Token.xml</filename>, then the file should have the
       following contents:</para>
     <programlisting>classpath*:org/apache/uima/fit/type/Token.xml</programlisting>
+    <note>
+      <para>Mind that the file <filename>types.txt</filename> is must be located in
+          <filename>META-INF/org.apache.uima.fit</filename> where
+          <filename>org.apache.uima.fit</filename> is the name of a sub-directory inside
+          <filename>META-INF</filename>. <emphasis>We are not using the Java package notation
+          here!</emphasis></para>
+    </note>
     <para>To specify multiple TSDs, add additonal lines to the file. If you have a large number of
       TSDs, you may prefer to add a pattern. Assume that we have a large number of TSDs under
         <filename>org/apache/uima/fit/type</filename>, we can use the following pattern which
@@ -46,12 +53,13 @@
     <para>If it is not possible or inconvenient to add the `types.txt` file, patterns can also be
       specified using the system property
         <parameter>org.apache.uima.fit.type.import_pattern</parameter>. Multiple patterns may be
-      specified separated by semicolon<footnote>
-        <para>The <literal>\</literal> in the example is used as a line-continuation indicator. It
-          and all spaces following it should be ommitted.</para>
-      </footnote>:</para>
+      specified separated by semicolon:</para>
     <programlisting>-Dorg.apache.uima.fit.type.import_pattern=\
   classpath*:org/apache/uima/fit/type/**/*.xml</programlisting>
+    <note>
+      <para>The <literal>\</literal> in the example is used as a line-continuation indicator. It
+        and all spaces following it should be ommitted.</para>
+    </note>
   </section>
   <section>
     <title>Using type auto-detection </title>