Author: areshetnyak Date: 2009-11-26 08:49:07 -0500 (Thu, 26 Nov 2009) New Revision: 882 Modified: jcr/branches/1.12.0-JBC/component/ext/src/main/java/org/exoplatform/services/jcr/ext/replication/ProxyWorkspaceDataReceiver.java jcr/branches/1.12.0-JBC/component/ext/src/main/java/org/exoplatform/services/jcr/ext/replication/WorkspaceDataManagerProxy.java Log: EXOJCR-199 : The calsess ProxyWorkspaceDataReciver and WorkspaceDataManagerProxy was fixed for build. Modified: jcr/branches/1.12.0-JBC/component/ext/src/main/java/org/exoplatform/services/jcr/ext/replication/ProxyWorkspaceDataReceiver.java =================================================================== --- jcr/branches/1.12.0-JBC/component/ext/src/main/java/org/exoplatform/services/jcr/ext/replication/ProxyWorkspaceDataReceiver.java 2009-11-26 13:31:31 UTC (rev 881) +++ jcr/branches/1.12.0-JBC/component/ext/src/main/java/org/exoplatform/services/jcr/ext/replication/ProxyWorkspaceDataReceiver.java 2009-11-26 13:49:07 UTC (rev 882) @@ -19,7 +19,6 @@ package org.exoplatform.services.jcr.ext.replication; import org.exoplatform.services.jcr.config.RepositoryConfigurationException; -import org.exoplatform.services.jcr.impl.core.lock.LockManagerImpl; import org.exoplatform.services.jcr.impl.core.query.SearchManager; import org.exoplatform.services.jcr.impl.dataflow.persistent.CacheableWorkspaceDataManager; @@ -42,12 +41,12 @@ * the LockManagerImpl * @throws RepositoryConfigurationException * will be generated RepositoryConfigurationException - */ + *//* public ProxyWorkspaceDataReceiver(CacheableWorkspaceDataManager dataManager, LockManagerImpl lockManager) throws RepositoryConfigurationException { this(dataManager, null, lockManager); - } + }*/ /** * ProxyWorkspaceDataReceiver constructor. @@ -58,12 +57,12 @@ * the SearchManager * @throws RepositoryConfigurationException * will be generated RepositoryConfigurationException - */ + *//* public ProxyWorkspaceDataReceiver(CacheableWorkspaceDataManager dataManager, SearchManager searchManager) throws RepositoryConfigurationException { this(dataManager, searchManager, null); - } + }*/ /** * ProxyWorkspaceDataReceiver constructor. @@ -75,7 +74,7 @@ */ public ProxyWorkspaceDataReceiver(CacheableWorkspaceDataManager dataManager) throws RepositoryConfigurationException { - this(dataManager, null, null); + this(dataManager, null/*, null*/); } /** @@ -90,9 +89,9 @@ * @throws RepositoryConfigurationException * will be generated the RepositoryConfigurationException */ - public ProxyWorkspaceDataReceiver(CacheableWorkspaceDataManager dataManager, SearchManager searchManager, - LockManagerImpl lockManager) throws RepositoryConfigurationException + public ProxyWorkspaceDataReceiver(CacheableWorkspaceDataManager dataManager, SearchManager searchManager/*, + LockManagerImpl lockManager*/) throws RepositoryConfigurationException { - dataKeeper = new WorkspaceDataManagerProxy(dataManager, searchManager, lockManager); + dataKeeper = new WorkspaceDataManagerProxy(dataManager, searchManager/*, lockManager*/); } } Modified: jcr/branches/1.12.0-JBC/component/ext/src/main/java/org/exoplatform/services/jcr/ext/replication/WorkspaceDataManagerProxy.java =================================================================== --- jcr/branches/1.12.0-JBC/component/ext/src/main/java/org/exoplatform/services/jcr/ext/replication/WorkspaceDataManagerProxy.java 2009-11-26 13:31:31 UTC (rev 881) +++ jcr/branches/1.12.0-JBC/component/ext/src/main/java/org/exoplatform/services/jcr/ext/replication/WorkspaceDataManagerProxy.java 2009-11-26 13:49:07 UTC (rev 882) @@ -21,7 +21,6 @@ import org.exoplatform.services.jcr.dataflow.ItemDataKeeper; import org.exoplatform.services.jcr.dataflow.ItemStateChangesLog; import org.exoplatform.services.jcr.dataflow.persistent.ItemsPersistenceListener; -import org.exoplatform.services.jcr.impl.core.lock.LockManagerImpl; import org.exoplatform.services.jcr.impl.core.query.SearchManager; import org.exoplatform.services.jcr.impl.dataflow.persistent.CacheableWorkspaceDataManager; import org.exoplatform.services.log.ExoLogger; @@ -63,18 +62,16 @@ * the CacheableWorkspaceDataManager * @param searchIndex * the SearchManager - * @param lockManager - * the LockManagerImpl */ - public WorkspaceDataManagerProxy(CacheableWorkspaceDataManager dataManager, SearchManager searchIndex, - LockManagerImpl lockManager) + public WorkspaceDataManagerProxy(CacheableWorkspaceDataManager dataManager, SearchManager searchIndex/*, + LockManagerImpl lockManager*/) { this.listeners = new ArrayList<ItemsPersistenceListener>(); listeners.add(dataManager.getCache()); if (searchIndex != null) listeners.add(searchIndex); - if (lockManager != null) - listeners.add(lockManager); + /*if (lockManager != null) + listeners.add(lockManager);*/ log.info("WorkspaceDataManagerProxy is instantiated"); }