Author: skabashnyuk Date: 2009-12-09 12:04:54 -0500 (Wed, 09 Dec 2009) New Revision: 977 Modified: jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/core/query/DefaultChangesFilter.java jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/core/query/IndexerChangesFilter.java jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/core/query/SearchManager.java jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/core/query/SystemSearchManager.java jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/core/query/jbosscache/JbossCacheIndexChangesFilter.java Log: EXOJCR-291: initialization changed Modified: jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/core/query/DefaultChangesFilter.java =================================================================== --- jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/core/query/DefaultChangesFilter.java 2009-12-09 16:26:19 UTC (rev 976) +++ jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/core/query/DefaultChangesFilter.java 2009-12-09 17:04:54 UTC (rev 977) @@ -34,18 +34,21 @@ */ public class DefaultChangesFilter extends IndexerChangesFilter { + /** * @param searchManager * @param parentSearchManager * @param config * @param indexingTree * @param parentIndexingTree + * @param handler + * @param parentHandler */ public DefaultChangesFilter(SearchManager searchManager, SearchManager parentSearchManager, - QueryHandlerEntry config, IndexingTree indexingTree, IndexingTree parentIndexingTree) + QueryHandlerEntry config, IndexingTree indexingTree, IndexingTree parentIndexingTree, QueryHandler handler, + QueryHandler parentHandler) { - super(searchManager, parentSearchManager, config, indexingTree, parentIndexingTree); - // TODO Auto-generated constructor stub + super(searchManager, parentSearchManager, config, indexingTree, parentIndexingTree, handler, parentHandler); } /** Modified: jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/core/query/IndexerChangesFilter.java =================================================================== --- jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/core/query/IndexerChangesFilter.java 2009-12-09 16:26:19 UTC (rev 976) +++ jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/core/query/IndexerChangesFilter.java 2009-12-09 17:04:54 UTC (rev 977) @@ -49,9 +49,9 @@ protected final QueryHandlerEntry config; - protected QueryHandler handler; + protected final QueryHandler handler; - protected QueryHandler parentHandler; + protected final QueryHandler parentHandler; protected final IndexingTree indexingTree; @@ -66,7 +66,8 @@ * @param indexingTree */ public IndexerChangesFilter(SearchManager searchManager, SearchManager parentSearchManager, - QueryHandlerEntry config, IndexingTree indexingTree, IndexingTree parentIndexingTree) + QueryHandlerEntry config, IndexingTree indexingTree, IndexingTree parentIndexingTree, QueryHandler handler, + QueryHandler parentHandler) { super(); this.searchManager = searchManager; @@ -74,6 +75,8 @@ this.config = config; this.parentIndexingTree = parentIndexingTree; this.indexingTree = indexingTree; + this.handler = handler; + this.parentHandler = parentHandler; } /** @@ -224,14 +227,6 @@ } /** - * @param handler the handler to set - */ - public void setHandler(QueryHandler handler) - { - this.handler = handler; - } - - /** * Update index. * @param removedNodes * @param addedNodes @@ -239,14 +234,6 @@ protected abstract void doUpdateIndex(Set<String> removedNodes, Set<String> addedNodes, Set<String> parentRemovedNodes, Set<String> parentAddedNodes); - /** - * @param parentHandler the parentHandler to set - */ - protected void setParentHandler(QueryHandler parentHandler) - { - this.parentHandler = parentHandler; - } - private void createNewOrAdd(String key, ItemState state, Map<String, List<ItemState>> updatedNodes) { List<ItemState> list = updatedNodes.get(key); Modified: jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/core/query/SearchManager.java =================================================================== --- jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/core/query/SearchManager.java 2009-12-09 16:26:19 UTC (rev 976) +++ jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/core/query/SearchManager.java 2009-12-09 17:04:54 UTC (rev 977) @@ -497,7 +497,6 @@ indexingTree = new IndexingTree(indexingRootData, excludedPath); } - initializeChangesFilter(); initializeQueryHandler(); if (changesLogBuffer.size() > 0) @@ -691,9 +690,11 @@ * @throws NoSuchMethodException * @throws SecurityException */ - protected void initializeChangesFilter() throws RepositoryException, RepositoryConfigurationException + protected IndexerChangesFilter initializeChangesFilter() throws RepositoryException, + RepositoryConfigurationException { + IndexerChangesFilter newChangesFilter = null; Class<? extends IndexerChangesFilter> changesFilterClass = DefaultChangesFilter.class; String changesFilterClassName = config.getParameterValue(QueryHandlerParams.PARAM_CHANGES_FILTER_CLASS, null); try @@ -706,19 +707,13 @@ } Constructor<? extends IndexerChangesFilter> constuctor = changesFilterClass.getConstructor(SearchManager.class, SearchManager.class, QueryHandlerEntry.class, - IndexingTree.class, IndexingTree.class); + IndexingTree.class, IndexingTree.class, QueryHandler.class, QueryHandler.class); if (parentSearchManager != null) { - changesFilter = + newChangesFilter = constuctor.newInstance(this, parentSearchManager, config, indexingTree, parentSearchManager - .getIndexingTree()); + .getIndexingTree(), handler, parentSearchManager.getHandler()); } - //Disabled for system search manager - // else - // { - // changesFilter = constuctor.newInstance(this, null, config, indexingTree, null); - // } - } catch (SecurityException e) { @@ -748,6 +743,7 @@ { throw new RepositoryException(e.getMessage(), e); } + return newChangesFilter; } /** @@ -773,10 +769,10 @@ QueryHandler parentHandler = (this.parentSearchManager != null) ? parentSearchManager.getHandler() : null; QueryHandlerContext context = createQueryHandlerContext(parentHandler); handler.init(context); - if (parentSearchManager != null && changesFilter != null) + + if (parentSearchManager != null) { - changesFilter.setHandler(handler); - changesFilter.setParentHandler(parentSearchManager.getHandler()); + changesFilter = initializeChangesFilter(); } } catch (SecurityException e) Modified: jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/core/query/SystemSearchManager.java =================================================================== --- jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/core/query/SystemSearchManager.java 2009-12-09 16:26:19 UTC (rev 976) +++ jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/core/query/SystemSearchManager.java 2009-12-09 17:04:54 UTC (rev 977) @@ -103,7 +103,6 @@ indexingTree = new IndexingTree(indexingRootNodeData, excludedPaths); } - initializeChangesFilter(); initializeQueryHandler(); } Modified: jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/core/query/jbosscache/JbossCacheIndexChangesFilter.java =================================================================== --- jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/core/query/jbosscache/JbossCacheIndexChangesFilter.java 2009-12-09 16:26:19 UTC (rev 976) +++ jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/core/query/jbosscache/JbossCacheIndexChangesFilter.java 2009-12-09 17:04:54 UTC (rev 977) @@ -23,18 +23,17 @@ import org.exoplatform.services.jcr.config.RepositoryConfigurationException; import org.exoplatform.services.jcr.impl.core.query.IndexerChangesFilter; import org.exoplatform.services.jcr.impl.core.query.IndexingTree; +import org.exoplatform.services.jcr.impl.core.query.QueryHandler; import org.exoplatform.services.jcr.impl.core.query.SearchManager; import org.exoplatform.services.jcr.util.IdGenerator; import org.exoplatform.services.log.ExoLogger; import org.exoplatform.services.log.Log; import org.jboss.cache.Cache; import org.jboss.cache.CacheFactory; -import org.jboss.cache.CacheSPI; import org.jboss.cache.DefaultCacheFactory; import org.jboss.cache.config.CacheLoaderConfig; import org.jboss.cache.config.CacheLoaderConfig.IndividualCacheLoaderConfig; import org.jboss.cache.config.CacheLoaderConfig.IndividualCacheLoaderConfig.SingletonStoreConfig; -import org.jboss.cache.loader.SingletonStoreCacheLoader; import java.io.Serializable; import java.util.Properties; @@ -71,10 +70,10 @@ * @throws RepositoryConfigurationException */ public JbossCacheIndexChangesFilter(SearchManager searchManager, SearchManager parentSearchManager, - QueryHandlerEntry config, IndexingTree indexingTree, IndexingTree parentIndexingTree) - throws RepositoryConfigurationException + QueryHandlerEntry config, IndexingTree indexingTree, IndexingTree parentIndexingTree, QueryHandler handler, + QueryHandler parentHandler) throws RepositoryConfigurationException { - super(searchManager, parentSearchManager, config, indexingTree, parentIndexingTree); + super(searchManager, parentSearchManager, config, indexingTree, parentIndexingTree, handler, parentHandler); String jbcConfig = config.getParameterValue(QueryHandlerParams.PARAM_CHANGES_FILTER_CONFIG_PATH); CacheFactory<Serializable, Object> factory = new DefaultCacheFactory<Serializable, Object>(); log.info("JBoss Cache configuration used: " + jbcConfig);