From 5791f1e7fbfe4f4b8b099a30f0ab2a4c3a9d6d22 Mon Sep 17 00:00:00 2001
From: Steven Glover <steven.glover@alfresco.com>
Date: Mon, 26 Jul 2010 12:44:30 +0000
Subject: [PATCH] Fix for ALF-3952 - Search/Read Permissions Evaluation
 Performance Includes read permission evaluation optimisation, bulk loading of
 aspects

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@21406 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 config/alfresco/cache-context.xml             |   30 +
 config/alfresco/dao/dao-context.xml           |    7 +
 config/alfresco/ehcache-default.xml           |   12 +-
 .../node-common-SqlMap.xml                    |   43 +-
 .../public-services-security-context.xml      |   15 +-
 config/alfresco/repository.properties         |    4 +
 .../cmis/search/CMISResultSetImpl.java        |   39 +
 .../org/alfresco/repo/avm/AVMNodeService.java |    8 +-
 .../alfresco/repo/cache/EhCacheTracerJob.java |    2 +
 .../repo/domain/node/AbstractNodeDAOImpl.java |   27 +-
 .../repo/domain/node/NodeAspectsEntity.java   |   29 +-
 .../alfresco/repo/domain/node/NodeDAO.java    |    3 +-
 .../repo/domain/node/ibatis/NodeDAOImpl.java  |   30 +-
 .../AVMPermissionsDaoComponentImpl.java       |    1 +
 .../AbstractPermissionsDaoComponentImpl.java  |   20 +
 .../repo/domain/permissions/AclDAOImpl.java   |   16 +-
 .../repo/domain/permissions/AclEntity.java    |    8 +-
 .../domain/permissions/AclUpdateEntity.java   |    4 +-
 .../repo/node/db/DbNodeServiceImpl.java       |   18 +
 .../repo/search/AbstractResultSet.java        |   42 +-
 .../alfresco/repo/search/EmptyResultSet.java  |   40 +
 .../repo/search/SearchServiceTest.java        |    2 +-
 .../search/impl/lucene/ADMLuceneTest.java     | 3423 +++++++++--------
 .../LuceneAlfrescoFtsQueryLanguage.java       |    7 +-
 .../LuceneAlfrescoSqlQueryLanguage.java       |    1 -
 .../LuceneCmisStrictSqlQueryLanguage.java     |    1 -
 .../search/impl/lucene/LuceneResultSet.java   |   59 +-
 .../impl/lucene/PagingLuceneResultSet.java    |   40 +
 .../impl/lucene/LuceneQueryEngine.java        |    2 -
 .../search/results/ResultSetSPIWrapper.java   |   42 +-
 .../repo/search/results/SortedResultSet.java  |   40 +
 .../security/permissions/impl/ModelDAO.java   |    3 +-
 .../impl/PermissionServiceImpl.java           |  554 ++-
 .../ACLEntryAfterInvocationProvider.java      |  152 +-
 .../impl/acegi/FilteringResultSet.java        |   39 +
 .../impl/model/PermissionModel.java           |   81 +-
 .../noop/PermissionServiceNOOPImpl.java       |   16 +-
 .../repo/version/NodeServiceImpl.java         |    9 +
 38 files changed, 3095 insertions(+), 1774 deletions(-)

diff --git a/config/alfresco/cache-context.xml b/config/alfresco/cache-context.xml
index 5ef22757f4..d3c88e25a9 100644
--- a/config/alfresco/cache-context.xml
+++ b/config/alfresco/cache-context.xml
@@ -400,7 +400,37 @@
          <value>10000</value>
       </property>
    </bean>
+
+    <!-- The cross-transaction shared cache for ACL readers -->
    
+   <bean name="readersSharedCache" class="org.alfresco.repo.cache.EhCacheAdapter">
+      <property name="cache">
+         <bean class="org.springframework.cache.ehcache.EhCacheFactoryBean" >
+            <property name="cacheManager">
+               <ref bean="internalEHCacheManager" />
+            </property>
+            <property name="cacheName">
+               <value>org.alfresco.cache.readersCache</value>
+            </property>
+         </bean>
+      </property>
+   </bean>
+   
+   <!-- The transactional cache for ACL readers -->
+   
+   <bean name="readersCache" class="org.alfresco.repo.cache.TransactionalCache">
+      <property name="sharedCache">
+         <ref bean="readersSharedCache" />
+      </property>
+      <!-- Eh cache area -->
+      <property name="name">
+         <value>org.alfresco.readersTransactionalCache</value>
+      </property>
+      <property name="maxCacheSize">
+         <value>10000</value>
+      </property>
+   </bean>
+      
    <!-- ===================================== -->
    <!-- Node owner cache                      -->
    <!-- ===================================== -->
diff --git a/config/alfresco/dao/dao-context.xml b/config/alfresco/dao/dao-context.xml
index 5de38b1db8..aa174a6cea 100644
--- a/config/alfresco/dao/dao-context.xml
+++ b/config/alfresco/dao/dao-context.xml
@@ -184,6 +184,9 @@
       <property name="aclDAO">
          <ref bean="aclDAO"/>
       </property>
+      <property name="readersCache">
+         <ref bean="readersCache" />
+      </property>
       <property name="protocolToACLDAO">
          <map>
             <entry key="workspace"><ref bean="admNodeACLDAO"></ref></entry>
@@ -199,6 +202,9 @@
       <property name="aclDAO">
          <ref bean="aclDAO"/>
       </property>
+      <property name="readersCache">
+         <ref bean="readersCache" />
+      </property>
       <property name="protocolToACLDAO">
          <map>
             <entry key="workspace"><ref bean="admNodeACLDAO"></ref></entry>
@@ -234,6 +240,7 @@
       <property name="qnameDAO" ref="qnameDAO"/>
       <property name="aclCrudDAO" ref="aclCrudDAO"/>
       <property name="aclCache" ref="aclCache"/>
+      <property name="readersCache" ref="readersCache"/>
    </bean>
    
    <bean id="usageDAO" class="org.alfresco.repo.domain.usage.ibatis.UsageDAOImpl">
diff --git a/config/alfresco/ehcache-default.xml b/config/alfresco/ehcache-default.xml
index 187fde7e8d..17f04ca246 100644
--- a/config/alfresco/ehcache-default.xml
+++ b/config/alfresco/ehcache-default.xml
@@ -212,6 +212,14 @@
         overflowToDisk="false"
         statistics="false"
         />
+
+    <cache 
+        name="org.alfresco.cache.readersCache" 
+        maxElementsInMemory="10000"
+        eternal="true"
+        overflowToDisk="false"
+        />
+
     <cache 
         name="org.alfresco.cache.nodeOwnerCache" 
         maxElementsInMemory="20000"
@@ -243,7 +251,6 @@
         overflowToDisk="false"
         statistics="false"
         />
-        
     <cache
         name="org.alfresco.cache.permissions.aclEntityCache"
         maxElementsInMemory="50000"
@@ -259,7 +266,6 @@
         overflowToDisk="false"
         statistics="false"
         />
-        
     <cache
         name="org.alfresco.cache.permissions.permissionEntityCache"
         maxElementsInMemory="10000"
@@ -364,4 +370,4 @@
         statistics="false"
         />
 
-</ehcache>
\ No newline at end of file
+</ehcache>
diff --git a/config/alfresco/ibatis/org.hibernate.dialect.Dialect/node-common-SqlMap.xml b/config/alfresco/ibatis/org.hibernate.dialect.Dialect/node-common-SqlMap.xml
index f73efdd8a6..d26a2b9055 100644
--- a/config/alfresco/ibatis/org.hibernate.dialect.Dialect/node-common-SqlMap.xml
+++ b/config/alfresco/ibatis/org.hibernate.dialect.Dialect/node-common-SqlMap.xml
@@ -25,7 +25,7 @@
     <typeAlias alias="NodeAssoc" type="org.alfresco.repo.domain.node.NodeAssocEntity"/>
     <typeAlias alias="ChildAssoc" type="org.alfresco.repo.domain.node.ChildAssocEntity"/>
     <typeAlias alias="PrimaryChildrenAclUpdate" type="org.alfresco.repo.domain.node.PrimaryChildrenAclUpdateEntity"/>
-
+    <typeAlias alias="Aspect" type="org.alfresco.repo.domain.node.AspectEntity"/>
     
     <!--                -->
     <!-- Result Maps    -->
@@ -86,6 +86,16 @@
         <result property="id" column="id" jdbcType="BIGINT" javaType="java.lang.Long"/>
         <result property="aclId" column="acl_id" jdbcType="BIGINT" javaType="java.lang.Long"/>
     </resultMap>
+    <resultMap id="result_AspectQNameIds" class="java.lang.Long">
+        <result property="" column="qname_id"/>
+    </resultMap>
+    <resultMap id="result_NodeAspects" class="NodeAspects" groupBy="nodeId">
+        <result property="nodeId" column="node_id" jdbcType="BIGINT" javaType="java.lang.Long"/>
+        <result property="aspectQNameIds" resultMap="alfresco.node.result_AspectQNameIds"/>
+<!--
+        <result property="aspectQNameIds" column="qname_id" jdbcType="BIGINT" javaType="java.lang.Long"/>
+-->
+    </resultMap>
     <resultMap id="result_NodeProperty" class="NodeProperty">
         <result property="nodeId" column="node_id" jdbcType="BIGINT" javaType="java.lang.Long"/>
         <result property="key.qnameId" column="qname_id" jdbcType="BIGINT" javaType="java.lang.Long"/>
@@ -409,7 +419,7 @@
     <delete id="delete_NodeAspects" parameterClass="NodeAspects">
         delete from alf_node_aspects
         where
-            node_id = #id#
+            node_id = #nodeId#
             <isNotNull property="aspectQNameIds" prepend="">
                 and qname_id in
                 <iterate property="aspectQNameIds" open="(" close=")" conjunction=", ">#aspectQNameIds[]#</iterate>
@@ -592,7 +602,34 @@
                 <iterate property="qnameIds" open="(" close=")" conjunction=",">#qnameIds[]#</iterate>
             </isNotNull>
     </select>
+
+    <sql id="select_NodeAspects_Results">
+        select
+            aspects.node_id            as node_id,
+            aspects.qname_id           as qname_id
+    </sql>
     
+    <select id="select_NodeAspects" parameterClass="NodeAspects" resultMap="result_NodeAspects">
+        <include refid="alfresco.node.select_NodeAspects_Results"/>
+        from
+            alf_node_aspects aspects
+        where
+            <dynamic>
+                <isNotNull property="nodeId">aspects.node_id = #nodeId#</isNotNull>
+                <isNotNull property="nodeIds">
+                    aspects.node_id in <iterate property="nodeIds" open="(" close=")" conjunction=",">#nodeIds[]#</iterate>
+                </isNotNull>
+            </dynamic>
+<!--
+            <isNotNull property="key.qnameId">and qname_id = #key.qnameId#</isNotNull>
+            <isNotNull property="qnameIds">
+                and qname_id in
+                <iterate property="qnameIds" open="(" close=")" conjunction=",">#qnameIds[]#</iterate>
+            </isNotNull>
+-->
+    </select>
+    
+
     <select id="select_NodeAspectIds" parameterMap="parameter_Id" resultClass="java.lang.Long">
         select
             qname_id
@@ -601,7 +638,7 @@
         where
             node_id = ?
     </select>
-    
+  
     <select id="select_NodesWithAspectId" parameterMap="parameter_NodesWithAspect" resultMap="result_NodeRef" >
         select
             node.id             as id,
diff --git a/config/alfresco/public-services-security-context.xml b/config/alfresco/public-services-security-context.xml
index 49e73ab26f..679aa59cb9 100644
--- a/config/alfresco/public-services-security-context.xml
+++ b/config/alfresco/public-services-security-context.xml
@@ -77,12 +77,18 @@
         <property name="accessCache">
             <ref bean="permissionsAccessCache" />
         </property>
+        <property name="readersCache">
+            <ref bean="readersCache" />
+        </property>
         <property name="policyComponent">
             <ref bean="policyComponent" />
         </property>
         <property name="aclDAO">
             <ref bean="aclDAO" />
         </property>
+        <property name="ownableService">
+            <ref bean="ownableService" />
+        </property>
         <property name="dynamicAuthorities">
             <list>
                 <ref bean="ownerDynamicAuthority" />
@@ -96,7 +102,6 @@
     <!-- Dynamic Authorities -->
     <!-- =================== -->
 
-
     <!-- The provider to evaluate if the current authentication is the owner of a node.  -->
     <bean id="ownerDynamicAuthority" class="org.alfresco.repo.security.permissions.dynamic.OwnerDynamicAuthority">
         <property name="ownableService">
@@ -231,6 +236,12 @@
         <property name="maxPermissionChecks">
             <value>${system.acl.maxPermissionChecks}</value>
         </property>
+        <property name="optimisePermissionsCheck">
+            <value>${system.readpermissions.optimise}</value>
+        </property>
+        <property name="optimisePermissionsBulkFetchSize">
+            <value>${system.readpermissions.bulkfetchsize}</value>
+        </property>
     </bean>
 
     <!-- Link up after method call security -->
@@ -879,4 +890,4 @@
         </property>
     </bean>
 	
-</beans>
\ No newline at end of file
+</beans>
diff --git a/config/alfresco/repository.properties b/config/alfresco/repository.properties
index 7f65ec3ad0..c5c3a25253 100644
--- a/config/alfresco/repository.properties
+++ b/config/alfresco/repository.properties
@@ -117,6 +117,10 @@ system.acl.maxPermissionCheckTimeMillis=10000
 # The maximum number of results to perform permission checks against
 system.acl.maxPermissionChecks=1000
 
+# Properties to control read permission evaluation for acegi
+system.readpermissions.optimise=true
+system.readpermissions.bulkfetchsize=1000
+
 #
 # Manually control how the system handles maximum string lengths.
 # Any zero or negative value is ignored.
diff --git a/source/java/org/alfresco/cmis/search/CMISResultSetImpl.java b/source/java/org/alfresco/cmis/search/CMISResultSetImpl.java
index aba50ef1a5..b3da974f2e 100644
--- a/source/java/org/alfresco/cmis/search/CMISResultSetImpl.java
+++ b/source/java/org/alfresco/cmis/search/CMISResultSetImpl.java
@@ -283,5 +283,44 @@ public class CMISResultSetImpl implements CMISResultSet, Serializable
     {
         return getLength();
     }
+    
+    /**
+     * Bulk fetch results in the cache - not supported here
+     * 
+     * @param bulkFetch
+     */
+    public boolean setBulkFetch(boolean bulkFetch)
+    {
+    	return false;
+    }
 
+    /**
+     * Do we bulk fetch - not supported here
+     * 
+     * @return - true if we do
+     */
+    public boolean getBulkFetch()
+    {
+        return false;
+    }
+
+    /**
+     * Set the bulk fetch size
+     * 
+     * @param bulkFetchSize
+     */
+    public int setBulkFetchSize(int bulkFetchSize)
+    {
+    	return 0;
+    }
+
+    /**
+     * Get the bulk fetch size.
+     * 
+     * @return the fetch size
+     */
+    public int getBulkFetchSize()
+    {
+        return 0;
+    }
 }
diff --git a/source/java/org/alfresco/repo/avm/AVMNodeService.java b/source/java/org/alfresco/repo/avm/AVMNodeService.java
index 6d723f961d..a5f0a19249 100644
--- a/source/java/org/alfresco/repo/avm/AVMNodeService.java
+++ b/source/java/org/alfresco/repo/avm/AVMNodeService.java
@@ -1992,5 +1992,11 @@ public class AVMNodeService extends AbstractNodeServiceImpl implements NodeServi
     public Collection<ChildAssociationRef> getChildAssocsWithoutParentAssocsOfType(NodeRef parent, QName assocTypeQName)
     {
         throw new UnsupportedOperationException("AVM does not support this operation.");
-    }        
+    }
+
+    public Long getNodeAclId(NodeRef nodeRef) throws InvalidNodeRefException
+    {
+    	throw new UnsupportedOperationException("getNodeAclId is unsupported for AVMNodeService");
+    }
+
 }
diff --git a/source/java/org/alfresco/repo/cache/EhCacheTracerJob.java b/source/java/org/alfresco/repo/cache/EhCacheTracerJob.java
index c6f5c9f5c1..6a71c6b163 100644
--- a/source/java/org/alfresco/repo/cache/EhCacheTracerJob.java
+++ b/source/java/org/alfresco/repo/cache/EhCacheTracerJob.java
@@ -90,6 +90,8 @@ public class EhCacheTracerJob implements Job
         for (String cacheName : cacheNames)
         {
             Cache cache = cacheManager.getCache(cacheName);
+            //cache.getCacheEventNotificationService().
+//            cache.registerCacheUsageListener(cacheUsageListener)
             if (cache == null)  // perhaps a temporary cache
             {
                 continue;
diff --git a/source/java/org/alfresco/repo/domain/node/AbstractNodeDAOImpl.java b/source/java/org/alfresco/repo/domain/node/AbstractNodeDAOImpl.java
index 067ae98a5b..5119d8c91c 100644
--- a/source/java/org/alfresco/repo/domain/node/AbstractNodeDAOImpl.java
+++ b/source/java/org/alfresco/repo/domain/node/AbstractNodeDAOImpl.java
@@ -2816,7 +2816,7 @@ public abstract class AbstractNodeDAOImpl implements NodeDAO, BatchingDAO
     /*
      * Bulk caching
      */
-
+    
     /**
      * {@inheritDoc}
      * <p/>
@@ -2930,17 +2930,33 @@ public abstract class AbstractNodeDAOImpl implements NodeDAO, BatchingDAO
     {
         // Get the nodes
         List<NodeEntity> nodes = selectNodesByUuids(storeId, uuids);
-        SortedSet<Long> nodeIds = new TreeSet<Long>();
+        SortedSet<Long> aspectNodeIds = new TreeSet<Long>();
+        SortedSet<Long> propertiesNodeIds = new TreeSet<Long>();
         for (NodeEntity node : nodes)
         {
             Long nodeId = node.getId();
             nodesCache.setValue(nodeId, node);
             if (propertiesCache.getValue(nodeId) == null)
             {
-                nodeIds.add(nodeId);
+                propertiesNodeIds.add(nodeId);
+            }
+            if (aspectsCache.getValue(nodeId) == null)
+            {
+                aspectNodeIds.add(nodeId);
             }
         }
-        Map<Long, Map<NodePropertyKey, NodePropertyValue>> propsByNodeId = selectNodeProperties(nodeIds);
+        
+        List<NodeAspectsEntity> nodeAspects = selectNodeAspects(aspectNodeIds);
+        for (NodeAspectsEntity nodeAspect : nodeAspects)
+        {
+            Long nodeId = nodeAspect.getNodeId();
+            List<Long> qnameIds = nodeAspect.getAspectQNameIds();
+            HashSet<Long> qnameIdsSet = new HashSet<Long>(qnameIds);
+            Set<QName> qnames = qnameDAO.convertIdsToQNames(qnameIdsSet);
+            aspectsCache.setValue(nodeId, qnames);
+        }
+
+        Map<Long, Map<NodePropertyKey, NodePropertyValue>> propsByNodeId = selectNodeProperties(propertiesNodeIds);
         for (Map.Entry<Long, Map<NodePropertyKey, NodePropertyValue>> entry : propsByNodeId.entrySet())
         {
             Long nodeId = entry.getKey();
@@ -3099,6 +3115,7 @@ public abstract class AbstractNodeDAOImpl implements NodeDAO, BatchingDAO
     protected abstract NodeEntity selectNodeByNodeRef(NodeRef nodeRef, Boolean deleted);
     protected abstract List<NodeEntity> selectNodesByUuids(Long storeId, SortedSet<String> uuids);
     protected abstract Map<Long, Map<NodePropertyKey, NodePropertyValue>> selectNodeProperties(Set<Long> nodeIds);
+    protected abstract List<NodeAspectsEntity> selectNodeAspects(Set<Long> nodeIds);
     protected abstract Map<NodePropertyKey, NodePropertyValue> selectNodeProperties(Long nodeId);
     protected abstract Map<NodePropertyKey, NodePropertyValue> selectNodeProperties(Long nodeId, Set<Long> qnameIds);
     protected abstract int deleteNodeProperties(Long nodeId, Set<Long> qnameIds);
@@ -3212,4 +3229,4 @@ public abstract class AbstractNodeDAOImpl implements NodeDAO, BatchingDAO
     protected abstract List<Long> selectTxnsUnused(Long minTxnId, Long maxCommitTime, Integer count);
     protected abstract Long selectMinTxnCommitTime();
     protected abstract Long selectMaxTxnCommitTime();
-}
\ No newline at end of file
+}
diff --git a/source/java/org/alfresco/repo/domain/node/NodeAspectsEntity.java b/source/java/org/alfresco/repo/domain/node/NodeAspectsEntity.java
index 91a8ec388c..06dae1e2d2 100644
--- a/source/java/org/alfresco/repo/domain/node/NodeAspectsEntity.java
+++ b/source/java/org/alfresco/repo/domain/node/NodeAspectsEntity.java
@@ -34,9 +34,12 @@ import java.util.List;
  */
 public class NodeAspectsEntity
 {
-    private Long id;
+	private Long nodeId;
     private List<Long> aspectQNameIds;
-    
+
+    /** Carries data for queries */
+    private List<Long> nodeIds;
+
     /**
      * Required default constructor
      */
@@ -49,22 +52,22 @@ public class NodeAspectsEntity
     {
         StringBuilder sb = new StringBuilder(512);
         sb.append("NodeAspectsEntity")
-          .append(", id=").append(id)
+          .append(", nodeId=").append(nodeId)
           .append(", aspects=").append(aspectQNameIds)
           .append("]");
         return sb.toString();
     }
 
-    public Long getId()
+    public Long getNodeId()
     {
-        return id;
+        return nodeId;
     }
 
-    public void setId(Long id)
+    public void setNodeId(Long nodeId)
     {
-        this.id = id;
+        this.nodeId = nodeId;
     }
-
+    
     public List<Long> getAspectQNameIds()
     {
         return aspectQNameIds;
@@ -74,4 +77,14 @@ public class NodeAspectsEntity
     {
         this.aspectQNameIds = aspectQNameIds;
     }
+    
+    public List<Long> getNodeIds()
+    {
+        return nodeIds;
+    }
+
+    public void setNodeIds(List<Long> nodeIds)
+    {
+        this.nodeIds = nodeIds;
+    }
 }
diff --git a/source/java/org/alfresco/repo/domain/node/NodeDAO.java b/source/java/org/alfresco/repo/domain/node/NodeDAO.java
index f6b9cba8f1..5687b70ee1 100644
--- a/source/java/org/alfresco/repo/domain/node/NodeDAO.java
+++ b/source/java/org/alfresco/repo/domain/node/NodeDAO.java
@@ -159,7 +159,8 @@ public interface NodeDAO extends NodeBulkLoader
             String uuid,
             QName nodeTypeQName,
             String childNodeName,
-            Map<QName, Serializable> auditableProperties) throws InvalidTypeException;
+            Map<QName, Serializable> auditableProperties/*,
+            Map<QName, Serializable> ownableProperties*/) throws InvalidTypeException;
 
     /**
      * Update a node's primary association, giving it a new parent and new association parameters.
diff --git a/source/java/org/alfresco/repo/domain/node/ibatis/NodeDAOImpl.java b/source/java/org/alfresco/repo/domain/node/ibatis/NodeDAOImpl.java
index a4cf50d187..55d51ebb39 100644
--- a/source/java/org/alfresco/repo/domain/node/ibatis/NodeDAOImpl.java
+++ b/source/java/org/alfresco/repo/domain/node/ibatis/NodeDAOImpl.java
@@ -89,6 +89,7 @@ public class NodeDAOImpl extends AbstractNodeDAOImpl
     private static final String SELECT_NODE_BY_NODEREF = "alfresco.node.select_NodeByNodeRef";
     private static final String SELECT_NODES_BY_UUIDS = "alfresco.node.select_NodesByUuids";
     private static final String SELECT_NODE_PROPERTIES = "alfresco.node.select_NodeProperties";
+    private static final String SELECT_NODE_ASPECTS = "alfresco.node.select_NodeAspects";
     private static final String INSERT_NODE_PROPERTY = "alfresco.node.insert_NodeProperty";
     private static final String UPDATE_PRIMARY_CHILDREN_SHARED_ACL = "alfresco.node.update_PrimaryChildrenSharedAcl";
     private static final String SELECT_NODE_ASPECT_IDS = "alfresco.node.select_NodeAspectIds";
@@ -395,6 +396,21 @@ public class NodeDAOImpl extends AbstractNodeDAOImpl
         return rows;
     }
     
+    @Override
+    @SuppressWarnings("unchecked")
+    protected List<NodeAspectsEntity> selectNodeAspects(Set<Long> nodeIds)
+    {
+        if (nodeIds.size() == 0)
+        {
+            return Collections.emptyList();
+        }
+        NodeAspectsEntity aspects = new NodeAspectsEntity();
+        aspects.setNodeIds(new ArrayList<Long>(nodeIds));
+
+        List<NodeAspectsEntity> rows = template.queryForList(SELECT_NODE_ASPECTS, aspects);
+        return rows;
+    }
+    
     @Override
     @SuppressWarnings("unchecked")
     protected Map<Long, Map<NodePropertyKey, NodePropertyValue>> selectNodeProperties(Set<Long> nodeIds)
@@ -527,8 +543,16 @@ public class NodeDAOImpl extends AbstractNodeDAOImpl
     @Override
     protected Set<Long> selectNodeAspectIds(Long nodeId)
     {
-        List<Long> aspectQNameIdList = template.queryForList(SELECT_NODE_ASPECT_IDS, nodeId);
-        return new HashSet<Long>(aspectQNameIdList);
+    	Set<Long> aspectIds = new HashSet<Long>();
+    	Set<Long> nodeIds = new HashSet<Long>();
+    	nodeIds.add(nodeId);
+    	List<NodeAspectsEntity> nodeAspectEntities = selectNodeAspects(nodeIds);
+    	if(nodeAspectEntities.size() > 0)
+    	{
+    		NodeAspectsEntity nodeAspects = nodeAspectEntities.get(0);
+    		aspectIds.addAll(nodeAspects.getAspectQNameIds());
+    	}
+		return aspectIds;
     }
 
     @Override
@@ -544,7 +568,7 @@ public class NodeDAOImpl extends AbstractNodeDAOImpl
     protected int deleteNodeAspects(Long nodeId, Set<Long> qnameIds)
     {
         NodeAspectsEntity nodeAspects = new NodeAspectsEntity();
-        nodeAspects.setId(nodeId);
+        nodeAspects.setNodeId(nodeId);
         if (qnameIds != null && !qnameIds.isEmpty())
         {
             nodeAspects.setAspectQNameIds(new ArrayList<Long>(qnameIds));                // Null means all
diff --git a/source/java/org/alfresco/repo/domain/permissions/AVMPermissionsDaoComponentImpl.java b/source/java/org/alfresco/repo/domain/permissions/AVMPermissionsDaoComponentImpl.java
index 3d86fdd1ad..b869e22cc4 100644
--- a/source/java/org/alfresco/repo/domain/permissions/AVMPermissionsDaoComponentImpl.java
+++ b/source/java/org/alfresco/repo/domain/permissions/AVMPermissionsDaoComponentImpl.java
@@ -181,6 +181,7 @@ public class AVMPermissionsDaoComponentImpl extends AbstractPermissionsDaoCompon
                     getACLDAO(nodeRef).updateChangedAcls(nodeRef, changes);
                     aclDaoComponent.deleteAccessControlList(acl.getId());
                 }
+                readersCache.remove(acl.getId());
                 break;
             case FIXED:
                 throw new IllegalStateException("Delete not supported for fixed permissions");
diff --git a/source/java/org/alfresco/repo/domain/permissions/AbstractPermissionsDaoComponentImpl.java b/source/java/org/alfresco/repo/domain/permissions/AbstractPermissionsDaoComponentImpl.java
index 75a2111a8e..aa80966d28 100644
--- a/source/java/org/alfresco/repo/domain/permissions/AbstractPermissionsDaoComponentImpl.java
+++ b/source/java/org/alfresco/repo/domain/permissions/AbstractPermissionsDaoComponentImpl.java
@@ -24,12 +24,14 @@
  */
 package org.alfresco.repo.domain.permissions;
 
+import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
+import org.alfresco.repo.cache.SimpleCache;
 import org.alfresco.repo.security.permissions.ACEType;
 import org.alfresco.repo.security.permissions.ACLType;
 import org.alfresco.repo.security.permissions.AccessControlEntry;
@@ -75,6 +77,8 @@ public abstract class AbstractPermissionsDaoComponentImpl implements Permissions
 
     private AccessControlListDAO fDefaultACLDAO;
 
+    protected SimpleCache<Serializable, Set<String>> readersCache;
+    
     /** a uuid identifying this unique instance */
     private String uuid;
 
@@ -92,6 +96,14 @@ public abstract class AbstractPermissionsDaoComponentImpl implements Permissions
         this.aclDaoComponent = aclDaoComponent;
     }
 
+    /**
+     * @param readersCache the readersCache to set
+     */
+    public void setReadersCache(SimpleCache<Serializable, Set<String>> readersCache)
+    {
+        this.readersCache = readersCache;
+    }
+    
     /**
      * Checks equality by type and uuid
      */
@@ -355,6 +367,7 @@ public abstract class AbstractPermissionsDaoComponentImpl implements Permissions
             pattern.setPosition(Integer.valueOf(0));
             List<AclChange> changes = aclDaoComponent.deleteAccessControlEntries(report.getCreated().getId(), pattern);
             getACLDAO(nodeRef).updateChangedAcls(nodeRef, changes);
+            readersCache.remove(acl.getId());
             break;
         }
     }
@@ -407,6 +420,7 @@ public abstract class AbstractPermissionsDaoComponentImpl implements Permissions
             pattern.setPosition(Integer.valueOf(0));
             List<AclChange> changes = aclDaoComponent.deleteAccessControlEntries(report.getCreated().getId(), pattern);
             getACLDAO(nodeRef).updateChangedAcls(nodeRef, changes);
+            readersCache.remove(acl.getId());
             break;
         }
 
