exo-jcr SVN: r4210 - core/trunk.
by do-not-reply＠jboss.org
Author: tolusha
Date: 2011-04-06 03:55:50 -0400 (Wed, 06 Apr 2011)
New Revision: 4210
Modified:
core/trunk/pom.xml
Log:
EXOJCR-1293: set commons-lang dependency to 2.6 ver
Modified: core/trunk/pom.xml
===================================================================
--- core/trunk/pom.xml 2011-04-06 06:48:47 UTC (rev 4209)
+++ core/trunk/pom.xml 2011-04-06 07:55:50 UTC (rev 4210)
@@ -168,7 +168,7 @@
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
- <version>2.4</version>
+ <version>2.6</version>
</dependency>
<dependency>
15 years
exo-jcr SVN: r4208 - in jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl: storage/jdbc and 1 other directory.
by do-not-reply＠jboss.org
Author: tolusha
Date: 2011-04-06 02:29:28 -0400 (Wed, 06 Apr 2011)
New Revision: 4208
Modified:
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/SearchIndex.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCWorkspaceDataContainer.java
Log:
EXOJCR-1258: open connection based on existing datasource, don't allow query execution on closed index (when component is supended)
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/SearchIndex.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/SearchIndex.java 2011-04-05 10:04:01 UTC (rev 4207)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/SearchIndex.java 2011-04-06 06:29:28 UTC (rev 4208)
@@ -88,6 +88,7 @@
import java.util.List;
import java.util.Map;
import java.util.Set;
+import java.util.concurrent.CountDownLatch;
import javax.jcr.RepositoryException;
import javax.jcr.query.InvalidQueryException;
@@ -504,6 +505,11 @@
private boolean asyncReindexing = DEFAULT_ASYNC_REINDEXING;
/**
+ * Waiting query execution until resume.
+ */
+ protected CountDownLatch latcher = null;
+
+ /**
* Working constructor.
*
* @throws RepositoryConfigurationException
@@ -1017,6 +1023,8 @@
public MultiColumnQueryHits executeQuery(SessionImpl session, AbstractQueryImpl queryImpl, Query query,
QPath[] orderProps, boolean[] orderSpecs, long resultFetchHint) throws IOException, RepositoryException
{
+ waitForResuming();
+
checkOpen();
Sort sort = new Sort(createSortFields(orderProps, orderSpecs));
@@ -1066,6 +1074,8 @@
public MultiColumnQueryHits executeQuery(SessionImpl session, MultiColumnQuery query, QPath[] orderProps,
boolean[] orderSpecs, long resultFetchHint) throws IOException, RepositoryException
{
+ waitForResuming();
+
checkOpen();
Sort sort = new Sort(createSortFields(orderProps, orderSpecs));
@@ -2997,6 +3007,8 @@
*/
public QueryHits executeQuery(Query query) throws IOException
{
+ waitForResuming();
+
checkOpen();
IndexReader reader = getIndexReader(true);
@@ -3052,6 +3064,7 @@
*/
public void suspend() throws SuspendException
{
+ latcher = new CountDownLatch(1);
close();
}
@@ -3064,6 +3077,8 @@
{
closed = false;
doInit();
+
+ latcher.countDown();
}
catch (IOException e)
{
@@ -3074,4 +3089,25 @@
throw new ResumeException(e);
}
}
+
+ /**
+ * If component is suspended need to wait resuming and not allow
+ * execute query on closed index.
+ *
+ * @throws IOException
+ */
+ private void waitForResuming() throws IOException
+ {
+ if (latcher != null && latcher.getCount() != 0)
+ {
+ try
+ {
+ latcher.await();
+ }
+ catch (InterruptedException e)
+ {
+ throw new IOException(e);
+ }
+ }
+ }
}
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCWorkspaceDataContainer.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCWorkspaceDataContainer.java 2011-04-05 10:04:01 UTC (rev 4207)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/storage/jdbc/JDBCWorkspaceDataContainer.java 2011-04-06 06:29:28 UTC (rev 4208)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2009 eXo Platform SAS.
+z * Copyright (C) 2009 eXo Platform SAS.
*
* This is free software; you can redistribute it and/or modify it
* under the terms of the GNU Lesser General Public License as
@@ -85,7 +85,6 @@
import javax.jcr.RepositoryException;
import javax.naming.InitialContext;
-import javax.naming.NameNotFoundException;
import javax.naming.NamingException;
import javax.sql.DataSource;
@@ -1108,22 +1107,9 @@
+ containerName + "'");
}
- final DataSource ds = (DataSource)new InitialContext().lookup(dbSourceName);
- if (ds == null)
- {
- throw new NameNotFoundException("Data source " + dbSourceName + " not found");
- }
+ // using existing DataSource to get a JDBC Connection.
+ Connection jdbcConn = connFactory.getJdbcConnection();
- Connection jdbcConn =
- SecurityHelper.doPrivilegedSQLExceptionAction(new PrivilegedExceptionAction<Connection>()
- {
- public Connection run() throws Exception
- {
- return ds.getConnection();
-
- }
- });
-
DBBackup.backup(storageDir, jdbcConn, scripts);
// backup value storage
@@ -1155,14 +1141,10 @@
{
throw new BackupException(e);
}
- catch (NamingException e)
+ catch (RepositoryException e)
{
throw new BackupException(e);
}
- catch (SQLException e)
- {
- throw new BackupException(e);
- }
finally
{
if (backupInfo != null)
@@ -1390,32 +1372,16 @@
{
try
{
- final DataSource ds = (DataSource)new InitialContext().lookup(dbSourceName);
+ Connection jdbcConn = connFactory.getJdbcConnection();
+ jdbcConn.setAutoCommit(false);
- if (ds != null)
- {
- Connection jdbcConn =
- SecurityHelper.doPrivilegedSQLExceptionAction(new PrivilegedExceptionAction<Connection>()
- {
- public Connection run() throws Exception
- {
- return ds.getConnection();
- }
- });
- jdbcConn.setAutoCommit(false);
-
- return getDataRestorer(storageDir, jdbcConn);
- }
- else
- {
- throw new NameNotFoundException("Data source " + dbSourceName + " not found");
- }
+ return getDataRestorer(storageDir, jdbcConn);
}
catch (SQLException e)
{
throw new BackupException(e);
}
- catch (NamingException e)
+ catch (RepositoryException e)
{
throw new BackupException(e);
}
15 years
exo-jcr SVN: r4207 - in jcr/trunk/applications/product-patches/as: jetty and 2 other directories.
by do-not-reply＠jboss.org
Author: tolusha
Date: 2011-04-05 06:04:01 -0400 (Tue, 05 Apr 2011)
New Revision: 4207
Modified:
jcr/trunk/applications/product-patches/as/jboss/exo-configuration.xml
jcr/trunk/applications/product-patches/as/jetty/exo-configuration.xml
jcr/trunk/applications/product-patches/as/jonas/exo-configuration.xml
jcr/trunk/applications/product-patches/as/tomcat/exo-configuration.xml
Log:
EXOJCR-1501: set character encoding UTF-8 for FTP server
Modified: jcr/trunk/applications/product-patches/as/jboss/exo-configuration.xml
===================================================================
--- jcr/trunk/applications/product-patches/as/jboss/exo-configuration.xml 2011-04-05 08:27:45 UTC (rev 4206)
+++ jcr/trunk/applications/product-patches/as/jboss/exo-configuration.xml 2011-04-05 10:04:01 UTC (rev 4207)
@@ -283,8 +283,7 @@
</value-param>
<value-param>
<name>client-side-encoding</name>
- <value>windows-1251</value>
- <!-- value>KOI8-R</value -->
+ <value>UTF-8</value>
</value-param>
<value-param>
<name>def-folder-node-type</name>
Modified: jcr/trunk/applications/product-patches/as/jetty/exo-configuration.xml
===================================================================
--- jcr/trunk/applications/product-patches/as/jetty/exo-configuration.xml 2011-04-05 08:27:45 UTC (rev 4206)
+++ jcr/trunk/applications/product-patches/as/jetty/exo-configuration.xml 2011-04-05 10:04:01 UTC (rev 4207)
@@ -283,8 +283,7 @@
</value-param>
<value-param>
<name>client-side-encoding</name>
- <value>windows-1251</value>
- <!-- value>KOI8-R</value -->
+ <value>UTF-8</value>
</value-param>
<value-param>
<name>def-folder-node-type</name>
Modified: jcr/trunk/applications/product-patches/as/jonas/exo-configuration.xml
===================================================================
--- jcr/trunk/applications/product-patches/as/jonas/exo-configuration.xml 2011-04-05 08:27:45 UTC (rev 4206)
+++ jcr/trunk/applications/product-patches/as/jonas/exo-configuration.xml 2011-04-05 10:04:01 UTC (rev 4207)
@@ -283,8 +283,7 @@
</value-param>
<value-param>
<name>client-side-encoding</name>
- <value>windows-1251</value>
- <!-- value>KOI8-R</value -->
+ <value>UTF-8</value>
</value-param>
<value-param>
<name>def-folder-node-type</name>
Modified: jcr/trunk/applications/product-patches/as/tomcat/exo-configuration.xml
===================================================================
--- jcr/trunk/applications/product-patches/as/tomcat/exo-configuration.xml 2011-04-05 08:27:45 UTC (rev 4206)
+++ jcr/trunk/applications/product-patches/as/tomcat/exo-configuration.xml 2011-04-05 10:04:01 UTC (rev 4207)
@@ -283,8 +283,7 @@
</value-param>
<value-param>
<name>client-side-encoding</name>
- <value>windows-1251</value>
- <!-- value>KOI8-R</value -->
+ <value>UTF-8</value>
</value-param>
<value-param>
<name>def-folder-node-type</name>
15 years
exo-jcr SVN: r4206 - 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: 2011-04-05 04:27:45 -0400 (Tue, 05 Apr 2011)
New Revision: 4206
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/SearchIndex.java
Log:
EXOJCR-1275 : closing MultiIndex on suspend, initializing on resume.
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 2011-04-04 11:59:02 UTC (rev 4205)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/MultiIndex.java 2011-04-05 08:27:45 UTC (rev 4206)
@@ -99,7 +99,7 @@
* thread and reader threads is done using {@link #updateMonitor} and
* {@link #updateInProgress}.
*/
-public class MultiIndex implements IndexerIoModeListener, IndexUpdateMonitorListener, Suspendable
+public class MultiIndex implements IndexerIoModeListener, IndexUpdateMonitorListener
{
/**
@@ -3652,40 +3652,4 @@
}
return true;
}
-
- /**
- * {@inheritDoc}
- */
- public void suspend() throws SuspendException
- {
- try
- {
- releaseMultiReader();
- flush();
- }
- catch (IOException e)
- {
- throw new SuspendException(e);
- }
- merger.dispose();
- }
-
- /**
- * {@inheritDoc}
- */
- public void resume() throws ResumeException
- {
- try
- {
- indexNames.read();
- refreshIndexList();
-
- doInitIndexMerger();
- merger.start();
- }
- catch (IOException e)
- {
- throw new ResumeException(e);
- }
- }
}
\ No newline at end of file
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/SearchIndex.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/SearchIndex.java 2011-04-04 11:59:02 UTC (rev 4205)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/SearchIndex.java 2011-04-05 08:27:45 UTC (rev 4206)
@@ -3052,12 +3052,7 @@
*/
public void suspend() throws SuspendException
{
- errorLog.close();
-
- if (index instanceof Suspendable)
- {
- ((Suspendable)index).suspend();
- }
+ close();
}
/**
@@ -3067,16 +3062,16 @@
{
try
{
- doInitErrorLog();
+ closed = false;
+ doInit();
}
catch (IOException e)
{
throw new ResumeException(e);
}
-
- if (index instanceof Suspendable)
+ catch (RepositoryException e)
{
- ((Suspendable)index).resume();
+ throw new ResumeException(e);
}
}
}
15 years
exo-jcr SVN: r4205 - 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: 2011-04-04 07:59:02 -0400 (Mon, 04 Apr 2011)
New Revision: 4205
Modified:
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/MultiIndex.java
Log:
EXOJCR-1275 : releasing multiReader on suspend
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 2011-04-01 14:53:07 UTC (rev 4204)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/MultiIndex.java 2011-04-04 11:59:02 UTC (rev 4205)
@@ -3660,6 +3660,7 @@
{
try
{
+ releaseMultiReader();
flush();
}
catch (IOException e)
15 years
exo-jcr SVN: r4204 - in jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent: jbosscache and 1 other directory.
by do-not-reply＠jboss.org
Author: sergiykarpenko
Date: 2011-04-01 10:53:07 -0400 (Fri, 01 Apr 2011)
New Revision: 4204
Modified:
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/infinispan/ISPNCacheWorkspaceStorageCache.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/jbosscache/JBossCacheWorkspaceStorageCache.java
Log:
EXOJCR-1289: persistent data added to cache without transactions
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/infinispan/ISPNCacheWorkspaceStorageCache.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/infinispan/ISPNCacheWorkspaceStorageCache.java 2011-04-01 13:28:52 UTC (rev 4203)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/infinispan/ISPNCacheWorkspaceStorageCache.java 2011-04-01 14:53:07 UTC (rev 4204)
@@ -275,7 +275,7 @@
cache.setLocal(false);
if (!inTransaction)
{
- cache.commitTransaction();
+ dedicatedTxCommit();
}
}
}
@@ -390,7 +390,7 @@
cache.setLocal(false);
if (!inTransaction)
{
- cache.commitTransaction();
+ dedicatedTxCommit();
}
}
}
@@ -432,7 +432,7 @@
cache.setLocal(false);
if (!inTransaction)
{
- cache.commitTransaction();
+ dedicatedTxCommit();
}
}
}
@@ -1086,7 +1086,7 @@
cache.setLocal(false);
if (!inTransaction)
{
- cache.commitTransaction();
+ dedicatedTxCommit();
}
}
}
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/jbosscache/JBossCacheWorkspaceStorageCache.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/jbosscache/JBossCacheWorkspaceStorageCache.java 2011-04-01 13:28:52 UTC (rev 4203)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/jbosscache/JBossCacheWorkspaceStorageCache.java 2011-04-01 14:53:07 UTC (rev 4204)
@@ -499,7 +499,7 @@
cache.setLocal(false);
if (!inTransaction)
{
- cache.commitTransaction();
+ dedicatedTxCommit();
}
}
}
@@ -615,7 +615,7 @@
cache.setLocal(false);
if (!inTransaction)
{
- cache.commitTransaction();
+ dedicatedTxCommit();
}
}
}
@@ -658,7 +658,7 @@
cache.setLocal(false);
if (!inTransaction)
{
- cache.commitTransaction();
+ dedicatedTxCommit();
}
}
}
@@ -884,7 +884,7 @@
cache.setLocal(false);
if (!inTransaction)
{
- cache.commitTransaction();
+ dedicatedTxCommit();
}
}
}
15 years
exo-jcr SVN: r4203 - 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: 2011-04-01 09:28:52 -0400 (Fri, 01 Apr 2011)
New Revision: 4203
Modified:
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/SearchIndex.java
Log:
EXOJCR-577: fix
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/SearchIndex.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/SearchIndex.java 2011-04-01 11:43:25 UTC (rev 4202)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/SearchIndex.java 2011-04-01 13:28:52 UTC (rev 4203)
@@ -700,7 +700,7 @@
{
if (doReindexing)
{
- index.createInitialIndex(itemStateManager, false);
+ index.createInitialIndex(itemStateManager);
}
if (doCheck)
{
15 years
exo-jcr SVN: r4202 - in jcr/branches/1.12.x/patch/1.12.9-GA: JCR-1604 and 1 other directory.
by do-not-reply＠jboss.org
Author: sergiykarpenko
Date: 2011-04-01 07:43:25 -0400 (Fri, 01 Apr 2011)
New Revision: 4202
Added:
jcr/branches/1.12.x/patch/1.12.9-GA/JCR-1604/
jcr/branches/1.12.x/patch/1.12.9-GA/JCR-1604/JCR-1604.patch
Log:
JCR-1604: patch proposed
Added: jcr/branches/1.12.x/patch/1.12.9-GA/JCR-1604/JCR-1604.patch
===================================================================
--- jcr/branches/1.12.x/patch/1.12.9-GA/JCR-1604/JCR-1604.patch (rev 0)
+++ jcr/branches/1.12.x/patch/1.12.9-GA/JCR-1604/JCR-1604.patch 2011-04-01 11:43:25 UTC (rev 4202)
@@ -0,0 +1,93 @@
+Index: exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/jbosscache/JBossCacheWorkspaceStorageCache.java
+===================================================================
+--- exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/jbosscache/JBossCacheWorkspaceStorageCache.java (revision 4199)
++++ exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/jbosscache/JBossCacheWorkspaceStorageCache.java (working copy)
+@@ -60,6 +60,7 @@
+
+ import javax.jcr.PropertyType;
+ import javax.jcr.RepositoryException;
++import javax.transaction.Transaction;
+ import javax.transaction.TransactionManager;
+
+ /**
+@@ -417,7 +418,7 @@
+ cache.setLocal(false);
+ if (!inTransaction)
+ {
+- cache.commitTransaction();
++ dedicatedTxCommit();
+ }
+ }
+ }
+@@ -572,7 +573,7 @@
+ cache.setLocal(false);
+ if (!inTransaction)
+ {
+- cache.commitTransaction();
++ dedicatedTxCommit();
+ }
+ }
+ }
+@@ -616,7 +617,7 @@
+ cache.setLocal(false);
+ if (!inTransaction)
+ {
+- cache.commitTransaction();
++ dedicatedTxCommit();
+ }
+ }
+ }
+@@ -658,7 +659,7 @@
+ cache.setLocal(false);
+ if (!inTransaction)
+ {
+- cache.commitTransaction();
++ dedicatedTxCommit();
+ }
+ }
+ }
+@@ -1347,4 +1348,44 @@
+ NOT_MODIFY, MODIFY, FORCE_MODIFY
+ }
+
++ /**
++ * Allows to commit the cache changes in a dedicated XA Tx in order to avoid potential
++ * deadlocks
++ */
++ private void dedicatedTxCommit()
++ {
++ // Ensure that the commit is done in a dedicated tx to avoid deadlock due
++ // to global XA Tx
++ TransactionManager tm = getTransactionManager();
++ Transaction tx = null;
++ try
++ {
++ if (tm != null)
++ {
++ try
++ {
++ tx = tm.suspend();
++ }
++ catch (Exception e)
++ {
++ LOG.warn("Cannot suspend the current transaction", e);
++ }
++ }
++ cache.commitTransaction();
++ }
++ finally
++ {
++ if (tx != null)
++ {
++ try
++ {
++ tm.resume(tx);
++ }
++ catch (Exception e)
++ {
++ LOG.warn("Cannot resume the current transaction", e);
++ }
++ }
++ }
++ }
+ }
15 years
exo-jcr SVN: r4201 - jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/infinispan.
by do-not-reply＠jboss.org
Author: tolusha
Date: 2011-04-01 07:35:04 -0400 (Fri, 01 Apr 2011)
New Revision: 4201
Modified:
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/infinispan/ISPNCacheableLockManagerImpl.java
Log:
EXOJCR-1271: add prefix before lock cache name
Modified: jcr/trunk/exo.jcr.component.core/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/infinispan/ISPNCacheableLockManagerImpl.java 2011-04-01 10:08:12 UTC (rev 4200)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/infinispan/ISPNCacheableLockManagerImpl.java 2011-04-01 11:35:04 UTC (rev 4201)
@@ -116,7 +116,7 @@
// configure cache loader parameters with correct DB data-types
configureJDBCCacheLoader(config.getLockManager());
- cache = factory.createCache(config.getUniqueName().replace("_", ""), config.getLockManager());
+ cache = factory.createCache("L" + config.getUniqueName().replace("_", ""), config.getLockManager());
// Context recall is a workaround of JDBCCacheLoader starting.
context.recall();
15 years
exo-jcr SVN: r4200 - in jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query: lucene and 1 other directory.
by do-not-reply＠jboss.org
Author: nzamosenchuk
Date: 2011-04-01 06:08:12 -0400 (Fri, 01 Apr 2011)
New Revision: 4200
Modified:
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/QueryHandlerContext.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/SearchManager.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/SearchIndex.java
Log:
EXOJCR-577: Added RepositoryName to Thread performing async reindexing
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/QueryHandlerContext.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/QueryHandlerContext.java 2011-04-01 08:24:33 UTC (rev 4199)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/QueryHandlerContext.java 2011-04-01 10:08:12 UTC (rev 4200)
@@ -88,6 +88,8 @@
* Field containing RPCService, if any configured in container
*/
private final RPCService rpcService;
+
+ private final String repositoryName;
/**
* Creates a new context instance.
@@ -119,7 +121,7 @@
public QueryHandlerContext(WorkspaceContainerFacade container, ItemDataConsumer stateMgr, IndexingTree indexingTree,
NodeTypeDataManager nodeTypeDataManager, NamespaceRegistryImpl nsRegistry, QueryHandler parentHandler,
String indexDirectory, DocumentReaderService extractor, boolean createInitialIndex,
- LuceneVirtualTableResolver virtualTableResolver, IndexRecovery indexRecovery, RPCService rpcService)
+ LuceneVirtualTableResolver virtualTableResolver, IndexRecovery indexRecovery, RPCService rpcService, String repositoryName)
{
this.indexRecovery = indexRecovery;
this.container = container;
@@ -134,6 +136,7 @@
this.propRegistry = new PropertyTypeRegistry(nodeTypeDataManager);
this.rpcService = rpcService;
this.parentHandler = parentHandler;
+ this.repositoryName = repositoryName;
((NodeTypeDataManagerImpl)this.nodeTypeDataManager).addListener(propRegistry);
}
@@ -253,5 +256,14 @@
{
return rpcService;
}
+
+ /**
+ * @return
+ * The name of current repository
+ */
+ public String getRepositoryName()
+ {
+ return repositoryName;
+ }
}
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/SearchManager.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/SearchManager.java 2011-04-01 08:24:33 UTC (rev 4199)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/SearchManager.java 2011-04-01 10:08:12 UTC (rev 4200)
@@ -720,7 +720,7 @@
QueryHandlerContext context =
new QueryHandlerContext(container, itemMgr, indexingTree, nodeTypeDataManager, nsReg, parentHandler,
PrivilegedFileHelper.getAbsolutePath(getIndexDirectory()), extractor, true, virtualTableResolver,
- indexRecovery, rpcService);
+ indexRecovery, rpcService, repositoryName);
return context;
}
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/SearchIndex.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/SearchIndex.java 2011-04-01 08:24:33 UTC (rev 4199)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/SearchIndex.java 2011-04-01 10:08:12 UTC (rev 4200)
@@ -663,10 +663,12 @@
catch (IOException e)
{
log
- .error("Error while reindexing the workspace. Please fix the problem, delete index and restart server.", e);
+ .error(
+ "Error while reindexing the workspace. Please fix the problem, delete index and restart server.",
+ e);
}
}
- }, "Reindexing-" + context.getContainer().getWorkspaceName()).start();
+ }, "Reindexing-" + context.getRepositoryName() + "-" + context.getContainer().getWorkspaceName()).start();
}
else
{
@@ -698,7 +700,7 @@
{
if (doReindexing)
{
- index.createInitialIndex(itemStateManager);
+ index.createInitialIndex(itemStateManager, false);
}
if (doCheck)
{
@@ -3036,7 +3038,7 @@
checkOpen();
index.setOnline(isOnline);
}
-
+
/**
* @see org.exoplatform.services.jcr.impl.core.query.QueryHandler#isOnline()
*/
15 years