Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)

84758: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      80284: ACE-2213


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85123 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

source/java/org/alfresco/repo/content/transform/AbstractContentTransformer2.java

@@ -27,6 +27,7 @@ import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 
+import org.alfresco.api.AlfrescoPublicApi;   
 import org.alfresco.error.AlfrescoRuntimeException;
 import org.alfresco.repo.content.AbstractStreamAwareProxy;
 import org.alfresco.repo.content.StreamAwareContentReaderProxy;
@@ -51,6 +52,7 @@ import org.apache.commons.logging.LogFactory;
  * @author Derek Hulley
  * @author Roy Wetherall
  */
+@AlfrescoPublicApi
 public abstract class AbstractContentTransformer2 extends AbstractContentTransformerLimits
 {
     private static final Log logger = LogFactory.getLog(AbstractContentTransformer2.class);

source/java/org/alfresco/repo/content/transform/AbstractContentTransformerLimits.java

@@ -28,6 +28,7 @@ import static org.alfresco.service.cmr.repository.TransformationOptionLimits.OPT
 import java.util.Map;
 import java.util.Map.Entry;
 
+import org.alfresco.api.AlfrescoPublicApi;
 import org.alfresco.repo.content.AbstractContentReader;
 import org.alfresco.service.cmr.repository.ContentReader;
 import org.alfresco.service.cmr.repository.ContentWriter;
@@ -45,6 +46,7 @@ import org.alfresco.service.cmr.repository.TransformationOptions;
  * 
  * @author Alan Davis
  */
+@AlfrescoPublicApi
 public abstract class AbstractContentTransformerLimits extends ContentTransformerHelper implements ContentTransformer
 {
     /** Indicates if 'page' limits are supported. */

source/java/org/alfresco/repo/content/transform/ComplexContentTransformer.java

@@ -31,6 +31,7 @@ import java.util.Map;
 
 import javax.faces.el.MethodNotFoundException;
 
+import org.alfresco.api.AlfrescoPublicApi;     
 import org.alfresco.error.AlfrescoRuntimeException;
 import org.alfresco.repo.content.filestore.FileContentWriter;
 import org.alfresco.service.cmr.repository.ContentReader;
@@ -52,6 +53,7 @@ import org.springframework.beans.factory.InitializingBean;
  * 
  * @author Derek Hulley
  */
+@AlfrescoPublicApi
 public class ComplexContentTransformer extends AbstractContentTransformer2 implements InitializingBean
 {
     /**

source/java/org/alfresco/repo/content/transform/ContentTransformer.java

@@ -21,6 +21,7 @@ package org.alfresco.repo.content.transform;
 import java.util.List;
 import java.util.Map;
 
+import org.alfresco.api.AlfrescoPublicApi;     
 import org.alfresco.repo.content.ContentWorker;
 import org.alfresco.service.cmr.repository.ContentIOException;
 import org.alfresco.service.cmr.repository.ContentReader;
@@ -32,6 +33,7 @@ import org.alfresco.service.cmr.repository.TransformationOptions;
  * 
  * @author Derek Hulley
  */
+@AlfrescoPublicApi
 public interface ContentTransformer extends ContentWorker
 {
     /**

source/java/org/alfresco/repo/content/transform/ContentTransformerHelper.java

@@ -24,6 +24,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
+import org.alfresco.api.AlfrescoPublicApi; 
 import org.alfresco.error.AlfrescoRuntimeException;
 import org.alfresco.service.cmr.repository.ContentAccessor;
 import org.alfresco.service.cmr.repository.MimetypeService;
@@ -37,6 +38,7 @@ import org.springframework.beans.factory.BeanNameAware;
  * 
  * @author dward
  */
+@AlfrescoPublicApi
 public class ContentTransformerHelper implements BeanNameAware
 {
     private static final Log logger = LogFactory.getLog(ContentTransformerHelper.class);

source/java/org/alfresco/repo/content/transform/ContentTransformerRegistry.java

@@ -22,6 +22,7 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
+import org.alfresco.api.AlfrescoPublicApi;    
 import org.alfresco.service.cmr.repository.TransformationOptions;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -40,6 +41,7 @@ import org.apache.commons.logging.LogFactory;
  * 
  * @author Derek Hulley
  */
+@AlfrescoPublicApi
 public class ContentTransformerRegistry
 {
     private static final Log logger = LogFactory.getLog(ContentTransformerRegistry.class);

source/java/org/alfresco/repo/content/transform/ContentTransformerWorker.java

@@ -18,6 +18,7 @@
  */
 package org.alfresco.repo.content.transform;
 
+import org.alfresco.api.AlfrescoPublicApi;     
 import org.alfresco.service.cmr.repository.ContentReader;
 import org.alfresco.service.cmr.repository.ContentWriter;
 import org.alfresco.service.cmr.repository.TransformationOptions;
@@ -29,6 +30,7 @@ import org.alfresco.service.cmr.repository.TransformationOptions;
  * @author dward
  */
 // TODO Modify ContentTransformerWorker to understand transformer limits. At the moment no workers use them
+@AlfrescoPublicApi
 public interface ContentTransformerWorker
 {
     /**

source/java/org/alfresco/repo/content/transform/FailoverContentTransformer.java

@@ -21,6 +21,7 @@ package org.alfresco.repo.content.transform;
 import java.io.File;
 import java.util.List;
 
+import org.alfresco.api.AlfrescoPublicApi;     
 import org.alfresco.error.AlfrescoRuntimeException;
 import org.alfresco.repo.content.filestore.FileContentWriter;
 import org.alfresco.service.cmr.repository.ContentReader;
@@ -41,6 +42,7 @@ import org.springframework.beans.factory.InitializingBean;
  * 
  * @author Neil McErlean
  */
+@AlfrescoPublicApi
 public class FailoverContentTransformer extends AbstractContentTransformer2 implements InitializingBean
 {
     private static Log logger = LogFactory.getLog(FailoverContentTransformer.class);

source/java/org/alfresco/repo/content/transform/ProxyContentTransformer.java

@@ -20,6 +20,7 @@ package org.alfresco.repo.content.transform;
 
 import net.sf.jooreports.converter.DocumentFormatRegistry;
 
+import org.alfresco.api.AlfrescoPublicApi;   
 import org.alfresco.service.cmr.repository.ContentReader;
 import org.alfresco.service.cmr.repository.ContentWriter;
 import org.alfresco.service.cmr.repository.TransformationOptionLimits;
@@ -30,6 +31,7 @@ import org.alfresco.service.cmr.repository.TransformationOptions;
  * 
  * @author dward
  */
+@AlfrescoPublicApi
 public class ProxyContentTransformer extends AbstractContentTransformer2
 {
     private ContentTransformerWorker worker;

source/java/org/alfresco/repo/content/transform/RuntimeExecutableContentTransformerWorker.java

@@ -23,6 +23,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import org.alfresco.api.AlfrescoPublicApi;     
 import org.alfresco.error.AlfrescoRuntimeException;
 import org.alfresco.service.cmr.repository.ContentIOException;
 import org.alfresco.service.cmr.repository.ContentReader;
@@ -62,6 +63,7 @@ import org.springframework.beans.factory.InitializingBean;
  * @since 1.1
  * @author Derek Hulley
  */
+@AlfrescoPublicApi
 public class RuntimeExecutableContentTransformerWorker extends ContentTransformerHelper implements ContentTransformerWorker, InitializingBean
 {
     public static final String VAR_SOURCE = "source";

source/java/org/alfresco/repo/content/transform/TransformerConfig.java

@@ -22,6 +22,7 @@ import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 
+import org.alfresco.api.AlfrescoPublicApi;  
 import org.alfresco.service.cmr.repository.TransformationOptionLimits;
 import org.alfresco.service.cmr.repository.TransformationOptions;
 
@@ -30,6 +31,7 @@ import org.alfresco.service.cmr.repository.TransformationOptions;
  * 
  * @author Alan Davis
  */
+@AlfrescoPublicApi
 public interface TransformerConfig
 {
     /**

source/java/org/alfresco/repo/content/transform/TransformerDebug.java

@@ -36,6 +36,7 @@ import java.util.TreeMap;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.regex.Pattern;
 
+import org.alfresco.api.AlfrescoPublicApi;  
 import org.alfresco.error.AlfrescoRuntimeException;
 import org.alfresco.model.ContentModel;
 import org.alfresco.repo.content.filestore.FileContentReader;
@@ -72,6 +73,7 @@ import org.springframework.util.ResourceUtils;
  * 
  * @author Alan Davis
  */
+@AlfrescoPublicApi
 public class TransformerDebug
 {
     private static final String FINISHED_IN = "Finished in ";
@@ -80,6 +82,7 @@ public class TransformerDebug
     private final Log logger;
     private final Log info;
 
+    @AlfrescoPublicApi 
     private enum Call
     {
         AVAILABLE,
@@ -87,6 +90,7 @@ public class TransformerDebug
         AVAILABLE_AND_TRANSFORM
     };
     
+    @AlfrescoPublicApi
     private static class ThreadInfo
     {
         private static final ThreadLocal<ThreadInfo> threadInfo = new ThreadLocal<ThreadInfo>()
@@ -137,6 +141,7 @@ public class TransformerDebug
         }
     }
     
+    @AlfrescoPublicApi
     private static class Frame
     {
         private static final AtomicInteger uniqueId = new AtomicInteger(0);
@@ -213,6 +218,7 @@ public class TransformerDebug
         }
     }
     
+    @AlfrescoPublicApi
     private class UnavailableTransformer
     {
         private final String name;
@@ -1392,6 +1398,7 @@ public class TransformerDebug
         }
     }
 
+    @AlfrescoPublicApi
     private abstract class TestTransform
     {
         String run(String sourceExtension, String targetExtension, String use)

source/java/org/alfresco/repo/content/transform/TransformerLog.java

@@ -23,12 +23,15 @@ import java.util.Deque;
 
 import org.apache.commons.logging.Log;
 
+import org.alfresco.api.AlfrescoPublicApi;  
+
 /**
  * Implementation of a {@link Log} that logs messages to a structure accessible via
  * {@link TransformerConfigMBean#getTransformationLog(int)}.<p>
  * 
  * @author Alan Davis
  */
+@AlfrescoPublicApi
 public class TransformerLog extends TransformerLogger<String>
 {
     /**

source/java/org/alfresco/repo/content/transform/TransformerLogger.java

@@ -24,6 +24,7 @@ import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.Properties;
 
+import org.alfresco.api.AlfrescoPublicApi;  
 import org.alfresco.util.LogAdapter;
 import org.apache.commons.logging.Log;
 
@@ -35,6 +36,7 @@ import org.apache.commons.logging.Log;
  * 
  * @author Alan Davis
  */
+@AlfrescoPublicApi
 abstract class TransformerLogger<T> extends LogAdapter implements LogEntries
 {
     static final SimpleDateFormat DATE_FORMAT = new SimpleDateFormat("d MMM yyyy HH:mm:ss");

source/java/org/alfresco/repo/content/transform/TransformerSelector.java

@@ -20,6 +20,7 @@ package org.alfresco.repo.content.transform;
 
 import java.util.List;
 
+import org.alfresco.api.AlfrescoPublicApi;   
 import org.alfresco.service.cmr.repository.TransformationOptions;
 
 /**
@@ -28,6 +29,7 @@ import org.alfresco.service.cmr.repository.TransformationOptions;
  * 
  * @author Alan Davis
  */
+@AlfrescoPublicApi
 public interface TransformerSelector
 {
     /**

source/java/org/alfresco/repo/content/transform/TransformerStatistics.java

@@ -18,6 +18,7 @@
  */
 package org.alfresco.repo.content.transform;
 
+import org.alfresco.api.AlfrescoPublicApi;  
 
 /**
  * Interface to obtain the configuration and performance data for every
@@ -25,6 +26,7 @@ package org.alfresco.repo.content.transform;
  *  
  * @author Alan Davis
  */
+@AlfrescoPublicApi
 public interface TransformerStatistics
 {
     /**

source/java/org/alfresco/repo/content/transform/UnsupportedTransformationException.java

@@ -18,6 +18,7 @@
  */
 package org.alfresco.repo.content.transform;
 
+import org.alfresco.api.AlfrescoPublicApi;     
 import org.alfresco.error.AlfrescoRuntimeException;
 
 /**
@@ -28,6 +29,7 @@ import org.alfresco.error.AlfrescoRuntimeException;
  * 
  * @author Alan Davis
  */
+@AlfrescoPublicApi
 public class UnsupportedTransformationException extends AlfrescoRuntimeException
 {
     private static final long serialVersionUID = 9039331287661301086L;

source/java/org/alfresco/repo/content/transform/magick/ImageResizeOptions.java

@@ -18,11 +18,14 @@
  */
 package org.alfresco.repo.content.transform.magick;
 
+import org.alfresco.api.AlfrescoPublicApi;    
+
 /**
  * Image resize options
  * 
  * @author Roy Wetherall
  */
+@AlfrescoPublicApi 
 public class ImageResizeOptions
 {
     /** The width */

source/java/org/alfresco/repo/content/transform/magick/ImageTransformationOptions.java

@@ -21,6 +21,7 @@ package org.alfresco.repo.content.transform.magick;
 import java.util.HashMap;
 import java.util.Map;
 
+import org.alfresco.api.AlfrescoPublicApi;     
 import org.alfresco.service.cmr.repository.TransformationOptions;
 import org.alfresco.service.cmr.repository.TransformationSourceOptions;
 
@@ -29,6 +30,7 @@ import org.alfresco.service.cmr.repository.TransformationSourceOptions;
  * 
  * @author Roy Wetherall
  */
+@AlfrescoPublicApi
 public class ImageTransformationOptions extends TransformationOptions
 {
     public static final String OPT_COMMAND_OPTIONS = "commandOptions";