[exo-jcr-commits] exo-jcr SVN: r5992 - in jcr/trunk: exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/lock and 2 other directories.

Friday, 30 March 2012


Author: areshetnyak
Date: 2012-03-30 04:07:47 -0400 (Fri, 30 Mar 2012)
New Revision: 5992

Modified:
  
jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/java/org/exoplatform/services/jcr/impl/core/lock/infinispan/ISPNCacheableLockManagerImpl.java
  
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/jbosscache/CacheableLockManagerImpl.java
  
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/jbosscache/ControllerCacheLoader.java
  
jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/lock/TestLockImpl.java
  
jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-jcr-config-ijdbc-jbc.xml
  
jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-jcr-config-mjdbc-jbc.xml
  
jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-jcr-config-sjdbc-jbc.xml
Log:
EXOJCR-1804 : Problem in CacheableLockManagerImpl (JbossCache) with  not loading data from
cache loader after second start repository (stop and start on repository) in
"jbosscache-shareable" mode was fixed.

Modified:
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/jbosscache/CacheableLockManagerImpl.java
===================================================================
---
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/jbosscache/CacheableLockManagerImpl.java	2012-03-30
07:40:12 UTC (rev 5991)
+++
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/jbosscache/CacheableLockManagerImpl.java	2012-03-30
08:07:47 UTC (rev 5992)
@@ -208,6 +208,7 @@
                }
             });
          }
+         
          PrivilegedJBossCacheHelper.create(cache);
          if (cache.getCacheStatus().startAllowed())
          {
@@ -215,13 +216,12 @@
             addCacheLoader();
             PrivilegedJBossCacheHelper.start(cache);
          }
-
-         createStructuredNode(lockRoot);
       }
       else
       {
          throw new RepositoryConfigurationException("Cache configuration not
found");
       }
+      
 
       this.getNumLocks = new LockActionNonTxAware<Integer, Object>()
       {
@@ -479,6 +479,7 @@
       }
 
       ControllerCacheLoader ccl = new ControllerCacheLoader(currentCL);
+      
       List<IndividualCacheLoaderConfig> newConfig = new
ArrayList<IndividualCacheLoaderConfig>(1);
       // create CacheLoaderConfig
       IndividualCacheLoaderConfig cclConfig = new IndividualCacheLoaderConfig();
@@ -498,11 +499,62 @@
          LOG.info("The configured cache loader has been encapsulated
successfully");
       }
    }
+   
+   private ControllerCacheLoader getControllerCacheLoader()
+   {
+      CacheLoaderConfig config = cache.getConfiguration().getCacheLoaderConfig();
+      List<IndividualCacheLoaderConfig> oldConfigs;
+      if (config == null || (oldConfigs = config.getIndividualCacheLoaderConfigs()) ==
null || oldConfigs.isEmpty())
+      {
+         if (LOG.isInfoEnabled())
+         {
+            LOG.info("No cache loader has been defined, thus no need to encapsulate
any cache loader.");
+         }
+         return null;
+      }
+      CacheLoaderManager clm =
+         ((CacheSPI<Serializable,
Object>)cache).getComponentRegistry().getComponent(CacheLoaderManager.class);
+      if (clm == null)
+      {
+         LOG.error("The CacheLoaderManager cannot be found");
+         return null;
+      }
+      CacheLoader currentCL = clm.getCacheLoader();
+      if (currentCL == null)
+      {
+         LOG.error("The CacheLoader cannot be found");
+         return null;
+      }
 
+      return (ControllerCacheLoader)currentCL;
+   }
+
    /**
     * {@inheritDoc}
     */
-   @Override
+   public void start()
+   {
+      ControllerCacheLoader ccl = getControllerCacheLoader();
+      if (ccl != null)
+      {
+         try
+         {
+            ccl.enableDirectAccess();
+            createStructuredNode(lockRoot);
+            getLockList();
+         }
+         finally
+         {
+            ccl.disableDirectAccess();
+         }
+      }
+
+      super.start(); 
+   }
+   
+   /**
+    * {@inheritDoc}
+    */
    public void stop()
    {
       super.stop();

Modified:
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/jbosscache/ControllerCacheLoader.java
===================================================================
---
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/jbosscache/ControllerCacheLoader.java	2012-03-30
07:40:12 UTC (rev 5991)
+++
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/jbosscache/ControllerCacheLoader.java	2012-03-30
08:07:47 UTC (rev 5992)
@@ -31,6 +31,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.concurrent.atomic.AtomicBoolean;
 
 /**
  * This {@link CacheLoader} is used to encapsulate the {@link CacheLoader} used to
persist the data of the Locks.
@@ -50,6 +51,17 @@
 public class ControllerCacheLoader implements CacheLoader
 {
    /**
+    *  Thread local parameter for allow direct access to the data from cache loader. 
+    */
+   private ThreadLocal<Boolean> allowDirectAccess = new
ThreadLocal<Boolean>(){
+      @Override
+      protected Boolean initialValue()
+      {
+         return false;
+      }
+   };
+	
+   /**
     * The nested cache loader
     */
    private final CacheLoader cl;
@@ -103,6 +115,11 @@
             return cl.exists(name);
          }
       }
+      else if (allowDirectAccess.get())
+      {
+         return cl.exists(name);
+      }
+      
       // All the data is loaded at startup, so no need to call the nested cache loader
