[exo-jcr-commits] exo-jcr SVN: r2891 - in jcr/branches/1.12.x/docs/reference/en/src/main/docbook/en-US/modules/jcr: searching and 1 other directory.
do-not-reply at jboss.org
do-not-reply at jboss.org
Thu Aug 5 11:19:12 EDT 2010
Author: sergiykarpenko
Date: 2010-08-05 11:19:12 -0400 (Thu, 05 Aug 2010)
New Revision: 2891
Modified:
jcr/branches/1.12.x/docs/reference/en/src/main/docbook/en-US/modules/jcr/configuration/exo-jcr-configuration.xml
jcr/branches/1.12.x/docs/reference/en/src/main/docbook/en-US/modules/jcr/searching/searching-repository-content.xml
Log:
EXOJCR-869: few fixes
Modified: jcr/branches/1.12.x/docs/reference/en/src/main/docbook/en-US/modules/jcr/configuration/exo-jcr-configuration.xml
===================================================================
--- jcr/branches/1.12.x/docs/reference/en/src/main/docbook/en-US/modules/jcr/configuration/exo-jcr-configuration.xml 2010-08-05 15:08:10 UTC (rev 2890)
+++ jcr/branches/1.12.x/docs/reference/en/src/main/docbook/en-US/modules/jcr/configuration/exo-jcr-configuration.xml 2010-08-05 15:19:12 UTC (rev 2891)
@@ -55,27 +55,36 @@
<para>The following setup procedure is used to obtain a Standalone
configuration (find more in <link
linkend="Kernel.ContainerConfiguration">Container
- configuration</link>):</para>
+ configuration</link>):<itemizedlist>
+ <listitem>
+ <para>Configuration that is set explicitly using
+ StandaloneContainer.addConfigurationURL(String url) or
+ StandaloneContainer.addConfigurationPath(String path) before
+ getInstance()</para>
+ </listitem>
- <para>* Configuration that is set explicitly using
- StandaloneContainer.addConfigurationURL(String url) or
- StandaloneContainer.addConfigurationPath(String path) before
- getInstance()</para>
+ <listitem>
+ <para>Configuration from $base:directory/exo-configuration.xml or
+ $base:directory/conf/exo-configuration.xml file. Where
+ $base:directory is either AS's home directory in case of J2EE AS
+ environment or just the current directory in case of a standalone
+ application.</para>
+ </listitem>
- <para>* Configuration from $base:directory/exo-configuration.xml or
- $base:directory/conf/exo-configuration.xml file. Where $base:directory is
- either AS's home directory in case of J2EE AS environment or just the
- current directory in case of a standalone application.</para>
+ <listitem>
+ <para>/conf/exo-configuration.xml in the current classloader (e.g.
+ war, ear archive)</para>
+ </listitem>
- <para>* /conf/exo-configuration.xml in the current classloader (e.g. war,
- ear archive)</para>
+ <listitem>
+ <para>Configuration from
+ $service_jar_file/conf/portal/configuration.xml. WARNING: do not
+ rely on some concrete jar's configuration if you have more than one
+ jar containing conf/portal/configuration.xml file. In this case
+ choosing a configuration is unpredictable.</para>
+ </listitem>
+ </itemizedlist></para>
- <para>* Configuration from
- $service_jar_file/conf/portal/configuration.xml. WARNING: do not rely on
- some concrete jar's configuration if you have more than one jar containing
- conf/portal/configuration.xml file. In this case choosing a configuration
- is unpredictable.</para>
-
<para>JCR service configuration looks like:</para>
<programlisting><component>
Modified: jcr/branches/1.12.x/docs/reference/en/src/main/docbook/en-US/modules/jcr/searching/searching-repository-content.xml
===================================================================
--- jcr/branches/1.12.x/docs/reference/en/src/main/docbook/en-US/modules/jcr/searching/searching-repository-content.xml 2010-08-05 15:08:10 UTC (rev 2890)
+++ jcr/branches/1.12.x/docs/reference/en/src/main/docbook/en-US/modules/jcr/searching/searching-repository-content.xml 2010-08-05 15:19:12 UTC (rev 2891)
@@ -34,8 +34,6 @@
<para>XPath query: //* .</para>
</listitem>
</itemizedlist>
-
- <para>")</para>
</note>
<para>TwoWayRangeIterator interface:</para>
More information about the exo-jcr-commits
mailing list