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 HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)

Browse Source 
78403: Merged EOL (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      75700: ACE-2149: EOL AVM / WCM
       - Remove most of the AVM and WCM beans, scripts, classes, patches, etc
       - The Explorer client is very broken for compilation
         - TODO: Remove all WCM-related functionality, which I thought would be best left to a UI dev
                 I've murdered many of the classes and beans but there's more to do
       - The repository compiles
         TODO: Get it running again
       - TODO: Check if we can wipe the 'deployment' project as well


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82540 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Erik Winlof
2014-09-03 12:01:49 +00:00
parent eaff240152
commit 0baa0f74f4
284 changed files with 206 additions and 58844 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
source/java/org/alfresco/repo/domain/patch/AbstractPatchDAOImpl.java
View File

@@ -22,7 +22,6 @@ import java.util.List;
import java.util.Map;
import org.alfresco.ibatis.BatchingDAO;
import org.alfresco.repo.domain.avm.AVMNodeEntity;
import org.alfresco.repo.domain.contentdata.ContentDataDAO;
import org.alfresco.service.cmr.repository.ContentData;
import org.apache.ibatis.session.ResultHandler;
@@ -51,46 +50,6 @@ public abstract class AbstractPatchDAOImpl implements PatchDAO, BatchingDAO
this.contentDataDAO = contentDataDAO;
}
/**
* {@inheritDoc}
*/
public long getAVMNodesCountWhereNewInStore()
{
return getAVMNodeEntitiesCountWhereNewInStore();
}
public List<AVMNodeEntity> getEmptyGUIDS(int count)
{
return getAVMNodeEntitiesWithEmptyGUID(count);
}
public List<AVMNodeEntity> getNullVersionLayeredDirectories(int count)
{
return getNullVersionLayeredDirectoryNodeEntities(count);
}
public List<AVMNodeEntity> getNullVersionLayeredFiles(int count)
{
return getNullVersionLayeredFileNodeEntities(count);
}
public int updateAVMNodesNullifyAcl(List<Long> nodeIds)
{
return updateAVMNodeEntitiesNullifyAcl(nodeIds);
}
public int updateAVMNodesSetAcl(long aclId, List<Long> nodeIds)
{
return updateAVMNodeEntitiesSetAcl(aclId, nodeIds);
}
protected abstract long getAVMNodeEntitiesCountWhereNewInStore();
protected abstract List<AVMNodeEntity> getAVMNodeEntitiesWithEmptyGUID(int maxResults);
protected abstract List<AVMNodeEntity> getNullVersionLayeredDirectoryNodeEntities(int maxResults);
protected abstract List<AVMNodeEntity> getNullVersionLayeredFileNodeEntities(int maxResults);
protected abstract int updateAVMNodeEntitiesNullifyAcl(List<Long> nodeIds);
protected abstract int updateAVMNodeEntitiesSetAcl(long aclId, List<Long> nodeIds);
public long getMaxAclId()
{
return getMaxAclEntityId();
@@ -224,15 +183,6 @@ public abstract class AbstractPatchDAOImpl implements PatchDAO, BatchingDAO
protected abstract void getOldAttrTenantsImpl(ResultHandler resultHandler);
// note: caller's row handler is expected to migrate the attrs
@Override
public void migrateOldAttrAVMLocks(ResultHandler resultHandler)
{
getOldAttrAVMLocksImpl(resultHandler);
}
protected abstract void getOldAttrAVMLocksImpl(ResultHandler resultHandler);
// note: caller's row handler is expected to migrate the attrs
@Override
public void migrateOldAttrPropertyBackedBeans(ResultHandler resultHandler)

24
source/java/org/alfresco/repo/domain/patch/PatchDAO.java
View File

@@ -22,7 +22,6 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
import org.alfresco.repo.domain.avm.AVMNodeEntity;
import org.alfresco.repo.domain.contentdata.ContentDataDAO;
import org.alfresco.service.cmr.repository.ContentData;
import org.alfresco.service.cmr.repository.NodeRef;
@@ -39,24 +38,6 @@ import org.apache.ibatis.session.ResultHandler;
*/
public interface PatchDAO
{
// AVM-related
public long getAVMNodesCountWhereNewInStore();
public List<AVMNodeEntity> getEmptyGUIDS(int count);
public List<AVMNodeEntity> getNullVersionLayeredDirectories(int count);
public List<AVMNodeEntity> getNullVersionLayeredFiles(int count);
public long getMaxAvmNodeID();
public List<Long> getAvmNodesWithOldContentProperties(Long minNodeId, Long maxNodeId);
public int updateAVMNodesNullifyAcl(List<Long> nodeIds);
public int updateAVMNodesSetAcl(long aclId, List<Long> nodeIds);
// DM-related
public long getMaxAdmNodeID();
@@ -189,11 +170,6 @@ public interface PatchDAO
*/
public void migrateOldAttrTenants(ResultHandler resultHandler);
/**
* Migrate old AVM Lock attributes (if any)
*/
public void migrateOldAttrAVMLocks(ResultHandler resultHandler);
/**
* Migrate old Property-Backed Bean attributes (if any)
*/

92
source/java/org/alfresco/repo/domain/patch/ibatis/PatchDAOImpl.java
View File

@@ -28,7 +28,6 @@ import java.util.Set;
import org.alfresco.ibatis.IdsEntity;
import org.alfresco.model.ContentModel;
import org.alfresco.repo.domain.CrcHelper;
import org.alfresco.repo.domain.avm.AVMNodeEntity;
import org.alfresco.repo.domain.locale.LocaleDAO;
import org.alfresco.repo.domain.node.ChildAssocEntity;
import org.alfresco.repo.domain.patch.AbstractPatchDAOImpl;
@@ -48,7 +47,7 @@ import org.apache.ibatis.session.RowBounds;
import org.mybatis.spring.SqlSessionTemplate;
/**
* iBatis-specific implementation of the AVMPatch DAO.
* iBatis-specific implementation of the PatchDAO.
*
* @author janv
* @since 3.2
@@ -57,13 +56,7 @@ public class PatchDAOImpl extends AbstractPatchDAOImpl
{
private static Log logger = LogFactory.getLog(PatchDAOImpl.class);
private static final String SELECT_AVM_NODE_ENTITIES_COUNT_WHERE_NEW_IN_STORE = "alfresco.avm.select_AVMNodeEntitiesCountWhereNewInStore";
private static final String SELECT_AVM_NODE_ENTITIES_WITH_EMPTY_GUID = "alfresco.avm.select_AVMNodesWithEmptyGUID";
private static final String SELECT_AVM_LD_NODE_ENTITIES_NULL_VERSION = "alfresco.avm.select_AVMNodes_nullVersionLayeredDirectories";
private static final String SELECT_AVM_LF_NODE_ENTITIES_NULL_VERSION = "alfresco.avm.select_AVMNodes_nullVersionLayeredFiles";
private static final String SELECT_AVM_MAX_NODE_ID = "alfresco.patch.select_avmMaxNodeId";
private static final String SELECT_ADM_MAX_NODE_ID = "alfresco.patch.select_admMaxNodeId";
private static final String SELECT_AVM_NODES_WITH_OLD_CONTENT_PROPERTIES = "alfresco.patch.select_avmNodesWithOldContentProperties";
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";
@@ -78,8 +71,6 @@ public class PatchDAOImpl extends AbstractPatchDAOImpl
private static final String UPDATE_ADM_OLD_CONTENT_PROPERTY = "alfresco.patch.update_admOldContentProperty";
private static final String UPDATE_CONTENT_MIMETYPE_ID = "alfresco.patch.update_contentMimetypeId";
private static final String UPDATE_AVM_NODE_LIST_NULLIFY_ACL = "alfresco.avm.update_AVMNodeList_nullifyAcl";
private static final String UPDATE_AVM_NODE_LIST_SET_ACL = "alfresco.avm.update_AVMNodeList_setAcl";
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";
@@ -88,7 +79,6 @@ public class PatchDAOImpl extends AbstractPatchDAOImpl
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_AVM_LOCKS= "alfresco.patch.select_oldAttrAVMLocks";
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";
private static final String SELECT_OLD_ATTR_CUSTOM_NAMES = "alfresco.patch.select_oldAttrCustomNames";
@@ -167,64 +157,6 @@ public class PatchDAOImpl extends AbstractPatchDAOImpl
*/
}
@Override
protected long getAVMNodeEntitiesCountWhereNewInStore()
{
Long count = (Long) template.selectOne(SELECT_AVM_NODE_ENTITIES_COUNT_WHERE_NEW_IN_STORE);
return count == null ? 0L : count;
}
@SuppressWarnings("unchecked")
@Override
protected List<AVMNodeEntity> getAVMNodeEntitiesWithEmptyGUID(int maxResults)
{
if (maxResults < 0)
{
maxResults = RowBounds.NO_ROW_LIMIT;
}
return (List<AVMNodeEntity>) template.selectList(SELECT_AVM_NODE_ENTITIES_WITH_EMPTY_GUID, new RowBounds(0, maxResults));
}
@SuppressWarnings("unchecked")
@Override
protected List<AVMNodeEntity> getNullVersionLayeredDirectoryNodeEntities(int maxResults)
{
if (maxResults < 0)
{
maxResults = RowBounds.NO_ROW_LIMIT;
}
return (List<AVMNodeEntity>) template.selectList(SELECT_AVM_LD_NODE_ENTITIES_NULL_VERSION, new RowBounds(0, maxResults));
}
@SuppressWarnings("unchecked")
@Override
protected List<AVMNodeEntity> getNullVersionLayeredFileNodeEntities(int maxResults)
{
if (maxResults < 0)
{
maxResults = RowBounds.NO_ROW_LIMIT;
}
return (List<AVMNodeEntity>) template.selectList(SELECT_AVM_LF_NODE_ENTITIES_NULL_VERSION, new RowBounds(0, maxResults));
}
public long getMaxAvmNodeID()
{
Long count = (Long) template.selectOne(SELECT_AVM_MAX_NODE_ID);
return count == null ? 0L : count;
}
@SuppressWarnings("unchecked")
public List<Long> getAvmNodesWithOldContentProperties(Long minNodeId, Long maxNodeId)
{
IdsEntity ids = new IdsEntity();
ids.setIdOne(minNodeId);
ids.setIdTwo(maxNodeId);
return (List<Long>) template.selectList(SELECT_AVM_NODES_WITH_OLD_CONTENT_PROPERTIES, ids);
}
public long getMaxAdmNodeID()
{
Long count = (Long) template.selectOne(SELECT_ADM_MAX_NODE_ID);
@@ -281,22 +213,6 @@ public class PatchDAOImpl extends AbstractPatchDAOImpl
return rowsAffected;
}
@Override
protected int updateAVMNodeEntitiesNullifyAcl(List<Long> nodeIds)
{
return template.update(UPDATE_AVM_NODE_LIST_NULLIFY_ACL, nodeIds);
}
@Override
protected int updateAVMNodeEntitiesSetAcl(long aclId, List<Long> nodeIds)
{
IdListOfIdsParam params = new IdListOfIdsParam();
params.setId(aclId);
params.setListOfIds(nodeIds);
return template.update(UPDATE_AVM_NODE_LIST_SET_ACL, params);
}
@Override
protected long getMaxAclEntityId()
{
@@ -527,12 +443,6 @@ public class PatchDAOImpl extends AbstractPatchDAOImpl
template.select(SELECT_OLD_ATTR_TENANTS, resultHandler);
}
@Override
protected void getOldAttrAVMLocksImpl(ResultHandler resultHandler)
{
template.select(SELECT_OLD_ATTR_AVM_LOCKS, resultHandler);
}
@Override
protected void getOldAttrPropertyBackedBeansImpl(ResultHandler resultHandler)
{