inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-24 17:32:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged V2.1 to HEAD

Browse Source 
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
This commit is contained in:
Derek Hulley
2007-09-10 22:07:27 +00:00
parent 4711101687
commit f44d8cb56c
3 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/alfresco/workflow/submit_processdefinition.xml
View File

@@ -229,7 +229,7 @@
<end-state name="end"/> <end-state name="end"/>
<event type="process-end"> <event type="process-end">
<action class="org.alfresco.repo.avm.wf.AVMRemoveAllWebappsHandler"/> <action class="org.alfresco.repo.avm.wf.AVMRemoveAllSrcWebappsHandler"/>
<action class="org.alfresco.repo.avm.wf.AVMRemoveWFStoreHandler"/> <action class="org.alfresco.repo.avm.wf.AVMRemoveWFStoreHandler"/>
</event> </event>

8
source/java/org/alfresco/repo/avm/wf/AVMRemoveAllWebappsHandler.java → source/java/org/alfresco/repo/avm/wf/AVMRemoveAllSrcWebappsHandler.java
View File

@@ -22,7 +22,7 @@
* *
* *
* Author Jon Cox <jcox@alfresco.com> * Author Jon Cox <jcox@alfresco.com>
* File AVMRemoveAllWebappsHandler.java * File AVMRemoveAllSrcWebappsHandler.java
*----------------------------------------------------------------------------*/ *----------------------------------------------------------------------------*/
package org.alfresco.repo.avm.wf; package org.alfresco.repo.avm.wf;
@@ -49,12 +49,12 @@ import org.springframework.context.ApplicationContext;
* *
* @author Jon Cox * @author Jon Cox
*/ */
public class AVMRemoveAllWebappsHandler extends JBPMSpringActionHandler public class AVMRemoveAllSrcWebappsHandler extends JBPMSpringActionHandler
{ {
static final long serialVersionUID = 3004374776252613278L; static final long serialVersionUID = 3004374776252613278L;
private static Logger log = private static Logger log =
Logger.getLogger(AVMRemoveAllWebappsHandler.class); Logger.getLogger(AVMRemoveAllSrcWebappsHandler.class);
/** /**
* The AVMService instance. * The AVMService instance.
@@ -79,7 +79,7 @@ public class AVMRemoveAllWebappsHandler extends JBPMSpringActionHandler
public void execute(ExecutionContext executionContext) throws Exception public void execute(ExecutionContext executionContext) throws Exception
{ {
if (log.isDebugEnabled()) if (log.isDebugEnabled())
log.debug("AVMRemoveAllWebappsHandler.execute()"); log.debug("AVMRemoveAllSrcWebappsHandler.execute()");
// retrieve submitted package // retrieve submitted package
NodeRef pkg = ((JBPMNode)executionContext.getContextInstance(). NodeRef pkg = ((JBPMNode)executionContext.getContextInstance().

13
source/java/org/alfresco/repo/avm/wf/AVMSubmitPackageHandler.java
View File

@@ -53,7 +53,7 @@ public class AVMSubmitPackageHandler
{ {
private static final long serialVersionUID = 4113360751217684995L; 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. */ /** The AVMService instance. */
private AVMService fAVMService; private AVMService fAVMService;
@@ -99,7 +99,8 @@ public class AVMSubmitPackageHandler
final AVMNodeDescriptor pkgDesc = fAVMService.lookup(pkgPath.getFirst(), pkgPath.getSecond()); final AVMNodeDescriptor pkgDesc = fAVMService.lookup(pkgPath.getFirst(), pkgPath.getSecond());
final String from = (String)executionContext.getContextInstance().getVariable("wcmwf_fromPath"); final String from = (String)executionContext.getContextInstance().getVariable("wcmwf_fromPath");
final String targetPath = pkgDesc.getIndirection(); 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 // submit the package changes
final String description = (String)executionContext.getContextInstance().getVariable("bpm_workflowDescription"); 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) 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); AVMNodeDescriptor desc = fAVMService.lookup(version, path, true);
if (desc.isFile() || desc.isDeletedFile()) if (desc.isFile() || desc.isDeletedFile())
{ {
@@ -172,9 +174,10 @@ public class AVMSubmitPackageHandler
desc = history.get(1); desc = history.get(1);
} }
for (final AVMNodeDescriptor child : fAVMService.getDirectoryListingArray(desc.getVersionID(), desc.getPath(), true)) Map<String, AVMNodeDescriptor> list = fAVMService.getDirectoryListing(desc, true);
for (AVMNodeDescriptor child : list.values())
{ {
this.recursivelyRemoveLocks(webProject, child.getVersionID(), child.getPath()); recursivelyRemoveLocks(webProject, child.getVersionID(), child.getPath());
} }
} }
} }