mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-07 17:49:17 +00:00
43386: ALF-13091: Prevent bean post processor propagation to child application contexts. Remove Jsr250BeanPostPorcessor from the CXF configuration, to prevent strange interaction with component scanning. 43402: Merged DEV to V4.1-BUG-FIX 43330: ALF-16073: Share forms renders is slow when using sets. Optimize performance for fieldsVisibleInAnyMode populating in getFields and FormField obtaining in getVisibleFieldNamesFor. 43412: ALF-16680 ImageMagick exit code 255 is not seen as an error 43420: ALF-16627 SOLR indexing does not provide TransformationOption when converting content to plain text for indexing 43452: Fix for ALF-16296 - On site customization page, when a page containing apostrophe (') is renamed, a backslash (\) is added to the name 43453: Fix for ALF-16105 - Disabled 'Follow' feature does not disable it for existing users 43462: ALF-16715 : Merged V3.4-BUG-FIX (3.4.12) to V4.1-BUG-FIX (4.1.3) 43461: ALF-16713 Cannot disable metadata extractors 43464: ALF-16715 : Merged V3.4-BUG-FIX (3.4.12) to V4.1-BUG-FIX (4.1.3) 43463: ALF-16713 Cannot disable metadata extractors - fix test failures - none set mimetypeService 43471: Fix for ALF-16542 - Web application context for the onlineEditUrl variable is hard-coded to alfresco: Merged BRANCHES/DEV/CLOUD1_SP to BRANCHES/DEV/V4.1-BUG-FIX 40565: CLOUD-23: core changes to allow overriding of "edit online" button's URL generation. 43475: Fix for ALF-15859 - UploadContentServlet servlet /alfresco/upload can update the content, mime type and encoding but not the locale 43476: Merged DEV to V4.1-BUG-FIX 43401 : ALF-16587 GreenMail IMAP server does not clean up session handlers - memory leak 43478: MNT-181: Now WebDAV will ALWAYS preserve the original metadata and versions of ANY node that is temporarily 'moved out' in ANY kind of 'shuffle' operation - To make the source node temporarily invisible to WebDAV the client specific HIDDEN aspect features are used - WebDAVHelper.isRenameShuffle() method introduced, to parallel ALF-3856 CIFS fix and using similar system.webdav.renameShufflePattern global property to detect the start of a shuffle - WebDAVHelper converted to use proper dependency injection - CopyMethod has become a simple subclass of MoveMethod as all the hidden aspect munging is done by it - DeleteMethod now preserves hidden nodes - PropFindMethod now ignores hidden nodes - Listing methods will hide hidden nodes from WebDAV 43483: MNT-181: Corrected typo 43498: Fix for ALF-16648 - Alfresco Enterprise artifacts in artifacts.alfresco.com do not provide POM files / dependencies declarations: Merged HEAD to V4.1-BUG-FIX (4.1.2) 43380: -- added site content for alfresco-platform-distribution POM 43379: -- added site documentation for alfresco-platform-distribution POM 43378: -- added site documentation for alfresco-platform-distribution POM -- deployed site for 4.2.b Community at https://artifacts.alfresco.com/nexus/content/repositories/alfresco-docs/alfresco-platform-distribution/latest/index.html -- created repository for Enterprise docs and added url in the appropriate edition properties 43273: Use property to define POI version 42966: ALF-14353 - Added platform distribution POM to standard maven-deploy procedure 42965: ALF-14353 - added alfresco-platform-distribution to provide a Maven release descriptor (dependencyManagement) per each Community / Enterprise release -- moved maven-ant-tasks not to be in the runtime lib -- added platform distribution pom in the SDK folder -- updated maven.xml to deploy filter and deploy the appropriate platform-distribution POM per each releae -- in maven.xml moved configure-release and configure-snapshot goals to maven-env-prerequisites -- updated sdk readme to explain the presence of alfresco-platform-distribution POM 42912: -- updated README header on the POM specifying it's NOT usable to build Alfresco -- make a clear reference to the POMs that get deployed by pom-experimental.xml being usable for development 42842: ALF-14353: Fix artifactId alfresco-jlan -> alfresco-jlan-embed 41883: ALF-14353 - fixed multiple Maven build issues. Now mvn clean install -f pom-experimental.xml works fine. Also deployed Spring Surf 1.2.0-SNAPSHOT so proper Surf version is retrieved 41882: added pre-requisites to build POMs successfully with mvn clean install -f pom-experimental.xml 43499: Upgrade version in POM files to 4.1.3-SNAPSHOT 43520: ALF-16694 POI becoming responsiveness and causing jvm to freeze for a while with certain XLS (fraction formats) - Patched POI to: - limit the length of fractions to four digits (more than that takes too long to process) e.g. "# #/#####" is too long and will be reduced to "# #/####" which still takes about a second! - handle the -ve fraction format part (i.e. n in p;n;z), so its length is not interpret as part of the fraction format of the +ve fraction part. - handle custom formats a bit better (strip them) rather than interpret the text length as part of the fraction format - handle -ve fractions (just did not work) - limitations: - custom text gets stripped (still better than before) - formats that have p (+ve) and n (-ve) parts must include a fraction format in each part. Otherwise +ve and -ve values are not formatted as a fraction (still better than before) 43523: MNT-181: Corrections - WebDAVLockService.unlock() made 'harmless' to call on already-unlocked nodes - Delete method hides rather than deletes versioned nodes and working copes in case it is called by OSX Finder during a 'replace' operation 43524: MNT-181: Correction - PutMethod now 'unhides' hidden nodes and behaves as though it created them 43541: Merged DEV to V4.1-BUG-FIX 43536: ALF-16200: WQS delete fails to publish to live projects onDeleteNode behavior The condition of "if" operator was modified. Now "if" operator evaluate to true if least one of the nodesToTransfer or nodesToRemoveOnTransfer sets is not empty. beforeDeleteNode() methods were updated for check for the ASPECT_PENDING_DELETE aspect on the node. enqueueRemovedNodes() call was moved from onDeleteNode() into beforeDeleteNode(). These fixes allow to automatically update the sites published to (i.e. live projects) to include the removal of the file and removal of file from any collection (asset list) when a content was deleted from an editorial project. 43542: Fix for ALF-16618 - ScriptableHashMap does not have hasOwnProperty method 43555: Fix for ALF-16494 - site collaborator has rights to modify comments made by another user. 43556: ALF-15859: Prevent NPE on upload without NodeRef 43558: ALF-16694 POI becoming irresponsive and causing jvm to freeze with XLS that includes fraction formats - Original jar did not get removed in previous commit << NO NEED TO MERGE TO CLOUD1-BUG-FIX as there was a tree conflict and the original jar was removed. >> 43570: MNT-181: More corrections researched by Valery - Don't treat all moves to temporary locations as copies - just those from non-temporary locations. Avoids initial upload leaving lots of hidden files around. - Only copy the content, not the whole node including aspects to avoid versioning temporary files! - Don't version on changes to sys:clientVisibilityMask - avoids 'double versioning' - Recognize Mac .TemporaryItems folder and ._ files as temporary 43575: Fix for ALF-9317 - Links: Delete Link button in Selected Items menu is available for Consumer, Contributor and Collaborator 43577: Upgrade POM files after following changes: 43401: ALF-16587 patch greenmail 43520: ALF-16694 Uprade POI and patch it 43584: Merged V4.1 to V4.1-BUG-FIX <<Record Only>> 43582: Merged V4.1-BUG-FIX to V4.1 (4.1.2) 43402: Merged DEV to V4.1-BUG-FIX 43330: ALF-16073: Share forms renders is slow when using sets. Optimize performance for fieldsVisibleInAnyMode populating in getFields and FormField obtaining in getVisibleFieldNamesFor. 43557: Merged V4.1-BUG-FIX to V4.1 43555: Fix for ALF-16494 - site collaborator has rights to modify comments made by another user. 43586: MNT-181: Final correction researched by Valery - Corrected system.webdav.renameShufflePattern so that it matches .TemporaryItems folder and ._ files as a full match 43591: ALF-16772: If the WebDAV path of a document exceeds 255 characters, documents opened in MSOffice cannot be saved back - Interpret null nodeLockToken as not locked. 43594: Merged DEV to V4.1-BUG-FIX 43540: ALF-12425: Can't launch activiti workflow console from Share when external / ntlm / kerberos authentication is used. New webscript that redirects to activiti admin console with URL holding current ticket. The webscript resides below wcs and allows to use alfresco connector in Share. 43562: ALF-12425: Can't launch activiti workflow console from Share when external / ntlm / kerberos authentication is used. Activiti admin console webscript that allows admin console to be invoked behind wcs authentication. 43595: Merged V4.1 to V4.1-BUG-FIX 43376: Merged DEV to V4.1 43339: ALF-16590 : java.lang.IllegalArgumentException while initiating In-Place import FilesystemContentDataFactory#contentIsInStore method was modified. Now files' absolute paths are compared. 43390: ALF-15856: Test org.alfresco.repo.node.NodeServiceTest does not finish on DB2 - Now inner-nested retrying transaction in testConcurrentArchive passes its exception straight through to the outer transaction, which unwraps and retries it if necessary 43397: ALF-16021: RuleServiceImplTest never ends on DB2 - Added endTransaction() call so that testDeleteSpaceWithExecuteScriptRule() doesn't hang indefinitely waiting for the outer transaction to complete 43398: ALF-15856: Test org.alfresco.repo.node.NodeServiceTest does not finish on DB2 - Now inner-nested retrying transaction runs in its own thread and we don't wait forever for it 43404: ALF-16666: IMAP subsystem startup causes Tomcat crash - Stopped IMAP subsystem from depending on itself by using private rather than public IMapService! 43408: Fixed latest DB2 hangs for Samuel (concurrent nested transactions) 43424: Fixed latest DB2 hang for Samuel (concurrent nested transactions) 43426: ALF-16692: Merged HEAD to V4.1 (with corrections) 43425: Fixes issue with YUI SWF files (see: IT-9441) 43450: Possible fix for workflow tests on DB2 - retrying txns where necessary 43484: ALF-16702: Restored missing index in DB2 schema reference 43596: Merged V4.1 to V4.1-BUG-FIX (RECORD ONLY) 43589: Merged V4.1-BUG-FIX to V4.1 43575: Fix for ALF-9317 - Links: Delete Link button in Selected Items menu is available for Consumer, Contributor and Collaborator git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@43601 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
300 lines
10 KiB
Java
300 lines
10 KiB
Java
/*
|
|
* Copyright (C) 2005-2012 Jesper Steen Møller
|
|
*
|
|
* 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.content.metadata;
|
|
|
|
import java.util.ArrayList;
|
|
import java.util.HashMap;
|
|
import java.util.List;
|
|
import java.util.Map;
|
|
import java.util.concurrent.locks.Lock;
|
|
import java.util.concurrent.locks.ReadWriteLock;
|
|
import java.util.concurrent.locks.ReentrantReadWriteLock;
|
|
|
|
import org.apache.commons.logging.Log;
|
|
import org.apache.commons.logging.LogFactory;
|
|
|
|
/**
|
|
* Holds and provides the most appropriate metadate extracter for a particular
|
|
* mimetype.
|
|
* <p>
|
|
* The extracters themselves know how well they are able to extract metadata.
|
|
*
|
|
* @see org.alfresco.repo.content.metadata.MetadataExtracter
|
|
* @author Jesper Steen Møller
|
|
*/
|
|
public class MetadataExtracterRegistry
|
|
{
|
|
private static final Log logger = LogFactory.getLog(MetadataExtracterRegistry.class);
|
|
|
|
private List<MetadataExtracter> extracters;
|
|
private Map<String, List<MetadataExtracter>> extracterCache;
|
|
private Map<String, List<MetadataEmbedder>> embedderCache;
|
|
|
|
/** Controls read access to the cache */
|
|
private Lock extracterCacheReadLock;
|
|
/** controls write access to the cache */
|
|
private Lock extracterCacheWriteLock;
|
|
|
|
public MetadataExtracterRegistry()
|
|
{
|
|
// initialise lists
|
|
extracters = new ArrayList<MetadataExtracter>(10);
|
|
extracterCache = new HashMap<String, List<MetadataExtracter>>(17);
|
|
embedderCache = new HashMap<String, List<MetadataEmbedder>>(17);
|
|
|
|
// create lock objects for access to the cache
|
|
ReadWriteLock extractionCacheLock = new ReentrantReadWriteLock();
|
|
extracterCacheReadLock = extractionCacheLock.readLock();
|
|
extracterCacheWriteLock = extractionCacheLock.writeLock();
|
|
}
|
|
|
|
/**
|
|
* Force the registry to drop its cache of extractors. This is useful for the case where an extractor
|
|
* becomes available only after the registry has initialized the cache.
|
|
*/
|
|
public void resetCache()
|
|
{
|
|
extracterCacheWriteLock.lock();
|
|
try
|
|
{
|
|
extracterCache.clear();
|
|
embedderCache.clear();
|
|
}
|
|
finally
|
|
{
|
|
extracterCacheWriteLock.unlock();
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Register an instance of an extracter for use
|
|
*
|
|
* @param extracter an extracter
|
|
*/
|
|
public void register(MetadataExtracter extracter)
|
|
{
|
|
if (logger.isDebugEnabled())
|
|
{
|
|
logger.debug("Registering metadata extracter: " + extracter);
|
|
}
|
|
|
|
extracterCacheWriteLock.lock();
|
|
try
|
|
{
|
|
extracters.add(extracter);
|
|
extracterCache.clear();
|
|
embedderCache.clear();
|
|
}
|
|
finally
|
|
{
|
|
extracterCacheWriteLock.unlock();
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Gets the best metadata extracter. This is a combination of the most
|
|
* reliable and the most performant extracter.
|
|
* <p>
|
|
* The result is cached for quicker access next time.
|
|
*
|
|
* @param mimetype the source MIME of the extraction
|
|
* @return Returns a metadata extracter that can extract metadata from the
|
|
* chosen MIME type.
|
|
*/
|
|
public MetadataExtracter getExtracter(String sourceMimetype)
|
|
{
|
|
logger.debug("Get extractors for " + sourceMimetype);
|
|
List<MetadataExtracter> extractors = null;
|
|
extracterCacheReadLock.lock();
|
|
try
|
|
{
|
|
if (extracterCache.containsKey(sourceMimetype))
|
|
{
|
|
// the translation has been requested before
|
|
// it might have been null
|
|
extractors = extracterCache.get(sourceMimetype);
|
|
}
|
|
}
|
|
finally
|
|
{
|
|
extracterCacheReadLock.unlock();
|
|
}
|
|
|
|
if (extractors == null)
|
|
{
|
|
// No request has been made before
|
|
// Get a write lock on the cache
|
|
// No double check done as it is not an expensive task
|
|
extracterCacheWriteLock.lock();
|
|
try
|
|
{
|
|
// find the most suitable transformer - may be empty list
|
|
extractors = findBestExtracters(sourceMimetype);
|
|
// store the result even if it is null
|
|
extracterCache.put(sourceMimetype, extractors);
|
|
}
|
|
finally
|
|
{
|
|
extracterCacheWriteLock.unlock();
|
|
}
|
|
}
|
|
|
|
// We have the list of extractors that supposedly work (as registered).
|
|
// Take the last one that still claims to work
|
|
MetadataExtracter liveExtractor = null;
|
|
for (MetadataExtracter extractor : extractors)
|
|
{
|
|
// An extractor may dynamically become unavailable
|
|
if (!extractor.isSupported(sourceMimetype))
|
|
{
|
|
logger.debug("Get unsupported: "+getName(extractor));
|
|
continue;
|
|
}
|
|
logger.debug("Get supported: "+getName(extractor));
|
|
liveExtractor = extractor;
|
|
}
|
|
logger.debug("Get returning: "+getName(liveExtractor));
|
|
return liveExtractor;
|
|
}
|
|
|
|
private String getName(MetadataExtracter extractor)
|
|
{
|
|
return extractor == null
|
|
? null
|
|
: extractor instanceof AbstractMetadataExtracter
|
|
? ((AbstractMetadataExtracter)extractor).getBeanName()
|
|
: extractor instanceof AbstractMappingMetadataExtracter
|
|
? ((AbstractMappingMetadataExtracter)extractor).getBeanName()
|
|
: extractor.getClass().getSimpleName();
|
|
}
|
|
|
|
/**
|
|
* @param sourceMimetype The MIME type under examination
|
|
* @return Returns a set of extractors that will work for the given mimetype
|
|
*/
|
|
private List<MetadataExtracter> findBestExtracters(String sourceMimetype)
|
|
{
|
|
logger.debug("Finding extractors for " + sourceMimetype);
|
|
|
|
List<MetadataExtracter> extractors = new ArrayList<MetadataExtracter>(1);
|
|
|
|
for (MetadataExtracter extractor : extracters)
|
|
{
|
|
if (!extractor.isSupported(sourceMimetype))
|
|
{
|
|
// extraction not achievable
|
|
logger.debug("Find unsupported: "+getName(extractor));
|
|
continue;
|
|
}
|
|
logger.debug("Find supported: "+getName(extractor));
|
|
extractors.add(extractor);
|
|
}
|
|
logger.debug("Find returning: "+extractors);
|
|
return extractors;
|
|
}
|
|
|
|
/**
|
|
* Gets the best metadata embedder. This is a combination of the most
|
|
* reliable and the most performant embedder.
|
|
* <p>
|
|
* The result is cached for quicker access next time.
|
|
*
|
|
* @param mimetype the source MIME of the extraction
|
|
* @return Returns a metadata embedder that can embed metadata in the
|
|
* chosen MIME type.
|
|
*/
|
|
public MetadataEmbedder getEmbedder(String sourceMimetype)
|
|
{
|
|
List<MetadataEmbedder> embedders = null;
|
|
extracterCacheReadLock.lock();
|
|
try
|
|
{
|
|
if (embedderCache.containsKey(sourceMimetype))
|
|
{
|
|
// the translation has been requested before
|
|
// it might have been null
|
|
embedders = embedderCache.get(sourceMimetype);
|
|
}
|
|
}
|
|
finally
|
|
{
|
|
extracterCacheReadLock.unlock();
|
|
}
|
|
|
|
if (embedders == null)
|
|
{
|
|
// No request has been made before
|
|
// Get a write lock on the cache
|
|
// No double check done as it is not an expensive task
|
|
extracterCacheWriteLock.lock();
|
|
try
|
|
{
|
|
// find the most suitable transformer - may be empty list
|
|
embedders = findBestEmbedders(sourceMimetype);
|
|
// store the result even if it is null
|
|
embedderCache.put(sourceMimetype, embedders);
|
|
}
|
|
finally
|
|
{
|
|
extracterCacheWriteLock.unlock();
|
|
}
|
|
}
|
|
|
|
// We have the list of embedders that supposedly work (as registered).
|
|
// Take the last one that still claims to work
|
|
MetadataEmbedder liveEmbedder = null;
|
|
for (MetadataEmbedder embedder : embedders)
|
|
{
|
|
// An extractor may dynamically become unavailable
|
|
if (!embedder.isEmbeddingSupported(sourceMimetype))
|
|
{
|
|
continue;
|
|
}
|
|
liveEmbedder = embedder;
|
|
}
|
|
return liveEmbedder;
|
|
}
|
|
|
|
/**
|
|
* @param sourceMimetype The MIME type under examination
|
|
* @return Returns a set of embedders that will work for the given mimetype
|
|
*/
|
|
private List<MetadataEmbedder> findBestEmbedders(String sourceMimetype)
|
|
{
|
|
logger.debug("Finding embedders for " + sourceMimetype);
|
|
|
|
List<MetadataEmbedder> embedders = new ArrayList<MetadataEmbedder>(1);
|
|
|
|
for (MetadataExtracter extractor : extracters)
|
|
{
|
|
if (!(extractor instanceof MetadataEmbedder))
|
|
{
|
|
continue;
|
|
}
|
|
if (!((MetadataEmbedder) extractor).isEmbeddingSupported(sourceMimetype))
|
|
{
|
|
// extraction not achievable
|
|
continue;
|
|
}
|
|
embedders.add((MetadataEmbedder)extractor);
|
|
}
|
|
return embedders;
|
|
}
|
|
}
|