gatein SVN: r1444 - portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2010-01-25 06:12:49 -0500 (Mon, 25 Jan 2010)
New Revision: 1444
Added:
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/repository-configuration.xml
Removed:
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/cluster/
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/local/
Modified:
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/jcr-configuration.xml
Log:
move the repository-configuration.xml back to its former place as its not needed to be duplicated for now
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/jcr-configuration.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/jcr-configuration.xml 2010-01-25 09:35:28 UTC (rev 1443)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/jcr-configuration.xml 2010-01-25 11:12:49 UTC (rev 1444)
@@ -31,7 +31,7 @@
<value-param>
<name>conf-path</name>
<description>JCR configuration file</description>
- <value>war:/conf/jcr/local/repository-configuration.xml</value>
+ <value>war:/conf/jcr/repository-configuration.xml</value>
</value-param>
<properties-param>
<name>working-conf</name>
Copied: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/repository-configuration.xml (from rev 1442, portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/local/repository-configuration.xml)
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/repository-configuration.xml (rev 0)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/repository-configuration.xml 2010-01-25 11:12:49 UTC (rev 1444)
@@ -0,0 +1,230 @@
+<!--
+
+ Copyright (C) 2009 eXo Platform SAS.
+
+ This is free software; you can redistribute it and/or modify it
+ under the terms of the GNU Lesser General Public License as
+ published by the Free Software Foundation; either version 2.1 of
+ the License, or (at your option) any later version.
+
+ This software is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this software; if not, write to the Free
+ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+
+-->
+
+<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>
+ <workspace name="system">
+ <container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer">
+ <properties>
+ <property name="source-name" value="${gatein.datasource.name}${container.name.suffix}"/>
+ <property name="dialect" value="${gatein.datasource.dialect.jcr}"/>
+ <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}/system${container.name.suffix}"/>
+ </properties>
+ <value-storages>
+ <value-storage id="system" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage">
+ <properties>
+ <property name="path" value="${gatein.jcr.storage.data.dir}/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="conf/jcr/jbosscache/${gatein.jcr.config.type}/config-system.xml" />
+ </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}/system${container.name.suffix}"/>
+ <property name="changesfilter-class" value="${gatein.jcr.changefilterclass}" />
+ <property name="changesfilter-config-path" value="conf/jcr/jbosscache/cluster/indexer-config-system.xml" />
+ <property name="max-volatile-time" value="60" />
+ </properties>
+ </query-handler>
+ <lock-manager class="org.exoplatform.services.jcr.impl.core.lock.jbosscache.CacheableLockManager">
+ <properties>
+ <property name="time-out" value="15m" />
+ <property name="jbosscache-configuration" value="conf/jcr/jbosscache/${gatein.jcr.config.type}/lock-config-system.xml" />
+ </properties>
+ </lock-manager>
+ </workspace>
+
+ <!-- Portal system data -->
+ <workspace name="portal-system">
+ <container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer">
+ <properties>
+ <property name="source-name" value="${gatein.datasource.name}${container.name.suffix}"/>
+ <property name="dialect" value="${gatein.datasource.dialect.jcr}"/>
+ <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="any read;*:/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="conf/jcr/jbosscache/${gatein.jcr.config.type}/config-portal-system.xml" />
+ </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.changefilterclass}" />
+ <property name="changesfilter-config-path" value="conf/jcr/jbosscache/cluster/indexer-config-portal-system.xml" />
+ <property name="max-volatile-time" value="60" />
+ </properties>
+ </query-handler>
+ <lock-manager class="org.exoplatform.services.jcr.impl.core.lock.jbosscache.CacheableLockManager">
+ <properties>
+ <property name="time-out" value="15m" />
+ <property name="jbosscache-configuration" value="conf/jcr/jbosscache/${gatein.jcr.config.type}/lock-config-portal-system.xml" />
+ </properties>
+ </lock-manager>
+ </workspace>
+
+ <!-- Portal work data -->
+ <workspace name="portal-work">
+ <container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer">
+ <properties>
+ <property name="source-name" value="${gatein.datasource.name}${container.name.suffix}"/>
+ <property name="dialect" value="${gatein.datasource.dialect.jcr}"/>
+ <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-work${container.name.suffix}"/>
+ </properties>
+ <value-storages>
+ <value-storage id="portal-work" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage">
+ <properties>
+ <property name="path" value="${gatein.jcr.storage.data.dir}/portal-work${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="any read;*:/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="conf/jcr/jbosscache/${gatein.jcr.config.type}/config-portal-work.xml" />
+ </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-work${container.name.suffix}"/>
+ <property name="changesfilter-class" value="${gatein.jcr.changefilterclass}" />
+ <property name="changesfilter-config-path" value="conf/jcr/jbosscache/cluster/indexer-config-portal-work.xml" />
+ <property name="max-volatile-time" value="60" />
+ </properties>
+ </query-handler>
+ <lock-manager class="org.exoplatform.services.jcr.impl.core.lock.jbosscache.CacheableLockManager">
+ <properties>
+ <property name="time-out" value="15m" />
+ <property name="jbosscache-configuration" value="conf/jcr/jbosscache/${gatein.jcr.config.type}/lock-config-portal-work.xml" />
+ </properties>
+ </lock-manager>
+ </workspace>
+
+ <!-- Workspace for WSRP -->
+ <workspace name="wsrp-system">
+ <container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer">
+ <properties>
+ <property name="source-name" value="${gatein.datasource.name}${container.name.suffix}"/>
+ <property name="dialect" value="${gatein.datasource.dialect.jcr}"/>
+ <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/wsrp${container.name.suffix}"/>
+ </properties>
+ <value-storages>
+ <value-storage id="gadgets"
+ class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage">
+ <properties>
+ <property name="path" value="${gatein.jcr.storage.data.dir}/wsrp${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="any read;*:/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="conf/jcr/jbosscache/${gatein.jcr.config.type}/config-wsrp-system.xml" />
+ </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}/wsrp${container.name.suffix}"/>
+ <property name="changesfilter-class" value="${gatein.jcr.changefilterclass}" />
+ <property name="changesfilter-config-path" value="conf/jcr/jbosscache/cluster/indexer-config-wsrp-system.xml" />
+ <property name="max-volatile-time" value="60" />
+ </properties>
+ </query-handler>
+ <lock-manager class="org.exoplatform.services.jcr.impl.core.lock.jbosscache.CacheableLockManager">
+ <properties>
+ <property name="time-out" value="15m" />
+ <property name="jbosscache-configuration" value="conf/jcr/jbosscache/${gatein.jcr.config.type}/lock-config-wsrp-system.xml" />
+ </properties>
+ </lock-manager>
+ </workspace>
+
+ </workspaces>
+ </repository>
+ </repositories>
+</repository-service>
15 years, 8 months
- 1
- 0
gatein SVN: r1443 - portal/trunk/web/portal/src/main/webapp/groovy/webui/core.
by do-not-reply＠jboss.org
Author: tuancn
Date: 2010-01-25 04:35:28 -0500 (Mon, 25 Jan 2010)
New Revision: 1443
Modified:
portal/trunk/web/portal/src/main/webapp/groovy/webui/core/UIGrid.gtmpl
Log:
GTNPORTAL-552 Problem with UIGrid in User and Management portlet in special case
Modified: portal/trunk/web/portal/src/main/webapp/groovy/webui/core/UIGrid.gtmpl
===================================================================
--- portal/trunk/web/portal/src/main/webapp/groovy/webui/core/UIGrid.gtmpl 2010-01-25 09:16:26 UTC (rev 1442)
+++ portal/trunk/web/portal/src/main/webapp/groovy/webui/core/UIGrid.gtmpl 2010-01-25 09:35:28 UTC (rev 1443)
@@ -4,6 +4,12 @@
String[] beanFields = uicomponent.getBeanFields();
String[] beanActions = uicomponent.getBeanActions();
+ int colnum = 0;
+ if(beanFields != null && beanFields.length > 0 && beanActions != null && beanActions.length > 0)
+ colnum = beanFields.length + 1;
+ else if(beanFields != null && beanFields.length > 0)
+ colnum = beanFields.length;
+
UIComponent uiParent = uicomponent.getParent();
String name = uicomponent.getLabel();
UIForm uiForm = uicomponent.getAncestorOfType(UIForm.class);
@@ -13,34 +19,33 @@
<thead>
<tr>
<% if (name != null)
- { %>
- <% for (field in beanFields)
- { %>
- <th><%=_ctx.appRes(name + ".header." + field)%></th>
- <% } %>
- <% if (beanActions != null)
- { %>
- <th><%=_ctx.appRes(name + ".header.action")%></th>
- <% } %>
- <% } %>
- <% if (name == null)
- { %>
- <% for (field in beanFields)
- { %>
- <th><%=_ctx.appRes(uiParent.getName() + ".header." + field)%></th>
- <% } %>
- <% if (beanActions != null && beanActions.length > 0)
- { %>
- <th><%=_ctx.appRes(uiParent.getName() + ".header.action")%></th>
- <% } %>
- <% } %>
+ { for (field in beanFields)
+ { %>
+ <th><%=_ctx.appRes(name + ".header." + field)%></th>
+ <% }
+ if (beanActions != null)
+ { %>
+ <th><%=_ctx.appRes(name + ".header.action")%></th>
+ <% }
+ }
+ if (name == null)
+ {
+ for (field in beanFields)
+ { %>
+ <th><%=_ctx.appRes(uiParent.getName() + ".header." + field)%></th>
+ <% }
+ if (beanActions != null && beanActions.length > 0)
+ { %>
+ <th><%=_ctx.appRes(uiParent.getName() + ".header.action")%></th>
+ <% }
+ } %>
</tr>
</thead>
<tbody>
<% if (uicomponent.getUIPageIterator().getAvailable() < 1)
{ %>
<tr>
- <td style="font-style:italic; color: #FF5604; text-align: center;" colspan="<%=beanFields.length + 1%>">
+ <td style="font-style:italic; color: #FF5604; text-align: center;" colspan="<%=colnum%>">
<%=_ctx.appRes("UIGrid.msg.empty")%>
</td>
</tr>
15 years, 8 months
- 1
- 0
gatein SVN: r1442 - in portal/trunk: component/common/src/main/java/conf/jcr/jbosscache/cluster and 6 other directories.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2010-01-25 04:16:26 -0500 (Mon, 25 Jan 2010)
New Revision: 1442
Added:
portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/cluster/config-portal-system.xml
portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/cluster/config-portal-work.xml
portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/cluster/config-system.xml
portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/cluster/config-wsrp-system.xml
portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/cluster/indexer-config-portal-system.xml
portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/cluster/indexer-config-portal-work.xml
portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/cluster/indexer-config-system.xml
portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/cluster/indexer-config-wsrp-system.xml
portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/cluster/lock-config-portal-system.xml
portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/cluster/lock-config-portal-work.xml
portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/cluster/lock-config-system.xml
portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/cluster/lock-config-wsrp-system.xml
portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/local/config-portal-system.xml
portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/local/config-portal-work.xml
portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/local/config-system.xml
portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/local/config-wsrp-system.xml
Removed:
portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/local/config.xml
Modified:
portal/trunk/component/common/src/main/java/conf/configuration-jboss.properties
portal/trunk/component/common/src/main/java/conf/configuration-tomcat.properties
portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/cache/DataCache.java
portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/jcr/repository-configuration.xml
portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/jcr/repository-configuration.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/local/repository-configuration.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/web.xml
Log:
integrate with cluster configuration for JCR
Modified: portal/trunk/component/common/src/main/java/conf/configuration-jboss.properties
===================================================================
--- portal/trunk/component/common/src/main/java/conf/configuration-jboss.properties 2010-01-25 06:02:11 UTC (rev 1441)
+++ portal/trunk/component/common/src/main/java/conf/configuration-jboss.properties 2010-01-25 09:16:26 UTC (rev 1442)
@@ -32,3 +32,6 @@
gatein.jcr.data.dir=${gatein.data.dir}/jcr
gatein.jcr.storage.data.dir=${gatein.jcr.data.dir}/values
gatein.jcr.index.data.dir=${gatein.jcr.data.dir}/jcrlucenedb
+
+gatein.jcr.changefilterclass=org.exoplatform.services.jcr.impl.core.query.DefaultChangesFilter
+gatein.jcr.config.type=local
\ No newline at end of file
Modified: portal/trunk/component/common/src/main/java/conf/configuration-tomcat.properties
===================================================================
--- portal/trunk/component/common/src/main/java/conf/configuration-tomcat.properties 2010-01-25 06:02:11 UTC (rev 1441)
+++ portal/trunk/component/common/src/main/java/conf/configuration-tomcat.properties 2010-01-25 09:16:26 UTC (rev 1442)
@@ -32,3 +32,6 @@
gatein.jcr.data.dir=${gatein.data.dir}/jcr
gatein.jcr.storage.data.dir=${gatein.jcr.data.dir}/values
gatein.jcr.index.data.dir=${gatein.jcr.data.dir}/jcrlucenedb
+
+gatein.jcr.changefilterclass=org.exoplatform.services.jcr.impl.core.query.DefaultChangesFilter
+gatein.jcr.config.type=local
\ No newline at end of file
Added: portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/cluster/config-portal-system.xml
===================================================================
--- portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/cluster/config-portal-system.xml (rev 0)
+++ portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/cluster/config-portal-system.xml 2010-01-25 09:16:26 UTC (rev 1442)
@@ -0,0 +1,105 @@
+<!--
+ ~ Copyright (C) 2009 eXo Platform SAS.
+ ~
+ ~ This is free software; you can redistribute it and/or modify it
+ ~ under the terms of the GNU Lesser General Public License as
+ ~ published by the Free Software Foundation; either version 2.1 of
+ ~ the License, or (at your option) any later version.
+ ~
+ ~ This software is distributed in the hope that it will be useful,
+ ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ ~ Lesser General Public License for more details.
+ ~
+ ~ You should have received a copy of the GNU Lesser General Public
+ ~ License along with this software; if not, write to the Free
+ ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ -->
+<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="JBoss-Cache-Cluster_portal_system">
+ <!--
+ Fetch in memory state is enable, because second cluster-node
+ currently doesn't work properly on clear cache
+ -->
+ <stateRetrieval timeout="20000" fetchInMemoryState="false" nonBlocking="true"/>
+ <!--
+ This JGroups configuration is taken from JBC branch, but
+ "enable_bundling" is set to false, because of notice, that appeared
+ during running
+ multiplexerStack="fc-fast-minimalthreads"
+ -->
+ <jgroupsConfig>
+ <!--
+ UDP discard_incompatible_packets="true" enable_bundling="false"
+ enable_diagnostics="false" ip_ttl="2" loopback="false"
+ max_bundle_size="64000" max_bundle_timeout="30"
+ mcast_addr="228.10.10.10" mcast_port="45588"
+ mcast_recv_buf_size="25000000" mcast_send_buf_size="640000"
+ oob_thread_pool.enabled="true"
+ oob_thread_pool.keep_alive_time="10000"
+ oob_thread_pool.max_threads="4" oob_thread_pool.min_threads="1"
+ oob_thread_pool.queue_enabled="true"
+ oob_thread_pool.queue_max_size="10"
+ oob_thread_pool.rejection_policy="Run" thread_naming_pattern="pl"
+ thread_pool.enabled="true" thread_pool.keep_alive_time="30000"
+ thread_pool.max_threads="25" thread_pool.min_threads="1"
+ thread_pool.queue_enabled="true" thread_pool.queue_max_size="10"
+ thread_pool.rejection_policy="Run" tos="8"
+ ucast_recv_buf_size="20000000" ucast_send_buf_size="640000"
+ use_concurrent_stack="true" use_incoming_packet_handler="true" />
+ <PING num_initial_members="3" timeout="2000" /
+ -->
+
+ <TCP bind_addr="127.0.0.1" start_port="9600" loopback="true"
+ recv_buf_size="20000000" send_buf_size="640000"
+ discard_incompatible_packets="true" max_bundle_size="64000"
+ max_bundle_timeout="30" use_incoming_packet_handler="true"
+ enable_bundling="false" use_send_queues="false" sock_conn_timeout="300"
+ skip_suspected_members="true" use_concurrent_stack="true"
+ thread_pool.enabled="true" thread_pool.min_threads="1"
+ thread_pool.max_threads="25" thread_pool.keep_alive_time="5000"
+ thread_pool.queue_enabled="false" thread_pool.queue_max_size="100"
+ thread_pool.rejection_policy="run" oob_thread_pool.enabled="true"
+ oob_thread_pool.min_threads="1" oob_thread_pool.max_threads="8"
+ oob_thread_pool.keep_alive_time="5000"
+ 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="34521"
+ 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" />
+ <VERIFY_SUSPECT timeout="1500" />
+ <pbcast.NAKACK discard_delivered_msgs="true" gc_lag="0"
+ retransmit_timeout="300,600,1200,2400,4800" use_mcast_xmit="false" />
+ <UNICAST timeout="300,600,1200,2400,3600" />
+ <pbcast.STABLE desired_avg_gossip="50000" max_bytes="400000"
+ stability_delay="1000" />
+ <pbcast.GMS join_timeout="5000" print_local_addr="true"
+ shun="false" view_ack_collection_timeout="5000" view_bundling="true" />
+ <FRAG2 frag_size="60000" />
+ <pbcast.STREAMING_STATE_TRANSFER />
+ <pbcast.FLUSH timeout="0" />
+
+ </jgroupsConfig>
+
+ <sync />
+
+ </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="10000" />
+ <property name="timeToLive" value="120000" />
+ </default>
+ </eviction>
+</jbosscache>
\ No newline at end of file
Added: portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/cluster/config-portal-work.xml
===================================================================
--- portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/cluster/config-portal-work.xml (rev 0)
+++ portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/cluster/config-portal-work.xml 2010-01-25 09:16:26 UTC (rev 1442)
@@ -0,0 +1,105 @@
+<!--
+ ~ Copyright (C) 2009 eXo Platform SAS.
+ ~
+ ~ This is free software; you can redistribute it and/or modify it
+ ~ under the terms of the GNU Lesser General Public License as
+ ~ published by the Free Software Foundation; either version 2.1 of
+ ~ the License, or (at your option) any later version.
+ ~
+ ~ This software is distributed in the hope that it will be useful,
+ ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ ~ Lesser General Public License for more details.
+ ~
+ ~ You should have received a copy of the GNU Lesser General Public
+ ~ License along with this software; if not, write to the Free
+ ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ -->
+<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="JBoss-Cache-Cluster_portal_work">
+ <!--
+ Fetch in memory state is enable, because second cluster-node
+ currently doesn't work properly on clear cache
+ -->
+ <stateRetrieval timeout="20000" fetchInMemoryState="false" nonBlocking="true"/>
+ <!--
+ This JGroups configuration is taken from JBC branch, but
+ "enable_bundling" is set to false, because of notice, that appeared
+ during running
+ multiplexerStack="fc-fast-minimalthreads"
+ -->
+ <jgroupsConfig>
+ <!--
+ UDP discard_incompatible_packets="true" enable_bundling="false"
+ enable_diagnostics="false" ip_ttl="2" loopback="false"
+ max_bundle_size="64000" max_bundle_timeout="30"
+ mcast_addr="228.10.10.10" mcast_port="45588"
+ mcast_recv_buf_size="25000000" mcast_send_buf_size="640000"
+ oob_thread_pool.enabled="true"
+ oob_thread_pool.keep_alive_time="10000"
+ oob_thread_pool.max_threads="4" oob_thread_pool.min_threads="1"
+ oob_thread_pool.queue_enabled="true"
+ oob_thread_pool.queue_max_size="10"
+ oob_thread_pool.rejection_policy="Run" thread_naming_pattern="pl"
+ thread_pool.enabled="true" thread_pool.keep_alive_time="30000"
+ thread_pool.max_threads="25" thread_pool.min_threads="1"
+ thread_pool.queue_enabled="true" thread_pool.queue_max_size="10"
+ thread_pool.rejection_policy="Run" tos="8"
+ ucast_recv_buf_size="20000000" ucast_send_buf_size="640000"
+ use_concurrent_stack="true" use_incoming_packet_handler="true" />
+ <PING num_initial_members="3" timeout="2000" /
+ -->
+
+ <TCP bind_addr="127.0.0.1" start_port="9600" loopback="true"
+ recv_buf_size="20000000" send_buf_size="640000"
+ discard_incompatible_packets="true" max_bundle_size="64000"
+ max_bundle_timeout="30" use_incoming_packet_handler="true"
+ enable_bundling="false" use_send_queues="false" sock_conn_timeout="300"
+ skip_suspected_members="true" use_concurrent_stack="true"
+ thread_pool.enabled="true" thread_pool.min_threads="1"
+ thread_pool.max_threads="25" thread_pool.keep_alive_time="5000"
+ thread_pool.queue_enabled="false" thread_pool.queue_max_size="100"
+ thread_pool.rejection_policy="run" oob_thread_pool.enabled="true"
+ oob_thread_pool.min_threads="1" oob_thread_pool.max_threads="8"
+ oob_thread_pool.keep_alive_time="5000"
+ 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="34521"
+ 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" />
+ <VERIFY_SUSPECT timeout="1500" />
+ <pbcast.NAKACK discard_delivered_msgs="true" gc_lag="0"
+ retransmit_timeout="300,600,1200,2400,4800" use_mcast_xmit="false" />
+ <UNICAST timeout="300,600,1200,2400,3600" />
+ <pbcast.STABLE desired_avg_gossip="50000" max_bytes="400000"
+ stability_delay="1000" />
+ <pbcast.GMS join_timeout="5000" print_local_addr="true"
+ shun="false" view_ack_collection_timeout="5000" view_bundling="true" />
+ <FRAG2 frag_size="60000" />
+ <pbcast.STREAMING_STATE_TRANSFER />
+ <pbcast.FLUSH timeout="0" />
+
+ </jgroupsConfig>
+
+ <sync />
+
+ </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="10000" />
+ <property name="timeToLive" value="120000" />
+ </default>
+ </eviction>
+</jbosscache>
\ No newline at end of file
Added: portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/cluster/config-system.xml
===================================================================
--- portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/cluster/config-system.xml (rev 0)
+++ portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/cluster/config-system.xml 2010-01-25 09:16:26 UTC (rev 1442)
@@ -0,0 +1,105 @@
+<!--
+ ~ Copyright (C) 2009 eXo Platform SAS.
+ ~
+ ~ This is free software; you can redistribute it and/or modify it
+ ~ under the terms of the GNU Lesser General Public License as
+ ~ published by the Free Software Foundation; either version 2.1 of
+ ~ the License, or (at your option) any later version.
+ ~
+ ~ This software is distributed in the hope that it will be useful,
+ ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ ~ Lesser General Public License for more details.
+ ~
+ ~ You should have received a copy of the GNU Lesser General Public
+ ~ License along with this software; if not, write to the Free
+ ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ -->
+<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="JBoss-Cache-Cluster_system">
+ <!--
+ Fetch in memory state is enable, because second cluster-node
+ currently doesn't work properly on clear cache
+ -->
+ <stateRetrieval timeout="20000" fetchInMemoryState="false" nonBlocking="true"/>
+ <!--
+ This JGroups configuration is taken from JBC branch, but
+ "enable_bundling" is set to false, because of notice, that appeared
+ during running
+ multiplexerStack="fc-fast-minimalthreads"
+ -->
+ <jgroupsConfig>
+ <!--
+ UDP discard_incompatible_packets="true" enable_bundling="false"
+ enable_diagnostics="false" ip_ttl="2" loopback="false"
+ max_bundle_size="64000" max_bundle_timeout="30"
+ mcast_addr="228.10.10.10" mcast_port="45588"
+ mcast_recv_buf_size="25000000" mcast_send_buf_size="640000"
+ oob_thread_pool.enabled="true"
+ oob_thread_pool.keep_alive_time="10000"
+ oob_thread_pool.max_threads="4" oob_thread_pool.min_threads="1"
+ oob_thread_pool.queue_enabled="true"
+ oob_thread_pool.queue_max_size="10"
+ oob_thread_pool.rejection_policy="Run" thread_naming_pattern="pl"
+ thread_pool.enabled="true" thread_pool.keep_alive_time="30000"
+ thread_pool.max_threads="25" thread_pool.min_threads="1"
+ thread_pool.queue_enabled="true" thread_pool.queue_max_size="10"
+ thread_pool.rejection_policy="Run" tos="8"
+ ucast_recv_buf_size="20000000" ucast_send_buf_size="640000"
+ use_concurrent_stack="true" use_incoming_packet_handler="true" />
+ <PING num_initial_members="3" timeout="2000" /
+ -->
+
+ <TCP bind_addr="127.0.0.1" start_port="9600" loopback="true"
+ recv_buf_size="20000000" send_buf_size="640000"
+ discard_incompatible_packets="true" max_bundle_size="64000"
+ max_bundle_timeout="30" use_incoming_packet_handler="true"
+ enable_bundling="false" use_send_queues="false" sock_conn_timeout="300"
+ skip_suspected_members="true" use_concurrent_stack="true"
+ thread_pool.enabled="true" thread_pool.min_threads="1"
+ thread_pool.max_threads="25" thread_pool.keep_alive_time="5000"
+ thread_pool.queue_enabled="false" thread_pool.queue_max_size="100"
+ thread_pool.rejection_policy="run" oob_thread_pool.enabled="true"
+ oob_thread_pool.min_threads="1" oob_thread_pool.max_threads="8"
+ oob_thread_pool.keep_alive_time="5000"
+ 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="34521"
+ 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" />
+ <VERIFY_SUSPECT timeout="1500" />
+ <pbcast.NAKACK discard_delivered_msgs="true" gc_lag="0"
+ retransmit_timeout="300,600,1200,2400,4800" use_mcast_xmit="false" />
+ <UNICAST timeout="300,600,1200,2400,3600" />
+ <pbcast.STABLE desired_avg_gossip="50000" max_bytes="400000"
+ stability_delay="1000" />
+ <pbcast.GMS join_timeout="5000" print_local_addr="true"
+ shun="false" view_ack_collection_timeout="5000" view_bundling="true" />
+ <FRAG2 frag_size="60000" />
+ <pbcast.STREAMING_STATE_TRANSFER />
+ <pbcast.FLUSH timeout="0" />
+
+ </jgroupsConfig>
+
+ <sync />
+
+ </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="10000" />
+ <property name="timeToLive" value="120000" />
+ </default>
+ </eviction>
+</jbosscache>
\ No newline at end of file
Added: portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/cluster/config-wsrp-system.xml
===================================================================
--- portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/cluster/config-wsrp-system.xml (rev 0)
+++ portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/cluster/config-wsrp-system.xml 2010-01-25 09:16:26 UTC (rev 1442)
@@ -0,0 +1,105 @@
+<!--
+ ~ Copyright (C) 2009 eXo Platform SAS.
+ ~
+ ~ This is free software; you can redistribute it and/or modify it
+ ~ under the terms of the GNU Lesser General Public License as
+ ~ published by the Free Software Foundation; either version 2.1 of
+ ~ the License, or (at your option) any later version.
+ ~
+ ~ This software is distributed in the hope that it will be useful,
+ ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ ~ Lesser General Public License for more details.
+ ~
+ ~ You should have received a copy of the GNU Lesser General Public
+ ~ License along with this software; if not, write to the Free
+ ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ -->
+<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="JBoss-Cache-Cluster_wsrp_system">
+ <!--
+ Fetch in memory state is enable, because second cluster-node
+ currently doesn't work properly on clear cache
+ -->
+ <stateRetrieval timeout="20000" fetchInMemoryState="false" nonBlocking="true"/>
+ <!--
+ This JGroups configuration is taken from JBC branch, but
+ "enable_bundling" is set to false, because of notice, that appeared
+ during running
+ multiplexerStack="fc-fast-minimalthreads"
+ -->
+ <jgroupsConfig>
+ <!--
+ UDP discard_incompatible_packets="true" enable_bundling="false"
+ enable_diagnostics="false" ip_ttl="2" loopback="false"
+ max_bundle_size="64000" max_bundle_timeout="30"
+ mcast_addr="228.10.10.10" mcast_port="45588"
+ mcast_recv_buf_size="25000000" mcast_send_buf_size="640000"
+ oob_thread_pool.enabled="true"
+ oob_thread_pool.keep_alive_time="10000"
+ oob_thread_pool.max_threads="4" oob_thread_pool.min_threads="1"
+ oob_thread_pool.queue_enabled="true"
+ oob_thread_pool.queue_max_size="10"
+ oob_thread_pool.rejection_policy="Run" thread_naming_pattern="pl"
+ thread_pool.enabled="true" thread_pool.keep_alive_time="30000"
+ thread_pool.max_threads="25" thread_pool.min_threads="1"
+ thread_pool.queue_enabled="true" thread_pool.queue_max_size="10"
+ thread_pool.rejection_policy="Run" tos="8"
+ ucast_recv_buf_size="20000000" ucast_send_buf_size="640000"
+ use_concurrent_stack="true" use_incoming_packet_handler="true" />
+ <PING num_initial_members="3" timeout="2000" /
+ -->
+
+ <TCP bind_addr="127.0.0.1" start_port="9600" loopback="true"
+ recv_buf_size="20000000" send_buf_size="640000"
+ discard_incompatible_packets="true" max_bundle_size="64000"
+ max_bundle_timeout="30" use_incoming_packet_handler="true"
+ enable_bundling="false" use_send_queues="false" sock_conn_timeout="300"
+ skip_suspected_members="true" use_concurrent_stack="true"
+ thread_pool.enabled="true" thread_pool.min_threads="1"
+ thread_pool.max_threads="25" thread_pool.keep_alive_time="5000"
+ thread_pool.queue_enabled="false" thread_pool.queue_max_size="100"
+ thread_pool.rejection_policy="run" oob_thread_pool.enabled="true"
+ oob_thread_pool.min_threads="1" oob_thread_pool.max_threads="8"
+ oob_thread_pool.keep_alive_time="5000"
+ 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="34521"
+ 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" />
+ <VERIFY_SUSPECT timeout="1500" />
+ <pbcast.NAKACK discard_delivered_msgs="true" gc_lag="0"
+ retransmit_timeout="300,600,1200,2400,4800" use_mcast_xmit="false" />
+ <UNICAST timeout="300,600,1200,2400,3600" />
+ <pbcast.STABLE desired_avg_gossip="50000" max_bytes="400000"
+ stability_delay="1000" />
+ <pbcast.GMS join_timeout="5000" print_local_addr="true"
+ shun="false" view_ack_collection_timeout="5000" view_bundling="true" />
+ <FRAG2 frag_size="60000" />
+ <pbcast.STREAMING_STATE_TRANSFER />
+ <pbcast.FLUSH timeout="0" />
+
+ </jgroupsConfig>
+
+ <sync />
+
+ </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="10000" />
+ <property name="timeToLive" value="120000" />
+ </default>
+ </eviction>
+</jbosscache>
\ No newline at end of file
Added: portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/cluster/indexer-config-portal-system.xml
===================================================================
--- portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/cluster/indexer-config-portal-system.xml (rev 0)
+++ portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/cluster/indexer-config-portal-system.xml 2010-01-25 09:16:26 UTC (rev 1442)
@@ -0,0 +1,76 @@
+<!--
+ ~ Copyright (C) 2009 eXo Platform SAS.
+ ~
+ ~ This is free software; you can redistribute it and/or modify it
+ ~ under the terms of the GNU Lesser General Public License as
+ ~ published by the Free Software Foundation; either version 2.1 of
+ ~ the License, or (at your option) any later version.
+ ~
+ ~ This software is distributed in the hope that it will be useful,
+ ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ ~ Lesser General Public License for more details.
+ ~
+ ~ You should have received a copy of the GNU Lesser General Public
+ ~ License along with this software; if not, write to the Free
+ ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ -->
+<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" />
+ <!-- Configure the TransactionManager -->
+ <transaction
+ transactionManagerLookupClass="org.jboss.cache.transaction.JBossStandaloneJTAManagerLookup" />
+
+ <clustering mode="replication" clusterName="JBoss-Cache-Indexer-Cluster_portal_system">
+ <stateRetrieval timeout="20000" fetchInMemoryState="false" nonBlocking="true"/>
+ <jgroupsConfig>
+ <TCP bind_addr="127.0.0.1" start_port="9700" loopback="true"
+ recv_buf_size="20000000" send_buf_size="640000"
+ discard_incompatible_packets="true" max_bundle_size="64000"
+ max_bundle_timeout="30" use_incoming_packet_handler="true"
+ enable_bundling="false" use_send_queues="false" sock_conn_timeout="300"
+ skip_suspected_members="true" use_concurrent_stack="true"
+ thread_pool.enabled="true" thread_pool.min_threads="1"
+ thread_pool.max_threads="25" thread_pool.keep_alive_time="5000"
+ thread_pool.queue_enabled="false" thread_pool.queue_max_size="100"
+ thread_pool.rejection_policy="run" oob_thread_pool.enabled="true"
+ oob_thread_pool.min_threads="1" oob_thread_pool.max_threads="8"
+ oob_thread_pool.keep_alive_time="5000"
+ 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="34530"
+ 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" />
+ <VERIFY_SUSPECT timeout="1500" />
+ <pbcast.NAKACK discard_delivered_msgs="true" gc_lag="0"
+ retransmit_timeout="300,600,1200,2400,4800" use_mcast_xmit="false" />
+ <UNICAST timeout="300,600,1200,2400,3600" />
+ <pbcast.STABLE desired_avg_gossip="50000" max_bytes="400000"
+ stability_delay="1000" />
+ <pbcast.GMS join_timeout="5000" print_local_addr="true"
+ shun="false" view_ack_collection_timeout="5000" view_bundling="true" />
+ <FRAG2 frag_size="60000" />
+ <pbcast.STREAMING_STATE_TRANSFER />
+ <pbcast.FLUSH timeout="0" />
+
+ </jgroupsConfig>
+
+ <sync />
+ </clustering>
+ <!-- Eviction configuration -->
+ <eviction wakeUpInterval="5000">
+ <default algorithmClass="org.jboss.cache.eviction.FIFOAlgorithm" eventQueueSize="1000000">
+ <property name="maxNodes" value="10000" />
+ <property name="minTimeToLive" value="60000" />
+ </default>
+ </eviction>
+
+</jbosscache>
\ No newline at end of file
Added: portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/cluster/indexer-config-portal-work.xml
===================================================================
--- portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/cluster/indexer-config-portal-work.xml (rev 0)
+++ portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/cluster/indexer-config-portal-work.xml 2010-01-25 09:16:26 UTC (rev 1442)
@@ -0,0 +1,76 @@
+<!--
+ ~ Copyright (C) 2009 eXo Platform SAS.
+ ~
+ ~ This is free software; you can redistribute it and/or modify it
+ ~ under the terms of the GNU Lesser General Public License as
+ ~ published by the Free Software Foundation; either version 2.1 of
+ ~ the License, or (at your option) any later version.
+ ~
+ ~ This software is distributed in the hope that it will be useful,
+ ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ ~ Lesser General Public License for more details.
+ ~
+ ~ You should have received a copy of the GNU Lesser General Public
+ ~ License along with this software; if not, write to the Free
+ ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ -->
+<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" />
+ <!-- Configure the TransactionManager -->
+ <transaction
+ transactionManagerLookupClass="org.jboss.cache.transaction.JBossStandaloneJTAManagerLookup" />
+
+ <clustering mode="replication" clusterName="JBoss-Cache-Indexer-Cluster_portal_work">
+ <stateRetrieval timeout="20000" fetchInMemoryState="false" nonBlocking="true"/>
+ <jgroupsConfig>
+ <TCP bind_addr="127.0.0.1" start_port="9700" loopback="true"
+ recv_buf_size="20000000" send_buf_size="640000"
+ discard_incompatible_packets="true" max_bundle_size="64000"
+ max_bundle_timeout="30" use_incoming_packet_handler="true"
+ enable_bundling="false" use_send_queues="false" sock_conn_timeout="300"
+ skip_suspected_members="true" use_concurrent_stack="true"
+ thread_pool.enabled="true" thread_pool.min_threads="1"
+ thread_pool.max_threads="25" thread_pool.keep_alive_time="5000"
+ thread_pool.queue_enabled="false" thread_pool.queue_max_size="100"
+ thread_pool.rejection_policy="run" oob_thread_pool.enabled="true"
+ oob_thread_pool.min_threads="1" oob_thread_pool.max_threads="8"
+ oob_thread_pool.keep_alive_time="5000"
+ 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="34530"
+ 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" />
+ <VERIFY_SUSPECT timeout="1500" />
+ <pbcast.NAKACK discard_delivered_msgs="true" gc_lag="0"
+ retransmit_timeout="300,600,1200,2400,4800" use_mcast_xmit="false" />
+ <UNICAST timeout="300,600,1200,2400,3600" />
+ <pbcast.STABLE desired_avg_gossip="50000" max_bytes="400000"
+ stability_delay="1000" />
+ <pbcast.GMS join_timeout="5000" print_local_addr="true"
+ shun="false" view_ack_collection_timeout="5000" view_bundling="true" />
+ <FRAG2 frag_size="60000" />
+ <pbcast.STREAMING_STATE_TRANSFER />
+ <pbcast.FLUSH timeout="0" />
+
+ </jgroupsConfig>
+
+ <sync />
+ </clustering>
+ <!-- Eviction configuration -->
+ <eviction wakeUpInterval="5000">
+ <default algorithmClass="org.jboss.cache.eviction.FIFOAlgorithm" eventQueueSize="1000000">
+ <property name="maxNodes" value="10000" />
+ <property name="minTimeToLive" value="60000" />
+ </default>
+ </eviction>
+
+</jbosscache>
\ No newline at end of file
Added: portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/cluster/indexer-config-system.xml
===================================================================
--- portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/cluster/indexer-config-system.xml (rev 0)
+++ portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/cluster/indexer-config-system.xml 2010-01-25 09:16:26 UTC (rev 1442)
@@ -0,0 +1,76 @@
+<!--
+ ~ Copyright (C) 2009 eXo Platform SAS.
+ ~
+ ~ This is free software; you can redistribute it and/or modify it
+ ~ under the terms of the GNU Lesser General Public License as
+ ~ published by the Free Software Foundation; either version 2.1 of
+ ~ the License, or (at your option) any later version.
+ ~
+ ~ This software is distributed in the hope that it will be useful,
+ ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ ~ Lesser General Public License for more details.
+ ~
+ ~ You should have received a copy of the GNU Lesser General Public
+ ~ License along with this software; if not, write to the Free
+ ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ -->
+<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" />
+ <!-- Configure the TransactionManager -->
+ <transaction
+ transactionManagerLookupClass="org.jboss.cache.transaction.JBossStandaloneJTAManagerLookup" />
+
+ <clustering mode="replication" clusterName="JBoss-Cache-Indexer-Cluster_system">
+ <stateRetrieval timeout="20000" fetchInMemoryState="false" nonBlocking="true"/>
+ <jgroupsConfig>
+ <TCP bind_addr="127.0.0.1" start_port="9700" loopback="true"
+ recv_buf_size="20000000" send_buf_size="640000"
+ discard_incompatible_packets="true" max_bundle_size="64000"
+ max_bundle_timeout="30" use_incoming_packet_handler="true"
+ enable_bundling="false" use_send_queues="false" sock_conn_timeout="300"
+ skip_suspected_members="true" use_concurrent_stack="true"
+ thread_pool.enabled="true" thread_pool.min_threads="1"
+ thread_pool.max_threads="25" thread_pool.keep_alive_time="5000"
+ thread_pool.queue_enabled="false" thread_pool.queue_max_size="100"
+ thread_pool.rejection_policy="run" oob_thread_pool.enabled="true"
+ oob_thread_pool.min_threads="1" oob_thread_pool.max_threads="8"
+ oob_thread_pool.keep_alive_time="5000"
+ 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="34530"
+ 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" />
+ <VERIFY_SUSPECT timeout="1500" />
+ <pbcast.NAKACK discard_delivered_msgs="true" gc_lag="0"
+ retransmit_timeout="300,600,1200,2400,4800" use_mcast_xmit="false" />
+ <UNICAST timeout="300,600,1200,2400,3600" />
+ <pbcast.STABLE desired_avg_gossip="50000" max_bytes="400000"
+ stability_delay="1000" />
+ <pbcast.GMS join_timeout="5000" print_local_addr="true"
+ shun="false" view_ack_collection_timeout="5000" view_bundling="true" />
+ <FRAG2 frag_size="60000" />
+ <pbcast.STREAMING_STATE_TRANSFER />
+ <pbcast.FLUSH timeout="0" />
+
+ </jgroupsConfig>
+
+ <sync />
+ </clustering>
+ <!-- Eviction configuration -->
+ <eviction wakeUpInterval="5000">
+ <default algorithmClass="org.jboss.cache.eviction.FIFOAlgorithm" eventQueueSize="1000000">
+ <property name="maxNodes" value="10000" />
+ <property name="minTimeToLive" value="60000" />
+ </default>
+ </eviction>
+
+</jbosscache>
\ No newline at end of file
Added: portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/cluster/indexer-config-wsrp-system.xml
===================================================================
--- portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/cluster/indexer-config-wsrp-system.xml (rev 0)
+++ portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/cluster/indexer-config-wsrp-system.xml 2010-01-25 09:16:26 UTC (rev 1442)
@@ -0,0 +1,77 @@
+<!--
+ ~ Copyright (C) 2009 eXo Platform SAS.
+ ~
+ ~ This is free software; you can redistribute it and/or modify it
+ ~ under the terms of the GNU Lesser General Public License as
+ ~ published by the Free Software Foundation; either version 2.1 of
+ ~ the License, or (at your option) any later version.
+ ~
+ ~ This software is distributed in the hope that it will be useful,
+ ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ ~ Lesser General Public License for more details.
+ ~
+ ~ You should have received a copy of the GNU Lesser General Public
+ ~ License along with this software; if not, write to the Free
+ ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ -->
+
+<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" />
+ <!-- Configure the TransactionManager -->
+ <transaction
+ transactionManagerLookupClass="org.jboss.cache.transaction.JBossStandaloneJTAManagerLookup" />
+
+ <clustering mode="replication" clusterName="JBoss-Cache-Indexer-Cluster_portal_system">
+ <stateRetrieval timeout="20000" fetchInMemoryState="false" nonBlocking="true"/>
+ <jgroupsConfig>
+ <TCP bind_addr="127.0.0.1" start_port="9700" loopback="true"
+ recv_buf_size="20000000" send_buf_size="640000"
+ discard_incompatible_packets="true" max_bundle_size="64000"
+ max_bundle_timeout="30" use_incoming_packet_handler="true"
+ enable_bundling="false" use_send_queues="false" sock_conn_timeout="300"
+ skip_suspected_members="true" use_concurrent_stack="true"
+ thread_pool.enabled="true" thread_pool.min_threads="1"
+ thread_pool.max_threads="25" thread_pool.keep_alive_time="5000"
+ thread_pool.queue_enabled="false" thread_pool.queue_max_size="100"
+ thread_pool.rejection_policy="run" oob_thread_pool.enabled="true"
+ oob_thread_pool.min_threads="1" oob_thread_pool.max_threads="8"
+ oob_thread_pool.keep_alive_time="5000"
+ 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="34530"
+ 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" />
+ <VERIFY_SUSPECT timeout="1500" />
+ <pbcast.NAKACK discard_delivered_msgs="true" gc_lag="0"
+ retransmit_timeout="300,600,1200,2400,4800" use_mcast_xmit="false" />
+ <UNICAST timeout="300,600,1200,2400,3600" />
+ <pbcast.STABLE desired_avg_gossip="50000" max_bytes="400000"
+ stability_delay="1000" />
+ <pbcast.GMS join_timeout="5000" print_local_addr="true"
+ shun="false" view_ack_collection_timeout="5000" view_bundling="true" />
+ <FRAG2 frag_size="60000" />
+ <pbcast.STREAMING_STATE_TRANSFER />
+ <pbcast.FLUSH timeout="0" />
+
+ </jgroupsConfig>
+
+ <sync />
+ </clustering>
+ <!-- Eviction configuration -->
+ <eviction wakeUpInterval="5000">
+ <default algorithmClass="org.jboss.cache.eviction.FIFOAlgorithm" eventQueueSize="1000000">
+ <property name="maxNodes" value="10000" />
+ <property name="minTimeToLive" value="60000" />
+ </default>
+ </eviction>
+
+</jbosscache>
\ No newline at end of file
Added: portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/cluster/lock-config-portal-system.xml
===================================================================
--- portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/cluster/lock-config-portal-system.xml (rev 0)
+++ portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/cluster/lock-config-portal-system.xml 2010-01-25 09:16:26 UTC (rev 1442)
@@ -0,0 +1,76 @@
+<!--
+ ~ Copyright (C) 2009 eXo Platform SAS.
+ ~
+ ~ This is free software; you can redistribute it and/or modify it
+ ~ under the terms of the GNU Lesser General Public License as
+ ~ published by the Free Software Foundation; either version 2.1 of
+ ~ the License, or (at your option) any later version.
+ ~
+ ~ This software is distributed in the hope that it will be useful,
+ ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ ~ Lesser General Public License for more details.
+ ~
+ ~ You should have received a copy of the GNU Lesser General Public
+ ~ License along with this software; if not, write to the Free
+ ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ -->
+<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="JBoss-Cache-Lock-Cluster_portal_system">
+ <stateRetrieval timeout="20000" fetchInMemoryState="false" nonBlocking="true" />
+ <jgroupsConfig>
+
+ <TCP bind_addr="127.0.0.1" start_port="9800" loopback="true" recv_buf_size="20000000" send_buf_size="640000" discard_incompatible_packets="true"
+ max_bundle_size="64000" max_bundle_timeout="30" use_incoming_packet_handler="true" enable_bundling="false" use_send_queues="false" sock_conn_timeout="300"
+ skip_suspected_members="true" use_concurrent_stack="true" thread_pool.enabled="true" thread_pool.min_threads="1" thread_pool.max_threads="25"
+ thread_pool.keep_alive_time="5000" thread_pool.queue_enabled="false" thread_pool.queue_max_size="100" thread_pool.rejection_policy="run"
+ oob_thread_pool.enabled="true" oob_thread_pool.min_threads="1" oob_thread_pool.max_threads="8" oob_thread_pool.keep_alive_time="5000"
+ 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" />
+ <VERIFY_SUSPECT timeout="1500" />
+ <pbcast.NAKACK discard_delivered_msgs="true" gc_lag="0" retransmit_timeout="300,600,1200,2400,4800" use_mcast_xmit="false" />
+ <UNICAST timeout="300,600,1200,2400,3600" />
+ <pbcast.STABLE desired_avg_gossip="50000" max_bytes="400000" stability_delay="1000" />
+ <pbcast.GMS join_timeout="5000" print_local_addr="true" shun="false" view_ack_collection_timeout="5000" view_bundling="true" />
+ <FRAG2 frag_size="60000" />
+ <pbcast.STREAMING_STATE_TRANSFER />
+ <pbcast.FLUSH timeout="0" />
+
+ </jgroupsConfig>
+
+ <sync />
+ </clustering>
+
+<!--
+ <loaders passivation="false" shared="true">
+ <preload>
+ <node fqn="/" />
+ </preload>
+ <loader class="org.jboss.cache.loader.JDBCCacheLoader" async="false" fetchPersistentState="false" ignoreModifications="false" purgeOnStartup="false">
+ <properties>
+ cache.jdbc.table.name=jcrlocks_db1_ws
+ cache.jdbc.table.create=true
+ cache.jdbc.table.drop=false
+ cache.jdbc.table.primarykey=jcrlocks_db1_ws_pk
+ cache.jdbc.fqn.column=fqn
+ cache.jdbc.fqn.type=VARCHAR(512)
+ cache.jdbc.node.column=node
+ cache.jdbc.node.type=LONGBLOB
+ cache.jdbc.parent.column=parent
+ cache.jdbc.datasource=jdbcjcr
+ </properties>
+ </loader>
+
+ </loaders>
+-->
+
+</jbosscache>
\ No newline at end of file
Added: portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/cluster/lock-config-portal-work.xml
===================================================================
--- portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/cluster/lock-config-portal-work.xml (rev 0)
+++ portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/cluster/lock-config-portal-work.xml 2010-01-25 09:16:26 UTC (rev 1442)
@@ -0,0 +1,76 @@
+<!--
+ ~ Copyright (C) 2009 eXo Platform SAS.
+ ~
+ ~ This is free software; you can redistribute it and/or modify it
+ ~ under the terms of the GNU Lesser General Public License as
+ ~ published by the Free Software Foundation; either version 2.1 of
+ ~ the License, or (at your option) any later version.
+ ~
+ ~ This software is distributed in the hope that it will be useful,
+ ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ ~ Lesser General Public License for more details.
+ ~
+ ~ You should have received a copy of the GNU Lesser General Public
+ ~ License along with this software; if not, write to the Free
+ ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ -->
+<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="JBoss-Cache-Lock-Cluster_portal_work">
+ <stateRetrieval timeout="20000" fetchInMemoryState="false" nonBlocking="true" />
+ <jgroupsConfig>
+
+ <TCP bind_addr="127.0.0.1" start_port="9800" loopback="true" recv_buf_size="20000000" send_buf_size="640000" discard_incompatible_packets="true"
+ max_bundle_size="64000" max_bundle_timeout="30" use_incoming_packet_handler="true" enable_bundling="false" use_send_queues="false" sock_conn_timeout="300"
+ skip_suspected_members="true" use_concurrent_stack="true" thread_pool.enabled="true" thread_pool.min_threads="1" thread_pool.max_threads="25"
+ thread_pool.keep_alive_time="5000" thread_pool.queue_enabled="false" thread_pool.queue_max_size="100" thread_pool.rejection_policy="run"
+ oob_thread_pool.enabled="true" oob_thread_pool.min_threads="1" oob_thread_pool.max_threads="8" oob_thread_pool.keep_alive_time="5000"
+ 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" />
+ <VERIFY_SUSPECT timeout="1500" />
+ <pbcast.NAKACK discard_delivered_msgs="true" gc_lag="0" retransmit_timeout="300,600,1200,2400,4800" use_mcast_xmit="false" />
+ <UNICAST timeout="300,600,1200,2400,3600" />
+ <pbcast.STABLE desired_avg_gossip="50000" max_bytes="400000" stability_delay="1000" />
+ <pbcast.GMS join_timeout="5000" print_local_addr="true" shun="false" view_ack_collection_timeout="5000" view_bundling="true" />
+ <FRAG2 frag_size="60000" />
+ <pbcast.STREAMING_STATE_TRANSFER />
+ <pbcast.FLUSH timeout="0" />
+
+ </jgroupsConfig>
+
+ <sync />
+ </clustering>
+
+<!--
+ <loaders passivation="false" shared="true">
+ <preload>
+ <node fqn="/" />
+ </preload>
+ <loader class="org.jboss.cache.loader.JDBCCacheLoader" async="false" fetchPersistentState="false" ignoreModifications="false" purgeOnStartup="false">
+ <properties>
+ cache.jdbc.table.name=jcrlocks_db1_ws
+ cache.jdbc.table.create=true
+ cache.jdbc.table.drop=false
+ cache.jdbc.table.primarykey=jcrlocks_db1_ws_pk
+ cache.jdbc.fqn.column=fqn
+ cache.jdbc.fqn.type=VARCHAR(512)
+ cache.jdbc.node.column=node
+ cache.jdbc.node.type=LONGBLOB
+ cache.jdbc.parent.column=parent
+ cache.jdbc.datasource=jdbcjcr
+ </properties>
+ </loader>
+
+ </loaders>
+-->
+
+</jbosscache>
\ No newline at end of file
Added: portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/cluster/lock-config-system.xml
===================================================================
--- portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/cluster/lock-config-system.xml (rev 0)
+++ portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/cluster/lock-config-system.xml 2010-01-25 09:16:26 UTC (rev 1442)
@@ -0,0 +1,76 @@
+<!--
+ ~ Copyright (C) 2009 eXo Platform SAS.
+ ~
+ ~ This is free software; you can redistribute it and/or modify it
+ ~ under the terms of the GNU Lesser General Public License as
+ ~ published by the Free Software Foundation; either version 2.1 of
+ ~ the License, or (at your option) any later version.
+ ~
+ ~ This software is distributed in the hope that it will be useful,
+ ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ ~ Lesser General Public License for more details.
+ ~
+ ~ You should have received a copy of the GNU Lesser General Public
+ ~ License along with this software; if not, write to the Free
+ ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ -->
+<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="JBoss-Cache-Lock-Cluster_system">
+ <stateRetrieval timeout="20000" fetchInMemoryState="false" nonBlocking="true" />
+ <jgroupsConfig>
+
+ <TCP bind_addr="127.0.0.1" start_port="9800" loopback="true" recv_buf_size="20000000" send_buf_size="640000" discard_incompatible_packets="true"
+ max_bundle_size="64000" max_bundle_timeout="30" use_incoming_packet_handler="true" enable_bundling="false" use_send_queues="false" sock_conn_timeout="300"
+ skip_suspected_members="true" use_concurrent_stack="true" thread_pool.enabled="true" thread_pool.min_threads="1" thread_pool.max_threads="25"
+ thread_pool.keep_alive_time="5000" thread_pool.queue_enabled="false" thread_pool.queue_max_size="100" thread_pool.rejection_policy="run"
+ oob_thread_pool.enabled="true" oob_thread_pool.min_threads="1" oob_thread_pool.max_threads="8" oob_thread_pool.keep_alive_time="5000"
+ 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" />
+ <VERIFY_SUSPECT timeout="1500" />
+ <pbcast.NAKACK discard_delivered_msgs="true" gc_lag="0" retransmit_timeout="300,600,1200,2400,4800" use_mcast_xmit="false" />
+ <UNICAST timeout="300,600,1200,2400,3600" />
+ <pbcast.STABLE desired_avg_gossip="50000" max_bytes="400000" stability_delay="1000" />
+ <pbcast.GMS join_timeout="5000" print_local_addr="true" shun="false" view_ack_collection_timeout="5000" view_bundling="true" />
+ <FRAG2 frag_size="60000" />
+ <pbcast.STREAMING_STATE_TRANSFER />
+ <pbcast.FLUSH timeout="0" />
+
+ </jgroupsConfig>
+
+ <sync />
+ </clustering>
+
+<!--
+ <loaders passivation="false" shared="true">
+ <preload>
+ <node fqn="/" />
+ </preload>
+ <loader class="org.jboss.cache.loader.JDBCCacheLoader" async="false" fetchPersistentState="false" ignoreModifications="false" purgeOnStartup="false">
+ <properties>
+ cache.jdbc.table.name=jcrlocks_db1_ws
+ cache.jdbc.table.create=true
+ cache.jdbc.table.drop=false
+ cache.jdbc.table.primarykey=jcrlocks_db1_ws_pk
+ cache.jdbc.fqn.column=fqn
+ cache.jdbc.fqn.type=VARCHAR(512)
+ cache.jdbc.node.column=node
+ cache.jdbc.node.type=LONGBLOB
+ cache.jdbc.parent.column=parent
+ cache.jdbc.datasource=jdbcjcr
+ </properties>
+ </loader>
+
+ </loaders>
+-->
+
+</jbosscache>
\ No newline at end of file
Added: portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/cluster/lock-config-wsrp-system.xml
===================================================================
--- portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/cluster/lock-config-wsrp-system.xml (rev 0)
+++ portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/cluster/lock-config-wsrp-system.xml 2010-01-25 09:16:26 UTC (rev 1442)
@@ -0,0 +1,76 @@
+<!--
+ ~ Copyright (C) 2009 eXo Platform SAS.
+ ~
+ ~ This is free software; you can redistribute it and/or modify it
+ ~ under the terms of the GNU Lesser General Public License as
+ ~ published by the Free Software Foundation; either version 2.1 of
+ ~ the License, or (at your option) any later version.
+ ~
+ ~ This software is distributed in the hope that it will be useful,
+ ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ ~ Lesser General Public License for more details.
+ ~
+ ~ You should have received a copy of the GNU Lesser General Public
+ ~ License along with this software; if not, write to the Free
+ ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ -->
+<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="JBoss-Cache-Lock-Cluster_wsrp_system">
+ <stateRetrieval timeout="20000" fetchInMemoryState="false" nonBlocking="true" />
+ <jgroupsConfig>
+
+ <TCP bind_addr="127.0.0.1" start_port="9800" loopback="true" recv_buf_size="20000000" send_buf_size="640000" discard_incompatible_packets="true"
+ max_bundle_size="64000" max_bundle_timeout="30" use_incoming_packet_handler="true" enable_bundling="false" use_send_queues="false" sock_conn_timeout="300"
+ skip_suspected_members="true" use_concurrent_stack="true" thread_pool.enabled="true" thread_pool.min_threads="1" thread_pool.max_threads="25"
+ thread_pool.keep_alive_time="5000" thread_pool.queue_enabled="false" thread_pool.queue_max_size="100" thread_pool.rejection_policy="run"
+ oob_thread_pool.enabled="true" oob_thread_pool.min_threads="1" oob_thread_pool.max_threads="8" oob_thread_pool.keep_alive_time="5000"
+ 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" />
+ <VERIFY_SUSPECT timeout="1500" />
+ <pbcast.NAKACK discard_delivered_msgs="true" gc_lag="0" retransmit_timeout="300,600,1200,2400,4800" use_mcast_xmit="false" />
+ <UNICAST timeout="300,600,1200,2400,3600" />
+ <pbcast.STABLE desired_avg_gossip="50000" max_bytes="400000" stability_delay="1000" />
+ <pbcast.GMS join_timeout="5000" print_local_addr="true" shun="false" view_ack_collection_timeout="5000" view_bundling="true" />
+ <FRAG2 frag_size="60000" />
+ <pbcast.STREAMING_STATE_TRANSFER />
+ <pbcast.FLUSH timeout="0" />
+
+ </jgroupsConfig>
+
+ <sync />
+ </clustering>
+
+<!--
+ <loaders passivation="false" shared="true">
+ <preload>
+ <node fqn="/" />
+ </preload>
+ <loader class="org.jboss.cache.loader.JDBCCacheLoader" async="false" fetchPersistentState="false" ignoreModifications="false" purgeOnStartup="false">
+ <properties>
+ cache.jdbc.table.name=jcrlocks_db1_ws
+ cache.jdbc.table.create=true
+ cache.jdbc.table.drop=false
+ cache.jdbc.table.primarykey=jcrlocks_db1_ws_pk
+ cache.jdbc.fqn.column=fqn
+ cache.jdbc.fqn.type=VARCHAR(512)
+ cache.jdbc.node.column=node
+ cache.jdbc.node.type=LONGBLOB
+ cache.jdbc.parent.column=parent
+ cache.jdbc.datasource=jdbcjcr
+ </properties>
+ </loader>
+
+ </loaders>
+-->
+
+</jbosscache>
\ No newline at end of file
Added: portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/local/config-portal-system.xml
===================================================================
--- portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/local/config-portal-system.xml (rev 0)
+++ portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/local/config-portal-system.xml 2010-01-25 09:16:26 UTC (rev 1442)
@@ -0,0 +1,38 @@
+<!--
+ ~ Copyright (C) 2009 eXo Platform SAS.
+ ~
+ ~ This is free software; you can redistribute it and/or modify it
+ ~ under the terms of the GNU Lesser General Public License as
+ ~ published by the Free Software Foundation; either version 2.1 of
+ ~ the License, or (at your option) any later version.
+ ~
+ ~ This software is distributed in the hope that it will be useful,
+ ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ ~ Lesser General Public License for more details.
+ ~
+ ~ You should have received a copy of the GNU Lesser General Public
+ ~ License along with this software; if not, write to the Free
+ ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ -->
+
+<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"/>
+
+ <!-- Configure the TransactionManager -->
+ <transaction transactionManagerLookupClass="org.jboss.cache.transaction.JBossStandaloneJTAManagerLookup" />
+
+ <!-- Enable batching -->
+ <invocationBatching enabled="true" />
+
+ <!-- Eviction configuration -->
+ <eviction wakeUpInterval="5000">
+ <default algorithmClass="org.jboss.cache.eviction.FIFOAlgorithm" actionPolicyClass="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.ParentNodeEvictionActionPolicy" eventQueueSize="1000000">
+ <property name="maxNodes" value="5000" />
+ <property name="minTimeToLive" value="60000" />
+ </default>
+ </eviction>
+
+</jbosscache>
\ No newline at end of file
Added: portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/local/config-portal-work.xml
===================================================================
--- portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/local/config-portal-work.xml (rev 0)
+++ portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/local/config-portal-work.xml 2010-01-25 09:16:26 UTC (rev 1442)
@@ -0,0 +1,38 @@
+<!--
+ ~ Copyright (C) 2009 eXo Platform SAS.
+ ~
+ ~ This is free software; you can redistribute it and/or modify it
+ ~ under the terms of the GNU Lesser General Public License as
+ ~ published by the Free Software Foundation; either version 2.1 of
+ ~ the License, or (at your option) any later version.
+ ~
+ ~ This software is distributed in the hope that it will be useful,
+ ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ ~ Lesser General Public License for more details.
+ ~
+ ~ You should have received a copy of the GNU Lesser General Public
+ ~ License along with this software; if not, write to the Free
+ ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ -->
+
+<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"/>
+
+ <!-- Configure the TransactionManager -->
+ <transaction transactionManagerLookupClass="org.jboss.cache.transaction.JBossStandaloneJTAManagerLookup" />
+
+ <!-- Enable batching -->
+ <invocationBatching enabled="true" />
+
+ <!-- Eviction configuration -->
+ <eviction wakeUpInterval="5000">
+ <default algorithmClass="org.jboss.cache.eviction.FIFOAlgorithm" actionPolicyClass="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.ParentNodeEvictionActionPolicy" eventQueueSize="1000000">
+ <property name="maxNodes" value="5000" />
+ <property name="minTimeToLive" value="60000" />
+ </default>
+ </eviction>
+
+</jbosscache>
\ No newline at end of file
Copied: portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/local/config-system.xml (from rev 1430, portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/local/config.xml)
===================================================================
--- portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/local/config-system.xml (rev 0)
+++ portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/local/config-system.xml 2010-01-25 09:16:26 UTC (rev 1442)
@@ -0,0 +1,37 @@
+<!--
+ ~ Copyright (C) 2009 eXo Platform SAS.
+ ~
+ ~ This is free software; you can redistribute it and/or modify it
+ ~ under the terms of the GNU Lesser General Public License as
+ ~ published by the Free Software Foundation; either version 2.1 of
+ ~ the License, or (at your option) any later version.
+ ~
+ ~ This software is distributed in the hope that it will be useful,
+ ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ ~ Lesser General Public License for more details.
+ ~
+ ~ You should have received a copy of the GNU Lesser General Public
+ ~ License along with this software; if not, write to the Free
+ ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ -->
+<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"/>
+
+ <!-- Configure the TransactionManager -->
+ <transaction transactionManagerLookupClass="org.jboss.cache.transaction.JBossStandaloneJTAManagerLookup" />
+
+ <!-- Enable batching -->
+ <invocationBatching enabled="true" />
+
+ <!-- Eviction configuration -->
+ <eviction wakeUpInterval="5000">
+ <default algorithmClass="org.jboss.cache.eviction.FIFOAlgorithm" actionPolicyClass="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.ParentNodeEvictionActionPolicy" eventQueueSize="1000000">
+ <property name="maxNodes" value="5000" />
+ <property name="minTimeToLive" value="60000" />
+ </default>
+ </eviction>
+
+</jbosscache>
\ No newline at end of file
Added: portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/local/config-wsrp-system.xml
===================================================================
--- portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/local/config-wsrp-system.xml (rev 0)
+++ portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/local/config-wsrp-system.xml 2010-01-25 09:16:26 UTC (rev 1442)
@@ -0,0 +1,38 @@
+<!--
+ ~ Copyright (C) 2009 eXo Platform SAS.
+ ~
+ ~ This is free software; you can redistribute it and/or modify it
+ ~ under the terms of the GNU Lesser General Public License as
+ ~ published by the Free Software Foundation; either version 2.1 of
+ ~ the License, or (at your option) any later version.
+ ~
+ ~ This software is distributed in the hope that it will be useful,
+ ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ ~ Lesser General Public License for more details.
+ ~
+ ~ You should have received a copy of the GNU Lesser General Public
+ ~ License along with this software; if not, write to the Free
+ ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ -->
+
+<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"/>
+
+ <!-- Configure the TransactionManager -->
+ <transaction transactionManagerLookupClass="org.jboss.cache.transaction.JBossStandaloneJTAManagerLookup" />
+
+ <!-- Enable batching -->
+ <invocationBatching enabled="true" />
+
+ <!-- Eviction configuration -->
+ <eviction wakeUpInterval="5000">
+ <default algorithmClass="org.jboss.cache.eviction.FIFOAlgorithm" actionPolicyClass="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.ParentNodeEvictionActionPolicy" eventQueueSize="1000000">
+ <property name="maxNodes" value="5000" />
+ <property name="minTimeToLive" value="60000" />
+ </default>
+ </eviction>
+
+</jbosscache>
\ No newline at end of file
Deleted: portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/local/config.xml
===================================================================
--- portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/local/config.xml 2010-01-25 06:02:11 UTC (rev 1441)
+++ portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/local/config.xml 2010-01-25 09:16:26 UTC (rev 1442)
@@ -1,37 +0,0 @@
-<!--
- ~ Copyright (C) 2009 eXo Platform SAS.
- ~
- ~ This is free software; you can redistribute it and/or modify it
- ~ under the terms of the GNU Lesser General Public License as
- ~ published by the Free Software Foundation; either version 2.1 of
- ~ the License, or (at your option) any later version.
- ~
- ~ This software is distributed in the hope that it will be useful,
- ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
- ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- ~ Lesser General Public License for more details.
- ~
- ~ You should have received a copy of the GNU Lesser General Public
- ~ License along with this software; if not, write to the Free
- ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- -->
-<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"/>
-
- <!-- Configure the TransactionManager -->
- <transaction transactionManagerLookupClass="org.jboss.cache.transaction.JBossStandaloneJTAManagerLookup" />
-
- <!-- Enable batching -->
- <invocationBatching enabled="true" />
-
- <!-- Eviction configuration -->
- <eviction wakeUpInterval="5000">
- <default algorithmClass="org.jboss.cache.eviction.FIFOAlgorithm" actionPolicyClass="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.ParentNodeEvictionActionPolicy" eventQueueSize="1000000">
- <property name="maxNodes" value="5000" />
- <property name="minTimeToLive" value="60000" />
- </default>
- </eviction>
-
-</jbosscache>
\ No newline at end of file
Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/cache/DataCache.java
===================================================================
--- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/cache/DataCache.java 2010-01-25 06:02:11 UTC (rev 1441)
+++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/config/cache/DataCache.java 2010-01-25 09:16:26 UTC (rev 1442)
@@ -18,6 +18,7 @@
*/
package org.exoplatform.portal.pom.config.cache;
+import org.exoplatform.container.ExoContainer;
import org.exoplatform.portal.pom.config.POMSession;
import org.exoplatform.portal.pom.config.POMTask;
import org.exoplatform.portal.pom.config.TaskExecutor;
@@ -36,6 +37,9 @@
/** . */
private final AtomicLong readCount = new AtomicLong();
+ /** . */
+ private boolean cluster = ExoContainer.getProfiles().contains("cluster");
+
public DataCache(TaskExecutor next)
{
super(next);
@@ -43,7 +47,7 @@
public <V> V execute(POMSession session, POMTask<V> task) throws Exception
{
- if (task instanceof CacheableDataTask)
+ if (task instanceof CacheableDataTask && !cluster)
{
CacheableDataTask<?, V> loadTask = (CacheableDataTask<?, V>)task;
switch (loadTask.getAccessMode())
Modified: portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/jcr/repository-configuration.xml
===================================================================
--- portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/jcr/repository-configuration.xml 2010-01-25 06:02:11 UTC (rev 1441)
+++ portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/jcr/repository-configuration.xml 2010-01-25 09:16:26 UTC (rev 1442)
@@ -39,7 +39,7 @@
<value-storages>
<value-storage id="sample-ws" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage">
<properties>
- <property name="path" value="${gatein.jcr.data.dir}/values/sample-ws${container.name.suffix}" />
+ <property name="path" value="${gatein.jcr.storage.data.dir}/sample-ws${container.name.suffix}" />
</properties>
<filters>
<filter property-type="Binary" />
@@ -62,7 +62,7 @@
</cache>
<query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex">
<properties>
- <property name="index-dir" value="${gatein.jcr.data.dir}/jcrlucenedb/sample-ws${container.name.suffix}" />
+ <property name="index-dir" value="${gatein.jcr.index.data.dir}/sample-ws${container.name.suffix}" />
</properties>
</query-handler>
<lock-manager>
Modified: portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/jcr/repository-configuration.xml
===================================================================
--- portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/jcr/repository-configuration.xml 2010-01-25 06:02:11 UTC (rev 1441)
+++ portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/jcr/repository-configuration.xml 2010-01-25 09:16:26 UTC (rev 1442)
@@ -39,7 +39,7 @@
<value-storages>
<value-storage id="sample-ws" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage">
<properties>
- <property name="path" value="${gatein.jcr.data.dir}/values/sample-ws${container.name.suffix}" />
+ <property name="path" value="${gatein.jcr.storage.data.dir}/sample-ws${container.name.suffix}" />
</properties>
<filters>
<filter property-type="Binary" />
@@ -62,7 +62,7 @@
</cache>
<query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex">
<properties>
- <property name="index-dir" value="${gatein.jcr.data.dir}/jcrlucenedb/sample-ws${container.name.suffix}" />
+ <property name="index-dir" value="${gatein.jcr.index.data.dir}/sample-ws${container.name.suffix}" />
</properties>
</query-handler>
<lock-manager>
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/local/repository-configuration.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/local/repository-configuration.xml 2010-01-25 06:02:11 UTC (rev 1441)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/local/repository-configuration.xml 2010-01-25 09:16:26 UTC (rev 1442)
@@ -57,18 +57,21 @@
</initializer>
<cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache">
<properties>
- <property name="jbosscache-configuration" value="conf/jcr/jbosscache/local/config.xml" />
+ <property name="jbosscache-configuration" value="conf/jcr/jbosscache/${gatein.jcr.config.type}/config-system.xml" />
</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}/system${container.name.suffix}"/>
+ <property name="changesfilter-class" value="${gatein.jcr.changefilterclass}" />
+ <property name="changesfilter-config-path" value="conf/jcr/jbosscache/cluster/indexer-config-system.xml" />
+ <property name="max-volatile-time" value="60" />
</properties>
</query-handler>
<lock-manager class="org.exoplatform.services.jcr.impl.core.lock.jbosscache.CacheableLockManager">
<properties>
<property name="time-out" value="15m" />
- <property name="jbosscache-configuration" value="conf/jcr/jbosscache/local/lock-config-system.xml" />
+ <property name="jbosscache-configuration" value="conf/jcr/jbosscache/${gatein.jcr.config.type}/lock-config-system.xml" />
</properties>
</lock-manager>
</workspace>
@@ -103,18 +106,21 @@
</initializer>
<cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache">
<properties>
- <property name="jbosscache-configuration" value="conf/jcr/jbosscache/local/config.xml" />
+ <property name="jbosscache-configuration" value="conf/jcr/jbosscache/${gatein.jcr.config.type}/config-portal-system.xml" />
</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.changefilterclass}" />
+ <property name="changesfilter-config-path" value="conf/jcr/jbosscache/cluster/indexer-config-portal-system.xml" />
+ <property name="max-volatile-time" value="60" />
</properties>
</query-handler>
<lock-manager class="org.exoplatform.services.jcr.impl.core.lock.jbosscache.CacheableLockManager">
<properties>
<property name="time-out" value="15m" />
- <property name="jbosscache-configuration" value="conf/jcr/jbosscache/local/lock-config-portal-system.xml" />
+ <property name="jbosscache-configuration" value="conf/jcr/jbosscache/${gatein.jcr.config.type}/lock-config-portal-system.xml" />
</properties>
</lock-manager>
</workspace>
@@ -149,18 +155,21 @@
</initializer>
<cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache">
<properties>
- <property name="jbosscache-configuration" value="conf/jcr/jbosscache/local/config.xml" />
+ <property name="jbosscache-configuration" value="conf/jcr/jbosscache/${gatein.jcr.config.type}/config-portal-work.xml" />
</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-work${container.name.suffix}"/>
+ <property name="changesfilter-class" value="${gatein.jcr.changefilterclass}" />
+ <property name="changesfilter-config-path" value="conf/jcr/jbosscache/cluster/indexer-config-portal-work.xml" />
+ <property name="max-volatile-time" value="60" />
</properties>
</query-handler>
<lock-manager class="org.exoplatform.services.jcr.impl.core.lock.jbosscache.CacheableLockManager">
<properties>
<property name="time-out" value="15m" />
- <property name="jbosscache-configuration" value="conf/jcr/jbosscache/local/lock-config-portal-work.xml" />
+ <property name="jbosscache-configuration" value="conf/jcr/jbosscache/${gatein.jcr.config.type}/lock-config-portal-work.xml" />
</properties>
</lock-manager>
</workspace>
@@ -196,18 +205,21 @@
</initializer>
<cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache">
<properties>
- <property name="jbosscache-configuration" value="conf/jcr/jbosscache/local/config.xml" />
+ <property name="jbosscache-configuration" value="conf/jcr/jbosscache/${gatein.jcr.config.type}/config-wsrp-system.xml" />
</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}/wsrp${container.name.suffix}"/>
+ <property name="changesfilter-class" value="${gatein.jcr.changefilterclass}" />
+ <property name="changesfilter-config-path" value="conf/jcr/jbosscache/cluster/indexer-config-wsrp-system.xml" />
+ <property name="max-volatile-time" value="60" />
</properties>
</query-handler>
<lock-manager class="org.exoplatform.services.jcr.impl.core.lock.jbosscache.CacheableLockManager">
<properties>
<property name="time-out" value="15m" />
- <property name="jbosscache-configuration" value="conf/jcr/jbosscache/local/lock-config-wsrp-system.xml" />
+ <property name="jbosscache-configuration" value="conf/jcr/jbosscache/${gatein.jcr.config.type}/lock-config-wsrp-system.xml" />
</properties>
</lock-manager>
</workspace>
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/web.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/web.xml 2010-01-25 06:02:11 UTC (rev 1441)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/web.xml 2010-01-25 09:16:26 UTC (rev 1442)
@@ -28,8 +28,8 @@
<!--Uncomment for clustered setup-->
<!--
+ -->
<distributable/>
- -->
<context-param>
<param-name>org.exoplatform.frameworks.jcr.command.web.fckeditor.digitalAssetsWorkspace</param-name>
15 years, 8 months
- 1
- 0
gatein SVN: r1441 - portal/trunk/docs/reference-guide/en/modules/configuration.
by do-not-reply＠jboss.org
Author: smumford
Date: 2010-01-25 01:02:11 -0500 (Mon, 25 Jan 2010)
New Revision: 1441
Modified:
portal/trunk/docs/reference-guide/en/modules/configuration/JavaScript_Configuration.xml
portal/trunk/docs/reference-guide/en/modules/configuration/Skin_Configuration.xml
Log:
further edits
Modified: portal/trunk/docs/reference-guide/en/modules/configuration/JavaScript_Configuration.xml
===================================================================
--- portal/trunk/docs/reference-guide/en/modules/configuration/JavaScript_Configuration.xml 2010-01-25 03:17:17 UTC (rev 1440)
+++ portal/trunk/docs/reference-guide/en/modules/configuration/JavaScript_Configuration.xml 2010-01-25 06:02:11 UTC (rev 1441)
@@ -6,10 +6,13 @@
<section id="sect-Reference_Guide-Javascript_Configuration">
<title>Javascript Configuration</title>
<para>
- Manaing Javascript scripts in an application like GateIn Platform is a critical part of the configuration work if you want to get good response time.
+ Managing Javascript scripts in an application like &PRODUCT; is a critical part of the configuration work. Configuring the scripts correctly will result in a faster response time from the portal.
</para>
<para>
- Every portlet can have its own javscript code but in many cases it is more convenient to reuse some existing shared libraries. For that reason, GateIn has a mechanism to easily register the libraries that will be loaded when the first page will be rendered. To do so, every WAR deployed in GateIn can register the js files thanks to a groovy script "WEB-INF/conf/script/groovy/JavascriptScript.groovy". The next file is the one you can find in the GateInResources.war
+ Every portlet can have its own javscript code but in many cases it is more convenient to reuse some existing shared libraries. For that reason, &PRODUCT; has a mechanism to easily register the libraries that will be loaded when the first page will be rendered.
+ </para>
+ <para>
+ To do so, every WAR deployed in &PRODUCT; can register the <filename>js</filename> files thanks to a groovy script "<filename>WEB-INF/conf/script/groovy/JavascriptScript.groovy</filename>". The example file below is found in the 01eXoResources.war
</para>
<programlisting>JavascriptService.addJavascript("eXo", "/javascript/eXo.js", ServletContext);
@@ -56,17 +59,26 @@
JavascriptService.addJavascript("eXo.desktop.UIWindow", "/javascript/eXo/desktop/UIWindow.js", ServletContext);
</programlisting>
<para>
- Note that even if the you register dedicated javascripts, they will be merged into a single <literal>merged.js</literal> file when the server will load in order to reduce the number of HTTP calls as seen in the home page source code:
+ Note that even registered dedicated javascripts will be merged into a single <literal>merged.js</literal> file when the server loads. This reduces the number of HTTP calls as seen in the home page source code:
</para>
<programlisting><script type="text/javascript" src="/portal/javascript/merged.js"></script>
</programlisting>
<para>
- Although this optimization is useful for a production environment, you may find it easier to deactivate this optimization while debugging your javascript. For that, you simply need to set the java system property <literal>exo.product.developing</literal> to <literal>true</literal>. But if you <emphasis>want to see or use the merged file</emphasis> you have to set this property to <literal>false</literal>. You can pass the property as a JVM parameter with the <literal>-D</literal> option in your <literal>GateIn.sh</literal> or <literal>GateIn.bat</literal> startup script:
+ Although this optimization is useful for a production environment, it may be easier to deactivate this optimization while debugging javascript problems.
</para>
<para>
- Every javascript file is referenced with a module name of type "eXo.core.DragDrop" which acts like a namespace. Inside the associated files, global javascript functions are used following the same namespace convention:
+ To do this, set the java system property <literal>exo.product.developing</literal> to <literal>true</literal>.
</para>
+ <para>
+ To see or use the merged file set this property to <literal>false</literal>.
+ </para>
+ <para>
+ The property can be passed as a JVM parameter with the <literal>-D</literal> option in your <literal>GateIn.sh</literal> or <literal>GateIn.bat</literal> startup script.
+ </para>
+ <para>
+ Every javascript file is referenced with a module name of "<literal>eXo.core.DragDrop</literal>" which acts as a namespace. Inside the associated files, global javascript functions are used following the same namespace convention:
+ </para>
<programlisting>eXo.core.DragDrop = new DragDrop() ;
</programlisting>
Modified: portal/trunk/docs/reference-guide/en/modules/configuration/Skin_Configuration.xml
===================================================================
--- portal/trunk/docs/reference-guide/en/modules/configuration/Skin_Configuration.xml 2010-01-25 03:17:17 UTC (rev 1440)
+++ portal/trunk/docs/reference-guide/en/modules/configuration/Skin_Configuration.xml 2010-01-25 06:02:11 UTC (rev 1441)
@@ -125,7 +125,7 @@
<section id="sect-Reference_Guide-How_to_Configure_a_Portal_Skin-SkinService">
<title>SkinService</title>
<para>
- The <ulink url="http://fisheye.exoplatform.org/browse/projects/portal/trunk/webui/portal/...">SkinService</ulink> is an GateIn service that manages portal skin, portlet styles and portlet themes (windows borders). The code snippet below is an excerpt of the API offered by this service.
+ The <ulink url="http://fisheye.exoplatform.org/browse/projects/portal/trunk/webui/portal/...">SkinService</ulink> is an &PRODUCT; service that manages portal skin, portlet styles and portlet themes (windows borders). The code snippet below is an excerpt of the API offered by this service.
</para>
<programlisting role="JAVA">/**
@@ -174,7 +174,7 @@
<section id="sect-Reference_Guide-How_to_Configure_a_Portal_Skin-SkinConfigListener">
<title>SkinConfigListener</title>
<para>
- GateIn provides a servlet listener that allows you to register your own skins and styles when your webapp starts up. Your first step is to add the listener to your portlet app <literal>web.xml</literal>.
+ &PRODUCT; provides a servlet listener that allows you to register your own skins and styles when your webapp starts up. The first step is to add the listener to your portlet app <literal>web.xml</literal>.
</para>
<programlisting role="XML"><web-app>
@@ -190,10 +190,10 @@
<section id="sect-Reference_Guide-How_to_Configure_a_Portal_Skin-SkinConfigScript.groovy">
<title>SkinConfigScript.groovy</title>
<para>
- The <literal>SkinListener</literal> looks for the groovy script file located in your war under: <filename>/WEB-INF/conf/script/groovy/SkinConfigScript.groovy</filename>
+ The <literal>SkinListener</literal> looks for the groovy script file located in the <filename>war</filename> under: <filename>/WEB-INF/conf/script/groovy/SkinConfigScript.groovy</filename>
</para>
<para>
- In this script, you have full access to the <literal>SkinService</literal> and <literal>ServletContext</literal> which are bound as scripting variables under the same name. As an example, take a look at the following script. It can be found in the <literal>GateInResources.war</literal> and is used by GateIn to register the <literal>Default</literal> portal skin and some portlet themes.
+ This script allows full access to the <literal>SkinService</literal> and <literal>ServletContext</literal> which are bound as scripting variables under the same name. The following script is an example. It can be found in the <literal>GateInResources.war</literal> and is used by &PRODUCT; to register the <literal>Default</literal> portal skin and some portlet themes.
</para>
<programlisting>SkinService.addPortalSkin("CoreSkin","Default", "/GateInResources/skin/Stylesheet.css", ServletContext);
@@ -222,10 +222,10 @@
</programlisting>
</para>
<para>
- <literal>overwrite</literal> is optional, its default value is "false". If its value is true, the later call of addSkin() for the same skin key (combination of module + skinName) replaces the skin of the previous call.
+ '<literal>overwrite</literal>' is optional, its default value is "<parameter>false</parameter>". If its value is <parameter>true</parameter>, the later call of <parameter>addSkin()</parameter> for the same skin key (combination of module + skinName) replaces the skin of the previous call.
</para>
<para>
- Similarly, to configure a particular portal you can use the following :
+ Similarly, use the following to configure a particular portal:
</para>
<programlisting>SkinService.addSkin("myportalname", "skin", "/path/to/skin/Stylesheet.css", ServletContext);
@@ -242,18 +242,18 @@
<section id="sect-Reference_Guide-Skin_Configuration-Tips_and_Tricks">
<title>Tips and Tricks</title>
<section id="sect-Reference_Guide-Tips_and_Tricks-Easier_css_debuggin">
- <title>Easier css debuggin</title>
+ <title>Easier css debugging</title>
<para>
- By default, CSS files are cached and their imports are merged, at the server side, into a single CSS file to reduce the number of HTTP requests from the browser to the server.
+ By default, CSS files are cached and their imports are merged into a single CSS file at the server side. This reduces the number of HTTP requests from the browser to the server.
</para>
<para>
- The <literal>ServletContext</literal> parameter is there to allow the direct access to the CSS files from the <literal>SkinService</literal>. The optimization code is quite simple as all the CSS files are parsed at the server startup time and all the @import and url(...) references are rewritten to support a single flat file. The result is stored in a cache directly used from the <literal>ResourceRequestFilter</literal>.
+ The <literal>ServletContext</literal> parameter allows direct access to the CSS files from the <literal>SkinService</literal>. The optimization code is quite simple as all the CSS files are parsed at the server startup time and all the @import and url(...) references are rewritten to support a single flat file. The result is stored in a cache directly used from the <literal>ResourceRequestFilter</literal>.
</para>
<para>
- Although the optimization is useful for a production environments, you may find it easier to deactivate this optimization while debugging your stylesheets. For that, you simply need to set the java system property <literal>exo.product.developing</literal> to <literal>true</literal>.
+ Although the optimization is useful for a production environments, it may be easier to deactivate this optimization while debugging stylesheets. To do so, set the java system property <literal>exo.product.developing</literal> to <literal>true</literal>.
</para>
<para>
- For example, you can pass the property as a JVM parameter with the <literal>-D</literal> option in your <literal>GateIn.sh</literal> startup script: {code} EXO{code}
+ For example, the property can passed as a JVM parameter with the <literal>-D</literal> option in the <literal>GateIn.sh</literal> startup script: {code} EXO{code}
</para>
<orderedlist numeration="arabic">
<listitem>
@@ -267,31 +267,31 @@
<section id="sect-Reference_Guide-Tips_and_Tricks-Change_portlet_icons">
<title> Change portlet icons </title>
<para>
- Each portlet is represented by an icon that you can see in the portlet registry, or the webos dock. You can change this icon by adding an image in the directory :
+ Each portlet is represented by an icon that you can see in the portlet registry, or the webos dock. This icon can be changed by adding an image to the directory:
</para>
<itemizedlist>
<listitem>
<para>
- $project/portlet/myportlets/src/main/webapp/skin/DefaultSkin/portletIcons/<emphasis role="bold">and by naming the icon after the portlet, eg:</emphasis>ExoPortlet.png
+ <filename>$project/portlet/myportlets/src/main/webapp/skin/DefaultSkin/portletIcons<replaceable>icon_name.png</replaceable></filename>. To be used correctly the icon must be named after the portlet.
</para>
</listitem>
</itemizedlist>
<para>
- For example, in portal we have an account portlet named AccountPortlet, the icon is located in :
+ For example,the icon for an account portlet named AccountPortlet would be located at:
</para>
<itemizedlist>
<listitem>
<para>
- portal/tags/2.1.1/portlet/exoadmin/src/main/webapp/skin/DefaultSkin/portletIcons/AccountPortlet.png
+ <filename>portal/tags/2.1.1/portlet/exoadmin/src/main/webapp/skin/DefaultSkin/portletIcons/AccountPortlet.png</filename>
</para>
</listitem>
</itemizedlist>
</section>
- <section id="sect-Reference_Guide-Tips_and_Tricks-Set_the_default_skin_for_Portal">
- <title> Set the default skin for Portal </title>
+ <section id="sect-Reference_Guide-Tips_and_Tricks-Set_the_default_skin">
+ <title>Set the default skin</title>
<para>
- When not configured, the default skin of portal is Default. If you want to change this value (to Mac skin, Vista skin, or your own), add a skin tag in the <literal>portal.xml</literal> that defines your portal:
+ The default skin of portal is called Default. To change this value (to a Mac-like skin, a Windows Vista-like skin, or an original skin), add a skin tag in the <literal>portal.xml</literal> that defines your portal:
</para>
<programlisting role="XML"><portal-config>
@@ -308,10 +308,10 @@
<section id="sect-Reference_Guide-Tips_and_Tricks-Some_CSS_techniques">
<title>Some CSS techniques</title>
<para>
- Before studying GateIn CSS, make sure you already have some experience with css and read the css spec at http://www.w3.org/TR/REC-CSS2/selector.html
+ It is recommended that users have some experience with CSS before studying &PRODUCT; CSS. ALso, pleased read the CSS specification at <ulink type="http" url="http://www.w3.org/TR/REC-CSS2/selector.html"></ulink>
</para>
<para>
- GateIn relies heavily on CSS to create the layout and special effects for the UI. Below we explain some common techniques you may find often inside GateIn's markup. We explain them here to help you better understand GateIn generated markup, ease css issues fixing or get inspration for styling your own apps.
+ &PRODUCT; relies heavily on CSS to create the layout and effects for the UI. Some common techniques for customizing &PRODUCT;'s CSS are explained below.
</para>
<section id="sect-Reference_Guide-Some_CSS_techniques-Decorator_pattern">
<title>Decorator pattern</title>
@@ -383,28 +383,54 @@
<section id="sect-Reference_Guide-Skin_Configuration-How_to_create_a_new_skin">
<title>How to create a new skin</title>
- <para>
- New skin can be created by the configuration. Firstly, you have to definy the new skin in <literal>WEB-INF/conf/script/groovy/SkinConfigScript.groovy</literal> in your <literal>Ressource</literal> (for example, in the project MyPortal, you can put it in <literal>GateInResourcesMyPortal</literal>).
- </para>
-
+ <procedure>
+ <step>
+ <para>
+ Define the new skin in the <literal>WEB-INF/conf/script/groovy/SkinConfigScript.groovy</literal> file as a <literal>Resource</literal> (for example, in the project <replaceable>MyPortal</replaceable>, the resource would read; <literal>GateInResourcesMyPortal</literal>).
+ </para>
+<warning>
+<para>
+ The <literal>WEB-INF/conf/script/groovy/SkinConfigScript.groovy</literal> file mentioned above does not exist in EPP-5.0.ER2. The closest match is <literal>./jboss-as/server/default/tmp/<replaceable>instance</replaceable>/02portal.war/WEB-INF/conf/uiconf/portal/webui/portal/SkinConfigOption.groovy
+</literal>
+</para>
+</warning>
<programlisting>
SkinService.addPortalSkin("MyPortalSkin","MyPortal","/GateInResourcesMyPortal/skin/Stylesheet.css",ServletContext);
</programlisting>
- <para>
- Secondly, you put all your new skin into <literal>folder skinyourSkin</literal> and create new file <literal>Stylesheet.css</literal> here. In this file, you will import all links to your CSS. For example in MyPortal project.
- </para>
+ </step>
+ <step>
+ <para>
+ Place the new skin files into the <replaceable>skinyourSkin</replaceable> folder and create a new <literal>Stylesheet.css</literal> file in the same directory. This file should include lines to import all links to your CSS. For example in <replaceable>MyPortal</replaceable> project:
+ </para>
<programlisting>
@import url(MyPortalSkin/portal/webui/component/UIPortalApplicationSkin.css) ;
@import url(MyPortalSkin/webui/component/Stylesheet.css) ;
</programlisting>
- <para>
- Finally, you have to definy the name of new skin and the image preview for the <emphasis>Skin Settings</emphasis> action in <emphasis> "User Workspace" </emphasis> <!-- <link linkend="User Workspace">User Workspace</link> -->.
- </para>
- <para>
- By default, if you don not set new name for skin, its name is <literal>label></literal>. Looking in the file and add yout new name here.
- </para>
+ </step>
+ <step>
+ <para>
+ Finally, define the name of new skin and the image preview for the <emphasis>Skin Settings</emphasis> action. The image preview can be set in the file:<filename>ressource/skin/DefaultSkin/portal/webui/component/customization/UIChangeSkinForm/Stylesheet.css</filename>
+
+<programlisting>
+.UIChangeSkinForm .UIItemSelector .TemplateContainer .MyPortalImage {
+ margin: auto;
+ width: 329px; height:204px;
+ background: url('background/MyPortal.jpg') no-repeat top;
+ cursor: pointer ;
+}
+</programlisting>
+ </para>
+ <para>
+ If no name is set for the new skin, it will be named <literal>label></literal>. The skin name is defined in the <literal>./jboss-as/server/default/tmp<replaceable>instance</replaceable>/<replaceable>resource</replaceable>/skin/DefaultSkin/portal/webui/component/customization/UIChangeSkinForm/Stylesheet.css</literal>.
+ </para>
+<warning>
+<para>
+ The program listing below is in French. This should be translated into en-US before publication.
+</para>
+</warning>
+
<programlisting>
#############################################################################
# Change Skin #
@@ -420,40 +446,38 @@
Skin.title=Liste des styles
Skin.left.title=Voir et s?lectionner un style
</programlisting>
- <para>
- The image peeview can be set in file <literal>ressource/skin/DefaultSkin/portal/webui/component/customization/UIChangeSkinForm/Stylesheet.css</literal> of Portal.
- </para>
-
-<programlisting>
-.UIChangeSkinForm .UIItemSelector .TemplateContainer .MyPortalImage {
- margin: auto;
- width: 329px; height:204px;
- background: url('background/MyPortal.jpg') no-repeat top;
- cursor: pointer ;
-}
-</programlisting>
- <para>
- And now, you copy your image <literal>MyPortal.jpg</literal> (that you defined above) to the folder <literal>ressource/skin/DefaultSkin/portal/webui/component/customization/UIChangeSkinForm/background</literal> and test your new skin.
- </para>
+
+ </step>
+ <step>
+ <para>
+ Copy the image defined above (<literal>MyPortal.jpg</literal>) to the folder <literal>ressource/skin/DefaultSkin/portal/webui/component/customization/UIChangeSkinForm/background</literal> and test your new skin.
+ </para>
+ </step>
+ </procedure>
</section>
<section id="sect-Reference_Guide-Skin_Configuration-How_to_create_new_themes">
<title>How to create new themes</title>
- <para>
- Firstly, you have to definy the new theme in <literal>WEB-INF/conf/script/groovy/SkinConfigScript.groovy</literal> in your <literal>Ressource</literal> (for example, in the project MyPortal, you can put it in <literal>GateInResourcesCp060508</literal>).
- </para>
-
+ <procedure>
+ <step>
+ <para>
+ Define the new theme in <literal>WEB-INF/conf/script/groovy/SkinConfigScript.groovy</literal> in your <literal>Resource</literal> (for example, in the project MyPortal: <literal>GateInResourcesCp060508</literal>).
+ </para>
<programlisting>SkinService.addTheme("MyPortal-MacTheme", ["MacGray","MacBlue","MacBlack"]);
</programlisting>
- <para>
- Secondly, you put all your new theme into <literal>folder skinyourSkin</literal> and create new file <literal>Stylesheet.css</literal> here. In this file, you will import all links to your CSS. For example in MyPortal project.
- </para>
-
+ </step>
+ <step>
+ <para>
+ Place new theme files into <literal>folder skinyourSkin</literal> and create a new <literal>Stylesheet.css</literal> file in the same directory. This file should include lines to import all links to all CSS resources. For example, in the <replaceable>MyPortal</replaceable> project:
+ </para>
+
<programlisting>@import url(MyPortalSkin/PortletThemes/Stylesheet.css) ;
</programlisting>
- <para>
- You can see here, in the <literal>GateInResourcesCp060508/skin/MyPortalSkin/PortletThemes/Stylesheet.css</literal>, you put all your CSS of new theme.
- </para>
+ </step>
+ </procedure>
+ <para>
+ The code below illustrates the inclusion of all CSS resoucres for a new theme from the example file <literal>GateInResourcesCp060508/skin/MyPortalSkin/PortletThemes/Stylesheet.css</literal>.
+ </para>
<programlisting>
/*---- MyPortalTheme ----*/
@@ -583,6 +607,7 @@
height: 30px;
}
</programlisting>
+
</section>
</section>
15 years, 8 months
- 1
- 0
gatein SVN: r1440 - portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application.
by do-not-reply＠jboss.org
Author: tuancn
Date: 2010-01-24 22:17:17 -0500 (Sun, 24 Jan 2010)
New Revision: 1440
Modified:
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletLifecycle.java
Log:
GTNPORTAL-423 NPE when delete tab of Dashboard in special case
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletLifecycle.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletLifecycle.java 2010-01-25 03:16:10 UTC (rev 1439)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortletLifecycle.java 2010-01-25 03:17:17 UTC (rev 1440)
@@ -30,12 +30,14 @@
import org.exoplatform.services.log.ExoLogger;
import org.exoplatform.services.log.Log;
import org.exoplatform.services.portletcontainer.PortletContainerException;
+import org.exoplatform.web.application.ApplicationMessage;
import org.exoplatform.webui.application.WebuiApplication;
import org.exoplatform.webui.application.WebuiRequestContext;
import org.exoplatform.webui.core.UIComponent;
import org.exoplatform.webui.core.lifecycle.Lifecycle;
import org.exoplatform.webui.core.lifecycle.WebuiBindingContext;
import org.exoplatform.webui.event.Event;
+import org.exoplatform.webui.exception.MessageException;
import org.gatein.common.util.MultiValuedPropertyMap;
import org.gatein.pc.api.invocation.RenderInvocation;
import org.gatein.pc.api.invocation.response.ErrorResponse;
@@ -74,70 +76,75 @@
*/
public void processAction(UIPortlet<S, C> uicomponent, WebuiRequestContext context) throws Exception
{
- String action = context.getRequestParameter(PortalRequestContext.UI_COMPONENT_ACTION);
- if (action != null)
+ try
{
- Event<UIComponent> event = uicomponent.createEvent(action, Event.Phase.PROCESS, context);
- if (event != null)
- event.broadcast();
- return;
- }
+ String action = context.getRequestParameter(PortalRequestContext.UI_COMPONENT_ACTION);
+ if (action != null)
+ {
+ Event<UIComponent> event = uicomponent.createEvent(action, Event.Phase.PROCESS, context);
+ if (event != null)
+ event.broadcast();
+ return;
+ }
- boolean addUpdateComponent = false;
- String portletMode = context.getRequestParameter("portal:portletMode");
- if (portletMode != null)
- {
- Event<UIComponent> event = uicomponent.createEvent("ChangePortletMode", Event.Phase.PROCESS, context);
- if (event != null)
- event.broadcast();
- addUpdateComponent = true;
- }
+ String portletMode = context.getRequestParameter("portal:portletMode");
+ if (portletMode != null)
+ {
+ Event<UIComponent> event = uicomponent.createEvent("ChangePortletMode", Event.Phase.PROCESS, context);
+ if (event != null)
+ event.broadcast();
+ }
- String windowState = context.getRequestParameter("portal:windowState");
- if (windowState != null)
- {
- Event<UIComponent> event = uicomponent.createEvent("ChangeWindowState", Event.Phase.PROCESS, context);
- if (event != null)
- event.broadcast();
- addUpdateComponent = true;
- }
-
- /*
- * Check the type of the incoming request, can be either an ActionURL or a
- * RenderURL one
- *
- * In case of a RenderURL, the parameter state map must be invalidated and
- * ths is done in the associated ActionListener
- *
- * If no action type is specified we assume the default, which is to render
- */
- String portletActionType = context.getRequestParameter(Constants.TYPE_PARAMETER);
- if (portletActionType != null)
- {
- if (portletActionType.equals(Constants.PORTAL_PROCESS_ACTION))
+ String windowState = context.getRequestParameter("portal:windowState");
+ if (windowState != null)
{
- Event<UIComponent> event = uicomponent.createEvent("ProcessAction", Event.Phase.PROCESS, context);
+ Event<UIComponent> event = uicomponent.createEvent("ChangeWindowState", Event.Phase.PROCESS, context);
if (event != null)
event.broadcast();
- addUpdateComponent = true;
}
- else if (portletActionType.equals(Constants.PORTAL_SERVE_RESOURCE))
+
+ /*
+ * Check the type of the incoming request, can be either an ActionURL or a
+ * RenderURL one
+ *
+ * In case of a RenderURL, the parameter state map must be invalidated and
+ * this is done in the associated ActionListener
+ *
+ * If no action type is specified we assume the default, which is to render
+ */
+ String portletActionType = context.getRequestParameter(Constants.TYPE_PARAMETER);
+ if (portletActionType != null)
{
- Event<UIComponent> event = uicomponent.createEvent("ServeResource", Event.Phase.PROCESS, context);
+ if (portletActionType.equals(Constants.PORTAL_PROCESS_ACTION))
+ {
+ Event<UIComponent> event = uicomponent.createEvent("ProcessAction", Event.Phase.PROCESS, context);
+ if (event != null)
+ event.broadcast();
+ }
+ else if (portletActionType.equals(Constants.PORTAL_SERVE_RESOURCE))
+ {
+ Event<UIComponent> event = uicomponent.createEvent("ServeResource", Event.Phase.PROCESS, context);
+ if (event != null)
+ event.broadcast();
+ }
+ }
+ else
+ {
+ Event<UIComponent> event = uicomponent.createEvent("Render", Event.Phase.PROCESS, context);
if (event != null)
event.broadcast();
}
+
+ context.addUIComponentToUpdateByAjax(uicomponent);
}
- else
+ catch (Exception e)
{
- Event<UIComponent> event = uicomponent.createEvent("Render", Event.Phase.PROCESS, context);
- if (event != null)
- event.broadcast();
- addUpdateComponent = true;
+ log.error(e.getMessage());
+ Object[] args = {e.getMessage()};
+ context.addUIComponentToUpdateByAjax(uicomponent);
+ throw new MessageException(new ApplicationMessage("UIPortletLifecycle.msg.process-error", args, ApplicationMessage.ERROR));
}
-
- if (addUpdateComponent)
- context.addUIComponentToUpdateByAjax(uicomponent);
+
}
/**
15 years, 8 months
- 1
- 0
gatein SVN: r1439 - portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal.
by do-not-reply＠jboss.org
Author: tuancn
Date: 2010-01-24 22:16:10 -0500 (Sun, 24 Jan 2010)
New Revision: 1439
Modified:
portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties
Log:
GTNPORTAL-423 NPE when delete tab of Dashboard in special case
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties 2010-01-25 03:08:03 UTC (rev 1438)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties 2010-01-25 03:16:10 UTC (rev 1439)
@@ -257,6 +257,7 @@
#############################################################################
UIApplication.msg.unknown-error=Unknown error
+UIPortletLifecycle.msg.process-error=Action process encountered an error
#############################################################################
# org.exoplatform.portal.component.customization.UIContainerForm#
15 years, 8 months
- 1
- 0
gatein SVN: r1438 - portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace.
by do-not-reply＠jboss.org
Author: truong.le
Date: 2010-01-24 22:08:03 -0500 (Sun, 24 Jan 2010)
New Revision: 1438
Modified:
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIPortalApplication.java
Log:
GTNPORTAL-446: Have problem when delete page in Manage pages in special case
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIPortalApplication.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIPortalApplication.java 2010-01-24 08:51:49 UTC (rev 1437)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIPortalApplication.java 2010-01-25 03:08:03 UTC (rev 1438)
@@ -19,10 +19,15 @@
package org.exoplatform.portal.webui.workspace;
+import org.exoplatform.container.ExoContainer;
import org.exoplatform.portal.application.PortalRequestContext;
import org.exoplatform.portal.config.DataStorage;
+import org.exoplatform.portal.config.NoSuchDataException;
import org.exoplatform.portal.config.UserPortalConfig;
+import org.exoplatform.portal.config.UserPortalConfigService;
import org.exoplatform.portal.config.model.Container;
+import org.exoplatform.portal.config.model.Page;
+import org.exoplatform.portal.config.model.PageNode;
import org.exoplatform.portal.resource.Skin;
import org.exoplatform.portal.resource.SkinConfig;
import org.exoplatform.portal.resource.SkinService;
@@ -376,20 +381,21 @@
}
/**
- * The processDecode() method is doing 3 actions: 1) if the nodePath is null
- * (case of the first request) a call to super.processDecode(context) is made
- * and we end the method here 2) if the nodePath exist but is equals to the
- * current one then we also call super and stops here 3) if the requested
- * nodePath is not equals to the current one , then an event of type
- * PageNodeEvent.CHANGE_PAGE_NODE is sent to the asociated EventListener; a
- * call to super is then done
+ * The processDecode() method is doing 3 actions:
+ * 1) if the nodePath is null (case of the first request) a call to
+ * super.processDecode(context) is made and we end the method here
+ * 2) if the nodePath exist but is equals to the current one
+ * then we also call super and stops here
+ * 3) if the requested nodePath is not equals to the current one or current
+ * page no longer exists, then an event of type PageNodeEvent.CHANGE_PAGE_NODE
+ * is sent to the associated EventListener; a call to super is then done
*/
public void processDecode(WebuiRequestContext context) throws Exception
{
PortalRequestContext pcontext = (PortalRequestContext)context;
String nodePath = pcontext.getNodePath().trim();
-
- if (!nodePath.equals(nodePath_))
+
+ if (!nodePath.equals(nodePath_) || !isPageExist())
{
nodePath_ = nodePath;
UIPortal uiPortal = findFirstComponentOfType(UIPortal.class);
@@ -557,5 +563,30 @@
{
this.userPortalConfig_ = userPortalConfig;
}
+
+ private boolean isPageExist() throws Exception
+ {
+ WebuiRequestContext context = Util.getPortalRequestContext();
+ ExoContainer appContainer = context.getApplication().getApplicationServiceContainer();
+ UserPortalConfigService userPortalConfigService =
+ (UserPortalConfigService)appContainer.getComponentInstanceOfType(UserPortalConfigService.class);
+ Page page = null;
+ PageNode pageNode = Util.getUIPortal().getSelectedNode();
+ if (pageNode != null)
+ {
+ try
+ {
+ if (pageNode.getPageReference() != null)
+ {
+ page = userPortalConfigService.getPage(pageNode.getPageReference(), context.getRemoteUser());
+ }
+ }
+ catch (NoSuchDataException nsde)
+ {
+ return false;
+ }
+ }
+ return (page != null);
+ }
}
15 years, 8 months
- 1
- 0
gatein SVN: r1437 - in portal/trunk: web/portal/src/main/webapp/WEB-INF/conf/common and 1 other directory.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2010-01-24 03:51:49 -0500 (Sun, 24 Jan 2010)
New Revision: 1437
Added:
portal/trunk/component/common/src/main/java/org/exoplatform/commons/InitialContextInitializer2.java
Modified:
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/common/common-configuration.xml
Log:
InitialContextInitializer2 that will not override an existing (AS deployed) datasource.
Added: portal/trunk/component/common/src/main/java/org/exoplatform/commons/InitialContextInitializer2.java
===================================================================
--- portal/trunk/component/common/src/main/java/org/exoplatform/commons/InitialContextInitializer2.java (rev 0)
+++ portal/trunk/component/common/src/main/java/org/exoplatform/commons/InitialContextInitializer2.java 2010-01-24 08:51:49 UTC (rev 1437)
@@ -0,0 +1,66 @@
+/*
+ * Copyright (C) 2009 eXo Platform SAS.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.exoplatform.commons;
+
+import org.exoplatform.container.component.ComponentPlugin;
+import org.exoplatform.container.configuration.ConfigurationException;
+import org.exoplatform.container.xml.InitParams;
+import org.exoplatform.services.naming.BindReferencePlugin;
+import org.exoplatform.services.naming.InitialContextInitializer;
+
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+
+/**
+ * This code should be moved in the core, for now it is here as it is needed here.
+ * It extends the {@link org.exoplatform.services.naming.InitialContextInitializer} to override the
+ * {@link #addPlugin(org.exoplatform.container.component.ComponentPlugin)} method and perform no binding
+ * if there is an existing binding before.
+ *
+ * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
+ * @version $Revision$
+ */
+public class InitialContextInitializer2 extends InitialContextInitializer
+{
+
+ public InitialContextInitializer2(InitParams params) throws NamingException, ConfigurationException
+ {
+ super(params);
+ }
+
+ @Override
+ public void addPlugin(ComponentPlugin plugin)
+ {
+ if (plugin instanceof BindReferencePlugin)
+ {
+ BindReferencePlugin brplugin = (BindReferencePlugin)plugin;
+ InitialContext initialContext = getInitialContext();
+ try
+ {
+ initialContext.lookup(brplugin.getBindName());
+ // If we reach this step it means that something is already bound
+ }
+ catch (NamingException e)
+ {
+ super.addPlugin(plugin);
+ }
+ }
+ }
+}
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/common/common-configuration.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/common/common-configuration.xml 2010-01-23 22:28:43 UTC (rev 1436)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/common/common-configuration.xml 2010-01-24 08:51:49 UTC (rev 1437)
@@ -26,7 +26,7 @@
xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd">
<component>
<key>org.exoplatform.services.naming.InitialContextInitializer</key>
- <type>org.exoplatform.services.naming.InitialContextInitializer</type>
+ <type>org.exoplatform.commons.InitialContextInitializer2</type>
<init-params>
<properties-param>
<name>default-properties</name>
15 years, 8 months
- 1
- 0
gatein SVN: r1436 - portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/database.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2010-01-23 17:28:43 -0500 (Sat, 23 Jan 2010)
New Revision: 1436
Modified:
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/database/database-configuration.xml
Log:
actually removing commented out C3P0 config
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/database/database-configuration.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/database/database-configuration.xml 2010-01-23 22:13:10 UTC (rev 1435)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/database/database-configuration.xml 2010-01-23 22:28:43 UTC (rev 1436)
@@ -42,12 +42,6 @@
<property name="hibernate.connection.datasource" value="${gatein.datasource.name}${container.name.suffix}"/>
<property name="hibernate.connection.autocommit" value="true"/>
<property name="hibernate.dialect" value="${gatein.datasource.dialect.hibernate}"/>
-<!--
- <property name="hibernate.c3p0.min_size" value="5"/>
- <property name="hibernate.c3p0.max_size" value="20"/>
- <property name="hibernate.c3p0.timeout" value="1800"/>
- <property name="hibernate.c3p0.max_statements" value="50"/>
--->
</properties-param>
</init-params>
</component>
15 years, 8 months
- 1
- 0
gatein SVN: r1435 - in portal/trunk: web/portal/src/main/webapp/WEB-INF/conf/database and 2 other directories.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2010-01-23 17:13:10 -0500 (Sat, 23 Jan 2010)
New Revision: 1435
Removed:
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/database/database-configuration.tmpl.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/jcr-configuration.tmpl.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/local/repository-configuration.tmpl.xml
Modified:
portal/trunk/component/common/src/main/java/conf/configuration-jboss.properties
portal/trunk/component/common/src/main/java/conf/configuration-tomcat.properties
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/database/database-configuration.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/jcr-configuration.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/local/repository-configuration.xml
Log:
factor out dialects in configuration properties
Modified: portal/trunk/component/common/src/main/java/conf/configuration-jboss.properties
===================================================================
--- portal/trunk/component/common/src/main/java/conf/configuration-jboss.properties 2010-01-23 21:57:26 UTC (rev 1434)
+++ portal/trunk/component/common/src/main/java/conf/configuration-jboss.properties 2010-01-23 22:13:10 UTC (rev 1435)
@@ -19,6 +19,8 @@
# Datasource name
gatein.datasource.name=java:jdbcexo
+gatein.datasource.dialect.hibernate=org.hibernate.dialect.HSQLDialect
+gatein.datasource.dialect.jcr=hsqldb
# Data
gatein.data.dir=${jboss.server.data.dir}/gatein
Modified: portal/trunk/component/common/src/main/java/conf/configuration-tomcat.properties
===================================================================
--- portal/trunk/component/common/src/main/java/conf/configuration-tomcat.properties 2010-01-23 21:57:26 UTC (rev 1434)
+++ portal/trunk/component/common/src/main/java/conf/configuration-tomcat.properties 2010-01-23 22:13:10 UTC (rev 1435)
@@ -19,6 +19,8 @@
# Datasource name
gatein.datasource.name=jdbcexo
+gatein.datasource.dialect.hibernate=org.hibernate.dialect.HSQLDialect
+gatein.datasource.dialect.jcr=hsqldb
# Data
gatein.data.dir=../temp
Deleted: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/database/database-configuration.tmpl.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/database/database-configuration.tmpl.xml 2010-01-23 21:57:26 UTC (rev 1434)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/database/database-configuration.tmpl.xml 2010-01-23 22:13:10 UTC (rev 1435)
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
-
- Copyright (C) 2009 eXo Platform SAS.
-
- This is free software; you can redistribute it and/or modify it
- under the terms of the GNU Lesser General Public License as
- published by the Free Software Foundation; either version 2.1 of
- the License, or (at your option) any later version.
-
- This software is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this software; if not, write to the Free
- Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-
--->
-
-<configuration
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd http://www.exoplaform.org/xml/ns/kernel_1_0.xsd"
- xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd">
- <component>
- <key>org.exoplatform.services.database.HibernateService</key>
- <jmx-name>database:type=HibernateService</jmx-name>
- <type>org.exoplatform.services.database.impl.HibernateServiceImpl</type>
- <init-params>
- <properties-param>
- <name>hibernate.properties</name>
- <description>Default Hibernate Service</description>
- <property name="hibernate.show_sql" value="false"/>
- <property name="hibernate.current_session_context_class" value="thread"/>
- <property name="hibernate.cache.use_second_level_cache" value="true"/>
- <property name="hibernate.cache.use_query_cache" value="true"/>
- <!--CHANGEME HashtableCacheProvider shold not be used in production env-->
- <property name="hibernate.cache.provider_class" value="org.hibernate.cache.HashtableCacheProvider"/>
- <property name="hibernate.cglib.use_reflection_optimizer" value="true"/>
- <property name="hibernate.connection.datasource" value="${gatein.datasource.name}${container.name.suffix}"/>
- <property name="hibernate.connection.autocommit" value="true"/>
- <property name="hibernate.dialect" value="${dialect}"/>
- <property name="hibernate.c3p0.min_size" value="5"/>
- <property name="hibernate.c3p0.max_size" value="20"/>
- <property name="hibernate.c3p0.timeout" value="1800"/>
- <property name="hibernate.c3p0.max_statements" value="50"/>
- </properties-param>
- </init-params>
- </component>
-
- <external-component-plugins>
- <target-component>org.exoplatform.services.naming.InitialContextInitializer</target-component>
- <component-plugin>
- <name>bind.datasource</name>
- <set-method>addPlugin</set-method>
- <type>org.exoplatform.services.naming.BindReferencePlugin</type>
- <init-params>
- <value-param>
- <name>bind-name</name>
- <value>${gatein.datasource.name}${container.name.suffix}</value>
- </value-param>
- <value-param>
- <name>class-name</name>
- <value>javax.sql.DataSource</value>
- </value-param>
- <value-param>
- <name>factory</name>
- <value>org.apache.commons.dbcp.BasicDataSourceFactory</value>
- </value-param>
- <properties-param>
- <name>ref-addresses</name>
- <description>ref-addresses</description>
- <property name="driverClassName" value="${driverClass}"/>
- <property name="url" value="${connectionUrl}"/>
- <property name="username" value="${username}"/>
- <property name="password" value="${password}"/>
- </properties-param>
- </init-params>
- </component-plugin>
- </external-component-plugins>
-</configuration>
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/database/database-configuration.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/database/database-configuration.xml 2010-01-23 21:57:26 UTC (rev 1434)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/database/database-configuration.xml 2010-01-23 22:13:10 UTC (rev 1435)
@@ -41,11 +41,13 @@
<property name="hibernate.cglib.use_reflection_optimizer" value="true"/>
<property name="hibernate.connection.datasource" value="${gatein.datasource.name}${container.name.suffix}"/>
<property name="hibernate.connection.autocommit" value="true"/>
- <property name="hibernate.dialect" value="org.hibernate.dialect.HSQLDialect"/>
+ <property name="hibernate.dialect" value="${gatein.datasource.dialect.hibernate}"/>
+<!--
<property name="hibernate.c3p0.min_size" value="5"/>
<property name="hibernate.c3p0.max_size" value="20"/>
<property name="hibernate.c3p0.timeout" value="1800"/>
<property name="hibernate.c3p0.max_statements" value="50"/>
+-->
</properties-param>
</init-params>
</component>
Deleted: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/jcr-configuration.tmpl.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/jcr-configuration.tmpl.xml 2010-01-23 21:57:26 UTC (rev 1434)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/jcr-configuration.tmpl.xml 2010-01-23 22:13:10 UTC (rev 1435)
@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
-
- Copyright (C) 2009 eXo Platform SAS.
-
- This is free software; you can redistribute it and/or modify it
- under the terms of the GNU Lesser General Public License as
- published by the Free Software Foundation; either version 2.1 of
- the License, or (at your option) any later version.
-
- This software is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this software; if not, write to the Free
- Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-
--->
-
-<configuration
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd http://www.exoplaform.org/xml/ns/kernel_1_0.xsd"
- xmlns="http://www.exoplaform.org/xml/ns/kernel_1_0.xsd">
- <component>
- <key>org.exoplatform.services.jcr.config.RepositoryServiceConfiguration</key>
- <type>org.exoplatform.services.jcr.impl.config.RepositoryServiceConfigurationImpl</type>
- <init-params>
- <value-param>
- <name>conf-path</name>
- <description>JCR configuration file</description>
- <value>war:/conf/jcr/local/repository-configuration.xml</value>
- </value-param>
- <properties-param>
- <name>working-conf</name>
- <description>working-conf</description>
- <property name="persister-class-name" value="org.exoplatform.services.jcr.impl.config.JDBCConfigurationPersister"/>
- <property name="source-name" value="${gatein.datasource.name}${container.name.suffix}"/>
- <property name="dialect" value="${dialect}"/>
- </properties-param>
- </init-params>
- </component>
-
- <component>
- <key>org.exoplatform.services.jcr.RepositoryService</key>
- <type>org.exoplatform.services.jcr.impl.RepositoryServiceImpl</type>
- </component>
-
- <component>
- <key>org.exoplatform.services.jcr.ext.hierarchy.NodeHierarchyCreator</key>
- <type>org.exoplatform.services.jcr.ext.hierarchy.impl.NodeHierarchyCreatorImpl</type>
- </component>
-
- <component>
- <key>org.exoplatform.services.jcr.webdav.WebDavServiceImpl</key>
- <type>org.exoplatform.services.jcr.webdav.WebDavServiceImpl</type>
- <init-params>
-
- <value-param>
- <name>auto-mix-lockable</name>
- <value>false</value>
- </value-param>
-
- <value-param>
- <name>def-folder-node-type</name>
- <value>nt:folder</value>
- </value-param>
-
- <value-param>
- <name>def-file-node-type</name>
- <value>nt:file</value>
- </value-param>
-
- <value-param>
- <name>def-file-mimetype</name>
- <value>text/plain</value>
- </value-param>
-
- <value-param>
- <name>update-policy</name>
- <value>create-version</value>
- </value-param>
- </init-params>
- </component>
-
- <external-component-plugins>
- <target-component>org.exoplatform.services.jcr.RepositoryService</target-component>
- <component-plugin>
- <name>add.namespaces</name>
- <set-method>addPlugin</set-method>
- <type>org.exoplatform.services.jcr.impl.AddNamespacesPlugin</type>
- <init-params>
- <properties-param>
- <name>namespaces</name>
- <property name="dc" value="http://purl.org/dc/elements/1.1/"/>
- <property name="mop" value="http://www.gatein.org/jcr/mop/1.0/"/>
- <property name="app" value="http://www.gatein.org/jcr/application-registry/1.0/"/>
- <property name="lgn" value="http://www.gatein.org/jcr/autologin/1.0/"/>
- <property name="wsrp" value="http://www.gatein.org/jcr/wsrp/1.0/"/>
- </properties-param>
- </init-params>
- </component-plugin>
- <component-plugin>
- <name>add.nodeType</name>
- <set-method>addPlugin</set-method>
- <type>org.exoplatform.services.jcr.impl.AddNodeTypePlugin</type>
- <init-params>
- <values-param>
- <name>autoCreatedInNewRepository</name>
- <description>Node types configuration file</description>
- <value>jar:/conf/ext-nodetypes-config.xml</value>
- <value>jar:/conf/organization-nodetypes.xml</value>
- <value>jar:/conf/mop-nodetypes.xml</value>
- <value>jar:/conf/application-nodetypes.xml</value>
- <value>jar:/conf/content-nodetypes.xml</value>
- <value>jar:/conf/autologin-nodetypes.xml</value>
- <value>war:/conf/wsrp/consumers-configuration-nodetypes.xml</value>
- <value>war:/conf/wsrp/producer-configuration-nodetypes.xml</value>
- <value>war:/conf/wsrp/producer-registrations-nodetypes.xml</value>
- </values-param>
- </init-params>
- </component-plugin>
- </external-component-plugins>
-
-</configuration>
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/jcr-configuration.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/jcr-configuration.xml 2010-01-23 21:57:26 UTC (rev 1434)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/jcr-configuration.xml 2010-01-23 22:13:10 UTC (rev 1435)
@@ -38,7 +38,7 @@
<description>working-conf</description>
<property name="persister-class-name" value="org.exoplatform.services.jcr.impl.config.JDBCConfigurationPersister"/>
<property name="source-name" value="${gatein.datasource.name}${container.name.suffix}"/>
- <property name="dialect" value="hsqldb"/>
+ <property name="dialect" value="${gatein.datasource.dialect.jcr}"/>
</properties-param>
</init-params>
</component>
Deleted: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/local/repository-configuration.tmpl.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/local/repository-configuration.tmpl.xml 2010-01-23 21:57:26 UTC (rev 1434)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/local/repository-configuration.tmpl.xml 2010-01-23 22:13:10 UTC (rev 1435)
@@ -1,218 +0,0 @@
-<!--
-
- Copyright (C) 2009 eXo Platform SAS.
-
- This is free software; you can redistribute it and/or modify it
- under the terms of the GNU Lesser General Public License as
- published by the Free Software Foundation; either version 2.1 of
- the License, or (at your option) any later version.
-
- This software is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this software; if not, write to the Free
- Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-
--->
-
-<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>
- <workspace name="system">
- <container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer">
- <properties>
- <property name="source-name" value="${gatein.datasource.name}${container.name.suffix}"/>
- <property name="dialect" value="${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}/system${container.name.suffix}"/>
- </properties>
- <value-storages>
- <value-storage id="system" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage">
- <properties>
- <property name="path" value="${gatein.jcr.storage.data.dir}/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="conf/jcr/jbosscache/local/config.xml" />
- </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}/system${container.name.suffix}"/>
- </properties>
- </query-handler>
- <lock-manager class="org.exoplatform.services.jcr.impl.core.lock.jbosscache.CacheableLockManager">
- <properties>
- <property name="time-out" value="15m" />
- <property name="jbosscache-configuration" value="conf/jcr/jbosscache/local/lock-config-system.xml" />
- </properties>
- </lock-manager>
- </workspace>
-
- <!-- Portal system data -->
- <workspace name="portal-system">
- <container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer">
- <properties>
- <property name="source-name" value="${gatein.datasource.name}${container.name.suffix}"/>
- <property name="dialect" value="${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="any read;*:/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="conf/jcr/jbosscache/local/config.xml" />
- </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}"/>
- </properties>
- </query-handler>
- <lock-manager class="org.exoplatform.services.jcr.impl.core.lock.jbosscache.CacheableLockManager">
- <properties>
- <property name="time-out" value="15m" />
- <property name="jbosscache-configuration" value="conf/jcr/jbosscache/local/lock-config-portal-system.xml" />
- </properties>
- </lock-manager>
- </workspace>
-
- <!-- Portal work data -->
- <workspace name="portal-work">
- <container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer">
- <properties>
- <property name="source-name" value="${gatein.datasource.name}${container.name.suffix}"/>
- <property name="dialect" value="${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-work${container.name.suffix}"/>
- </properties>
- <value-storages>
- <value-storage id="portal-work" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage">
- <properties>
- <property name="path" value="${gatein.jcr.storage.data.dir}/portal-work${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="any read;*:/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="conf/jcr/jbosscache/local/config.xml" />
- </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-work${container.name.suffix}"/>
- </properties>
- </query-handler>
- <lock-manager class="org.exoplatform.services.jcr.impl.core.lock.jbosscache.CacheableLockManager">
- <properties>
- <property name="time-out" value="15m" />
- <property name="jbosscache-configuration" value="conf/jcr/jbosscache/local/lock-config-portal-work.xml" />
- </properties>
- </lock-manager>
- </workspace>
-
- <!-- Workspace for WSRP -->
- <workspace name="wsrp-system">
- <container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer">
- <properties>
- <property name="source-name" value="${gatein.datasource.name}${container.name.suffix}"/>
- <property name="dialect" value="${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/wsrp${container.name.suffix}"/>
- </properties>
- <value-storages>
- <value-storage id="gadgets"
- class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage">
- <properties>
- <property name="path" value="${gatein.jcr.storage.data.dir}/wsrp${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="any read;*:/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="conf/jcr/jbosscache/local/config.xml" />
- </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}/wsrp${container.name.suffix}"/>
- </properties>
- </query-handler>
- <lock-manager class="org.exoplatform.services.jcr.impl.core.lock.jbosscache.CacheableLockManager">
- <properties>
- <property name="time-out" value="15m" />
- <property name="jbosscache-configuration" value="conf/jcr/jbosscache/local/lock-config-wsrp-system.xml" />
- </properties>
- </lock-manager>
- </workspace>
-
- </workspaces>
- </repository>
- </repositories>
-</repository-service>
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/local/repository-configuration.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/local/repository-configuration.xml 2010-01-23 21:57:26 UTC (rev 1434)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/local/repository-configuration.xml 2010-01-23 22:13:10 UTC (rev 1435)
@@ -32,7 +32,7 @@
<container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer">
<properties>
<property name="source-name" value="${gatein.datasource.name}${container.name.suffix}"/>
- <property name="dialect" value="hsqldb"/>
+ <property name="dialect" value="${gatein.datasource.dialect.jcr}"/>
<property name="multi-db" value="false"/>
<property name="update-storage" value="true"/>
<property name="max-buffer-size" value="204800"/>
@@ -78,7 +78,7 @@
<container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer">
<properties>
<property name="source-name" value="${gatein.datasource.name}${container.name.suffix}"/>
- <property name="dialect" value="hsqldb"/>
+ <property name="dialect" value="${gatein.datasource.dialect.jcr}"/>
<property name="multi-db" value="false"/>
<property name="update-storage" value="true"/>
<property name="max-buffer-size" value="204800"/>
@@ -124,7 +124,7 @@
<container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer">
<properties>
<property name="source-name" value="${gatein.datasource.name}${container.name.suffix}"/>
- <property name="dialect" value="hsqldb"/>
+ <property name="dialect" value="${gatein.datasource.dialect.jcr}"/>
<property name="multi-db" value="false"/>
<property name="update-storage" value="true"/>
<property name="max-buffer-size" value="204800"/>
@@ -170,7 +170,7 @@
<container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer">
<properties>
<property name="source-name" value="${gatein.datasource.name}${container.name.suffix}"/>
- <property name="dialect" value="hsqldb"/>
+ <property name="dialect" value="${gatein.datasource.dialect.jcr}"/>
<property name="multi-db" value="false"/>
<property name="update-storage" value="true"/>
<property name="max-buffer-size" value="204800"/>
15 years, 8 months
- 1
- 0