From f44d8cb56c1d051b9d2dfec2fe03f153722ebc60 Mon Sep 17 00:00:00 2001 From: Derek Hulley Date: Mon, 10 Sep 2007 22:07:27 +0000 Subject: [PATCH] Merged V2.1 to HEAD 6436: Support for virtualized cookie paths, aggressive cleanup of sockets when virt server is down. 6439: Fix for WCM-619 & WCM-571 6440: Encoding of text/html files created inline using the web-client now has sensible default. AWC-1324. 6442: Fix for WCM-621 (reviewer can not view or run links report) 6443: Fix for AWC-1488. Dashboard 6444: Fix for WCM-693 issue with submitting a deleted directory if no workflow associated with web project. 6445: Icons for use in fix for WCM-522 6446: Office Add-Ins: Fix for AWC-1481 - Login dialog can appear recursively git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6733 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../alfresco/workflow/submit_processdefinition.xml | 2 +- ...dler.java => AVMRemoveAllSrcWebappsHandler.java} | 8 ++++---- .../repo/avm/wf/AVMSubmitPackageHandler.java | 13 ++++++++----- 3 files changed, 13 insertions(+), 10 deletions(-) rename source/java/org/alfresco/repo/avm/wf/{AVMRemoveAllWebappsHandler.java => AVMRemoveAllSrcWebappsHandler.java} (94%) diff --git a/config/alfresco/workflow/submit_processdefinition.xml b/config/alfresco/workflow/submit_processdefinition.xml index 0d39a21685..b10997912d 100644 --- a/config/alfresco/workflow/submit_processdefinition.xml +++ b/config/alfresco/workflow/submit_processdefinition.xml @@ -229,7 +229,7 @@ - + diff --git a/source/java/org/alfresco/repo/avm/wf/AVMRemoveAllWebappsHandler.java b/source/java/org/alfresco/repo/avm/wf/AVMRemoveAllSrcWebappsHandler.java similarity index 94% rename from source/java/org/alfresco/repo/avm/wf/AVMRemoveAllWebappsHandler.java rename to source/java/org/alfresco/repo/avm/wf/AVMRemoveAllSrcWebappsHandler.java index 13fece4219..ad03523523 100644 --- a/source/java/org/alfresco/repo/avm/wf/AVMRemoveAllWebappsHandler.java +++ b/source/java/org/alfresco/repo/avm/wf/AVMRemoveAllSrcWebappsHandler.java @@ -22,7 +22,7 @@ * * * Author Jon Cox -* File AVMRemoveAllWebappsHandler.java +* File AVMRemoveAllSrcWebappsHandler.java *----------------------------------------------------------------------------*/ package org.alfresco.repo.avm.wf; @@ -49,12 +49,12 @@ import org.springframework.context.ApplicationContext; * * @author Jon Cox */ -public class AVMRemoveAllWebappsHandler extends JBPMSpringActionHandler +public class AVMRemoveAllSrcWebappsHandler extends JBPMSpringActionHandler { static final long serialVersionUID = 3004374776252613278L; private static Logger log = - Logger.getLogger(AVMRemoveAllWebappsHandler.class); + Logger.getLogger(AVMRemoveAllSrcWebappsHandler.class); /** * The AVMService instance. @@ -79,7 +79,7 @@ public class AVMRemoveAllWebappsHandler extends JBPMSpringActionHandler public void execute(ExecutionContext executionContext) throws Exception { if (log.isDebugEnabled()) - log.debug("AVMRemoveAllWebappsHandler.execute()"); + log.debug("AVMRemoveAllSrcWebappsHandler.execute()"); // retrieve submitted package NodeRef pkg = ((JBPMNode)executionContext.getContextInstance(). diff --git a/source/java/org/alfresco/repo/avm/wf/AVMSubmitPackageHandler.java b/source/java/org/alfresco/repo/avm/wf/AVMSubmitPackageHandler.java index e5a52366ff..813fd26b91 100644 --- a/source/java/org/alfresco/repo/avm/wf/AVMSubmitPackageHandler.java +++ b/source/java/org/alfresco/repo/avm/wf/AVMSubmitPackageHandler.java @@ -53,7 +53,7 @@ public class AVMSubmitPackageHandler { private static final long serialVersionUID = 4113360751217684995L; - private static final Log LOGGER = LogFactory.getLog(AVMSubmitPackageHandler.class); + private static final Log logger = LogFactory.getLog(AVMSubmitPackageHandler.class); /** The AVMService instance. */ private AVMService fAVMService; @@ -99,7 +99,8 @@ public class AVMSubmitPackageHandler final AVMNodeDescriptor pkgDesc = fAVMService.lookup(pkgPath.getFirst(), pkgPath.getSecond()); final String from = (String)executionContext.getContextInstance().getVariable("wcmwf_fromPath"); final String targetPath = pkgDesc.getIndirection(); - LOGGER.debug("handling submit of " + pkgPath.getSecond() + " from " + from + " to " + targetPath); + if (logger.isDebugEnabled()) + logger.debug("handling submit of " + pkgPath.getSecond() + " from " + from + " to " + targetPath); // submit the package changes final String description = (String)executionContext.getContextInstance().getVariable("bpm_workflowDescription"); @@ -153,7 +154,8 @@ public class AVMSubmitPackageHandler */ private void recursivelyRemoveLocks(final String webProject, final int version, final String path) { - LOGGER.debug("removing lock on " + path); + if (logger.isDebugEnabled()) + logger.debug("removing lock on " + path); AVMNodeDescriptor desc = fAVMService.lookup(version, path, true); if (desc.isFile() || desc.isDeletedFile()) { @@ -172,9 +174,10 @@ public class AVMSubmitPackageHandler desc = history.get(1); } - for (final AVMNodeDescriptor child : fAVMService.getDirectoryListingArray(desc.getVersionID(), desc.getPath(), true)) + Map list = fAVMService.getDirectoryListing(desc, true); + for (AVMNodeDescriptor child : list.values()) { - this.recursivelyRemoveLocks(webProject, child.getVersionID(), child.getPath()); + recursivelyRemoveLocks(webProject, child.getVersionID(), child.getPath()); } } }