From b865ef7d885f31a2655f863334e9cc57450a4986 Mon Sep 17 00:00:00 2001
From: Derek Hulley <derek.hulley@alfresco.com>
Date: Tue, 19 Jan 2010 12:35:20 +0000
Subject: [PATCH] Merged V3.2 to HEAD    17366: Fix for ETHREEOH-2761: UI -
 Cannot search in deleted items with more than 2 Japanese characters    17369:
 Fix for ETHREEOH-1771: Unable to use
 language-specific-index-and-search-context.xml    17383: Putting explicit
 version name on PDFRenderer.jar
 ___________________________________________________________________ Modified:
 svn:mergeinfo    Merged /alfresco/BRANCHES/V3.2:r17366,17369,17383

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18133 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 ...ecific-index-and-search-context.xml.sample | 38 +++++--------------
 1 file changed, 9 insertions(+), 29 deletions(-)

diff --git a/config/alfresco/extension/language-specific-index-and-search-context.xml.sample b/config/alfresco/extension/language-specific-index-and-search-context.xml.sample
index 8259f14c91..b083c06fad 100644
--- a/config/alfresco/extension/language-specific-index-and-search-context.xml.sample
+++ b/config/alfresco/extension/language-specific-index-and-search-context.xml.sample
@@ -10,51 +10,31 @@
     <!-- See MLAnalysisMode for all the available options -->
     
     <bean id="admLuceneIndexerAndSearcherFactory"
-        class="org.alfresco.repo.search.impl.lucene.LuceneIndexerAndSearcherFactory2">
+        parent="abstractLuceneIndexerAndSearcherFactory"
+        class="org.alfresco.repo.search.impl.lucene.ADMLuceneUnIndexedIndexAndSearcherFactory">
         <property name="nodeService">
             <ref bean="mlAwareNodeService" />
         </property>
+        <property name="tenantService">
+            <ref bean="tenantService"/>
+        </property>
         <property name="dictionaryService">
             <ref bean="dictionaryService" />
         </property>
         <property name="nameSpaceService">
             <ref bean="namespaceService" />
         </property>
-        <property name="indexRootLocation">
-            <value>${dir.indexes}</value>
-        </property>
         <property name="contentService">
             <ref bean="contentService" />
         </property>
         <property name="queryRegister">
             <ref bean="queryRegisterComponent" />
         </property>
-        <property name="maxAtomicTransformationTime">
-            <value>${lucene.maxAtomicTransformationTime}</value>  <!-- milliseconds allowed for inline text transformation -->
+        <property name="threadPoolExecutor">
+            <ref bean="indexThreadPoolExecutor"></ref>
         </property>
-        <property name="queryMaxClauses">
-            <value>${lucene.query.maxClauses}</value>
-        </property>
-        <property name="indexerBatchSize">
-            <value>${lucene.indexer.batchSize}</value>
-        </property>
-        <property name="lockDirectory">
-            <value>${dir.indexes.lock}</value>
-        </property>
-        <property name="indexerMaxFieldLength">
-            <value>${lucene.indexer.maxFieldLength}</value>
-        </property>
-        <property name="writeLockTimeout">
-            <value>${lucene.write.lock.timeout}</value>
-        </property>
-        <property name="commitLockTimeout">
-            <value>${lucene.commit.lock.timeout}</value>
-        </property>
-        <property name="lockPollInterval">
-            <value>${lucene.lock.poll.interval}</value>
-        </property>
-		 <property name="defaultMLIndexAnalysisMode">
-            <value>EXACT_LANGUAGE_AND_ALL</value>
+        <property name="bulkLoader">
+            <ref bean="nodeDaoServiceImpl"></ref>
         </property>
 		<property name="defaultMLSearchAnalysisMode">
             <value>EXACT_LANGUAGE</value>