mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-07-24 17:32:48 +00:00
Big honkin' merge from head. Sheesh!
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3617 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -31,6 +31,7 @@ import org.alfresco.repo.content.ContentServicePolicies.OnContentUpdatePolicy;
|
||||
import org.alfresco.repo.content.filestore.FileContentStore;
|
||||
import org.alfresco.repo.content.transform.ContentTransformer;
|
||||
import org.alfresco.repo.content.transform.ContentTransformerRegistry;
|
||||
import org.alfresco.repo.content.transform.magick.ImageMagickContentTransformer;
|
||||
import org.alfresco.repo.policy.ClassPolicyDelegate;
|
||||
import org.alfresco.repo.policy.JavaBehaviour;
|
||||
import org.alfresco.repo.policy.PolicyComponent;
|
||||
@@ -78,6 +79,7 @@ public class RoutingContentService implements ContentService
|
||||
private ContentStore store;
|
||||
/** the store for all temporarily created content */
|
||||
private ContentStore tempStore;
|
||||
private ImageMagickContentTransformer imageMagickContentTransformer;
|
||||
|
||||
/**
|
||||
* The policy component
|
||||
@@ -133,6 +135,11 @@ public class RoutingContentService implements ContentService
|
||||
this.avmService = service;
|
||||
}
|
||||
|
||||
public void setImageMagickContentTransformer(ImageMagickContentTransformer imageMagickContentTransformer)
|
||||
{
|
||||
this.imageMagickContentTransformer = imageMagickContentTransformer;
|
||||
}
|
||||
|
||||
/**
|
||||
* Service initialise
|
||||
*/
|
||||
@@ -407,6 +414,14 @@ public class RoutingContentService implements ContentService
|
||||
return transformer;
|
||||
}
|
||||
|
||||
/**
|
||||
* @see org.alfresco.service.cmr.repository.ContentService#getImageTransformer()
|
||||
*/
|
||||
public ContentTransformer getImageTransformer()
|
||||
{
|
||||
return imageMagickContentTransformer;
|
||||
}
|
||||
|
||||
/**
|
||||
* @see org.alfresco.repo.content.transform.ContentTransformerRegistry
|
||||
* @see org.alfresco.repo.content.transform.ContentTransformer
|
||||
|
Reference in New Issue
Block a user