Merged V2.2 to HEAD

10963: Merged DEV/LARGE_COLLECTION_PROPERTIES_2.2.1 to V2.2
          - PersonService: Lucene removal
          - Lucene optimizations (in progress)
          - Multi-valued and locale-specific properties persisted in alf_node_properties
          - Removal of unused AVM tables
   10987: Oracle dialects and enhanced SQL patch support
          - Only support Alfresco's 9i and 10g dialects (with auto-switching)
          - SQL script patches can now apply selectively to ranges
   11007: Test to check cached retrieval of QNames


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

source/java/org/alfresco/repo/node/integrity/PropertiesIntegrityEvent.java

@@ -30,6 +30,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
+import org.alfresco.model.ContentModel;
 import org.alfresco.service.cmr.dictionary.AspectDefinition;
 import org.alfresco.service.cmr.dictionary.Constraint;
 import org.alfresco.service.cmr.dictionary.ConstraintDefinition;
@@ -102,6 +103,17 @@ public class PropertiesIntegrityEvent extends AbstractIntegrityEvent
         Set<QName> aspectTypeQNames = nodeService.getAspects(nodeRef);
         for (QName aspectTypeQName : aspectTypeQNames)
         {
+            // Shortcut sys:referencable
+            if (aspectTypeQName.equals(ContentModel.ASPECT_REFERENCEABLE))
+            {
+                continue;
+            }
+            // Shortcut cm:auditable
+            if (aspectTypeQName.equals(ContentModel.ASPECT_AUDITABLE))
+            {
+                continue;
+            }
+            
             // get property definitions for the aspect
             AspectDefinition aspectDef = dictionaryService.getAspect(aspectTypeQName);
             propertyDefs = aspectDef.getProperties().values();