[gatein-commits] gatein SVN: r6139 - in epp/portal/branches/EPP_5_1_Branch: component/common/src/main/java/conf/jcr/jbosscache/cluster and 1 other directories.

[do-not-reply at jboss.org]

Author: hfnukal
Date: 2011-03-30 09:02:29 -0400 (Wed, 30 Mar 2011)
New Revision: 6139

Modified:
   epp/portal/branches/EPP_5_1_Branch/component/common/src/main/java/conf/jbosscache/cluster/config.xml
   epp/portal/branches/EPP_5_1_Branch/component/common/src/main/java/conf/jcr/jbosscache/cluster/config.xml
   epp/portal/branches/EPP_5_1_Branch/component/common/src/main/java/conf/jcr/jbosscache/cluster/indexer-config.xml
   epp/portal/branches/EPP_5_1_Branch/component/common/src/main/java/conf/jcr/jbosscache/cluster/lock-config.xml
   epp/portal/branches/EPP_5_1_Branch/component/common/src/main/java/conf/jcr/jbosscache/cluster/udp-mux.xml
   epp/portal/branches/EPP_5_1_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/jboss-cache-cluster.xml
Log:
JBEPP-764: Leverage the EAP parameters -g, -u, -m to enable cluster isolation

Modified: epp/portal/branches/EPP_5_1_Branch/component/common/src/main/java/conf/jbosscache/cluster/config.xml
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/component/common/src/main/java/conf/jbosscache/cluster/config.xml	2011-03-30 13:00:48 UTC (rev 6138)
+++ epp/portal/branches/EPP_5_1_Branch/component/common/src/main/java/conf/jbosscache/cluster/config.xml	2011-03-30 13:02:29 UTC (rev 6139)
@@ -20,7 +20,7 @@
 <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="gatein">
+  <clustering mode="replication" clusterName="${jboss.partition.name:DefaultPartition}-gatein">
   </clustering>
 
 </jbosscache>
\ No newline at end of file

Modified: epp/portal/branches/EPP_5_1_Branch/component/common/src/main/java/conf/jcr/jbosscache/cluster/config.xml
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/component/common/src/main/java/conf/jcr/jbosscache/cluster/config.xml	2011-03-30 13:00:48 UTC (rev 6138)
+++ epp/portal/branches/EPP_5_1_Branch/component/common/src/main/java/conf/jcr/jbosscache/cluster/config.xml	2011-03-30 13:02:29 UTC (rev 6139)
@@ -22,7 +22,7 @@
   <locking useLockStriping="false" concurrencyLevel="64" lockParentForChildInsertRemove="false"
     lockAcquisitionTimeout="20000" />
 
-  <clustering mode="replication" clusterName="${jbosscache-cluster-name}">
+  <clustering mode="replication" clusterName="${jboss.partition.name:DefaultPartition}-${jbosscache-cluster-name}">
     <stateRetrieval timeout="20000" fetchInMemoryState="false" />
     <jgroupsConfig multiplexerStack="jcr.stack" />
     <sync />

Modified: epp/portal/branches/EPP_5_1_Branch/component/common/src/main/java/conf/jcr/jbosscache/cluster/indexer-config.xml
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/component/common/src/main/java/conf/jcr/jbosscache/cluster/indexer-config.xml	2011-03-30 13:00:48 UTC (rev 6138)
+++ epp/portal/branches/EPP_5_1_Branch/component/common/src/main/java/conf/jcr/jbosscache/cluster/indexer-config.xml	2011-03-30 13:02:29 UTC (rev 6139)
@@ -24,7 +24,7 @@
    <!-- Configure the TransactionManager -->
    <transaction transactionManagerLookupClass="org.jboss.cache.transaction.JBossStandaloneJTAManagerLookup" />
 
-   <clustering mode="replication" clusterName="${jbosscache-cluster-name}">
+   <clustering mode="replication" clusterName="${jboss.partition.name:DefaultPartition}-${jbosscache-cluster-name}">
       <stateRetrieval timeout="20000" fetchInMemoryState="false" />
       <jgroupsConfig multiplexerStack="jcr.stack" />
       <sync />

Modified: epp/portal/branches/EPP_5_1_Branch/component/common/src/main/java/conf/jcr/jbosscache/cluster/lock-config.xml
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/component/common/src/main/java/conf/jcr/jbosscache/cluster/lock-config.xml	2011-03-30 13:00:48 UTC (rev 6138)
+++ epp/portal/branches/EPP_5_1_Branch/component/common/src/main/java/conf/jcr/jbosscache/cluster/lock-config.xml	2011-03-30 13:02:29 UTC (rev 6139)
@@ -21,7 +21,7 @@
 
   <locking useLockStriping="false" concurrencyLevel="64" lockParentForChildInsertRemove="false" lockAcquisitionTimeout="20000" />
 
-  <clustering mode="replication" clusterName="${jbosscache-cluster-name}">
+  <clustering mode="replication" clusterName="${jboss.partition.name:DefaultPartition}-${jbosscache-cluster-name}">
     <stateRetrieval timeout="20000" fetchInMemoryState="false" />
     <jgroupsConfig multiplexerStack="jcr.stack" />
     <sync />

Modified: epp/portal/branches/EPP_5_1_Branch/component/common/src/main/java/conf/jcr/jbosscache/cluster/udp-mux.xml
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/component/common/src/main/java/conf/jcr/jbosscache/cluster/udp-mux.xml	2011-03-30 13:00:48 UTC (rev 6138)
+++ epp/portal/branches/EPP_5_1_Branch/component/common/src/main/java/conf/jcr/jbosscache/cluster/udp-mux.xml	2011-03-30 13:02:29 UTC (rev 6139)
@@ -19,7 +19,7 @@
 <protocol_stacks>
    <stack name="jcr.stack">
       <config>
-         <UDP mcast_addr="228.10.10.10" mcast_port="45588" tos="8" ucast_recv_buf_size="20000000"
+         <UDP 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="2" enable_bundling="true" enable_diagnostics="true"

Modified: epp/portal/branches/EPP_5_1_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/jboss-cache-cluster.xml
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/jboss-cache-cluster.xml	2011-03-30 13:00:48 UTC (rev 6138)
+++ epp/portal/branches/EPP_5_1_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/jboss-cache-cluster.xml	2011-03-30 13:02:29 UTC (rev 6139)
@@ -1,6 +1,6 @@
 <jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:jboss:jbosscache-core:config:3.1">
 
-  <clustering mode="replication" clusterName="idm-cluster">
+  <clustering mode="replication" clusterName="${jboss.partition.name:DefaultPartition}-idm-cluster">
     <stateRetrieval timeout="20000" fetchInMemoryState="false" />
     <jgroupsConfig multiplexerStack="jcr.stack" />
     <sync />