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

MOB-651: Decouple File Servers from Config Service and Authenticators

Browse Source 
- Minor JLAN changes (backward compatible)
   - CIFSAuthenticator implements an interface (to allow dynamic proxying to authentication subsystem)
   - CIFSAuthenticator accesses ServerConfiguration via ServerConfigurationAccessor interface and doesn't retain references to config sections (again to allow dynamic proxying and hot swapping)
   - ConfigSections have way of directly setting container initialised authenticators, sharemappers, etc.
   - Authenticators, etc. still support initialisation from config service in backward compatible manner.
- Most of ServerConfigurationBean moved to AbstractServerConfigurationBean superclass.
- New org.alfresco.filesys.config package with ServerConfigurationBean implementation and supporting classes that can be initialised by a Spring container.
- File server authenticators moved into authentication subsystem. TODO: Kerberos and NTLM

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13795 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Dave Ward
2009-04-01 13:22:06 +00:00
parent e7d9ce8fc6
commit 972dd9a4ba
49 changed files with 9469 additions and 3276 deletions
Download Patch File Download Diff File Expand all files Collapse all files

79
source/java/org/alfresco/filesys/alfresco/MultiTenantShareMapper.java
View File

@@ -38,13 +38,14 @@ import org.alfresco.jlan.server.filesys.FilesystemsConfigSection;
import org.alfresco.jlan.server.filesys.SrvDiskInfo;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.StoreRef;
import org.springframework.beans.factory.InitializingBean;
/**
* Multi Tenant Share Mapper Class
*
* @author gkspencer
*/
public class MultiTenantShareMapper implements ShareMapper, ConfigurationListener {
public class MultiTenantShareMapper implements ShareMapper, ConfigurationListener, InitializingBean {
// Server configuration and configuration sections
@@ -75,7 +76,24 @@ public class MultiTenantShareMapper implements ShareMapper, ConfigurationListene
public MultiTenantShareMapper() {
}
/**
public void setServerConfiguration(ServerConfiguration config)
{
this.m_config = config;
}
public void setTenantShareName(String shareName)
{
m_tenantShareName = shareName;
}
public void setDebug(boolean debug)
{
this.m_debug = debug;
}
/**
* Initialize the share mapper
*
* @param config ServerConfiguration
@@ -87,25 +105,8 @@ public class MultiTenantShareMapper implements ShareMapper, ConfigurationListene
// Save the server configuration
m_config = config;
setServerConfiguration(config);
// Filesystem configuration will usually be initialized after the security configuration so we need to plug in
// a listener to initialize it later
m_filesysConfig = (FilesystemsConfigSection) m_config.getConfigSection( FilesystemsConfigSection.SectionName);
// Get the Alfresco configuration section
m_alfrescoConfig = (AlfrescoConfigSection) m_config.getConfigSection( AlfrescoConfigSection.SectionName);
if ( m_filesysConfig == null || m_alfrescoConfig == null)
m_config.addListener( this);
// Find the content filesystem details to be used for hte tenant shares
if ( m_filesysConfig != null)
findContentShareDetails();
// Check if a tenant share name has been specified
ConfigElement tenantShareName = params.getChild( "TenantShareName");
@@ -115,7 +116,7 @@ public class MultiTenantShareMapper implements ShareMapper, ConfigurationListene
// Validate the share name
if ( tenantShareName.getValue() != null && tenantShareName.getValue().length() > 0)
m_tenantShareName = tenantShareName.getValue();
setTenantShareName(tenantShareName.getValue());
else
throw new InvalidConfigurationException("Invalid tenant share name");
}
@@ -123,14 +124,38 @@ public class MultiTenantShareMapper implements ShareMapper, ConfigurationListene
// Check if debug is enabled
if ( params.getChild("debug") != null)
m_debug = true;
// Create the tenant share lists table
m_tenantShareLists = new Hashtable<String, SharedDeviceList>();
setDebug(true);
// Complete initialization
afterPropertiesSet();
}
/**
public void afterPropertiesSet()
{
// Filesystem configuration will usually be initialized after the security configuration so we need to plug in
// a listener to initialize it later
m_filesysConfig = (FilesystemsConfigSection) m_config.getConfigSection( FilesystemsConfigSection.SectionName);
// Get the Alfresco configuration section
m_alfrescoConfig = (AlfrescoConfigSection) m_config.getConfigSection( AlfrescoConfigSection.SectionName);
if ( m_filesysConfig == null || m_alfrescoConfig == null)
m_config.addListener( this);
// Find the content filesystem details to be used for the tenant shares
if ( m_filesysConfig != null)
findContentShareDetails();
// Create the tenant share lists table
m_tenantShareLists = new Hashtable<String, SharedDeviceList>();
}
/**
* Check if debug output is enabled
*
* @return boolean