Author: schor
Date: Sun Jul 15 01:29:23 2018
New Revision: 1835942
URL: http://svn.apache.org/viewvc?rev=1835942&view=rev
Log:
[UIMA-5730] merge from trunk
Modified:
uima/uv3/uimaj-v3/trunk/uima-docbook-references/ (props changed)
uima/uv3/uimaj-v3/trunk/uima-docbook-references/src/docbook/ (props
changed)
uima/uv3/uimaj-v3/trunk/uima-docbook-references/src/docbook/ref.pear.xml
uima/uv3/uimaj-v3/trunk/uima-docbook-references/src/docbook/ref.xml.component_descriptor.xml
(props changed)
Propchange: uima/uv3/uimaj-v3/trunk/uima-docbook-references/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Jul 15 01:29:23 2018
@@ -1,4 +1,4 @@
/uima/uimaj/branches/depend-on-july-9-build-tools/uima-docbook-references:963167-964468
/uima/uimaj/branches/depend-on-parent-pom-4/uima-docbook-references:961329-961745
/uima/uimaj/branches/filteredCompress-uima-2498/uima-docbook-references:1436573-1462257
-/uima/uimaj/trunk/uima-docbook-references:1690273-1768790,1781553
+/uima/uimaj/trunk/uima-docbook-references:1690273-1835941
Propchange: uima/uv3/uimaj-v3/trunk/uima-docbook-references/src/docbook/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Jul 15 01:29:23 2018
@@ -1,4 +1,4 @@
/uima/uimaj/branches/depend-on-july-9-build-tools/uima-docbook-references/src/docbook:963167-964468
/uima/uimaj/branches/depend-on-parent-pom-4/uima-docbook-references/src/docbook:961329-961745
/uima/uimaj/branches/filteredCompress-uima-2498/uima-docbook-references/src/docbook:1436573-1462257
-/uima/uimaj/trunk/uima-docbook-references/src/docbook:1690273-1774659,1781553
+/uima/uimaj/trunk/uima-docbook-references/src/docbook:1690273-1774659,1781553-1835941
Modified:
uima/uv3/uimaj-v3/trunk/uima-docbook-references/src/docbook/ref.pear.xml
URL:
http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uima-docbook-references/src/docbook/ref.pear.xml?rev=1835942&r1=1835941&r2=1835942&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uima-docbook-references/src/docbook/ref.pear.xml
(original)
+++ uima/uv3/uimaj-v3/trunk/uima-docbook-references/src/docbook/ref.pear.xml
Sun Jul 15 01:29:23 2018
@@ -966,6 +966,12 @@ try {
<programlisting><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
<pearSpecifier xmlns="http://uima.apache.org/resourceSpecifier";>
<pearPath>/home/user/uimaApp/installedPears/testpear</pearPath>
+ <parameters> <!-- optional -->
+ <parameter> <!-- any number, repeated -->
+ <name>name-of-the-parameter</name>
+ <value>string-value</value>
+ </parameter>
+ </parameters>
</pearSpecifier>]]></programlisting>
<para>
The <literal>pearPath</literal> setting in the descriptor must point to
the component root directory
@@ -982,6 +988,12 @@ try {
(unless exactly the same Classpath and Data Path are being used).
</para>
</note>
+
+ <para>The optional <literal>parameters</literal> section, if used,
specifies parameter values,
+ which are used to customize / override parameter values in the PEAR
descriptor.
+ External Settings overrides continue to work for PEAR descriptors, and
have precedence, if specified.
+ </para>
+
</section>
</chapter>
\ No newline at end of file
Propchange:
uima/uv3/uimaj-v3/trunk/uima-docbook-references/src/docbook/ref.xml.component_descriptor.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Jul 15 01:29:23 2018
@@ -1,4 +1,4 @@
/uima/uimaj/branches/depend-on-july-9-build-tools/uima-docbook-references/src/docbook/ref.xml.component_descriptor.xml:963167-964468
/uima/uimaj/branches/depend-on-parent-pom-4/uima-docbook-references/src/docbook/ref.xml.component_descriptor.xml:961329-961745
/uima/uimaj/branches/filteredCompress-uima-2498/uima-docbook-references/src/docbook/ref.xml.component_descriptor.xml:1436573-1462257
-/uima/uimaj/trunk/uima-docbook-references/src/docbook/ref.xml.component_descriptor.xml:1690273-1805676
+/uima/uimaj/trunk/uima-docbook-references/src/docbook/ref.xml.component_descriptor.xml:1690273-1835941
