inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-10-08 14:51:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)

Browse Source 
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
This commit is contained in:
Tatyana Valkevych
2015-04-21 13:29:39 +00:00
parent 761a92b2cc
commit c5d15c4146
3 changed files with 43 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
source/java/org/alfresco/service/ServiceRegistry.java
View File

@@ -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