RM-2812 Update following review comments.

The class dependency used to determine the classes to include based on the initial services is:

Depth 0: Service interfaces.

Depth 1:
ClearanceLevel <- SecurityClearanceService
RecordsManagementActionCondition <- RecordsManagementActionService
ClassificationAspectProperties <- ContentClassificationService
Version <- RecordableVersionConfigService, RecordableVersionService
Role <- FilePlanRoleService
CaveatGroupType <- CaveatSchemeService
RecordsManagementEvent <- RecordsManagementEventService
Group <- CapabilityService
RelationshipDisplayName <- RelationshipService
RecordsManagementActionResult <- RecordsManagementActionService
RecordsManagementAction <- RecordsManagementActionService
Relationship <- RelationshipService
ProtectedModelArtifact <- ModelSecurityService
ReportGenerator <- ReportService
RecordsManagementSearchParameters <- RecordsManagementSearchService
SecurityClearance <- SecurityClearanceService
SortDirection <- CaveatSchemeService
RecordsManagementEventType <- RecordsManagementEventService
Report <- ReportService
UserQueryParams <- SecurityClearanceService
CaveatMarkSortField <- CaveatSchemeService
ProtectedProperty <- ModelSecurityService
RelationshipDefinition <- RelationshipService
Capability <- FilePlanRoleService, CapabilityService
ExemptionCategory <- ClassificationSchemeService
CaveatGroup <- CaveatMarkingService, CaveatSchemeService
ClassificationReason <- ClassificationSchemeService
ProtectedAspect <- ModelSecurityService
MetadataReferral <- ReferralAdminService, ReferredMetadataService
CaveatMark <- CaveatClearanceService, CaveatMarkingService, ContentClassificationService, CaveatSchemeService, ClassificationSchemeService
SavedSearchDetails <- RecordsManagementSearchService
IdentifierGenerator <- IdentifierService

Depth 2:
RecordsManagementActionConditionDefinition <- RecordsManagementActionCondition
ReferralRegistry <- MetadataReferral
ClassificationSchemeEntity <- ExemptionCategory, ClassificationReason
RecordsManagementActionDefinition <- RecordsManagementAction
ReportDetails <- SavedSearchDetails
SortItem <- RecordsManagementSearchParameters
SavedSearchDetailsCompatibility <- SavedSearchDetails

Depth 3:
RecordsManagementModel <- SavedSearchDetailsCompatibility

Depth 4:
RecordsManagementCustomModel <- RecordsManagementModel

rm-community/rm-community-repo/source/compatibility/org/alfresco/module/org_alfresco_module_rm/caveat/RMCaveatConfigService.java

@@ -33,11 +33,9 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import org.alfresco.api.AlfrescoPublicApi;
 import org.alfresco.error.AlfrescoRuntimeException;
 import org.alfresco.service.cmr.repository.NodeRef;
 
