Author: tolusha Date: 2011-03-05 06:29:46 -0500 (Sat, 05 Mar 2011) New Revision: 4061 Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/jbosscache/CacheableLockManagerImpl.java jcr/trunk/exo.jcr.component.core/src/main/resources/conf/portal/cluster/infinispan-indexer.xml jcr/trunk/exo.jcr.component.core/src/main/resources/conf/portal/cluster/infinispan-lock.xml jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-infinispan-indexer.xml jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-infinispan-lock.xml jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-infinispan-indexer.xml jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-infinispan-lock.xml Log: EXOJCR-833: fix configuration Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/jbosscache/CacheableLockManagerImpl.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/jbosscache/CacheableLockManagerImpl.java 2011-03-04 15:13:03 UTC (rev 4060) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/jbosscache/CacheableLockManagerImpl.java 2011-03-05 11:29:46 UTC (rev 4061) @@ -488,7 +488,7 @@ // HSSQL if (dialect.equals(DBConstants.DB_DIALECT_HSQLDB)) { - blobType = "OBJECT"; + blobType = "VARBINARY(65535)"; } // MYSQL else if (dialect.equals(DBConstants.DB_DIALECT_MYSQL) || dialect.equals(DBConstants.DB_DIALECT_MYSQL_UTF8)) Modified: jcr/trunk/exo.jcr.component.core/src/main/resources/conf/portal/cluster/infinispan-indexer.xml =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/resources/conf/portal/cluster/infinispan-indexer.xml 2011-03-04 15:13:03 UTC (rev 4060) +++ jcr/trunk/exo.jcr.component.core/src/main/resources/conf/portal/cluster/infinispan-indexer.xml 2011-03-05 11:29:46 UTC (rev 4061) @@ -50,6 +50,7 @@ <transaction transactionManagerLookupClass="org.infinispan.transaction.lookup.JBossStandaloneJTAManagerLookup" syncRollbackPhase="false" syncCommitPhase="false"/> <jmxStatistics enabled="true"/> <deadlockDetection enabled="true" spinDuration="100"/> + <eviction strategy="NONE"/> <loaders passivation="false" shared="false" preload="false"> <loader class="${infinispan-cachestore-classname}" fetchPersistentState="false" ignoreModifications="false" purgeOnStartup="false"> Modified: jcr/trunk/exo.jcr.component.core/src/main/resources/conf/portal/cluster/infinispan-lock.xml =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/resources/conf/portal/cluster/infinispan-lock.xml 2011-03-04 15:13:03 UTC (rev 4060) +++ jcr/trunk/exo.jcr.component.core/src/main/resources/conf/portal/cluster/infinispan-lock.xml 2011-03-05 11:29:46 UTC (rev 4061) @@ -50,6 +50,7 @@ <transaction transactionManagerLookupClass="org.infinispan.transaction.lookup.JBossStandaloneJTAManagerLookup" syncRollbackPhase="false" syncCommitPhase="false"/> <jmxStatistics enabled="true"/> <deadlockDetection enabled="true" spinDuration="100"/> + <eviction strategy="NONE"/> <loaders passivation="false" shared="true" preload="true"> <loader class="org.infinispan.loaders.jdbc.stringbased.JdbcStringBasedCacheStore" fetchPersistentState="false" ignoreModifications="false" purgeOnStartup="false"> Modified: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-infinispan-indexer.xml =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-infinispan-indexer.xml 2011-03-04 15:13:03 UTC (rev 4060) +++ jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-infinispan-indexer.xml 2011-03-05 11:29:46 UTC (rev 4061) @@ -50,6 +50,7 @@ <transaction transactionManagerLookupClass="org.infinispan.transaction.lookup.JBossStandaloneJTAManagerLookup" syncRollbackPhase="false" syncCommitPhase="false"/> <jmxStatistics enabled="true"/> <deadlockDetection enabled="true" spinDuration="100"/> + <eviction strategy="NONE"/> <loaders passivation="false" shared="false" preload="false"> <loader class="${infinispan-cachestore-classname}" fetchPersistentState="false" ignoreModifications="false" purgeOnStartup="false"> Modified: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-infinispan-lock.xml =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-infinispan-lock.xml 2011-03-04 15:13:03 UTC (rev 4060) +++ jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-infinispan-lock.xml 2011-03-05 11:29:46 UTC (rev 4061) @@ -50,6 +50,7 @@ <transaction transactionManagerLookupClass="org.infinispan.transaction.lookup.JBossStandaloneJTAManagerLookup" syncRollbackPhase="false" syncCommitPhase="false"/> <jmxStatistics enabled="true"/> <deadlockDetection enabled="true" spinDuration="100"/> + <eviction strategy="NONE"/> <loaders passivation="false" shared="true" preload="true"> <loader class="org.infinispan.loaders.jdbc.stringbased.JdbcStringBasedCacheStore" fetchPersistentState="false" ignoreModifications="false" purgeOnStartup="false"> Modified: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-infinispan-indexer.xml =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-infinispan-indexer.xml 2011-03-04 15:13:03 UTC (rev 4060) +++ jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-infinispan-indexer.xml 2011-03-05 11:29:46 UTC (rev 4061) @@ -38,6 +38,9 @@ <locking isolationLevel="READ_COMMITTED" lockAcquisitionTimeout="20000" writeSkewCheck="false" concurrencyLevel="500"/> <jmxStatistics enabled="true"/> <deadlockDetection enabled="true" spinDuration="100"/> + <eviction strategy="NONE"/> + <transaction transactionManagerLookupClass="org.infinispan.transaction.lookup.JBossStandaloneJTAManagerLookup" syncRollbackPhase="false" syncCommitPhase="false"/> + <loaders passivation="false" shared="false" preload="false"> <loader class="${infinispan-cachestore-classname}" fetchPersistentState="false" ignoreModifications="false" purgeOnStartup="false"> <async enabled="false"/> Modified: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-infinispan-lock.xml =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-infinispan-lock.xml 2011-03-04 15:13:03 UTC (rev 4060) +++ jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-infinispan-lock.xml 2011-03-05 11:29:46 UTC (rev 4061) @@ -39,6 +39,7 @@ <transaction transactionManagerLookupClass="org.infinispan.transaction.lookup.JBossStandaloneJTAManagerLookup" syncRollbackPhase="false" syncCommitPhase="false"/> <jmxStatistics enabled="true"/> <deadlockDetection enabled="true" spinDuration="100"/> + <eviction strategy="NONE"/> <loaders passivation="false" shared="true" preload="true"> <loader class="org.infinispan.loaders.jdbc.stringbased.JdbcStringBasedCacheStore" fetchPersistentState="false" ignoreModifications="false" purgeOnStartup="false">