March 2012 - exo-jcr-commits - Jboss List Archives

exo-jcr SVN: r6000 - in jcr/branches/1.14.x/patch/1.14.8-GA: JCR-1731 and 1 other directory.

by do-not-reply＠jboss.org

Author: areshetnyak Date: 2012-03-30 09:15:56 -0400 (Fri, 30 Mar 2012) New Revision: 6000 Added: jcr/branches/1.14.x/patch/1.14.8-GA/JCR-1731/ jcr/branches/1.14.x/patch/1.14.8-GA/JCR-1731/JCR-1731.patch Log: JCR-1731 : Patch for fix probleb with "JbossCache in CacheableLockManagerImpl is not load data from cache loader after second start repository (stop and start on repository) in "jbosscache-shareable" mode." was propoused. Added: jcr/branches/1.14.x/patch/1.14.8-GA/JCR-1731/JCR-1731.patch =================================================================== --- jcr/branches/1.14.x/patch/1.14.8-GA/JCR-1731/JCR-1731.patch (rev 0) +++ jcr/branches/1.14.x/patch/1.14.8-GA/JCR-1731/JCR-1731.patch 2012-03-30 13:15:56 UTC (rev 6000) @@ -0,0 +1,395 @@ +Index: exo.jcr.component.core.impl.infinispan.v5/src/main/java/org/exoplatform/services/jcr/impl/core/lock/infinispan/ISPNCacheableLockManagerImpl.java +=================================================================== +--- exo.jcr.component.core.impl.infinispan.v5/src/main/java/org/exoplatform/services/jcr/impl/core/lock/infinispan/ISPNCacheableLockManagerImpl.java (revision 5992) ++++ exo.jcr.component.core.impl.infinispan.v5/src/main/java/org/exoplatform/services/jcr/impl/core/lock/infinispan/ISPNCacheableLockManagerImpl.java (working copy) +@@ -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(); +Index: exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/lock/TestLockImpl.java +=================================================================== +--- exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/lock/TestLockImpl.java (revision 5992) ++++ exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/lock/TestLockImpl.java (working copy) +@@ -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())); ++ } ++ + } +Index: exo.jcr.component.core/src/test/resources/conf/standalone/test-jcr-config-jbc.xml +=================================================================== +--- exo.jcr.component.core/src/test/resources/conf/standalone/test-jcr-config-jbc.xml (revision 5992) ++++ exo.jcr.component.core/src/test/resources/conf/standalone/test-jcr-config-jbc.xml (working copy) +@@ -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,14 +136,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> +@@ -195,14 +195,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> +@@ -276,14 +276,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> +@@ -345,10 +345,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" /> +@@ -403,14 +403,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> +@@ -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" /> +@@ -548,14 +548,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> +@@ -618,14 +618,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> +Index: exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/jbosscache/CacheableLockManagerImpl.java +=================================================================== +--- exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/jbosscache/CacheableLockManagerImpl.java (revision 5992) ++++ exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/jbosscache/CacheableLockManagerImpl.java (working copy) +@@ -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(); +Index: exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/jbosscache/ControllerCacheLoader.java +=================================================================== +--- exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/jbosscache/ControllerCacheLoader.java (revision 5992) ++++ exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/jbosscache/ControllerCacheLoader.java (working copy) +@@ -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,11 @@ + public class ControllerCacheLoader implements CacheLoader + { + /** ++ * Thread local parameter for allow direct access to the data from cache loader. ++ */ ++ private final ThreadLocal<Boolean> allowDirectAccess = new ThreadLocal<Boolean>(); ++ ++ /** + * The nested cache loader + */ + private final CacheLoader cl; +@@ -103,6 +109,11 @@ + return cl.exists(name); + } + } ++ else if (allowDirectAccess.get() != null && 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 +141,11 @@ + return cl.get(name); + } + } ++ else if (allowDirectAccess.get() != null && 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 +321,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(null); ++ } ++ + }

12 years

1
0
0 / 0

