inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-31 17:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Thumbnail Service: removed unessesary code to store transformation options on node, added GET for thumbnail collection resource, created thumbnails are kept in sync with the master file asynchronously

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@9452 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Roy Wetherall
2008-06-11 15:27:03 +00:00
parent fb856c8da6
commit 725497edc9
12 changed files with 409 additions and 291 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
config/alfresco/model/contentModel.xml
View File

@@ -316,16 +316,16 @@
<parent>cm:content</parent> <parent>cm:content</parent>
<archive>true</archive> <archive>true</archive>
<properties> <properties>
<property name="cm:thumbnailName">
<title>Thumbnail Name</title>
<type>d:text</type>
<mandatory>false</mandatory>
</property>
<property name="cm:contentPropertyName"> <property name="cm:contentPropertyName">
<title>Thumbnailed Content Property Name</title> <title>Thumbnailed Content Property Name</title>
<type>d:qname</type> <type>d:qname</type>
<mandatory>true</mandatory> <mandatory>true</mandatory>
</property> </property>
<property name="cm:transformationOptionsClass">
<title>Transformation Options Class</title>
<type>d:text</type>
<mandatory>false</mandatory>
</property>
</properties> </properties>
</type> </type>
@@ -839,6 +839,14 @@
<!-- Thumbnailed aspect relates a content node to it's thumbnails --> <!-- Thumbnailed aspect relates a content node to it's thumbnails -->
<aspect name="cm:thumbnailed"> <aspect name="cm:thumbnailed">
<title>Thumbnailed</title> <title>Thumbnailed</title>
<properties>
<property name="cm:automaticUpdate">
<title>Automatic Update</title>
<type>d:boolean</type>
<mandatory>true</mandatory>
<default>true</default>
</property>
</properties>
<associations> <associations>
<child-association name="cm:thumbnails"> <child-association name="cm:thumbnails">
<source> <source>
@@ -854,60 +862,6 @@
</associations> </associations>
</aspect> </aspect>
<!-- Aspect containing image transformation options -->
<aspect name="cm:imageTransformationOptions">
<title>Image Transformation Options</title>
<properties>
<property name="cm:commandOptions">
<title>Command Options</title>
<type>d:text</type>
<mandatory>false</mandatory>
<default>-1</default>
</property>
<property name="cm:resize">
<title>Resize The Image</title>
<type>d:boolean</type>
<default>false</default>
</property>
<property name="cm:resizeWidth">
<title>Resize Width</title>
<type>d:int</type>
<mandatory>false</mandatory>
<default>-1</default>
</property>
<property name="cm:resizeHeight">
<title>Resize Height</title>
<type>d:int</type>
<mandatory>false</mandatory>
</property>
<property name="cm:resizeMaintainAspectRatio">
<title>Resize Maintain Aspect Ratio</title>
<type>d:boolean</type>
<default>true</default>
</property>
<property name="cm:resizePercent">
<title>Resize Percent</title>
<type>d:boolean</type>
<default>false</default>
</property>
<property name="cm:resizeToThumbnail">
<title>Resize To Thumbnail</title>
<type>d:boolean</type>
<default>false</default>
</property>
</properties>
</aspect>
<!-- Aspect containing swf transformation options -->
<aspect name="cm:swfTransformationOptions">
<properties>
<property name="cm:flashVerison">
<title>Flash Version</title>
<type>d:text</type>
</property>
</properties>
</aspect>
</aspects> </aspects>
</model> </model>

22
config/alfresco/thumbnail-service-context.xml
View File

@@ -96,6 +96,28 @@
</property> </property>
</bean> </bean>
<!-- Update Thumbnail Action -->
<bean id="update-thumbnail" class="org.alfresco.repo.thumbnail.UpdateThumbnailActionExecuter" parent="action-executer">
<property name="publicAction">
<value>false</value>
</property>
<property name="nodeService">
<ref bean="NodeService" />
</property>
<property name="thumbnailService">
<ref bean="ThumbnailService" />
</property>
</bean>
<!-- Thumbnailed aspect -->
<bean id="thumbnailedAspect" class="org.alfresco.repo.thumbnail.ThumbnailedAspect" init-method="init">
<property name="nodeService" ref="NodeService"/>
<property name="dictionaryService" ref="DictionaryService"/>
<property name="policyComponent" ref="policyComponent"/>
<property name="actionService" ref="ActionService"/>
<property name="thumbnailService" ref="ThumbnailService"/>
</bean>
<!-- Thumbnail service script API --> <!-- Thumbnail service script API -->
<bean id="thumbnailServiceScript" parent="baseJavaScriptExtension" class="org.alfresco.repo.thumbnail.script.ScriptThumbnailService"> <bean id="thumbnailServiceScript" parent="baseJavaScriptExtension" class="org.alfresco.repo.thumbnail.script.ScriptThumbnailService">
<property name="extensionName"> <property name="extensionName">

3
source/java/org/alfresco/model/ContentModel.java
View File

