From 68e217aa0b828591d420d214a3d486cdeb9ac9ad Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Sat, 31 Jan 2015 15:32:56 +0000 Subject: [PATCH] Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud) 94145: Merged 5.0.N (5.0.1) to HEAD-BUG-FIX (5.1/Cloud) 94083: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.1) 93997: Merged DEV to V4.2-BUG-FIX 93952: MNT-12841: Xenit Fred: AuthorityService is not public but should be - Mark AuthorityService and dependencies as AlfrescoPublicApi git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@95046 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../org/alfresco/repo/security/authority/AuthorityInfo.java | 2 ++ .../org/alfresco/service/cmr/security/AuthorityService.java | 2 ++ 2 files changed, 4 insertions(+) diff --git a/source/java/org/alfresco/repo/security/authority/AuthorityInfo.java b/source/java/org/alfresco/repo/security/authority/AuthorityInfo.java index f06e6124fa..edef299f2b 100644 --- a/source/java/org/alfresco/repo/security/authority/AuthorityInfo.java +++ b/source/java/org/alfresco/repo/security/authority/AuthorityInfo.java @@ -18,6 +18,7 @@ */ package org.alfresco.repo.security.authority; +import org.alfresco.api.AlfrescoPublicApi; import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.security.AuthorityType; @@ -27,6 +28,7 @@ import org.alfresco.service.cmr.security.AuthorityType; * @author janv * @since 4.0 */ +@AlfrescoPublicApi public class AuthorityInfo { private Long nodeId; diff --git a/source/java/org/alfresco/service/cmr/security/AuthorityService.java b/source/java/org/alfresco/service/cmr/security/AuthorityService.java index 8c5711c65a..b1b81ac641 100644 --- a/source/java/org/alfresco/service/cmr/security/AuthorityService.java +++ b/source/java/org/alfresco/service/cmr/security/AuthorityService.java @@ -21,6 +21,7 @@ package org.alfresco.service.cmr.security; import java.util.Collection; import java.util.Set; +import org.alfresco.api.AlfrescoPublicApi; import org.alfresco.query.PagingRequest; import org.alfresco.query.PagingResults; import org.alfresco.repo.security.authority.AuthorityInfo; @@ -42,6 +43,7 @@ import org.alfresco.service.cmr.repository.NodeRef; * * @author Andy Hind */ +@AlfrescoPublicApi public interface AuthorityService { /**