for another
       // cache status other than CacheStatus.STARTING
       return false;
@@ -130,6 +147,11 @@
             return cl.get(name);
          }
       }
+      else if (allowDirectAccess.get())
+      {
+         return cl.get(name);
+      }
+      
       // All the data is loaded at startup, so no need to call the nested cache loader
for another
       // cache status other than CacheStatus.STARTING
       return null;
@@ -305,4 +327,21 @@
       cl.stop();
    }
 
+   
+   /**
+    * Enable direct access to the data from cache loader.
+    */
+   protected void enableDirectAccess()
+   {
+      allowDirectAccess.set(true);
+   }
+  
+   /**
+   * Disable direct access to the data from cache loader.
+   */
+   protected void disableDirectAccess()
+   {
+      allowDirectAccess.set(false);
+   }
+  
 }

Modified:
jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/lock/TestLockImpl.java
===================================================================
---
jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/lock/TestLockImpl.java	2012-03-30
07:40:12 UTC (rev 5991)
+++
jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/lock/TestLockImpl.java	2012-03-30
08:07:47 UTC (rev 5992)
@@ -167,5 +167,37 @@
       // node should not be locked after removing lock data from lock tables
       assertFalse(node.isLocked());
    }
+   
+   public void testLoadLocksAfterStopStart() throws Exception
+   {
+      Node node = session.getRootNode().addNode("testLock");
+      node.addMixin("mix:lockable");
+      node.addMixin("mix:referenceable");
+      session.save();
 
+      node.lock(false, false);
+      session.save();
+
+      assertTrue(node.isLocked());
+
+      AbstractCacheableLockManager lockManager =
+        
(AbstractCacheableLockManager)repository.getWorkspaceContainer("ws").getComponent(
+            AbstractCacheableLockManager.class);
+      
+      lockManager.stop();
+
+      try
+      {
+         assertFalse(lockManager.lockExist(node.getUUID()));
+      }
+      catch (IllegalStateException e)
+      {
+         // not check for ISPN cache.
+      }
+      
+      lockManager.start();
+      
+      assertTrue(lockManager.lockExist(node.getUUID()));
+   }
+
 }

Modified:
jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-jcr-config-ijdbc-jbc.xml
===================================================================
---
jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-jcr-config-ijdbc-jbc.xml	2012-03-30
07:40:12 UTC (rev 5991)
+++
jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-jcr-config-ijdbc-jbc.xml	2012-03-30
08:07:47 UTC (rev 5992)
@@ -76,10 +76,10 @@
                   <properties>
                      <property name="time-out" value="15m" />
                      <property name="jbosscache-configuration"
value="conf/standalone/test-jbosscache-lock.xml" />
-                     <property name="jbosscache-cl-cache.jdbc.table.name"
value="jcrlocks_db1_ws" />
+                     <property name="jbosscache-cl-cache.jdbc.table.name"
value="jcrlocks_db1" />
                      <property name="jbosscache-cl-cache.jdbc.table.create"
value="true" />
                      <property name="jbosscache-cl-cache.jdbc.table.drop"
value="false" />
-                     <property
name="jbosscache-cl-cache.jdbc.table.primarykey"
value="jcrlocks_db1_ws_pk" />
+                     <property
name="jbosscache-cl-cache.jdbc.table.primarykey"
value="jcrlocks_db1_pk" />
                      <property name="jbosscache-cl-cache.jdbc.fqn.column"
value="fqn" />
                      <property name="jbosscache-cl-cache.jdbc.node.column"
value="node" />
                      <property name="jbosscache-cl-cache.jdbc.parent.column"
value="parent" />
@@ -134,10 +134,10 @@
                   <properties>
                      <property name="time-out" value="15m" />
                      <property name="jbosscache-configuration"
value="conf/standalone/test-jbosscache-lock.xml" />
-                     <property name="jbosscache-cl-cache.jdbc.table.name"
value="jcrlocks_db1_ws1" />
+                     <property name="jbosscache-cl-cache.jdbc.table.name"
value="jcrlocks_db1" />
                      <property name="jbosscache-cl-cache.jdbc.table.create"
value="true" />
                      <property name="jbosscache-cl-cache.jdbc.table.drop"
value="false" />
-                     <property
name="jbosscache-cl-cache.jdbc.table.primarykey"
value="jcrlocks_db1_ws1_pk" />
+                     <property
name="jbosscache-cl-cache.jdbc.table.primarykey"
value="jcrlocks_db1_pk" />
                      <property name="jbosscache-cl-cache.jdbc.fqn.column"
value="fqn" />
                      <property name="jbosscache-cl-cache.jdbc.node.column"
value="node" />
                      <property name="jbosscache-cl-cache.jdbc.parent.column"
value="parent" />
@@ -192,10 +192,10 @@
                   <properties>
                      <property name="time-out" value="15m" />
                      <property name="jbosscache-configuration"
value="conf/standalone/test-jbosscache-lock.xml" />
-                     <property name="jbosscache-cl-cache.jdbc.table.name"
value="jcrlocks_db1_ws2" />
+                     <property name="jbosscache-cl-cache.jdbc.table.name"
value="jcrlocks_db1" />
                      <property name="jbosscache-cl-cache.jdbc.table.create"
value="true" />
                      <property name="jbosscache-cl-cache.jdbc.table.drop"