@@ -240,8 +240,9 @@ public interface ContentModel
// Thumbnail Type // Thumbnail Type
static final QName TYPE_THUMBNAIL = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "thumbnail"); static final QName TYPE_THUMBNAIL = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "thumbnail");
static final QName PROP_THUMBNAIL_NAME = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "thumbnailName");
static final QName PROP_CONTENT_PROPERTY_NAME = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "contentPropertyName"); static final QName PROP_CONTENT_PROPERTY_NAME = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "contentPropertyName");
static final QName PROP_TRANSFORMATION_OPTIONS_CLASS = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "cm:transformationOptionsClass"); static final QName PROP_AUTOMATIC_UPDATE = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "automaticUpdate");
// Thumbnailed Aspect // Thumbnailed Aspect
static final QName ASPECT_THUMBNAILED = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "thumbnailed"); static final QName ASPECT_THUMBNAILED = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "thumbnailed");

88
source/java/org/alfresco/repo/content/transform/magick/ImageTransformationOptions.java
View File

@@ -24,15 +24,7 @@
*/ */
package org.alfresco.repo.content.transform.magick; package org.alfresco.repo.content.transform.magick;
import java.io.Serializable;
import java.util.HashMap;
import java.util.Map;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.NodeService;
import org.alfresco.service.cmr.repository.TransformationOptions; import org.alfresco.service.cmr.repository.TransformationOptions;
import org.alfresco.service.namespace.NamespaceService;
import org.alfresco.service.namespace.QName;
/** /**
* Image transformation options * Image transformation options
@@ -41,16 +33,6 @@ import org.alfresco.service.namespace.QName;
*/ */
public class ImageTransformationOptions extends TransformationOptions public class ImageTransformationOptions extends TransformationOptions
{ {
/** imageTransformOptions aspect details */
public static final QName ASPECT_IMAGE_TRANSFORATION_OPTIONS = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "imageTransformationOptions");
public static final QName PROP_COMMAND_OPTIONS = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "commandOptions");
public static final QName PROP_RESIZE = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "resize");
public static final QName PROP_RESIZE_WIDTH = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "resizeWidth");
public static final QName PROP_RESIZE_HEIGHT = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "resizeHeight");
public static final QName PROP_RESIZE_MAINTAIN_ASPECT_RATIO = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "resizeMaintainAspectRatio");
public static final QName PROP_RESIZE_PERCENT = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "resizePercent");
public static final QName PROP_RESIZE_TO_THUMBNAIL = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "resizeToThumbnail");
/** Command string options, provided for backward compatibility */ /** Command string options, provided for backward compatibility */
private String commandOptions = ""; private String commandOptions = "";
@@ -96,74 +78,4 @@ public class ImageTransformationOptions extends TransformationOptions
{ {
return resizeOptions; return resizeOptions;
} }
/**
* Save the transformation options to the ImageTransformationOptions aspect.
*
* @see org.alfresco.service.cmr.repository.TransformationOptions#saveToNode(org.alfresco.service.cmr.repository.NodeRef, org.alfresco.service.cmr.repository.NodeService)
*/
@Override
public void saveToNode(NodeRef nodeRef, NodeService nodeService)
{
super.saveToNode(nodeRef, nodeService);
// Create a list of the properties
Map<QName, Serializable> properties = new HashMap<QName, Serializable>(7);
properties.put(PROP_COMMAND_OPTIONS, this.commandOptions);
if (this.resizeOptions != null)
{
properties.put(PROP_RESIZE, true);
properties.put(PROP_RESIZE_HEIGHT, this.resizeOptions.getHeight());
properties.put(PROP_RESIZE_WIDTH, this.resizeOptions.getWidth());
properties.put(PROP_RESIZE_MAINTAIN_ASPECT_RATIO, this.resizeOptions.isMaintainAspectRatio());
properties.put(PROP_RESIZE_PERCENT, this.resizeOptions.isPercentResize());
properties.put(PROP_RESIZE_TO_THUMBNAIL, this.resizeOptions.isResizeToThumbnail());
}
else
{
properties.put(PROP_RESIZE, false);
}
// Add the aspect
nodeService.addAspect(nodeRef, ASPECT_IMAGE_TRANSFORATION_OPTIONS, properties);
}
/**
* Populate the image transformation options from the node provided.
*
* @see org.alfresco.service.cmr.repository.TransformationOptions#populateFromNode(org.alfresco.service.cmr.repository.NodeRef, org.alfresco.service.cmr.repository.NodeService)
*/
@Override
public void populateFromNode(NodeRef nodeRef, NodeService nodeService)
{
super.populateFromNode(nodeRef, nodeService);
// Check whether the node has the image transformation options aspect
if (nodeService.hasAspect(nodeRef, ASPECT_IMAGE_TRANSFORATION_OPTIONS) == true)
{
// Get the node's properties
Map<QName, Serializable> properties = nodeService.getProperties(nodeRef);
// Set the properties
this.commandOptions = (String)properties.get(PROP_COMMAND_OPTIONS);
// Set the resize properties
Boolean isResize = (Boolean)properties.get(PROP_RESIZE);
if (isResize.booleanValue() == true)
{
int height = ((Long)properties.get(PROP_RESIZE_HEIGHT)).intValue();
int width = ((Long)properties.get(PROP_RESIZE_WIDTH)).intValue();
boolean maintainAspectRatio = ((Boolean)properties.get(PROP_RESIZE_MAINTAIN_ASPECT_RATIO)).booleanValue();
boolean percentResize = ((Boolean)properties.get(PROP_RESIZE_PERCENT)).booleanValue();
boolean resizeToThumbnail = ((Boolean)properties.get(PROP_RESIZE_TO_THUMBNAIL)).booleanValue();
this.resizeOptions = new ImageResizeOptions();
this.resizeOptions.setHeight(height);
this.resizeOptions.setWidth(width);
this.resizeOptions.setMaintainAspectRatio(maintainAspectRatio);
this.resizeOptions.setPercentResize(percentResize);
this.resizeOptions.setResizeToThumbnail(resizeToThumbnail);
}
}
}
} }

