Author: mposolda Date: 2011-10-26 05:01:00 -0400 (Wed, 26 Oct 2011) New Revision: 7887 Added: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/jgroups/ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/jgroups/gatein-tcp.xml portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/jgroups/gatein-udp.xml portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jbosscache/ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jbosscache/cluster/ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jbosscache/cluster/config.xml portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jbosscache/local/ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jbosscache/local/config.xml portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/jbosscache/ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/jbosscache/cluster/ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/jbosscache/cluster/config.xml portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/jbosscache/cluster/indexer-config.xml portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/jbosscache/cluster/lock-config.xml portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/jbosscache/local/ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/jbosscache/local/config.xml portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/jbosscache/local/lock-config.xml Removed: portal/trunk/component/common/src/main/java/conf/jbosscache/ portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/jboss-cache-cluster.xml Modified: portal/trunk/component/common/src/main/java/conf/configuration-jboss.properties portal/trunk/component/common/src/main/java/conf/configuration-jetty.properties portal/trunk/component/common/src/main/java/conf/configuration-tomcat.properties portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/PicketLinkIDMServiceImpl.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/packaging/jboss-as7/pkg/src/main/resources/jboss/standalone/configuration/gatein/configuration.properties portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/common/common-configuration.xml portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/repository-configuration.xml portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/idm-configuration.xml portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/jboss-cache-api-cluster.xml portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/jboss-cache-store-cluster.xml portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/repository-configuration.xml Log: GTNPORTAL-2234 Improve configuration of JBoss cache and JGroups Modified: portal/trunk/component/common/src/main/java/conf/configuration-jboss.properties =================================================================== --- portal/trunk/component/common/src/main/java/conf/configuration-jboss.properties 2011-10-26 04:55:00 UTC (rev 7886) +++ portal/trunk/component/common/src/main/java/conf/configuration-jboss.properties 2011-10-26 09:01:00 UTC (rev 7887) @@ -35,12 +35,12 @@ gatein.jcr.data.dir=${gatein.data.dir}/jcr gatein.jcr.storage.data.dir=${gatein.jcr.data.dir}/values -gatein.jcr.cache.config=classpath:/conf/jcr/jbosscache/${gatein.jcr.config.type}/config.xml -gatein.jcr.lock.cache.config=classpath:/conf/jcr/jbosscache/${gatein.jcr.config.type}/lock-config.xml +gatein.jcr.cache.config=war:/conf/jcr/jbosscache/${gatein.jcr.config.type}/config.xml +gatein.jcr.lock.cache.config=war:/conf/jcr/jbosscache/${gatein.jcr.config.type}/lock-config.xml gatein.jcr.index.data.dir=${gatein.jcr.data.dir}/lucene gatein.jcr.index.changefilterclass=org.exoplatform.services.jcr.impl.core.query.DefaultChangesFilter -gatein.jcr.index.cache.config=classpath:/conf/jcr/jbosscache/cluster/indexer-config.xml -gatein.jcr.jgroups.config=classpath:/conf/jcr/jbosscache/cluster/udp-mux.xml +gatein.jcr.index.cache.config=war:/conf/jcr/jbosscache/cluster/indexer-config.xml +gatein.jcr.jgroups.config=classpath:/jgroups/gatein-${gatein.default.jgroups.stack:udp}.xml # IDM gatein.idm.datasource.name=java:jdbcidm Modified: portal/trunk/component/common/src/main/java/conf/configuration-jetty.properties =================================================================== --- portal/trunk/component/common/src/main/java/conf/configuration-jetty.properties 2011-10-26 04:55:00 UTC (rev 7886) +++ portal/trunk/component/common/src/main/java/conf/configuration-jetty.properties 2011-10-26 09:01:00 UTC (rev 7887) @@ -35,12 +35,12 @@ gatein.jcr.data.dir=${gatein.data.dir}/jcr gatein.jcr.storage.data.dir=${gatein.jcr.data.dir}/values -gatein.jcr.cache.config=classpath:/conf/jcr/jbosscache/${gatein.jcr.config.type}/config.xml -gatein.jcr.lock.cache.config=classpath:/conf/jcr/jbosscache/${gatein.jcr.config.type}/lock-config.xml +gatein.jcr.cache.config=war:/conf/jcr/jbosscache/${gatein.jcr.config.type}/config.xml +gatein.jcr.lock.cache.config=war:/conf/jcr/jbosscache/${gatein.jcr.config.type}/lock-config.xml gatein.jcr.index.data.dir=${gatein.jcr.data.dir}/lucene gatein.jcr.index.changefilterclass=org.exoplatform.services.jcr.impl.core.query.DefaultChangesFilter -gatein.jcr.index.cache.config=classpath:/conf/jcr/jbosscache/cluster/indexer-config.xml -gatein.jcr.jgroups.config=classpath:/conf/jcr/jbosscache/cluster/udp-mux.xml +gatein.jcr.index.cache.config=war:/conf/jcr/jbosscache/cluster/indexer-config.xml +gatein.jcr.jgroups.config=classpath:/jgroups/gatein-${gatein.default.jgroups.stack:udp}.xml # IDM gatein.idm.datasource.name=jdbcidm Modified: portal/trunk/component/common/src/main/java/conf/configuration-tomcat.properties =================================================================== --- portal/trunk/component/common/src/main/java/conf/configuration-tomcat.properties 2011-10-26 04:55:00 UTC (rev 7886) +++ portal/trunk/component/common/src/main/java/conf/configuration-tomcat.properties 2011-10-26 09:01:00 UTC (rev 7887) @@ -35,12 +35,12 @@ gatein.jcr.data.dir=${gatein.data.dir}/jcr gatein.jcr.storage.data.dir=${gatein.jcr.data.dir}/values -gatein.jcr.cache.config=classpath:/conf/jcr/jbosscache/${gatein.jcr.config.type}/config.xml -gatein.jcr.lock.cache.config=classpath:/conf/jcr/jbosscache/${gatein.jcr.config.type}/lock-config.xml +gatein.jcr.cache.config=war:/conf/jcr/jbosscache/${gatein.jcr.config.type}/config.xml +gatein.jcr.lock.cache.config=war:/conf/jcr/jbosscache/${gatein.jcr.config.type}/lock-config.xml gatein.jcr.index.data.dir=${gatein.jcr.data.dir}/lucene gatein.jcr.index.changefilterclass=org.exoplatform.services.jcr.impl.core.query.DefaultChangesFilter -gatein.jcr.index.cache.config=classpath:/conf/jcr/jbosscache/cluster/indexer-config.xml -gatein.jcr.jgroups.config=classpath:/conf/jcr/jbosscache/cluster/udp-mux.xml +gatein.jcr.index.cache.config=war:/conf/jcr/jbosscache/cluster/indexer-config.xml +gatein.jcr.jgroups.config=classpath:/jgroups/gatein-${gatein.default.jgroups.stack:udp}.xml # IDM gatein.idm.datasource.name=jdbcidm Modified: portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/PicketLinkIDMServiceImpl.java =================================================================== --- portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/PicketLinkIDMServiceImpl.java 2011-10-26 04:55:00 UTC (rev 7886) +++ portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/PicketLinkIDMServiceImpl.java 2011-10-26 09:01:00 UTC (rev 7887) @@ -19,6 +19,7 @@ package org.exoplatform.services.organization.idm; +import org.exoplatform.container.ExoContainerContext; import org.exoplatform.container.configuration.ConfigurationManager; import org.exoplatform.container.xml.InitParams; import org.exoplatform.container.xml.ValueParam; @@ -30,6 +31,7 @@ import org.jboss.cache.CacheFactory; import org.jboss.cache.DefaultCacheFactory; +import org.jboss.cache.config.Configuration; import org.jgroups.JChannelFactory; import org.picketlink.idm.api.IdentitySession; import org.picketlink.idm.api.IdentitySessionFactory; @@ -97,6 +99,7 @@ } public PicketLinkIDMServiceImpl( + ExoContainerContext exoContainerContext, InitParams initParams, HibernateService hibernateService, ConfigurationManager confManager, @@ -164,8 +167,17 @@ throw new IllegalArgumentException("JBoss Cache configuration InputStream is null"); } - Cache cache = factory.createCache(configStream); + Cache cache = factory.createCache(configStream, false); + Configuration cfg = cache.getConfiguration(); + // we need unique cluster name for each portal container + String clusterName = cfg.getClusterName(); + if (clusterName != null && (clusterName = clusterName.trim()).length() > 0) + { + cfg.setClusterName(clusterName + "-" + exoContainerContext.getName()); + } + + applyJGroupsConfig(cache, confManager, jgroupsStack, jgroupsConfig); cache.create(); @@ -200,8 +212,16 @@ throw new IllegalArgumentException("JBoss Cache configuration InputStream is null"); } - Cache cache = factory.createCache(configStream); + Cache cache = factory.createCache(configStream, false); + Configuration cfg = cache.getConfiguration(); + // we need unique cluster name for each portal container + String clusterName = cfg.getClusterName(); + if (clusterName != null && (clusterName = clusterName.trim()).length() > 0) + { + cfg.setClusterName(clusterName + "-" + exoContainerContext.getName()); + } + applyJGroupsConfig(cache, confManager, jgroupsStack, jgroupsConfig); cache.create(); 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 2011-10-26 04:55:00 UTC (rev 7886) +++ portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/jcr/repository-configuration.xml 2011-10-26 09:01:00 UTC (rev 7887) @@ -57,8 +57,9 @@ <properties> <property name="jbosscache-configuration" value="${gatein.jcr.cache.config}" /> <property name="jgroups-configuration" value="${gatein.jcr.jgroups.config}" /> - <property name="jgroups-multiplexer-stack" value="true" /> - <property name="jbosscache-cluster-name" value="jcr-${container.name.suffix}-sample-ws" /> + <property name="jgroups-multiplexer-stack" value="false" /> + <property name="jbosscache-cluster-name" value="jcr${container.name.suffix}" /> + <property name="jbosscache-shareable" value="true" /> </properties> </cache> <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> @@ -67,8 +68,9 @@ <property name="changesfilter-class" value="${gatein.jcr.index.changefilterclass}" /> <property name="jbosscache-configuration" value="${gatein.jcr.index.cache.config}" /> <property name="jgroups-configuration" value="${gatein.jcr.jgroups.config}" /> - <property name="jgroups-multiplexer-stack" value="true" /> - <property name="jbosscache-cluster-name" value="jcrindexer-${container.name.suffix}-sample-ws" /> + <property name="jgroups-multiplexer-stack" value="false" /> + <property name="jbosscache-cluster-name" value="jcrindexer${container.name.suffix}" /> + <property name="jbosscache-shareable" value="true" /> <property name="max-volatile-time" value="60" /> </properties> </query-handler> @@ -77,9 +79,10 @@ <property name="time-out" value="15m" /> <property name="jbosscache-configuration" value="${gatein.jcr.lock.cache.config}" /> <property name="jgroups-configuration" value="${gatein.jcr.jgroups.config}" /> - <property name="jgroups-multiplexer-stack" value="true" /> - <property name="jbosscache-cluster-name" value="jcrlock-${container.name.suffix}-sample-ws" /> - <property name="jbosscache-cl-cache.jdbc.table.name" value="jcrlock_sample_ws" /> + <property name="jgroups-multiplexer-stack" value="false" /> + <property name="jbosscache-cluster-name" value="jcrlock${container.name.suffix}" /> + <property name="jbosscache-shareable" value="true" /> + <property name="jbosscache-cl-cache.jdbc.table.name" value="jcrlock" /> <property name="jbosscache-cl-cache.jdbc.table.create" value="true" /> <property name="jbosscache-cl-cache.jdbc.table.drop" value="false" /> <property name="jbosscache-cl-cache.jdbc.table.primarykey" value="pk" /> 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 2011-10-26 04:55:00 UTC (rev 7886) +++ portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/jcr/repository-configuration.xml 2011-10-26 09:01:00 UTC (rev 7887) @@ -57,8 +57,9 @@ <properties> <property name="jbosscache-configuration" value="${gatein.jcr.cache.config}" /> <property name="jgroups-configuration" value="${gatein.jcr.jgroups.config}" /> - <property name="jgroups-multiplexer-stack" value="true" /> - <property name="jbosscache-cluster-name" value="jcr-${container.name.suffix}-sample-ws" /> + <property name="jgroups-multiplexer-stack" value="false" /> + <property name="jbosscache-cluster-name" value="jcr${container.name.suffix}" /> + <property name="jbosscache-shareable" value="true" /> </properties> </cache> <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> @@ -67,8 +68,9 @@ <property name="changesfilter-class" value="${gatein.jcr.index.changefilterclass}" /> <property name="jbosscache-configuration" value="${gatein.jcr.index.cache.config}" /> <property name="jgroups-configuration" value="${gatein.jcr.jgroups.config}" /> - <property name="jgroups-multiplexer-stack" value="true" /> - <property name="jbosscache-cluster-name" value="jcrindexer-${container.name.suffix}-sample-ws" /> + <property name="jgroups-multiplexer-stack" value="false" /> + <property name="jbosscache-cluster-name" value="jcrindexer${container.name.suffix}" /> + <property name="jbosscache-shareable" value="true" /> <property name="max-volatile-time" value="60" /> </properties> </query-handler> @@ -77,9 +79,10 @@ <property name="time-out" value="15m" /> <property name="jbosscache-configuration" value="${gatein.jcr.lock.cache.config}" /> <property name="jgroups-configuration" value="${gatein.jcr.jgroups.config}" /> - <property name="jgroups-multiplexer-stack" value="true" /> - <property name="jbosscache-cluster-name" value="jcrlock-${container.name.suffix}-sample-ws" /> - <property name="jbosscache-cl-cache.jdbc.table.name" value="jcrlock_sample_ws" /> + <property name="jgroups-multiplexer-stack" value="false" /> + <property name="jbosscache-cluster-name" value="jcrlock${container.name.suffix}" /> + <property name="jbosscache-shareable" value="true" /> + <property name="jbosscache-cl-cache.jdbc.table.name" value="jcrlock" /> <property name="jbosscache-cl-cache.jdbc.table.create" value="true" /> <property name="jbosscache-cl-cache.jdbc.table.drop" value="false" /> <property name="jbosscache-cl-cache.jdbc.table.primarykey" value="pk" /> Modified: portal/trunk/packaging/jboss-as7/pkg/src/main/resources/jboss/standalone/configuration/gatein/configuration.properties =================================================================== --- portal/trunk/packaging/jboss-as7/pkg/src/main/resources/jboss/standalone/configuration/gatein/configuration.properties 2011-10-26 04:55:00 UTC (rev 7886) +++ portal/trunk/packaging/jboss-as7/pkg/src/main/resources/jboss/standalone/configuration/gatein/configuration.properties 2011-10-26 09:01:00 UTC (rev 7887) @@ -35,12 +35,12 @@ gatein.jcr.data.dir=${gatein.data.dir}/jcr gatein.jcr.storage.data.dir=${gatein.jcr.data.dir}/values -gatein.jcr.cache.config=classpath:/conf/jcr/jbosscache/${gatein.jcr.config.type}/config.xml -gatein.jcr.lock.cache.config=classpath:/conf/jcr/jbosscache/${gatein.jcr.config.type}/lock-config.xml +gatein.jcr.cache.config=war:/conf/jcr/jbosscache/${gatein.jcr.config.type}/config.xml +gatein.jcr.lock.cache.config=war:/conf/jcr/jbosscache/${gatein.jcr.config.type}/lock-config.xml gatein.jcr.index.data.dir=${gatein.jcr.data.dir}/lucene gatein.jcr.index.changefilterclass=org.exoplatform.services.jcr.impl.core.query.DefaultChangesFilter -gatein.jcr.index.cache.config=classpath:/conf/jcr/jbosscache/cluster/indexer-config.xml -gatein.jcr.jgroups.config=classpath:/conf/jcr/jbosscache/cluster/udp-mux.xml +gatein.jcr.index.cache.config=war:/conf/jcr/jbosscache/cluster/indexer-config.xml +gatein.jcr.jgroups.config=classpath:/jgroups/gatein-${gatein.default.jgroups.stack:udp}.xml # IDM gatein.idm.datasource.name=java:jdbcidm Added: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/jgroups/gatein-tcp.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/jgroups/gatein-tcp.xml (rev 0) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/jgroups/gatein-tcp.xml 2011-10-26 09:01:00 UTC (rev 7887) @@ -0,0 +1,96 @@ +<!-- + ~ JBoss, a division of Red Hat + ~ Copyright 2011, Red Hat Middleware, LLC, and individual + ~ contributors as indicated by the @authors tag. See the + ~ copyright.txt in the distribution for a full listing of + ~ individual contributors. + ~ + ~ 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. + --> + +<config> + <TCP + singleton_name="gatein-tcp" + start_port="${gatein.jgroups.tcp.tcp_port:8600}" + tcp_nodelay="true" + 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" + timer.num_threads="12" + enable_diagnostics="${jboss.jgroups.enable_diagnostics:true}" + diagnostics_addr="${jboss.jgroups.diagnostics_addr:224.0.75.75}" + diagnostics_port="${jboss.jgroups.diagnostics_port:7500}" + + thread_pool.enabled="true" + thread_pool.min_threads="20" + thread_pool.max_threads="200" + thread_pool.keep_alive_time="5000" + thread_pool.queue_enabled="true" + thread_pool.queue_max_size="1000" + thread_pool.rejection_policy="discard" + + oob_thread_pool.enabled="true" + oob_thread_pool.min_threads="20" + oob_thread_pool.max_threads="200" + oob_thread_pool.keep_alive_time="1000" + oob_thread_pool.queue_enabled="false" + oob_thread_pool.rejection_policy="discard"/> + <!-- Alternative 1: multicast-based automatic discovery. --> + <MPING timeout="3000" + num_initial_members="3" + mcast_addr="${gatein.jgroups.tcp.mping_mcast_addr:235.15.15.15}" + mcast_port="${gatein.tcp.mping_mcast_port:46700}" + ip_ttl="${jgroups.udp.ip_ttl:2}"/> + <!-- Alternative 2: non multicast-based replacement for MPING. Requires a static configuration + of *all* possible cluster members. + <TCPPING timeout="3000" + initial_hosts="${gatein.jgroups.tcp.tcpping.initial_hosts:localhost[8600],localhost[8601]}" + port_range="1" + num_initial_members="3"/> + --> + <MERGE2 max_interval="100000" min_interval="20000"/> + <FD_SOCK start_port="${gatein.jgroups.tcp.fd_sock_port:58600}"/> + <FD timeout="6000" max_tries="5" shun="true"/> + <VERIFY_SUSPECT timeout="1500"/> + <BARRIER/> + <pbcast.NAKACK use_mcast_xmit="false" gc_lag="0" + retransmit_timeout="300,600,1200,2400,4800" + discard_delivered_msgs="true"/> + <UNICAST timeout="300,600,1200,2400,3600"/> + <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000" + max_bytes="400000"/> + <VIEW_SYNC avg_send_interval="10000"/> + <pbcast.GMS print_local_addr="true" join_timeout="3000" + shun="true" + view_bundling="true" + view_ack_collection_timeout="5000" + resume_task_timeout="7500"/> + <FC max_credits="2000000" min_threshold="0.10" + ignore_synchronous_response="true"/> + <FRAG2 frag_size="60000"/> + <!-- pbcast.STREAMING_STATE_TRANSFER/ --> + <pbcast.STATE_TRANSFER/> + <pbcast.FLUSH timeout="0" start_flush_timeout="10000"/> + </config> + Added: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/jgroups/gatein-udp.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/jgroups/gatein-udp.xml (rev 0) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/jgroups/gatein-udp.xml 2011-10-26 09:01:00 UTC (rev 7887) @@ -0,0 +1,56 @@ +<!-- + ~ JBoss, a division of Red Hat + ~ Copyright 2011, Red Hat Middleware, LLC, and individual + ~ contributors as indicated by the @authors tag. See the + ~ copyright.txt in the distribution for a full listing of + ~ individual contributors. + ~ + ~ 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. + --> + <config> + <UDP + singleton_name="gatein-udp" + bind_port="${gatein.jgroups.udp.bind_port:56200}" + mcast_addr="${jboss.jgroups.udp_async.mcast_addr:228.10.10.10}" mcast_port="${jboss.jgroups.udp_async.mcast_port:45588}" tos="8" ucast_recv_buf_size="20000000" + ucast_send_buf_size="640000" mcast_recv_buf_size="25000000" mcast_send_buf_size="640000" loopback="false" + discard_incompatible_packets="true" max_bundle_size="64000" max_bundle_timeout="30" + use_incoming_packet_handler="true" ip_ttl="${jgroups.udp.ip_ttl:2}" enable_bundling="false" enable_diagnostics="${jboss.jgroups.enable_diagnostics:true}" + diagnostics_addr="${jboss.jgroups.diagnostics_addr:224.0.75.75}" diagnostics_port="${jboss.jgroups.diagnostics_port:7500}" + thread_naming_pattern="cl" use_concurrent_stack="true" thread_pool.enabled="true" thread_pool.min_threads="2" + thread_pool.max_threads="8" thread_pool.keep_alive_time="5000" thread_pool.queue_enabled="true" + thread_pool.queue_max_size="1000" thread_pool.rejection_policy="discard" 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" /> + + <PING timeout="2000" num_initial_members="3" /> + <MERGE2 max_interval="30000" min_interval="10000" /> + <FD_SOCK /> + <FD timeout="10000" max_tries="5" shun="true" /> + <VERIFY_SUSPECT timeout="1500" /> + <BARRIER /> + <pbcast.NAKACK use_stats_for_retransmission="false" exponential_backoff="150" use_mcast_xmit="true" + gc_lag="0" retransmit_timeout="50,300,600,1200" discard_delivered_msgs="true" /> + <UNICAST timeout="300,600,1200" /> + <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000" max_bytes="1000000" /> + <VIEW_SYNC avg_send_interval="60000" /> + <pbcast.GMS print_local_addr="true" join_timeout="3000" shun="false" view_bundling="true" /> + <FC max_credits="500000" min_threshold="0.20" /> + <FRAG2 frag_size="60000" /> + <!--pbcast.STREAMING_STATE_TRANSFER /--> + <pbcast.STATE_TRANSFER /> + <pbcast.FLUSH /> + </config> + 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 2011-10-26 04:55:00 UTC (rev 7886) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/common/common-configuration.xml 2011-10-26 09:01:00 UTC (rev 7887) @@ -132,11 +132,11 @@ <init-params> <value-param> <name>cache.config.template</name> - <value>classpath:/conf/jbosscache/local/config.xml</value> + <value>war:/conf/jbosscache/local/config.xml</value> </value-param> <value-param profiles="cluster"> <name>cache.config.template</name> - <value>classpath:/conf/jbosscache/cluster/config.xml</value> + <value>war:/conf/jbosscache/cluster/config.xml</value> </value-param> </init-params> </component> Added: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jbosscache/cluster/config.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jbosscache/cluster/config.xml (rev 0) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jbosscache/cluster/config.xml 2011-10-26 09:01:00 UTC (rev 7887) @@ -0,0 +1,27 @@ +<!-- + ~ 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"> + + <!-- The cluster name should be changed by the kernel cache configuration --> + <clustering mode="replication" clusterName="${jboss.partition.name:DefaultPartition}-gatein"> + <jgroupsConfig configFile="jgroups/gatein-${gatein.default.jgroups.stack:udp}.xml" /> + </clustering> + +</jbosscache> \ No newline at end of file Added: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jbosscache/local/config.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jbosscache/local/config.xml (rev 0) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jbosscache/local/config.xml 2011-10-26 09:01:00 UTC (rev 7887) @@ -0,0 +1,22 @@ +<!-- + ~ 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"> + +</jbosscache> \ No newline at end of file Added: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/jbosscache/cluster/config.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/jbosscache/cluster/config.xml (rev 0) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/jbosscache/cluster/config.xml 2011-10-26 09:01:00 UTC (rev 7887) @@ -0,0 +1,40 @@ +<!-- + ~ 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="64" lockParentForChildInsertRemove="false" + lockAcquisitionTimeout="20000" /> + + <clustering mode="replication" clusterName="${jboss.partition.name:DefaultPartition}-${jbosscache-cluster-name}"> + <stateRetrieval timeout="20000" fetchInMemoryState="false" /> + <jgroupsConfig configFile="jgroups/gatein-${gatein.default.jgroups.stack:udp}.xml" /> + <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="5000" /> + <property name="timeToLive" value="20000" /> + </default> + </eviction> +</jbosscache> \ No newline at end of file Added: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/jbosscache/cluster/indexer-config.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/jbosscache/cluster/indexer-config.xml (rev 0) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/jbosscache/cluster/indexer-config.xml 2011-10-26 09:01:00 UTC (rev 7887) @@ -0,0 +1,32 @@ +<!-- + ~ 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="64" lockParentForChildInsertRemove="false" + lockAcquisitionTimeout="20000" /> + + <!-- Configure the TransactionManager --> + <transaction transactionManagerLookupClass="org.jboss.cache.transaction.JBossStandaloneJTAManagerLookup" /> + + <clustering mode="replication" clusterName="${jboss.partition.name:DefaultPartition}-${jbosscache-cluster-name}"> + <stateRetrieval timeout="20000" fetchInMemoryState="false" /> + <jgroupsConfig configFile="jgroups/gatein-${gatein.default.jgroups.stack:udp}.xml" /> + <sync /> + </clustering> +</jbosscache> Added: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/jbosscache/cluster/lock-config.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/jbosscache/cluster/lock-config.xml (rev 0) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/jbosscache/cluster/lock-config.xml 2011-10-26 09:01:00 UTC (rev 7887) @@ -0,0 +1,50 @@ +<!-- + ~ 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="64" lockParentForChildInsertRemove="false" lockAcquisitionTimeout="20000" /> + + <clustering mode="replication" clusterName="${jboss.partition.name:DefaultPartition}-${jbosscache-cluster-name}"> + <stateRetrieval timeout="20000" fetchInMemoryState="false" /> + <jgroupsConfig configFile="jgroups/gatein-${gatein.default.jgroups.stack:udp}.xml" /> + <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=${jbosscache-cl-cache.jdbc.table.name} + cache.jdbc.table.create=${jbosscache-cl-cache.jdbc.table.create} + cache.jdbc.table.drop=${jbosscache-cl-cache.jdbc.table.drop} + cache.jdbc.table.primarykey=${jbosscache-cl-cache.jdbc.table.primarykey} + cache.jdbc.fqn.column=${jbosscache-cl-cache.jdbc.fqn.column} + cache.jdbc.fqn.type=${jbosscache-cl-cache.jdbc.fqn.type} + cache.jdbc.node.column=${jbosscache-cl-cache.jdbc.node.column} + cache.jdbc.node.type=${jbosscache-cl-cache.jdbc.node.type} + cache.jdbc.parent.column=${jbosscache-cl-cache.jdbc.parent.column} + cache.jdbc.datasource=${jbosscache-cl-cache.jdbc.datasource} + </properties> + </loader> + </loaders> +</jbosscache> Added: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/jbosscache/local/config.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/jbosscache/local/config.xml (rev 0) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/jbosscache/local/config.xml 2011-10-26 09:01:00 UTC (rev 7887) @@ -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="64" 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="20000" /> + </default> + </eviction> + +</jbosscache> Added: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/jbosscache/local/lock-config.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/jbosscache/local/lock-config.xml (rev 0) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/jbosscache/local/lock-config.xml 2011-10-26 09:01:00 UTC (rev 7887) @@ -0,0 +1,43 @@ +<!-- + ~ 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="64" lockParentForChildInsertRemove="false" lockAcquisitionTimeout="20000" /> + + <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=${jbosscache-cl-cache.jdbc.table.name} + cache.jdbc.table.create=${jbosscache-cl-cache.jdbc.table.create} + cache.jdbc.table.drop=${jbosscache-cl-cache.jdbc.table.drop} + cache.jdbc.table.primarykey=${jbosscache-cl-cache.jdbc.table.primarykey} + cache.jdbc.fqn.column=${jbosscache-cl-cache.jdbc.fqn.column} + cache.jdbc.fqn.type=${jbosscache-cl-cache.jdbc.fqn.type} + cache.jdbc.node.column=${jbosscache-cl-cache.jdbc.node.column} + cache.jdbc.node.type=${jbosscache-cl-cache.jdbc.node.type} + cache.jdbc.parent.column=${jbosscache-cl-cache.jdbc.parent.column} + cache.jdbc.datasource=${jbosscache-cl-cache.jdbc.datasource} + </properties> + </loader> + </loaders> +</jbosscache> Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/repository-configuration.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/repository-configuration.xml 2011-10-26 04:55:00 UTC (rev 7886) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/repository-configuration.xml 2011-10-26 09:01:00 UTC (rev 7887) @@ -59,8 +59,9 @@ <properties> <property name="jbosscache-configuration" value="${gatein.jcr.cache.config}" /> <property name="jgroups-configuration" value="${gatein.jcr.jgroups.config}" /> - <property name="jgroups-multiplexer-stack" value="true" /> - <property name="jbosscache-cluster-name" value="jcr-${container.name.suffix}-system" /> + <property name="jgroups-multiplexer-stack" value="false" /> + <property name="jbosscache-cluster-name" value="jcr${container.name.suffix}" /> + <property name="jbosscache-shareable" value="true" /> </properties> </cache> <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> @@ -69,8 +70,9 @@ <property name="changesfilter-class" value="${gatein.jcr.index.changefilterclass}" /> <property name="jbosscache-configuration" value="${gatein.jcr.index.cache.config}" /> <property name="jgroups-configuration" value="${gatein.jcr.jgroups.config}" /> - <property name="jgroups-multiplexer-stack" value="true" /> - <property name="jbosscache-cluster-name" value="jcrindexer-${container.name.suffix}-system" /> + <property name="jgroups-multiplexer-stack" value="false" /> + <property name="jbosscache-cluster-name" value="jcrindexer${container.name.suffix}" /> + <property name="jbosscache-shareable" value="true" /> <property name="max-volatile-time" value="60" /> </properties> </query-handler> @@ -79,9 +81,10 @@ <property name="time-out" value="15m" /> <property name="jbosscache-configuration" value="${gatein.jcr.lock.cache.config}" /> <property name="jgroups-configuration" value="${gatein.jcr.jgroups.config}" /> - <property name="jgroups-multiplexer-stack" value="true" /> - <property name="jbosscache-cluster-name" value="jcrlock-${container.name.suffix}-system" /> - <property name="jbosscache-cl-cache.jdbc.table.name" value="jcrlock_system" /> + <property name="jgroups-multiplexer-stack" value="false" /> + <property name="jbosscache-cluster-name" value="jcrlock${container.name.suffix}" /> + <property name="jbosscache-shareable" value="true" /> + <property name="jbosscache-cl-cache.jdbc.table.name" value="jcrlock" /> <property name="jbosscache-cl-cache.jdbc.table.create" value="true" /> <property name="jbosscache-cl-cache.jdbc.table.drop" value="false" /> <property name="jbosscache-cl-cache.jdbc.table.primarykey" value="pk" /> @@ -125,8 +128,9 @@ <properties> <property name="jbosscache-configuration" value="${gatein.jcr.cache.config}" /> <property name="jgroups-configuration" value="${gatein.jcr.jgroups.config}" /> - <property name="jgroups-multiplexer-stack" value="true" /> - <property name="jbosscache-cluster-name" value="jcr-${container.name.suffix}-portal-system" /> + <property name="jgroups-multiplexer-stack" value="false" /> + <property name="jbosscache-cluster-name" value="jcr${container.name.suffix}" /> + <property name="jbosscache-shareable" value="true" /> </properties> </cache> <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> @@ -135,8 +139,9 @@ <property name="changesfilter-class" value="${gatein.jcr.index.changefilterclass}" /> <property name="jbosscache-configuration" value="${gatein.jcr.index.cache.config}" /> <property name="jgroups-configuration" value="${gatein.jcr.jgroups.config}" /> - <property name="jgroups-multiplexer-stack" value="true" /> - <property name="jbosscache-cluster-name" value="jcrindexer-${container.name.suffix}-portal-system" /> + <property name="jgroups-multiplexer-stack" value="false" /> + <property name="jbosscache-cluster-name" value="jcrindexer${container.name.suffix}" /> + <property name="jbosscache-shareable" value="true" /> <property name="max-volatile-time" value="60" /> </properties> </query-handler> @@ -145,9 +150,10 @@ <property name="time-out" value="15m" /> <property name="jbosscache-configuration" value="${gatein.jcr.lock.cache.config}" /> <property name="jgroups-configuration" value="${gatein.jcr.jgroups.config}" /> - <property name="jgroups-multiplexer-stack" value="true" /> - <property name="jbosscache-cluster-name" value="jcrlock-${container.name.suffix}-portal-system" /> - <property name="jbosscache-cl-cache.jdbc.table.name" value="jcrlock_portal_system" /> + <property name="jgroups-multiplexer-stack" value="false" /> + <property name="jbosscache-cluster-name" value="jcrlock${container.name.suffix}" /> + <property name="jbosscache-shareable" value="true" /> + <property name="jbosscache-cl-cache.jdbc.table.name" value="jcrlock" /> <property name="jbosscache-cl-cache.jdbc.table.create" value="true" /> <property name="jbosscache-cl-cache.jdbc.table.drop" value="false" /> <property name="jbosscache-cl-cache.jdbc.table.primarykey" value="pk" /> @@ -191,8 +197,9 @@ <properties> <property name="jbosscache-configuration" value="${gatein.jcr.cache.config}" /> <property name="jgroups-configuration" value="${gatein.jcr.jgroups.config}" /> - <property name="jgroups-multiplexer-stack" value="true" /> - <property name="jbosscache-cluster-name" value="jcr-${container.name.suffix}-portal-work" /> + <property name="jgroups-multiplexer-stack" value="false" /> + <property name="jbosscache-cluster-name" value="jcr${container.name.suffix}" /> + <property name="jbosscache-shareable" value="true" /> </properties> </cache> <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> @@ -201,8 +208,9 @@ <property name="changesfilter-class" value="${gatein.jcr.index.changefilterclass}" /> <property name="jbosscache-configuration" value="${gatein.jcr.index.cache.config}" /> <property name="jgroups-configuration" value="${gatein.jcr.jgroups.config}" /> - <property name="jgroups-multiplexer-stack" value="true" /> - <property name="jbosscache-cluster-name" value="jcrindexer-${container.name.suffix}-portal-work" /> + <property name="jgroups-multiplexer-stack" value="false" /> + <property name="jbosscache-cluster-name" value="jcrindexer${container.name.suffix}" /> + <property name="jbosscache-shareable" value="true" /> <property name="max-volatile-time" value="60" /> </properties> </query-handler> @@ -211,9 +219,10 @@ <property name="time-out" value="15m" /> <property name="jbosscache-configuration" value="${gatein.jcr.lock.cache.config}" /> <property name="jgroups-configuration" value="${gatein.jcr.jgroups.config}" /> - <property name="jgroups-multiplexer-stack" value="true" /> - <property name="jbosscache-cluster-name" value="jcrlock-${container.name.suffix}-portal-work" /> - <property name="jbosscache-cl-cache.jdbc.table.name" value="jcrlock_portal_work" /> + <property name="jgroups-multiplexer-stack" value="false" /> + <property name="jbosscache-cluster-name" value="jcrlock${container.name.suffix}" /> + <property name="jbosscache-shareable" value="true" /> + <property name="jbosscache-cl-cache.jdbc.table.name" value="jcrlock" /> <property name="jbosscache-cl-cache.jdbc.table.create" value="true" /> <property name="jbosscache-cl-cache.jdbc.table.drop" value="false" /> <property name="jbosscache-cl-cache.jdbc.table.primarykey" value="pk" /> Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/idm-configuration.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/idm-configuration.xml 2011-10-26 04:55:00 UTC (rev 7886) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/idm-configuration.xml 2011-10-26 09:01:00 UTC (rev 7887) @@ -116,7 +116,7 @@ <value-param profiles="cluster"> <name>jgroups-multiplexer-stack</name> - <value>true</value> + <value>false</value> </value-param> <value-param> Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/jboss-cache-api-cluster.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/jboss-cache-api-cluster.xml 2011-10-26 04:55:00 UTC (rev 7886) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/jboss-cache-api-cluster.xml 2011-10-26 09:01:00 UTC (rev 7887) @@ -1,8 +1,9 @@ <jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:jboss:jbosscache-core:config:3.1"> + <!-- The cluster name will be changed programmatically. Portal container name will be added to the end of cluster name. --> <clustering mode="replication" clusterName="${jboss.partition.name:DefaultPartition}-idm-api-cluster"> <stateRetrieval timeout="20000" fetchInMemoryState="false" /> - <jgroupsConfig multiplexerStack="jcr.stack" /> + <jgroupsConfig configFile="jgroups/gatein-${gatein.default.jgroups.stack:udp}.xml" /> <sync /> </clustering> Deleted: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/jboss-cache-cluster.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/jboss-cache-cluster.xml 2011-10-26 04:55:00 UTC (rev 7886) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/jboss-cache-cluster.xml 2011-10-26 09:01:00 UTC (rev 7887) @@ -1,19 +0,0 @@ -<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:jboss:jbosscache-core:config:3.1"> - - <clustering mode="replication" clusterName="idm-cluster"> - <stateRetrieval timeout="20000" fetchInMemoryState="false" /> - <jgroupsConfig multiplexerStack="jcr.stack" /> - <sync /> - </clustering> - - <!-- Eviction configuration --> - <eviction wakeUpInterval="5000"> - <default algorithmClass="org.jboss.cache.eviction.ExpirationAlgorithm" - eventQueueSize="1000000"> - <property name="maxNodes" value="100000" /> - <property name="timeToLive" value="120000" /> - <property name="warnNoExpirationKey" value="false" /> - </default> - </eviction> - -</jbosscache> Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/jboss-cache-store-cluster.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/jboss-cache-store-cluster.xml 2011-10-26 04:55:00 UTC (rev 7886) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/jboss-cache-store-cluster.xml 2011-10-26 09:01:00 UTC (rev 7887) @@ -1,8 +1,9 @@ <jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:jboss:jbosscache-core:config:3.1"> + <!-- The cluster name will be changed programmatically. Portal container name will be added to the end of cluster name. --> <clustering mode="replication" clusterName="${jboss.partition.name:DefaultPartition}-idm-store-cluster"> <stateRetrieval timeout="20000" fetchInMemoryState="false" /> - <jgroupsConfig multiplexerStack="jcr.stack" /> + <jgroupsConfig configFile="jgroups/gatein-${gatein.default.jgroups.stack:udp}.xml" /> <sync /> </clustering> Modified: portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/repository-configuration.xml =================================================================== --- portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/repository-configuration.xml 2011-10-26 04:55:00 UTC (rev 7886) +++ portal/trunk/wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/repository-configuration.xml 2011-10-26 09:01:00 UTC (rev 7887) @@ -64,8 +64,9 @@ <properties> <property name="jbosscache-configuration" value="${gatein.jcr.cache.config}"/> <property name="jgroups-configuration" value="${gatein.jcr.jgroups.config}"/> - <property name="jgroups-multiplexer-stack" value="true"/> - <property name="jbosscache-cluster-name" value="jcr-${container.name.suffix}-wsrp-system"/> + <property name="jgroups-multiplexer-stack" value="false" /> + <property name="jbosscache-cluster-name" value="jcr${container.name.suffix}" /> + <property name="jbosscache-shareable" value="true" /> </properties> </cache> <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> @@ -75,8 +76,9 @@ <property name="changesfilter-class" value="${gatein.jcr.index.changefilterclass}"/> <property name="jbosscache-configuration" value="${gatein.jcr.index.cache.config}"/> <property name="jgroups-configuration" value="${gatein.jcr.jgroups.config}"/> - <property name="jgroups-multiplexer-stack" value="true"/> - <property name="jbosscache-cluster-name" value="jcrindexer-${container.name.suffix}-wsrp-system"/> + <property name="jgroups-multiplexer-stack" value="false" /> + <property name="jbosscache-cluster-name" value="jcrindexer${container.name.suffix}" /> + <property name="jbosscache-shareable" value="true" /> <property name="max-volatile-time" value="60"/> </properties> </query-handler> @@ -85,9 +87,10 @@ <property name="time-out" value="15m"/> <property name="jbosscache-configuration" value="${gatein.jcr.lock.cache.config}"/> <property name="jgroups-configuration" value="${gatein.jcr.jgroups.config}"/> - <property name="jgroups-multiplexer-stack" value="true"/> - <property name="jbosscache-cluster-name" value="jcrlock-${container.name.suffix}-wsrp-system"/> - <property name="jbosscache-cl-cache.jdbc.table.name" value="jcrlock_wsrp_system"/> + <property name="jgroups-multiplexer-stack" value="false" /> + <property name="jbosscache-cluster-name" value="jcrlock${container.name.suffix}" /> + <property name="jbosscache-shareable" value="true" /> + <property name="jbosscache-cl-cache.jdbc.table.name" value="jcrlock" /> <property name="jbosscache-cl-cache.jdbc.table.create" value="true"/> <property name="jbosscache-cl-cache.jdbc.table.drop" value="false"/> <property name="jbosscache-cl-cache.jdbc.table.primarykey" value="pk"/> @@ -136,8 +139,9 @@ <properties> <property name="jbosscache-configuration" value="${gatein.jcr.cache.config}"/> <property name="jgroups-configuration" value="${gatein.jcr.jgroups.config}"/> - <property name="jgroups-multiplexer-stack" value="true"/> - <property name="jbosscache-cluster-name" value="jcr-${container.name.suffix}-pc-system"/> + <property name="jgroups-multiplexer-stack" value="false" /> + <property name="jbosscache-cluster-name" value="jcr${container.name.suffix}" /> + <property name="jbosscache-shareable" value="true" /> </properties> </cache> <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> @@ -146,8 +150,9 @@ <property name="changesfilter-class" value="${gatein.jcr.index.changefilterclass}"/> <property name="jbosscache-configuration" value="${gatein.jcr.index.cache.config}"/> <property name="jgroups-configuration" value="${gatein.jcr.jgroups.config}"/> - <property name="jgroups-multiplexer-stack" value="true"/> - <property name="jbosscache-cluster-name" value="jcrindexer-${container.name.suffix}-pc-system"/> + <property name="jgroups-multiplexer-stack" value="false" /> + <property name="jbosscache-cluster-name" value="jcrindexer${container.name.suffix}" /> + <property name="jbosscache-shareable" value="true" /> <property name="max-volatile-time" value="60"/> </properties> </query-handler> @@ -156,9 +161,10 @@ <property name="time-out" value="15m"/> <property name="jbosscache-configuration" value="${gatein.jcr.lock.cache.config}"/> <property name="jgroups-configuration" value="${gatein.jcr.jgroups.config}"/> - <property name="jgroups-multiplexer-stack" value="true"/> - <property name="jbosscache-cluster-name" value="jcrlock-${container.name.suffix}-pc-system"/> - <property name="jbosscache-cl-cache.jdbc.table.name" value="jcrlock_portlet_state_system"/> + <property name="jgroups-multiplexer-stack" value="false" /> + <property name="jbosscache-cluster-name" value="jcrlock${container.name.suffix}" /> + <property name="jbosscache-shareable" value="true" /> + <property name="jbosscache-cl-cache.jdbc.table.name" value="jcrlock" /> <property name="jbosscache-cl-cache.jdbc.table.create" value="true"/> <property name="jbosscache-cl-cache.jdbc.table.drop" value="false"/> <property name="jbosscache-cl-cache.jdbc.table.primarykey" value="pk"/>