Merged V2.1 to HEAD

6846: used ] instead of } in ${ldap.synchronisation.userIdAttributeName]
   6856: Fixed 2 NPEs, one reported by MIT and one found by Jan (WCM-835)
   6859: Truncate an existing file when uploading via FTP. WCM-836.
   6869: Removed temporary files and folders from deploy-installer project
   6870: Updated ignore property
   6875: Fix for AWC-1605
   6878: Fix for AWC-1587
   6880: Fix for French language pack - locked_user message
   6883: Fix for AWC-1565
   6884: Relax trhe permissions required to get the parent links from a child node
   6891: Fix for AR-1781 and AR-1782 (requires CHK-1451)
   6892: Fixed AR-1777: Node status not updated for addition and removal of secondary associations (affects index tracking)
   6893: Sample for replicating content store sample
   6896: Added JVM shutdown check into inner loop to get faster breakout in the event of shutdown.


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

source/java/org/alfresco/repo/node/db/DbNodeServiceImpl.java

@@ -832,6 +832,9 @@ public class DbNodeServiceImpl extends AbstractNodeServiceImpl
 
         // Invoke policy behaviours
         invokeOnCreateChildAssociation(assocRef, false);
+
+        // update the node status
+        nodeDaoService.recordChangeId(childNodeRef);
         
         return assoc.getChildAssocRef();
     }
@@ -872,6 +875,12 @@ public class DbNodeServiceImpl extends AbstractNodeServiceImpl
         {
             deleteNode(primaryAssocRef.getChildRef());
         }
+        else
+        {
+            // The cascade delete will update the node status, but just a plain assoc deletion will not
+            // Update the node status
+            nodeDaoService.recordChangeId(childRef);
+        }
 
         // done
     }
@@ -888,6 +897,8 @@ public class DbNodeServiceImpl extends AbstractNodeServiceImpl
         if (deleted)
         {
             invokeOnDeleteChildAssociation(childAssocRef);
+            // Update the node status
+            nodeDaoService.recordChangeId(childNode.getNodeRef());
         }
         // Done
         return deleted;
@@ -914,6 +925,8 @@ public class DbNodeServiceImpl extends AbstractNodeServiceImpl
         // Delete the secondary association
         nodeDaoService.deleteChildAssoc(assoc, false);
         invokeOnDeleteChildAssociation(childAssocRef);
+        // Update the node status
+        nodeDaoService.recordChangeId(childNode.getNodeRef());
         // Done
         return true;
     }