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 V3.2 to HEAD

Browse Source 
17410: Merged V3.1 to V3.2
      16667: (record-only) Fix ETHREEOH-2477 - group-based perms (MT env)
      16883: Fix ETHREEOH-1544 - cannot paste an item, if cut from another web project (modifyLock errror)
      16918: Fix ETHREEOH-3053 - Deployment of non-stale file in a stale layered folder removes the file from FSR
      16947: (record-only) Temporarily comment-out testSubmitChangedAssets1 (intermittent permission failure)
      17162: Fix ETHREEOH-2850 - submitting delete of (web form) xml instance does not submit the associated deleted renditions
      17319: Fix ETHREEOH-3111 - ManageReviewTaskDialog (fix-up contributed patch)
   17418: Merged V3.1 to V3.2
      17141: Fix ETHREEOH-3088: Cut/Paste into self causes stack overflow
      17216: Fixed ETHREEOH-3170: DB errors on MSSQL with Snapshot Isolation enabled while CIFS copying
      17255: Fixed ETHREEOH-3180: Error appears when trying to search resources on Manage Task page
   17419: Fix for ETHREEOH-3296: Enterprise 3.X / Permissions Error When Cut & Paste on Sub-Folder
   17421: Review and tweaks of DB script port
   17423: Follow-on for ETHREEOH-3088
   17424: Missed check-in for ETHREEOH-3032 (CHK-10240)
   17437: ETHREEOH-2790 - OpenOffice-startup-context.xml needs to also initiate the connection to OpenOffice
   17441: Build fix: Fix AVM permission inheritance to match DM and fix common permission dao component
   17470: Fix for ETHREEOH-3350: Admin Console - Viewing user properties for user without home folder throws exception
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /alfresco/BRANCHES/V3.1:r16667,16883,16918,16947,17141,17162,17216,17255,17319
   Merged /alfresco/BRANCHES/V3.2:r17410,17418-17419,17421,17423-17424,17437,17441,17470


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18137 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2010-01-19 13:18:50 +00:00
parent 60a9007e8e
commit 6b8cf8d13b
26 changed files with 9924 additions and 9759 deletions
Download Patch File Download Diff File Expand all files Collapse all files

95
source/java/org/alfresco/repo/deploy/DeploymentServiceImpl.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2005-2009 Alfresco Software Limited.
* Copyright (C) 2005-2009 Alfresco Software Limited.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -425,12 +425,12 @@ public class DeploymentServiceImpl implements DeploymentService
String name = entry.getKey();
AVMNodeDescriptor srcNode = entry.getValue();
if (isStale(srcNode))
if (isStale(srcNode))
{
if (fgLogger.isDebugEnabled())
{
fgLogger.debug("Stale child found: " + srcNode);
}
if (fgLogger.isDebugEnabled())
{
fgLogger.debug("Stale child found: " + srcNode);
}
srcList.remove(name);
}
}
@@ -646,12 +646,12 @@ public class DeploymentServiceImpl implements DeploymentService
/**
* Temporary work around for staleness.
*/
if (isStale(child))
if (isStale(child))
{
if (fgLogger.isDebugEnabled())
{
fgLogger.debug("Stale child found: " + child);
}
if (fgLogger.isDebugEnabled())
{
fgLogger.debug("Stale child found: " + child);
}
continue;
}
@@ -1252,11 +1252,11 @@ public class DeploymentServiceImpl implements DeploymentService
* Correct fix would be to remove stale files from the snapshot.
* Code becomes obsolete once stale files are not part of the snapshot.
*/
if (isStale(src))
if (isStale(src))
{
if (fgLogger.isDebugEnabled())
{
fgLogger.debug("Stale child found: " + src);
fgLogger.debug("Stale child found: " + src);
}
src = null;
continue;
@@ -1440,14 +1440,14 @@ public class DeploymentServiceImpl implements DeploymentService
{
if (!excluded(matcher, child.getPath(), null))
{
if (isStale(child))
{
if (fgLogger.isDebugEnabled())
{
fgLogger.debug("Stale child found: " + child);
}
continue;
}
if (isStale(child))
{
if (fgLogger.isDebugEnabled())
{
fgLogger.debug("Stale child found: " + child);
}
continue;
}
createOnFSR(service, ticket, version, child, dstPath, matcher, sendQueue);
}
}
@@ -1867,25 +1867,36 @@ public class DeploymentServiceImpl implements DeploymentService
}
}
}
private boolean isStale(AVMNodeDescriptor avmRef)
{
// note: currently specific to WCM use-cases, eg. ETHREEOH-2758
if ((avmRef.isLayeredDirectory() && avmRef.isPrimary()) || avmRef.isLayeredFile())
{
AVMNodeDescriptor parentNode = avmRef;
while((parentNode.isLayeredDirectory() && parentNode.isPrimary()) || parentNode.isLayeredFile())
{
AVMNodeDescriptor childNode = fAVMService.lookup(avmRef.getIndirectionVersion(), avmRef.getIndirection());
if(childNode == null)
{
// The child node is missing
return true;
}
parentNode = childNode;
}
}
return false;
}
private boolean isStale(AVMNodeDescriptor avmRef)
{
// note: currently specific to WCM use-cases, eg. ETHREEOH-2758
if ((avmRef.isLayeredDirectory() && avmRef.isPrimary()) || avmRef.isLayeredFile())
{
AVMNodeDescriptor srcNode = avmRef;
while ((srcNode.isLayeredDirectory() && srcNode.isPrimary()) || srcNode.isLayeredFile())
{
AVMNodeDescriptor targetNode = fAVMService.lookup(srcNode.getIndirectionVersion(), srcNode.getIndirection());
if (targetNode == null)
{
if (srcNode.isLayeredFile() ||
(srcNode.isLayeredDirectory() &&
(! srcNode.getOpacity()) &&
fAVMService.getDirectoryListingDirect(srcNode, false).isEmpty()))
{
// The target node is missing
return true;
}
else
{
// unbacked layered dir - however opaque or not directly empty
return false;
}
}
srcNode = targetNode;
}
}
return false;
}
}