Merged DEV to HEAD:

54373: MNT-2641 : User can delete or move a working copy
   54469: Compilation fix for MNT-2641 test
   54470: Removed thousands of tabs
   54523: Fixed ALF-19843: Integrity checking does not enforce mandatory aspects on aspects
   54525: Pull IntegrityChecker properties into property file (ALF-19843)
   54527: Fixed Eclipse warning about potentially unclosed file
   54528: Prevent cm:workingcopy aspect from being removed directly (MNT-2641)
   54529: Nail down behaviour around cm:workingcopy


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

source/java/org/alfresco/repo/admin/patch/impl/CopiedFromAspectPatch.java

@@ -229,6 +229,7 @@ public class CopiedFromAspectPatch extends AbstractPatch
         }
         finally
         {
+            try { outputFile.close(); } catch (IOException e) {}
             try { file.close(); } catch (IOException e) {}
         }
     }

source/java/org/alfresco/repo/coci/WorkingCopyAspect.java

@@ -21,6 +21,7 @@ package org.alfresco.repo.coci;
 
 import java.io.Serializable;
 import java.util.Collections;
+import java.util.List;
 import java.util.Map;
 
 import org.alfresco.model.ContentModel;
@@ -34,12 +35,13 @@ import org.alfresco.repo.policy.JavaBehaviour;
 import org.alfresco.repo.policy.PolicyComponent;
 import org.alfresco.service.cmr.coci.CheckOutCheckInService;
 import org.alfresco.service.cmr.lock.LockService;
+import org.alfresco.service.cmr.repository.AssociationRef;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.repository.NodeService;
 import org.alfresco.service.namespace.QName;
 import org.alfresco.util.GUID;
 
-public class WorkingCopyAspect implements CopyServicePolicies.OnCopyNodePolicy
+public class WorkingCopyAspect implements CopyServicePolicies.OnCopyNodePolicy, NodeServicePolicies.OnRemoveAspectPolicy
 {    
     private PolicyComponent policyComponent;
     private NodeService nodeService;
@@ -117,7 +119,12 @@ public class WorkingCopyAspect implements CopyServicePolicies.OnCopyNodePolicy
                 NodeServicePolicies.BeforeDeleteNodePolicy.QNAME,
                 ContentModel.ASPECT_WORKING_COPY,
                 new JavaBehaviour(this, "beforeDeleteWorkingCopy"));
-        // register onBeforeDelete class behaviour for the checked-out aspect
+        
+        // Watch for removal of the aspect and ensure that the cm:workingcopylink assoc is removed
+        this.policyComponent.bindClassBehaviour(
+                NodeServicePolicies.OnRemoveAspectPolicy.QNAME,
+                ContentModel.ASPECT_WORKING_COPY,
+                new JavaBehaviour(this, "onRemoveAspect"));
     }
     
     /**
@@ -143,6 +150,13 @@ public class WorkingCopyAspect implements CopyServicePolicies.OnCopyNodePolicy
         }
     }
     
+    @Override
+    public void onRemoveAspect(NodeRef nodeRef, QName aspectTypeQName)
+    {
+        // This is simply not allowed.
+        throw new UnsupportedOperationException("Use CheckOutCheckInservice to manipulate working copies.");
+    }
+
     /**
      * @return              Returns {@link WorkingCopyAspectCopyBehaviourCallback}
      */

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

@@ -18,6 +18,7 @@
  */
 package org.alfresco.repo.node.integrity;
 
+import java.util.Collections;
 import java.util.List;
 import java.util.Set;
 
@@ -77,7 +78,9 @@ public class AspectsIntegrityEvent extends AbstractIntegrityEvent
         QName nodeTypeQName = nodeService.getType(nodeRef);
         // get the aspects that should exist
         TypeDefinition typeDef = dictionaryService.getType(nodeTypeQName);
-        List<AspectDefinition> mandatoryAspectDefs = typeDef.getDefaultAspects();
+        List<AspectDefinition> mandatoryAspectDefs = (typeDef == null)
+                ? Collections.<AspectDefinition>emptyList()
+                : typeDef.getDefaultAspects();
         
         // check
         for (AspectDefinition aspect : mandatoryAspectDefs)
@@ -96,6 +99,32 @@ public class AspectsIntegrityEvent extends AbstractIntegrityEvent
             // next one
             continue;
         }
+        
+        // Now, each aspect's mandatory aspects have to be checked
+        for (QName aspectQName : aspects)
+        {
+            AspectDefinition aspectDef = dictionaryService.getAspect(aspectQName);
+            mandatoryAspectDefs = (aspectDef == null)
+                    ? Collections.<AspectDefinition>emptyList()
+                    : aspectDef.getDefaultAspects();
+            for (AspectDefinition aspect : mandatoryAspectDefs)
+            {
+                if (aspects.contains(aspect.getName()))
+                {
+                    // it's fine
+                    continue;
+                }
+                IntegrityRecord result = new IntegrityRecord(
+                        "Mandatory aspect (aspect-declared) not set: \n" +
+                        "   Node:    " + nodeRef + "\n" +
+                        "   Aspect:  " + aspectQName + "\n" +
+                        "   Missing: " + aspect.getName());
+                eventResults.add(result);
+                // next one
+                continue;
+            }
+        }
+        
         // done
     }
 }