[exo-jcr-commits] exo-jcr SVN: r735 - in jcr/branches/1.12.0-JBC/component/core/src: main/java/org/exoplatform/services/jcr/impl/storage/inmemory and 4 other directories.

do-not-reply at jboss.org do-not-reply at jboss.org
Wed Nov 18 01:44:11 EST 2009


Author: tolusha
Date: 2009-11-18 01:44:11 -0500 (Wed, 18 Nov 2009)
New Revision: 735

Modified:
   jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/JBossCacheWorkspaceDataManager.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/JBossCacheStorage.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/JBossCacheWorkspaceDataContainer.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/JBossCacheStorageConnectionTest.java
   jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jbosscache/ObservationCacheLoaderTest.java
Log:
EXOJCR-201: remove deprecated $SESSION stub

Modified: jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/JBossCacheWorkspaceDataManager.java
===================================================================
--- jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/JBossCacheWorkspaceDataManager.java	2009-11-17 17:00:52 UTC (rev 734)
+++ jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/JBossCacheWorkspaceDataManager.java	2009-11-18 06:44:11 UTC (rev 735)
@@ -74,124 +74,85 @@
       WorkspaceStorageConnection thisConnection = null;
       WorkspaceStorageConnection systemConnection = null;
 
-      // prepare changes log list
-      List<PlainChangesLog> chengesLogList = new ArrayList<PlainChangesLog>();
-      if (changesLog instanceof PlainChangesLog)
-      {
-         chengesLogList.add((PlainChangesLog)changesLog);
-      }
-      else if (changesLog instanceof CompositeChangesLog)
-      {
-         for (ChangesLogIterator iter = ((CompositeChangesLog)changesLog).getLogIterator(); iter.hasNextLog();)
-         {
-            chengesLogList.add(iter.nextLog());
-         }
-      }
-
       try
       {
-         for (PlainChangesLog currChangesLog : chengesLogList)
+         for (Iterator<ItemState> iter = changesLog.getAllStates().iterator(); iter.hasNext();)
          {
-            boolean systemConnSessionInfoAdded = false;
-            boolean thisConnSessionInfoAdded = false;
+            ItemState itemState = iter.next();
 
-            for (Iterator<ItemState> iter = currChangesLog.getAllStates().iterator(); iter.hasNext();)
-            {
-               ItemState itemState = iter.next();
+            if (!itemState.isPersisted())
+               continue;
 
-               if (!itemState.isPersisted())
-                  continue;
+            long start = System.currentTimeMillis();
 
-               long start = System.currentTimeMillis();
+            TransientItemData data = (TransientItemData)itemState.getData();
 
-               TransientItemData data = (TransientItemData)itemState.getData();
+            WorkspaceStorageConnection conn = null;
+            if (isSystemDescendant(data.getQPath()))
+            {
+               conn = systemConnection == null
+               // we need system connection but it's not exist
+                  ? systemConnection = (systemDataContainer != dataContainer
+                  // if it's different container instances
+                     ? systemDataContainer.equals(dataContainer) && thisConnection != null
+                     // but container confugrations are same and non-system connnection open
+                        // reuse this connection as system
+                        ? systemDataContainer.reuseConnection(thisConnection)
+                        // or open one new system
+                        : systemDataContainer.openConnection()
+                     // else if it's same container instances (system and this)
+                     : thisConnection == null
+                     // and non-system connection doens't exist - open it
+                        ? thisConnection = dataContainer.openConnection()
+                        // if already open - use it
+                        : thisConnection)
+                  // system connection opened - use it
+                  : systemConnection;
+            }
+            else
+            {
+               conn = thisConnection == null
+               // we need this conatiner conection
+                  ? thisConnection = (systemDataContainer != dataContainer
+                  // if it's different container instances
+                     ? dataContainer.equals(systemDataContainer) && systemConnection != null
+                     // but container confugrations are same and system connnection open
+                        // reuse system connection as this
+                        ? dataContainer.reuseConnection(systemConnection)
+                        // or open one new
+                        : dataContainer.openConnection()
+                     // else if it's same container instances (system and this)
+                     : systemConnection == null
+                     // and system connection doens't exist - open it
+                        ? systemConnection = dataContainer.openConnection()
+                        // if already open - use it
+                        : systemConnection)
+                  // this connection opened - use it
+                  : thisConnection;
+            }
 
-               WorkspaceStorageConnection conn = null;
-               if (isSystemDescendant(data.getQPath()))
-               {
-                  conn = systemConnection == null
-                  // we need system connection but it's not exist
-                     ? systemConnection = (systemDataContainer != dataContainer
-                     // if it's different container instances
-                        ? systemDataContainer.equals(dataContainer) && thisConnection != null
-                        // but container confugrations are same and non-system connnection open
-                           // reuse this connection as system
-                           ? systemDataContainer.reuseConnection(thisConnection)
-                           // or open one new system
-                           : systemDataContainer.openConnection()
-                        // else if it's same container instances (system and this)
-                        : thisConnection == null
-                        // and non-system connection doens't exist - open it
-                           ? thisConnection = dataContainer.openConnection()
-                           // if already open - use it
-                           : thisConnection)
-                     // system connection opened - use it
-                     : systemConnection;
+            data.increasePersistedVersion();
 
-                  if (!systemConnSessionInfoAdded)
-                  {
-                     if (!systemConnection.equals(thisConnection))
-                        systemConnection.addSessionInfo(currChangesLog.getSessionId());
-                     systemConnSessionInfoAdded = true;
-                  }
-               }
-               else
-               {
-                  conn = thisConnection == null
-                  // we need this conatiner conection
-                     ? thisConnection = (systemDataContainer != dataContainer
-                     // if it's different container instances
-                        ? dataContainer.equals(systemDataContainer) && systemConnection != null
-                        // but container confugrations are same and system connnection open
-                           // reuse system connection as this
-                           ? dataContainer.reuseConnection(systemConnection)
-                           // or open one new
-                           : dataContainer.openConnection()
-                        // else if it's same container instances (system and this)
-                        : systemConnection == null
-                        // and system connection doens't exist - open it
-                           ? systemConnection = dataContainer.openConnection()
-                           // if already open - use it
-                           : systemConnection)
-                     // this connection opened - use it
-                     : thisConnection;
-
-                  if (!thisConnSessionInfoAdded)
-                  {
-                     if (!thisConnection.equals(systemConnection))
-                        thisConnection.addSessionInfo(currChangesLog.getSessionId());
-                     thisConnSessionInfoAdded = true;
-                  }
-               }
-
-               data.increasePersistedVersion();
-
-               if (itemState.isAdded())
-               {
-                  doAdd(data, conn, addedNodes);
-               }
-               else if (itemState.isUpdated())
-               {
-                  doUpdate(data, conn);
-               }
-               else if (itemState.isDeleted())
-               {
-                  doDelete(data, conn);
-               }
-               else if (itemState.isRenamed())
-               {
-                  doRename(data, conn, addedNodes);
-               }
-
-               if (LOG.isDebugEnabled())
-                  LOG.debug(ItemState.nameFromValue(itemState.getState()) + " " + (System.currentTimeMillis() - start)
-                     + "ms, " + data.getQPath().getAsString());
+            if (itemState.isAdded())
+            {
+               doAdd(data, conn, addedNodes);
             }
-            //TODO rainf0x
-            /*if (thisConnection != null)
-               thisConnection.removeSessionInfo();
-            if (systemConnection != null && !systemConnection.equals(thisConnection))
-               systemConnection.removeSessionInfo();*/
+            else if (itemState.isUpdated())
+            {
+               doUpdate(data, conn);
+            }
+            else if (itemState.isDeleted())
+            {
+               doDelete(data, conn);
+            }
+            else if (itemState.isRenamed())
+            {
+               doRename(data, conn, addedNodes);
+            }
+
+            if (LOG.isDebugEnabled())
+               LOG.debug(ItemState.nameFromValue(itemState.getState()) + " " + (System.currentTimeMillis() - start)
+                  + "ms, " + data.getQPath().getAsString());
          }
          if (thisConnection != null)
             thisConnection.commit();

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-17 17:00:52 UTC (rev 734)
+++ jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/inmemory/InmemoryStorageConnection.java	2009-11-18 06:44:11 UTC (rev 735)
@@ -212,20 +212,6 @@
    {
    }
 
-   /**
-    * {@inheritDoc}
-    */
-   public void addSessionInfo(String sessionId) throws RepositoryException
-   {
-   }
-
-   /**
-    * {@inheritDoc}
-    */
-   public void removeSessionInfo() throws RepositoryException
-   {
-   }
-
    public boolean isOpened()
    {
       return false;

Modified: jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JBossCacheStorage.java
===================================================================
--- jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JBossCacheStorage.java	2009-11-17 17:00:52 UTC (rev 734)
+++ jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JBossCacheStorage.java	2009-11-18 06:44:11 UTC (rev 735)
@@ -35,6 +35,7 @@
 public abstract class JBossCacheStorage
 {
 
+   @Deprecated
    public static final String SESSION = "$SESSION".intern();
 
    public static final String NODES = "$NODES".intern();
@@ -47,30 +48,28 @@
 
    public static final String ITEM_ID = "$id".intern();
 
+   @Deprecated
    public static final String SESSION_ID = "$sessionId".intern();
 
+   @Deprecated
    public static final String USER_ID = "$userId".intern();
-   
+
    public static final String LOCK_DATA = "$lock".intern();
 
    protected final Node<Serializable, Object> nodesRoot;
 
    protected final Node<Serializable, Object> propsRoot;
 
-   protected final Node<Serializable, Object> sessionRoot;
-   
    protected final Node<Serializable, Object> locksRoot;
 
    protected JBossCacheStorage(Node<Serializable, Object> nodesRoot, Node<Serializable, Object> propsRoot,
-      Node<Serializable, Object> sessionRoot, Node<Serializable, Object> locksRoot)
+      Node<Serializable, Object> locksRoot)
    {
       this.nodesRoot = nodesRoot;
 
       this.propsRoot = propsRoot;
 
-      this.sessionRoot = sessionRoot;
-      
-      this.locksRoot = locksRoot; 
+      this.locksRoot = locksRoot;
    }
 
    /**

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-17 17:00:52 UTC (rev 734)
+++ jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JBossCacheStorageConnection.java	2009-11-18 06:44:11 UTC (rev 735)
@@ -74,9 +74,9 @@
     * @param cache Cache<Serializable, Object>
     */
    public JBossCacheStorageConnection(Cache<Serializable, Object> cache, Node<Serializable, Object> nodesRoot,
-      Node<Serializable, Object> propsRoot, Node<Serializable, Object> sessionRoot, Node<Serializable, Object> locksRoot)
+      Node<Serializable, Object> propsRoot, Node<Serializable, Object> locksRoot)
    {
-      super(nodesRoot, propsRoot, sessionRoot, locksRoot);
+      super(nodesRoot, propsRoot, locksRoot);
 
       this.cache = cache;
    }
@@ -646,38 +646,6 @@
    }
 
    /**
-    * {@inheritDoc}
-    */
-   public void addSessionInfo(String sessionId) throws RepositoryException
-   {
-      startBatch();
-
-      if (sessionRoot.getData().size() != 0)
-      {
-         throw new RepositoryException("Session attributes already exists in cache storage.");
-      }
-
-      // add attributes
-      sessionRoot.put(JBossCacheStorage.SESSION_ID, sessionId);
-   }
-
-   /**
-    * {@inheritDoc}
-    */
-   public void removeSessionInfo() throws InvalidItemStateException, RepositoryException
-   {
-      startBatch();
-
-      if (sessionRoot.getData().size() == 0)
-      {
-         throw new RepositoryException("Session attributes not exists in cache storage.");
-      }
-
-      // remove attributes
-      sessionRoot.clearData();
-   }
-
-   /**
     *  Start batching.
     */
    private void startBatch()

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-17 17:00:52 UTC (rev 734)
+++ jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JBossCacheTreeStorageConnection.java	2009-11-18 06:44:11 UTC (rev 735)
@@ -395,20 +395,6 @@
    }
 
    /**
-    * {@inheritDoc}
-    */
-   public void addSessionInfo(String sessionId) throws RepositoryException
-   {
-   }
-
-   /**
-    * {@inheritDoc}
-    */
-   public void removeSessionInfo() throws InvalidItemStateException, RepositoryException
-   {
-   }
-
-   /**
     *  Start batching.
     */
    private void startBatch()