@@ -425,6 +439,12 @@ public abstract class AbstractPermissionsDaoComponentImpl implements Permissions
         }
         if (report.getCreated() != null)
         {
+        	Acl acl = getAccessControlList(nodeRef);
+        	if(acl != null)
+        	{
+        		readersCache.remove(acl.getId());
+        	}
+
             SimpleAccessControlEntry entry = new SimpleAccessControlEntry();
             entry.setAuthority(authority);
             entry.setPermission(permission);
diff --git a/source/java/org/alfresco/repo/domain/permissions/AclDAOImpl.java b/source/java/org/alfresco/repo/domain/permissions/AclDAOImpl.java
index ed6ccab01e..2d9e69f02c 100644
--- a/source/java/org/alfresco/repo/domain/permissions/AclDAOImpl.java
+++ b/source/java/org/alfresco/repo/domain/permissions/AclDAOImpl.java
@@ -24,10 +24,12 @@
  */
 package org.alfresco.repo.domain.permissions;
 
+import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 import org.alfresco.repo.cache.SimpleCache;
 import org.alfresco.repo.domain.qname.QNameDAO;
@@ -72,6 +74,8 @@ public class AclDAOImpl implements AclDAO
     /** a transactionally-safe cache to be injected */
     private SimpleCache<Long, AccessControlList> aclCache;
     
+    private SimpleCache<Serializable, Set<String>> readersCache;
+
     private enum WriteMode
     {
         /**
@@ -123,7 +127,15 @@ public class AclDAOImpl implements AclDAO
     {
         this.aclCache = aclCache;
     }
-    
+
+    /**
+     * @param readersCache the readersCache to set
+     */
+    public void setReadersCache(SimpleCache<Serializable, Set<String>> readersCache)
+    {
+        this.readersCache = readersCache;
+    }
+
     /* (non-Javadoc)
      * @see org.alfresco.repo.domain.permissions.AclDAO#createAccessControlList()
      */
@@ -738,6 +750,8 @@ public class AclDAOImpl implements AclDAO
                 Long aceId = member.getAceId();
                 
                 aclCache.remove(aclId);
+                readersCache.remove(aclId);
+                
                 Acl list = aclCrudDAO.getAcl(aclId);
                 acls.add(new AclChangeImpl(aclId, aclId, list.getAclType(), list.getAclType()));
                 membersToDelete.add(aclMemberId);
diff --git a/source/java/org/alfresco/repo/domain/permissions/AclEntity.java b/source/java/org/alfresco/repo/domain/permissions/AclEntity.java
index 4c770c97aa..ef94a9810d 100644
--- a/source/java/org/alfresco/repo/domain/permissions/AclEntity.java
+++ b/source/java/org/alfresco/repo/domain/permissions/AclEntity.java
@@ -24,6 +24,8 @@
  */
 package org.alfresco.repo.domain.permissions;
 
+import java.io.Serializable;
+
 import org.alfresco.repo.security.permissions.ACLType;
 import org.alfresco.util.EqualsHelper;
 
@@ -34,9 +36,11 @@ import org.alfresco.util.EqualsHelper;
  * @author janv
  * @since 3.4
  */
-public class AclEntity implements Acl
+public class AclEntity implements Acl, Serializable
 {
-    private Long id;
+	private static final long serialVersionUID = 1L;
+	
+	private Long id;
     private Long version;
     private String aclId;
     private boolean latest;
diff --git a/source/java/org/alfresco/repo/domain/permissions/AclUpdateEntity.java b/source/java/org/alfresco/repo/domain/permissions/AclUpdateEntity.java
index 3fd600b281..2eadaa20cd 100644
--- a/source/java/org/alfresco/repo/domain/permissions/AclUpdateEntity.java
+++ b/source/java/org/alfresco/repo/domain/permissions/AclUpdateEntity.java
@@ -24,6 +24,7 @@
  */
 package org.alfresco.repo.domain.permissions;
 
+import java.io.Serializable;
 
 /**
  * Entity for <b>alf_acess_control_list</b> persistence.
@@ -31,6 +32,7 @@ package org.alfresco.repo.domain.permissions;
  * @author janv
  * @since 3.4
  */
-public class AclUpdateEntity extends AclEntity
+public class AclUpdateEntity extends AclEntity implements Serializable
 {
+	private static final long serialVersionUID = 1L;
 }
diff --git a/source/java/org/alfresco/repo/node/db/DbNodeServiceImpl.java b/source/java/org/alfresco/repo/node/db/DbNodeServiceImpl.java
index 7059e9c3fb..a7d6030514 100644
--- a/source/java/org/alfresco/repo/node/db/DbNodeServiceImpl.java
+++ b/source/java/org/alfresco/repo/node/db/DbNodeServiceImpl.java
@@ -34,6 +34,7 @@ import java.util.Stack;
 import org.alfresco.error.AlfrescoRuntimeException;
 import org.alfresco.model.ContentModel;
 import org.alfresco.repo.domain.node.ChildAssocEntity;
+import org.alfresco.repo.domain.node.Node;
 import org.alfresco.repo.domain.node.NodeDAO;
 import org.alfresco.repo.domain.node.NodeDAO.ChildAssocRefQueryCallback;
 import org.alfresco.repo.domain.qname.QNameDAO;
@@ -1281,7 +1282,24 @@ public class DbNodeServiceImpl extends AbstractNodeServiceImpl
         // done
         return nodeProperties;
     }
+    
+    public Long getNodeAclId(NodeRef nodeRef) throws InvalidNodeRefException
+    {
+        Pair<Long, NodeRef> nodePair = getNodePairNotNull(nodeRef);
+        return getAclIDImpl(nodePair);
+    }
 
+    /**
+     * Gets, converts and adds the intrinsic properties to the current node's properties
+     */
+    private Long getAclIDImpl(Pair<Long, NodeRef> nodePair) throws InvalidNodeRefException
+    {
+        Long nodeId = nodePair.getFirst();
+        Long aclID = nodeDAO.getNodeAclId(nodeId);
+        // done
+        return aclID;
+    }
+    
     /**
      * Performs additional tasks associated with setting a property.
      * 
diff --git a/source/java/org/alfresco/repo/search/AbstractResultSet.java b/source/java/org/alfresco/repo/search/AbstractResultSet.java
index 3994356f31..4be63ee8a7 100644
--- a/source/java/org/alfresco/repo/search/AbstractResultSet.java
+++ b/source/java/org/alfresco/repo/search/AbstractResultSet.java
@@ -34,7 +34,6 @@ import org.apache.lucene.search.HitCollector;
  */
 public abstract class AbstractResultSet implements ResultSet
 {
-
     /**
      * Default constructor
      */
@@ -54,7 +53,7 @@ public abstract class AbstractResultSet implements ResultSet
     {
         // default to do nothing
     }
-
+    
     public List<NodeRef> getNodeRefs()
     {
         ArrayList<NodeRef> nodeRefs = new ArrayList<NodeRef>(length());
@@ -75,4 +74,43 @@ public abstract class AbstractResultSet implements ResultSet
         return cars;
     }
 
+    /**
+     * Bulk fetch results in the cache
+     * 
+     * @param bulkFetch
+     */
+    public boolean setBulkFetch(boolean bulkFetch)
+    {
+    	return false;
+    }
+
+    /**
+     * Do we bulk fetch
+     * 
+     * @return - true if we do
+     */
+    public boolean getBulkFetch()
+    {
+        return false;
+    }
+
+    /**
+     * Set the bulk fetch size
+     * 
+     * @param bulkFetchSize
+     */
+    public int setBulkFetchSize(int bulkFetchSize)
+    {
+    	return 0;
+    }
+
+    /**
+     * Get the bulk fetch size.
+     * 
+     * @return the fetch size
+     */
+    public int getBulkFetchSize()
+    {
+        return 0;
+    }
 }
diff --git a/source/java/org/alfresco/repo/search/EmptyResultSet.java b/source/java/org/alfresco/repo/search/EmptyResultSet.java
index 95f01a10cf..9e478dedef 100644
--- a/source/java/org/alfresco/repo/search/EmptyResultSet.java
+++ b/source/java/org/alfresco/repo/search/EmptyResultSet.java
@@ -48,6 +48,46 @@ public class EmptyResultSet implements ResultSet
         super();
     }
 
+    /**
+     * Bulk fetch results in the cache
+     * 
+     * @param bulkFetch
+     */
+    public boolean setBulkFetch(boolean bulkFetch)
+    {
+    	return false;
+    }
+
+    /**
+     * Do we bulk fetch
+     * 
+     * @return - true if we do
+     */
+    public boolean getBulkFetch()
+    {
+        return false;
+    }
+
+    /**
+     * Set the bulk fetch size
+     * 
+     * @param bulkFetchSize
+     */
+    public int setBulkFetchSize(int bulkFetchSize)
+    {
+    	return 0;
+    }
+
+    /**
+     * Get the bulk fetch size.
+     * 
+     * @return the fetch size
+     */
+    public int getBulkFetchSize()
+    {
+        return 0;
+    }
+    
     public int length()
     {
         return 0;
diff --git a/source/java/org/alfresco/repo/search/SearchServiceTest.java b/source/java/org/alfresco/repo/search/SearchServiceTest.java
index 37f4169d44..1e0ad3309a 100644
--- a/source/java/org/alfresco/repo/search/SearchServiceTest.java
+++ b/source/java/org/alfresco/repo/search/SearchServiceTest.java
@@ -166,7 +166,7 @@ public class SearchServiceTest extends TestCase
         sp.setQuery("PATH:\"//*\"");
         sp.addStore(rootNodeRef.getStoreRef());
         ResultSet results = pubSearchService.query(sp);
-        assertEquals(results.length(), 10);
+        assertEquals(10, results.length());
         assertNotNull(results.getResultSetMetaData());
         assertEquals(results.getResultSetMetaData().getLimitedBy(), LimitBy.UNLIMITED);
         assertEquals(results.getResultSetMetaData().getPermissionEvaluationMode(), PermissionEvaluationMode.EAGER);
diff --git a/source/java/org/alfresco/repo/search/impl/lucene/ADMLuceneTest.java b/source/java/org/alfresco/repo/search/impl/lucene/ADMLuceneTest.java
index 9df7a86c0b..059e6b886b 100644
--- a/source/java/org/alfresco/repo/search/impl/lucene/ADMLuceneTest.java
+++ b/source/java/org/alfresco/repo/search/impl/lucene/ADMLuceneTest.java
@@ -670,1716 +670,1716 @@ public class ADMLuceneTest extends TestCase implements DictionaryListener
 
     }
 
-    public void testQuoting() throws Exception
-    {
-        testTX.commit();
-        testTX = transactionService.getUserTransaction();
-        testTX.begin();
-
-        SearchParameters sp = new SearchParameters();
-        sp.setLanguage(SearchService.LANGUAGE_LUCENE);
-        sp.setQuery("TEXT:\"te\\\"thing\\\"st\"");
-        sp.addStore(rootNodeRef.getStoreRef());
-        sp.excludeDataInTheCurrentTransaction(true);
-
-        ResultSet results = serviceRegistry.getSearchService().query(sp);
-        results.close();
-    }
-
-    public void testPublicServiceSearchServicePaging() throws Exception
-    {
-        testTX.commit();
-        testTX = transactionService.getUserTransaction();
-        testTX.begin();
-
-        List<NodeRef> expected = new ArrayList<NodeRef>(15);
-
-        SearchParameters sp = new SearchParameters();
-        sp.setLanguage(SearchService.LANGUAGE_FTS_ALFRESCO);
-        sp.setQuery("PATH:\"//.\"");
-        sp.addStore(rootNodeRef.getStoreRef());
-        sp.excludeDataInTheCurrentTransaction(true);
-
-        ResultSet results;
-        ResultSetMetaData md;
-
-        results = serviceRegistry.getSearchService().query(sp);
-        assertEquals(16, results.length());
-        md = results.getResultSetMetaData();
-        for (ResultSetRow row : results)
-        {
-            expected.add(row.getNodeRef());
-        }
-        results.close();
-        for (int skip = 0; skip < 20; skip++)
-        {
-            for (int max = 0; max < 20; max++)
-            {
-                doPage(expected, skip, max, sp, serviceRegistry.getSearchService());
-            }
-        }
-
-        this.authenticationComponent.setCurrentUser("admin");
-        sp = new SearchParameters();
-        sp.setLanguage(SearchService.LANGUAGE_LUCENE);
-        sp.setQuery("PATH:\"//.\"");
-        sp.addStore(rootNodeRef.getStoreRef());
-        sp.excludeDataInTheCurrentTransaction(true);
-
-        results = serviceRegistry.getSearchService().query(sp);
-        assertEquals(16, results.length());
-        results.close();
-
-        sp.setMaxPermissionChecks(2);
-        results = serviceRegistry.getSearchService().query(sp);
-        assertEquals(2, results.length());
-        results.close();
-
-        sp.setLanguage(SearchService.LANGUAGE_FTS_ALFRESCO);
-        sp.setMaxPermissionChecks(2);
-        results = serviceRegistry.getSearchService().query(sp);
-        assertEquals(2, results.length());
-        results.close();
-
-        // Even though it is picked up they go though before the time moves on
-        // sp.setMaxPermissionChecks(-1);
-        // sp.setMaxPermissionCheckTimeMillis(0);
-        // results = serviceRegistry.getSearchService().query(sp);
-        // assertEquals(0, results.length());
-        // results.close();
-
-    }
-
-    private void doPage(List<NodeRef> expected, int skip, int max, SearchParameters sp, SearchService searcher)
-    {
-        sp.setSkipCount(skip);
-        sp.setMaxItems(max);
-        ResultSet results = searcher.query(sp);
-        assertEquals("Skip = " + skip + " max  = " + max, skip + max > 16 ? 16 - skip : max, results.length());
-        assertEquals("Skip = " + skip + " max  = " + max, (skip + max) < 16, results.hasMore());
-        assertEquals("Skip = " + skip + " max  = " + max, skip, results.getStart());
-        int actualPosition = skip;
-        for (ResultSetRow row : results)
-        {
-            NodeRef nodeRef = row.getNodeRef();
-            assertEquals("Skip = " + skip + " max  = " + max + " actual = " + actualPosition, expected.get(actualPosition), nodeRef);
-            actualPosition++;
-        }
-        results.close();
-    }
-
-    public void testNonPublicSearchServicePaging() throws InterruptedException
-    {
-        luceneFTS.pause();
-        buildBaseIndex();
-
-        ADMLuceneSearcherImpl searcher = ADMLuceneSearcherImpl.getSearcher(rootNodeRef.getStoreRef(), indexerAndSearcher);
-        searcher.setNodeService(nodeService);
-        searcher.setDictionaryService(dictionaryService);
-        searcher.setTenantService(tenantService);
-        searcher.setNamespacePrefixResolver(getNamespacePrefixResolver("namespace"));
-        searcher.setQueryRegister(queryRegisterComponent);
-        searcher.setQueryLanguages(((AbstractLuceneIndexerAndSearcherFactory) indexerAndSearcher).queryLanguages);
-
-        List<NodeRef> expected = new ArrayList<NodeRef>(15);
-
-        SearchParameters sp = new SearchParameters();
-        sp.setLanguage(SearchService.LANGUAGE_FTS_ALFRESCO);
-        sp.setQuery("PATH:\"//.\"");
-        sp.addStore(rootNodeRef.getStoreRef());
-        sp.excludeDataInTheCurrentTransaction(true);
-
-        ResultSet results;
-        ResultSetMetaData md;
-
-        results = searcher.query(sp);
-        assertEquals(16, results.length());
-        md = results.getResultSetMetaData();
-        for (ResultSetRow row : results)
-        {
-            expected.add(row.getNodeRef());
-        }
-        results.close();
-
-        for (int skip = 0; skip < 20; skip++)
-        {
-            for (int max = 0; max < 20; max++)
-            {
-                doPage(expected, skip, max, sp, searcher);
-            }
-        }
-
-    }
-
-    private void doPage(List<NodeRef> expected, int skip, int max, SearchParameters sp, ADMLuceneSearcherImpl searcher)
-    {
-        sp.setSkipCount(skip);
-        sp.setMaxItems(max);
-        ResultSet results = searcher.query(sp);
-        assertEquals("Skip = " + skip + " max  = " + max, skip + max > 16 ? 16 - skip : max, results.length());
-        assertEquals("Skip = " + skip + " max  = " + max, (skip + max) < 16, results.hasMore());
-        assertEquals("Skip = " + skip + " max  = " + max, skip, results.getStart());
-        int actualPosition = skip;
-        for (ResultSetRow row : results)
-        {
-            NodeRef nodeRef = row.getNodeRef();
-            assertEquals("Skip = " + skip + " max  = " + max + " actual = " + actualPosition, expected.get(actualPosition), nodeRef);
-            actualPosition++;
-        }
-        results.close();
-    }
-
-    public void testAlfrescoSql() throws InterruptedException
-    {
-        luceneFTS.pause();
-        buildBaseIndex();
-
-        ADMLuceneSearcherImpl searcher = ADMLuceneSearcherImpl.getSearcher(rootNodeRef.getStoreRef(), indexerAndSearcher);
-        searcher.setNodeService(nodeService);
-        searcher.setDictionaryService(dictionaryService);
-        searcher.setTenantService(tenantService);
-        searcher.setNamespacePrefixResolver(getNamespacePrefixResolver("namespace"));
-        searcher.setQueryRegister(queryRegisterComponent);
-        searcher.setQueryLanguages(((AbstractLuceneIndexerAndSearcherFactory) indexerAndSearcher).queryLanguages);
-
-        alfrescoSqlQueryWithCount(searcher, "SELECT * FROM CMIS:DOCUMENT", 1);
-        alfrescoSqlQueryWithCount(searcher, "SELECT * FROM CMIS:DOCUMENT D JOIN CM:OWNABLE O ON D.CMIS:OBJECTID = O.CMIS:OBJECTID", 0);
-    }
-
-    public void alfrescoSqlQueryWithCount(ADMLuceneSearcherImpl searcher, String query, int count)
-    {
-        ResultSet results = searcher.query(rootNodeRef.getStoreRef(), SearchService.LANGUAGE_CMIS_ALFRESCO, query, null);
-        assertEquals(count, results.length());
-        results.getResultSetMetaData();
-        results.close();
-    }
-
-    public void testCmisSql() throws InterruptedException
-    {
-        luceneFTS.pause();
-        buildBaseIndex();
-
-        ADMLuceneSearcherImpl searcher = ADMLuceneSearcherImpl.getSearcher(rootNodeRef.getStoreRef(), indexerAndSearcher);
-        searcher.setNodeService(nodeService);
-        searcher.setDictionaryService(dictionaryService);
-        searcher.setTenantService(tenantService);
-        searcher.setNamespacePrefixResolver(getNamespacePrefixResolver("namespace"));
-        searcher.setQueryRegister(queryRegisterComponent);
-        searcher.setQueryLanguages(((AbstractLuceneIndexerAndSearcherFactory) indexerAndSearcher).queryLanguages);
-
-        sqlQueryWithCount(searcher, "SELECT * FROM CMIS:DOCUMENT", 1);
-        sqlQueryWithCount(searcher, "SELECT * FROM CMIS:DOCUMENT D WHERE CONTAINS(D,'lazy')", 1);
-    }
-
-    public void sqlQueryWithCount(ADMLuceneSearcherImpl searcher, String query, int count)
-    {
-        ResultSet results = searcher.query(rootNodeRef.getStoreRef(), SearchService.LANGUAGE_CMIS_STRICT, query, null);
-        assertEquals(count, results.length());
-        results.getResultSetMetaData();
-        results.close();
-    }
-
-    public void testFtsSort() throws Throwable
-    {
-        luceneFTS.pause();
-        buildBaseIndex();
-
-        ADMLuceneSearcherImpl searcher = ADMLuceneSearcherImpl.getSearcher(rootNodeRef.getStoreRef(), indexerAndSearcher);
-        searcher.setNodeService(nodeService);
-        searcher.setDictionaryService(dictionaryService);
-        searcher.setTenantService(tenantService);
-        searcher.setNamespacePrefixResolver(getNamespacePrefixResolver("namespace"));
-        searcher.setQueryRegister(queryRegisterComponent);
-        searcher.setQueryLanguages(((AbstractLuceneIndexerAndSearcherFactory) indexerAndSearcher).queryLanguages);
-
-        SearchParameters sp = new SearchParameters();
-        sp.setLanguage(SearchService.LANGUAGE_FTS_ALFRESCO);
-        sp.addStore(rootNodeRef.getStoreRef());
-        sp.setQuery("-eager or -dog");
-        sp.addQueryTemplate("ANDY", "%cm:content");
-        sp.setNamespace(NamespaceService.CONTENT_MODEL_1_0_URI);
-        sp.excludeDataInTheCurrentTransaction(true);
-        sp.addSort(ContentModel.PROP_NODE_UUID.toString(), true);
-        ResultSet results = searcher.query(sp);
-        assertEquals(16, results.length());
-
-        String f = null;
-        for (ResultSetRow row : results)
-        {
-            String currentBun = DefaultTypeConverter.INSTANCE.convert(String.class, nodeService.getProperty(row.getNodeRef(), ContentModel.PROP_NODE_UUID));
-            // System.out.println( (currentBun == null ? "null" : NumericEncoder.encode(currentBun))+ " "+currentBun);
-            if (f != null)
-            {
-                assertTrue(f.compareTo(currentBun) <= 0);
-            }
-            f = currentBun;
-        }
-
-        results.close();
-
-        sp = new SearchParameters();
-        sp.setLanguage(SearchService.LANGUAGE_FTS_ALFRESCO);
-        sp.addStore(rootNodeRef.getStoreRef());
-        sp.setQuery("-eager or -dog");
-        sp.addQueryTemplate("ANDY", "%cm:content");
-        sp.setNamespace(NamespaceService.CONTENT_MODEL_1_0_URI);
-        sp.excludeDataInTheCurrentTransaction(true);
-        sp.addSort(ContentModel.PROP_NODE_UUID.toString(), false);
-        results = searcher.query(sp);
-        assertEquals(16, results.length());
-
-        f = null;
-        for (ResultSetRow row : results)
-        {
-            String currentBun = DefaultTypeConverter.INSTANCE.convert(String.class, nodeService.getProperty(row.getNodeRef(), ContentModel.PROP_NODE_UUID));
-            // System.out.println( (currentBun == null ? "null" : NumericEncoder.encode(currentBun))+ " "+currentBun);
-            if (f != null)
-            {
-                assertTrue(f.compareTo(currentBun) >= 0);
-            }
-            f = currentBun;
-        }
-
-        results.close();
-
-        sp = new SearchParameters();
-        sp.setLanguage(SearchService.LANGUAGE_FTS_ALFRESCO);
-        sp.addStore(rootNodeRef.getStoreRef());
-        sp.setQuery("-eager or -dog");
-        sp.addQueryTemplate("ANDY", "%cm:content");
-        sp.setNamespace(NamespaceService.CONTENT_MODEL_1_0_URI);
-        sp.excludeDataInTheCurrentTransaction(true);
-        sp.addSort("@" + ContentModel.PROP_NODE_UUID.toString(), false);
-        results = searcher.query(sp);
-        assertEquals(16, results.length());
-
-        f = null;
-        for (ResultSetRow row : results)
-        {
-            String currentBun = DefaultTypeConverter.INSTANCE.convert(String.class, nodeService.getProperty(row.getNodeRef(), ContentModel.PROP_NODE_UUID));
-            // System.out.println( (currentBun == null ? "null" : NumericEncoder.encode(currentBun))+ " "+currentBun);
-            if (f != null)
-            {
-                assertTrue(f.compareTo(currentBun) >= 0);
-            }
-            f = currentBun;
-        }
-
-        results.close();
-
-        sp = new SearchParameters();
-        sp.setLanguage(SearchService.LANGUAGE_FTS_ALFRESCO);
-        sp.addStore(rootNodeRef.getStoreRef());
-        sp.setQuery("-eager or -dog");
-        sp.addQueryTemplate("ANDY", "%cm:content");
-        sp.setNamespace(NamespaceService.CONTENT_MODEL_1_0_URI);
-        sp.excludeDataInTheCurrentTransaction(true);
-        sp.addSort("cm:name", false);
-        results = searcher.query(sp);
-        assertEquals(16, results.length());
-
-        f = null;
-        for (ResultSetRow row : results)
-        {
-            String currentBun = DefaultTypeConverter.INSTANCE.convert(String.class, nodeService.getProperty(row.getNodeRef(), ContentModel.PROP_NODE_UUID));
-            // System.out.println( (currentBun == null ? "null" : NumericEncoder.encode(currentBun))+ " "+currentBun);
-            if (f != null)
-            {
-                assertTrue(f.compareTo(currentBun) >= 0);
-            }
-            f = currentBun;
-        }
-
-        results.close();
-
-        sp = new SearchParameters();
-        sp.setLanguage(SearchService.LANGUAGE_FTS_ALFRESCO);
-        sp.addStore(rootNodeRef.getStoreRef());
-        sp.setQuery("-eager or -dog");
-        sp.addQueryTemplate("ANDY", "%cm:content");
-        sp.setNamespace(NamespaceService.CONTENT_MODEL_1_0_URI);
-        sp.excludeDataInTheCurrentTransaction(true);
-        sp.addSort("test:neverIndexed", false);
-        results = searcher.query(sp);
-        assertEquals(16, results.length());
-        results.close();
-
-    }
-
-    public void testFTS() throws InterruptedException
-    {
-        luceneFTS.pause();
-        buildBaseIndex();
-
-        ADMLuceneSearcherImpl searcher = ADMLuceneSearcherImpl.getSearcher(rootNodeRef.getStoreRef(), indexerAndSearcher);
-        searcher.setNodeService(nodeService);
-        searcher.setDictionaryService(dictionaryService);
-        searcher.setTenantService(tenantService);
-        searcher.setNamespacePrefixResolver(getNamespacePrefixResolver("namespace"));
-        searcher.setQueryRegister(queryRegisterComponent);
-        searcher.setQueryLanguages(((AbstractLuceneIndexerAndSearcherFactory) indexerAndSearcher).queryLanguages);
-
-        ftsQueryWithCount(searcher, "\"lazy\"", 1);
-        ftsQueryWithCount(searcher, "lazy and dog", 1);
-        ftsQueryWithCount(searcher, "-lazy and -dog", 15);
-        ftsQueryWithCount(searcher, "-lazy and dog", 0);
-        ftsQueryWithCount(searcher, "lazy and -dog", 0);
-        ftsQueryWithCount(searcher, "|lazy and |dog", 1);
-        ftsQueryWithCount(searcher, "|eager and |dog", 1);
-        ftsQueryWithCount(searcher, "|lazy and |wolf", 1);
-        ftsQueryWithCount(searcher, "|eager and |wolf", 0);
-        ftsQueryWithCount(searcher, "-lazy or -dog", 15);
-        ftsQueryWithCount(searcher, "-eager or -dog", 16);
-        ftsQueryWithCount(searcher, "-lazy or -wolf", 16);
-        ftsQueryWithCount(searcher, "-eager or -wolf", 16);
-        ftsQueryWithCount(searcher, "lazy dog", 1);
-        ftsQueryWithCount(searcher, "lazy and not dog", 0);
-        ftsQueryWithCount(searcher, "lazy not dog", 16);
-        ftsQueryWithCount(searcher, "lazy and !dog", 0);
-        ftsQueryWithCount(searcher, "lazy !dog", 16);
-        ftsQueryWithCount(searcher, "lazy and -dog", 0);
-        ftsQueryWithCount(searcher, "lazy -dog", 16);
-        ftsQueryWithCount(searcher, "TEXT:\"lazy\"", 1);
-        ftsQueryWithCount(searcher, "cm_content:\"lazy\"", 1);
-        ftsQueryWithCount(searcher, "cm:content:big OR cm:content:lazy", 1);
-        ftsQueryWithCount(searcher, "cm:content:big AND cm:content:lazy", 0);
-        ftsQueryWithCount(searcher, "{http://www.alfresco.org/model/content/1.0}content:\"lazy\"", 1);
-        ftsQueryWithCount(searcher, "=lazy", 1);
-        ftsQueryWithCount(searcher, "@cm:content:big OR @cm:content:lazy", 1);
-        ftsQueryWithCount(searcher, "@cm:content:big AND @cm:content:lazy", 0);
-        ftsQueryWithCount(searcher, "@{http://www.alfresco.org/model/content/1.0}content:\"lazy\"", 1);
-        ftsQueryWithCount(searcher, "~@cm:content:big OR ~@cm:content:lazy", 1);
-        ftsQueryWithCount(searcher, "brown * quick", 0);
-        ftsQueryWithCount(searcher, "brown * dog", 1);
-        ftsQueryWithCount(searcher, "brown * dog", 1);
-        ftsQueryWithCount(searcher, "brown *(0) dog", 0);
-        ftsQueryWithCount(searcher, "brown *(1) dog", 0);
-        ftsQueryWithCount(searcher, "brown *(2) dog", 0);
-        ftsQueryWithCount(searcher, "brown *(3) dog", 0);
-        ftsQueryWithCount(searcher, "brown *(4) dog", 1); // "the" does not count
-        ftsQueryWithCount(searcher, "brown *(5) dog", 1);
-        ftsQueryWithCount(searcher, "brown *(6) dog", 1);
-        ftsQueryWithCount(searcher, "TEXT:(\"lazy\")", 1);
-        ftsQueryWithCount(searcher, "TEXT:(lazy and dog)", 1);
-        ftsQueryWithCount(searcher, "TEXT:(-lazy and -dog)", 15);
-        ftsQueryWithCount(searcher, "TEXT:(-lazy and dog)", 0);
-        ftsQueryWithCount(searcher, "TEXT:(lazy and -dog)", 0);
-        ftsQueryWithCount(searcher, "TEXT:(|lazy and |dog)", 1);
-        ftsQueryWithCount(searcher, "TEXT:(|eager and |dog)", 1);
-        ftsQueryWithCount(searcher, "TEXT:(|lazy and |wolf)", 1);
-        ftsQueryWithCount(searcher, "TEXT:(|eager and |wolf)", 0);
-        ftsQueryWithCount(searcher, "TEXT:(-lazy or -dog)", 15);
-        ftsQueryWithCount(searcher, "TEXT:(-eager or -dog)", 16);
-        ftsQueryWithCount(searcher, "TEXT:(-lazy or -wolf)", 16);
-        ftsQueryWithCount(searcher, "TEXT:(-eager or -wolf)", 16);
-        ftsQueryWithCount(searcher, "TEXT:(lazy dog)", 1);
-        ftsQueryWithCount(searcher, "TEXT:(lazy and not dog)", 0);
-        ftsQueryWithCount(searcher, "TEXT:(lazy not dog)", 16);
-        ftsQueryWithCount(searcher, "TEXT:(lazy and !dog)", 0);
-        ftsQueryWithCount(searcher, "TEXT:(lazy !dog)", 16);
-        ftsQueryWithCount(searcher, "TEXT:(lazy and -dog)", 0);
-        ftsQueryWithCount(searcher, "TEXT:(lazy -dog)", 16);
-        ftsQueryWithCount(searcher, "cm_content:(\"lazy\")", 1);
-        ftsQueryWithCount(searcher, "cm:content:(big OR lazy)", 1);
-        ftsQueryWithCount(searcher, "cm:content:(big AND lazy)", 0);
-        ftsQueryWithCount(searcher, "{http://www.alfresco.org/model/content/1.0}content:(\"lazy\")", 1);
-        ftsQueryWithCount(searcher, "TEXT:(=lazy)", 1);
-        ftsQueryWithCount(searcher, "@cm:content:(big) OR @cm:content:(lazy)", 1);
-        ftsQueryWithCount(searcher, "@cm:content:(big) AND @cm:content:(lazy)", 0);
-        ftsQueryWithCount(searcher, "@{http://www.alfresco.org/model/content/1.0}content:(\"lazy\")", 1);
-        ftsQueryWithCount(searcher, "@cm:content:(~big OR ~lazy)", 1);
-        ftsQueryWithCount(searcher, "TEXT:(brown * quick)", 0);
-        ftsQueryWithCount(searcher, "TEXT:(brown * dog)", 1);
-        ftsQueryWithCount(searcher, "TEXT:(brown * dog)", 1);
-        ftsQueryWithCount(searcher, "TEXT:(brown *(0) dog)", 0);
-        ftsQueryWithCount(searcher, "TEXT:(brown *(1) dog)", 0);
-        ftsQueryWithCount(searcher, "TEXT:(brown *(2) dog)", 0);
-        ftsQueryWithCount(searcher, "TEXT:(brown *(3) dog)", 0);
-        ftsQueryWithCount(searcher, "TEXT:(brown *(4) dog)", 1); // "the" does not count
-        ftsQueryWithCount(searcher, "TEXT:(brown *(5) dog)", 1);
-        ftsQueryWithCount(searcher, "TEXT:(brown *(6) dog)", 1);
-
-        // ftsQueryWithCount(searcher, "brown..dog", 1); // is this allowed??
-        // ftsQueryWithCount(searcher, "cm:content:brown..dog", 1);
-
-        QName qname = QName.createQName(TEST_NAMESPACE, "float\\-ista");
-        ftsQueryWithCount(searcher, qname + ":3.40", 1);
-        ftsQueryWithCount(searcher, qname + ":3..4", 1);
-        ftsQueryWithCount(searcher, qname + ":3..3.39", 0);
-        ftsQueryWithCount(searcher, qname + ":3..3.40", 1);
-        ftsQueryWithCount(searcher, qname + ":3.41..3.9", 0);
-        ftsQueryWithCount(searcher, qname + ":3.40..3.9", 1);
-
-        ftsQueryWithCount(searcher, qname + ":[3 TO 4]", 1);
-        ftsQueryWithCount(searcher, qname + ":[3 TO 3.39]", 0);
-        ftsQueryWithCount(searcher, qname + ":[3 TO 3.4]", 1);
-        ftsQueryWithCount(searcher, qname + ":[3.41 TO 4]", 0);
-        ftsQueryWithCount(searcher, qname + ":[3.4 TO 4]", 1);
-        ftsQueryWithCount(searcher, qname + ":[3 TO 3.4>", 0);
-        ftsQueryWithCount(searcher, qname + ":<3.4 TO 4]", 0);
-        ftsQueryWithCount(searcher, qname + ":<3.4 TO 3.4>", 0);
-
-        ftsQueryWithCount(searcher, qname + ":(3.40)", 1);
-        ftsQueryWithCount(searcher, qname + ":(3..4)", 1);
-        ftsQueryWithCount(searcher, qname + ":(3..3.39)", 0);
-        ftsQueryWithCount(searcher, qname + ":(3..3.40)", 1);
-        ftsQueryWithCount(searcher, qname + ":(3.41..3.9)", 0);
-        ftsQueryWithCount(searcher, qname + ":(3.40..3.9)", 1);
-
-        ftsQueryWithCount(searcher, qname + ":([3 TO 4])", 1);
-        ftsQueryWithCount(searcher, qname + ":([3 TO 3.39])", 0);
-        ftsQueryWithCount(searcher, qname + ":([3 TO 3.4])", 1);
-        ftsQueryWithCount(searcher, qname + ":([3.41 TO 4])", 0);
-        ftsQueryWithCount(searcher, qname + ":([3.4 TO 4])", 1);
-        ftsQueryWithCount(searcher, qname + ":([3 TO 3.4>)", 0);
-        ftsQueryWithCount(searcher, qname + ":(<3.4 TO 4])", 0);
-        ftsQueryWithCount(searcher, qname + ":(<3.4 TO 3.4>)", 0);
-
-        ftsQueryWithCount(searcher, "test:float_x002D_ista:3.40", 1);
-
-        ftsQueryWithCount(searcher, "lazy", 1);
-        ftsQueryWithCount(searcher, "laz*", 1);
-        ftsQueryWithCount(searcher, "l*y", 1);
-        ftsQueryWithCount(searcher, "l??y", 1);
-        ftsQueryWithCount(searcher, "?az?", 1);
-        ftsQueryWithCount(searcher, "*zy", 1);
-
-        ftsQueryWithCount(searcher, "\"lazy\"", 1);
-        ftsQueryWithCount(searcher, "\"laz*\"", 1);
-        ftsQueryWithCount(searcher, "\"l*y\"", 1);
-        ftsQueryWithCount(searcher, "\"l??y\"", 1);
-        ftsQueryWithCount(searcher, "\"?az?\"", 1);
-        ftsQueryWithCount(searcher, "\"*zy\"", 1);
-
-        ftsQueryWithCount(searcher, "cm:content:lazy", 1);
-        ftsQueryWithCount(searcher, "cm:content:laz*", 1);
-        ftsQueryWithCount(searcher, "cm:content:l*y", 1);
-        ftsQueryWithCount(searcher, "cm:content:l??y", 1);
-        ftsQueryWithCount(searcher, "cm:content:?az?", 1);
-        ftsQueryWithCount(searcher, "cm:content:*zy", 1);
-
-        ftsQueryWithCount(searcher, "cm:content:\"lazy\"", 1);
-        ftsQueryWithCount(searcher, "cm:content:\"laz*\"", 1);
-        ftsQueryWithCount(searcher, "cm:content:\"l*y\"", 1);
-        ftsQueryWithCount(searcher, "cm:content:\"l??y\"", 1);
-        ftsQueryWithCount(searcher, "cm:content:\"?az?\"", 1);
-        ftsQueryWithCount(searcher, "cm:content:\"*zy\"", 1);
-
-        ftsQueryWithCount(searcher, "cm:content:(lazy)", 1);
-        ftsQueryWithCount(searcher, "cm:content:(laz*)", 1);
-        ftsQueryWithCount(searcher, "cm:content:(l*y)", 1);
-        ftsQueryWithCount(searcher, "cm:content:(l??y)", 1);
-        ftsQueryWithCount(searcher, "cm:content:(?az?)", 1);
-        ftsQueryWithCount(searcher, "cm:content:(*zy)", 1);
-
-        ftsQueryWithCount(searcher, "cm:content:(\"lazy\")", 1);
-        ftsQueryWithCount(searcher, "cm:content:(\"laz*\")", 1);
-        ftsQueryWithCount(searcher, "cm:content:(\"l*y\")", 1);
-        ftsQueryWithCount(searcher, "cm:content:(\"l??y\")", 1);
-        ftsQueryWithCount(searcher, "cm:content:(\"?az?\")", 1);
-        ftsQueryWithCount(searcher, "cm:content:(\"*zy\")", 1);
-
-        ftsQueryWithCount(searcher, "lazy^2 dog^4.2", 1);
-
-        ftsQueryWithCount(searcher, "lazy~0.7", 1);
-        ftsQueryWithCount(searcher, "cm:content:laxy~0.7", 1);
-        ftsQueryWithCount(searcher, "laxy~0.7", 1);
-        ftsQueryWithCount(searcher, "=laxy~0.7", 1);
-        ftsQueryWithCount(searcher, "~laxy~0.7", 1);
-
-        ftsQueryWithCount(searcher, "\"quick fox\"~0", 0);
-        ftsQueryWithCount(searcher, "\"quick fox\"~1", 1);
-        ftsQueryWithCount(searcher, "\"quick fox\"~2", 1);
-        ftsQueryWithCount(searcher, "\"quick fox\"~3", 1);
-
-        ftsQueryWithCount(searcher, "\"fox quick\"~0", 0);
-        ftsQueryWithCount(searcher, "\"fox quick\"~1", 0);
-        ftsQueryWithCount(searcher, "\"fox quick\"~2", 0);
-        ftsQueryWithCount(searcher, "\"fox quick\"~3", 1);
-
-        ftsQueryWithCount(searcher, "lazy", 1);
-        ftsQueryWithCount(searcher, "-lazy", 15);
-        ftsQueryWithCount(searcher, "lazy -lazy", 16, null, n14);
-        ftsQueryWithCount(searcher, "lazy^20 -lazy", 16, n14, null);
-        ftsQueryWithCount(searcher, "lazy^20 -lazy^20", 16, null, n14);
-
-        ftsQueryWithCount(searcher, "cm:content:lazy", 1);
-        // Simple template
-        ftsQueryWithCount(searcher, "ANDY:lazy", 1);
-        // default namesapce cm
-        ftsQueryWithCount(searcher, "content:lazy", 1);
-
-        ftsQueryWithCount(searcher, "PATH:\"//.\"", 16);
-
-        ftsQueryWithCount(searcher, "+PATH:\"/app:company_home/st:sites/cm:rmtestnew1/cm:documentLibrary//*\"", 0);
-        ftsQueryWithCount(searcher, "+PATH:\"/app:company_home/st:sites/cm:rmtestnew1/cm:documentLibrary//*\" -TYPE:\"{http://www.alfresco.org/model/content/1.0}thumbnail\"", 15);
-        ftsQueryWithCount(searcher, "+PATH:\"/app:company_home/st:sites/cm:rmtestnew1/cm:documentLibrary//*\" AND -TYPE:\"{http://www.alfresco.org/model/content/1.0}thumbnail\"",
-                0);
-
-        ftsQueryWithCount(searcher, "(brown *(6) dog)", 1);
-        ftsQueryWithCount(searcher, "TEXT:(brown *(6) dog)", 1);
-        ftsQueryWithCount(searcher, "\"//.\"", 0);
-        ftsQueryWithCount(searcher, "PATH", "\"//.\"", 16);
-        ftsQueryWithCount(searcher, "cm:content:brown", 1);
-        ftsQueryWithCount(searcher, "ANDY:brown", 1);
-        ftsQueryWithCount(searcher, "ANDY", "brown", 1);
-        
-        // test date ranges - note: expected 2 results = n14 (cm:content) and n15 (cm:thumbnail)
-        ftsQueryWithCount(searcher, "modified:*", 2, Arrays.asList(new NodeRef[]{n14,n15}));
-        ftsQueryWithCount(searcher, "modified:[MIN TO NOW]", 2, Arrays.asList(new NodeRef[]{n14,n15}));
-    }
-    
-    
-    private ADMLuceneSearcherImpl buildSearcher()
-    {
-        ADMLuceneSearcherImpl searcher = ADMLuceneSearcherImpl.getSearcher(rootNodeRef.getStoreRef(), indexerAndSearcher);
-        searcher.setNodeService(nodeService);
-        searcher.setDictionaryService(dictionaryService);
-        searcher.setTenantService(tenantService);
-        searcher.setNamespacePrefixResolver(getNamespacePrefixResolver("namespace"));
-        searcher.setQueryRegister(queryRegisterComponent);
-        searcher.setQueryLanguages(((AbstractLuceneIndexerAndSearcherFactory) indexerAndSearcher).queryLanguages);
-        return searcher;
-    }
-    
-    public void testFTSandSort() throws Exception
-    {
-        luceneFTS.pause();
-        buildBaseIndex();
-        ADMLuceneSearcherImpl searcher = buildSearcher();
-        
-        SearchParameters sp = new SearchParameters();
-        sp.setLanguage(SearchService.LANGUAGE_FTS_ALFRESCO);
-        sp.addStore(rootNodeRef.getStoreRef());
-        sp.setQuery( "PATH:\"//.\"");
-        sp.addQueryTemplate("ANDY", "%cm:content");
-        sp.setNamespace(NamespaceService.CONTENT_MODEL_1_0_URI);
-        sp.excludeDataInTheCurrentTransaction(true);
-        sp.addSort("@"+ContentModel.PROP_CONTENT.toString()+".size", true);
-        ResultSet results = searcher.query(sp);
-        assertEquals(16, results.length());
-        results.close();
-    }
-
-    public void ftsQueryWithCount(ADMLuceneSearcherImpl searcher, String query, int count)
-    {
-        SearchParameters sp = new SearchParameters();
-        sp.setLanguage(SearchService.LANGUAGE_FTS_ALFRESCO);
-        sp.addStore(rootNodeRef.getStoreRef());
-        sp.setQuery(query);
-        sp.addQueryTemplate("ANDY", "%cm:content");
-        sp.setNamespace(NamespaceService.CONTENT_MODEL_1_0_URI);
-        sp.excludeDataInTheCurrentTransaction(true);
-        ResultSet results = searcher.query(sp);
-        assertEquals(count, results.length());
-        results.close();
-    }
-    
-    public void ftsQueryWithCount(ADMLuceneSearcherImpl searcher, String defaultFieldName, String query, int count)
-    {
-        SearchParameters sp = new SearchParameters();
-        sp.setLanguage(SearchService.LANGUAGE_FTS_ALFRESCO);
-        sp.addStore(rootNodeRef.getStoreRef());
-        sp.setQuery(query);
-        sp.addQueryTemplate("ANDY", "%cm:content");
-        sp.setNamespace(NamespaceService.CONTENT_MODEL_1_0_URI);
-        sp.excludeDataInTheCurrentTransaction(true);
-        sp.setDefaultFieldName(defaultFieldName);
-        ResultSet results = searcher.query(sp);
-        assertEquals(count, results.length());
-        results.close();
-    }
-
-    public void ftsQueryWithCount(ADMLuceneSearcherImpl searcher, String query, int count, NodeRef first, NodeRef last)
-    {
-        ResultSet results = searcher.query(rootNodeRef.getStoreRef(), SearchService.LANGUAGE_FTS_ALFRESCO, query, null);
-        for (ResultSetRow row : results)
-        {
-            System.out.println("" + row.getScore() + nodeService.getProperty(row.getNodeRef(), ContentModel.PROP_NAME));
-        }
-        assertEquals(count, results.length());
-        if (first != null)
-        {
-            assertEquals(first, results.getNodeRef(0));
-        }
-        if (last != null)
-        {
-            assertEquals(last, results.getNodeRef(results.length() - 1));
-        }
-        results.close();
-    }
-    
-    public void ftsQueryWithCount(ADMLuceneSearcherImpl searcher, String query, int count, List<NodeRef> expectedList)
-    {
-        ResultSet results = searcher.query(rootNodeRef.getStoreRef(), SearchService.LANGUAGE_FTS_ALFRESCO, query, null);
-        for (ResultSetRow row : results)
-        {
-            System.out.println("" + row.getScore() + nodeService.getProperty(row.getNodeRef(), ContentModel.PROP_NAME));
-        }
-        assertEquals(count, results.length());
-        
-        List<NodeRef> actualList = results.getNodeRefs();
-        
-        for (NodeRef expected : expectedList)
-        {
-            assertTrue("did not find "+expected, actualList.contains(expected));
-        }
-        
-        results.close();
-    }
-
-    public void testOverWritetoZeroSize() throws Exception
-    {
-        testTX.commit();
-        testTX = transactionService.getUserTransaction();
-        testTX.begin();
-        luceneFTS.pause();
-        buildBaseIndex();
-        runBaseTests();
-        luceneFTS.resume();
-        testTX.commit();
-
-        for (int i = 0; i < 50; i++)
-        {
-            testTX = transactionService.getUserTransaction();
-            testTX.begin();
-            runBaseTests();
-            nodeService.setProperty(rootNodeRef, QName.createQName("{namespace}property-A"), "A");
-            nodeService.setProperty(n1, QName.createQName("{namespace}property-A"), "A");
-            nodeService.setProperty(n2, QName.createQName("{namespace}property-A"), "A");
-            nodeService.setProperty(n3, QName.createQName("{namespace}property-A"), "A");
-            nodeService.setProperty(n4, QName.createQName("{namespace}property-A"), "A");
-            nodeService.setProperty(n5, QName.createQName("{namespace}property-A"), "A");
-            nodeService.setProperty(n6, QName.createQName("{namespace}property-A"), "A");
-            nodeService.setProperty(n7, QName.createQName("{namespace}property-A"), "A");
-            runBaseTests();
-            testTX.commit();
-
-            testTX = transactionService.getUserTransaction();
-            testTX.begin();
-            runBaseTests();
-            nodeService.setProperty(n8, QName.createQName("{namespace}property-A"), "A");
-            nodeService.setProperty(n9, QName.createQName("{namespace}property-A"), "A");
-            nodeService.setProperty(n10, QName.createQName("{namespace}property-A"), "A");
-            nodeService.setProperty(n11, QName.createQName("{namespace}property-A"), "A");
-            nodeService.setProperty(n12, QName.createQName("{namespace}property-A"), "A");
-            nodeService.setProperty(n13, QName.createQName("{namespace}property-A"), "A");
-            nodeService.setProperty(n14, QName.createQName("{namespace}property-A"), "A");
-            runBaseTests();
-            testTX.commit();
-        }
-
-    }
-
-    public void testBulkResultSet1() throws Exception
-    {
-        doBulkTest(1);
-    }
-
-    public void testBulkResultSet10() throws Exception
-    {
-        doBulkTest(10);
-    }
-
-    public void testBulkResultSet100() throws Exception
-    {
-
-        doBulkTest(100);
-    }
-
-    public void testBulkResultSet1000() throws Exception
-    {
-        doBulkTest(1000);
-    }
-
-    public void xtestBulkResultSet10000() throws Exception
-    {
-        doBulkTest(10000);
-    }
-
-    private void doBulkTest(int n) throws Exception
-    {
-        Map<QName, Serializable> testProperties = new HashMap<QName, Serializable>();
-        testProperties.put(QName.createQName(TEST_NAMESPACE, "text-indexed-stored-tokenised-atomic"), "BULK");
-        for (int i = 0; i < n; i++)
-        {
-            nodeService.createNode(rootNodeRef, ContentModel.ASSOC_CHILDREN, QName.createQName("{namespace}texas-" + i), testSuperType, testProperties).getChildRef();
-        }
-        testTX.commit();
-        testTX = transactionService.getUserTransaction();
-        testTX.begin();
-
-        ADMLuceneSearcherImpl searcher = ADMLuceneSearcherImpl.getSearcher(rootNodeRef.getStoreRef(), indexerAndSearcher);
-        searcher.setNodeService(nodeService);
-        searcher.setDictionaryService(dictionaryService);
-        searcher.setTenantService(tenantService);
-        searcher.setNamespacePrefixResolver(getNamespacePrefixResolver("namespace"));
-        SearchParameters sp = new SearchParameters();
-        sp.addStore(rootNodeRef.getStoreRef());
-        sp.setLanguage("lucene");
-        sp.setQuery("\\@" + escapeQName(QName.createQName(TEST_NAMESPACE, "text-indexed-stored-tokenised-atomic")) + ":\"BULK\"");
-        sp.setBulkFetch(false);
-        sp.setBulkFetchSize(10);
-        ResultSet results = searcher.query(sp);
-        assertEquals(n, results.length());
-        results.close();
-
-        getCold(searcher, n);
-        getWarm(searcher, n);
-        getCold(searcher, n);
-        getCold10(searcher, n);
-        getCold100(searcher, n);
-        getCold1000(searcher, n);
-        getCold10000(searcher, n);
-
-        testTX.commit();
-        testTX = transactionService.getUserTransaction();
-        testTX.begin();
-
-    }
-
-    private void getCold(ADMLuceneSearcherImpl searcher, int n)
-    {
-        nodeBulkLoader.clear();
-
-        long start;
-
-        long end;
-
-        start = System.nanoTime();
-
-        SearchParameters sp = new SearchParameters();
-        sp.addStore(rootNodeRef.getStoreRef());
-        sp.setLanguage("lucene");
-        sp.setQuery("\\@" + escapeQName(QName.createQName(TEST_NAMESPACE, "text-indexed-stored-tokenised-atomic")) + ":\"BULK\"");
-        sp.setBulkFetch(false);
-        sp.setBulkFetchSize(0);
-        ResultSet results = searcher.query(sp);
-        for (ResultSetRow row : results)
-        {
-            nodeService.getAspects(row.getNodeRef());
-            nodeService.getProperties(row.getNodeRef());
-        }
-        results.close();
-
-        end = System.nanoTime();
-
-        System.out.println(n + " Cold in " + ((end - start) / 10e9));
-    }
-
-    private void getWarm(ADMLuceneSearcherImpl searcher, int n)
-    {
-
-        long start;
-
-        long end;
-
-        start = System.nanoTime();
-
-        SearchParameters sp = new SearchParameters();
-        sp.addStore(rootNodeRef.getStoreRef());
-        sp.setLanguage("lucene");
-        sp.setQuery("\\@" + escapeQName(QName.createQName(TEST_NAMESPACE, "text-indexed-stored-tokenised-atomic")) + ":\"BULK\"");
-        sp.setBulkFetch(false);
-        sp.setBulkFetchSize(0);
-        ResultSet results = searcher.query(sp);
-        for (ResultSetRow row : results)
-        {
-            nodeService.getAspects(row.getNodeRef());
-            nodeService.getProperties(row.getNodeRef());
-        }
-        results.close();
-
-        end = System.nanoTime();
-
-        System.out.println(n + " Warm in " + ((end - start) / 10e9));
-    }
-
-    private void getCold10(ADMLuceneSearcherImpl searcher, int n)
-    {
-        nodeBulkLoader.clear();
-
-        long start;
-
-        long end;
-
-        start = System.nanoTime();
-
-        SearchParameters sp = new SearchParameters();
-        sp.addStore(rootNodeRef.getStoreRef());
-        sp.setLanguage("lucene");
-        sp.setQuery("\\@" + escapeQName(QName.createQName(TEST_NAMESPACE, "text-indexed-stored-tokenised-atomic")) + ":\"BULK\"");
-        sp.setBulkFetch(true);
-        sp.setBulkFetchSize(10);
-        ResultSet results = searcher.query(sp);
-        for (ResultSetRow row : results)
-        {
-            nodeService.getAspects(row.getNodeRef());
-            nodeService.getProperties(row.getNodeRef());
-        }
-        results.close();
-
-        end = System.nanoTime();
-
-        System.out.println(n + " Prefetch 10 in " + ((end - start) / 10e9));
-    }
-
-    private void getCold100(ADMLuceneSearcherImpl searcher, int n)
-    {
-        nodeBulkLoader.clear();
-
-        long start;
-
-        long end;
-
-        start = System.nanoTime();
-
-        SearchParameters sp = new SearchParameters();
-        sp.addStore(rootNodeRef.getStoreRef());
-        sp.setLanguage("lucene");
-        sp.setQuery("\\@" + escapeQName(QName.createQName(TEST_NAMESPACE, "text-indexed-stored-tokenised-atomic")) + ":\"BULK\"");
-        sp.setBulkFetch(true);
-        sp.setBulkFetchSize(100);
-        ResultSet results = searcher.query(sp);
-        for (ResultSetRow row : results)
-        {
-            nodeService.getAspects(row.getNodeRef());
-            nodeService.getProperties(row.getNodeRef());
-        }
-        results.close();
-
-        end = System.nanoTime();
-
-        System.out.println(n + " Prefetch 100 in " + ((end - start) / 10e9));
-    }
-
-    private void getCold1000(ADMLuceneSearcherImpl searcher, int n)
-    {
-        nodeBulkLoader.clear();
-
-        long start;
-
-        long end;
-
-        start = System.nanoTime();
-
-        SearchParameters sp = new SearchParameters();
-        sp.addStore(rootNodeRef.getStoreRef());
-        sp.setLanguage("lucene");
-        sp.setQuery("\\@" + escapeQName(QName.createQName(TEST_NAMESPACE, "text-indexed-stored-tokenised-atomic")) + ":\"BULK\"");
-        sp.setBulkFetch(true);
-        sp.setBulkFetchSize(1000);
-        ResultSet results = searcher.query(sp);
-        for (ResultSetRow row : results)
-        {
-            nodeService.getAspects(row.getNodeRef());
-            nodeService.getProperties(row.getNodeRef());
-        }
-        results.close();
-
-        end = System.nanoTime();
-
-        System.out.println(n + " Prefetch 1000 in " + ((end - start) / 10e9));
-    }
-
-    private void getCold10000(ADMLuceneSearcherImpl searcher, int n)
-    {
-        nodeBulkLoader.clear();
-
-        long start;
-
-        long end;
-
-        start = System.nanoTime();
-
-        SearchParameters sp = new SearchParameters();
-        sp.addStore(rootNodeRef.getStoreRef());
-        sp.setLanguage("lucene");
-        sp.setQuery("\\@" + escapeQName(QName.createQName(TEST_NAMESPACE, "text-indexed-stored-tokenised-atomic")) + ":\"BULK\"");
-        sp.setBulkFetch(true);
-        sp.setBulkFetchSize(10000);
-        ResultSet results = searcher.query(sp);
-        for (ResultSetRow row : results)
-        {
-            nodeService.getAspects(row.getNodeRef());
-            nodeService.getProperties(row.getNodeRef());
-        }
-        results.close();
-
-        end = System.nanoTime();
-
-        System.out.println(n + " Prefetch 10000 in " + ((end - start) / 10e9));
-    }
-
-    /**
-     * Test bug fix
-     * 
-     * @throws Exception
-     */
-    public void testSortIssue_AR_1515__AND__AR_1466() throws Exception
-    {
-        testTX.commit();
-        testTX = transactionService.getUserTransaction();
-        testTX.begin();
-        luceneFTS.pause();
-        buildBaseIndex();
-        runBaseTests();
-        testTX.commit();
-
-        testTX = transactionService.getUserTransaction();
-        testTX.begin();
-
-        runBaseTests();
-
-        SearchParameters sp = new SearchParameters();
-        sp.addStore(rootNodeRef.getStoreRef());
-        sp.setLanguage(SearchService.LANGUAGE_LUCENE);
-        sp.setQuery("PATH:\"//.\"");
-        sp.excludeDataInTheCurrentTransaction(false);
-        sp.addSort("ID", true);
-        ResultSet results = serviceRegistry.getSearchService().query(sp);
-        assertEquals(16, results.length());
-
-        String current = null;
-        for (ResultSetRow row : results)
-        {
-            String id = row.getNodeRef().getId();
-
-            if (current != null)
-            {
-                if (current.compareTo(id) > 0)
-                {
-                    fail();
-                }
-            }
-            current = id;
-        }
-        results.close();
-
-        assertEquals(5, serviceRegistry.getNodeService().getChildAssocs(rootNodeRef).size());
-        serviceRegistry.getNodeService().createNode(rootNodeRef, ContentModel.ASSOC_CHILDREN, QName.createQName("{namespace}texas"), testSuperType).getChildRef();
-        assertEquals(6, serviceRegistry.getNodeService().getChildAssocs(rootNodeRef).size());
-
-        sp = new SearchParameters();
-        sp.addStore(rootNodeRef.getStoreRef());
-        sp.setLanguage(SearchService.LANGUAGE_LUCENE);
-        sp.setQuery("PATH:\"//.\"");
-        sp.excludeDataInTheCurrentTransaction(false);
-        sp.addSort("ID", true);
-        results = serviceRegistry.getSearchService().query(sp);
-        assertEquals(17, results.length());
-        current = null;
-        for (ResultSetRow row : results)
-        {
-            String id = row.getNodeRef().getId();
-
-            if (current != null)
-            {
-                if (current.compareTo(id) > 0)
-                {
-                    fail();
-                }
-            }
-            current = id;
-        }
-        results.close();
-
-        assertEquals(6, serviceRegistry.getNodeService().getChildAssocs(rootNodeRef).size());
-        serviceRegistry.getNodeService().createNode(rootNodeRef, ContentModel.ASSOC_CHILDREN, QName.createQName("{namespace}texas"), testSuperType).getChildRef();
-        assertEquals(7, serviceRegistry.getNodeService().getChildAssocs(rootNodeRef).size());
-
-        sp = new SearchParameters();
-        sp.addStore(rootNodeRef.getStoreRef());
-        sp.setLanguage(SearchService.LANGUAGE_LUCENE);
-        sp.setQuery("PATH:\"//.\"");
-        sp.excludeDataInTheCurrentTransaction(false);
-        sp.addSort("ID", true);
-        results = serviceRegistry.getSearchService().query(sp);
-        assertEquals(18, results.length());
-        current = null;
-        for (ResultSetRow row : results)
-        {
-            String id = row.getNodeRef().getId();
-
-            if (current != null)
-            {
-                if (current.compareTo(id) > 0)
-                {
-                    fail();
-                }
-            }
-            current = id;
-        }
-        results.close();
-
-        testTX.rollback();
-
-    }
-
-    /**
-     * @throws Exception
-     */
-    public void testAuxDataIsPresent() throws Exception
-    {
-        luceneFTS.pause();
-        testTX.commit();
-
-        testTX = transactionService.getUserTransaction();
-        testTX.begin();
-        runBaseTests();
-
-        ADMLuceneSearcherImpl searcher = ADMLuceneSearcherImpl.getSearcher(rootNodeRef.getStoreRef(), indexerAndSearcher);
-        searcher.setNodeService(nodeService);
-        searcher.setDictionaryService(dictionaryService);
-        searcher.setTenantService(tenantService);
-        searcher.setNamespacePrefixResolver(getNamespacePrefixResolver("namespace"));
-        ResultSet results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "ID:\"" + n14 + "\"", null);
-        assertEquals(1, results.length()); // one node
-        results.close();
-
-        nodeService.addAspect(n14, aspectWithChildren, null);
-        testTX.commit();
-
-        testTX = transactionService.getUserTransaction();
-        testTX.begin();
-
-        searcher = ADMLuceneSearcherImpl.getSearcher(rootNodeRef.getStoreRef(), indexerAndSearcher);
-        searcher.setNodeService(nodeService);
-        searcher.setDictionaryService(dictionaryService);
-        searcher.setTenantService(tenantService);
-        searcher.setNamespacePrefixResolver(getNamespacePrefixResolver("namespace"));
-        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "ID:\"" + n14 + "\"", null);
-        assertEquals(10, results.length()); // one node + 9 aux paths to n14
-        results.close();
-    }
-
-    /**
-     * @throws Exception
-     */
-    public void testFirst() throws Exception
-    {
-        testReadAgainstDelta();
-    }
-
-    /**
-     * @throws Exception
-     */
-    public void test0() throws Exception
-    {
-        luceneFTS.pause();
-        buildBaseIndex();
-        runBaseTests();
-        luceneFTS.resume();
-    }
-
-    /**
-     * @throws Exception
-     */
-    public void testDeleteSecondaryAssocToContainer() throws Exception
-    {
-        luceneFTS.pause();
-
-        testTX.commit();
-
-        testTX = transactionService.getUserTransaction();
-        testTX.begin();
-        runBaseTests();
-        nodeService.removeChild(n2, n13);
-        testTX.commit();
-
-        testTX = transactionService.getUserTransaction();
-        testTX.begin();
-
-        ADMLuceneSearcherImpl searcher = ADMLuceneSearcherImpl.getSearcher(rootNodeRef.getStoreRef(), indexerAndSearcher);
-        searcher.setNodeService(nodeService);
-        searcher.setDictionaryService(dictionaryService);
-        searcher.setTenantService(tenantService);
-        searcher.setNamespacePrefixResolver(getNamespacePrefixResolver("namespace"));
-        ResultSet results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/namespace:one\"", null);
-        assertEquals(1, results.length());
-        results.close();
-        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/namespace:two\"", null);
-        assertEquals(1, results.length());
-        results.close();
-        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/namespace:three\"", null);
-        assertEquals(1, results.length());
-        results.close();
-        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/namespace:four\"", null);
-        assertEquals(1, results.length());
-        results.close();
-        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/namespace:eight-0\"", null);
-        assertEquals(1, results.length());
-        results.close();
-        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/namespace:five\"", null);
-        assertEquals(0, results.length());
-        results.close();
-        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/namespace:one/namespace:one\"", null);
-        assertEquals(0, results.length());
-        results.close();
-        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/namespace:one/namespace:two\"", null);
-        assertEquals(0, results.length());
-        results.close();
-        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/namespace:two/namespace:one\"", null);
-        assertEquals(0, results.length());
-        results.close();
-        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/namespace:two/namespace:two\"", null);
-        assertEquals(0, results.length());
-        results.close();
-        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/namespace:one/namespace:five\"", null);
-        assertEquals(1, results.length());
-        results.close();
-        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/namespace:one/namespace:six\"", null);
-        assertEquals(1, results.length());
-        results.close();
-        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/namespace:two/namespace:seven\"", null);
-        assertEquals(1, results.length());
-        results.close();
-        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/namespace:one/namespace:eight-1\"", null);
-        assertEquals(1, results.length());
-        results.close();
-        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/namespace:two/namespace:eight-2\"", null);
-        assertEquals(1, results.length());
-        results.close();
-        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/namespace:one/namespace:eight-2\"", null);
-        assertEquals(0, results.length());
-        results.close();
-        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/namespace:two/namespace:eight-1\"", null);
-        assertEquals(0, results.length());
-        results.close();
-        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/namespace:two/namespace:eight-0\"", null);
-        assertEquals(0, results.length());
-        results.close();
-        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/namespace:one/namespace:eight-0\"", null);
-        assertEquals(0, results.length());
-        results.close();
-        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/namespace:one/namespace:five/namespace:nine\"", null);
-        assertEquals(1, results.length());
-        results.close();
-        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/namespace:one/namespace:five/namespace:ten\"", null);
-        assertEquals(1, results.length());
-        results.close();
-        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/namespace:one/namespace:five/namespace:eleven\"", null);
-        assertEquals(1, results.length());
-        results.close();
-        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/namespace:one/namespace:five/namespace:twelve\"", null);
-        assertEquals(1, results.length());
-        results.close();
-        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/namespace:one/namespace:five/namespace:twelve/namespace:thirteen\"", null);
-        assertEquals(1, results.length());
-        results.close();
-        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/namespace:one/namespace:five/namespace:twelve/namespace:thirteen/namespace:fourteen\"", null);
-        assertEquals(1, results.length());
-        results.close();
-        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/namespace:one/namespace:five/namespace:twelve/namespace:thirteen/namespace:common\"", null);
-        assertEquals(1, results.length());
-        results.close();
-        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/namespace:two/namespace:link\"", null);
-        assertEquals(0, results.length());
-        results.close();
-        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/namespace:one/namespace:five/namespace:twelve/namespace:common\"", null);
-        assertEquals(1, results.length());
-        results.close();
-        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/namespace:*\"", null);
-        assertEquals(5, results.length());
-        results.close();
-        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/namespace:*/namespace:*\"", null);
-        assertEquals(5, results.length());
-        results.close();
-        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH_WITH_REPEATS:\"/namespace:*/namespace:*\"", null);
-        assertEquals(7, results.length());
-        results.close();
-        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/namespace:*/namespace:five\"", null);
-        assertEquals(1, results.length());
-        results.close();
-        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/namespace:*/namespace:*/namespace:*\"", null);
-        assertEquals(5, results.length());
-        results.close();
-        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH_WITH_REPEATS:\"/namespace:*/namespace:*/namespace:*\"", null);
-        assertEquals(6, results.length());
-        results.close();
-        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/namespace:one/namespace:*\"", null);
-        assertEquals(4, results.length());
-        results.close();
-        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/namespace:*/namespace:five/namespace:*\"", null);
-        assertEquals(5, results.length());
-        results.close();
-        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/namespace:one/namespace:*/namespace:nine\"", null);
-        assertEquals(1, results.length());
-        results.close();
-        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/*\"", null);
-        assertEquals(5, results.length());
-        results.close();
-        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/*/*\"", null);
-        assertEquals(5, results.length());
-        results.close();
-        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH_WITH_REPEATS:\"/*/*\"", null);
-        assertEquals(7, results.length());
-        results.close();
-        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/*/namespace:five\"", null);
-        assertEquals(1, results.length());
-        results.close();
-        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/*/*/*\"", null);
-        assertEquals(5, results.length());
-        results.close();
-        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/namespace:one/*\"", null);
-        assertEquals(4, results.length());
-        results.close();
-        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/*/namespace:five/*\"", null);
-        assertEquals(5, results.length());
-        results.close();
-        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/namespace:one/*/namespace:nine\"", null);
-        assertEquals(1, results.length());
-        results.close();
-        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"//.\"", null);
-        assertEquals(16, results.length());
-        results.close();
-        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH_WITH_REPEATS:\"//.\"", null);
-        assertEquals(24, results.length());
-        results.close();
-        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"//*\"", null);
-        assertEquals(15, results.length());
-        results.close();
-        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH_WITH_REPEATS:\"//*\"", null);
-        assertEquals(23, results.length());
-        results.close();
-        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"//*/.\"", null);
-        assertEquals(15, results.length());
-        results.close();
-        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH_WITH_REPEATS:\"//*/.\"", null);
-        assertEquals(23, results.length());
-        results.close();
-        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"//*/./.\"", null);
-        assertEquals(15, results.length());
-        results.close();
-        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH_WITH_REPEATS:\"//*/./.\"", null);
-        assertEquals(23, results.length());
-        results.close();
-        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"//./*\"", null);
-        assertEquals(15, results.length());
-        results.close();
-        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH_WITH_REPEATS:\"//./*\"", null);
-        assertEquals(23, results.length());
-        results.close();
-        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"//././*/././.\"", null);
-        assertEquals(15, results.length());
-        results.close();
-        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH_WITH_REPEATS:\"//././*/././.\"", null);
-        assertEquals(23, results.length());
-        results.close();
-        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"//common\"", null);
-        assertEquals(1, results.length());
-        results.close();
-        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/one//common\"", null);
-        assertEquals(1, results.length());
-        results.close();
-        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/one/five//*\"", null);
-        assertEquals(7, results.length());
-        results.close();
-        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH_WITH_REPEATS:\"/one/five//*\"", null);
-        assertEquals(10, results.length());
-        results.close();
-        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/one/five//.\"", null);
-        assertEquals(8, results.length());
-        results.close();
-        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/one//five/nine\"", null);
-        assertEquals(1, results.length());
-        results.close();
-        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/one//thirteen/fourteen\"", null);
-        assertEquals(1, results.length());
-        results.close();
-        luceneFTS.resume();
-    }
-
-    /**
-     * @throws Exception
-     */
-    public void testDeleteSecondaryAssocToLeaf() throws Exception
-    {
-        luceneFTS.pause();
-
-        testTX.commit();
-
-        testTX = transactionService.getUserTransaction();
-        testTX.begin();
-        runBaseTests();
-        nodeService.removeChild(n12, n14);
-        testTX.commit();
-
-        testTX = transactionService.getUserTransaction();
-        testTX.begin();
-
-        ADMLuceneSearcherImpl searcher = ADMLuceneSearcherImpl.getSearcher(rootNodeRef.getStoreRef(), indexerAndSearcher);
-        searcher.setNodeService(nodeService);
-        searcher.setDictionaryService(dictionaryService);
-        searcher.setTenantService(tenantService);
-        searcher.setNamespacePrefixResolver(getNamespacePrefixResolver("namespace"));
-        ResultSet results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/namespace:one\"", null);
-        assertEquals(1, results.length());
-        results.close();
-        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/namespace:two\"", null);
-        assertEquals(1, results.length());
-        results.close();
-        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/namespace:three\"", null);
-        assertEquals(1, results.length());
-        results.close();
-        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/namespace:four\"", null);
-        assertEquals(1, results.length());
-        results.close();
-        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/namespace:eight-0\"", null);
-        assertEquals(1, results.length());
-        results.close();
-        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/namespace:five\"", null);
-        assertEquals(0, results.length());
-        results.close();
-        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/namespace:one/namespace:one\"", null);
-        assertEquals(0, results.length());
-        results.close();
-        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/namespace:one/namespace:two\"", null);
-        assertEquals(0, results.length());
-        results.close();
-        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/namespace:two/namespace:one\"", null);
-        assertEquals(0, results.length());
-        results.close();
-        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/namespace:two/namespace:two\"", null);
-        assertEquals(0, results.length());
-        results.close();
-        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/namespace:one/namespace:five\"", null);
-        assertEquals(1, results.length());
-        results.close();
-        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/namespace:one/namespace:six\"", null);
-        assertEquals(1, results.length());
-        results.close();
-        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/namespace:two/namespace:seven\"", null);
-        assertEquals(1, results.length());
-        results.close();
-        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/namespace:one/namespace:eight-1\"", null);
-        assertEquals(1, results.length());
-        results.close();
-        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/namespace:two/namespace:eight-2\"", null);
-        assertEquals(1, results.length());
-        results.close();
-        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/namespace:one/namespace:eight-2\"", null);
-        assertEquals(0, results.length());
-        results.close();
-        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/namespace:two/namespace:eight-1\"", null);
-        assertEquals(0, results.length());
-        results.close();
-        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/namespace:two/namespace:eight-0\"", null);
-        assertEquals(0, results.length());
-        results.close();
-        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/namespace:one/namespace:eight-0\"", null);
-        assertEquals(0, results.length());
-        results.close();
-        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/namespace:one/namespace:five/namespace:nine\"", null);
-        assertEquals(1, results.length());
-        results.close();
-        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/namespace:one/namespace:five/namespace:ten\"", null);
-        assertEquals(1, results.length());
-        results.close();
-        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/namespace:one/namespace:five/namespace:eleven\"", null);
-        assertEquals(1, results.length());
-        results.close();
-        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/namespace:one/namespace:five/namespace:twelve\"", null);
-        assertEquals(1, results.length());
-        results.close();
-        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/namespace:one/namespace:five/namespace:twelve/namespace:thirteen\"", null);
-        assertEquals(1, results.length());
-        results.close();
-        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/namespace:one/namespace:five/namespace:twelve/namespace:thirteen/namespace:fourteen\"", null);
-        assertEquals(1, results.length());
-        results.close();
-        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/namespace:one/namespace:five/namespace:twelve/namespace:thirteen/namespace:common\"", null);
-        assertEquals(1, results.length());
-        results.close();
-        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/namespace:one/namespace:five/namespace:twelve/namespace:common\"", null);
-        assertEquals(0, results.length());
-        results.close();
-        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/namespace:*\"", null);
-        assertEquals(5, results.length());
-        results.close();
-        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/namespace:*/namespace:*\"", null);
-        assertEquals(6, results.length());
-        results.close();
-        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH_WITH_REPEATS:\"/namespace:*/namespace:*\"", null);
-        assertEquals(8, results.length());
-        results.close();
-        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/namespace:*/namespace:five\"", null);
-        assertEquals(1, results.length());
-        results.close();
-        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/namespace:*/namespace:*/namespace:*\"", null);
-        assertEquals(6, results.length());
-        results.close();
-        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/namespace:one/namespace:*\"", null);
-        assertEquals(4, results.length());
-        results.close();
-        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/namespace:*/namespace:five/namespace:*\"", null);
-        assertEquals(5, results.length());
-        results.close();
-        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/namespace:one/namespace:*/namespace:nine\"", null);
-        assertEquals(1, results.length());
-        results.close();
-        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/*\"", null);
-        assertEquals(5, results.length());
-        results.close();
-        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/*/*\"", null);
-        assertEquals(6, results.length());
-        results.close();
-        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH_WITH_REPEATS:\"/*/*\"", null);
-        assertEquals(8, results.length());
-        results.close();
-        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/*/namespace:five\"", null);
-        assertEquals(1, results.length());
-        results.close();
-        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/*/*/*\"", null);
-        assertEquals(6, results.length());
-        results.close();
-        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/namespace:one/*\"", null);
-        assertEquals(4, results.length());
-        results.close();
-        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/*/namespace:five/*\"", null);
-        assertEquals(5, results.length());
-        results.close();
-        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/namespace:one/*/namespace:nine\"", null);
-        assertEquals(1, results.length());
-        results.close();
-        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"//.\"", null);
-        assertEquals(16, results.length());
-        results.close();
-        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH_WITH_REPEATS:\"//.\"", null);
-        assertEquals(27, results.length());
-        results.close();
-        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"//*\"", null);
-        assertEquals(15, results.length());
-        results.close();
-        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH_WITH_REPEATS:\"//*\"", null);
-        assertEquals(26, results.length());
-        results.close();
-        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"//*/.\"", null);
-        assertEquals(15, results.length());
-        results.close();
-        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH_WITH_REPEATS:\"//*/.\"", null);
-        assertEquals(26, results.length());
-        results.close();
-        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"//*/./.\"", null);
-        assertEquals(15, results.length());
-        results.close();
-        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH_WITH_REPEATS:\"//*/./.\"", null);
-        assertEquals(26, results.length());
-        results.close();
-        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"//./*\"", null);
-        assertEquals(15, results.length());
-        results.close();
-        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH_WITH_REPEATS:\"//./*\"", null);
-        assertEquals(26, results.length());
-        results.close();
-        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"//././*/././.\"", null);
-        assertEquals(15, results.length());
-        results.close();
-        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH_WITH_REPEATS:\"//././*/././.\"", null);
-        assertEquals(26, results.length());
-        results.close();
-        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"//common\"", null);
-        assertEquals(1, results.length());
-        results.close();
-        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/one//common\"", null);
-        assertEquals(1, results.length());
-        results.close();
-        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/one/five//*\"", null);
-        assertEquals(7, results.length());
-        results.close();
-        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH_WITH_REPEATS:\"/one/five//*\"", null);
-        assertEquals(9, results.length());
-        results.close();
-        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/one/five//.\"", null);
-        assertEquals(8, results.length());
-        results.close();
-        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/one//five/nine\"", null);
-        assertEquals(1, results.length());
-        results.close();
-        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/one//thirteen/fourteen\"", null);
-        assertEquals(1, results.length());
-        results.close();
-        luceneFTS.resume();
-    }
-
-    /**
-     * @throws Exception
-     */
-    public void testDeleteIssue() throws Exception
-    {
-
-        testTX.commit();
-
-        testTX = transactionService.getUserTransaction();
-        testTX.begin();
-        ChildAssociationRef testFind = nodeService.createNode(rootNodeRef, ContentModel.ASSOC_CHILDREN, QName.createQName("{namespace}testFind"), testSuperType);
-        testTX.commit();
-
-        ADMLuceneSearcherImpl searcher = ADMLuceneSearcherImpl.getSearcher(rootNodeRef.getStoreRef(), indexerAndSearcher);
-        searcher.setNodeService(nodeService);
-        searcher.setDictionaryService(dictionaryService);
-        searcher.setTenantService(tenantService);
-        searcher.setNamespacePrefixResolver(getNamespacePrefixResolver("namespace"));
-        searcher.setQueryRegister(queryRegisterComponent);
-
-        ResultSet results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "QNAME:\"namespace:testFind\"");
-        assertEquals(1, results.length());
-        results.close();
-
-        RetryingTransactionCallback<Object> createAndDeleteCallback = new RetryingTransactionCallback<Object>()
-        {
-            public Object execute() throws Throwable
-            {
-                for (int i = 0; i < 100; i+=10)
-                {
-                    HashSet<ChildAssociationRef> refs = new HashSet<ChildAssociationRef>();
-                    for (int j = 0; j < i; j++)
-                    {
-                        ChildAssociationRef test = nodeService.createNode(rootNodeRef, ContentModel.ASSOC_CHILDREN, QName.createQName("{namespace}test"), testSuperType);
-                        refs.add(test);
-                    }
-
-                    for (ChildAssociationRef car : refs)
-                    {
-                        nodeService.deleteNode(car.getChildRef());
-                    }
-                }
-                return null;
-            }
-        };
-        retryingTransactionHelper.doInTransaction(createAndDeleteCallback);
-
-        UserTransaction tx3 = transactionService.getUserTransaction();
-        tx3.begin();
-        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "QNAME:\"namespace:testFind\"");
-        assertEquals(1, results.length());
-        results.close();
-        tx3.commit();
-    }
-
-    /**
-     * @throws Exception
-     */
-    public void testMTDeleteIssue() throws Exception
-    {
-        luceneFTS.pause();
-        testTX.commit();
-
-        testTX = transactionService.getUserTransaction();
-        testTX.begin();
-        ChildAssociationRef testFind = nodeService.createNode(rootNodeRef, ContentModel.ASSOC_CHILDREN, QName.createQName("{namespace}testFind"), testSuperType);
-        testTX.commit();
-        testTX = transactionService.getUserTransaction();
-        testTX.begin();
-
-        ADMLuceneSearcherImpl searcher = ADMLuceneSearcherImpl.getSearcher(rootNodeRef.getStoreRef(), indexerAndSearcher);
-        searcher.setNodeService(nodeService);
-        searcher.setDictionaryService(dictionaryService);
-        searcher.setTenantService(tenantService);
-        searcher.setNamespacePrefixResolver(getNamespacePrefixResolver("namespace"));
-        searcher.setQueryRegister(queryRegisterComponent);
-
-        ResultSet results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "QNAME:\"namespace:testFind\"");
-        assertEquals(1, results.length());
-        results.close();
-        testTX.commit();
-
-        Thread runner = null;
-
-        for (int i = 0; i < 20; i++)
-        {
-            runner = new Nester("Concurrent-" + i, runner);
-        }
-        if (runner != null)
-        {
-            runner.start();
-
-            try
-            {
-                runner.join();
-            }
-            catch (InterruptedException e)
-            {
-                e.printStackTrace();
-            }
-        }
-
-        testTX = transactionService.getUserTransaction();
-        testTX.begin();
-        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "QNAME:\"namespace:testFind\"");
-        assertEquals(1, results.length());
-        results.close();
-        testTX.commit();
-    }
-
-    class Nester extends Thread
-    {
-        Thread waiter;
-
-        Nester(String name, Thread waiter)
-        {
-            super(name);
-            this.setDaemon(true);
-            this.waiter = waiter;
-        }
-
-        public void run()
-        {
-            authenticationComponent.setSystemUserAsCurrentUser();
-            if (waiter != null)
-            {
-                waiter.start();
-            }
-            try
-            {
-                System.out.println("Start " + this.getName());
-                RetryingTransactionCallback<Object> createAndDeleteCallback = new RetryingTransactionCallback<Object>()
-                {
-                    public Object execute() throws Throwable
-                    {
-                        for (int i = 0; i < 20; i++)
-                        {
-                            HashSet<ChildAssociationRef> refs = new HashSet<ChildAssociationRef>();
-                            for (int j = 0; j < i; j++)
-                            {
-                                ChildAssociationRef test = nodeService.createNode(rootNodeRef, ContentModel.ASSOC_CHILDREN, QName.createQName("{namespace}test_"
-                                        + getName() + "_" + i + "_" + j), testSuperType);
-                                refs.add(test);
-                            }
-
-                            for (ChildAssociationRef car : refs)
-                            {
-                                nodeService.deleteNode(car.getChildRef());
-                            }
-                        }
-                        return null;
-                    }
-                };
-                retryingTransactionHelper.doInTransaction(createAndDeleteCallback);
-                System.out.println("End " + this.getName());
-            }
-            catch (Exception e)
-            {
-                System.out.println("End " + this.getName() + " with error " + e.getMessage());
-                e.printStackTrace();
-            }
-            finally
-            {
-                authenticationComponent.clearCurrentSecurityContext();
-            }
-            if (waiter != null)
-            {
-                try
-                {
-                    waiter.join();
-                }
-                catch (InterruptedException e)
-                {
-                }
-            }
-        }
-
-    }
+//    public void testQuoting() throws Exception
+//    {
+//        testTX.commit();
+//        testTX = transactionService.getUserTransaction();
+//        testTX.begin();
+//
+//        SearchParameters sp = new SearchParameters();
+//        sp.setLanguage(SearchService.LANGUAGE_LUCENE);
+//        sp.setQuery("TEXT:\"te\\\"thing\\\"st\"");
+//        sp.addStore(rootNodeRef.getStoreRef());
+//        sp.excludeDataInTheCurrentTransaction(true);
+//
+//        ResultSet results = serviceRegistry.getSearchService().query(sp);
+//        results.close();
+//    }
+//
+//    public void testPublicServiceSearchServicePaging() throws Exception
+//    {
+//        testTX.commit();
+//        testTX = transactionService.getUserTransaction();
+//        testTX.begin();
+//
+//        List<NodeRef> expected = new ArrayList<NodeRef>(15);
+//
+//        SearchParameters sp = new SearchParameters();
+//        sp.setLanguage(SearchService.LANGUAGE_FTS_ALFRESCO);
+//        sp.setQuery("PATH:\"//.\"");
+//        sp.addStore(rootNodeRef.getStoreRef());
+//        sp.excludeDataInTheCurrentTransaction(true);
+//
+//        ResultSet results;
+//        ResultSetMetaData md;
+//
+//        results = serviceRegistry.getSearchService().query(sp);
+//        assertEquals(16, results.length());
+//        md = results.getResultSetMetaData();
+//        for (ResultSetRow row : results)
+//        {
+//            expected.add(row.getNodeRef());
+//        }
+//        results.close();
+//        for (int skip = 0; skip < 20; skip++)
+//        {
+//            for (int max = 0; max < 20; max++)
+//            {
+//                doPage(expected, skip, max, sp, serviceRegistry.getSearchService());
+//            }
+//        }
+//
+//        this.authenticationComponent.setCurrentUser("admin");
+//        sp = new SearchParameters();
+//        sp.setLanguage(SearchService.LANGUAGE_LUCENE);
+//        sp.setQuery("PATH:\"//.\"");
+//        sp.addStore(rootNodeRef.getStoreRef());
+//        sp.excludeDataInTheCurrentTransaction(true);
+//
+//        results = serviceRegistry.getSearchService().query(sp);
+//        assertEquals(16, results.length());
+//        results.close();
+//
+//        sp.setMaxPermissionChecks(2);
+//        results = serviceRegistry.getSearchService().query(sp);
+//        assertEquals(2, results.length());
+//        results.close();
+//
+//        sp.setLanguage(SearchService.LANGUAGE_FTS_ALFRESCO);
+//        sp.setMaxPermissionChecks(2);
+//        results = serviceRegistry.getSearchService().query(sp);
+//        assertEquals(2, results.length());
+//        results.close();
+//
+//        // Even though it is picked up they go though before the time moves on
+//        // sp.setMaxPermissionChecks(-1);
+//        // sp.setMaxPermissionCheckTimeMillis(0);
+//        // results = serviceRegistry.getSearchService().query(sp);
+//        // assertEquals(0, results.length());
+//        // results.close();
+//
+//    }
+//
+//    private void doPage(List<NodeRef> expected, int skip, int max, SearchParameters sp, SearchService searcher)
+//    {
+//        sp.setSkipCount(skip);
+//        sp.setMaxItems(max);
+//        ResultSet results = searcher.query(sp);
+//        assertEquals("Skip = " + skip + " max  = " + max, skip + max > 16 ? 16 - skip : max, results.length());
+//        assertEquals("Skip = " + skip + " max  = " + max, (skip + max) < 16, results.hasMore());
+//        assertEquals("Skip = " + skip + " max  = " + max, skip, results.getStart());
+//        int actualPosition = skip;
+//        for (ResultSetRow row : results)
+//        {
+//            NodeRef nodeRef = row.getNodeRef();
+//            assertEquals("Skip = " + skip + " max  = " + max + " actual = " + actualPosition, expected.get(actualPosition), nodeRef);
+//            actualPosition++;
+//        }
+//        results.close();
+//    }
+//
+//    public void testNonPublicSearchServicePaging() throws InterruptedException
+//    {
+//        luceneFTS.pause();
+//        buildBaseIndex();
+//
+//        ADMLuceneSearcherImpl searcher = ADMLuceneSearcherImpl.getSearcher(rootNodeRef.getStoreRef(), indexerAndSearcher);
+//        searcher.setNodeService(nodeService);
+//        searcher.setDictionaryService(dictionaryService);
+//        searcher.setTenantService(tenantService);
+//        searcher.setNamespacePrefixResolver(getNamespacePrefixResolver("namespace"));
+//        searcher.setQueryRegister(queryRegisterComponent);
+//        searcher.setQueryLanguages(((AbstractLuceneIndexerAndSearcherFactory) indexerAndSearcher).queryLanguages);
+//
+//        List<NodeRef> expected = new ArrayList<NodeRef>(15);
+//
+//        SearchParameters sp = new SearchParameters();
+//        sp.setLanguage(SearchService.LANGUAGE_FTS_ALFRESCO);
+//        sp.setQuery("PATH:\"//.\"");
+//        sp.addStore(rootNodeRef.getStoreRef());
+//        sp.excludeDataInTheCurrentTransaction(true);
+//
+//        ResultSet results;
+//        ResultSetMetaData md;
+//
+//        results = searcher.query(sp);
+//        assertEquals(16, results.length());
+//        md = results.getResultSetMetaData();
+//        for (ResultSetRow row : results)
+//        {
+//            expected.add(row.getNodeRef());
+//        }
+//        results.close();
+//
+//        for (int skip = 0; skip < 20; skip++)
+//        {
+//            for (int max = 0; max < 20; max++)
+//            {
+//                doPage(expected, skip, max, sp, searcher);
+//            }
+//        }
+//
+//    }
+//
+//    private void doPage(List<NodeRef> expected, int skip, int max, SearchParameters sp, ADMLuceneSearcherImpl searcher)
+//    {
+//        sp.setSkipCount(skip);
+//        sp.setMaxItems(max);
+//        ResultSet results = searcher.query(sp);
+//        assertEquals("Skip = " + skip + " max  = " + max, skip + max > 16 ? 16 - skip : max, results.length());
+//        assertEquals("Skip = " + skip + " max  = " + max, (skip + max) < 16, results.hasMore());
+//        assertEquals("Skip = " + skip + " max  = " + max, skip, results.getStart());
+//        int actualPosition = skip;
+//        for (ResultSetRow row : results)
+//        {
+//            NodeRef nodeRef = row.getNodeRef();
+//            assertEquals("Skip = " + skip + " max  = " + max + " actual = " + actualPosition, expected.get(actualPosition), nodeRef);
+//            actualPosition++;
+//        }
+//        results.close();
+//    }
+//
+//    public void testAlfrescoSql() throws InterruptedException
+//    {
+//        luceneFTS.pause();
+//        buildBaseIndex();
+//
+//        ADMLuceneSearcherImpl searcher = ADMLuceneSearcherImpl.getSearcher(rootNodeRef.getStoreRef(), indexerAndSearcher);
+//        searcher.setNodeService(nodeService);
+//        searcher.setDictionaryService(dictionaryService);
+//        searcher.setTenantService(tenantService);
+//        searcher.setNamespacePrefixResolver(getNamespacePrefixResolver("namespace"));
+//        searcher.setQueryRegister(queryRegisterComponent);
+//        searcher.setQueryLanguages(((AbstractLuceneIndexerAndSearcherFactory) indexerAndSearcher).queryLanguages);
+//
+//        alfrescoSqlQueryWithCount(searcher, "SELECT * FROM CMIS:DOCUMENT", 1);
+//        alfrescoSqlQueryWithCount(searcher, "SELECT * FROM CMIS:DOCUMENT D JOIN CM:OWNABLE O ON D.CMIS:OBJECTID = O.CMIS:OBJECTID", 0);
+//    }
+//
+//    public void alfrescoSqlQueryWithCount(ADMLuceneSearcherImpl searcher, String query, int count)
+//    {
+//        ResultSet results = searcher.query(rootNodeRef.getStoreRef(), SearchService.LANGUAGE_CMIS_ALFRESCO, query, null);
+//        assertEquals(count, results.length());
+//        results.getResultSetMetaData();
+//        results.close();
+//    }
+//
+//    public void testCmisSql() throws InterruptedException
+//    {
+//        luceneFTS.pause();
+//        buildBaseIndex();
+//
+//        ADMLuceneSearcherImpl searcher = ADMLuceneSearcherImpl.getSearcher(rootNodeRef.getStoreRef(), indexerAndSearcher);
+//        searcher.setNodeService(nodeService);
+//        searcher.setDictionaryService(dictionaryService);
+//        searcher.setTenantService(tenantService);
+//        searcher.setNamespacePrefixResolver(getNamespacePrefixResolver("namespace"));
+//        searcher.setQueryRegister(queryRegisterComponent);
+//        searcher.setQueryLanguages(((AbstractLuceneIndexerAndSearcherFactory) indexerAndSearcher).queryLanguages);
+//
+//        sqlQueryWithCount(searcher, "SELECT * FROM CMIS:DOCUMENT", 1);
+//        sqlQueryWithCount(searcher, "SELECT * FROM CMIS:DOCUMENT D WHERE CONTAINS(D,'lazy')", 1);
+//    }
+//
+//    public void sqlQueryWithCount(ADMLuceneSearcherImpl searcher, String query, int count)
+//    {
+//        ResultSet results = searcher.query(rootNodeRef.getStoreRef(), SearchService.LANGUAGE_CMIS_STRICT, query, null);
+//        assertEquals(count, results.length());
+//        results.getResultSetMetaData();
+//        results.close();
+//    }
+//
+//    public void testFtsSort() throws Throwable
+//    {
+//        luceneFTS.pause();
+//        buildBaseIndex();
+//
+//        ADMLuceneSearcherImpl searcher = ADMLuceneSearcherImpl.getSearcher(rootNodeRef.getStoreRef(), indexerAndSearcher);
+//        searcher.setNodeService(nodeService);
+//        searcher.setDictionaryService(dictionaryService);
+//        searcher.setTenantService(tenantService);
+//        searcher.setNamespacePrefixResolver(getNamespacePrefixResolver("namespace"));
+//        searcher.setQueryRegister(queryRegisterComponent);
+//        searcher.setQueryLanguages(((AbstractLuceneIndexerAndSearcherFactory) indexerAndSearcher).queryLanguages);
+//
+//        SearchParameters sp = new SearchParameters();
+//        sp.setLanguage(SearchService.LANGUAGE_FTS_ALFRESCO);
+//        sp.addStore(rootNodeRef.getStoreRef());
+//        sp.setQuery("-eager or -dog");
+//        sp.addQueryTemplate("ANDY", "%cm:content");
+//        sp.setNamespace(NamespaceService.CONTENT_MODEL_1_0_URI);
+//        sp.excludeDataInTheCurrentTransaction(true);
+//        sp.addSort(ContentModel.PROP_NODE_UUID.toString(), true);
+//        ResultSet results = searcher.query(sp);
+//        assertEquals(16, results.length());
+//
+//        String f = null;
+//        for (ResultSetRow row : results)
+//        {
+//            String currentBun = DefaultTypeConverter.INSTANCE.convert(String.class, nodeService.getProperty(row.getNodeRef(), ContentModel.PROP_NODE_UUID));
+//            // System.out.println( (currentBun == null ? "null" : NumericEncoder.encode(currentBun))+ " "+currentBun);
+//            if (f != null)
+//            {
+//                assertTrue(f.compareTo(currentBun) <= 0);
+//            }
+//            f = currentBun;
+//        }
+//
+//        results.close();
+//
+//        sp = new SearchParameters();
+//        sp.setLanguage(SearchService.LANGUAGE_FTS_ALFRESCO);
+//        sp.addStore(rootNodeRef.getStoreRef());
+//        sp.setQuery("-eager or -dog");
+//        sp.addQueryTemplate("ANDY", "%cm:content");
+//        sp.setNamespace(NamespaceService.CONTENT_MODEL_1_0_URI);
+//        sp.excludeDataInTheCurrentTransaction(true);
+//        sp.addSort(ContentModel.PROP_NODE_UUID.toString(), false);
+//        results = searcher.query(sp);
+//        assertEquals(16, results.length());
+//
+//        f = null;
+//        for (ResultSetRow row : results)
+//        {
+//            String currentBun = DefaultTypeConverter.INSTANCE.convert(String.class, nodeService.getProperty(row.getNodeRef(), ContentModel.PROP_NODE_UUID));
+//            // System.out.println( (currentBun == null ? "null" : NumericEncoder.encode(currentBun))+ " "+currentBun);
+//            if (f != null)
+//            {
+//                assertTrue(f.compareTo(currentBun) >= 0);
+//            }
+//            f = currentBun;
+//        }
+//
+//        results.close();
+//
+//        sp = new SearchParameters();
+//        sp.setLanguage(SearchService.LANGUAGE_FTS_ALFRESCO);
+//        sp.addStore(rootNodeRef.getStoreRef());
+//        sp.setQuery("-eager or -dog");
+//        sp.addQueryTemplate("ANDY", "%cm:content");
+//        sp.setNamespace(NamespaceService.CONTENT_MODEL_1_0_URI);
+//        sp.excludeDataInTheCurrentTransaction(true);
+//        sp.addSort("@" + ContentModel.PROP_NODE_UUID.toString(), false);
+//        results = searcher.query(sp);
+//        assertEquals(16, results.length());
+//
+//        f = null;
+//        for (ResultSetRow row : results)
+//        {
+//            String currentBun = DefaultTypeConverter.INSTANCE.convert(String.class, nodeService.getProperty(row.getNodeRef(), ContentModel.PROP_NODE_UUID));
+//            // System.out.println( (currentBun == null ? "null" : NumericEncoder.encode(currentBun))+ " "+currentBun);
+//            if (f != null)
+//            {
+//                assertTrue(f.compareTo(currentBun) >= 0);
+//            }
+//            f = currentBun;
+//        }
+//
+//        results.close();
+//
+//        sp = new SearchParameters();
+//        sp.setLanguage(SearchService.LANGUAGE_FTS_ALFRESCO);
+//        sp.addStore(rootNodeRef.getStoreRef());
+//        sp.setQuery("-eager or -dog");
+//        sp.addQueryTemplate("ANDY", "%cm:content");
+//        sp.setNamespace(NamespaceService.CONTENT_MODEL_1_0_URI);
+//        sp.excludeDataInTheCurrentTransaction(true);
+//        sp.addSort("cm:name", false);
+//        results = searcher.query(sp);
+//        assertEquals(16, results.length());
+//
+//        f = null;
+//        for (ResultSetRow row : results)
+//        {
+//            String currentBun = DefaultTypeConverter.INSTANCE.convert(String.class, nodeService.getProperty(row.getNodeRef(), ContentModel.PROP_NODE_UUID));
+//            // System.out.println( (currentBun == null ? "null" : NumericEncoder.encode(currentBun))+ " "+currentBun);
+//            if (f != null)
+//            {
+//                assertTrue(f.compareTo(currentBun) >= 0);
+//            }
+//            f = currentBun;
+//        }
+//
+//        results.close();
+//
+//        sp = new SearchParameters();
+//        sp.setLanguage(SearchService.LANGUAGE_FTS_ALFRESCO);
+//        sp.addStore(rootNodeRef.getStoreRef());
+//        sp.setQuery("-eager or -dog");
+//        sp.addQueryTemplate("ANDY", "%cm:content");
+//        sp.setNamespace(NamespaceService.CONTENT_MODEL_1_0_URI);
+//        sp.excludeDataInTheCurrentTransaction(true);
+//        sp.addSort("test:neverIndexed", false);
+//        results = searcher.query(sp);
+//        assertEquals(16, results.length());
+//        results.close();
+//
+//    }
+//
+//    public void testFTS() throws InterruptedException
+//    {
+//        luceneFTS.pause();
+//        buildBaseIndex();
+//
+//        ADMLuceneSearcherImpl searcher = ADMLuceneSearcherImpl.getSearcher(rootNodeRef.getStoreRef(), indexerAndSearcher);
+//        searcher.setNodeService(nodeService);
+//        searcher.setDictionaryService(dictionaryService);
+//        searcher.setTenantService(tenantService);
+//        searcher.setNamespacePrefixResolver(getNamespacePrefixResolver("namespace"));
+//        searcher.setQueryRegister(queryRegisterComponent);
+//        searcher.setQueryLanguages(((AbstractLuceneIndexerAndSearcherFactory) indexerAndSearcher).queryLanguages);
+//
+//        ftsQueryWithCount(searcher, "\"lazy\"", 1);
+//        ftsQueryWithCount(searcher, "lazy and dog", 1);
+//        ftsQueryWithCount(searcher, "-lazy and -dog", 15);
+//        ftsQueryWithCount(searcher, "-lazy and dog", 0);
+//        ftsQueryWithCount(searcher, "lazy and -dog", 0);
+//        ftsQueryWithCount(searcher, "|lazy and |dog", 1);
+//        ftsQueryWithCount(searcher, "|eager and |dog", 1);
+//        ftsQueryWithCount(searcher, "|lazy and |wolf", 1);
+//        ftsQueryWithCount(searcher, "|eager and |wolf", 0);
+//        ftsQueryWithCount(searcher, "-lazy or -dog", 15);
+//        ftsQueryWithCount(searcher, "-eager or -dog", 16);
+//        ftsQueryWithCount(searcher, "-lazy or -wolf", 16);
+//        ftsQueryWithCount(searcher, "-eager or -wolf", 16);
+//        ftsQueryWithCount(searcher, "lazy dog", 1);
+//        ftsQueryWithCount(searcher, "lazy and not dog", 0);
+//        ftsQueryWithCount(searcher, "lazy not dog", 16);
+//        ftsQueryWithCount(searcher, "lazy and !dog", 0);
+//        ftsQueryWithCount(searcher, "lazy !dog", 16);
+//        ftsQueryWithCount(searcher, "lazy and -dog", 0);
+//        ftsQueryWithCount(searcher, "lazy -dog", 16);
+//        ftsQueryWithCount(searcher, "TEXT:\"lazy\"", 1);
+//        ftsQueryWithCount(searcher, "cm_content:\"lazy\"", 1);
+//        ftsQueryWithCount(searcher, "cm:content:big OR cm:content:lazy", 1);
+//        ftsQueryWithCount(searcher, "cm:content:big AND cm:content:lazy", 0);
+//        ftsQueryWithCount(searcher, "{http://www.alfresco.org/model/content/1.0}content:\"lazy\"", 1);
+//        ftsQueryWithCount(searcher, "=lazy", 1);
+//        ftsQueryWithCount(searcher, "@cm:content:big OR @cm:content:lazy", 1);
+//        ftsQueryWithCount(searcher, "@cm:content:big AND @cm:content:lazy", 0);
+//        ftsQueryWithCount(searcher, "@{http://www.alfresco.org/model/content/1.0}content:\"lazy\"", 1);
+//        ftsQueryWithCount(searcher, "~@cm:content:big OR ~@cm:content:lazy", 1);
+//        ftsQueryWithCount(searcher, "brown * quick", 0);
+//        ftsQueryWithCount(searcher, "brown * dog", 1);
+//        ftsQueryWithCount(searcher, "brown * dog", 1);
+//        ftsQueryWithCount(searcher, "brown *(0) dog", 0);
+//        ftsQueryWithCount(searcher, "brown *(1) dog", 0);
+//        ftsQueryWithCount(searcher, "brown *(2) dog", 0);
+//        ftsQueryWithCount(searcher, "brown *(3) dog", 0);
+//        ftsQueryWithCount(searcher, "brown *(4) dog", 1); // "the" does not count
+//        ftsQueryWithCount(searcher, "brown *(5) dog", 1);
+//        ftsQueryWithCount(searcher, "brown *(6) dog", 1);
+//        ftsQueryWithCount(searcher, "TEXT:(\"lazy\")", 1);
+//        ftsQueryWithCount(searcher, "TEXT:(lazy and dog)", 1);
+//        ftsQueryWithCount(searcher, "TEXT:(-lazy and -dog)", 15);
+//        ftsQueryWithCount(searcher, "TEXT:(-lazy and dog)", 0);
+//        ftsQueryWithCount(searcher, "TEXT:(lazy and -dog)", 0);
+//        ftsQueryWithCount(searcher, "TEXT:(|lazy and |dog)", 1);
+//        ftsQueryWithCount(searcher, "TEXT:(|eager and |dog)", 1);
+//        ftsQueryWithCount(searcher, "TEXT:(|lazy and |wolf)", 1);
+//        ftsQueryWithCount(searcher, "TEXT:(|eager and |wolf)", 0);
+//        ftsQueryWithCount(searcher, "TEXT:(-lazy or -dog)", 15);
+//        ftsQueryWithCount(searcher, "TEXT:(-eager or -dog)", 16);
+//        ftsQueryWithCount(searcher, "TEXT:(-lazy or -wolf)", 16);
+//        ftsQueryWithCount(searcher, "TEXT:(-eager or -wolf)", 16);
+//        ftsQueryWithCount(searcher, "TEXT:(lazy dog)", 1);
+//        ftsQueryWithCount(searcher, "TEXT:(lazy and not dog)", 0);
+//        ftsQueryWithCount(searcher, "TEXT:(lazy not dog)", 16);
+//        ftsQueryWithCount(searcher, "TEXT:(lazy and !dog)", 0);
+//        ftsQueryWithCount(searcher, "TEXT:(lazy !dog)", 16);
+//        ftsQueryWithCount(searcher, "TEXT:(lazy and -dog)", 0);
+//        ftsQueryWithCount(searcher, "TEXT:(lazy -dog)", 16);
+//        ftsQueryWithCount(searcher, "cm_content:(\"lazy\")", 1);
+//        ftsQueryWithCount(searcher, "cm:content:(big OR lazy)", 1);
+//        ftsQueryWithCount(searcher, "cm:content:(big AND lazy)", 0);
+//        ftsQueryWithCount(searcher, "{http://www.alfresco.org/model/content/1.0}content:(\"lazy\")", 1);
+//        ftsQueryWithCount(searcher, "TEXT:(=lazy)", 1);
+//        ftsQueryWithCount(searcher, "@cm:content:(big) OR @cm:content:(lazy)", 1);
+//        ftsQueryWithCount(searcher, "@cm:content:(big) AND @cm:content:(lazy)", 0);
+//        ftsQueryWithCount(searcher, "@{http://www.alfresco.org/model/content/1.0}content:(\"lazy\")", 1);
+//        ftsQueryWithCount(searcher, "@cm:content:(~big OR ~lazy)", 1);
+//        ftsQueryWithCount(searcher, "TEXT:(brown * quick)", 0);
+//        ftsQueryWithCount(searcher, "TEXT:(brown * dog)", 1);
+//        ftsQueryWithCount(searcher, "TEXT:(brown * dog)", 1);
+//        ftsQueryWithCount(searcher, "TEXT:(brown *(0) dog)", 0);
+//        ftsQueryWithCount(searcher, "TEXT:(brown *(1) dog)", 0);
+//        ftsQueryWithCount(searcher, "TEXT:(brown *(2) dog)", 0);
+//        ftsQueryWithCount(searcher, "TEXT:(brown *(3) dog)", 0);
+//        ftsQueryWithCount(searcher, "TEXT:(brown *(4) dog)", 1); // "the" does not count
+//        ftsQueryWithCount(searcher, "TEXT:(brown *(5) dog)", 1);
+//        ftsQueryWithCount(searcher, "TEXT:(brown *(6) dog)", 1);
+//
+//        // ftsQueryWithCount(searcher, "brown..dog", 1); // is this allowed??
+//        // ftsQueryWithCount(searcher, "cm:content:brown..dog", 1);
+//
+//        QName qname = QName.createQName(TEST_NAMESPACE, "float\\-ista");
+//        ftsQueryWithCount(searcher, qname + ":3.40", 1);
+//        ftsQueryWithCount(searcher, qname + ":3..4", 1);
+//        ftsQueryWithCount(searcher, qname + ":3..3.39", 0);
+//        ftsQueryWithCount(searcher, qname + ":3..3.40", 1);
+//        ftsQueryWithCount(searcher, qname + ":3.41..3.9", 0);
+//        ftsQueryWithCount(searcher, qname + ":3.40..3.9", 1);
+//
+//        ftsQueryWithCount(searcher, qname + ":[3 TO 4]", 1);
+//        ftsQueryWithCount(searcher, qname + ":[3 TO 3.39]", 0);
+//        ftsQueryWithCount(searcher, qname + ":[3 TO 3.4]", 1);
+//        ftsQueryWithCount(searcher, qname + ":[3.41 TO 4]", 0);
+//        ftsQueryWithCount(searcher, qname + ":[3.4 TO 4]", 1);
+//        ftsQueryWithCount(searcher, qname + ":[3 TO 3.4>", 0);
+//        ftsQueryWithCount(searcher, qname + ":<3.4 TO 4]", 0);
+//        ftsQueryWithCount(searcher, qname + ":<3.4 TO 3.4>", 0);
+//
+//        ftsQueryWithCount(searcher, qname + ":(3.40)", 1);
+//        ftsQueryWithCount(searcher, qname + ":(3..4)", 1);
+//        ftsQueryWithCount(searcher, qname + ":(3..3.39)", 0);
+//        ftsQueryWithCount(searcher, qname + ":(3..3.40)", 1);
+//        ftsQueryWithCount(searcher, qname + ":(3.41..3.9)", 0);
+//        ftsQueryWithCount(searcher, qname + ":(3.40..3.9)", 1);
+//
+//        ftsQueryWithCount(searcher, qname + ":([3 TO 4])", 1);
+//        ftsQueryWithCount(searcher, qname + ":([3 TO 3.39])", 0);
+//        ftsQueryWithCount(searcher, qname + ":([3 TO 3.4])", 1);
+//        ftsQueryWithCount(searcher, qname + ":([3.41 TO 4])", 0);
+//        ftsQueryWithCount(searcher, qname + ":([3.4 TO 4])", 1);
+//        ftsQueryWithCount(searcher, qname + ":([3 TO 3.4>)", 0);
+//        ftsQueryWithCount(searcher, qname + ":(<3.4 TO 4])", 0);
+//        ftsQueryWithCount(searcher, qname + ":(<3.4 TO 3.4>)", 0);
+//
+//        ftsQueryWithCount(searcher, "test:float_x002D_ista:3.40", 1);
+//
+//        ftsQueryWithCount(searcher, "lazy", 1);
+//        ftsQueryWithCount(searcher, "laz*", 1);
+//        ftsQueryWithCount(searcher, "l*y", 1);
+//        ftsQueryWithCount(searcher, "l??y", 1);
+//        ftsQueryWithCount(searcher, "?az?", 1);
+//        ftsQueryWithCount(searcher, "*zy", 1);
+//
+//        ftsQueryWithCount(searcher, "\"lazy\"", 1);
+//        ftsQueryWithCount(searcher, "\"laz*\"", 1);
+//        ftsQueryWithCount(searcher, "\"l*y\"", 1);
+//        ftsQueryWithCount(searcher, "\"l??y\"", 1);
+//        ftsQueryWithCount(searcher, "\"?az?\"", 1);
+//        ftsQueryWithCount(searcher, "\"*zy\"", 1);
+//
+//        ftsQueryWithCount(searcher, "cm:content:lazy", 1);
+//        ftsQueryWithCount(searcher, "cm:content:laz*", 1);
+//        ftsQueryWithCount(searcher, "cm:content:l*y", 1);
+//        ftsQueryWithCount(searcher, "cm:content:l??y", 1);
+//        ftsQueryWithCount(searcher, "cm:content:?az?", 1);
+//        ftsQueryWithCount(searcher, "cm:content:*zy", 1);
+//
+//        ftsQueryWithCount(searcher, "cm:content:\"lazy\"", 1);
+//        ftsQueryWithCount(searcher, "cm:content:\"laz*\"", 1);
+//        ftsQueryWithCount(searcher, "cm:content:\"l*y\"", 1);
+//        ftsQueryWithCount(searcher, "cm:content:\"l??y\"", 1);
+//        ftsQueryWithCount(searcher, "cm:content:\"?az?\"", 1);
+//        ftsQueryWithCount(searcher, "cm:content:\"*zy\"", 1);
+//
+//        ftsQueryWithCount(searcher, "cm:content:(lazy)", 1);
+//        ftsQueryWithCount(searcher, "cm:content:(laz*)", 1);
+//        ftsQueryWithCount(searcher, "cm:content:(l*y)", 1);
+//        ftsQueryWithCount(searcher, "cm:content:(l??y)", 1);
+//        ftsQueryWithCount(searcher, "cm:content:(?az?)", 1);
+//        ftsQueryWithCount(searcher, "cm:content:(*zy)", 1);
+//
+//        ftsQueryWithCount(searcher, "cm:content:(\"lazy\")", 1);
+//        ftsQueryWithCount(searcher, "cm:content:(\"laz*\")", 1);
+//        ftsQueryWithCount(searcher, "cm:content:(\"l*y\")", 1);
+//        ftsQueryWithCount(searcher, "cm:content:(\"l??y\")", 1);
+//        ftsQueryWithCount(searcher, "cm:content:(\"?az?\")", 1);
+//        ftsQueryWithCount(searcher, "cm:content:(\"*zy\")", 1);
+//
+//        ftsQueryWithCount(searcher, "lazy^2 dog^4.2", 1);
+//
+//        ftsQueryWithCount(searcher, "lazy~0.7", 1);
+//        ftsQueryWithCount(searcher, "cm:content:laxy~0.7", 1);
+//        ftsQueryWithCount(searcher, "laxy~0.7", 1);
+//        ftsQueryWithCount(searcher, "=laxy~0.7", 1);
+//        ftsQueryWithCount(searcher, "~laxy~0.7", 1);
+//
+//        ftsQueryWithCount(searcher, "\"quick fox\"~0", 0);
+//        ftsQueryWithCount(searcher, "\"quick fox\"~1", 1);
+//        ftsQueryWithCount(searcher, "\"quick fox\"~2", 1);
+//        ftsQueryWithCount(searcher, "\"quick fox\"~3", 1);
+//
+//        ftsQueryWithCount(searcher, "\"fox quick\"~0", 0);
+//        ftsQueryWithCount(searcher, "\"fox quick\"~1", 0);
+//        ftsQueryWithCount(searcher, "\"fox quick\"~2", 0);
+//        ftsQueryWithCount(searcher, "\"fox quick\"~3", 1);
+//
+//        ftsQueryWithCount(searcher, "lazy", 1);
+//        ftsQueryWithCount(searcher, "-lazy", 15);
+//        ftsQueryWithCount(searcher, "lazy -lazy", 16, null, n14);
+//        ftsQueryWithCount(searcher, "lazy^20 -lazy", 16, n14, null);
+//        ftsQueryWithCount(searcher, "lazy^20 -lazy^20", 16, null, n14);
+//
+//        ftsQueryWithCount(searcher, "cm:content:lazy", 1);
+//        // Simple template
+//        ftsQueryWithCount(searcher, "ANDY:lazy", 1);
+//        // default namesapce cm
+//        ftsQueryWithCount(searcher, "content:lazy", 1);
+//
+//        ftsQueryWithCount(searcher, "PATH:\"//.\"", 16);
+//
+//        ftsQueryWithCount(searcher, "+PATH:\"/app:company_home/st:sites/cm:rmtestnew1/cm:documentLibrary//*\"", 0);
+//        ftsQueryWithCount(searcher, "+PATH:\"/app:company_home/st:sites/cm:rmtestnew1/cm:documentLibrary//*\" -TYPE:\"{http://www.alfresco.org/model/content/1.0}thumbnail\"", 15);
+//        ftsQueryWithCount(searcher, "+PATH:\"/app:company_home/st:sites/cm:rmtestnew1/cm:documentLibrary//*\" AND -TYPE:\"{http://www.alfresco.org/model/content/1.0}thumbnail\"",
+//                0);
+//
+//        ftsQueryWithCount(searcher, "(brown *(6) dog)", 1);
+//        ftsQueryWithCount(searcher, "TEXT:(brown *(6) dog)", 1);
+//        ftsQueryWithCount(searcher, "\"//.\"", 0);
+//        ftsQueryWithCount(searcher, "PATH", "\"//.\"", 16);
+//        ftsQueryWithCount(searcher, "cm:content:brown", 1);
+//        ftsQueryWithCount(searcher, "ANDY:brown", 1);
+//        ftsQueryWithCount(searcher, "ANDY", "brown", 1);
+//        
+//        // test date ranges - note: expected 2 results = n14 (cm:content) and n15 (cm:thumbnail)
+//        ftsQueryWithCount(searcher, "modified:*", 2, Arrays.asList(new NodeRef[]{n14,n15}));
+//        ftsQueryWithCount(searcher, "modified:[MIN TO NOW]", 2, Arrays.asList(new NodeRef[]{n14,n15}));
+//    }
+//    
+//    
+//    private ADMLuceneSearcherImpl buildSearcher()
+//    {
+//        ADMLuceneSearcherImpl searcher = ADMLuceneSearcherImpl.getSearcher(rootNodeRef.getStoreRef(), indexerAndSearcher);
+//        searcher.setNodeService(nodeService);
+//        searcher.setDictionaryService(dictionaryService);
+//        searcher.setTenantService(tenantService);
+//        searcher.setNamespacePrefixResolver(getNamespacePrefixResolver("namespace"));
+//        searcher.setQueryRegister(queryRegisterComponent);
+//        searcher.setQueryLanguages(((AbstractLuceneIndexerAndSearcherFactory) indexerAndSearcher).queryLanguages);
+//        return searcher;
+//    }
+//    
+//    public void testFTSandSort() throws Exception
+//    {
+//        luceneFTS.pause();
+//        buildBaseIndex();
+//        ADMLuceneSearcherImpl searcher = buildSearcher();
+//        
+//        SearchParameters sp = new SearchParameters();
+//        sp.setLanguage(SearchService.LANGUAGE_FTS_ALFRESCO);
+//        sp.addStore(rootNodeRef.getStoreRef());
+//        sp.setQuery( "PATH:\"//.\"");
+//        sp.addQueryTemplate("ANDY", "%cm:content");
+//        sp.setNamespace(NamespaceService.CONTENT_MODEL_1_0_URI);
+//        sp.excludeDataInTheCurrentTransaction(true);
+//        sp.addSort("@"+ContentModel.PROP_CONTENT.toString()+".size", true);
+//        ResultSet results = searcher.query(sp);
+//        assertEquals(16, results.length());
+//        results.close();
+//    }
+//
+//    public void ftsQueryWithCount(ADMLuceneSearcherImpl searcher, String query, int count)
+//    {
+//        SearchParameters sp = new SearchParameters();
+//        sp.setLanguage(SearchService.LANGUAGE_FTS_ALFRESCO);
+//        sp.addStore(rootNodeRef.getStoreRef());
+//        sp.setQuery(query);
+//        sp.addQueryTemplate("ANDY", "%cm:content");
+//        sp.setNamespace(NamespaceService.CONTENT_MODEL_1_0_URI);
+//        sp.excludeDataInTheCurrentTransaction(true);
+//        ResultSet results = searcher.query(sp);
+//        assertEquals(count, results.length());
+//        results.close();
+//    }
+//    
+//    public void ftsQueryWithCount(ADMLuceneSearcherImpl searcher, String defaultFieldName, String query, int count)
+//    {
+//        SearchParameters sp = new SearchParameters();
+//        sp.setLanguage(SearchService.LANGUAGE_FTS_ALFRESCO);
+//        sp.addStore(rootNodeRef.getStoreRef());
+//        sp.setQuery(query);
+//        sp.addQueryTemplate("ANDY", "%cm:content");
+//        sp.setNamespace(NamespaceService.CONTENT_MODEL_1_0_URI);
+//        sp.excludeDataInTheCurrentTransaction(true);
+//        sp.setDefaultFieldName(defaultFieldName);
+//        ResultSet results = searcher.query(sp);
+//        assertEquals(count, results.length());
+//        results.close();
+//    }
+//
+//    public void ftsQueryWithCount(ADMLuceneSearcherImpl searcher, String query, int count, NodeRef first, NodeRef last)
+//    {
+//        ResultSet results = searcher.query(rootNodeRef.getStoreRef(), SearchService.LANGUAGE_FTS_ALFRESCO, query, null);
+//        for (ResultSetRow row : results)
+//        {
+//            System.out.println("" + row.getScore() + nodeService.getProperty(row.getNodeRef(), ContentModel.PROP_NAME));
+//        }
+//        assertEquals(count, results.length());
+//        if (first != null)
+//        {
+//            assertEquals(first, results.getNodeRef(0));
+//        }
+//        if (last != null)
+//        {
+//            assertEquals(last, results.getNodeRef(results.length() - 1));
+//        }
+//        results.close();
+//    }
+//    
+//    public void ftsQueryWithCount(ADMLuceneSearcherImpl searcher, String query, int count, List<NodeRef> expectedList)
+//    {
+//        ResultSet results = searcher.query(rootNodeRef.getStoreRef(), SearchService.LANGUAGE_FTS_ALFRESCO, query, null);
+//        for (ResultSetRow row : results)
+//        {
+//            System.out.println("" + row.getScore() + nodeService.getProperty(row.getNodeRef(), ContentModel.PROP_NAME));
+//        }
+//        assertEquals(count, results.length());
+//        
+//        List<NodeRef> actualList = results.getNodeRefs();
+//        
+//        for (NodeRef expected : expectedList)
+//        {
+//            assertTrue("did not find "+expected, actualList.contains(expected));
+//        }
+//        
+//        results.close();
+//    }
+//
+//    public void testOverWritetoZeroSize() throws Exception
+//    {
+//        testTX.commit();
+//        testTX = transactionService.getUserTransaction();
+//        testTX.begin();
+//        luceneFTS.pause();
+//        buildBaseIndex();
+//        runBaseTests();
+//        luceneFTS.resume();
+//        testTX.commit();
+//
+//        for (int i = 0; i < 50; i++)
+//        {
+//            testTX = transactionService.getUserTransaction();
+//            testTX.begin();
+//            runBaseTests();
+//            nodeService.setProperty(rootNodeRef, QName.createQName("{namespace}property-A"), "A");
+//            nodeService.setProperty(n1, QName.createQName("{namespace}property-A"), "A");
+//            nodeService.setProperty(n2, QName.createQName("{namespace}property-A"), "A");
+//            nodeService.setProperty(n3, QName.createQName("{namespace}property-A"), "A");
+//            nodeService.setProperty(n4, QName.createQName("{namespace}property-A"), "A");
+//            nodeService.setProperty(n5, QName.createQName("{namespace}property-A"), "A");
+//            nodeService.setProperty(n6, QName.createQName("{namespace}property-A"), "A");
+//            nodeService.setProperty(n7, QName.createQName("{namespace}property-A"), "A");
+//            runBaseTests();
+//            testTX.commit();
+//
+//            testTX = transactionService.getUserTransaction();
+//            testTX.begin();
+//            runBaseTests();
+//            nodeService.setProperty(n8, QName.createQName("{namespace}property-A"), "A");
+//            nodeService.setProperty(n9, QName.createQName("{namespace}property-A"), "A");
+//            nodeService.setProperty(n10, QName.createQName("{namespace}property-A"), "A");
+//            nodeService.setProperty(n11, QName.createQName("{namespace}property-A"), "A");
+//            nodeService.setProperty(n12, QName.createQName("{namespace}property-A"), "A");
+//            nodeService.setProperty(n13, QName.createQName("{namespace}property-A"), "A");
+//            nodeService.setProperty(n14, QName.createQName("{namespace}property-A"), "A");
+//            runBaseTests();
+//            testTX.commit();
+//        }
+//
+//    }
+//
+//    public void testBulkResultSet1() throws Exception
+//    {
+//        doBulkTest(1);
+//    }
+//
+//    public void testBulkResultSet10() throws Exception
+//    {
+//        doBulkTest(10);
+//    }
+//
+//    public void testBulkResultSet100() throws Exception
+//    {
+//
+//        doBulkTest(100);
+//    }
+//
+//    public void testBulkResultSet1000() throws Exception
+//    {
+//        doBulkTest(1000);
+//    }
+//
+//    public void xtestBulkResultSet10000() throws Exception
+//    {
+//        doBulkTest(10000);
+//    }
+//
+//    private void doBulkTest(int n) throws Exception
+//    {
+//        Map<QName, Serializable> testProperties = new HashMap<QName, Serializable>();
+//        testProperties.put(QName.createQName(TEST_NAMESPACE, "text-indexed-stored-tokenised-atomic"), "BULK");
+//        for (int i = 0; i < n; i++)
+//        {
+//            nodeService.createNode(rootNodeRef, ContentModel.ASSOC_CHILDREN, QName.createQName("{namespace}texas-" + i), testSuperType, testProperties).getChildRef();
+//        }
+//        testTX.commit();
+//        testTX = transactionService.getUserTransaction();
+//        testTX.begin();
+//
+//        ADMLuceneSearcherImpl searcher = ADMLuceneSearcherImpl.getSearcher(rootNodeRef.getStoreRef(), indexerAndSearcher);
+//        searcher.setNodeService(nodeService);
+//        searcher.setDictionaryService(dictionaryService);
+//        searcher.setTenantService(tenantService);
+//        searcher.setNamespacePrefixResolver(getNamespacePrefixResolver("namespace"));
+//        SearchParameters sp = new SearchParameters();
+//        sp.addStore(rootNodeRef.getStoreRef());
+//        sp.setLanguage("lucene");
+//        sp.setQuery("\\@" + escapeQName(QName.createQName(TEST_NAMESPACE, "text-indexed-stored-tokenised-atomic")) + ":\"BULK\"");
+//        ResultSet results = searcher.query(sp);
+//        results.setBulkFetch(false);
+//        results.setBulkFetchSize(10);
+//        assertEquals(n, results.length());
+//        results.close();
+//
+//        getCold(searcher, n);
+//        getWarm(searcher, n);
+//        getCold(searcher, n);
+//        getCold10(searcher, n);
+//        getCold100(searcher, n);
+//        getCold1000(searcher, n);
+//        getCold10000(searcher, n);
+//
+//        testTX.commit();
+//        testTX = transactionService.getUserTransaction();
+//        testTX.begin();
+//
+//    }
+//
+//    private void getCold(ADMLuceneSearcherImpl searcher, int n)
+//    {
+//        nodeBulkLoader.clear();
+//
+//        long start;
+//
+//        long end;
+//
+//        start = System.nanoTime();
+//
+//        SearchParameters sp = new SearchParameters();
+//        sp.addStore(rootNodeRef.getStoreRef());
+//        sp.setLanguage("lucene");
+//        sp.setQuery("\\@" + escapeQName(QName.createQName(TEST_NAMESPACE, "text-indexed-stored-tokenised-atomic")) + ":\"BULK\"");
+//        ResultSet results = searcher.query(sp);
+//        results.setBulkFetch(false);
+//        results.setBulkFetchSize(0);
+//        for (ResultSetRow row : results)
+//        {
+//            nodeService.getAspects(row.getNodeRef());
+//            nodeService.getProperties(row.getNodeRef());
+//        }
+//        results.close();
+//
+//        end = System.nanoTime();
+//
+//        System.out.println(n + " Cold in " + ((end - start) / 10e9));
+//    }
+//
+//    private void getWarm(ADMLuceneSearcherImpl searcher, int n)
+//    {
+//
+//        long start;
+//
+//        long end;
+//
+//        start = System.nanoTime();
+//
+//        SearchParameters sp = new SearchParameters();
+//        sp.addStore(rootNodeRef.getStoreRef());
+//        sp.setLanguage("lucene");
+//        sp.setQuery("\\@" + escapeQName(QName.createQName(TEST_NAMESPACE, "text-indexed-stored-tokenised-atomic")) + ":\"BULK\"");
+//        ResultSet results = searcher.query(sp);
+//        results.setBulkFetch(false);
+//        results.setBulkFetchSize(0);
+//        for (ResultSetRow row : results)
+//        {
+//            nodeService.getAspects(row.getNodeRef());
+//            nodeService.getProperties(row.getNodeRef());
+//        }
+//        results.close();
+//
+//        end = System.nanoTime();
+//
+//        System.out.println(n + " Warm in " + ((end - start) / 10e9));
+//    }
+//
+//    private void getCold10(ADMLuceneSearcherImpl searcher, int n)
+//    {
+//        nodeBulkLoader.clear();
+//
+//        long start;
+//
+//        long end;
+//
+//        start = System.nanoTime();
+//
+//        SearchParameters sp = new SearchParameters();
+//        sp.addStore(rootNodeRef.getStoreRef());
+//        sp.setLanguage("lucene");
+//        sp.setQuery("\\@" + escapeQName(QName.createQName(TEST_NAMESPACE, "text-indexed-stored-tokenised-atomic")) + ":\"BULK\"");
+//        ResultSet results = searcher.query(sp);
+//        results.setBulkFetch(true);
+//        results.setBulkFetchSize(10);
+//        for (ResultSetRow row : results)
+//        {
+//            nodeService.getAspects(row.getNodeRef());
+//            nodeService.getProperties(row.getNodeRef());
+//        }
+//        results.close();
+//
+//        end = System.nanoTime();
+//
+//        System.out.println(n + " Prefetch 10 in " + ((end - start) / 10e9));
+//    }
+//
+//    private void getCold100(ADMLuceneSearcherImpl searcher, int n)
+//    {
+//        nodeBulkLoader.clear();
+//
+//        long start;
+//
+//        long end;
+//
+//        start = System.nanoTime();
+//
+//        SearchParameters sp = new SearchParameters();
+//        sp.addStore(rootNodeRef.getStoreRef());
+//        sp.setLanguage("lucene");
+//        sp.setQuery("\\@" + escapeQName(QName.createQName(TEST_NAMESPACE, "text-indexed-stored-tokenised-atomic")) + ":\"BULK\"");
+//        ResultSet results = searcher.query(sp);
+//        results.setBulkFetch(true);
+//        results.setBulkFetchSize(100);
+//        for (ResultSetRow row : results)
+//        {
+//            nodeService.getAspects(row.getNodeRef());
+//            nodeService.getProperties(row.getNodeRef());
+//        }
+//        results.close();
+//
+//        end = System.nanoTime();
+//
+//        System.out.println(n + " Prefetch 100 in " + ((end - start) / 10e9));
+//    }
+//
+//    private void getCold1000(ADMLuceneSearcherImpl searcher, int n)
+//    {
+//        nodeBulkLoader.clear();
+//
+//        long start;
+//
+//        long end;
+//
+//        start = System.nanoTime();
+//
+//        SearchParameters sp = new SearchParameters();
+//        sp.addStore(rootNodeRef.getStoreRef());
+//        sp.setLanguage("lucene");
+//        sp.setQuery("\\@" + escapeQName(QName.createQName(TEST_NAMESPACE, "text-indexed-stored-tokenised-atomic")) + ":\"BULK\"");
+//        ResultSet results = searcher.query(sp);
+//        results.setBulkFetch(true);
+//        results.setBulkFetchSize(1000);
+//        for (ResultSetRow row : results)
+//        {
+//            nodeService.getAspects(row.getNodeRef());
+//            nodeService.getProperties(row.getNodeRef());
+//        }
+//        results.close();
+//
+//        end = System.nanoTime();
+//
+//        System.out.println(n + " Prefetch 1000 in " + ((end - start) / 10e9));
+//    }
+//
+//    private void getCold10000(ADMLuceneSearcherImpl searcher, int n)
+//    {
+//        nodeBulkLoader.clear();
+//
+//        long start;
+//
+//        long end;
+//
+//        start = System.nanoTime();
+//
+//        SearchParameters sp = new SearchParameters();
+//        sp.addStore(rootNodeRef.getStoreRef());
+//        sp.setLanguage("lucene");
+//        sp.setQuery("\\@" + escapeQName(QName.createQName(TEST_NAMESPACE, "text-indexed-stored-tokenised-atomic")) + ":\"BULK\"");
+//        ResultSet results = searcher.query(sp);
+//        results.setBulkFetch(true);
+//        results.setBulkFetchSize(10000);
+//        for (ResultSetRow row : results)
+//        {
+//            nodeService.getAspects(row.getNodeRef());
+//            nodeService.getProperties(row.getNodeRef());
+//        }
+//        results.close();
+//
+//        end = System.nanoTime();
+//
+//        System.out.println(n + " Prefetch 10000 in " + ((end - start) / 10e9));
+//    }
+//
+//    /**
+//     * Test bug fix
+//     * 
+//     * @throws Exception
+//     */
+//    public void testSortIssue_AR_1515__AND__AR_1466() throws Exception
+//    {
+//        testTX.commit();
+//        testTX = transactionService.getUserTransaction();
+//        testTX.begin();
+//        luceneFTS.pause();
+//        buildBaseIndex();
+//        runBaseTests();
+//        testTX.commit();
+//
+//        testTX = transactionService.getUserTransaction();
+//        testTX.begin();
+//
+//        runBaseTests();
+//
+//        SearchParameters sp = new SearchParameters();
+//        sp.addStore(rootNodeRef.getStoreRef());
+//        sp.setLanguage(SearchService.LANGUAGE_LUCENE);
+//        sp.setQuery("PATH:\"//.\"");
+//        sp.excludeDataInTheCurrentTransaction(false);
+//        sp.addSort("ID", true);
+//        ResultSet results = serviceRegistry.getSearchService().query(sp);
+//        assertEquals(16, results.length());
+//
+//        String current = null;
+//        for (ResultSetRow row : results)
+//        {
+//            String id = row.getNodeRef().getId();
+//
+//            if (current != null)
+//            {
+//                if (current.compareTo(id) > 0)
+//                {
+//                    fail();
+//                }
+//            }
+//            current = id;
+//        }
+//        results.close();
+//
+//        assertEquals(5, serviceRegistry.getNodeService().getChildAssocs(rootNodeRef).size());
+//        serviceRegistry.getNodeService().createNode(rootNodeRef, ContentModel.ASSOC_CHILDREN, QName.createQName("{namespace}texas"), testSuperType).getChildRef();
+//        assertEquals(6, serviceRegistry.getNodeService().getChildAssocs(rootNodeRef).size());
+//
+//        sp = new SearchParameters();
+//        sp.addStore(rootNodeRef.getStoreRef());
+//        sp.setLanguage(SearchService.LANGUAGE_LUCENE);
+//        sp.setQuery("PATH:\"//.\"");
+//        sp.excludeDataInTheCurrentTransaction(false);
+//        sp.addSort("ID", true);
+//        results = serviceRegistry.getSearchService().query(sp);
+//        assertEquals(17, results.length());
+//        current = null;
+//        for (ResultSetRow row : results)
+//        {
+//            String id = row.getNodeRef().getId();
+//
+//            if (current != null)
+//            {
+//                if (current.compareTo(id) > 0)
+//                {
+//                    fail();
+//                }
+//            }
+//            current = id;
+//        }
+//        results.close();
+//
+//        assertEquals(6, serviceRegistry.getNodeService().getChildAssocs(rootNodeRef).size());
+//        serviceRegistry.getNodeService().createNode(rootNodeRef, ContentModel.ASSOC_CHILDREN, QName.createQName("{namespace}texas"), testSuperType).getChildRef();
+//        assertEquals(7, serviceRegistry.getNodeService().getChildAssocs(rootNodeRef).size());
+//
+//        sp = new SearchParameters();
+//        sp.addStore(rootNodeRef.getStoreRef());
+//        sp.setLanguage(SearchService.LANGUAGE_LUCENE);
+//        sp.setQuery("PATH:\"//.\"");
+//        sp.excludeDataInTheCurrentTransaction(false);
+//        sp.addSort("ID", true);
+//        results = serviceRegistry.getSearchService().query(sp);
+//        assertEquals(18, results.length());
+//        current = null;
+//        for (ResultSetRow row : results)
+//        {
+//            String id = row.getNodeRef().getId();
+//
+//            if (current != null)
+//            {
+//                if (current.compareTo(id) > 0)
+//                {
+//                    fail();
+//                }
+//            }
+//            current = id;
+//        }
+//        results.close();
+//
+//        testTX.rollback();
+//
+//    }
+//
+//    /**
+//     * @throws Exception
+//     */
+//    public void testAuxDataIsPresent() throws Exception
+//    {
+//        luceneFTS.pause();
+//        testTX.commit();
+//
+//        testTX = transactionService.getUserTransaction();
+//        testTX.begin();
+//        runBaseTests();
+//
+//        ADMLuceneSearcherImpl searcher = ADMLuceneSearcherImpl.getSearcher(rootNodeRef.getStoreRef(), indexerAndSearcher);
+//        searcher.setNodeService(nodeService);
+//        searcher.setDictionaryService(dictionaryService);
+//        searcher.setTenantService(tenantService);
+//        searcher.setNamespacePrefixResolver(getNamespacePrefixResolver("namespace"));
+//        ResultSet results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "ID:\"" + n14 + "\"", null);
+//        assertEquals(1, results.length()); // one node
+//        results.close();
+//
+//        nodeService.addAspect(n14, aspectWithChildren, null);
+//        testTX.commit();
+//
+//        testTX = transactionService.getUserTransaction();
+//        testTX.begin();
+//
+//        searcher = ADMLuceneSearcherImpl.getSearcher(rootNodeRef.getStoreRef(), indexerAndSearcher);
+//        searcher.setNodeService(nodeService);
+//        searcher.setDictionaryService(dictionaryService);
+//        searcher.setTenantService(tenantService);
+//        searcher.setNamespacePrefixResolver(getNamespacePrefixResolver("namespace"));
+//        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "ID:\"" + n14 + "\"", null);
+//        assertEquals(10, results.length()); // one node + 9 aux paths to n14
+//        results.close();
+//    }
+//
+//    /**
+//     * @throws Exception
+//     */
+//    public void testFirst() throws Exception
+//    {
+//        testReadAgainstDelta();
+//    }
+//
+//    /**
+//     * @throws Exception
+//     */
+//    public void test0() throws Exception
+//    {
+//        luceneFTS.pause();
+//        buildBaseIndex();
+//        runBaseTests();
+//        luceneFTS.resume();
+//    }
+//
+//    /**
+//     * @throws Exception
+//     */
+//    public void testDeleteSecondaryAssocToContainer() throws Exception
+//    {
+//        luceneFTS.pause();
+//
+//        testTX.commit();
+//
+//        testTX = transactionService.getUserTransaction();
+//        testTX.begin();
+//        runBaseTests();
+//        nodeService.removeChild(n2, n13);
+//        testTX.commit();
+//
+//        testTX = transactionService.getUserTransaction();
+//        testTX.begin();
+//
+//        ADMLuceneSearcherImpl searcher = ADMLuceneSearcherImpl.getSearcher(rootNodeRef.getStoreRef(), indexerAndSearcher);
+//        searcher.setNodeService(nodeService);
+//        searcher.setDictionaryService(dictionaryService);
+//        searcher.setTenantService(tenantService);
+//        searcher.setNamespacePrefixResolver(getNamespacePrefixResolver("namespace"));
+//        ResultSet results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/namespace:one\"", null);
+//        assertEquals(1, results.length());
+//        results.close();
+//        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/namespace:two\"", null);
+//        assertEquals(1, results.length());
+//        results.close();
+//        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/namespace:three\"", null);
+//        assertEquals(1, results.length());
+//        results.close();
+//        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/namespace:four\"", null);
+//        assertEquals(1, results.length());
+//        results.close();
+//        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/namespace:eight-0\"", null);
+//        assertEquals(1, results.length());
+//        results.close();
+//        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/namespace:five\"", null);
+//        assertEquals(0, results.length());
+//        results.close();
+//        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/namespace:one/namespace:one\"", null);
+//        assertEquals(0, results.length());
+//        results.close();
+//        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/namespace:one/namespace:two\"", null);
+//        assertEquals(0, results.length());
+//        results.close();
+//        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/namespace:two/namespace:one\"", null);
+//        assertEquals(0, results.length());
+//        results.close();
+//        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/namespace:two/namespace:two\"", null);
+//        assertEquals(0, results.length());
+//        results.close();
+//        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/namespace:one/namespace:five\"", null);
+//        assertEquals(1, results.length());
+//        results.close();
+//        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/namespace:one/namespace:six\"", null);
+//        assertEquals(1, results.length());
+//        results.close();
+//        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/namespace:two/namespace:seven\"", null);
+//        assertEquals(1, results.length());
+//        results.close();
+//        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/namespace:one/namespace:eight-1\"", null);
+//        assertEquals(1, results.length());
+//        results.close();
+//        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/namespace:two/namespace:eight-2\"", null);
+//        assertEquals(1, results.length());
+//        results.close();
+//        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/namespace:one/namespace:eight-2\"", null);
+//        assertEquals(0, results.length());
+//        results.close();
+//        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/namespace:two/namespace:eight-1\"", null);
+//        assertEquals(0, results.length());
+//        results.close();
+//        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/namespace:two/namespace:eight-0\"", null);
+//        assertEquals(0, results.length());
+//        results.close();
+//        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/namespace:one/namespace:eight-0\"", null);
+//        assertEquals(0, results.length());
+//        results.close();
+//        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/namespace:one/namespace:five/namespace:nine\"", null);
+//        assertEquals(1, results.length());
+//        results.close();
+//        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/namespace:one/namespace:five/namespace:ten\"", null);
+//        assertEquals(1, results.length());
+//        results.close();
+//        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/namespace:one/namespace:five/namespace:eleven\"", null);
+//        assertEquals(1, results.length());
+//        results.close();
+//        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/namespace:one/namespace:five/namespace:twelve\"", null);
+//        assertEquals(1, results.length());
+//        results.close();
+//        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/namespace:one/namespace:five/namespace:twelve/namespace:thirteen\"", null);
+//        assertEquals(1, results.length());
+//        results.close();
+//        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/namespace:one/namespace:five/namespace:twelve/namespace:thirteen/namespace:fourteen\"", null);
+//        assertEquals(1, results.length());
+//        results.close();
+//        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/namespace:one/namespace:five/namespace:twelve/namespace:thirteen/namespace:common\"", null);
+//        assertEquals(1, results.length());
+//        results.close();
+//        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/namespace:two/namespace:link\"", null);
+//        assertEquals(0, results.length());
+//        results.close();
+//        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/namespace:one/namespace:five/namespace:twelve/namespace:common\"", null);
+//        assertEquals(1, results.length());
+//        results.close();
+//        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/namespace:*\"", null);
+//        assertEquals(5, results.length());
+//        results.close();
+//        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/namespace:*/namespace:*\"", null);
+//        assertEquals(5, results.length());
+//        results.close();
+//        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH_WITH_REPEATS:\"/namespace:*/namespace:*\"", null);
+//        assertEquals(7, results.length());
+//        results.close();
+//        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/namespace:*/namespace:five\"", null);
+//        assertEquals(1, results.length());
+//        results.close();
+//        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/namespace:*/namespace:*/namespace:*\"", null);
+//        assertEquals(5, results.length());
+//        results.close();
+//        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH_WITH_REPEATS:\"/namespace:*/namespace:*/namespace:*\"", null);
+//        assertEquals(6, results.length());
+//        results.close();
+//        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/namespace:one/namespace:*\"", null);
+//        assertEquals(4, results.length());
+//        results.close();
+//        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/namespace:*/namespace:five/namespace:*\"", null);
+//        assertEquals(5, results.length());
+//        results.close();
+//        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/namespace:one/namespace:*/namespace:nine\"", null);
+//        assertEquals(1, results.length());
+//        results.close();
+//        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/*\"", null);
+//        assertEquals(5, results.length());
+//        results.close();
+//        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/*/*\"", null);
+//        assertEquals(5, results.length());
+//        results.close();
+//        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH_WITH_REPEATS:\"/*/*\"", null);
+//        assertEquals(7, results.length());
+//        results.close();
+//        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/*/namespace:five\"", null);
+//        assertEquals(1, results.length());
+//        results.close();
+//        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/*/*/*\"", null);
+//        assertEquals(5, results.length());
+//        results.close();
+//        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/namespace:one/*\"", null);
+//        assertEquals(4, results.length());
+//        results.close();
+//        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/*/namespace:five/*\"", null);
+//        assertEquals(5, results.length());
+//        results.close();
+//        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/namespace:one/*/namespace:nine\"", null);
+//        assertEquals(1, results.length());
+//        results.close();
+//        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"//.\"", null);
+//        assertEquals(16, results.length());
+//        results.close();
+//        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH_WITH_REPEATS:\"//.\"", null);
+//        assertEquals(24, results.length());
+//        results.close();
+//        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"//*\"", null);
+//        assertEquals(15, results.length());
+//        results.close();
+//        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH_WITH_REPEATS:\"//*\"", null);
+//        assertEquals(23, results.length());
+//        results.close();
+//        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"//*/.\"", null);
+//        assertEquals(15, results.length());
+//        results.close();
+//        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH_WITH_REPEATS:\"//*/.\"", null);
+//        assertEquals(23, results.length());
+//        results.close();
+//        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"//*/./.\"", null);
+//        assertEquals(15, results.length());
+//        results.close();
+//        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH_WITH_REPEATS:\"//*/./.\"", null);
+//        assertEquals(23, results.length());
+//        results.close();
+//        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"//./*\"", null);
+//        assertEquals(15, results.length());
+//        results.close();
+//        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH_WITH_REPEATS:\"//./*\"", null);
+//        assertEquals(23, results.length());
+//        results.close();
+//        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"//././*/././.\"", null);
+//        assertEquals(15, results.length());
+//        results.close();
+//        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH_WITH_REPEATS:\"//././*/././.\"", null);
+//        assertEquals(23, results.length());
+//        results.close();
+//        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"//common\"", null);
+//        assertEquals(1, results.length());
+//        results.close();
+//        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/one//common\"", null);
+//        assertEquals(1, results.length());
+//        results.close();
+//        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/one/five//*\"", null);
+//        assertEquals(7, results.length());
+//        results.close();
+//        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH_WITH_REPEATS:\"/one/five//*\"", null);
+//        assertEquals(10, results.length());
+//        results.close();
+//        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/one/five//.\"", null);
+//        assertEquals(8, results.length());
+//        results.close();
+//        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/one//five/nine\"", null);
+//        assertEquals(1, results.length());
+//        results.close();
+//        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/one//thirteen/fourteen\"", null);
+//        assertEquals(1, results.length());
+//        results.close();
+//        luceneFTS.resume();
+//    }
+//
+//    /**
+//     * @throws Exception
+//     */
+//    public void testDeleteSecondaryAssocToLeaf() throws Exception
+//    {
+//        luceneFTS.pause();
+//
+//        testTX.commit();
+//
+//        testTX = transactionService.getUserTransaction();
+//        testTX.begin();
+//        runBaseTests();
+//        nodeService.removeChild(n12, n14);
+//        testTX.commit();
+//
+//        testTX = transactionService.getUserTransaction();
+//        testTX.begin();
+//
+//        ADMLuceneSearcherImpl searcher = ADMLuceneSearcherImpl.getSearcher(rootNodeRef.getStoreRef(), indexerAndSearcher);
+//        searcher.setNodeService(nodeService);
+//        searcher.setDictionaryService(dictionaryService);
+//        searcher.setTenantService(tenantService);
+//        searcher.setNamespacePrefixResolver(getNamespacePrefixResolver("namespace"));
+//        ResultSet results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/namespace:one\"", null);
+//        assertEquals(1, results.length());
+//        results.close();
+//        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/namespace:two\"", null);
+//        assertEquals(1, results.length());
+//        results.close();
+//        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/namespace:three\"", null);
+//        assertEquals(1, results.length());
+//        results.close();
+//        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/namespace:four\"", null);
+//        assertEquals(1, results.length());
+//        results.close();
+//        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/namespace:eight-0\"", null);
+//        assertEquals(1, results.length());
+//        results.close();
+//        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/namespace:five\"", null);
+//        assertEquals(0, results.length());
+//        results.close();
+//        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/namespace:one/namespace:one\"", null);
+//        assertEquals(0, results.length());
+//        results.close();
+//        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/namespace:one/namespace:two\"", null);
+//        assertEquals(0, results.length());
+//        results.close();
+//        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/namespace:two/namespace:one\"", null);
+//        assertEquals(0, results.length());
+//        results.close();
+//        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/namespace:two/namespace:two\"", null);
+//        assertEquals(0, results.length());
+//        results.close();
+//        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/namespace:one/namespace:five\"", null);
+//        assertEquals(1, results.length());
+//        results.close();
+//        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/namespace:one/namespace:six\"", null);
+//        assertEquals(1, results.length());
+//        results.close();
+//        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/namespace:two/namespace:seven\"", null);
+//        assertEquals(1, results.length());
+//        results.close();
+//        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/namespace:one/namespace:eight-1\"", null);
+//        assertEquals(1, results.length());
+//        results.close();
+//        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/namespace:two/namespace:eight-2\"", null);
+//        assertEquals(1, results.length());
+//        results.close();
+//        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/namespace:one/namespace:eight-2\"", null);
+//        assertEquals(0, results.length());
+//        results.close();
+//        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/namespace:two/namespace:eight-1\"", null);
+//        assertEquals(0, results.length());
+//        results.close();
+//        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/namespace:two/namespace:eight-0\"", null);
+//        assertEquals(0, results.length());
+//        results.close();
+//        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/namespace:one/namespace:eight-0\"", null);
+//        assertEquals(0, results.length());
+//        results.close();
+//        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/namespace:one/namespace:five/namespace:nine\"", null);
+//        assertEquals(1, results.length());
+//        results.close();
+//        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/namespace:one/namespace:five/namespace:ten\"", null);
+//        assertEquals(1, results.length());
+//        results.close();
+//        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/namespace:one/namespace:five/namespace:eleven\"", null);
+//        assertEquals(1, results.length());
+//        results.close();
+//        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/namespace:one/namespace:five/namespace:twelve\"", null);
+//        assertEquals(1, results.length());
+//        results.close();
+//        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/namespace:one/namespace:five/namespace:twelve/namespace:thirteen\"", null);
+//        assertEquals(1, results.length());
+//        results.close();
+//        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/namespace:one/namespace:five/namespace:twelve/namespace:thirteen/namespace:fourteen\"", null);
+//        assertEquals(1, results.length());
+//        results.close();
+//        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/namespace:one/namespace:five/namespace:twelve/namespace:thirteen/namespace:common\"", null);
+//        assertEquals(1, results.length());
+//        results.close();
+//        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/namespace:one/namespace:five/namespace:twelve/namespace:common\"", null);
+//        assertEquals(0, results.length());
+//        results.close();
+//        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/namespace:*\"", null);
+//        assertEquals(5, results.length());
+//        results.close();
+//        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/namespace:*/namespace:*\"", null);
+//        assertEquals(6, results.length());
+//        results.close();
+//        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH_WITH_REPEATS:\"/namespace:*/namespace:*\"", null);
+//        assertEquals(8, results.length());
+//        results.close();
+//        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/namespace:*/namespace:five\"", null);
+//        assertEquals(1, results.length());
+//        results.close();
+//        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/namespace:*/namespace:*/namespace:*\"", null);
+//        assertEquals(6, results.length());
+//        results.close();
+//        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/namespace:one/namespace:*\"", null);
+//        assertEquals(4, results.length());
+//        results.close();
+//        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/namespace:*/namespace:five/namespace:*\"", null);
+//        assertEquals(5, results.length());
+//        results.close();
+//        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/namespace:one/namespace:*/namespace:nine\"", null);
+//        assertEquals(1, results.length());
+//        results.close();
+//        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/*\"", null);
+//        assertEquals(5, results.length());
+//        results.close();
+//        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/*/*\"", null);
+//        assertEquals(6, results.length());
+//        results.close();
+//        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH_WITH_REPEATS:\"/*/*\"", null);
+//        assertEquals(8, results.length());
+//        results.close();
+//        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/*/namespace:five\"", null);
+//        assertEquals(1, results.length());
+//        results.close();
+//        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/*/*/*\"", null);
+//        assertEquals(6, results.length());
+//        results.close();
+//        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/namespace:one/*\"", null);
+//        assertEquals(4, results.length());
+//        results.close();
+//        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/*/namespace:five/*\"", null);
+//        assertEquals(5, results.length());
+//        results.close();
+//        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/namespace:one/*/namespace:nine\"", null);
+//        assertEquals(1, results.length());
+//        results.close();
+//        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"//.\"", null);
+//        assertEquals(16, results.length());
+//        results.close();
+//        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH_WITH_REPEATS:\"//.\"", null);
+//        assertEquals(27, results.length());
+//        results.close();
+//        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"//*\"", null);
+//        assertEquals(15, results.length());
+//        results.close();
+//        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH_WITH_REPEATS:\"//*\"", null);
+//        assertEquals(26, results.length());
+//        results.close();
+//        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"//*/.\"", null);
+//        assertEquals(15, results.length());
+//        results.close();
+//        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH_WITH_REPEATS:\"//*/.\"", null);
+//        assertEquals(26, results.length());
+//        results.close();
+//        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"//*/./.\"", null);
+//        assertEquals(15, results.length());
+//        results.close();
+//        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH_WITH_REPEATS:\"//*/./.\"", null);
+//        assertEquals(26, results.length());
+//        results.close();
+//        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"//./*\"", null);
+//        assertEquals(15, results.length());
+//        results.close();
+//        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH_WITH_REPEATS:\"//./*\"", null);
+//        assertEquals(26, results.length());
+//        results.close();
+//        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"//././*/././.\"", null);
+//        assertEquals(15, results.length());
+//        results.close();
+//        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH_WITH_REPEATS:\"//././*/././.\"", null);
+//        assertEquals(26, results.length());
+//        results.close();
+//        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"//common\"", null);
+//        assertEquals(1, results.length());
+//        results.close();
+//        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/one//common\"", null);
+//        assertEquals(1, results.length());
+//        results.close();
+//        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/one/five//*\"", null);
+//        assertEquals(7, results.length());
+//        results.close();
+//        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH_WITH_REPEATS:\"/one/five//*\"", null);
+//        assertEquals(9, results.length());
+//        results.close();
+//        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/one/five//.\"", null);
+//        assertEquals(8, results.length());
+//        results.close();
+//        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/one//five/nine\"", null);
+//        assertEquals(1, results.length());
+//        results.close();
+//        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PATH:\"/one//thirteen/fourteen\"", null);
+//        assertEquals(1, results.length());
+//        results.close();
+//        luceneFTS.resume();
+//    }
+//
+//    /**
+//     * @throws Exception
+//     */
+//    public void testDeleteIssue() throws Exception
+//    {
+//
+//        testTX.commit();
+//
+//        testTX = transactionService.getUserTransaction();
+//        testTX.begin();
+//        ChildAssociationRef testFind = nodeService.createNode(rootNodeRef, ContentModel.ASSOC_CHILDREN, QName.createQName("{namespace}testFind"), testSuperType);
+//        testTX.commit();
+//
+//        ADMLuceneSearcherImpl searcher = ADMLuceneSearcherImpl.getSearcher(rootNodeRef.getStoreRef(), indexerAndSearcher);
+//        searcher.setNodeService(nodeService);
+//        searcher.setDictionaryService(dictionaryService);
+//        searcher.setTenantService(tenantService);
+//        searcher.setNamespacePrefixResolver(getNamespacePrefixResolver("namespace"));
+//        searcher.setQueryRegister(queryRegisterComponent);
+//
+//        ResultSet results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "QNAME:\"namespace:testFind\"");
+//        assertEquals(1, results.length());
+//        results.close();
+//
+//        RetryingTransactionCallback<Object> createAndDeleteCallback = new RetryingTransactionCallback<Object>()
+//        {
+//            public Object execute() throws Throwable
+//            {
+//                for (int i = 0; i < 100; i+=10)
+//                {
+//                    HashSet<ChildAssociationRef> refs = new HashSet<ChildAssociationRef>();
+//                    for (int j = 0; j < i; j++)
+//                    {
+//                        ChildAssociationRef test = nodeService.createNode(rootNodeRef, ContentModel.ASSOC_CHILDREN, QName.createQName("{namespace}test"), testSuperType);
+//                        refs.add(test);
+//                    }
+//
+//                    for (ChildAssociationRef car : refs)
+//                    {
+//                        nodeService.deleteNode(car.getChildRef());
+//                    }
+//                }
+//                return null;
+//            }
+//        };
+//        retryingTransactionHelper.doInTransaction(createAndDeleteCallback);
+//
+//        UserTransaction tx3 = transactionService.getUserTransaction();
+//        tx3.begin();
+//        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "QNAME:\"namespace:testFind\"");
+//        assertEquals(1, results.length());
+//        results.close();
+//        tx3.commit();
+//    }
+//
+//    /**
+//     * @throws Exception
+//     */
+//    public void testMTDeleteIssue() throws Exception
+//    {
+//        luceneFTS.pause();
+//        testTX.commit();
+//
+//        testTX = transactionService.getUserTransaction();
+//        testTX.begin();
+//        ChildAssociationRef testFind = nodeService.createNode(rootNodeRef, ContentModel.ASSOC_CHILDREN, QName.createQName("{namespace}testFind"), testSuperType);
+//        testTX.commit();
+//        testTX = transactionService.getUserTransaction();
+//        testTX.begin();
+//
+//        ADMLuceneSearcherImpl searcher = ADMLuceneSearcherImpl.getSearcher(rootNodeRef.getStoreRef(), indexerAndSearcher);
+//        searcher.setNodeService(nodeService);
+//        searcher.setDictionaryService(dictionaryService);
+//        searcher.setTenantService(tenantService);
+//        searcher.setNamespacePrefixResolver(getNamespacePrefixResolver("namespace"));
+//        searcher.setQueryRegister(queryRegisterComponent);
+//
+//        ResultSet results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "QNAME:\"namespace:testFind\"");
+//        assertEquals(1, results.length());
+//        results.close();
+//        testTX.commit();
+//
+//        Thread runner = null;
+//
+//        for (int i = 0; i < 20; i++)
+//        {
+//            runner = new Nester("Concurrent-" + i, runner);
+//        }
+//        if (runner != null)
+//        {
+//            runner.start();
+//
+//            try
+//            {
+//                runner.join();
+//            }
+//            catch (InterruptedException e)
+//            {
+//                e.printStackTrace();
+//            }
+//        }
+//
+//        testTX = transactionService.getUserTransaction();
+//        testTX.begin();
+//        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "QNAME:\"namespace:testFind\"");
+//        assertEquals(1, results.length());
+//        results.close();
+//        testTX.commit();
+//    }
+//
+//    class Nester extends Thread
+//    {
+//        Thread waiter;
+//
+//        Nester(String name, Thread waiter)
+//        {
+//            super(name);
+//            this.setDaemon(true);
+//            this.waiter = waiter;
+//        }
+//
+//        public void run()
+//        {
+//            authenticationComponent.setSystemUserAsCurrentUser();
+//            if (waiter != null)
+//            {
+//                waiter.start();
+//            }
+//            try
+//            {
+//                System.out.println("Start " + this.getName());
+//                RetryingTransactionCallback<Object> createAndDeleteCallback = new RetryingTransactionCallback<Object>()
+//                {
+//                    public Object execute() throws Throwable
+//                    {
+//                        for (int i = 0; i < 20; i++)
+//                        {
+//                            HashSet<ChildAssociationRef> refs = new HashSet<ChildAssociationRef>();
+//                            for (int j = 0; j < i; j++)
+//                            {
+//                                ChildAssociationRef test = nodeService.createNode(rootNodeRef, ContentModel.ASSOC_CHILDREN, QName.createQName("{namespace}test_"
+//                                        + getName() + "_" + i + "_" + j), testSuperType);
+//                                refs.add(test);
+//                            }
+//
+//                            for (ChildAssociationRef car : refs)
+//                            {
+//                                nodeService.deleteNode(car.getChildRef());
+//                            }
+//                        }
+//                        return null;
+//                    }
+//                };
+//                retryingTransactionHelper.doInTransaction(createAndDeleteCallback);
+//                System.out.println("End " + this.getName());
+//            }
+//            catch (Exception e)
+//            {
+//                System.out.println("End " + this.getName() + " with error " + e.getMessage());
+//                e.printStackTrace();
+//            }
+//            finally
+//            {
+//                authenticationComponent.clearCurrentSecurityContext();
+//            }
+//            if (waiter != null)
+//            {
+//                try
+//                {
+//                    waiter.join();
+//                }
+//                catch (InterruptedException e)
+//                {
+//                }
+//            }
+//        }
+//
+//    }
 
     /**
      * @throws Exception
@@ -2415,6 +2415,9 @@ public class ADMLuceneTest extends TestCase implements DictionaryListener
                     sp.setQuery("PATH:\"//.\"");
                     sp.excludeDataInTheCurrentTransaction(false);
                     ResultSet results = serviceRegistry.getSearchService().query(sp);
+                    for(ResultSetRow row : results) {
+                       System.out.println("row = " + row.getQName());
+                    }
                     assertEquals(15, results.length());
                     results.close();
 
diff --git a/source/java/org/alfresco/repo/search/impl/lucene/LuceneAlfrescoFtsQueryLanguage.java b/source/java/org/alfresco/repo/search/impl/lucene/LuceneAlfrescoFtsQueryLanguage.java
index 72b13351ea..8795b4dfc5 100644
--- a/source/java/org/alfresco/repo/search/impl/lucene/LuceneAlfrescoFtsQueryLanguage.java
+++ b/source/java/org/alfresco/repo/search/impl/lucene/LuceneAlfrescoFtsQueryLanguage.java
@@ -19,14 +19,11 @@
 package org.alfresco.repo.search.impl.lucene;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.alfresco.cmis.CMISQueryOptions.CMISQueryMode;
 import org.alfresco.repo.search.impl.parsers.AlfrescoFunctionEvaluationContext;
-import org.alfresco.repo.search.impl.parsers.CMISParser;
 import org.alfresco.repo.search.impl.parsers.FTSParser;
 import org.alfresco.repo.search.impl.parsers.FTSQueryParser;
 import org.alfresco.repo.search.impl.querymodel.Argument;
@@ -77,7 +74,6 @@ public class LuceneAlfrescoFtsQueryLanguage implements LuceneQueryLanguageSPI
                 searchParameters.getNamespace());
 
         QueryOptions options = new QueryOptions(searchParameters.getQuery(), null);
-        options.setFetchSize(searchParameters.getBulkFecthSize());
         options.setIncludeInTransactionData(!searchParameters.excludeDataInTheCurrentTransaction());
         options.setDefaultFTSConnective(searchParameters.getDefaultOperator() == SearchParameters.Operator.OR ? Connective.OR : Connective.AND);
         options.setDefaultFTSFieldConnective(searchParameters.getDefaultOperator() == SearchParameters.Operator.OR ? Connective.OR : Connective.AND);
@@ -113,7 +109,8 @@ public class LuceneAlfrescoFtsQueryLanguage implements LuceneQueryLanguageSPI
         org.alfresco.repo.search.impl.querymodel.Query query = factory.createQuery(null, null, constraint, buildOrderings(factory, searchParameters));
 
         QueryEngineResults results = queryEngine.executeQuery(query, options, context);
-        return results.getResults().values().iterator().next();
+        ResultSet resultSet = results.getResults().values().iterator().next();
+        return resultSet;
     }
 
     public String getName()
diff --git a/source/java/org/alfresco/repo/search/impl/lucene/LuceneAlfrescoSqlQueryLanguage.java b/source/java/org/alfresco/repo/search/impl/lucene/LuceneAlfrescoSqlQueryLanguage.java
index ddcde3890c..d9a3b55354 100644
--- a/source/java/org/alfresco/repo/search/impl/lucene/LuceneAlfrescoSqlQueryLanguage.java
+++ b/source/java/org/alfresco/repo/search/impl/lucene/LuceneAlfrescoSqlQueryLanguage.java
@@ -56,7 +56,6 @@ public class LuceneAlfrescoSqlQueryLanguage implements LuceneQueryLanguageSPI
         String sql = searchParameters.getQuery();
 
         CMISQueryOptions options = new CMISQueryOptions(sql, searchParameters.getStores().get(0));
-        options.setFetchSize(searchParameters.getBulkFecthSize());
         options.setIncludeInTransactionData(!searchParameters.excludeDataInTheCurrentTransaction());
         options.setDefaultFTSConnective(searchParameters.getDefaultOperator() == SearchParameters.Operator.OR ? Connective.OR : Connective.AND);
         options.setDefaultFTSFieldConnective(searchParameters.getDefaultOperator() == SearchParameters.Operator.OR ? Connective.OR : Connective.AND);
diff --git a/source/java/org/alfresco/repo/search/impl/lucene/LuceneCmisStrictSqlQueryLanguage.java b/source/java/org/alfresco/repo/search/impl/lucene/LuceneCmisStrictSqlQueryLanguage.java
index 413cf8b6f4..e6193279e3 100644
--- a/source/java/org/alfresco/repo/search/impl/lucene/LuceneCmisStrictSqlQueryLanguage.java
+++ b/source/java/org/alfresco/repo/search/impl/lucene/LuceneCmisStrictSqlQueryLanguage.java
@@ -56,7 +56,6 @@ public class LuceneCmisStrictSqlQueryLanguage implements LuceneQueryLanguageSPI
         String sql = searchParameters.getQuery();
 
         CMISQueryOptions options = new CMISQueryOptions(sql, searchParameters.getStores().get(0));
-        options.setFetchSize(searchParameters.getBulkFecthSize());
         options.setIncludeInTransactionData(!searchParameters.excludeDataInTheCurrentTransaction());
         options.setDefaultFTSConnective(searchParameters.getDefaultOperator() == SearchParameters.Operator.OR ? Connective.OR : Connective.AND);
         options.setDefaultFTSFieldConnective(searchParameters.getDefaultOperator() == SearchParameters.Operator.OR ? Connective.OR : Connective.AND);
diff --git a/source/java/org/alfresco/repo/search/impl/lucene/LuceneResultSet.java b/source/java/org/alfresco/repo/search/impl/lucene/LuceneResultSet.java
index 23f0b28ef9..8c5bdcf257 100644
--- a/source/java/org/alfresco/repo/search/impl/lucene/LuceneResultSet.java
+++ b/source/java/org/alfresco/repo/search/impl/lucene/LuceneResultSet.java
@@ -50,6 +50,8 @@ import org.apache.lucene.search.Searcher;
  */
 public class LuceneResultSet extends AbstractResultSet
 {
+    private static int DEFAULT_BULK_FETCH_SIZE = 1000;
+    
     /**
      * The underlying hits
      */
@@ -67,7 +69,10 @@ public class LuceneResultSet extends AbstractResultSet
 
     private BitSet prefetch;
 
+    private boolean bulkFetch = true;
 
+    private int bulkFetchSize = DEFAULT_BULK_FETCH_SIZE;
+    
     /**
      * Wrap a lucene seach result with node support
      * 
@@ -156,11 +161,11 @@ public class LuceneResultSet extends AbstractResultSet
             throw new SearcherException("IO Error reading reading document from the result set", e);
         }
     }
-    
+
     private void prefetch(int n) throws IOException
     {
         NodeBulkLoader bulkLoader = config.getBulkLoader();
-        if (!searchParameters.getBulkFetch() || (bulkLoader == null))
+        if (!getBulkFetch() || (bulkLoader == null))
         {
             // No prefetching
             return;
@@ -171,7 +176,7 @@ public class LuceneResultSet extends AbstractResultSet
             return;
         }
         // Start at 'n' and process the the next bulk set
-        int bulkFetchSize = searchParameters.getBulkFecthSize();
+        int bulkFetchSize = getBulkFetchSize();
         List<NodeRef> fetchList = new ArrayList<NodeRef>(bulkFetchSize);
         int totalHits = hits.length();
         for (int i = 0; i < bulkFetchSize; i++)
@@ -255,4 +260,52 @@ public class LuceneResultSet extends AbstractResultSet
         return tenantService;
     }
     
+    /**
+     * Bulk fetch results in the cache
+     * 
+     * @param bulkFetch
+     */
+    @Override
+    public boolean setBulkFetch(boolean bulkFetch)
+    {
+    	boolean oldBulkFetch = this.bulkFetch;
+        this.bulkFetch = bulkFetch;
+        return oldBulkFetch;
+    }
+
+    /**
+     * Do we bulk fetch
+     * 
+     * @return - true if we do
+     */
+    @Override
+    public boolean getBulkFetch()
+    {
+        return bulkFetch;
+    }
+
+    /**
+     * Set the bulk fetch size
+     * 
+     * @param bulkFetchSize
+     */
+    @Override
+    public int setBulkFetchSize(int bulkFetchSize)
+    {
+    	int oldBulkFetchSize = this.bulkFetchSize;
+        this.bulkFetchSize = bulkFetchSize;
+        return oldBulkFetchSize;
+    }
+
+    /**
+     * Get the bulk fetch size.
+     * 
+     * @return the fetch size
+     */
+    @Override
+    public int getBulkFetchSize()
+    {
+        return bulkFetchSize;
+    }
+    
 }
