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/10/13 22:12:11 UTC
svn commit: r704228 [1/2] - in /mina/ftpserver/trunk/core/src:
examples/java/org/apache/ftpserver/examples/
main/java/org/apache/ftpserver/ main/java/org/apache/ftpserver/command/
main/java/org/apache/ftpserver/command/impl/ main/java/org/apache/ftpser...
Author: ngn
Date: Mon Oct 13 13:12:08 2008
New Revision: 704228
URL: http://svn.apache.org/viewvc?rev=704228&view=rev
Log:
Create FtpServer using a factory (FTPSERVER-187)
Added:
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/FtpServer.java (with props)
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/FtpServerFactory.java (with props)
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/impl/DefaultFtpServer.java (contents, props changed)
- copied, changed from r701885, mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/FtpServer.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/impl/DefaultFtpServerContext.java (contents, props changed)
- copied, changed from r703875, mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/DefaultFtpServerContext.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/impl/FtpHandler.java
- copied, changed from r701863, mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/FtpHandler.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/impl/FtpServerContext.java (contents, props changed)
- copied, changed from r701863, mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/FtpServerContext.java
Removed:
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/FtpServerContext.java
Modified:
mina/ftpserver/trunk/core/src/examples/java/org/apache/ftpserver/examples/EmbeddingFtpServer.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/Command.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/impl/ABOR.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/ACCT.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/APPE.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/AUTH.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/CDUP.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/CWD.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/DELE.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/EPRT.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/EPSV.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/FEAT.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/HELP.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/LANG.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/LIST.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/MD5.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/MDTM.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/MKD.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/MLSD.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/MLST.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/MODE.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/NLST.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/NOOP.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/OPTS.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/OPTS_MLST.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/OPTS_UTF8.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/PASS.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/PASV.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/PBSZ.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/PORT.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/PROT.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/PWD.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/QUIT.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/REIN.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/REST.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/RETR.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/RMD.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/RNFR.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/RNTO.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/SITE.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/SITE_DESCUSER.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/SITE_HELP.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/SITE_STAT.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/SITE_WHO.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/SITE_ZONE.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/SIZE.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/STAT.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/STOR.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/STOU.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/STRU.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/SYST.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/TYPE.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/USER.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/impl/DefaultFtpHandler.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/impl/FtpIoSession.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/impl/IODataConnectionFactory.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/impl/LocalizedFtpReply.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/NioListener.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/util/LocalizedFtpReply.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/ClientTestTemplate.java
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/ConnectPickPortTest.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/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/LoginNoAnonTest.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/SubnetBlacklistTest.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/DbUserManagerConfigTest.java
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/config/spring/FileUserManagerConfigTest.java
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/config/spring/MyCustomListener.java
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/config/spring/PropertyPlaceholderTest.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/SpringConfigTestTemplate.java
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ftpletcontainer/FtpLetReturnDefaultTest.java
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ftpletcontainer/FtpLetReturnDisconnectTest.java
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ftpletcontainer/FtpLetReturnSkipTest.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/SSLTestTemplate.java
Modified: mina/ftpserver/trunk/core/src/examples/java/org/apache/ftpserver/examples/EmbeddingFtpServer.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/examples/java/org/apache/ftpserver/examples/EmbeddingFtpServer.java?rev=704228&r1=704227&r2=704228&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/examples/java/org/apache/ftpserver/examples/EmbeddingFtpServer.java (original)
+++ mina/ftpserver/trunk/core/src/examples/java/org/apache/ftpserver/examples/EmbeddingFtpServer.java Mon Oct 13 13:12:08 2008
@@ -22,6 +22,7 @@
import java.io.File;
import org.apache.ftpserver.FtpServer;
+import org.apache.ftpserver.FtpServerFactory;
import org.apache.ftpserver.listener.ListenerFactory;
import org.apache.ftpserver.ssl.SslConfigurationFactory;
import org.apache.ftpserver.usermanager.PropertiesUserManagerFactory;
@@ -29,7 +30,7 @@
public class EmbeddingFtpServer {
public static void main(String[] args) throws Exception {
- FtpServer server = new FtpServer();
+ FtpServerFactory serverFactory = new FtpServerFactory();
ListenerFactory factory = new ListenerFactory();
@@ -46,14 +47,16 @@
factory.setImplicitSsl(true);
// replace the default listener
- server.addListener("default", factory.createListener());
+ serverFactory.addListener("default", factory.createListener());
PropertiesUserManagerFactory userManagerFactory = new PropertiesUserManagerFactory();
userManagerFactory.setFile(new File("myusers.properties"));
- server.setUserManager(userManagerFactory.createUserManager());
+ serverFactory.setUserManager(userManagerFactory.createUserManager());
// start the server
+ FtpServer server = serverFactory.createServer();
+
server.start();
}
}
Added: 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=704228&view=auto
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/FtpServer.java (added)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/FtpServer.java Mon Oct 13 13:12:08 2008
@@ -0,0 +1,63 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.ftpserver;
+
+
+/**
+ * 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: 701885 $, $Date: 2008-10-05 22:51:37 +0200 (Sun, 05 Oct 2008) $
+ */
+public interface FtpServer {
+
+ /**
+ * Start the server. Open a new listener thread.
+ */
+ void start() throws Exception;
+
+ /**
+ * Stop the server. Stop the listener thread.
+ */
+ void stop();
+
+ /**
+ * Get the server status.
+ */
+ boolean isStopped();
+
+ /**
+ * Suspend further requests
+ */
+ void suspend();
+
+ /**
+ * Resume the server handler
+ */
+ void resume();
+
+ /**
+ * Is the server suspended
+ */
+ boolean isSuspended();
+
+}
Propchange: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/FtpServer.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/FtpServerFactory.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/FtpServerFactory.java?rev=704228&view=auto
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/FtpServerFactory.java (added)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/FtpServerFactory.java Mon Oct 13 13:12:08 2008
@@ -0,0 +1,232 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.ftpserver;
+
+import java.util.Map;
+
+import org.apache.ftpserver.command.CommandFactory;
+import org.apache.ftpserver.ftplet.FileSystemFactory;
+import org.apache.ftpserver.ftplet.Ftplet;
+import org.apache.ftpserver.ftplet.UserManager;
+import org.apache.ftpserver.ftpletcontainer.impl.DefaultFtpletContainer;
+import org.apache.ftpserver.impl.DefaultFtpServerContext;
+import org.apache.ftpserver.impl.DefaultFtpServer;
+import org.apache.ftpserver.listener.Listener;
+import org.apache.ftpserver.message.MessageResource;
+
+/**
+ * This is the starting point of all the servers. Creates server instances based on
+ * the provided configuration.
+ *
+ * @author The Apache MINA Project (dev@mina.apache.org)
+ * @version $Rev: 701885 $, $Date: 2008-10-05 22:51:37 +0200 (Sun, 05 Oct 2008) $
+ */
+public class FtpServerFactory {
+
+ private DefaultFtpServerContext serverContext;
+
+ /**
+ * Creates a server with the default configuration
+ *
+ * @throws Exception
+ */
+ public FtpServerFactory() throws Exception {
+ serverContext = new DefaultFtpServerContext();
+ }
+
+ /**
+ * Create a {@link DefaultFtpServer} instance based
+ * on the provided configuration
+ * @return The {@link DefaultFtpServer} instance
+ */
+ public FtpServer createServer() {
+ return new DefaultFtpServer(serverContext);
+ }
+
+ /**
+ * Get all listeners available one this server
+ *
+ * @return The current listeners
+ */
+ public Map<String, Listener> getListeners() {
+ return serverContext.getListeners();
+ }
+
+ /**
+ * Get a specific {@link Listener} identified by its name
+ *
+ * @param name
+ * The name of the listener
+ * @return The {@link Listener} matching the provided name
+ */
+ public Listener getListener(final String name) {
+ return serverContext.getListener(name);
+ }
+
+ /**
+ * Add a {@link Listener} to this factory
+ * @param name The name of the listener
+ * @param listener The {@link Listener}
+ */
+ public void addListener(final String name, final Listener listener) {
+ serverContext.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
+ */
+ public void setListeners(final Map<String, Listener> listeners) {
+ serverContext.setListeners(listeners);
+ }
+
+ /**
+ * Get all {@link Ftplet}s registered at this server
+ *
+ * @return All {@link Ftplet}s
+ */
+ public Map<String, Ftplet> getFtplets() {
+ return serverContext.getFtpletContainer().getFtplets();
+ }
+
+ /**
+ * 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) {
+ serverContext.setFtpletContainer(new DefaultFtpletContainer(ftplets));
+ }
+
+ /**
+ * Retrieve the user manager used with this server
+ *
+ * @return The user manager
+ */
+ public UserManager getUserManager() {
+ return serverContext.getUserManager();
+ }
+
+ /**
+ * 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
+ */
+ public void setUserManager(final UserManager userManager) {
+ serverContext.setUserManager(userManager);
+ }
+
+ /**
+ * Retrieve the file system used with this server
+ *
+ * @return The {@link FileSystemFactory}
+ */
+ public FileSystemFactory getFileSystem() {
+ return serverContext.getFileSystemManager();
+ }
+
+ /**
+ * Set the file system to be used for this server
+ *
+ * @param fileSystem
+ * The {@link FileSystemFactory}
+ * @throws IllegalStateException
+ * If a custom server context has been set
+ */
+ public void setFileSystem(final FileSystemFactory fileSystem) {
+ serverContext.setFileSystemManager(fileSystem);
+ }
+
+ /**
+ * Retrieve the command factory used with this server
+ *
+ * @return The {@link CommandFactory}
+ */
+ public CommandFactory getCommandFactory() {
+ return serverContext.getCommandFactory();
+ }
+
+ /**
+ * 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
+ */
+ public void setCommandFactory(final CommandFactory commandFactory) {
+ serverContext.setCommandFactory(commandFactory);
+ }
+
+ /**
+ * Retrieve the message resource used with this server
+ *
+ * @return The {@link MessageResource}
+ */
+ public MessageResource getMessageResource() {
+ return serverContext.getMessageResource();
+ }
+
+ /**
+ * 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
+ */
+ public void setMessageResource(final MessageResource messageResource) {
+ serverContext.setMessageResource(messageResource);
+ }
+
+ /**
+ * Retrieve the connection configuration this server
+ *
+ * @return The {@link MessageResource}
+ */
+ public ConnectionConfig getConnectionConfig() {
+ return serverContext.getConnectionConfig();
+ }
+
+ /**
+ * 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
+ */
+ public void setConnectionConfig(final ConnectionConfig connectionConfig) {
+ serverContext.setConnectionConfig(connectionConfig);
+ }
+}
Propchange: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/FtpServerFactory.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/Command.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/Command.java?rev=704228&r1=704227&r2=704228&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/Command.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/Command.java Mon Oct 13 13:12:08 2008
@@ -21,10 +21,10 @@
import java.io.IOException;
-import org.apache.ftpserver.FtpServerContext;
import org.apache.ftpserver.ftplet.FtpException;
import org.apache.ftpserver.ftplet.FtpRequest;
import org.apache.ftpserver.impl.FtpIoSession;
+import org.apache.ftpserver.impl.FtpServerContext;
/**
* This interface encapsulates all the FTP commands.
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/NotSupportedCommand.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/NotSupportedCommand.java?rev=704228&r1=704227&r2=704228&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/NotSupportedCommand.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/NotSupportedCommand.java Mon Oct 13 13:12:08 2008
@@ -21,10 +21,10 @@
import java.io.IOException;
-import org.apache.ftpserver.FtpServerContext;
import org.apache.ftpserver.ftplet.FtpReply;
import org.apache.ftpserver.ftplet.FtpRequest;
import org.apache.ftpserver.impl.FtpIoSession;
+import org.apache.ftpserver.impl.FtpServerContext;
import org.apache.ftpserver.impl.LocalizedFtpReply;
/**
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/ABOR.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/ABOR.java?rev=704228&r1=704227&r2=704228&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/ABOR.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/ABOR.java Mon Oct 13 13:12:08 2008
@@ -21,11 +21,11 @@
import java.io.IOException;
-import org.apache.ftpserver.FtpServerContext;
import org.apache.ftpserver.command.AbstractCommand;
import org.apache.ftpserver.ftplet.FtpReply;
import org.apache.ftpserver.ftplet.FtpRequest;
import org.apache.ftpserver.impl.FtpIoSession;
+import org.apache.ftpserver.impl.FtpServerContext;
import org.apache.ftpserver.impl.LocalizedFtpReply;
/**
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/ACCT.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/ACCT.java?rev=704228&r1=704227&r2=704228&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/ACCT.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/ACCT.java Mon Oct 13 13:12:08 2008
@@ -21,11 +21,11 @@
import java.io.IOException;
-import org.apache.ftpserver.FtpServerContext;
import org.apache.ftpserver.command.AbstractCommand;
import org.apache.ftpserver.ftplet.FtpReply;
import org.apache.ftpserver.ftplet.FtpRequest;
import org.apache.ftpserver.impl.FtpIoSession;
+import org.apache.ftpserver.impl.FtpServerContext;
import org.apache.ftpserver.impl.LocalizedFtpReply;
/**
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/APPE.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/APPE.java?rev=704228&r1=704227&r2=704228&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/APPE.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/APPE.java Mon Oct 13 13:12:08 2008
@@ -24,7 +24,6 @@
import java.net.InetAddress;
import java.net.SocketException;
-import org.apache.ftpserver.FtpServerContext;
import org.apache.ftpserver.command.AbstractCommand;
import org.apache.ftpserver.ftplet.DataConnection;
import org.apache.ftpserver.ftplet.DataConnectionFactory;
@@ -34,6 +33,7 @@
import org.apache.ftpserver.ftplet.FtpReply;
import org.apache.ftpserver.ftplet.FtpRequest;
import org.apache.ftpserver.impl.FtpIoSession;
+import org.apache.ftpserver.impl.FtpServerContext;
import org.apache.ftpserver.impl.IODataConnectionFactory;
import org.apache.ftpserver.impl.LocalizedFtpReply;
import org.apache.ftpserver.impl.ServerFtpStatistics;
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/AUTH.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/AUTH.java?rev=704228&r1=704227&r2=704228&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/AUTH.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/AUTH.java Mon Oct 13 13:12:08 2008
@@ -22,12 +22,12 @@
import java.io.IOException;
import java.security.GeneralSecurityException;
-import org.apache.ftpserver.FtpServerContext;
import org.apache.ftpserver.command.AbstractCommand;
import org.apache.ftpserver.ftplet.FtpException;
import org.apache.ftpserver.ftplet.FtpReply;
import org.apache.ftpserver.ftplet.FtpRequest;
import org.apache.ftpserver.impl.FtpIoSession;
+import org.apache.ftpserver.impl.FtpServerContext;
import org.apache.ftpserver.impl.LocalizedFtpReply;
import org.apache.ftpserver.ssl.ClientAuth;
import org.apache.ftpserver.ssl.SslConfiguration;
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/CDUP.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/CDUP.java?rev=704228&r1=704227&r2=704228&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/CDUP.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/CDUP.java Mon Oct 13 13:12:08 2008
@@ -21,13 +21,13 @@
import java.io.IOException;
-import org.apache.ftpserver.FtpServerContext;
import org.apache.ftpserver.command.AbstractCommand;
import org.apache.ftpserver.ftplet.FileSystemView;
import org.apache.ftpserver.ftplet.FtpException;
import org.apache.ftpserver.ftplet.FtpReply;
import org.apache.ftpserver.ftplet.FtpRequest;
import org.apache.ftpserver.impl.FtpIoSession;
+import org.apache.ftpserver.impl.FtpServerContext;
import org.apache.ftpserver.impl.LocalizedFtpReply;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/CWD.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/CWD.java?rev=704228&r1=704227&r2=704228&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/CWD.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/CWD.java Mon Oct 13 13:12:08 2008
@@ -21,13 +21,13 @@
import java.io.IOException;
-import org.apache.ftpserver.FtpServerContext;
import org.apache.ftpserver.command.AbstractCommand;
import org.apache.ftpserver.ftplet.FileSystemView;
import org.apache.ftpserver.ftplet.FtpException;
import org.apache.ftpserver.ftplet.FtpReply;
import org.apache.ftpserver.ftplet.FtpRequest;
import org.apache.ftpserver.impl.FtpIoSession;
+import org.apache.ftpserver.impl.FtpServerContext;
import org.apache.ftpserver.impl.LocalizedFtpReply;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/DELE.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/DELE.java?rev=704228&r1=704227&r2=704228&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/DELE.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/DELE.java Mon Oct 13 13:12:08 2008
@@ -21,13 +21,13 @@
import java.io.IOException;
-import org.apache.ftpserver.FtpServerContext;
import org.apache.ftpserver.command.AbstractCommand;
import org.apache.ftpserver.ftplet.FtpException;
import org.apache.ftpserver.ftplet.FtpFile;
import org.apache.ftpserver.ftplet.FtpReply;
import org.apache.ftpserver.ftplet.FtpRequest;
import org.apache.ftpserver.impl.FtpIoSession;
+import org.apache.ftpserver.impl.FtpServerContext;
import org.apache.ftpserver.impl.LocalizedFtpReply;
import org.apache.ftpserver.impl.ServerFtpStatistics;
import org.slf4j.Logger;
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/EPRT.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/EPRT.java?rev=704228&r1=704227&r2=704228&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/EPRT.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/EPRT.java Mon Oct 13 13:12:08 2008
@@ -25,11 +25,11 @@
import java.net.UnknownHostException;
import org.apache.ftpserver.DataConnectionConfiguration;
-import org.apache.ftpserver.FtpServerContext;
import org.apache.ftpserver.command.AbstractCommand;
import org.apache.ftpserver.ftplet.FtpReply;
import org.apache.ftpserver.ftplet.FtpRequest;
import org.apache.ftpserver.impl.FtpIoSession;
+import org.apache.ftpserver.impl.FtpServerContext;
import org.apache.ftpserver.impl.LocalizedFtpReply;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/EPSV.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/EPSV.java?rev=704228&r1=704227&r2=704228&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/EPSV.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/EPSV.java Mon Oct 13 13:12:08 2008
@@ -23,11 +23,11 @@
import java.net.InetSocketAddress;
import org.apache.ftpserver.DataConnectionException;
-import org.apache.ftpserver.FtpServerContext;
import org.apache.ftpserver.command.AbstractCommand;
import org.apache.ftpserver.ftplet.FtpReply;
import org.apache.ftpserver.ftplet.FtpRequest;
import org.apache.ftpserver.impl.FtpIoSession;
+import org.apache.ftpserver.impl.FtpServerContext;
import org.apache.ftpserver.impl.LocalizedFtpReply;
import org.apache.ftpserver.impl.ServerDataConnectionFactory;
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/FEAT.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/FEAT.java?rev=704228&r1=704227&r2=704228&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/FEAT.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/FEAT.java Mon Oct 13 13:12:08 2008
@@ -21,12 +21,12 @@
import java.io.IOException;
-import org.apache.ftpserver.FtpServerContext;
import org.apache.ftpserver.command.AbstractCommand;
import org.apache.ftpserver.ftplet.FtpException;
import org.apache.ftpserver.ftplet.FtpReply;
import org.apache.ftpserver.ftplet.FtpRequest;
import org.apache.ftpserver.impl.FtpIoSession;
+import org.apache.ftpserver.impl.FtpServerContext;
import org.apache.ftpserver.impl.LocalizedFtpReply;
/**
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/HELP.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/HELP.java?rev=704228&r1=704227&r2=704228&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/HELP.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/HELP.java Mon Oct 13 13:12:08 2008
@@ -21,11 +21,11 @@
import java.io.IOException;
-import org.apache.ftpserver.FtpServerContext;
import org.apache.ftpserver.command.AbstractCommand;
import org.apache.ftpserver.ftplet.FtpReply;
import org.apache.ftpserver.ftplet.FtpRequest;
import org.apache.ftpserver.impl.FtpIoSession;
+import org.apache.ftpserver.impl.FtpServerContext;
import org.apache.ftpserver.impl.LocalizedFtpReply;
import org.apache.ftpserver.message.MessageResource;
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/LANG.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/LANG.java?rev=704228&r1=704227&r2=704228&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/LANG.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/LANG.java Mon Oct 13 13:12:08 2008
@@ -21,12 +21,12 @@
import java.io.IOException;
-import org.apache.ftpserver.FtpServerContext;
import org.apache.ftpserver.command.AbstractCommand;
import org.apache.ftpserver.ftplet.FtpException;
import org.apache.ftpserver.ftplet.FtpReply;
import org.apache.ftpserver.ftplet.FtpRequest;
import org.apache.ftpserver.impl.FtpIoSession;
+import org.apache.ftpserver.impl.FtpServerContext;
import org.apache.ftpserver.impl.LocalizedFtpReply;
import org.apache.ftpserver.message.MessageResource;
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/LIST.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/LIST.java?rev=704228&r1=704227&r2=704228&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/LIST.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/LIST.java Mon Oct 13 13:12:08 2008
@@ -23,7 +23,6 @@
import java.net.InetAddress;
import java.net.SocketException;
-import org.apache.ftpserver.FtpServerContext;
import org.apache.ftpserver.command.AbstractCommand;
import org.apache.ftpserver.command.impl.listing.DirectoryLister;
import org.apache.ftpserver.command.impl.listing.LISTFileFormater;
@@ -36,6 +35,7 @@
import org.apache.ftpserver.ftplet.FtpReply;
import org.apache.ftpserver.ftplet.FtpRequest;
import org.apache.ftpserver.impl.FtpIoSession;
+import org.apache.ftpserver.impl.FtpServerContext;
import org.apache.ftpserver.impl.IODataConnectionFactory;
import org.apache.ftpserver.impl.LocalizedFtpReply;
import org.slf4j.Logger;
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/MD5.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/MD5.java?rev=704228&r1=704227&r2=704228&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/MD5.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/MD5.java Mon Oct 13 13:12:08 2008
@@ -25,12 +25,12 @@
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
-import org.apache.ftpserver.FtpServerContext;
import org.apache.ftpserver.command.AbstractCommand;
import org.apache.ftpserver.ftplet.FtpFile;
import org.apache.ftpserver.ftplet.FtpReply;
import org.apache.ftpserver.ftplet.FtpRequest;
import org.apache.ftpserver.impl.FtpIoSession;
+import org.apache.ftpserver.impl.FtpServerContext;
import org.apache.ftpserver.impl.LocalizedFtpReply;
import org.apache.ftpserver.util.IoUtils;
import org.slf4j.Logger;
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/MDTM.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/MDTM.java?rev=704228&r1=704227&r2=704228&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/MDTM.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/MDTM.java Mon Oct 13 13:12:08 2008
@@ -21,13 +21,13 @@
import java.io.IOException;
-import org.apache.ftpserver.FtpServerContext;
import org.apache.ftpserver.command.AbstractCommand;
import org.apache.ftpserver.ftplet.FtpException;
import org.apache.ftpserver.ftplet.FtpFile;
import org.apache.ftpserver.ftplet.FtpReply;
import org.apache.ftpserver.ftplet.FtpRequest;
import org.apache.ftpserver.impl.FtpIoSession;
+import org.apache.ftpserver.impl.FtpServerContext;
import org.apache.ftpserver.impl.LocalizedFtpReply;
import org.apache.ftpserver.util.DateUtils;
import org.slf4j.Logger;
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/MKD.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/MKD.java?rev=704228&r1=704227&r2=704228&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/MKD.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/MKD.java Mon Oct 13 13:12:08 2008
@@ -22,13 +22,13 @@
import java.io.File;
import java.io.IOException;
-import org.apache.ftpserver.FtpServerContext;
import org.apache.ftpserver.command.AbstractCommand;
import org.apache.ftpserver.ftplet.FtpException;
import org.apache.ftpserver.ftplet.FtpFile;
import org.apache.ftpserver.ftplet.FtpReply;
import org.apache.ftpserver.ftplet.FtpRequest;
import org.apache.ftpserver.impl.FtpIoSession;
+import org.apache.ftpserver.impl.FtpServerContext;
import org.apache.ftpserver.impl.LocalizedFtpReply;
import org.apache.ftpserver.impl.ServerFtpStatistics;
import org.slf4j.Logger;
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/MLSD.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/MLSD.java?rev=704228&r1=704227&r2=704228&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/MLSD.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/MLSD.java Mon Oct 13 13:12:08 2008
@@ -23,7 +23,6 @@
import java.net.InetAddress;
import java.net.SocketException;
-import org.apache.ftpserver.FtpServerContext;
import org.apache.ftpserver.command.AbstractCommand;
import org.apache.ftpserver.command.impl.listing.DirectoryLister;
import org.apache.ftpserver.command.impl.listing.FileFormater;
@@ -37,6 +36,7 @@
import org.apache.ftpserver.ftplet.FtpReply;
import org.apache.ftpserver.ftplet.FtpRequest;
import org.apache.ftpserver.impl.FtpIoSession;
+import org.apache.ftpserver.impl.FtpServerContext;
import org.apache.ftpserver.impl.IODataConnectionFactory;
import org.apache.ftpserver.impl.LocalizedFtpReply;
import org.slf4j.Logger;
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/MLST.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/MLST.java?rev=704228&r1=704227&r2=704228&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/MLST.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/MLST.java Mon Oct 13 13:12:08 2008
@@ -21,7 +21,6 @@
import java.io.IOException;
-import org.apache.ftpserver.FtpServerContext;
import org.apache.ftpserver.command.AbstractCommand;
import org.apache.ftpserver.command.impl.listing.FileFormater;
import org.apache.ftpserver.command.impl.listing.ListArgument;
@@ -32,6 +31,7 @@
import org.apache.ftpserver.ftplet.FtpReply;
import org.apache.ftpserver.ftplet.FtpRequest;
import org.apache.ftpserver.impl.FtpIoSession;
+import org.apache.ftpserver.impl.FtpServerContext;
import org.apache.ftpserver.impl.LocalizedFtpReply;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/MODE.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/MODE.java?rev=704228&r1=704227&r2=704228&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/MODE.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/MODE.java Mon Oct 13 13:12:08 2008
@@ -21,11 +21,11 @@
import java.io.IOException;
-import org.apache.ftpserver.FtpServerContext;
import org.apache.ftpserver.command.AbstractCommand;
import org.apache.ftpserver.ftplet.FtpReply;
import org.apache.ftpserver.ftplet.FtpRequest;
import org.apache.ftpserver.impl.FtpIoSession;
+import org.apache.ftpserver.impl.FtpServerContext;
import org.apache.ftpserver.impl.LocalizedFtpReply;
/**
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/NLST.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/NLST.java?rev=704228&r1=704227&r2=704228&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/NLST.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/NLST.java Mon Oct 13 13:12:08 2008
@@ -23,7 +23,6 @@
import java.net.InetAddress;
import java.net.SocketException;
-import org.apache.ftpserver.FtpServerContext;
import org.apache.ftpserver.command.AbstractCommand;
import org.apache.ftpserver.command.impl.listing.DirectoryLister;
import org.apache.ftpserver.command.impl.listing.FileFormater;
@@ -38,6 +37,7 @@
import org.apache.ftpserver.ftplet.FtpReply;
import org.apache.ftpserver.ftplet.FtpRequest;
import org.apache.ftpserver.impl.FtpIoSession;
+import org.apache.ftpserver.impl.FtpServerContext;
import org.apache.ftpserver.impl.IODataConnectionFactory;
import org.apache.ftpserver.impl.LocalizedFtpReply;
import org.slf4j.Logger;
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/NOOP.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/NOOP.java?rev=704228&r1=704227&r2=704228&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/NOOP.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/NOOP.java Mon Oct 13 13:12:08 2008
@@ -21,12 +21,12 @@
import java.io.IOException;
-import org.apache.ftpserver.FtpServerContext;
import org.apache.ftpserver.command.AbstractCommand;
import org.apache.ftpserver.ftplet.FtpException;
import org.apache.ftpserver.ftplet.FtpReply;
import org.apache.ftpserver.ftplet.FtpRequest;
import org.apache.ftpserver.impl.FtpIoSession;
+import org.apache.ftpserver.impl.FtpServerContext;
import org.apache.ftpserver.impl.LocalizedFtpReply;
/**
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/OPTS.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/OPTS.java?rev=704228&r1=704227&r2=704228&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/OPTS.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/OPTS.java Mon Oct 13 13:12:08 2008
@@ -22,13 +22,13 @@
import java.io.IOException;
import java.util.HashMap;
-import org.apache.ftpserver.FtpServerContext;
import org.apache.ftpserver.command.AbstractCommand;
import org.apache.ftpserver.command.Command;
import org.apache.ftpserver.ftplet.FtpException;
import org.apache.ftpserver.ftplet.FtpReply;
import org.apache.ftpserver.ftplet.FtpRequest;
import org.apache.ftpserver.impl.FtpIoSession;
+import org.apache.ftpserver.impl.FtpServerContext;
import org.apache.ftpserver.impl.LocalizedFtpReply;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/OPTS_MLST.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/OPTS_MLST.java?rev=704228&r1=704227&r2=704228&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/OPTS_MLST.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/OPTS_MLST.java Mon Oct 13 13:12:08 2008
@@ -22,12 +22,12 @@
import java.io.IOException;
import java.util.StringTokenizer;
-import org.apache.ftpserver.FtpServerContext;
import org.apache.ftpserver.command.AbstractCommand;
import org.apache.ftpserver.ftplet.FtpException;
import org.apache.ftpserver.ftplet.FtpReply;
import org.apache.ftpserver.ftplet.FtpRequest;
import org.apache.ftpserver.impl.FtpIoSession;
+import org.apache.ftpserver.impl.FtpServerContext;
import org.apache.ftpserver.impl.LocalizedFtpReply;
/**
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/OPTS_UTF8.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/OPTS_UTF8.java?rev=704228&r1=704227&r2=704228&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/OPTS_UTF8.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/OPTS_UTF8.java Mon Oct 13 13:12:08 2008
@@ -21,12 +21,12 @@
import java.io.IOException;
-import org.apache.ftpserver.FtpServerContext;
import org.apache.ftpserver.command.AbstractCommand;
import org.apache.ftpserver.ftplet.FtpException;
import org.apache.ftpserver.ftplet.FtpReply;
import org.apache.ftpserver.ftplet.FtpRequest;
import org.apache.ftpserver.impl.FtpIoSession;
+import org.apache.ftpserver.impl.FtpServerContext;
import org.apache.ftpserver.impl.LocalizedFtpReply;
/**
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/PASS.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/PASS.java?rev=704228&r1=704227&r2=704228&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/PASS.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/PASS.java Mon Oct 13 13:12:08 2008
@@ -22,7 +22,6 @@
import java.io.IOException;
import java.net.InetSocketAddress;
-import org.apache.ftpserver.FtpServerContext;
import org.apache.ftpserver.command.AbstractCommand;
import org.apache.ftpserver.ftplet.Authentication;
import org.apache.ftpserver.ftplet.AuthenticationFailedException;
@@ -34,6 +33,7 @@
import org.apache.ftpserver.ftplet.User;
import org.apache.ftpserver.ftplet.UserManager;
import org.apache.ftpserver.impl.FtpIoSession;
+import org.apache.ftpserver.impl.FtpServerContext;
import org.apache.ftpserver.impl.LocalizedFtpReply;
import org.apache.ftpserver.impl.ServerFtpStatistics;
import org.apache.ftpserver.usermanager.AnonymousAuthentication;
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/PASV.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/PASV.java?rev=704228&r1=704227&r2=704228&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/PASV.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/PASV.java Mon Oct 13 13:12:08 2008
@@ -24,12 +24,12 @@
import java.net.InetSocketAddress;
import org.apache.ftpserver.DataConnectionException;
-import org.apache.ftpserver.FtpServerContext;
import org.apache.ftpserver.command.AbstractCommand;
import org.apache.ftpserver.ftplet.FtpException;
import org.apache.ftpserver.ftplet.FtpReply;
import org.apache.ftpserver.ftplet.FtpRequest;
import org.apache.ftpserver.impl.FtpIoSession;
+import org.apache.ftpserver.impl.FtpServerContext;
import org.apache.ftpserver.impl.LocalizedFtpReply;
import org.apache.ftpserver.impl.ServerDataConnectionFactory;
import org.apache.ftpserver.util.SocketAddressEncoder;
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/PBSZ.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/PBSZ.java?rev=704228&r1=704227&r2=704228&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/PBSZ.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/PBSZ.java Mon Oct 13 13:12:08 2008
@@ -21,12 +21,12 @@
import java.io.IOException;
-import org.apache.ftpserver.FtpServerContext;
import org.apache.ftpserver.command.AbstractCommand;
import org.apache.ftpserver.ftplet.FtpException;
import org.apache.ftpserver.ftplet.FtpReply;
import org.apache.ftpserver.ftplet.FtpRequest;
import org.apache.ftpserver.impl.FtpIoSession;
+import org.apache.ftpserver.impl.FtpServerContext;
import org.apache.ftpserver.impl.LocalizedFtpReply;
/**
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/PORT.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/PORT.java?rev=704228&r1=704227&r2=704228&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/PORT.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/PORT.java Mon Oct 13 13:12:08 2008
@@ -25,11 +25,11 @@
import java.net.UnknownHostException;
import org.apache.ftpserver.DataConnectionConfiguration;
-import org.apache.ftpserver.FtpServerContext;
import org.apache.ftpserver.command.AbstractCommand;
import org.apache.ftpserver.ftplet.FtpReply;
import org.apache.ftpserver.ftplet.FtpRequest;
import org.apache.ftpserver.impl.FtpIoSession;
+import org.apache.ftpserver.impl.FtpServerContext;
import org.apache.ftpserver.impl.LocalizedFtpReply;
import org.apache.ftpserver.util.IllegalInetAddressException;
import org.apache.ftpserver.util.IllegalPortException;
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/PROT.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/PROT.java?rev=704228&r1=704227&r2=704228&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/PROT.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/PROT.java Mon Oct 13 13:12:08 2008
@@ -21,12 +21,12 @@
import java.io.IOException;
-import org.apache.ftpserver.FtpServerContext;
import org.apache.ftpserver.command.AbstractCommand;
import org.apache.ftpserver.ftplet.FtpException;
import org.apache.ftpserver.ftplet.FtpReply;
import org.apache.ftpserver.ftplet.FtpRequest;
import org.apache.ftpserver.impl.FtpIoSession;
+import org.apache.ftpserver.impl.FtpServerContext;
import org.apache.ftpserver.impl.LocalizedFtpReply;
import org.apache.ftpserver.impl.ServerDataConnectionFactory;
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/PWD.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/PWD.java?rev=704228&r1=704227&r2=704228&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/PWD.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/PWD.java Mon Oct 13 13:12:08 2008
@@ -21,13 +21,13 @@
import java.io.IOException;
-import org.apache.ftpserver.FtpServerContext;
import org.apache.ftpserver.command.AbstractCommand;
import org.apache.ftpserver.ftplet.FileSystemView;
import org.apache.ftpserver.ftplet.FtpException;
import org.apache.ftpserver.ftplet.FtpReply;
import org.apache.ftpserver.ftplet.FtpRequest;
import org.apache.ftpserver.impl.FtpIoSession;
+import org.apache.ftpserver.impl.FtpServerContext;
import org.apache.ftpserver.impl.LocalizedFtpReply;
/**
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/QUIT.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/QUIT.java?rev=704228&r1=704227&r2=704228&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/QUIT.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/QUIT.java Mon Oct 13 13:12:08 2008
@@ -21,11 +21,11 @@
import java.io.IOException;
-import org.apache.ftpserver.FtpServerContext;
import org.apache.ftpserver.command.AbstractCommand;
import org.apache.ftpserver.ftplet.FtpReply;
import org.apache.ftpserver.ftplet.FtpRequest;
import org.apache.ftpserver.impl.FtpIoSession;
+import org.apache.ftpserver.impl.FtpServerContext;
import org.apache.ftpserver.impl.LocalizedFtpReply;
/**
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/REIN.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/REIN.java?rev=704228&r1=704227&r2=704228&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/REIN.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/REIN.java Mon Oct 13 13:12:08 2008
@@ -21,11 +21,11 @@
import java.io.IOException;
-import org.apache.ftpserver.FtpServerContext;
import org.apache.ftpserver.command.AbstractCommand;
import org.apache.ftpserver.ftplet.FtpReply;
import org.apache.ftpserver.ftplet.FtpRequest;
import org.apache.ftpserver.impl.FtpIoSession;
+import org.apache.ftpserver.impl.FtpServerContext;
import org.apache.ftpserver.impl.LocalizedFtpReply;
/**
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/REST.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/REST.java?rev=704228&r1=704227&r2=704228&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/REST.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/REST.java Mon Oct 13 13:12:08 2008
@@ -21,11 +21,11 @@
import java.io.IOException;
-import org.apache.ftpserver.FtpServerContext;
import org.apache.ftpserver.command.AbstractCommand;
import org.apache.ftpserver.ftplet.FtpReply;
import org.apache.ftpserver.ftplet.FtpRequest;
import org.apache.ftpserver.impl.FtpIoSession;
+import org.apache.ftpserver.impl.FtpServerContext;
import org.apache.ftpserver.impl.LocalizedFtpReply;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/RETR.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/RETR.java?rev=704228&r1=704227&r2=704228&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/RETR.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/RETR.java Mon Oct 13 13:12:08 2008
@@ -25,7 +25,6 @@
import java.net.InetAddress;
import java.net.SocketException;
-import org.apache.ftpserver.FtpServerContext;
import org.apache.ftpserver.command.AbstractCommand;
import org.apache.ftpserver.ftplet.DataConnection;
import org.apache.ftpserver.ftplet.DataConnectionFactory;
@@ -36,6 +35,7 @@
import org.apache.ftpserver.ftplet.FtpReply;
import org.apache.ftpserver.ftplet.FtpRequest;
import org.apache.ftpserver.impl.FtpIoSession;
+import org.apache.ftpserver.impl.FtpServerContext;
import org.apache.ftpserver.impl.IODataConnectionFactory;
import org.apache.ftpserver.impl.LocalizedFtpReply;
import org.apache.ftpserver.impl.ServerFtpStatistics;
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/RMD.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/RMD.java?rev=704228&r1=704227&r2=704228&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/RMD.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/RMD.java Mon Oct 13 13:12:08 2008
@@ -21,13 +21,13 @@
import java.io.IOException;
-import org.apache.ftpserver.FtpServerContext;
import org.apache.ftpserver.command.AbstractCommand;
import org.apache.ftpserver.ftplet.FtpException;
import org.apache.ftpserver.ftplet.FtpFile;
import org.apache.ftpserver.ftplet.FtpReply;
import org.apache.ftpserver.ftplet.FtpRequest;
import org.apache.ftpserver.impl.FtpIoSession;
+import org.apache.ftpserver.impl.FtpServerContext;
import org.apache.ftpserver.impl.LocalizedFtpReply;
import org.apache.ftpserver.impl.ServerFtpStatistics;
import org.slf4j.Logger;
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/RNFR.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/RNFR.java?rev=704228&r1=704227&r2=704228&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/RNFR.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/RNFR.java Mon Oct 13 13:12:08 2008
@@ -21,13 +21,13 @@
import java.io.IOException;
-import org.apache.ftpserver.FtpServerContext;
import org.apache.ftpserver.command.AbstractCommand;
import org.apache.ftpserver.ftplet.FtpException;
import org.apache.ftpserver.ftplet.FtpFile;
import org.apache.ftpserver.ftplet.FtpReply;
import org.apache.ftpserver.ftplet.FtpRequest;
import org.apache.ftpserver.impl.FtpIoSession;
+import org.apache.ftpserver.impl.FtpServerContext;
import org.apache.ftpserver.impl.LocalizedFtpReply;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/RNTO.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/RNTO.java?rev=704228&r1=704227&r2=704228&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/RNTO.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/RNTO.java Mon Oct 13 13:12:08 2008
@@ -21,13 +21,13 @@
import java.io.IOException;
-import org.apache.ftpserver.FtpServerContext;
import org.apache.ftpserver.command.AbstractCommand;
import org.apache.ftpserver.ftplet.FtpException;
import org.apache.ftpserver.ftplet.FtpFile;
import org.apache.ftpserver.ftplet.FtpReply;
import org.apache.ftpserver.ftplet.FtpRequest;
import org.apache.ftpserver.impl.FtpIoSession;
+import org.apache.ftpserver.impl.FtpServerContext;
import org.apache.ftpserver.impl.LocalizedFtpReply;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/SITE.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/SITE.java?rev=704228&r1=704227&r2=704228&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/SITE.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/SITE.java Mon Oct 13 13:12:08 2008
@@ -22,13 +22,13 @@
import java.io.IOException;
import java.util.HashMap;
-import org.apache.ftpserver.FtpServerContext;
import org.apache.ftpserver.command.AbstractCommand;
import org.apache.ftpserver.command.Command;
import org.apache.ftpserver.ftplet.FtpException;
import org.apache.ftpserver.ftplet.FtpReply;
import org.apache.ftpserver.ftplet.FtpRequest;
import org.apache.ftpserver.impl.FtpIoSession;
+import org.apache.ftpserver.impl.FtpServerContext;
import org.apache.ftpserver.impl.LocalizedFtpReply;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/SITE_DESCUSER.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/SITE_DESCUSER.java?rev=704228&r1=704227&r2=704228&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/SITE_DESCUSER.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/SITE_DESCUSER.java Mon Oct 13 13:12:08 2008
@@ -21,7 +21,6 @@
import java.io.IOException;
-import org.apache.ftpserver.FtpServerContext;
import org.apache.ftpserver.command.AbstractCommand;
import org.apache.ftpserver.ftplet.DefaultFtpReply;
import org.apache.ftpserver.ftplet.FtpException;
@@ -30,6 +29,7 @@
import org.apache.ftpserver.ftplet.User;
import org.apache.ftpserver.ftplet.UserManager;
import org.apache.ftpserver.impl.FtpIoSession;
+import org.apache.ftpserver.impl.FtpServerContext;
import org.apache.ftpserver.impl.LocalizedFtpReply;
import org.apache.ftpserver.usermanager.impl.TransferRateRequest;
import org.apache.ftpserver.usermanager.impl.WriteRequest;
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/SITE_HELP.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/SITE_HELP.java?rev=704228&r1=704227&r2=704228&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/SITE_HELP.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/SITE_HELP.java Mon Oct 13 13:12:08 2008
@@ -21,12 +21,12 @@
import java.io.IOException;
-import org.apache.ftpserver.FtpServerContext;
import org.apache.ftpserver.command.AbstractCommand;
import org.apache.ftpserver.ftplet.FtpException;
import org.apache.ftpserver.ftplet.FtpReply;
import org.apache.ftpserver.ftplet.FtpRequest;
import org.apache.ftpserver.impl.FtpIoSession;
+import org.apache.ftpserver.impl.FtpServerContext;
import org.apache.ftpserver.impl.LocalizedFtpReply;
/**
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/SITE_STAT.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/SITE_STAT.java?rev=704228&r1=704227&r2=704228&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/SITE_STAT.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/SITE_STAT.java Mon Oct 13 13:12:08 2008
@@ -21,7 +21,6 @@
import java.io.IOException;
-import org.apache.ftpserver.FtpServerContext;
import org.apache.ftpserver.command.AbstractCommand;
import org.apache.ftpserver.ftplet.DefaultFtpReply;
import org.apache.ftpserver.ftplet.FtpException;
@@ -30,6 +29,7 @@
import org.apache.ftpserver.ftplet.FtpStatistics;
import org.apache.ftpserver.ftplet.UserManager;
import org.apache.ftpserver.impl.FtpIoSession;
+import org.apache.ftpserver.impl.FtpServerContext;
import org.apache.ftpserver.impl.LocalizedFtpReply;
import org.apache.ftpserver.util.DateUtils;
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/SITE_WHO.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/SITE_WHO.java?rev=704228&r1=704227&r2=704228&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/SITE_WHO.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/SITE_WHO.java Mon Oct 13 13:12:08 2008
@@ -24,7 +24,6 @@
import java.util.Iterator;
import java.util.Map;
-import org.apache.ftpserver.FtpServerContext;
import org.apache.ftpserver.command.AbstractCommand;
import org.apache.ftpserver.ftplet.DefaultFtpReply;
import org.apache.ftpserver.ftplet.FtpException;
@@ -33,6 +32,7 @@
import org.apache.ftpserver.ftplet.User;
import org.apache.ftpserver.ftplet.UserManager;
import org.apache.ftpserver.impl.FtpIoSession;
+import org.apache.ftpserver.impl.FtpServerContext;
import org.apache.ftpserver.impl.LocalizedFtpReply;
import org.apache.ftpserver.util.DateUtils;
import org.apache.ftpserver.util.StringUtils;
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/SITE_ZONE.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/SITE_ZONE.java?rev=704228&r1=704227&r2=704228&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/SITE_ZONE.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/SITE_ZONE.java Mon Oct 13 13:12:08 2008
@@ -23,13 +23,13 @@
import java.text.SimpleDateFormat;
import java.util.Date;
-import org.apache.ftpserver.FtpServerContext;
import org.apache.ftpserver.command.AbstractCommand;
import org.apache.ftpserver.ftplet.DefaultFtpReply;
import org.apache.ftpserver.ftplet.FtpException;
import org.apache.ftpserver.ftplet.FtpReply;
import org.apache.ftpserver.ftplet.FtpRequest;
import org.apache.ftpserver.impl.FtpIoSession;
+import org.apache.ftpserver.impl.FtpServerContext;
/**
* Displays the FTP server timezone in RFC 822 format.
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/SIZE.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/SIZE.java?rev=704228&r1=704227&r2=704228&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/SIZE.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/SIZE.java Mon Oct 13 13:12:08 2008
@@ -21,13 +21,13 @@
import java.io.IOException;
-import org.apache.ftpserver.FtpServerContext;
import org.apache.ftpserver.command.AbstractCommand;
import org.apache.ftpserver.ftplet.FtpException;
import org.apache.ftpserver.ftplet.FtpFile;
import org.apache.ftpserver.ftplet.FtpReply;
import org.apache.ftpserver.ftplet.FtpRequest;
import org.apache.ftpserver.impl.FtpIoSession;
+import org.apache.ftpserver.impl.FtpServerContext;
import org.apache.ftpserver.impl.LocalizedFtpReply;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/STAT.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/STAT.java?rev=704228&r1=704227&r2=704228&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/STAT.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/STAT.java Mon Oct 13 13:12:08 2008
@@ -21,11 +21,11 @@
import java.io.IOException;
-import org.apache.ftpserver.FtpServerContext;
import org.apache.ftpserver.command.AbstractCommand;
import org.apache.ftpserver.ftplet.FtpReply;
import org.apache.ftpserver.ftplet.FtpRequest;
import org.apache.ftpserver.impl.FtpIoSession;
+import org.apache.ftpserver.impl.FtpServerContext;
import org.apache.ftpserver.impl.LocalizedFtpReply;
/**
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/STOR.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/STOR.java?rev=704228&r1=704227&r2=704228&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/STOR.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/STOR.java Mon Oct 13 13:12:08 2008
@@ -24,7 +24,6 @@
import java.net.InetAddress;
import java.net.SocketException;
-import org.apache.ftpserver.FtpServerContext;
import org.apache.ftpserver.command.AbstractCommand;
import org.apache.ftpserver.ftplet.DataConnection;
import org.apache.ftpserver.ftplet.DataConnectionFactory;
@@ -34,6 +33,7 @@
import org.apache.ftpserver.ftplet.FtpReply;
import org.apache.ftpserver.ftplet.FtpRequest;
import org.apache.ftpserver.impl.FtpIoSession;
+import org.apache.ftpserver.impl.FtpServerContext;
import org.apache.ftpserver.impl.IODataConnectionFactory;
import org.apache.ftpserver.impl.LocalizedFtpReply;
import org.apache.ftpserver.impl.ServerFtpStatistics;
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/STOU.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/STOU.java?rev=704228&r1=704227&r2=704228&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/STOU.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/STOU.java Mon Oct 13 13:12:08 2008
@@ -24,7 +24,6 @@
import java.net.InetAddress;
import java.net.SocketException;
-import org.apache.ftpserver.FtpServerContext;
import org.apache.ftpserver.command.AbstractCommand;
import org.apache.ftpserver.ftplet.DataConnection;
import org.apache.ftpserver.ftplet.DataConnectionFactory;
@@ -35,6 +34,7 @@
import org.apache.ftpserver.ftplet.FtpReply;
import org.apache.ftpserver.ftplet.FtpRequest;
import org.apache.ftpserver.impl.FtpIoSession;
+import org.apache.ftpserver.impl.FtpServerContext;
import org.apache.ftpserver.impl.IODataConnectionFactory;
import org.apache.ftpserver.impl.LocalizedFtpReply;
import org.apache.ftpserver.impl.ServerFtpStatistics;
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/STRU.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/STRU.java?rev=704228&r1=704227&r2=704228&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/STRU.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/STRU.java Mon Oct 13 13:12:08 2008
@@ -21,12 +21,12 @@
import java.io.IOException;
-import org.apache.ftpserver.FtpServerContext;
import org.apache.ftpserver.command.AbstractCommand;
import org.apache.ftpserver.ftplet.FtpReply;
import org.apache.ftpserver.ftplet.FtpRequest;
import org.apache.ftpserver.ftplet.Structure;
import org.apache.ftpserver.impl.FtpIoSession;
+import org.apache.ftpserver.impl.FtpServerContext;
import org.apache.ftpserver.impl.LocalizedFtpReply;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/SYST.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/SYST.java?rev=704228&r1=704227&r2=704228&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/SYST.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/SYST.java Mon Oct 13 13:12:08 2008
@@ -21,11 +21,11 @@
import java.io.IOException;
-import org.apache.ftpserver.FtpServerContext;
import org.apache.ftpserver.command.AbstractCommand;
import org.apache.ftpserver.ftplet.FtpReply;
import org.apache.ftpserver.ftplet.FtpRequest;
import org.apache.ftpserver.impl.FtpIoSession;
+import org.apache.ftpserver.impl.FtpServerContext;
import org.apache.ftpserver.impl.LocalizedFtpReply;
/**
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/TYPE.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/TYPE.java?rev=704228&r1=704227&r2=704228&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/TYPE.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/TYPE.java Mon Oct 13 13:12:08 2008
@@ -21,12 +21,12 @@
import java.io.IOException;
-import org.apache.ftpserver.FtpServerContext;
import org.apache.ftpserver.command.AbstractCommand;
import org.apache.ftpserver.ftplet.DataType;
import org.apache.ftpserver.ftplet.FtpReply;
import org.apache.ftpserver.ftplet.FtpRequest;
import org.apache.ftpserver.impl.FtpIoSession;
+import org.apache.ftpserver.impl.FtpServerContext;
import org.apache.ftpserver.impl.LocalizedFtpReply;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/USER.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/USER.java?rev=704228&r1=704227&r2=704228&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/USER.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/USER.java Mon Oct 13 13:12:08 2008
@@ -23,13 +23,13 @@
import java.net.InetAddress;
import java.net.InetSocketAddress;
-import org.apache.ftpserver.FtpServerContext;
import org.apache.ftpserver.command.AbstractCommand;
import org.apache.ftpserver.ftplet.FtpException;
import org.apache.ftpserver.ftplet.FtpReply;
import org.apache.ftpserver.ftplet.FtpRequest;
import org.apache.ftpserver.ftplet.User;
import org.apache.ftpserver.impl.FtpIoSession;
+import org.apache.ftpserver.impl.FtpServerContext;
import org.apache.ftpserver.impl.LocalizedFtpReply;
import org.apache.ftpserver.impl.ServerFtpStatistics;
import org.apache.ftpserver.usermanager.impl.ConcurrentLoginRequest;
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/config/spring/ListenerBeanDefinitionParser.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/config/spring/ListenerBeanDefinitionParser.java?rev=704228&r1=704227&r2=704228&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/config/spring/ListenerBeanDefinitionParser.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/config/spring/ListenerBeanDefinitionParser.java Mon Oct 13 13:12:08 2008
@@ -34,6 +34,7 @@
import org.apache.mina.filter.firewall.Subnet;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.beans.factory.config.BeanDefinitionHolder;
import org.springframework.beans.factory.support.BeanDefinitionBuilder;
import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser;
@@ -152,11 +153,11 @@
factoryBuilder.addPropertyValue("blockedSubnets", subnets);
}
- String listenerName = element.getAttribute("name");
- // TODO Investigate how to make unique
- String listenerFactoryName = listenerName + "-factory";
+ BeanDefinition factoryDefinition = factoryBuilder.getBeanDefinition();
+
+ String listenerFactoryName = parserContext.getReaderContext().generateBeanName(factoryDefinition);
- BeanDefinitionHolder factoryHolder = new BeanDefinitionHolder(factoryBuilder.getBeanDefinition(), listenerFactoryName);
+ BeanDefinitionHolder factoryHolder = new BeanDefinitionHolder(factoryDefinition, listenerFactoryName);
registerBeanDefinition(factoryHolder, parserContext.getRegistry());
// set the factory on the listener bean
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/config/spring/ServerBeanDefinitionParser.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/config/spring/ServerBeanDefinitionParser.java?rev=704228&r1=704227&r2=704228&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/config/spring/ServerBeanDefinitionParser.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/config/spring/ServerBeanDefinitionParser.java Mon Oct 13 13:12:08 2008
@@ -26,8 +26,13 @@
import org.apache.ftpserver.DefaultConnectionConfig;
import org.apache.ftpserver.FtpServer;
import org.apache.ftpserver.FtpServerConfigurationException;
+import org.apache.ftpserver.FtpServerFactory;
+import org.apache.ftpserver.impl.DefaultFtpServer;
+import org.apache.ftpserver.listener.ListenerFactory;
import org.apache.ftpserver.message.MessageResource;
import org.apache.ftpserver.message.MessageResourceFactory;
+import org.springframework.beans.factory.config.BeanDefinition;
+import org.springframework.beans.factory.config.BeanDefinitionHolder;
import org.springframework.beans.factory.support.BeanDefinitionBuilder;
import org.springframework.beans.factory.support.ManagedMap;
import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser;
@@ -48,7 +53,7 @@
* {@inheritDoc}
*/
protected Class<? extends FtpServer> getBeanClass(final Element element) {
- return FtpServer.class;
+ return null;
}
/**
@@ -58,6 +63,9 @@
protected void doParse(final Element element,
final ParserContext parserContext,
final BeanDefinitionBuilder builder) {
+
+ BeanDefinitionBuilder factoryBuilder = BeanDefinitionBuilder.genericBeanDefinition(FtpServerFactory.class);
+
List<Element> childs = SpringUtil.getChildElements(element);
for (Element childElm : childs) {
String childName = childElm.getLocalName();
@@ -66,39 +74,39 @@
Map listeners = parseListeners(childElm, parserContext, builder);
if (listeners.size() > 0) {
- builder.addPropertyValue("listeners", listeners);
+ factoryBuilder.addPropertyValue("listeners", listeners);
}
} else if ("ftplets".equals(childName)) {
Map ftplets = parseFtplets(childElm, parserContext, builder);
- builder.addPropertyValue("ftplets", ftplets);
+ factoryBuilder.addPropertyValue("ftplets", ftplets);
} else if ("file-user-manager".equals(childName)
|| "db-user-manager".equals(childName)) {
Object userManager = parserContext.getDelegate()
.parseCustomElement(childElm,
builder.getBeanDefinition());
- builder.addPropertyValue("userManager", userManager);
+ factoryBuilder.addPropertyValue("userManager", userManager);
} else if ("user-manager".equals(childName)) {
- builder.addPropertyValue("userManager", SpringUtil
+ factoryBuilder.addPropertyValue("userManager", SpringUtil
.parseSpringChildElement(childElm, parserContext,
builder));
} else if ("native-filesystem".equals(childName)) {
Object fileSystem = parserContext.getDelegate()
.parseCustomElement(childElm,
builder.getBeanDefinition());
- builder.addPropertyValue("fileSystem", fileSystem);
+ factoryBuilder.addPropertyValue("fileSystem", fileSystem);
} else if ("filesystem".equals(childName)) {
- builder.addPropertyValue("fileSystem", SpringUtil
+ factoryBuilder.addPropertyValue("fileSystem", SpringUtil
.parseSpringChildElement(childElm, parserContext,
builder));
} else if ("commands".equals(childName)) {
Object commandFactory = parserContext.getDelegate()
.parseCustomElement(childElm,
builder.getBeanDefinition());
- builder.addPropertyValue("commandFactory", commandFactory);
+ factoryBuilder.addPropertyValue("commandFactory", commandFactory);
} else if ("messages".equals(childName)) {
MessageResource mr = parseMessageResource(childElm,
parserContext, builder);
- builder.addPropertyValue("messageResource", mr);
+ factoryBuilder.addPropertyValue("messageResource", mr);
} else {
throw new FtpServerConfigurationException(
@@ -129,7 +137,19 @@
"login-failure-delay"));
}
- builder.addPropertyValue("connectionConfig", connectionConfig);
+ factoryBuilder.addPropertyValue("connectionConfig", connectionConfig);
+
+
+ BeanDefinition factoryDefinition = factoryBuilder.getBeanDefinition();
+
+ String factoryName = parserContext.getReaderContext().generateBeanName(factoryDefinition);
+
+ BeanDefinitionHolder factoryHolder = new BeanDefinitionHolder(factoryDefinition, factoryName);
+ registerBeanDefinition(factoryHolder, parserContext.getRegistry());
+
+ // set the factory on the listener bean
+ builder.getRawBeanDefinition().setFactoryBeanName(factoryName);
+ builder.getRawBeanDefinition().setFactoryMethodName("createServer");
}
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/impl/DefaultFtpHandler.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/impl/DefaultFtpHandler.java?rev=704228&r1=704227&r2=704228&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/impl/DefaultFtpHandler.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/impl/DefaultFtpHandler.java Mon Oct 13 13:12:08 2008
@@ -21,8 +21,6 @@
import java.io.IOException;
-import org.apache.ftpserver.FtpHandler;
-import org.apache.ftpserver.FtpServerContext;
import org.apache.ftpserver.command.Command;
import org.apache.ftpserver.command.CommandFactory;
import org.apache.ftpserver.ftplet.FtpReply;