[exo-jcr-commits] 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.

[do-not-reply at 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()
     */