diff --git a/source/java/org/alfresco/repo/search/impl/lucene/PagingLuceneResultSet.java b/source/java/org/alfresco/repo/search/impl/lucene/PagingLuceneResultSet.java
index a7cd6b862a..be5b4becfb 100644
--- a/source/java/org/alfresco/repo/search/impl/lucene/PagingLuceneResultSet.java
+++ b/source/java/org/alfresco/repo/search/impl/lucene/PagingLuceneResultSet.java
@@ -193,4 +193,44 @@ public class PagingLuceneResultSet implements ResultSet, Serializable
     {
         return wrapped;
     }
+
+    /**
+     * Bulk fetch results in the cache
+     * 
+     * @param bulkFetch
+     */
+    public boolean setBulkFetch(boolean bulkFetch)
+    {
+    	return wrapped.setBulkFetch(bulkFetch);
+    }
+
+    /**
+     * Do we bulk fetch
+     * 
+     * @return - true if we do
+     */
+    public boolean getBulkFetch()
+    {
+        return wrapped.getBulkFetch();
+    }
+
+    /**
+     * Set the bulk fetch size
+     * 
+     * @param bulkFetchSize
+     */
+    public int setBulkFetchSize(int bulkFetchSize)
+    {
+    	return wrapped.setBulkFetchSize(bulkFetchSize);
+    }
+
+    /**
+     * Get the bulk fetch size.
+     * 
+     * @return the fetch size
+     */
+    public int getBulkFetchSize()
+    {
+        return wrapped.getBulkFetchSize();
+    }
 }
