Merge V3.2 to HEAD

19453: Merged BRANCHES/DEV/BELARUS/V3.2-2010_03_17 to BRANCHES/V3.2: 
      19407: ALF-254: empty files (0 bytes) do not trigger content rules 
         - Some Javadoc cleanup added    
   19601: Follow-up fix for ALF-254: Empty files (0 bytes) do not trigger content rules 
      - CIFS uses 'sys:noContent' instead of 'sys:temporary'; the latter has other behaviour attached



git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@19639 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Roy Wetherall
2010-03-29 13:27:36 +00:00
parent eaccdd978b
commit 28f113a0a3
7 changed files with 24 additions and 10 deletions

View File

@@ -26,9 +26,6 @@ import org.alfresco.repo.content.ContentStore;
import org.alfresco.repo.transaction.AlfrescoTransactionSupport;
import org.alfresco.repo.transaction.TransactionListenerAdapter;
import org.alfresco.repo.transaction.TransactionalResourceHelper;
import org.alfresco.service.cmr.repository.ContentData;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.namespace.QName;
import org.alfresco.util.PropertyCheck;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -69,13 +66,11 @@ public class EagerContentStoreCleaner extends TransactionListenerAdapter
{
/**
* Content URLs to delete once the transaction commits.
* @see #onContentPropertyUpdate(NodeRef, QName, ContentData, ContentData)
* @see #afterCommit()
*/
private static final String KEY_POST_COMMIT_DELETION_URLS = "ContentStoreCleaner.PostCommitDeletionUrls";
/**
* Content URLs to delete if the transaction rolls b ack.
* @see #onContentPropertyUpdate(NodeRef, QName, ContentData, ContentData)
* Content URLs to delete if the transaction rolls back.
* @see #afterRollback()
*/
private static final String KEY_POST_ROLLBACK_DELETION_URLS = "ContentStoreCleaner.PostRollbackDeletionUrls";