You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by ng...@apache.org on 2008/08/17 21:52:49 UTC
svn commit: r686637 [1/16] - in /mina/ftpserver/trunk:
core/src/main/java/org/apache/ftpserver/
core/src/main/java/org/apache/ftpserver/command/
core/src/main/java/org/apache/ftpserver/config/spring/
core/src/main/java/org/apache/ftpserver/filesystem/ ...
Author: ngn
Date: Sun Aug 17 12:52:42 2008
New Revision: 686637
URL: http://svn.apache.org/viewvc?rev=686637&view=rev
Log:
Use MINA code conventions (FTPSERVER-157)
Modified:
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/ConnectionConfig.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/DataConnectionException.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/DefaultCommandFactory.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/DefaultConnectionConfig.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/DefaultDataConnectionConfiguration.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/DefaultFtpHandler.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/DefaultFtpServerContext.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/FtpHandler.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/FtpRequestImpl.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/FtpServer.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/FtpServerConfigurationException.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/FtpSessionImpl.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/FtpStatisticsImpl.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/IODataConnection.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/IODataConnectionFactory.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/PassivePorts.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/ServerDataConnectionFactory.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/ABOR.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/ACCT.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/APPE.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/AUTH.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/AbstractCommand.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/CDUP.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/CWD.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/DELE.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/EPRT.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/EPSV.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/FEAT.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/HELP.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/LANG.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/LIST.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/MD5.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/MDTM.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/MKD.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/MLSD.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/MLST.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/MODE.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/NLST.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/NOOP.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/NotSupportedCommand.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/OPTS.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/OPTS_MLST.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/OPTS_UTF8.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/PASS.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/PASV.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/PBSZ.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/PORT.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/PROT.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/PWD.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/QUIT.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/REIN.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/REST.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/RETR.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/RMD.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/RNFR.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/RNTO.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/SITE.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/SITE_DESCUSER.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/SITE_HELP.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/SITE_STAT.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/SITE_WHO.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/SITE_ZONE.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/SIZE.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/STAT.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/STOR.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/STOU.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/STRU.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/SYST.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/TYPE.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/USER.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/config/spring/CommandFactoryBeanDefinitionParser.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/config/spring/FileSystemBeanDefinitionParser.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/config/spring/FtpServerNamespaceHandler.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/config/spring/ListenerBeanDefinitionParser.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/config/spring/ServerBeanDefinitionParser.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/config/spring/SpringUtil.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/config/spring/UserManagerBeanDefinitionParser.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/filesystem/NameEqualsFileFilter.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/filesystem/NativeFileObject.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/filesystem/NativeFileSystemManager.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/filesystem/NativeFileSystemView.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/filter/FtpLoggingFilter.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/ftplet/DefaultFtpletContainer.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/ftplet/FtpletContainer.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/interfaces/Command.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/interfaces/CommandFactory.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/interfaces/DataConnectionConfiguration.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/interfaces/FileObserver.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/interfaces/FtpIoSession.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/interfaces/FtpServerContext.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/interfaces/MessageResource.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/interfaces/ServerFtpStatistics.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/interfaces/SocketFactory.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/interfaces/StatisticsObserver.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listener/AbstractListener.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listener/Listener.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listener/nio/FtpHandlerAdapter.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listener/nio/FtpResponseEncoder.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listener/nio/FtpServerProtocolCodecFactory.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listener/nio/NioListener.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listing/DirectoryLister.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listing/FileFilter.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listing/FileFormater.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listing/LISTFileFormater.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listing/ListArgument.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listing/ListArgumentParser.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listing/MLSTFileFormater.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listing/NLSTFileFormater.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listing/RegexFileFilter.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listing/VisibleFileFilter.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/main/CommandLine.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/main/Daemon.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/message/MessageResourceImpl.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/ssl/AliasKeyManager.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/ssl/ClientAuth.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/ssl/DefaultSslConfiguration.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/ssl/ExtendedAliasKeyManager.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/ssl/SslConfiguration.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/usermanager/AbstractUserManager.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/usermanager/AnonymousAuthentication.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/usermanager/BaseUser.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/usermanager/ConcurrentLoginPermission.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/usermanager/ConcurrentLoginRequest.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/usermanager/DbUserManager.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/usermanager/LdapUserManager.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/usermanager/PropertiesUserManager.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/usermanager/TransferRatePermission.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/usermanager/TransferRateRequest.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/usermanager/UserMetadata.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/usermanager/UsernamePasswordAuthentication.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/usermanager/WritePermission.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/usermanager/WriteRequest.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/util/BaseProperties.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/util/ClassUtils.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/util/DateUtils.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/util/EncryptUtils.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/util/FileRegularFilter.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/util/FtpReplyUtil.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/util/IllegalInetAddressException.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/util/IllegalPortException.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/util/IoUtils.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/util/OS.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/util/RegularExpr.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/util/SocketAddressEncoder.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/util/StringUtils.java
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/DefaultCommandFactoryTest.java
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/DefaultFtpReplyTest.java
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/FtpRequestImplTest.java
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/FtpStatisticsImplTest.java
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/PassivePortsTest.java
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/ActiveModeReplyTest.java
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/CdCaseInsensitiveTest.java
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/CdTest.java
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/ClientTestTemplate.java
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/ConcatedCommandsTest.java
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/ConnectTest.java
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/CustomMaxLoginTest.java
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/DefaultMaxLoginTest.java
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/DeleteTest.java
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/DirectoryTest.java
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/FeatTest.java
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/FtpMd5Test.java
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/HelpTest.java
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/I18NTest.java
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/InetAddressBlacklistTest.java
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/LangTest.java
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/ListPassiveTest.java
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/ListTest.java
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/LoginNoAnonTest.java
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/LoginTest.java
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/MDTMTest.java
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/PasvAddressTest.java
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/PasvAddressWithHostnameTest.java
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/PasvTest.java
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/RenameTest.java
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/RetrievePassiveTest.java
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/RetrieveTest.java
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/RmDirTest.java
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/SizeTest.java
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/StorePassiveTest.java
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/StoreTest.java
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/SubnetBlacklistTest.java
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/SystTest.java
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/UnlimitedMaxLoginTest.java
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/config/spring/SpringConfigTest.java
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/config/spring/TestFtplet.java
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/config/spring/XmlDbUserManagerConfigTest.java
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/filesystem/FileObjectTestTemplate.java
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/filesystem/FileSystemViewTemplate.java
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/filesystem/NativeFileObjectTest.java
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/filesystem/NativeFileSystemViewTest.java
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ftplet/DefaultFtpLetContainerTest.java
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ftplet/FtpLetContainerTestTemplate.java
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ftplet/FtpLetReturnDefaultTest.java
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ftplet/FtpLetReturnDisconnectTest.java
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ftplet/FtpLetReturnSkipTest.java
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ftplet/FtpLetThrowFtpExceptionTest.java
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ftplet/FtpLetThrowIOExceptionTest.java
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ftplet/FtpLetThrowRuntimeExceptionTest.java
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ftplet/MockFtplet.java
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ftplet/MockFtpletCallback.java
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/interfaces/ServerFtpStatisticsTestTemplate.java
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/listing/DirectoryListerTest.java
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/listing/LISTFileFormaterTest.java
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/listing/ListArgumentParserTest.java
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/listing/ListArgumentTest.java
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/listing/MLSTFileFormaterTest.java
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/listing/NLSTFileFormaterTest.java
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ssl/AliasKeymanagerTest.java
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ssl/ExplicitSecurityTestTemplate.java
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ssl/ExtendedAliasKeymanagerTest.java
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ssl/ImplicitSecurityTestTemplate.java
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ssl/MinaCipherSuitesTest.java
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ssl/MinaClientAuthTest.java
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ssl/MinaExplicitSSLTest.java
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ssl/MinaExplicitTLSTest.java
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ssl/MinaImplicitClientAuthTest.java
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ssl/MinaImplicitSSLTest.java
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ssl/MinaImplicitTLSTest.java
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ssl/SSLTestTemplate.java
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/test/TestUtil.java
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/usermanager/BaseUserTest.java
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/usermanager/ConcurrentLoginPermissionTest.java
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/usermanager/DbUserManagerTest.java
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/usermanager/PropertiesUserManagerTest.java
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/usermanager/UserManagerTestTemplate.java
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/usermanager/UsernamePasswordAuthenticationTest.java
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/usermanager/WritePermissionTest.java
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/util/BasePropertiesTest.java
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/util/EncryptUtilsTest.java
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/util/RegularExprTest.java
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/util/SocketAddressEncoderTest.java
mina/ftpserver/trunk/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/Authentication.java
mina/ftpserver/trunk/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/AuthenticationFailedException.java
mina/ftpserver/trunk/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/Authority.java
mina/ftpserver/trunk/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/AuthorizationRequest.java
mina/ftpserver/trunk/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/DataConnection.java
mina/ftpserver/trunk/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/DataConnectionFactory.java
mina/ftpserver/trunk/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/DataType.java
mina/ftpserver/trunk/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/DefaultFtpReply.java
mina/ftpserver/trunk/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/DefaultFtplet.java
mina/ftpserver/trunk/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/FileObject.java
mina/ftpserver/trunk/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/FileSystemManager.java
mina/ftpserver/trunk/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/FileSystemView.java
mina/ftpserver/trunk/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/FtpException.java
mina/ftpserver/trunk/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/FtpReply.java
mina/ftpserver/trunk/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/FtpRequest.java
mina/ftpserver/trunk/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/FtpSession.java
mina/ftpserver/trunk/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/FtpStatistics.java
mina/ftpserver/trunk/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/Ftplet.java
mina/ftpserver/trunk/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/FtpletContext.java
mina/ftpserver/trunk/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/FtpletEnum.java
mina/ftpserver/trunk/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/Structure.java
mina/ftpserver/trunk/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/User.java
mina/ftpserver/trunk/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/UserManager.java
mina/ftpserver/trunk/ftplet-api/src/test/java/org/apache/ftpserver/ftplet/DataTypeTest.java
mina/ftpserver/trunk/ftplet-api/src/test/java/org/apache/ftpserver/ftplet/ExampleFtplet.java
mina/ftpserver/trunk/ftplet-api/src/test/java/org/apache/ftpserver/ftplet/StructureTest.java
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/ConnectionConfig.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/ConnectionConfig.java?rev=686637&r1=686636&r2=686637&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/ConnectionConfig.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/ConnectionConfig.java Sun Aug 17 12:52:42 2008
@@ -15,19 +15,25 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- */
+ */
package org.apache.ftpserver;
+/**
+ *
+ * @author The Apache MINA Project (dev@mina.apache.org)
+ * @version $Rev$, $Date$
+ *
+ */
public interface ConnectionConfig {
- int getMaxLoginFailures();
-
- int getLoginFailureDelay();
-
- int getMaxAnonymousLogins();
-
- int getMaxLogins();
-
- boolean isAnonymousLoginEnabled();
+ int getMaxLoginFailures();
+
+ int getLoginFailureDelay();
+
+ int getMaxAnonymousLogins();
+
+ int getMaxLogins();
+
+ boolean isAnonymousLoginEnabled();
}
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/DataConnectionException.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/DataConnectionException.java?rev=686637&r1=686636&r2=686637&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/DataConnectionException.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/DataConnectionException.java Sun Aug 17 12:52:42 2008
@@ -15,7 +15,7 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- */
+ */
package org.apache.ftpserver;
@@ -23,6 +23,9 @@
/**
* Thrown if a data connection can not be established
+ *
+ * @author The Apache MINA Project (dev@mina.apache.org)
+ * @version $Rev$, $Date$
*/
public class DataConnectionException extends FtpException {
private static final long serialVersionUID = -1328383839917648987L;
@@ -37,27 +40,30 @@
/**
* Constructs a <code>DataConnectionException</code> object with a message.
*
- * @param msg a description of the exception
+ * @param msg
+ * a description of the exception
*/
public DataConnectionException(final String msg) {
super(msg);
}
/**
- * Constructs a <code>DataConnectionException</code> object with a
+ * Constructs a <code>DataConnectionException</code> object with a
* <code>Throwable</code> cause.
*
- * @param th the original cause
+ * @param th
+ * the original cause
*/
public DataConnectionException(final Throwable th) {
super(th);
}
/**
- * Constructs a <code>DataConnectionException</code> object with a
+ * Constructs a <code>DataConnectionException</code> object with a
* <code>Throwable</code> cause.
*
- * @param th the original cause
+ * @param th
+ * the original cause
*/
public DataConnectionException(final String msg, final Throwable th) {
super(msg);
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/DefaultCommandFactory.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/DefaultCommandFactory.java?rev=686637&r1=686636&r2=686637&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/DefaultCommandFactory.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/DefaultCommandFactory.java Sun Aug 17 12:52:42 2008
@@ -15,7 +15,7 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- */
+ */
package org.apache.ftpserver;
@@ -70,19 +70,20 @@
import org.apache.ftpserver.interfaces.Command;
import org.apache.ftpserver.interfaces.CommandFactory;
-
/**
- * Command factory to return appropriate command implementation
- * depending on the FTP request command string.
+ * Command factory to return appropriate command implementation depending on the
+ * FTP request command string.
*
- * Used a default setup of commands which can be appended or
- * overriden using {@link #setCommandMap(HashMap)}.
+ * Used a default setup of commands which can be appended or overriden using
+ * {@link #setCommandMap(HashMap)}.
+ *
+ * @author The Apache MINA Project (dev@mina.apache.org)
+ * @version $Rev$, $Date$
*/
-public
-class DefaultCommandFactory implements CommandFactory {
+public class DefaultCommandFactory implements CommandFactory {
+
+ private static final HashMap<String, Command> DEFAULT_COMMAND_MAP = new HashMap<String, Command>();
- private static final HashMap<String, Command> DEFAULT_COMMAND_MAP = new HashMap<String, Command>();
-
static {
// first populate the default command list
DEFAULT_COMMAND_MAP.put("ABOR", new ABOR());
@@ -90,7 +91,7 @@
DEFAULT_COMMAND_MAP.put("APPE", new APPE());
DEFAULT_COMMAND_MAP.put("AUTH", new AUTH());
DEFAULT_COMMAND_MAP.put("CDUP", new CDUP());
- DEFAULT_COMMAND_MAP.put("CWD", new CWD());
+ DEFAULT_COMMAND_MAP.put("CWD", new CWD());
DEFAULT_COMMAND_MAP.put("DELE", new DELE());
DEFAULT_COMMAND_MAP.put("EPRT", new EPRT());
DEFAULT_COMMAND_MAP.put("EPSV", new EPSV());
@@ -102,7 +103,7 @@
DEFAULT_COMMAND_MAP.put("MMD5", new MD5());
DEFAULT_COMMAND_MAP.put("MDTM", new MDTM());
DEFAULT_COMMAND_MAP.put("MLST", new MLST());
- DEFAULT_COMMAND_MAP.put("MKD", new MKD());
+ DEFAULT_COMMAND_MAP.put("MKD", new MKD());
DEFAULT_COMMAND_MAP.put("MLSD", new MLSD());
DEFAULT_COMMAND_MAP.put("MODE", new MODE());
DEFAULT_COMMAND_MAP.put("NLST", new NLST());
@@ -113,12 +114,12 @@
DEFAULT_COMMAND_MAP.put("PBSZ", new PBSZ());
DEFAULT_COMMAND_MAP.put("PORT", new PORT());
DEFAULT_COMMAND_MAP.put("PROT", new PROT());
- DEFAULT_COMMAND_MAP.put("PWD", new PWD());
+ DEFAULT_COMMAND_MAP.put("PWD", new PWD());
DEFAULT_COMMAND_MAP.put("QUIT", new QUIT());
DEFAULT_COMMAND_MAP.put("REIN", new REIN());
DEFAULT_COMMAND_MAP.put("REST", new REST());
DEFAULT_COMMAND_MAP.put("RETR", new RETR());
- DEFAULT_COMMAND_MAP.put("RMD", new RMD());
+ DEFAULT_COMMAND_MAP.put("RMD", new RMD());
DEFAULT_COMMAND_MAP.put("RNFR", new RNFR());
DEFAULT_COMMAND_MAP.put("RNTO", new RNTO());
DEFAULT_COMMAND_MAP.put("SITE", new SITE());
@@ -133,63 +134,69 @@
}
private Map<String, Command> commandMap = new HashMap<String, Command>();
+
private boolean useDefaultCommands = true;
-
+
/**
* Are default commands used?
+ *
* @return true if default commands are used
*/
public boolean isUseDefaultCommands() {
- return useDefaultCommands;
- }
+ return useDefaultCommands;
+ }
/**
* Sets whether the default commands will be used.
- * @param useDefaultCommands true if default commands should be used
+ *
+ * @param useDefaultCommands
+ * true if default commands should be used
+ */
+ public void setUseDefaultCommands(final boolean useDefaultCommands) {
+ this.useDefaultCommands = useDefaultCommands;
+ }
+
+ /**
+ * Get the installed commands
+ *
+ * @return The installed commands
*/
- public void setUseDefaultCommands(final boolean useDefaultCommands) {
- this.useDefaultCommands = useDefaultCommands;
- }
-
- /**
- * Get the installed commands
- * @return The installed commands
- */
public Map<String, Command> getCommandMap() {
- return commandMap;
- }
+ return commandMap;
+ }
+
+ /**
+ * Set commands to add or override to the default commands
+ *
+ * @param commandMap
+ * The map of commands, the key will be used to map to requests.
+ */
+ public synchronized void setCommandMap(final Map<String, Command> commandMap) {
+ if (commandMap == null) {
+ throw new NullPointerException("commandMap can not be null");
+ }
+
+ this.commandMap.clear();
+
+ for (Entry<String, Command> entry : commandMap.entrySet()) {
+ this.commandMap.put(entry.getKey().toUpperCase(), entry.getValue());
+ }
+ }
- /**
- * Set commands to add or override to the default commands
- * @param commandMap The map of commands, the key will be used to map
- * to requests.
- */
- public synchronized void setCommandMap(final Map<String, Command> commandMap) {
- if(commandMap == null) {
- throw new NullPointerException("commandMap can not be null");
- }
-
- this.commandMap.clear();
-
- for(Entry<String, Command> entry : commandMap.entrySet()) {
- this.commandMap.put(entry.getKey().toUpperCase(), entry.getValue());
- }
- }
-
/**
* Get command. Returns null if not found.
*/
public Command getCommand(final String cmdName) {
- if(cmdName == null || cmdName.equals("")) {
+ if (cmdName == null || cmdName.equals("")) {
return null;
}
- String upperCaseCmdName = cmdName.toUpperCase();
- Command command = commandMap.get(upperCaseCmdName);
-
- if(command == null && useDefaultCommands) {
- command = DEFAULT_COMMAND_MAP.get(upperCaseCmdName);
- }
-
+ String upperCaseCmdName = cmdName.toUpperCase();
+ Command command = commandMap.get(upperCaseCmdName);
+
+ if (command == null && useDefaultCommands) {
+ command = DEFAULT_COMMAND_MAP.get(upperCaseCmdName);
+ }
+
return command;
}
}
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/DefaultConnectionConfig.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/DefaultConnectionConfig.java?rev=686637&r1=686636&r2=686637&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/DefaultConnectionConfig.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/DefaultConnectionConfig.java Sun Aug 17 12:52:42 2008
@@ -15,56 +15,67 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- */
+ */
package org.apache.ftpserver;
+/**
+ *
+ *
+ * @author The Apache MINA Project (dev@mina.apache.org)
+ * @version $Rev$, $Date$
+ *
+ */
public class DefaultConnectionConfig implements ConnectionConfig {
- private int maxLogins = 10;
- private boolean anonymousLoginEnabled = true;
- private int maxAnonymousLogins = 10;
- private int maxLoginFailures = 3;
+ private int maxLogins = 10;
+
+ private boolean anonymousLoginEnabled = true;
+
+ private int maxAnonymousLogins = 10;
+
+ private int maxLoginFailures = 3;
+
private int loginFailureDelay = 500;
-
- public int getLoginFailureDelay() {
- return loginFailureDelay;
- }
-
- public int getMaxAnonymousLogins() {
- return maxAnonymousLogins;
- }
-
- public int getMaxLoginFailures() {
- return maxLoginFailures;
- }
-
- public int getMaxLogins() {
- return maxLogins;
- }
-
- public boolean isAnonymousLoginEnabled() {
- return anonymousLoginEnabled;
- }
-
- public void setMaxLogins(final int maxLogins) {
- this.maxLogins = maxLogins;
- }
-
- public void setAnonymousLoginEnabled(final boolean anonymousLoginEnabled) {
- this.anonymousLoginEnabled = anonymousLoginEnabled;
- }
-
- public void setMaxAnonymousLogins(final int maxAnonymousLogins) {
- this.maxAnonymousLogins = maxAnonymousLogins;
- }
-
- public void setMaxLoginFailures(final int maxLoginFailures) {
- this.maxLoginFailures = maxLoginFailures;
- }
-
- public void setLoginFailureDelay(final int loginFailureDelay) {
- this.loginFailureDelay = loginFailureDelay;
- }
+
+ public int getLoginFailureDelay() {
+ return loginFailureDelay;
+ }
+
+ public int getMaxAnonymousLogins() {
+ return maxAnonymousLogins;
+ }
+
+ public int getMaxLoginFailures() {
+ return maxLoginFailures;
+ }
+
+ public int getMaxLogins() {
+ return maxLogins;
+ }
+
+ public boolean isAnonymousLoginEnabled() {
+ return anonymousLoginEnabled;
+ }
+
+ public void setMaxLogins(final int maxLogins) {
+ this.maxLogins = maxLogins;
+ }
+
+ public void setAnonymousLoginEnabled(final boolean anonymousLoginEnabled) {
+ this.anonymousLoginEnabled = anonymousLoginEnabled;
+ }
+
+ public void setMaxAnonymousLogins(final int maxAnonymousLogins) {
+ this.maxAnonymousLogins = maxAnonymousLogins;
+ }
+
+ public void setMaxLoginFailures(final int maxLoginFailures) {
+ this.maxLoginFailures = maxLoginFailures;
+ }
+
+ public void setLoginFailureDelay(final int loginFailureDelay) {
+ this.loginFailureDelay = loginFailureDelay;
+ }
}
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/DefaultDataConnectionConfiguration.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/DefaultDataConnectionConfiguration.java?rev=686637&r1=686636&r2=686637&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/DefaultDataConnectionConfiguration.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/DefaultDataConnectionConfiguration.java Sun Aug 17 12:52:42 2008
@@ -15,7 +15,7 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- */
+ */
package org.apache.ftpserver;
@@ -27,135 +27,156 @@
/**
* Data connection configuration.
+ *
+ * @author The Apache MINA Project (dev@mina.apache.org)
+ * @version $Rev$, $Date$
*/
-public
-class DefaultDataConnectionConfiguration implements DataConnectionConfiguration {
+public class DefaultDataConnectionConfiguration implements
+ DataConnectionConfiguration {
public static class Active {
private boolean enable = true;
+
private InetAddress localAddress;
+
private int localPort = 0;
+
private boolean ipCheck = false;
-
+
public Active() {
try {
localAddress = InetAddress.getLocalHost();
} catch (UnknownHostException e) {
- throw new FtpServerConfigurationException("Failed to resolve localhost", e);
+ throw new FtpServerConfigurationException(
+ "Failed to resolve localhost", e);
}
}
-
+
public boolean isEnable() {
return enable;
}
+
public void setEnable(boolean enable) {
this.enable = enable;
}
+
public boolean isIpCheck() {
return ipCheck;
}
+
public void setIpCheck(boolean ipCheck) {
this.ipCheck = ipCheck;
}
+
public InetAddress getLocalAddress() {
return localAddress;
}
+
public void setLocalAddress(InetAddress localAddress) {
this.localAddress = localAddress;
}
+
public int getLocalPort() {
return localPort;
}
+
public void setLocalPort(int localPort) {
this.localPort = localPort;
}
}
-
- public static class Passive {
+
+ public static class Passive {
private InetAddress address;
+
private InetAddress externalAddress;
- private PassivePorts passivePorts = new PassivePorts(new int[]{0});
-
+
+ private PassivePorts passivePorts = new PassivePorts(new int[] { 0 });
+
public InetAddress getAddress() {
return address;
}
+
public void setAddress(InetAddress address) {
this.address = address;
}
+
public PassivePorts getPassivePorts() {
return passivePorts;
}
+
public void setPorts(String ports) {
this.passivePorts = new PassivePorts(ports);
}
+
public InetAddress getExternalAddress() {
return externalAddress;
}
+
public void setExternalAddress(InetAddress externalAddress) {
this.externalAddress = externalAddress;
}
}
-
+
// maximum idle time in seconds
private int idleTime = 300;
-
+
private SslConfiguration ssl;
-
+
/**
* Get the maximum idle time in seconds.
*/
public int getIdleTime() {
return idleTime;
}
-
+
public void setIdleTime(final int idleTime) {
this.idleTime = idleTime;
}
-
+
private Active active = new Active();
+
private Passive passive = new Passive();
-
+
public void setActive(final Active active) {
this.active = active;
}
-
+
public void setPassive(final Passive passive) {
this.passive = passive;
}
-
+
public void setSslConfiguration(final SslConfiguration ssl) {
this.ssl = ssl;
}
-
/**
* Is PORT enabled?
*/
public boolean isActiveEnabled() {
return active.isEnable();
}
-
+
/**
* Check the PORT IP?
*/
public boolean isActiveIpCheck() {
return active.isIpCheck();
}
-
+
/**
* Get the local address for active mode data transfer.
*/
public InetAddress getActiveLocalAddress() {
return active.getLocalAddress();
}
-
+
/**
* Get the active local port number.
*/
public int getActiveLocalPort() {
return active.getLocalPort();
}
-
+
/**
* Get passive host.
*/
@@ -165,12 +186,14 @@
/**
* Set the passive host
- * @param address The passive host
+ *
+ * @param address
+ * The passive host
*/
public void setPassiveAddress(final InetAddress address) {
- passive.setAddress(address);
+ passive.setAddress(address);
}
-
+
/**
* Get external passive host.
*/
@@ -180,32 +203,34 @@
/**
* Set the passive external host
- * @param address The passive external host
+ *
+ * @param address
+ * The passive external host
*/
public void setPassiveExernalAddress(final InetAddress address) {
- passive.setExternalAddress(address);
+ passive.setExternalAddress(address);
}
-
+
/**
- * Get passive data port. Data port number zero (0) means that
- * any available port will be used.
+ * Get passive data port. Data port number zero (0) means that any available
+ * port will be used.
*/
- public synchronized int requestPassivePort() {
+ public synchronized int requestPassivePort() {
int dataPort = -1;
int loopTimes = 2;
Thread currThread = Thread.currentThread();
-
- while( (dataPort==-1) && (--loopTimes >= 0) && (!currThread.isInterrupted()) ) {
- // search for a free port
+ while ((dataPort == -1) && (--loopTimes >= 0)
+ && (!currThread.isInterrupted())) {
+
+ // search for a free port
dataPort = passive.getPassivePorts().reserveNextPort();
// no available free port - wait for the release notification
- if(dataPort == -1) {
+ if (dataPort == -1) {
try {
wait();
- }
- catch(InterruptedException ex) {
+ } catch (InterruptedException ex) {
}
}
}
@@ -214,6 +239,7 @@
/**
* Retrive the passive ports configured for this data connection
+ *
* @return The String of passive ports
*/
public String getPassivePorts() {
@@ -221,11 +247,17 @@
}
/**
- * Set the passive ports allowed for this data connection.
- * @param passivePorts A string consisting of port numbers
- * separated by commas. It can also include ranged. For example:
- * <p>22,23,24</p>
- * <p>22-24,28</p>
+ * Set the passive ports allowed for this data connection.
+ *
+ * @param passivePorts
+ * A string consisting of port numbers separated by commas. It
+ * can also include ranged. For example:
+ * <p>
+ * 22,23,24
+ * </p>
+ * <p>
+ * 22-24,28
+ * </p>
*/
public void setPassivePorts(final String passivePorts) {
passive.passivePorts = new PassivePorts(passivePorts);
@@ -239,7 +271,7 @@
notify();
}
-
+
/**
* Get SSL component.
*/
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/DefaultFtpHandler.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/DefaultFtpHandler.java?rev=686637&r1=686636&r2=686637&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/DefaultFtpHandler.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/DefaultFtpHandler.java Sun Aug 17 12:52:42 2008
@@ -15,7 +15,7 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- */
+ */
package org.apache.ftpserver;
@@ -36,140 +36,154 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+/**
+ * @author The Apache MINA Project (dev@mina.apache.org)
+ * @version $Rev$, $Date$
+ *
+ */
public class DefaultFtpHandler implements FtpHandler {
-
- private final Logger LOG = LoggerFactory.getLogger(DefaultFtpHandler.class);
-
- private final static String[] NON_AUTHENTICATED_COMMANDS = new String[] {
- "USER",
- "PASS",
- "AUTH"
- };
-
- private FtpServerContext context;
- private Listener listener;
-
+
+ private final Logger LOG = LoggerFactory.getLogger(DefaultFtpHandler.class);
+
+ private final static String[] NON_AUTHENTICATED_COMMANDS = new String[] {
+ "USER", "PASS", "AUTH" };
+
+ private FtpServerContext context;
+
+ private Listener listener;
+
public void init(final FtpServerContext context, final Listener listener) {
- this.context = context;
- this.listener = listener;
+ this.context = context;
+ this.listener = listener;
}
- public void sessionCreated(final FtpIoSession session) throws Exception {
- session.setListener(listener);
+ public void sessionCreated(final FtpIoSession session) throws Exception {
+ session.setListener(listener);
}
public void sessionOpened(final FtpIoSession session) throws Exception {
context.getFtpletContainer().onConnect(session.getFtpletSession());
-
- session.write(FtpReplyUtil.translate(session, null, context, FtpReply.REPLY_220_SERVICE_READY, null, null));
+
+ session.write(FtpReplyUtil.translate(session, null, context,
+ FtpReply.REPLY_220_SERVICE_READY, null, null));
}
public void sessionClosed(final FtpIoSession session) throws Exception {
try {
- context.getFtpletContainer().onDisconnect(session.getFtpletSession());
- } catch(Exception e) {
+ context.getFtpletContainer().onDisconnect(
+ session.getFtpletSession());
+ } catch (Exception e) {
// shallow the exception, we're closing down the session anyways
LOG.warn("Ftplet threw an exception on disconnect", e);
}
-
- ServerFtpStatistics stats = ((ServerFtpStatistics)context.getFtpStatistics());
-
- if(stats != null) {
- stats.setLogout(session);
- }
+
+ ServerFtpStatistics stats = ((ServerFtpStatistics) context
+ .getFtpStatistics());
+
+ if (stats != null) {
+ stats.setLogout(session);
+ }
}
- public void exceptionCaught(final FtpIoSession session, final Throwable cause ) throws Exception {
- LOG.error("Exception caught, closing session", cause);
- session.closeOnFlush().awaitUninterruptibly(10000);
+ public void exceptionCaught(final FtpIoSession session,
+ final Throwable cause) throws Exception {
+ LOG.error("Exception caught, closing session", cause);
+ session.closeOnFlush().awaitUninterruptibly(10000);
}
private boolean isCommandOkWithoutAuthentication(String command) {
boolean okay = false;
- for(String allowed : NON_AUTHENTICATED_COMMANDS) {
- if(allowed.equals(command)) {
+ for (String allowed : NON_AUTHENTICATED_COMMANDS) {
+ if (allowed.equals(command)) {
okay = true;
break;
}
}
return okay;
}
-
- public void messageReceived( final FtpIoSession session, final FtpRequest request ) throws Exception {
+
+ public void messageReceived(final FtpIoSession session,
+ final FtpRequest request) throws Exception {
try {
String commandName = request.getCommand();
CommandFactory commandFactory = context.getCommandFactory();
Command command = commandFactory.getCommand(commandName);
-
+
// make sure the user is authenticated before he issues commands
- if(!session.isLoggedIn() && !isCommandOkWithoutAuthentication(commandName)) {
- session.write(FtpReplyUtil.translate(session, request, context, FtpReply.REPLY_530_NOT_LOGGED_IN, "permission", null));
+ if (!session.isLoggedIn()
+ && !isCommandOkWithoutAuthentication(commandName)) {
+ session.write(FtpReplyUtil.translate(session, request, context,
+ FtpReply.REPLY_530_NOT_LOGGED_IN, "permission", null));
return;
}
-
+
FtpletContainer ftplets = context.getFtpletContainer();
-
+
FtpletEnum ftpletRet;
try {
- ftpletRet = ftplets.beforeCommand(session.getFtpletSession(), request);
- } catch(Exception e) {
+ ftpletRet = ftplets.beforeCommand(session.getFtpletSession(),
+ request);
+ } catch (Exception e) {
LOG.debug("Ftplet container threw exception", e);
ftpletRet = FtpletEnum.RET_DISCONNECT;
}
- if(ftpletRet == FtpletEnum.RET_DISCONNECT) {
+ if (ftpletRet == FtpletEnum.RET_DISCONNECT) {
session.closeOnFlush().awaitUninterruptibly(10000);
return;
- } else if(ftpletRet != FtpletEnum.RET_SKIP) {
+ } else if (ftpletRet != FtpletEnum.RET_SKIP) {
- if(command != null) {
- synchronized (session) {
- command.execute(session, context, request);
- }
- }
- else {
- session.write(FtpReplyUtil.translate(session, request, context, FtpReply.REPLY_502_COMMAND_NOT_IMPLEMENTED, "not.implemented", null));
+ if (command != null) {
+ synchronized (session) {
+ command.execute(session, context, request);
+ }
+ } else {
+ session.write(FtpReplyUtil.translate(session, request,
+ context,
+ FtpReply.REPLY_502_COMMAND_NOT_IMPLEMENTED,
+ "not.implemented", null));
}
}
-
+
try {
- ftpletRet = ftplets.afterCommand(session.getFtpletSession(), request);
- } catch(Exception e) {
+ ftpletRet = ftplets.afterCommand(session.getFtpletSession(),
+ request);
+ } catch (Exception e) {
LOG.debug("Ftplet container threw exception", e);
ftpletRet = FtpletEnum.RET_DISCONNECT;
}
- if(ftpletRet == FtpletEnum.RET_DISCONNECT) {
+ if (ftpletRet == FtpletEnum.RET_DISCONNECT) {
session.closeOnFlush().awaitUninterruptibly(10000);
return;
}
- }
- catch(Exception ex) {
-
+ } catch (Exception ex) {
+
// send error reply
- try {
- session.write(FtpReplyUtil.translate(session, request, context, FtpReply.REPLY_550_REQUESTED_ACTION_NOT_TAKEN, null, null));
- }
- catch(Exception ex1) {
+ try {
+ session.write(FtpReplyUtil.translate(session, request, context,
+ FtpReply.REPLY_550_REQUESTED_ACTION_NOT_TAKEN, null,
+ null));
+ } catch (Exception ex1) {
}
-
+
if (ex instanceof java.io.IOException) {
- throw (IOException)ex;
- }
- else {
+ throw (IOException) ex;
+ } else {
LOG.warn("RequestHandler.service()", ex);
}
}
}
- public void sessionIdle( final FtpIoSession session, final IdleStatus status ) throws Exception {
- LOG.info("Session idle, closing");
+ public void sessionIdle(final FtpIoSession session, final IdleStatus status)
+ throws Exception {
+ LOG.info("Session idle, closing");
session.closeOnFlush().awaitUninterruptibly(10000);
}
- public void messageSent(final FtpIoSession session, final FtpReply reply)
- throws Exception {
- // do nothing
-
- }
+ public void messageSent(final FtpIoSession session, final FtpReply reply)
+ throws Exception {
+ // do nothing
+
+ }
}
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/DefaultFtpServerContext.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/DefaultFtpServerContext.java?rev=686637&r1=686636&r2=686637&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/DefaultFtpServerContext.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/DefaultFtpServerContext.java Sun Aug 17 12:52:42 2008
@@ -47,186 +47,195 @@
/**
* FTP server configuration implementation. It holds all the components used.
+ *
+ * @author The Apache MINA Project (dev@mina.apache.org)
+ * @version $Rev$, $Date$
*/
public class DefaultFtpServerContext implements FtpServerContext {
- private final Logger LOG = LoggerFactory
- .getLogger(DefaultFtpServerContext.class);
+ private final Logger LOG = LoggerFactory
+ .getLogger(DefaultFtpServerContext.class);
- private MessageResource messageResource = new MessageResourceImpl();
- private UserManager userManager = new PropertiesUserManager();
- private FileSystemManager fileSystemManager = new NativeFileSystemManager();
- private FtpletContainer ftpletContainer = new DefaultFtpletContainer();
- private FtpStatistics statistics = new FtpStatisticsImpl();
- private CommandFactory commandFactory = new DefaultCommandFactory();
- private ConnectionConfig connectionConfig = new DefaultConnectionConfig();
-
- private Map<String, Listener> listeners = new HashMap<String, Listener>();
-
- private static final Authority[] ADMIN_AUTHORITIES = new Authority[] { new WritePermission() };
-
- private static final Authority[] ANON_AUTHORITIES = new Authority[] {
- new ConcurrentLoginPermission(20, 2),
- new TransferRatePermission(4800, 4800) };
+ private MessageResource messageResource = new MessageResourceImpl();
- public DefaultFtpServerContext() throws Exception {
+ private UserManager userManager = new PropertiesUserManager();
+
+ private FileSystemManager fileSystemManager = new NativeFileSystemManager();
+
+ private FtpletContainer ftpletContainer = new DefaultFtpletContainer();
+
+ private FtpStatistics statistics = new FtpStatisticsImpl();
+
+ private CommandFactory commandFactory = new DefaultCommandFactory();
+
+ private ConnectionConfig connectionConfig = new DefaultConnectionConfig();
+
+ private Map<String, Listener> listeners = new HashMap<String, Listener>();
+
+ private static final Authority[] ADMIN_AUTHORITIES = new Authority[] { new WritePermission() };
+
+ private static final Authority[] ANON_AUTHORITIES = new Authority[] {
+ new ConcurrentLoginPermission(20, 2),
+ new TransferRatePermission(4800, 4800) };
+
+ public DefaultFtpServerContext() throws Exception {
// create the default listener
- listeners.put("default", new NioListener());
- }
+ listeners.put("default", new NioListener());
+ }
- /**
- * Create default users.
- */
- public void createDefaultUsers() throws Exception {
- UserManager userManager = getUserManager();
-
- // create admin user
- String adminName = userManager.getAdminName();
- if (!userManager.doesExist(adminName)) {
- LOG.info("Creating user : " + adminName);
- BaseUser adminUser = new BaseUser();
- adminUser.setName(adminName);
- adminUser.setPassword(adminName);
- adminUser.setEnabled(true);
-
- adminUser.setAuthorities(ADMIN_AUTHORITIES);
-
- adminUser.setHomeDirectory("./res/home");
- adminUser.setMaxIdleTime(0);
- userManager.save(adminUser);
- }
-
- // create anonymous user
- if (!userManager.doesExist("anonymous")) {
- LOG.info("Creating user : anonymous");
- BaseUser anonUser = new BaseUser();
- anonUser.setName("anonymous");
- anonUser.setPassword("");
-
- anonUser.setAuthorities(ANON_AUTHORITIES);
-
- anonUser.setEnabled(true);
-
- anonUser.setHomeDirectory("./res/home");
- anonUser.setMaxIdleTime(300);
- userManager.save(anonUser);
- }
- }
-
- /**
- * Get user manager.
- */
- public UserManager getUserManager() {
- return userManager;
- }
-
- /**
- * Get file system manager.
- */
- public FileSystemManager getFileSystemManager() {
- return fileSystemManager;
- }
-
- /**
- * Get message resource.
- */
- public MessageResource getMessageResource() {
- return messageResource;
- }
-
- /**
- * Get ftp statistics.
- */
- public FtpStatistics getFtpStatistics() {
- return statistics;
- }
-
- public void setFtpStatistics(FtpStatistics statistics) {
- this.statistics = statistics;
- }
-
- /**
- * Get ftplet handler.
- */
- public FtpletContainer getFtpletContainer() {
- return ftpletContainer;
- }
-
- /**
- * Get the command factory.
- */
- public CommandFactory getCommandFactory() {
- return commandFactory;
- }
-
- /**
- * Get Ftplet.
- */
- public Ftplet getFtplet(String name) {
- return ftpletContainer.getFtplet(name);
- }
-
- /**
- * Close all the components.
- */
- public void dispose() {
-
- Iterator<Listener> listenerIter = listeners.values().iterator();
- while (listenerIter.hasNext()) {
- Listener listener = listenerIter.next();
- listener.stop();
- }
- }
-
- public Listener getListener(String name) {
- return listeners.get(name);
- }
-
- public void setListener(String name, Listener listener) {
- listeners.put(name, listener);
- }
-
- public Map<String, Listener> getListeners() {
- return listeners;
- }
-
- public void setListeners(Map<String, Listener> listeners) {
- this.listeners = listeners;
- }
-
- public void addListener(String name, Listener listener) {
- listeners.put(name, listener);
- }
-
- public Listener removeListener(String name) {
- return listeners.remove(name);
- }
-
- public void setCommandFactory(CommandFactory commandFactory) {
- this.commandFactory = commandFactory;
- }
-
- public void setFileSystemManager(FileSystemManager fileSystemManager) {
- this.fileSystemManager = fileSystemManager;
- }
-
- public void setFtpletContainer(FtpletContainer ftpletContainer) {
- this.ftpletContainer = ftpletContainer;
- }
-
- public void setMessageResource(MessageResource messageResource) {
- this.messageResource = messageResource;
- }
-
- public void setUserManager(UserManager userManager) {
- this.userManager = userManager;
- }
-
- public ConnectionConfig getConnectionConfig() {
- return connectionConfig;
- }
-
- public void setConnectionConfig(ConnectionConfig connectionConfig) {
- this.connectionConfig = connectionConfig;
- }
+ /**
+ * Create default users.
+ */
+ public void createDefaultUsers() throws Exception {
+ UserManager userManager = getUserManager();
+
+ // create admin user
+ String adminName = userManager.getAdminName();
+ if (!userManager.doesExist(adminName)) {
+ LOG.info("Creating user : " + adminName);
+ BaseUser adminUser = new BaseUser();
+ adminUser.setName(adminName);
+ adminUser.setPassword(adminName);
+ adminUser.setEnabled(true);
+
+ adminUser.setAuthorities(ADMIN_AUTHORITIES);
+
+ adminUser.setHomeDirectory("./res/home");
+ adminUser.setMaxIdleTime(0);
+ userManager.save(adminUser);
+ }
+
+ // create anonymous user
+ if (!userManager.doesExist("anonymous")) {
+ LOG.info("Creating user : anonymous");
+ BaseUser anonUser = new BaseUser();
+ anonUser.setName("anonymous");
+ anonUser.setPassword("");
+
+ anonUser.setAuthorities(ANON_AUTHORITIES);
+
+ anonUser.setEnabled(true);
+
+ anonUser.setHomeDirectory("./res/home");
+ anonUser.setMaxIdleTime(300);
+ userManager.save(anonUser);
+ }
+ }
+
+ /**
+ * Get user manager.
+ */
+ public UserManager getUserManager() {
+ return userManager;
+ }
+
+ /**
+ * Get file system manager.
+ */
+ public FileSystemManager getFileSystemManager() {
+ return fileSystemManager;
+ }
+
+ /**
+ * Get message resource.
+ */
+ public MessageResource getMessageResource() {
+ return messageResource;
+ }
+
+ /**
+ * Get ftp statistics.
+ */
+ public FtpStatistics getFtpStatistics() {
+ return statistics;
+ }
+
+ public void setFtpStatistics(FtpStatistics statistics) {
+ this.statistics = statistics;
+ }
+
+ /**
+ * Get ftplet handler.
+ */
+ public FtpletContainer getFtpletContainer() {
+ return ftpletContainer;
+ }
+
+ /**
+ * Get the command factory.
+ */
+ public CommandFactory getCommandFactory() {
+ return commandFactory;
+ }
+
+ /**
+ * Get Ftplet.
+ */
+ public Ftplet getFtplet(String name) {
+ return ftpletContainer.getFtplet(name);
+ }
+
+ /**
+ * Close all the components.
+ */
+ public void dispose() {
+
+ Iterator<Listener> listenerIter = listeners.values().iterator();
+ while (listenerIter.hasNext()) {
+ Listener listener = listenerIter.next();
+ listener.stop();
+ }
+ }
+
+ public Listener getListener(String name) {
+ return listeners.get(name);
+ }
+
+ public void setListener(String name, Listener listener) {
+ listeners.put(name, listener);
+ }
+
+ public Map<String, Listener> getListeners() {
+ return listeners;
+ }
+
+ public void setListeners(Map<String, Listener> listeners) {
+ this.listeners = listeners;
+ }
+
+ public void addListener(String name, Listener listener) {
+ listeners.put(name, listener);
+ }
+
+ public Listener removeListener(String name) {
+ return listeners.remove(name);
+ }
+
+ public void setCommandFactory(CommandFactory commandFactory) {
+ this.commandFactory = commandFactory;
+ }
+
+ public void setFileSystemManager(FileSystemManager fileSystemManager) {
+ this.fileSystemManager = fileSystemManager;
+ }
+
+ public void setFtpletContainer(FtpletContainer ftpletContainer) {
+ this.ftpletContainer = ftpletContainer;
+ }
+
+ public void setMessageResource(MessageResource messageResource) {
+ this.messageResource = messageResource;
+ }
+
+ public void setUserManager(UserManager userManager) {
+ this.userManager = userManager;
+ }
+
+ public ConnectionConfig getConnectionConfig() {
+ return connectionConfig;
+ }
+
+ public void setConnectionConfig(ConnectionConfig connectionConfig) {
+ this.connectionConfig = connectionConfig;
+ }
}
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/FtpHandler.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/FtpHandler.java?rev=686637&r1=686636&r2=686637&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/FtpHandler.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/FtpHandler.java Sun Aug 17 12:52:42 2008
@@ -15,7 +15,7 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- */
+ */
package org.apache.ftpserver;
@@ -30,22 +30,29 @@
import org.apache.mina.core.session.IdleStatus;
import org.apache.mina.core.session.IoSession;
+/**
+ *
+ *
+ * @author The Apache MINA Project (dev@mina.apache.org)
+ * @version $Rev$, $Date$
+ *
+ */
public interface FtpHandler {
-
- void init(FtpServerContext context, Listener listener) throws Exception;
-
- /**
- * Invoked from an I/O processor thread when a new connection has been created.
- * Because this method is supposed to be called from the same thread that
- * handles I/O of multiple sessions, please implement this method to perform
- * tasks that consumes minimal amount of time such as socket parameter
- * and user-defined session attribute initialization.
+
+ void init(FtpServerContext context, Listener listener) throws Exception;
+
+ /**
+ * Invoked from an I/O processor thread when a new connection has been
+ * created. Because this method is supposed to be called from the same
+ * thread that handles I/O of multiple sessions, please implement this
+ * method to perform tasks that consumes minimal amount of time such as
+ * socket parameter and user-defined session attribute initialization.
*/
void sessionCreated(FtpIoSession session) throws Exception;
/**
- * Invoked when a connection has been opened. This method is invoked after
- * {@link #sessionCreated(IoSession)}. The biggest difference from
+ * Invoked when a connection has been opened. This method is invoked after
+ * {@link #sessionCreated(IoSession)}. The biggest difference from
* {@link #sessionCreated(IoSession)} is that it's invoked from other thread
* than an I/O processor thread once thread modesl is configured properly.
*/
@@ -57,27 +64,29 @@
void sessionClosed(FtpIoSession session) throws Exception;
/**
- * Invoked with the related {@link IdleStatus} when a connection becomes idle.
- * This method is not invoked if the transport type is UDP; it's a known bug,
- * and will be fixed in 2.0.
+ * Invoked with the related {@link IdleStatus} when a connection becomes
+ * idle. This method is not invoked if the transport type is UDP; it's a
+ * known bug, and will be fixed in 2.0.
*/
void sessionIdle(FtpIoSession session, IdleStatus status) throws Exception;
/**
* Invoked when any exception is thrown by user {@link IoHandler}
- * implementation or by MINA. If <code>cause</code> is instanceof
+ * implementation or by MINA. If <code>cause</code> is instanceof
* {@link IOException}, MINA will close the connection automatically.
*/
- void exceptionCaught(FtpIoSession session, Throwable cause) throws Exception;
+ void exceptionCaught(FtpIoSession session, Throwable cause)
+ throws Exception;
/**
* Invoked when a message is received.
*/
- void messageReceived(FtpIoSession session, FtpRequest request) throws Exception;
+ void messageReceived(FtpIoSession session, FtpRequest request)
+ throws Exception;
/**
- * Invoked when a message written by {@link IoSession#write(Object)} is
- * sent out.
+ * Invoked when a message written by {@link IoSession#write(Object)} is sent
+ * out.
*/
void messageSent(FtpIoSession session, FtpReply reply) throws Exception;
}
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/FtpRequestImpl.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/FtpRequestImpl.java?rev=686637&r1=686636&r2=686637&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/FtpRequestImpl.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/FtpRequestImpl.java Sun Aug 17 12:52:42 2008
@@ -15,7 +15,7 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- */
+ */
package org.apache.ftpserver;
@@ -23,68 +23,70 @@
/**
* FTP request object.
+ *
+ * @author The Apache MINA Project (dev@mina.apache.org)
+ * @version $Rev$, $Date$
*/
public class FtpRequestImpl implements FtpRequest {
-
+
private String line;
+
private String command;
+
private String argument;
-
/**
* Default constructor.
*/
public FtpRequestImpl(final String requestLine) {
parse(requestLine);
- }
-
+ }
+
/**
* Parse the ftp command line.
*/
private void parse(final String lineToParse) {
-
+
// parse request
line = lineToParse.trim();
command = null;
argument = null;
int spInd = line.indexOf(' ');
- if(spInd != -1) {
+ if (spInd != -1) {
argument = line.substring(spInd + 1);
- if(argument.equals("")) {
+ if (argument.equals("")) {
argument = null;
}
command = line.substring(0, spInd).toUpperCase();
- }
- else {
+ } else {
command = line.toUpperCase();
}
-
- if( (command.length() > 0) && (command.charAt(0) == 'X') ) {
+
+ if ((command.length() > 0) && (command.charAt(0) == 'X')) {
command = command.substring(1);
}
}
-
+
/**
* Get the ftp command.
*/
public String getCommand() {
return command;
}
-
+
/**
- * Get ftp input argument.
- */
+ * Get ftp input argument.
+ */
public String getArgument() {
return argument;
}
-
+
/**
* Get the ftp request line.
*/
public String getRequestLine() {
return line;
}
-
/**
* Has argument.
@@ -93,8 +95,9 @@
return getArgument() != null;
}
-
- /* (non-Javadoc)
+ /*
+ * (non-Javadoc)
+ *
* @see java.lang.Object#toString()
*/
public String toString() {
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/FtpServer.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/FtpServer.java?rev=686637&r1=686636&r2=686637&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/FtpServer.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/FtpServer.java Sun Aug 17 12:52:42 2008
@@ -19,7 +19,6 @@
package org.apache.ftpserver;
-
import java.util.Map;
import org.apache.ftpserver.ftplet.FileSystemManager;
@@ -36,22 +35,24 @@
* This is the starting point of all the servers. It invokes a new listener
* 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$, $Date$
*/
public class FtpServer {
private final Logger LOG = LoggerFactory.getLogger(FtpServer.class);
-
-
+
private FtpServerContext serverContext;
private boolean suspended = false;
private boolean started = false;
-
/**
* Creates a server with the default configuration
- * @throws Exception
+ *
+ * @throws Exception
*/
public FtpServer() throws Exception {
serverContext = new DefaultFtpServerContext();
@@ -59,6 +60,7 @@
/**
* Constructor. Set a custom the server context.
+ *
* @throws Exception
*/
public FtpServer(final FtpServerContext serverContext) throws Exception {
@@ -69,29 +71,29 @@
* Start the server. Open a new listener thread.
*/
public void start() throws Exception {
-
- Map<String, Listener> listeners = serverContext.getListeners();
+
+ Map<String, Listener> listeners = serverContext.getListeners();
for (Listener listener : listeners.values()) {
listener.start(serverContext);
}
started = true;
-
+
LOG.info("FTP server started");
}
-
+
/**
* Stop the server. Stop the listener thread.
*/
public void stop() {
- if(!started || serverContext == null) {
- // we have already been stopped, ignore
- return;
- }
-
+ if (!started || serverContext == null) {
+ // we have already been stopped, ignore
+ return;
+ }
+
// stop all listeners
- Map<String, Listener> listeners = serverContext.getListeners();
+ Map<String, Listener> listeners = serverContext.getListeners();
for (Listener listener : listeners.values()) {
listener.stop();
}
@@ -116,16 +118,16 @@
* Suspend further requests
*/
public void suspend() {
- if(!started) {
+ if (!started) {
return;
}
-
+
// stop all listeners
Map<String, Listener> listeners = serverContext.getListeners();
for (Listener listener : listeners.values()) {
listener.suspend();
}
-
+
suspended = true;
}
@@ -133,16 +135,15 @@
* Resume the server handler
*/
public void resume() {
- if(!suspended) {
+ if (!suspended) {
return;
}
-
+
Map<String, Listener> listeners = serverContext.getListeners();
for (Listener listener : listeners.values()) {
listener.resume();
}
-
suspended = false;
}
@@ -159,17 +160,19 @@
public FtpServerContext getServerContext() {
return serverContext;
}
-
+
private DefaultFtpServerContext checkAndGetContext() {
- if(getServerContext() instanceof DefaultFtpServerContext) {
+ if (getServerContext() instanceof DefaultFtpServerContext) {
return (DefaultFtpServerContext) getServerContext();
} else {
- throw new IllegalStateException("Custom FtpServerContext provided, setters can not be used on FtpServer");
+ throw new IllegalStateException(
+ "Custom FtpServerContext provided, setters can not be used on FtpServer");
}
}
-
+
/**
* Get all listeners available one this server
+ *
* @return The current listeners
*/
public Map<String, Listener> getListeners() {
@@ -178,29 +181,35 @@
/**
* Get a specific listener identified by its name
- * @param name The name of the listener
+ *
+ * @param name
+ * The name of the listener
* @return The {@link Listener} matching the provided name
*/
public Listener getListener(final String name) {
return getServerContext().getListener(name);
}
-
+
public void addListener(final String name, final Listener listener) {
checkAndGetContext().addListener(name, listener);
}
-
+
/**
* Set the listeners for this server, replaces existing listeners
- * @param listeners The listeners to use for this server with the name as the key
- * and the listener as the value
- * @throws IllegalStateException If a custom server context has been set
+ *
+ * @param listeners
+ * The listeners to use for this server with the name as the key
+ * and the listener as the value
+ * @throws IllegalStateException
+ * If a custom server context has been set
*/
public void setListeners(final Map<String, Listener> listeners) {
checkAndGetContext().setListeners(listeners);
}
-
+
/**
* Get all {@link Ftplet}s registered at this server
+ *
* @return All {@link Ftplet}s
*/
public Map<String, Ftplet> getFtplets() {
@@ -208,9 +217,14 @@
}
/**
- * Set the {@link Ftplet}s to be active for this server. Replaces existing {@link Ftplet}s
- * @param ftplets Ftplets as a map with the name as the key and the Ftplet as the value
- * @throws IllegalStateException If a custom server context has been set
+ * Set the {@link Ftplet}s to be active for this server. Replaces existing
+ * {@link Ftplet}s
+ *
+ * @param ftplets
+ * Ftplets as a map with the name as the key and the Ftplet as
+ * the value
+ * @throws IllegalStateException
+ * If a custom server context has been set
*/
public void setFtplets(final Map<String, Ftplet> ftplets) {
getServerContext().getFtpletContainer().setFtplets(ftplets);
@@ -218,6 +232,7 @@
/**
* Retrieve the user manager used with this server
+ *
* @return The user manager
*/
public UserManager getUserManager() {
@@ -226,15 +241,19 @@
/**
* Set the user manager to be used for this server
- * @param userManager The {@link UserManager}
- * @throws IllegalStateException If a custom server context has been set
+ *
+ * @param userManager
+ * The {@link UserManager}
+ * @throws IllegalStateException
+ * If a custom server context has been set
*/
public void setUserManager(final UserManager userManager) {
checkAndGetContext().setUserManager(userManager);
}
-
+
/**
* Retrieve the file system used with this server
+ *
* @return The {@link FileSystemManager}
*/
public FileSystemManager getFileSystem() {
@@ -243,15 +262,19 @@
/**
* Set the file system to be used for this server
- * @param fileSystem The {@link FileSystemManager}
- * @throws IllegalStateException If a custom server context has been set
+ *
+ * @param fileSystem
+ * The {@link FileSystemManager}
+ * @throws IllegalStateException
+ * If a custom server context has been set
*/
public void setFileSystem(final FileSystemManager fileSystem) {
checkAndGetContext().setFileSystemManager(fileSystem);
}
-
+
/**
* Retrieve the command factory used with this server
+ *
* @return The {@link CommandFactory}
*/
public CommandFactory getCommandFactory() {
@@ -260,15 +283,19 @@
/**
* Set the command factory to be used for this server
- * @param commandFactory The {@link CommandFactory}
- * @throws IllegalStateException If a custom server context has been set
+ *
+ * @param commandFactory
+ * The {@link CommandFactory}
+ * @throws IllegalStateException
+ * If a custom server context has been set
*/
public void setCommandFactory(final CommandFactory commandFactory) {
checkAndGetContext().setCommandFactory(commandFactory);
}
-
+
/**
* Retrieve the message resource used with this server
+ *
* @return The {@link MessageResource}
*/
public MessageResource getMessageResource() {
@@ -277,8 +304,11 @@
/**
* Set the message resource to be used with this server
- * @param messageResource The {@link MessageResource}
- * @throws IllegalStateException If a custom server context has been set
+ *
+ * @param messageResource
+ * The {@link MessageResource}
+ * @throws IllegalStateException
+ * If a custom server context has been set
*/
public void setMessageResource(final MessageResource messageResource) {
checkAndGetContext().setMessageResource(messageResource);
@@ -286,6 +316,7 @@
/**
* Retrieve the connection configuration this server
+ *
* @return The {@link MessageResource}
*/
public ConnectionConfig getConnectionConfig() {
@@ -294,8 +325,11 @@
/**
* Set the message resource to be used with this server
- * @param messageResource The {@link MessageResource}
- * @throws IllegalStateException If a custom server context has been set
+ *
+ * @param messageResource
+ * The {@link MessageResource}
+ * @throws IllegalStateException
+ * If a custom server context has been set
*/
public void setConnectionConfig(final ConnectionConfig connectionConfig) {
checkAndGetContext().setConnectionConfig(connectionConfig);
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/FtpServerConfigurationException.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/FtpServerConfigurationException.java?rev=686637&r1=686636&r2=686637&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/FtpServerConfigurationException.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/FtpServerConfigurationException.java Sun Aug 17 12:52:42 2008
@@ -15,20 +15,21 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- */
+ */
package org.apache.ftpserver;
-
/**
- * Exception used during startup to indicate that the configuration is
- * not correct.
+ * Exception used during startup to indicate that the configuration is not
+ * correct.
+ *
+ * @author The Apache MINA Project (dev@mina.apache.org)
+ * @version $Rev$, $Date$
*/
-public
-class FtpServerConfigurationException extends RuntimeException {
+public class FtpServerConfigurationException extends RuntimeException {
private static final long serialVersionUID = -1328432839915898987L;
-
+
/**
* {@link RuntimeException#RuntimeException()}
*/
@@ -39,7 +40,8 @@
/**
* {@link RuntimeException#RuntimeException(String, Throwable)}
*/
- public FtpServerConfigurationException(final String message, final Throwable cause) {
+ public FtpServerConfigurationException(final String message,
+ final Throwable cause) {
super(message, cause);
}