Modified: jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JBossCacheWorkspaceDataContainer.java
===================================================================
--- jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JBossCacheWorkspaceDataContainer.java	2009-11-17 17:00:52 UTC (rev 734)
+++ jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JBossCacheWorkspaceDataContainer.java	2009-11-18 06:44:11 UTC (rev 735)
@@ -72,8 +72,6 @@
 
    private Node<Serializable, Object> properties;
 
-   private Node<Serializable, Object> session;
-
    private Node<Serializable, Object> locks;
 
    /**
@@ -131,7 +129,6 @@
       cache.startBatch();
       this.nodes = cacheRoot.addChild(Fqn.fromElements(JBossCacheStorage.NODES));
       this.properties = cacheRoot.addChild(Fqn.fromElements(JBossCacheStorage.PROPS));
-      this.session = cacheRoot.addChild(Fqn.fromElements(JBossCacheStorage.SESSION)); // TODO remove it
       this.locks = cacheRoot.addChild(Fqn.fromElements(JBossCacheStorage.LOCKS));
       cache.endBatch(true);
    }
@@ -182,7 +179,7 @@
       //         throw new RepositoryException("Container is not started");
       //      }
 
-      return new JBossCacheStorageConnection(cache, nodes, properties, session, locks);
+      return new JBossCacheStorageConnection(cache, nodes, properties, locks);
    }
 
    /**
@@ -196,7 +193,7 @@
       //         throw new RepositoryException("Container is not started");
       //      }
 
-      return new JBossCacheStorageConnection(cache, nodes, properties, session, locks);
+      return new JBossCacheStorageConnection(cache, nodes, properties, locks);
    }
 
    /**

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-17 17:00:52 UTC (rev 734)
+++ jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCStorageConnection.java	2009-11-18 06:44:11 UTC (rev 735)
@@ -716,20 +716,6 @@
       return null;
    }
 
-   /**
-    * {@inheritDoc}
-    */
-   public void addSessionInfo(String sessionId) throws RepositoryException
-   {
-   }
-
-   /**
-    * {@inheritDoc}
-    */
-   public void removeSessionInfo() throws RepositoryException
-   {
-   }
-
    // ------------------ Private methods ---------------
 
    /**
@@ -2017,7 +2003,7 @@
       try
       {
          List<PropertyDataInfo> children = new ArrayList<PropertyDataInfo>();
-         
+
          ResultSet prop = findChildPropertiesIdNameByParentIdentifier(getInternalId(parentId));
          while (prop.next())
          {

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-17 17:00:52 UTC (rev 734)
+++ jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/storage/WorkspaceStorageConnection.java	2009-11-18 06:44:11 UTC (rev 735)
@@ -259,7 +259,7 @@
     */
    void delete(NodeData data) throws RepositoryException, UnsupportedOperationException, InvalidItemStateException,
       IllegalStateException;
