Author: nzamosenchuk Date: 2011-03-03 10:34:52 -0500 (Thu, 03 Mar 2011) New Revision: 4052 Added: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-jbosscache-indexer.xml Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/ispn/ISPNIndexChangesFilter.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/ispn/IndexerCacheStore.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/jbosscache/IndexerCacheLoader.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/test/resources/conf/standalone/test-jcr-config-jbc.xml jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-jcr-config-sjdbc-jbc.xml Log: EXOJCR-833 : Fixed QueryHandler configuration and Index startup when JBC implementation used in non-clustered environment Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/ispn/ISPNIndexChangesFilter.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/ispn/ISPNIndexChangesFilter.java 2011-03-03 15:27:43 UTC (rev 4051) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/ispn/ISPNIndexChangesFilter.java 2011-03-03 15:34:52 UTC (rev 4052) @@ -91,12 +91,6 @@ cache.getAdvancedCache().getComponentRegistry().getComponent(CacheLoaderManager.class); IndexerCacheStore cacheStore = (IndexerCacheStore)cacheLoaderManager.getCacheLoader(); - // This code make it possible to use the ISPNIndexChangesFilter in a non-cluster environment - if (cache.getConfiguration().getCacheMode() == CacheMode.LOCAL) - { - cacheStore.activeStatusChanged(true); - } - cacheStore.register(searchManager, parentSearchManager, handler, parentHandler); IndexerIoModeHandler modeHandler = cacheStore.getModeHandler(); handler.setIndexerIoModeHandler(modeHandler); Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/ispn/IndexerCacheStore.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/ispn/IndexerCacheStore.java 2011-03-03 15:27:43 UTC (rev 4051) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/ispn/IndexerCacheStore.java 2011-03-03 15:34:52 UTC (rev 4052) @@ -23,6 +23,7 @@ import org.exoplatform.services.jcr.impl.core.query.jbosscache.ChangesFilterListsWrapper; import org.exoplatform.services.jcr.util.IdGenerator; import org.infinispan.Cache; +import org.infinispan.config.Configuration.CacheMode; import org.infinispan.container.DataContainer; import org.infinispan.container.entries.InternalCacheEntry; import org.infinispan.lifecycle.ComponentStatus; @@ -100,7 +101,8 @@ if (modeHandler == null) { this.modeHandler = - new IndexerIoModeHandler(cacheManager.isCoordinator() ? IndexerIoMode.READ_WRITE + new IndexerIoModeHandler(cacheManager.isCoordinator() + || cache.getConfiguration().getCacheMode() == CacheMode.LOCAL ? IndexerIoMode.READ_WRITE : IndexerIoMode.READ_ONLY); } } @@ -143,11 +145,8 @@ { coordinator = newActiveState; - if (modeHandler != null) - { - modeHandler.setMode(coordinator ? IndexerIoMode.READ_WRITE : IndexerIoMode.READ_ONLY); - log.info("Set indexer io mode to:" + (coordinator ? IndexerIoMode.READ_WRITE : IndexerIoMode.READ_ONLY)); - } + getModeHandler().setMode(coordinator ? IndexerIoMode.READ_WRITE : IndexerIoMode.READ_ONLY); + log.info("Set indexer io mode to:" + (coordinator ? IndexerIoMode.READ_WRITE : IndexerIoMode.READ_ONLY)); if (coordinator) { Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/jbosscache/IndexerCacheLoader.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/jbosscache/IndexerCacheLoader.java 2011-03-03 15:27:43 UTC (rev 4051) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/jbosscache/IndexerCacheLoader.java 2011-03-03 15:34:52 UTC (rev 4052) @@ -28,6 +28,7 @@ import org.jboss.cache.CacheStatus; import org.jboss.cache.Fqn; import org.jboss.cache.Modification; +import org.jboss.cache.config.Configuration.CacheMode; import java.util.HashMap; import java.util.List; @@ -156,10 +157,7 @@ */ void setMode(IndexerIoMode ioMode) { - if (modeHandler != null) - { - modeHandler.setMode(ioMode); - } + getModeHandler().setMode(ioMode); } /** @@ -179,7 +177,8 @@ if (modeHandler == null) { this.modeHandler = - new IndexerIoModeHandler(cache.getRPCManager().isCoordinator() ? IndexerIoMode.READ_WRITE + new IndexerIoModeHandler(cache.getRPCManager().isCoordinator() + || cache.getConfiguration().getCacheMode() == CacheMode.LOCAL ? IndexerIoMode.READ_WRITE : IndexerIoMode.READ_ONLY); } } 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 2011-03-03 15:27:43 UTC (rev 4051) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/jbosscache/JBossCacheIndexChangesFilter.java 2011-03-03 15:34:52 UTC (rev 4052) @@ -148,20 +148,6 @@ IndexerSingletonStoreCacheLoader issCacheLoader = (IndexerSingletonStoreCacheLoader)((CacheSPI)cache).getCacheLoaderManager().getCacheLoader(); - // This code make it possible to use the JBossCacheIndexChangesFilter in - // a non-cluster environment - if (cache.getConfiguration().getCacheMode() == CacheMode.LOCAL) - { - // Activate the cache loader - try - { - issCacheLoader.activeStatusChanged(true); - } - catch (PushStateException e) - { - // ignore me; - } - } indexerCacheLoader = (IndexerCacheLoader)issCacheLoader.getCacheLoader(); indexerCacheLoader.register(searchManager, parentSearchManager, handler, parentHandler); Added: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-jbosscache-indexer.xml =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-jbosscache-indexer.xml (rev 0) +++ jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-jbosscache-indexer.xml 2011-03-03 15:34:52 UTC (rev 4052) @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:jboss:jbosscache-core:config:3.1"> + + <locking useLockStriping="false" concurrencyLevel="500" lockParentForChildInsertRemove="false" + lockAcquisitionTimeout="20000" /> + <!-- Configure the TransactionManager --> + <transaction transactionManagerLookupClass="org.jboss.cache.transaction.JBossStandaloneJTAManagerLookup" /> + + <!-- Eviction configuration --> + <eviction wakeUpInterval="5000"> + <default algorithmClass="org.jboss.cache.eviction.FIFOAlgorithm" eventQueueSize="1000000"> + <property name="maxNodes" value="10000" /> + <property name="minTimeToLive" value="60000" /> + </default> + </eviction> + +</jbosscache> Property changes on: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-jbosscache-indexer.xml ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-jcr-config-jbc.xml =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-jcr-config-jbc.xml 2011-03-03 15:27:43 UTC (rev 4051) +++ jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-jcr-config-jbc.xml 2011-03-03 15:34:52 UTC (rev 4052) @@ -40,11 +40,13 @@ <property name="swap-directory" value="target/temp/swap/ws" /> </properties> <value-storages> - <value-storage id="ws" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> + <value-storage id="ws" + class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> <properties> <property name="path" value="target/temp/values/ws" /> <property name="digest-algo" value="MD5" /> - <property name="vcas-type" value="org.exoplatform.services.jcr.impl.storage.value.cas.JDBCValueContentAddressStorageImpl" /> + <property name="vcas-type" + value="org.exoplatform.services.jcr.impl.storage.value.cas.JDBCValueContentAddressStorageImpl" /> <property name="jdbc-source-name" value="jdbcjcr" /> <property name="jdbc-dialect" value="auto" /> </properties> @@ -59,25 +61,20 @@ <property name="root-nodetype" value="nt:unstructured" /> </properties> </initializer> - <!-- initializer class="org.exoplatform.services.jcr.impl.core.RestoreWorkspaceInitializer"> + <cache enabled="true" + class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache"> <properties> - <property name="restore-path" value="./sv_export_root.xml" /> - <property name="restore-path" value="./src/test/resources/import-export/restore_db1_ws1.xml" /> - </properties> - </initializer --> - <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}" /> + <property name="jbosscache-shareable" value="${jbosscache-shareable}" /> </properties> </cache> - <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> - <properties> + <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> + <properties> + <property name="changesfilter-class" + value="org.exoplatform.services.jcr.impl.core.query.jbosscache.JBossCacheIndexChangesFilter" /> + <property name="jbosscache-configuration" value="conf/standalone/test-jbosscache-indexer.xml" /> <property name="index-dir" value="target/temp/index/db1/ws" /> - <!-- property name="changesfilter-class" value="org.exoplatform.services.jcr.impl.core.query.jbosscache.JbossCacheIndexChangesFilter" /> - <property name="jbosscache-configuration" value="conf/standalone/test-jbosscache-config.xml" /--> - - </properties> + </properties> </query-handler> <lock-manager class="org.exoplatform.services.jcr.impl.core.lock.jbosscache.CacheableLockManagerImpl"> <properties> @@ -91,9 +88,9 @@ <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}" /> + <property name="jbosscache-shareable" value="${jbosscache-shareable}" /> </properties> - </lock-manager> + </lock-manager> </workspace> <workspace name="ws1"> @@ -107,7 +104,8 @@ <property name="swap-directory" value="target/temp/swap/ws1" /> </properties> <value-storages> - <value-storage id="ws1" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> + <value-storage id="ws1" + class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> <properties> <property name="path" value="target/temp/values/ws1" /> </properties> @@ -117,21 +115,27 @@ </value-storage> </value-storages> </container> - <cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache"> + <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}" /> + <property name="jbosscache-shareable" value="${jbosscache-shareable}" /> </properties> </cache> - <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> - <properties> + <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> + <properties> + <property name="changesfilter-class" + value="org.exoplatform.services.jcr.impl.core.query.jbosscache.JBossCacheIndexChangesFilter" /> + <property name="jbosscache-configuration" value="conf/standalone/test-jbosscache-indexer.xml" /> <property name="index-dir" value="target/temp/index/db1/ws1" /> - <property name="synonymprovider-class" value="org.exoplatform.services.jcr.impl.core.query.lucene.PropertiesSynonymProvider" /> + <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" /> + <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"> @@ -146,9 +150,9 @@ <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}" /> + <property name="jbosscache-shareable" value="${jbosscache-shareable}" /> </properties> - </lock-manager> + </lock-manager> </workspace> <workspace name="ws2" lazy-read-threshold="1"> @@ -162,7 +166,8 @@ <property name="swap-directory" value="target/temp/swap/ws2" /> </properties> <value-storages> - <value-storage id="ws2" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> + <value-storage id="ws2" + class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> <properties> <property name="path" value="target/temp/values/ws2" /> </properties> @@ -172,21 +177,27 @@ </value-storage> </value-storages> </container> - <cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache"> + <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}" /> + <property name="jbosscache-shareable" value="${jbosscache-shareable}" /> </properties> </cache> - <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> - <properties> + <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> + <properties> + <property name="changesfilter-class" + value="org.exoplatform.services.jcr.impl.core.query.jbosscache.JBossCacheIndexChangesFilter" /> + <property name="jbosscache-configuration" value="conf/standalone/test-jbosscache-indexer.xml" /> <property name="index-dir" value="target/temp/index/db1/ws2" /> - <property name="synonymprovider-class" value="org.exoplatform.services.jcr.impl.core.query.lucene.PropertiesSynonymProvider" /> + <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" /> + <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"> @@ -201,11 +212,11 @@ <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}" /> + <property name="jbosscache-shareable" value="${jbosscache-shareable}" /> </properties> - </lock-manager> + </lock-manager> </workspace> - + <workspace name="ws3"> <!-- for system storage --> <container class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer"> @@ -218,12 +229,12 @@ <property name="swap-directory" value="target/temp/swap/ws3" /> </properties> <value-storages> - <!-- - This storage is used to check whether properties are removed - correctly from each value-storage - (TestRemoveFromValueStorage.java) - --> - <value-storage id="ws3_big" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> + <!-- + This storage is used to check whether properties are removed correctly from each value-storage + (TestRemoveFromValueStorage.java) + --> + <value-storage id="ws3_big" + class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> <properties> <property name="path" value="target/temp/values/ws3_big" /> </properties> @@ -231,11 +242,13 @@ <filter property-type="Binary" min-value-size="1024K" /> </filters> </value-storage> - <value-storage id="ws3" class="org.exoplatform.services.jcr.impl.storage.value.fs.CASableTreeFileValueStorage"> + <value-storage id="ws3" + class="org.exoplatform.services.jcr.impl.storage.value.fs.CASableTreeFileValueStorage"> <properties> <property name="path" value="target/temp/values/ws3" /> <property name="digest-algo" value="MD5" /> - <property name="vcas-type" value="org.exoplatform.services.jcr.impl.storage.value.cas.JDBCValueContentAddressStorageImpl" /> + <property name="vcas-type" + value="org.exoplatform.services.jcr.impl.storage.value.cas.JDBCValueContentAddressStorageImpl" /> <property name="jdbc-source-name" value="jdbcjcr" /> </properties> <filters> @@ -249,21 +262,27 @@ <property name="root-nodetype" value="nt:unstructured" /> </properties> </initializer> - <cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache"> + <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}" /> + <property name="jbosscache-shareable" value="${jbosscache-shareable}" /> </properties> </cache> - <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> - <properties> + <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> + <properties> + <property name="changesfilter-class" + value="org.exoplatform.services.jcr.impl.core.query.jbosscache.JBossCacheIndexChangesFilter" /> + <property name="jbosscache-configuration" value="conf/standalone/test-jbosscache-indexer.xml" /> <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-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" /> + <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"> @@ -278,9 +297,9 @@ <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}" /> + <property name="jbosscache-shareable" value="${jbosscache-shareable}" /> </properties> - </lock-manager> + </lock-manager> </workspace> </workspaces> </repository> @@ -304,7 +323,8 @@ <property name="swap-directory" value="target/temp/swap/wsdb2" /> </properties> <value-storages> - <value-storage id="ws" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> + <value-storage id="ws" + class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> <properties> <property name="path" value="target/temp/values/wsdb2" /> </properties> @@ -317,17 +337,22 @@ <initializer class="org.exoplatform.services.jcr.impl.core.ScratchWorkspaceInitializer"> <properties> <property name="root-nodetype" value="nt:unstructured" /> - <property name="root-permissions" value="*:/platform/administrators read;*:/platform/administrators add_node;*:/platform/administrators set_property;*:/platform/administrators remove" /> + <property name="root-permissions" + value="*:/platform/administrators read;*:/platform/administrators add_node;*:/platform/administrators set_property;*:/platform/administrators remove" /> </properties> </initializer> - <cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache"> + <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"> - <properties> + <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> + <properties> + <property name="changesfilter-class" + value="org.exoplatform.services.jcr.impl.core.query.jbosscache.JBossCacheIndexChangesFilter" /> + <property name="jbosscache-configuration" value="conf/standalone/test-jbosscache-indexer.xml" /> <property name="index-dir" value="target/temp/index/db2/ws" /> </properties> </query-handler> @@ -345,7 +370,7 @@ <property name="jbosscache-cl-cache.jdbc.datasource" value="jdbcjcrdb2" /> <property name="jbosscache-shareable" value="${jbosscache-shareable}" /> </properties> - </lock-manager> + </lock-manager> </workspace> <workspace name="ws1"> @@ -359,7 +384,8 @@ <property name="swap-directory" value="target/temp/swap/ws1db2" /> </properties> <value-storages> - <value-storage id="ws1" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> + <value-storage id="ws1" + class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> <properties> <property name="path" value="target/temp/values/ws1db2" /> </properties> @@ -375,14 +401,18 @@ <property name="root-permissions" value="any read;any add_node;any set_property;any remove" /> </properties> </initializer> - <cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache"> + <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"> - <properties> + <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> + <properties> + <property name="changesfilter-class" + value="org.exoplatform.services.jcr.impl.core.query.jbosscache.JBossCacheIndexChangesFilter" /> + <property name="jbosscache-configuration" value="conf/standalone/test-jbosscache-indexer.xml" /> <property name="index-dir" value="target/temp/index/db2/ws1" /> </properties> </query-handler> @@ -400,10 +430,10 @@ <property name="jbosscache-cl-cache.jdbc.datasource" value="jdbcjcr1db2" /> <property name="jbosscache-shareable" value="${jbosscache-shareable}" /> </properties> - </lock-manager> + </lock-manager> </workspace> </workspaces> - </repository> + </repository> <repository name="db1tck" system-workspace="ws" default-workspace="ws"> <security-domain>exo-domain</security-domain> @@ -424,7 +454,8 @@ <property name="swap-directory" value="target/temp/swap/wstck" /> </properties> <value-storages> - <value-storage id="ws" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> + <value-storage id="ws" + class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> <properties> <property name="path" value="target/temp/values/wstck" /> </properties> @@ -437,25 +468,32 @@ <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" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache"> + <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"> - <properties> + <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> + <properties> + <property name="changesfilter-class" + value="org.exoplatform.services.jcr.impl.core.query.jbosscache.JBossCacheIndexChangesFilter" /> + <property name="jbosscache-configuration" value="conf/standalone/test-jbosscache-indexer.xml" /> <property name="index-dir" value="target/temp/index/db1tck/ws" /> - <property name="synonymprovider-class" value="org.exoplatform.services.jcr.impl.core.query.lucene.PropertiesSynonymProvider" /> + <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="excerptprovider-class" value="org.exoplatform.services.jcr.impl.core.query.lucene.WeightedHTMLExcerpt" /> - <property name="spellchecker-class" value="org.exoplatform.services.jcr.impl.core.query.lucene.spell.LuceneSpellChecker$FiveSecondsRefreshInterval" /> + <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"> @@ -472,7 +510,7 @@ <property name="jbosscache-cl-cache.jdbc.datasource" value="jdbcjcrtck" /> <property name="jbosscache-shareable" value="${jbosscache-shareable}" /> </properties> - </lock-manager> + </lock-manager> </workspace> <workspace name="ws1"> @@ -486,7 +524,8 @@ <property name="swap-directory" value="target/temp/swap/ws1tck" /> </properties> <value-storages> - <value-storage id="ws1" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> + <value-storage id="ws1" + class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> <properties> <property name="path" value="target/temp/values/ws1tck" /> </properties> @@ -499,24 +538,31 @@ <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" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache"> + <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"> - <properties> + <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> + <properties> + <property name="changesfilter-class" + value="org.exoplatform.services.jcr.impl.core.query.jbosscache.JBossCacheIndexChangesFilter" /> + <property name="jbosscache-configuration" value="conf/standalone/test-jbosscache-indexer.xml" /> <property name="index-dir" value="target/temp/index/db1tck/ws1" /> - <property name="synonymprovider-class" value="org.exoplatform.services.jcr.impl.core.query.lucene.PropertiesSynonymProvider" /> + <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" /> + <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"> @@ -533,7 +579,7 @@ <property name="jbosscache-cl-cache.jdbc.datasource" value="jdbcjcr1tck" /> <property name="jbosscache-shareable" value="${jbosscache-shareable}" /> </properties> - </lock-manager> + </lock-manager> </workspace> <workspace name="ws2"> @@ -547,7 +593,8 @@ <property name="swap-directory" value="target/temp/swap/ws2tck" /> </properties> <value-storages> - <value-storage id="ws2" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> + <value-storage id="ws2" + class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> <properties> <property name="path" value="target/temp/values/ws2tck" /> </properties> @@ -560,27 +607,34 @@ <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" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache"> + <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"> - <properties> + <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> + <properties> + <property name="changesfilter-class" + value="org.exoplatform.services.jcr.impl.core.query.jbosscache.JBossCacheIndexChangesFilter" /> + <property name="jbosscache-configuration" value="conf/standalone/test-jbosscache-indexer.xml" /> <property name="index-dir" value="target/temp/index/db1tck/ws2" /> - <property name="synonymprovider-class" value="org.exoplatform.services.jcr.impl.core.query.lucene.PropertiesSynonymProvider" /> + <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" /> - <property name="excerptprovider-class" value="org.exoplatform.services.jcr.impl.core.query.lucene.WeightedHTMLExcerpt"/> - <property name="extractorPoolSize" value="2"/> - <property name="extractorTimeout" value="10"/> + <property name="spellchecker-class" + value="org.exoplatform.services.jcr.impl.core.query.lucene.spell.LuceneSpellChecker$FiveSecondsRefreshInterval" /> + <property name="excerptprovider-class" value="org.exoplatform.services.jcr.impl.core.query.lucene.WeightedHTMLExcerpt" /> + <property name="extractorPoolSize" value="2" /> + <property name="extractorTimeout" value="10" /> </properties> </query-handler> <lock-manager class="org.exoplatform.services.jcr.impl.core.lock.jbosscache.CacheableLockManagerImpl"> @@ -597,7 +651,7 @@ <property name="jbosscache-cl-cache.jdbc.datasource" value="jdbcjcr2tck" /> <property name="jbosscache-shareable" value="${jbosscache-shareable}" /> </properties> - </lock-manager> + </lock-manager> </workspace> </workspaces> </repository> Modified: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-jcr-config-sjdbc-jbc.xml =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-jcr-config-sjdbc-jbc.xml 2011-03-03 15:27:43 UTC (rev 4051) +++ jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-jcr-config-sjdbc-jbc.xml 2011-03-03 15:34:52 UTC (rev 4052) @@ -40,11 +40,13 @@ <property name="swap-directory" value="target/temp/swap/ws" /> </properties> <value-storages> - <value-storage id="ws" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> + <value-storage id="ws" + class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> <properties> <property name="path" value="target/temp/values/ws" /> <property name="digest-algo" value="MD5" /> - <property name="vcas-type" value="org.exoplatform.services.jcr.impl.storage.value.cas.JDBCValueContentAddressStorageImpl" /> + <property name="vcas-type" + value="org.exoplatform.services.jcr.impl.storage.value.cas.JDBCValueContentAddressStorageImpl" /> <property name="jdbc-source-name" value="jdbcjcr" /> <property name="jdbc-dialect" value="auto" /> </properties> @@ -59,25 +61,20 @@ <property name="root-nodetype" value="nt:unstructured" /> </properties> </initializer> - <!-- initializer class="org.exoplatform.services.jcr.impl.core.RestoreWorkspaceInitializer"> + <cache enabled="true" + class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache"> <properties> - <property name="restore-path" value="./sv_export_root.xml" /> - <property name="restore-path" value="./src/test/resources/import-export/restore_db1_ws1.xml" /> - </properties> - </initializer --> - <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"> - <properties> + <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> + <properties> + <property name="changesfilter-class" + value="org.exoplatform.services.jcr.impl.core.query.jbosscache.JBossCacheIndexChangesFilter" /> + <property name="jbosscache-configuration" value="conf/standalone/test-jbosscache-indexer.xml" /> <property name="index-dir" value="target/temp/index/db1/ws" /> - <!-- property name="changesfilter-class" value="org.exoplatform.services.jcr.impl.core.query.jbosscache.JbossCacheIndexChangesFilter" /> - <property name="jbosscache-configuration" value="conf/standalone/test-jbosscache-config.xml" /--> - - </properties> + </properties> </query-handler> <lock-manager class="org.exoplatform.services.jcr.impl.core.lock.jbosscache.CacheableLockManagerImpl"> <properties> @@ -93,7 +90,7 @@ <property name="jbosscache-cl-cache.jdbc.datasource" value="jdbcjcr" /> <property name="jbosscache-shareable" value="${jbosscache-shareable}" /> </properties> - </lock-manager> + </lock-manager> </workspace> <workspace name="ws1"> @@ -107,7 +104,8 @@ <property name="swap-directory" value="target/temp/swap/ws1" /> </properties> <value-storages> - <value-storage id="ws1" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> + <value-storage id="ws1" + class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> <properties> <property name="path" value="target/temp/values/ws1" /> </properties> @@ -117,21 +115,27 @@ </value-storage> </value-storages> </container> - <cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache"> + <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"> - <properties> + <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> + <properties> + <property name="changesfilter-class" + value="org.exoplatform.services.jcr.impl.core.query.jbosscache.JBossCacheIndexChangesFilter" /> + <property name="jbosscache-configuration" value="conf/standalone/test-jbosscache-indexer.xml" /> <property name="index-dir" value="target/temp/index/db1/ws1" /> - <property name="synonymprovider-class" value="org.exoplatform.services.jcr.impl.core.query.lucene.PropertiesSynonymProvider" /> + <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" /> + <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"> @@ -148,7 +152,7 @@ <property name="jbosscache-cl-cache.jdbc.datasource" value="jdbcjcr" /> <property name="jbosscache-shareable" value="${jbosscache-shareable}" /> </properties> - </lock-manager> + </lock-manager> </workspace> <workspace name="ws2" lazy-read-threshold="1"> @@ -162,7 +166,8 @@ <property name="swap-directory" value="target/temp/swap/ws2" /> </properties> <value-storages> - <value-storage id="ws2" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> + <value-storage id="ws2" + class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> <properties> <property name="path" value="target/temp/values/ws2" /> </properties> @@ -172,21 +177,27 @@ </value-storage> </value-storages> </container> - <cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache"> + <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"> - <properties> + <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> + <properties> + <property name="changesfilter-class" + value="org.exoplatform.services.jcr.impl.core.query.jbosscache.JBossCacheIndexChangesFilter" /> + <property name="jbosscache-configuration" value="conf/standalone/test-jbosscache-indexer.xml" /> <property name="index-dir" value="target/temp/index/db1/ws2" /> - <property name="synonymprovider-class" value="org.exoplatform.services.jcr.impl.core.query.lucene.PropertiesSynonymProvider" /> + <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" /> + <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"> @@ -203,95 +214,94 @@ <property name="jbosscache-cl-cache.jdbc.datasource" value="jdbcjcr" /> <property name="jbosscache-shareable" value="${jbosscache-shareable}" /> </properties> - </lock-manager> + </lock-manager> </workspace> - + <workspace name="ws3"> - <!-- for system storage --> - <container - class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer"> - <properties> - <property name="source-name" value="jdbcjcr" /> - <property name="dialect" value="auto" /> - <property name="multi-db" value="false" /> - <property name="update-storage" value="false" /> - <property name="max-buffer-size" value="200k" /> - <property name="swap-directory" value="target/temp/swap/ws3" /> - </properties> - <value-storages> - <!-- - This storage is used to check whether properties are removed - correctly from each value-storage - (TestRemoveFromValueStorage.java) - --> - <value-storage id="ws3_big" - class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> - <properties> - <property name="path" value="target/temp/values/ws3_big" /> - </properties> - <filters> - <filter property-type="Binary" min-value-size="1024K" /> - </filters> - </value-storage> - <value-storage id="ws3" - class="org.exoplatform.services.jcr.impl.storage.value.fs.CASableTreeFileValueStorage"> - <properties> - <property name="path" value="target/temp/values/ws3" /> - <property name="digest-algo" value="MD5" /> - <property name="vcas-type" - value="org.exoplatform.services.jcr.impl.storage.value.cas.JDBCValueContentAddressStorageImpl" /> - <property name="jdbc-source-name" value="jdbcjcr" /> - </properties> - <filters> - <filter property-type="Binary" /> - </filters> - </value-storage> - </value-storages> - </container> - <initializer - class="org.exoplatform.services.jcr.impl.core.ScratchWorkspaceInitializer"> - <properties> - <property name="root-nodetype" value="nt:unstructured" /> - </properties> - </initializer> - <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"> - <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="jdbcjcr" /> - <property name="jbosscache-shareable" value="${jbosscache-shareable}" /> - </properties> - </lock-manager> + <!-- for system storage --> + <container class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer"> + <properties> + <property name="source-name" value="jdbcjcr" /> + <property name="dialect" value="auto" /> + <property name="multi-db" value="false" /> + <property name="update-storage" value="false" /> + <property name="max-buffer-size" value="200k" /> + <property name="swap-directory" value="target/temp/swap/ws3" /> + </properties> + <value-storages> + <!-- + This storage is used to check whether properties are removed correctly from each value-storage + (TestRemoveFromValueStorage.java) + --> + <value-storage id="ws3_big" + class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> + <properties> + <property name="path" value="target/temp/values/ws3_big" /> + </properties> + <filters> + <filter property-type="Binary" min-value-size="1024K" /> + </filters> + </value-storage> + <value-storage id="ws3" + class="org.exoplatform.services.jcr.impl.storage.value.fs.CASableTreeFileValueStorage"> + <properties> + <property name="path" value="target/temp/values/ws3" /> + <property name="digest-algo" value="MD5" /> + <property name="vcas-type" + value="org.exoplatform.services.jcr.impl.storage.value.cas.JDBCValueContentAddressStorageImpl" /> + <property name="jdbc-source-name" value="jdbcjcr" /> + </properties> + <filters> + <filter property-type="Binary" /> + </filters> + </value-storage> + </value-storages> + </container> + <initializer class="org.exoplatform.services.jcr.impl.core.ScratchWorkspaceInitializer"> + <properties> + <property name="root-nodetype" value="nt:unstructured" /> + </properties> + </initializer> + <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"> + <properties> + <property name="changesfilter-class" + value="org.exoplatform.services.jcr.impl.core.query.jbosscache.JBossCacheIndexChangesFilter" /> + <property name="jbosscache-configuration" value="conf/standalone/test-jbosscache-indexer.xml" /> + <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="jdbcjcr" /> + <property name="jbosscache-shareable" value="${jbosscache-shareable}" /> + </properties> + </lock-manager> - </workspace> + </workspace> </workspaces> </repository> @@ -314,7 +324,8 @@ <property name="swap-directory" value="target/temp/swap/wsdb2" /> </properties> <value-storages> - <value-storage id="ws" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> + <value-storage id="ws" + class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> <properties> <property name="path" value="target/temp/values/wsdb2" /> </properties> @@ -327,17 +338,22 @@ <initializer class="org.exoplatform.services.jcr.impl.core.ScratchWorkspaceInitializer"> <properties> <property name="root-nodetype" value="nt:unstructured" /> - <property name="root-permissions" value="*:/platform/administrators read;*:/platform/administrators add_node;*:/platform/administrators set_property;*:/platform/administrators remove" /> + <property name="root-permissions" + value="*:/platform/administrators read;*:/platform/administrators add_node;*:/platform/administrators set_property;*:/platform/administrators remove" /> </properties> </initializer> - <cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache"> + <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"> - <properties> + <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> + <properties> + <property name="changesfilter-class" + value="org.exoplatform.services.jcr.impl.core.query.jbosscache.JBossCacheIndexChangesFilter" /> + <property name="jbosscache-configuration" value="conf/standalone/test-jbosscache-indexer.xml" /> <property name="index-dir" value="target/temp/index/db2/ws" /> </properties> </query-handler> @@ -355,7 +371,7 @@ <property name="jbosscache-cl-cache.jdbc.datasource" value="jdbcjcrdb2" /> <property name="jbosscache-shareable" value="${jbosscache-shareable}" /> </properties> - </lock-manager> + </lock-manager> </workspace> <workspace name="ws1"> @@ -369,7 +385,8 @@ <property name="swap-directory" value="target/temp/swap/ws1db2" /> </properties> <value-storages> - <value-storage id="ws1" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> + <value-storage id="ws1" + class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> <properties> <property name="path" value="target/temp/values/ws1db2" /> </properties> @@ -385,14 +402,18 @@ <property name="root-permissions" value="any read;any add_node;any set_property;any remove" /> </properties> </initializer> - <cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache"> + <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"> - <properties> + <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> + <properties> + <property name="changesfilter-class" + value="org.exoplatform.services.jcr.impl.core.query.jbosscache.JBossCacheIndexChangesFilter" /> + <property name="jbosscache-configuration" value="conf/standalone/test-jbosscache-indexer.xml" /> <property name="index-dir" value="target/temp/index/db2/ws1" /> </properties> </query-handler> @@ -410,10 +431,10 @@ <property name="jbosscache-cl-cache.jdbc.datasource" value="jdbcjcrdb2" /> <property name="jbosscache-shareable" value="${jbosscache-shareable}" /> </properties> - </lock-manager> + </lock-manager> </workspace> </workspaces> - </repository> + </repository> <repository name="db1tck" system-workspace="ws" default-workspace="ws"> <security-domain>exo-domain</security-domain> @@ -434,7 +455,8 @@ <property name="swap-directory" value="target/temp/swap/wstck" /> </properties> <value-storages> - <value-storage id="ws" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> + <value-storage id="ws" + class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> <properties> <property name="path" value="target/temp/values/wstck" /> </properties> @@ -447,25 +469,32 @@ <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" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache"> + <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"> - <properties> + <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> + <properties> + <property name="changesfilter-class" + value="org.exoplatform.services.jcr.impl.core.query.jbosscache.JBossCacheIndexChangesFilter" /> + <property name="jbosscache-configuration" value="conf/standalone/test-jbosscache-indexer.xml" /> <property name="index-dir" value="target/temp/index/db1tck/ws" /> - <property name="synonymprovider-class" value="org.exoplatform.services.jcr.impl.core.query.lucene.PropertiesSynonymProvider" /> + <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="excerptprovider-class" value="org.exoplatform.services.jcr.impl.core.query.lucene.WeightedHTMLExcerpt" /> - <property name="spellchecker-class" value="org.exoplatform.services.jcr.impl.core.query.lucene.spell.LuceneSpellChecker$FiveSecondsRefreshInterval" /> + <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"> @@ -482,7 +511,7 @@ <property name="jbosscache-cl-cache.jdbc.datasource" value="jdbcjcrtck" /> <property name="jbosscache-shareable" value="${jbosscache-shareable}" /> </properties> - </lock-manager> + </lock-manager> </workspace> <workspace name="ws1"> @@ -496,7 +525,8 @@ <property name="swap-directory" value="target/temp/swap/ws1tck" /> </properties> <value-storages> - <value-storage id="ws1" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> + <value-storage id="ws1" + class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> <properties> <property name="path" value="target/temp/values/ws1tck" /> </properties> @@ -509,24 +539,31 @@ <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" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache"> + <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"> - <properties> + <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> + <properties> + <property name="changesfilter-class" + value="org.exoplatform.services.jcr.impl.core.query.jbosscache.JBossCacheIndexChangesFilter" /> + <property name="jbosscache-configuration" value="conf/standalone/test-jbosscache-indexer.xml" /> <property name="index-dir" value="target/temp/index/db1tck/ws1" /> - <property name="synonymprovider-class" value="org.exoplatform.services.jcr.impl.core.query.lucene.PropertiesSynonymProvider" /> + <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" /> + <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"> @@ -543,7 +580,7 @@ <property name="jbosscache-cl-cache.jdbc.datasource" value="jdbcjcrtck" /> <property name="jbosscache-shareable" value="${jbosscache-shareable}" /> </properties> - </lock-manager> + </lock-manager> </workspace> <workspace name="ws2"> @@ -557,7 +594,8 @@ <property name="swap-directory" value="target/temp/swap/ws2tck" /> </properties> <value-storages> - <value-storage id="ws2" class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> + <value-storage id="ws2" + class="org.exoplatform.services.jcr.impl.storage.value.fs.TreeFileValueStorage"> <properties> <property name="path" value="target/temp/values/ws2tck" /> </properties> @@ -570,27 +608,34 @@ <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" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache"> + <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"> - <properties> + <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex"> + <properties> + <property name="changesfilter-class" + value="org.exoplatform.services.jcr.impl.core.query.jbosscache.JBossCacheIndexChangesFilter" /> + <property name="jbosscache-configuration" value="conf/standalone/test-jbosscache-indexer.xml" /> <property name="index-dir" value="target/temp/index/db1tck/ws2" /> - <property name="synonymprovider-class" value="org.exoplatform.services.jcr.impl.core.query.lucene.PropertiesSynonymProvider" /> + <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" /> - <property name="excerptprovider-class" value="org.exoplatform.services.jcr.impl.core.query.lucene.WeightedHTMLExcerpt"/> - <property name="extractorPoolSize" value="2"/> - <property name="extractorTimeout" value="10"/> + <property name="spellchecker-class" + value="org.exoplatform.services.jcr.impl.core.query.lucene.spell.LuceneSpellChecker$FiveSecondsRefreshInterval" /> + <property name="excerptprovider-class" value="org.exoplatform.services.jcr.impl.core.query.lucene.WeightedHTMLExcerpt" /> + <property name="extractorPoolSize" value="2" /> + <property name="extractorTimeout" value="10" /> </properties> </query-handler> <lock-manager class="org.exoplatform.services.jcr.impl.core.lock.jbosscache.CacheableLockManagerImpl"> @@ -607,7 +652,7 @@ <property name="jbosscache-cl-cache.jdbc.datasource" value="jdbcjcrtck" /> <property name="jbosscache-shareable" value="${jbosscache-shareable}" /> </properties> - </lock-manager> + </lock-manager> </workspace> </workspaces> </repository>