Author: tolusha Date: 2011-03-31 08:14:39 -0400 (Thu, 31 Mar 2011) New Revision: 4195 Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/infinispan/ISPNCacheableLockManagerImpl.java jcr/trunk/exo.jcr.component.core/src/main/resources/conf/portal/exo-jcr-ispn-config.xml jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jcr-config.xml jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-jcr-config-sjdbc.xml jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-jcr-config.xml Log: EXOJCR-1271: decrease table lock name Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/infinispan/ISPNCacheableLockManagerImpl.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/infinispan/ISPNCacheableLockManagerImpl.java 2011-03-31 12:04:39 UTC (rev 4194) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/infinispan/ISPNCacheableLockManagerImpl.java 2011-03-31 12:14:39 UTC (rev 4195) @@ -116,7 +116,7 @@ // configure cache loader parameters with correct DB data-types configureJDBCCacheLoader(config.getLockManager()); - cache = factory.createCache("Lock_" + config.getUniqueName(), config.getLockManager()); + cache = factory.createCache(config.getUniqueName().replace("_", ""), config.getLockManager()); // Context recall is a workaround of JDBCCacheLoader starting. context.recall(); Modified: jcr/trunk/exo.jcr.component.core/src/main/resources/conf/portal/exo-jcr-ispn-config.xml =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/resources/conf/portal/exo-jcr-ispn-config.xml 2011-03-31 12:04:39 UTC (rev 4194) +++ jcr/trunk/exo.jcr.component.core/src/main/resources/conf/portal/exo-jcr-ispn-config.xml 2011-03-31 12:14:39 UTC (rev 4195) @@ -75,7 +75,7 @@ <property name="infinispan-configuration" value="jar:/conf/portal/cluster/infinispan-lock.xml" /> <property name="jgroups-configuration" value="jar:/conf/portal/cluster/udp-mux.xml" /> <property name="infinispan-cluster-name" value="JCR-cluster" /> - <property name="infinispan-cl-cache.jdbc.table.name" value="jcrlocks" /> + <property name="infinispan-cl-cache.jdbc.table.name" value="lk" /> <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" /> @@ -136,7 +136,7 @@ <property name="infinispan-configuration" value="jar:/conf/portal/cluster/infinispan-lock.xml" /> <property name="jgroups-configuration" value="jar:/conf/portal/cluster/udp-mux.xml" /> <property name="infinispan-cluster-name" value="JCR-cluster" /> - <property name="infinispan-cl-cache.jdbc.table.name" value="jcrlocks" /> + <property name="infinispan-cl-cache.jdbc.table.name" value="lk" /> <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" /> @@ -197,7 +197,7 @@ <property name="infinispan-configuration" value="jar:/conf/portal/cluster/infinispan-lock.xml" /> <property name="jgroups-configuration" value="jar:/conf/portal/cluster/udp-mux.xml" /> <property name="infinispan-cluster-name" value="JCR-cluster" /> - <property name="infinispan-cl-cache.jdbc.table.name" value="jcrlocks" /> + <property name="infinispan-cl-cache.jdbc.table.name" value="lk" /> <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" /> Modified: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jcr-config.xml =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jcr-config.xml 2011-03-31 12:04:39 UTC (rev 4194) +++ jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jcr-config.xml 2011-03-31 12:14:39 UTC (rev 4195) @@ -75,7 +75,7 @@ <property name="infinispan-configuration" value="conf/standalone/cluster/test-infinispan-lock.xml" /> <property name="jgroups-configuration" value="udp-mux.xml" /> <property name="infinispan-cluster-name" value="JCR-cluster" /> - <property name="infinispan-cl-cache.jdbc.table.name" value="jcrlocks" /> + <property name="infinispan-cl-cache.jdbc.table.name" value="lk" /> <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" /> @@ -141,7 +141,7 @@ <property name="infinispan-configuration" value="conf/standalone/cluster/test-infinispan-lock.xml" /> <property name="jgroups-configuration" value="udp-mux.xml" /> <property name="infinispan-cluster-name" value="JCR-cluster" /> - <property name="infinispan-cl-cache.jdbc.table.name" value="jcrlocks" /> + <property name="infinispan-cl-cache.jdbc.table.name" value="lk" /> <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" /> @@ -207,7 +207,7 @@ <property name="infinispan-configuration" value="conf/standalone/cluster/test-infinispan-lock.xml" /> <property name="jgroups-configuration" value="udp-mux.xml" /> <property name="infinispan-cluster-name" value="JCR-cluster" /> - <property name="infinispan-cl-cache.jdbc.table.name" value="jcrlocks" /> + <property name="infinispan-cl-cache.jdbc.table.name" value="lk" /> <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" /> @@ -296,7 +296,7 @@ <property name="infinispan-configuration" value="conf/standalone/cluster/test-infinispan-lock.xml" /> <property name="jgroups-configuration" value="udp-mux.xml" /> <property name="infinispan-cluster-name" value="JCR-cluster" /> - <property name="infinispan-cl-cache.jdbc.table.name" value="jcrlocks" /> + <property name="infinispan-cl-cache.jdbc.table.name" value="lk" /> <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" /> @@ -371,7 +371,7 @@ <property name="infinispan-configuration" value="conf/standalone/cluster/test-infinispan-lock.xml" /> <property name="jgroups-configuration" value="udp-mux.xml" /> <property name="infinispan-cluster-name" value="JCR-cluster" /> - <property name="infinispan-cl-cache.jdbc.table.name" value="jcrlocks" /> + <property name="infinispan-cl-cache.jdbc.table.name" value="lk" /> <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" /> @@ -435,7 +435,7 @@ <property name="infinispan-configuration" value="conf/standalone/cluster/test-infinispan-lock.xml" /> <property name="jgroups-configuration" value="udp-mux.xml" /> <property name="infinispan-cluster-name" value="JCR-cluster" /> - <property name="infinispan-cl-cache.jdbc.table.name" value="jcrlocks" /> + <property name="infinispan-cl-cache.jdbc.table.name" value="lk" /> <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" /> @@ -519,7 +519,7 @@ <property name="infinispan-configuration" value="conf/standalone/cluster/test-infinispan-lock.xml" /> <property name="jgroups-configuration" value="udp-mux.xml" /> <property name="infinispan-cluster-name" value="JCR-cluster" /> - <property name="infinispan-cl-cache.jdbc.table.name" value="jcrlocks" /> + <property name="infinispan-cl-cache.jdbc.table.name" value="lk" /> <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" /> @@ -592,7 +592,7 @@ <property name="infinispan-configuration" value="conf/standalone/cluster/test-infinispan-lock.xml" /> <property name="jgroups-configuration" value="udp-mux.xml" /> <property name="infinispan-cluster-name" value="JCR-cluster" /> - <property name="infinispan-cl-cache.jdbc.table.name" value="jcrlocks" /> + <property name="infinispan-cl-cache.jdbc.table.name" value="lk" /> <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" /> @@ -668,7 +668,7 @@ <property name="infinispan-configuration" value="conf/standalone/cluster/test-infinispan-lock.xml" /> <property name="jgroups-configuration" value="udp-mux.xml" /> <property name="infinispan-cluster-name" value="JCR-cluster" /> - <property name="infinispan-cl-cache.jdbc.table.name" value="jcrlocks" /> + <property name="infinispan-cl-cache.jdbc.table.name" value="lk" /> <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" /> Modified: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-jcr-config-sjdbc.xml =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-jcr-config-sjdbc.xml 2011-03-31 12:04:39 UTC (rev 4194) +++ jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-jcr-config-sjdbc.xml 2011-03-31 12:14:39 UTC (rev 4195) @@ -75,7 +75,7 @@ <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" /> + <property name="infinispan-cl-cache.jdbc.table.name" value="lk" /> <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" /> @@ -130,7 +130,7 @@ <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" /> + <property name="infinispan-cl-cache.jdbc.table.name" value="lk" /> <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" /> @@ -185,7 +185,7 @@ <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" /> + <property name="infinispan-cl-cache.jdbc.table.name" value="lk" /> <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" /> @@ -262,7 +262,7 @@ <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" /> + <property name="infinispan-cl-cache.jdbc.table.name" value="lk" /> <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" /> @@ -325,7 +325,7 @@ <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" /> + <property name="infinispan-cl-cache.jdbc.table.name" value="lk" /> <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" /> @@ -378,7 +378,7 @@ <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" /> + <property name="infinispan-cl-cache.jdbc.table.name" value="lk" /> <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" /> @@ -451,7 +451,7 @@ <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" /> + <property name="infinispan-cl-cache.jdbc.table.name" value="lk" /> <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" /> @@ -512,7 +512,7 @@ <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" /> + <property name="infinispan-cl-cache.jdbc.table.name" value="lk" /> <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" /> @@ -576,7 +576,7 @@ <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" /> + <property name="infinispan-cl-cache.jdbc.table.name" value="lk" /> <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" /> Modified: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-jcr-config.xml =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-jcr-config.xml 2011-03-31 12:04:39 UTC (rev 4194) +++ jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-jcr-config.xml 2011-03-31 12:14:39 UTC (rev 4195) @@ -75,7 +75,7 @@ <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" /> + <property name="infinispan-cl-cache.jdbc.table.name" value="lk" /> <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" /> @@ -130,7 +130,7 @@ <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" /> + <property name="infinispan-cl-cache.jdbc.table.name" value="lk" /> <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" /> @@ -185,7 +185,7 @@ <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" /> + <property name="infinispan-cl-cache.jdbc.table.name" value="lk" /> <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" /> @@ -262,7 +262,7 @@ <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" /> + <property name="infinispan-cl-cache.jdbc.table.name" value="lk" /> <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" /> @@ -325,7 +325,7 @@ <properties> <property name="time-out" value="15m" /> <property name="infinispan-configuration" value="conf/standalone/test-infinispan-config.xml" /> - <property name="infinispan-cl-cache.jdbc.table.name" value="jcrlocks" /> + <property name="infinispan-cl-cache.jdbc.table.name" value="lk" /> <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" /> @@ -378,7 +378,7 @@ <properties> <property name="time-out" value="15m" /> <property name="infinispan-configuration" value="conf/standalone/test-infinispan-config.xml" /> - <property name="infinispan-cl-cache.jdbc.table.name" value="jcrlocks" /> + <property name="infinispan-cl-cache.jdbc.table.name" value="lk" /> <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" /> @@ -451,7 +451,7 @@ <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" /> + <property name="infinispan-cl-cache.jdbc.table.name" value="lk" /> <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" /> @@ -512,7 +512,7 @@ <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" /> + <property name="infinispan-cl-cache.jdbc.table.name" value="lk" /> <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" /> @@ -576,7 +576,7 @@ <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" /> + <property name="infinispan-cl-cache.jdbc.table.name" value="lk" /> <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" />