Author: smumford
Date: 2010-08-10 00:28:14 -0400 (Tue, 10 Aug 2010)
New Revision: 3785
Added:
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_lock-manager-config/you.xml
Removed:
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_lock-manager-config/you.java
Modified:
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_jbosscache-configuration-templates/default36.xml
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_lock-manager-config/default50.xml
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_query-handler-config/default59.xml
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/modules/Advanced/JCR/jbosscache-configuration-templates.xml
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/modules/Advanced/JCR/lock-manager-config.xml
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/modules/Advanced/JCR/query-handler-config.xml
Log:
JBEPP-370: Update callout pointer postitions with column attribute
Modified:
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_jbosscache-configuration-templates/default36.xml
===================================================================
---
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_jbosscache-configuration-templates/default36.xml 2010-08-10
03:24:42 UTC (rev 3784)
+++
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_jbosscache-configuration-templates/default36.xml 2010-08-10
04:28:14 UTC (rev 3785)
@@ -14,4 +14,4 @@
<property name="minTimeToLive" value="60000" />
</default>
</eviction>
-</jbosscache>
+</jbosscache>
\ No newline at end of file
Modified:
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_lock-manager-config/default50.xml
===================================================================
---
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_lock-manager-config/default50.xml 2010-08-10
03:24:42 UTC (rev 3784)
+++
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_lock-manager-config/default50.xml 2010-08-10
04:28:14 UTC (rev 3785)
@@ -15,7 +15,6 @@
oob_thread_pool.queue_enabled="false"
oob_thread_pool.queue_max_size="100"
oob_thread_pool.rejection_policy="run" />
<MPING timeout="2000" num_initial_members="2"
mcast_port="34540" bind_addr="127.0.0.1"
mcast_addr="224.0.0.1" />
-
<MERGE2 max_interval="30000" min_interval="10000" />
<FD_SOCK />
<FD max_tries="5" shun="true" timeout="10000" />
Deleted:
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_lock-manager-config/you.java
===================================================================
---
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_lock-manager-config/you.java 2010-08-10
03:24:42 UTC (rev 3784)
+++
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_lock-manager-config/you.java 2010-08-10
04:28:14 UTC (rev 3785)
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<jbosscache
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:jboss:jbosscache-core:config:3.1">
-
- <locking useLockStriping="false" concurrencyLevel="50000"
lockParentForChildInsertRemove="false"
- lockAcquisitionTimeout="20000" />
-
- <clustering mode="replication"
clusterName="${jbosscache-cluster-name}">
- <stateRetrieval timeout="20000" fetchInMemoryState="false"
/>
- <jgroupsConfig multiplexerStack="jcr.stack" />
- <sync />
- </clustering>
-
- <loaders passivation="false" shared="true">
- <!-- All the data of the JCR locks needs to be loaded at startup -->
- <preload>
- <node fqn="/" />
- </preload>
- <!--
- For another cache-loader class you should use another template with
- cache-loader specific parameters
- -->
- <loader class="org.jboss.cache.loader.JDBCCacheLoader"
async=q"false" fetchPersistentState="false"
- ignoreModifications="false" purgeOnStartup="false">
- <properties>
- cache.jdbc.table.name=${jbosscache-cl-cache.jdbc.table.name}
- cache.jdbc.table.create=${jbosscache-cl-cache.jdbc.table.create}
- cache.jdbc.table.drop=${jbosscache-cl-cache.jdbc.table.drop}
- cache.jdbc.table.primarykey=${jbosscache-cl-cache.jdbc.table.primarykey}
- cache.jdbc.fqn.column=${jbosscache-cl-cache.jdbc.fqn.column}
- cache.jdbc.fqn.type=${jbosscache-cl-cache.jdbc.fqn.type}
- cache.jdbc.node.column=${jbosscache-cl-cache.jdbc.node.column}
- cache.jdbc.node.type=${jbosscache-cl-cache.jdbc.node.type}
- cache.jdbc.parent.column=${jbosscache-cl-cache.jdbc.parent.column}
- cache.jdbc.datasource=${jbosscache-cl-cache.jdbc.datasource}
- </properties>
- </loader>
- </loaders>
-</jbosscache>
Copied:
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_lock-manager-config/you.xml
(from rev 3746,
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_lock-manager-config/you.java)
===================================================================
---
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_lock-manager-config/you.xml
(rev 0)
+++
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_lock-manager-config/you.xml 2010-08-10
04:28:14 UTC (rev 3785)
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jbosscache
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:jboss:jbosscache-core:config:3.1">
+
+ <locking useLockStriping="false" concurrencyLevel="50000"
lockParentForChildInsertRemove="false"
+ lockAcquisitionTimeout="20000" />
+
+ <clustering mode="replication"
clusterName="${jbosscache-cluster-name}">
+ <stateRetrieval timeout="20000" fetchInMemoryState="false"
/>
+ <jgroupsConfig multiplexerStack="jcr.stack" />
+ <sync />
+ </clustering>
+
+ <loaders passivation="false" shared="true">
+ <!-- All the data of the JCR locks needs to be loaded at startup -->
+ <preload>
+ <node fqn="/" />
+ </preload>
+ <!--
+ For another cache-loader class you should use another template with
+ cache-loader specific parameters
+ -->
+ <loader class="org.jboss.cache.loader.JDBCCacheLoader"
async=q"false" fetchPersistentState="false"
+ ignoreModifications="false" purgeOnStartup="false">
+ <properties>
+ cache.jdbc.table.name=${jbosscache-cl-cache.jdbc.table.name}
+ cache.jdbc.table.create=${jbosscache-cl-cache.jdbc.table.create}
+ cache.jdbc.table.drop=${jbosscache-cl-cache.jdbc.table.drop}
+ cache.jdbc.table.primarykey=${jbosscache-cl-cache.jdbc.table.primarykey}
+ cache.jdbc.fqn.column=${jbosscache-cl-cache.jdbc.fqn.column}
+ cache.jdbc.fqn.type=${jbosscache-cl-cache.jdbc.fqn.type}
+ cache.jdbc.node.column=${jbosscache-cl-cache.jdbc.node.column}
+ cache.jdbc.node.type=${jbosscache-cl-cache.jdbc.node.type}
+ cache.jdbc.parent.column=${jbosscache-cl-cache.jdbc.parent.column}
+ cache.jdbc.datasource=${jbosscache-cl-cache.jdbc.datasource}
+ </properties>
+ </loader>
+ </loaders>
+</jbosscache>
\ No newline at end of file
Modified:
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_query-handler-config/default59.xml
===================================================================
---
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_query-handler-config/default59.xml 2010-08-10
03:24:42 UTC (rev 3784)
+++
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_query-handler-config/default59.xml 2010-08-10
04:28:14 UTC (rev 3785)
@@ -3,7 +3,7 @@
<properties>
<property name="index-dir" value="shareddir/index/db1/ws"
/>
<property name="changesfilter-class"
-
value="org.exoplatform.services.jcr.impl.core.query.jbosscache.JBossCacheIndexChangesFilter"
/>
+
value="org.exoplatform.services.jcr.impl.core.query.jbosscache.JBossCacheIndexChangesFilter"/>
<property name="jbosscache-configuration"
value="jbosscache-indexer.xml" />
<property name="jgroups-configuration"
value="udp-mux.xml" />
<property name="jgroups-multiplexer-stack" value="true"
/>
Modified:
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/modules/Advanced/JCR/jbosscache-configuration-templates.xml
===================================================================
---
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/modules/Advanced/JCR/jbosscache-configuration-templates.xml 2010-08-10
03:24:42 UTC (rev 3784)
+++
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/modules/Advanced/JCR/jbosscache-configuration-templates.xml 2010-08-10
04:28:14 UTC (rev 3785)
@@ -260,7 +260,7 @@
<programlistingco>
<areaspec>
- <area coords="5"
id="Reference_Guide-JBoss_Cache_configuration-Templates-jbosscache-cluster-name2"/>
+ <area coords="5 90"
id="Reference_Guide-JBoss_Cache_configuration-Templates-jbosscache-cluster-name2"/>
</areaspec>
<programlisting language="XML" role="XML"><xi:include
parse="text"
href="../../../extras/Advanced_Development_JCR_jbosscache-configuration-templates/default36.xml"
xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting>
Modified:
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/modules/Advanced/JCR/lock-manager-config.xml
===================================================================
---
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/modules/Advanced/JCR/lock-manager-config.xml 2010-08-10
03:24:42 UTC (rev 3784)
+++
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/modules/Advanced/JCR/lock-manager-config.xml 2010-08-10
04:28:14 UTC (rev 3785)
@@ -148,7 +148,7 @@
</para>
<programlistingco>
<areaspec>
- <area coords="4"
id="Reference_Guide-LockManager_configuration-CacheableLockManagerImpl-Simple_Jboss_Cache_Configuration-test-jbosscache-lock-config.xml"/>
+ <area coords="4 90"
id="Reference_Guide-LockManager_configuration-CacheableLockManagerImpl-Simple_Jboss_Cache_Configuration-test-jbosscache-lock-config.xml"/>
</areaspec>
<programlisting language="XML" role="XML"><xi:include
parse="text"
href="../../../extras/Advanced_Development_JCR_lock-manager-config/default49.xml"
xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting>
@@ -174,11 +174,11 @@
</para>
<programlistingco>
<areaspec>
- <area coords="5"
id="Reference_Guide-LockManager_configuration-CacheableLockManagerImpl-Simple_Jboss_Cache_Configuration-clusterName"/>
- <area coords="42"
id="Reference_Guide-LockManager_configuration-CacheableLockManagerImpl-Simple_Jboss_Cache_Configuration-cache.jdbc.table.name"/>
+ <area coords="6 90"
id="Reference_Guide-LockManager_configuration-CacheableLockManagerImpl-Simple_Jboss_Cache_Configuration-clusterName"/>
+ <area coords="41 50"
id="Reference_Guide-LockManager_configuration-CacheableLockManagerImpl-Simple_Jboss_Cache_Configuration-cache.jdbc.table.name"/>
<areaset coords=""
id="Reference_Guide-LockManager_configuration-CacheableLockManagerImpl-Simple_Jboss_Cache_Configuration-cache.jdbc.types">
- <area coords="49"
id="Reference_Guide-LockManager_configuration-CacheableLockManagerImpl-Simple_Jboss_Cache_Configuration-cache.jdbc.node.type"/>
- <area coords="46"
id="Reference_Guide-LockManager_configuration-CacheableLockManagerImpl-Simple_Jboss_Cache_Configuration-cache.jdbc.fqn.type"/>
+ <area coords="48 50"
id="Reference_Guide-LockManager_configuration-CacheableLockManagerImpl-Simple_Jboss_Cache_Configuration-cache.jdbc.node.type"/>
+ <area coords="46 50"
id="Reference_Guide-LockManager_configuration-CacheableLockManagerImpl-Simple_Jboss_Cache_Configuration-cache.jdbc.fqn.type"/>
</areaset>
</areaspec>
@@ -397,12 +397,12 @@
<programlistingco>
<areaspec>
<areaset coords=""
id="Reference_Guide-LockManager_configuration-CacheableLockManagerImpl-Template_JBoss_Cache_Configuration-cache.jdbc.templates">
- <area coords="24"
id="Reference_Guide-LockManager_configuration-CacheableLockManagerImpl-Template_JBoss_Cache_Configuration-cache.jdbc.table.name"/>
- <area coords="34"
id="Reference_Guide-LockManager_configuration-CacheableLockManagerImpl-Template_JBoss_Cache_Configuration-cache.jdbc.datasource"/>
+ <area coords="24 50"
id="Reference_Guide-LockManager_configuration-CacheableLockManagerImpl-Template_JBoss_Cache_Configuration-cache.jdbc.table.name"/>
+ <area coords="35 50"
id="Reference_Guide-LockManager_configuration-CacheableLockManagerImpl-Template_JBoss_Cache_Configuration-cache.jdbc.datasource"/>
</areaset>
</areaspec>
-<programlisting language="XML" role="XML"><xi:include
parse="text"
href="../../../extras/Advanced_Development_JCR_lock-manager-config/you.java"
xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting>
+<programlisting language="XML" role="XML"><xi:include
parse="text"
href="../../../extras/Advanced_Development_JCR_lock-manager-config/you.xml"
xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting>
<!--<programlisting language="XML"
role="XML"><![CDATA[<?xml version="1.0"
encoding="UTF-8"?>
<jbosscache
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:jboss:jbosscache-core:config:3.1">
@@ -457,11 +457,11 @@
</para>
<programlistingco>
<areaspec>
+ <area coords="5 90"
id="Reference_Guide-LockManager_configuration-CacheableLockManagerImpl-Template_JBoss_Cache_Configuration-udp-mux.xml"/>
<areaset coords=""
id="Reference_Guide-LockManager_configuration-CacheableLockManagerImpl-Template_JBoss_Cache_Configuration-jbosscache-cl-cache.jdbc.parameters">
- <area coords="12"
id="Reference_Guide-LockManager_configuration-CacheableLockManagerImpl-Template_JBoss_Cache_Configuration-jbosscache-cl-cache.jdbc.fqn.column"/>
- <area coords="15"
id="Reference_Guide-LockManager_configuration-CacheableLockManagerImpl-Template_JBoss_Cache_Configuration-jbosscache-cl-cache.jdbc.node.type"/>
+ <area coords="12 90"
id="Reference_Guide-LockManager_configuration-CacheableLockManagerImpl-Template_JBoss_Cache_Configuration-jbosscache-cl-cache.jdbc.fqn.column"/>
+ <area coords="15 90"
id="Reference_Guide-LockManager_configuration-CacheableLockManagerImpl-Template_JBoss_Cache_Configuration-jbosscache-cl-cache.jdbc.node.type"/>
</areaset>
- <area coords="5"
id="Reference_Guide-LockManager_configuration-CacheableLockManagerImpl-Template_JBoss_Cache_Configuration-udp-mux.xml"/>
</areaspec>
<programlisting language="XML" role="XML"><xi:include
parse="text"
href="../../../extras/Advanced_Development_JCR_lock-manager-config/default51.xml"
xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting>
@@ -487,20 +487,20 @@
</lock-manager>]]></programlisting>-->
<calloutlist>
- <callout
arearefs="Reference_Guide-LockManager_configuration-CacheableLockManagerImpl-Template_JBoss_Cache_Configuration-jbosscache-cl-cache.jdbc.parameters">
+ <callout
arearefs="Reference_Guide-LockManager_configuration-CacheableLockManagerImpl-Template_JBoss_Cache_Configuration-udp-mux.xml">
<para>
- The <parameter>jbosscache-cl-cache.jdbc.fqn.column</parameter> and
<parameter>jbosscache-cl-cache.jdbc.node.type</parameter> parameters are not
explicitly defined as <parameter>cache.jdbc.fqn.type</parameter> and
<parameter>cache.jdbc.node.type</parameter> are defined in the JBoss Cache
configuration.
+ The <literal>jgroups-configuration</literal> has been moved to a
separate configuration file (<filename>udp-mux.xml</filename>, shown below).
</para>
<para>
- Refer to <xref
linkend="tabl-Reference_Guide-Data_Types_in_Different_Databases-Fqn_type_and_node_type_in_different_databases"/>
for information about setting these parameters or set them as
<parameter>AUTO</parameter> and the data type will by detected automatically.
+ In this case the <filename>udp-mux.xml</filename> is a common
configuration for all JGroup components (QueryHandler, cache, LockManager), but this is
not a requirement of the configuration method.
</para>
</callout>
- <callout
arearefs="Reference_Guide-LockManager_configuration-CacheableLockManagerImpl-Template_JBoss_Cache_Configuration-udp-mux.xml">
+ <callout
arearefs="Reference_Guide-LockManager_configuration-CacheableLockManagerImpl-Template_JBoss_Cache_Configuration-jbosscache-cl-cache.jdbc.parameters">
<para>
- The <literal>jgroups-configuration</literal> has been moved to a
separate configuration file (<filename>udp-mux.xml</filename>, shown below).
+ The <parameter>jbosscache-cl-cache.jdbc.fqn.column</parameter> and
<parameter>jbosscache-cl-cache.jdbc.node.type</parameter> parameters are not
explicitly defined as <parameter>cache.jdbc.fqn.type</parameter> and
<parameter>cache.jdbc.node.type</parameter> are defined in the JBoss Cache
configuration.
</para>
<para>
- In this case the <filename>udp-mux.xml</filename> is a common
configuration for all JGroup components (QueryHandler, cache, LockManager), but this is
not a requirement of the configuration method.
+ Refer to <xref
linkend="tabl-Reference_Guide-Data_Types_in_Different_Databases-Fqn_type_and_node_type_in_different_databases"/>
for information about setting these parameters or set them as
<parameter>AUTO</parameter> and the data type will by detected automatically.
</para>
</callout>
</calloutlist>
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-08-10
03:24:42 UTC (rev 3784)
+++
epp/docs/branches/EPP_5_0_Branch/Reference_Guide/en-US/modules/Advanced/JCR/query-handler-config.xml 2010-08-10
04:28:14 UTC (rev 3785)
@@ -81,12 +81,12 @@
<programlistingco>
<areaspec>
- <area coords="4"
id="Reference_Guide-QueryHandler_configuration-Configuration-index-dir"/>
- <area coords="8"
id="Reference_Guide-QueryHandler_configuration-Configuration-jbosscache-configuration"/>
- <area coords="9"
id="Reference_Guide-QueryHandler_configuration-Configuration-jgroups-configuration"/>
- <area coords="10"
id="Reference_Guide-QueryHandler_configuration-Configuration-jgroups-multiplexer-stack"/>
- <area coords="11"
id="Reference_Guide-QueryHandler_configuration-Configuration-jbosscache-cluster-name"/>
- <area coords="12"
id="Reference_Guide-QueryHandler_configuration-Configuration-max-volatile-time"/>
+ <area coords="4 90"
id="Reference_Guide-QueryHandler_configuration-Configuration-index-dir"/>
+ <area coords="7 90"
id="Reference_Guide-QueryHandler_configuration-Configuration-jbosscache-configuration"/>
+ <area coords="8 90"
id="Reference_Guide-QueryHandler_configuration-Configuration-jgroups-configuration"/>
+ <area coords="9 90"
id="Reference_Guide-QueryHandler_configuration-Configuration-jgroups-multiplexer-stack"/>
+ <area coords="10 90"
id="Reference_Guide-QueryHandler_configuration-Configuration-jbosscache-cluster-name"/>
+ <area coords="11 90"
id="Reference_Guide-QueryHandler_configuration-Configuration-max-volatile-time"/>
</areaspec>
<programlisting language="XML" role="XML"><xi:include
parse="text"
href="../../../extras/Advanced_Development_JCR_query-handler-config/default59.xml"
xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting>