Author: thomas.heute(a)jboss.com Date: 2010-11-11 11:08:35 -0500 (Thu, 11 Nov 2010) New Revision: 5043 Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_jbossts-transaction-service/default37.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_query-handler-config/default59.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_query-handler-config/default60.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/Advanced/JCR.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/Advanced/JCR/jbossts-transaction-service.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/Advanced/JCR/multilanguage-support.xml epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/Advanced/JCR/query-handler-config.xml Log: JBEPP-623: Remove eXo JCR documentation that applies to eXo JCR standalone Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_jbossts-transaction-service/default37.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_jbossts-transaction-service/default37.xml 2010-11-11 14:52:44 UTC (rev 5042) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_jbossts-transaction-service/default37.xml 2010-11-11 16:08:35 UTC (rev 5043) @@ -1,10 +1,10 @@ -<component> - <key>org.exoplatform.services.transaction.TransactionService</key> - <type>org.exoplatform.services.transaction.jbosscache.JBossTransactionsService</type> - <init-params> - <value-param> - <name>timeout</name> - <value>3000</value> - </value-param> - </init-params> - </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> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_query-handler-config/default59.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_query-handler-config/default59.xml 2010-11-11 14:52:44 UTC (rev 5042) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_query-handler-config/default59.xml 2010-11-11 16:08:35 UTC (rev 5043) @@ -1,14 +1,11 @@ -<workspace name="ws"> - <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> - <properties> - <property name="index-dir" value="shareddir/index/db1/ws" /> - <property name="changesfilter-class" - 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" /> - <property name="jbosscache-cluster-name" value="JCR-cluster-indexer-ws" /> - <property name="max-volatile-time" value="60" /> - </properties> - </query-handler> -</workspace> + <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> + <properties> + <property name="index-dir" value="${gatein.jcr.index.data.dir}/system${container.name.suffix}"/> + <property name="changesfilter-class" value="${gatein.jcr.index.changefilterclass}" /> + <property name="jbosscache-configuration" value="${gatein.jcr.index.cache.config}" /> + <property name="jgroups-configuration" value="${gatein.jcr.jgroups.config}" /> + <property name="jgroups-multiplexer-stack" value="true" /> + <property name="jbosscache-cluster-name" value="jcrindexer-${container.name.suffix}-system" /> + <property name="max-volatile-time" value="60" /> + </properties> + </query-handler> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_query-handler-config/default60.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_query-handler-config/default60.xml 2010-11-11 14:52:44 UTC (rev 5042) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_query-handler-config/default60.xml 2010-11-11 16:08:35 UTC (rev 5043) @@ -1,8 +1,9 @@ <?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" + <locking useLockStriping="false" concurrencyLevel="64" lockParentForChildInsertRemove="false" lockAcquisitionTimeout="20000" /> + <!-- Configure the TransactionManager --> <transaction transactionManagerLookupClass="org.jboss.cache.transaction.JBossStandaloneJTAManagerLookup" /> @@ -14,8 +15,8 @@ <!-- Eviction configuration --> <eviction wakeUpInterval="5000"> <default algorithmClass="org.jboss.cache.eviction.FIFOAlgorithm" eventQueueSize="1000000"> - <property name="maxNodes" value="10000" /> - <property name="minTimeToLive" value="60000" /> + <property name="maxNodes" value="5000" /> + <property name="minTimeToLive" value="20000" /> </default> </eviction> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/Advanced/JCR/jbossts-transaction-service.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/Advanced/JCR/jbossts-transaction-service.xml 2010-11-11 14:52:44 UTC (rev 5042) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/Advanced/JCR/jbossts-transaction-service.xml 2010-11-11 16:08:35 UTC (rev 5043) @@ -8,18 +8,15 @@ <section id="sect-Reference_Guide-JBossTransactionsService-Introduction"> <title>Introduction</title> <para> - JBossTransactionsService implements eXo JCR and provides access to <ulink type="http" url="http://www.jboss.org/jbosstm/">JBoss Transaction Service (JBossTS)</ulink> JTA implementation via eXo container dependency. + eXo JCR uses the <ulink type="http" url="http://www.jboss.org/jbosstm/">JBoss Transaction Service (JBossTS)</ulink> JTA implementation via eXo container dependency. </para> - <para> - TransactionService used in JCR cache <emphasis>org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache</emphasis> implementation. - </para> </section> <section id="sect-Reference_Guide-JBossTransactionsService-Configuration"> <title>Configuration</title> <para> - Example configuration: + Timeout configuration can be done in: <filename>gatein.ear/02portal.war/WEB-INF/conf/common/common-configuration.xml</filename> </para> <programlisting language="XML" role="XML"><xi:include href="../../../extras/Advanced_Development_JCR_jbossts-transaction-service/default37.xml" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/Advanced/JCR/multilanguage-support.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/Advanced/JCR/multilanguage-support.xml 2010-11-11 14:52:44 UTC (rev 5042) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/Advanced/JCR/multilanguage-support.xml 2010-11-11 16:08:35 UTC (rev 5043) @@ -7,6 +7,7 @@ <title>Multilanguage support in eXo JCR RDB backend</title> <para> Whenever a relational database is used to store multilingual text data in the eXo Java Content Repository the configuration must be adapted to support UTF-8 encoding. + Dialect is automatically detected for certified database. You can still enforce it in case fof failure, see below. </para> <para> The following sections describe enabling UTF-8 support with various databases. @@ -37,7 +38,7 @@ <orderedlist> <listitem> <para> - The configuration file to be modified for these changes is:<filename>/portal/WEB-INF/conf/jcr/repository-configuration.xml</filename> + The configuration file to be modified for these changes is:<filename>gatein.ear/02portal.war/WEB-INF/conf/jcr/repository-configuration.xml</filename> </para> </listitem> <listitem> @@ -50,22 +51,9 @@ <section id="sect-Reference_Guide-Multilanguage_support_in_eXo_JCR_RDB_backend-Oracle"> <title>Oracle</title> <para> - In order to run a multi-language instance of JCR on an Oracle backend, Unicode encoding should be applied to the database. Other Oracle globalization parameters will not be effective in this. The property to modify is <constant>NLS_CHARACTERSET</constant>. - </para> + In order to run a multi-language instance of JCR on an Oracle backend, Unicode encoding should be applied to the database. + </para> <para> - <constant>NLS_CHARACTERSET</constant> has tested with many European and Asian languages when set at <constant>AL32UTF8</constant>. - </para> - <para> - The below example of the multi-language database configuration has been used in pre-release JCR testing: - </para> - -<programlisting language="Java" role="Java"><xi:include href="../../../extras/Advanced_Development_JCR_multilanguage-support/default53.java" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting> - <warning> - <para> - JCR 1.12.<replaceable>x</replaceable> versions do not use <parameter>NVARCHAR</parameter> columns, so the value of the <parameter>NLS_NCHAR_CHARACTERSET</parameter> parameter has no effect. - </para> - </warning> - <para> To create a database with Unicode encoding using Oracle dialect for the Workspace Container, implement the following settings: </para> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/Advanced/JCR/query-handler-config.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/Advanced/JCR/query-handler-config.xml 2010-11-11 14:52:44 UTC (rev 5042) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/Advanced/JCR/query-handler-config.xml 2010-11-11 16:08:35 UTC (rev 5043) @@ -70,24 +70,24 @@ <formalpara id="form-Reference_Guide-Configuration-Query_handler_configuration"> <title>Query-handler configuration</title> <para> - An example configuration + In <filename>gatein.ear/02portal.war/WEB-INF/conf/jcr/repository-configuration.xml</filename> query handlers are already configured for the packaged workspaces such as: </para> </formalpara> <programlistingco> <areaspec> - <area coords="4 90" id="area-Reference_Guide-QueryHandler_configuration-Configuration-index-dir" /> - <area coords="7 90" id="area-Reference_Guide-QueryHandler_configuration-Configuration-jbosscache-configuration" /> - <area coords="8 90" id="area-Reference_Guide-QueryHandler_configuration-Configuration-jgroups-configuration" /> - <area coords="9 90" id="area-Reference_Guide-QueryHandler_configuration-Configuration-jgroups-multiplexer-stack" /> - <area coords="10 90" id="area-Reference_Guide-QueryHandler_configuration-Configuration-jbosscache-cluster-name" /> - <area coords="11 90" id="area-Reference_Guide-QueryHandler_configuration-Configuration-max-volatile-time" /> + <area coords="3 90" id="area-Reference_Guide-QueryHandler_configuration-Configuration-index-dir" /> + <area coords="5 90" id="area-Reference_Guide-QueryHandler_configuration-Configuration-jbosscache-configuration" /> + <area coords="6 90" id="area-Reference_Guide-QueryHandler_configuration-Configuration-jgroups-configuration" /> + <area coords="7 90" id="area-Reference_Guide-QueryHandler_configuration-Configuration-jgroups-multiplexer-stack" /> + <area coords="8 90" id="area-Reference_Guide-QueryHandler_configuration-Configuration-jbosscache-cluster-name" /> + <area coords="9 90" id="area-Reference_Guide-QueryHandler_configuration-Configuration-max-volatile-time" /> </areaspec> <programlisting language="XML" role="XML"><xi:include href="../../../extras/Advanced_Development_JCR_query-handler-config/default59.xml" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting> <calloutlist> <callout arearefs="area-Reference_Guide-QueryHandler_configuration-Configuration-index-dir"> <para> - The <parameter>index-dir</parameter> property is the path to the index directory. + The <parameter>index-dir</parameter> property is the path to the index directory. Where <literal>${gatein.jcr.index.data.dir}</literal> is obtained from the file configuration.properties as explained in the installation guide and <literal>${container.name.suffix}</literal> is a dynamic value based on the name of the current portal context. </para> </callout> <callout arearefs="area-Reference_Guide-QueryHandler_configuration-Configuration-jbosscache-configuration"> @@ -121,7 +121,7 @@ <formalpara id="form-Reference_Guide-Configuration-JBoss_Cache_template_configuration"> <title>JBoss Cache template configuration</title> <para> - Below is an example JBoss Cache template configuration file for the query handler (<filename>jbosscache-indexer.xml</filename>). + Below is an example JBoss Cache template configuration file for the query handler used by the shipped-in workspaces. </para> </formalpara> Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/Advanced/JCR.xml =================================================================== --- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/Advanced/JCR.xml 2010-11-11 14:52:44 UTC (rev 5042) +++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/Advanced/JCR.xml 2010-11-11 16:08:35 UTC (rev 5043) @@ -7,8 +7,10 @@ <title>eXo JCR</title> <xi:include href="JCR/intro.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> <xi:include href="JCR/configuration.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> + <!-- <xi:include href="JCR/jdbc-data-container-config.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> - <!--<xi:include href="JCR/external-value-storages.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />--> + --> + <xi:include href="JCR/external-value-storages.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> <!--Section removed as JCR requirements already configured in EPP--> <xi:include href="JCR/search-configuration.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> <xi:include href="JCR/multilanguage-support.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> @@ -16,12 +18,14 @@ <!--Section removed as JCR requirements already configured in EPP--> <!--<xi:include href="JCR/cluster-config.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />--> <!--Section removed as JCR requirements already configured in EPP--> - <!--<xi:include href="JCR/jbosscache-configuration-templates.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />--> - <!--Section removed as JCR requirements already configured in EPP--> - <!--<xi:include href="JCR/lock-manager-config.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />--> - <!--Section removed as JCR requirements already configured in EPP--> + <xi:include href="JCR/jbosscache-configuration-templates.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> + <xi:include href="JCR/lock-manager-config.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> <xi:include href="JCR/query-handler-config.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> <xi:include href="JCR/jbossts-transaction-service.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> + <!-- <xi:include href="JCR/transaction-manager-lookup.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> + --> + <!-- <xi:include href="JCR/statistics.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> + --> </chapter>