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/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
 {
     /**

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
 {
     /**

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
 {
     /**

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
 {
     

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
 {
     /**

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 */

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;

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;

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 */

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
     {
         

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
 {
     /**

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;

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
 {
     /**