JCR-2234: Make sure that the JDBC Cache store used by the LockManager…

… is optimized and reliable (jcr-benchmark)

Readme.txt

@@ -2,8 +2,3 @@
 2. Go to target\exo-jcr-benchmark-binary.dir\bin and run start-benchmark.cmd.
 By default this benchmark is configured for pgsql DB.
 Make sure you have configured mysql DB as in config\test-configuration-benchmark.xml.
-
-
-The benchmark for Infinispan
-1. Run "mvn clean install -Pispn" command.
-2. Go to target\exo-jcr-benchmark-binary.dir\bin and run start-benchmark.cmd.

assembly-descriptor.xml

@@ -38,10 +38,7 @@
       <unpack>false</unpack>
       <scope>runtime</scope>
       <excludes>
-        <exclude>xalan:xalan</exclude>
-        <exclude>xerces:xerces</exclude>
         <exclude>xerces:xercesImpl</exclude>
-        <exclude>com.sun.xml.parsers:jaxp-ri</exclude>
       </excludes>
     </dependencySet>
   </dependencySets>

bin/64start-benchmark-linux-server.sh

@@ -1,2 +1,2 @@
-/usr/lib/java6_x64/jre/bin/java -Xmx12g -Djava.net.preferIPv4Stack=true -Dlog4j.configuration=file:../config/log4j.properties -Duser.language=en -Dexo.jcr.allow.closed.session.usage=true -Duser.region=us -jar ../lib/exo-jcr-benchmark-1.16.0-Alpha3-SNAPSHOT.jar ../config/JCRAPI.xml -last -line
-/usr/lib/java6_x64/jre/bin/java -cp ../lib/exo-jcr-benchmark-1.16.0-Alpha3-SNAPSHOT.jar org.exoplatform.jcr.benchmark.helpers.SimpleReportHelper
+$JAVA_HOME/bin/java -Xmx12g -Djava.net.preferIPv4Stack=true -Dlog4j.configuration=file:../config/log4j.properties -Duser.language=en -Dexo.jcr.allow.closed.session.usage=true -Duser.region=us -jar ../lib/exo-jcr-benchmark-1.16.0-Alpha3-SNAPSHOT.jar ../config/JCRAPI.xml -last -line
+$JAVA_HOME/bin/java -cp ../lib/exo-jcr-benchmark-1.16.0-Alpha3-SNAPSHOT.jar org.exoplatform.jcr.benchmark.helpers.SimpleReportHelper

config/test-infinispan-config.xml

@@ -21,8 +21,8 @@
 -->
 <infinispan
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-      xsi:schemaLocation="urn:infinispan:config:5.1 http://www.infinispan.org/schemas/infinispan-config-5.1.xsd" 
-      xmlns="urn:infinispan:config:5.1">
+      xsi:schemaLocation="urn:infinispan:config:5.2 http://www.infinispan.org/schemas/infinispan-config-5.2.xsd" 
+      xmlns="urn:infinispan:config:5.2">
 
     <global>
       <evictionScheduledExecutor factory="org.infinispan.executors.DefaultScheduledExecutorFactory">

config/test-infinispan-indexer.xml

@@ -21,8 +21,8 @@
 -->
 <infinispan
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-      xsi:schemaLocation="urn:infinispan:config:5.1 http://www.infinispan.org/schemas/infinispan-config-5.1.xsd" 
-      xmlns="urn:infinispan:config:5.1">
+      xsi:schemaLocation="urn:infinispan:config:5.2 http://www.infinispan.org/schemas/infinispan-config-5.2.xsd" 
+      xmlns="urn:infinispan:config:5.2">
 
     <global>
       <evictionScheduledExecutor factory="org.infinispan.executors.DefaultScheduledExecutorFactory">

config/test-infinispan-lock.xml

@@ -21,8 +21,8 @@
 -->
 <infinispan
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-      xsi:schemaLocation="urn:infinispan:config:5.1 http://www.infinispan.org/schemas/infinispan-config-5.1.xsd" 
-      xmlns="urn:infinispan:config:5.1">
+      xsi:schemaLocation="urn:infinispan:config:5.2 http://www.infinispan.org/schemas/infinispan-config-5.2.xsd" 
+      xmlns="urn:infinispan:config:5.2">
 
     <global>
       <evictionScheduledExecutor factory="org.infinispan.executors.DefaultScheduledExecutorFactory">
@@ -52,7 +52,7 @@
       <eviction strategy="NONE"/>
 
       <loaders passivation="false" shared="true" preload="true">
-        <loader class="org.infinispan.loaders.jdbc.stringbased.JdbcStringBasedCacheStore" fetchPersistentState="true" ignoreModifications="false" purgeOnStartup="false">
+        <loader class="org.exoplatform.services.jcr.infinispan.JdbcStringBasedCacheStore" fetchPersistentState="true" 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}"/>