Author: nfilotto Date: 2010-09-15 11:19:22 -0400 (Wed, 15 Sep 2010) New Revision: 3115 Modified: jcr/trunk/exo.jcr.component.core/pom.xml jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/config/QueryHandlerParams.java 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/query/jbosscache/JBossCacheIndexChangesFilter.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/jbosscache/JBossCacheWorkspaceStorageCache.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/jbosscache/ExoJBossCacheFactory.java 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-942: The parameter jbosscache-shareable has been added in order to allow to activate or not the ability to share the JBoss Cache instance. In case the cache is not shareable, the cluster name is modified to add the workspace unique id after the given cluster name, this is needed to ensure that the same cluster name won't be used several times Modified: jcr/trunk/exo.jcr.component.core/pom.xml =================================================================== --- jcr/trunk/exo.jcr.component.core/pom.xml 2010-09-15 07:48:08 UTC (rev 3114) +++ jcr/trunk/exo.jcr.component.core/pom.xml 2010-09-15 15:19:22 UTC (rev 3115) @@ -31,6 +31,7 @@ <description>eXo JCR Service core component</description> <properties> <jcr.test.configuration.file>/conf/standalone/test-configuration.xml</jcr.test.configuration.file> + <jbosscache.shareable>true</jbosscache.shareable> </properties> <dependencies> <dependency> @@ -389,6 +390,10 @@ <name>emma.coverage.out.file</name> <value>target/emma/coverage.ec</value> </property> + <property> + <name>jbosscache-shareable</name> + <value>${jbosscache.shareable}</value> + </property> <!-- Uncomment the line below if you want to enable the statistics --> <!--property> <name>JDBCWorkspaceDataContainer.statistics.enabled</name> @@ -585,6 +590,10 @@ <value>target/emma/coverage.ec</value> </property> <property> + <name>jbosscache-shareable</name> + <value>${jbosscache.shareable}</value> + </property> + <property> <name>known.issues</name> <value>org.apache.jackrabbit.test.api.SetValueConstraintViolationExceptionTest#testBooleanProperty org.apache.jackrabbit.test.api.SetValueConstraintViolationExceptionTest#testMultipleBooleanProperty @@ -658,6 +667,10 @@ <value>target/emma/coverage.ec</value> </property> <property> + <name>jbosscache-shareable</name> + <value>${jbosscache.shareable}</value> + </property> + <property> <name>known.issues</name> <value>org.apache.jackrabbit.test.api.SetValueConstraintViolationExceptionTest#testBooleanProperty org.apache.jackrabbit.test.api.SetValueConstraintViolationExceptionTest#testMultipleBooleanProperty @@ -752,6 +765,10 @@ <name>jcr.test.configuration.file</name> <value>${jcr.test.configuration.file}</value> </property> + <property> + <name>jbosscache-shareable</name> + <value>${jbosscache.shareable}</value> + </property> <!-- Uncomment the line below if you want to enable the statistics --> <!--property> <name>JDBCWorkspaceDataContainer.statistics.enabled</name> Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/config/QueryHandlerParams.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/config/QueryHandlerParams.java 2010-09-15 07:48:08 UTC (rev 3114) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/config/QueryHandlerParams.java 2010-09-15 15:19:22 UTC (rev 3115) @@ -108,10 +108,4 @@ public static final String PARAM_ANALYZER_CLASS = "analyzer"; public static final String PARAM_CHANGES_FILTER_CLASS = "changesfilter-class"; - - public static final String PARAM_JBOSSCACHE_CONFIGURATION = "jbosscache-configuration"; - - public static final String PARAM_JBOSSCACHE_PUSHSTATE = "jbosscache-sscl-push.state.enabled"; - - public static final String PARAM_JBOSSCACHE_PUSHSTATE_TIMEOUT = "jbosscache-sscl-push.state.timeout"; } 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 2010-09-15 07:48:08 UTC (rev 3114) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/jbosscache/CacheableLockManagerImpl.java 2010-09-15 15:19:22 UTC (rev 3115) @@ -120,6 +120,13 @@ public static final String JBOSSCACHE_JDBC_CL_FQN_COLUMN = "jbosscache-cl-cache.jdbc.fqn.type"; + /** + * Indicate whether the JBoss Cache instance used can be shared with other caches + */ + public static final String JBOSSCACHE_SHAREABLE = "jbosscache-shareable"; + + public static final Boolean JBOSSCACHE_SHAREABLE_DEFAULT = Boolean.TRUE; + public static final String JBOSSCACHE_JDBC_CL_AUTO = "auto"; /** @@ -165,6 +172,8 @@ private Cache<Serializable, Object> cache; private final Fqn<String> lockRoot; + + private final boolean shareable; /** * SessionLockManagers that uses this LockManager. @@ -260,7 +269,11 @@ cache = factory.createCache(config.getLockManager()); Fqn<String> rootFqn = Fqn.fromElements(config.getUniqueName()); - cache = ExoJBossCacheFactory.getUniqueInstance(CacheType.LOCK_CACHE, rootFqn, cache); + + shareable = + config.getLockManager().getParameterBoolean(JBOSSCACHE_SHAREABLE, JBOSSCACHE_SHAREABLE_DEFAULT) + .booleanValue(); + cache = ExoJBossCacheFactory.getUniqueInstance(CacheType.LOCK_CACHE, rootFqn, cache, shareable); cache.create(); if (cache.getCacheStatus().startAllowed()) { @@ -817,8 +830,15 @@ lockRemover.halt(); lockRemover.interrupt(); sessionLockManagers.clear(); - // The cache cannot be stopped since it cans be shared so we evict the root node instead - cache.evict(lockRoot); + if (shareable) + { + // The cache cannot be stopped since it can be shared so we evict the root node instead + cache.evict(lockRoot); + } + else + { + PrivilegedCacheHelper.stop(cache); + } } /** Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/jbosscache/JBossCacheIndexChangesFilter.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/jbosscache/JBossCacheIndexChangesFilter.java 2010-09-15 07:48:08 UTC (rev 3114) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/jbosscache/JBossCacheIndexChangesFilter.java 2010-09-15 15:19:22 UTC (rev 3115) @@ -20,7 +20,6 @@ import org.exoplatform.container.configuration.ConfigurationManager; import org.exoplatform.services.jcr.config.QueryHandlerEntry; -import org.exoplatform.services.jcr.config.QueryHandlerParams; import org.exoplatform.services.jcr.config.RepositoryConfigurationException; import org.exoplatform.services.jcr.impl.core.query.IndexerChangesFilter; import org.exoplatform.services.jcr.impl.core.query.IndexerIoMode; @@ -63,6 +62,19 @@ */ private final Log log = ExoLogger.getLogger("exo.jcr.component.core.JBossCacheIndexChangesFilter"); + public static final String PARAM_JBOSSCACHE_CONFIGURATION = "jbosscache-configuration"; + + public static final String PARAM_JBOSSCACHE_PUSHSTATE = "jbosscache-sscl-push.state.enabled"; + + public static final String PARAM_JBOSSCACHE_PUSHSTATE_TIMEOUT = "jbosscache-sscl-push.state.timeout"; + + /** + * Indicate whether the JBoss Cache instance used can be shared with other caches + */ + public static final String PARAM_JBOSSCACHE_SHAREABLE = "jbosscache-shareable"; + + public static final Boolean PARAM_JBOSSCACHE_SHAREABLE_DEFAULT = Boolean.TRUE; + private final Cache<Serializable, Object> cache; private final Fqn<String> rootFqn; @@ -94,8 +106,8 @@ Properties singletonStoreProperties = new Properties(); // try to get pushState parameters, since they are set programmatically only - Boolean pushState = config.getParameterBoolean(QueryHandlerParams.PARAM_JBOSSCACHE_PUSHSTATE, false); - Long pushStateTimeOut = config.getParameterTime(QueryHandlerParams.PARAM_JBOSSCACHE_PUSHSTATE_TIMEOUT, 10000L); + Boolean pushState = config.getParameterBoolean(PARAM_JBOSSCACHE_PUSHSTATE, false); + Long pushStateTimeOut = config.getParameterTime(PARAM_JBOSSCACHE_PUSHSTATE_TIMEOUT, 10000L); singletonStoreProperties.setProperty("pushStateWhenCoordinator", pushState.toString()); singletonStoreProperties.setProperty("pushStateWhenCoordinatorTimeout", pushStateTimeOut.toString()); @@ -120,7 +132,9 @@ // insert CacheLoaderConfig initCache.getConfiguration().setCacheLoaderConfig(cacheLoaderConfig); this.rootFqn = Fqn.fromElements(searchManager.getWsId()); - this.cache = ExoJBossCacheFactory.getUniqueInstance(CacheType.INDEX_CACHE, rootFqn, initCache); + this.cache = + ExoJBossCacheFactory.getUniqueInstance(CacheType.INDEX_CACHE, rootFqn, initCache, config.getParameterBoolean( + PARAM_JBOSSCACHE_SHAREABLE, PARAM_JBOSSCACHE_SHAREABLE_DEFAULT)); this.cache.create(); this.cache.start(); Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/jbosscache/JBossCacheWorkspaceStorageCache.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/jbosscache/JBossCacheWorkspaceStorageCache.java 2010-09-15 07:48:08 UTC (rev 3114) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/jbosscache/JBossCacheWorkspaceStorageCache.java 2010-09-15 15:19:22 UTC (rev 3115) @@ -100,6 +100,13 @@ public static final String JBOSSCACHE_EXPIRATION = "jbosscache-expiration-time"; + /** + * Indicate whether the JBoss Cache instance used can be shared with other caches + */ + public static final String JBOSSCACHE_SHAREABLE = "jbosscache-shareable"; + + public static final Boolean JBOSSCACHE_SHAREABLE_DEFAULT = Boolean.TRUE; + public static final long JBOSSCACHE_EXPIRATION_DEFAULT = 900000; // 15 minutes public static final String ITEMS = "$ITEMS".intern(); @@ -309,7 +316,9 @@ } this.rootFqn = Fqn.fromElements(wsConfig.getUniqueName()); - parentCache = ExoJBossCacheFactory.getUniqueInstance(CacheType.JCR_CACHE, rootFqn, parentCache); + parentCache = + ExoJBossCacheFactory.getUniqueInstance(CacheType.JCR_CACHE, rootFqn, parentCache, wsConfig.getCache() + .getParameterBoolean(JBOSSCACHE_SHAREABLE, JBOSSCACHE_SHAREABLE_DEFAULT).booleanValue()); // if expiration is used, set appropriate factory with with timeout set via configuration (or default one 15minutes) this.cache = Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/jbosscache/ExoJBossCacheFactory.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/jbosscache/ExoJBossCacheFactory.java 2010-09-15 07:48:08 UTC (rev 3114) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/jbosscache/ExoJBossCacheFactory.java 2010-09-15 15:19:22 UTC (rev 3115) @@ -238,14 +238,23 @@ * @param cacheType The type of the target cache * @param rootFqn the rootFqn corresponding to root of the region * @param cache the cache to register + * @param shareable indicates whether the cache is shareable or not. * @return the given cache if has not been registered otherwise the cache of the same - * type that has already been registered + * type that has already been registered. If the cache is not sharable, the given cache + * will be returned. * @throws RepositoryConfigurationException */ @SuppressWarnings("unchecked") public static synchronized <K, V> Cache<K, V> getUniqueInstance(CacheType cacheType, Fqn<String> rootFqn, - Cache<K, V> cache) throws RepositoryConfigurationException + Cache<K, V> cache, boolean shareable) throws RepositoryConfigurationException { + if (!shareable) + { + // The cache is not shareable + // Avoid potential naming collision by changing the cluster name + cache.getConfiguration().setClusterName(cache.getConfiguration().getClusterName() + rootFqn.toString().replace('/', '-')); + return cache; + } ExoContainer container = ExoContainerContext.getCurrentContainer(); Map<CacheType, Map<ConfigurationKey, Cache>> allCacheTypes = CACHES.get(container); if (allCacheTypes == null) 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 2010-09-15 07:48:08 UTC (rev 3114) +++ jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jcr-config.xml 2010-09-15 15:19:22 UTC (rev 3115) @@ -52,6 +52,7 @@ <property name="jgroups-configuration" value="udp-mux.xml" /> <property name="jgroups-multiplexer-stack" value="false" /> <property name="jbosscache-cluster-name" value="JCR-cluster-data" /> + <property name="jbosscache-shareable" value="${jbosscache-shareable}" /> </properties> </cache> <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> @@ -63,6 +64,7 @@ <property name="jgroups-configuration" value="udp-mux.xml" /> <property name="jgroups-multiplexer-stack" value="false" /> <property name="jbosscache-cluster-name" value="JCR-cluster-indexer" /> + <property name="jbosscache-shareable" value="${jbosscache-shareable}" /> <property name="max-volatile-time" value="60" /> </properties> </query-handler> @@ -81,6 +83,7 @@ <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="jbosscache-shareable" value="${jbosscache-shareable}" /> </properties> </lock-manager> </workspace> @@ -113,6 +116,7 @@ <property name="jgroups-configuration" value="udp-mux.xml" /> <property name="jgroups-multiplexer-stack" value="false" /> <property name="jbosscache-cluster-name" value="JCR-cluster-data" /> + <property name="jbosscache-shareable" value="${jbosscache-shareable}" /> </properties> </cache> <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> @@ -124,6 +128,7 @@ <property name="jgroups-configuration" value="udp-mux.xml" /> <property name="jgroups-multiplexer-stack" value="false" /> <property name="jbosscache-cluster-name" value="JCR-cluster-indexer" /> + <property name="jbosscache-shareable" value="${jbosscache-shareable}" /> <property name="max-volatile-time" value="60" /> <property name="synonymprovider-class" @@ -152,6 +157,7 @@ <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="jbosscache-shareable" value="${jbosscache-shareable}" /> </properties> </lock-manager> </workspace> @@ -184,6 +190,7 @@ <property name="jgroups-configuration" value="udp-mux.xml" /> <property name="jgroups-multiplexer-stack" value="false" /> <property name="jbosscache-cluster-name" value="JCR-cluster-data" /> + <property name="jbosscache-shareable" value="${jbosscache-shareable}" /> </properties> </cache> <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> @@ -195,6 +202,7 @@ <property name="jgroups-configuration" value="udp-mux.xml" /> <property name="jgroups-multiplexer-stack" value="false" /> <property name="jbosscache-cluster-name" value="JCR-cluster-indexer" /> + <property name="jbosscache-shareable" value="${jbosscache-shareable}" /> <property name="max-volatile-time" value="60" /> <property name="synonymprovider-class" @@ -223,6 +231,7 @@ <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="jbosscache-shareable" value="${jbosscache-shareable}" /> </properties> </lock-manager> </workspace> @@ -269,6 +278,7 @@ <property name="jgroups-configuration" value="udp-mux.xml" /> <property name="jgroups-multiplexer-stack" value="false" /> <property name="jbosscache-cluster-name" value="JCR-cluster-data" /> + <property name="jbosscache-shareable" value="${jbosscache-shareable}" /> </properties> </cache> <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> @@ -280,8 +290,9 @@ <property name="jgroups-configuration" value="udp-mux.xml" /> <property name="jgroups-multiplexer-stack" value="false" /> <property name="jbosscache-cluster-name" value="JCR-cluster-indexer" /> + <property name="jbosscache-shareable" value="${jbosscache-shareable}" /> <property name="max-volatile-time" value="60" /> - + <property name="synonymprovider-class" value="org.exoplatform.services.jcr.impl.core.query.lucene.PropertiesSynonymProvider" /> <property name="synonymprovider-config-path" value="../../../synonyms.properties" /> @@ -308,6 +319,7 @@ <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="jbosscache-shareable" value="${jbosscache-shareable}" /> </properties> </lock-manager> </workspace> @@ -359,6 +371,7 @@ <property name="jgroups-configuration" value="udp-mux.xml" /> <property name="jgroups-multiplexer-stack" value="false" /> <property name="jbosscache-cluster-name" value="JCR-cluster-data" /> + <property name="jbosscache-shareable" value="${jbosscache-shareable}" /> </properties> </cache> <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> @@ -370,6 +383,7 @@ <property name="jgroups-configuration" value="udp-mux.xml" /> <property name="jgroups-multiplexer-stack" value="false" /> <property name="jbosscache-cluster-name" value="JCR-cluster-indexer" /> + <property name="jbosscache-shareable" value="${jbosscache-shareable}" /> <property name="max-volatile-time" value="60" /> <property name="synonymprovider-class" @@ -398,6 +412,7 @@ <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="jbosscache-shareable" value="${jbosscache-shareable}" /> </properties> </lock-manager> </workspace> @@ -437,6 +452,7 @@ <property name="jgroups-configuration" value="udp-mux.xml" /> <property name="jgroups-multiplexer-stack" value="false" /> <property name="jbosscache-cluster-name" value="JCR-cluster-data" /> + <property name="jbosscache-shareable" value="${jbosscache-shareable}" /> </properties> </cache> <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> @@ -448,6 +464,7 @@ <property name="jgroups-configuration" value="udp-mux.xml" /> <property name="jgroups-multiplexer-stack" value="false" /> <property name="jbosscache-cluster-name" value="JCR-cluster-indexer" /> + <property name="jbosscache-shareable" value="${jbosscache-shareable}" /> <property name="max-volatile-time" value="60" /> <property name="synonymprovider-class" value="org.exoplatform.services.jcr.impl.core.query.lucene.PropertiesSynonymProvider" /> @@ -474,6 +491,7 @@ <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="jbosscache-shareable" value="${jbosscache-shareable}" /> </properties> </lock-manager> </workspace> @@ -513,6 +531,7 @@ <property name="jgroups-configuration" value="udp-mux.xml" /> <property name="jgroups-multiplexer-stack" value="false" /> <property name="jbosscache-cluster-name" value="JCR-cluster-data" /> + <property name="jbosscache-shareable" value="${jbosscache-shareable}" /> </properties> </cache> <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> @@ -524,6 +543,7 @@ <property name="jgroups-configuration" value="udp-mux.xml" /> <property name="jgroups-multiplexer-stack" value="false" /> <property name="jbosscache-cluster-name" value="JCR-cluster-indexer" /> + <property name="jbosscache-shareable" value="${jbosscache-shareable}" /> <property name="max-volatile-time" value="60" /> <property name="synonymprovider-class" value="org.exoplatform.services.jcr.impl.core.query.lucene.PropertiesSynonymProvider" /> @@ -553,6 +573,7 @@ <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="jbosscache-shareable" value="${jbosscache-shareable}" /> </properties> </lock-manager> </workspace> 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 2010-09-15 07:48:08 UTC (rev 3114) +++ jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-jcr-config-sjdbc.xml 2010-09-15 15:19:22 UTC (rev 3115) @@ -68,6 +68,7 @@ <cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache"> <properties> <property name="jbosscache-configuration" value="conf/standalone/test-jbosscache-config.xml" /> + <property name="jbosscache-shareable" value="${jbosscache-shareable}" /> </properties> </cache> <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> @@ -90,6 +91,7 @@ <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="jbosscache-shareable" value="${jbosscache-shareable}" /> </properties> </lock-manager> </workspace> @@ -118,6 +120,7 @@ <cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache"> <properties> <property name="jbosscache-configuration" value="conf/standalone/test-jbosscache-config.xml" /> + <property name="jbosscache-shareable" value="${jbosscache-shareable}" /> </properties> </cache> <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> @@ -143,6 +146,7 @@ <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="jbosscache-shareable" value="${jbosscache-shareable}" /> </properties> </lock-manager> </workspace> @@ -171,6 +175,7 @@ <cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache"> <properties> <property name="jbosscache-configuration" value="conf/standalone/test-jbosscache-config.xml" /> + <property name="jbosscache-shareable" value="${jbosscache-shareable}" /> </properties> </cache> <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> @@ -196,6 +201,7 @@ <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="jbosscache-shareable" value="${jbosscache-shareable}" /> </properties> </lock-manager> </workspace> @@ -251,6 +257,7 @@ <cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache"> <properties> <property name="jbosscache-configuration" value="conf/standalone/test-jbosscache-config.xml" /> + <property name="jbosscache-shareable" value="${jbosscache-shareable}" /> </properties> </cache> <query-handler @@ -280,6 +287,7 @@ <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="jbosscache-shareable" value="${jbosscache-shareable}" /> </properties> </lock-manager> @@ -325,6 +333,7 @@ <cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache"> <properties> <property name="jbosscache-configuration" value="conf/standalone/test-jbosscache-config.xml" /> + <property name="jbosscache-shareable" value="${jbosscache-shareable}" /> </properties> </cache> <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> @@ -351,6 +360,7 @@ <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="jbosscache-shareable" value="${jbosscache-shareable}" /> </properties> </lock-manager> </workspace> @@ -385,6 +395,7 @@ <cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache"> <properties> <property name="jbosscache-configuration" value="conf/standalone/test-jbosscache-config.xml" /> + <property name="jbosscache-shareable" value="${jbosscache-shareable}" /> </properties> </cache> <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> @@ -410,6 +421,7 @@ <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="jbosscache-shareable" value="${jbosscache-shareable}" /> </properties> </lock-manager> </workspace> @@ -444,6 +456,7 @@ <cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache"> <properties> <property name="jbosscache-configuration" value="conf/standalone/test-jbosscache-config.xml" /> + <property name="jbosscache-shareable" value="${jbosscache-shareable}" /> </properties> </cache> <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> @@ -472,6 +485,7 @@ <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="jbosscache-shareable" value="${jbosscache-shareable}" /> </properties> </lock-manager> </workspace> 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 2010-09-15 07:48:08 UTC (rev 3114) +++ jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-jcr-config.xml 2010-09-15 15:19:22 UTC (rev 3115) @@ -68,6 +68,7 @@ <cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache"> <properties> <property name="jbosscache-configuration" value="conf/standalone/test-jbosscache-config.xml" /> + <property name="jbosscache-shareable" value="${jbosscache-shareable}" /> </properties> </cache> <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> @@ -90,6 +91,7 @@ <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="jbosscache-shareable" value="${jbosscache-shareable}" /> </properties> </lock-manager> </workspace> @@ -118,6 +120,7 @@ <cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache"> <properties> <property name="jbosscache-configuration" value="conf/standalone/test-jbosscache-config.xml" /> + <property name="jbosscache-shareable" value="${jbosscache-shareable}" /> </properties> </cache> <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> @@ -143,6 +146,7 @@ <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="jbosscache-shareable" value="${jbosscache-shareable}" /> </properties> </lock-manager> </workspace> @@ -171,6 +175,7 @@ <cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache"> <properties> <property name="jbosscache-configuration" value="conf/standalone/test-jbosscache-config.xml" /> + <property name="jbosscache-shareable" value="${jbosscache-shareable}" /> </properties> </cache> <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> @@ -196,6 +201,7 @@ <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="jbosscache-shareable" value="${jbosscache-shareable}" /> </properties> </lock-manager> </workspace> @@ -251,6 +257,7 @@ <cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache"> <properties> <property name="jbosscache-configuration" value="conf/standalone/test-jbosscache-config.xml" /> + <property name="jbosscache-shareable" value="${jbosscache-shareable}" /> </properties> </cache> <query-handler @@ -280,6 +287,7 @@ <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" /> + <property name="jbosscache-shareable" value="${jbosscache-shareable}" /> </properties> </lock-manager> @@ -325,6 +333,7 @@ <cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache"> <properties> <property name="jbosscache-configuration" value="conf/standalone/test-jbosscache-config.xml" /> + <property name="jbosscache-shareable" value="${jbosscache-shareable}" /> </properties> </cache> <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> @@ -351,6 +360,7 @@ <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="jbosscache-shareable" value="${jbosscache-shareable}" /> </properties> </lock-manager> </workspace> @@ -385,6 +395,7 @@ <cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache"> <properties> <property name="jbosscache-configuration" value="conf/standalone/test-jbosscache-config.xml" /> + <property name="jbosscache-shareable" value="${jbosscache-shareable}" /> </properties> </cache> <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> @@ -410,6 +421,7 @@ <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="jbosscache-shareable" value="${jbosscache-shareable}" /> </properties> </lock-manager> </workspace> @@ -444,6 +456,7 @@ <cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache"> <properties> <property name="jbosscache-configuration" value="conf/standalone/test-jbosscache-config.xml" /> + <property name="jbosscache-shareable" value="${jbosscache-shareable}" /> </properties> </cache> <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> @@ -472,6 +485,7 @@ <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="jbosscache-shareable" value="${jbosscache-shareable}" /> </properties> </lock-manager> </workspace>