12:40 a.m.
Author: smumford
Date: 2010-09-24 01:40:09 -0400 (Fri, 24 Sep 2010)
New Revision: 4368
Modified:
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/modules/Advanced/JCR/cluster-config.xml
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/modules/Advanced/JCR/query-handler-config.xml
Log:
Minor misc fixes
Modified:
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/modules/Advanced/JCR/cluster-config.xml
===================================================================
---
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/modules/Advanced/JCR/cluster-config.xml 2010-09-24
03:59:14 UTC (rev 4367)
+++
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/modules/Advanced/JCR/cluster-config.xml 2010-09-24
05:40:09 UTC (rev 4368)
@@ -33,12 +33,6 @@
</para>
<programlisting language="XML" role="XML"><xi:include
parse="text"
href="../../../extras/Advanced_Development_JCR_cluster-config/default12.xml"
xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting>
-
-<!--<programlisting language="XML"
role="XML"><![CDATA[<application-policy
name="exo-domain">
- <authentication>
- <login-module
code="org.exoplatform.services.security.j2ee.JbossLoginModule"
flag="required"></login-module>
- </authentication>
-</application-policy>]]></programlisting>-->
</step>
<step>
@@ -46,27 +40,11 @@
Ensure that you use JBossTS and JBoss Cache. See <xref
linkend="chap-Reference_Guide-eXoJCR"/> and <xref
linkend="sect-Reference_Guide-JBossTransactionsService"/> for more
information.
</para>
<para>
- The <filename>exo-configuration.xml</filename> must contain the
following parts:
+ The <filename>common-configuration.xml</filename> must contain the
following parts:
</para>
-<!-- DOC TODO: There is no exo-configuration.xml file in the jar or in the svn trunk/.
Does this file exist? -->
<programlisting language="XML" role="XML"><xi:include
parse="text"
href="../../../extras/Advanced_Development_JCR_cluster-config/default13.xml"
xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting>
-<!--<programlisting language="XML"
role="XML"><![CDATA[<component>
- <key>org.jboss.cache.transaction.TransactionManagerLookup</key>
- <type>org.jboss.cache.GenericTransactionManagerLookup</type>^
-</component>
-
-<component>
- <key>org.exoplatform.services.transaction.TransactionService</key>
-
<type>org.exoplatform.services.transaction.jbosscache.JBossTransactionsService</type>
- <init-params>
- <value-param>
- <name>timeout</name>
- <value>300</value>
- </value-param>
- </init-params>
-</component>]]></programlisting>-->
</step>
<step>
<para>
@@ -106,53 +84,6 @@
<programlisting language="XML" role="XML"><xi:include
parse="text"
href="../../../extras/Advanced_Development_JCR_cluster-config/default14.xml"
xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting>
-<!--<programlisting language="XML"
role="XML"><![CDATA[<repository-service
default-repository="repository1">
- <repositories>
- <repository name="repository1" system-workspace="ws1"
default-workspace="ws1">
- <security-domain>exo-domain</security-domain>
- <access-control>optional</access-control>
-
<authentication-policy>org.exoplatform.services.jcr.impl.core.access.JAASAuthenticator</authentication-policy>
- <workspaces>
- <workspace name="ws1">
- <container
class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer">
- <properties>
- <property name="source-name" value="jdbcjcr"
/>
- <property name="dialect" value="oracle"
/>
- <property name="multi-db" value="false"
/>
- <property name="update-storage" value="false"
/>
- <property name="max-buffer-size" value="200k"
/>
- <property name="swap-directory"
value="../temp/swap/production" />
- </properties>
- <value-storages>
-
- </value-storages>
- </container>
- <initializer
class="org.exoplatform.services.jcr.impl.core.ScratchWorkspaceInitializer">
- <properties>
- <property name="root-nodetype"
value="nt:unstructured" />
- </properties>
- </initializer>
- <cache enabled="true"
class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache">
-
- </cache>
- <query-handler
class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex">
-
- </query-handler>
- <lock-manager
class="org.exoplatform.services.jcr.impl.core.lock.jbosscache.CacheableLockManagerImpl">
-
- </lock-manager>
- </workspace>
- <workspace name="ws2">
- ...
- </workspace>
- <workspace name="wsN">
- ...
- </workspace>
- </workspaces>
- </repository>
- </repositories>
-</repository-service>]]></programlisting>-->
-
<calloutlist>
<callout
arearefs="Reference_Guide-Configuring_JBoss_AS_with_eXo_JCR_in_cluster-value-storages">
<para>
@@ -183,19 +114,6 @@
<programlisting language="XML" role="XML"><xi:include
parse="text"
href="../../../extras/Advanced_Development_JCR_cluster-config/default15.xml"
xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting>
-<!--<programlisting language="XML"
role="XML"><![CDATA[<component>
-
<key>org.exoplatform.services.jcr.config.RepositoryServiceConfiguration</key>
-
<type>org.exoplatform.services.jcr.impl.config.RepositoryServiceConfigurationImpl</type>
- <init-params>
- <value-param>
- <name>conf-path</name>
- <description>JCR configuration file</description>
- <value>exo-jcr-configuration.xml</value>
- </value-param>
- </init-params>
-</component>]]></programlisting>-->
-
-
<section
id="sect-Reference_Guide-Requirements-Environment_requirements">
<title>Environment requirements</title>
<itemizedlist>
@@ -229,16 +147,6 @@
<programlisting language="XML" role="XML"><xi:include
parse="text"
href="../../../extras/Advanced_Development_JCR_cluster-config/default16.xml"
xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting>
-<!--<programlisting language="XML"
role="XML"><![CDATA[<value-storages>
- <value-storage id="system"
class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage">
- <properties>
- <property name="path"
value="/mnt/tornado/temp/values/production" /> <!-path within NFS where
ValueStorage will hold it's data->
- </properties>
- <filters>
- <filter property-type="Binary" />
- </filters>
- </value-storage>
-</value-storages>]]></programlisting>-->
</listitem>
<listitem id="list-Reference_Guide-conf_cache">
<para>
@@ -253,15 +161,7 @@
<programlisting language="XML" role="XML"><xi:include
parse="text"
href="../../../extras/Advanced_Development_JCR_cluster-config/default17.xml"
xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting>
-<!--<programlisting language="XML"
role="XML"><![CDATA[<cache enabled="true"
class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.
-JBossCacheWorkspaceStorageCache">
- <properties>
- <property name="jbosscache-configuration"
value="jar:/conf/portal/test-jbosscache-data.xml" />
- <property name="jgroups-configuration"
value="jar:/conf/portal/udp-mux.xml" />
- <property name="jbosscache-cluster-name"
value="JCR_Cluster_cache_production" />
- <property name="jgroups-multiplexer-stack" value="true"
/>
- </properties>
-</cache>]]></programlisting>-->
+
<calloutlist>
<callout
arearefs="Reference_Guide-Requirements-Environment_requirements-jboss_cache_config">
@@ -290,17 +190,8 @@
<programlisting language="XML" role="XML"><xi:include
parse="text"
href="../../../extras/Advanced_Development_JCR_cluster-config/default18.xml"
xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting>
-<!--<programlisting language="XML"
role="XML"><![CDATA[<query-handler
class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex">
- <properties>
- <property name="changesfilter-class"
value="org.exoplatform.services.jcr.impl.core.query.jbosscache.JBossCacheIndexChangesFilter"
/>
- <property name="index-dir"
value="/mnt/tornado/temp/jcrlucenedb/production" />
<!- path within NFS where ValueStorage will hold it's data ->
- <property name="jbosscache-configuration"
value="jar:/conf/portal/test-jbosscache-indexer.xml" /> <!- path to
JBoss Cache configuration for indexer ->
- <property name="jgroups-configuration"
value="jar:/conf/portal/udp-mux.xml" /> <!- path
to JGroups configuration ->
- <property name="jbosscache-cluster-name"
value="JCR_Cluster_indexer_production" /> <!- JBoss
Cache indexer cluster name ->
- <property name="jgroups-multiplexer-stack" value="true"
/>
- </properties>
-</query-handler>]]></programlisting>-->
+
</listitem>
<listitem id="list-Reference_Guide-conf_lock_manager">
<para>
@@ -308,25 +199,7 @@
</para>
<programlisting language="XML" role="XML"><xi:include
parse="text"
href="../../../extras/Advanced_Development_JCR_cluster-config/default19.xml"
xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting>
-
-<!--<programlisting language="XML"
role="XML"><![CDATA[<lock-manager
class="org.exoplatform.services.jcr.impl.core.lock.jbosscache.CacheableLockManagerImpl">
- <properties>
- <property name="time-out" value="15m" />
- <property name="jbosscache-configuration"
value="jar:/conf/portal/test-jbosscache-lock.xml" /> <!- path to
JBoss Cache configuration for lock manager ->
- <property name="jgroups-configuration"
value="jar:/conf/portal/udp-mux.xml" /> <!- path
to JGroups configuration ->
- <property name="jgroups-multiplexer-stack" value="true"
/>
- <property name="jbosscache-cluster-name"
value="JCR_Cluster_lock_production" /> <!- JBoss
Cache locks cluster name ->
-
- <property name="jbosscache-cl-cache.jdbc.table.name"
value="jcrlocks_production"/> <!- the name of the DB
table where lock's data will be stored ->
- <property name="jbosscache-cl-cache.jdbc.table.create"
value="true"/>
- <property name="jbosscache-cl-cache.jdbc.table.drop"
value="false"/>
- <property name="jbosscache-cl-cache.jdbc.table.primarykey"
value="jcrlocks_production_pk"/>
- <property name="jbosscache-cl-cache.jdbc.fqn.column"
value="fqn"/>
- <property name="jbosscache-cl-cache.jdbc.node.column"
value="node"/>
- <property name="jbosscache-cl-cache.jdbc.parent.column"
value="parent"/>
- <property name="jbosscache-cl-cache.jdbc.datasource"
value="jdbcjcr"/>
- </properties>
-</lock-manager>]]></programlisting>-->
+
</listitem>
</orderedlist>
Modified:
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/modules/Advanced/JCR/query-handler-config.xml
===================================================================
---
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/modules/Advanced/JCR/query-handler-config.xml 2010-09-24
03:59:14 UTC (rev 4367)
+++
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/modules/Advanced/JCR/query-handler-config.xml 2010-09-24
05:40:09 UTC (rev 4368)
@@ -105,7 +105,7 @@
</callout>
<callout
arearefs="Reference_Guide-QueryHandler_configuration-Configuration-jgroups-configuration">
<para>
- The <parameter>jgroups-configuration</parameter> property is the
configuration template for all components (search, cache, locks). <!--[TODO 5.1 Add
link to document describing template configurations] -->
+ The <parameter>jgroups-configuration</parameter> property
is the configuration template for all components (search, cache, locks). Refer to <xref
linkend="sect-Reference_Guide-JBoss_Cache_configuration"/>
</para>
</callout>
<callout
arearefs="Reference_Guide-QueryHandler_configuration-Configuration-jgroups-multiplexer-stack">