Fix AVM and context issues

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5749 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

config/alfresco/action-services-context.xml

@@ -10,7 +10,7 @@
             <ref bean="NodeService" />
         </property>  	   
         <property name="searchService">
-            <ref bean="SearchService" />
+            <ref bean="ADMSearchService" />
         </property>  	   
         <property name="authenticationComponent">
             <ref bean="authenticationComponent" />
@@ -414,7 +414,7 @@
     
     <bean id="simple-avm-submit" class="org.alfresco.repo.avm.actions.SimpleAVMSubmitAction" parent="action-executer">
         <property name="avmService">
-    	    <ref bean="avmService"/>
+    	    <ref bean="indexingAVMService"/>
     	</property>
     	<property name="avmSyncService">
     	    <ref bean="avmSyncService"/>
@@ -468,7 +468,7 @@
     
     <bean id="avm-revert-to-version" class="org.alfresco.repo.avm.actions.AVMRevertToVersionAction" parent = "action-executer">
         <property name="avmService">
-            <ref bean="avmService"/>
+            <ref bean="indexingAVMService"/>
         </property>
         <property name="publicAction">
             <value>false</value>
@@ -477,7 +477,7 @@
     
     <bean id="avm-undo-list" class="org.alfresco.repo.avm.actions.AVMUndoSandboxListAction" parent="action-executer">
     	<property name="avmService">
-    	    <ref bean="avmService"/>
+    	    <ref bean="indexingAVMService"/>
     	</property>
     	<property name="publicAction">
     	    <value>false</value>

config/alfresco/authentication-services-context.xml

@@ -86,7 +86,7 @@
            <ref bean="namespaceService" />
        </property>
        <property name="searchService">
-           <ref bean="searchService" />
+           <ref bean="admSearchService" />
        </property>
        <property name="userNamesAreCaseSensitive">
           <value>${user.name.caseSensitive}</value>
@@ -182,7 +182,7 @@
 		    <ref bean="nodeService" />
 		</property>
 		<property name="searchService">
-		    <ref bean="searchService" />
+		    <ref bean="admSearchService" />
 		</property>
 		<property name="permissionServiceSPI">
 			<ref bean="permissionServiceImpl" />

config/alfresco/authority-services-context.xml

@@ -62,7 +62,7 @@
             <ref bean="namespaceService" />
         </property>
         <property name="searchService">
-            <ref bean="searchService" />
+            <ref bean="admSearchService" />
         </property>
         <property name="dictionaryService">
             <ref bean="dictionaryService" />

config/alfresco/avm-console-context.xml

@@ -17,13 +17,13 @@
 	
 	<bean id="bulkLoader" class="org.alfresco.repo.avm.util.BulkLoader">
 		<property name="avmService">
-			<ref bean="avmService"/>
+			<ref bean="indexingAVMService"/>
 		</property>
 	</bean>
 	
 	<bean id="interactiveConsole" class="org.alfresco.repo.avm.AVMInterpreter">
 		<property name="avmService">
-			<ref bean="avmService"/>
+			<ref bean="indexingAVMService"/>
 		</property>
 		<property name="bulkLoader">
 			<ref bean="bulkLoader"/>

config/alfresco/core-services-context.xml

@@ -269,6 +269,12 @@
             <ref bean="indexerAndSearcherFactory" />
         </property>
     </bean>
+	
+	<bean id="admSearchService" class="org.alfresco.repo.search.SearcherComponent">
+        <property name="indexerAndSearcherFactory">
+            <ref bean="admLuceneIndexerAndSearcherFactory" />
+        </property>
+    </bean>
 
 
     <!--                                                                               -->
@@ -471,7 +477,7 @@
             <ref bean="ownableService"></ref>
         </property>
         <property name="searchService">
-            <ref bean="searchService"></ref>
+            <ref bean="admSearchService"></ref>
         </property>
     </bean>
 
@@ -491,7 +497,7 @@
             <ref bean="versionCounterService" />
         </property>
         <property name="searcher">
-            <ref bean="searchService" />
+            <ref bean="admSearchService" />
         </property>
         <property name="dictionaryService">
             <ref bean="dictionaryService" />
@@ -675,7 +681,7 @@
             <ref bean="ruleService" />
         </property>
         <property name="searchService">
-            <ref bean="SearchService" />
+            <ref bean="ADMSearchService" />
         </property>
         <property name="permissionService">
             <ref bean="PermissionService" />

config/alfresco/model-specific-services-context.xml

@@ -10,7 +10,7 @@
       <property name="dictionaryService"><ref bean="dictionaryService" /></property>
       <property name="nodeService"><ref bean="nodeService" /></property>
       <property name="copyService"><ref bean="copyService" /></property>
-      <property name="searchService"><ref bean="searchService" /></property>
+      <property name="searchService"><ref bean="admSearchService" /></property>
       <property name="contentService"><ref bean="contentService" /></property>
       <property name="multilingualContentService"><ref bean="multilingualContentService" /></property>
       <property name="mimetypeService"><ref bean="mimetypeService" /></property>
@@ -57,7 +57,7 @@
          <ref bean="nodeService" />
       </property>
       <property name="searchService">
-         <ref bean="searchService" />
+         <ref bean="admSearchService" />
       </property>
       <property name="versionService">
          <ref bean="versionService" />

config/alfresco/network-protocol-context.xml

@@ -77,7 +77,7 @@
    
 	<!-- AVM Filesystem Interface -->
    <bean id="avmDiskDriver" class="org.alfresco.filesys.avm.AVMDiskDriver" >
-	  <property name="avmService"><ref bean="avmService" /></property>
+	  <property name="avmService"><ref bean="indexingAVMService" /></property>
       <property name="transactionService"><ref bean="transactionComponent" /></property>
       <property name="authenticationComponent"><ref bean="authenticationComponent"/></property>
 	  <property name="authenticationService"><ref bean="authenticationService"/></property>

config/alfresco/public-services-context.xml

@@ -147,6 +147,23 @@
             </list>
         </property>
     </bean>
+	
+	<bean id="ADMSearchService" class="org.springframework.aop.framework.ProxyFactoryBean">
+        <property name="proxyInterfaces">
+            <value>org.alfresco.service.cmr.search.SearchService</value>
+        </property>
+        <property name="target">
+            <ref bean="admSearchService"/>
+        </property>
+        <property name="interceptorNames">
+            <list>
+                <idref local="SearchService_transaction"/>
+                <idref local="AuditMethodInterceptor"/>
+                <idref local="exceptionTranslator"/>
+                <idref bean="SearchService_security"/>
+            </list>
+        </property>
+    </bean>
     
     <bean id="SearchService_transaction" class="org.springframework.transaction.interceptor.TransactionInterceptor">
         <property name="transactionManager">
@@ -692,7 +709,7 @@
     
     <bean id="crossRepositoryCopyService" class="org.alfresco.repo.copy.CrossRepositoryCopyServiceImpl">
         <property name="avmService">
-            <ref bean="avmService"/>
+            <ref bean="indexingAVMService"/>
         </property>
         <property name="nodeService">
             <ref bean="nodeService"/>