value="false" />
-                     <property
name="jbosscache-cl-cache.jdbc.table.primarykey"
value="jcrlocks_db1_ws2_pk" />
+                     <property
name="jbosscache-cl-cache.jdbc.table.primarykey"
value="jcrlocks_db1_pk" />
                      <property name="jbosscache-cl-cache.jdbc.fqn.column"
value="fqn" />
                      <property name="jbosscache-cl-cache.jdbc.node.column"
value="node" />
                      <property name="jbosscache-cl-cache.jdbc.parent.column"
value="parent" />
@@ -272,10 +272,10 @@
                   <properties>
                      <property name="time-out" value="15m" />
                      <property name="jbosscache-configuration"
value="conf/standalone/test-jbosscache-lock.xml" />
-                     <property name="jbosscache-cl-cache.jdbc.table.name"
value="jcrlocks_db1_ws3" />
+                     <property name="jbosscache-cl-cache.jdbc.table.name"
value="jcrlocks_db1" />
                      <property name="jbosscache-cl-cache.jdbc.table.create"
value="true" />
                      <property name="jbosscache-cl-cache.jdbc.table.drop"
value="false" />
-                     <property
name="jbosscache-cl-cache.jdbc.table.primarykey"
value="jcrlocks_db1_ws3_pk" />
+                     <property
name="jbosscache-cl-cache.jdbc.table.primarykey"
value="jcrlocks_db1_pk" />
                      <property name="jbosscache-cl-cache.jdbc.fqn.column"
value="fqn" />
                      <property name="jbosscache-cl-cache.jdbc.node.column"
value="node" />
                      <property name="jbosscache-cl-cache.jdbc.parent.column"
value="parent" />
@@ -340,10 +340,10 @@
                   <properties>
                      <property name="time-out" value="15m" />
                      <property name="jbosscache-configuration"
value="conf/standalone/test-jbosscache-lock.xml" />
-                     <property name="jbosscache-cl-cache.jdbc.table.name"
value="jcrlocks_db2_ws" />
+                     <property name="jbosscache-cl-cache.jdbc.table.name"
value="jcrlocks_db2" />
                      <property name="jbosscache-cl-cache.jdbc.table.create"
value="true" />
                      <property name="jbosscache-cl-cache.jdbc.table.drop"
value="false" />
-                     <property
name="jbosscache-cl-cache.jdbc.table.primarykey"
value="jcrlocks_db2_ws_pk" />
+                     <property
name="jbosscache-cl-cache.jdbc.table.primarykey"
value="jcrlocks_db2_pk" />
                      <property name="jbosscache-cl-cache.jdbc.fqn.column"
value="fqn" />
                      <property name="jbosscache-cl-cache.jdbc.node.column"
value="node" />
                      <property name="jbosscache-cl-cache.jdbc.parent.column"
value="parent" />
@@ -397,10 +397,10 @@
                   <properties>
                      <property name="time-out" value="15m" />
                      <property name="jbosscache-configuration"
value="conf/standalone/test-jbosscache-lock.xml" />
-                     <property name="jbosscache-cl-cache.jdbc.table.name"
value="jcrlocks_db2_ws1" />
+                     <property name="jbosscache-cl-cache.jdbc.table.name"
value="jcrlocks_db2" />
                      <property name="jbosscache-cl-cache.jdbc.table.create"
value="true" />
                      <property name="jbosscache-cl-cache.jdbc.table.drop"
value="false" />
-                     <property
name="jbosscache-cl-cache.jdbc.table.primarykey"
value="jcrlocks_db2_ws1_pk" />
+                     <property
name="jbosscache-cl-cache.jdbc.table.primarykey"
value="jcrlocks_db2_pk" />
                      <property name="jbosscache-cl-cache.jdbc.fqn.column"
value="fqn" />
                      <property name="jbosscache-cl-cache.jdbc.node.column"
value="node" />
                      <property name="jbosscache-cl-cache.jdbc.parent.column"
value="parent" />
@@ -474,10 +474,10 @@
                   <properties>
                      <property name="time-out" value="15m" />
                      <property name="jbosscache-configuration"
value="conf/standalone/test-jbosscache-lock.xml" />
-                     <property name="jbosscache-cl-cache.jdbc.table.name"
value="jcrlocks_db1tck_ws" />
+                     <property name="jbosscache-cl-cache.jdbc.table.name"
value="jcrlocks_db1tck" />
                      <property name="jbosscache-cl-cache.jdbc.table.create"
value="true" />
                      <property name="jbosscache-cl-cache.jdbc.table.drop"
value="false" />
-                     <property
name="jbosscache-cl-cache.jdbc.table.primarykey"
value="jcrlocks_db1tck_ws_pk" />
+                     <property
name="jbosscache-cl-cache.jdbc.table.primarykey"
value="jcrlocks_db1tck_pk" />
                      <property name="jbosscache-cl-cache.jdbc.fqn.column"
value="fqn" />
                      <property name="jbosscache-cl-cache.jdbc.node.column"
value="node" />
                      <property name="jbosscache-cl-cache.jdbc.parent.column"
value="parent" />
@@ -540,10 +540,10 @@
                   <properties>
                      <property name="time-out" value="15m" />
                      <property name="jbosscache-configuration"
