incubator-ftpserver-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From n..@apache.org
Subject svn commit: r488023 - in /incubator/ftpserver/trunk: core/src/java/org/apache/ftpserver/ core/src/java/org/apache/ftpserver/command/ core/src/java/org/apache/ftpserver/commandline/ core/src/java/org/apache/ftpserver/ftplet/ core/src/java/org/apache/ftp...
Date Sun, 17 Dec 2006 18:53:02 GMT
Author: ngn
Date: Sun Dec 17 10:53:00 2006
New Revision: 488023

URL: http://svn.apache.org/viewvc?view=rev&rev=488023
Log:
Renamed FtpConfig and ServerFtpConfig interfaces to FtpletContext and FtpServerContext to
better reflect the responibility on the interfaces.
More cleanup (rename variables and such) to finish this is upcoming.

Added:
    incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/interfaces/FtpServerContext.java
      - copied, changed from r487956, incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/interfaces/ServerFtpConfig.java
    incubator/ftpserver/trunk/ftplet-api/src/java/org/apache/ftpserver/ftplet/FtpletContext.java
      - copied, changed from r487956, incubator/ftpserver/trunk/ftplet-api/src/java/org/apache/ftpserver/ftplet/FtpConfig.java
Removed:
    incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/interfaces/ServerFtpConfig.java
    incubator/ftpserver/trunk/ftplet-api/src/java/org/apache/ftpserver/ftplet/FtpConfig.java
Modified:
    incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/DefaultListener.java
    incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/FtpConfigImpl.java
    incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/FtpDataConnection.java
    incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/FtpServer.java
    incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/FtpWriter.java
    incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/RequestHandler.java
    incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/command/APPE.java
    incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/command/AUTH.java
    incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/command/DELE.java
    incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/command/MKD.java
    incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/command/PASS.java
    incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/command/PROT.java
    incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/command/RETR.java
    incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/command/RMD.java
    incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/command/RNTO.java
    incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/command/SITE.java
    incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/command/SITE_DESCUSER.java
    incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/command/STOR.java
    incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/command/STOU.java
    incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/command/USER.java
    incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/commandline/CommandLine.java
    incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/ftplet/DefaultFtpletContainer.java
    incubator/ftpserver/trunk/core/src/test/org/apache/ftpserver/AbstractFtpServerTestTemplate.java
    incubator/ftpserver/trunk/core/src/test/org/apache/ftpserver/clienttests/ClientTestTemplate.java
    incubator/ftpserver/trunk/core/src/test/org/apache/ftpserver/ftplet/FtpLetReturnDisconnectTest.java
    incubator/ftpserver/trunk/core/src/test/org/apache/ftpserver/ftplet/MockFtplet.java
    incubator/ftpserver/trunk/core/src/test/org/apache/ftpserver/ftplet/MockFtpletCallback.java
    incubator/ftpserver/trunk/ftplet-api/src/java/org/apache/ftpserver/ftplet/DefaultFtplet.java
    incubator/ftpserver/trunk/ftplet-api/src/java/org/apache/ftpserver/ftplet/Ftplet.java

Modified: incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/DefaultListener.java
URL: http://svn.apache.org/viewvc/incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/DefaultListener.java?view=diff&rev=488023&r1=488022&r2=488023
==============================================================================
--- incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/DefaultListener.java (original)
+++ incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/DefaultListener.java Sun
Dec 17 10:53:00 2006
@@ -7,7 +7,7 @@
 import org.apache.commons.logging.Log;
 import org.apache.ftpserver.interfaces.Connection;
 import org.apache.ftpserver.interfaces.ConnectionManager;
-import org.apache.ftpserver.interfaces.ServerFtpConfig;
+import org.apache.ftpserver.interfaces.FtpServerContext;
 
 /**
  * The default {@link Listener} implementation.
@@ -17,7 +17,7 @@
 
     private Log log;
     
-    private ServerFtpConfig ftpConfig;
+    private FtpServerContext ftpConfig;
 
     private ServerSocket serverSocket;
 
@@ -30,7 +30,7 @@
      * 
      * @param ftpConfig Configuration for the listener
      */
