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

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

Browse Source 
78429: Merged EOL (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      75801: ACE-2149: EOL AVM / WCM
       - Thorough sweep of 'avm' and 'wcm' references
       - Picked up on many 'deployment' and related classes and configuration
       - Repo starts


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82558 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Erik Winlof
2014-09-03 12:13:50 +00:00
parent 63678f2980
commit e94f8f8351
93 changed files with 62 additions and 4426 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/java/org/alfresco/repo/site/SiteServiceImpl.java
View File

@@ -120,7 +120,7 @@ import org.springframework.extensions.surf.util.AbstractLifecycleBean;
import org.springframework.extensions.surf.util.ParameterCheck;
/**
* Site Service Implementation. Also bootstraps the site AVM and DM stores.
* Site Service Implementation. Also bootstraps the site DM stores.
*
* @author Roy Wetherall
*/
@@ -173,7 +173,6 @@ public class SiteServiceImpl extends AbstractLifecycleBean implements SiteServic
private FileFolderService fileFolderService;
private SearchService searchService;
private NamespaceService namespaceService;
private PreferenceService preferenceService;
private PermissionService permissionService;
private ActivityService activityService;
private PersonService personService;
@@ -205,9 +204,10 @@ public class SiteServiceImpl extends AbstractLifecycleBean implements SiteServic
this.sitesXPath = sitesXPath;
}
@Deprecated
public void setPreferenceService(PreferenceService preferenceService)
{
this.preferenceService = preferenceService;
// Never used
}
/**