value="conf/standalone/test-jbosscache-lock.xml" />
-                     <property name="jbosscache-cl-cache.jdbc.table.name"
value="jcrlocks_db1tck_ws1" />
+                     <property name="jbosscache-cl-cache.jdbc.table.name"
value="jcrlocks_db1tck" />
                      <property name="jbosscache-cl-cache.jdbc.table.create"
value="true" />
                      <property name="jbosscache-cl-cache.jdbc.table.drop"
value="false" />
-                     <property
name="jbosscache-cl-cache.jdbc.table.primarykey"
value="jcrlocks_db1tck_ws1_pk" />
+                     <property
name="jbosscache-cl-cache.jdbc.table.primarykey"
value="jcrlocks_db1tck_pk" />
                      <property name="jbosscache-cl-cache.jdbc.fqn.column"
value="fqn" />
                      <property name="jbosscache-cl-cache.jdbc.node.column"
value="node" />
                      <property name="jbosscache-cl-cache.jdbc.parent.column"
value="parent" />
@@ -609,10 +609,10 @@
                   <properties>
                      <property name="time-out" value="15m" />
                      <property name="jbosscache-configuration"
value="conf/standalone/test-jbosscache-lock.xml" />
-                     <property name="jbosscache-cl-cache.jdbc.table.name"
value="jcrlocks_db1tck_ws2" />
+                     <property name="jbosscache-cl-cache.jdbc.table.name"
value="jcrlocks_db1tck" />
                      <property name="jbosscache-cl-cache.jdbc.table.create"
value="true" />
                      <property name="jbosscache-cl-cache.jdbc.table.drop"
value="false" />
-                     <property
name="jbosscache-cl-cache.jdbc.table.primarykey"
value="jcrlocks_db1tck_ws2_pk" />
+                     <property
name="jbosscache-cl-cache.jdbc.table.primarykey"
value="jcrlocks_db1tck_pk" />
                      <property name="jbosscache-cl-cache.jdbc.fqn.column"
value="fqn" />
                      <property name="jbosscache-cl-cache.jdbc.node.column"
value="node" />
                      <property name="jbosscache-cl-cache.jdbc.parent.column"
value="parent" />

Modified:
jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-jcr-config-mjdbc-jbc.xml
===================================================================
---
jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-jcr-config-mjdbc-jbc.xml	2012-03-30
07:40:12 UTC (rev 5991)
+++
jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-jcr-config-mjdbc-jbc.xml	2012-03-30
08:07:47 UTC (rev 5992)
@@ -76,10 +76,10 @@
                   <properties>
                      <property name="time-out" value="15m" />
                      <property name="jbosscache-configuration"
value="conf/standalone/test-jbosscache-lock.xml" />
-                     <property name="jbosscache-cl-cache.jdbc.table.name"
value="jcrlocks_db1_ws" />
+                     <property name="jbosscache-cl-cache.jdbc.table.name"
value="jcrlocks_db1" />
                      <property name="jbosscache-cl-cache.jdbc.table.create"
value="true" />
                      <property name="jbosscache-cl-cache.jdbc.table.drop"
value="false" />
-                     <property
name="jbosscache-cl-cache.jdbc.table.primarykey"
value="jcrlocks_db1_ws_pk" />
+                     <property
name="jbosscache-cl-cache.jdbc.table.primarykey"
value="jcrlocks_db1_pk" />
                      <property name="jbosscache-cl-cache.jdbc.fqn.column"
value="fqn" />
                      <property name="jbosscache-cl-cache.jdbc.node.column"
value="node" />
                      <property name="jbosscache-cl-cache.jdbc.parent.column"
value="parent" />
@@ -134,14 +134,14 @@
                   <properties>
                      <property name="time-out" value="15m" />
                      <property name="jbosscache-configuration"
value="conf/standalone/test-jbosscache-lock.xml" />
-                     <property name="jbosscache-cl-cache.jdbc.table.name"
value="jcrlocks_db1_ws1" />
+                     <property name="jbosscache-cl-cache.jdbc.table.name"
value="jcrlocks_db1" />
                      <property name="jbosscache-cl-cache.jdbc.table.create"
value="true" />
                      <property name="jbosscache-cl-cache.jdbc.table.drop"
value="false" />
-                     <property
name="jbosscache-cl-cache.jdbc.table.primarykey"
value="jcrlocks_db1_ws1_pk" />
+                     <property
name="jbosscache-cl-cache.jdbc.table.primarykey"
value="jcrlocks_db1_pk" />
                      <property name="jbosscache-cl-cache.jdbc.fqn.column"
value="fqn" />
                      <property name="jbosscache-cl-cache.jdbc.node.column"
value="node" />
                      <property name="jbosscache-cl-cache.jdbc.parent.column"
value="parent" />
-                     <property name="jbosscache-cl-cache.jdbc.datasource"
value="jdbcjcr1" />
+                     <property name="jbosscache-cl-cache.jdbc.datasource"
value="jdbcjcr" />
                      <property name="jbosscache-shareable"
value="${jbosscache-shareable}" />
                   </properties>
                </lock-manager>
@@ -192,14 +192,14 @@
                   <properties>
                      <property name="time-out" value="15m" />
                      <property name="jbosscache-configuration"
value="conf/standalone/test-jbosscache-lock.xml" />
-                     <property name="jbosscache-cl-cache.jdbc.table.name"
value="jcrlocks_db1_ws2" />
+                     <property name="jbosscache-cl-cache.jdbc.table.name"
value="jcrlocks_db1" />
                      <property name="jbosscache-cl-cache.jdbc.table.create"
