expand the ftpserver

core/pom.xml

@@ -17,13 +17,13 @@
 	<parent>
 		<artifactId>ftpserver-parent</artifactId>
 		<groupId>org.apache.ftpserver</groupId>
-		<version>1.0.0-RC3-SNAPSHOT</version>
+		<version>1.0.7-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.apache.ftpserver</groupId>
 	<artifactId>ftpserver-core</artifactId>
 	<name>Apache FtpServer Core</name>
-	<version>1.0.0-RC3-SNAPSHOT</version>
+	<version>1.0.7-SNAPSHOT</version>
 	<packaging>bundle</packaging>
 	<scm>
 		<connection>
@@ -58,32 +58,25 @@
 			<plugin>
 				<groupId>org.apache.felix</groupId>
 				<artifactId>maven-bundle-plugin</artifactId>
-				<version>1.4.1</version>
+				<version>2.3.4</version>
 				<extensions>true</extensions>
 				<configuration>
 					<instructions>
 						<Bundle-SymbolicName> ${artifactId}</Bundle-SymbolicName>
 						<Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
-						<Export-Package> org.apache.ftpserver;version=${pom.version},
-							org.apache.ftpserver.command;version=${pom.version},
-							org.apache.ftpserver.config.spring;version=${pom.version},
-							org.apache.ftpserver.filesystem.nativefs;version=${pom.version},
-							org.apache.ftpserver.ftpletcontainer;version=${pom.version},
-							org.apache.ftpserver.listener;version=${pom.version}, 
-							org.apache.ftpserver.main;version=${pom.version},
-							org.apache.ftpserver.message;version=${pom.version},
-							org.apache.ftpserver.ssl;version=${pom.version},
-							org.apache.ftpserver.usermanager;version=${pom.version}
+						<Export-Package> org.apache.ftpserver;version=${project.version},
+							org.apache.ftpserver.command;version=${project.version},
+							org.apache.ftpserver.config.spring;version=${project.version},
+							org.apache.ftpserver.filesystem.nativefs;version=${project.version},
+							org.apache.ftpserver.ftpletcontainer;version=${project.version},
+							org.apache.ftpserver.ipfilter;version=${project.version}, 
+							org.apache.ftpserver.listener;version=${project.version}, 
+							org.apache.ftpserver.main;version=${project.version},
+							org.apache.ftpserver.message;version=${project.version},
+							org.apache.ftpserver.ssl;version=${project.version},
+							org.apache.ftpserver.usermanager;version=${project.version}
 						</Export-Package>
-						<Private-Package> org.apache.ftpserver.command.impl,
-						    org.apache.ftpserver.command.impl.listing,
-							org.apache.ftpserver.filesystem.nativefs.impl,
-							org.apache.ftpserver.ftpletcontainer.impl,
-							org.apache.ftpserver.impl, org.apache.ftpserver.listener.nio,
-							org.apache.ftpserver.message.impl, org.apache.ftpserver.ssl.impl,
-							org.apache.ftpserver.usermanager.impl,
-							org.apache.ftpserver.util</Private-Package>
- 						<Import-Package>
+						<Import-Package>
 							org.springframework.beans.factory.config;resolution:=optional;version="2.5",
 							org.springframework.beans.factory.support;resolution:=optional;version="2.5",
 							org.springframework.beans.factory.xml;resolution:=optional;version="2.5",
@@ -108,7 +101,7 @@
 	</build>
 	<dependencies>
 		<dependency>
-			<groupId>${groupId}</groupId>
+			<groupId>${project.groupId}</groupId>
 			<artifactId>ftplet-api</artifactId>
 		</dependency>
 		<dependency>
@@ -159,11 +152,6 @@
 			<artifactId>commons-codec</artifactId>
 			<scope>test</scope>
 		</dependency>
-		<dependency>
-			<groupId>oro</groupId>
-			<artifactId>oro</artifactId>
-			<scope>test</scope>
-		</dependency>
 		<dependency>
 			<groupId>hsqldb</groupId>
 			<artifactId>hsqldb</artifactId>

core/src/examples/java/org/apache/ftpserver/examples/EmbeddingFtpServer.java