37
source/java/org/alfresco/repo/content/transform/swf/SWFTransformationOptions.java
View File

@@ -24,15 +24,7 @@
*/ */
package org.alfresco.repo.content.transform.swf; package org.alfresco.repo.content.transform.swf;
import java.io.Serializable;
import java.util.HashMap;
import java.util.Map;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.NodeService;
import org.alfresco.service.cmr.repository.TransformationOptions; import org.alfresco.service.cmr.repository.TransformationOptions;
import org.alfresco.service.namespace.NamespaceService;
import org.alfresco.service.namespace.QName;
/** /**
* SFW transformation options * SFW transformation options
@@ -41,9 +33,6 @@ import org.alfresco.service.namespace.QName;
*/ */
public class SWFTransformationOptions extends TransformationOptions public class SWFTransformationOptions extends TransformationOptions
{ {
private final static QName ASPECT_SWF_TRANSFORMATION_OPTIONS = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "swfTransformationOptions");
private final static QName PROP_FLASH_VERSION = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "flashVerison");
/** The version of the flash to convert to */ /** The version of the flash to convert to */
private String flashVersion = "9"; private String flashVersion = "9";
@@ -56,30 +45,4 @@ public class SWFTransformationOptions extends TransformationOptions
{ {
return flashVersion; return flashVersion;
} }
@Override
public void saveToNode(NodeRef nodeRef, NodeService nodeService)
{
super.saveToNode(nodeRef, nodeService);
Map<QName, Serializable> properties = new HashMap<QName, Serializable>(7);
properties.put(PROP_FLASH_VERSION, this.flashVersion);
nodeService.addAspect(nodeRef, ASPECT_SWF_TRANSFORMATION_OPTIONS, properties);
}
@Override
public void populateFromNode(NodeRef nodeRef, NodeService nodeService)
{
super.populateFromNode(nodeRef, nodeService);
// Check whether the node has the image transformation options aspect
if (nodeService.hasAspect(nodeRef, ASPECT_SWF_TRANSFORMATION_OPTIONS) == true)
{
// Get the node's properties
Map<QName, Serializable> properties = nodeService.getProperties(nodeRef);
// Set the properties
this.flashVersion = (String)properties.get(PROP_FLASH_VERSION);
}
}
} }

19
source/java/org/alfresco/repo/jscript/ScriptNode.java
View File

@@ -2002,12 +2002,25 @@ public class ScriptNode implements Serializable, Scopeable
} }
/** /**
* Get the all the thumbnails for a given node's content property.
* *
* @return * @return ScriptThumbnail list of thumbnails, empty if none available
*/ */
public ScriptableHashMap<String, ScriptThumbnail> getThumbnails() public ScriptThumbnail[] getThumbnails()
{ {
return null; List<NodeRef> thumbnails = this.services.getThumbnailService().getThumbnails(
this.nodeRef,
ContentModel.PROP_CONTENT,
null,
null);
List<ScriptThumbnail> result = new ArrayList<ScriptThumbnail>(thumbnails.size());
for (NodeRef thumbnail : thumbnails)
{
ScriptThumbnail scriptThumbnail = new ScriptThumbnail(thumbnail, this.services, this.scope);
result.add(scriptThumbnail);
}
return (ScriptThumbnail[])result.toArray(new ScriptThumbnail[result.size()]);
} }

38
source/java/org/alfresco/repo/thumbnail/ThumbnailServiceImpl.java
View File

