Big honkin' merge from head. Sheesh!

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3617 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Britt Park
2006-08-27 01:01:30 +00:00
parent e2c66899cc
commit 8031cc6574
322 changed files with 20776 additions and 6550 deletions

View File

@@ -50,10 +50,6 @@ public class FTPNetworkServer extends NetworkFileServer implements Runnable
// Session Thread group
private static final ThreadGroup THREAD_GROUP_SESSION = new ThreadGroup("FTP_SESSION_GROUP");
// Server version
private static final String ServerVersion = "3.5.0";
// Listen backlog for the server socket
protected static final int LISTEN_BACKLOG = 10;
@@ -100,10 +96,6 @@ public class FTPNetworkServer extends NetworkFileServer implements Runnable
{
super("FTP", config);
// Set the server version
setVersion(ServerVersion);
// Allocate the session lists
m_sessions = new FTPSessionList();
@@ -365,7 +357,6 @@ public class FTPNetworkServer extends NetworkFileServer implements Runnable
if (logger.isDebugEnabled() && hasDebug())
{
logger.debug("FTP Server starting on port " + getPort());
logger.debug("Version " + isVersion());
}
// Create a server socket to listen for incoming FTP session requests