Author: nfilotto
Date: 2012-02-02 06:52:55 -0500 (Thu, 02 Feb 2012)
New Revision: 5564
Modified:
jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/resources/conf/distributed-cache-configuration.xml
jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/test/resources/conf/standalone/cluster/distributed-cache-configuration.xml
jcr/trunk/pom.xml
Log:
EXOJCR-1682: Upgraded to ISPN 5.1.1.CR1 and JGroups 3.0.4.Final (jcr)
Modified:
jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/resources/conf/distributed-cache-configuration.xml
===================================================================
---
jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/resources/conf/distributed-cache-configuration.xml 2012-02-02
11:38:29 UTC (rev 5563)
+++
jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/resources/conf/distributed-cache-configuration.xml 2012-02-02
11:52:55 UTC (rev 5564)
@@ -36,10 +36,20 @@
<jmxStatistics enabled="true"/>
<clustering mode="distribution">
<l1 enabled="true"
invalidationThreshold="${invalidationThreshold}"/>
- <hash numOwners="2" rehashRpcTimeout="120000">
+ <hash numOwners="3" rehashRpcTimeout="120000">
<groups enabled="true"/>
</hash>
<sync replTimeout="180000"/>
</clustering>
</namedCache>
+ <namedCache name="eXoCache">
+ <locking isolationLevel="READ_COMMITTED"
lockAcquisitionTimeout="120000" writeSkewCheck="false"
concurrencyLevel="500" useLockStriping="true" />
+ <transaction
transactionManagerLookupClass="org.infinispan.transaction.lookup.GenericTransactionManagerLookup"
syncRollbackPhase="true" syncCommitPhase="true"
eagerLockSingleNode="true" transactionMode="TRANSACTIONAL"/>
+ <jmxStatistics enabled="true"/>
+ <clustering mode="distribution">
+ <l1 enabled="true"
invalidationThreshold="${invalidationThreshold}"/>
+ <hash numOwners="3" rehashRpcTimeout="120000"/>
+ <sync replTimeout="180000"/>
+ </clustering>
+ </namedCache>
</infinispan>
\ No newline at end of file
Modified:
jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/test/resources/conf/standalone/cluster/distributed-cache-configuration.xml
===================================================================
---
jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/test/resources/conf/standalone/cluster/distributed-cache-configuration.xml 2012-02-02
11:38:29 UTC (rev 5563)
+++
jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/test/resources/conf/standalone/cluster/distributed-cache-configuration.xml 2012-02-02
11:52:55 UTC (rev 5564)
@@ -25,7 +25,7 @@
<globalJmxStatistics jmxDomain="exo" enabled="true"
allowDuplicateDomains="true"/>
<transport
transportClass="org.infinispan.remoting.transport.jgroups.JGroupsTransport"
clusterName="JCR-cluster" distributedSyncTimeout="20000">
<properties>
- <property name="configurationFile"
value="tcp-mux.xml"/>
+ <property name="configurationFile"
value="tcp-mux-v3.xml"/>
</properties>
</transport>
<shutdown hookBehavior="DEFAULT"/>
@@ -36,10 +36,20 @@
<jmxStatistics enabled="true"/>
<clustering mode="distribution">
<l1 enabled="true" invalidationThreshold="-1"/>
- <hash numOwners="2" rehashRpcTimeout="120000">
+ <hash numOwners="3" rehashRpcTimeout="120000">
<groups enabled="true"/>
</hash>
<sync replTimeout="180000"/>
</clustering>
</namedCache>
+ <namedCache name="eXoCache">
+ <locking isolationLevel="READ_COMMITTED"
lockAcquisitionTimeout="120000" writeSkewCheck="false"
concurrencyLevel="500" useLockStriping="true" />
+ <transaction
transactionManagerLookupClass="org.infinispan.transaction.lookup.GenericTransactionManagerLookup"
syncRollbackPhase="true" syncCommitPhase="true"
eagerLockSingleNode="true" transactionMode="TRANSACTIONAL"/>
+ <jmxStatistics enabled="true"/>
+ <clustering mode="distribution">
+ <l1 enabled="true" invalidationThreshold="-1"/>
+ <hash numOwners="3" rehashRpcTimeout="120000"/>
+ <sync replTimeout="180000"/>
+ </clustering>
+ </namedCache>
</infinispan>
\ No newline at end of file
Modified: jcr/trunk/pom.xml
===================================================================
--- jcr/trunk/pom.xml 2012-02-02 11:38:29 UTC (rev 5563)
+++ jcr/trunk/pom.xml 2012-02-02 11:52:55 UTC (rev 5564)
@@ -397,12 +397,12 @@
<dependency>
<groupId>org.infinispan</groupId>
<artifactId>infinispan-core</artifactId>
- <version>5.1.0.FINAL</version>
+ <version>5.1.1.CR1</version>
</dependency>
<dependency>
<groupId>org.infinispan</groupId>
<artifactId>infinispan-cachestore-jdbc</artifactId>
- <version>5.1.0.FINAL</version>
+ <version>5.1.1.CR1</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>