value="true" />
                      <property name="jbosscache-cl-cache.jdbc.table.drop"
value="false" />
-                     <property
name="jbosscache-cl-cache.jdbc.table.primarykey"
value="jcrlocks_db1_ws2_pk" />
+                     <property
name="jbosscache-cl-cache.jdbc.table.primarykey"
value="jcrlocks_db1_pk" />
                      <property name="jbosscache-cl-cache.jdbc.fqn.column"
value="fqn" />
                      <property name="jbosscache-cl-cache.jdbc.node.column"
value="node" />
                      <property name="jbosscache-cl-cache.jdbc.parent.column"
value="parent" />
-                     <property name="jbosscache-cl-cache.jdbc.datasource"
value="jdbcjcr2" />
+                     <property name="jbosscache-cl-cache.jdbc.datasource"
value="jdbcjcr" />
                      <property name="jbosscache-shareable"
value="${jbosscache-shareable}" />
                   </properties>
                </lock-manager>
@@ -272,14 +272,14 @@
                   <properties>
                      <property name="time-out" value="15m" />
                      <property name="jbosscache-configuration"
value="conf/standalone/test-jbosscache-lock.xml" />
-                     <property name="jbosscache-cl-cache.jdbc.table.name"
value="jcrlocks_db1_ws3" />
+                     <property name="jbosscache-cl-cache.jdbc.table.name"
value="jcrlocks_db1" />
                      <property name="jbosscache-cl-cache.jdbc.table.create"
value="true" />
                      <property name="jbosscache-cl-cache.jdbc.table.drop"
value="false" />
-                     <property
name="jbosscache-cl-cache.jdbc.table.primarykey"
value="jcrlocks_db1_ws3_pk" />
+                     <property
name="jbosscache-cl-cache.jdbc.table.primarykey"
value="jcrlocks_db1_pk" />
                      <property name="jbosscache-cl-cache.jdbc.fqn.column"
value="fqn" />
                      <property name="jbosscache-cl-cache.jdbc.node.column"
value="node" />
                      <property name="jbosscache-cl-cache.jdbc.parent.column"
value="parent" />
-                     <property name="jbosscache-cl-cache.jdbc.datasource"
value="jdbcjcr3" />
+                     <property name="jbosscache-cl-cache.jdbc.datasource"
value="jdbcjcr" />
                      <property name="jbosscache-shareable"
value="${jbosscache-shareable}" />
                   </properties>
                </lock-manager>
@@ -340,10 +340,10 @@
                   <properties>
                      <property name="time-out" value="15m" />
                      <property name="jbosscache-configuration"
value="conf/standalone/test-jbosscache-lock.xml" />
-                     <property name="jbosscache-cl-cache.jdbc.table.name"
value="jcrlocks_db2_ws" />
+                     <property name="jbosscache-cl-cache.jdbc.table.name"
value="jcrlocks_db2" />
                      <property name="jbosscache-cl-cache.jdbc.table.create"
value="true" />
                      <property name="jbosscache-cl-cache.jdbc.table.drop"
value="false" />
-                     <property
name="jbosscache-cl-cache.jdbc.table.primarykey"
value="jcrlocks_db2_ws_pk" />
+                     <property
name="jbosscache-cl-cache.jdbc.table.primarykey"
value="jcrlocks_db2_pk" />
                      <property name="jbosscache-cl-cache.jdbc.fqn.column"
value="fqn" />
                      <property name="jbosscache-cl-cache.jdbc.node.column"
value="node" />
                      <property name="jbosscache-cl-cache.jdbc.parent.column"
value="parent" />
@@ -397,14 +397,14 @@
                   <properties>
                      <property name="time-out" value="15m" />
                      <property name="jbosscache-configuration"
value="conf/standalone/test-jbosscache-lock.xml" />
-                     <property name="jbosscache-cl-cache.jdbc.table.name"
value="jcrlocks_db2_ws1" />
+                     <property name="jbosscache-cl-cache.jdbc.table.name"
value="jcrlocks_db2" />
                      <property name="jbosscache-cl-cache.jdbc.table.create"
value="true" />
                      <property name="jbosscache-cl-cache.jdbc.table.drop"
value="false" />
-                     <property
name="jbosscache-cl-cache.jdbc.table.primarykey"
value="jcrlocks_db2_ws1_pk" />
+                     <property
name="jbosscache-cl-cache.jdbc.table.primarykey"
value="jcrlocks_db2_pk" />
                      <property name="jbosscache-cl-cache.jdbc.fqn.column"
value="fqn" />
                      <property name="jbosscache-cl-cache.jdbc.node.column"
value="node" />
                      <property name="jbosscache-cl-cache.jdbc.parent.column"
value="parent" />
-                     <property name="jbosscache-cl-cache.jdbc.datasource"
value="jdbcjcr1db2" />
+                     <property name="jbosscache-cl-cache.jdbc.datasource"
value="jdbcjcrdb2" />
                      <property name="jbosscache-shareable"
value="${jbosscache-shareable}" />
                   </properties>
                </lock-manager>
@@ -474,10 +474,10 @@
                   <properties>
                      <property name="time-out" value="15m" />
                      <property name="jbosscache-configuration"
