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

Synchronize default file server configuration (file-servers-context.xml) with changes made to file-servers.xml in revision 13943

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@14033 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Dave Ward
2009-04-21 15:50:55 +00:00
parent d2180c5eaa
commit a68ce953a0
4 changed files with 34 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
config/alfresco/subsystems/fileServers/default/file-servers-context.xml
View File

@@ -197,6 +197,11 @@
<value>${ftp.port}</value> <value>${ftp.port}</value>
</property> </property>
<!-- IPv6 support -->
<property name="ipv6Enabled">
<value>${ftp.ipv6.enabled}</value>
</property>
<!-- FTP authentication --> <!-- FTP authentication -->
<property name="authenticator"> <property name="authenticator">
<ref bean="FtpAuthenticator" /> <ref bean="FtpAuthenticator" />

1
config/alfresco/subsystems/fileServers/default/file-servers.properties
View File

@@ -29,6 +29,7 @@ cifs.WINS.secondary=5.6.7.8
ftp.enabled=true ftp.enabled=true
ftp.port=21 ftp.port=21
ftp.ipv6.enabled=true
nfs.enabled=false nfs.enabled=false

24
source/java/org/alfresco/filesys/config/FTPConfigBean.java
View File

@@ -62,6 +62,9 @@ public class FTPConfigBean
/** The authenticator. */ /** The authenticator. */
private FTPAuthenticator authenticator; private FTPAuthenticator authenticator;
/** Is IP v6 enabled? */
private boolean ipv6Enabled;
/** /**
* Checks if is server enabled. * Checks if is server enabled.
* *
@@ -250,4 +253,25 @@ public class FTPConfigBean
{ {
this.authenticator = authenticator; this.authenticator = authenticator;
} }
/**
* Checks if IP v6 is enabled.
*
* @return <code>true</code> if IP v6 is enabled
*/
public boolean getIpv6Enabled()
{
return ipv6Enabled;
}
/**
* Indicates whether IP v6 should be enabled.
*
* @param ipv6Enabled
* <code>true</code> if IP v6 should be enabled
*/
public void setIpv6Enabled(boolean ipv6Enabled)
{
this.ipv6Enabled = ipv6Enabled;
}
} }

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

@@ -1262,6 +1262,10 @@ public class ServerConfigurationBean extends AbstractServerConfigurationBean
ftpConfig.setFTPDebug(ftpDbg); ftpConfig.setFTPDebug(ftpDbg);
} }
// Check if IPv6 support should be enabled
ftpConfig.setIPv6Enabled(ftpConfigBean.getIpv6Enabled());
// Check if a character set has been specified // Check if a character set has been specified
String charSet = ftpConfigBean.getCharSet(); String charSet = ftpConfigBean.getCharSet();