mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-06-30 18:15:39 +00:00
20794: Merged DEV/V3.3-BUG-FIX to V3.3 20792: Fix for unit test failures introduced by check in 20771 20791: ALF-3568: Include axiom jars in WAS shared library to solve Quickr connector issues 20785: Merged DEV/BELARUS/V3.3-BUG-FIX-2010_06_14 to DEV/V3.3-BUG-FIX 20644: Function for the browser window closing was implemented. For IE browser the trick with window opener was used. Fixes ALF-1004: After closing Details Space, user doesn't return to his previous location 20784: Fix for ALF-3516: Enterprise 3.X / Impossible to Create a Blog with Special Characters in the Title (?/!) 20783: Fix for ALF-1087: Documents checked-out from Share do not have "Upload new version" action in Alfresco Explorer 20782: Added multiday timed event handling to week view 20775: Merged V3.3 to DEV/V3.3-BUG-FIX 20670: Fix for ALF-3260: XSS attack is made in Wiki tab if First/Last user name contain xss. Also fixed double encoding errors found during regression testing. 20772: Update to node browser to show namespace of attributes. 20771: ALF-3591 - transferring rules. - also extends the behaviour filter. 20770: ALF-3186 - action parameter values are not fully transferred - need to handle d:any 20768: AVM - ALF-3611 (OrphanReaper + PurgeTestP + additional NPE fixes) 20765: (RECORD ONLY) Merged BRANCHES/V3.3 to BRANCHES/DEV/V3.3-BUG-FIX: 20708: DB2 build - add create/drop db ant targets (use DB2 cmdline - since not possible via JDBC/SQL) 20722: DB2 build - run db2cmd in same window (follow-on to r20708) 20764: Fix unreported JSON encoding issue with links components 20762: Fix ALF-2599: Share - Cannot search for user currently logged on 20759: DB2: fix FullNodeServiceTest.testLongMLTextValues (ALF-497) - TODO: fix create script when merging to HEAD 20756: DB2: fix JBPMEngine*Test.* (ALF-3640) - follow-on (upgrade patch) 20746: DB2: fix WebProjectServiceImplTest.testCreateWebProject (ALF-2300) 20744: DB2: fix JBPMEngine*Test.* (ALF-3640) - missed file 20743: DB2: fix JBPMEngine*Test.* (ALF-3640) 20729: AVM - fix purge store so that root nodes are actually orphaned (ALF-3627) - also prelim for ALF-3611 20720: (RECORD ONLY) ALF-3594: Merged HEAD to V3.3-BUGFIX 20616: ALF-2265: Share 'Uber Filter' part 2 - WebScriptNTLMAuthenticationFilter detached from its superclass and renamed to WebScriptSSOAuthenticationFilter - Now the filter simply chains to the downstream authentication filter rather than call its superclass - This means the same filter can be used for Kerberos-protected webscripts as well as NTLM - Wired globalAuthenticationFilter behind webscriptAuthenticationFilter in the filter chain in web.xml - Configured webscriptAuthenticationFilter for Kerberos subsystem 20719: Merged DEV/TEMPORARY to V3.3-BUGFIX 20696: ALF-3180: when using NTLM SSO, a user needs to log in first into the web UI before being able to mount alfresco using CIFS The absence of the missing person creation logic in “the org.alfresco.filesys.auth.cifs.PassthruCifsAuthenticator.authenticateUser()” method was fixed. 20718: Merged DEV/TEMPORARY to V3.3-BUGFIX 20659: ALF-3216: Incomplete settings for Lotus Quickr The protocol,host,port and context are removed from properties and a dependency on the org.alfresco.repo.admin.SysAdminParams interface is introduced. 20711: Latest SpringSurf libs - fix for ALF-3557 20710: Merged HEAD to BRANCHES/DEV/V3.3-BUG-FIX: 20705: Fix ALF-3585: AtomPub summary can render first part of binary content resulting in invalid XML 20691: Merged DEV/TEMPORARY to V3.3-BUGFIX 19404: ALF-220: Editor can't rename files and folders via WebDav The Rename method of FileFolderService was used in case of file renaming instead of move method in WebDAV MOVE command. 20663: ALF-3208 RenderingEngine actions should no longer appear in the list of available actions that can be fired using rules. 20656: ALF-2645: LDAP sync now logs 'dangling references' for debugging purposes 20651: ALF-485: FTP passthru authenticator logs authentication failures at debug level to avoid noise in the logs 20646: Merge V2.2 To V3.3 14301 : RECORD ONLY - ETWOTWO-1227 - fix to serialize FSR deployments. 14618 : RECORD ONLY - Merge HEAD to 2.2 13944 : After rename project deploy option disappears. 20637: ALF-3123: Avoid NPE on Oracle when loading empty string values persisted through JMX and the attribute service 20633: ALF-2057: LDAP synchronization lock now persists for a maximum of two minutes (instead of 24 hours!) - The exclusive lock gained for LDAP sync from the JobLockService is now refreshed at 1 minute intervals and never persists for more than 2 minutes 20628: ALF-1905: Allow use of anonymous bind for LDAP synchronization (NOT authentication) - Previously synchronization AND authentication shared the same setting for java.naming.security.authentication, meaning that if you tried to use anonymous bind for the synchronization side, the authentication side would complain. - Now there are two independent environments declared for the 'default' synchronization connection and the authentication connection - A new property ldap.synchronization.java.naming.security.authentication declares the authentication type used by synchronization. Set to "none" for anonymous bind. 20623: Fix for ALF-3188 : Access Denied when updating doc via CIFS 20620: Merge DEV to V3.3-BUG-FIX 20456 - ALF-1824 : Setting alfresco.rmi.services.host on linux does not use specified host/IP 20617: Merged DEV/BELARUS/V3.3-2010_06_08 to V3.3-BUG-FIX (with corrections) 20606: ALF-651: Web Services client ContentUtils.convertToByteArray is broken - org.alfresco.webservice.util.ContentUtils.convertToByteArray() method has been updated to cover large Input Streams conversion. - org.alfresco.webservice.test.ContentUtilsTest is a test for the new functionality implemented in the ContentUtils class. - org.alfresco.webservice.test.resources.big-content.pdf is a large content for the ContentUtilsTest.testInputStreamToByteArrayConversion() test. 20613: Fixed ALF-1746: Metadata extractors are unable to remove ALL aspect-related properties - putRawValue keeps hold of 'null' values - All policies keep hold of 'null' values - Only affects 'carryAspectProperties=false' 20609: Merged HEAD to V3.3-BUG-FIX 20578: ALF-3178 - Transfer Service - to transfer rule (ie. ruleFolder with it's children) the PathHelper should allow "-" (dash character) 20608: ALF-3178 - fix r20578 (mis-applied patch) 20594: WebDAV BitKinex compatibility fix - Let the XML Parser work out the body encoding if it is not declared in the Content-Type header 20588: (RECORD ONLY) Merged V3.3 to V3.3-BUG-FIX - Merged across all differences from V3.3 20778: Added revision to version label. 20777: Fix for ALF-2451 - installer correctly configure Share port 20722: DB2 build - run db2cmd in same window (follow-on to r20712) 20721: DB2 build - fix create target and add "/c" to exit "db2cmd" - TODO: add wait/timeout target, ideally checking for created DB git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@20796 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
415 lines
14 KiB
Java
415 lines
14 KiB
Java
/*
|
|
* Copyright (C) 2005-2010 Alfresco Software Limited.
|
|
*
|
|
* This file is part of Alfresco
|
|
*
|
|
* Alfresco is free software: you can redistribute it and/or modify
|
|
* it under the terms of the GNU Lesser General Public License as published by
|
|
* the Free Software Foundation, either version 3 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* Alfresco is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public License
|
|
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>. */
|
|
|
|
package org.alfresco.repo.avm;
|
|
|
|
import java.util.LinkedList;
|
|
import java.util.List;
|
|
|
|
import org.alfresco.repo.domain.DbAccessControlList;
|
|
import org.alfresco.repo.domain.avm.AVMHistoryLinkEntity;
|
|
import org.alfresco.repo.domain.avm.AVMMergeLinkEntity;
|
|
import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
|
|
import org.alfresco.service.cmr.repository.ContentData;
|
|
import org.alfresco.service.transaction.TransactionService;
|
|
import org.apache.commons.logging.Log;
|
|
import org.apache.commons.logging.LogFactory;
|
|
|
|
/**
|
|
* This is the background thread for reaping no longer referenced nodes in the AVM repository. These orphans arise from
|
|
* purge operations.
|
|
*
|
|
* @author britt
|
|
*/
|
|
public class OrphanReaper
|
|
{
|
|
public void execute()
|
|
{
|
|
synchronized (this)
|
|
{
|
|
if (fRunning)
|
|
{
|
|
if (fgLogger.isDebugEnabled())
|
|
{
|
|
fgLogger.debug("OrphanReaper is already running - just return");
|
|
}
|
|
|
|
return;
|
|
}
|
|
|
|
fRunning = true;
|
|
|
|
if (fgLogger.isTraceEnabled())
|
|
{
|
|
fgLogger.trace("Start running OrphanReaper ...");
|
|
}
|
|
}
|
|
try
|
|
{
|
|
do
|
|
{
|
|
doBatch();
|
|
if (fDone)
|
|
{
|
|
if (fgLogger.isTraceEnabled())
|
|
{
|
|
fgLogger.trace("OrphanReaper is done - just return");
|
|
}
|
|
return;
|
|
}
|
|
try
|
|
{
|
|
if (fgLogger.isTraceEnabled())
|
|
{
|
|
fgLogger.trace("OrphanReaper is not done - sleep for "+fActiveBaseSleep+" ms");
|
|
}
|
|
Thread.sleep(fActiveBaseSleep);
|
|
}
|
|
catch (InterruptedException e)
|
|
{
|
|
fgLogger.warn("OrphanReaper was interrupted - do nothing: "+e);
|
|
// Do nothing.
|
|
}
|
|
}
|
|
while (fActive);
|
|
}
|
|
finally
|
|
{
|
|
synchronized (this)
|
|
{
|
|
fRunning = false;
|
|
|
|
if (fgLogger.isTraceEnabled())
|
|
{
|
|
fgLogger.trace("... finish running OrphanReaper");
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
private Log fgLogger = LogFactory.getLog(OrphanReaper.class);
|
|
|
|
/**
|
|
* The Transaction Service
|
|
*/
|
|
private TransactionService fTransactionService;
|
|
|
|
/**
|
|
* Active base sleep interval.
|
|
*/
|
|
private long fActiveBaseSleep;
|
|
|
|
/**
|
|
* Batch size.
|
|
*/
|
|
private int fBatchSize;
|
|
|
|
/**
|
|
* Whether we are currently active, ie have work queued up.
|
|
*/
|
|
private boolean fActive;
|
|
|
|
/**
|
|
* The maximum length of the queue.
|
|
*/
|
|
private int fQueueLength;
|
|
|
|
/**
|
|
* The linked list containing ids of nodes that are purgable.
|
|
*/
|
|
private LinkedList<Long> fPurgeQueue;
|
|
|
|
private boolean fDone = false;
|
|
|
|
private boolean fRunning = false;
|
|
|
|
/**
|
|
* Create one with default parameters.
|
|
*/
|
|
public OrphanReaper()
|
|
{
|
|
fActiveBaseSleep = 1000;
|
|
fBatchSize = 50;
|
|
fQueueLength = 1000;
|
|
fActive = false;
|
|
}
|
|
|
|
// Setters for configuration.
|
|
|
|
/**
|
|
* Set the active base sleep interval.
|
|
*
|
|
* @param interval
|
|
* The interval to set in ms.
|
|
*/
|
|
public void setActiveBaseSleep(long interval)
|
|
{
|
|
fActiveBaseSleep = interval;
|
|
}
|
|
|
|
/**
|
|
* Set the batch size.
|
|
*
|
|
* @param size
|
|
* The batch size to set.
|
|
*/
|
|
public void setBatchSize(int size)
|
|
{
|
|
fBatchSize = size;
|
|
}
|
|
|
|
/**
|
|
* Set the transaction service.
|
|
*
|
|
* @param transactionService
|
|
* The service.
|
|
*/
|
|
public void setTransactionService(TransactionService transactionService)
|
|
{
|
|
fTransactionService = transactionService;
|
|
}
|
|
|
|
/**
|
|
* Set the maximum size of the queue of purgeable nodes.
|
|
*
|
|
* @param queueLength
|
|
* The max length.
|
|
*/
|
|
public void setMaxQueueLength(int queueLength)
|
|
{
|
|
fQueueLength = queueLength;
|
|
}
|
|
|
|
/**
|
|
* Start things up after configuration is complete.
|
|
*/
|
|
// public void init()
|
|
// {
|
|
// fThread = new Thread(this);
|
|
// fThread.start();
|
|
// }
|
|
/**
|
|
* Shutdown the reaper. This needs to be called when the application shuts down.
|
|
*/
|
|
public void shutDown()
|
|
{
|
|
fDone = true;
|
|
}
|
|
|
|
/**
|
|
* Sit in a loop, periodically querying for orphans. When orphans are found, unhook them in bite sized batches.
|
|
*/
|
|
// public void run()
|
|
// {
|
|
// while (!fDone)
|
|
// {
|
|
// synchronized (this)
|
|
// {
|
|
// try
|
|
// {
|
|
// wait(fActive? fActiveBaseSleep : fInactiveBaseSleep);
|
|
// }
|
|
// catch (InterruptedException ie)
|
|
// {
|
|
// // Do nothing.
|
|
// }
|
|
// doBatch();
|
|
// }
|
|
// }
|
|
// }
|
|
/**
|
|
* This is really for debugging and testing. Allows another thread to mark the orphan reaper busy so that it can
|
|
* monitor for it's being done.
|
|
*/
|
|
public void activate()
|
|
{
|
|
fActive = true;
|
|
}
|
|
|
|
/**
|
|
* See if the reaper is actively reaping.
|
|
*
|
|
* @return Whether this is actively reaping.
|
|
*/
|
|
public boolean isActive()
|
|
{
|
|
return fActive;
|
|
}
|
|
|
|
/**
|
|
* Do a batch of cleanup work.
|
|
*/
|
|
public void doBatch()
|
|
{
|
|
class TxnWork implements RetryingTransactionCallback<Object>
|
|
{
|
|
public Object execute() throws Exception
|
|
{
|
|
if (fPurgeQueue == null)
|
|
{
|
|
List<AVMNode> nodes = AVMDAOs.Instance().fAVMNodeDAO.getOrphans(fQueueLength);
|
|
if (nodes.size() == 0)
|
|
{
|
|
if (fgLogger.isTraceEnabled())
|
|
{
|
|
fgLogger.trace("Nothing to purge (set fActive = false)");
|
|
}
|
|
|
|
fActive = false;
|
|
return null;
|
|
}
|
|
fPurgeQueue = new LinkedList<Long>();
|
|
for (AVMNode node : nodes)
|
|
{
|
|
fPurgeQueue.add(node.getId());
|
|
}
|
|
}
|
|
|
|
if (fgLogger.isDebugEnabled())
|
|
{
|
|
fgLogger.debug("Found orphan nodes (fpurgeQueue size = "+fPurgeQueue.size()+")");
|
|
}
|
|
|
|
fActive = true;
|
|
for (int i = 0; i < fBatchSize; i++)
|
|
{
|
|
if (fPurgeQueue.size() == 0)
|
|
{
|
|
if (fgLogger.isDebugEnabled())
|
|
{
|
|
fgLogger.debug("Purge queue is empty (fpurgeQueue size = "+fPurgeQueue.size()+")");
|
|
}
|
|
|
|
fPurgeQueue = null;
|
|
return null;
|
|
}
|
|
|
|
Long nodeId = fPurgeQueue.removeFirst();
|
|
AVMNode node = AVMDAOs.Instance().fAVMNodeDAO.getByID(nodeId);
|
|
if (node == null)
|
|
{
|
|
// eg. cluster, multiple reapers
|
|
|
|
fgLogger.warn("Node ["+nodeId+"] not found - assume multiple reapers ...");
|
|
|
|
continue;
|
|
}
|
|
|
|
// Save away the ancestor and merged from fields from this node.
|
|
|
|
AVMNode ancestor = null;
|
|
AVMHistoryLinkEntity hlEntity = AVMDAOs.Instance().newAVMNodeLinksDAO.getHistoryLinkByDescendent(node.getId());
|
|
if (hlEntity != null)
|
|
{
|
|
ancestor = AVMDAOs.Instance().fAVMNodeDAO.getByID(hlEntity.getAncestorNodeId());
|
|
AVMDAOs.Instance().newAVMNodeLinksDAO.deleteHistoryLink(hlEntity.getAncestorNodeId(), hlEntity.getDescendentNodeId());
|
|
}
|
|
|
|
AVMNode mergedFrom = null;
|
|
AVMMergeLinkEntity mlEntity = AVMDAOs.Instance().newAVMNodeLinksDAO.getMergeLinkByTo(node.getId());
|
|
if (mlEntity != null)
|
|
{
|
|
mergedFrom = AVMDAOs.Instance().fAVMNodeDAO.getByID(mlEntity.getMergeFromNodeId());
|
|
AVMDAOs.Instance().newAVMNodeLinksDAO.deleteMergeLink(mlEntity.getMergeFromNodeId(), mlEntity.getMergeToNodeId());
|
|
}
|
|
|
|
// Get all the nodes that have this node as ancestor.
|
|
List<AVMHistoryLinkEntity> hlEntities = AVMDAOs.Instance().newAVMNodeLinksDAO.getHistoryLinksByAncestor(node.getId());
|
|
for (AVMHistoryLinkEntity link : hlEntities)
|
|
{
|
|
AVMNode desc = AVMDAOs.Instance().fAVMNodeDAO.getByID(link.getDescendentNodeId());
|
|
if (desc != null)
|
|
{
|
|
desc.setAncestor(ancestor);
|
|
if (desc.getMergedFrom() == null)
|
|
{
|
|
desc.setMergedFrom(mergedFrom);
|
|
}
|
|
}
|
|
AVMDAOs.Instance().newAVMNodeLinksDAO.deleteHistoryLink(link.getAncestorNodeId(), link.getDescendentNodeId());
|
|
}
|
|
// Get all the nodes that have this node as mergedFrom
|
|
List<AVMMergeLinkEntity> mlEntities = AVMDAOs.Instance().newAVMNodeLinksDAO.getMergeLinksByFrom(node.getId());
|
|
for (AVMMergeLinkEntity link : mlEntities)
|
|
{
|
|
AVMNode mto = AVMDAOs.Instance().fAVMNodeDAO.getByID(link.getMergeToNodeId());
|
|
if (mto != null)
|
|
{
|
|
mto.setMergedFrom(ancestor);
|
|
}
|
|
AVMDAOs.Instance().newAVMNodeLinksDAO.deleteMergeLink(link.getMergeFromNodeId(), link.getMergeToNodeId());
|
|
}
|
|
|
|
// Get rid of all properties belonging to this node.
|
|
AVMDAOs.Instance().fAVMNodeDAO.deleteProperties(node.getId());
|
|
|
|
// Get rid of all aspects belonging to this node.
|
|
AVMDAOs.Instance().fAVMNodeDAO.deleteAspects(node.getId());
|
|
|
|
// Get rid of ACL.
|
|
DbAccessControlList acl = node.getAcl();
|
|
node.setAcl(null);
|
|
// Unused acls will be garbage collected
|
|
// Many acls will be shared
|
|
// Extra work for directories.
|
|
if (node.getType() == AVMNodeType.PLAIN_DIRECTORY || node.getType() == AVMNodeType.LAYERED_DIRECTORY)
|
|
{
|
|
// First get rid of all child entries for the node.
|
|
AVMDAOs.Instance().fChildEntryDAO.deleteByParent(node);
|
|
}
|
|
else if (node.getType() == AVMNodeType.PLAIN_FILE)
|
|
{
|
|
PlainFileNode file = (PlainFileNode)node;
|
|
if (file.isLegacyContentData())
|
|
{
|
|
// We quickly convert the old ContentData to the new storage
|
|
ContentData contentData = file.getContentData();
|
|
file.setContentData(contentData);
|
|
}
|
|
Long contentDataId = file.getContentDataId();
|
|
if (contentDataId != null)
|
|
{
|
|
// The ContentDataDAO will take care of dereferencing and cleanup
|
|
AVMDAOs.Instance().contentDataDAO.deleteContentData(contentDataId);
|
|
}
|
|
}
|
|
// Finally, delete it
|
|
AVMDAOs.Instance().fAVMNodeDAO.delete(node);
|
|
|
|
if (fgLogger.isTraceEnabled())
|
|
{
|
|
fgLogger.trace("Deleted Node ["+node.getId()+"]");
|
|
}
|
|
}
|
|
return null;
|
|
}
|
|
}
|
|
try
|
|
{
|
|
if (!fTransactionService.isReadOnly())
|
|
{
|
|
fTransactionService.getRetryingTransactionHelper().doInTransaction(new TxnWork());
|
|
}
|
|
}
|
|
catch (Exception e)
|
|
{
|
|
fgLogger.error("Garbage collector error", e);
|
|
}
|
|
}
|
|
}
|