exo-jcr SVN: r5999 - kernel/branches/2.3.x/patch/2.3.8-GA/KER-183.

by do-not-reply＠jboss.org

Author: andrew.plotnikov Date: 2012-03-30 09:15:05 -0400 (Fri, 30 Mar 2012) New Revision: 5999 Modified: kernel/branches/2.3.x/patch/2.3.8-GA/KER-183/KER-183.patch Log: KER-183: update patch Modified: kernel/branches/2.3.x/patch/2.3.8-GA/KER-183/KER-183.patch =================================================================== --- kernel/branches/2.3.x/patch/2.3.8-GA/KER-183/KER-183.patch 2012-03-30 13:10:43 UTC (rev 5998) +++ kernel/branches/2.3.x/patch/2.3.8-GA/KER-183/KER-183.patch 2012-03-30 13:15:05 UTC (rev 5999) @@ -2,14 +2,17 @@ =================================================================== --- exo.kernel.commons/src/test/java/org/exoplatform/commons/utils/TestLogMessageFormatter.java (revision 5990) +++ exo.kernel.commons/src/test/java/org/exoplatform/commons/utils/TestLogMessageFormatter.java (working copy) -@@ -57,4 +57,17 @@ +@@ -57,4 +57,20 @@ assertEquals(t, LogMessageFormatter.getThrowable(new Object(), t)); assertEquals(t, LogMessageFormatter.getThrowable("Just testing{}", new Object(), t)); } + -+ public void testMessageIsNull() throws Exception ++ public void testGetMessage() throws Exception + { ++ //if object.toString return null + LogMessageFormatter.getMessage("Hello, World {} ", new A()); ++ //if object is null ++ LogMessageFormatter.getMessage("Hello, World {} {}", new Object(), null); + } + + class A @@ -24,12 +27,20 @@ =================================================================== --- exo.kernel.commons/src/main/java/org/exoplatform/services/log/impl/LogMessageFormatter.java (revision 5990) +++ exo.kernel.commons/src/main/java/org/exoplatform/services/log/impl/LogMessageFormatter.java (working copy) -@@ -41,13 +41,11 @@ +@@ -34,20 +34,18 @@ + + public static String getMessage(String str, Object... argsArray) + { +- + if (argsArray != null && argsArray.length > 0) + { + for (int i = 0; i < argsArray.length; i++) { if (i != argsArray.length - 1 || !(argsArray[i] instanceof Throwable)) { - str = REPLACE_PATTERN.matcher(str).replaceFirst(String.valueOf(argsArray[i])); -+ str = REPLACE_PATTERN.matcher(str).replaceFirst(String.valueOf(argsArray[i].toString())); ++ String message = String.valueOf(argsArray[i]); ++ str = REPLACE_PATTERN.matcher(str).replaceFirst(message != null ? message : "null"); } } }

12 years

1
0
0 / 0

exo-jcr SVN: r5998 - in kernel/trunk/exo.kernel.commons/src: test/java/org/exoplatform/commons/utils and 1 other directory.

by do-not-reply＠jboss.org

Author: andrew.plotnikov Date: 2012-03-30 09:10:43 -0400 (Fri, 30 Mar 2012) New Revision: 5998 Modified: kernel/trunk/exo.kernel.commons/src/main/java/org/exoplatform/services/log/impl/LogMessageFormatter.java kernel/trunk/exo.kernel.commons/src/test/java/org/exoplatform/commons/utils/TestLogMessageFormatter.java Log: EXOJCR-1815: Fixed LogMessageFormatter.getMessage throws NPE if object is null Modified: kernel/trunk/exo.kernel.commons/src/main/java/org/exoplatform/services/log/impl/LogMessageFormatter.java =================================================================== --- kernel/trunk/exo.kernel.commons/src/main/java/org/exoplatform/services/log/impl/LogMessageFormatter.java 2012-03-30 12:08:29 UTC (rev 5997) +++ kernel/trunk/exo.kernel.commons/src/main/java/org/exoplatform/services/log/impl/LogMessageFormatter.java 2012-03-30 13:10:43 UTC (rev 5998) @@ -34,14 +34,14 @@ public static String getMessage(String str, Object... argsArray) { - if (argsArray != null && argsArray.length > 0) { for (int i = 0; i < argsArray.length; i++) { if (i != argsArray.length - 1 || !(argsArray[i] instanceof Throwable)) { - str = REPLACE_PATTERN.matcher(str).replaceFirst(String.valueOf(argsArray[i].toString())); + String message = String.valueOf(argsArray[i]); + str = REPLACE_PATTERN.matcher(str).replaceFirst(message != null ? message : "null"); } } } Modified: kernel/trunk/exo.kernel.commons/src/test/java/org/exoplatform/commons/utils/TestLogMessageFormatter.java =================================================================== --- kernel/trunk/exo.kernel.commons/src/test/java/org/exoplatform/commons/utils/TestLogMessageFormatter.java 2012-03-30 12:08:29 UTC (rev 5997) +++ kernel/trunk/exo.kernel.commons/src/test/java/org/exoplatform/commons/utils/TestLogMessageFormatter.java 2012-03-30 13:10:43 UTC (rev 5998) @@ -58,9 +58,12 @@ assertEquals(t, LogMessageFormatter.getThrowable("Just testing{}", new Object(), t)); } - public void testMessageIsNull() throws Exception + public void testGetMessage() throws Exception { + //if object.toString return null LogMessageFormatter.getMessage("Hello, World {} ", new A()); + //if object is null + LogMessageFormatter.getMessage("Hello, World {} {}", new Object(), null); } class A

12 years

1
0
0 / 0

exo-jcr SVN: r5997 - jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/jbosscache.

by do-not-reply＠jboss.org

Author: areshetnyak Date: 2012-03-30 08:08:29 -0400 (Fri, 30 Mar 2012) New Revision: 5997 Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/jbosscache/ControllerCacheLoader.java 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/ControllerCacheLoader.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/jbosscache/ControllerCacheLoader.java 2012-03-30 08:35:05 UTC (rev 5996) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/jbosscache/ControllerCacheLoader.java 2012-03-30 12:08:29 UTC (rev 5997) @@ -53,13 +53,7 @@ /** * 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; - } - }; + private final ThreadLocal<Boolean> allowDirectAccess = new ThreadLocal<Boolean>(); /** * The nested cache loader @@ -115,7 +109,7 @@ return cl.exists(name); } } - else if (allowDirectAccess.get()) + else if (allowDirectAccess.get() != null && allowDirectAccess.get()) { return cl.exists(name); } @@ -147,7 +141,7 @@ return cl.get(name); } } - else if (allowDirectAccess.get()) + else if (allowDirectAccess.get() != null && allowDirectAccess.get()) { return cl.get(name); } @@ -341,7 +335,7 @@ */ protected void disableDirectAccess() { - allowDirectAccess.set(false); + allowDirectAccess.set(null); } }

12 years

1
0
0 / 0

exo-jcr SVN: r5996 - in jcr/branches/1.14.x/patch/1.14.8-GA: JCR-1729 and 1 other directory.

by do-not-reply＠jboss.org

Author: tolusha Date: 2012-03-30 04:35:05 -0400 (Fri, 30 Mar 2012) New Revision: 5996 Added: jcr/branches/1.14.x/patch/1.14.8-GA/JCR-1729/ jcr/branches/1.14.x/patch/1.14.8-GA/JCR-1729/JCR-1729.patch Log: JCR-1729: patch proposed Added: jcr/branches/1.14.x/patch/1.14.8-GA/JCR-1729/JCR-1729.patch =================================================================== --- jcr/branches/1.14.x/patch/1.14.8-GA/JCR-1729/JCR-1729.patch (rev 0) +++ jcr/branches/1.14.x/patch/1.14.8-GA/JCR-1729/JCR-1729.patch 2012-03-30 08:35:05 UTC (rev 5996) @@ -0,0 +1,45 @@ +Index: exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/jbosscache/ExoJBossCacheFactory.java +=================================================================== +--- exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/jbosscache/ExoJBossCacheFactory.java (revision 5970) ++++ exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/jbosscache/ExoJBossCacheFactory.java (working copy) +@@ -43,9 +43,9 @@ + import java.io.Serializable; + import java.security.PrivilegedAction; + import java.util.HashMap; ++import java.util.Iterator; + import java.util.Map; + import java.util.Map.Entry; +-import java.util.concurrent.ConcurrentHashMap; + + import javax.management.ObjectName; + import javax.transaction.TransactionManager; +@@ -284,7 +284,7 @@ + Map<ConfigurationKey, CacheInstance> caches = allCacheTypes.get(cacheType); + if (caches == null) + { +- caches = new ConcurrentHashMap<ConfigurationKey, CacheInstance>(); ++ caches = new HashMap<ConfigurationKey, CacheInstance>(); + allCacheTypes.put(cacheType, caches); + } + Configuration cfg = cache.getConfiguration(); +@@ -334,8 +334,10 @@ + Map<CacheType, Map<ConfigurationKey, CacheInstance>> allCacheTypes = CACHES.get(container); + Map<ConfigurationKey, CacheInstance> caches = allCacheTypes.get(cacheType); + +- for (Entry<ConfigurationKey, CacheInstance> entry : caches.entrySet()) ++ for (Iterator<Entry<ConfigurationKey, CacheInstance>> it = caches.entrySet().iterator(); it.hasNext();) + { ++ Entry<ConfigurationKey, CacheInstance> entry = it.next(); ++ + CacheInstance cacheInstance = entry.getValue(); + if (cacheInstance.isSame(cache)) + { +@@ -343,7 +345,7 @@ + + if (!cacheInstance.hasReferences()) + { +- caches.remove(entry.getKey()); ++ it.remove(); + PrivilegedJBossCacheHelper.stop((Cache<Serializable, Object>)cache); + } + }

12 years

1
0
0 / 0

exo-jcr SVN: r5995 - in kernel/trunk/exo.kernel.commons/src: test/java/org/exoplatform/commons/utils and 1 other directory.

by do-not-reply＠jboss.org

Author: andrew.plotnikov Date: 2012-03-30 04:31:44 -0400 (Fri, 30 Mar 2012) New Revision: 5995 Modified: kernel/trunk/exo.kernel.commons/src/main/java/org/exoplatform/services/log/impl/LogMessageFormatter.java kernel/trunk/exo.kernel.commons/src/test/java/org/exoplatform/commons/utils/TestLogMessageFormatter.java Log: EXOJCR-1815: Fixed LogMessageFormatter.getMessage throws NPE if object.toString() return null Modified: kernel/trunk/exo.kernel.commons/src/main/java/org/exoplatform/services/log/impl/LogMessageFormatter.java =================================================================== --- kernel/trunk/exo.kernel.commons/src/main/java/org/exoplatform/services/log/impl/LogMessageFormatter.java 2012-03-30 08:27:11 UTC (rev 5994) +++ kernel/trunk/exo.kernel.commons/src/main/java/org/exoplatform/services/log/impl/LogMessageFormatter.java 2012-03-30 08:31:44 UTC (rev 5995) @@ -41,13 +41,11 @@ { if (i != argsArray.length - 1 || !(argsArray[i] instanceof Throwable)) { - str = REPLACE_PATTERN.matcher(str).replaceFirst(String.valueOf(argsArray[i])); + str = REPLACE_PATTERN.matcher(str).replaceFirst(String.valueOf(argsArray[i].toString())); } } } return str; - - } public static Throwable getThrowable(Object... argsArray) Modified: kernel/trunk/exo.kernel.commons/src/test/java/org/exoplatform/commons/utils/TestLogMessageFormatter.java =================================================================== --- kernel/trunk/exo.kernel.commons/src/test/java/org/exoplatform/commons/utils/TestLogMessageFormatter.java 2012-03-30 08:27:11 UTC (rev 5994) +++ kernel/trunk/exo.kernel.commons/src/test/java/org/exoplatform/commons/utils/TestLogMessageFormatter.java 2012-03-30 08:31:44 UTC (rev 5995) @@ -57,4 +57,17 @@ assertEquals(t, LogMessageFormatter.getThrowable(new Object(), t)); assertEquals(t, LogMessageFormatter.getThrowable("Just testing{}", new Object(), t)); } + + public void testMessageIsNull() throws Exception + { + LogMessageFormatter.getMessage("Hello, World {} ", new A()); + } + + class A + { + public String toString() + { + return null; + } + } }

