From 3b86753d322581d16b4d128ad69b66b3b785468c Mon Sep 17 00:00:00 2001 From: Erik Winlof Date: Wed, 3 Sep 2014 12:09:04 +0000 Subject: [PATCH] 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 --- .../alfresco/dbscripts/db-schema-context.xml | 25 ------------ .../alfresco/ibatis/alfresco-SqlMapConfig.xml | 2 - .../patch-common-SqlMap.xml | 39 +------------------ .../domain/patch/AbstractPatchDAOImpl.java | 34 ++-------------- .../alfresco/repo/domain/patch/PatchDAO.java | 10 ----- .../domain/patch/ibatis/PatchDAOImpl.java | 38 ------------------ 6 files changed, 5 insertions(+), 143 deletions(-) diff --git a/config/alfresco/dbscripts/db-schema-context.xml b/config/alfresco/dbscripts/db-schema-context.xml index 6c41cb89bf..6cb0ef026e 100644 --- a/config/alfresco/dbscripts/db-schema-context.xml +++ b/config/alfresco/dbscripts/db-schema-context.xml @@ -25,15 +25,6 @@ - - - - - classpath:alfresco/dbscripts/create/${db.script.dialect}/AlfrescoCreate-AvmTables.sql - - - - @@ -98,22 +89,6 @@ - - - - - - - - - - - - - - - - diff --git a/config/alfresco/ibatis/alfresco-SqlMapConfig.xml b/config/alfresco/ibatis/alfresco-SqlMapConfig.xml index ca00ba9762..8d4692b1ca 100644 --- a/config/alfresco/ibatis/alfresco-SqlMapConfig.xml +++ b/config/alfresco/ibatis/alfresco-SqlMapConfig.xml @@ -206,8 +206,6 @@ Inbound settings from iBatis - - diff --git a/config/alfresco/ibatis/org.hibernate.dialect.Dialect/patch-common-SqlMap.xml b/config/alfresco/ibatis/org.hibernate.dialect.Dialect/patch-common-SqlMap.xml index e1cc113d62..8e8de54ecd 100644 --- a/config/alfresco/ibatis/org.hibernate.dialect.Dialect/patch-common-SqlMap.xml +++ b/config/alfresco/ibatis/org.hibernate.dialect.Dialect/patch-common-SqlMap.xml @@ -261,28 +261,6 @@ ga.name = 'alfresco-tenants' - - - - - - - diff --git a/source/java/org/alfresco/repo/domain/patch/AbstractPatchDAOImpl.java b/source/java/org/alfresco/repo/domain/patch/AbstractPatchDAOImpl.java index e6c6d4cfcf..ebf68cf5a9 100644 --- a/source/java/org/alfresco/repo/domain/patch/AbstractPatchDAOImpl.java +++ b/source/java/org/alfresco/repo/domain/patch/AbstractPatchDAOImpl.java @@ -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 selectAllAclIds() - { - return selectAllAclEntityIds(); - } - - public List selectNonDanglingAclIds() - { - return selectNonDanglingAclEntityIds(); - } - - public int deleteDanglingAces() - { - return deleteDanglingAceEntities(); - } - - public int deleteAcls(List aclIds) - { - return deleteAclEntities(aclIds); - } - - public int deleteAclMembersForAcls(List aclIds) - { - return deleteAclMemberEntitiesForAcls(aclIds); - } - /** * {@inheritDoc} *

* @see #getAdmOldContentProperties(Long, Long) */ + @Override public void updateAdmV31ContentProperties(Long minNodeId, Long maxNodeId) { List> 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 selectAllAclEntityIds(); - protected abstract List selectNonDanglingAclEntityIds(); - protected abstract int deleteDanglingAceEntities(); - protected abstract int deleteAclEntities(List aclIds); - protected abstract int deleteAclMemberEntitiesForAcls(List aclIds); // note: caller's row handler is expected to migrate the attrs @Override diff --git a/source/java/org/alfresco/repo/domain/patch/PatchDAO.java b/source/java/org/alfresco/repo/domain/patch/PatchDAO.java index 8519eaad7a..f86375e8ee 100644 --- a/source/java/org/alfresco/repo/domain/patch/PatchDAO.java +++ b/source/java/org/alfresco/repo/domain/patch/PatchDAO.java @@ -97,16 +97,6 @@ public interface PatchDAO */ public long getDmNodeCountWithNewACLs(Long above); - public List selectAllAclIds(); - - public List selectNonDanglingAclIds(); - - public int deleteDanglingAces(); - - public int deleteAcls(List aclIds); - - public int deleteAclMembersForAcls(List aclIds); - /** * @return Returns the names of authorities with incorrect CRC values */ diff --git a/source/java/org/alfresco/repo/domain/patch/ibatis/PatchDAOImpl.java b/source/java/org/alfresco/repo/domain/patch/ibatis/PatchDAOImpl.java index 0c3ce00717..4f789dbe8a 100644 --- a/source/java/org/alfresco/repo/domain/patch/ibatis/PatchDAOImpl.java +++ b/source/java/org/alfresco/repo/domain/patch/ibatis/PatchDAOImpl.java @@ -59,8 +59,6 @@ public class PatchDAOImpl extends AbstractPatchDAOImpl private static final String SELECT_ADM_MAX_NODE_ID = "alfresco.patch.select_admMaxNodeId"; private static final String SELECT_ADM_OLD_CONTENT_PROPERTIES = "alfresco.patch.select_admOldContentProperties"; private static final String SELECT_AUTHORITIES_AND_CRC = "alfresco.patch.select_authoritiesAndCrc"; - private static final String SELECT_PERMISSIONS_ALL_ACL_IDS = "alfresco.patch.select_AllAclIds"; - private static final String SELECT_PERMISSIONS_USED_ACL_IDS = "alfresco.patch.select_UsedAclIds"; private static final String SELECT_PERMISSIONS_MAX_ACL_ID = "alfresco.patch.select_MaxAclId"; private static final String SELECT_PERMISSIONS_DM_NODE_COUNT = "alfresco.patch.select_DmNodeCount"; private static final String SELECT_PERMISSIONS_DM_NODE_COUNT_WITH_NEW_ACLS = "alfresco.patch.select_DmNodeCountWherePermissionsHaveChanged"; @@ -74,10 +72,6 @@ public class PatchDAOImpl extends AbstractPatchDAOImpl private static final String UPDATE_CHILD_ASSOC_CRC = "alfresco.patch.update_childAssocCrc"; private static final String UPDATE_CREATE_SIZE_CURRENT_PROPERTY = "alfresco.patch.update_CreateSizeCurrentProperty"; - private static final String DELETE_PERMISSIONS_UNUSED_ACES = "alfresco.permissions.delete_UnusedAces"; - private static final String DELETE_PERMISSIONS_ACL_LIST = "alfresco.permissions.delete_AclList"; - private static final String DELETE_PERMISSIONS_ACL_MEMBERS_FOR_ACL_LIST = "alfresco.permissions.delete_AclMembersForAclList"; - private static final String SELECT_OLD_ATTR_TENANTS = "alfresco.patch.select_oldAttrTenants"; private static final String SELECT_OLD_ATTR_PBBS = "alfresco.patch.select_oldAttrPropertyBackedBeans"; private static final String SELECT_OLD_ATTR_CHAINING_URS = "alfresco.patch.select_oldAttrChainingURS"; @@ -236,38 +230,6 @@ public class PatchDAOImpl extends AbstractPatchDAOImpl return count == null ? 0L : count; } - @SuppressWarnings("unchecked") - @Override - protected List selectAllAclEntityIds() - { - return (List) template.selectList(SELECT_PERMISSIONS_ALL_ACL_IDS); - } - - @SuppressWarnings("unchecked") - @Override - protected List selectNonDanglingAclEntityIds() - { - return (List) template.selectList(SELECT_PERMISSIONS_USED_ACL_IDS); - } - - @Override - protected int deleteDanglingAceEntities() - { - return template.delete(DELETE_PERMISSIONS_UNUSED_ACES); - } - - @Override - protected int deleteAclEntities(List aclIds) - { - return template.delete(DELETE_PERMISSIONS_ACL_LIST, aclIds); - } - - @Override - protected int deleteAclMemberEntitiesForAcls(List aclIds) - { - return template.delete(DELETE_PERMISSIONS_ACL_MEMBERS_FOR_ACL_LIST, aclIds); - } - public List getAuthoritiesWithNonUtf8Crcs() { final List results = new ArrayList(1000);