gatein SVN: r5045 - epp/portal/branches/EPP_5_1_Branch.
by do-not-reply@jboss.org
Author: thomas.heute(a)jboss.com
Date: 2010-11-11 11:24:41 -0500 (Thu, 11 Nov 2010)
New Revision: 5045
Modified:
epp/portal/branches/EPP_5_1_Branch/pom.xml
Log:
JBEPP-625: Update Portlet Container to 2.2.0-CR02
Modified: epp/portal/branches/EPP_5_1_Branch/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/pom.xml 2010-11-11 16:14:52 UTC (rev 5044)
+++ epp/portal/branches/EPP_5_1_Branch/pom.xml 2010-11-11 16:24:41 UTC (rev 5045)
@@ -46,7 +46,7 @@
<nl.captcha.simplecaptcha.version>1.1.1-GA-Patch01</nl.captcha.simplecaptcha.version>
<org.gatein.common.version>2.0.3-GA</org.gatein.common.version>
<org.gatein.wci.version>2.0.2-GA</org.gatein.wci.version>
- <org.gatein.pc.version>2.2.0-CR01</org.gatein.pc.version>
+ <org.gatein.pc.version>2.2.0-CR02</org.gatein.pc.version>
<org.picketlink.idm>1.1.7.CR01</org.picketlink.idm>
<org.gatein.wsrp.version>2.0.0-Beta05</org.gatein.wsrp.version>
<org.gatein.mop.version>1.0.3-GA</org.gatein.mop.version>
15 years, 5 months
gatein SVN: r5044 - epp/portal/branches/EPP_5_1_Branch.
by do-not-reply@jboss.org
Author: thomas.heute(a)jboss.com
Date: 2010-11-11 11:14:52 -0500 (Thu, 11 Nov 2010)
New Revision: 5044
Modified:
epp/portal/branches/EPP_5_1_Branch/pom.xml
Log:
JBEPP-624: Upgrade eXo JCR to 1.12.6 CR01
Modified: epp/portal/branches/EPP_5_1_Branch/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/pom.xml 2010-11-11 16:08:35 UTC (rev 5043)
+++ epp/portal/branches/EPP_5_1_Branch/pom.xml 2010-11-11 16:14:52 UTC (rev 5044)
@@ -37,10 +37,10 @@
<name>GateIn - Portal</name>
<properties>
- <org.exoplatform.kernel.version>2.2.5-GA</org.exoplatform.kernel.version>
- <org.exoplatform.core.version>2.3.5-GA</org.exoplatform.core.version>
- <org.exoplatform.ws.version>2.1.5-GA</org.exoplatform.ws.version>
- <org.exoplatform.jcr.version>1.12.5-GA</org.exoplatform.jcr.version>
+ <org.exoplatform.kernel.version>2.2.6-CR01</org.exoplatform.kernel.version>
+ <org.exoplatform.core.version>2.3.6-CR01</org.exoplatform.core.version>
+ <org.exoplatform.ws.version>2.1.6-CR01</org.exoplatform.ws.version>
+ <org.exoplatform.jcr.version>1.12.6-CR01</org.exoplatform.jcr.version>
<org.jibx.version>1.2.1</org.jibx.version>
<org.shindig.version>1.0-r790473-Patch04</org.shindig.version>
<nl.captcha.simplecaptcha.version>1.1.1-GA-Patch01</nl.captcha.simplecaptcha.version>
15 years, 5 months
gatein SVN: r5043 - in epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US: extras/Advanced_Development_JCR_query-handler-config and 2 other directories.
by do-not-reply@jboss.org
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>
15 years, 5 months
gatein SVN: r5042 - in epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US: modules/Advanced and 1 other directories.
by do-not-reply@jboss.org
Author: thomas.heute(a)jboss.com
Date: 2010-11-11 09:52:44 -0500 (Thu, 11 Nov 2010)
New Revision: 5042
Modified:
epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_Configuration/orig.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/configuration.xml
epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/Advanced/JCR/intro.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_Configuration/orig.xml
===================================================================
--- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_Configuration/orig.xml 2010-11-11 12:16:48 UTC (rev 5041)
+++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/extras/Advanced_Development_JCR_Configuration/orig.xml 2010-11-11 14:52:44 UTC (rev 5042)
@@ -1,96 +1,65 @@
-<repository-service default-repository="repository">
- <repositories>
- <repository name="db1" system-workspace="ws" default-workspace="ws">
- <security-domain>exo-domain</security-domain>
- <access-control>optional</access-control>
- <session-max-age>1h</session-max-age>
- <authentication-policy>org.exoplatform.services.jcr.impl.core.access.JAASAuthenticator</authentication-policy>
- <workspaces>
- <workspace name="production">
- <!-- for system storage -->
- <container class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer">
- <properties>
- <property name="source-name" value="jdbcjcr" />
- <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-storage id="system" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage">
- <properties>
- <property name="path" value="../temp/values/production" />
- </properties>
- <filters>
- <filter property-type="Binary" />
- </filters>
- </value-storage>
- </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.LinkedWorkspaceStorageCacheImpl">
- <properties>
- <property name="max-size" value="10k" />
- <property name="live-time" value="1h" />
- </properties>
- </cache>
- <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex">
- <properties>
- <property name="index-dir" value="../temp/jcrlucenedb/production" />
- </properties>
- </query-handler>
- <lock-manager>
- <time-out>15m</time-out>
- <persister class="org.exoplatform.services.jcr.impl.core.lock.FileSystemLockPersister">
- <properties>
- <property name="path" value="../temp/lock/system" />
- </properties>
- </persister>
- </lock-manager>
- </workspace>
-
- <workspace name="backup">
- <container class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer">
- <properties>
- <property name="source-name" value="jdbcjcr" />
- <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/backup" />
- </properties>
- <value-storages>
- <value-storage id="draft" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage">
- <properties>
- <property name="path" value="../temp/values/backup" />
- </properties>
- <filters>
- <filter property-type="Binary" />
- </filters>
- </value-storage>
- </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.LinkedWorkspaceStorageCacheImpl">
- <properties>
- <property name="max-size" value="10k" />
- <property name="live-time" value="1h" />
- </properties>
- </cache>
- <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex">
- <properties>
- <property name="index-dir" value="../temp/jcrlucenedb/backup" />
- </properties>
- </query-handler>
- </workspace>
- </workspaces>
- </repository>
- </repositories>
-</repository-service>
+ <!-- Portal system data -->
+ <workspace name="portal-system">
+ <container class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer">
+ <properties>
+ <property name="source-name" value="${gatein.jcr.datasource.name}${container.name.suffix}"/>
+ <property name="dialect" value="${gatein.jcr.datasource.dialect}"/>
+ <property name="multi-db" value="false"/>
+ <property name="update-storage" value="true"/>
+ <property name="max-buffer-size" value="204800"/>
+ <property name="swap-directory" value="${gatein.jcr.data.dir}/swap/portal-system${container.name.suffix}"/>
+ </properties>
+ <value-storages>
+ <value-storage id="portal-system" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage">
+ <properties>
+ <property name="path" value="${gatein.jcr.storage.data.dir}/portal-system${container.name.suffix}"/>
+ </properties>
+ <filters>
+ <filter property-type="Binary"/>
+ </filters>
+ </value-storage>
+ </value-storages>
+ </container>
+ <initializer class="org.exoplatform.services.jcr.impl.core.ScratchWorkspaceInitializer">
+ <properties>
+ <property name="root-nodetype" value="nt:unstructured"/>
+ <property name="root-permissions" value="*:/platform/administrators read;*:/platform/administrators add_node;*:/platform/administrators set_property;*:/platform/administrators remove"/>
+ </properties>
+ </initializer>
+ <cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache">
+ <properties>
+ <property name="jbosscache-configuration" value="${gatein.jcr.cache.config}" />
+ <property name="jgroups-configuration" value="${gatein.jcr.jgroups.config}" />
+ <property name="jgroups-multiplexer-stack" value="true" />
+ <property name="jbosscache-cluster-name" value="jcr-${container.name.suffix}-portal-system" />
+ </properties>
+ </cache>
+ <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex">
+ <properties>
+ <property name="index-dir" value="${gatein.jcr.index.data.dir}/portal-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}-portal-system" />
+ <property name="max-volatile-time" value="60" />
+ </properties>
+ </query-handler>
+ <lock-manager class="org.exoplatform.services.jcr.impl.core.lock.jbosscache.CacheableLockManagerImpl">
+ <properties>
+ <property name="time-out" value="15m" />
+ <property name="jbosscache-configuration" value="${gatein.jcr.lock.cache.config}" />
+ <property name="jgroups-configuration" value="${gatein.jcr.jgroups.config}" />
+ <property name="jgroups-multiplexer-stack" value="true" />
+ <property name="jbosscache-cluster-name" value="jcrlock-${container.name.suffix}-portal-system" />
+ <property name="jbosscache-cl-cache.jdbc.table.name" value="jcrlock_portal_system" />
+ <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="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="${gatein.jcr.datasource.name}${container.name.suffix}" />
+ </properties>
+ </lock-manager>
+ </workspace>
Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/Advanced/JCR/configuration.xml
===================================================================
--- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/Advanced/JCR/configuration.xml 2010-11-11 12:16:48 UTC (rev 5041)
+++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/Advanced/JCR/configuration.xml 2010-11-11 14:52:44 UTC (rev 5042)
@@ -14,21 +14,64 @@
<programlisting language="Java" role="Java"><xi:include parse="text" href="../../../extras/Advanced_Development_JCR_Configuration/NMTOKEN.java" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting>
<para>
- To configure the JCR Service;
+ To modify the configuration of the JCR Service, you would need to modify the file found at <filename>/<replaceable>JBOSS_AS</replaceable>/server/<replaceable>PROFILE</replaceable>/deploy/gatein.ear/02portal.war/WEB-INF/conf/jcr/repository-configuration.xml</filename>.
+ <programlisting><![CDATA[
+<repository-service default-repository="repository">
+ <repositories>
+ <repository name="repository" system-workspace="system" default-workspace="portal-system">
+ <security-domain>gatein-domain</security-domain>
+ <access-control>optional</access-control>
+ <authentication-policy>org.exoplatform.services.jcr.impl.core.access.JAASAuthenticator</authentication-policy>
+
+ <!-- System -->
+ <workspaces>
+ [... Workspaces definitions ...]
+ </workspaces>
+ </repository>
+ </repositories>
+</repository-service>]]>
+
+ </programlisting>
</para>
<procedure>
<step>
<para>
- Familiarize yourself with the DTD file above and the either the example configuration file below or the one in your &PRODUCT; deployment (found at; <filename>/<replaceable>JBOSS_AS</replaceable>/server/<replaceable>PROFILE</replaceable>/deploy/gatein.ear/02portal.war/WEB-INF/conf/jcr/repository-configuration.xml</filename>).
+ In JBoss Enteprise Portal Platform you will see several configured workspaces required for the portal.
+ <itemizedlist>
+ <listitem>
+ <para>
+ <literal>system</literal>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <literal>portal-system</literal>: To store portal metadata such as page compositions
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <literal>portal-work</literal>: To store elements that are temporary such as tokens
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <literal>wsrp-system</literal>: To store WSRP related data
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <literal>wsrp-system</literal>: To store Portlet Container related data (such as portlet preferences
+ </para>
+ </listitem>
+
+ </itemizedlist>
</para>
</step>
+ <step>
+ <para>Locate the workspace to modify.
+ <step>
<step>
<para>
- Replace the element values marked below with those of your deployment environment.
- </para>
- </step>
- <step>
- <para>
The repository configuration supports human-readable values. They are not case-sensitive.
</para>
<para>
@@ -122,162 +165,27 @@
</step>
</procedure>
<section id="sect-Reference_Guide-Portal_and_Standalone_configuration-Repository_service_configuration">
- <title>Repository Service Configuration</title>
+ <title>Example of the portal-system workspace</title>
<!--DOCS NOTE: The callout configuration below is not rerndering correctly in Publican builds. The callout list icons do not rener from number 15 onwards. -->
<programlistingco>
<areaspec>
- <!--1-->
- <area coords="1 60" id="Reference_Guide-Portal_and_Standalone_configuration-Repository_service_configuration-default-repository"/>
+ <!--1-->
+ <area coords="2 60" id="Reference_Guide-Portal_and_Standalone_configuration-Repository_service_configuration-workspace-name"/>
<!--2-->
- <area coords="2 60" id="Reference_Guide-Portal_and_Standalone_configuration-Repository_service_configuration-repositories"/>
+ <area coords="3 90" id="Reference_Guide-Portal_and_Standalone_configuration-Repository_service_configuration-container"/>
<!--3-->
- <area coords="3 80" id="Reference_Guide-Portal_and_Standalone_configuration-Repository_service_configuration-name"/>
+ <area coords="23 90" id="Reference_Guide-Portal_and_Standalone_configuration-Repository_service_initializer"/>
<!--4-->
- <area coords="3 85" id="Reference_Guide-Portal_and_Standalone_configuration-Repository_service_configuration-system-workspace"/>
+ <area coords="29 60" id="Reference_Guide-Portal_and_Standalone_configuration-Repository_service_cache"/>
<!--5-->
- <area coords="3 90" id="Reference_Guide-Portal_and_Standalone_configuration-Repository_service_configuration-default-workspace"/>
+ <area coords="37 100" id="Reference_Guide-Portal_and_Standalone_configuration-Repository_service_query-handler"/>
<!--6-->
- <area coords="4 60" id="Reference_Guide-Portal_and_Standalone_configuration-Repository_service_configuration-security-domain"/>
- <!--7-->
- <area coords="5 60" id="Reference_Guide-Portal_and_Standalone_configuration-Repository_service_configuration-access-control"/>
- <!--8-->
- <area coords="6 60" id="Reference_Guide-Portal_and_Standalone_configuration-Repository_service_configuration-session-max-age"/>
- <!--9-->
- <area coords="7 100" id="Reference_Guide-Portal_and_Standalone_configuration-Repository_service_configuration-authentication-policy"/>
- <!--10-->
- <area coords="8 60" id="Reference_Guide-Portal_and_Standalone_configuration-Repository_service_configuration-workspaces"/>
- <!--11-->
- <area coords="9 60" id="Reference_Guide-Portal_and_Standalone_configuration-Repository_service_configuration-workspace-name"/>
- <!--12-->
- <area coords="11 90" id="Reference_Guide-Portal_and_Standalone_configuration-Repository_service_configuration-container"/>
- <!--13-->
- <area coords="30 90" id="Reference_Guide-Portal_and_Standalone_configuration-Repository_service_initializer"/>
- <!--14-->
- <area coords="35 60" id="Reference_Guide-Portal_and_Standalone_configuration-Repository_service_cache"/>
- <!--15-->
- <area coords="41 100" id="Reference_Guide-Portal_and_Standalone_configuration-Repository_service_query-handler"/>
- <!--16-->
- <area coords="47 60" id="Reference_Guide-Portal_and_Standalone_configuration-Repository_service_lock-manager-timeout"/>
- <!--17-->
- <area coords="48 100" id="Reference_Guide-Portal_and_Standalone_configuration-Repository_service_lock-manager-persister"/>
- <!--18-->
- <area coords="50 90" id="Reference_Guide-Portal_and_Standalone_configuration-Repository_service_lock-manager-path"/>
- <!--19-->
- <area coords="57 110" id="Reference_Guide-Portal_and_Standalone_configuration-Repository_service_workspace-container-class"/>
- <!--20-->
- <area coords="58 60" id="Reference_Guide-Portal_and_Standalone_configuration-Repository_service_workspace-container-properties"/>
- <!--21-->
- <area coords="65 60" id="Reference_Guide-Portal_and_Standalone_configuration-Repository_service_workspace-container-value-storages"/>
- <!--22-->
- <area coords="66 90" id="Reference_Guide-Portal_and_Standalone_configuration-Repository_service_workspace-container-value-storage"/>
- <!--23-->
- <area coords="66 95" id="Reference_Guide-Portal_and_Standalone_configuration-Repository_service_workspace-container-value-class"/>
- <!--24-->
- <area coords="67 60" id="Reference_Guide-Portal_and_Standalone_configuration-Repository_service_workspace-container-value-properties"/>
- <!--25-->
- <area coords="70 60" id="Reference_Guide-Portal_and_Standalone_configuration-Repository_service_workspace-container-value-filters"/>
- <!--26-->
- <area coords="76 90" id="Reference_Guide-Portal_and_Standalone_configuration-Repository_service_initializer_implementation_class"/>
- <!--27-->
- <area coords="77 60" id="Reference_Guide-Portal_and_Standalone_configuration-Repository_service_initializer_implementation_properties"/>
- <!--28-->
- <area coords="81 90" id="Reference_Guide-Portal_and_Standalone_configuration-Repository_service_cache_enabled"/>
- <!--29-->
- <area coords="81 95" id="Reference_Guide-Portal_and_Standalone_configuration-Repository_service_cache_class"/>
- <!--30-->
- <area coords="82 60" id="Reference_Guide-Portal_and_Standalone_configuration-Repository_service_cache_properties"/>
- <!--31-->
- <area coords="87 100" id="Reference_Guide-Portal_and_Standalone_configuration-Repository_service_query-handler-class"/>
- <!--32-->
- <area coords="88 60" id="Reference_Guide-Portal_and_Standalone_configuration-Repository_service_query-handler-properties"/>
+ <area coords="50 60" id="Reference_Guide-Portal_and_Standalone_configuration-Repository_service_lock-manager-timeout"/>
</areaspec>
<programlisting language="XML" role="XML"><xi:include parse="text" href="../../../extras/Advanced_Development_JCR_Configuration/orig.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting>
<calloutlist>
- <!--<title>Repository Service configuration:</title>-->
- <callout arearefs="Reference_Guide-Portal_and_Standalone_configuration-Repository_service_configuration-default-repository">
- <para>
- The name of a default repository (one returned by RepositoryService.getRepository())
- </para>
- </callout>
- <callout arearefs="Reference_Guide-Portal_and_Standalone_configuration-Repository_service_configuration-repositories">
- <para>
- The list of repositories is configured within the <repositories> element.
- </para>
- </callout>
- <!--</calloutlist>
- <calloutlist>
- <title>Repository configuration:</title>-->
- <callout arearefs="Reference_Guide-Portal_and_Standalone_configuration-Repository_service_configuration-name">
- <para>
- The name of the repository being configured.
- </para>
- </callout>
- <callout arearefs="Reference_Guide-Portal_and_Standalone_configuration-Repository_service_configuration-default-workspace">
- <para>
- The name of a workspace. This can be obtained using Session's <literal>login()</literal> or <literal>login(Credentials)</literal> methods for workspaces without an explicit name.
- </para>
- </callout>
- <callout arearefs="Reference_Guide-Portal_and_Standalone_configuration-Repository_service_configuration-system-workspace">
- <para>
- The name of workspace where /jcr:system node is placed.
- </para>
- </callout>
- <callout arearefs="Reference_Guide-Portal_and_Standalone_configuration-Repository_service_configuration-security-domain">
- <para>
- The name of a security domain for JAAS authentication
- </para>
- </callout>
- <callout arearefs="Reference_Guide-Portal_and_Standalone_configuration-Repository_service_configuration-access-control">
- <para>
- The name of an access control policy. There can be three types:
- </para>
- <variablelist>
- <varlistentry>
- <term>optional</term>
- <listitem>
- <para>
- AN ACL is created on demand. This is the default policy.
- </para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>disable</term>
- <listitem>
- <para>
- Disables access control.
- </para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>mandatory</term>
- <listitem>
- <para>
- An ACL is created for each added node. This function is not supported in this release.
- </para>
- </listitem>
- </varlistentry>
- </variablelist>
- </callout>
- <callout arearefs="Reference_Guide-Portal_and_Standalone_configuration-Repository_service_configuration-session-max-age">
- <para>
- The amount of time before an idle session will be removed (called logout). If it is not set, the idle session will never be removed.
- </para>
- </callout>
- <callout arearefs="Reference_Guide-Portal_and_Standalone_configuration-Repository_service_configuration-authentication-policy">
- <para>
- The name of an authentication policy class.
- </para>
- </callout>
- <callout arearefs="Reference_Guide-Portal_and_Standalone_configuration-Repository_service_configuration-workspaces">
- <para>
- The list of workspaces.
- </para>
- </callout>
- <!--</calloutlist>
- <calloutlist>
- <title>Workspace configuration:</title>-->
<callout arearefs="Reference_Guide-Portal_and_Standalone_configuration-Repository_service_configuration-workspace-name">
<para>
The name of the workspace.
@@ -303,172 +211,11 @@
Query handler configuration.
</para>
</callout>
- <!--</calloutlist>
- <calloutlist>
- <title>Lock Manager configuration:</title>-->
<callout arearefs="Reference_Guide-Portal_and_Standalone_configuration-Repository_service_lock-manager-timeout">
<para>
The amount of time before the unused global lock is removed.
</para>
</callout>
- <callout arearefs="Reference_Guide-Portal_and_Standalone_configuration-Repository_service_lock-manager-persister">
- <para>
- A class for storing lock information for future use. For example; remove lock after restarting JCR.
- </para>
- </callout>
- <callout arearefs="Reference_Guide-Portal_and_Standalone_configuration-Repository_service_lock-manager-path">
- <para>
- Each workspace has its own lock folder.
- </para>
- </callout>
- <!--</calloutlist>
- <calloutlist>
- <title>Workspace data container configuration:</title>-->
- <callout arearefs="Reference_Guide-Portal_and_Standalone_configuration-Repository_service_workspace-container-class">
- <para>
- A workspace data container class name.
- </para>
- </callout>
- <callout arearefs="Reference_Guide-Portal_and_Standalone_configuration-Repository_service_workspace-container-properties">
- <para>
- The list of properties (in name-value pairs) for the concrete Workspace data container.
- </para>
- </callout>
- <callout arearefs="Reference_Guide-Portal_and_Standalone_configuration-Repository_service_workspace-container-value-storages">
- <para>
- The list of value storage plugins.
- </para>
- </callout>
- <!--</calloutlist>
- <calloutlist>
- <title>Value storage plugin configuration (optional feature):</title>-->
- <callout arearefs="Reference_Guide-Portal_and_Standalone_configuration-Repository_service_workspace-container-value-storage">
- <para>
- <emphasis role="bold">Optional</emphasis>: Value storage plugin definition. If this element is not included, the values will be stored as BLOBs inside the database.
- </para>
- </callout>
- <callout arearefs="Reference_Guide-Portal_and_Standalone_configuration-Repository_service_workspace-container-value-class">
- <para>
- A value storage plugin class name (attribute).
- </para>
- </callout>
- <callout arearefs="Reference_Guide-Portal_and_Standalone_configuration-Repository_service_workspace-container-value-properties">
- <para>
- The list of properties (in name-value pairs) for a concrete value storage plugin.
- </para>
- </callout>
- <callout arearefs="Reference_Guide-Portal_and_Standalone_configuration-Repository_service_workspace-container-value-filters">
- <para>
- The list of filters defining conditions when this plugin is applicable.
- </para>
- </callout>
- <!--</calloutlist>
- <calloutlist>
- <title>Initializer configuration (optional):</title>-->
- <callout arearefs="Reference_Guide-Portal_and_Standalone_configuration-Repository_service_initializer_implementation_class">
- <para>
- Initializer implementation class.
- </para>
- </callout>
- <callout arearefs="Reference_Guide-Portal_and_Standalone_configuration-Repository_service_initializer_implementation_properties">
- <para>
- The list of properties (in name-value pairs). Properties are supported:
- </para>
- <variablelist>
- <varlistentry>
- <term>root-nodetype</term>
- <listitem>
- <para>
- The node type for root node initialization.
- </para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>root-permissions</term>
- <listitem>
- <para>
- Default permissions of the root node. It is defined as a set of semicolon-delimited permissions containing a group of space-delimited identities and the type of permission.
- </para>
- <para>
- For example any read;:/admin read;:/admin add_node;:/admin set_property;:/admin remove means that users from group admin have all permissions and other users have only a 'read' permission.
- </para>
- <para>
- Configurable initializer adds a capability to override workspace initial startup procedure.
- </para>
- </listitem>
- </varlistentry>
- </variablelist>
- </callout>
- <!--</calloutlist>
- <calloutlist>
- <title>Cache configuration:</title>-->
- <callout arearefs="Reference_Guide-Portal_and_Standalone_configuration-Repository_service_cache_enabled">
- <para>
- Defines if the workspace cache is enabled.
- </para>
- </callout>
- <callout arearefs="Reference_Guide-Portal_and_Standalone_configuration-Repository_service_cache_class">
- <para>
- Cache implementation class. This is optional from JCR version 1.9.
- </para>
- <para>
- The default value is <literal>org.exoplatform.services.jcr.impl.dataflow.persistent.LinkedWorkspaceStorageCacheImpl</literal>.
- </para>
- <para>
- The cache can be configured to use concrete implementations of the <literal>WorkspaceStorageCache</literal> interface.
- </para>
- <para>
- The JCR core has two implementations to use:
- </para>
- <para>
- <emphasis role="bold">LinkedWorkspaceStorageCacheImpl</emphasis>
- </para>
- <para>
- The default implementation, with configurable read behavior and statistics.
- </para>
- <para>
- <emphasis role="bold">WorkspaceStorageCacheImpl</emphasis>
- </para>
- <para>
- This implementation is a legacy from pre 1.9 versions of the JCR. However, it can still be used.
- </para>
- </callout>
- <callout arearefs="Reference_Guide-Portal_and_Standalone_configuration-Repository_service_cache_properties">
- <para>
- The list of properties (in name-value pairs) for the workspace cache:
- </para>
- <variablelist>
- <varlistentry>
- <term>max-size</term>
- <listitem>
- <para>
- The maximum size of the cache.
- </para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term>live-time</term>
- <listitem>
- <para>
- Cached item live time.
- </para>
- </listitem>
- </varlistentry>
- </variablelist>
- </callout>
- <!--</calloutlist>
- <calloutlist>
- <title>Query Handler configuration:</title>-->
- <callout arearefs="Reference_Guide-Portal_and_Standalone_configuration-Repository_service_query-handler-class">
- <para>
- A Query Handler class name.
- </para>
- </callout>
- <callout arearefs="Reference_Guide-Portal_and_Standalone_configuration-Repository_service_query-handler-properties">
- <para>
- The list of properties (name-value pairs) for a Query Handler (<literal>indexDir</literal>) properties and advanced features described in <xref linkend="sect-Reference_Guide-Search_Configuration"/>.
- </para>
- </callout>
</calloutlist>
</programlistingco>
Modified: epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/Advanced/JCR/intro.xml
===================================================================
--- epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/Advanced/JCR/intro.xml 2010-11-11 12:16:48 UTC (rev 5041)
+++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/Advanced/JCR/intro.xml 2010-11-11 14:52:44 UTC (rev 5042)
@@ -5,11 +5,17 @@
]>
<section id="sect-Reference_Guide-Introduction">
<title>Introduction</title>
+ <warning>
+ <title>eXo JCR usage</title>
+ <para>
+ The JBoss Enterprise Portal Platform is using a JCR API to store its information for internal usage. We do not support usage of the JCR to store application infornation. The information below only exists if one need to understand particular low level details on how the JBoss Enterprise Portal Platform works and how it can be fine-tuned.
+ </para>
+ </warning>
<para>
The term <emphasis role="bold">JCR</emphasis> refers to the Java Content Repository. The JCR is the data store of JBoss Enterprise Portal Platform. All content is stored and managed via the JCR.
</para>
<para>
- The eXo JCR included with JBoss Enterprise Portal Platform 5.1 is a (<ulink type="http" url="http://www.jcp.org/en/jsr/detail?id=170">JSR-170</ulink>) compliant implementation of the JCR 1.0 specification. The JCR provides versioning, textual search, access control, content event monitoring, and can be used for storing text and binary data. The backend storage of the JCR is configurable and can be a filesystem or a database.
+ The eXo JCR included with JBoss Enterprise Portal Platform 5.1 is a (<ulink type="http" url="http://www.jcp.org/en/jsr/detail?id=170">JSR-170</ulink>) compliant implementation of the JCR 1.0 specification. The JCR provides versioning, textual search, access control, content event monitoring, and is used to storing text and binary data for the portal internal usage. The backend storage of the JCR is configurable and can be a filesystem or a database.
</para>
<section id="sect-Reference_Guide-Introduction-Concepts">
<title>Concepts</title>
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 12:16:48 UTC (rev 5041)
+++ epp/docs/branches/EPP_5_1_Branch/Reference_Guide/en-US/modules/Advanced/JCR.xml 2010-11-11 14:52:44 UTC (rev 5042)
@@ -6,8 +6,7 @@
<chapter id="chap-Reference_Guide-eXo_JCR">
<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" />-->
- <!--Section removed as JCR requirements already configured in EPP-->
+ <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" />-->
<!--Section removed as JCR requirements already configured in EPP-->
15 years, 5 months
gatein SVN: r5041 - epp/portal/branches/EPP_5_1_Branch.
by do-not-reply@jboss.org
Author: thomas.heute(a)jboss.com
Date: 2010-11-11 07:16:48 -0500 (Thu, 11 Nov 2010)
New Revision: 5041
Modified:
epp/portal/branches/EPP_5_1_Branch/pom.xml
Log:
JBEPP-621: Upgrade PicketLink IDM jars to 1.1.7.CR01
Modified: epp/portal/branches/EPP_5_1_Branch/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/pom.xml 2010-11-11 12:11:09 UTC (rev 5040)
+++ epp/portal/branches/EPP_5_1_Branch/pom.xml 2010-11-11 12:16:48 UTC (rev 5041)
@@ -47,7 +47,7 @@
<org.gatein.common.version>2.0.3-GA</org.gatein.common.version>
<org.gatein.wci.version>2.0.2-GA</org.gatein.wci.version>
<org.gatein.pc.version>2.2.0-CR01</org.gatein.pc.version>
- <org.picketlink.idm>1.1.6.GA</org.picketlink.idm>
+ <org.picketlink.idm>1.1.7.CR01</org.picketlink.idm>
<org.gatein.wsrp.version>2.0.0-Beta05</org.gatein.wsrp.version>
<org.gatein.mop.version>1.0.3-GA</org.gatein.mop.version>
<org.slf4j.version>1.5.6</org.slf4j.version>
15 years, 5 months
gatein SVN: r5040 - portal/trunk.
by do-not-reply@jboss.org
Author: bdaw
Date: 2010-11-11 07:11:09 -0500 (Thu, 11 Nov 2010)
New Revision: 5040
Modified:
portal/trunk/pom.xml
Log:
GTNPORTAL-1647 Upgrade PicketLink IDM jars to 1.1.7.CR01
Modified: portal/trunk/pom.xml
===================================================================
--- portal/trunk/pom.xml 2010-11-11 11:20:01 UTC (rev 5039)
+++ portal/trunk/pom.xml 2010-11-11 12:11:09 UTC (rev 5040)
@@ -47,7 +47,7 @@
<org.gatein.common.version>2.0.3-GA</org.gatein.common.version>
<org.gatein.wci.version>2.0.2-GA</org.gatein.wci.version>
<org.gatein.pc.version>2.2.0-CR02</org.gatein.pc.version>
- <org.picketlink.idm>1.1.6.GA</org.picketlink.idm>
+ <org.picketlink.idm>1.1.7.CR01</org.picketlink.idm>
<org.gatein.wsrp.version>2.0.0-CR02</org.gatein.wsrp.version>
<org.gatein.mop.version>1.0.3-GA</org.gatein.mop.version>
<org.slf4j.version>1.5.6</org.slf4j.version>
15 years, 5 months
gatein SVN: r5039 - epp/portal/branches/EPP_5_1_Branch/portlet/exoadmin/src/main/java/org/exoplatform/toolbar/webui/component.
by do-not-reply@jboss.org
Author: thomas.heute(a)jboss.com
Date: 2010-11-11 06:20:01 -0500 (Thu, 11 Nov 2010)
New Revision: 5039
Modified:
epp/portal/branches/EPP_5_1_Branch/portlet/exoadmin/src/main/java/org/exoplatform/toolbar/webui/component/UIUserToolBarSitePortlet.java
Log:
JBEPP-600: Portal names: "por", "port", "porta", "portal" caused problems with portal url links
Modified: epp/portal/branches/EPP_5_1_Branch/portlet/exoadmin/src/main/java/org/exoplatform/toolbar/webui/component/UIUserToolBarSitePortlet.java
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/portlet/exoadmin/src/main/java/org/exoplatform/toolbar/webui/component/UIUserToolBarSitePortlet.java 2010-11-11 10:56:29 UTC (rev 5038)
+++ epp/portal/branches/EPP_5_1_Branch/portlet/exoadmin/src/main/java/org/exoplatform/toolbar/webui/component/UIUserToolBarSitePortlet.java 2010-11-11 11:20:01 UTC (rev 5039)
@@ -60,7 +60,8 @@
public String getPortalURI(String portalName)
{
- return Util.getPortalRequestContext().getPortalURI().replace(getCurrentPortal(), portalName);
+ String currentPortalURI = Util.getPortalRequestContext().getPortalURI();
+ return currentPortalURI.substring(0, currentPortalURI.lastIndexOf(getCurrentPortal())) + portalName + "/";
}
public PageNavigation getCurrentPortalNavigation() throws Exception
15 years, 5 months
gatein SVN: r5038 - in portal/trunk/docs/reference-guide/en/modules: Configuration and 1 other directory.
by do-not-reply@jboss.org
Author: thomas.heute(a)jboss.com
Date: 2010-11-11 05:56:29 -0500 (Thu, 11 Nov 2010)
New Revision: 5038
Added:
portal/trunk/docs/reference-guide/en/modules/Configuration/HTTPSConfiguration.xml
Modified:
portal/trunk/docs/reference-guide/en/modules/Configuration.xml
Log:
GTNPORTAL-1535: Remote gadgets don't work under https mode
Added: portal/trunk/docs/reference-guide/en/modules/Configuration/HTTPSConfiguration.xml
===================================================================
--- portal/trunk/docs/reference-guide/en/modules/Configuration/HTTPSConfiguration.xml (rev 0)
+++ portal/trunk/docs/reference-guide/en/modules/Configuration/HTTPSConfiguration.xml 2010-11-11 10:56:29 UTC (rev 5038)
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "../../Reference_Guide.ent">
+%BOOK_ENTITIES;
+]>
+<section id="sect-Reference_Guide-HTTPS_Configuration">
+ <title>HTTPS Configuration</title>
+
+ <section id="sect-Reference_Guide-HTTPS_Configuration-Overview">
+ <title>Overview</title>
+
+ <para>&PRODUCT; default run on HTTP mode. However, for security purpose, you can config GateIn to run on HTTPS mode. This section show you how to config GateIn with HTTPS mode.</para>
+
+ </section>
+ <section id="sect-Reference_Guide-HTTPS_Configuration-Generate_Key">
+ <title>Generate your key</title>
+
+ <para>If you haven't your own X.509 certificate, you can make a simple certificate using keytool command:
+ <programlisting>keytool -genkey -alias serverkeys -keyalg RSA -keystore server.keystore -storepass 123456 -keypass 123456 -dname "CN=localhost, OU=MYOU, O=MYORG, L=MYCITY, ST=MYSTATE, C=MY"</programlisting></para>
+
+ <para>Now, your key is stored in server.keystore</para>
+
+ <para>You need to import your key into the Sun JDK keystore (This is required to help running gadget features)
+ <programlisting>keytool -importkeystore -srckeystore server.keystore -destkeystore $JAVA_HOME/jre/lib/security/cacerts</programlisting></para>
+ </section>
+ <section id="sect-Reference_Guide-HTTPS_Configuration-Use_In_Jboss">
+ <title>Setup Jboss configuration to use your key</title>
+ <para>Edit server.xml from jboss/server/<NAME>/deploy/jbossweb.sar folder.
+ Comment lines:
+ <programlisting><Connector protocol="HTTP/1.1" port="8080" address="${jboss.bind.address}"
+ connectionTimeout="20000" redirectPort="8443" /></programlisting>
+ Uncomment lines and change keystoreFile and keystorePass to values of your key:
+ <programlisting><Connector protocol="HTTP/1.1" SSLEnabled="true"
+ port="8443" address="${jboss.bind.address}"
+ scheme="https" secure="true" clientAuth="false"
+ keystoreFile="$JAVA_HOME/jre/lib/security/cacerts"
+ keystorePass="123456" sslProtocol = "TLS" /></programlisting>
+ </para>
+ </section>
+ <section id="sect-Reference_Guide-HTTPS_Configuration-Use_In_Tomcat">
+ <title>Setup Tomcat configuration to use your key</title>
+
+ <para>Edit server.xml from tomcat/conf folder. Comment lines:
+ <programlisting><Connector port="8080" protocol="HTTP/1.1"
+ maxThreads="150" connectionTimeout="20000"
+ redirectPort="8443" URIEncoding="UTF-8"
+ emptySessionPath="true"/></programlisting>
+ Uncomment lines and add keystoreFile and keystorePass values:
+ <programlisting><Connector port="8443" protocol="HTTP/1.1" SSLEnabled="true"
+ maxThreads="150" scheme="https" secure="true"
+ clientAuth="false" sslProtocol="TLS"
+ keystoreFile="$JAVA_HOME/jre/lib/security/cacerts"
+ keystorePass="123456" /></programlisting>
+ </para>
+
+ <para>Restart GateIn. If your configuration is correct, you can access to GateIn via address: <literal>https://<ServerAddress>:8443/portal</literal></para>
+ </section>
+</section>
Modified: portal/trunk/docs/reference-guide/en/modules/Configuration.xml
===================================================================
--- portal/trunk/docs/reference-guide/en/modules/Configuration.xml 2010-11-11 08:15:43 UTC (rev 5037)
+++ portal/trunk/docs/reference-guide/en/modules/Configuration.xml 2010-11-11 10:56:29 UTC (rev 5038)
@@ -7,4 +7,5 @@
<title>Configuration</title>
<xi:include href="Configuration/DatabaseConfiguration.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="Configuration/EMailServiceConfiguration.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
-</chapter>
\ No newline at end of file
+ <xi:include href="Configuration/HTTPSConfiguration.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+</chapter>
15 years, 5 months
gatein SVN: r5037 - in exo/portal/branches/3.1.x/component/common/src/main/java/conf/jcr/jbosscache: local and 1 other directory.
by do-not-reply@jboss.org
Author: trong.tran
Date: 2010-11-11 03:15:43 -0500 (Thu, 11 Nov 2010)
New Revision: 5037
Modified:
exo/portal/branches/3.1.x/component/common/src/main/java/conf/jcr/jbosscache/cluster/config.xml
exo/portal/branches/3.1.x/component/common/src/main/java/conf/jcr/jbosscache/local/config.xml
Log:
EXOGTN-130 Use the ExpirationAlgorithm as eviction algorithm instead of FIFO or LRU
Modified: exo/portal/branches/3.1.x/component/common/src/main/java/conf/jcr/jbosscache/cluster/config.xml
===================================================================
--- exo/portal/branches/3.1.x/component/common/src/main/java/conf/jcr/jbosscache/cluster/config.xml 2010-11-11 08:13:46 UTC (rev 5036)
+++ exo/portal/branches/3.1.x/component/common/src/main/java/conf/jcr/jbosscache/cluster/config.xml 2010-11-11 08:15:43 UTC (rev 5037)
@@ -29,12 +29,11 @@
</clustering>
<!-- Eviction configuration -->
- <eviction wakeUpInterval="5000">
- <default algorithmClass="org.jboss.cache.eviction.LRUAlgorithm"
- actionPolicyClass="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.ParentNodeEvictionActionPolicy"
- eventQueueSize="1000000">
- <property name="maxNodes" value="5000" />
- <property name="timeToLive" value="20000" />
- </default>
- </eviction>
+ <eviction wakeUpInterval="5000">
+ <default algorithmClass="org.jboss.cache.eviction.ExpirationAlgorithm" actionPolicyClass="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.ParentNodeEvictionActionPolicy"
+ eventQueueSize="1000000">
+ <property name="maxNodes" value="5000" />
+ <property name="warnNoExpirationKey" value="false" />
+ </default>
+ </eviction>
</jbosscache>
\ No newline at end of file
Modified: exo/portal/branches/3.1.x/component/common/src/main/java/conf/jcr/jbosscache/local/config.xml
===================================================================
--- exo/portal/branches/3.1.x/component/common/src/main/java/conf/jcr/jbosscache/local/config.xml 2010-11-11 08:13:46 UTC (rev 5036)
+++ exo/portal/branches/3.1.x/component/common/src/main/java/conf/jcr/jbosscache/local/config.xml 2010-11-11 08:15:43 UTC (rev 5037)
@@ -28,9 +28,10 @@
<!-- Eviction configuration -->
<eviction wakeUpInterval="5000">
- <default algorithmClass="org.jboss.cache.eviction.FIFOAlgorithm" actionPolicyClass="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.ParentNodeEvictionActionPolicy" eventQueueSize="1000000">
+ <default algorithmClass="org.jboss.cache.eviction.ExpirationAlgorithm" actionPolicyClass="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.ParentNodeEvictionActionPolicy"
+ eventQueueSize="1000000">
<property name="maxNodes" value="5000" />
- <property name="minTimeToLive" value="20000" />
+ <property name="warnNoExpirationKey" value="false" />
</default>
</eviction>
15 years, 5 months
gatein SVN: r5035 - portal/trunk.
by do-not-reply@jboss.org
Author: chris.laprun(a)jboss.com
Date: 2010-11-10 18:51:09 -0500 (Wed, 10 Nov 2010)
New Revision: 5035
Modified:
portal/trunk/pom.xml
Log:
- Updated to use WSRP 2.0.0-CR02 and PC 2.2.0-CR02.
Modified: portal/trunk/pom.xml
===================================================================
--- portal/trunk/pom.xml 2010-11-10 23:29:26 UTC (rev 5034)
+++ portal/trunk/pom.xml 2010-11-10 23:51:09 UTC (rev 5035)
@@ -46,9 +46,9 @@
<nl.captcha.simplecaptcha.version>1.1.1-GA-Patch01</nl.captcha.simplecaptcha.version>
<org.gatein.common.version>2.0.3-GA</org.gatein.common.version>
<org.gatein.wci.version>2.0.2-GA</org.gatein.wci.version>
- <org.gatein.pc.version>2.2.0-CR01</org.gatein.pc.version>
+ <org.gatein.pc.version>2.2.0-CR02</org.gatein.pc.version>
<org.picketlink.idm>1.1.6.GA</org.picketlink.idm>
- <org.gatein.wsrp.version>2.0.0-CR01</org.gatein.wsrp.version>
+ <org.gatein.wsrp.version>2.0.0-CR02</org.gatein.wsrp.version>
<org.gatein.mop.version>1.0.3-GA</org.gatein.mop.version>
<org.slf4j.version>1.5.6</org.slf4j.version>
<rhino.version>1.6R5</rhino.version>
15 years, 5 months