12 years

1
0
0 / 0

exo-jcr SVN: r5994 - in kernel/branches/2.3.x/patch/2.3.8-GA: KER-183 and 1 other directory.

by do-not-reply＠jboss.org

Author: andrew.plotnikov Date: 2012-03-30 04:27:11 -0400 (Fri, 30 Mar 2012) New Revision: 5994 Added: kernel/branches/2.3.x/patch/2.3.8-GA/KER-183/ kernel/branches/2.3.x/patch/2.3.8-GA/KER-183/KER-183.patch Log: KER-183: patch proposed Added: kernel/branches/2.3.x/patch/2.3.8-GA/KER-183/KER-183.patch =================================================================== --- kernel/branches/2.3.x/patch/2.3.8-GA/KER-183/KER-183.patch (rev 0) +++ kernel/branches/2.3.x/patch/2.3.8-GA/KER-183/KER-183.patch 2012-03-30 08:27:11 UTC (rev 5994) @@ -0,0 +1,41 @@ +Index: exo.kernel.commons/src/test/java/org/exoplatform/commons/utils/TestLogMessageFormatter.java +=================================================================== +--- exo.kernel.commons/src/test/java/org/exoplatform/commons/utils/TestLogMessageFormatter.java (revision 5990) ++++ exo.kernel.commons/src/test/java/org/exoplatform/commons/utils/TestLogMessageFormatter.java (working copy) +@@ -57,4 +57,17 @@ + assertEquals(t, LogMessageFormatter.getThrowable(new Object(), t)); + assertEquals(t, LogMessageFormatter.getThrowable("Just testing{}", new Object(), t)); + } ++ ++ public void testMessageIsNull() throws Exception ++ { ++ LogMessageFormatter.getMessage("Hello, World {} ", new A()); ++ } ++ ++ class A ++ { ++ public String toString() ++ { ++ return null; ++ } ++ } + } +Index: exo.kernel.commons/src/main/java/org/exoplatform/services/log/impl/LogMessageFormatter.java +=================================================================== +--- exo.kernel.commons/src/main/java/org/exoplatform/services/log/impl/LogMessageFormatter.java (revision 5990) ++++ exo.kernel.commons/src/main/java/org/exoplatform/services/log/impl/LogMessageFormatter.java (working copy) +@@ -41,13 +41,11 @@ + { + if (i != argsArray.length - 1 || !(argsArray[i] instanceof Throwable)) + { +- str = REPLACE_PATTERN.matcher(str).replaceFirst(String.valueOf(argsArray[i])); ++ str = REPLACE_PATTERN.matcher(str).replaceFirst(String.valueOf(argsArray[i].toString())); + } + } + } + return str; +- +- + } + + public static Throwable getThrowable(Object... argsArray)