value="conf/standalone/test-jbosscache-lock.xml" />
-                     <property name="jbosscache-cl-cache.jdbc.table.name"
value="jcrlocks_db1tck_ws" />
+                     <property name="jbosscache-cl-cache.jdbc.table.name"
value="jcrlocks_db1tck" />
                      <property name="jbosscache-cl-cache.jdbc.table.create"
value="true" />
                      <property name="jbosscache-cl-cache.jdbc.table.drop"
value="false" />
-                     <property
name="jbosscache-cl-cache.jdbc.table.primarykey"
value="jcrlocks_db1tck_ws_pk" />
+                     <property
name="jbosscache-cl-cache.jdbc.table.primarykey"
value="jcrlocks_db1tck_pk" />
                      <property name="jbosscache-cl-cache.jdbc.fqn.column"
value="fqn" />
                      <property name="jbosscache-cl-cache.jdbc.node.column"
value="node" />
                      <property name="jbosscache-cl-cache.jdbc.parent.column"
value="parent" />
@@ -540,14 +540,14 @@
                   <properties>
                      <property name="time-out" value="15m" />
                      <property name="jbosscache-configuration"
value="conf/standalone/test-jbosscache-lock.xml" />
-                     <property name="jbosscache-cl-cache.jdbc.table.name"
value="jcrlocks_db1tck_ws1" />
+                     <property name="jbosscache-cl-cache.jdbc.table.name"
value="jcrlocks_db1tck" />
                      <property name="jbosscache-cl-cache.jdbc.table.create"
value="true" />
                      <property name="jbosscache-cl-cache.jdbc.table.drop"
value="false" />
-                     <property
name="jbosscache-cl-cache.jdbc.table.primarykey"
value="jcrlocks_db1tck_ws1_pk" />
+                     <property
name="jbosscache-cl-cache.jdbc.table.primarykey"
value="jcrlocks_db1tck_pk" />
                      <property name="jbosscache-cl-cache.jdbc.fqn.column"
value="fqn" />
                      <property name="jbosscache-cl-cache.jdbc.node.column"
value="node" />
                      <property name="jbosscache-cl-cache.jdbc.parent.column"
value="parent" />
-                     <property name="jbosscache-cl-cache.jdbc.datasource"
value="jdbcjcr1tck" />
+                     <property name="jbosscache-cl-cache.jdbc.datasource"
value="jdbcjcrtck" />
                      <property name="jbosscache-shareable"
value="${jbosscache-shareable}" />
                   </properties>
                </lock-manager>
@@ -609,14 +609,14 @@
                   <properties>
                      <property name="time-out" value="15m" />
                      <property name="jbosscache-configuration"
value="conf/standalone/test-jbosscache-lock.xml" />
-                     <property name="jbosscache-cl-cache.jdbc.table.name"
value="jcrlocks_db1tck_ws2" />
+                     <property name="jbosscache-cl-cache.jdbc.table.name"
value="jcrlocks_db1tck" />
                      <property name="jbosscache-cl-cache.jdbc.table.create"
value="true" />
                      <property name="jbosscache-cl-cache.jdbc.table.drop"
value="false" />
-                     <property
name="jbosscache-cl-cache.jdbc.table.primarykey"
value="jcrlocks_db1tck_ws2_pk" />
+                     <property
name="jbosscache-cl-cache.jdbc.table.primarykey"
value="jcrlocks_db1tck_pk" />
                      <property name="jbosscache-cl-cache.jdbc.fqn.column"
value="fqn" />
                      <property name="jbosscache-cl-cache.jdbc.node.column"
value="node" />
                      <property name="jbosscache-cl-cache.jdbc.parent.column"
value="parent" />
-                     <property name="jbosscache-cl-cache.jdbc.datasource"
value="jdbcjcr2tck" />
+                     <property name="jbosscache-cl-cache.jdbc.datasource"
value="jdbcjcrtck" />
                      <property name="jbosscache-shareable"
value="${jbosscache-shareable}" />
                   </properties>
                </lock-manager>

Modified:
jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-jcr-config-sjdbc-jbc.xml
===================================================================
---
jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-jcr-config-sjdbc-jbc.xml	2012-03-30
07:40:12 UTC (rev 5991)
+++
jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-jcr-config-sjdbc-jbc.xml	2012-03-30
08:07:47 UTC (rev 5992)
@@ -77,10 +77,10 @@
                   <properties>
                      <property name="time-out" value="15m" />
                      <property name="jbosscache-configuration"
value="conf/standalone/test-jbosscache-lock.xml" />
-                     <property name="jbosscache-cl-cache.jdbc.table.name"
value="jcrlocks_db1_ws" />
+                     <property name="jbosscache-cl-cache.jdbc.table.name"
value="jcrlocks_db1" />
                      <property name="jbosscache-cl-cache.jdbc.table.create"
value="true" />
                      <property name="jbosscache-cl-cache.jdbc.table.drop"
value="false" />
-                     <property
name="jbosscache-cl-cache.jdbc.table.primarykey"
value="jcrlocks_db1_ws_pk" />
+                     <property
name="jbosscache-cl-cache.jdbc.table.primarykey"
value="jcrlocks_db1_pk" />
                      <property name="jbosscache-cl-cache.jdbc.fqn.column"
value="fqn" />
                      <property name="jbosscache-cl-cache.jdbc.node.column"
