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

Merge 3.1 to HEAD

Browse Source 
13778: Fix <homefolder> file server config missing from 3.1. ETHREEOH-1763.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13780 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Gary Spencer
2009-03-31 10:46:54 +00:00
parent fda5fc143f
commit 249905ff74
5 changed files with 384 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
source/java/org/alfresco/filesys/ServerConfigurationBean.java
View File

@@ -88,6 +88,7 @@ import org.alfresco.filesys.alfresco.AlfrescoClientInfoFactory;
import org.alfresco.filesys.alfresco.DesktopAction;
import org.alfresco.filesys.alfresco.DesktopActionException;
import org.alfresco.filesys.alfresco.DesktopActionTable;
import org.alfresco.filesys.alfresco.HomeShareMapper;
import org.alfresco.filesys.avm.AVMContext;
import org.alfresco.filesys.avm.AVMDiskDriver;
import org.alfresco.filesys.repo.ContentContext;
@@ -2422,6 +2423,29 @@ public class ServerConfigurationBean extends ServerConfiguration implements Appl
}
}
}
// Check for the home folder filesystem
ConfigElement homeElem = config.getConfigElement("homeFolder");
if ( homeElem != null)
{
try
{
// Initialize the home folder share mapper
secConfig.setShareMapper( "org.alfresco.filesys.alfresco.HomeShareMapper", homeElem);
// Debug
if ( logger.isDebugEnabled())
logger.debug("Using home folder share mapper");
}
catch (InvalidConfigurationException ex)
{
throw new AlfrescoRuntimeException("Failed to initialize home folder share mapper", ex);
}
}
}
/**
@@ -2473,13 +2497,15 @@ public class ServerConfigurationBean extends ServerConfiguration implements Appl
if ( mapperElem != null) {
// Check if the shre mapper type has been specified
// Check if the share mapper type has been specified
String mapperType = mapperElem.getAttribute( "type");
String mapperClass = null;
if ( mapperType.equalsIgnoreCase( "multi-tenant"))
mapperClass = "org.alfresco.filesys.alfresco.MultiTenantShareMapper";
else if ( mapperType.equalsIgnoreCase( "home-folder"))
mapperClass = "org.alfresco.filesys.alfresco.HomeShareMapper";
else
{
// Get the share mapper class