12 years

1
0
0 / 0

exo-jcr SVN: r5993 - jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/jbosscache.

by do-not-reply＠jboss.org

Author: tolusha Date: 2012-03-30 04:25:59 -0400 (Fri, 30 Mar 2012) New Revision: 5993 Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/jbosscache/ExoJBossCacheFactory.java Log: EXOJCR-1838: Remove workraround about using ConcurretnHashMap Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/jbosscache/ExoJBossCacheFactory.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/jbosscache/ExoJBossCacheFactory.java 2012-03-30 08:07:47 UTC (rev 5992) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/jbosscache/ExoJBossCacheFactory.java 2012-03-30 08:25:59 UTC (rev 5993) @@ -43,9 +43,9 @@ import java.io.Serializable; import java.security.PrivilegedAction; import java.util.HashMap; +import java.util.Iterator; import java.util.Map; import java.util.Map.Entry; -import java.util.concurrent.ConcurrentHashMap; import javax.management.ObjectName; import javax.transaction.TransactionManager; @@ -284,7 +284,7 @@ Map<ConfigurationKey, CacheInstance> caches = allCacheTypes.get(cacheType); if (caches == null) { - caches = new ConcurrentHashMap<ConfigurationKey, CacheInstance>(); + caches = new HashMap<ConfigurationKey, CacheInstance>(); allCacheTypes.put(cacheType, caches); } Configuration cfg = cache.getConfiguration(); @@ -334,8 +334,10 @@ Map<CacheType, Map<ConfigurationKey, CacheInstance>> allCacheTypes = CACHES.get(container); Map<ConfigurationKey, CacheInstance> caches = allCacheTypes.get(cacheType); - for (Entry<ConfigurationKey, CacheInstance> entry : caches.entrySet()) + for (Iterator<Entry<ConfigurationKey, CacheInstance>> it = caches.entrySet().iterator(); it.hasNext();) { + Entry<ConfigurationKey, CacheInstance> entry = it.next(); + CacheInstance cacheInstance = entry.getValue(); if (cacheInstance.isSame(cache)) { @@ -343,7 +345,7 @@ if (!cacheInstance.hasReferences()) { - caches.remove(entry.getKey()); + it.remove(); PrivilegedJBossCacheHelper.stop((Cache<Serializable, Object>)cache); } }

12 years

1
0
0 / 0

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.

by do-not-reply＠jboss.org

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();

12 years

1
0
0 / 0

exo-jcr SVN: r5991 - jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene.

by do-not-reply＠jboss.org

Author: nzamosenchuk Date: 2012-03-30 03:40:12 -0400 (Fri, 30 Mar 2012) New Revision: 5991 Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/AbstractIndex.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/CommittableIndexReader.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/MultiIndex.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/OfflinePersistentIndex.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/PersistentIndex.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/VolatileIndex.java Log: EXOJCR-1796 : apply patch from JCR-1727 Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/AbstractIndex.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/AbstractIndex.java 2012-03-30 06:17:55 UTC (rev 5990) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/AbstractIndex.java 2012-03-30 07:40:12 UTC (rev 5991) @@ -26,6 +26,8 @@ import org.apache.lucene.search.Similarity; import org.apache.lucene.store.Directory; import org.apache.lucene.util.Version; +import org.exoplatform.services.jcr.impl.core.query.IndexerIoMode; +import org.exoplatform.services.jcr.impl.core.query.IndexerIoModeHandler; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -100,6 +102,8 @@ */ private boolean isExisting; + protected final IndexerIoModeHandler modeHandler; + /** * Constructs an index with an <code>analyzer</code> and a * <code>directory</code>. @@ -112,13 +116,14 @@ * <code>null</code>. * @throws IOException if the index cannot be initialized. */ - AbstractIndex(final Analyzer analyzer, Similarity similarity, final Directory directory, DocNumberCache cache) - throws IOException + AbstractIndex(final Analyzer analyzer, Similarity similarity, final Directory directory, DocNumberCache cache, + IndexerIoModeHandler modeHandler) throws IOException { this.analyzer = analyzer; this.similarity = similarity; this.directory = directory; this.cache = cache; + this.modeHandler = modeHandler; AbstractIndex.this.isExisting = IndexReader.indexExists(directory); @@ -232,11 +237,18 @@ log.debug("closing IndexWriter."); indexWriter = null; } - + if (indexReader == null || !indexReader.isCurrent()) { IndexReader reader = IndexReader.open(getDirectory(), null, false, termInfosIndexDivisor); - indexReader = new CommittableIndexReader(reader); + // if modeHandler != null and mode==READ_ONLY, then reader should be with transient deleteions. + // This is used to transiently update reader in clustered environment when some documents have + // been deleted. If index reader not null and already contains some transient deletions, but it + // is no more current, it will be re-created loosing deletions. They will already be applied by + // coordinator node in the cluster. And there is no need to inject them into the new reader + + indexReader = + new CommittableIndexReader(reader, modeHandler != null && modeHandler.getMode() == IndexerIoMode.READ_ONLY); } return indexReader; } Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/CommittableIndexReader.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/CommittableIndexReader.java 2012-03-30 06:17:55 UTC (rev 5990) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/CommittableIndexReader.java 2012-03-30 07:40:12 UTC (rev 5991) @@ -16,12 +16,16 @@ */ package org.exoplatform.services.jcr.impl.core.query.lucene; -import java.io.IOException; - import org.apache.lucene.index.CorruptIndexException; import org.apache.lucene.index.FilterIndexReader; import org.apache.lucene.index.IndexReader; +import org.apache.lucene.index.StaleReaderException; +import org.apache.lucene.store.LockObtainFailedException; +import java.io.IOException; +import java.util.Set; +import java.util.concurrent.CopyOnWriteArraySet; + /** * Wraps an <code>IndexReader</code> and allows to commit changes without * closing the reader. @@ -36,13 +40,28 @@ private volatile long modCount; /** + * If reader is created with flag transientDeletions, then reader + * deleted documents are stored in the memory buffer and not applied to underlying + * index reader. + */ + private final boolean transientDeletions; + + private final Set<Integer> deletedDocs; + + /** * Creates a new <code>CommittableIndexReader</code> based on <code>in</code>. * * @param in the <code>IndexReader</code> to wrap. + * @param transientDeletions If reader is created with flag transientDeletions, then reader + * deleted documents are stored in the memory buffer and not applied to underlying + * index reader. */ - CommittableIndexReader(IndexReader in) { + CommittableIndexReader(IndexReader in, boolean transientDeletions) { super(in); modCount = in.getVersion(); + this.transientDeletions = transientDeletions; + // no need to initialize Set if transientDeletions = false + this.deletedDocs = transientDeletions? new CopyOnWriteArraySet<Integer>() : null; } //------------------------< FilterIndexReader >----------------------------- @@ -57,6 +76,36 @@ modCount++; } + /** + * {@inheritDoc} + */ + @Override + public void deleteDocument(int docNum) throws StaleReaderException, CorruptIndexException, + LockObtainFailedException, IOException { + // skip acquiring write lock + if (transientDeletions) + { + deletedDocs.add(docNum); + modCount++; // doDelete won't be executed, so incrementing modCount + } + else + { + super.deleteDocument(docNum); + } + } + + @Override + public boolean isDeleted(int n) { + if (transientDeletions) + { + return deletedDocs.contains(n); + } + else + { + return super.isDeleted(n); + } + } + //------------------------< additional methods >---------------------------- /** Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/MultiIndex.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/MultiIndex.java 2012-03-30 06:17:55 UTC (rev 5990) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/MultiIndex.java 2012-03-30 07:40:12 UTC (rev 5991) @@ -335,7 +335,8 @@ continue; } PersistentIndex index = - new PersistentIndex(name, handler.getTextAnalyzer(), handler.getSimilarity(), cache, directoryManager); + new PersistentIndex(name, handler.getTextAnalyzer(), handler.getSimilarity(), cache, directoryManager, + modeHandler); index.setMaxFieldLength(handler.getMaxFieldLength()); index.setUseCompoundFile(handler.getUseCompoundFile()); index.setTermInfosIndexDivisor(handler.getTermInfosIndexDivisor()); @@ -722,7 +723,24 @@ for (Iterator<String> it = remove.iterator(); it.hasNext();) { Term idTerm = new Term(FieldNames.UUID, it.next()); - volatileIndex.removeDocument(idTerm); + int num = volatileIndex.removeDocument(idTerm); + if (num == 0) + { + for (int i = indexes.size() - 1; i >= 0; i--) + { + // only look in registered indexes + PersistentIndex idx = indexes.get(i); + if (indexNames.contains(idx.getName())) + { + num = idx.removeDocument(idTerm); + if (num > 0) + { + break; + } + } + } + } + } // try to avoid getting index reader for each doc @@ -1156,7 +1174,8 @@ try { index = - new PersistentIndex(indexName, handler.getTextAnalyzer(), handler.getSimilarity(), cache, directoryManager); + new PersistentIndex(indexName, handler.getTextAnalyzer(), handler.getSimilarity(), cache, directoryManager, + modeHandler); } catch (IOException e) { @@ -3388,7 +3407,8 @@ continue; } PersistentIndex index = - new PersistentIndex(name, handler.getTextAnalyzer(), handler.getSimilarity(), cache, directoryManager); + new PersistentIndex(name, handler.getTextAnalyzer(), handler.getSimilarity(), cache, directoryManager, + modeHandler); index.setMaxFieldLength(handler.getMaxFieldLength()); index.setUseCompoundFile(handler.getUseCompoundFile()); index.setTermInfosIndexDivisor(handler.getTermInfosIndexDivisor()); @@ -3488,7 +3508,8 @@ merger = null; } offlineIndex = - new OfflinePersistentIndex(handler.getTextAnalyzer(), handler.getSimilarity(), cache, directoryManager); + new OfflinePersistentIndex(handler.getTextAnalyzer(), handler.getSimilarity(), cache, directoryManager, + modeHandler); if (modeHandler.getMode() == IndexerIoMode.READ_WRITE) { flush(); Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/OfflinePersistentIndex.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/OfflinePersistentIndex.java 2012-03-30 06:17:55 UTC (rev 5990) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/OfflinePersistentIndex.java 2012-03-30 07:40:12 UTC (rev 5991) @@ -22,6 +22,7 @@ import org.apache.lucene.document.Document; import org.apache.lucene.index.Term; import org.apache.lucene.search.Similarity; +import org.exoplatform.services.jcr.impl.core.query.IndexerIoModeHandler; import org.exoplatform.services.jcr.impl.core.query.lucene.directory.DirectoryManager; import java.io.IOException; @@ -55,9 +56,9 @@ * index. */ OfflinePersistentIndex(Analyzer analyzer, Similarity similarity, DocNumberCache cache, - DirectoryManager directoryManager) throws IOException + DirectoryManager directoryManager, IndexerIoModeHandler modeHandler) throws IOException { - super(NAME, analyzer, similarity, cache, directoryManager); + super(NAME, analyzer, similarity, cache, directoryManager, modeHandler); this.processedIDs = new ArrayList<String>(); } Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/PersistentIndex.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/PersistentIndex.java 2012-03-30 06:17:55 UTC (rev 5990) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/PersistentIndex.java 2012-03-30 07:40:12 UTC (rev 5991) @@ -23,6 +23,7 @@ import org.apache.lucene.store.Directory; import org.apache.lucene.store.IndexInput; import org.apache.lucene.store.IndexOutput; +import org.exoplatform.services.jcr.impl.core.query.IndexerIoModeHandler; import org.exoplatform.services.jcr.impl.core.query.lucene.directory.DirectoryManager; import java.io.IOException; @@ -55,9 +56,9 @@ * index. */ PersistentIndex(String name, Analyzer analyzer, Similarity similarity, DocNumberCache cache, - final DirectoryManager directoryManager) throws IOException + final DirectoryManager directoryManager, IndexerIoModeHandler modeHandler) throws IOException { - super(analyzer, similarity, directoryManager.getDirectory(name), cache); + super(analyzer, similarity, directoryManager.getDirectory(name), cache, modeHandler); this.name = name; if (isExisting()) { Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/VolatileIndex.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/VolatileIndex.java 2012-03-30 06:17:55 UTC (rev 5990) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/VolatileIndex.java 2012-03-30 07:40:12 UTC (rev 5991) @@ -61,7 +61,7 @@ */ VolatileIndex(Analyzer analyzer, Similarity similarity) throws IOException { - super(analyzer, similarity, new RAMDirectory(), null); + super(analyzer, similarity, new RAMDirectory(), null, null); } /**

12 years

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

exo-jcr-commits March 2012