Merged V3.4-BUG-FIX to HEAD

29870: ALF-9952: Compatibility fix to allow mounting of Alfresco WebDAV as a network drive on Windows XP (without WebDrive)
   29872: Fixed ALF-7698 "Defects in tags picker in SHARE."
   - now checks added items to avoid duplicates
   29873: Made sure the onActionDetails doclib action generates SimpleDialog instance ids each time, to avoid multiple js class instances with the same id getting called for every dialog created.
   29878: ALF-9378: Use caching plus a read write lock, in a similar manner to ALF-7064, to avoid contention in SubsystemProxyFactory under load
   29881: Added helper text for the translators to the property file.
   29910: ALF-7433: a file deleted using the web UI still appears in a NFS mount but with NULL stats
   - timestamp propagation now enabled by default so NFS always works
   - timestamp propagation less agressive - only has to propagate on adds / deletes and renames
   29911: Values for recurrence strings updated now that I've read RFC-2445
   29944: ALF-9988: Merged PATCHES/V3.3.4 to V3.4-BUG-FIX
      28581: ALF-8944: Corrected sort parameter handling for datetime fields, based on analyzer and tokenization mode
   29955: Fixed ALF-9965: Property names matching fails if the property contains non Alphanumeric characters
   29956: Fixed ALF-9424: Webform(XSD): xf:switch switch group does not work based on "complexContent with Base" element.
   29964: Fixed ALF-9089: TinyMCE convert_fonts_to_spans parameter is not being picked up in Web Forms
   29977: L10N Updates from Gloria (based on rev29838).
   29980: Ignore virtual tomcat directory
   29981: Merged BRANCHES/DEV/BELARUS/V3.4-BUG-FIX-2011_08_19 to BRANCHES/DEV/V3.4-BUG-FIX 
       ALF-6808 : Incorrect Search Language Conversion for wild card characters (%, _) for MS SQL 
   29984: ALF-4753: Fix search query escaping in Alfresco Explorer
   - AWC-1743 / CHK-2171 fix restored
   29993: Merged DEV/TEMPORARY to V3.4-BUG-FIX
      29989: ALF-9976: WebDAV Class 2 compliance issue with OPTIONS response.
         Class 2 incompliance connected with absence of 'PROPPATCH' method in the 'Allow' response header has been fixed
   30009: ALF-7239 : Documents from Records Manager cannot be viewed in Outlook   
   30012: Merged BRANCHES/DEV/BELARUS/V3.4-BUG-FIX-2011_08_19 to BRANCHES/DEV/V3.4-BUG-FIX:
      29986: ALF-7105: pdfbox returns errors in the logs but one cannot understand what file is affected (PDFBox)
   30014: ALF-6284: Fix for Share Kerberos SSO Websphere compatibility (by Pavel)
   30016: Merged DEV to V3.4-BUG-FIX
      29424: ALF-8715: NFS: Admin sometimes cannot edit content uploaded via JSF
             Fix for "Can't open file for writing" during saving file in VI-like editors connected with FileExpiry daemon:
             - 'getNodeOrNull()' method extracted to get and check on existence of the cached file object
                and then update cache timeout or remove it from the cache;
             - 'getNodeForPath()' was appropriately updated in accordance with logic extracted to 'getNodeOrNull()';
             - 'fileExists()' method was corrected to take into account existence of the cached file object 
   30017: Reverses an accidental check in made with the last L10N bundle update (r29977)
   30045: ALF-8664 - Custom 'mandatory' RM metadata causes editing issues   
   30053: ALF-9681: webScriptsRegistryCache size in ehcache-default.xml   
      webScriptsRegistryCache maxElementsInMemory size was incremented up to 1000
   30079: ALF-10027: Fix template alfresco-global.properties for custom tomcat ports
   - Obselete web.application.context.url removed
   - alfresco.host, alfresco.port, share.host and share.port added
   30080: Fixed parse error mentioned in ALF-9511 "RSS Feeds with HTTP Auth doesn't work with Feed dashlet"
    - In java regexps the . (dot) does NOT include the \r or \n by default, to change that a (?s) instruction was added in the beginning of the regexp
   30083: Fixed ALF-10048 "Multiple thumbnails in RSS feeds causes problem for RSS Feed dashlet"
   30088: ALF-7433: Fix unit test fallout from new timestamp propagation behaviour
   30089: ALF-7433: Further unit test fallout from new timestamp propagation behaviour
   - testPermissionsAndPolicies needs to get folder modification date in a distinct transaction after populating it
   30091: ALF-10050: CIFS: Coordinator is unable to delete content after IMAP has been enabled
   - Transactional cache null entry issue
   30096: ALF-9793: Allow auto-created NFS authenticated users to work
   - Also removed admin from default mappings to avoid security hole
   30102: ALF-8723 CIFS on Windows fails to start under certain conditions
      - Found another place >= was required rather than just >
   30104: ALF-9890 SiteService is not producing audit data.
      - Internal siteService rather than public SiteService was being used, so there was no audit advice.
   30119: ALF-9793: Fallout from previous fix. Prevent initialization error when there are no user mappings and NFS is not enabled.
   30120: ALF-9526: Work around the fact that Websphere ignores the response encoding unless you call response.setCharacterEncoding()
   - GlobalLocalizationFilter inserts a response wrapper that parses the charset parameter from the content type header, if it is present
   30121: ALF-9535: Alfresco ignores Accept-Language sent from Share
   - Ticket and webscript authentication (i.e. Share requests) will use the language set in request headers as the session language
   30130: ALF-10049: Fix by Andrey to enable Flash upload on Weblogic!
   30141: ALF-8732 Now if the adhoc workflow throws exceptions while sending a notification email then those exceptions are ignored.
   30226: ALF-9415: JSF - Copy/Paste vs Cut/Paste add aspect rule.
   30242: Added NodeService.getNodeRef(Long nodeId)
    - First step to remove Lucene search from inbound email server
    - Done while investigating ALF-9660
   30243: Fixed ALF-9660: Inbound emails are always stored with encoding=UTF-8 regardless the encoding the email client uses.
    - If the encoding is provided, then it is not guessed
    - Includes tweak to remove Lucene search and rather use direct node ID-NodeRef translation provided by NodeService
   30263: Incremented version revision
   30264: ALF-10187: Merged V3.3 to V3.4-BUG-FIX
      30003: ALF-9898: More defensive exception handling to avoid packet pool leaks and extra logging on packet pool exhaustion
   30265: Merged V3.4 to V3.4-BUG-FIX
      30259: ALF-6527 LangPack FR - [Search results' page] Incorrect label when search matches results
        - Added "(s)" to "trouvé(s) dans l'entrepôt."   (for a repository search - found in retest)
        - The original change:
          Added "(s)" to "trouvé(s) dans tous les sites."   (for an All Sites search)
          
          However this leaves the current site search. As a result I also:
          Added "(s)" to "trouvé(s) dans le site {0}."  (for a current Site search)
          and checked with a French speaker that this would sound correct.
          
          Note: all three labels are prefixed by a separate text label: "N résultat(s) "
      30261: (RECORD ONLY) Merged V3.4-BUG-FIX to V3.4 (3.4.5)
      30262: ALF-10186: Merged PATCHES/V3.4.1 to V3.4
         30126: ALF-10075: Concurrency during CMIS document update causes content stream to close prematurely.
            - Created BufferedRequest request wrapper in RepositoryContainer
            - If the content stream is accessed directly it is streamed to a temporary file so that requests can be retried
         30137: ALF-10075: Fixed NPE


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

source/java/org/alfresco/repo/domain/node/AbstractNodeDAOImpl.java

@@ -1143,9 +1143,6 @@ public abstract class AbstractNodeDAOImpl implements NodeDAO, BatchingDAO
             {
                 Long oldParentNodeId = primaryParentAssoc.getParentNode().getId();
                 oldParentAclId = getNodeNotNull(oldParentNodeId).getAclId();
-                
-                // Update the parent node, if required
-                propagateTimestamps(childNodeId);
             }
         }
         