-   
+
    /**
     * Deletes <code>PropertyData</code>.
     * 
@@ -310,38 +310,19 @@
    void close() throws IllegalStateException, RepositoryException;
 
    /**
-    * Add session information to cache storage. 
-    *
-    * @param sessionId
-    *          the session identifier to be added 
-    * 
-    * @throws RepositoryException
-    *           if some exception occured
-    */
-   void addSessionInfo(String sessionId) throws RepositoryException;
-
-   /**
-    * Remove session information from cache storage. 
-    *
-    * @throws RepositoryException
-    *           if some exception occured
-    */
-   void removeSessionInfo() throws RepositoryException;
-
-   /**
     * Returns true if connection can be used.
     * 
     * @return boolean, true if connection is open and ready, false - otherwise
     */
    boolean isOpened();
-   
+
    /**
     * @param identifier
     * @return
     *    LockData by given node uuid, or null if not present
     */
    LockData getLockData(String identifier);
-   
+
    /**
     * @return
     *    List of all locks.

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-17 17:00:52 UTC (rev 734)
+++ jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jbosscache/AbstractCacheLoaderTest.java	2009-11-18 06:44:11 UTC (rev 735)
@@ -162,7 +162,7 @@
       list.add(modification);
       return list;
    }
-   
+
    /**
     * Returns {@link Modification} like as node update. 
     * 
@@ -172,21 +172,24 @@
     * @param data
     * @return
     */