value="node" />
                      <property name="jbosscache-cl-cache.jdbc.parent.column"
value="parent" />
@@ -136,10 +136,10 @@
                   <properties>
                      <property name="time-out" value="15m" />
                      <property name="jbosscache-configuration"
value="conf/standalone/test-jbosscache-lock.xml" />
-                     <property name="jbosscache-cl-cache.jdbc.table.name"
value="jcrlocks_db1_ws1" />
+                     <property name="jbosscache-cl-cache.jdbc.table.name"
value="jcrlocks_db1" />
                      <property name="jbosscache-cl-cache.jdbc.table.create"
value="true" />
                      <property name="jbosscache-cl-cache.jdbc.table.drop"
value="false" />
-                     <property
name="jbosscache-cl-cache.jdbc.table.primarykey"
value="jcrlocks_db1_ws1_pk" />
+                     <property
name="jbosscache-cl-cache.jdbc.table.primarykey"
value="jcrlocks_db1_pk" />
                      <property name="jbosscache-cl-cache.jdbc.fqn.column"
value="fqn" />
                      <property name="jbosscache-cl-cache.jdbc.node.column"
value="node" />
                      <property name="jbosscache-cl-cache.jdbc.parent.column"
value="parent" />
@@ -195,10 +195,10 @@
                   <properties>
                      <property name="time-out" value="15m" />
                      <property name="jbosscache-configuration"
value="conf/standalone/test-jbosscache-lock.xml" />
-                     <property name="jbosscache-cl-cache.jdbc.table.name"
value="jcrlocks_db1_ws2" />
+                     <property name="jbosscache-cl-cache.jdbc.table.name"
value="jcrlocks_db1" />
                      <property name="jbosscache-cl-cache.jdbc.table.create"
value="true" />
                      <property name="jbosscache-cl-cache.jdbc.table.drop"
value="false" />
-                     <property
name="jbosscache-cl-cache.jdbc.table.primarykey"
value="jcrlocks_db1_ws2_pk" />
+                     <property
name="jbosscache-cl-cache.jdbc.table.primarykey"
value="jcrlocks_db1_pk" />
                      <property name="jbosscache-cl-cache.jdbc.fqn.column"
value="fqn" />
                      <property name="jbosscache-cl-cache.jdbc.node.column"
value="node" />
                      <property name="jbosscache-cl-cache.jdbc.parent.column"
value="parent" />
@@ -278,10 +278,10 @@
                   <properties>
                      <property name="time-out" value="15m" />
                      <property name="jbosscache-configuration"
value="conf/standalone/test-jbosscache-lock.xml" />
-                     <property name="jbosscache-cl-cache.jdbc.table.name"
value="jcrlocks_db1_ws3" />
+                     <property name="jbosscache-cl-cache.jdbc.table.name"
value="jcrlocks_db1" />
                      <property name="jbosscache-cl-cache.jdbc.table.create"
value="true" />
                      <property name="jbosscache-cl-cache.jdbc.table.drop"
value="false" />
-                     <property
name="jbosscache-cl-cache.jdbc.table.primarykey"
value="jcrlocks_db1_ws3_pk" />
+                     <property
name="jbosscache-cl-cache.jdbc.table.primarykey"
value="jcrlocks_db1_pk" />
                      <property name="jbosscache-cl-cache.jdbc.fqn.column"
value="fqn" />
                      <property name="jbosscache-cl-cache.jdbc.node.column"
value="node" />
                      <property name="jbosscache-cl-cache.jdbc.parent.column"
value="parent" />
@@ -347,10 +347,10 @@
                   <properties>
                      <property name="time-out" value="15m" />
                      <property name="jbosscache-configuration"
value="conf/standalone/test-jbosscache-lock.xml" />
-                     <property name="jbosscache-cl-cache.jdbc.table.name"
value="jcrlocks_db2_ws" />
+                     <property name="jbosscache-cl-cache.jdbc.table.name"
value="jcrlocks_db2" />
                      <property name="jbosscache-cl-cache.jdbc.table.create"
value="true" />
                      <property name="jbosscache-cl-cache.jdbc.table.drop"
value="false" />
-                     <property
name="jbosscache-cl-cache.jdbc.table.primarykey"
value="jcrlocks_db2_ws_pk" />
+                     <property
name="jbosscache-cl-cache.jdbc.table.primarykey"
value="jcrlocks_db2_pk" />
                      <property name="jbosscache-cl-cache.jdbc.fqn.column"
value="fqn" />
                      <property name="jbosscache-cl-cache.jdbc.node.column"
value="node" />
                      <property name="jbosscache-cl-cache.jdbc.parent.column"
value="parent" />
@@ -404,10 +404,10 @@
                   <properties>
                      <property name="time-out" value="15m" />
                      <property name="jbosscache-configuration"
value="conf/standalone/test-jbosscache-lock.xml" />
-                     <property name="jbosscache-cl-cache.jdbc.table.name"
value="jcrlocks_db2_ws1" />
+                     <property name="jbosscache-cl-cache.jdbc.table.name"
value="jcrlocks_db2" />
                      <property name="jbosscache-cl-cache.jdbc.table.create"
value="true" />
                      <property name="jbosscache-cl-cache.jdbc.table.drop"
