Author: julien_viet Date: 2010-02-15 17:11:13 -0500 (Mon, 15 Feb 2010) New Revision: 1719 Modified: portal/trunk/component/common/src/main/java/conf/configuration-jboss.properties portal/trunk/component/common/src/main/java/conf/configuration-tomcat.properties portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/jcr/repository-configuration.xml portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/jcr/repository-configuration.xml portal/trunk/pom.xml portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/repository-configuration.xml Log: - upgrade to MOP 1.0.0-CR02 - improve JCR configuration - fixes a couple of prb in configration property file Modified: portal/trunk/component/common/src/main/java/conf/configuration-jboss.properties =================================================================== --- portal/trunk/component/common/src/main/java/conf/configuration-jboss.properties 2010-02-15 21:51:01 UTC (rev 1718) +++ portal/trunk/component/common/src/main/java/conf/configuration-jboss.properties 2010-02-15 22:11:13 UTC (rev 1719) @@ -35,7 +35,7 @@ gatein.jcr.data.dir=${gatein.data.dir}/jcr gatein.jcr.storage.data.dir=${gatein.jcr.data.dir}/values -gatein.jcr.index.data.dir=${gatein.jcr.data.dir}/jcrlucenedb +gatein.jcr.index.data.dir=${gatein.jcr.data.dir}/lucene gatein.jcr.index.changefilterclass=org.exoplatform.services.jcr.impl.core.query.DefaultChangesFilter # IDM Modified: portal/trunk/component/common/src/main/java/conf/configuration-tomcat.properties =================================================================== --- portal/trunk/component/common/src/main/java/conf/configuration-tomcat.properties 2010-02-15 21:51:01 UTC (rev 1718) +++ portal/trunk/component/common/src/main/java/conf/configuration-tomcat.properties 2010-02-15 22:11:13 UTC (rev 1719) @@ -28,21 +28,21 @@ gatein.jcr.datasource.name=jdbcjcr gatein.jcr.datasource.dialect=auto -gatein.jcr.datasource.url=jdbc:hsqldb:file:${gatein.db.data.dir}/data/jdbcjcr${container.name.suffix} +gatein.jcr.datasource.url=jdbc:hsqldb:file:${gatein.db.data.dir}/data/jdbcjcr gatein.jcr.datasource.username=sa gatein.jcr.datasource.password= gatein.jcr.datasource.driver=org.hsqldb.jdbcDriver gatein.jcr.data.dir=${gatein.data.dir}/jcr gatein.jcr.storage.data.dir=${gatein.jcr.data.dir}/values -gatein.jcr.index.data.dir=${gatein.jcr.data.dir}/jcrlucenedb +gatein.jcr.index.data.dir=${gatein.jcr.data.dir}/lucene gatein.jcr.index.changefilterclass=org.exoplatform.services.jcr.impl.core.query.DefaultChangesFilter # IDM gatein.idm.datasource.name=jdbcidm gatein.idm.datasource.dialect=org.hibernate.dialect.HSQLDialect -gatein.jcr.datasource.url=jdbc:hsqldb:file:${gatein.db.data.dir}/data/jdbcidm${container.name.suffix} -gatein.jcr.datasource.username=sa -gatein.jcr.datasource.password= -gatein.jcr.datasource.driver=org.hsqldb.jdbcDriver +gatein.idm.datasource.url=jdbc:hsqldb:file:${gatein.db.data.dir}/data/jdbcidm +gatein.idm.datasource.username=sa +gatein.idm.datasource.password= +gatein.idm.datasource.driver=org.hsqldb.jdbcDriver Modified: portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/jcr/repository-configuration.xml =================================================================== --- portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/jcr/repository-configuration.xml 2010-02-15 21:51:01 UTC (rev 1718) +++ portal/trunk/examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/jcr/repository-configuration.xml 2010-02-15 22:11:13 UTC (rev 1719) @@ -27,10 +27,10 @@ <authentication-policy>org.exoplatform.services.jcr.impl.core.access.JAASAuthenticator</authentication-policy> <workspaces> <workspace name="sample-ws"> - <container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer"> + <container class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer"> <properties> <property name="source-name" value="${gatein.jcr.datasource.name}${container.name.suffix}" /> - <property name="dialect" value="hsqldb" /> + <property name="dialect" value="auto" /> <property name="multi-db" value="false" /> <property name="update-storage" value="true" /> <property name="max-buffer-size" value="204800" /> @@ -50,29 +50,45 @@ <initializer class="org.exoplatform.services.jcr.impl.core.ScratchWorkspaceInitializer"> <properties> <property name="root-nodetype" value="nt:unstructured" /> - <property name="root-permissions" - value="any read;*:/platform/administrators read;*:/platform/administrators add_node;*:/platform/administrators set_property;*:/platform/administrators remove" /> + <property name="root-permissions" value="any read;*:/platform/administrators read;*:/platform/administrators add_node;*:/platform/administrators set_property;*:/platform/administrators remove" /> </properties> </initializer> - <cache enabled="true"> - <properties> - <property name="max-size" value="20000" /> - <property name="live-time" value="30000" /> - </properties> - </cache> - <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> - <properties> - <property name="index-dir" value="${gatein.jcr.index.data.dir}/sample-ws${container.name.suffix}" /> - </properties> - </query-handler> - <lock-manager> - <time-out>15m</time-out><!-- 15min --> - <persister class="org.exoplatform.services.jcr.impl.core.lock.FileSystemLockPersister"> - <properties> - <property name="path" value="${gatein.jcr.data.dir}/lock/sample-ws${container.name.suffix}" /> - </properties> - </persister> - </lock-manager> + <cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache"> + <properties> + <property name="jbosscache-configuration" value="conf/jcr/jbosscache/${gatein.jcr.config.type}/config.xml" /> + <property name="jgroups-configuration" value="jar:/conf/jcr/jbosscache/cluster/udp-mux.xml" /> + <property name="jgroups-multiplexer-stack" value="true" /> + <property name="jbosscache-cluster-name" value="jcr-${container.name.suffix}-sample-ws" /> + </properties> + </cache> + <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> + <properties> + <property name="index-dir" value="${gatein.jcr.index.data.dir}/sample-ws${container.name.suffix}"/> + <property name="changesfilter-class" value="${gatein.jcr.index.changefilterclass}" /> + <property name="jbosscache-configuration" value="conf/jcr/jbosscache/cluster/indexer-config.xml" /> + <property name="jgroups-configuration" value="jar:/conf/jcr/jbosscache/cluster/udp-mux.xml" /> + <property name="jgroups-multiplexer-stack" value="true" /> + <property name="jbosscache-cluster-name" value="jcrindexer-${container.name.suffix}-sample-ws" /> + <property name="max-volatile-time" value="60" /> + </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/jcr/jbosscache/${gatein.jcr.config.type}/lock-config.xml" /> + <property name="jgroups-configuration" value="jar:/conf/jcr/jbosscache/cluster/udp-mux.xml" /> + <property name="jgroups-multiplexer-stack" value="true" /> + <property name="jbosscache-cluster-name" value="jcrlock-${container.name.suffix}-sample-ws" /> + <property name="jbosscache-cl-cache.jdbc.table.name" value="jcrlock_sample_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="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="${gatein.jcr.datasource.name}${container.name.suffix}" /> + </properties> + </lock-manager> </workspace> </workspaces> </repository> Modified: portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/jcr/repository-configuration.xml =================================================================== --- portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/jcr/repository-configuration.xml 2010-02-15 21:51:01 UTC (rev 1718) +++ portal/trunk/examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/jcr/repository-configuration.xml 2010-02-15 22:11:13 UTC (rev 1719) @@ -27,10 +27,10 @@ <authentication-policy>org.exoplatform.services.jcr.impl.core.access.JAASAuthenticator</authentication-policy> <workspaces> <workspace name="sample-ws"> - <container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer"> + <container class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer"> <properties> <property name="source-name" value="${gatein.jcr.datasource.name}${container.name.suffix}" /> - <property name="dialect" value="hsqldb" /> + <property name="dialect" value="auto" /> <property name="multi-db" value="false" /> <property name="update-storage" value="true" /> <property name="max-buffer-size" value="204800" /> @@ -50,29 +50,45 @@ <initializer class="org.exoplatform.services.jcr.impl.core.ScratchWorkspaceInitializer"> <properties> <property name="root-nodetype" value="nt:unstructured" /> - <property name="root-permissions" - value="any read;*:/platform/administrators read;*:/platform/administrators add_node;*:/platform/administrators set_property;*:/platform/administrators remove" /> + <property name="root-permissions" value="any read;*:/platform/administrators read;*:/platform/administrators add_node;*:/platform/administrators set_property;*:/platform/administrators remove" /> </properties> </initializer> - <cache enabled="true"> - <properties> - <property name="max-size" value="20000" /> - <property name="live-time" value="30000" /> - </properties> - </cache> - <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> - <properties> - <property name="index-dir" value="${gatein.jcr.index.data.dir}/sample-ws${container.name.suffix}" /> - </properties> - </query-handler> - <lock-manager> - <time-out>15m</time-out><!-- 15min --> - <persister class="org.exoplatform.services.jcr.impl.core.lock.FileSystemLockPersister"> - <properties> - <property name="path" value="${gatein.jcr.data.dir}/lock/sample-ws${container.name.suffix}" /> - </properties> - </persister> - </lock-manager> + <cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache"> + <properties> + <property name="jbosscache-configuration" value="conf/jcr/jbosscache/${gatein.jcr.config.type}/config.xml" /> + <property name="jgroups-configuration" value="jar:/conf/jcr/jbosscache/cluster/udp-mux.xml" /> + <property name="jgroups-multiplexer-stack" value="true" /> + <property name="jbosscache-cluster-name" value="jcr-${container.name.suffix}-sample-ws" /> + </properties> + </cache> + <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> + <properties> + <property name="index-dir" value="${gatein.jcr.index.data.dir}/sample-ws${container.name.suffix}"/> + <property name="changesfilter-class" value="${gatein.jcr.index.changefilterclass}" /> + <property name="jbosscache-configuration" value="conf/jcr/jbosscache/cluster/indexer-config.xml" /> + <property name="jgroups-configuration" value="jar:/conf/jcr/jbosscache/cluster/udp-mux.xml" /> + <property name="jgroups-multiplexer-stack" value="true" /> + <property name="jbosscache-cluster-name" value="jcrindexer-${container.name.suffix}-sample-ws" /> + <property name="max-volatile-time" value="60" /> + </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/jcr/jbosscache/${gatein.jcr.config.type}/lock-config.xml" /> + <property name="jgroups-configuration" value="jar:/conf/jcr/jbosscache/cluster/udp-mux.xml" /> + <property name="jgroups-multiplexer-stack" value="true" /> + <property name="jbosscache-cluster-name" value="jcrlock-${container.name.suffix}-sample-ws" /> + <property name="jbosscache-cl-cache.jdbc.table.name" value="jcrlock_sample_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="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="${gatein.jcr.datasource.name}${container.name.suffix}" /> + </properties> + </lock-manager> </workspace> </workspaces> </repository> Modified: portal/trunk/pom.xml =================================================================== --- portal/trunk/pom.xml 2010-02-15 21:51:01 UTC (rev 1718) +++ portal/trunk/pom.xml 2010-02-15 22:11:13 UTC (rev 1719) @@ -49,7 +49,7 @@ <org.gatein.pc.version>2.1.0-CR02</org.gatein.pc.version> <org.picketlink.idm>1.1.0.Beta5</org.picketlink.idm> <org.gatein.wsrp.version>1.0.0-Beta07</org.gatein.wsrp.version> - <org.gatein.mop.version>1.0.0-CR01</org.gatein.mop.version> + <org.gatein.mop.version>1.0.0-CR02</org.gatein.mop.version> <org.slf4j.version>1.5.6</org.slf4j.version> <rhino.version>1.6R5</rhino.version> <org.codehaus.groovy.version>1.6.5</org.codehaus.groovy.version> Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/repository-configuration.xml =================================================================== --- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/repository-configuration.xml 2010-02-15 21:51:01 UTC (rev 1718) +++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/repository-configuration.xml 2010-02-15 22:11:13 UTC (rev 1719) @@ -60,7 +60,7 @@ <property name="jbosscache-configuration" value="conf/jcr/jbosscache/${gatein.jcr.config.type}/config.xml" /> <property name="jgroups-configuration" value="jar:/conf/jcr/jbosscache/cluster/udp-mux.xml" /> <property name="jgroups-multiplexer-stack" value="true" /> - <property name="jbosscache-cluster-name" value="JCR-cluster-repository-system" /> + <property name="jbosscache-cluster-name" value="jcr-${container.name.suffix}-system" /> </properties> </cache> <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> @@ -70,7 +70,7 @@ <property name="jbosscache-configuration" value="conf/jcr/jbosscache/cluster/indexer-config.xml" /> <property name="jgroups-configuration" value="jar:/conf/jcr/jbosscache/cluster/udp-mux.xml" /> <property name="jgroups-multiplexer-stack" value="true" /> - <property name="jbosscache-cluster-name" value="JCR-cluster-indexer-repository-system" /> + <property name="jbosscache-cluster-name" value="jcrindexer-${container.name.suffix}-system" /> <property name="max-volatile-time" value="60" /> </properties> </query-handler> @@ -80,11 +80,11 @@ <property name="jbosscache-configuration" value="conf/jcr/jbosscache/${gatein.jcr.config.type}/lock-config.xml" /> <property name="jgroups-configuration" value="jar:/conf/jcr/jbosscache/cluster/udp-mux.xml" /> <property name="jgroups-multiplexer-stack" value="true" /> - <property name="jbosscache-cluster-name" value="JCR-cluster-locks-repository-system" /> - <property name="jbosscache-cl-cache.jdbc.table.name" value="jcrlocks_repository_system" /> + <property name="jbosscache-cluster-name" value="jcrlock-${container.name.suffix}-system" /> + <property name="jbosscache-cl-cache.jdbc.table.name" value="jcrlock_system" /> <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_repositoty_system_pk" /> + <property name="jbosscache-cl-cache.jdbc.table.primarykey" value="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" /> @@ -126,7 +126,7 @@ <property name="jbosscache-configuration" value="conf/jcr/jbosscache/${gatein.jcr.config.type}/config.xml" /> <property name="jgroups-configuration" value="jar:/conf/jcr/jbosscache/cluster/udp-mux.xml" /> <property name="jgroups-multiplexer-stack" value="true" /> - <property name="jbosscache-cluster-name" value="JCR-cluster-repository-portal-system" /> + <property name="jbosscache-cluster-name" value="jcr-${container.name.suffix}-portal-system" /> </properties> </cache> <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> @@ -136,7 +136,7 @@ <property name="jbosscache-configuration" value="conf/jcr/jbosscache/cluster/indexer-config.xml" /> <property name="jgroups-configuration" value="jar:/conf/jcr/jbosscache/cluster/udp-mux.xml" /> <property name="jgroups-multiplexer-stack" value="true" /> - <property name="jbosscache-cluster-name" value="JCR-cluster-indexer-repository-portal-system" /> + <property name="jbosscache-cluster-name" value="jcrindexer-${container.name.suffix}-portal-system" /> <property name="max-volatile-time" value="60" /> </properties> </query-handler> @@ -146,11 +146,11 @@ <property name="jbosscache-configuration" value="conf/jcr/jbosscache/${gatein.jcr.config.type}/lock-config.xml" /> <property name="jgroups-configuration" value="jar:/conf/jcr/jbosscache/cluster/udp-mux.xml" /> <property name="jgroups-multiplexer-stack" value="true" /> - <property name="jbosscache-cluster-name" value="JCR-cluster-locks-repository-system" /> - <property name="jbosscache-cl-cache.jdbc.table.name" value="jcrlocks_repository_portal_system" /> + <property name="jbosscache-cluster-name" value="jcrlock-${container.name.suffix}-system" /> + <property name="jbosscache-cl-cache.jdbc.table.name" value="jcrlock_portal_system" /> <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_repositoty_portal_system_pk" /> + <property name="jbosscache-cl-cache.jdbc.table.primarykey" value="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" /> @@ -192,7 +192,7 @@ <property name="jbosscache-configuration" value="conf/jcr/jbosscache/${gatein.jcr.config.type}/config.xml" /> <property name="jgroups-configuration" value="jar:/conf/jcr/jbosscache/cluster/udp-mux.xml" /> <property name="jgroups-multiplexer-stack" value="true" /> - <property name="jbosscache-cluster-name" value="JCR-cluster-repository-portal-work" /> + <property name="jbosscache-cluster-name" value="jcr-${container.name.suffix}-portal-work" /> </properties> </cache> <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> @@ -202,7 +202,7 @@ <property name="jbosscache-configuration" value="conf/jcr/jbosscache/cluster/indexer-config.xml" /> <property name="jgroups-configuration" value="jar:/conf/jcr/jbosscache/cluster/udp-mux.xml" /> <property name="jgroups-multiplexer-stack" value="true" /> - <property name="jbosscache-cluster-name" value="JCR-cluster-indexer-repository-portal-work" /> + <property name="jbosscache-cluster-name" value="jcrindexer-${container.name.suffix}-portal-work" /> <property name="max-volatile-time" value="60" /> </properties> </query-handler> @@ -212,11 +212,11 @@ <property name="jbosscache-configuration" value="conf/jcr/jbosscache/${gatein.jcr.config.type}/lock-config.xml" /> <property name="jgroups-configuration" value="jar:/conf/jcr/jbosscache/cluster/udp-mux.xml" /> <property name="jgroups-multiplexer-stack" value="true" /> - <property name="jbosscache-cluster-name" value="JCR-cluster-locks-repository-system" /> - <property name="jbosscache-cl-cache.jdbc.table.name" value="jcrlocks_repository_portal_work" /> + <property name="jbosscache-cluster-name" value="jcrlock-${container.name.suffix}-system" /> + <property name="jbosscache-cl-cache.jdbc.table.name" value="jcrlock_portal_work" /> <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_repositoty_portal_work_pk" /> + <property name="jbosscache-cl-cache.jdbc.table.primarykey" value="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" /> @@ -259,7 +259,7 @@ <property name="jbosscache-configuration" value="conf/jcr/jbosscache/${gatein.jcr.config.type}/config.xml" /> <property name="jgroups-configuration" value="jar:/conf/jcr/jbosscache/cluster/udp-mux.xml" /> <property name="jgroups-multiplexer-stack" value="true" /> - <property name="jbosscache-cluster-name" value="JCR-cluster-repository-wsrp-system" /> + <property name="jbosscache-cluster-name" value="jcr-${container.name.suffix}-wsrp-system" /> </properties> </cache> <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> @@ -269,7 +269,7 @@ <property name="jbosscache-configuration" value="conf/jcr/jbosscache/cluster/indexer-config.xml" /> <property name="jgroups-configuration" value="jar:/conf/jcr/jbosscache/cluster/udp-mux.xml" /> <property name="jgroups-multiplexer-stack" value="true" /> - <property name="jbosscache-cluster-name" value="JCR-cluster-indexer-repository-wsrp-system" /> + <property name="jbosscache-cluster-name" value="jcrindexer-${container.name.suffix}-wsrp-system" /> <property name="max-volatile-time" value="60" /> </properties> </query-handler> @@ -279,11 +279,11 @@ <property name="jbosscache-configuration" value="conf/jcr/jbosscache/${gatein.jcr.config.type}/lock-config.xml" /> <property name="jgroups-configuration" value="jar:/conf/jcr/jbosscache/cluster/udp-mux.xml" /> <property name="jgroups-multiplexer-stack" value="true" /> - <property name="jbosscache-cluster-namejbosscache-cluster-name" value="JCR-cluster-locks-repository-system" /> - <property name="jbosscache-cl-cache.jdbc.table.name" value="jcrlocks_wsrp_system_system" /> + <property name="jbosscache-cluster-namejbosscache-cluster-name" value="jcrlock-${container.name.suffix}-system" /> + <property name="jbosscache-cl-cache.jdbc.table.name" value="jcrlock_wsrp_system" /> <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_repositoty_wsrp_system_pk" /> + <property name="jbosscache-cl-cache.jdbc.table.primarykey" value="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" />