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

21
source/java/org/alfresco/repo/service/ServiceDescriptorRegistry.java
View File

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