From 567bf7ed835f3e8ccc74f04742a07f7c11a2292e Mon Sep 17 00:00:00 2001 From: Mark Rogers Date: Fri, 19 Sep 2014 22:34:18 +0000 Subject: [PATCH] Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud) 84774: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud) 80889: ACE-2213 git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85136 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../org/alfresco/repo/content/metadata/MetadataExtracter.java | 1 + .../service/cmr/repository/TransformationOptionPair.java | 1 + 2 files changed, 2 insertions(+) diff --git a/source/java/org/alfresco/repo/content/metadata/MetadataExtracter.java b/source/java/org/alfresco/repo/content/metadata/MetadataExtracter.java index 57057c17f1..d9db5c2872 100644 --- a/source/java/org/alfresco/repo/content/metadata/MetadataExtracter.java +++ b/source/java/org/alfresco/repo/content/metadata/MetadataExtracter.java @@ -48,6 +48,7 @@ public interface MetadataExtracter extends ContentWorker * @author Derek Hulley * @author Jesper Steen Møller */ + @AlfrescoPublicApi public enum OverwritePolicy { /** diff --git a/source/java/org/alfresco/service/cmr/repository/TransformationOptionPair.java b/source/java/org/alfresco/service/cmr/repository/TransformationOptionPair.java index 3f683cb32a..f721982cfd 100644 --- a/source/java/org/alfresco/service/cmr/repository/TransformationOptionPair.java +++ b/source/java/org/alfresco/service/cmr/repository/TransformationOptionPair.java @@ -48,6 +48,7 @@ public class TransformationOptionPair implements Serializable /** * Action to take place for a given pair of values. */ + @AlfrescoPublicApi public enum Action { THROW_EXCEPTION