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 
15596: Merged V3.1 to V3.2
        14017: Fix ETHREEOH-1880 - remove (double-)reverse of WCM staging snapshot order
        14112: Fix ETHREEOH-1758 - apply contributed patch
        14447: Merged V2.2 to V3.1
            14276: ETWOTWO-1224 / WCM-948 - browsing staging area during (commit of) large submit can cause AVMNotFoundException: Path /www/avm_webapps not found.
       14452: Add WCM services-based unit test for ETWOTWO-1224 / WCM-948
       14589: ETHREEOH-1646 - User Sandboxes aren't visible for Content Publisher
    15604: Merged V3.1 to V3.2
        14734: Merged V2.2 to V3.1
            14718: ETWOTWO-1244 - unable to revert some snapshots ("Does not exist: xxx")
        14852: Merged V2.2 to V3.1
            14720: ETWOTWO-1183 - "Show All Sandboxes" checkbox should only be visible for "Content Publisher" or "Content Manager"
        15032: Fix ETHREEOH-2240 - delete WCM web project (does not clean-up workflow sandboxes and also appears in archive store)
        15037: Fix ETHREEOH-2240 - follow-on for Alfresco Explorer's Manage (Review) Task Dialog
        15056: Fix ETHREEOH-2297 - WCM layered folder - problem deleting file
        15072: Minor - fix remote AVM test
    15605: Merged V3.1 to V3.2
        15082: Merged V2.2 to V3.1
            15081: AVM - add tests only
        15083: Fix ETHREEOH-2296 - user conflict when updating an AVM layered file
        15118: Merged V2.2 to V3.1
            15115: Fix ETWOTWO-1265 - WCM locking not working as expected (+ add WCM services test)
        15137: Fix ETHREEOH-2309 and ETHREEOH-227 - including refactor (& clean-up) of WCM-related actions
        15156: Fix ETHREEOH-2078 & ETHREEOH-2040 - WCM - deploy to localhost causes "Must have at least one store" errors
        15175: Fix ETHREEOH-2309 and ETHREEOH-227 - further clean-up of WCM submit/undo actions (for consistency)
        15190: Minor: message updates for WCM submit/undo actions


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@16858 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Jan Vonka
2009-10-13 11:34:23 +00:00
parent 69f987c456
commit 2eeefe0a72
33 changed files with 2983 additions and 323 deletions
Download Patch File Download Diff File Expand all files Collapse all files

138
source/java/org/alfresco/wcm/sandbox/SandboxServiceImpl.java
View File