@@ -165,15 +165,10 @@ public class ThumbnailServiceImpl implements ThumbnailService
String thumbnailFileName = generateThumbnailFileName(thumbnailName, mimetype); String thumbnailFileName = generateThumbnailFileName(thumbnailName, mimetype);
properties.put(ContentModel.PROP_NAME, thumbnailFileName); properties.put(ContentModel.PROP_NAME, thumbnailFileName);
} }
properties.put(ContentModel.PROP_THUMBNAIL_NAME, thumbnailName);
// Add the name of the content property // Add the name of the content property
properties.put(ContentModel.PROP_CONTENT_PROPERTY_NAME, contentProperty); properties.put(ContentModel.PROP_CONTENT_PROPERTY_NAME, contentProperty);
// Add the class name of the transformation options
if (transformationOptions != null)
{
properties.put(ContentModel.PROP_TRANSFORMATION_OPTIONS_CLASS, transformationOptions.getClass().getName());
}
// See if parent association details have been specified for the thumbnail // See if parent association details have been specified for the thumbnail
if (assocDetails == null) if (assocDetails == null)
@@ -220,9 +215,6 @@ public class ThumbnailServiceImpl implements ThumbnailService
{ {
// Do the thumnail transformation // Do the thumnail transformation
this.contentService.transform(reader, writer, transformationOptions); this.contentService.transform(reader, writer, transformationOptions);
// Store the transformation options on the thumbnail
transformationOptions.saveToNode(thumbnail, this.nodeService);
} }
// Return the created thumbnail // Return the created thumbnail
@@ -248,31 +240,7 @@ public class ThumbnailServiceImpl implements ThumbnailService
{ {
// First check that we are dealing with a thumbnail // First check that we are dealing with a thumbnail
if (ContentModel.TYPE_THUMBNAIL.equals(this.nodeService.getType(thumbnail)) == true) if (ContentModel.TYPE_THUMBNAIL.equals(this.nodeService.getType(thumbnail)) == true)
{ {
// Get the transformation options
// TransformationOptions options = null;
// String transformationOptionsClassName = (String)this.nodeService.getProperty(thumbnail, ContentModel.PROP_TRANSFORMATION_OPTIONS_CLASS);
// if (transformationOptionsClassName == null)
// {
// options = new TransformationOptions();
// }
// else
// {
// // Create an options object of the type specified on the thumbnail
// try
// {
// Class transformationClass = Class.forName(transformationOptionsClassName);
// options = (TransformationOptions)transformationClass.newInstance();
// }
// catch (Exception exception)
// {
// throw new ThumbnailException(ERR_TRANS_CLASS);
// }
//
// // Populate the options from the node
// options.populateFromNode(thumbnail, this.nodeService);
// }
// Get the node that is the source of the thumbnail // Get the node that is the source of the thumbnail
NodeRef node = null; NodeRef node = null;
List<ChildAssociationRef> parents = this.nodeService.getParentAssocs(thumbnail, ContentModel.ASSOC_THUMBNAILS, RegexQNamePattern.MATCH_ALL); List<ChildAssociationRef> parents = this.nodeService.getParentAssocs(thumbnail, ContentModel.ASSOC_THUMBNAILS, RegexQNamePattern.MATCH_ALL);
@@ -294,7 +262,7 @@ public class ThumbnailServiceImpl implements ThumbnailService
// Get the reader and writer // Get the reader and writer
ContentReader reader = this.contentService.getReader(node, contentProperty); ContentReader reader = this.contentService.getReader(node, contentProperty);
ContentWriter writer = this.contentService.getWriter(node, ContentModel.PROP_CONTENT, true); ContentWriter writer = this.contentService.getWriter(thumbnail, ContentModel.PROP_CONTENT, true);
// Set the basic detail of the transformation options // Set the basic detail of the transformation options
transformationOptions.setSourceNodeRef(node); transformationOptions.setSourceNodeRef(node);

87
source/java/org/alfresco/repo/thumbnail/ThumbnailServiceImplTest.java
View File

@@ -37,6 +37,7 @@ import org.alfresco.repo.content.transform.AbstractContentTransformerTest;
import org.alfresco.repo.content.transform.magick.ImageResizeOptions; import org.alfresco.repo.content.transform.magick.ImageResizeOptions;
import org.alfresco.repo.content.transform.magick.ImageTransformationOptions; import org.alfresco.repo.content.transform.magick.ImageTransformationOptions;
import org.alfresco.repo.jscript.ClasspathScriptLocation; import org.alfresco.repo.jscript.ClasspathScriptLocation;
import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
import org.alfresco.service.cmr.repository.ChildAssociationRef; import org.alfresco.service.cmr.repository.ChildAssociationRef;
import org.alfresco.service.cmr.repository.ContentReader; import org.alfresco.service.cmr.repository.ContentReader;
import org.alfresco.service.cmr.repository.ContentWriter; import org.alfresco.service.cmr.repository.ContentWriter;
@@ -109,7 +110,7 @@ public class ThumbnailServiceImplTest extends BaseAlfrescoSpringTest
"small"); "small");
assertNotNull(thumbnail1); assertNotNull(thumbnail1);
checkThumbnailed(jpgOrig, "small"); checkThumbnailed(jpgOrig, "small");
checkThumbnail(thumbnail1, imageTransformationOptions); checkThumbnail("small", thumbnail1);
outputThumbnailTempContentLocation(thumbnail1, "jpg", "small - 64x64, marked as thumbnail"); outputThumbnailTempContentLocation(thumbnail1, "jpg", "small - 64x64, marked as thumbnail");
// ===== small2: 64x64, aspect not maintained ==== // ===== small2: 64x64, aspect not maintained ====
@@ -126,7 +127,7 @@ public class ThumbnailServiceImplTest extends BaseAlfrescoSpringTest
imageTransformationOptions2, imageTransformationOptions2,
"small2"); "small2");
checkThumbnailed(jpgOrig, "small2"); checkThumbnailed(jpgOrig, "small2");
checkThumbnail(thumbnail2, imageTransformationOptions2); checkThumbnail("small2", thumbnail2);
outputThumbnailTempContentLocation(thumbnail2, "jpg", "small2 - 64x64, aspect not maintained"); outputThumbnailTempContentLocation(thumbnail2, "jpg", "small2 - 64x64, aspect not maintained");
// ===== half: 50%x50 ===== // ===== half: 50%x50 =====
@@ -143,7 +144,7 @@ public class ThumbnailServiceImplTest extends BaseAlfrescoSpringTest
imageTransformationOptions3, imageTransformationOptions3,
"half"); "half");
checkThumbnailed(jpgOrig, "half"); checkThumbnailed(jpgOrig, "half");
checkThumbnail(thumbnail3, imageTransformationOptions3); checkThumbnail("half", thumbnail3);
outputThumbnailTempContentLocation(thumbnail3, "jpg", "half - 50%x50%"); outputThumbnailTempContentLocation(thumbnail3, "jpg", "half - 50%x50%");
@@ -161,7 +162,7 @@ public class ThumbnailServiceImplTest extends BaseAlfrescoSpringTest
imageTransformationOptions4, imageTransformationOptions4,
"half2"); "half2");
checkThumbnailed(gifOrig, "half2"); checkThumbnailed(gifOrig, "half2");
checkThumbnail(thumbnail4, imageTransformationOptions4); checkThumbnail("half2", thumbnail4);
outputThumbnailTempContentLocation(thumbnail4, "jpg", "half2 - 50%x50%, from gif"); outputThumbnailTempContentLocation(thumbnail4, "jpg", "half2 - 50%x50%, from gif");
} }
} }
@@ -185,7 +186,7 @@ public class ThumbnailServiceImplTest extends BaseAlfrescoSpringTest
"small"); "small");
assertNotNull(thumbnail1); assertNotNull(thumbnail1);
checkThumbnailed(jpgOrig, "small"); checkThumbnailed(jpgOrig, "small");
checkThumbnail(thumbnail1, imageTransformationOptions); checkThumbnail("small", thumbnail1);
try try
{ {
@@ -252,7 +253,7 @@ public class ThumbnailServiceImplTest extends BaseAlfrescoSpringTest
// Try and retrieve the thumbnail // Try and retrieve the thumbnail
NodeRef result2 = this.thumbnailService.getThumbnailByName(jpgOrig, ContentModel.PROP_CONTENT, "small"); NodeRef result2 = this.thumbnailService.getThumbnailByName(jpgOrig, ContentModel.PROP_CONTENT, "small");
assertNotNull(result2); assertNotNull(result2);
checkThumbnail(result2, imageTransformationOptions); checkThumbnail("small", result2);
// Check for an other thumbnail that doesn't exist // Check for an other thumbnail that doesn't exist
NodeRef result3 = this.thumbnailService.getThumbnailByName(jpgOrig, ContentModel.PROP_CONTENT, "anotherone"); NodeRef result3 = this.thumbnailService.getThumbnailByName(jpgOrig, ContentModel.PROP_CONTENT, "anotherone");
@@ -270,48 +271,17 @@ public class ThumbnailServiceImplTest extends BaseAlfrescoSpringTest
assertEquals(1, assocs.size()); assertEquals(1, assocs.size());
} }
private void checkThumbnail(NodeRef thumbnail, TransformationOptions transformationOptions) private void checkThumbnail(String thumbnailName, NodeRef thumbnail)
{ {
// Check the thumbnail is of the correct type // Check the thumbnail is of the correct type
assertEquals(ContentModel.TYPE_THUMBNAIL, this.nodeService.getType(thumbnail)); assertEquals(ContentModel.TYPE_THUMBNAIL, this.nodeService.getType(thumbnail));
// Check the meta data on the thumnail // Check the name
assertEquals(ContentModel.PROP_CONTENT, this.nodeService.getProperty(thumbnail, ContentModel.PROP_CONTENT_PROPERTY_NAME)); assertEquals(thumbnailName, this.nodeService.getProperty(thumbnail, ContentModel.PROP_THUMBNAIL_NAME));
assertEquals(transformationOptions.getClass().getName(), this.nodeService.getProperty(thumbnail, ContentModel.PROP_TRANSFORMATION_OPTIONS_CLASS));
// Check the contet property value
assertEquals(ContentModel.PROP_CONTENT, this.nodeService.getProperty(thumbnail, ContentModel.PROP_CONTENT_PROPERTY_NAME));
if (transformationOptions instanceof ImageTransformationOptions)
{
ImageTransformationOptions imageTransformationOptions = (ImageTransformationOptions)transformationOptions;
assertTrue(this.nodeService.hasAspect(thumbnail, ImageTransformationOptions.ASPECT_IMAGE_TRANSFORATION_OPTIONS));
assertEquals(
imageTransformationOptions.getCommandOptions(),
this.nodeService.getProperty(thumbnail, ImageTransformationOptions.PROP_COMMAND_OPTIONS));
ImageResizeOptions resizeOptions = imageTransformationOptions.getResizeOptions();
if (resizeOptions != null)
{
assertTrue((Boolean)this.nodeService.getProperty(thumbnail, ImageTransformationOptions.PROP_RESIZE));
assertEquals(
imageTransformationOptions.getResizeOptions().getHeight(),
this.nodeService.getProperty(thumbnail, ImageTransformationOptions.PROP_RESIZE_HEIGHT));
assertEquals(
imageTransformationOptions.getResizeOptions().getWidth(),
this.nodeService.getProperty(thumbnail, ImageTransformationOptions.PROP_RESIZE_WIDTH));
assertEquals(
imageTransformationOptions.getResizeOptions().isMaintainAspectRatio(),
this.nodeService.getProperty(thumbnail, ImageTransformationOptions.PROP_RESIZE_MAINTAIN_ASPECT_RATIO));
assertEquals(
imageTransformationOptions.getResizeOptions().isPercentResize(),
this.nodeService.getProperty(thumbnail, ImageTransformationOptions.PROP_RESIZE_PERCENT));
assertEquals(
imageTransformationOptions.getResizeOptions().isResizeToThumbnail(),
this.nodeService.getProperty(thumbnail, ImageTransformationOptions.PROP_RESIZE_TO_THUMBNAIL));
}
else
{
assertFalse((Boolean)this.nodeService.getProperty(thumbnail, ImageTransformationOptions.PROP_RESIZE));
}
}
} }
private void outputThumbnailTempContentLocation(NodeRef thumbnail, String ext, String message) private void outputThumbnailTempContentLocation(NodeRef thumbnail, String ext, String message)
@@ -346,6 +316,37 @@ public class ThumbnailServiceImplTest extends BaseAlfrescoSpringTest
return node; return node;
} }
public void testAutoUpdate() throws Exception
{
if (contentService.getImageTransformer() != null)
{
final NodeRef jpgOrig = createOrigionalContent(this.folder, MimetypeMap.MIMETYPE_IMAGE_JPEG);
ThumbnailDetails details = this.thumbnailService.getThumbnailRegistry().getThumbnailDetails("medium");
final NodeRef thumbnail = this.thumbnailService.createThumbnail(jpgOrig, ContentModel.PROP_CONTENT, details.getMimetype(), details.getTransformationOptions(), details.getName());
setComplete();
endTransaction();
transactionService.getRetryingTransactionHelper().doInTransaction(new RetryingTransactionCallback<Object>()
{
public Object execute() throws Exception
{
String ext = ThumbnailServiceImplTest.this.mimetypeMap.getExtension(MimetypeMap.MIMETYPE_IMAGE_JPEG);
File origFile = AbstractContentTransformerTest.loadQuickTestFile(ext);
ContentWriter writer = ThumbnailServiceImplTest.this.contentService.getWriter(jpgOrig, ContentModel.PROP_CONTENT, true);
writer.putContent(origFile);
return null;
}
});
Thread.sleep(100000);
}
}
// == Test the JavaScript API == // == Test the JavaScript API ==
public void testJSAPI() throws Exception public void testJSAPI() throws Exception

