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
2025-06-30 18:15:39 +00:00 · 2014-09-19 22:28:29 +00:00 · 2014-09-19 22:28:29 +00:00 · 1481a5481e
commit 1481a5481e
parent 60281c702a
56 changed files with 126 additions and 0 deletions
--- a/source/java/org/alfresco/repo/content/AbstractContentReader.java
+++ b/source/java/org/alfresco/repo/content/AbstractContentReader.java
@ -36,6 +36,7 @@ import java.util.Timer;
 import java.util.TimerTask;
 import java.util.concurrent.atomic.AtomicBoolean;

+import org.alfresco.api.AlfrescoPublicApi;    
 import org.alfresco.error.AlfrescoRuntimeException;
 import org.alfresco.repo.content.filestore.FileContentWriter;
 import org.alfresco.repo.content.transform.TransformerDebug;
@ -64,6 +65,7 @@ import org.springframework.util.FileCopyUtils;
 * 
 * @author Derek Hulley
 */
+@AlfrescoPublicApi
 public abstract class AbstractContentReader extends AbstractContentAccessor implements ContentReader
 {
    private static final Log logger = LogFactory.getLog(AbstractContentReader.class);
--- a/source/java/org/alfresco/repo/content/AbstractContentWriter.java
+++ b/source/java/org/alfresco/repo/content/AbstractContentWriter.java
@ -33,6 +33,7 @@ import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.List;

+import org.alfresco.api.AlfrescoPublicApi; 
 import org.alfresco.error.AlfrescoRuntimeException;
 import org.alfresco.repo.content.ContentLimitProvider.NoLimitProvider;
 import org.alfresco.repo.content.encoding.ContentCharsetFinder;
@ -59,6 +60,7 @@ import org.springframework.aop.framework.ProxyFactory;
 * 
 * @author Derek Hulley
 */
+@AlfrescoPublicApi
 public abstract class AbstractContentWriter extends AbstractContentAccessor implements ContentWriter, MimetypeServiceAware
 {
    private static final Log logger = LogFactory.getLog(AbstractContentWriter.class);
--- a/source/java/org/alfresco/repo/content/ContentServicePolicies.java
+++ b/source/java/org/alfresco/repo/content/ContentServicePolicies.java
@ -18,6 +18,7 @@
 */
 package org.alfresco.repo.content;

+import org.alfresco.api.AlfrescoPublicApi;    
 import org.alfresco.repo.policy.ClassPolicy;
 import org.alfresco.service.cmr.repository.ContentData;
 import org.alfresco.service.cmr.repository.NodeRef;
@ -44,6 +45,7 @@ public interface ContentServicePolicies
 	 * changed; the specific properties are irrelevant.  This is primarily useful to determine
 	 * when a new file is introduced into the system.
 	 */
+	@AlfrescoPublicApi
 	public interface OnContentUpdatePolicy extends ClassPolicy
 	{
 	    public static final QName QNAME = QName.createQName(NamespaceService.ALFRESCO_URI, "onContentUpdate");
--- a/source/java/org/alfresco/repo/content/ContentWorker.java
+++ b/source/java/org/alfresco/repo/content/ContentWorker.java
@ -18,6 +18,8 @@
 */
 package org.alfresco.repo.content;

+import org.alfresco.api.AlfrescoPublicApi;   
+
 /**
 * An interface instances that operate on content.  This is a marker interface
 * for specific <i>worker</i> interfaces such as metadata extractors, content transformers
@ -27,6 +29,7 @@ package org.alfresco.repo.content;
 * @since 2.1
 * @author Derek Hulley
 */
+@AlfrescoPublicApi
 public interface ContentWorker
 {
 }
--- a/source/java/org/alfresco/repo/content/filestore/FileContentReader.java
+++ b/source/java/org/alfresco/repo/content/filestore/FileContentReader.java
@ -27,6 +27,7 @@ import java.nio.channels.Channels;
 import java.nio.channels.ReadableByteChannel;
 import java.text.MessageFormat;

+import org.alfresco.api.AlfrescoPublicApi;    
 import org.alfresco.repo.content.AbstractContentReader;
 import org.alfresco.repo.content.ContentStore;
 import org.alfresco.repo.content.MimetypeMap;
@ -44,6 +45,7 @@ import org.apache.commons.logging.LogFactory;
 * 
 * @author Derek Hulley
 */
+@AlfrescoPublicApi
 public class FileContentReader extends AbstractContentReader
    implements org.alfresco.service.cmr.repository.FileContentReader
 {
--- a/source/java/org/alfresco/repo/content/filestore/FileContentWriter.java
+++ b/source/java/org/alfresco/repo/content/filestore/FileContentWriter.java
@ -26,6 +26,7 @@ import java.io.RandomAccessFile;
 import java.nio.channels.Channels;
 import java.nio.channels.WritableByteChannel;

+import org.alfresco.api.AlfrescoPublicApi;     
 import org.alfresco.repo.content.AbstractContentWriter;
 import org.alfresco.repo.content.ContentStore;
 import org.alfresco.service.cmr.repository.ContentIOException;
@ -40,6 +41,7 @@ import org.apache.commons.logging.LogFactory;
 * 
 * @author Derek Hulley
 */
+@AlfrescoPublicApi
 public class FileContentWriter extends AbstractContentWriter
 {
    private static final Log logger = LogFactory.getLog(FileContentWriter.class);
--- a/source/java/org/alfresco/repo/content/metadata/AbstractMappingMetadataExtracter.java
+++ b/source/java/org/alfresco/repo/content/metadata/AbstractMappingMetadataExtracter.java
@ -42,6 +42,7 @@ import java.util.concurrent.FutureTask;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;

+import org.alfresco.api.AlfrescoPublicApi;     
 import org.alfresco.error.AlfrescoRuntimeException;
 import org.alfresco.model.ContentModel;
 import org.alfresco.repo.content.StreamAwareContentReaderProxy;
@ -108,6 +109,7 @@ import org.springframework.extensions.surf.util.ISO8601DateFormat;
 * @author Jesper Steen Møller
 * @author Derek Hulley
 */
+@AlfrescoPublicApi
 abstract public class AbstractMappingMetadataExtracter implements MetadataExtracter, MetadataEmbedder, BeanNameAware, ApplicationContextAware
 {
    public static final String NAMESPACE_PROPERTY_PREFIX = "namespace.prefix.";
--- a/source/java/org/alfresco/repo/content/metadata/MetadataEmbedder.java
+++ b/source/java/org/alfresco/repo/content/metadata/MetadataEmbedder.java
@ -21,6 +21,7 @@ package org.alfresco.repo.content.metadata;
 import java.io.Serializable;
 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;
@ -33,6 +34,7 @@ import org.alfresco.service.namespace.QName;
 * @author Ray Gauss II
 *
 */
+@AlfrescoPublicApi
 public interface MetadataEmbedder extends ContentWorker {

    /**
--- a/source/java/org/alfresco/repo/content/metadata/MetadataExtracter.java
+++ b/source/java/org/alfresco/repo/content/metadata/MetadataExtracter.java
@ -23,6 +23,7 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;

+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;
@ -37,6 +38,7 @@ import org.alfresco.service.namespace.QName;
 * @author Jesper Steen Møller
 * @author Derek Hulley
 */
+@AlfrescoPublicApi
 public interface MetadataExtracter extends ContentWorker
 {
    /**
--- a/source/java/org/alfresco/repo/content/metadata/MetadataExtracterLimits.java
+++ b/source/java/org/alfresco/repo/content/metadata/MetadataExtracterLimits.java
@ -18,6 +18,8 @@
 */
 package org.alfresco.repo.content.metadata;

+import org.alfresco.api.AlfrescoPublicApi;    
+
 /**
 * Represents maximum values (that result in exceptions if exceeded) or
 * limits on values (that result in EOF (End Of File) being returned
@ -25,6 +27,7 @@ package org.alfresco.repo.content.metadata;
 * 
 * @author Ray Gauss II
 */
+@AlfrescoPublicApi
 public class MetadataExtracterLimits
 {
    private long timeoutMs = -1;
--- a/source/java/org/alfresco/repo/content/metadata/MetadataExtracterRegistry.java
+++ b/source/java/org/alfresco/repo/content/metadata/MetadataExtracterRegistry.java
@ -29,6 +29,8 @@ import java.util.concurrent.locks.ReentrantReadWriteLock;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

+import org.alfresco.api.AlfrescoPublicApi;  
+
 /**
 * Holds and provides the most appropriate metadate extracter for a particular
 * mimetype.
@ -38,6 +40,7 @@ import org.apache.commons.logging.LogFactory;
 * @see org.alfresco.repo.content.metadata.MetadataExtracter
 * @author Jesper Steen Møller
 */
+@AlfrescoPublicApi
 public class MetadataExtracterRegistry
 {
    private static final Log logger = LogFactory.getLog(MetadataExtracterRegistry.class);
--- a/source/java/org/alfresco/repo/content/metadata/TikaPoweredMetadataExtracter.java
+++ b/source/java/org/alfresco/repo/content/metadata/TikaPoweredMetadataExtracter.java
@ -30,6 +30,7 @@ import java.util.HashSet;
 import java.util.Locale;
 import java.util.Map;

+import org.alfresco.api.AlfrescoPublicApi;   
 import org.alfresco.repo.content.MimetypeMap;
 import org.alfresco.repo.content.filestore.FileContentReader;
 import org.alfresco.service.cmr.repository.ContentReader;
@ -81,6 +82,7 @@ import org.xml.sax.SAXException;
 * @since 3.4
 * @author Nick Burch
 */
+@AlfrescoPublicApi
 public abstract class TikaPoweredMetadataExtracter
        extends AbstractMappingMetadataExtracter
        implements MetadataEmbedder
--- a/source/java/org/alfresco/repo/content/metadata/TikaSpringConfiguredMetadataExtracter.java
+++ b/source/java/org/alfresco/repo/content/metadata/TikaSpringConfiguredMetadataExtracter.java
@ -21,6 +21,7 @@ package org.alfresco.repo.content.metadata;
 import java.util.ArrayList;
 import java.util.HashSet;

+import org.alfresco.api.AlfrescoPublicApi;    
 import org.alfresco.error.AlfrescoRuntimeException;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@ -47,6 +48,7 @@ import org.apache.tika.parser.Parser;
 * @since 3.4
 * @author Nick Burch
 */
+@AlfrescoPublicApi
 public class TikaSpringConfiguredMetadataExtracter extends TikaPoweredMetadataExtracter
 {
    protected static Log logger = LogFactory.getLog(TikaSpringConfiguredMetadataExtracter.class);
--- a/source/java/org/alfresco/repo/content/transform/AbstractContentTransformer2.java
+++ b/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);
--- a/source/java/org/alfresco/repo/content/transform/AbstractContentTransformerLimits.java
+++ b/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. */
--- a/source/java/org/alfresco/repo/content/transform/ComplexContentTransformer.java
+++ b/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
 {
    /**
--- a/source/java/org/alfresco/repo/content/transform/ContentTransformer.java
+++ b/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
 {
    /**
--- a/source/java/org/alfresco/repo/content/transform/ContentTransformerHelper.java
+++ b/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);
--- a/source/java/org/alfresco/repo/content/transform/ContentTransformerRegistry.java
+++ b/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);
--- a/source/java/org/alfresco/repo/content/transform/ContentTransformerWorker.java
+++ b/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
 {
    /**
--- a/source/java/org/alfresco/repo/content/transform/FailoverContentTransformer.java
+++ b/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);
--- a/source/java/org/alfresco/repo/content/transform/ProxyContentTransformer.java
+++ b/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;
--- a/source/java/org/alfresco/repo/content/transform/RuntimeExecutableContentTransformerWorker.java
+++ b/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";
--- a/source/java/org/alfresco/repo/content/transform/TransformerConfig.java
+++ b/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
 {
    /**
--- a/source/java/org/alfresco/repo/content/transform/TransformerDebug.java
+++ b/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)
--- a/source/java/org/alfresco/repo/content/transform/TransformerLog.java
+++ b/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>
 {
    /**
--- a/source/java/org/alfresco/repo/content/transform/TransformerLogger.java
+++ b/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");
--- a/source/java/org/alfresco/repo/content/transform/TransformerSelector.java
+++ b/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
 {
    /**
--- a/source/java/org/alfresco/repo/content/transform/TransformerStatistics.java
+++ b/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
 {
    /**
--- a/source/java/org/alfresco/repo/content/transform/UnsupportedTransformationException.java
+++ b/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;
--- a/source/java/org/alfresco/repo/content/transform/magick/ImageResizeOptions.java
+++ b/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 */
--- a/source/java/org/alfresco/repo/content/transform/magick/ImageTransformationOptions.java
+++ b/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";
--- a/source/java/org/alfresco/repo/copy/CopyServicePolicies.java
+++ b/source/java/org/alfresco/repo/copy/CopyServicePolicies.java
@ -20,6 +20,7 @@ package org.alfresco.repo.copy;

 import java.util.Map;

+import org.alfresco.api.AlfrescoPublicApi;    
 import org.alfresco.repo.policy.ClassPolicy;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.namespace.NamespaceService;
@ -125,6 +126,7 @@ public interface CopyServicePolicies
     *  overwritten. You are unable to make changes to what gets copied though, that must
     *  be done earlier via a {@link OnCopyNodePolicy}.
     */
+    @AlfrescoPublicApi
    public interface BeforeCopyPolicy extends ClassPolicy
    {
        public static final QName QNAME = QName.createQName(NamespaceService.ALFRESCO_URI, "beforeCopy");
@ -148,6 +150,7 @@ public interface CopyServicePolicies
     * The copy map contains all the nodes created during the copy, this helps to re-map
     * any potentially relative associations.
     */
+    @AlfrescoPublicApi
    public interface OnCopyCompletePolicy extends ClassPolicy
    {
        public static final QName QNAME = QName.createQName(NamespaceService.ALFRESCO_URI, "onCopyComplete");
--- a/source/java/org/alfresco/repo/i18n/MessageService.java
+++ b/source/java/org/alfresco/repo/i18n/MessageService.java
@ -23,6 +23,7 @@ import java.util.Locale;
 import java.util.ResourceBundle;
 import java.util.Set;

+import org.alfresco.api.AlfrescoPublicApi;   
 import org.alfresco.repo.tenant.TenantDeployer;
 import org.alfresco.service.cmr.i18n.MessageLookup;
 import org.alfresco.service.cmr.repository.StoreRef;
@ -31,6 +32,7 @@ import org.alfresco.service.cmr.repository.StoreRef;
 * Utility class providing methods to access the Locale of the current thread and to get
 * Localised strings. These strings may be loaded from resource bundles deployed in the Repository.
 */
+@AlfrescoPublicApi
 public interface MessageService extends TenantDeployer, MessageLookup
 {
    /**
--- a/source/java/org/alfresco/repo/jscript/BaseScopableProcessorExtension.java
+++ b/source/java/org/alfresco/repo/jscript/BaseScopableProcessorExtension.java
@ -18,6 +18,7 @@
 */
 package org.alfresco.repo.jscript;

+import org.alfresco.api.AlfrescoPublicApi;     
 import org.alfresco.repo.processor.BaseProcessorExtension;
 import org.mozilla.javascript.Scriptable;

@ -28,6 +29,7 @@ import org.mozilla.javascript.Scriptable;
 * 
 * @author Kevin Roast
 */
+@AlfrescoPublicApi
 public class BaseScopableProcessorExtension extends BaseProcessorExtension implements Scopeable
 {
    private static ThreadLocal<Scriptable> scope = new ThreadLocal<Scriptable>();
--- a/source/java/org/alfresco/repo/lock/JobLockService.java
+++ b/source/java/org/alfresco/repo/lock/JobLockService.java
@ -18,6 +18,7 @@
 */
 package org.alfresco.repo.lock;

+import org.alfresco.api.AlfrescoPublicApi;     
 import org.alfresco.service.namespace.QName;

 /**
@ -39,6 +40,7 @@ import org.alfresco.service.namespace.QName;
 * @author Derek Hulley
 * @since 3.2
 */
+@AlfrescoPublicApi
 public interface JobLockService
 {
    /**
@ -208,6 +210,7 @@ public interface JobLockService
     * @author Derek Hulley
     * @since 3.4.0b
     */
+    @AlfrescoPublicApi
    public interface JobLockRefreshCallback
    {
        /**
--- a/source/java/org/alfresco/repo/lock/LockAcquisitionException.java
+++ b/source/java/org/alfresco/repo/lock/LockAcquisitionException.java
@ -18,6 +18,7 @@
 */
 package org.alfresco.repo.lock;

+import org.alfresco.api.AlfrescoPublicApi;  
 import org.alfresco.error.AlfrescoRuntimeException;
 import org.alfresco.service.namespace.QName;

@ -27,6 +28,7 @@ import org.alfresco.service.namespace.QName;
 * @author Derek Hulley
 * @since 3.2
 */
+@AlfrescoPublicApi
 public class LockAcquisitionException extends AlfrescoRuntimeException
 {
    private static final long serialVersionUID = 8215858379509645862L;
--- a/source/java/org/alfresco/repo/model/filefolder/HiddenAspect.java
+++ b/source/java/org/alfresco/repo/model/filefolder/HiddenAspect.java
@ -29,6 +29,7 @@ import java.util.Map;
 import java.util.Set;
 import java.util.regex.Pattern;

+import org.alfresco.api.AlfrescoPublicApi;   
 import org.alfresco.model.ContentModel;
 import org.alfresco.query.PagingRequest;
 import org.alfresco.query.PagingResults;
@ -62,6 +63,7 @@ import org.apache.commons.logging.LogFactory;
 * set in FileInfo.
 *
 */
+@AlfrescoPublicApi
 public class HiddenAspect
 {
    private static Log logger = LogFactory.getLog(HiddenAspect.class);
--- a/source/java/org/alfresco/repo/policy/BehaviourFilter.java
+++ b/source/java/org/alfresco/repo/policy/BehaviourFilter.java
@ -18,6 +18,7 @@
 */
 package org.alfresco.repo.policy;

+import org.alfresco.api.AlfrescoPublicApi;  
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.namespace.QName;

@ -53,6 +54,7 @@ import org.alfresco.service.namespace.QName;
 * 
 * @author Derek Hulley
 */
+@AlfrescoPublicApi
 public interface BehaviourFilter
 {
    /**
--- a/source/java/org/alfresco/repo/processor/BaseProcessorExtension.java
+++ b/source/java/org/alfresco/repo/processor/BaseProcessorExtension.java
@ -18,6 +18,7 @@
 */
 package org.alfresco.repo.processor;

+import org.alfresco.api.AlfrescoPublicApi;    
 import org.alfresco.processor.Processor;
 import org.alfresco.processor.ProcessorExtension;

@ -26,6 +27,7 @@ import org.alfresco.processor.ProcessorExtension;
 * 
 * @author Roy Wetherall
 */
+@AlfrescoPublicApi
 public abstract class BaseProcessorExtension implements ProcessorExtension
 {
 	/** The processor */
--- a/source/java/org/alfresco/repo/template/TemplateProperties.java
+++ b/source/java/org/alfresco/repo/template/TemplateProperties.java
@ -23,6 +23,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;

+import org.alfresco.api.AlfrescoPublicApi;    
 import org.alfresco.service.namespace.QName;

 /**
@ -30,6 +31,7 @@ import org.alfresco.service.namespace.QName;
 * 
 * @author Kevin Roast
 */
+@AlfrescoPublicApi
 public interface TemplateProperties extends TemplateNodeRef
 {
    /**
--- a/source/java/org/alfresco/repo/version/VersionServicePolicies.java
+++ b/source/java/org/alfresco/repo/version/VersionServicePolicies.java
@ -21,6 +21,7 @@ package org.alfresco.repo.version;
 import java.io.Serializable;
 import java.util.Map;

+import org.alfresco.api.AlfrescoPublicApi;     
 import org.alfresco.repo.policy.ClassPolicy;
 import org.alfresco.repo.policy.PolicyScope;
 import org.alfresco.service.cmr.repository.NodeRef;
@ -38,6 +39,7 @@ public interface VersionServicePolicies
 	/**
 	 * Before create version policy interface.
 	 */
+	@AlfrescoPublicApi
 	public interface BeforeCreateVersionPolicy extends ClassPolicy
 	{
 	    public static final QName QNAME = QName.createQName(NamespaceService.ALFRESCO_URI, "beforeCreateVersion");
@ -54,6 +56,7 @@ public interface VersionServicePolicies
 	 * After create version policy interface
 	 *
 	 */
+	@AlfrescoPublicApi
 	public interface AfterCreateVersionPolicy extends ClassPolicy
 	{
        public static final QName QNAME = QName.createQName(NamespaceService.ALFRESCO_URI, "afterCreateVersion");
--- a/source/java/org/alfresco/repo/workflow/WorkflowModel.java
+++ b/source/java/org/alfresco/repo/workflow/WorkflowModel.java
@ -18,6 +18,7 @@
 */
 package org.alfresco.repo.workflow;

+import org.alfresco.api.AlfrescoPublicApi;     
 import org.alfresco.service.namespace.NamespaceService;
 import org.alfresco.service.namespace.QName;

@ -25,6 +26,7 @@ import org.alfresco.service.namespace.QName;
 /**
 * Workflow Model Constants
 */
+@AlfrescoPublicApi
 public interface WorkflowModel
 {
    
--- a/source/java/org/alfresco/service/cmr/preference/PreferenceService.java
+++ b/source/java/org/alfresco/service/cmr/preference/PreferenceService.java
@ -21,6 +21,7 @@ package org.alfresco.service.cmr.preference;
 import java.io.Serializable;
 import java.util.Map;

+import org.alfresco.api.AlfrescoPublicApi;     
 import org.alfresco.query.PagingRequest;
 import org.alfresco.query.PagingResults;
 import org.alfresco.service.Auditable;
@ -29,6 +30,7 @@ import org.alfresco.util.Pair;
 /**
 * @author Roy Wetherall
 */
+@AlfrescoPublicApi
 public interface PreferenceService
 {
    /**
--- a/source/java/org/alfresco/service/cmr/rendition/RenditionDefinition.java
+++ b/source/java/org/alfresco/service/cmr/rendition/RenditionDefinition.java
@ -21,6 +21,7 @@ package org.alfresco.service.cmr.rendition;

 import java.io.Serializable;

+import org.alfresco.api.AlfrescoPublicApi;    
 import org.alfresco.service.cmr.action.Action;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.namespace.QName;
@ -36,6 +37,7 @@ import org.alfresco.service.namespace.QName;
 * @author Nick Smith
 * @author Neil McErlean
 */
+@AlfrescoPublicApi
 public interface RenditionDefinition extends Action, Serializable
 {
    /**
--- a/source/java/org/alfresco/service/cmr/rendition/RenditionService.java
+++ b/source/java/org/alfresco/service/cmr/rendition/RenditionService.java
@ -21,6 +21,7 @@ package org.alfresco.service.cmr.rendition;

 import java.util.List;

+import org.alfresco.api.AlfrescoPublicApi;    
 import org.alfresco.repo.rendition.RenditionDefinitionPersister;
 import org.alfresco.service.NotAuditable;
 import org.alfresco.service.cmr.action.ActionTrackingService;
@ -33,6 +34,7 @@ import org.alfresco.service.namespace.QName;
 * @author Nick Smith
 * @author Neil McErlean
 */
+@AlfrescoPublicApi
 public interface RenditionService extends RenditionDefinitionPersister
 {
    /**
--- a/source/java/org/alfresco/service/cmr/repository/SerializedTransformationOptionsAccessor.java
+++ b/source/java/org/alfresco/service/cmr/repository/SerializedTransformationOptionsAccessor.java
@ -18,6 +18,7 @@
 */
 package org.alfresco.service.cmr.repository;

+import org.alfresco.api.AlfrescoPublicApi;    
 import org.alfresco.service.cmr.rendition.RenditionServiceException;

 /**
@ -26,6 +27,7 @@ import org.alfresco.service.cmr.rendition.RenditionServiceException;
 * 
 * @author Ray Gauss II
 */
+@AlfrescoPublicApi
 public interface SerializedTransformationOptionsAccessor
 {
    
--- a/source/java/org/alfresco/service/cmr/repository/TemplateImageResolver.java
+++ b/source/java/org/alfresco/service/cmr/repository/TemplateImageResolver.java
@ -20,6 +20,8 @@ package org.alfresco.service.cmr.repository;

 import java.io.Serializable;

+import org.alfresco.api.AlfrescoPublicApi;   
+
 /**
 * Interface contract for the conversion of file name to a fully qualified icon image path for use by
 * templating and scripting engines executing within the repository context.
@ -29,6 +31,7 @@ import java.io.Serializable;
 * 
 * @author Kevin Roast
 */
+@AlfrescoPublicApi
 public interface TemplateImageResolver extends Serializable
 {
    /**
--- a/source/java/org/alfresco/service/cmr/repository/TemplateService.java
+++ b/source/java/org/alfresco/service/cmr/repository/TemplateService.java
@ -22,6 +22,7 @@ import java.io.Writer;
 import java.util.Locale;
 import java.util.Map;

+import org.alfresco.api.AlfrescoPublicApi;     
 import org.alfresco.service.Auditable;

 /**
@ -38,6 +39,7 @@ import org.alfresco.service.Auditable;
 * 
 * @author Kevin Roast
 */
+@AlfrescoPublicApi
 public interface TemplateService
 {
    /** Keys for default model values */
--- a/source/java/org/alfresco/service/cmr/repository/TransformationOptionLimits.java
+++ b/source/java/org/alfresco/service/cmr/repository/TransformationOptionLimits.java
@ -22,6 +22,7 @@ import java.io.Serializable;
 import java.util.HashMap;
 import java.util.Map;

+import org.alfresco.api.AlfrescoPublicApi;     
 import org.alfresco.util.EqualsHelper;

 /**
@ -31,6 +32,7 @@ import org.alfresco.util.EqualsHelper;
 * 
 * @author Alan Davis
 */
+@AlfrescoPublicApi
 public class TransformationOptionLimits implements Serializable
 {
    private static final long serialVersionUID = 1L;
--- a/source/java/org/alfresco/service/cmr/repository/TransformationOptionPair.java
+++ b/source/java/org/alfresco/service/cmr/repository/TransformationOptionPair.java
@ -22,6 +22,7 @@ import java.io.IOException;
 import java.io.Serializable;
 import java.util.Map;

+import org.alfresco.api.AlfrescoPublicApi;     
 import org.alfresco.repo.content.transform.TransformerDebug;

 /**
@ -39,6 +40,7 @@ import org.alfresco.repo.content.transform.TransformerDebug;
 * 
 * @author Alan Davis
 */
+@AlfrescoPublicApi
 public class TransformationOptionPair implements Serializable
 {
    private static final long serialVersionUID = 1L;
--- a/source/java/org/alfresco/service/cmr/repository/TransformationOptions.java
+++ b/source/java/org/alfresco/service/cmr/repository/TransformationOptions.java
@ -22,6 +22,7 @@ import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;

+import org.alfresco.api.AlfrescoPublicApi;
 import org.alfresco.service.cmr.repository.datatype.TypeConverter;
 import org.alfresco.service.namespace.QName;

@ -36,6 +37,7 @@ import org.alfresco.service.namespace.QName;
 * @author Roy Wetherall
 * @since 3.0.0
 */
+@AlfrescoPublicApi
 public class TransformationOptions implements Cloneable
 {
    /** Option map names to preserve backward compatibility */
--- a/source/java/org/alfresco/service/cmr/repository/TransformationSourceOptions.java
+++ b/source/java/org/alfresco/service/cmr/repository/TransformationSourceOptions.java
@ -22,6 +22,7 @@ import java.io.Serializable;
 import java.util.List;
 import java.util.Map;

+import org.alfresco.api.AlfrescoPublicApi;
 import org.alfresco.repo.rendition.executer.AbstractRenderingEngine;
 import org.alfresco.service.cmr.rendition.RenditionService;
 import org.alfresco.service.cmr.repository.PagedSourceOptions;
@ -35,6 +36,7 @@ import org.alfresco.service.cmr.repository.PagedSourceOptions;
 * 
 * @author Ray Gauss II
 */
+@AlfrescoPublicApi
 public interface TransformationSourceOptions
 {
    
@ -87,6 +89,7 @@ public interface TransformationSourceOptions
     * with {@link AbstractRenderingEngine}'s RenderContext being an implementer
     * of this interface.
     */
+    @AlfrescoPublicApi
    public interface TransformationSourceOptionsSerializer
    {
        
--- a/source/java/org/alfresco/service/cmr/security/MutableAuthenticationService.java
+++ b/source/java/org/alfresco/service/cmr/security/MutableAuthenticationService.java
@ -18,6 +18,7 @@
 */
 package org.alfresco.service.cmr.security;

+import org.alfresco.api.AlfrescoPublicApi;     
 import org.alfresco.repo.security.authentication.AuthenticationException;
 import org.alfresco.service.Auditable;

@ -26,6 +27,7 @@ import org.alfresco.service.Auditable;
 * 
 * @author dward
 */
+@AlfrescoPublicApi
 public interface MutableAuthenticationService extends AuthenticationService
 {
    /**
--- a/source/java/org/alfresco/service/cmr/security/PersonService.java
+++ b/source/java/org/alfresco/service/cmr/security/PersonService.java
@ -271,6 +271,7 @@ public interface PersonService
     * @author janv
     * @since 4.0
     */
+    @AlfrescoPublicApi
    public class PersonInfo implements PermissionCheckValue
    {
        private final NodeRef nodeRef;
--- a/source/java/org/alfresco/service/cmr/tagging/TaggingService.java
+++ b/source/java/org/alfresco/service/cmr/tagging/TaggingService.java
@ -20,6 +20,7 @@ package org.alfresco.service.cmr.tagging;

 import java.util.List;

+import org.alfresco.api.AlfrescoPublicApi; 
 import org.alfresco.query.PagingRequest;
 import org.alfresco.query.PagingResults;
 import org.alfresco.service.Auditable;
@ -33,6 +34,7 @@ import org.alfresco.util.Pair;
 * 
 * @author Roy Wetherall
 */
+@AlfrescoPublicApi
 public interface TaggingService
 {
    /**