diff --git a/source/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/LuceneQueryEngine.java b/source/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/LuceneQueryEngine.java
index f4b6377a7e..554439ddb4 100644
--- a/source/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/LuceneQueryEngine.java
+++ b/source/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/LuceneQueryEngine.java
@@ -136,8 +136,6 @@ public class LuceneQueryEngine implements QueryEngine
         }
 
         SearchParameters searchParameters = new SearchParameters();
-        searchParameters.setBulkFetch(options.getFetchSize() > 0);
-        searchParameters.setBulkFetchSize(options.getFetchSize());
         if(options.getLocales().size() > 0)
         {
            for(Locale locale: options.getLocales())
diff --git a/source/java/org/alfresco/repo/search/results/ResultSetSPIWrapper.java b/source/java/org/alfresco/repo/search/results/ResultSetSPIWrapper.java
index d6fc3326a7..8e851283d7 100644
--- a/source/java/org/alfresco/repo/search/results/ResultSetSPIWrapper.java
+++ b/source/java/org/alfresco/repo/search/results/ResultSetSPIWrapper.java
@@ -103,12 +103,52 @@ public class ResultSetSPIWrapper<ROW extends ResultSetRow, MD extends ResultSetM
     {
         return wrapped.length();
     }
-
+    
     public Iterator<ResultSetRow> iterator()
     {
         return new WrappedIterator<ROW>(wrapped.iterator());
     }
 
+    /**
+     * Bulk fetch results in the cache
+     * 
+     * @param bulkFetch
+     */
+    public boolean setBulkFetch(boolean bulkFetch)
+    {
+    	return wrapped.setBulkFetch(bulkFetch);
+    }
+
+    /**
+     * Do we bulk fetch
+     * 
+     * @return - true if we do
+     */
+    public boolean getBulkFetch()
+    {
+        return wrapped.getBulkFetch();
+    }
+
+    /**
+     * Set the bulk fetch size
+     * 
+     * @param bulkFetchSize
+     */
+    public int setBulkFetchSize(int bulkFetchSize)
+    {
+    	return wrapped.setBulkFetchSize(bulkFetchSize);
+    }
+
+    /**
+     * Get the bulk fetch size.
+     * 
+     * @return the fetch size
+     */
+    public int getBulkFetchSize()
+    {
+        return wrapped.getBulkFetchSize();
+    }
+    
     private static class WrappedIterator<ROW extends ResultSetRow> implements Iterator<ResultSetRow>
     {
         private Iterator<ROW> wrapped;
diff --git a/source/java/org/alfresco/repo/search/results/SortedResultSet.java b/source/java/org/alfresco/repo/search/results/SortedResultSet.java
index c3fd99e230..1168c4733e 100644
--- a/source/java/org/alfresco/repo/search/results/SortedResultSet.java
+++ b/source/java/org/alfresco/repo/search/results/SortedResultSet.java
@@ -285,5 +285,45 @@ public class SortedResultSet implements ResultSet
     {
         throw new UnsupportedOperationException();
     }
+    
+    /**
+     * Bulk fetch results in the cache
+     * 
+     * @param bulkFetch
+     */
+    public boolean setBulkFetch(boolean bulkFetch)
+    {
+    	return resultSet.setBulkFetch(bulkFetch);
+    }
+
+    /**
+     * Do we bulk fetch
+     * 
+     * @return - true if we do
+     */
+    public boolean getBulkFetch()
+    {
+        return resultSet.getBulkFetch();
+    }
+
+    /**
+     * Set the bulk fetch size
+     * 
+     * @param bulkFetchSize
+     */
+    public int setBulkFetchSize(int bulkFetchSize)
+    {
+    	return resultSet.setBulkFetchSize(bulkFetchSize);
+    }
+
+    /**
+     * Get the bulk fetch size.
+     * 
+     * @return the fetch size
+     */
+    public int getBulkFetchSize()
+    {
+        return resultSet.getBulkFetchSize();
+    }
 
 }
diff --git a/source/java/org/alfresco/repo/security/permissions/impl/ModelDAO.java b/source/java/org/alfresco/repo/security/permissions/impl/ModelDAO.java
index 0c14c83d2e..c099edfbb5 100644
--- a/source/java/org/alfresco/repo/security/permissions/impl/ModelDAO.java
+++ b/source/java/org/alfresco/repo/security/permissions/impl/ModelDAO.java
@@ -41,7 +41,6 @@ public interface ModelDAO
      */
     public Set<PermissionReference> getAllPermissions(QName type);
     
-    
     /**
      * Get the permissions that can be set for the given type.
      * 
@@ -96,6 +95,8 @@ public interface ModelDAO
      */
     public Set<PermissionReference> getRequiredPermissions(PermissionReference required, QName qName, Set<QName> aspectQNames, RequiredPermission.On on);
 
+    public Set<PermissionReference> getUnconditionalRequiredPermissions(PermissionReference required, RequiredPermission.On on);
+    
     /**
      * Get the permissions which are granted by the supplied permission.
      * 
diff --git a/source/java/org/alfresco/repo/security/permissions/impl/PermissionServiceImpl.java b/source/java/org/alfresco/repo/security/permissions/impl/PermissionServiceImpl.java
index a08587983d..4c805579ee 100644
--- a/source/java/org/alfresco/repo/security/permissions/impl/PermissionServiceImpl.java
+++ b/source/java/org/alfresco/repo/security/permissions/impl/PermissionServiceImpl.java
@@ -19,6 +19,7 @@
 package org.alfresco.repo.security.permissions.impl;
 
 import java.io.Serializable;
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.LinkedHashSet;
 import java.util.List;
@@ -48,6 +49,7 @@ import org.alfresco.repo.security.permissions.PermissionEntry;
 import org.alfresco.repo.security.permissions.PermissionReference;
 import org.alfresco.repo.security.permissions.PermissionServiceSPI;
 import org.alfresco.repo.tenant.TenantService;
+import org.alfresco.repo.transaction.AlfrescoTransactionSupport;
 import org.alfresco.repo.version.Version2Model;
 import org.alfresco.repo.version.VersionModel;
 import org.alfresco.repo.version.common.VersionUtil;
@@ -59,6 +61,7 @@ import org.alfresco.service.cmr.repository.StoreRef;
 import org.alfresco.service.cmr.security.AccessPermission;
 import org.alfresco.service.cmr.security.AccessStatus;
 import org.alfresco.service.cmr.security.AuthorityService;
+import org.alfresco.service.cmr.security.OwnableService;
 import org.alfresco.service.cmr.security.PermissionContext;
 import org.alfresco.service.cmr.security.PermissionService;
 import org.alfresco.service.namespace.NamespaceService;
@@ -86,6 +89,8 @@ public class PermissionServiceImpl extends AbstractLifecycleBean implements Perm
 
     /** a transactionally-safe cache to be injected */
     private SimpleCache<Serializable, AccessStatus> accessCache;
+    
+    private SimpleCache<Serializable, Set<String>> readersCache;
 
     /*
      * Access to the model
@@ -112,6 +117,11 @@ public class PermissionServiceImpl extends AbstractLifecycleBean implements Perm
      */
     private DictionaryService dictionaryService;
 
+    /*
+     * Access to the ownable service
+     */
+    private OwnableService ownableService;
+    
     /*
      * Access to the authority component
      */
@@ -169,6 +179,16 @@ public class PermissionServiceImpl extends AbstractLifecycleBean implements Perm
         this.nodeService = nodeService;
     }
 
