inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged V3.2 to HEAD

Browse Source 
17574: Merged in DEV work for ContentStoreCleaner: ETHREEOH-2813
      17432: Build up for fix of ETHREEOH-2813: ContentStoreCleaner doesn't scale
      17546: ContentStoreCleaner fixes and further tests
      17524: Unit tests and bulk queries for orphaned content
      17506: W.I.P. for content cleaner for V3.2: ETHREEOH-2813
   17575: Missed check-in (other DB create scripts look OK)
   17577: Re-activated 'contentStoreCleanerTrigger'
          - Added system property: system.content.orphanCleanup.cronExpression=0 0 4 * * ?
          - Other useful properties:
              system.content.eagerOrphanCleanup=false
              system.content.orphanProtectDays=14
   17578: Fixed MT test and sample contexts after recent content cleaner changes
   17579: Fixed DB2 unique index creation for content URLs
   17580: First pass at fix for ETHREEOH-3454: Port enterprise upgrade scripts for ContentStoreCleaner changes
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /alfresco/BRANCHES/V3.2:r17574-17575,17577-17580


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18151 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2010-01-19 15:26:46 +00:00
parent a650eb2a1c
commit f89af49875
37 changed files with 1033 additions and 1031 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
source/java/org/alfresco/repo/avm/ibatis/AVMNodeDAOIbatis.java
View File

@@ -20,7 +20,6 @@
* FLOSS exception. You should have recieved a copy of the text describing
* the FLOSS exception, and it is also available here:
* http://www.alfresco.com/legal/licensing" */
package org.alfresco.repo.avm.ibatis;
import java.util.ArrayList;
@@ -56,7 +55,6 @@ import org.alfresco.repo.domain.PropertyValue;
import org.alfresco.repo.domain.avm.AVMNodeEntity;
import org.alfresco.repo.domain.avm.AVMVersionRootEntity;
import org.alfresco.repo.domain.hibernate.DbAccessControlListImpl;
import org.alfresco.service.cmr.repository.ContentData;
import org.alfresco.service.namespace.QName;
import org.springframework.orm.hibernate3.support.HibernateDaoSupport;
@@ -68,7 +66,6 @@ import org.springframework.orm.hibernate3.support.HibernateDaoSupport;
*/
class AVMNodeDAOIbatis extends HibernateDaoSupport implements AVMNodeDAO
{
/* (non-Javadoc)
* @see org.alfresco.repo.avm.AVMNodeDAO#save(org.alfresco.repo.avm.AVMNode)
*/
@@ -380,10 +377,10 @@ class AVMNodeDAOIbatis extends HibernateDaoSupport implements AVMNodeDAO
if (node instanceof PlainFileNode)
{
PlainFileNode pfNode = (PlainFileNode)node;
nodeEntity.setEncoding(pfNode.getContentData().getEncoding());
nodeEntity.setMimetype(pfNode.getContentData().getMimetype());
nodeEntity.setContentUrl(pfNode.getContentData().getContentUrl());
nodeEntity.setLength(pfNode.getContentData().getSize());
nodeEntity.setEncoding(pfNode.getEncoding());
nodeEntity.setLength(pfNode.getLength());
nodeEntity.setMimetype(pfNode.getMimeType());
nodeEntity.setContentUrl(pfNode.getContentURL());
}
else if (node instanceof LayeredFileNode)
{
@@ -429,9 +426,11 @@ class AVMNodeDAOIbatis extends HibernateDaoSupport implements AVMNodeDAO
if (nodeEntity.getType() == AVMNodeType.PLAIN_FILE)
{
node = new PlainFileNodeImpl();
ContentData cd = new ContentData(nodeEntity.getContentUrl(), nodeEntity.getMimetype(), nodeEntity.getLength(), nodeEntity.getEncoding());
((PlainFileNodeImpl)node).setContentData(cd);
PlainFileNodeImpl pfNode = (PlainFileNodeImpl) node;
pfNode.setMimeType(nodeEntity.getMimetype());
pfNode.setEncoding(nodeEntity.getEncoding());
pfNode.setLength(nodeEntity.getLength());
pfNode.setContentURL(nodeEntity.getContentUrl());
}
else if (nodeEntity.getType() == AVMNodeType.PLAIN_DIRECTORY)
{