value="false" />
-                     <property
name="jbosscache-cl-cache.jdbc.table.primarykey"
value="jcrlocks_db2_ws1_pk" />
+                     <property
name="jbosscache-cl-cache.jdbc.table.primarykey"
value="jcrlocks_db2_pk" />
                      <property name="jbosscache-cl-cache.jdbc.fqn.column"
value="fqn" />
                      <property name="jbosscache-cl-cache.jdbc.node.column"
value="node" />
                      <property name="jbosscache-cl-cache.jdbc.parent.column"
value="parent" />
@@ -481,10 +481,10 @@
                   <properties>
                      <property name="time-out" value="15m" />
                      <property name="jbosscache-configuration"
value="conf/standalone/test-jbosscache-lock.xml" />
-                     <property name="jbosscache-cl-cache.jdbc.table.name"
value="jcrlocks_db1tck_ws" />
+                     <property name="jbosscache-cl-cache.jdbc.table.name"
value="jcrlocks_db1tck" />
                      <property name="jbosscache-cl-cache.jdbc.table.create"
value="true" />
                      <property name="jbosscache-cl-cache.jdbc.table.drop"
value="false" />
-                     <property
name="jbosscache-cl-cache.jdbc.table.primarykey"
value="jcrlocks_db1tck_ws_pk" />
+                     <property
name="jbosscache-cl-cache.jdbc.table.primarykey"
value="jcrlocks_db1tck_pk" />
                      <property name="jbosscache-cl-cache.jdbc.fqn.column"
value="fqn" />
                      <property name="jbosscache-cl-cache.jdbc.node.column"
value="node" />
                      <property name="jbosscache-cl-cache.jdbc.parent.column"
value="parent" />
@@ -547,10 +547,10 @@
                   <properties>
                      <property name="time-out" value="15m" />
                      <property name="jbosscache-configuration"
value="conf/standalone/test-jbosscache-lock.xml" />
-                     <property name="jbosscache-cl-cache.jdbc.table.name"
value="jcrlocks_db1tck_ws1" />
+                     <property name="jbosscache-cl-cache.jdbc.table.name"
value="jcrlocks_db1tck" />
                      <property name="jbosscache-cl-cache.jdbc.table.create"
value="true" />
                      <property name="jbosscache-cl-cache.jdbc.table.drop"
value="false" />
-                     <property
name="jbosscache-cl-cache.jdbc.table.primarykey"
value="jcrlocks_db1tck_ws1_pk" />
+                     <property
name="jbosscache-cl-cache.jdbc.table.primarykey"
value="jcrlocks_db1tck_pk" />
                      <property name="jbosscache-cl-cache.jdbc.fqn.column"
value="fqn" />
                      <property name="jbosscache-cl-cache.jdbc.node.column"
value="node" />
                      <property name="jbosscache-cl-cache.jdbc.parent.column"
value="parent" />
@@ -616,10 +616,10 @@
                   <properties>
                      <property name="time-out" value="15m" />
                      <property name="jbosscache-configuration"
value="conf/standalone/test-jbosscache-lock.xml" />
-                     <property name="jbosscache-cl-cache.jdbc.table.name"
value="jcrlocks_db1tck_ws2" />
+                     <property name="jbosscache-cl-cache.jdbc.table.name"
value="jcrlocks_db1tck" />
                      <property name="jbosscache-cl-cache.jdbc.table.create"
value="true" />
                      <property name="jbosscache-cl-cache.jdbc.table.drop"
value="false" />
-                     <property
name="jbosscache-cl-cache.jdbc.table.primarykey"
value="jcrlocks_db1tck_ws2_pk" />
+                     <property
name="jbosscache-cl-cache.jdbc.table.primarykey"
value="jcrlocks_db1tck_pk" />
                      <property name="jbosscache-cl-cache.jdbc.fqn.column"
value="fqn" />
                      <property name="jbosscache-cl-cache.jdbc.node.column"
value="node" />
                      <property name="jbosscache-cl-cache.jdbc.parent.column"
value="parent" />

Modified:
jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/java/org/exoplatform/services/jcr/impl/core/lock/infinispan/ISPNCacheableLockManagerImpl.java
===================================================================
---
jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/java/org/exoplatform/services/jcr/impl/core/lock/infinispan/ISPNCacheableLockManagerImpl.java	2012-03-30
07:40:12 UTC (rev 5991)
+++
jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/main/java/org/exoplatform/services/jcr/impl/core/lock/infinispan/ISPNCacheableLockManagerImpl.java	2012-03-30
08:07:47 UTC (rev 5992)
@@ -119,7 +119,6 @@
          configureJDBCCacheLoader(config.getLockManager());
 
          cache = factory.createCache("L" +
config.getUniqueName().replace("_", ""), config.getLockManager());
-         PrivilegedISPNCacheHelper.start(cache);
       }
       else
       {
@@ -350,11 +349,19 @@
          LOG.warn("CacheLoader DataSource " + INFINISPAN_JDBC_CL_DATASOURCE +
" is not configured.");
       }
    }
+   
+   /**
+    * {@inheritDoc}
+    */
+   public void start()
+   {
+      PrivilegedISPNCacheHelper.start(cache);
+      super.start();
+   }
 
    /**
     * {@inheritDoc}
     */
-   @Override
    public void stop()
    {
       super.stop();


    

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

[exo-jcr-commits] exo-jcr SVN: r5992 - in jcr/trunk: exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/lock and 2 other directories.