[exo-jcr-commits] exo-jcr SVN: r559 - in jcr/branches/1.12.0-JBC/component/core/src: main/java/org/exoplatform/services/jcr/impl/dataflow/persistent and 5 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Wed Nov 11 07:53:07 EST 2009
Author: tolusha
Date: 2009-11-11 07:53:06 -0500 (Wed, 11 Nov 2009)
New Revision: 559
Modified:
jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/LockManagerImpl.java
jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/WorkspacePersistentDataManager.java
jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/inmemory/InmemoryStorageConnection.java
jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JBossCacheStorageConnection.java
jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JBossCacheTreeStorageConnection.java
jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jbosscache/LockCacheLoader.java
jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCStorageConnection.java
jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/storage/WorkspaceStorageConnection.java
jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jbosscache/AbstractCacheLoaderTest.java
jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jbosscache/LockCacheLoaderTest.java
jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jbosscache/TesterLockManagerImpl.java
Log:
EXOJCR-205: small fix
Modified: jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/LockManagerImpl.java
===================================================================
--- jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/LockManagerImpl.java 2009-11-11 11:30:51 UTC (rev 558)
+++ jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/LockManagerImpl.java 2009-11-11 12:53:06 UTC (rev 559)
@@ -52,6 +52,7 @@
import org.exoplatform.services.jcr.util.IdGenerator;
import org.exoplatform.services.log.ExoLogger;
import org.exoplatform.services.log.Log;
+import org.jboss.cache.factories.annotations.NonVolatile;
import org.picocontainer.Startable;
import java.io.IOException;
@@ -77,6 +78,7 @@
*/
@Managed
@NameTemplate(@Property(key = "service", value = "lockmanager"))
+ at NonVolatile
public class LockManagerImpl implements ItemsPersistenceListener, SessionLifecycleListener, LockManager, Startable
{
/**
Modified: jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/WorkspacePersistentDataManager.java
===================================================================
--- jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/WorkspacePersistentDataManager.java 2009-11-11 11:30:51 UTC (rev 558)
+++ jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/WorkspacePersistentDataManager.java 2009-11-11 12:53:06 UTC (rev 559)
@@ -187,8 +187,9 @@
if (!systemConnSessionInfoAdded)
{
+ // TODO userId
if (!systemConnection.equals(thisConnection))
- systemConnection.addSessionInfo(currChangesLog.getSessionId(), "");
+ systemConnection.addSessionInfo(currChangesLog.getSessionId());
systemConnSessionInfoAdded = true;
}
}
@@ -215,8 +216,9 @@
if (!thisConnSessionInfoAdded)
{
+ // TODO userId
if (!thisConnection.equals(systemConnection))
- thisConnection.addSessionInfo(currChangesLog.getSessionId(), "");
+ thisConnection.addSessionInfo(currChangesLog.getSessionId());
thisConnSessionInfoAdded = true;
}
}
Modified: jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/inmemory/InmemoryStorageConnection.java
===================================================================
--- jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/inmemory/InmemoryStorageConnection.java 2009-11-11 11:30:51 UTC (rev 558)
+++ jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/inmemory/InmemoryStorageConnection.java 2009-11-11 12:53:06 UTC (rev 559)
@@ -214,7 +214,7 @@
/**
* {@inheritDoc}
*/
- public void addSessionInfo(String sessionId, String userId) throws RepositoryException
+ public void addSessionInfo(String sessionId) throws RepositoryException
{
}
Modified: jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JBossCacheStorageConnection.java
===================================================================
--- jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JBossCacheStorageConnection.java 2009-11-11 11:30:51 UTC (rev 558)
+++ jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JBossCacheStorageConnection.java 2009-11-11 12:53:06 UTC (rev 559)
@@ -556,7 +556,7 @@
/**
* {@inheritDoc}
*/
- public void addSessionInfo(String sessionId, String userId) throws RepositoryException
+ public void addSessionInfo(String sessionId) throws RepositoryException
{
startBatch();
@@ -567,7 +567,6 @@
// add attributes
sessionRoot.put(JBossCacheStorage.SESSION_ID, sessionId);
- sessionRoot.put(JBossCacheStorage.USER_ID, userId);
}
/**
Modified: jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JBossCacheTreeStorageConnection.java
===================================================================
--- jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JBossCacheTreeStorageConnection.java 2009-11-11 11:30:51 UTC (rev 558)
+++ jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JBossCacheTreeStorageConnection.java 2009-11-11 12:53:06 UTC (rev 559)
@@ -396,7 +396,7 @@
/**
* {@inheritDoc}
*/
- public void addSessionInfo(String sessionId, String userId) throws RepositoryException
+ public void addSessionInfo(String sessionId) throws RepositoryException
{
}
Modified: jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jbosscache/LockCacheLoader.java
===================================================================
--- jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jbosscache/LockCacheLoader.java 2009-11-11 11:30:51 UTC (rev 558)
+++ jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jbosscache/LockCacheLoader.java 2009-11-11 12:53:06 UTC (rev 559)
@@ -16,11 +16,13 @@
*/
package org.exoplatform.services.jcr.impl.storage.jbosscache;
+import org.exoplatform.services.jcr.config.RepositoryConfigurationException;
import org.exoplatform.services.jcr.datamodel.InternalQName;
import org.exoplatform.services.jcr.datamodel.PropertyData;
import org.exoplatform.services.jcr.impl.Constants;
import org.exoplatform.services.jcr.impl.core.lock.LockManagerImpl;
import org.exoplatform.services.jcr.impl.dataflow.TransientPropertyData;
+import org.exoplatform.services.jcr.storage.WorkspaceDataContainer;
import org.exoplatform.services.jcr.util.IdGenerator;
import org.exoplatform.services.log.ExoLogger;
import org.exoplatform.services.log.Log;
@@ -28,6 +30,7 @@
import org.jboss.cache.Fqn;
import org.jboss.cache.Modification;
import org.jboss.cache.Modification.ModificationType;
+import org.jboss.cache.factories.annotations.Inject;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
@@ -51,7 +54,7 @@
/**
* Lock manager.
*/
- private final LockManagerImpl lockManager;
+ private LockManagerImpl lockManager;
/**
* Logger.
@@ -59,12 +62,18 @@
private final Log log = ExoLogger.getLogger("jcr.LockCacheLoader");
/**
- * LockCacheLoader constructor.
+ * Injection dependencies.
*
- * @param lockManager
+ * @param lockManager LockManagerImpl
*/
- public LockCacheLoader(LockManagerImpl lockManager)
+ @Inject
+ public void injectDependencies(LockManagerImpl lockManager) throws RepositoryConfigurationException
{
+ if (this.lockManager != null)
+ {
+ throw new RepositoryConfigurationException("Cannot set LockManagerImpl twice");
+ }
+
this.lockManager = lockManager;
}
@@ -106,7 +115,7 @@
else if (lockChanges.get(0).getType() == ModificationType.REMOVE_NODE
&& lockChanges.get(1).getType() == ModificationType.REMOVE_NODE)
{
- PropertyData propertyData = (PropertyData)lockChanges.get(0).getOldValue();
+ PropertyData propertyData = (PropertyData)lockChanges.get(0).getValue();
performUnLock(lockChanges, propertyData.getParentIdentifier(), sessionId);
}
else
Modified: jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCStorageConnection.java
===================================================================
--- jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCStorageConnection.java 2009-11-11 11:30:51 UTC (rev 558)
+++ jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCStorageConnection.java 2009-11-11 12:53:06 UTC (rev 559)
@@ -700,7 +700,7 @@
/**
* {@inheritDoc}
*/
- public void addSessionInfo(String sessionId, String userId) throws RepositoryException
+ public void addSessionInfo(String sessionId) throws RepositoryException
{
}
Modified: jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/storage/WorkspaceStorageConnection.java
===================================================================
--- jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/storage/WorkspaceStorageConnection.java 2009-11-11 11:30:51 UTC (rev 558)
+++ jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/storage/WorkspaceStorageConnection.java 2009-11-11 12:53:06 UTC (rev 559)
@@ -314,13 +314,10 @@
* @param sessionId
* the session identifier to be added
*
- * @param userId
- * the user identifier to be added
- *
* @throws RepositoryException
* if some exception occured
*/
- void addSessionInfo(String sessionId, String userId) throws RepositoryException;
+ void addSessionInfo(String sessionId) throws RepositoryException;
/**
* Remove session information from cache storage.
Modified: jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jbosscache/AbstractCacheLoaderTest.java
===================================================================
--- jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jbosscache/AbstractCacheLoaderTest.java 2009-11-11 11:30:51 UTC (rev 558)
+++ jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jbosscache/AbstractCacheLoaderTest.java 2009-11-11 12:53:06 UTC (rev 559)
@@ -41,6 +41,11 @@
protected static boolean addPUTDATA = true;
+ public void setUp() throws Exception
+ {
+ super.setUp();
+ }
+
/**
* Returns {@link Modification} like as node added. NodeData is written to /$NODE/IDxxxx as an attribute by key ITEM_DATA.
*
Modified: jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jbosscache/LockCacheLoaderTest.java
===================================================================
--- jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jbosscache/LockCacheLoaderTest.java 2009-11-11 11:30:51 UTC (rev 558)
+++ jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jbosscache/LockCacheLoaderTest.java 2009-11-11 12:53:06 UTC (rev 559)
@@ -16,20 +16,38 @@
*/
package org.exoplatform.services.jcr.impl.storage.jbosscache;
+import org.exoplatform.services.idgenerator.impl.IDGeneratorServiceImpl;
+import org.exoplatform.services.jcr.config.ContainerEntry;
+import org.exoplatform.services.jcr.config.RepositoryEntry;
+import org.exoplatform.services.jcr.config.SimpleParameterEntry;
+import org.exoplatform.services.jcr.config.WorkspaceEntry;
import org.exoplatform.services.jcr.datamodel.InternalQName;
import org.exoplatform.services.jcr.datamodel.QPath;
import org.exoplatform.services.jcr.impl.Constants;
import org.exoplatform.services.jcr.impl.core.lock.LockData;
+import org.exoplatform.services.jcr.impl.core.lock.LockManagerImpl;
import org.exoplatform.services.jcr.impl.core.value.ValueFactoryImpl;
import org.exoplatform.services.jcr.impl.dataflow.TransientPropertyData;
import org.exoplatform.services.jcr.impl.dataflow.TransientValueData;
+import org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer;
+import org.exoplatform.services.jcr.impl.storage.value.StandaloneStoragePluginProvider;
+import org.exoplatform.services.jcr.storage.WorkspaceDataContainer;
+import org.exoplatform.services.jcr.storage.value.ValueStoragePluginProvider;
+import org.exoplatform.services.jcr.util.IdGenerator;
+import org.jboss.cache.Cache;
+import org.jboss.cache.CacheSPI;
+import org.jboss.cache.DefaultCacheFactory;
+import org.jboss.cache.Fqn;
import org.jboss.cache.Modification;
+import org.jboss.cache.Node;
+import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
import javax.jcr.PropertyType;
+import javax.naming.Context;
/**
* Created by The eXo Platform SAS.
@@ -46,16 +64,26 @@
private LockCacheLoader lockCacheLoader;
- private ValueFactoryImpl valueFactory;
-
private final QPath testRoot = QPath.makeChildPath(Constants.ROOT_PATH, new InternalQName("", "testRoot"));
public void setUp() throws Exception
{
- this.lockManager = new TesterLockManagerImpl();
- this.lockCacheLoader = new LockCacheLoader(lockManager);
+ super.setUp();
+
+ lockManager = new TesterLockManagerImpl();
+ lockCacheLoader = new LockCacheLoader();
+ lockCacheLoader.injectDependencies(lockManager);
}
+ /**
+ * {@inheritDoc}
+ */
+ protected void tearDown() throws Exception
+ {
+
+ super.tearDown();
+ }
+
public void testLock() throws Exception
{
List<Modification> modifications = new ArrayList<Modification>();
Modified: jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jbosscache/TesterLockManagerImpl.java
===================================================================
--- jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jbosscache/TesterLockManagerImpl.java 2009-11-11 11:30:51 UTC (rev 558)
+++ jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jbosscache/TesterLockManagerImpl.java 2009-11-11 12:53:06 UTC (rev 559)
@@ -22,6 +22,7 @@
import org.exoplatform.services.jcr.impl.core.lock.LockData;
import org.exoplatform.services.jcr.impl.core.lock.LockManagerImpl;
import org.exoplatform.services.jcr.impl.dataflow.persistent.WorkspacePersistentDataManager;
+import org.jboss.cache.factories.annotations.NonVolatile;
import java.util.Map;
@@ -35,6 +36,7 @@
* @author <a href="mailto:anatoliy.bazko at exoplatform.com.ua">Anatoliy Bazko</a>
* @version $Id$
*/
+ at NonVolatile
public class TesterLockManagerImpl extends LockManagerImpl
{
More information about the exo-jcr-commits
mailing list