+    /**
+     * Set the ownable service.
+     * 
+     * @param ownableService
+     */
+    public void setOwnableService(OwnableService ownableService)
+    {
+        this.ownableService = ownableService;
+    }
+    
     /**
      * Set the tenant service.
      * @param tenantService
@@ -207,7 +227,7 @@ public class PermissionServiceImpl extends AbstractLifecycleBean implements Perm
     {
         this.dynamicAuthorities = dynamicAuthorities;
     }
-
+    
     /**
      * Set the ACL DAO component.
      * 
@@ -229,6 +249,14 @@ public class PermissionServiceImpl extends AbstractLifecycleBean implements Perm
         this.accessCache = accessCache;
     }
 
+    /**
+     * @param readersCache the readersCache to set
+     */
+    public void setReadersCache(SimpleCache<Serializable, Set<String>> readersCache)
+    {
+        this.readersCache = readersCache;
+    }
+    
     /**
      * Set the policy component
      * 
@@ -256,9 +284,11 @@ public class PermissionServiceImpl extends AbstractLifecycleBean implements Perm
         PropertyCheck.mandatory(this, "dictionaryService", dictionaryService);
         PropertyCheck.mandatory(this, "modelDAO", modelDAO);
         PropertyCheck.mandatory(this, "nodeService", nodeService);
+        PropertyCheck.mandatory(this, "ownableService", ownableService);
         PropertyCheck.mandatory(this, "permissionsDaoComponent", permissionsDaoComponent);
         PropertyCheck.mandatory(this, "authorityService", authorityService);
         PropertyCheck.mandatory(this, "accessCache", accessCache);
+        PropertyCheck.mandatory(this, "readersCache", readersCache);
         PropertyCheck.mandatory(this, "policyComponent", policyComponent);
         PropertyCheck.mandatory(this, "aclDaoComponent", aclDaoComponent);
 
@@ -720,7 +750,7 @@ public class PermissionServiceImpl extends AbstractLifecycleBean implements Perm
         auths.addAll(authorityService.getAuthoritiesForUser(username));
         return auths;
     }
-
+  
     private Set<String> getDynamicAuthorities(Authentication auth, NodeRef nodeRef, PermissionReference required)
     {
         HashSet<String> auths = new HashSet<String>(64);
@@ -827,7 +857,6 @@ public class PermissionServiceImpl extends AbstractLifecycleBean implements Perm
     {
         permissionsDaoComponent.setPermission(storeRef, authority, permission, allow);
         accessCache.clear();
-
     }
 
     public void deletePermissions(NodeRef nodeRef)
@@ -958,6 +987,193 @@ public class PermissionServiceImpl extends AbstractLifecycleBean implements Perm
         accessCache.clear();
     }
 
+    /**
+     * Optimised read permission evaluation
+     * caveats:
+     * doesn't take into account dynamic authorities/groups
+     * doesn't take into account node types/aspects for permissions
+     *  
+     */
+    public AccessStatus hasReadPermission(NodeRef nodeRef)
+    {
+        AccessStatus status = AccessStatus.DENIED;
+
+        // If the node ref is null there is no sensible test to do - and there
+        // must be no permissions
+        // - so we allow it
+        if (nodeRef == null)
+        {
+            return AccessStatus.ALLOWED;
+        }
+
+        // Allow permissions for nodes that do not exist
+        if (!nodeService.exists(nodeRef))
+        {
+            return AccessStatus.ALLOWED;
+        }
+
+        String runAsUser = AuthenticationUtil.getRunAsUser();
+        if (runAsUser == null)
+        {
+            return AccessStatus.DENIED;
+        }
+
+        if (AuthenticationUtil.isRunAsUserTheSystemUser())
+        {
+            return AccessStatus.ALLOWED;
+        }
+
+        // any dynamic authorities other than those defined in the default permissions model with full
+        // control or read permission force hasPermission check
+        Boolean forceHasPermission = (Boolean)AlfrescoTransactionSupport.getResource("forceHasPermission");
+        if(forceHasPermission == null)
+        {
+            for(DynamicAuthority dynamicAuthority : dynamicAuthorities)
+            {
+                String authority = dynamicAuthority.getAuthority();
+                Set<PermissionReference> requiredFor = dynamicAuthority.requiredFor();
+                if(authority != PermissionService.OWNER_AUTHORITY &&
+                        authority != PermissionService.ADMINISTRATOR_AUTHORITY &&
+                        authority != PermissionService.LOCK_OWNER_AUTHORITY &&
+                        (requiredFor == null ||
+                                requiredFor.contains(modelDAO.getPermissionReference(null, PermissionService.FULL_CONTROL)) ||
+                                requiredFor.contains(modelDAO.getPermissionReference(null, PermissionService.READ))))
+                {
+                    forceHasPermission = Boolean.TRUE;
+                    break;
+                }
+            }
+            AlfrescoTransactionSupport.bindResource("forceHasPermission", forceHasPermission);            
+        }
+
+        if(forceHasPermission == Boolean.TRUE)
+        {
+            return hasPermission(nodeRef, PermissionService.READ);
+        }
+
+        Long aclID = nodeService.getNodeAclId(nodeRef);
+        if(aclID == null)
+        {
+            // ACLID is null - need to call default permissions evaluation
+            // This will end up calling the old-style ACL code that walks up the ACL tree
+            status = hasPermission(nodeRef, getPermissionReference(null, PermissionService.READ));
+        }
+        else
+        {
+            status = (canRead(aclID) == AccessStatus.ALLOWED ||
+                    adminRead() == AccessStatus.ALLOWED ||
+                    ownerRead(runAsUser, nodeRef) == AccessStatus.ALLOWED) ? AccessStatus.ALLOWED : AccessStatus.DENIED;
+        }
+
+        return status;
+    }
+
+    private AccessStatus adminRead()
+    {
+        AccessStatus result = AccessStatus.DENIED;
+
+        Set<String> authorisations = getAuthorisations();
+        if(authorisations.contains(AuthenticationUtil.getAdminRoleName()))
+        {
+            result = AccessStatus.ALLOWED;
+        }
+
+        // ROLE_ADMINISTRATOR authority has FULL_CONTROL in permissionDefinitions
+        // so we don't need to check node requirements
+        return result;
+    }
+
+    private AccessStatus ownerRead(String username, NodeRef nodeRef)
+    {
+        AccessStatus result = AccessStatus.DENIED;
+
+        String owner = ownableService.getOwner(nodeRef);
+        if(owner == null)
+        {
+            // TODO node may not have auditable aspect and hence creator property
+            result = AccessStatus.DENIED;
+        }
+
+        // is the user the owner of the node?
+        if(EqualsHelper.nullSafeEquals(username, owner))
+        {
+            // ROLE_OWNER authority has FULL_CONTROL in permissionDefinitions
+            // so we don't need to check node requirements    		
+            return AccessStatus.ALLOWED;
+        }
+
+        return result;
+    }
+
+    /**
+     * @param aclId
+     * @return set of authorities with read permission on the ACL
+     */
+    private Set<String> buildReaders(Long aclId)
+    {
+        HashSet<String> assigned = new HashSet<String>();
+        HashSet<String> readers = new HashSet<String>();
+        AccessControlList acl = aclDaoComponent.getAccessControlList(aclId);
+
+        if (acl == null)
+        {
+            return readers;
+        }
+
+        for (AccessControlEntry ace : acl.getEntries())
+        {
+            assigned.add(ace.getAuthority());
+        }
+
+        for(String authority : assigned)
+        {
+            UnconditionalAclTest test = new UnconditionalAclTest(getPermissionReference(PermissionService.READ));
+            if(test.evaluate(authority, aclId))
+            {
+                readers.add(authority);
+            }
+        }
+
+        return readers;
+    }
+
+    private AccessStatus canRead(Long aclId)
+    {
+        Set<String> authorities = getAuthorisations();
+
+        // test acl readers
+        Set<String> aclReaders = readersCache.get(aclId);
+        if(aclReaders == null)
+        {
+            aclReaders = buildReaders(aclId);
+            readersCache.put(aclId, aclReaders);
+        }
+
+        // both lists are ordered so we can skip scan to find any overlap
+        if(authorities.size() < aclReaders.size())
+        {
+            for(String auth : authorities)
+            {
+                if(aclReaders.contains(auth))
+                {
+                    return AccessStatus.ALLOWED;
+                }
+            }
+        }
+        else
+        {
+            for(String auth : aclReaders)
+            {
+                if(authorities.contains(auth))
+                {
+                    return AccessStatus.ALLOWED;
+                }
+            }
+        }
+
+        return AccessStatus.DENIED;
+    }
+  
     //
     // SUPPORT CLASSES
     //
