Merged V2.2 to HEAD

8078: Merged V2.1 to V2.2
      8025: Fixes WCM-1039, problems with case insensitive name handling.
   8079: Merged V2.1 to V2.2
      8035: -- DONE SEPARATELY --
      8040: Fix AR-1985: SQL Server dialect is derived from Sybase dialect there need additional no-op script
      8046: Better Javadocs for getChildByName()
      8056: Fixed WCM-790: Date conversion for metadata extractors
      8057: Fixed WCM-790: Properties that don't convert can be discarded (default is to fail)
      8059: -- DONE SEPARATELY --
      8061: Fixes WCM-790: Fallout from CHK-2168 and CHK-2169
   8081: Fix for WCM-1018
   8082: Merged V2.1 to V2.2
      8016: Merged V2.1-A to V2.1
         8000: Additional indexes for AVM
         8013: Patch to introduce reverse indexes required for AVM


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8474 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2008-03-10 12:17:10 +00:00
parent b7416e159e
commit 7ab2e83a19
4 changed files with 59 additions and 14 deletions

View File

@@ -45,6 +45,7 @@ import javax.transaction.UserTransaction;
import org.alfresco.config.ConfigElement;
import org.alfresco.config.ConfigService;
import org.alfresco.linkvalidation.HrefValidationProgress;
import org.alfresco.linkvalidation.LinkValidationService;
import org.alfresco.model.ContentModel;
import org.alfresco.model.WCMAppModel;
import org.alfresco.repo.avm.AVMNodeConverter;
@@ -104,6 +105,7 @@ import org.alfresco.web.ui.wcm.component.UIUserSandboxes;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.web.jsf.FacesContextUtils;
/**
* Bean backing up the AVM specific browse screens
@@ -228,10 +230,12 @@ public class AVMBrowseBean implements IContextListener
/** The SearchService reference */
transient private SearchService searchService;
/** The LinkValidationService */
transient private LinkValidationService linkValidationService;
/** The PermissionService reference */
transient protected PermissionService permissionService;
/**
* Default Constructor
*/
@@ -320,6 +324,22 @@ public class AVMBrowseBean implements IContextListener
return workflowService;
}
public void setLinkValidationService(LinkValidationService service)
{
this.linkValidationService = service;
}
protected LinkValidationService getLinkValidationService()
{
if (linkValidationService == null)
{
linkValidationService = (LinkValidationService)FacesContextUtils.getRequiredWebApplicationContext(
FacesContext.getCurrentInstance()).getBean("LinkValidationService");
}
return this.linkValidationService;
}
/**
* @param searchService The Searcher to set.
*/
@@ -675,6 +695,14 @@ public class AVMBrowseBean implements IContextListener
{
this.linkValidationState = state;
}
/**
* @return Determines whether the link validation service is enabled
*/
public boolean isLinkValidationEnabled()
{
return (this.getLinkValidationService().getPollInterval() > 0);
}
public List<AVMNodeDescriptor> getNodesForSubmit()
{