179
source/java/org/alfresco/repo/thumbnail/ThumbnailedAspect.java Normal file
View File

@@ -0,0 +1,179 @@
/*
* Copyright (C) 2005-2007 Alfresco Software Limited.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
* This program 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 General Public License for more details.
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
* As a special exception to the terms and conditions of version 2.0 of
* the GPL, you may redistribute this Program in connection with Free/Libre
* and Open Source Software ("FLOSS") applications as described in Alfresco's
* FLOSS exception. You should have recieved a copy of the text describing
* the FLOSS exception, and it is also available here:
* http://www.alfresco.com/legal/licensing"
*/
package org.alfresco.repo.thumbnail;
import java.io.Serializable;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import org.alfresco.model.ContentModel;
import org.alfresco.repo.content.ContentServicePolicies;
import org.alfresco.repo.content.ContentServicePolicies.OnContentUpdatePolicy;
import org.alfresco.repo.node.NodeServicePolicies;
import org.alfresco.repo.policy.Behaviour;
import org.alfresco.repo.policy.JavaBehaviour;
import org.alfresco.repo.policy.PolicyComponent;
import org.alfresco.service.cmr.action.Action;
import org.alfresco.service.cmr.action.ActionService;
import org.alfresco.service.cmr.dictionary.DataTypeDefinition;
import org.alfresco.service.cmr.dictionary.DictionaryService;
import org.alfresco.service.cmr.dictionary.PropertyDefinition;
import org.alfresco.service.cmr.repository.ContentData;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.NodeService;
import org.alfresco.service.cmr.thumbnail.ThumbnailService;
import org.alfresco.service.namespace.NamespaceService;
import org.alfresco.service.namespace.QName;
import org.alfresco.util.EqualsHelper;
/**
* Thumbnailed aspect behaviour bean
*
* @author Roy Wetherall
*/
public class ThumbnailedAspect implements NodeServicePolicies.OnUpdatePropertiesPolicy
{
private PolicyComponent policyComponent;
private ThumbnailService thumbnailService;
private ActionService actionService;
private NodeService nodeService;
private DictionaryService dictionaryService;
public void setPolicyComponent(PolicyComponent policyComponent)
{
this.policyComponent = policyComponent;
}
public void setActionService(ActionService actionService)
{
this.actionService = actionService;
}
public void setNodeService(NodeService nodeService)
{
this.nodeService = nodeService;
}
public void setThumbnailService(ThumbnailService thumbnailService)
{
this.thumbnailService = thumbnailService;
}
public void setDictionaryService(DictionaryService dictionaryService)
{
this.dictionaryService = dictionaryService;
}
public void init()
{
this.policyComponent.bindClassBehaviour(
QName.createQName(NamespaceService.ALFRESCO_URI, "onUpdateProperties"),
ContentModel.ASPECT_THUMBNAILED,
new JavaBehaviour(this, "onUpdateProperties", Behaviour.NotificationFrequency.TRANSACTION_COMMIT));
}
public void onUpdateProperties(
NodeRef nodeRef,
Map<QName, Serializable> before,
Map<QName, Serializable> after)
{
// check if any of the content properties have changed
for (QName propertyQName : after.keySet())
{
// is this a content property?
PropertyDefinition propertyDef = dictionaryService.getProperty(propertyQName);
if (propertyDef == null)
{
// the property is not recognised
continue;
}
if (!propertyDef.getDataType().getName().equals(DataTypeDefinition.CONTENT))
{
// not a content type
continue;
}
try
{
ContentData beforeValue = (ContentData) before.get(propertyQName);
ContentData afterValue = (ContentData) after.get(propertyQName);
// Figure out if the content is new or not
boolean newContent = false;
String beforeContentUrl = null;
if (beforeValue != null)
{
beforeContentUrl = beforeValue.getContentUrl();
}
String afterContentUrl = null;
if (afterValue != null)
{
afterContentUrl = afterValue.getContentUrl();
}
if (beforeContentUrl == null && afterContentUrl != null)
{
newContent = true;
}
if (afterValue != null && afterValue.getContentUrl() == null)
{
// no URL - ignore
}
else if (newContent == false && EqualsHelper.nullSafeEquals(beforeValue, afterValue) == false)
{
// Queue the update
queueUpdate(nodeRef, propertyQName);
}
}
catch (ClassCastException e)
{
// properties don't conform to model
continue;
}
}
}
private void queueUpdate(NodeRef nodeRef, QName contentProperty)
{
if (this.nodeService.exists(nodeRef) == true)
{
Boolean automaticUpdate = (Boolean)this.nodeService.getProperty(nodeRef, ContentModel.PROP_AUTOMATIC_UPDATE);
if (automaticUpdate != null && automaticUpdate.booleanValue() == true)
{
List<NodeRef> thumbnails = this.thumbnailService.getThumbnails(nodeRef, contentProperty, null, null);
for (NodeRef thumbnail : thumbnails)
{
// Execute the update thumbnail action async for each thumbnail
Action action = actionService.createAction(UpdateThumbnailActionExecuter.NAME);
action.setParameterValue(CreateThumbnailActionExecuter.PARAM_CONTENT_PROPERTY, contentProperty);
actionService.executeAction(action, thumbnail, false, true);
}
}
}
}
}