@@ -1764,6 +1980,295 @@ public class PermissionServiceImpl extends AbstractLifecycleBean implements Perm
 
     }
 
+    /**
+     * Ignores type and aspect requirements on the node
+     *
+     */
+    private class UnconditionalAclTest
+    {
+        /*
+         * The required permission.
+         */
+        PermissionReference required;
+
+        /*
+         * Granters of the permission
+         */
+        Set<PermissionReference> granters;
+
+        /*
+         * The additional permissions required at the node level.
+         */
+        Set<PermissionReference> nodeRequirements = new HashSet<PermissionReference>();
+
+        /*
+         * Constructor just gets the additional requirements
+         */
+        UnconditionalAclTest(PermissionReference required)
+        {
+            this.required = required;
+
+            // Set the required node permissions
+            if (required.equals(getPermissionReference(ALL_PERMISSIONS)))
+            {
+                nodeRequirements = modelDAO.getUnconditionalRequiredPermissions(getPermissionReference(PermissionService.FULL_CONTROL), RequiredPermission.On.NODE);
+            }
+            else
+            {
+                nodeRequirements = modelDAO.getUnconditionalRequiredPermissions(required, RequiredPermission.On.NODE);
+            }
+
+            if (modelDAO.getUnconditionalRequiredPermissions(required, RequiredPermission.On.PARENT).size() > 0)
+            {
+                throw new IllegalStateException("Parent permissions can not be checked for an acl");
+            }
+
+            if (modelDAO.getUnconditionalRequiredPermissions(required,  RequiredPermission.On.CHILDREN).size() > 0)
+            {
+                throw new IllegalStateException("Child permissions can not be checked for an acl");
+            }
+
+            // Find all the permissions that grant the allowed permission
+            // All permissions are treated specially.
+            granters = new LinkedHashSet<PermissionReference>(128, 1.0f);
+            granters.addAll(modelDAO.getGrantingPermissions(required));
+            granters.add(getAllPermissionReference());
+            granters.add(OLD_ALL_PERMISSIONS_REFERENCE);
+        }
+
+        /**
+         * Internal hook point for recursion
+         * 
+         * @param authorisations
+         * @param nodeRef
+         * @param denied
+         * @param recursiveIn
+         * @return true if granted
+         */
+        boolean evaluate(String authority, Long aclId)
+        {
+            // Start out true and "and" all other results
+            boolean success = true;
+
+            // Check the required permissions but not for sets they rely on
+            // their underlying permissions
+            //if (modelDAO.checkPermission(required))
+            //{
+
+                // We have to do the test as no parent will help us out
+                success &= hasSinglePermission(authority, aclId);
+
+                if (!success)
+                {
+                    return false;
+                }
+            //}
+
+            // Check the other permissions required on the node
+            for (PermissionReference pr : nodeRequirements)
+            {
+                // Build a new test
+                UnconditionalAclTest nt = new UnconditionalAclTest(pr);
+                success &= nt.evaluate(authority, aclId);
+                if (!success)
+                {
+                    return false;
+                }
+            }
+
+            return success;
+        }
+
+        boolean hasSinglePermission(String authority, Long aclId)
+        {
+            // Check global permission
+
+            if (checkGlobalPermissions(authority))
+            {
+                return true;
+            }
+
+            if(aclId == null)
+            {
+                return false;
+            }
+            else
+            {
+                return checkRequired(authority, aclId);
+            }
+
+        }
+
+        /**
+         * Check if we have a global permission
+         * 
+         * @param authorisations
+         * @return true if granted
+         */
+        private boolean checkGlobalPermissions(String authority)
+        {
+            for (PermissionEntry pe : modelDAO.getGlobalPermissionEntries())
+            {
+                if (isGranted(pe, authority))
+                {
+                    return true;
+                }
+            }
+            return false;
+        }
+
+        /**
+         * Check that a given authentication is available on a node
+         * 
+         * @param authorisations
+         * @param nodeRef
+         * @param denied
+         * @return true if a check is required
+         */
+        boolean checkRequired(String authority, Long aclId)
+        {
+            AccessControlList acl = aclDaoComponent.getAccessControlList(aclId);
+
+            if (acl == null)
+            {
+                return false;
+            }
+
+            Set<Pair<String, PermissionReference>> denied = new HashSet<Pair<String, PermissionReference>>();
+
+            // Check if each permission allows - the first wins.
+            // We could have other voting style mechanisms here
+            for (AccessControlEntry ace : acl.getEntries())
+            {
+                if (isGranted(ace, authority, denied))
+                {
+                    return true;
+                }
+            }
+            return false;
+        }
+
+        /**
+         * Is a permission granted
+         * 
+         * @param pe -
+         *            the permissions entry to consider
+         * @param granters -
+         *            the set of granters
+         * @param authorisations -
+         *            the set of authorities
+         * @param denied -
+         *            the set of denied permissions/authority pais
+         * @return true if granted
+         */
+        private boolean isGranted(AccessControlEntry ace, String authority, Set<Pair<String, PermissionReference>> denied)
+        {
+            // If the permission entry denies then we just deny
+            if (ace.getAccessStatus() == AccessStatus.DENIED)
+            {
+                denied.add(new Pair<String, PermissionReference>(ace.getAuthority(), ace.getPermission()));
+
+                Set<PermissionReference> granters = modelDAO.getGrantingPermissions(ace.getPermission());
+                for (PermissionReference granter : granters)
+                {
+                    denied.add(new Pair<String, PermissionReference>(ace.getAuthority(), granter));
+                }
+
+                // All the things granted by this permission must be
+                // denied
+                Set<PermissionReference> grantees = modelDAO.getGranteePermissions(ace.getPermission());
+                for (PermissionReference grantee : grantees)
+                {
+                    denied.add(new Pair<String, PermissionReference>(ace.getAuthority(), grantee));
+                }
+
+                // All permission excludes all permissions available for
+                // the node.
+                if (ace.getPermission().equals(getAllPermissionReference()) || ace.getPermission().equals(OLD_ALL_PERMISSIONS_REFERENCE))
+                {
+                    for (PermissionReference deny : modelDAO.getAllPermissions())
+                    {
+                        denied.add(new Pair<String, PermissionReference>(ace.getAuthority(), deny));
+                    }
+                }
+
+                return false;
+            }
+
+            // The permission is allowed but we deny it as it is in the denied
+            // set
+
+            if (denied != null)
+            {
+                Pair<String, PermissionReference> specific = new Pair<String, PermissionReference>(ace.getAuthority(), required);
+                if (denied.contains(specific))
+                {
+                    return false;
+                }
+            }
+
+            // any deny denies
+
+//            if (false)
+//            {
+//                if (denied != null)
+//                {
+//                    for (String auth : authorisations)
+//                    {
+//                        Pair<String, PermissionReference> specific = new Pair<String, PermissionReference>(auth, required);
+//                        if (denied.contains(specific))
+//                        {
+//                            return false;
+//                        }
+//                        for (PermissionReference perm : granters)
+//                        {
+//                            specific = new Pair<String, PermissionReference>(auth, perm);
+//                            if (denied.contains(specific))
+//                            {
+//                                return false;
+//                            }
+//                        }
+//                    }
+//                }
+//            }
+
+            // If the permission has a match in both the authorities and
+            // granters list it is allowed
+            // It applies to the current user and it is granted
+            if (authority.equals(ace.getAuthority()) && granters.contains(ace.getPermission()))
+            {
+                {
+                    return true;
+                }
+            }
+
+            // Default deny
+            return false;
+        }
+
+        private boolean isGranted(PermissionEntry pe, String authority)
+        {
+            // If the permission entry denies then we just deny
+            if (pe.isDenied())
+            {
+                return false;
+            }
+
+            // If the permission has a match in both the authorities and
+            // granters list it is allowed
+            // It applies to the current user and it is granted
+            if (granters.contains(pe.getPermissionReference()) && authority.equals(pe.getAuthority()))
+            {
+                {
+                    return true;
+                }
+            }
+
+            // Default deny
+            return false;
+        }
+    }
+    
     /**
      * Helper class to store a pair of objects which may be null
      * 
@@ -1874,4 +2379,47 @@ public class PermissionServiceImpl extends AbstractLifecycleBean implements Perm
         
         return nodeRef;
     }
+    
+    /**
+     * Get the set of authorities for currently authenticated user,
+     * adding them to a transactional cache
+     * 
+     * @return
+     */
+    public Set<String> getAuthorisations()
+    {
+        // Use TX cache 
+        
+        @SuppressWarnings("unchecked")
+        Set<String> auths = (Set<String>) AlfrescoTransactionSupport.getResource("MyAuthCache");
+        Authentication auth = AuthenticationUtil.getRunAsAuthentication();
+        User user = (User) auth.getPrincipal();
+        if(auths != null)
+        {
+            if(!auths.contains(user.getUsername()))
+            {
+                auths = null;
+            }
+        }
+        if (auths == null)
+        {
+            auths = new HashSet<String>();
+              
+            // No authenticated user then no permissions
+            if (auth != null)
+            {
+                
+                auths.add(user.getUsername());
+                for (GrantedAuthority authority : auth.getAuthorities())
+                {
+                    auths.add(authority.getAuthority());
+                }
+                auths.addAll(authorityService.getAuthoritiesForUser(user.getUsername()));
+            }
+            
+            AlfrescoTransactionSupport.bindResource("MyAuthCache", auths);
+        }
+        return Collections.unmodifiableSet(auths);   
+    }
+
 }
