Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)

78416: Merged EOL (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      75791: ACE-2149: EOL AVM / WCM
       - Some (probably not all!) removal of AVM patch-related code and MyBatis config


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82548 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Erik Winlof
2014-09-03 12:09:04 +00:00
parent 81fbc4c634
commit 3b86753d32
6 changed files with 5 additions and 143 deletions

View File

@@ -50,51 +50,30 @@ public abstract class AbstractPatchDAOImpl implements PatchDAO, BatchingDAO
this.contentDataDAO = contentDataDAO;
}
@Override
public long getMaxAclId()
{
return getMaxAclEntityId();
}
@Override
public long getDmNodeCount()
{
return getDmNodeEntitiesCount();
}
@Override
public long getDmNodeCountWithNewACLs(Long above)
{
return getDmNodeEntitiesCountWithNewACLs(above);
}
public List<Long> selectAllAclIds()
{
return selectAllAclEntityIds();
}
public List<Long> selectNonDanglingAclIds()
{
return selectNonDanglingAclEntityIds();
}
public int deleteDanglingAces()
{
return deleteDanglingAceEntities();
}
public int deleteAcls(List<Long> aclIds)
{
return deleteAclEntities(aclIds);
}
public int deleteAclMembersForAcls(List<Long> aclIds)
{
return deleteAclMemberEntitiesForAcls(aclIds);
}
/**
* {@inheritDoc}
* <p>
* @see #getAdmOldContentProperties(Long, Long)
*/
@Override
public void updateAdmV31ContentProperties(Long minNodeId, Long maxNodeId)
{
List<Map<String, Object>> props = getAdmOldContentProperties(minNodeId, maxNodeId);
@@ -168,11 +147,6 @@ public abstract class AbstractPatchDAOImpl implements PatchDAO, BatchingDAO
protected abstract long getMaxAclEntityId();
protected abstract long getDmNodeEntitiesCount();
protected abstract long getDmNodeEntitiesCountWithNewACLs(Long above);
protected abstract List<Long> selectAllAclEntityIds();
protected abstract List<Long> selectNonDanglingAclEntityIds();
protected abstract int deleteDanglingAceEntities();
protected abstract int deleteAclEntities(List<Long> aclIds);
protected abstract int deleteAclMemberEntitiesForAcls(List<Long> aclIds);
// note: caller's row handler is expected to migrate the attrs
@Override