Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/impl/IODataConnectionFactory.java URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/impl/IODataConnectionFactory.java?rev=711534&r1=711533&r2=711534&view=diff ============================================================================== --- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/impl/IODataConnectionFactory.java (original) +++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/impl/IODataConnectionFactory.java Wed Nov 5 00:48:47 2008 @@ -42,6 +42,8 @@ import org.slf4j.LoggerFactory; /** + * <strong>Internal class, do not use directly.</strong> + * * We can get the FTP data connection using this class. It uses either PORT or * PASV command. *
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/impl/LocalizedFtpReply.java URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/impl/LocalizedFtpReply.java?rev=711534&r1=711533&r2=711534&view=diff ============================================================================== --- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/impl/LocalizedFtpReply.java (original) +++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/impl/LocalizedFtpReply.java Wed Nov 5 00:48:47 2008 @@ -31,6 +31,8 @@ import org.apache.ftpserver.util.DateUtils; /** + * <strong>Internal class, do not use directly.</strong> + * * FTP reply translator. * * @author The Apache MINA Project ([EMAIL PROTECTED]) Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/impl/PassivePorts.java URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/impl/PassivePorts.java?rev=711534&r1=711533&r2=711534&view=diff ============================================================================== --- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/impl/PassivePorts.java (original) +++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/impl/PassivePorts.java Wed Nov 5 00:48:47 2008 @@ -25,6 +25,8 @@ import java.util.StringTokenizer; /** + * <strong>Internal class, do not use directly.</strong> + * * Provides support for parsing a passive ports string as well as keeping track * of reserved passive ports. * Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/impl/ServerDataConnectionFactory.java URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/impl/ServerDataConnectionFactory.java?rev=711534&r1=711533&r2=711534&view=diff ============================================================================== --- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/impl/ServerDataConnectionFactory.java (original) +++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/impl/ServerDataConnectionFactory.java Wed Nov 5 00:48:47 2008 @@ -26,7 +26,7 @@ import org.apache.ftpserver.ftplet.DataConnectionFactory; /** - * + * <strong>Internal class, do not use directly.</strong> * * @author The Apache MINA Project ([EMAIL PROTECTED]) * @version $Rev$, $Date$ Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/impl/ServerFtpStatistics.java URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/impl/ServerFtpStatistics.java?rev=711534&r1=711533&r2=711534&view=diff ============================================================================== --- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/impl/ServerFtpStatistics.java (original) +++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/impl/ServerFtpStatistics.java Wed Nov 5 00:48:47 2008 @@ -23,6 +23,8 @@ import org.apache.ftpserver.ftplet.FtpStatistics; /** + * <strong>Internal class, do not use directly.</strong> + * * This is same as <code>org.apache.ftpserver.ftplet.FtpStatistics</code> with * added observer and setting values functionalities. * Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/impl/StatisticsObserver.java URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/impl/StatisticsObserver.java?rev=711534&r1=711533&r2=711534&view=diff ============================================================================== --- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/impl/StatisticsObserver.java (original) +++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/impl/StatisticsObserver.java Wed Nov 5 00:48:47 2008 @@ -22,7 +22,9 @@ import java.net.InetAddress; /** - * Ftp statistics observer interface. + * <strong>Internal class, do not use directly.</strong> + * + * FTP statistics observer interface. * * @author The Apache MINA Project ([EMAIL PROTECTED]) * @version $Rev$, $Date$ Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listener/Listener.java URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listener/Listener.java?rev=711534&r1=711533&r2=711534&view=diff ============================================================================== --- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listener/Listener.java (original) +++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listener/Listener.java Wed Nov 5 00:48:47 2008 @@ -42,6 +42,7 @@ * Start the listener, will initiate the listener waiting on the socket. The * method should not return until the listener has started accepting socket * requests. + * @param serverContext The current [EMAIL PROTECTED] FtpServerContext} * * @throws Exception * On error during start up Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listener/ListenerFactory.java URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listener/ListenerFactory.java?rev=711534&r1=711533&r2=711534&view=diff ============================================================================== --- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listener/ListenerFactory.java (original) +++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listener/ListenerFactory.java Wed Nov 5 00:48:47 2008 @@ -239,12 +239,12 @@ /** * Sets the [EMAIL PROTECTED] Subnet}s that listeners created by this factory will block from connecting - * + * @param blockedSubnets + * The list of [EMAIL PROTECTED] Subnet}s * @param blockedAddresses - * The list of [EMAIL PROTECTED] Subnet}s */ public void setBlockedSubnets(List<Subnet> blockedSubnets) { this.blockedSubnets = blockedSubnets; } -} +} \ No newline at end of file Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listener/nio/AbstractListener.java URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listener/nio/AbstractListener.java?rev=711534&r1=711533&r2=711534&view=diff ============================================================================== --- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listener/nio/AbstractListener.java (original) +++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listener/nio/AbstractListener.java Wed Nov 5 00:48:47 2008 @@ -31,6 +31,8 @@ import org.apache.mina.filter.firewall.Subnet; /** + * <strong>Internal class, do not use directly.</strong> + * * Common base class for listener implementations * * @author The Apache MINA Project ([EMAIL PROTECTED]) Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listener/nio/FtpHandlerAdapter.java URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listener/nio/FtpHandlerAdapter.java?rev=711534&r1=711533&r2=711534&view=diff ============================================================================== --- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listener/nio/FtpHandlerAdapter.java (original) +++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listener/nio/FtpHandlerAdapter.java Wed Nov 5 00:48:47 2008 @@ -30,6 +30,8 @@ import org.apache.mina.core.session.IoSession; /** + * <strong>Internal class, do not use directly.</strong> + * * Adapter between MINA handler and the [EMAIL PROTECTED] FtpHandler} interface * * @author The Apache MINA Project ([EMAIL PROTECTED]) Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listener/nio/FtpLoggingFilter.java URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listener/nio/FtpLoggingFilter.java?rev=711534&r1=711533&r2=711534&view=diff ============================================================================== --- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listener/nio/FtpLoggingFilter.java (original) +++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listener/nio/FtpLoggingFilter.java Wed Nov 5 00:48:47 2008 @@ -24,6 +24,8 @@ import org.apache.mina.filter.logging.LoggingFilter; /** + * <strong>Internal class, do not use directly.</strong> + * * Specialized @see [EMAIL PROTECTED] LoggingFilter} that optionally masks FTP passwords. * * @author The Apache MINA Project ([EMAIL PROTECTED]) Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listener/nio/FtpResponseEncoder.java URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listener/nio/FtpResponseEncoder.java?rev=711534&r1=711533&r2=711534&view=diff ============================================================================== --- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listener/nio/FtpResponseEncoder.java (original) +++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listener/nio/FtpResponseEncoder.java Wed Nov 5 00:48:47 2008 @@ -30,6 +30,8 @@ import org.apache.mina.filter.codec.demux.MessageEncoder; /** + * <strong>Internal class, do not use directly.</strong> + * * A [EMAIL PROTECTED] MessageEncoder} that encodes [EMAIL PROTECTED] FtpReply}. * * @author The Apache MINA Project ([EMAIL PROTECTED]) Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listener/nio/FtpServerProtocolCodecFactory.java URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listener/nio/FtpServerProtocolCodecFactory.java?rev=711534&r1=711533&r2=711534&view=diff ============================================================================== --- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listener/nio/FtpServerProtocolCodecFactory.java (original) +++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listener/nio/FtpServerProtocolCodecFactory.java Wed Nov 5 00:48:47 2008 @@ -28,6 +28,8 @@ import org.apache.mina.filter.codec.textline.TextLineDecoder; /** + * <strong>Internal class, do not use directly.</strong> + * * Factory for creating decoders and encoders * * @author The Apache MINA Project ([EMAIL PROTECTED]) Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listener/nio/NioListener.java URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listener/nio/NioListener.java?rev=711534&r1=711533&r2=711534&view=diff ============================================================================== --- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listener/nio/NioListener.java (original) +++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listener/nio/NioListener.java Wed Nov 5 00:48:47 2008 @@ -57,6 +57,8 @@ import org.slf4j.LoggerFactory; /** + * <strong>Internal class, do not use directly.</strong> + * * The default [EMAIL PROTECTED] Listener} implementation. * * @author The Apache MINA Project ([EMAIL PROTECTED]) Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/main/Daemon.java URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/main/Daemon.java?rev=711534&r1=711533&r2=711534&view=diff ============================================================================== --- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/main/Daemon.java (original) +++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/main/Daemon.java Wed Nov 5 00:48:47 2008 @@ -42,6 +42,11 @@ private static Object lock = new Object(); + /** + * Main entry point for the daemon + * @param args The arguments + * @throws Exception + */ public static void main(String[] args) throws Exception { try { if (server == null) { Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/message/MessageResource.java URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/message/MessageResource.java?rev=711534&r1=711533&r2=711534&view=diff ============================================================================== --- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/message/MessageResource.java (original) +++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/message/MessageResource.java Wed Nov 5 00:48:47 2008 @@ -19,6 +19,8 @@ package org.apache.ftpserver.message; +import java.util.List; +import java.util.Map; import java.util.Properties; /** @@ -31,17 +33,24 @@ /** * Get all the available languages. + * @return A list of available languages */ - String[] getAvailableLanguages(); + List<String> getAvailableLanguages(); /** * Get the message for the corresponding code and sub id. If not found it * will return null. + * @param code The reply code + * @param subId The sub ID + * @param language The language + * @return The message matching the provided inputs, or null if not found */ String getMessage(int code, String subId, String language); /** * Get all the messages. + * @param language The language + * @return All messages for the provided language */ - Properties getMessages(String language); + Map<String, String> getMessages(String language); } Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/message/MessageResourceFactory.java URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/message/MessageResourceFactory.java?rev=711534&r1=711533&r2=711534&view=diff ============================================================================== --- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/message/MessageResourceFactory.java (original) +++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/message/MessageResourceFactory.java Wed Nov 5 00:48:47 2008 @@ -20,6 +20,7 @@ package org.apache.ftpserver.message; import java.io.File; +import java.util.List; import org.apache.ftpserver.message.impl.DefaultMessageResource; @@ -31,7 +32,7 @@ */ public class MessageResourceFactory { - private String[] languages; + private List<String> languages; private File customMessageDirectory; @@ -39,11 +40,11 @@ return new DefaultMessageResource(languages, customMessageDirectory); } - public String[] getLanguages() { + public List<String> getLanguages() { return languages; } - public void setLanguages(String[] languages) { + public void setLanguages(List<String> languages) { this.languages = languages; } Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/message/impl/DefaultMessageResource.java URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/message/impl/DefaultMessageResource.java?rev=711534&r1=711533&r2=711534&view=diff ============================================================================== --- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/message/impl/DefaultMessageResource.java (original) +++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/message/impl/DefaultMessageResource.java Wed Nov 5 00:48:47 2008 @@ -24,9 +24,11 @@ import java.io.IOException; import java.io.InputStream; import java.net.URL; +import java.util.Collections; import java.util.Enumeration; import java.util.HashMap; import java.util.Iterator; +import java.util.List; import java.util.Map; import java.util.Properties; @@ -38,10 +40,12 @@ import org.slf4j.LoggerFactory; /** + * <strong>Internal class, do not use directly.</strong> + * * Class to get FtpServer reply messages. This supports i18n. Basic message * search path is: * - * <strong>Internal class, do not use directly</strong> + * <strong><strong>Internal class, do not use directly.</strong></strong> * * Custom Language Specific Messages -> Default Language Specific Messages -> * Custom Common Messages -> Default Common Messages -> null (not found) @@ -56,17 +60,17 @@ private final static String RESOURCE_PATH = "org/apache/ftpserver/message/"; - private String[] languages; + private List<String> languages; private Map<String, PropertiesPair> messages; /** * Internal constructor, do not use directly. Use [EMAIL PROTECTED] MessageResourceFactory} instead. */ - public DefaultMessageResource(String[] languages, + public DefaultMessageResource(List<String> languages, File customMessageDirectory) { if(languages != null) { - this.languages = languages.clone(); + this.languages = Collections.unmodifiableList(languages); } // populate different properties @@ -150,11 +154,11 @@ /** * Get all the available languages. */ - public String[] getAvailableLanguages() { + public List<String> getAvailableLanguages() { if (languages == null) { return null; } else { - return (String[]) languages.clone(); + return Collections.unmodifiableList(languages); } } @@ -199,7 +203,7 @@ /** * Get all messages. */ - public Properties getMessages(String language) { + public Map<String, String> getMessages(String language) { Properties messages = new Properties(); // load properties sequentially @@ -217,7 +221,13 @@ messages.putAll(pair.customProperties); } } - return messages; + + Map<String, String> result = new HashMap<String, String>(); + for(Object key : messages.keySet()) { + result.put(key.toString(), messages.getProperty(key.toString())); + } + + return Collections.unmodifiableMap(result); } /** Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/ssl/impl/AliasKeyManager.java URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/ssl/impl/AliasKeyManager.java?rev=711534&r1=711533&r2=711534&view=diff ============================================================================== --- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/ssl/impl/AliasKeyManager.java (original) +++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/ssl/impl/AliasKeyManager.java Wed Nov 5 00:48:47 2008 @@ -25,6 +25,8 @@ import javax.net.ssl.X509KeyManager; /** + * <strong>Internal class, do not use directly.</strong> + * * X509KeyManager which allows selection of a specific keypair and certificate * chain (identified by their keystore alias name) to be used by the server to * authenticate itself to SSL clients. Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/ssl/impl/DefaultSslConfiguration.java URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/ssl/impl/DefaultSslConfiguration.java?rev=711534&r1=711533&r2=711534&view=diff ============================================================================== --- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/ssl/impl/DefaultSslConfiguration.java (original) +++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/ssl/impl/DefaultSslConfiguration.java Wed Nov 5 00:48:47 2008 @@ -33,10 +33,12 @@ import org.apache.ftpserver.util.ClassUtils; /** + * <strong>Internal class, do not use directly.</strong> + * * Used to configure the SSL settings for the control channel or the data * channel. * - * <strong>Internal class, do not use directly</strong> + * <strong><strong>Internal class, do not use directly.</strong></strong> * * @author The Apache MINA Project ([EMAIL PROTECTED]) * @version $Rev$, $Date$ Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/ssl/impl/ExtendedAliasKeyManager.java URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/ssl/impl/ExtendedAliasKeyManager.java?rev=711534&r1=711533&r2=711534&view=diff ============================================================================== --- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/ssl/impl/ExtendedAliasKeyManager.java (original) +++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/ssl/impl/ExtendedAliasKeyManager.java Wed Nov 5 00:48:47 2008 @@ -26,6 +26,8 @@ import javax.net.ssl.X509ExtendedKeyManager; /** + * <strong>Internal class, do not use directly.</strong> + * * X509KeyManager which allows selection of a specific keypair and certificate * chain (identified by their keystore alias name) to be used by the server to * authenticate itself to SSL clients. Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/usermanager/DbUserManagerFactory.java URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/usermanager/DbUserManagerFactory.java?rev=711534&r1=711533&r2=711534&view=diff ============================================================================== --- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/usermanager/DbUserManagerFactory.java (original) +++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/usermanager/DbUserManagerFactory.java Wed Nov 5 00:48:47 2008 @@ -94,6 +94,7 @@ /** * Get the admin name. + * @return The admin user name */ public String getAdminName() { return adminName; Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/usermanager/PropertiesUserManagerFactory.java URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/usermanager/PropertiesUserManagerFactory.java?rev=711534&r1=711533&r2=711534&view=diff ============================================================================== --- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/usermanager/PropertiesUserManagerFactory.java (original) +++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/usermanager/PropertiesUserManagerFactory.java Wed Nov 5 00:48:47 2008 @@ -49,6 +49,7 @@ /** * Get the admin name. + * @return The admin user name */ public String getAdminName() { return adminName; Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/usermanager/impl/AbstractUserManager.java URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/usermanager/impl/AbstractUserManager.java?rev=711534&r1=711533&r2=711534&view=diff ============================================================================== --- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/usermanager/impl/AbstractUserManager.java (original) +++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/usermanager/impl/AbstractUserManager.java Wed Nov 5 00:48:47 2008 @@ -25,6 +25,8 @@ import org.apache.ftpserver.usermanager.PasswordEncryptor; /** + * <strong>Internal class, do not use directly.</strong> + * * Abstract common base type for [EMAIL PROTECTED] UserManager} implementations * * @author The Apache MINA Project ([EMAIL PROTECTED]) Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/usermanager/impl/BaseUser.java URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/usermanager/impl/BaseUser.java?rev=711534&r1=711533&r2=711534&view=diff ============================================================================== --- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/usermanager/impl/BaseUser.java (original) +++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/usermanager/impl/BaseUser.java Wed Nov 5 00:48:47 2008 @@ -28,6 +28,8 @@ import org.apache.ftpserver.ftplet.User; /** + * <strong>Internal class, do not use directly.</strong> + * * Generic user class. The user attributes are: * <ul> * <li>userid</li> Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/usermanager/impl/ConcurrentLoginPermission.java URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/usermanager/impl/ConcurrentLoginPermission.java?rev=711534&r1=711533&r2=711534&view=diff ============================================================================== --- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/usermanager/impl/ConcurrentLoginPermission.java (original) +++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/usermanager/impl/ConcurrentLoginPermission.java Wed Nov 5 00:48:47 2008 @@ -23,6 +23,8 @@ import org.apache.ftpserver.ftplet.AuthorizationRequest; /** + * <strong>Internal class, do not use directly.</strong> + * * The max upload rate permission * * @author The Apache MINA Project ([EMAIL PROTECTED]) Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/usermanager/impl/ConcurrentLoginRequest.java URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/usermanager/impl/ConcurrentLoginRequest.java?rev=711534&r1=711533&r2=711534&view=diff ============================================================================== --- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/usermanager/impl/ConcurrentLoginRequest.java (original) +++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/usermanager/impl/ConcurrentLoginRequest.java Wed Nov 5 00:48:47 2008 @@ -22,6 +22,8 @@ import org.apache.ftpserver.ftplet.AuthorizationRequest; /** + * <strong>Internal class, do not use directly.</strong> + * * Class representing a request to log in a number of concurrent times * * @author The Apache MINA Project ([EMAIL PROTECTED]) Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/usermanager/impl/DbUserManager.java URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/usermanager/impl/DbUserManager.java?rev=711534&r1=711533&r2=711534&view=diff ============================================================================== --- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/usermanager/impl/DbUserManager.java (original) +++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/usermanager/impl/DbUserManager.java Wed Nov 5 00:48:47 2008 @@ -44,6 +44,8 @@ import org.slf4j.LoggerFactory; /** + * <strong>Internal class, do not use directly.</strong> + * * This is another database based user manager class. It has been tested in * MySQL and Oracle 8i database. The schema file is </code>res/ftp-db.sql</code> * Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/usermanager/impl/PropertiesUserManager.java URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/usermanager/impl/PropertiesUserManager.java?rev=711534&r1=711533&r2=711534&view=diff ============================================================================== --- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/usermanager/impl/PropertiesUserManager.java (original) +++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/usermanager/impl/PropertiesUserManager.java Wed Nov 5 00:48:47 2008 @@ -46,6 +46,8 @@ import org.slf4j.LoggerFactory; /** + * <strong>Internal class, do not use directly.</strong> + * * <p>Properties file based <code>UserManager</code> implementation. We use * <code>user.properties</code> file to store user data.</p> * Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/usermanager/impl/TransferRatePermission.java URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/usermanager/impl/TransferRatePermission.java?rev=711534&r1=711533&r2=711534&view=diff ============================================================================== --- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/usermanager/impl/TransferRatePermission.java (original) +++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/usermanager/impl/TransferRatePermission.java Wed Nov 5 00:48:47 2008 @@ -23,6 +23,8 @@ import org.apache.ftpserver.ftplet.AuthorizationRequest; /** + * <strong>Internal class, do not use directly.</strong> + * * The max upload rate permission * * @author The Apache MINA Project ([EMAIL PROTECTED]) Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/usermanager/impl/TransferRateRequest.java URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/usermanager/impl/TransferRateRequest.java?rev=711534&r1=711533&r2=711534&view=diff ============================================================================== --- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/usermanager/impl/TransferRateRequest.java (original) +++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/usermanager/impl/TransferRateRequest.java Wed Nov 5 00:48:47 2008 @@ -22,6 +22,8 @@ import org.apache.ftpserver.ftplet.AuthorizationRequest; /** + * <strong>Internal class, do not use directly.</strong> + * * Request for getting the maximum allowed transfer rates for a user * * @author The Apache MINA Project ([EMAIL PROTECTED]) Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/usermanager/impl/UserMetadata.java URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/usermanager/impl/UserMetadata.java?rev=711534&r1=711533&r2=711534&view=diff ============================================================================== --- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/usermanager/impl/UserMetadata.java (original) +++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/usermanager/impl/UserMetadata.java Wed Nov 5 00:48:47 2008 @@ -23,6 +23,8 @@ import java.security.cert.Certificate; /** + * <strong>Internal class, do not use directly.</strong> + * * User metadata used during authentication * * @author The Apache MINA Project ([EMAIL PROTECTED]) Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/usermanager/impl/WritePermission.java URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/usermanager/impl/WritePermission.java?rev=711534&r1=711533&r2=711534&view=diff ============================================================================== --- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/usermanager/impl/WritePermission.java (original) +++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/usermanager/impl/WritePermission.java Wed Nov 5 00:48:47 2008 @@ -23,6 +23,8 @@ import org.apache.ftpserver.ftplet.AuthorizationRequest; /** + * <strong>Internal class, do not use directly.</strong> + * * Class representing a write permission * * @author The Apache MINA Project ([EMAIL PROTECTED]) Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/usermanager/impl/WriteRequest.java URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/usermanager/impl/WriteRequest.java?rev=711534&r1=711533&r2=711534&view=diff ============================================================================== --- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/usermanager/impl/WriteRequest.java (original) +++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/usermanager/impl/WriteRequest.java Wed Nov 5 00:48:47 2008 @@ -22,6 +22,8 @@ import org.apache.ftpserver.ftplet.AuthorizationRequest; /** + * <strong>Internal class, do not use directly.</strong> + * * Class representing a write request * * @author The Apache MINA Project ([EMAIL PROTECTED]) Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/util/BaseProperties.java URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/util/BaseProperties.java?rev=711534&r1=711533&r2=711534&view=diff ============================================================================== --- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/util/BaseProperties.java (original) +++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/util/BaseProperties.java Wed Nov 5 00:48:47 2008 @@ -32,6 +32,8 @@ import org.apache.ftpserver.ftplet.FtpException; /** + * <strong>Internal class, do not use directly.</strong> + * * This class encapsulates <code>java.util.Properties</code> to add java * primitives and some other java classes. * Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/util/ClassUtils.java URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/util/ClassUtils.java?rev=711534&r1=711533&r2=711534&view=diff ============================================================================== --- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/util/ClassUtils.java (original) +++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/util/ClassUtils.java Wed Nov 5 00:48:47 2008 @@ -20,7 +20,7 @@ package org.apache.ftpserver.util; /** - * + * <strong>Internal class, do not use directly.</strong> * * @author The Apache MINA Project ([EMAIL PROTECTED]) * @version $Rev$, $Date$ Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/util/DateUtils.java URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/util/DateUtils.java?rev=711534&r1=711533&r2=711534&view=diff ============================================================================== --- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/util/DateUtils.java (original) +++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/util/DateUtils.java Wed Nov 5 00:48:47 2008 @@ -23,6 +23,8 @@ import java.util.GregorianCalendar; /** + * <strong>Internal class, do not use directly.</strong> + * * Standard date related utility methods. * * @author The Apache MINA Project ([EMAIL PROTECTED]) Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/util/EncryptUtils.java URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/util/EncryptUtils.java?rev=711534&r1=711533&r2=711534&view=diff ============================================================================== --- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/util/EncryptUtils.java (original) +++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/util/EncryptUtils.java Wed Nov 5 00:48:47 2008 @@ -23,6 +23,8 @@ import java.security.NoSuchAlgorithmException; /** + * <strong>Internal class, do not use directly.</strong> + * * String encryption utility methods. * * @author The Apache MINA Project ([EMAIL PROTECTED]) Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/util/FileRegularFilter.java URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/util/FileRegularFilter.java?rev=711534&r1=711533&r2=711534&view=diff ============================================================================== --- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/util/FileRegularFilter.java (original) +++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/util/FileRegularFilter.java Wed Nov 5 00:48:47 2008 @@ -23,6 +23,8 @@ import java.io.FilenameFilter; /** + * <strong>Internal class, do not use directly.</strong> + * * This is regular expression filename filter. * * @author The Apache MINA Project ([EMAIL PROTECTED]) Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/util/IllegalInetAddressException.java URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/util/IllegalInetAddressException.java?rev=711534&r1=711533&r2=711534&view=diff ============================================================================== --- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/util/IllegalInetAddressException.java (original) +++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/util/IllegalInetAddressException.java Wed Nov 5 00:48:47 2008 @@ -20,6 +20,8 @@ package org.apache.ftpserver.util; /** + * <strong>Internal class, do not use directly.</strong> + * * Thrown if the provided string representation does not match a valid IP * address * Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/util/IllegalPortException.java URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/util/IllegalPortException.java?rev=711534&r1=711533&r2=711534&view=diff ============================================================================== --- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/util/IllegalPortException.java (original) +++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/util/IllegalPortException.java Wed Nov 5 00:48:47 2008 @@ -20,6 +20,8 @@ package org.apache.ftpserver.util; /** + * <strong>Internal class, do not use directly.</strong> + * * Thrown if the provided string representation does not match a valid IP port * * @author The Apache MINA Project ([EMAIL PROTECTED]) Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/util/IoUtils.java URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/util/IoUtils.java?rev=711534&r1=711533&r2=711534&view=diff ============================================================================== --- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/util/IoUtils.java (original) +++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/util/IoUtils.java Wed Nov 5 00:48:47 2008 @@ -35,6 +35,8 @@ import java.util.Random; /** + * <strong>Internal class, do not use directly.</strong> + * * IO utility methods. * * <b>Note: Why not use commons-io?</b> Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/util/OS.java URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/util/OS.java?rev=711534&r1=711533&r2=711534&view=diff ============================================================================== --- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/util/OS.java (original) +++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/util/OS.java Wed Nov 5 00:48:47 2008 @@ -20,6 +20,8 @@ import java.util.Locale; /** + * <strong>Internal class, do not use directly.</strong> + * * Condition that tests the OS type. * * @author The Apache MINA Project ([EMAIL PROTECTED]) Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/util/RegularExpr.java URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/util/RegularExpr.java?rev=711534&r1=711533&r2=711534&view=diff ============================================================================== --- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/util/RegularExpr.java (original) +++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/util/RegularExpr.java Wed Nov 5 00:48:47 2008 @@ -20,6 +20,8 @@ package org.apache.ftpserver.util; /** + * <strong>Internal class, do not use directly.</strong> + * * This is a simplified regular character mattching class. Supports *?^[]- * pattern characters. * Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/util/SocketAddressEncoder.java URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/util/SocketAddressEncoder.java?rev=711534&r1=711533&r2=711534&view=diff ============================================================================== --- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/util/SocketAddressEncoder.java (original) +++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/util/SocketAddressEncoder.java Wed Nov 5 00:48:47 2008 @@ -25,6 +25,8 @@ import java.util.StringTokenizer; /** + * <strong>Internal class, do not use directly.</strong> + * * Encodes and decodes socket addresses (IP and port) from and to the format * used with for example the PORT and PASV command * Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/util/StringUtils.java URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/util/StringUtils.java?rev=711534&r1=711533&r2=711534&view=diff ============================================================================== --- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/util/StringUtils.java (original) +++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/util/StringUtils.java Wed Nov 5 00:48:47 2008 @@ -22,6 +22,8 @@ import java.util.Map; /** + * <strong>Internal class, do not use directly.</strong> + * * String utility methods. * * @author The Apache MINA Project ([EMAIL PROTECTED]) Modified: mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/LangTest.java URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/LangTest.java?rev=711534&r1=711533&r2=711534&view=diff ============================================================================== --- mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/LangTest.java (original) +++ mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/LangTest.java Wed Nov 5 00:48:47 2008 @@ -19,6 +19,8 @@ package org.apache.ftpserver.clienttests; +import java.util.Arrays; + import org.apache.ftpserver.FtpServerFactory; import org.apache.ftpserver.message.MessageResourceFactory; @@ -39,7 +41,7 @@ FtpServerFactory server = super.createServer(); MessageResourceFactory factory = new MessageResourceFactory(); - factory.setLanguages(new String[] { "en", "zh-tw" }); + factory.setLanguages(Arrays.asList(new String[] { "en", "zh-tw" })); server.setMessageResource(factory.createMessageResource()); return server; Modified: mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/config/spring/SpringConfigTest.java URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/config/spring/SpringConfigTest.java?rev=711534&r1=711533&r2=711534&view=diff ============================================================================== --- mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/config/spring/SpringConfigTest.java (original) +++ mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/config/spring/SpringConfigTest.java Wed Nov 5 00:48:47 2008 @@ -97,12 +97,12 @@ assertTrue(cf.getCommand("FOO") instanceof HELP); assertTrue(cf.getCommand("FOO2") instanceof STAT); - String[] languages = server.getServerContext().getMessageResource() + List<String> languages = server.getServerContext().getMessageResource() .getAvailableLanguages(); - assertEquals(2, languages.length); - assertEquals("en", languages[0]); - assertEquals("zh-tw", languages[1]); + assertEquals(2, languages.size()); + assertEquals("en", languages.get(0)); + assertEquals("zh-tw", languages.get(1)); NativeFileSystemFactory fs = (NativeFileSystemFactory) server.getFileSystem(); assertTrue(fs.isCreateHome());
