Author: skabashnyuk Date: 2009-12-07 03:41:44 -0500 (Mon, 07 Dec 2009) New Revision: 929 Removed: jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/core/query/JbossCacheSearchManager.java jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/core/query/JbossCacheSystemSearchManager.java Modified: jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/RepositoryContainer.java Log: EXOJCR-283: Removed separated classes due to error in container. Modified: jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/RepositoryContainer.java =================================================================== --- jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/RepositoryContainer.java 2009-12-04 16:45:41 UTC (rev 928) +++ jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/RepositoryContainer.java 2009-12-07 08:41:44 UTC (rev 929) @@ -46,8 +46,6 @@ import org.exoplatform.services.jcr.impl.core.nodetype.NodeTypeManagerImpl; import org.exoplatform.services.jcr.impl.core.nodetype.registration.JcrNodeTypeDataPersister; import org.exoplatform.services.jcr.impl.core.observation.ObservationManagerRegistry; -import org.exoplatform.services.jcr.impl.core.query.JbossCacheSearchManager; -import org.exoplatform.services.jcr.impl.core.query.JbossCacheSystemSearchManager; import org.exoplatform.services.jcr.impl.core.query.QueryManagerFactory; import org.exoplatform.services.jcr.impl.core.query.RepositoryIndexSearcherHolder; import org.exoplatform.services.jcr.impl.core.query.SearchManager; @@ -266,22 +264,12 @@ QueryHandlerEntry queryHandler = wsConfig.getQueryHandler(); if (queryHandler != null) { - if (queryHandler.getParameterValue(JbossCacheSearchManager.JBOSSCACHE_CONFIG, null) == null) + workspaceContainer.registerComponentImplementation(SearchManager.class); + if (isSystem) { - workspaceContainer.registerComponentImplementation(SearchManager.class); - if (isSystem) - { - workspaceContainer.registerComponentImplementation(SystemSearchManager.class); - } + workspaceContainer.registerComponentImplementation(SystemSearchManager.class); } - else - { - workspaceContainer.registerComponentImplementation(JbossCacheSearchManager.class); - if (isSystem) - { - workspaceContainer.registerComponentImplementation(JbossCacheSystemSearchManager.class); - } - } + workspaceContainer.registerComponentImplementation(QueryManager.class); workspaceContainer.registerComponentImplementation(QueryManagerFactory.class); workspaceContainer.registerComponentInstance(queryHandler); Deleted: jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/core/query/JbossCacheSearchManager.java =================================================================== --- jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/core/query/JbossCacheSearchManager.java 2009-12-04 16:45:41 UTC (rev 928) +++ jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/core/query/JbossCacheSearchManager.java 2009-12-07 08:41:44 UTC (rev 929) @@ -1,61 +0,0 @@ -/* - * Copyright (C) 2009 eXo Platform SAS. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.exoplatform.services.jcr.impl.core.query; - -import org.exoplatform.container.configuration.ConfigurationManager; -import org.exoplatform.services.document.DocumentReaderService; -import org.exoplatform.services.jcr.config.QueryHandlerEntry; -import org.exoplatform.services.jcr.config.RepositoryConfigurationException; -import org.exoplatform.services.jcr.core.nodetype.NodeTypeDataManager; -import org.exoplatform.services.jcr.impl.core.NamespaceRegistryImpl; -import org.exoplatform.services.jcr.impl.dataflow.persistent.WorkspacePersistentDataManager; - -import javax.jcr.RepositoryException; - -/** - * @author <a href="mailto:Sergey.Kabashnyuk@exoplatform.org">Sergey Kabashnyuk</a> - * @version $Id: exo-jboss-codetemplates.xml 34360 2009-07-22 23:58:59Z ksm $ - * - */ -public class JbossCacheSearchManager extends SearchManager -{ - /** - * @param config - * @param nsReg - * @param ntReg - * @param itemMgr - * @param parentSearchManager - * @param extractor - * @param cfm - * @param indexSearcherHolder - * @throws RepositoryException - * @throws RepositoryConfigurationException - */ - public JbossCacheSearchManager(QueryHandlerEntry config, NamespaceRegistryImpl nsReg, NodeTypeDataManager ntReg, - WorkspacePersistentDataManager itemMgr, SystemSearchManagerHolder parentSearchManager, - DocumentReaderService extractor, ConfigurationManager cfm, RepositoryIndexSearcherHolder indexSearcherHolder) - throws RepositoryException, RepositoryConfigurationException - { - super(config, nsReg, ntReg, itemMgr, parentSearchManager, extractor, cfm, indexSearcherHolder); - // TODO Auto-generated constructor stub - } - - public static final String JBOSSCACHE_CONFIG = "jbosscache-configuration"; - -} Deleted: jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/core/query/JbossCacheSystemSearchManager.java =================================================================== --- jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/core/query/JbossCacheSystemSearchManager.java 2009-12-04 16:45:41 UTC (rev 928) +++ jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/core/query/JbossCacheSystemSearchManager.java 2009-12-07 08:41:44 UTC (rev 929) @@ -1,59 +0,0 @@ -/* - * Copyright (C) 2009 eXo Platform SAS. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.exoplatform.services.jcr.impl.core.query; - -import org.exoplatform.container.configuration.ConfigurationManager; -import org.exoplatform.services.document.DocumentReaderService; -import org.exoplatform.services.jcr.config.QueryHandlerEntry; -import org.exoplatform.services.jcr.config.RepositoryConfigurationException; -import org.exoplatform.services.jcr.core.nodetype.NodeTypeDataManager; -import org.exoplatform.services.jcr.impl.core.NamespaceRegistryImpl; -import org.exoplatform.services.jcr.impl.dataflow.persistent.WorkspacePersistentDataManager; - -import javax.jcr.RepositoryException; - -/** - * @author <a href="mailto:Sergey.Kabashnyuk@exoplatform.org">Sergey Kabashnyuk</a> - * @version $Id: exo-jboss-codetemplates.xml 34360 2009-07-22 23:58:59Z ksm $ - * - */ -public class JbossCacheSystemSearchManager extends SystemSearchManager -{ - - /** - * @param config - * @param nsReg - * @param ntReg - * @param itemMgr - * @param service - * @param cfm - * @param indexSearcherHolder - * @throws RepositoryException - * @throws RepositoryConfigurationException - */ - public JbossCacheSystemSearchManager(QueryHandlerEntry config, NamespaceRegistryImpl nsReg, - NodeTypeDataManager ntReg, WorkspacePersistentDataManager itemMgr, DocumentReaderService service, - ConfigurationManager cfm, RepositoryIndexSearcherHolder indexSearcherHolder) throws RepositoryException, - RepositoryConfigurationException - { - super(config, nsReg, ntReg, itemMgr, service, cfm, indexSearcherHolder); - // TODO Auto-generated constructor stub - } - -}