diff --git a/source/java/org/alfresco/repo/security/permissions/impl/acegi/ACLEntryAfterInvocationProvider.java b/source/java/org/alfresco/repo/security/permissions/impl/acegi/ACLEntryAfterInvocationProvider.java
index 837798d53e..33a6f8758c 100644
--- a/source/java/org/alfresco/repo/security/permissions/impl/acegi/ACLEntryAfterInvocationProvider.java
+++ b/source/java/org/alfresco/repo/security/permissions/impl/acegi/ACLEntryAfterInvocationProvider.java
@@ -34,7 +34,6 @@ import net.sf.acegisecurity.Authentication;
 import net.sf.acegisecurity.ConfigAttribute;
 import net.sf.acegisecurity.ConfigAttributeDefinition;
 import net.sf.acegisecurity.afterinvocation.AfterInvocationProvider;
-import net.sf.acegisecurity.vote.AccessDecisionVoter;
 
 import org.alfresco.cmis.CMISResultSet;
 import org.alfresco.repo.search.SimpleResultSetMetaData;
@@ -61,7 +60,7 @@ import org.apache.commons.logging.LogFactory;
 import org.springframework.beans.factory.InitializingBean;
 
 /**
- * Enforce permission after the method calll
+ * Enforce permission after the method call
  * 
  * @author andyh
  */
