mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-10-08 14:51:49 +00:00
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
This commit is contained in:
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (C) 2005-2014 Alfresco Software Limited.
|
* Copyright (C) 2005-2015 Alfresco Software Limited.
|
||||||
*
|
*
|
||||||
* This file is part of Alfresco
|
* 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.EditionService;
|
||||||
import org.alfresco.service.cmr.ml.MultilingualContentService;
|
import org.alfresco.service.cmr.ml.MultilingualContentService;
|
||||||
import org.alfresco.service.cmr.model.FileFolderService;
|
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.notification.NotificationService;
|
||||||
import org.alfresco.service.cmr.rating.RatingService;
|
import org.alfresco.service.cmr.rating.RatingService;
|
||||||
import org.alfresco.service.cmr.rendition.RenditionService;
|
import org.alfresco.service.cmr.rendition.RenditionService;
|
||||||
@@ -413,12 +414,18 @@ public class ServiceDescriptorRegistry
|
|||||||
return (PublicServiceAccessService)getService(PUBLIC_SERVICE_ACCESS_SERVICE);
|
return (PublicServiceAccessService)getService(PUBLIC_SERVICE_ACCESS_SERVICE);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* (non-Javadoc)
|
||||||
|
* @see org.alfresco.service.ServiceRegistry#getRepoAdminService()
|
||||||
|
*/
|
||||||
@Override
|
@Override
|
||||||
public RepoAdminService getRepoAdminService()
|
public RepoAdminService getRepoAdminService()
|
||||||
{
|
{
|
||||||
return (RepoAdminService)getService(REPO_ADMIN_SERVICE);
|
return (RepoAdminService)getService(REPO_ADMIN_SERVICE);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* (non-Javadoc)
|
||||||
|
* @see org.alfresco.service.ServiceRegistry#getSysAdminParams()
|
||||||
|
*/
|
||||||
@Override
|
@Override
|
||||||
public SysAdminParams getSysAdminParams()
|
public SysAdminParams getSysAdminParams()
|
||||||
{
|
{
|
||||||
@@ -426,12 +433,24 @@ public class ServiceDescriptorRegistry
|
|||||||
return (SysAdminParams) beanFactory.getBean(beanName);
|
return (SysAdminParams) beanFactory.getBean(beanName);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* (non-Javadoc)
|
||||||
|
* @see org.alfresco.service.ServiceRegistry#getWebDavService()
|
||||||
|
*/
|
||||||
@Override
|
@Override
|
||||||
public WebDavService getWebDavService()
|
public WebDavService getWebDavService()
|
||||||
{
|
{
|
||||||
return (WebDavService)getService(WEBDAV_SERVICE);
|
return (WebDavService)getService(WEBDAV_SERVICE);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* (non-Javadoc)
|
||||||
|
* @see org.alfresco.service.ServiceRegistry#getModelService()
|
||||||
|
*/
|
||||||
|
@Override
|
||||||
|
public ModuleService getModuleService()
|
||||||
|
{
|
||||||
|
return (ModuleService) getService(MODULE_SERVICE);
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public SolrFacetHelper getSolrFacetHelper()
|
public SolrFacetHelper getSolrFacetHelper()
|
||||||
{
|
{
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (C) 2005-2011 Alfresco Software Limited.
|
* Copyright (C) 2005-2015 Alfresco Software Limited.
|
||||||
*
|
*
|
||||||
* This file is part of Alfresco
|
* 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.EditionService;
|
||||||
import org.alfresco.service.cmr.ml.MultilingualContentService;
|
import org.alfresco.service.cmr.ml.MultilingualContentService;
|
||||||
import org.alfresco.service.cmr.model.FileFolderService;
|
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.notification.NotificationService;
|
||||||
import org.alfresco.service.cmr.rating.RatingService;
|
import org.alfresco.service.cmr.rating.RatingService;
|
||||||
import org.alfresco.service.cmr.rendition.RenditionService;
|
import org.alfresco.service.cmr.rendition.RenditionService;
|
||||||
@@ -150,6 +151,8 @@ public interface ServiceRegistry
|
|||||||
|
|
||||||
static final QName WEBDAV_SERVICE = QName.createQName(NamespaceService.ALFRESCO_URI, "webdavService");
|
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
|
* Get the list of services provided by the Repository
|
||||||
*
|
*
|
||||||
@@ -468,15 +471,15 @@ public interface ServiceRegistry
|
|||||||
ImapService getImapService();
|
ImapService getImapService();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get the IMAP service (or null if one is not provided)
|
* Get the Public Service Access service (or null if one is not provided)
|
||||||
* @return the IMAP service
|
* @return the Public Service Access service
|
||||||
*/
|
*/
|
||||||
@NotAuditable
|
@NotAuditable
|
||||||
PublicServiceAccessService getPublicServiceAccessService();
|
PublicServiceAccessService getPublicServiceAccessService();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get the repo admin service (or null if one is not provided)
|
* Get the repo admin service (or null if one is not provided)
|
||||||
* @return the invitation service
|
* @return the repo admin service
|
||||||
*/
|
*/
|
||||||
@NotAuditable
|
@NotAuditable
|
||||||
RepoAdminService getRepoAdminService();
|
RepoAdminService getRepoAdminService();
|
||||||
@@ -495,6 +498,13 @@ public interface ServiceRegistry
|
|||||||
@NotAuditable
|
@NotAuditable
|
||||||
WebDavService getWebDavService();
|
WebDavService getWebDavService();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the module service bean.
|
||||||
|
* @return the module service bean
|
||||||
|
*/
|
||||||
|
@NotAuditable
|
||||||
|
ModuleService getModuleService();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get the Solr facet helper bean
|
* Get the Solr facet helper bean
|
||||||
* @return the Solr facet helper bean
|
* @return the Solr facet helper bean
|
||||||
|
@@ -47,6 +47,7 @@ import org.alfresco.service.cmr.ml.ContentFilterLanguagesService;
|
|||||||
import org.alfresco.service.cmr.ml.EditionService;
|
import org.alfresco.service.cmr.ml.EditionService;
|
||||||
import org.alfresco.service.cmr.ml.MultilingualContentService;
|
import org.alfresco.service.cmr.ml.MultilingualContentService;
|
||||||
import org.alfresco.service.cmr.model.FileFolderService;
|
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.notification.NotificationService;
|
||||||
import org.alfresco.service.cmr.rating.RatingService;
|
import org.alfresco.service.cmr.rating.RatingService;
|
||||||
import org.alfresco.service.cmr.rendition.RenditionService;
|
import org.alfresco.service.cmr.rendition.RenditionService;
|
||||||
@@ -477,4 +478,12 @@ public class MockedTestServiceRegistry implements ServiceRegistry
|
|||||||
// A mock response
|
// A mock response
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public ModuleService getModuleService()
|
||||||
|
{
|
||||||
|
// TODO Auto-generated method stub
|
||||||
|
return null;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user