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

Added <serverEnabled enable="true|false"/> tag for CIFS, FTP and NFS server enable/disable. Removed <disable.../> tags

Browse Source 
as they only worked one way.
Added NFS server bean wiring to bootstrap.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4813 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Gary Spencer
2007-01-12 17:44:09 +00:00
parent 1b7cfc8303
commit 366cdfdc86
2 changed files with 63 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
config/alfresco/bootstrap-context.xml
View File

@@ -284,6 +284,14 @@
</constructor-arg> </constructor-arg>
</bean> </bean>
<!-- NFS Server -->
<bean id="nfsServer" class="org.alfresco.filesys.NFSServer" destroy-method="stopServer">
<constructor-arg>
<ref local="fileServerConfiguration"/>
</constructor-arg>
</bean>
<!-- Startup Message --> <!-- Startup Message -->
<bean id="startupLog" class="org.alfresco.repo.descriptor.DescriptorStartupLog"> <bean id="startupLog" class="org.alfresco.repo.descriptor.DescriptorStartupLog">

66
source/java/org/alfresco/filesys/server/config/ServerConfiguration.java
View File

@@ -628,7 +628,7 @@ public class ServerConfiguration extends AbstractLifecycleBean
// Log the successful startup // Log the successful startup
logger.info("CIFS server started"); logger.info("CIFS server " + (isSMBServerEnabled() ? "" : "NOT ") + "started");
} }
catch (UnsatisfiedLinkError ex) catch (UnsatisfiedLinkError ex)
{ {
@@ -670,7 +670,7 @@ public class ServerConfiguration extends AbstractLifecycleBean
// Log the successful startup // Log the successful startup
logger.info("FTP server started"); logger.info("FTP server " + (isFTPServerEnabled() ? "" : "NOT ") + "started");
} }
catch (Exception ex) catch (Exception ex)
{ {
@@ -690,7 +690,7 @@ public class ServerConfiguration extends AbstractLifecycleBean
// Log the successful startup // Log the successful startup
logger.info("NFS server started"); logger.info("NFS server " + (isNFSServerEnabled() ? "" : "NOT ") + "started");
} }
catch (Exception ex) catch (Exception ex)
{ {
@@ -745,19 +745,33 @@ public class ServerConfiguration extends AbstractLifecycleBean
{ {
// If the configuration section is not valid then CIFS is disabled // If the configuration section is not valid then CIFS is disabled
if ( config == null || config.getConfigElements().isEmpty() || if ( config == null)
config.getConfigElement( "disableCIFS") != null)
{ {
setSMBServerEnabled(false); setSMBServerEnabled(false);
return; return;
} }
// Check if the server has been disabled
ConfigElement elem = config.getConfigElement( "serverEnable");
if ( elem != null)
{
// Check for the enabled attribute
String srvEnable = elem.getAttribute( "enabled");
if ( srvEnable != null && srvEnable.equalsIgnoreCase( "false"))
{
setSMBServerEnabled(false);
return;
}
}
// Get the network broadcast address // Get the network broadcast address
// //
// Note: We need to set this first as the call to getLocalDomainName() may use a NetBIOS // Note: We need to set this first as the call to getLocalDomainName() may use a NetBIOS
// name lookup, so the broadcast mask must be set before then. // name lookup, so the broadcast mask must be set before then.
ConfigElement elem = config.getConfigElement("broadcast"); elem = config.getConfigElement("broadcast");
if (elem != null) if (elem != null)
{ {
@@ -1513,15 +1527,30 @@ public class ServerConfiguration extends AbstractLifecycleBean
{ {
// If the configuration section is not valid then FTP is disabled // If the configuration section is not valid then FTP is disabled
if ( config == null || config.getConfigElement( "disableFTP") != null) if ( config == null)
{ {
setFTPServerEnabled(false); setFTPServerEnabled(false);
return; return;
} }
// Check if the server has been disabled
ConfigElement elem = config.getConfigElement( "serverEnable");
if ( elem != null)
{
// Check for the enabled attribute
String srvEnable = elem.getAttribute( "enabled");
if ( srvEnable != null && srvEnable.equalsIgnoreCase( "false"))
{
setFTPServerEnabled(false);
return;
}
}
// Check for a bind address // Check for a bind address
ConfigElement elem = config.getConfigElement("bindto"); elem = config.getConfigElement("bindto");
if ( elem != null) { if ( elem != null) {
// Validate the bind address // Validate the bind address
@@ -1703,20 +1732,35 @@ public class ServerConfiguration extends AbstractLifecycleBean
{ {
// If the configuration section is not valid then NFS is disabled // If the configuration section is not valid then NFS is disabled
if ( config == null || config.getConfigElement( "disableNFS") != null) if ( config == null)
{ {
setNFSServerEnabled(false); setNFSServerEnabled(false);
return; return;
} }
// Check if the port mapper is enabled // Check if the server has been disabled
ConfigElement elem = config.getConfigElement( "serverEnable");
if ( elem != null)
{
// Check for the enabled attribute
String srvEnable = elem.getAttribute( "enabled");
if ( srvEnable != null && srvEnable.equalsIgnoreCase( "false"))
{
setNFSServerEnabled(false);
return;
}
}
// Check if the port mapper is enabled
if ( config.getConfigElement("enablePortMapper") != null) if ( config.getConfigElement("enablePortMapper") != null)
m_nfsPortMapper = true; m_nfsPortMapper = true;
// Check for the thread pool size // Check for the thread pool size
ConfigElement elem = config.getConfigElement("ThreadPool"); elem = config.getConfigElement("ThreadPool");
if ( elem != null) { if ( elem != null) {