mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-06-30 18:15:39 +00:00
31072: Incremented version.revision for 3.4.7 31082: Merged DEV to V3.4-BUG-FIX 31077: ALF-9661: Adding or removing associations does not trigger 'update' rule. 1. Unit test for replicating. 2. SingleAssocRefPolicyRuleTrigger now handles trigger of the rules on the list of parents. 31115: Merged DEV/TEMPORARY to V3.4-BUG-FIX 30992: ALF-10029 : Webdav error when document type is missing Correcting directory listing. Display reader's mimetype if display label for mimetype couldn't be found. 31116: Merged DEV/TEMPORARY to V3.4-BUG-FIX 31114: ALF-10309 : CLONE -WebDAV - Canceling "save as" upload will create 0 byte content Logic was added to PutMethod that removes empty files if a save operation is cancelled or fails. 31157: ALF-10757: Merged HEAD to V3.4-BUG-FIX 31154: Synchronize file writes from CIFS. ALF-10721. 31188: Merged DEV/TEMPORARY to V3.4-BUG-FIX 31176: ALF-9979: Error thrown when adding user(s) to group in explorer if user already exists in group Implemented checking of the user presence in the particular group using getAuthService().getContainedAuthorities() 31189: Merged DEV/TEMPORARY to V3.4-BUG-FIX 31174: ALF-9684: CMIS AtomPub: The combination of includeRelationships=both and returnVersion=latestmajor returns an internal server error Try-catch block was added for nodeService.getSourceAssocs(node, RegexQNamePattern.MATCH_ALL) operation. This operation is not supported for a version store. 31190: Merged DEV/TEMPORARY to V3.4-BUG-FIX 20694: ALF-925: "title" property always gets populated with the name of a file when content without a file extension is added via Webdav. When user creates file through webdav, "title" property was populated with "name" property value. The code that was doing it has been removed. Now the title will be empty in such a case. This makes things consistent with CIFS and FTP, where you have to create a rule with action "Extract common metadata fields from content". 31217: ALF-10807: Share document download with SSL - Fix from Bitrock 31226: ALF-10632: Added a sample configuration fragment for war-deployers-jboss-beans.xml because it's rather tricky to publish the correct configuration in the docs! 31265: ALF-9999 Cannot search pdf files, which are written vertically. Sample configures PdfMiner as the pdf -> text and ??? -> pdf -> text transformer rather than PDFBox. PdfMiner is slower but does handle vertical text. 31268: ALF-9093 Alfresco incapable of previewing text files including non Western European characters Sample file that configures OpenOffice as the default handler for text to PDF conversions 31304: Merged BRANCHES/DEV/BELARUS/HEAD-2011_10_05 to BRANCHES/DEV/V3.4-BUG-FIX: 31291: ALF-9460 : Archived discussion posts break display of the discussed node when users do not have access to the trash can 31313: Fix for JBPM security issues with timers and async tasks. ALF-10776: Workflow timer fires a policy that causes a AuthenticationCredentialsNotFoundException ALF-6405: SecureContext issue if task node async property is set to "true" 31314: Fixed ALF-10373 "There is no path to the folder for "Move" action inside the rule's description." 31361: Fixed ALF-10930. Incorrect description of 'xam.archive.forceBackgroundStoreMove' 31366: ALF-3756 - original fix didn't cope with existing MLText having one or more language variants. ...upgrading to the fix would therefore not solve the problem properly. For example, if a property has en_GB text in it, then 'updating' that property with a locale of en_US will result in the addition of the en_US text rather than a true update (they're both English, and using two slightly differently configured browsers in this way leads to confusion). 31387: ALF-10740: Flash upload - Working Copy label not removed on check in if non english locale is used in Share client Two separate problems were fixed: * Locale string as supplied by the flash uploader was being placed into the language portion of the Locale object in java, therefore no proper match was made when looking up the working copy label (e.g. "(Working Copy)") - fixed by using a proper locale string parser as supplied by Surf. * Working copy label could still fail to be removed if document was checked out under one locale and checked in using another. Fix provided by recording the *original* working copy label against the cm:workingcopy aspect. 31395: ALF-3756: fixes broken FullNodeServiceTest 31399: ALF-3756: fixing build failures from -c31366 (VersionServiceImplText.testRevert()) A ConcurrentModificationException was being thrown, have changed the way that the hashmap is processed to avoid this. 31401: Fix for ALF-2980 31410: Fix for ALF-10961 - Share - Sites not displayed on dashboard 31418: ALF-10768 Environment variables are being used to replace property placeholders in xml configuration files Modified ALL spring beans that are a PropertyPlaceholderConfigurer (including sub classes) and the PropertyPlaceholderConfigurer created ChildApplicationContextFactory so that OS environment variables are not used in property place holder substitutions. Spring 3 started allowing OS environment variables to be used by default. This may explain why we have so many install problems. 31420: ALF-3756 another compile error: This time StoreSelectorAspectContentStoreTest 31425: ALF-10740: Fix from -c 31387 (compilation error) This fix is in addition to -c31420. The compilation error was due to me not having the bug fix branch configured as an enterprise project. 31458: Fix for ALF-10916 31459: Fix for ALF-10915 31482: ALF-10915 - Fix build 31491: Various oplock, access mode and CIFS protocol fixes ported from v4/HEAD. ALF-10331. 31492: File open access mode checks ported from v4/HEAD. ALF-10331. 31529: ALF-11144: NPE during incremental LDAP sync 31530: Fixed ALF-11139: Audit concurrency exceptions do not trigger transaction retries - AuditMethodInterceptor allows audit exceptions to propagate out 31606: ALF-10309 CLONE -WebDAV - Cancelling "save as" upload will create 0 byte content Changed name of aspect to be WebDAV specific (rather than using a CIFS value), so that it might be possible to tidy these up in future. 31638: Fix for ALF-10597 - Share - Upload new version issue - OK button displayed during refresh 31639: Fix for ALF-10297 JSF - Sort by First/Last Name in Groups Management not working 31641: ALF-9776 - Fix for WCM - it allows users to submit contents to Staging with past Launch and Expiration Date 31653: ALF-8906: Ensure entire IMAP service startup transaction runs as system, to allow for any auto-aspect adding / versioning during cache warming 31654: Merged V3.4 to V3.4-BUG-FIX 31327: ALF-10878 Merged HEAD to V3.4 30225: ALF-10001 Update SiteService.listMembers to check group display names as well as group names, plus test 31329: Merged V3.4-BUG-FIX (3.4.7) to V3.4 (3.4.6) 30992: ALF-10029 : Webdav error when document type is missing Correcting directory listing. Display reader's mimetype if display label for mimetype couldn't be found. 31462: ALF-10010 Document can not be found even after a full reindex. Sample configures xpdf as the pdf -> text and ??? -> pdf -> text transformer rather than PDFBox. 31478: Merged BELARUS/V3.4-BUG-FIX-2011_10_13 to V3.4 (3.4.6) 31460: ALF-10952: User is unable to edit own profile using Alfresco Share To compare two objects it needs to use equals() method instead of ==. Such a check was changed in UsageQuotaProtector.onUpdateProperties() method. 31502: ALF-10324 Cannot disable Home Folder Creation 2nd part to the problem. Folders were being created when "Show all" was pressed in the UI 31504: Fix for ALF-9589 - Share - Advanced Search is not IE7 compatible for other themes 31531: ALF-10324 Cannot disable Home Folder Creation There is a knock on effect to ContentUsageService when the user does not exist and we are not allowed to create missing users. Resulted in 2 DMDeploymentTargetTest failures 31532: ALF-10955 No pooled task created for moderated site managers if any user requested to join Going with David Wards suggestion of still using getContainingAuthoritiesInZone with a null zone and a cut off at 100. The 100 might be too small, but probably is okay. 31655: ALF-10187: Merged V3.3 to V3.4-BUG-FIX 31180: ALF-9898: CIFS packet pool leaks - File state manager op lock break expiry thread was never getting started so some deferred packets were never getting released! - Synchronize around m_borrowed to prevent ConcurrentModificationExceptions in diagnostics - Synchronize around m_selector.keys() to prevent ConcurrentModificationExceptions during session reaping 31244: Merged DEV/BELARUS/V3.4-BUG-FIX-2011_09_29_CIFS to V3.3 ALF-10831: CIFS concurrency issues under load - Atomic synchronized write AND read operations in FileStateCache, TreeConnection, SrvSessionList, VirtualCircuit, VirtualCircuitList, ContentQuotaManager 31245: Merged DEV/BELARUS/V3.4-BUG-FIX-2011_09_29_CIFS to V3.3 ALF-9540: copy from drive to CIFS is slower than direct drive to drive copy by a factor of ~ 15 - batchRemoveRequest added to ThreadRequestQueue, meaning that not all incoming packets are scatter-gunned across different worker threads and reducing context switching - Arseny's tests show that combined with 3.4.6 changes, the factor is now under 2! 31246: ALF-9898: Merged HEAD to V3.3 31154: Synchronize file writes from CIFS. ALF-10721. 31233: Fixed a possible memory leak in the CIFS oplock timeout handler. 31273: ALF-9540: Reversed batchRemoveRequest changes - Review by Gary. Thread pool may not be utilized properly when multiple virtual connections are being handled at once. 31576: Changes to the CIFS idle session reaper so that it runs in the main socket event thread. ALF-9898. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@31657 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
255 lines
8.3 KiB
Java
255 lines
8.3 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.util;
|
|
|
|
import java.util.concurrent.ArrayBlockingQueue;
|
|
import java.util.concurrent.BlockingQueue;
|
|
import java.util.concurrent.LinkedBlockingQueue;
|
|
import java.util.concurrent.RejectedExecutionHandler;
|
|
import java.util.concurrent.ThreadPoolExecutor;
|
|
import java.util.concurrent.TimeUnit;
|
|
|
|
import org.alfresco.error.AlfrescoRuntimeException;
|
|
import org.springframework.beans.factory.DisposableBean;
|
|
import org.springframework.beans.factory.FactoryBean;
|
|
import org.springframework.beans.factory.InitializingBean;
|
|
|
|
/**
|
|
* Factory for {@link java.util.concurrent.ThreadPoolExecutor} instances,
|
|
* which cannot easily be constructed using constructor injection. This instance
|
|
* also allows the setting of the thread-specific properties that would otherwise
|
|
* require setting a <code>ThreadFactory</code>.
|
|
* <p>
|
|
* This factory provides the a singleton instance of the pool.
|
|
* <p>
|
|
* Defaults are:
|
|
* <ul>
|
|
* <li><b>{@link #setCorePoolSize(int) corePoolSize}: </b>
|
|
* 20</li>
|
|
* <li><b>{@link #setMaximumPoolSize(int) maximumPoolSize}: </b>
|
|
* Equal to the {@link #setCorePoolSize(int)} at the time of instance creation</li>
|
|
* <li><b>{@link #setKeepAliveTime(int) keepAliveTime}: </b>
|
|
* 90 seconds</li>
|
|
* <li><b>{@link #setThreadPriority(int) threadPriority}: </b>
|
|
* 5 (NORM)</li>
|
|
* <li><b>{@link #setThreadDaemon(boolean) threadDaemon}: </b>
|
|
* true</li>
|
|
* <li><b>{@link #setWorkQueueSize(int) workQueueSize}: </b>
|
|
* -1 or less (No upper bound)</li>
|
|
* <li><b>{@link #setRejectedExecutionHandler(RejectedExecutionHandler) rejectedExecutionHandler: </b>
|
|
* <code>ThreadPoolExecutor.CallerRunsPolicy</code></li>
|
|
* </ul>
|
|
*
|
|
* @author Derek Hulley
|
|
*/
|
|
public class ThreadPoolExecutorFactoryBean implements FactoryBean, InitializingBean, DisposableBean
|
|
{
|
|
private static final int DEFAULT_CORE_POOL_SIZE = 20;
|
|
private static final int DEFAULT_MAXIMUM_POOL_SIZE = -1; // -1 is a sign that it must match the core pool size
|
|
private static final int DEFAULT_KEEP_ALIVE_TIME = 90; // seconds
|
|
private static final int DEFAULT_THREAD_PRIORITY = Thread.NORM_PRIORITY;
|
|
private static final boolean DEFAULT_THREAD_DAEMON = Boolean.TRUE;
|
|
private static final int DEFAULT_WORK_QUEUE_SIZE = -1;
|
|
private static final RejectedExecutionHandler DEFAULT_REJECTED_EXECUTION_HANDLER = new ThreadPoolExecutor.CallerRunsPolicy();
|
|
private String poolName = "";
|
|
|
|
private int corePoolSize;
|
|
private int maximumPoolSize;
|
|
private int keepAliveTime;
|
|
private int threadPriority;
|
|
private boolean threadDaemon;
|
|
private int workQueueSize;
|
|
private RejectedExecutionHandler rejectedExecutionHandler;
|
|
/** the instance that will be given out by the factory */
|
|
private DynamicallySizedThreadPoolExecutor instance;
|
|
|
|
/**
|
|
* Constructor setting default properties:
|
|
*/
|
|
public ThreadPoolExecutorFactoryBean()
|
|
{
|
|
corePoolSize = DEFAULT_CORE_POOL_SIZE;
|
|
maximumPoolSize = DEFAULT_MAXIMUM_POOL_SIZE;
|
|
keepAliveTime = DEFAULT_KEEP_ALIVE_TIME;
|
|
threadPriority = DEFAULT_THREAD_PRIORITY;
|
|
threadDaemon = DEFAULT_THREAD_DAEMON;
|
|
workQueueSize = DEFAULT_WORK_QUEUE_SIZE;
|
|
rejectedExecutionHandler = DEFAULT_REJECTED_EXECUTION_HANDLER;
|
|
}
|
|
|
|
/**
|
|
* The number of threads to keep in the pool, even if idle.
|
|
*
|
|
* @param corePoolSize core thread count
|
|
*/
|
|
public void setCorePoolSize(int corePoolSize)
|
|
{
|
|
this.corePoolSize = corePoolSize;
|
|
}
|
|
|
|
/**
|
|
* The maximum number of threads to keep in the pool
|
|
*
|
|
* @param maximumPoolSize the maximum number of threads in the pool
|
|
*/
|
|
public void setMaximumPoolSize(int maximumPoolSize)
|
|
{
|
|
this.maximumPoolSize = maximumPoolSize;
|
|
}
|
|
|
|
/**
|
|
* The time (in seconds) to keep non-core idle threads in the pool
|
|
*
|
|
* @param keepAliveTime time to stay idle in seconds
|
|
*/
|
|
public void setKeepAliveTime(int keepAliveTime)
|
|
{
|
|
this.keepAliveTime = keepAliveTime;
|
|
}
|
|
|
|
/**
|
|
* The priority that all threads must have on the scale of 1 to 10,
|
|
* where 1 has the lowest priority and 10 has the highest priority.
|
|
*
|
|
* @param threadPriority the thread priority
|
|
*/
|
|
public void setThreadPriority(int threadPriority)
|
|
{
|
|
this.threadPriority = threadPriority;
|
|
}
|
|
|
|
/**
|
|
* Set whether the threads run as daemon threads or not.
|
|
*
|
|
* @param threadDaemon <tt>true</tt> to run as daemon
|
|
*/
|
|
public void setThreadDaemon(boolean threadDaemon)
|
|
{
|
|
this.threadDaemon = threadDaemon;
|
|
}
|
|
|
|
/**
|
|
* The maximum number of queued work instances to keep before blocking
|
|
* against further adds.
|
|
*
|
|
* @param size the queue size before blocks, or <b>-1</b> default
|
|
* to indicate no upper bound
|
|
*/
|
|
public void setWorkQueueSize(int workQueueSize)
|
|
{
|
|
this.workQueueSize = workQueueSize;
|
|
}
|
|
|
|
/**
|
|
* The optional handler for when tasks cannot be submitted to the queue.
|
|
* The default is the <code>CallerRunsPolicy</code>.
|
|
*
|
|
* @param rejectedExecutionHandler the handler to use
|
|
*/
|
|
public void setRejectedExecutionHandler(RejectedExecutionHandler rejectedExecutionHandler)
|
|
{
|
|
this.rejectedExecutionHandler = rejectedExecutionHandler;
|
|
}
|
|
|
|
public void afterPropertiesSet() throws Exception
|
|
{
|
|
// if the maximum pool size has not been set, change it to match the core pool size
|
|
if (maximumPoolSize == DEFAULT_MAXIMUM_POOL_SIZE)
|
|
{
|
|
maximumPoolSize = corePoolSize;
|
|
}
|
|
|
|
// We need a thread factory
|
|
TraceableThreadFactory threadFactory = new TraceableThreadFactory();
|
|
threadFactory.setThreadDaemon(threadDaemon);
|
|
threadFactory.setThreadPriority(threadPriority);
|
|
|
|
if(poolName.length() > 0)
|
|
{
|
|
threadFactory.setNamePrefix(poolName);
|
|
}
|
|
|
|
BlockingQueue<Runnable> workQueue;
|
|
if (workQueueSize < 0)
|
|
{
|
|
// We can have an unlimited queue, as we have a sensible thread pool!
|
|
workQueue = new LinkedBlockingQueue<Runnable>();
|
|
}
|
|
else
|
|
{
|
|
// Use an array one for consistent performance on a small queue size
|
|
workQueue = new ArrayBlockingQueue<Runnable>(workQueueSize);
|
|
}
|
|
|
|
// construct the instance
|
|
instance = new DynamicallySizedThreadPoolExecutor(
|
|
corePoolSize,
|
|
maximumPoolSize,
|
|
keepAliveTime,
|
|
TimeUnit.SECONDS,
|
|
workQueue,
|
|
threadFactory,
|
|
rejectedExecutionHandler);
|
|
}
|
|
|
|
/**
|
|
* @return Returns true always.
|
|
*/
|
|
public boolean isSingleton()
|
|
{
|
|
return false;
|
|
}
|
|
|
|
/**
|
|
* @return Returns the singleton {@link ThreadPoolExecutor instance}.
|
|
*/
|
|
public Object getObject() throws Exception
|
|
{
|
|
if (instance == null)
|
|
{
|
|
throw new AlfrescoRuntimeException("The ThreadPoolExecutor instance has not been created");
|
|
}
|
|
return instance;
|
|
}
|
|
|
|
/**
|
|
* @see ThreadPoolExecutor
|
|
*/
|
|
public Class getObjectType()
|
|
{
|
|
return DynamicallySizedThreadPoolExecutor.class;
|
|
}
|
|
|
|
public String getPoolName()
|
|
{
|
|
return this.poolName;
|
|
}
|
|
|
|
public void setPoolName(String poolName)
|
|
{
|
|
this.poolName = poolName;
|
|
}
|
|
|
|
public void destroy()
|
|
{
|
|
this.instance.shutdown();
|
|
}
|
|
|
|
}
|