Added FTP IPv6 configuration, via the <IPv6 state="enabled|disabled"/> tag. Added the ftp.ipv6 property. MOB-714.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13943 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Gary Spencer
2009-04-14 14:55:54 +00:00
parent bc0340335c
commit 457190fc88
3 changed files with 15 additions and 0 deletions

View File

@@ -9,5 +9,6 @@ cifs.ipv6=disabled
cifs.hostannounce=true cifs.hostannounce=true
ftp.enabled=true ftp.enabled=true
ftp.ipv6=enabled
nfs.enabled=false nfs.enabled=false

View File

@@ -100,6 +100,9 @@
<port>1121</port> <port>1121</port>
--> -->
<!-- IPv6 support -->
<IPv6 state="${ftp.ipv6}"/>
<!-- FTP authentication --> <!-- FTP authentication -->
<!-- Available types are 'alfresco' and 'passthru' --> <!-- Available types are 'alfresco' and 'passthru' -->
<authenticator type="alfresco"/> <authenticator type="alfresco"/>

View File

@@ -1415,6 +1415,17 @@ public class ServerConfigurationBean extends AbstractServerConfigurationBean {
ftpConfig.setFTPDebug(ftpDbg); ftpConfig.setFTPDebug(ftpDbg);
} }
// Check if IPv6 support should be enabled
elem = config.getConfigElement("IPv6");
if ( elem != null) {
// Enable IPv6 support
if ( elem.hasAttribute("state") && elem.getAttribute("state").equalsIgnoreCase("enabled"))
ftpConfig.setIPv6Enabled( true);
}
// Check if a character set has been specified // Check if a character set has been specified
elem = config.getConfigElement( "charSet"); elem = config.getConfigElement( "charSet");