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 DEV to HEAD (5.0)

Browse Source 
87810: ACE-2030: Moved retired patches into retired-patches-context.xml
  87811: ACE-2030: Clean up unused PatchDAO methods and SQL mappings


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@87814 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2014-10-11 21:00:25 +00:00
parent 89a179e2d7
commit 33da30e3b8
7 changed files with 1297 additions and 2128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

147
source/java/org/alfresco/repo/admin/patch/impl/DmPermissionsPatch.java
View File

@@ -1,147 +0,0 @@
/*
* Copyright (C) 2005-2010 Alfresco Software Limited.
*
* This file is part of Alfresco
*
* Alfresco is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Alfresco is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
*/
package org.alfresco.repo.admin.patch.impl;
import java.util.Map;
import org.alfresco.repo.admin.patch.AbstractPatch;
import org.alfresco.repo.domain.control.ControlDAO;
import org.alfresco.repo.domain.patch.PatchDAO;
import org.alfresco.repo.domain.permissions.AccessControlListDAO;
import org.alfresco.repo.security.permissions.ACLType;
import org.alfresco.repo.transaction.RetryingTransactionHelper;
import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.extensions.surf.util.I18NUtil;
/**
* Migrate permissions from the OLD format to defining, shared and layered
*/
public class DmPermissionsPatch extends AbstractPatch
{
private static final String MSG_SUCCESS = "patch.updateDmPermissions.result";
private static Log logger = LogFactory.getLog(DmPermissionsPatch.class);
private AccessControlListDAO accessControlListDao;
private PatchDAO patchDAO;
private ControlDAO controlDAO;
public void setAccessControlListDao(AccessControlListDAO accessControlListDao)
{
this.accessControlListDao = accessControlListDao;
}
public void setPatchDAO(PatchDAO patchDAO)
{
this.patchDAO = patchDAO;
}
public void setControlDAO(ControlDAO controlDAO)
{
this.controlDAO = controlDAO;
}
@Override
protected String applyInternal() throws Exception
{
Thread progressThread = null;
progressThread = new Thread(new ProgressWatcher(), "DMPatchProgressWatcher");
progressThread.start();
try
{
Map<ACLType, Integer> summary = this.accessControlListDao.patchAcls();
// build the result message
String msg = I18NUtil.getMessage(DmPermissionsPatch.MSG_SUCCESS, summary.get(ACLType.DEFINING));
// done
return msg;
}
finally
{
progressThread.interrupt();
progressThread.join();
}
}
private class ProgressWatcher implements Runnable
{
private boolean running = true;
Long toDo;
Long max;
public void run()
{
while (this.running)
{
if (this.running)
{
RetryingTransactionHelper txHelper = transactionService.getRetryingTransactionHelper();
txHelper.setMaxRetries(1);
txHelper.setForceWritable(true);
RetryingTransactionCallback<Long> callback = new RetryingTransactionCallback<Long>()
{
public Long execute() throws Throwable
{
// Change isolation level
try
{
controlDAO.setTransactionIsolationLevel(1);
}
catch (IllegalStateException e)
{
// Can't be set. We're done here.
toDo = 0L;
running = false;
return 0L;
}
if (toDo == null)
{
toDo = patchDAO.getDmNodeCount();
max = patchDAO.getMaxAclId();
}
return patchDAO.getDmNodeCountWithNewACLs(ProgressWatcher.this.max);
}
};
try
{
Long done = txHelper.doInTransaction(callback, true, true);
reportProgress(this.toDo, done);
}
catch (Throwable e)
{
logger.error("Failure in ProgressWatcher", e);
this.running = false;
}
}
try
{
Thread.sleep(60000);
}
catch (InterruptedException e)
{
this.running = false;
}
}
}
}
}