121
source/java/org/alfresco/repo/thumbnail/UpdateThumbnailActionExecuter.java Normal file
View File

@@ -0,0 +1,121 @@
/*
* Copyright (C) 2005-2007 Alfresco Software Limited.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
* This program 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 General Public License for more details.
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
* As a special exception to the terms and conditions of version 2.0 of
* the GPL, you may redistribute this Program in connection with Free/Libre
* and Open Source Software ("FLOSS") applications as described in Alfresco's
* FLOSS exception. You should have recieved a copy of the text describing
* the FLOSS exception, and it is also available here:
* http://www.alfresco.com/legal/licensing"
*/
package org.alfresco.repo.thumbnail;
import java.util.List;
import org.alfresco.error.AlfrescoRuntimeException;
import org.alfresco.model.ContentModel;
import org.alfresco.repo.action.ParameterDefinitionImpl;
import org.alfresco.repo.action.executer.ActionExecuterAbstractBase;
import org.alfresco.service.cmr.action.Action;
import org.alfresco.service.cmr.action.ParameterDefinition;
import org.alfresco.service.cmr.dictionary.DataTypeDefinition;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.NodeService;
import org.alfresco.service.cmr.thumbnail.ThumbnailService;
import org.alfresco.service.namespace.QName;
/**
* Update thumbnail action executer.
*
* NOTE: This action is used to facilitate the async update of thumbnails. It is not intended for genereral usage.
*
* @author Roy Wetherall
*/
public class UpdateThumbnailActionExecuter extends ActionExecuterAbstractBase
{
/** Thumbnail Service */
private ThumbnailService thumbnailService;
/** Node Service */
private NodeService nodeService;
/** Action name and parameters */
public static final String NAME = "update-thumbnail";
public static final String PARAM_CONTENT_PROPERTY = "content-property";
/**
* Set the thumbnail service
*
* @param thumbnailService the thumbnail service
*/
public void setThumbnailService(ThumbnailService thumbnailService)
{
this.thumbnailService = thumbnailService;
}
/**
* Set the node service
*
* @param nodeService node service
*/
public void setNodeService(NodeService nodeService)
{
this.nodeService = nodeService;
}
/**
* @see org.alfresco.repo.action.executer.ActionExecuterAbstractBase#executeImpl(org.alfresco.service.cmr.action.Action, org.alfresco.service.cmr.repository.NodeRef)
*/
@Override
protected void executeImpl(Action action, NodeRef actionedUponNodeRef)
{
if (this.nodeService.exists(actionedUponNodeRef) == true)
{
// Get the thumbnail Name
String thumbnailName = (String)this.nodeService.getProperty(actionedUponNodeRef, ContentModel.PROP_THUMBNAIL_NAME);
// Get the details of the thumbnail
ThumbnailRegistry registry = this.thumbnailService.getThumbnailRegistry();
ThumbnailDetails details = registry.getThumbnailDetails(thumbnailName);
if (details == null)
{
// Throw exception
throw new AlfrescoRuntimeException("The thumbnail name '" + thumbnailName + "' is not registered");
}
// Get the content property
QName contentProperty = (QName)action.getParameterValue(PARAM_CONTENT_PROPERTY);
if (contentProperty == null)
{
contentProperty = ContentModel.PROP_CONTENT;
}
// Create the thumbnail
this.thumbnailService.updateThumbnail(actionedUponNodeRef, details.getTransformationOptions());
}
}
/**
* @see org.alfresco.repo.action.ParameterizedItemAbstractBase#addParameterDefinitions(java.util.List)
*/
@Override
protected void addParameterDefinitions(List<ParameterDefinition> paramList)
{
paramList.add(new ParameterDefinitionImpl(PARAM_CONTENT_PROPERTY, DataTypeDefinition.QNAME, false, getParamDisplayLabel(PARAM_CONTENT_PROPERTY)));
}
}

