Merged HEAD (5.1) to 5.1.N (5.1.1)

119838 gjames: ACE-4855: Added @AlfrescoPublicApi to AbstractModuleComponent and ImporterModuleComponent


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@120172 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Ramona Neamtu
2015-12-15 12:53:26 +00:00
parent 418f69acda
commit db6475fae6
2 changed files with 4 additions and 0 deletions

View File

@@ -23,6 +23,7 @@ import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import org.alfresco.api.AlfrescoPublicApi;
import org.alfresco.error.AlfrescoRuntimeException; import org.alfresco.error.AlfrescoRuntimeException;
import org.alfresco.repo.security.authentication.AuthenticationComponent; import org.alfresco.repo.security.authentication.AuthenticationComponent;
import org.alfresco.repo.tenant.TenantAdminService; import org.alfresco.repo.tenant.TenantAdminService;
@@ -43,6 +44,7 @@ import org.springframework.extensions.surf.util.I18NUtil;
* @author Derek Hulley * @author Derek Hulley
* @since 2.0 * @since 2.0
*/ */
@AlfrescoPublicApi
public abstract class AbstractModuleComponent implements ModuleComponent, BeanNameAware public abstract class AbstractModuleComponent implements ModuleComponent, BeanNameAware
{ {
private static final String ERR_ALREADY_EXECUTED = "module.err.already_executed"; private static final String ERR_ALREADY_EXECUTED = "module.err.already_executed";

View File

@@ -22,6 +22,7 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Properties; import java.util.Properties;
import org.alfresco.api.AlfrescoPublicApi;
import org.alfresco.repo.importer.ImporterBootstrap; import org.alfresco.repo.importer.ImporterBootstrap;
import org.alfresco.util.PropertyCheck; import org.alfresco.util.PropertyCheck;
@@ -32,6 +33,7 @@ import org.alfresco.util.PropertyCheck;
* @author Derek Hulley * @author Derek Hulley
* @since 2.0 * @since 2.0
*/ */
@AlfrescoPublicApi
public class ImporterModuleComponent extends AbstractModuleComponent public class ImporterModuleComponent extends AbstractModuleComponent
{ {
private ImporterBootstrap importer; private ImporterBootstrap importer;