-   public List<Modification> updateNode(NodeData data) {
+   public List<Modification> updateNode(NodeData data)
+   {
 
-      List<Modification> list = new ArrayList<Modification>();      
-      Fqn fqn = Fqn.fromElements(JBossCacheStorage.NODES, data.getParentIdentifier(), data.getQPath().getEntries()[data.getQPath().getEntries().length - 1].getAsString(true));
-      
+      List<Modification> list = new ArrayList<Modification>();
+      Fqn fqn =
+         Fqn.fromElements(JBossCacheStorage.NODES, data.getParentIdentifier(), data.getQPath().getEntries()[data
+            .getQPath().getEntries().length - 1].getAsString(true));
+
       Modification modification =
          new Modification(ModificationType.PUT_KEY_VALUE, fqn, JBossCacheStorage.ITEM_ID, data.getIdentifier());
       list.add(modification);
-      
+
       fqn = Fqn.fromElements(JBossCacheStorage.NODES, data.getIdentifier());
       modification = new Modification(ModificationType.PUT_KEY_VALUE, fqn, JBossCacheStorage.ITEM_DATA, data);
       modification.setOldValue(data);
       list.add(modification);
-      
-      return list;      
+
+      return list;
    }
 
    /**
@@ -227,6 +230,7 @@
     * @param userId
     * @return
     */
+   @Deprecated
    public List<Modification> addSessionInfo(String sessionId, String userId)
    {
       List<Modification> list = new ArrayList<Modification>();
@@ -247,6 +251,7 @@
     * 
     * @return
     */
+   @Deprecated
    public List<Modification> removeSessionInfo()
    {
       List<Modification> list = new ArrayList<Modification>();

Modified: jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JBossCacheStorageConnectionTest.java
===================================================================
--- jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JBossCacheStorageConnectionTest.java	2009-11-17 17:00:52 UTC (rev 734)
+++ jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JBossCacheStorageConnectionTest.java	2009-11-18 06:44:11 UTC (rev 735)
@@ -59,8 +59,6 @@
 
    protected Node<Serializable, Object> props;
 
-   protected Node<Serializable, Object> session;
-
    protected Node<Serializable, Object> locks;
 
    protected String jbcConfig;
@@ -88,11 +86,10 @@
       // prepare cache structures
       nodes = cacheRoot.addChild(Fqn.fromString(JBossCacheStorage.NODES));
       props = cacheRoot.addChild(Fqn.fromString(JBossCacheStorage.PROPS));
-      session = cacheRoot.addChild(Fqn.fromString(JBossCacheStorage.SESSION));
-      locks = cacheRoot.addChild(Fqn.fromString(JBossCacheStorage.SESSION));
+      locks = cacheRoot.addChild(Fqn.fromString(JBossCacheStorage.LOCKS));
 
       // JCR connection
-      conn = new JBossCacheStorageConnection(cache, nodes, props, session, locks);
+      conn = new JBossCacheStorageConnection(cache, nodes, props, locks);
    }
 
    protected void initJBCConfig()

Modified: jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jbosscache/ObservationCacheLoaderTest.java
===================================================================
--- jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jbosscache/ObservationCacheLoaderTest.java	2009-11-17 17:00:52 UTC (rev 734)
+++ jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jbosscache/ObservationCacheLoaderTest.java	2009-11-18 06:44:11 UTC (rev 735)
@@ -473,10 +473,6 @@
          storage.put(data.getIdentifier(), data);
       }
 
-      public void addSessionInfo(String sessionId, String userId) throws RepositoryException
-      {
-      }
-
       public void close() throws IllegalStateException, RepositoryException
       {
       }
@@ -529,10 +525,6 @@
          return null;
       }
 
-      public void removeSessionInfo() throws RepositoryException
-      {
-      }
-
       public void rename(NodeData data) throws RepositoryException, UnsupportedOperationException,
          InvalidItemStateException, IllegalStateException
       {
@@ -552,10 +544,6 @@
       {
       }
 
-      public void addSessionInfo(String sessionId) throws RepositoryException
-      {
-      }
-
       /**
        * @see org.exoplatform.services.jcr.storage.WorkspaceStorageConnection#getLockData(java.lang.String)
        */



More information about the exo-jcr-commits mailing list