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 V2.1 to HEAD

Browse Source 
6742: MIT locking issue for content contributors


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6751 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2007-09-11 04:51:34 +00:00
parent 6936c6e642
commit e78f3a8106
1 changed files with 56 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
source/java/org/alfresco/web/bean/wcm/EditWebContentWizard.java
View File

@@ -52,6 +52,7 @@ import org.alfresco.repo.workflow.WorkflowModel;
import org.alfresco.service.cmr.avm.AVMExistsException; import org.alfresco.service.cmr.avm.AVMExistsException;
import org.alfresco.service.cmr.avm.AVMNodeDescriptor; import org.alfresco.service.cmr.avm.AVMNodeDescriptor;
import org.alfresco.service.cmr.avm.AVMService; import org.alfresco.service.cmr.avm.AVMService;
import org.alfresco.service.cmr.avm.locking.AVMLock;
import org.alfresco.service.cmr.avmsync.AVMDifference; import org.alfresco.service.cmr.avmsync.AVMDifference;
import org.alfresco.service.cmr.avmsync.AVMSyncService; import org.alfresco.service.cmr.avmsync.AVMSyncService;
import org.alfresco.service.cmr.dictionary.DataTypeDefinition; import org.alfresco.service.cmr.dictionary.DataTypeDefinition;
@@ -109,8 +110,12 @@ public class EditWebContentWizard extends CreateWebContentWizard
{ {
throw new IllegalArgumentException("Edit Form wizard requires action node context."); throw new IllegalArgumentException("Edit Form wizard requires action node context.");
} }
if (LOGGER.isDebugEnabled())
{
LOGGER.debug("path is " + this.avmNode.getPath()); LOGGER.debug("path is " + this.avmNode.getPath());
}
this.createdPath = AVMUtil.getCorrespondingPathInPreviewStore(this.avmNode.getPath()); this.createdPath = AVMUtil.getCorrespondingPathInPreviewStore(this.avmNode.getPath());
this.formInstanceData = this.formsService.getFormInstanceData(-1, this.createdPath); this.formInstanceData = this.formsService.getFormInstanceData(-1, this.createdPath);
final WebProject webProject = new WebProject(this.createdPath); final WebProject webProject = new WebProject(this.createdPath);
try try
@@ -122,6 +127,7 @@ public class EditWebContentWizard extends CreateWebContentWizard
{ {
Utils.addErrorMessage(fnfe.getMessage(), fnfe); Utils.addErrorMessage(fnfe.getMessage(), fnfe);
} }
this.content = this.avmService.getContentReader(-1, this.createdPath).getContentString(); this.content = this.avmService.getContentReader(-1, this.createdPath).getContentString();
this.fileName = this.formInstanceData.getName(); this.fileName = this.formInstanceData.getName();
this.mimeType = MimetypeMap.MIMETYPE_XML; this.mimeType = MimetypeMap.MIMETYPE_XML;
@@ -147,11 +153,50 @@ public class EditWebContentWizard extends CreateWebContentWizard
{ {
LOGGER.debug("saving " + this.createdPath); LOGGER.debug("saving " + this.createdPath);
} }
AVMLock lock = this.avmLockingService.getLock(AVMUtil.getStoreId(this.createdPath),
AVMUtil.getStoreRelativePath(this.createdPath));
String previousStore = lock.getStore();
if (lock != null)
{
LOGGER.debug("transferring lock from " + lock.getStore() +
" to " + AVMUtil.getStoreName(this.createdPath));
this.avmLockingService.modifyLock(AVMUtil.getStoreId(this.createdPath),
AVMUtil.getStoreRelativePath(this.createdPath),
null,
AVMUtil.getStoreName(this.createdPath),
null,
null);
}
final ContentWriter writer = this.avmService.getContentWriter(this.createdPath); final ContentWriter writer = this.avmService.getContentWriter(this.createdPath);
this.content = XMLUtil.toString(this.instanceDataDocument, false); this.content = XMLUtil.toString(this.instanceDataDocument, false);
writer.putContent(this.content); writer.putContent(this.content);
LOGGER.debug("transferring lock back to " + previousStore);
this.avmLockingService.modifyLock(AVMUtil.getStoreId(this.createdPath),
AVMUtil.getStoreRelativePath(this.createdPath),
null,
previousStore,
null,
null);
// XXXarielb might not need to do this reload // XXXarielb might not need to do this reload
this.formInstanceData = this.formsService.getFormInstanceData(-1, this.createdPath); this.formInstanceData = this.formsService.getFormInstanceData(-1, this.createdPath);
for (final Rendition r : this.formInstanceData.getRenditions())
{
lock = this.avmLockingService.getLock(AVMUtil.getStoreId(r.getPath()),
AVMUtil.getStoreRelativePath(r.getPath()));
if (lock != null)
{
LOGGER.debug("transferring lock from " + lock.getStore() +
" to " + AVMUtil.getStoreName(r.getPath()));
this.avmLockingService.modifyLock(AVMUtil.getStoreId(r.getPath()),
AVMUtil.getStoreRelativePath(r.getPath()),
null,
AVMUtil.getStoreName(r.getPath()),
null,
null);
}
}
final List<FormInstanceData.RegenerateResult> result = this.formInstanceData.regenerateRenditions(); final List<FormInstanceData.RegenerateResult> result = this.formInstanceData.regenerateRenditions();
this.renditions = new LinkedList<Rendition>(); this.renditions = new LinkedList<Rendition>();
for (FormInstanceData.RegenerateResult rr : result) for (FormInstanceData.RegenerateResult rr : result)
@@ -164,7 +209,16 @@ public class EditWebContentWizard extends CreateWebContentWizard
} }
else else
{ {
this.renditions.add(rr.getRendition()); final Rendition r = rr.getRendition();
this.renditions.add(r);
LOGGER.debug("transferring lock for " + r.getPath() + " back to " + previousStore);
this.avmLockingService.modifyLock(AVMUtil.getStoreId(r.getPath()),
AVMUtil.getStoreRelativePath(r.getPath()),
null,
previousStore,
null,
null);
} }
} }
} }