mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-07-24 17:32:48 +00:00
Merged V2.2 to HEAD
7336: JMX-based admin: workaround for LinkValidationService circular reference (to allow unit tests to be run in Eclipse) 7419: Directory listings are filtered so that child directories without READ_CHILDREN permissions 7421: Update FOP from 0.92beta to 0.94 Fixed line endings for .classpath git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8337 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -65,7 +65,8 @@ public class RepoServerMgmt implements RepoServerMgmtMBean, ApplicationContextAw
|
||||
this.authenticationService = authenticationService;
|
||||
}
|
||||
|
||||
public void setLinkValidationService(LinkValidationService linkValidationService)
|
||||
// TODO - temporary workaround, can be removed when link validation is part of repo
|
||||
public void registerLinkValidationService(LinkValidationService linkValidationService)
|
||||
{
|
||||
this.linkValidationService = linkValidationService;
|
||||
}
|
||||
@@ -344,6 +345,12 @@ public class RepoServerMgmt implements RepoServerMgmtMBean, ApplicationContextAw
|
||||
*/
|
||||
public void setLinkValidationDisabled(boolean disable)
|
||||
{
|
||||
if (linkValidationService == null)
|
||||
{
|
||||
log.error("LinkValidationService not registered");
|
||||
throw new AlfrescoRuntimeException("LinkValidationService not registered");
|
||||
}
|
||||
|
||||
linkValidationService.setLinkValidationDisabled(disable);
|
||||
if (disable)
|
||||
{
|
||||
@@ -361,6 +368,12 @@ public class RepoServerMgmt implements RepoServerMgmtMBean, ApplicationContextAw
|
||||
*/
|
||||
public boolean isLinkValidationDisabled()
|
||||
{
|
||||
if (linkValidationService == null)
|
||||
{
|
||||
log.error("LinkValidationService not registered");
|
||||
throw new AlfrescoRuntimeException("LinkValidationService not registered");
|
||||
}
|
||||
|
||||
return linkValidationService.isLinkValidationDisabled();
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user