mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-07 17:49:17 +00:00
Merged BRANCHES/DEV/HEAD-QA to HEAD:
49458: Merged BRANCHES/DEV/HEAD-BUG-FIX to BRANCHES/DEV/HEAD-QA:
49117: Merged BRANCHES/DEV/CONV_V413 to BRANCHES/DEV/HEAD-BUG-FIX:
49111: - Revert of r47645
- Change of imgpreview thumbnailDefinition to mimetype and size expected for HEAD
- Relates to ALF-5051 and MNT-8599 / ALF-18726
49118: Restored high resolution placeholder icons for imgpreview, relates to ALF-13984
49979: ALF-18726: Alfresco could not start with WCMQS applied
- Updated RenditionServiceIntegrationTest with new imgpreview values
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@49980 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Ray Gauss
@@ -621,12 +621,12 @@ system.thumbnail.generate=true
|
||||
|
||||
# Default thumbnail limits
|
||||
# When creating thumbnails, only use the first pageLimit pages
|
||||
system.thumbnail.definition.doclib.timeoutMs=-1
|
||||
system.thumbnail.definition.doclib.readLimitTimeMs=-1
|
||||
system.thumbnail.definition.doclib.maxSourceSizeKBytes=-1
|
||||
system.thumbnail.definition.doclib.readLimitKBytes=-1
|
||||
system.thumbnail.definition.doclib.pageLimit=1
|
||||
system.thumbnail.definition.doclib.maxPages=-1
|
||||
system.thumbnail.definition.default.timeoutMs=-1
|
||||
system.thumbnail.definition.default.readLimitTimeMs=-1
|
||||
system.thumbnail.definition.default.maxSourceSizeKBytes=-1
|
||||
system.thumbnail.definition.default.readLimitKBytes=-1
|
||||
system.thumbnail.definition.default.pageLimit=1
|
||||
system.thumbnail.definition.default.maxPages=-1
|
||||
|
||||
# Max mimetype sizes to create thumbnail icons
|
||||
system.thumbnail.mimetype.maxSourceSizeKBytes.pdf=-1
|
||||
|
||||
@@ -55,29 +55,44 @@
|
||||
<property name="renditionService" ref="renditionService" />
|
||||
</bean>
|
||||
|
||||
<!-- Thumbnail Register -->
|
||||
<bean id="thumbnailRegistry" parent="baseThumbnailRegistry" class="org.alfresco.repo.thumbnail.ThumbnailRegistry" />
|
||||
<bean id="baseThumbnailDefinition"
|
||||
class="org.alfresco.repo.thumbnail.ThumbnailDefinition"
|
||||
abstract="true"
|
||||
init-method="register">
|
||||
<property name="thumbnailRegistry">
|
||||
<ref bean="thumbnailRegistry" />
|
||||
</property>
|
||||
</bean>
|
||||
|
||||
<bean id="defaultImageResizeOptions"
|
||||
class="org.alfresco.repo.content.transform.magick.ImageResizeOptions"
|
||||
abstract="true">
|
||||
<property name="maintainAspectRatio" value="true"/>
|
||||
<property name="resizeToThumbnail" value="true" />
|
||||
</bean>
|
||||
|
||||
<bean id="defaultImageTransformationOptions"
|
||||
class="org.alfresco.repo.content.transform.magick.ImageTransformationOptions"
|
||||
abstract="true">
|
||||
<property name="timeoutMs" value="${system.thumbnail.definition.default.timeoutMs}" />
|
||||
<property name="readLimitTimeMs" value="${system.thumbnail.definition.default.readLimitTimeMs}" />
|
||||
<property name="maxSourceSizeKBytes" value="${system.thumbnail.definition.default.maxSourceSizeKBytes}" />
|
||||
<property name="readLimitKBytes" value="${system.thumbnail.definition.default.readLimitKBytes}" />
|
||||
<property name="pageLimit" value="${system.thumbnail.definition.default.pageLimit}" />
|
||||
<property name="maxPages" value="${system.thumbnail.definition.default.maxPages}" />
|
||||
</bean>
|
||||
|
||||
<bean id="baseThumbnailRegistry" abstract="true">
|
||||
<property name="contentService" ref="ContentService"/>
|
||||
<property name="renditionService" ref="renditionService" />
|
||||
<property name="transactionService" ref="TransactionService" />
|
||||
<property name="tenantAdminService" ref="tenantAdminService" />
|
||||
<property name="redeployStaticDefsOnStartup" value="${system.thumbnail.redeployStaticDefsOnStartup}" />
|
||||
<property name="thumbnailDefinitions">
|
||||
<list>
|
||||
<!-- Small image thumbnail options -->
|
||||
<bean class="org.alfresco.repo.thumbnail.ThumbnailDefinition">
|
||||
<!-- Note that this will auto-register with parent="baseThumbnailDefinition" in the future -->
|
||||
<bean id="thumbnailDefinitionMedium" class="org.alfresco.repo.thumbnail.ThumbnailDefinition">
|
||||
<property name="name" value="medium" />
|
||||
<property name="mimetype" value="image/jpeg"/>
|
||||
<property name="transformationOptions">
|
||||
<bean class="org.alfresco.repo.content.transform.magick.ImageTransformationOptions">
|
||||
<bean parent="defaultImageTransformationOptions">
|
||||
<property name="resizeOptions">
|
||||
<bean class="org.alfresco.repo.content.transform.magick.ImageResizeOptions">
|
||||
<bean parent="defaultImageResizeOptions">
|
||||
<property name="width" value="100"/>
|
||||
<property name="height" value="100"/>
|
||||
<property name="maintainAspectRatio" value="true"/>
|
||||
<property name="resizeToThumbnail" value="true" />
|
||||
</bean>
|
||||
</property>
|
||||
</bean>
|
||||
@@ -88,26 +103,19 @@
|
||||
</bean>
|
||||
|
||||
<!-- Slingshot Document Library image thumbnail options -->
|
||||
<bean class="org.alfresco.repo.thumbnail.ThumbnailDefinition">
|
||||
<!-- Note that this will auto-register with parent="baseThumbnailDefinition" in the future -->
|
||||
<bean id="thumbnailDefinitionDoclib" class="org.alfresco.repo.thumbnail.ThumbnailDefinition">
|
||||
<property name="name" value="doclib" />
|
||||
<property name="mimetype" value="image/png"/>
|
||||
<property name="transformationOptions">
|
||||
<bean class="org.alfresco.repo.content.transform.magick.ImageTransformationOptions">
|
||||
<bean parent="defaultImageTransformationOptions">
|
||||
<property name="resizeOptions">
|
||||
<bean class="org.alfresco.repo.content.transform.magick.ImageResizeOptions">
|
||||
<bean parent="defaultImageResizeOptions">
|
||||
<property name="width" value="100"/>
|
||||
<property name="height" value="100"/>
|
||||
<property name="maintainAspectRatio" value="true"/>
|
||||
<property name="resizeToThumbnail" value="true" />
|
||||
<property name="allowEnlargement" value="false" />
|
||||
</bean>
|
||||
</property>
|
||||
<property name="timeoutMs" value="${system.thumbnail.definition.doclib.timeoutMs}" />
|
||||
<property name="readLimitTimeMs" value="${system.thumbnail.definition.doclib.readLimitTimeMs}" />
|
||||
<property name="maxSourceSizeKBytes" value="${system.thumbnail.definition.doclib.maxSourceSizeKBytes}" />
|
||||
<property name="readLimitKBytes" value="${system.thumbnail.definition.doclib.readLimitKBytes}" />
|
||||
<property name="pageLimit" value="${system.thumbnail.definition.doclib.pageLimit}" />
|
||||
<property name="maxPages" value="${system.thumbnail.definition.doclib.maxPages}" />
|
||||
</bean>
|
||||
</property>
|
||||
<property name="placeHolderResourcePath" value="alfresco/thumbnail/thumbnail_placeholder_doclib.png" />
|
||||
@@ -116,11 +124,73 @@
|
||||
<property name="failureHandlingOptions" ref="standardFailureOptions"/>
|
||||
</bean>
|
||||
|
||||
<!-- Image preview thumbnail options -->
|
||||
<!-- Note that this will auto-register with parent="baseThumbnailDefinition" in the future -->
|
||||
<bean id="thumbnailDefinitionImgpreview" class="org.alfresco.repo.thumbnail.ThumbnailDefinition">
|
||||
<property name="name" value="imgpreview" />
|
||||
<property name="mimetype" value="image/jpeg"/>
|
||||
<property name="transformationOptions">
|
||||
<bean parent="defaultImageTransformationOptions">
|
||||
<property name="resizeOptions">
|
||||
<bean parent="defaultImageResizeOptions">
|
||||
<property name="width" value="960"/>
|
||||
<property name="height" value="960"/>
|
||||
<property name="allowEnlargement" value="false" />
|
||||
</bean>
|
||||
</property>
|
||||
</bean>
|
||||
</property>
|
||||
<property name="placeHolderResourcePath" value="alfresco/thumbnail/thumbnail_placeholder_256.png" />
|
||||
<property name="mimeAwarePlaceHolderResourcePath" value="alfresco/thumbnail/thumbnail_placeholder_256{0}.png" />
|
||||
<property name="runAs" value="System"/>
|
||||
<property name="failureHandlingOptions" ref="standardFailureOptions"/>
|
||||
</bean>
|
||||
|
||||
<!-- User avatar 64x64 image thumbnail options -->
|
||||
<!-- Note that this will auto-register with parent="baseThumbnailDefinition" in the future -->
|
||||
<bean id="thumbnailDefinitionAvatar" class="org.alfresco.repo.thumbnail.ThumbnailDefinition">
|
||||
<property name="name" value="avatar" />
|
||||
<property name="mimetype" value="image/png"/>
|
||||
<property name="transformationOptions">
|
||||
<bean parent="defaultImageTransformationOptions">
|
||||
<property name="resizeOptions">
|
||||
<bean parent="defaultImageResizeOptions">
|
||||
<property name="width" value="64"/>
|
||||
<property name="height" value="64"/>
|
||||
<property name="allowEnlargement" value="false" />
|
||||
</bean>
|
||||
</property>
|
||||
</bean>
|
||||
</property>
|
||||
<property name="placeHolderResourcePath" value="alfresco/thumbnail/thumbnail_placeholder_avatar.png" />
|
||||
<property name="runAs" value="System"/>
|
||||
<property name="failureHandlingOptions" ref="standardFailureOptions"/>
|
||||
</bean>
|
||||
|
||||
<!-- User avatar 32x32 image thumbnail options -->
|
||||
<!-- Note that this will auto-register with parent="baseThumbnailDefinition" in the future -->
|
||||
<bean id="thumbnailDefinitionAvatar32" class="org.alfresco.repo.thumbnail.ThumbnailDefinition">
|
||||
<property name="name" value="avatar32" />
|
||||
<property name="mimetype" value="image/png"/>
|
||||
<property name="transformationOptions">
|
||||
<bean parent="defaultImageTransformationOptions">
|
||||
<property name="resizeOptions">
|
||||
<bean parent="defaultImageResizeOptions">
|
||||
<property name="width" value="32"/>
|
||||
<property name="height" value="32"/>
|
||||
<property name="allowEnlargement" value="false" />
|
||||
</bean>
|
||||
</property>
|
||||
</bean>
|
||||
</property>
|
||||
<property name="placeHolderResourcePath" value="alfresco/thumbnail/thumbnail_placeholder_avatar32.png" />
|
||||
<property name="runAs" value="System"/>
|
||||
<property name="failureHandlingOptions" ref="standardFailureOptions"/>
|
||||
</bean>
|
||||
|
||||
<!-- Web Preview thumbnail options -->
|
||||
<bean class="org.alfresco.repo.thumbnail.ThumbnailDefinition">
|
||||
<!-- Note that this will auto-register with parent="baseThumbnailDefinition" in the future -->
|
||||
<bean id="thumbnailDefinitionWebpreview" class="org.alfresco.repo.thumbnail.ThumbnailDefinition">
|
||||
<property name="name" value="webpreview" />
|
||||
<property name="mimetype" value="application/x-shockwave-flash"/>
|
||||
<property name="transformationOptions">
|
||||
@@ -132,70 +202,23 @@
|
||||
<property name="failureHandlingOptions" ref="standardFailureOptions"/>
|
||||
</bean>
|
||||
|
||||
<!-- Image preview thumbnail options -->
|
||||
<bean class="org.alfresco.repo.thumbnail.ThumbnailDefinition">
|
||||
<property name="name" value="imgpreview" />
|
||||
<property name="mimetype" value="image/jpeg"/>
|
||||
<property name="transformationOptions">
|
||||
<bean class="org.alfresco.repo.content.transform.magick.ImageTransformationOptions">
|
||||
<property name="resizeOptions">
|
||||
<bean class="org.alfresco.repo.content.transform.magick.ImageResizeOptions">
|
||||
<property name="width" value="960"/>
|
||||
<property name="height" value="960"/>
|
||||
<property name="maintainAspectRatio" value="true"/>
|
||||
<property name="resizeToThumbnail" value="true" />
|
||||
<property name="allowEnlargement" value="false" />
|
||||
</bean>
|
||||
</property>
|
||||
</bean>
|
||||
</property>
|
||||
<property name="placeHolderResourcePath" value="alfresco/thumbnail/thumbnail_placeholder_imgpreview.png" />
|
||||
<property name="runAs" value="System"/>
|
||||
<property name="failureHandlingOptions" ref="standardFailureOptions"/>
|
||||
</bean>
|
||||
<!-- Thumbnail Register -->
|
||||
<bean id="thumbnailRegistry" parent="baseThumbnailRegistry" class="org.alfresco.repo.thumbnail.ThumbnailRegistry" />
|
||||
|
||||
|
||||
<!-- User avatar 64x64 image thumbnail options -->
|
||||
<bean class="org.alfresco.repo.thumbnail.ThumbnailDefinition">
|
||||
<property name="name" value="avatar" />
|
||||
<property name="mimetype" value="image/png"/>
|
||||
<property name="transformationOptions">
|
||||
<bean class="org.alfresco.repo.content.transform.magick.ImageTransformationOptions">
|
||||
<property name="resizeOptions">
|
||||
<bean class="org.alfresco.repo.content.transform.magick.ImageResizeOptions">
|
||||
<property name="width" value="64"/>
|
||||
<property name="height" value="64"/>
|
||||
<property name="maintainAspectRatio" value="true"/>
|
||||
<property name="resizeToThumbnail" value="true" />
|
||||
</bean>
|
||||
</property>
|
||||
</bean>
|
||||
</property>
|
||||
<property name="placeHolderResourcePath" value="alfresco/thumbnail/thumbnail_placeholder_avatar.png" />
|
||||
<property name="runAs" value="System"/>
|
||||
<property name="failureHandlingOptions" ref="standardFailureOptions"/>
|
||||
</bean>
|
||||
|
||||
<!-- User avatar 32x32 image thumbnail options -->
|
||||
<bean class="org.alfresco.repo.thumbnail.ThumbnailDefinition">
|
||||
<property name="name" value="avatar32" />
|
||||
<property name="mimetype" value="image/png"/>
|
||||
<property name="transformationOptions">
|
||||
<bean class="org.alfresco.repo.content.transform.magick.ImageTransformationOptions">
|
||||
<property name="resizeOptions">
|
||||
<bean class="org.alfresco.repo.content.transform.magick.ImageResizeOptions">
|
||||
<property name="width" value="32"/>
|
||||
<property name="height" value="32"/>
|
||||
<property name="maintainAspectRatio" value="true"/>
|
||||
<property name="resizeToThumbnail" value="true" />
|
||||
</bean>
|
||||
</property>
|
||||
</bean>
|
||||
</property>
|
||||
<property name="placeHolderResourcePath" value="alfresco/thumbnail/thumbnail_placeholder_avatar32.png" />
|
||||
<property name="runAs" value="System"/>
|
||||
<property name="failureHandlingOptions" ref="standardFailureOptions"/>
|
||||
</bean>
|
||||
<bean id="baseThumbnailRegistry" abstract="true">
|
||||
<property name="contentService" ref="ContentService"/>
|
||||
<property name="renditionService" ref="renditionService" />
|
||||
<property name="transactionService" ref="TransactionService" />
|
||||
<property name="tenantAdminService" ref="tenantAdminService" />
|
||||
<property name="redeployStaticDefsOnStartup" value="${system.thumbnail.redeployStaticDefsOnStartup}" />
|
||||
<property name="thumbnailDefinitions">
|
||||
<list>
|
||||
<ref bean="thumbnailDefinitionMedium" />
|
||||
<ref bean="thumbnailDefinitionDoclib" />
|
||||
<ref bean="thumbnailDefinitionImgpreview" />
|
||||
<ref bean="thumbnailDefinitionAvatar" />
|
||||
<ref bean="thumbnailDefinitionAvatar32" />
|
||||
<ref bean="thumbnailDefinitionWebpreview" />
|
||||
</list>
|
||||
</property>
|
||||
<property name="thumbnailRenditionConvertor" ref="thumbnailRenditionConvertor" />
|
||||
|
||||
@@ -1413,9 +1413,9 @@ public class RenditionServiceIntegrationTest extends BaseAlfrescoSpringTest
|
||||
|
||||
// 4. "imgpreview"
|
||||
parameterValues.clear();
|
||||
parameterValues.put(AbstractRenderingEngine.PARAM_MIME_TYPE, MimetypeMap.MIMETYPE_IMAGE_PNG);
|
||||
parameterValues.put(ImageRenderingEngine.PARAM_RESIZE_WIDTH, 480);
|
||||
parameterValues.put(ImageRenderingEngine.PARAM_RESIZE_HEIGHT, 480);
|
||||
parameterValues.put(AbstractRenderingEngine.PARAM_MIME_TYPE, MimetypeMap.MIMETYPE_IMAGE_JPEG);
|
||||
parameterValues.put(ImageRenderingEngine.PARAM_RESIZE_WIDTH, 960);
|
||||
parameterValues.put(ImageRenderingEngine.PARAM_RESIZE_HEIGHT, 960);
|
||||
parameterValues.put(ImageRenderingEngine.PARAM_MAINTAIN_ASPECT_RATIO, true);
|
||||
parameterValues.put(ImageRenderingEngine.PARAM_RESIZE_TO_THUMBNAIL, true);
|
||||
parameterValues.put(ImageRenderingEngine.PARAM_ALLOW_ENLARGEMENT, false);
|
||||
|
||||
Reference in New Issue
Block a user