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

Merge WOLF-1 to HEAD

Browse Source 
EOL-2 : Remove NFS

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@109179 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Mark Rogers
2015-07-29 16:57:14 +00:00
parent ce1922480b
commit db4195196d
11 changed files with 2 additions and 1410 deletions
Download Patch File Download Diff File Expand all files Collapse all files

197
source/java/org/alfresco/filesys/config/ServerConfigurationBean.java
View File

@@ -103,7 +103,6 @@ public class ServerConfigurationBean extends AbstractServerConfigurationBean imp
{
private CIFSConfigBean cifsConfigBean;
private FTPConfigBean ftpConfigBean;
private NFSConfigBean nfsConfigBean;
private List<DeviceContext> filesystemContexts;
private SecurityConfigBean securityConfigBean;
private CoreServerConfigBean coreServerConfigBean;
@@ -139,11 +138,6 @@ public class ServerConfigurationBean extends AbstractServerConfigurationBean imp
{
this.ftpConfigBean = ftpConfigBean;
}
public void setNfsConfigBean(NFSConfigBean nfsConfigBean)
{
this.nfsConfigBean = nfsConfigBean;
}
public void setFilesystemContexts(List<DeviceContext> filesystemContexts)
{
@@ -1560,197 +1554,6 @@ public class ServerConfigurationBean extends AbstractServerConfigurationBean imp
}
}
/**
* Process the NFS server configuration
*/
protected void processNFSServerConfig()
{
// If the configuration section is not valid then NFS is disabled
if (nfsConfigBean == null)
{
removeConfigSection(NFSConfigSection.SectionName);
return;
}
// Check if the server has been disabled
if (!nfsConfigBean.getServerEnabled())
{
removeConfigSection(NFSConfigSection.SectionName);
return;
}
// Create the NFS configuration section
NFSConfigSection nfsConfig = new NFSConfigSection(this);
try
{
// Check if the port mapper is enabled
if (nfsConfigBean.getPortMapperEnabled())
nfsConfig.setNFSPortMapper(true);
// Check for the thread pool size
Integer poolSize = nfsConfigBean.getThreadPool();
if (poolSize != null)
{
// Range check the pool size value
if (poolSize < 4)
{
throw new AlfrescoRuntimeException("NFS thread pool size is below minimum of 4");
}
// Set the thread pool size
nfsConfig.setNFSThreadPoolSize(poolSize);
}
// NFS packet pool size
Integer pktPoolSize = nfsConfigBean.getPacketPool();
if (pktPoolSize != null)
{
// Range check the pool size value
if (pktPoolSize < 10)
throw new AlfrescoRuntimeException("NFS packet pool size is below minimum of 10");
if (pktPoolSize < nfsConfig.getNFSThreadPoolSize() + 1)
throw new AlfrescoRuntimeException("NFS packet pool must be at least thread pool size plus one");
// Set the packet pool size
nfsConfig.setNFSPacketPoolSize(pktPoolSize);
}
// Check for a port mapper server port
Integer portMapperPort = nfsConfigBean.getPortMapperPort();
if (portMapperPort != null)
{
nfsConfig.setPortMapperPort(portMapperPort);
if ( nfsConfig.getPortMapperPort() == -1)
{
logger.info("NFS portmapper registration disabled");
}
else
{
if (nfsConfig.getPortMapperPort() <= 0 || nfsConfig.getPortMapperPort() >= 65535)
{
throw new AlfrescoRuntimeException("NFS Port mapper server port out of valid range");
}
}
}
// Check for a mount server port
Integer mountServerPort = nfsConfigBean.getMountServerPort();
if (mountServerPort != null)
{
nfsConfig.setMountServerPort(mountServerPort);
if (nfsConfig.getMountServerPort() < 0 || nfsConfig.getMountServerPort() >= 65535)
{
throw new AlfrescoRuntimeException("NFS Mount server port out of valid range");
}
}
// Check for an NFS server port
Integer nfsServerPort = nfsConfigBean.getNfsServerPort();
if (nfsServerPort != null)
{
nfsConfig.setNFSServerPort(nfsServerPort);
if (nfsConfig.getNFSServerPort() < 0 || nfsConfig.getNFSServerPort() >= 65535)
{
throw new AlfrescoRuntimeException("NFS server port out of valid range");
}
}
// Check for an RPC registration port
Integer rpcRegisterPort = nfsConfigBean.getRpcRegisterPort();
if ( rpcRegisterPort != null)
{
nfsConfig.setRPCRegistrationPort( rpcRegisterPort);
if ( nfsConfig.getRPCRegistrationPort() < 0 || nfsConfig.getRPCRegistrationPort() >= 65535)
{
throw new AlfrescoRuntimeException("RPC registrtion port out of valid range");
}
}
// Check for NFS debug flags
String flags = nfsConfigBean.getDebugFlags();
int nfsDbg = 0;
if (flags != null && flags.length() > 0)
{
// Parse the flags
flags = flags.toUpperCase();
StringTokenizer token = new StringTokenizer(flags, ",");
while (token.hasMoreTokens())
{
// Get the current debug flag token
String dbg = token.nextToken().trim();
// Find the debug flag name
int idx = 0;
while (idx < m_nfsDebugStr.length && m_nfsDebugStr[idx].equalsIgnoreCase(dbg) == false)
idx++;
if (idx >= m_nfsDebugStr.length)
throw new AlfrescoRuntimeException("Invalid NFS debug flag, " + dbg);
// Set the debug flag
nfsDbg += 1 << idx;
}
// Set the NFS debug flags
nfsConfig.setNFSDebug(nfsDbg);
}
// Check if mount server debug output is enabled
if (nfsConfigBean.getMountServerDebug())
nfsConfig.setMountServerDebug(true);
// Check if portmapper debug output is enabled
if (nfsConfigBean.getPortMapperDebug())
nfsConfig.setPortMapperDebug(true);
// Create the RPC authenticator
RpcAuthenticator rpcAuthenticator = nfsConfigBean.getRpcAuthenticator();
if (rpcAuthenticator != null)
{
nfsConfig.setRpcAuthenticator(rpcAuthenticator);
}
else
{
throw new AlfrescoRuntimeException("RPC authenticator configuration missing, require user mappings");
}
}
catch (InvalidConfigurationException ex)
{
throw new AlfrescoRuntimeException(ex.getMessage());
}
}
/**
* Process the filesystems configuration
*/