@@ -1192,12 +1189,12 @@ public abstract class AbstractNodeDAOImpl implements NodeDAO, BatchingDAO
             childNodeUpdate.setUpdateDeleted(true);
             // Update the entity.
             // Note: We don't use delete here because that will attempt to clean everything up again.
-            updateNodeImpl(childNode, childNodeUpdate);
+            updateNodeImpl(childNode, childNodeUpdate, true);
         }
         else
         {
             // Ensure that the child node reflects the current txn and auditable data
-            touchNodeImpl(childNodeId);
+            touchNodeImpl(childNodeId, true);
             
             // The moved node's reference has not changed, so just remove the cache entry to
             // it's immediate parent.  All children of the moved node will still point to the
@@ -1263,7 +1260,7 @@ public abstract class AbstractNodeDAOImpl implements NodeDAO, BatchingDAO
     }
     
     @Override
-    public void updateNode(Long nodeId, QName nodeTypeQName, Locale nodeLocale)
+    public void updateNode(Long nodeId, QName nodeTypeQName, Locale nodeLocale, boolean propagate)
     {
         // Get the existing node; we need to check for a change in store or UUID
         Node oldNode = getNodeNotNull(nodeId);
@@ -1304,13 +1301,13 @@ public abstract class AbstractNodeDAOImpl implements NodeDAO, BatchingDAO
             nodeUpdate.setUpdateLocaleId(true);
         }
 
