Author: tolusha
Date: 2010-07-20 04:15:54 -0400 (Tue, 20 Jul 2010)
New Revision: 2800
Added:
jcr/branches/1.14-ISPN/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/infinispan/
jcr/branches/1.14-ISPN/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/infinispan/
jcr/branches/1.14-ISPN/exo.jcr.component.core/src/test/resources/conf/standalone/test-infinispan-lock.xml
Modified:
jcr/branches/1.14-ISPN/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/config/TemplateConfigurationHelper.java
jcr/branches/1.14-ISPN/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/util/io/PrivilegedCacheHelper.java
jcr/branches/1.14-ISPN/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/lab/infinispan/TestISPNCache.java
jcr/branches/1.14-ISPN/exo.jcr.component.core/src/test/resources/conf/standalone/test-jcr-config.xml
Log:
EXOJCR-831: first lock impl on Infinispan Test passed.
Modified:
jcr/branches/1.14-ISPN/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/config/TemplateConfigurationHelper.java
===================================================================
---
jcr/branches/1.14-ISPN/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/config/TemplateConfigurationHelper.java 2010-07-19
14:39:08 UTC (rev 2799)
+++
jcr/branches/1.14-ISPN/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/config/TemplateConfigurationHelper.java 2010-07-20
08:15:54 UTC (rev 2800)
@@ -22,7 +22,6 @@
import org.exoplatform.services.jcr.impl.util.io.PrivilegedFileHelper;
import java.io.ByteArrayInputStream;
-import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
@@ -89,8 +88,9 @@
*/
public static TemplateConfigurationHelper createJBossCacheHelper(ConfigurationManager
cfm)
{
- return new TemplateConfigurationHelper(new String[]{"^jbosscache-.*",
"^jgroups-configuration"},
- new String[]{"^jbosscache-configuration"}, cfm);
+ return new TemplateConfigurationHelper(
+ new String[]{"^jbosscache-.*", "^jgroups-configuration",
"^infinispan-.*"}, new String[]{
+ "^jbosscache-configuration",
"^infinispan-configuration"}, cfm);
}
/**
Modified:
jcr/branches/1.14-ISPN/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/util/io/PrivilegedCacheHelper.java
===================================================================
---
jcr/branches/1.14-ISPN/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/util/io/PrivilegedCacheHelper.java 2010-07-19
14:39:08 UTC (rev 2799)
+++
jcr/branches/1.14-ISPN/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/util/io/PrivilegedCacheHelper.java 2010-07-20
08:15:54 UTC (rev 2800)
@@ -36,7 +36,7 @@
public class PrivilegedCacheHelper
{
/**
- * Start cache in privileged mode.
+ * Start JBoss cache in privileged mode.
*
* @param cache
*/
@@ -54,7 +54,7 @@
}
/**
- * Stop cache in privileged mode.
+ * Stop JBoss cache in privileged mode.
*
* @param cache
*/
@@ -72,7 +72,7 @@
}
/**
- * Create cache in privileged mode.
+ * Create JBoss cache in privileged mode.
*
* @param cache
*/
@@ -90,7 +90,7 @@
}
/**
- * Put in cache in privileged mode.
+ * Put in JBoss cache in privileged mode.
*
* @param cache
*/
@@ -128,7 +128,7 @@
}
/**
- * Put in cache in privileged mode.
+ * Put in JBoss cache in privileged mode.
*
* @param cache
*/
@@ -163,4 +163,77 @@
}
}
}
+
+ /**
+ * Start Infinispan cache in privileged mode.
+ *
+ * @param cache
+ */
+ public static void start(final org.infinispan.Cache<Serializable, Object>
cache)
+ {
+ PrivilegedAction<Object> action = new PrivilegedAction<Object>()
+ {
+ public Object run()
+ {
+ cache.start();
+ return null;
+ }
+ };
+ AccessController.doPrivileged(action);
+ }
+
+ /**
+ * Stop Infinispan cache in privileged mode.
+ *
+ * @param cache
+ */
+ public static void stop(final org.infinispan.Cache<Serializable, Object> cache)
+ {
+ PrivilegedAction<Object> action = new PrivilegedAction<Object>()
+ {
+ public Object run()
+ {
+ cache.stop();
+ return null;
+ }
+ };
+ AccessController.doPrivileged(action);
+ }
+
+ /**
+ * Put in Infinispan cache in privileged mode.
+ *
+ * @param cache
+ */
+ public static Object putIfAbsent(final org.infinispan.Cache<Serializable,
Object> cache, final Serializable key,
+ final Object value) throws CacheException
+ {
+ PrivilegedExceptionAction<Object> action = new
PrivilegedExceptionAction<Object>()
+ {
+ public Object run() throws Exception
+ {
+ return cache.putIfAbsent(key, value);
+ }
+ };
+ try
+ {
+ return AccessController.doPrivileged(action);
+ }
+ catch (PrivilegedActionException pae)
+ {
+ Throwable cause = pae.getCause();
+ if (cause instanceof CacheException)
+ {
+ throw (CacheException)cause;
+ }
+ else if (cause instanceof RuntimeException)
+ {
+ throw (RuntimeException)cause;
+ }
+ else
+ {
+ throw new RuntimeException(cause);
+ }
+ }
+ }
}
Modified:
jcr/branches/1.14-ISPN/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/lab/infinispan/TestISPNCache.java
===================================================================
---
jcr/branches/1.14-ISPN/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/lab/infinispan/TestISPNCache.java 2010-07-19
14:39:08 UTC (rev 2799)
+++
jcr/branches/1.14-ISPN/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/lab/infinispan/TestISPNCache.java 2010-07-20
08:15:54 UTC (rev 2800)
@@ -87,7 +87,7 @@
cache.put("key", "value", 2, TimeUnit.SECONDS);
assertTrue(cache.containsKey("key"));
- Thread.sleep(2000);
+ Thread.sleep(2000 + 500);
assertFalse(cache.containsKey("key"));
}
@@ -121,7 +121,8 @@
cache.put("key", "value", 2, TimeUnit.SECONDS);
assertTrue(cache.containsKey("key"));
- Thread.sleep(2000);
+ Thread.sleep(2000 + 500);
assertFalse(cache.containsKey("key"));
}
+
}
Added:
jcr/branches/1.14-ISPN/exo.jcr.component.core/src/test/resources/conf/standalone/test-infinispan-lock.xml
===================================================================
---
jcr/branches/1.14-ISPN/exo.jcr.component.core/src/test/resources/conf/standalone/test-infinispan-lock.xml
(rev 0)
+++
jcr/branches/1.14-ISPN/exo.jcr.component.core/src/test/resources/conf/standalone/test-infinispan-lock.xml 2010-07-20
08:15:54 UTC (rev 2800)
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<infinispan
+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:infinispan:config:4.0
http://www.infinispan.org/schemas/infinispan-config-4.0.xsd"
+ xmlns="urn:infinispan:config:4.0">
+
+ <default>
+ <loaders passivation="false" shared="true"
preload="true">
+ <loader
class="org.infinispan.loaders.jdbc.stringbased.JdbcStringBasedCacheStore"
fetchPersistentState="false" ignoreModifications="false"
purgeOnStartup="false">
+ <properties>
+ <property name="stringsTableNamePrefix"
value="${infinispan-cl-cache.jdbc.table.name}"/>
+ <property name="idColumnName"
value="${infinispan-cl-cache.jdbc.id.column}"/>
+ <property name="dataColumnName"
value="${infinispan-cl-cache.jdbc.data.column}"/>
+ <property name="timestampColumnName"
value="${infinispan-cl-cache.jdbc.timestamp.column}"/>
+ <property name="idColumnType"
value="${infinispan-cl-cache.jdbc.id.type}"/>
+ <property name="dataColumnType"
value="${infinispan-cl-cache.jdbc.data.type}"/>
+ <property name="timestampColumnType"
value="${infinispan-cl-cache.jdbc.timestamp.type}"/>
+ <property name="dropTableOnExit"
value="${infinispan-cl-cache.jdbc.table.drop}"/>
+ <property name="createTableOnStart"
value="${infinispan-cl-cache.jdbc.table.create}"/>
+ <property name="connectionFactoryClass"
value="org.infinispan.loaders.jdbc.connectionfactory.ManagedConnectionFactory"/>
+ <property name="datasourceJndiLocation"
value="${infinispan-cl-cache.jdbc.datasource}"/>
+ </properties>
+ <async enabled="false"/>
+ </loader>
+ </loaders>
+ </default>
+</infinispan>
Modified:
jcr/branches/1.14-ISPN/exo.jcr.component.core/src/test/resources/conf/standalone/test-jcr-config.xml
===================================================================
---
jcr/branches/1.14-ISPN/exo.jcr.component.core/src/test/resources/conf/standalone/test-jcr-config.xml 2010-07-19
14:39:08 UTC (rev 2799)
+++
jcr/branches/1.14-ISPN/exo.jcr.component.core/src/test/resources/conf/standalone/test-jcr-config.xml 2010-07-20
08:15:54 UTC (rev 2800)
@@ -78,18 +78,17 @@
</properties>
</query-handler>
- <lock-manager
class="org.exoplatform.services.jcr.impl.core.lock.jbosscache.CacheableLockManagerImpl">
+ <lock-manager
class="org.exoplatform.services.jcr.impl.core.lock.infinispan.InfinispanLockManagerImpl">
<properties>
<property name="time-out" value="15m" />
- <property name="jbosscache-configuration"
value="conf/standalone/test-jbosscache-lock.xml" />
- <property name="jbosscache-cl-cache.jdbc.table.name"
value="jcrlocks_db1_ws" />
- <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="jcrlocks_db1_ws_pk" />
- <property name="jbosscache-cl-cache.jdbc.fqn.column"
value="fqn" />
- <property name="jbosscache-cl-cache.jdbc.node.column"
value="node" />
- <property name="jbosscache-cl-cache.jdbc.parent.column"
value="parent" />
- <property name="jbosscache-cl-cache.jdbc.datasource"
value="jdbcjcr" />
+ <property name="infinispan-configuration"
value="conf/standalone/test-infinispan-lock.xml" />
+ <property name="infinispan-cl-cache.jdbc.table.name"
value="jcrlocks_db1_ws" />
+ <property name="infinispan-cl-cache.jdbc.table.create"
value="true" />
+ <property name="infinispan-cl-cache.jdbc.table.drop"
value="false" />
+ <property name="infinispan-cl-cache.jdbc.id.column"
value="id" />
+ <property name="infinispan-cl-cache.jdbc.data.column"
value="data" />
+ <property
name="infinispan-cl-cache.jdbc.timestamp.column" value="time_stamp"
/>
+ <property name="infinispan-cl-cache.jdbc.datasource"
value="jdbcjcr" />
</properties>
</lock-manager>
</workspace>
@@ -131,18 +130,17 @@
<property name="spellchecker-class"
value="org.exoplatform.services.jcr.impl.core.query.lucene.spell.LuceneSpellChecker$FiveSecondsRefreshInterval"
/>
</properties>
</query-handler>
- <lock-manager
class="org.exoplatform.services.jcr.impl.core.lock.jbosscache.CacheableLockManagerImpl">
+ <lock-manager
class="org.exoplatform.services.jcr.impl.core.lock.infinispan.InfinispanLockManagerImpl">
<properties>
<property name="time-out" value="15m" />
- <property name="jbosscache-configuration"
value="conf/standalone/test-jbosscache-lock.xml" />
- <property name="jbosscache-cl-cache.jdbc.table.name"
value="jcrlocks_db1_ws1" />
- <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="jcrlocks_db1_ws1_pk" />
- <property name="jbosscache-cl-cache.jdbc.fqn.column"
value="fqn" />
- <property name="jbosscache-cl-cache.jdbc.node.column"
value="node" />
- <property name="jbosscache-cl-cache.jdbc.parent.column"
value="parent" />
- <property name="jbosscache-cl-cache.jdbc.datasource"
value="jdbcjcr1" />
+ <property name="infinispan-configuration"
value="conf/standalone/test-infinispan-lock.xml" />
+ <property name="infinispan-cl-cache.jdbc.table.name"
value="jcrlocks_db1_ws1" />
+ <property name="infinispan-cl-cache.jdbc.table.create"
value="true" />
+ <property name="infinispan-cl-cache.jdbc.table.drop"
value="false" />
+ <property name="infinispan-cl-cache.jdbc.id.column"
value="id" />
+ <property name="infinispan-cl-cache.jdbc.data.column"
value="data" />
+ <property
name="infinispan-cl-cache.jdbc.timestamp.column" value="time_stamp"
/>
+ <property name="infinispan-cl-cache.jdbc.datasource"
value="jdbcjcr1" />
</properties>
</lock-manager>
</workspace>
@@ -184,18 +182,17 @@
<property name="spellchecker-class"
value="org.exoplatform.services.jcr.impl.core.query.lucene.spell.LuceneSpellChecker$FiveSecondsRefreshInterval"
/>
</properties>
</query-handler>
- <lock-manager
class="org.exoplatform.services.jcr.impl.core.lock.jbosscache.CacheableLockManagerImpl">
+ <lock-manager
class="org.exoplatform.services.jcr.impl.core.lock.infinispan.InfinispanLockManagerImpl">
<properties>
<property name="time-out" value="15m" />
- <property name="jbosscache-configuration"
value="conf/standalone/test-jbosscache-lock.xml" />
- <property name="jbosscache-cl-cache.jdbc.table.name"
value="jcrlocks_db1_ws2" />
- <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="jcrlocks_db1_ws2_pk" />
- <property name="jbosscache-cl-cache.jdbc.fqn.column"
value="fqn" />
- <property name="jbosscache-cl-cache.jdbc.node.column"
value="node" />
- <property name="jbosscache-cl-cache.jdbc.parent.column"
value="parent" />
- <property name="jbosscache-cl-cache.jdbc.datasource"
value="jdbcjcr2" />
+ <property name="infinispan-configuration"
value="conf/standalone/test-infinispan-lock.xml" />
+ <property name="infinispan-cl-cache.jdbc.table.name"
value="jcrlocks_db1_ws2" />
+ <property name="infinispan-cl-cache.jdbc.table.create"
value="true" />
+ <property name="infinispan-cl-cache.jdbc.table.drop"
value="false" />
+ <property name="infinispan-cl-cache.jdbc.id.column"
value="id" />
+ <property name="infinispan-cl-cache.jdbc.data.column"
value="data" />
+ <property
name="infinispan-cl-cache.jdbc.timestamp.column" value="time_stamp"
/>
+ <property name="infinispan-cl-cache.jdbc.datasource"
value="jdbcjcr2" />
</properties>
</lock-manager>
</workspace>
@@ -253,36 +250,32 @@
<property name="jbosscache-configuration"
value="conf/standalone/test-jbosscache-config.xml" />
</properties>
</cache>
- <query-handler
- class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex">
- <properties>
- <property name="index-dir"
value="target/temp/index/db1/ws3" />
- <property name="synonymprovider-class"
- value="org.exoplatform.services.jcr.impl.core.query.lucene.PropertiesSynonymProvider"
/>
- <property name="synonymprovider-config-path"
value="../../synonyms.properties" />
- <property name="support-highlighting" value="true" />
- <property name="indexing-configuration-path"
value="../../indexing-configuration.xml" />
- <property name="query-class"
- value="org.exoplatform.services.jcr.impl.core.query.QueryImpl" />
- <property name="spellchecker-class"
- value="org.exoplatform.services.jcr.impl.core.query.lucene.spell.LuceneSpellChecker$FiveSecondsRefreshInterval"
/>
- </properties>
- </query-handler>
- <lock-manager
class="org.exoplatform.services.jcr.impl.core.lock.jbosscache.CacheableLockManagerImpl">
- <properties>
- <property name="time-out" value="15m" />
- <property name="jbosscache-configuration"
value="conf/standalone/test-jbosscache-lock.xml" />
- <property name="jbosscache-cl-cache.jdbc.table.name"
value="jcrlocks_db1_ws3" />
- <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="jcrlocks_db1_ws3_pk" />
- <property name="jbosscache-cl-cache.jdbc.fqn.column"
value="fqn" />
- <property name="jbosscache-cl-cache.jdbc.node.column"
value="node" />
- <property
name="jbosscache-cl-cache.jdbc.parent.column" value="parent" />
- <property name="jbosscache-cl-cache.jdbc.datasource"
value="jdbcjcr3" />
- </properties>
- </lock-manager>
-
+ <query-handler
+ class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex">
+ <properties>
+ <property name="index-dir" value="target/temp/index/db1/ws3"
/>
+ <property name="synonymprovider-class"
+ value="org.exoplatform.services.jcr.impl.core.query.lucene.PropertiesSynonymProvider"
/>
+ <property name="synonymprovider-config-path"
value="../../synonyms.properties" />
+ <property name="support-highlighting" value="true" />
+ <property name="indexing-configuration-path"
value="../../indexing-configuration.xml" />
+ <property name="query-class"
value="org.exoplatform.services.jcr.impl.core.query.QueryImpl" />
+ <property name="spellchecker-class"
value="org.exoplatform.services.jcr.impl.core.query.lucene.spell.LuceneSpellChecker$FiveSecondsRefreshInterval"
/>
+ </properties>
+ </query-handler>
+ <lock-manager
class="org.exoplatform.services.jcr.impl.core.lock.infinispan.InfinispanLockManagerImpl">
+ <properties>
+ <property name="time-out" value="15m" />
+ <property name="infinispan-configuration"
value="conf/standalone/test-infinispan-lock.xml" />
+ <property name="infinispan-cl-cache.jdbc.table.name"
value="jcrlocks_db1_ws3" />
+ <property name="infinispan-cl-cache.jdbc.table.create"
value="true" />
+ <property name="infinispan-cl-cache.jdbc.table.drop"
value="false" />
+ <property name="infinispan-cl-cache.jdbc.id.column"
value="id" />
+ <property name="infinispan-cl-cache.jdbc.data.column"
value="data" />
+ <property
name="infinispan-cl-cache.jdbc.timestamp.column" value="time_stamp"
/>
+ <property name="infinispan-cl-cache.jdbc.datasource"
value="jdbcjcr3" />
+ </properties>
+ </lock-manager>
</workspace>
</workspaces>
</repository>
@@ -339,18 +332,17 @@
<property name="spellchecker-class"
value="org.exoplatform.services.jcr.impl.core.query.lucene.spell.LuceneSpellChecker$FiveSecondsRefreshInterval"
/>
</properties>
</query-handler>
- <lock-manager
class="org.exoplatform.services.jcr.impl.core.lock.jbosscache.CacheableLockManagerImpl">
+ <lock-manager
class="org.exoplatform.services.jcr.impl.core.lock.infinispan.InfinispanLockManagerImpl">
<properties>
<property name="time-out" value="15m" />
- <property name="jbosscache-configuration"
value="conf/standalone/test-jbosscache-lock.xml" />
- <property name="jbosscache-cl-cache.jdbc.table.name"
value="jcrlocks_db1tck_ws" />
- <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="jcrlocks_db1tck_ws_pk" />
- <property name="jbosscache-cl-cache.jdbc.fqn.column"
value="fqn" />
- <property name="jbosscache-cl-cache.jdbc.node.column"
value="node" />
- <property name="jbosscache-cl-cache.jdbc.parent.column"
value="parent" />
- <property name="jbosscache-cl-cache.jdbc.datasource"
value="jdbcjcrtck" />
+ <property name="infinispan-configuration"
value="conf/standalone/test-infinispan-lock.xml" />
+ <property name="infinispan-cl-cache.jdbc.table.name"
value="jcrlocks_db1tck_ws" />
+ <property name="infinispan-cl-cache.jdbc.table.create"
value="true" />
+ <property name="infinispan-cl-cache.jdbc.table.drop"
value="false" />
+ <property name="infinispan-cl-cache.jdbc.id.column"
value="id" />
+ <property name="infinispan-cl-cache.jdbc.data.column"
value="data" />
+ <property
name="infinispan-cl-cache.jdbc.timestamp.column" value="time_stamp"
/>
+ <property name="infinispan-cl-cache.jdbc.datasource"
value="jdbcjcrtck" />
</properties>
</lock-manager>
</workspace>
@@ -398,20 +390,19 @@
<property name="spellchecker-class"
value="org.exoplatform.services.jcr.impl.core.query.lucene.spell.LuceneSpellChecker$FiveSecondsRefreshInterval"
/>
</properties>
</query-handler>
- <lock-manager
class="org.exoplatform.services.jcr.impl.core.lock.jbosscache.CacheableLockManagerImpl">
+ <lock-manager
class="org.exoplatform.services.jcr.impl.core.lock.infinispan.InfinispanLockManagerImpl">
<properties>
<property name="time-out" value="15m" />
- <property name="jbosscache-configuration"
value="conf/standalone/test-jbosscache-lock.xml" />
- <property name="jbosscache-cl-cache.jdbc.table.name"
value="jcrlocks_db1tck_ws1" />
- <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="jcrlocks_db1tck_ws1_pk" />
- <property name="jbosscache-cl-cache.jdbc.fqn.column"
value="fqn" />
- <property name="jbosscache-cl-cache.jdbc.node.column"
value="node" />
- <property name="jbosscache-cl-cache.jdbc.parent.column"
value="parent" />
- <property name="jbosscache-cl-cache.jdbc.datasource"
value="jdbcjcr1tck" />
+ <property name="infinispan-configuration"
value="conf/standalone/test-infinispan-lock.xml" />
+ <property name="infinispan-cl-cache.jdbc.table.name"
value="jcrlocks_db1tck_ws1" />
+ <property name="infinispan-cl-cache.jdbc.table.create"
value="true" />
+ <property name="infinispan-cl-cache.jdbc.table.drop"
value="false" />
+ <property name="infinispan-cl-cache.jdbc.id.column"
value="id" />
+ <property name="infinispan-cl-cache.jdbc.data.column"
value="data" />
+ <property
name="infinispan-cl-cache.jdbc.timestamp.column" value="time_stamp"
/>
+ <property name="infinispan-cl-cache.jdbc.datasource"
value="jdbcjcr1tck" />
</properties>
- </lock-manager>
+ </lock-manager>
</workspace>
<workspace name="ws2">
@@ -460,20 +451,19 @@
<property name="extractorTimeout"
value="10"/>
</properties>
</query-handler>
- <lock-manager
class="org.exoplatform.services.jcr.impl.core.lock.jbosscache.CacheableLockManagerImpl">
+ <lock-manager
class="org.exoplatform.services.jcr.impl.core.lock.infinispan.InfinispanLockManagerImpl">
<properties>
<property name="time-out" value="15m" />
- <property name="jbosscache-configuration"
value="conf/standalone/test-jbosscache-lock.xml" />
- <property name="jbosscache-cl-cache.jdbc.table.name"
value="jcrlocks_db1tck_ws2" />
- <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="jcrlocks_db1tck_ws2_pk" />
- <property name="jbosscache-cl-cache.jdbc.fqn.column"
value="fqn" />
- <property name="jbosscache-cl-cache.jdbc.node.column"
value="node" />
- <property name="jbosscache-cl-cache.jdbc.parent.column"
value="parent" />
- <property name="jbosscache-cl-cache.jdbc.datasource"
value="jdbcjcr2tck" />
+ <property name="infinispan-configuration"
value="conf/standalone/test-infinispan-lock.xml" />
+ <property name="infinispan-cl-cache.jdbc.table.name"
value="jcrlocks_db1tck_ws2" />
+ <property name="infinispan-cl-cache.jdbc.table.create"
value="true" />
+ <property name="infinispan-cl-cache.jdbc.table.drop"
value="false" />
+ <property name="infinispan-cl-cache.jdbc.id.column"
value="id" />
+ <property name="infinispan-cl-cache.jdbc.data.column"
value="data" />
+ <property
name="infinispan-cl-cache.jdbc.timestamp.column" value="time_stamp"
/>
+ <property name="infinispan-cl-cache.jdbc.datasource"
value="jdbcjcr2tck" />
</properties>
- </lock-manager>
+ </lock-manager>
</workspace>
</workspaces>
</repository>