From c5d15c414631bbd65309efb5c85b674dd84a9eb8 Mon Sep 17 00:00:00 2001 From: Tatyana Valkevych Date: Tue, 21 Apr 2015 13:29:39 +0000 Subject: [PATCH] Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud) 102180: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud) 102046: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2) 101946: Merged DEV to V4.2-BUG-FIX (4.2.5) 101416: MNT-13781: ModuleService is not available via a ServiceRegistry getter 101888: checkstyle fix git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@102244 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../service/ServiceDescriptorRegistry.java | 21 ++++++++++++++++++- .../org/alfresco/service/ServiceRegistry.java | 18 ++++++++++++---- .../rendition/MockedTestServiceRegistry.java | 9 ++++++++ 3 files changed, 43 insertions(+), 5 deletions(-) diff --git a/source/java/org/alfresco/repo/service/ServiceDescriptorRegistry.java b/source/java/org/alfresco/repo/service/ServiceDescriptorRegistry.java index f3edd0aa6e..92acaa9919 100644 --- a/source/java/org/alfresco/repo/service/ServiceDescriptorRegistry.java +++ b/source/java/org/alfresco/repo/service/ServiceDescriptorRegistry.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2014 Alfresco Software Limited. + * Copyright (C) 2005-2015 Alfresco Software Limited. * * This file is part of Alfresco * @@ -45,6 +45,7 @@ import org.alfresco.service.cmr.ml.ContentFilterLanguagesService; import org.alfresco.service.cmr.ml.EditionService; import org.alfresco.service.cmr.ml.MultilingualContentService; import org.alfresco.service.cmr.model.FileFolderService; +import org.alfresco.service.cmr.module.ModuleService; import org.alfresco.service.cmr.notification.NotificationService; import org.alfresco.service.cmr.rating.RatingService; import org.alfresco.service.cmr.rendition.RenditionService; @@ -413,12 +414,18 @@ public class ServiceDescriptorRegistry return (PublicServiceAccessService)getService(PUBLIC_SERVICE_ACCESS_SERVICE); } + /* (non-Javadoc) + * @see org.alfresco.service.ServiceRegistry#getRepoAdminService() + */ @Override public RepoAdminService getRepoAdminService() { return (RepoAdminService)getService(REPO_ADMIN_SERVICE); } + /* (non-Javadoc) + * @see org.alfresco.service.ServiceRegistry#getSysAdminParams() + */ @Override public SysAdminParams getSysAdminParams() { @@ -426,11 +433,23 @@ public class ServiceDescriptorRegistry return (SysAdminParams) beanFactory.getBean(beanName); } + /* (non-Javadoc) + * @see org.alfresco.service.ServiceRegistry#getWebDavService() + */ @Override public WebDavService getWebDavService() { return (WebDavService)getService(WEBDAV_SERVICE); } + + /* (non-Javadoc) + * @see org.alfresco.service.ServiceRegistry#getModelService() + */ + @Override + public ModuleService getModuleService() + { + return (ModuleService) getService(MODULE_SERVICE); + } @Override public SolrFacetHelper getSolrFacetHelper() diff --git a/source/java/org/alfresco/service/ServiceRegistry.java b/source/java/org/alfresco/service/ServiceRegistry.java index 625a13ea71..ae5e43e64d 100644 --- a/source/java/org/alfresco/service/ServiceRegistry.java +++ b/source/java/org/alfresco/service/ServiceRegistry.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2011 Alfresco Software Limited. + * Copyright (C) 2005-2015 Alfresco Software Limited. * * This file is part of Alfresco * @@ -45,6 +45,7 @@ import org.alfresco.service.cmr.ml.ContentFilterLanguagesService; import org.alfresco.service.cmr.ml.EditionService; import org.alfresco.service.cmr.ml.MultilingualContentService; import org.alfresco.service.cmr.model.FileFolderService; +import org.alfresco.service.cmr.module.ModuleService; import org.alfresco.service.cmr.notification.NotificationService; import org.alfresco.service.cmr.rating.RatingService; import org.alfresco.service.cmr.rendition.RenditionService; @@ -149,6 +150,8 @@ public interface ServiceRegistry static final QName PUBLIC_SERVICE_ACCESS_SERVICE = QName.createQName(NamespaceService.ALFRESCO_URI, "PublicServiceAccessService"); static final QName WEBDAV_SERVICE = QName.createQName(NamespaceService.ALFRESCO_URI, "webdavService"); + + static final QName MODULE_SERVICE = QName.createQName(NamespaceService.ALFRESCO_URI, "ModuleService"); /** * Get the list of services provided by the Repository @@ -468,15 +471,15 @@ public interface ServiceRegistry ImapService getImapService(); /** - * Get the IMAP service (or null if one is not provided) - * @return the IMAP service + * Get the Public Service Access service (or null if one is not provided) + * @return the Public Service Access service */ @NotAuditable PublicServiceAccessService getPublicServiceAccessService(); /** * Get the repo admin service (or null if one is not provided) - * @return the invitation service + * @return the repo admin service */ @NotAuditable RepoAdminService getRepoAdminService(); @@ -495,6 +498,13 @@ public interface ServiceRegistry @NotAuditable WebDavService getWebDavService(); + /** + * Get the module service bean. + * @return the module service bean + */ + @NotAuditable + ModuleService getModuleService(); + /** * Get the Solr facet helper bean * @return the Solr facet helper bean diff --git a/source/test-java/org/alfresco/repo/rendition/MockedTestServiceRegistry.java b/source/test-java/org/alfresco/repo/rendition/MockedTestServiceRegistry.java index f81a4894b8..283241be5d 100644 --- a/source/test-java/org/alfresco/repo/rendition/MockedTestServiceRegistry.java +++ b/source/test-java/org/alfresco/repo/rendition/MockedTestServiceRegistry.java @@ -47,6 +47,7 @@ import org.alfresco.service.cmr.ml.ContentFilterLanguagesService; import org.alfresco.service.cmr.ml.EditionService; import org.alfresco.service.cmr.ml.MultilingualContentService; import org.alfresco.service.cmr.model.FileFolderService; +import org.alfresco.service.cmr.module.ModuleService; import org.alfresco.service.cmr.notification.NotificationService; import org.alfresco.service.cmr.rating.RatingService; import org.alfresco.service.cmr.rendition.RenditionService; @@ -477,4 +478,12 @@ public class MockedTestServiceRegistry implements ServiceRegistry // A mock response return null; } + + + @Override + public ModuleService getModuleService() + { + // TODO Auto-generated method stub + return null; + } }