-        updateNodeImpl(oldNode, nodeUpdate);
+        updateNodeImpl(oldNode, nodeUpdate, propagate);
     }
     
     /**
      * Updates the node's transaction and <b>cm:auditable</b> properties only.
      */
-    private void touchNodeImpl(Long nodeId)
+    private void touchNodeImpl(Long nodeId, boolean propagate)
     {
         Node node = null;
         try
@@ -1326,7 +1323,7 @@ public abstract class AbstractNodeDAOImpl implements NodeDAO, BatchingDAO
         NodeUpdateEntity nodeUpdate = new NodeUpdateEntity();
         nodeUpdate.setId(nodeId);
         // Update it
-        updateNodeImpl(node, nodeUpdate);
+        updateNodeImpl(node, nodeUpdate, propagate);
     }
     
     /**
@@ -1338,9 +1335,9 @@ public abstract class AbstractNodeDAOImpl implements NodeDAO, BatchingDAO
      * 
      * @param oldNode               the existing node, fully populated
      * @param nodeUpdate            the node update with all update elements populated
-     * @return                      the updated node ID and reference
+     * @param propagate             should this update be propagated to parent audit properties?
      */
-    private void updateNodeImpl(Node oldNode, NodeUpdateEntity nodeUpdate)
+    private void updateNodeImpl(Node oldNode, NodeUpdateEntity nodeUpdate, boolean propagate)
     {
         Long nodeId = oldNode.getId();
         
@@ -1456,7 +1453,7 @@ public abstract class AbstractNodeDAOImpl implements NodeDAO, BatchingDAO
         }
 
         // Ensure that cm:auditable values are propagated, if required