-    public DefaultListener(ServerFtpConfig ftpConfig) {
+    public DefaultListener(FtpServerContext ftpConfig) {
         this.ftpConfig = ftpConfig;
         
         log = ftpConfig.getLogFactory().getInstance(getClass());

Modified: incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/FtpConfigImpl.java
URL: http://svn.apache.org/viewvc/incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/FtpConfigImpl.java?view=diff&rev=488023&r1=488022&r2=488023
==============================================================================
--- incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/FtpConfigImpl.java (original)
+++ incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/FtpConfigImpl.java Sun Dec
17 10:53:00 2006
@@ -24,6 +24,7 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.ftpserver.filesystem.NativeFileSystemManager;
 import org.apache.ftpserver.ftplet.Component;
 import org.apache.ftpserver.ftplet.Configuration;
 import org.apache.ftpserver.ftplet.DefaultFtpletContainer;
@@ -38,10 +39,14 @@
 import org.apache.ftpserver.interfaces.DataConnectionConfig;
 import org.apache.ftpserver.interfaces.IpRestrictor;
 import org.apache.ftpserver.interfaces.MessageResource;
-import org.apache.ftpserver.interfaces.ServerFtpConfig;
+import org.apache.ftpserver.interfaces.FtpServerContext;
 import org.apache.ftpserver.interfaces.ServerFtpStatistics;
 import org.apache.ftpserver.interfaces.SocketFactory;
+import org.apache.ftpserver.iprestrictor.FileIpRestrictor;
+import org.apache.ftpserver.message.MessageResourceImpl;
+import org.apache.ftpserver.socketfactory.FtpSocketFactory;
 import org.apache.ftpserver.usermanager.BaseUser;
+import org.apache.ftpserver.usermanager.PropertiesUserManager;
 
 /**
  * FTP server configuration implementation. It holds all 
@@ -50,7 +55,7 @@
  * @author <a href="mailto:rana_b@yahoo.com">Rana Bhattacharyya</a>
  */
 public
-class FtpConfigImpl implements ServerFtpConfig {
+class FtpConfigImpl implements FtpServerContext {
 
     private LogFactory logFactory;
     private SocketFactory socketFactory;
@@ -80,15 +85,15 @@
             log        = logFactory.getInstance(FtpConfigImpl.class);
             
             // create all the components
-            socketFactory     = (SocketFactory)        createComponent(conf, "socket-factory",
     "org.apache.ftpserver.socketfactory.FtpSocketFactory");
-            dataConConfig     = (DataConnectionConfig) createComponent(conf, "data-connection",
    "org.apache.ftpserver.DefaultDataConnectionConfig"); 
-            messageResource   = (MessageResource)      createComponent(conf, "message", 
           "org.apache.ftpserver.message.MessageResourceImpl");
-            connectionManager = (ConnectionManager)    createComponent(conf, "connection-manager",
 "org.apache.ftpserver.ConnectionManagerImpl");
-            ipRestrictor      = (IpRestrictor)         createComponent(conf, "ip-restrictor",
      "org.apache.ftpserver.iprestrictor.FileIpRestrictor");
-            userManager       = (UserManager)           createComponent(conf, "user-manager",
       "org.apache.ftpserver.usermanager.PropertiesUserManager");
-            fileSystemManager = (FileSystemManager)     createComponent(conf, "file-system-manager",
"org.apache.ftpserver.filesystem.NativeFileSystemManager");
-            statistics        = (ServerFtpStatistics)        createComponent(conf, "statistics",
         "org.apache.ftpserver.FtpStatisticsImpl");
-            commandFactory    = (CommandFactory)       createComponent(conf, "command-factory",
    "org.apache.ftpserver.DefaultCommandFactory");
+            socketFactory     = (SocketFactory)        createComponent(conf, "socket-factory",
     FtpSocketFactory.class.getName());
+            dataConConfig     = (DataConnectionConfig) createComponent(conf, "data-connection",
    DefaultDataConnectionConfig.class.getName()); 
+            messageResource   = (MessageResource)      createComponent(conf, "message", 
           MessageResourceImpl.class.getName());
+            connectionManager = (ConnectionManager)    createComponent(conf, "connection-manager",
 ConnectionManagerImpl.class.getName());
+            ipRestrictor      = (IpRestrictor)         createComponent(conf, "ip-restrictor",
      FileIpRestrictor.class.getName());
+            userManager       = (UserManager)           createComponent(conf, "user-manager",
       PropertiesUserManager.class.getName());
+            fileSystemManager = (FileSystemManager)     createComponent(conf, "file-system-manager",
NativeFileSystemManager.class.getName());
+            statistics        = (ServerFtpStatistics)        createComponent(conf, "statistics",
         FtpStatisticsImpl.class.getName());
+            commandFactory    = (CommandFactory)       createComponent(conf, "command-factory",
    DefaultCommandFactory.class.getName());
             
             // create user if necessary
             boolean userCreate = conf.getBoolean("create-default-user", true);

Modified: incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/FtpDataConnection.java
URL: http://svn.apache.org/viewvc/incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/FtpDataConnection.java?view=diff&rev=488023&r1=488022&r2=488023
==============================================================================
--- incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/FtpDataConnection.java (original)
+++ incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/FtpDataConnection.java Sun
Dec 17 10:53:00 2006
@@ -26,7 +26,7 @@
 import org.apache.commons.logging.Log;
 import org.apache.ftpserver.ftplet.FtpException;
 import org.apache.ftpserver.interfaces.DataConnectionConfig;
-import org.apache.ftpserver.interfaces.ServerFtpConfig;
+import org.apache.ftpserver.interfaces.FtpServerContext;
 import org.apache.ftpserver.interfaces.Ssl;
 
 
@@ -41,7 +41,7 @@
     
     private Log log;
     
-    private ServerFtpConfig    fconfig;
+    private FtpServerContext    fconfig;
     private Socket        dataSoc;
     private ServerSocket  servSoc;
     
@@ -62,7 +62,7 @@
     /**
      * Set the ftp config.
      */
-    public void setFtpConfig(ServerFtpConfig cfg) {
+    public void setFtpConfig(FtpServerContext cfg) {
         fconfig = cfg;
         log = fconfig.getLogFactory().getInstance(getClass());
     }

Modified: incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/FtpServer.java
URL: http://svn.apache.org/viewvc/incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/FtpServer.java?view=diff&rev=488023&r1=488022&r2=488023
==============================================================================
--- incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/FtpServer.java (original)
+++ incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/FtpServer.java Sun Dec 17
10:53:00 2006
@@ -25,7 +25,7 @@
 import java.util.List;
 
 import org.apache.commons.logging.Log;
-import org.apache.ftpserver.interfaces.ServerFtpConfig;
+import org.apache.ftpserver.interfaces.FtpServerContext;
 
 /**
  * This is the starting point of all the servers. It invokes a new listener
@@ -38,7 +38,7 @@
 
     private Thread runner;
 
-    private ServerFtpConfig ftpConfig;
+    private FtpServerContext ftpConfig;
 
     private Log log;
 
@@ -49,7 +49,7 @@
     /**
      * Constructor. Set the server object.
      */
-    public FtpServer(ServerFtpConfig ftpConfig) {
+    public FtpServer(FtpServerContext ftpConfig) {
         this.ftpConfig = ftpConfig;
         log = this.ftpConfig.getLogFactory().getInstance(getClass());
 
@@ -123,7 +123,7 @@
     /**
      * Get the root server configuration object.
      */
-    public ServerFtpConfig getFtpConfig() {
+    public FtpServerContext getFtpConfig() {
         return ftpConfig;
     }
 }

Modified: incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/FtpWriter.java
URL: http://svn.apache.org/viewvc/incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/FtpWriter.java?view=diff&rev=488023&r1=488022&r2=488023
==============================================================================
--- incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/FtpWriter.java (original)
+++ incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/FtpWriter.java Sun Dec 17
10:53:00 2006
@@ -33,7 +33,7 @@
 import org.apache.ftpserver.ftplet.FtpResponse;
 import org.apache.ftpserver.ftplet.FtpStatistics;
 import org.apache.ftpserver.interfaces.ConnectionObserver;
-import org.apache.ftpserver.interfaces.ServerFtpConfig;
+import org.apache.ftpserver.interfaces.FtpServerContext;
 import org.apache.ftpserver.interfaces.MessageResource;
 import org.apache.ftpserver.util.DateUtils;
 import org.apache.ftpserver.util.IoUtils;
@@ -94,7 +94,7 @@
     private Log log;
     private Writer writer;
     private ConnectionObserver observer;
-    private ServerFtpConfig fconfig;
+    private FtpServerContext fconfig;
     private FtpRequest request;
     private InetAddress serverAddress;
 
@@ -110,7 +110,7 @@
     /**
      * Set ftp config.
      */
-    public void setFtpConfig(ServerFtpConfig fconfig) {
+    public void setFtpConfig(FtpServerContext fconfig) {
         this.fconfig = fconfig;
         log = this.fconfig.getLogFactory().getInstance(getClass());
     }

Modified: incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/RequestHandler.java
URL: http://svn.apache.org/viewvc/incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/RequestHandler.java?view=diff&rev=488023&r1=488022&r2=488023
==============================================================================
--- incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/RequestHandler.java (original)
+++ incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/RequestHandler.java Sun Dec
17 10:53:00 2006
@@ -47,7 +47,7 @@
 import org.apache.ftpserver.interfaces.ConnectionManager;
 import org.apache.ftpserver.interfaces.ConnectionObserver;
 import org.apache.ftpserver.interfaces.IpRestrictor;
-import org.apache.ftpserver.interfaces.ServerFtpConfig;
+import org.apache.ftpserver.interfaces.FtpServerContext;
 import org.apache.ftpserver.interfaces.ServerFtpStatistics;
 import org.apache.ftpserver.interfaces.Ssl;
 import org.apache.ftpserver.listing.DirectoryLister;
@@ -63,7 +63,7 @@
 public 
 class RequestHandler implements Connection {
     
-    private ServerFtpConfig fconfig;
+    private FtpServerContext fconfig;
     private Log log;
     
     private Socket controlSocket;
@@ -81,7 +81,7 @@
     /**
      * Constructor - set the control socket.
      */
-    public RequestHandler(ServerFtpConfig fconfig, Socket controlSocket) throws IOException
{
+    public RequestHandler(FtpServerContext fconfig, Socket controlSocket) throws IOException
{
         this.fconfig = fconfig;
         this.controlSocket = controlSocket;
         log = this.fconfig.getLogFactory().getInstance(getClass());
@@ -124,7 +124,7 @@
     /**
      * Get the configuration object.
      */
-    public ServerFtpConfig getConfig() {
+    public FtpServerContext getConfig() {
         return fconfig;
     }
                 
@@ -237,7 +237,8 @@
                 
                 // connection limit check
                 int maxConnections = conManager.getMaxConnections();
-                if(ftpStat.getCurrentConnectionNumber() > maxConnections) {
+                System.out.println(ftpStat.getCurrentConnectionNumber() + " -- " + maxConnections);
+                if(maxConnections != 0 && ftpStat.getCurrentConnectionNumber() >
maxConnections) {
                     log.warn("Maximum connection limit reached.");
                     writer.send(530, "connection.limit", null);
                     return;

Modified: incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/command/APPE.java
URL: http://svn.apache.org/viewvc/incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/command/APPE.java?view=diff&rev=488023&r1=488022&r2=488023
==============================================================================
--- incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/command/APPE.java (original)
+++ incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/command/APPE.java Sun Dec
17 10:53:00 2006
@@ -34,7 +34,7 @@
 import org.apache.ftpserver.ftplet.Ftplet;
 import org.apache.ftpserver.ftplet.FtpletEnum;
 import org.apache.ftpserver.interfaces.Command;
-import org.apache.ftpserver.interfaces.ServerFtpConfig;
+import org.apache.ftpserver.interfaces.FtpServerContext;
 import org.apache.ftpserver.interfaces.ServerFtpStatistics;
 import org.apache.ftpserver.util.IoUtils;
 
@@ -64,7 +64,7 @@
         
             // reset state variables
             request.resetState();
-            ServerFtpConfig fconfig = handler.getConfig();
+            FtpServerContext fconfig = handler.getConfig();
             
             // argument check
             String fileName = request.getArgument();

Modified: incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/command/AUTH.java
URL: http://svn.apache.org/viewvc/incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/command/AUTH.java?view=diff&rev=488023&r1=488022&r2=488023
==============================================================================
--- incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/command/AUTH.java (original)
+++ incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/command/AUTH.java Sun Dec
17 10:53:00 2006
@@ -27,7 +27,7 @@
 import org.apache.ftpserver.RequestHandler;
 import org.apache.ftpserver.ftplet.FtpException;
 import org.apache.ftpserver.interfaces.Command;
-import org.apache.ftpserver.interfaces.ServerFtpConfig;
+import org.apache.ftpserver.interfaces.FtpServerContext;
 
 /**
  * This server supports explicit SSL support.
@@ -55,7 +55,7 @@
         }
         
         // check SSL configuration
-        ServerFtpConfig fconfig = handler.getConfig();
+        FtpServerContext fconfig = handler.getConfig();
         Log log = fconfig.getLogFactory().getInstance(getClass());
         if(fconfig.getSocketFactory().getSSL() == null) {
             out.send(431, "AUTH", null);

Modified: incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/command/DELE.java
URL: http://svn.apache.org/viewvc/incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/command/DELE.java?view=diff&rev=488023&r1=488022&r2=488023
==============================================================================
--- incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/command/DELE.java (original)
+++ incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/command/DELE.java Sun Dec
17 10:53:00 2006
@@ -30,7 +30,7 @@
 import org.apache.ftpserver.ftplet.Ftplet;
 import org.apache.ftpserver.ftplet.FtpletEnum;
 import org.apache.ftpserver.interfaces.Command;
-import org.apache.ftpserver.interfaces.ServerFtpConfig;
+import org.apache.ftpserver.interfaces.FtpServerContext;
 import org.apache.ftpserver.interfaces.ServerFtpStatistics;
 
 /**
@@ -54,7 +54,7 @@
         
         // reset state variables
         request.resetState(); 
-        ServerFtpConfig fconfig = handler.getConfig();
+        FtpServerContext fconfig = handler.getConfig();
         
         // argument check
         String fileName = request.getArgument();

Modified: incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/command/MKD.java
URL: http://svn.apache.org/viewvc/incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/command/MKD.java?view=diff&rev=488023&r1=488022&r2=488023
==============================================================================
--- incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/command/MKD.java (original)
+++ incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/command/MKD.java Sun Dec
17 10:53:00 2006
@@ -30,7 +30,7 @@
 import org.apache.ftpserver.ftplet.Ftplet;
 import org.apache.ftpserver.ftplet.FtpletEnum;
 import org.apache.ftpserver.interfaces.Command;
-import org.apache.ftpserver.interfaces.ServerFtpConfig;
+import org.apache.ftpserver.interfaces.FtpServerContext;
 import org.apache.ftpserver.interfaces.ServerFtpStatistics;
 
 /**
@@ -56,7 +56,7 @@
         
         // reset state
         request.resetState(); 
-        ServerFtpConfig fconfig = handler.getConfig();
+        FtpServerContext fconfig = handler.getConfig();
         
         // argument check
         String fileName = request.getArgument();

Modified: incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/command/PASS.java
URL: http://svn.apache.org/viewvc/incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/command/PASS.java?view=diff&rev=488023&r1=488022&r2=488023
==============================================================================
--- incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/command/PASS.java (original)
+++ incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/command/PASS.java Sun Dec
17 10:53:00 2006
@@ -34,7 +34,7 @@
 import org.apache.ftpserver.ftplet.UserManager;
 import org.apache.ftpserver.interfaces.Command;
 import org.apache.ftpserver.interfaces.ConnectionManager;
-import org.apache.ftpserver.interfaces.ServerFtpConfig;
+import org.apache.ftpserver.interfaces.FtpServerContext;
 import org.apache.ftpserver.interfaces.ServerFtpStatistics;
 
 /**
@@ -57,7 +57,7 @@
                         FtpWriter out) throws IOException, FtpException {
     
         boolean success = false;
-        ServerFtpConfig fconfig = handler.getConfig();
+        FtpServerContext fconfig = handler.getConfig();
         Log log = fconfig.getLogFactory().getInstance(getClass());
         ConnectionManager conManager = fconfig.getConnectionManager();
         ServerFtpStatistics stat = (ServerFtpStatistics)fconfig.getFtpStatistics();
@@ -100,7 +100,7 @@
             // login limit check
             int currLogin = stat.getCurrentLoginNumber();
             int maxLogin = conManager.getMaxLogins();
-            if(currLogin >= maxLogin) {
+            if(maxLogin != 0 && currLogin >= maxLogin) {
                 out.send(421, "PASS.login", null);
                 return;
             }

Modified: incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/command/PROT.java
URL: http://svn.apache.org/viewvc/incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/command/PROT.java?view=diff&rev=488023&r1=488022&r2=488023
==============================================================================
--- incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/command/PROT.java (original)
+++ incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/command/PROT.java Sun Dec
17 10:53:00 2006
@@ -27,7 +27,7 @@
 import org.apache.ftpserver.RequestHandler;
 import org.apache.ftpserver.ftplet.FtpException;
 import org.apache.ftpserver.interfaces.Command;
-import org.apache.ftpserver.interfaces.ServerFtpConfig;
+import org.apache.ftpserver.interfaces.FtpServerContext;
 
 /**
  * Data channel protection level.
@@ -62,7 +62,7 @@
             out.send(200, "PROT", null);
         }
         else if(arg.equals("P")) {
-            ServerFtpConfig fconfig = handler.getConfig();
+            FtpServerContext fconfig = handler.getConfig();
             if(fconfig.getDataConnectionConfig().getSSL() == null) {
                 out.send(431, "PROT", null);
             }

Modified: incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/command/RETR.java
URL: http://svn.apache.org/viewvc/incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/command/RETR.java?view=diff&rev=488023&r1=488022&r2=488023
==============================================================================
--- incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/command/RETR.java (original)
+++ incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/command/RETR.java Sun Dec
17 10:53:00 2006
@@ -36,7 +36,7 @@
 import org.apache.ftpserver.ftplet.Ftplet;
 import org.apache.ftpserver.ftplet.FtpletEnum;
 import org.apache.ftpserver.interfaces.Command;
-import org.apache.ftpserver.interfaces.ServerFtpConfig;
+import org.apache.ftpserver.interfaces.FtpServerContext;
 import org.apache.ftpserver.interfaces.ServerFtpStatistics;
 import org.apache.ftpserver.util.IoUtils;
 
@@ -65,7 +65,7 @@
         
             // get state variable
             long skipLen = request.getFileOffset();
-            ServerFtpConfig fconfig = handler.getConfig();
+            FtpServerContext fconfig = handler.getConfig();
             
             // argument check
             String fileName = request.getArgument();

Modified: incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/command/RMD.java
URL: http://svn.apache.org/viewvc/incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/command/RMD.java?view=diff&rev=488023&r1=488022&r2=488023
==============================================================================
--- incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/command/RMD.java (original)
+++ incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/command/RMD.java Sun Dec
17 10:53:00 2006
@@ -30,7 +30,7 @@
 import org.apache.ftpserver.ftplet.Ftplet;
 import org.apache.ftpserver.ftplet.FtpletEnum;
 import org.apache.ftpserver.interfaces.Command;
-import org.apache.ftpserver.interfaces.ServerFtpConfig;
+import org.apache.ftpserver.interfaces.FtpServerContext;
 import org.apache.ftpserver.interfaces.ServerFtpStatistics;
 
 /**
@@ -56,7 +56,7 @@
         
         // reset state variables
         request.resetState();
-        ServerFtpConfig fconfig = handler.getConfig();
+        FtpServerContext fconfig = handler.getConfig();
         
         // argument check
         String fileName = request.getArgument();

Modified: incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/command/RNTO.java
URL: http://svn.apache.org/viewvc/incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/command/RNTO.java?view=diff&rev=488023&r1=488022&r2=488023
==============================================================================
--- incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/command/RNTO.java (original)
+++ incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/command/RNTO.java Sun Dec
17 10:53:00 2006
@@ -30,7 +30,7 @@
 import org.apache.ftpserver.ftplet.Ftplet;
 import org.apache.ftpserver.ftplet.FtpletEnum;
 import org.apache.ftpserver.interfaces.Command;
-import org.apache.ftpserver.interfaces.ServerFtpConfig;
+import org.apache.ftpserver.interfaces.FtpServerContext;
 
 /**
  * <code>RNTO &lt;SP&gt; &lt;pathname&gt; &lt;CRLF&gt;</code><br>
@@ -62,7 +62,7 @@
             }
             
             // call Ftplet.onRenameStart() method
-            ServerFtpConfig fconfig = handler.getConfig();
+            FtpServerContext fconfig = handler.getConfig();
             Ftplet ftpletContainer = fconfig.getFtpletContainer();
             FtpletEnum ftpletRet;
             try {

Modified: incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/command/SITE.java
URL: http://svn.apache.org/viewvc/incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/command/SITE.java?view=diff&rev=488023&r1=488022&r2=488023
==============================================================================
--- incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/command/SITE.java (original)
+++ incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/command/SITE.java Sun Dec
17 10:53:00 2006
@@ -30,7 +30,7 @@
 import org.apache.ftpserver.ftplet.Ftplet;
 import org.apache.ftpserver.ftplet.FtpletEnum;
 import org.apache.ftpserver.interfaces.Command;
-import org.apache.ftpserver.interfaces.ServerFtpConfig;
+import org.apache.ftpserver.interfaces.FtpServerContext;
 
 
 /**
@@ -52,7 +52,7 @@
                         FtpWriter out) throws IOException, FtpException {
         
         // call Ftplet.onSite method
-        ServerFtpConfig fconfig = handler.getConfig();
+        FtpServerContext fconfig = handler.getConfig();
         Ftplet ftpletContainer = fconfig.getFtpletContainer();
         FtpletEnum ftpletRet;
         try {

Modified: incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/command/SITE_DESCUSER.java
URL: http://svn.apache.org/viewvc/incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/command/SITE_DESCUSER.java?view=diff&rev=488023&r1=488022&r2=488023
==============================================================================
--- incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/command/SITE_DESCUSER.java
(original)
+++ incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/command/SITE_DESCUSER.java
Sun Dec 17 10:53:00 2006
@@ -24,7 +24,7 @@
 import org.apache.ftpserver.FtpRequestImpl;
 import org.apache.ftpserver.FtpWriter;
 import org.apache.ftpserver.RequestHandler;
-import org.apache.ftpserver.ftplet.FtpConfig;
+import org.apache.ftpserver.ftplet.FtpletContext;
 import org.apache.ftpserver.ftplet.FtpException;
 import org.apache.ftpserver.ftplet.User;
 import org.apache.ftpserver.ftplet.UserManager;
@@ -66,7 +66,7 @@
         String userName = argument.substring(spIndex + 1);
         
         // check the user existance
-        FtpConfig fconfig = handler.getConfig();
+        FtpletContext fconfig = handler.getConfig();
         UserManager usrManager = fconfig.getUserManager();
         User user = null;
         try {

Modified: incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/command/STOR.java
URL: http://svn.apache.org/viewvc/incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/command/STOR.java?view=diff&rev=488023&r1=488022&r2=488023
==============================================================================
--- incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/command/STOR.java (original)
+++ incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/command/STOR.java Sun Dec
17 10:53:00 2006
@@ -34,7 +34,7 @@
 import org.apache.ftpserver.ftplet.Ftplet;
 import org.apache.ftpserver.ftplet.FtpletEnum;
 import org.apache.ftpserver.interfaces.Command;
-import org.apache.ftpserver.interfaces.ServerFtpConfig;
+import org.apache.ftpserver.interfaces.FtpServerContext;
 import org.apache.ftpserver.interfaces.ServerFtpStatistics;
 import org.apache.ftpserver.util.IoUtils;
 
@@ -66,7 +66,7 @@
         
             // get state variable
             long skipLen = request.getFileOffset();
-            ServerFtpConfig fconfig = handler.getConfig();
+            FtpServerContext fconfig = handler.getConfig();
             
             // argument check
             String fileName = request.getArgument();

Modified: incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/command/STOU.java
URL: http://svn.apache.org/viewvc/incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/command/STOU.java?view=diff&rev=488023&r1=488022&r2=488023
==============================================================================
--- incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/command/STOU.java (original)
+++ incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/command/STOU.java Sun Dec
17 10:53:00 2006
@@ -35,7 +35,7 @@
 import org.apache.ftpserver.ftplet.Ftplet;
 import org.apache.ftpserver.ftplet.FtpletEnum;
 import org.apache.ftpserver.interfaces.Command;
-import org.apache.ftpserver.interfaces.ServerFtpConfig;
+import org.apache.ftpserver.interfaces.FtpServerContext;
 import org.apache.ftpserver.interfaces.ServerFtpStatistics;
 import org.apache.ftpserver.util.IoUtils;
 
@@ -64,7 +64,7 @@
         
             // reset state variables
             request.resetState();
-            ServerFtpConfig fconfig = handler.getConfig();
+            FtpServerContext fconfig = handler.getConfig();
             
             // call Ftplet.onUploadUniqueStart() method
             Ftplet ftpletContainer = fconfig.getFtpletContainer();

Modified: incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/command/USER.java
URL: http://svn.apache.org/viewvc/incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/command/USER.java?view=diff&rev=488023&r1=488022&r2=488023
==============================================================================
--- incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/command/USER.java (original)
+++ incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/command/USER.java Sun Dec
17 10:53:00 2006
@@ -28,7 +28,7 @@
 import org.apache.ftpserver.ftplet.User;
 import org.apache.ftpserver.interfaces.Command;
 import org.apache.ftpserver.interfaces.ConnectionManager;
-import org.apache.ftpserver.interfaces.ServerFtpConfig;
+import org.apache.ftpserver.interfaces.FtpServerContext;
 import org.apache.ftpserver.interfaces.ServerFtpStatistics;
 import org.apache.ftpserver.usermanager.BaseUser;
 
@@ -54,7 +54,7 @@
                         FtpWriter out) throws IOException, FtpException {
     
         boolean success = false;
-        ServerFtpConfig fconfig = handler.getConfig();
+        FtpServerContext fconfig = handler.getConfig();
         ConnectionManager conManager = fconfig.getConnectionManager();
         ServerFtpStatistics stat = (ServerFtpStatistics)fconfig.getFtpStatistics();
         try {
@@ -100,7 +100,7 @@
             // login limit check
             int currLogin = stat.getCurrentLoginNumber();
             int maxLogin = conManager.getMaxLogins();
-            if(currLogin >= maxLogin) {
+            if(maxLogin != 0 && currLogin >= maxLogin) {
                 out.send(421, "USER.login", null);
                 return;
             }

Modified: incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/commandline/CommandLine.java
URL: http://svn.apache.org/viewvc/incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/commandline/CommandLine.java?view=diff&rev=488023&r1=488022&r2=488023
==============================================================================
--- incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/commandline/CommandLine.java
(original)
+++ incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/commandline/CommandLine.java
Sun Dec 17 10:53:00 2006
@@ -27,7 +27,7 @@
 import org.apache.ftpserver.config.XmlConfigurationHandler;
 import org.apache.ftpserver.ftplet.Configuration;
 import org.apache.ftpserver.ftplet.EmptyConfiguration;
-import org.apache.ftpserver.interfaces.ServerFtpConfig;
+import org.apache.ftpserver.interfaces.FtpServerContext;
 import org.apache.ftpserver.util.IoUtils;
 
 /**
@@ -76,7 +76,7 @@
             }
 
             // create root configuration object
-            ServerFtpConfig ftpConfig = new FtpConfigImpl(config);
+            FtpServerContext ftpConfig = new FtpConfigImpl(config);
 
             // start the server
             FtpServer server = new FtpServer(ftpConfig);

Modified: incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/ftplet/DefaultFtpletContainer.java
URL: http://svn.apache.org/viewvc/incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/ftplet/DefaultFtpletContainer.java?view=diff&rev=488023&r1=488022&r2=488023
==============================================================================
--- incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/ftplet/DefaultFtpletContainer.java
(original)
+++ incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/ftplet/DefaultFtpletContainer.java
Sun Dec 17 10:53:00 2006
@@ -544,7 +544,7 @@
         return retVal;
     }
 
-    public void init(FtpConfig ftpConfig, Configuration config) throws FtpException {
+    public void init(FtpletContext ftpletContext, Configuration config) throws FtpException
{
         // dummy, forces by Ftplet API       
     }
 

Copied: incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/interfaces/FtpServerContext.java
(from r487956, incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/interfaces/ServerFtpConfig.java)
URL: http://svn.apache.org/viewvc/incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/interfaces/FtpServerContext.java?view=diff&rev=488023&p1=incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/interfaces/ServerFtpConfig.java&r1=487956&p2=incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/interfaces/FtpServerContext.java&r2=488023
==============================================================================
--- incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/interfaces/ServerFtpConfig.java
(original)
+++ incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/interfaces/FtpServerContext.java
Sun Dec 17 10:53:00 2006
@@ -19,17 +19,17 @@
 
 package org.apache.ftpserver.interfaces;
 
-import org.apache.ftpserver.ftplet.FtpConfig;
+import org.apache.ftpserver.ftplet.FtpletContext;
 import org.apache.ftpserver.ftplet.Ftplet;
 
 /**
- * This is basically <code>org.apache.ftpserver.ftplet.FtpConfig</code> with
added
+ * This is basically <code>org.apache.ftpserver.ftplet.FtpletContext</code> with
added
  * connection manager, message resource functionalities.
  * 
  * @author <a href="mailto:rana_b@yahoo.com">Rana Bhattacharyya</a>
  */
 public 
-interface ServerFtpConfig extends FtpConfig {
+interface FtpServerContext extends FtpletContext {
 
     /**
      * Get connection manager.

Modified: incubator/ftpserver/trunk/core/src/test/org/apache/ftpserver/AbstractFtpServerTestTemplate.java
URL: http://svn.apache.org/viewvc/incubator/ftpserver/trunk/core/src/test/org/apache/ftpserver/AbstractFtpServerTestTemplate.java?view=diff&rev=488023&r1=488022&r2=488023
==============================================================================
--- incubator/ftpserver/trunk/core/src/test/org/apache/ftpserver/AbstractFtpServerTestTemplate.java
(original)
+++ incubator/ftpserver/trunk/core/src/test/org/apache/ftpserver/AbstractFtpServerTestTemplate.java
Sun Dec 17 10:53:00 2006
@@ -25,7 +25,7 @@
 import junit.framework.TestCase;
 
 import org.apache.ftpserver.config.PropertiesConfiguration;
-import org.apache.ftpserver.interfaces.ServerFtpConfig;
+import org.apache.ftpserver.interfaces.FtpServerContext;
 import org.apache.ftpserver.interfaces.SocketFactory;
 import org.apache.ftpserver.test.TestUtil;
 
@@ -68,7 +68,7 @@
         this.serverPort = TestUtil.findFreePort();
         
         // create root configuration object
-        final ServerFtpConfig ftpConfig = new FtpConfigImpl(new PropertiesConfiguration(createConfig()));
+        final FtpServerContext ftpConfig = new FtpConfigImpl(new PropertiesConfiguration(createConfig()));
 
         // start the server
         this.ftpServer = new FtpServer(ftpConfig);

Modified: incubator/ftpserver/trunk/core/src/test/org/apache/ftpserver/clienttests/ClientTestTemplate.java
URL: http://svn.apache.org/viewvc/incubator/ftpserver/trunk/core/src/test/org/apache/ftpserver/clienttests/ClientTestTemplate.java?view=diff&rev=488023&r1=488022&r2=488023
==============================================================================
--- incubator/ftpserver/trunk/core/src/test/org/apache/ftpserver/clienttests/ClientTestTemplate.java
(original)
+++ incubator/ftpserver/trunk/core/src/test/org/apache/ftpserver/clienttests/ClientTestTemplate.java
Sun Dec 17 10:53:00 2006
@@ -33,7 +33,7 @@
 import org.apache.ftpserver.FtpConfigImpl;
 import org.apache.ftpserver.FtpServer;
 import org.apache.ftpserver.config.PropertiesConfiguration;
-import org.apache.ftpserver.interfaces.ServerFtpConfig;
+import org.apache.ftpserver.interfaces.FtpServerContext;
 import org.apache.ftpserver.test.TestUtil;
 import org.apache.ftpserver.util.IoUtils;
 import org.apache.log4j.Logger;
@@ -54,7 +54,7 @@
 
     protected int port = -1;
 
-    private ServerFtpConfig config;
+    private FtpServerContext config;
 
     protected FTPClient client;
 

Modified: incubator/ftpserver/trunk/core/src/test/org/apache/ftpserver/ftplet/FtpLetReturnDisconnectTest.java
URL: http://svn.apache.org/viewvc/incubator/ftpserver/trunk/core/src/test/org/apache/ftpserver/ftplet/FtpLetReturnDisconnectTest.java?view=diff&rev=488023&r1=488022&r2=488023
==============================================================================
--- incubator/ftpserver/trunk/core/src/test/org/apache/ftpserver/ftplet/FtpLetReturnDisconnectTest.java
(original)
+++ incubator/ftpserver/trunk/core/src/test/org/apache/ftpserver/ftplet/FtpLetReturnDisconnectTest.java
Sun Dec 17 10:53:00 2006
@@ -71,7 +71,7 @@
 
 /*    public void testExceptionDuringInit() throws Exception {
         MockFtplet.callback = new MockFtpletCallback() {
-            public void init(FtpConfig ftpConfig, Configuration config)
+            public void init(FtpletContext ftpConfig, Configuration config)
                     throws FtpException {
                 throw new RuntimeException();
             }

Modified: incubator/ftpserver/trunk/core/src/test/org/apache/ftpserver/ftplet/MockFtplet.java
URL: http://svn.apache.org/viewvc/incubator/ftpserver/trunk/core/src/test/org/apache/ftpserver/ftplet/MockFtplet.java?view=diff&rev=488023&r1=488022&r2=488023
==============================================================================
--- incubator/ftpserver/trunk/core/src/test/org/apache/ftpserver/ftplet/MockFtplet.java (original)
+++ incubator/ftpserver/trunk/core/src/test/org/apache/ftpserver/ftplet/MockFtplet.java Sun
Dec 17 10:53:00 2006
@@ -29,8 +29,8 @@
         callback.destroy();
     }
 
-    public void init(FtpConfig ftpConfig, Configuration config) throws FtpException {
-        callback.init(ftpConfig, config);
+    public void init(FtpletContext ftpletContext, Configuration config) throws FtpException
{
+        callback.init(ftpletContext, config);
     }
 
     public FtpletEnum onAppendEnd(FtpRequest request, FtpResponse response) throws FtpException,
IOException {

Modified: incubator/ftpserver/trunk/core/src/test/org/apache/ftpserver/ftplet/MockFtpletCallback.java
URL: http://svn.apache.org/viewvc/incubator/ftpserver/trunk/core/src/test/org/apache/ftpserver/ftplet/MockFtpletCallback.java?view=diff&rev=488023&r1=488022&r2=488023
==============================================================================
--- incubator/ftpserver/trunk/core/src/test/org/apache/ftpserver/ftplet/MockFtpletCallback.java
(original)
+++ incubator/ftpserver/trunk/core/src/test/org/apache/ftpserver/ftplet/MockFtpletCallback.java
Sun Dec 17 10:53:00 2006
@@ -28,7 +28,7 @@
     public void destroy() {
     }
 
-    public void init(FtpConfig ftpConfig, Configuration config) throws FtpException {
+    public void init(FtpletContext ftpletContext, Configuration config) throws FtpException
{
     }
 
     public FtpletEnum onAppendEnd(FtpRequest request, FtpResponse response) throws FtpException,
IOException {

Modified: incubator/ftpserver/trunk/ftplet-api/src/java/org/apache/ftpserver/ftplet/DefaultFtplet.java
URL: http://svn.apache.org/viewvc/incubator/ftpserver/trunk/ftplet-api/src/java/org/apache/ftpserver/ftplet/DefaultFtplet.java?view=diff&rev=488023&r1=488022&r2=488023
==============================================================================
--- incubator/ftpserver/trunk/ftplet-api/src/java/org/apache/ftpserver/ftplet/DefaultFtplet.java
(original)
+++ incubator/ftpserver/trunk/ftplet-api/src/java/org/apache/ftpserver/ftplet/DefaultFtplet.java
Sun Dec 17 10:53:00 2006
@@ -31,7 +31,7 @@
 public 
 class DefaultFtplet implements Ftplet {
 
-    public void init(FtpConfig ftpConfig, Configuration config) throws FtpException {}
+    public void init(FtpletContext ftpletContext, Configuration config) throws FtpException
{}
     public void destroy() {}
     
     public FtpletEnum onConnect(FtpRequest request, FtpResponse response) throws FtpException,
IOException {return null;}

Modified: incubator/ftpserver/trunk/ftplet-api/src/java/org/apache/ftpserver/ftplet/Ftplet.java
URL: http://svn.apache.org/viewvc/incubator/ftpserver/trunk/ftplet-api/src/java/org/apache/ftpserver/ftplet/Ftplet.java?view=diff&rev=488023&r1=488022&r2=488023
==============================================================================
--- incubator/ftpserver/trunk/ftplet-api/src/java/org/apache/ftpserver/ftplet/Ftplet.java
(original)
+++ incubator/ftpserver/trunk/ftplet-api/src/java/org/apache/ftpserver/ftplet/Ftplet.java
Sun Dec 17 10:53:00 2006
@@ -55,13 +55,13 @@
      * the ftplet. The init method must complete successfully before the ftplet can 
      * receive any requests.
      */
-    void init(FtpConfig ftpConfig, Configuration config) throws FtpException;
+    void init(FtpletContext ftpletContext, Configuration config) throws FtpException;
     
     /**
      * Called by the servlet container to indicate to a ftplet that the ftplet is 
      * being taken out of service. This method is only called once all threads within 
      * the ftplet's service method have exited. After the ftplet container calls this 
-     * method, callback methods will not be executed. If the ftplet initializarion 
+     * method, callback methods will not be executed. If the ftplet initialization 
      * method fails, this method will not be called. 
      */
     void destroy();

Copied: incubator/ftpserver/trunk/ftplet-api/src/java/org/apache/ftpserver/ftplet/FtpletContext.java
(from r487956, incubator/ftpserver/trunk/ftplet-api/src/java/org/apache/ftpserver/ftplet/FtpConfig.java)
URL: http://svn.apache.org/viewvc/incubator/ftpserver/trunk/ftplet-api/src/java/org/apache/ftpserver/ftplet/FtpletContext.java?view=diff&rev=488023&p1=incubator/ftpserver/trunk/ftplet-api/src/java/org/apache/ftpserver/ftplet/FtpConfig.java&r1=487956&p2=incubator/ftpserver/trunk/ftplet-api/src/java/org/apache/ftpserver/ftplet/FtpletContext.java&r2=488023
==============================================================================
--- incubator/ftpserver/trunk/ftplet-api/src/java/org/apache/ftpserver/ftplet/FtpConfig.java
(original)
+++ incubator/ftpserver/trunk/ftplet-api/src/java/org/apache/ftpserver/ftplet/FtpletContext.java
Sun Dec 17 10:53:00 2006
@@ -31,7 +31,7 @@
  * @author <a href="mailto:rana_b@yahoo.com">Rana Bhattacharyya</a>
  */
 public 
-interface FtpConfig {
+interface FtpletContext {
 
     /**
      * Get the log factory.



Mime
View raw message