8
source/java/org/alfresco/repo/thumbnail/script/test_thumbnailAPI.js
View File

@@ -1,8 +1,16 @@
function testCreateThumbnail() function testCreateThumbnail()
{ {
var thumbs = jpgOrig.getThumbnails();
test.assertNotNull(thumbs);
test.assertEquals(0, thumbs.length);
// Create a thumbnail // Create a thumbnail
var thumbnail = jpgOrig.createThumbnail("medium"); var thumbnail = jpgOrig.createThumbnail("medium");
test.assertNotNull(thumbnail); test.assertNotNull(thumbnail);
thumbs = jpgOrig.getThumbnails();
test.assertNotNull(thumbs);
test.assertEquals(1, thumbs.length);
} }
function testThumbnailService() function testThumbnailService()

24
source/java/org/alfresco/service/cmr/repository/TransformationOptions.java
View File

@@ -207,28 +207,4 @@ public class TransformationOptions
this.targetNodeRef = (NodeRef)optionsMap.get(OPT_TARGET_NODEREF); this.targetNodeRef = (NodeRef)optionsMap.get(OPT_TARGET_NODEREF);
this.targetContentProperty = (QName)optionsMap.get(OPT_TARGET_CONTENT_PROPERTY); this.targetContentProperty = (QName)optionsMap.get(OPT_TARGET_CONTENT_PROPERTY);
} }
/**
* Save the transformation options to the given node by applying the appropriate aspect
* and setting the meta data from the transformation options
*
* @param nodeRef the node reference
* @param nodeService the node service
*/
public void saveToNode(NodeRef nodeRef, NodeService nodeService)
{
// Do nothing for default transformation options
}
/**
* Populate the transformation options from the meta data present on the appropraite
* aspect on the passed node.
*
* @param nodeRef the node reference
* @param nodeService the node service
*/
public void populateFromNode(NodeRef nodeRef, NodeService nodeService)
{
// Do nothing for the detauls transformation options
}
} }