-@AlfrescoPublicApi
 public interface RMCaveatConfigService
 {
     void init();

rm-community/rm-community-repo/source/compatibility/org/alfresco/module/org_alfresco_module_rm/caveat/RMConstraintInfo.java

@@ -29,9 +29,6 @@ package org.alfresco.module.org_alfresco_module_rm.caveat;
 
 import java.util.Arrays;
 
-import org.alfresco.api.AlfrescoPublicApi;
-
-@AlfrescoPublicApi
 public class RMConstraintInfo
 {
     private String name;

rm-community/rm-community-repo/source/compatibility/org/alfresco/module/org_alfresco_module_rm/caveat/RMListOfValuesConstraint.java

@@ -33,7 +33,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.alfresco.api.AlfrescoPublicApi;
 import org.alfresco.repo.dictionary.constraint.ListOfValuesConstraint;
 import org.alfresco.repo.security.authentication.AuthenticationUtil;
 import org.alfresco.service.cmr.dictionary.ConstraintException;
@@ -60,7 +59,6 @@ public class RMListOfValuesConstraint extends ListOfValuesConstraint
     // defined match logic used by caveat matching (default = "AND")
     private MatchLogic matchLogic = MatchLogic.AND;
 
-    @AlfrescoPublicApi
     public enum MatchLogic
     {
         // closed marking - all values must match

rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/dataset/DataSet.java

@@ -27,9 +27,6 @@
 
 package org.alfresco.module.org_alfresco_module_rm.dataset;
 
-import org.alfresco.api.AlfrescoPublicApi;
-
-@AlfrescoPublicApi
 public interface DataSet
 {
 

rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/dataset/DataSetService.java

@@ -29,10 +29,8 @@ package org.alfresco.module.org_alfresco_module_rm.dataset;
 
 import java.util.Map;
 
-import org.alfresco.api.AlfrescoPublicApi;
 import org.alfresco.service.cmr.repository.NodeRef;
 
-@AlfrescoPublicApi
 public interface DataSetService
 {
 

rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/property/DispositionProperty.java

@@ -32,7 +32,6 @@ import java.util.Date;
 import java.util.Map;
 import java.util.Set;
 
-import org.alfresco.api.AlfrescoPublicApi;
 import org.alfresco.error.AlfrescoRuntimeException;
 import org.alfresco.module.org_alfresco_module_rm.disposition.DispositionAction;
 import org.alfresco.module.org_alfresco_module_rm.disposition.DispositionActionDefinition;
@@ -56,7 +55,6 @@ import org.alfresco.service.namespace.QName;
  *
  * @author Roy Wetherall
  */
-@AlfrescoPublicApi
 @BehaviourBean
 public class DispositionProperty extends BaseBehaviourBean
                                  implements NodeServicePolicies.OnUpdatePropertiesPolicy

rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/email/CustomEmailMappingService.java

@@ -30,12 +30,9 @@ package org.alfresco.module.org_alfresco_module_rm.email;
 import java.util.List;
 import java.util.Set;
 
-import org.alfresco.api.AlfrescoPublicApi;
-
 /**
  * Custom EMail Mapping Service
  */
-@AlfrescoPublicApi
 public interface CustomEmailMappingService
 {
     /**

rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/email/CustomMapping.java

@@ -27,12 +27,9 @@
 
 package org.alfresco.module.org_alfresco_module_rm.email;
 
-import org.alfresco.api.AlfrescoPublicApi;
-
 /**
  * Custom EMail Mapping
  */
-@AlfrescoPublicApi
 public class CustomMapping
 {
     private String from;

rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/BaseBehaviourBean.java

@@ -30,7 +30,6 @@ package org.alfresco.module.org_alfresco_module_rm.model;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.alfresco.api.AlfrescoPublicApi;
 import org.alfresco.error.AlfrescoRuntimeException;
 import org.alfresco.module.org_alfresco_module_rm.util.ServiceBaseImpl;
 import org.alfresco.repo.policy.BehaviourFilter;
@@ -44,7 +43,6 @@ import org.apache.commons.logging.LogFactory;
  * @author Roy Wetherall
  * @since 2.2
  */
-@AlfrescoPublicApi
 public abstract class BaseBehaviourBean extends ServiceBaseImpl
                                         implements RecordsManagementModel,
                                                    BehaviourRegistry

rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/slingshot/Version.java

@@ -30,12 +30,15 @@ package org.alfresco.module.org_alfresco_module_rm.script.slingshot;
 import static org.alfresco.util.ParameterCheck.mandatory;
 import static org.alfresco.util.ParameterCheck.mandatoryString;
 
+import org.alfresco.api.AlfrescoPublicApi;
+
 /**
  * Recordable version class
  *
  * @author Tuna Aksoy
  * @since 2.3
  */
+@AlfrescoPublicApi
 public class Version
 {
     /** The version policy */

rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/search/RecordsManagementSearchServiceImpl.java

@@ -31,7 +31,6 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map.Entry;
 
-import org.alfresco.api.AlfrescoPublicApi;
 import org.alfresco.error.AlfrescoRuntimeException;
 import org.alfresco.model.ContentModel;
 import org.alfresco.module.org_alfresco_module_rm.model.RecordsManagementModel;
@@ -64,7 +63,6 @@ import org.springframework.extensions.surf.util.I18NUtil;
  *
  * @author Roy Wetherall
  */
-@AlfrescoPublicApi
 public class RecordsManagementSearchServiceImpl implements RecordsManagementSearchService
 {
     private static final String SITES_SPACE_QNAME_PATH = "/app:company_home/st:sites/";

rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/search/ReportDetails.java

@@ -27,11 +27,14 @@
 
 package org.alfresco.module.org_alfresco_module_rm.search;
 
+import org.alfresco.api.AlfrescoPublicApi;
+
 /**
  * Report details.
  *
  * @author Roy Wetherall
  */
+@AlfrescoPublicApi
 public class ReportDetails
 {
     /** Name */

rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/search/SortItem.java

@@ -27,8 +27,10 @@
 
 package org.alfresco.module.org_alfresco_module_rm.search;
 
+import org.alfresco.api.AlfrescoPublicApi;
 import org.alfresco.service.namespace.QName;
 
+@AlfrescoPublicApi
 /*package*/ class SortItem
 {
     public QName property = null;

rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/util/AuthenticationUtil.java

@@ -27,7 +27,6 @@
 
 package org.alfresco.module.org_alfresco_module_rm.util;
 
-import org.alfresco.api.AlfrescoPublicApi;
 import org.alfresco.repo.security.authentication.AuthenticationException;
 import org.alfresco.repo.security.authentication.AuthenticationUtil.RunAsWork;
 
@@ -39,7 +38,6 @@ import org.alfresco.repo.security.authentication.AuthenticationUtil.RunAsWork;
  * @author Roy Wetherall
  * @since 2.3
  */
-@AlfrescoPublicApi
 public class AuthenticationUtil
 {
     /**

rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/util/ServiceBaseImpl.java

@@ -31,7 +31,6 @@ import java.util.Map;
 import java.util.Set;
 import java.util.WeakHashMap;
 
-import org.alfresco.api.AlfrescoPublicApi;
 import org.alfresco.module.org_alfresco_module_rm.fileplan.FilePlanComponentKind;
 import org.alfresco.module.org_alfresco_module_rm.fileplan.FilePlanService;
 import org.alfresco.module.org_alfresco_module_rm.hold.HoldService;
@@ -53,7 +52,6 @@ import org.springframework.context.ApplicationContextAware;
  * @author Roy Wetherall
  * @since 2.1
  */
-@AlfrescoPublicApi
 public class ServiceBaseImpl implements RecordsManagementModel, ApplicationContextAware
 {
     /** Node service */

rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/util/TransactionalResourceHelper.java

@@ -32,8 +32,6 @@ import java.util.Map;
 import java.util.Set;
 import java.util.TreeSet;
 
-import org.alfresco.api.AlfrescoPublicApi;
-
 /**
  * Delegate spring bean for TransactionResourceHelper
  * 
@@ -41,7 +39,6 @@ import org.alfresco.api.AlfrescoPublicApi;
  * @since 2.3
  * @see org.alfresco.repo.transaction.TransactionalResourceHelper
  */
-@AlfrescoPublicApi
 public class TransactionalResourceHelper
 {
     /**