-        if (enableTimestampPropagation &&
+        if (propagate && enableTimestampPropagation &&
                 nodeUpdate.isUpdateAuditableProperties() &&
                 nodeUpdate.getAuditableProperties() != null)
         {
@@ -1606,7 +1603,7 @@ public abstract class AbstractNodeDAOImpl implements NodeDAO, BatchingDAO
         nodeUpdateEntity.setId(nodeId);
         nodeUpdateEntity.setAclId(aclId);
         nodeUpdateEntity.setUpdateAclId(true);
-        updateNodeImpl(oldNode, nodeUpdateEntity);
+        updateNodeImpl(oldNode, nodeUpdateEntity, true);
     }
     
     public void setPrimaryChildrenSharedAclId(
@@ -2015,7 +2012,7 @@ public abstract class AbstractNodeDAOImpl implements NodeDAO, BatchingDAO
         // Touch to bring into current transaction
         if (updated)
         {
-            updateNodeImpl(node, nodeUpdate);
+            updateNodeImpl(node, nodeUpdate, propsToAdd.containsKey(ContentModel.PROP_NAME));
         }
         
         // Done
@@ -2083,7 +2080,7 @@ public abstract class AbstractNodeDAOImpl implements NodeDAO, BatchingDAO
             cachedProps.keySet().removeAll(propertyQNames);
             setNodePropertiesCached(nodeId, cachedProps);
             // Touch to bring into current txn
-            touchNodeImpl(nodeId);
+            touchNodeImpl(nodeId, propertyQNames.contains(ContentModel.PROP_NAME));
         }
         // Done
         return deleteCount > 0;
@@ -2241,7 +2238,7 @@ public abstract class AbstractNodeDAOImpl implements NodeDAO, BatchingDAO
         }
 
         // Touch to bring into current txn
-        touchNodeImpl(nodeId);
+        touchNodeImpl(nodeId, false);
         
         // Done
         return true;
@@ -2263,7 +2260,7 @@ public abstract class AbstractNodeDAOImpl implements NodeDAO, BatchingDAO
         aspectsCache.setValue(nodeId, Collections.<QName>emptySet());
 
         // Touch to bring into current txn
-        touchNodeImpl(nodeId);
+        touchNodeImpl(nodeId, false);
         
         // Done
         return deleteCount > 0;
@@ -2289,7 +2286,7 @@ public abstract class AbstractNodeDAOImpl implements NodeDAO, BatchingDAO
         }
         
         // Touch to bring into current txn
-        touchNodeImpl(nodeId);
+        touchNodeImpl(nodeId, false);
         
         // Done
         return deleteCount > 0;
@@ -2367,7 +2364,7 @@ public abstract class AbstractNodeDAOImpl implements NodeDAO, BatchingDAO
         }
         
         // Touch to bring into current txn and ensure concurrency is maintained on the nodes
-        touchNodeImpl(sourceNodeId);
+        touchNodeImpl(sourceNodeId, false);
 
         // Resolve type QName
         Long assocTypeQNameId = qnameDAO.getOrCreateQName(assocTypeQName).getFirst();
@@ -2413,7 +2410,7 @@ public abstract class AbstractNodeDAOImpl implements NodeDAO, BatchingDAO
             return 0;
         }
         // Touch to bring into current txn
-        touchNodeImpl(sourceNodeId);
+        touchNodeImpl(sourceNodeId, false);
 
         Long assocTypeQNameId = assocTypeQNamePair.getFirst();
         return deleteNodeAssoc(sourceNodeId, targetNodeId, assocTypeQNameId);
@@ -2422,7 +2419,7 @@ public abstract class AbstractNodeDAOImpl implements NodeDAO, BatchingDAO
     public int removeNodeAssocsToAndFrom(Long nodeId)
     {
         // Touch to bring into current txn
-        touchNodeImpl(nodeId);
+        touchNodeImpl(nodeId, false);
 
         return deleteNodeAssocsToAndFrom(nodeId);
     }
@@ -2436,7 +2433,7 @@ public abstract class AbstractNodeDAOImpl implements NodeDAO, BatchingDAO
             return 0;
         }
         // Touch to bring into current txn
-        touchNodeImpl(nodeId);
+        touchNodeImpl(nodeId, false);
 
         return deleteNodeAssocsToAndFrom(nodeId, assocTypeQNameIds);
     }
@@ -2604,7 +2601,7 @@ public abstract class AbstractNodeDAOImpl implements NodeDAO, BatchingDAO
         // node into the current transaction for secondary associations
         if (!isPrimary)
         {
-            updateNode(childNodeId, null, null);
+            updateNode(childNodeId, null, null, true);
         }
         
         // Done