@@ -87,6 +86,9 @@ public class ACLEntryAfterInvocationProvider implements AfterInvocationProvider,
     
     private Set<String> unfilteredFor = null;
 
+	private boolean optimisePermissionsCheck;
+	private int optimisePermissionsBulkFetchSize;
+
     /**
      * Default constructor
      */
@@ -156,7 +158,7 @@ public class ACLEntryAfterInvocationProvider implements AfterInvocationProvider,
     {
         this.nodeService = nodeService;
     }
-
+    
     /**
      * Set the authentication service
      * 
@@ -487,7 +489,7 @@ public class ACLEntryAfterInvocationProvider implements AfterInvocationProvider,
 
         return returnedObject;
     }
-
+    
     private ResultSet decide(Authentication authentication, Object object, ConfigAttributeDefinition config, PagingLuceneResultSet returnedObject) throws AccessDeniedException
 
     {
@@ -497,7 +499,24 @@ public class ACLEntryAfterInvocationProvider implements AfterInvocationProvider,
         return newPaging;
     }
 
-    private ResultSet decide(Authentication authentication, Object object, ConfigAttributeDefinition config, ResultSet returnedObject) throws AccessDeniedException
+    public void setOptimisePermissionsCheck(boolean optimisePermissionsCheck)
+    {
+    	this.optimisePermissionsCheck = optimisePermissionsCheck;
+    }
+
+    public void setOptimisePermissionsBulkFetchSize(int optimisePermissionsBulkFetchSize)
+    {
+    	this.optimisePermissionsBulkFetchSize = optimisePermissionsBulkFetchSize;
+    }
+    
+	private ResultSet decide(Authentication authentication, Object object, ConfigAttributeDefinition config, ResultSet returnedObject) throws AccessDeniedException
+    {
+    	ResultSet rs = optimisePermissionsCheck ? decideNew(authentication, object, config, returnedObject) :
+    			decideOld(authentication, object, config, returnedObject);
+        return rs;
+    }
+ 
+    private ResultSet decideNew(Authentication authentication, Object object, ConfigAttributeDefinition config, ResultSet returnedObject) throws AccessDeniedException
 
     {
         if (returnedObject == null)
@@ -548,7 +567,126 @@ public class ACLEntryAfterInvocationProvider implements AfterInvocationProvider,
                 {
                     filteringResultSet.setIncluded(i, true);
                 }
-                filteringResultSet.setResultSetMetaData(new SimpleResultSetMetaData(returnedObject.getResultSetMetaData().getLimitedBy(), PermissionEvaluationMode.EAGER, returnedObject.getResultSetMetaData()
+                filteringResultSet.setResultSetMetaData(new SimpleResultSetMetaData(LimitBy.FINAL_SIZE, PermissionEvaluationMode.EAGER, returnedObject.getResultSetMetaData()
+                        .getSearchParameters()));
+            }
+            else
+            {
+                for (int i = 0; i < maxSize.intValue(); i++)
+                {
+                    filteringResultSet.setIncluded(i, true);
+                }
+                filteringResultSet.setResultSetMetaData(new SimpleResultSetMetaData(LimitBy.UNLIMITED, PermissionEvaluationMode.EAGER, returnedObject.getResultSetMetaData()
+                        .getSearchParameters()));
+            }
+        }
+
+        // record the start time
+        long startTimeMillis = System.currentTimeMillis();
+        // set the default, unlimited resultset type
+        filteringResultSet.setResultSetMetaData(new SimpleResultSetMetaData(LimitBy.UNLIMITED, PermissionEvaluationMode.EAGER, returnedObject.getResultSetMetaData()
+                .getSearchParameters()));
+
+        // use the result set to do bulk loading
+        boolean oldBulkFetch = returnedObject.setBulkFetch(true);
+        int oldFetchSize = returnedObject.setBulkFetchSize(optimisePermissionsBulkFetchSize);
+
+        try
+        {
+           for (int i = 0; i < returnedObject.length(); i++)
+           {
+               long currentTimeMillis = System.currentTimeMillis();
+               if (i >= maxChecks || (currentTimeMillis - startTimeMillis) > maxCheckTime)
+               {
+                   filteringResultSet.setResultSetMetaData(new SimpleResultSetMetaData(LimitBy.NUMBER_OF_PERMISSION_EVALUATIONS, PermissionEvaluationMode.EAGER, returnedObject
+                           .getResultSetMetaData().getSearchParameters()));
+                   break;
+               }
+   
+               // All permission checks must pass
+               filteringResultSet.setIncluded(i, true);
+   
+               NodeRef nodeRef = returnedObject.getNodeRef(i);
+   
+               if (filteringResultSet.getIncluded(i) && permissionService.hasReadPermission(nodeRef) == AccessStatus.DENIED)
+               {
+                   filteringResultSet.setIncluded(i, false);
+               }
+   
+               // Bug out if we are limiting by size
+               if ((maxSize != null) && (filteringResultSet.length() > maxSize.intValue()))
+               {
+                   // Renove the last match to fix the correct size
+                   filteringResultSet.setIncluded(i, false);
+                   filteringResultSet.setResultSetMetaData(new SimpleResultSetMetaData(LimitBy.FINAL_SIZE, PermissionEvaluationMode.EAGER, returnedObject.getResultSetMetaData()
+                           .getSearchParameters()));
+                   break;
+               }
+           }
+        }
+        finally
+        {
+           // put them back to how they were
+           returnedObject.setBulkFetch(oldBulkFetch);
+           returnedObject.setBulkFetchSize(oldFetchSize);
+        }
+        
+        return filteringResultSet;
+    }
+
+
+    private ResultSet decideOld(Authentication authentication, Object object, ConfigAttributeDefinition config, ResultSet returnedObject) throws AccessDeniedException
+
+    {
+        if (returnedObject == null)
+        {
+            return null;
+        }
+
+        FilteringResultSet filteringResultSet = new FilteringResultSet(returnedObject);
+
+        List<ConfigAttributeDefintion> supportedDefinitions = extractSupportedDefinitions(config);
+
+        Integer maxSize = null;
+        if (returnedObject.getResultSetMetaData().getSearchParameters().getMaxItems() >= 0)
+        {
+            maxSize = new Integer(returnedObject.getResultSetMetaData().getSearchParameters().getMaxItems());
+        }
+        if ((maxSize == null) && (returnedObject.getResultSetMetaData().getSearchParameters().getLimitBy() == LimitBy.FINAL_SIZE))
+        {
+            maxSize = new Integer(returnedObject.getResultSetMetaData().getSearchParameters().getLimit());
+        }
+        // Allow for skip
+        if ((maxSize != null) && (returnedObject.getResultSetMetaData().getSearchParameters().getSkipCount() >= 0))
+        {
+            maxSize = new Integer(maxSize + returnedObject.getResultSetMetaData().getSearchParameters().getSkipCount());
+        }
+
+        int maxChecks = maxPermissionChecks;
+        if (returnedObject.getResultSetMetaData().getSearchParameters().getMaxPermissionChecks() >= 0)
+        {
+            maxChecks = returnedObject.getResultSetMetaData().getSearchParameters().getMaxPermissionChecks();
+        }
+
+        long maxCheckTime = maxPermissionCheckTimeMillis;
+        if (returnedObject.getResultSetMetaData().getSearchParameters().getMaxPermissionCheckTimeMillis() >= 0)
+        {
+            maxCheckTime = returnedObject.getResultSetMetaData().getSearchParameters().getMaxPermissionCheckTimeMillis();
+        }
+
+        if (supportedDefinitions.size() == 0)
+        {
+            if (maxSize == null)
+            {
+                return returnedObject;
+            }
+            else if (returnedObject.length() > maxSize.intValue())
+            {
+                for (int i = 0; i < maxSize.intValue(); i++)
+                {
+                    filteringResultSet.setIncluded(i, true);
+                }
+                filteringResultSet.setResultSetMetaData(new SimpleResultSetMetaData(LimitBy.FINAL_SIZE, PermissionEvaluationMode.EAGER, returnedObject.getResultSetMetaData()
                         .getSearchParameters()));
                 return filteringResultSet;
             }
@@ -610,7 +748,7 @@ public class ACLEntryAfterInvocationProvider implements AfterInvocationProvider,
             // Bug out if we are limiting by size
             if ((maxSize != null) && (filteringResultSet.length() > maxSize.intValue()))
             {
-                // Renove the last match to fix the correct size
+                // Remove the last match to fix the correct size
                 filteringResultSet.setIncluded(i, false);
                 filteringResultSet.setResultSetMetaData(new SimpleResultSetMetaData(LimitBy.FINAL_SIZE, PermissionEvaluationMode.EAGER, returnedObject.getResultSetMetaData()
                         .getSearchParameters()));
diff --git a/source/java/org/alfresco/repo/security/permissions/impl/acegi/FilteringResultSet.java b/source/java/org/alfresco/repo/security/permissions/impl/acegi/FilteringResultSet.java
index 748f409fea..7f8156451a 100644
--- a/source/java/org/alfresco/repo/security/permissions/impl/acegi/FilteringResultSet.java
+++ b/source/java/org/alfresco/repo/security/permissions/impl/acegi/FilteringResultSet.java
@@ -280,4 +280,43 @@ public class FilteringResultSet extends ACLEntryAfterInvocationProvider implemen
         throw new UnsupportedOperationException();
     }
 
+    /**
+     * Bulk fetch results in the cache
+     * 
+     * @param bulkFetch
+     */
+    public boolean setBulkFetch(boolean bulkFetch)
+    {
+    	return unfiltered.setBulkFetch(bulkFetch);
+    }
+
+    /**
+     * Do we bulk fetch
+     * 
+     * @return - true if we do
+     */
+    public boolean getBulkFetch()
+    {
+        return unfiltered.getBulkFetch();
+    }
+
+    /**
+     * Set the bulk fetch size
+     * 
+     * @param bulkFetchSize
+     */
+    public int setBulkFetchSize(int bulkFetchSize)
+    {
+    	return unfiltered.setBulkFetchSize(bulkFetchSize);
+    }
+
+    /**
+     * Get the bulk fetch size.
+     * 
+     * @return the fetch size
+     */
+    public int getBulkFetchSize()
+    {
+        return unfiltered.getBulkFetchSize();
+    }
 }
diff --git a/source/java/org/alfresco/repo/security/permissions/impl/model/PermissionModel.java b/source/java/org/alfresco/repo/security/permissions/impl/model/PermissionModel.java
index ce653e5d02..0ad6a0d93a 100644
--- a/source/java/org/alfresco/repo/security/permissions/impl/model/PermissionModel.java
+++ b/source/java/org/alfresco/repo/security/permissions/impl/model/PermissionModel.java
@@ -20,9 +20,11 @@ package org.alfresco.repo.security.permissions.impl.model;
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.Serializable;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.EnumMap;
+import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.LinkedHashSet;
@@ -32,6 +34,7 @@ import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.locks.ReadWriteLock;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 
+import org.alfresco.repo.cache.SimpleCache;
 import org.alfresco.repo.security.permissions.PermissionEntry;
 import org.alfresco.repo.security.permissions.PermissionReference;
 import org.alfresco.repo.security.permissions.impl.ModelDAO;
@@ -48,6 +51,7 @@ import org.alfresco.service.cmr.security.PermissionService;
 import org.alfresco.service.namespace.DynamicNamespacePrefixResolver;
 import org.alfresco.service.namespace.NamespaceService;
 import org.alfresco.service.namespace.QName;
+import org.alfresco.util.Pair;
 import org.dom4j.Attribute;
 import org.dom4j.Document;
 import org.dom4j.DocumentException;
@@ -127,6 +131,11 @@ public class PermissionModel extends AbstractLifecycleBean implements ModelDAO
 
     private Collection<QName> allAspects;
 
+    private ConcurrentHashMap<RequiredKey, Set<PermissionReference>> requiredPermissionsCache = new ConcurrentHashMap<RequiredKey, Set<PermissionReference>>(1024);
+    private PermissionGroup group;
+    
+    private ConcurrentHashMap<Pair<PermissionReference, RequiredPermission.On>, Set<PermissionReference>> unconditionalRequiredPermissionsCache = new ConcurrentHashMap<Pair<PermissionReference, RequiredPermission.On>, Set<PermissionReference>>(1024);
+    
     /**
      * Default constructor
      */
@@ -257,7 +266,7 @@ public class PermissionModel extends AbstractLifecycleBean implements ModelDAO
 
         allAspects = dictionaryService.getAllAspects();
     }
-
+    
     /*
      * Create the XML document from the file location
      */
@@ -1051,10 +1060,6 @@ public class PermissionModel extends AbstractLifecycleBean implements ModelDAO
 
     }
 
-    private ConcurrentHashMap<RequiredKey, Set<PermissionReference>> requiredPermissionsCache = new ConcurrentHashMap<RequiredKey, Set<PermissionReference>>(1024);
-
-    private PermissionGroup group;
-
     public Set<PermissionReference> getRequiredPermissions(PermissionReference required, QName qName, Set<QName> aspectQNames, RequiredPermission.On on)
     {
         // Cache lookup as this is static
@@ -1083,6 +1088,33 @@ public class PermissionModel extends AbstractLifecycleBean implements ModelDAO
         return answer;
     }
 
+    public Set<PermissionReference> getUnconditionalRequiredPermissions(PermissionReference required, RequiredPermission.On on)
+    {
+        // Cache lookup as this is static
+        if(required == null)
+        {
+            return Collections.<PermissionReference>emptySet();
+        }
+        Pair<PermissionReference, RequiredPermission.On> key = new Pair<PermissionReference, RequiredPermission.On>(required, on);
+
+        Set<PermissionReference> answer = unconditionalRequiredPermissionsCache.get(key);
+        if (answer == null)
+        {
+            PermissionGroup pg = getBasePermissionGroupOrNull(getPermissionGroupOrNull(required));
+            if (pg == null)
+            {
+                answer = getRequirementsForPermission(required, on);
+            }
+            else
+            {
+                answer = getUnconditionalRequirementsForPermissionGroup(pg, on);
+            }
+            answer = Collections.unmodifiableSet(answer);
+            unconditionalRequiredPermissionsCache.put(key, answer);
+        }
+        return answer;
+    }
+    
     /**
      * Get the requirements for a permission
      * 
@@ -1155,6 +1187,45 @@ public class PermissionModel extends AbstractLifecycleBean implements ModelDAO
         return requiredPermissions;
     }
 
+    private Set<PermissionReference> getUnconditionalRequirementsForPermissionGroup(PermissionGroup target, RequiredPermission.On on)
+    {
+        HashSet<PermissionReference> requiredPermissions = new HashSet<PermissionReference>(16, 1.0f);
+        if (target == null)
+        {
+            return requiredPermissions;
+        }
+        for (PermissionSet ps : permissionSets.values())
+        {
+            for (PermissionGroup pg : ps.getPermissionGroups())
+            {
+                PermissionGroup base = getBasePermissionGroupOrNull(pg);
+                if ((target.equals(base) || target.isAllowFullControl()) && (!base.isTypeRequired()))
+                {
+                    // Add includes
+                    for (PermissionReference pr : pg.getIncludedPermissionGroups())
+                    {
+                        requiredPermissions.addAll(getUnconditionalRequirementsForPermissionGroup(getBasePermissionGroupOrNull(getPermissionGroupOrNull(pr)), on));
+                    }
+                }
+            }
+            for (Permission p : ps.getPermissions())
+            {
+                for (PermissionReference grantedTo : p.getGrantedToGroups())
+                {
+                    PermissionGroup base = getBasePermissionGroupOrNull(getPermissionGroupOrNull(grantedTo));
+                    if ((target.equals(base) || target.isAllowFullControl()) && (!base.isTypeRequired()))
+                    {
+                        if (on == RequiredPermission.On.NODE)
+                        {
+                            requiredPermissions.add(p);
+                        }
+                    }
+                }
+            }
+        }
+        return requiredPermissions;
+    }
+    
     /**
      * Check type specifc extension of permission sets.
      * 
diff --git a/source/java/org/alfresco/repo/security/permissions/noop/PermissionServiceNOOPImpl.java b/source/java/org/alfresco/repo/security/permissions/noop/PermissionServiceNOOPImpl.java
index cc14ed3f84..35d42d1b93 100644
--- a/source/java/org/alfresco/repo/security/permissions/noop/PermissionServiceNOOPImpl.java
+++ b/source/java/org/alfresco/repo/security/permissions/noop/PermissionServiceNOOPImpl.java
@@ -283,6 +283,18 @@ public class PermissionServiceNOOPImpl
     {
         return new SimpleNodePermissionEntry(null, true, Collections.<PermissionEntry>emptyList());
     }
-    
-    
+
+    /* (non-Javadoc)
+     * @see org.alfresco.service.cmr.security.PermissionService#canRead(java.lang.Long)
+     */
+    public AccessStatus hasReadPermission(NodeRef nodeRef)
+    {
+        return AccessStatus.ALLOWED;
+    }
+
+	@Override
+	public Set<String> getAuthorisations() {
+		// TODO Auto-generated method stub
+		return new HashSet<String>();
+	}
 }
diff --git a/source/java/org/alfresco/repo/version/NodeServiceImpl.java b/source/java/org/alfresco/repo/version/NodeServiceImpl.java
index dd71b7794b..4a6bf59c17 100644
--- a/source/java/org/alfresco/repo/version/NodeServiceImpl.java
+++ b/source/java/org/alfresco/repo/version/NodeServiceImpl.java
@@ -51,6 +51,7 @@ import org.alfresco.service.cmr.search.SearchService;
 import org.alfresco.service.namespace.QName;
 import org.alfresco.service.namespace.QNamePattern;
 import org.alfresco.service.namespace.RegexQNamePattern;
+import org.alfresco.util.Pair;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -692,4 +693,12 @@ public class NodeServiceImpl implements NodeService, VersionModel
     {
         throw new UnsupportedOperationException(MSG_UNSUPPORTED);
     }        
+
+    /**
+     * Gets, converts and adds the intrinsic properties to the current node's properties
+     */
+    public Long getNodeAclId(NodeRef nodeRef) throws InvalidNodeRefException
+    {
+        throw new UnsupportedOperationException(MSG_UNSUPPORTED);
+    }
 }