Made revert to version behave better. Now when a node is reverted a clone of

the version being reverted to is created.  This clone has the previous head version
as its ancestor and a wcm:reverted aspect applied.  wcm:reverted contains
wcm:revertedid, the node id that the reversion is a clone of.  Revert to version is
now a simple call to a new AVMService method, revert().
Propagated this to the remote API.
Modified the the AVMRevertToVersionAction to use this mechanism. Though really the
action isn't really needed now.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4824 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Britt Park
2007-01-14 00:56:55 +00:00
parent 6d2dbe50e2
commit 0adccaeca8
17 changed files with 200 additions and 32 deletions

View File

@@ -3,10 +3,8 @@
*/
package org.alfresco.repo.avm.actions;
import java.util.ArrayList;
import java.util.List;
import org.alfresco.error.AlfrescoRuntimeException;
import org.alfresco.repo.action.ParameterDefinitionImpl;
import org.alfresco.repo.action.executer.ActionExecuterAbstractBase;
import org.alfresco.repo.avm.AVMNodeConverter;
@@ -14,8 +12,6 @@ import org.alfresco.service.cmr.action.Action;
import org.alfresco.service.cmr.action.ParameterDefinition;
import org.alfresco.service.cmr.avm.AVMNodeDescriptor;
import org.alfresco.service.cmr.avm.AVMService;
import org.alfresco.service.cmr.avmsync.AVMDifference;
import org.alfresco.service.cmr.avmsync.AVMSyncService;
import org.alfresco.service.cmr.dictionary.DataTypeDefinition;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.util.Pair;
@@ -37,8 +33,6 @@ public class AVMRevertToVersionAction extends ActionExecuterAbstractBase
private AVMService fAVMService;
private AVMSyncService fAVMSyncService;
/**
* Set the AVMService.
*/
@@ -47,14 +41,6 @@ public class AVMRevertToVersionAction extends ActionExecuterAbstractBase
fAVMService = service;
}
/**
* Set the AVMSyncService.
*/
public void setAvmSyncService(AVMSyncService service)
{
fAVMSyncService = service;
}
/* (non-Javadoc)
* @see org.alfresco.repo.action.executer.ActionExecuterAbstractBase#executeImpl(org.alfresco.service.cmr.action.Action, org.alfresco.service.cmr.repository.NodeRef)
*/
@@ -65,19 +51,7 @@ public class AVMRevertToVersionAction extends ActionExecuterAbstractBase
AVMNodeConverter.ToAVMVersionPath(actionedUponNodeRef);
AVMNodeDescriptor toRevert =
(AVMNodeDescriptor)action.getParameterValue(TOREVERT);
List<Pair<Integer, String>> paths = fAVMService.getPaths(toRevert);
if (paths.size() == 0)
{
fgLogger.error("Unable to find path for: " + toRevert);
throw new AlfrescoRuntimeException("Could not find path for: " + toRevert);
}
AVMDifference diff = new AVMDifference(paths.get(0).getFirst(), paths.get(0).getSecond(),
-1, versionPath.getSecond(),
AVMDifference.NEWER);
List<AVMDifference> diffs = new ArrayList<AVMDifference>(1);
diffs.add(diff);
String message = "Reverted " + versionPath.getSecond() + " to version in snapshot " + paths.get(0).getFirst() + ".";
fAVMSyncService.update(diffs, null, false, false, true, true, "Reverted", message);
fAVMService.revert(versionPath.getSecond(), toRevert);
}
/* (non-Javadoc)