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 2.1 to HEAD

Browse Source 
8639: Fixed WCM-1138 (Need a way to remove AVM locks through the UI)
   8749: Fixed AR-2177, WCM-1059, WCM-1137 and improved fix for WCM-1089, all to do with locking issues on the create and edit web content wizards.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8773 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Gavin Cornwell
2008-04-15 12:50:33 +00:00
parent 43c4e14560
commit 78d40348eb
11 changed files with 723 additions and 277 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
source/java/org/alfresco/web/forms/FormInstanceData.java
View File

@@ -47,29 +47,39 @@ public interface FormInstanceData
private static final long serialVersionUID = -3827878774655260635L;
private final RenderingEngineTemplate ret;
private final String path;
private final Rendition r;
private final Exception e;
public RegenerateResult(final RenderingEngineTemplate ret,
final String path,
final Rendition r)
{
this.ret = ret;
this.r = r;
this.e = null;
this.path = path;
}
public RegenerateResult(final RenderingEngineTemplate ret,
final String path,
final Exception e)
{
this.ret = ret;
this.e = e;
this.r = null;
this.path = path;
}
public RenderingEngineTemplate getRenderingEngineTemplate()
{
return this.ret;
}
public String getPath()
{
return this.path;
}
public Rendition getRendition()
{

82
source/java/org/alfresco/web/forms/FormInstanceDataImpl.java
View File

@@ -41,6 +41,8 @@ import org.alfresco.repo.domain.PropertyValue;
import org.alfresco.service.ServiceRegistry;
import org.alfresco.service.cmr.avm.AVMNotFoundException;
import org.alfresco.service.cmr.avm.AVMService;
import org.alfresco.service.cmr.avm.locking.AVMLock;
import org.alfresco.service.cmr.avm.locking.AVMLockingService;
import org.alfresco.service.cmr.dictionary.DataTypeDefinition;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.StoreRef;
@@ -61,8 +63,8 @@ import org.xml.sax.SAXException;
/* package */ class FormInstanceDataImpl implements FormInstanceData
{
private static final long serialVersionUID = -7806221587661854013L;
private static final Log LOGGER = LogFactory.getLog(RenditionImpl.class);
private static final Log logger = LogFactory.getLog(RenditionImpl.class);
private final NodeRef nodeRef;
private transient FormsService formsService;
@@ -175,9 +177,10 @@ import org.xml.sax.SAXException;
public List<FormInstanceData.RegenerateResult> regenerateRenditions()
throws FormNotFoundException
{
if (LOGGER.isDebugEnabled())
LOGGER.debug("regenerating renditions of " + this);
if (logger.isDebugEnabled())
logger.debug("regenerating renditions of " + this);
AVMLockingService avmLockService = this.getServiceRegistry().getAVMLockingService();
final AVMService avmService = this.getServiceRegistry().getAVMService();
PropertyValue pv = avmService.getNodeProperty(
AVMNodeConverter.ToAVMVersionPath(this.nodeRef).getFirst(),
@@ -191,6 +194,8 @@ import org.xml.sax.SAXException;
new HashSet<RenderingEngineTemplate>(this.getForm().getRenderingEngineTemplates());
final List<RegenerateResult> result = new LinkedList<RegenerateResult>();
// regenerate existing renditions
boolean renditionLockedBefore = false;
String path = null;
for (final Rendition r : this.getRenditions())
{
final RenderingEngineTemplate ret = r.getRenderingEngineTemplate();
@@ -200,14 +205,36 @@ import org.xml.sax.SAXException;
}
try
{
LOGGER.debug("regenerating rendition " + r + " using template " + ret);
if (logger.isDebugEnabled())
logger.debug("regenerating rendition " + r + " using template " + ret);
renditionLockedBefore = false;
path = r.getPath();
AVMLock lock = avmLockService.getLock(AVMUtil.getStoreId(path), AVMUtil.getStoreRelativePath(path));
if (lock != null)
{
renditionLockedBefore = true;
if (logger.isDebugEnabled())
logger.debug("Lock already exists for " + path);
}
ret.render(this, r);
allRets.remove(ret);
result.add(new RegenerateResult(ret, r));
result.add(new RegenerateResult(ret, path, r));
}
catch (Exception e)
{
result.add(new RegenerateResult(ret, e));
result.add(new RegenerateResult(ret, path, e));
// remove lock if there wasn't one before
if (renditionLockedBefore == false)
{
avmLockService.removeLock(AVMUtil.getStoreId(path), AVMUtil.getStoreRelativePath(path));
if (logger.isDebugEnabled())
logger.debug("Removed lock for " + path + " as it failed to generate");
}
}
}
@@ -216,15 +243,36 @@ import org.xml.sax.SAXException;
{
try
{
final String path = ret.getOutputPathForRendition(this, originalParentAvmPath);
LOGGER.debug("regenerating rendition of " + this.getPath() +
" at " + path + " using template " + ret);
renditionLockedBefore = false;
path = ret.getOutputPathForRendition(this, originalParentAvmPath);
result.add(new RegenerateResult(ret, ret.render(this, path)));
if (logger.isDebugEnabled())
logger.debug("regenerating rendition of " + this.getPath() +
" at " + path + " using template " + ret);
AVMLock lock = avmLockService.getLock(AVMUtil.getStoreId(path), AVMUtil.getStoreRelativePath(path));
if (lock != null)
{
renditionLockedBefore = true;
if (logger.isDebugEnabled())
logger.debug("Lock already exists for " + path);
}
result.add(new RegenerateResult(ret, path, ret.render(this, path)));
}
catch (Exception e)
{
result.add(new RegenerateResult(ret, e));
result.add(new RegenerateResult(ret, path, e));
// remove lock if there wasn't one before
if (renditionLockedBefore == false)
{
avmLockService.removeLock(AVMUtil.getStoreId(path), AVMUtil.getStoreRelativePath(path));
if (logger.isDebugEnabled())
logger.debug("Removed lock for " + path + " as it failed to generate");
}
}
}
return result;
@@ -244,7 +292,8 @@ import org.xml.sax.SAXException;
{
if (avmService.lookup(-1, storeName + ':' + (String)path) == null)
{
LOGGER.debug("ignoring dangling rendition at " + storeName + ':' + (String)path);
if (logger.isDebugEnabled())
logger.debug("ignoring dangling rendition at " + storeName + ':' + (String)path);
}
else
{
@@ -255,9 +304,10 @@ import org.xml.sax.SAXException;
{
if (!this.equals(r.getPrimaryFormInstanceData()))
{
LOGGER.debug("rendition " + r +
" points at form instance data " + r.getPrimaryFormInstanceData() +
" instead of " + this + ". Not including in renditions list.");
if (logger.isDebugEnabled())
logger.debug("rendition " + r +
" points at form instance data " + r.getPrimaryFormInstanceData() +
" instead of " + this + ". Not including in renditions list.");
continue;
}
}