mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-07 17:49:17 +00:00
Merged V4.0-BUG-FIX to HEAD
34321: Make CIFS virtual circuit per session limit configurable, return correct status code when virtual circuit limit is reached.
Required by Terminal Server clients as they can use a single session for all connections. ALF-13156
34322: Services part of fix for ALF-13057 Nodes marked with rma:ghosted aspect (or other configurable aspects/types) should not be renditioned.
34323: Added configuration property for CIFS virtual circuits per session, required by Terminal Server clients. ALF-13156.
34332: Fix for ALF-8405
34336: Merged BRANCHES/V4.0 to BRANCHES/DEV/V4.0-BUG-FIX:
34335: Fixing a failing test as part of ALF-13057
34338: NodeDAO: re-parent "lost & found" orphan child nodes (see ALF-12358 & ALF-13066 / SYS-301)
- test fix (follow-on to r34279)
34341: NodeDAO: re-parent "lost & found" orphan child nodes (see ALF-12358 & ALF-13066 / SYS-301)
- ano test fix (once more with feeling)
34351: Merged V4.0 to V4.0-BUG-FIX
34335: (RECORD ONLY) Fixing a failing test as part of ALF-13057
34350: Merged V3.4 to V4.0
34327: ALF-13030 ALF-13041 Transformer Server needs filename and to make its transformer preferred over OpenOffice and JOD
Relates to ALF-10976 and ALF-10412 set of changes
- TransformerOptions.sourceNodeRef now populated
- Set average transformer time via global properties
- TransformerDebug of active transformers added
34331: ALF-13030 ALF-13041 Transformer Server needs filename and to make its transformer preferred over OpenOffice and JOD
Relates to ALF-10976 and ALF-10412 set of changes
- Fix test failures
34346: ALF-13030 ALF-13041 Transformer Server needs filename and to make its transformer preferred over OpenOffice and JOD
Relates to ALF-10976 and ALF-10412 set of changes
- sourceNodeRef was not available to the first child transformer of a ComplexContentTransformer
34358: Merged V4.0 to V4.0-BUG-FIX (RECORD ONLY)
34324: Merged BRANCHES/DEV/V4.0-BUG-FIX to BRANCHES/V4.0:
34322: Services part of fix for ALF-13057 Nodes marked with rma:ghosted aspect (or other configurable aspects/types) should not be renditioned.
34360: Merged V3.4-BUG-FIX to V4.0-BUG-FIX (RECORD ONLY)
34349: Merged V3.4 to V3.4-BUG-FIX
34327: ALF-13030 ALF-13041 Transformer Server needs filename and to make its transformer preferred over OpenOffice and JOD
Relates to ALF-10976 and ALF-10412 set of changes
- TransformerOptions.sourceNodeRef now populated
- Set average transformer time via global properties
- TransformerDebug of active transformers added
34331: ALF-13030 ALF-13041 Transformer Server needs filename and to make its transformer preferred over OpenOffice and JOD
Relates to ALF-10976 and ALF-10412 set of changes
- Fix test failures
34346: ALF-13030 ALF-13041 Transformer Server needs filename and to make its transformer preferred over OpenOffice and JOD
Relates to ALF-10976 and ALF-10412 set of changes
- sourceNodeRef was not available to the first child transformer of a ComplexContentTransformer
34348: Merged PATCHES/V3.4.7 to V3.4
34347: ALF-12949: Merged V4.0-BUG-FIX to PATCHES/V3.4.7
33959: Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/DEV/V4.0-BUG-FIX
33950: Fix for ALF-12787:
- Surf Memory usage optimizations and improvements to ModelObject and derived classes.
- Reduced avg memory usage for a ModelObject in the Surf persister cache from 4.0K to 1.5K.
- Related refactoring to support removal of in-memory XML DOM previously used to maintain ModelObject state. Now XML DOM only created as needed for set() operations and thrown away.
- Improvements to Surf Persister cache strategy to support MRU style concurrent cache, now uses a LinkedConcurrentHashMap to provide a concurrent cache that also has a configurable maximum capacity
- Added various improved spring config for persister caches and default sizes.
Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/DEV/V4.0-BUG-FIX
33956: Latest SpringSurf libs: Fixed issue with overly aggressive caching of missing page View objects.
34108: Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/DEV/V4.0-BUG-FIX
34107: Added missing jar lib to wcmquickstart and webeditor dependencies
34363: Merged V4.0 to V4.0-BUG-FIX
34362: Merged V3.4 to V4.0 (RECORD ONLY)
34282: ALF-13059: Windows 7 specific: It's impossible to add documents to DWS
- Fix by Alex Malinovsky
34348: Merged PATCHES/V3.4.7 to V3.4
34347: ALF-12949: Merged V4.0-BUG-FIX to PATCHES/V3.4.7
33959: Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/DEV/V4.0-BUG-FIX
33950: Fix for ALF-12787:
- Surf Memory usage optimizations and improvements to ModelObject and derived classes.
- Reduced avg memory usage for a ModelObject in the Surf persister cache from 4.0K to 1.5K.
- Related refactoring to support removal of in-memory XML DOM previously used to maintain ModelObject state. Now XML DOM only created as needed for set() operations and thrown away.
- Improvements to Surf Persister cache strategy to support MRU style concurrent cache, now uses a LinkedConcurrentHashMap to provide a concurrent cache that also has a configurable maximum capacity
- Added various improved spring config for persister caches and default sizes.
Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/DEV/V4.0-BUG-FIX
33956: Latest SpringSurf libs: Fixed issue with overly aggressive caching of missing page View objects.
34108: Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/DEV/V4.0-BUG-FIX
34107: Added missing jar lib to wcmquickstart and webeditor dependencies
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@34364 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Dave Ward
@@ -33,6 +33,8 @@ import org.alfresco.repo.transaction.RetryingTransactionHelper;
|
||||
import org.alfresco.service.cmr.rendition.RenditionDefinition;
|
||||
import org.alfresco.service.cmr.rendition.RenditionService;
|
||||
import org.alfresco.service.cmr.repository.ContentService;
|
||||
import org.alfresco.service.cmr.repository.NodeRef;
|
||||
import org.alfresco.service.cmr.repository.TransformationOptions;
|
||||
import org.alfresco.service.cmr.thumbnail.ThumbnailException;
|
||||
import org.alfresco.service.transaction.TransactionService;
|
||||
import org.apache.commons.logging.Log;
|
||||
@@ -254,10 +256,16 @@ public class ThumbnailRegistry implements ApplicationContextAware, ApplicationLi
|
||||
* @param sourceUrl The URL of the source (optional)
|
||||
* @param sourceMimetype The source mimetype
|
||||
* @param sourceSize the size (in bytes) of the source. Use -1 if unknown.
|
||||
* @param sourceNodeRef which is set in a copy of the thumbnailDefinition transformation options,
|
||||
* so that it may be used by transformers and debug.
|
||||
* @param thumbnailDefinition The {@link ThumbnailDefinition} to check for
|
||||
*/
|
||||
public boolean isThumbnailDefinitionAvailable(String sourceUrl, String sourceMimetype, long sourceSize, ThumbnailDefinition thumbnailDefinition)
|
||||
public boolean isThumbnailDefinitionAvailable(String sourceUrl, String sourceMimetype, long sourceSize, NodeRef sourceNodeRef, ThumbnailDefinition thumbnailDefinition)
|
||||
{
|
||||
// Copy the thumbnail's TransformationOptions and set the sourceNodeRef, for use by transformers and debug.
|
||||
TransformationOptions options = new TransformationOptions(thumbnailDefinition.getTransformationOptions());
|
||||
options.setSourceNodeRef(sourceNodeRef);
|
||||
|
||||
// Log the following getTransform() as trace so we can see the wood for the trees
|
||||
boolean orig = TransformerDebug.setDebugOutput(false);
|
||||
try
|
||||
@@ -266,7 +274,7 @@ public class ThumbnailRegistry implements ApplicationContextAware, ApplicationLi
|
||||
sourceUrl,
|
||||
sourceMimetype,
|
||||
sourceSize,
|
||||
thumbnailDefinition.getMimetype(), thumbnailDefinition.getTransformationOptions()
|
||||
thumbnailDefinition.getMimetype(), options
|
||||
) != null;
|
||||
}
|
||||
finally
|
||||
|
||||
Reference in New Issue
Block a user