Merged V2.2 to HEAD

8405: Added causal exception to the runtime generated
   8408: AR-2136, AR-2137, AR-2138
   8410: WCM-1110, WCM-1111
   8417: Stopped chiba:match() function from being inserted into bindings for xforms model elements of type xs:integer.
   8419: Fixes for correct use of .empty in name spaces of QNames
   8420: Finally fixes WCM-1108 and WCM-1109
   8489: Merged V2.1 to V2.2
      8482: Fix For AR-2163
   8507: Merged V2.1 to V2.2
      8504: Fix for AR-2165 - respect repo read only setting during authentication


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

source/java/org/alfresco/repo/search/AVMSnapShotTriggeredIndexingMethodInterceptor.java

@@ -485,4 +485,18 @@ public class AVMSnapShotTriggeredIndexingMethodInterceptor implements MethodInte
             avmIndexer.createIndex(store, IndexMode.SYNCHRONOUS);
         }
     }
+    
+    public AVMLuceneIndexer getIndexer(String store)
+    {
+        StoreRef storeRef = AVMNodeConverter.ToStoreRef(store);
+        Indexer indexer = indexerAndSearcher.getIndexer(storeRef);
+        if (indexer instanceof AVMLuceneIndexer)
+        {
+            AVMLuceneIndexer avmIndexer = (AVMLuceneIndexer) indexer;
+            return avmIndexer;
+        }
+        return null;
+    }
+
+    
 }

source/java/org/alfresco/repo/search/impl/lucene/AVMLuceneIndexer.java

@@ -99,4 +99,10 @@ public interface AVMLuceneIndexer extends LuceneIndexer, BackgroundIndexerAware
      * @return
      */
     public boolean hasIndexBeenCreated(String store);
+    
+    /**
+     * Get the number of docs this indexer has indexed so far
+     * @return
+     */
+    public long getIndexedDocCount();
 }

source/java/org/alfresco/repo/search/impl/lucene/AVMLuceneIndexerImpl.java

@@ -128,6 +128,8 @@ public class AVMLuceneIndexerImpl extends AbstractLuceneIndexerImpl<String> impl
     private int startVersion = -1;
 
     private int endVersion = -1;
+    
+    private long indexedDocCount = 0;
 
     /**
      * Set the AVM Service
@@ -391,6 +393,7 @@ public class AVMLuceneIndexerImpl extends AbstractLuceneIndexerImpl<String> impl
         }
         if (desc.isLayeredDirectory() || desc.isLayeredFile())
         {
+            incrementDocCount();
             return docs;
         }
 
@@ -538,6 +541,7 @@ public class AVMLuceneIndexerImpl extends AbstractLuceneIndexerImpl<String> impl
             System.out.println("Is Root " + root);
             System.out.println("Is deleted " + deleted);
         }
+        incrementDocCount();
         return docs;
     }
 
@@ -1650,4 +1654,14 @@ public class AVMLuceneIndexerImpl extends AbstractLuceneIndexerImpl<String> impl
         }
 
     }
+    
+    public synchronized long getIndexedDocCount()
+    {
+        return indexedDocCount;
+    }
+    
+    private synchronized void incrementDocCount()
+    {
+        indexedDocCount++;
+    }
 }