@@ -37,8 +37,6 @@ import org.alfresco.mbeans.VirtServerRegistry;
import org.alfresco.model.WCMAppModel;
import org.alfresco.model.WCMWorkflowModel;
import org.alfresco.repo.avm.AVMNodeConverter;
import org.alfresco.repo.avm.actions.AVMRevertStoreAction;
import org.alfresco.repo.avm.actions.AVMUndoSandboxListAction;
import org.alfresco.repo.domain.PropertyValue;
import org.alfresco.repo.security.authentication.AuthenticationUtil;
import org.alfresco.repo.security.permissions.AccessDeniedException;
@@ -47,11 +45,10 @@ import org.alfresco.repo.transaction.RetryingTransactionHelper;
import org.alfresco.repo.transaction.TransactionListenerAdapter;
import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
import org.alfresco.repo.workflow.WorkflowModel;
import org.alfresco.service.cmr.action.Action;
import org.alfresco.service.cmr.action.ActionService;
import org.alfresco.service.cmr.avm.AVMNodeDescriptor;
import org.alfresco.service.cmr.avm.AVMService;
import org.alfresco.service.cmr.avm.VersionDescriptor;
import org.alfresco.service.cmr.avm.locking.AVMLockingService;
import org.alfresco.service.cmr.avmsync.AVMDifference;
import org.alfresco.service.cmr.avmsync.AVMSyncService;
import org.alfresco.service.cmr.dictionary.DataTypeDefinition;
@@ -98,10 +95,10 @@ public class SandboxServiceImpl implements SandboxService
private AVMSyncService avmSyncService;
private NameMatcher nameMatcher;
private VirtServerRegistry virtServerRegistry;
private ActionService actionService;
private WorkflowService workflowService;
private AssetService assetService;
private TransactionService transactionService;
private AVMLockingService avmLockingService;
public void setWebProjectService(WebProjectService wpService)
@@ -119,6 +116,11 @@ public class SandboxServiceImpl implements SandboxService
this.avmService = avmService;
}
public void setAvmLockingService(AVMLockingService avmLockingService)
{
this.avmLockingService = avmLockingService;
}
public void setAvmSyncService(AVMSyncService avmSyncService)
{
this.avmSyncService = avmSyncService;
@@ -134,11 +136,6 @@ public class SandboxServiceImpl implements SandboxService
this.virtServerRegistry = virtServerRegistry;
}
public void setActionService(ActionService actionService)
{
this.actionService = actionService;
}
public void setWorkflowService(WorkflowService workflowService)
{
this.workflowService = workflowService;
@@ -246,11 +243,12 @@ public class SandboxServiceImpl implements SandboxService
{
ParameterCheck.mandatoryString("wpStoreId", wpStoreId);
String currentUser = AuthenticationUtil.getFullyAuthenticatedUser();
List<SandboxInfo> sbInfos = null;
if (wpService.isContentManager(wpStoreId, currentUser))
String currentUser = AuthenticationUtil.getFullyAuthenticatedUser();
String userRole = wpService.getWebUserRole(wpStoreId, currentUser);
if (WCMUtil.ROLE_CONTENT_MANAGER.equals(userRole) || WCMUtil.ROLE_CONTENT_PUBLISHER.equals(userRole))
{
sbInfos = sandboxFactory.listAllSandboxes(wpStoreId);
}
@@ -279,9 +277,12 @@ public class SandboxServiceImpl implements SandboxService
ParameterCheck.mandatoryString("wpStoreId", wpStoreId);
ParameterCheck.mandatoryString("userName", userName);
if (! wpService.isContentManager(wpStoreId))
String currentUser = AuthenticationUtil.getFullyAuthenticatedUser();
String userRole = wpService.getWebUserRole(wpStoreId, currentUser);
if (WCMUtil.ROLE_CONTENT_MANAGER.equals(userRole) || WCMUtil.ROLE_CONTENT_PUBLISHER.equals(userRole))
{
throw new AccessDeniedException("Only content managers may list sandboxes for '"+userName+"' (web project id: "+wpStoreId+")");
throw new AccessDeniedException("Only content managers or content publishers may list sandboxes for '"+userName+"' (web project id: "+wpStoreId+")");
}
return AuthenticationUtil.runAs(new AuthenticationUtil.RunAsWork<List<SandboxInfo>>()
@@ -328,9 +329,13 @@ public class SandboxServiceImpl implements SandboxService
{
String currentUser = AuthenticationUtil.getFullyAuthenticatedUser();
if (! ((WCMUtil.getUserName(sbStoreId).equals(currentUser)) || (wpService.isContentManager(wpStoreId, currentUser))))
if (! (WCMUtil.getUserName(sbStoreId).equals(currentUser)))
{
throw new AccessDeniedException("Only content managers may get sandbox '"+sbStoreId+"' (web project id: "+wpStoreId+")");
String userRole = wpService.getWebUserRole(wpStoreId, currentUser);
if (! (WCMUtil.ROLE_CONTENT_MANAGER.equals(userRole) || WCMUtil.ROLE_CONTENT_PUBLISHER.equals(userRole)))
{
throw new AccessDeniedException("Only content managers or content publishers may get sandbox '"+sbStoreId+"' (web project id: "+wpStoreId+")");
}
}
}
@@ -951,7 +956,9 @@ public class SandboxServiceImpl implements SandboxService
// checks sandbox access (TODO review)
getSandbox(sbStoreId); // ignore result
List<Pair<Integer, String>> versionPaths = new ArrayList<Pair<Integer, String>>(assets.size());
String wpStoreId = WCMUtil.getWebProjectStoreId(sbStoreId);
List<AssetInfo> assetsToRevert = new ArrayList<AssetInfo>(assets.size());
List<WorkflowTask> tasks = null;
for (AssetInfo asset : assets)
@@ -961,27 +968,68 @@ public class SandboxServiceImpl implements SandboxService
tasks = WCMWorkflowUtil.getAssociatedTasksForSandbox(workflowService, WCMUtil.getSandboxStoreId(asset.getAvmPath()));
}
// TODO ... extra lookup ... either return AVMNodeDescriptor or change getAssociatedTasksForNode ...
AVMNodeDescriptor node = avmService.lookup(-1, asset.getAvmPath());
// TODO refactor getAssociatedTasksForNode to use AssetInfo instead of AVMNodeDescriptor
AVMNodeDescriptor node = ((AssetInfoImpl)asset).getAVMNodeDescriptor();
if (WCMWorkflowUtil.getAssociatedTasksForNode(avmService, node, tasks).size() == 0)
if (node != null)
{
String revertPath = asset.getAvmPath();
versionPaths.add(new Pair<Integer, String>(-1, revertPath));
if (VirtServerUtils.requiresUpdateNotification(revertPath))
{
// Bind the post-commit transaction listener with data required for virtualization server notification
UpdateSandboxTransactionListener tl = new UpdateSandboxTransactionListener(revertPath);
AlfrescoTransactionSupport.bindListener(tl);
}
if (WCMWorkflowUtil.getAssociatedTasksForNode(avmService, node, tasks).size() == 0)
{
assetsToRevert.add(asset);
if (VirtServerUtils.requiresUpdateNotification(asset.getAvmPath()))
{
// Bind the post-commit transaction listener with data required for virtualization server notification
UpdateSandboxTransactionListener tl = new UpdateSandboxTransactionListener(asset.getAvmPath());
AlfrescoTransactionSupport.bindListener(tl);
}
}
}
}
Map<String, Serializable> args = new HashMap<String, Serializable>(1, 1.0f);
args.put(AVMUndoSandboxListAction.PARAM_NODE_LIST, (Serializable)versionPaths);
Action action = actionService.createAction(AVMUndoSandboxListAction.NAME, args);
actionService.executeAction(action, null); // dummy action ref, list passed as action arg
for (AssetInfo asset : assetsToRevert)
{
String [] parentChild = AVMNodeConverter.SplitBase(asset.getAvmPath());
if (parentChild.length != 2)
{
continue;
}
AVMNodeDescriptor parent = avmService.lookup(-1, parentChild[0], true);
if (parent.isLayeredDirectory())
{
if (logger.isDebugEnabled())
{
logger.debug("reverting " + parentChild[1] + " in " + parentChild[0]);
}
avmService.makeTransparent(parentChild[0], parentChild[1]);
}
if (asset.isFile())
{
// is file or deleted file
String relativePath = asset.getPath();
if (logger.isDebugEnabled())
{
logger.debug("unlocking file " + relativePath + " in web project " + wpStoreId);
}
if (avmLockingService.getLock(wpStoreId, relativePath) != null)
{
avmLockingService.removeLock(wpStoreId, relativePath);
}
else
{
if (logger.isWarnEnabled())
{
logger.warn("expected file " + relativePath + " in " + wpStoreId + " to be locked");
}
}
}
}
}
/* (non-Javadoc)
@@ -1039,33 +1087,31 @@ public class SandboxServiceImpl implements SandboxService
/* (non-Javadoc)
* @see org.alfresco.wcm.sandbox.SandboxService#revertSnapshot(java.lang.String, int)
*/
public void revertSnapshot(final String sbStoreId, final int version)
public void revertSnapshot(final String sbStoreId, final int revertVersion)
{
ParameterCheck.mandatoryString("sbStoreId", sbStoreId);
String wpStoreId = WCMUtil.getWebProjectStoreId(sbStoreId);
if (! wpService.isContentManager(wpStoreId))
{
throw new AccessDeniedException("Only content managers may revert staging sandbox '"+sbStoreId+"' (web project id: "+wpStoreId+")");
}
// do this as system as the staging area has restricted access (and content manager may not have permission to delete children, for example)
List<AVMDifference> diffs = AuthenticationUtil.runAs(new AuthenticationUtil.RunAsWork<List<AVMDifference>>()
{
public List<AVMDifference> doWork() throws Exception
{
String sandboxPath = WCMUtil.buildSandboxRootPath(sbStoreId);
List<AVMDifference> diffs = avmSyncService.compare(-1, sandboxPath, version, sandboxPath, null);
Map<String, Serializable> args = new HashMap<String, Serializable>(1, 1.0f);
args.put(AVMRevertStoreAction.PARAM_VERSION, version);
Action action = actionService.createAction(AVMRevertStoreAction.NAME, args);
actionService.executeAction(action, AVMNodeConverter.ToNodeRef(-1, sbStoreId + WCMUtil.AVM_STORE_SEPARATOR + "/"));
String sandboxPath = sbStoreId + WCMUtil.AVM_STORE_SEPARATOR + "/";
List<AVMDifference> diffs = avmSyncService.compare(revertVersion, sandboxPath, -1, sandboxPath, null);
String message = "Reverted to Version " + revertVersion + ".";
avmSyncService.update(diffs, null, false, false, true, true, message, message);
return diffs;
}
}, AuthenticationUtil.getSystemUserName());
// See if any of the files being reverted require notification of the virt server, to update the webapp
for (AVMDifference diff : diffs)
{