@@ -1,5 +1,3 @@
-package org.apache.ftpserver.examples;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -19,6 +17,8 @@
  * under the License.
  */
 
+package org.apache.ftpserver.examples;
+
 import java.io.File;
 
 import org.apache.ftpserver.FtpServer;
@@ -27,6 +27,9 @@
 import org.apache.ftpserver.ssl.SslConfigurationFactory;
 import org.apache.ftpserver.usermanager.PropertiesUserManagerFactory;
 
+/**
+* @author <a href="http://mina.apache.org">Apache MINA Project</a>*
+*/
 public class EmbeddingFtpServer {
 
     public static void main(String[] args) throws Exception {

core/src/examples/java/org/apache/ftpserver/examples/ManagingUsers.java

@@ -25,8 +25,12 @@
 import org.apache.ftpserver.ftplet.UserManager;
 import org.apache.ftpserver.usermanager.PropertiesUserManagerFactory;
 import org.apache.ftpserver.usermanager.SaltedPasswordEncryptor;
+import org.apache.ftpserver.usermanager.UserFactory;
 import org.apache.ftpserver.usermanager.impl.BaseUser;
 
+/**
+* @author <a href="http://mina.apache.org">Apache MINA Project</a>*
+*/
 public class ManagingUsers {
 
     public static void main(String[] args) throws Exception {
@@ -35,11 +39,11 @@ public static void main(String[] args) throws Exception {
         userManagerFactory.setPasswordEncryptor(new SaltedPasswordEncryptor());
         UserManager um = userManagerFactory.createUserManager();
 
-        BaseUser user = new BaseUser();
-        user.setName("myNewUser");
-        user.setPassword("secret");
-        user.setHomeDirectory("ftproot");
-
+        UserFactory userFact = new UserFactory();
+        userFact.setName("myNewUser");
+        userFact.setPassword("secret");
+        userFact.setHomeDirectory("ftproot");
+        User user = userFact.createUser();
         um.save(user);
     }
 }

core/src/main/java/org/apache/ftpserver/ConnectionConfig.java

@@ -23,9 +23,7 @@
  * Interface for providing the configuration for the control socket connections.
  * 
  *
- * @author The Apache MINA Project (dev@mina.apache.org)
- * @version $Rev$, $Date$
- *
+ * @author <a href="http://mina.apache.org">Apache MINA Project</a>
  */
 public interface ConnectionConfig {
 
@@ -60,4 +58,13 @@ public interface ConnectionConfig {
      * @return true if anonymous logins are enabled
      */
     boolean isAnonymousLoginEnabled();
+
+    /**
+     * Returns the maximum number of threads the server is allowed to create for
+     * processing client requests.
+     * 
+     * @return the maximum number of threads the server is allowed to create for
+     *         processing client requests.
+     */
+    int getMaxThreads();
 }

core/src/main/java/org/apache/ftpserver/ConnectionConfigFactory.java

@@ -24,9 +24,7 @@
 /**
  * Factory for creating connection configurations
  *
- * @author The Apache MINA Project (dev@mina.apache.org)
- * @version $Rev$, $Date$
- *
+ * @author <a href="http://mina.apache.org">Apache MINA Project</a>
  */
 public class ConnectionConfigFactory {
 
@@ -40,16 +38,18 @@ public class ConnectionConfigFactory {
 
     private int loginFailureDelay = 500;
 
+    private int maxThreads = 0;
+
     /**
      * Create a connection configuration instances based on the configuration on this factory
      * @return The {@link ConnectionConfig} instance
      */
     public ConnectionConfig createConnectionConfig() {
         return new DefaultConnectionConfig(anonymousLoginEnabled,
                 loginFailureDelay, maxLogins, maxAnonymousLogins,
-                maxLoginFailures);
+                maxLoginFailures, maxThreads);
     }
-    
+
     /**
      * The delay in number of milliseconds between login failures. Important to 
      * make brute force attacks harder.
@@ -61,8 +61,8 @@ public int getLoginFailureDelay() {
     }
 
     /**
-     * The maximum number of time an anonymous user can fail to login before getting disconnected
-     * @return The maximum number of failer login attempts
+     * The maximum number of anonymous logins the server would allow at any given time
+     * @return The maximum number of anonymous logins
      */
     public int getMaxAnonymousLogins() {
         return maxAnonymousLogins;
@@ -101,6 +101,29 @@ public void setMaxLogins(final int maxLogins) {
         this.maxLogins = maxLogins;
     }
 
+    /**
+     * Returns the maximum number of threads the server is allowed to create for
+     * processing client requests.
+     * 
+     * @return the maximum number of threads the server is allowed to create for
+     *         processing client requests.
+     */
+    public int getMaxThreads() {
+        return maxThreads;
+    }
+
+    /**
+     * Sets the maximum number of threads the server is allowed to create for
+     * processing client requests.
+     * 
+     * @param maxThreads
+     *            the maximum number of threads the server is allowed to create
+     *            for processing client requests.
+     */
+    public void setMaxThreads(int maxThreads) {
+        this.maxThreads = maxThreads;
+    }
+
     /**
      * Set if anonymous logins are allowed at the server
      * @param anonymousLoginEnabled true if anonymous logins should be enabled
@@ -110,8 +133,8 @@ public void setAnonymousLoginEnabled(final boolean anonymousLoginEnabled) {
     }
 
     /**
-     * Sets the maximum number of time an anonymous user can fail to login before getting disconnected
-     * @param maxAnonymousLogins The maximum number of failer login attempts
+     * Sets the maximum number of anonymous logins the server would allow at any given time
+     * @param maxAnonymousLogins The maximum number of anonymous logins
      */
     public void setMaxAnonymousLogins(final int maxAnonymousLogins) {
         this.maxAnonymousLogins = maxAnonymousLogins;

core/src/main/java/org/apache/ftpserver/DataConnectionConfiguration.java

@@ -26,8 +26,7 @@
 /**
  * Data connection configuration interface.
  *
- * @author The Apache MINA Project (dev@mina.apache.org)
- * @version $Rev$, $Date$
+ * @author <a href="http://mina.apache.org">Apache MINA Project</a> 
  */
 public interface DataConnectionConfiguration {
 

core/src/main/java/org/apache/ftpserver/DataConnectionConfigurationFactory.java

@@ -21,19 +21,23 @@
 
 import java.net.InetAddress;
 import java.net.UnknownHostException;
+import java.util.Collections;
 
 import org.apache.ftpserver.impl.DefaultDataConnectionConfiguration;
 import org.apache.ftpserver.impl.PassivePorts;
 import org.apache.ftpserver.ssl.SslConfiguration;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Data connection factory
  *
- * @author The Apache MINA Project (dev@mina.apache.org)
- * @version $Rev: 701863 $, $Date: 2008-10-05 21:25:50 +0200 (Sun, 05 Oct 2008) $
+ * @author <a href="http://mina.apache.org">Apache MINA Project</a> 
  */
 public class DataConnectionConfigurationFactory {
 
+    private Logger log = LoggerFactory.getLogger(DataConnectionConfigurationFactory.class);
+
     // maximum idle time in seconds
     private int idleTime = 300;
     private SslConfiguration ssl;
@@ -45,7 +49,7 @@ public class DataConnectionConfigurationFactory {
 
     private String passiveAddress;
     private String passiveExternalAddress;
-    private PassivePorts passivePorts = new PassivePorts(new int[] { 0 });
+    private PassivePorts passivePorts = new PassivePorts(Collections.<Integer>emptySet(), true);
     private boolean implicitSsl;
 
     /**
@@ -212,6 +216,7 @@ public synchronized int requestPassivePort() {
             // no available free port - wait for the release notification
             if (dataPort == -1) {
                 try {
+                    log.info("Out of passive ports, waiting for one to be released. Might be stuck");
                     wait();
                 } catch (InterruptedException ex) {
                 }
@@ -245,7 +250,7 @@ public String getPassivePorts() {
      * @param passivePorts The passive ports string
      */
     public void setPassivePorts(String passivePorts) {
-        this.passivePorts = new PassivePorts(passivePorts);
+        this.passivePorts = new PassivePorts(passivePorts, true);
     }
 
 

core/src/main/java/org/apache/ftpserver/DataConnectionException.java

@@ -24,8 +24,7 @@
 /**
  * Thrown if a data connection can not be established
  *
- * @author The Apache MINA Project (dev@mina.apache.org)
- * @version $Rev$, $Date$
+ * @author <a href="http://mina.apache.org">Apache MINA Project</a> 
  */
 public class DataConnectionException extends FtpException {
     private static final long serialVersionUID = -1328383839917648987L;
@@ -67,6 +66,6 @@ public DataConnectionException(final Throwable th) {
      *            the original cause
      */
     public DataConnectionException(final String msg, final Throwable th) {
-        super(msg);
+        super(msg, th);
     }
 }

core/src/main/java/org/apache/ftpserver/FtpServer.java

@@ -27,8 +27,7 @@
  * thread. <code>Server</code> implementation is used to create the server
  * socket and handle client connection.
  *
- * @author The Apache MINA Project (dev@mina.apache.org)
- * @version $Rev: 701885 $, $Date: 2008-10-05 22:51:37 +0200 (Sun, 05 Oct 2008) $
+ * @author <a href="http://mina.apache.org">Apache MINA Project</a> 
  */
 public interface FtpServer {
 

core/src/main/java/org/apache/ftpserver/FtpServerConfigurationException.java

@@ -23,8 +23,7 @@
  * Exception used during startup to indicate that the configuration is not
  * correct.
  *
- * @author The Apache MINA Project (dev@mina.apache.org)
- * @version $Rev$, $Date$
+ * @author <a href="http://mina.apache.org">Apache MINA Project</a> 
  */
 public class FtpServerConfigurationException extends RuntimeException {
 

core/src/main/java/org/apache/ftpserver/FtpServerFactory.java

@@ -27,17 +27,16 @@
 import org.apache.ftpserver.ftplet.Ftplet;
 import org.apache.ftpserver.ftplet.UserManager;
 import org.apache.ftpserver.ftpletcontainer.impl.DefaultFtpletContainer;
-import org.apache.ftpserver.impl.DefaultFtpServerContext;
 import org.apache.ftpserver.impl.DefaultFtpServer;
+import org.apache.ftpserver.impl.DefaultFtpServerContext;
 import org.apache.ftpserver.listener.Listener;
 import org.apache.ftpserver.message.MessageResource;
 
 /**
  * This is the starting point of all the servers. Creates server instances based on 
  * the provided configuration. 
  *
- * @author The Apache MINA Project (dev@mina.apache.org)
- * @version $Rev: 701885 $, $Date: 2008-10-05 22:51:37 +0200 (Sun, 05 Oct 2008) $
+ * @author <a href="http://mina.apache.org">Apache MINA Project</a> 
  */
 public class FtpServerFactory {
 

core/src/main/java/org/apache/ftpserver/command/AbstractCommand.java

@@ -23,8 +23,7 @@
 /**
  * Common base class recommended for {@link Command} implementations
  *
- * @author The Apache MINA Project (dev@mina.apache.org)
- * @version $Rev$, $Date$
+ * @author <a href="http://mina.apache.org">Apache MINA Project</a> 
  */
 public abstract class AbstractCommand implements Command {
 

core/src/main/java/org/apache/ftpserver/command/Command.java

@@ -29,8 +29,7 @@
 /**
  * This interface encapsulates all the FTP commands.
  *
- * @author The Apache MINA Project (dev@mina.apache.org)
- * @version $Rev$, $Date$
+ * @author <a href="http://mina.apache.org">Apache MINA Project</a> 
  */
 public interface Command {
 

core/src/main/java/org/apache/ftpserver/command/CommandFactory.java

@@ -22,8 +22,7 @@
 /**
  * Command factory interface.
  *
- * @author The Apache MINA Project (dev@mina.apache.org)
- * @version $Rev$, $Date$
+ * @author <a href="http://mina.apache.org">Apache MINA Project</a> 
  */
 public interface CommandFactory {