Author: pnedonosko Date: 2009-10-27 10:52:30 -0400 (Tue, 27 Oct 2009) New Revision: 434 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/core/ScratchWorkspaceInitializer.java jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/FileSystemLockPersister.java jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/ACLInheritanceSupportedWorkspaceDataManager.java jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/LocalWorkspaceDataManagerStub.java jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/VersionableWorkspaceDataManager.java jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/usecases/export/ExportWorkspaceSystemViewTest.java Log: EXOJCR-211: remove cache from config and DM hierarchy 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-10-27 14:50:02 UTC (rev 433) +++ jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/RepositoryContainer.java 2009-10-27 14:52:30 UTC (rev 434) @@ -48,11 +48,8 @@ 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; -import org.exoplatform.services.jcr.impl.core.query.SystemSearchManager; -import org.exoplatform.services.jcr.impl.core.query.SystemSearchManagerHolder; import org.exoplatform.services.jcr.impl.core.value.ValueFactoryImpl; -import org.exoplatform.services.jcr.impl.dataflow.persistent.CacheableWorkspaceDataManager; -import org.exoplatform.services.jcr.impl.dataflow.persistent.LinkedWorkspaceStorageCacheImpl; +import org.exoplatform.services.jcr.impl.dataflow.persistent.JBossCacheWorkspaceDataManager; import org.exoplatform.services.jcr.impl.dataflow.persistent.LocalWorkspaceDataManagerStub; import org.exoplatform.services.jcr.impl.storage.SystemDataContainerHolder; import org.exoplatform.services.jcr.impl.storage.value.StandaloneStoragePluginProvider; @@ -229,24 +226,25 @@ } // cache type - try - { - String className = wsConfig.getCache().getType(); - if (className != null && className.length() > 0) - { - workspaceContainer.registerComponentImplementation(Class.forName(className)); - } - else - workspaceContainer.registerComponentImplementation(LinkedWorkspaceStorageCacheImpl.class); - } - catch (ClassNotFoundException e) - { - log.warn("Workspace cache class not found " + wsConfig.getCache().getType() - + ", will use default. Error : " + e); - workspaceContainer.registerComponentImplementation(LinkedWorkspaceStorageCacheImpl.class); - } + // TODO remove cache +// try +// { +// String className = wsConfig.getCache().getType(); +// if (className != null && className.length() > 0) +// { +// workspaceContainer.registerComponentImplementation(Class.forName(className)); +// } +// else +// workspaceContainer.registerComponentImplementation(LinkedWorkspaceStorageCacheImpl.class); +// } +// catch (ClassNotFoundException e) +// { +// log.warn("Workspace cache class not found " + wsConfig.getCache().getType() +// + ", will use default. Error : " + e); +// workspaceContainer.registerComponentImplementation(LinkedWorkspaceStorageCacheImpl.class); +// } - workspaceContainer.registerComponentImplementation(CacheableWorkspaceDataManager.class); + workspaceContainer.registerComponentImplementation(JBossCacheWorkspaceDataManager.class); workspaceContainer.registerComponentImplementation(LocalWorkspaceDataManagerStub.class); workspaceContainer.registerComponentImplementation(ObservationManagerRegistry.class); @@ -270,14 +268,14 @@ // Query handler if (wsConfig.getQueryHandler() != null) { - workspaceContainer.registerComponentImplementation(SearchManager.class); - workspaceContainer.registerComponentImplementation(QueryManager.class); - workspaceContainer.registerComponentImplementation(QueryManagerFactory.class); - workspaceContainer.registerComponentInstance(wsConfig.getQueryHandler()); - if (isSystem) - { - workspaceContainer.registerComponentImplementation(SystemSearchManager.class); - } +// workspaceContainer.registerComponentImplementation(SearchManager.class); +// workspaceContainer.registerComponentImplementation(QueryManager.class); +// workspaceContainer.registerComponentImplementation(QueryManagerFactory.class); +// workspaceContainer.registerComponentInstance(wsConfig.getQueryHandler()); +// TODO if (isSystem) +// { +// workspaceContainer.registerComponentImplementation(SystemSearchManager.class); +// } } // access manager @@ -439,8 +437,9 @@ // } } - SystemSearchManagerHolder searchManager = - (SystemSearchManagerHolder)this.getComponentInstanceOfType(SystemSearchManagerHolder.class); +// TODO SystemSearchManagerHolder searchManager = +// (SystemSearchManagerHolder)this.getComponentInstanceOfType(SystemSearchManagerHolder.class); + // if (searchManager != null) // { // typeManager.addQueryHandler(searchManager.get().getHandler()); @@ -509,13 +508,13 @@ String systemWsname = config.getSystemWorkspaceName(); WorkspaceEntry systemWsEntry = getWorkspaceEntry(systemWsname); - if (systemWsEntry != null && systemWsEntry.getQueryHandler() != null) - { - SystemSearchManager systemSearchManager = - (SystemSearchManager)getWorkspaceContainer(systemWsname).getComponentInstanceOfType( - SystemSearchManager.class); - registerComponentInstance(new SystemSearchManagerHolder(systemSearchManager)); - } +// TODO if (systemWsEntry != null && systemWsEntry.getQueryHandler() != null) +// { +// SystemSearchManager systemSearchManager = +// (SystemSearchManager)getWorkspaceContainer(systemWsname).getComponentInstanceOfType( +// SystemSearchManager.class); +// registerComponentInstance(new SystemSearchManagerHolder(systemSearchManager)); +// } try { Modified: jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/core/ScratchWorkspaceInitializer.java =================================================================== --- jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/core/ScratchWorkspaceInitializer.java 2009-10-27 14:50:02 UTC (rev 433) +++ jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/core/ScratchWorkspaceInitializer.java 2009-10-27 14:52:30 UTC (rev 434) @@ -28,6 +28,7 @@ import org.exoplatform.services.jcr.core.ExtendedPropertyType; import org.exoplatform.services.jcr.dataflow.DataManager; import org.exoplatform.services.jcr.dataflow.ItemState; +import org.exoplatform.services.jcr.dataflow.PersistentDataManager; import org.exoplatform.services.jcr.dataflow.PlainChangesLog; import org.exoplatform.services.jcr.dataflow.PlainChangesLogImpl; import org.exoplatform.services.jcr.dataflow.TransactionChangesLog; @@ -39,7 +40,6 @@ import org.exoplatform.services.jcr.impl.dataflow.TransientNodeData; import org.exoplatform.services.jcr.impl.dataflow.TransientPropertyData; import org.exoplatform.services.jcr.impl.dataflow.TransientValueData; -import org.exoplatform.services.jcr.impl.dataflow.persistent.CacheableWorkspaceDataManager; import org.exoplatform.services.jcr.util.IdGenerator; import org.exoplatform.services.log.ExoLogger; import org.exoplatform.services.log.Log; @@ -72,7 +72,7 @@ private final String workspaceName; - private final DataManager dataManager; + private final PersistentDataManager dataManager; private final String accessControlType; @@ -83,7 +83,7 @@ private final InternalQName rootNodeType; public ScratchWorkspaceInitializer(WorkspaceEntry config, RepositoryEntry repConfig, - CacheableWorkspaceDataManager dataManager, LocationFactory locationFactory) + PersistentDataManager dataManager, LocationFactory locationFactory) throws RepositoryConfigurationException, PathNotFoundException, RepositoryException { Modified: jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/FileSystemLockPersister.java =================================================================== --- jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/FileSystemLockPersister.java 2009-10-27 14:50:02 UTC (rev 433) +++ jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/FileSystemLockPersister.java 2009-10-27 14:52:30 UTC (rev 434) @@ -96,7 +96,7 @@ /** * @param dataManager * @param config - * @param searchManager + * @param searchManager TODO * @throws RepositoryConfigurationException * @throws RepositoryException */ Modified: jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/ACLInheritanceSupportedWorkspaceDataManager.java =================================================================== --- jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/ACLInheritanceSupportedWorkspaceDataManager.java 2009-10-27 14:50:02 UTC (rev 433) +++ jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/ACLInheritanceSupportedWorkspaceDataManager.java 2009-10-27 14:52:30 UTC (rev 434) @@ -43,11 +43,9 @@ public class ACLInheritanceSupportedWorkspaceDataManager implements SharedDataManager { - private static Log log = ExoLogger.getLogger("jcr.ACLInheritanceSupportedWorkspaceDataManager"); + protected final JBossCacheWorkspaceDataManager persistentManager; - protected final CacheableWorkspaceDataManager persistentManager; - - public ACLInheritanceSupportedWorkspaceDataManager(CacheableWorkspaceDataManager persistentManager) + public ACLInheritanceSupportedWorkspaceDataManager(JBossCacheWorkspaceDataManager persistentManager) { this.persistentManager = persistentManager; } Modified: jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/LocalWorkspaceDataManagerStub.java =================================================================== --- jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/LocalWorkspaceDataManagerStub.java 2009-10-27 14:50:02 UTC (rev 433) +++ jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/LocalWorkspaceDataManagerStub.java 2009-10-27 14:52:30 UTC (rev 434) @@ -18,8 +18,6 @@ */ package org.exoplatform.services.jcr.impl.dataflow.persistent; -import org.exoplatform.services.log.ExoLogger; -import org.exoplatform.services.log.Log; /** * Created by The eXo Platform SAS. @@ -31,9 +29,7 @@ public class LocalWorkspaceDataManagerStub extends VersionableWorkspaceDataManager { - private static Log log = ExoLogger.getLogger("jcr.LocalWorkspaceDataManagerStub"); - - public LocalWorkspaceDataManagerStub(CacheableWorkspaceDataManager persistentManager) + public LocalWorkspaceDataManagerStub(JBossCacheWorkspaceDataManager persistentManager) { super(persistentManager); } Modified: jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/VersionableWorkspaceDataManager.java =================================================================== --- jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/VersionableWorkspaceDataManager.java 2009-10-27 14:50:02 UTC (rev 433) +++ jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/VersionableWorkspaceDataManager.java 2009-10-27 14:52:30 UTC (rev 434) @@ -54,11 +54,9 @@ public class VersionableWorkspaceDataManager extends ACLInheritanceSupportedWorkspaceDataManager { - private static Log log = ExoLogger.getLogger("jcr.VersionableWorkspaceDataManager"); - private ACLInheritanceSupportedWorkspaceDataManager versionDataManager; - public VersionableWorkspaceDataManager(CacheableWorkspaceDataManager persistentManager) + public VersionableWorkspaceDataManager(JBossCacheWorkspaceDataManager persistentManager) { super(persistentManager); } @@ -72,11 +70,8 @@ this.versionDataManager = (ACLInheritanceSupportedWorkspaceDataManager)systemDataManager; } - /* - * (non-Javadoc) - * - * @see org.exoplatform.services.jcr.impl.core.WorkspaceDataManager#getChildNodes(org.exoplatform.services - * .jcr.datamodel.NodeData) + /** + * {@inheritDoc} */ @Override public List<NodeData> getChildNodesData(final NodeData nodeData) throws RepositoryException @@ -88,11 +83,8 @@ return super.getChildNodesData(nodeData); } - /* - * (non-Javadoc) - * - * @see org.exoplatform.services.jcr.impl.core.WorkspaceDataManager#getChildProperties(org.exoplatform - * .services.jcr.datamodel.NodeData) + /** + * {@inheritDoc} */ @Override public List<PropertyData> getChildPropertiesData(final NodeData nodeData) throws RepositoryException @@ -126,41 +118,41 @@ return super.getItemData(parentData, name); } - /** - * @see org.exoplatform.services.jcr.impl.dataflow.persistent.WorkspacePersistentDataManager#getItemData(java.lang.String) - */ - public ItemData getItemData(String identifier) throws RepositoryException - { - // from cache at first - ItemData cdata = persistentManager.getCachedItemData(identifier); - if (cdata != null) - return super.getItemData(identifier); +// /** +// * {@inheritDoc} +// */ +// public ItemData getItemData(String identifier) throws RepositoryException +// { +// // from cache at first +// ItemData cdata = persistentManager.getCachedItemData(identifier); +// if (cdata != null) +// return super.getItemData(identifier); +// +// if (!this.equals(versionDataManager) && !identifier.equals(Constants.ROOT_UUID)) +// { +// // search in System cache for /jcr:system nodes only +// cdata = versionDataManager.persistentManager.getCachedItemData(identifier); +// if (cdata != null) +// if (isSystemDescendant(cdata.getQPath())) +// return versionDataManager.getItemData(identifier); +// else +// return null; +// } +// +// // then from persistence +// ItemData data = super.getItemData(identifier); +// if (data != null) +// return data; +// else if (!this.equals(versionDataManager)) +// { +// // try from version storage if not the same +// data = versionDataManager.getItemData(identifier); +// if (data != null && isSystemDescendant(data.getQPath())) +// return data; +// } +// return null; +// } - if (!this.equals(versionDataManager) && !identifier.equals(Constants.ROOT_UUID)) - { - // search in System cache for /jcr:system nodes only - cdata = versionDataManager.persistentManager.getCachedItemData(identifier); - if (cdata != null) - if (isSystemDescendant(cdata.getQPath())) - return versionDataManager.getItemData(identifier); - else - return null; - } - - // then from persistence - ItemData data = super.getItemData(identifier); - if (data != null) - return data; - else if (!this.equals(versionDataManager)) - { - // try from version storage if not the same - data = versionDataManager.getItemData(identifier); - if (data != null && isSystemDescendant(data.getQPath())) - return data; - } - return null; - } - public void save(CompositeChangesLog changesLog) throws RepositoryException, InvalidItemStateException { Modified: jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/usecases/export/ExportWorkspaceSystemViewTest.java =================================================================== --- jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/usecases/export/ExportWorkspaceSystemViewTest.java 2009-10-27 14:50:02 UTC (rev 433) +++ jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/usecases/export/ExportWorkspaceSystemViewTest.java 2009-10-27 14:52:30 UTC (rev 434) @@ -102,7 +102,7 @@ ws1back.setAccessManager(ws1e.getAccessManager()); ws1back.setAutoInitializedRootNt(ws1e.getAutoInitializedRootNt()); ws1back.setAutoInitPermissions(ws1e.getAutoInitPermissions()); - ws1back.setCache(ws1e.getCache()); + // TODO ws1back.setCache(ws1e.getCache()); ws1back.setContainer(ws1e.getContainer()); ws1back.setLockManager(ws1e.getLockManager());