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/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.";

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

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

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;

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);

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

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);