Merged V2.1 to HEAD

6580: AVM bulk import performance tweaks.
   6582: WCM-767, WCM-768
   6583: Fix for AWC-1528 (potential NPE in ErrorsRenderer)
   6584: Fix for AWC-1256 (Links produced by inline HTML editor are incorrect)
   6585: AR-1635: event listeners added in a beforeCommit event are now executed successfully
   6586: AR-1561 Update Web Scripts readme.html to be consistent with "Category Search Sample" (or vice-versa)
   6587: Fix for AWC-1390 (Paste all doesn't work for forum items)
   6588: AR-1701 Script getDocument call doesn't check for non-existent content
   6589: Fix for AWC-1530 - Saved search does not work for custom properties of type d:text with list constraint
   6591: Improvement for submit speed.
   6592: Removed obsolete tests.
   6594: Index tracking sample to include AVM index tracking
   6595: Added the AVM helpers methods from the FreeMarker AVM API that were missing from the JavaScript API
   6597: Rationalize post commit execution hooks for deployment receiver
   6598: Properly escape path names for ProgramRunnable.
   6599: AVM store name lookup cache is (theoretically) clusterable.
   6600: Some or other gramatically incorrect stuff about Chiba.
   6601: Fix for AR-1121 and AR-1673
   6602: AR-1655: Versioning is not MLText aware
   6603: Updated messages from lang packs
   6604: Fixed AR-1476: JCR import end element escaping
   6605: Updated Japanese lang messages


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

config/alfresco/extension/index-tracking-context.xml.sample

@@ -3,8 +3,12 @@
 
 <beans>
 
-    <!-- Schedule index tracking every 30s -->
-    <bean id="indexTrackerTrigger" class="org.alfresco.util.CronTriggerBean">
+    <!--===========================-->
+    <!-- ADM index tracking        -->
+    <!--===========================-->
+
+    <!-- Schedule index tracking for ADM every 10s -->
+    <bean id="admIndexTrackerTrigger" class="org.alfresco.util.CronTriggerBean">
         <property name="jobDetail">
             <bean class="org.springframework.scheduling.quartz.JobDetailBean">
                 <property name="jobClass">
@@ -13,7 +17,7 @@
                 <property name="jobDataAsMap">
                     <map>
                         <entry key="indexRecoveryComponent">
-                            <ref bean="indexTrackerComponent" />
+                            <ref bean="admIndexTrackerComponent" />
                         </entry>
                     </map>
                 </property>
@@ -28,7 +32,7 @@
     </bean>
     
     <bean
-          id="indexTrackerComponent"
+          id="admIndexTrackerComponent"
           class="org.alfresco.repo.node.index.IndexRemoteTransactionTracker"
           parent="indexRecoveryComponentBase">
         <property name="remoteOnly">
@@ -36,15 +40,12 @@
         </property>
     </bean>
 
-    <!-- Forces the reindexing of nodes where content may have been missing before -->
-    <!--
-       This component can be triggered at intervals where asynchronous content sharing
-       between clustered servers has been set up.  If content sharing is synchronous
-       (see ReplicatingContentStore.setOutboundThreadPoolExecutor) then this component
-       is not required.
-    -->
-    <!--
-    <bean id="missingContentReindexTrigger" class="org.alfresco.util.TriggerBean">
+    <!--===========================-->
+    <!-- AVM (WCM) index tracking  -->
+    <!--===========================-->
+
+    <!-- Schedule index tracking for AVM every 60s -->
+    <bean id="indexTrackerTrigger" class="org.alfresco.util.CronTriggerBean">
         <property name="jobDetail">
             <bean class="org.springframework.scheduling.quartz.JobDetailBean">
                 <property name="jobClass">
@@ -53,7 +54,7 @@
                 <property name="jobDataAsMap">
                     <map>
                         <entry key="indexRecoveryComponent">
-                            <ref bean="missingContentReindexComponent" />
+                            <ref bean="avmIndexTrackerComponent" />
                         </entry>
                     </map>
                 </property>
@@ -62,13 +63,21 @@
         <property name="scheduler">
             <ref bean="schedulerFactory" />
         </property>
-        <property name="startDelayMinutes">
-            <value>5</value>
-        </property>
-        <property name="repeatCount">
-            <value>0</value>
+        <property name="cronExpression">
+            <value>15 * * * * ?</value>
         </property>
     </bean>
-    -->
+    
+    <bean
+          id="avmIndexTrackerComponent"
+          class="org.alfresco.repo.node.index.AVMRemoteSnapshotTracker"
+          parent="indexRecoveryComponentBase">
+	   <property name="avmService">
+          <ref bean="avmService" />
+      </property>
+	   <property name="avmSnapShotTriggeredIndexingMethodInterceptor">
+		   <ref bean="avmSnapShotTriggeredIndexingMethodInterceptor" />
+      </property>
+    </bean>
 
 </beans>