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/03/31 23:00:09 UTC
svn commit: r643147 - in /mina/ftpserver/trunk/core/src:
main/java/org/apache/ftpserver/ main/java/org/apache/ftpserver/command/
main/java/org/apache/ftpserver/filesystem/
main/java/org/apache/ftpserver/interfaces/
main/java/org/apache/ftpserver/messag...
Author: ngn
Date: Mon Mar 31 14:00:04 2008
New Revision: 643147
URL: http://svn.apache.org/viewvc?rev=643147&view=rev
Log:
Tests now set up FtpServer using the Java API rather than configuration
Modified:
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/ConfigurableFtpServerContext.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/DefaultDataConnectionConfig.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/DefaultFtpServerContext.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/STOR.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/filesystem/NativeFileSystemManager.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/interfaces/FtpServerContext.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/message/MessageResourceImpl.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/CustomMaxLoginTest.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/UnlimitedMaxLoginTest.java
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/filesystem/FileSystemViewTemplate.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
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/ConfigurableFtpServerContext.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/ConfigurableFtpServerContext.java?rev=643147&r1=643146&r2=643147&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/ConfigurableFtpServerContext.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/ConfigurableFtpServerContext.java Mon Mar 31 14:00:04 2008
@@ -273,8 +273,8 @@
/**
* Get ftplet handler.
*/
- public Ftplet getFtpletContainer() {
- return (Ftplet) ftpletContainerBean.getBean();
+ public FtpletContainer getFtpletContainer() {
+ return (FtpletContainer) ftpletContainerBean.getBean();
}
/**
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/DefaultDataConnectionConfig.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/DefaultDataConnectionConfig.java?rev=643147&r1=643146&r2=643147&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/DefaultDataConnectionConfig.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/DefaultDataConnectionConfig.java Mon Mar 31 14:00:04 2008
@@ -163,10 +163,26 @@
}
/**
+ * Set the passive host
+ * @param address The passive host
+ */
+ public void setPassiveAddress(InetAddress address) {
+ passive.setAddress(address);
+ }
+
+ /**
* Get external passive host.
*/
public InetAddress getPassiveExernalAddress() {
return passive.getExternalAddress();
+ }
+
+ /**
+ * Set the passive external host
+ * @param address The passive external host
+ */
+ public void setPassiveExernalAddress(InetAddress address) {
+ passive.setExternalAddress(address);
}
/**
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=643147&r1=643146&r2=643147&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 Mon Mar 31 14:00:04 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;
@@ -51,277 +51,279 @@
import org.slf4j.LoggerFactory;
/**
- * FTP server configuration implementation. It holds all
- * the components used.
+ * FTP server configuration implementation. It holds all the components used.
*/
public class DefaultFtpServerContext implements FtpServerContext {
- private final Logger LOG = LoggerFactory.getLogger(DefaultFtpServerContext.class);
-
- private MessageResource messageResource;
- private IpRestrictor ipRestrictor;
- private UserManager userManager;
- private FileSystemManager fileSystemManager;
- private FtpletContainer ftpletContainer;
- private FtpStatistics statistics;
- private CommandFactory commandFactory;
- 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)
- };
-
- /**
- * Constructor - set the root configuration.
- */
- public DefaultFtpServerContext() throws Exception {
- this(true);
- }
-
- public DefaultFtpServerContext(boolean createDefaultUsers) throws Exception {
-
- try {
- createListeners();
-
- // create all the components
- messageResource = new MessageResourceImpl();
- ((MessageResourceImpl)messageResource).configure(EmptyConfiguration.INSTANCE);
-
- ipRestrictor = new FileIpRestrictor();
- ((FileIpRestrictor)ipRestrictor).configure(EmptyConfiguration.INSTANCE);
-
- userManager = new PropertiesUserManager();
- ((PropertiesUserManager)userManager).configure();
-
- fileSystemManager = new NativeFileSystemManager();
- ((NativeFileSystemManager)fileSystemManager).configure(EmptyConfiguration.INSTANCE);
-
- statistics = new FtpStatisticsImpl();
- ((FtpStatisticsImpl)statistics).configure(EmptyConfiguration.INSTANCE);
-
- commandFactory = new DefaultCommandFactory();
- ((DefaultCommandFactory)commandFactory).configure(EmptyConfiguration.INSTANCE);
-
- // create user if necessary
- if(createDefaultUsers) {
- createDefaultUsers();
- }
-
- ftpletContainer = new DefaultFtpletContainer();
- ((DefaultFtpletContainer)ftpletContainer).configure(EmptyConfiguration.INSTANCE);
- }
- catch(Exception ex) {
- dispose();
- throw ex;
- }
- }
-
- private void createListeners() throws Exception {
- listeners.put("default", new MinaListener());
- }
-
-
- /**
- * Create default users.
- */
- private 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 IP restrictor.
- */
- public IpRestrictor getIpRestrictor() {
- return ipRestrictor;
- }
-
- /**
- * 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 Ftplet 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()) {
- Bean listenerBean = (Bean) listenerIter.next();
- listenerBean.destroyBean();
- }
-
-// Iterator listenerIter = listeners.values().iterator();
-// while (listenerIter.hasNext()) {
-// Listener listenerBean = (Listener) listenerIter.next();
-// listenerBean.stop();
-// }
-
-
- if(ftpletContainer != null && ftpletContainer instanceof Component) {
- ((Component)ftpletContainer).dispose();
- }
-
- if(userManager != null && userManager instanceof Component) {
- ((Component)userManager).dispose();
- }
-
- if(ipRestrictor != null && ipRestrictor instanceof Component) {
- ((Component)ipRestrictor).dispose();
- }
-
- if(fileSystemManager != null && fileSystemManager instanceof Component) {
- ((Component)fileSystemManager).dispose();
- }
-
- if(statistics != null && statistics instanceof Component) {
- ((Component)statistics).dispose();
- }
-
- if(messageResource != null && messageResource instanceof Component) {
- ((Component)messageResource).dispose();
- }
- }
-
- public Listener getListener(String name) {
- return listeners.get(name);
- }
-
- public Listener[] getAllListeners() {
- Collection<Listener> listenerList = listeners.values();
-
- Listener[] listenerArray = new Listener[0];
-
- return listenerList.toArray(listenerArray);
- }
-
- 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 setIpRestrictor(IpRestrictor ipRestrictor) {
- this.ipRestrictor = ipRestrictor;
- }
- public void setMessageResource(MessageResource messageResource) {
- this.messageResource = messageResource;
- }
- public void setUserManager(UserManager userManager) {
- this.userManager = userManager;
- }
+ private final Logger LOG = LoggerFactory
+ .getLogger(DefaultFtpServerContext.class);
+
+ private MessageResource messageResource;
+ private IpRestrictor ipRestrictor;
+ private UserManager userManager;
+ private FileSystemManager fileSystemManager;
+ private FtpletContainer ftpletContainer;
+ private FtpStatistics statistics;
+ private CommandFactory commandFactory;
+ 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) };
+
+ /**
+ * Constructor - set the root configuration.
+ */
+ public DefaultFtpServerContext() throws Exception {
+ this(true);
+ }
+
+ public DefaultFtpServerContext(boolean createDefaultUsers) throws Exception {
+
+ try {
+ createListeners();
+
+ // create all the components
+ messageResource = new MessageResourceImpl();
+ ((MessageResourceImpl) messageResource)
+ .configure();
+
+ ipRestrictor = new FileIpRestrictor();
+ ((FileIpRestrictor) ipRestrictor)
+ .configure(EmptyConfiguration.INSTANCE);
+
+ userManager = new PropertiesUserManager();
+ ((PropertiesUserManager) userManager).configure();
+
+ fileSystemManager = new NativeFileSystemManager();
+
+ statistics = new FtpStatisticsImpl();
+ ((FtpStatisticsImpl) statistics)
+ .configure(EmptyConfiguration.INSTANCE);
+
+ commandFactory = new DefaultCommandFactory();
+ ((DefaultCommandFactory) commandFactory)
+ .configure(EmptyConfiguration.INSTANCE);
+
+ // create user if necessary
+ // TODO turn into a setter
+ if (createDefaultUsers) {
+ createDefaultUsers();
+ }
+
+ ftpletContainer = new DefaultFtpletContainer();
+ ((DefaultFtpletContainer) ftpletContainer)
+ .configure(EmptyConfiguration.INSTANCE);
+ } catch (Exception ex) {
+ dispose();
+ throw ex;
+ }
+ }
+
+ private void createListeners() throws Exception {
+ listeners.put("default", new MinaListener());
+ }
+
+ /**
+ * Create default users.
+ */
+ private 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 IP restrictor.
+ */
+ public IpRestrictor getIpRestrictor() {
+ return ipRestrictor;
+ }
+
+ /**
+ * 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();
+ }
+
+ if (ftpletContainer != null && ftpletContainer instanceof Component) {
+ ((Component) ftpletContainer).dispose();
+ }
+
+ if (userManager != null && userManager instanceof Component) {
+ ((Component) userManager).dispose();
+ }
+
+ if (ipRestrictor != null && ipRestrictor instanceof Component) {
+ ((Component) ipRestrictor).dispose();
+ }
+
+ if (fileSystemManager != null && fileSystemManager instanceof Component) {
+ ((Component) fileSystemManager).dispose();
+ }
+
+ if (statistics != null && statistics instanceof Component) {
+ ((Component) statistics).dispose();
+ }
+
+ if (messageResource != null && messageResource instanceof Component) {
+ ((Component) messageResource).dispose();
+ }
+ }
+
+ public Listener getListener(String name) {
+ return listeners.get(name);
+ }
+
+ public void setListener(String name, Listener listener) {
+ listeners.put(name, listener);
+ }
+
+ public Listener[] getAllListeners() {
+ Collection<Listener> listenerList = listeners.values();
+
+ Listener[] listenerArray = new Listener[0];
+
+ return listenerList.toArray(listenerArray);
+ }
+
+ 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 setIpRestrictor(IpRestrictor ipRestrictor) {
+ this.ipRestrictor = ipRestrictor;
+ }
+
+ 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/command/STOR.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/STOR.java?rev=643147&r1=643146&r2=643147&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/STOR.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/STOR.java Mon Mar 31 14:00:04 2008
@@ -26,9 +26,9 @@
import org.apache.ftpserver.DefaultFtpReply;
import org.apache.ftpserver.IODataConnectionFactory;
+import org.apache.ftpserver.ftplet.DataConnection;
import org.apache.ftpserver.ftplet.DataConnectionFactory;
import org.apache.ftpserver.ftplet.FileObject;
-import org.apache.ftpserver.ftplet.DataConnection;
import org.apache.ftpserver.ftplet.FtpException;
import org.apache.ftpserver.ftplet.FtpReply;
import org.apache.ftpserver.ftplet.FtpRequest;
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/filesystem/NativeFileSystemManager.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/filesystem/NativeFileSystemManager.java?rev=643147&r1=643146&r2=643147&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/filesystem/NativeFileSystemManager.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/filesystem/NativeFileSystemManager.java Mon Mar 31 14:00:04 2008
@@ -21,8 +21,6 @@
import java.io.File;
-import org.apache.ftpserver.ftplet.Component;
-import org.apache.ftpserver.ftplet.Configuration;
import org.apache.ftpserver.ftplet.FileSystemManager;
import org.apache.ftpserver.ftplet.FileSystemView;
import org.apache.ftpserver.ftplet.FtpException;
@@ -34,27 +32,30 @@
* Native file system manager. It uses the OS file system.
*/
public
-class NativeFileSystemManager implements FileSystemManager, Component {
+class NativeFileSystemManager implements FileSystemManager {
private final Logger LOG = LoggerFactory.getLogger(NativeFileSystemManager.class);
private boolean createHome;
private boolean caseInsensitive;
- /**
- * Configure the file system manager - does nothing.
- */
- public void configure(Configuration conf) throws FtpException {
- createHome = conf.getBoolean("create-home", false);
- caseInsensitive = conf.getBoolean("case-insensitive", false);
- }
-
- /**
- * Dispose the file system manager.
- */
- public void dispose() {
- }
-
+ public boolean isCreateHome() {
+ return createHome;
+ }
+
+ public void setCreateHome(boolean createHome) {
+ this.createHome = createHome;
+ }
+
+ public boolean isCaseInsensitive() {
+ return caseInsensitive;
+ }
+
+ public void setCaseInsensitive(boolean caseInsensitive) {
+ this.caseInsensitive = caseInsensitive;
+ }
+
+
/**
* Create the appropriate user file system view.
*/
@@ -74,6 +75,7 @@
}
}
+ System.out.println("#########" + caseInsensitive);
FileSystemView fsView = new NativeFileSystemView(user, caseInsensitive);
return fsView;
}
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/interfaces/FtpServerContext.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/interfaces/FtpServerContext.java?rev=643147&r1=643146&r2=643147&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/interfaces/FtpServerContext.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/interfaces/FtpServerContext.java Mon Mar 31 14:00:04 2008
@@ -20,7 +20,7 @@
package org.apache.ftpserver.interfaces;
import org.apache.ftpserver.ConnectionConfig;
-import org.apache.ftpserver.ftplet.Ftplet;
+import org.apache.ftpserver.ftplet.FtpletContainer;
import org.apache.ftpserver.ftplet.FtpletContext;
import org.apache.ftpserver.listener.Listener;
@@ -46,7 +46,7 @@
/**
* Get ftplet container.
*/
- Ftplet getFtpletContainer();
+ FtpletContainer getFtpletContainer();
Listener getListener(String name);
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/message/MessageResourceImpl.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/message/MessageResourceImpl.java?rev=643147&r1=643146&r2=643147&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/message/MessageResourceImpl.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/message/MessageResourceImpl.java Mon Mar 31 14:00:04 2008
@@ -28,10 +28,7 @@
import java.util.HashMap;
import java.util.Iterator;
import java.util.Properties;
-import java.util.StringTokenizer;
-import org.apache.ftpserver.ftplet.Component;
-import org.apache.ftpserver.ftplet.Configuration;
import org.apache.ftpserver.ftplet.FtpException;
import org.apache.ftpserver.interfaces.MessageResource;
import org.apache.ftpserver.util.IoUtils;
@@ -47,7 +44,7 @@
* Custom Common Messages -> Default Common Messages -> null (not found)
*/
public
-class MessageResourceImpl implements MessageResource, Component {
+class MessageResourceImpl implements MessageResource {
private final Logger LOG = LoggerFactory.getLogger(MessageResourceImpl.class);
@@ -55,39 +52,39 @@
private String[] languages;
private HashMap<String, PropertiesPair> messages;
- private String customMessageDir;
-
+ private File customMessageDirectory;
+
private static class PropertiesPair {
public Properties defaultProperties = new Properties();
public Properties customProperties = new Properties();
}
- /**
+ public String[] getLanguages() {
+ return languages;
+ }
+
+ public void setLanguages(String[] languages) {
+ this.languages = languages;
+ }
+
+ public File getCustomMessageDirectory() {
+ return customMessageDirectory;
+ }
+
+ public void setCustomMessageDirectory(File customMessageDirectory) {
+ this.customMessageDirectory = customMessageDirectory;
+ }
+
+ /**
* Configure - load properties file.
*/
- public void configure(Configuration config) throws FtpException {
-
- // get the custom message directory
- customMessageDir = config.getString("custom-message-dir", "./res");
-
- // get all the languages
- String languages = config.getString("languages", null);
- if(languages != null) {
- StringTokenizer st = new StringTokenizer(languages, ",; \t");
- int tokenCount = st.countTokens();
- this.languages = new String[tokenCount];
- for(int i=0; i<tokenCount; ++i) {
- this.languages[i] = st.nextToken().toLowerCase();
- }
- }
-
+ public void configure() throws FtpException {
// populate different properties
messages = new HashMap<String, PropertiesPair>();
- if(this.languages != null) {
- for(int i=0; i<this.languages.length; ++i) {
- String lang = this.languages[i];
- PropertiesPair pair = createPropertiesPair(lang);
- messages.put(lang, pair);
+ if(languages != null) {
+ for(String language : languages) {
+ PropertiesPair pair = createPropertiesPair(language);
+ messages.put(language, pair);
}
}
PropertiesPair pair = createPropertiesPair(null);
@@ -127,10 +124,10 @@
// load custom resource
File resourceFile = null;
if(lang == null) {
- resourceFile = new File(customMessageDir, "FtpStatus.gen");
+ resourceFile = new File(customMessageDirectory, "FtpStatus.gen");
}
else {
- resourceFile = new File(customMessageDir, "FtpStatus_" + lang + ".gen");
+ resourceFile = new File(customMessageDirectory, "FtpStatus_" + lang + ".gen");
}
in = null;
try {
@@ -242,11 +239,11 @@
// get custom resource file name
File resourceFile = null;
if(language == null) {
- resourceFile = new File(customMessageDir, "FtpStatus.gen");
+ resourceFile = new File(customMessageDirectory, "FtpStatus.gen");
}
else {
language = language.toLowerCase();
- resourceFile = new File(customMessageDir, "FtpStatus_" + language + ".gen");
+ resourceFile = new File(customMessageDirectory, "FtpStatus_" + language + ".gen");
}
// save resource file
Modified: mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/CdCaseInsensitiveTest.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/CdCaseInsensitiveTest.java?rev=643147&r1=643146&r2=643147&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/CdCaseInsensitiveTest.java (original)
+++ mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/CdCaseInsensitiveTest.java Mon Mar 31 14:00:04 2008
@@ -19,19 +19,21 @@
package org.apache.ftpserver.clienttests;
-import java.util.Properties;
+import org.apache.ftpserver.FtpServer;
+import org.apache.ftpserver.filesystem.NativeFileSystemManager;
public class CdCaseInsensitiveTest extends CdTest {
- protected Properties createConfig() {
- Properties config = super.createConfig();
+ protected FtpServer createServer() throws Exception {
+ FtpServer server = super.createServer();
- config.setProperty("config.file-system-manager.case-insensitive", "true");
- return config;
+ NativeFileSystemManager fs = (NativeFileSystemManager) server.getServerContext().getFileSystemManager();
+ fs.setCaseInsensitive(true);
+
+ return server;
}
public void testCWDCaseInsensitive() throws Exception {
-
assertTrue(client.changeWorkingDirectory(TEST_DIR1.getName().toUpperCase()));
assertEquals("/dir1", client.printWorkingDirectory());
Modified: mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/ClientTestTemplate.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/ClientTestTemplate.java?rev=643147&r1=643146&r2=643147&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/ClientTestTemplate.java (original)
+++ mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/ClientTestTemplate.java Mon Mar 31 14:00:04 2008
@@ -21,7 +21,6 @@
import java.io.File;
import java.io.IOException;
-import java.util.Properties;
import junit.framework.TestCase;
@@ -29,12 +28,11 @@
import org.apache.commons.net.ProtocolCommandListener;
import org.apache.commons.net.ftp.FTPClient;
import org.apache.commons.net.ftp.FTPConnectionClosedException;
-import org.apache.ftpserver.ConfigurableFtpServerContext;
+import org.apache.ftpserver.DefaultFtpServerContext;
import org.apache.ftpserver.FtpServer;
-import org.apache.ftpserver.config.PropertiesConfiguration;
-import org.apache.ftpserver.interfaces.FtpServerContext;
import org.apache.ftpserver.listener.mina.MinaListener;
import org.apache.ftpserver.test.TestUtil;
+import org.apache.ftpserver.usermanager.PropertiesUserManager;
import org.apache.ftpserver.util.IoUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -55,8 +53,6 @@
protected int port = -1;
- private FtpServerContext serverContext;
-
protected FTPClient client;
@@ -64,26 +60,24 @@
private static final File TEST_TMP_DIR = new File("test-tmp");
protected static final File ROOT_DIR = new File(TEST_TMP_DIR, "ftproot");
- protected Properties createConfig() {
- return createDefaultConfig();
- }
-
- protected Properties createDefaultConfig() {
+ protected FtpServer createServer() throws Exception {
assertTrue(USERS_FILE.getAbsolutePath() + " must exist", USERS_FILE.exists());
- Properties configProps = new Properties();
- configProps.setProperty("config.listeners.default.class", MinaListener.class.getName());
- configProps.setProperty("config.listeners.default.port", Integer
- .toString(port));
- configProps.setProperty("config.user-manager.class",
- "org.apache.ftpserver.usermanager.PropertiesUserManager");
- configProps.setProperty("config.user-manager.admin", "admin");
- configProps.setProperty("config.user-manager.prop-password-encrypt", "false");
- configProps.setProperty("config.user-manager.prop-file",
- USERS_FILE.getAbsolutePath());
- configProps.setProperty("config.create-default-user", "false");
+ DefaultFtpServerContext context = new DefaultFtpServerContext(false);
- return configProps;
+ MinaListener listener = new MinaListener();
+ listener.setPort(port);
+ context.setListener("default", listener);
+
+ PropertiesUserManager userManager = new PropertiesUserManager();
+ userManager.setAdminName("admin");
+ userManager.setEncryptPasswords(false);
+ userManager.setPropFile(USERS_FILE);
+ userManager.configure();
+
+ context.setUserManager(userManager);
+
+ return new FtpServer(context);
}
/*
@@ -116,8 +110,7 @@
protected void initServer() throws IOException, Exception {
initPort();
- serverContext = new ConfigurableFtpServerContext(new PropertiesConfiguration(createConfig()));
- server = new FtpServer(serverContext);
+ server = createServer();
server.start();
}
Modified: mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/CustomMaxLoginTest.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/CustomMaxLoginTest.java?rev=643147&r1=643146&r2=643147&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/CustomMaxLoginTest.java (original)
+++ mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/CustomMaxLoginTest.java Mon Mar 31 14:00:04 2008
@@ -20,10 +20,11 @@
package org.apache.ftpserver.clienttests;
import java.net.SocketException;
-import java.util.Properties;
import org.apache.commons.net.ftp.FTPConnectionClosedException;
import org.apache.ftpserver.DefaultConnectionConfig;
+import org.apache.ftpserver.DefaultFtpServerContext;
+import org.apache.ftpserver.FtpServer;
public class CustomMaxLoginTest extends ClientTestTemplate {
@@ -32,13 +33,15 @@
- protected Properties createConfig() {
- Properties config = super.createConfig();
+ protected FtpServer createServer() throws Exception {
+ FtpServer server = super.createServer();
- config.setProperty("config.connection-config.class", DefaultConnectionConfig.class.getName());
- config.setProperty("config.connection-config.max-login-failures", "2");
+ DefaultFtpServerContext context = (DefaultFtpServerContext) server.getServerContext();
+ DefaultConnectionConfig cc = (DefaultConnectionConfig) context.getConnectionConfig();
- return config;
+ cc.setMaxLoginFailures(2);
+
+ return server;
}
Modified: mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/LangTest.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/LangTest.java?rev=643147&r1=643146&r2=643147&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/LangTest.java (original)
+++ mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/LangTest.java Mon Mar 31 14:00:04 2008
@@ -19,7 +19,9 @@
package org.apache.ftpserver.clienttests;
-import java.util.Properties;
+import org.apache.ftpserver.DefaultFtpServerContext;
+import org.apache.ftpserver.FtpServer;
+import org.apache.ftpserver.message.MessageResourceImpl;
@@ -29,10 +31,14 @@
/* (non-Javadoc)
* @see org.apache.ftpserver.clienttests.ClientTestTemplate#createConfig()
*/
- protected Properties createConfig() {
- Properties config = super.createConfig();
- config.setProperty("config.message.languages", "en,zh-tw");
- return config;
+ protected FtpServer createServer() throws Exception {
+ FtpServer server = super.createServer();
+
+ DefaultFtpServerContext context = (DefaultFtpServerContext) server.getServerContext();
+
+ MessageResourceImpl resource = (MessageResourceImpl) context.getMessageResource();
+ resource.setLanguages(new String[] {"en", "zh-tw"});
+ return server;
}
/* (non-Javadoc)
Modified: mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/LoginNoAnonTest.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/LoginNoAnonTest.java?rev=643147&r1=643146&r2=643147&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/LoginNoAnonTest.java (original)
+++ mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/LoginNoAnonTest.java Mon Mar 31 14:00:04 2008
@@ -19,9 +19,9 @@
package org.apache.ftpserver.clienttests;
-import java.util.Properties;
-
import org.apache.ftpserver.DefaultConnectionConfig;
+import org.apache.ftpserver.DefaultFtpServerContext;
+import org.apache.ftpserver.FtpServer;
public class LoginNoAnonTest extends ClientTestTemplate {
@@ -29,13 +29,15 @@
/* (non-Javadoc)
* @see org.apache.ftpserver.clienttests.ClientTestTemplate#createConfig()
*/
- protected Properties createConfig() {
- Properties config = super.createDefaultConfig();
-
- config.setProperty("config.connection-config.class", DefaultConnectionConfig.class.getName());
- config.setProperty("config.connection-config.anonymous-login-enabled", "false");
+ protected FtpServer createServer() throws Exception {
+ FtpServer server = super.createServer();
+
+ DefaultFtpServerContext context = (DefaultFtpServerContext) server.getServerContext();
+
+ DefaultConnectionConfig cc = (DefaultConnectionConfig) context.getConnectionConfig();
+ cc.setAnonymousLoginEnabled(false);
- return config;
+ return server;
}
Modified: mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/PasvAddressTest.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/PasvAddressTest.java?rev=643147&r1=643146&r2=643147&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/PasvAddressTest.java (original)
+++ mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/PasvAddressTest.java Mon Mar 31 14:00:04 2008
@@ -19,26 +19,27 @@
package org.apache.ftpserver.clienttests;
-import java.util.Properties;
+import java.net.InetAddress;
-public class PasvAddressTest extends ClientTestTemplate {
+import org.apache.ftpserver.DefaultDataConnectionConfig;
+import org.apache.ftpserver.FtpServer;
- protected Properties createConfig() {
- Properties config = createDefaultConfig();
+public class PasvAddressTest extends ClientTestTemplate {
- config.setProperty("config.listeners.default.data-connection.class",
- "org.apache.ftpserver.DefaultDataConnectionConfig");
- config.setProperty(
- "config.listeners.default.data-connection.passive.external-address",
- "1.2.3.4");
+ protected FtpServer createServer() throws Exception {
+ FtpServer server = super.createServer();
- return config;
+ DefaultDataConnectionConfig ddcc = (DefaultDataConnectionConfig) server.getServerContext().getListener("default").getDataConnectionConfig();
+
+ ddcc.setPassiveAddress(InetAddress.getByName("127.0.0.200"));
+
+ return server;
}
public void testPasvAddress() throws Exception {
client.login(ADMIN_USERNAME, ADMIN_PASSWORD);
client.pasv();
- assertTrue(client.getReplyString().indexOf("(1,2,3,4,") > -1);
+ assertTrue(client.getReplyString().indexOf("(127,0,0,200,") > -1);
}
}
Modified: mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/PasvAddressWithHostnameTest.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/PasvAddressWithHostnameTest.java?rev=643147&r1=643146&r2=643147&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/PasvAddressWithHostnameTest.java (original)
+++ mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/PasvAddressWithHostnameTest.java Mon Mar 31 14:00:04 2008
@@ -19,7 +19,11 @@
package org.apache.ftpserver.clienttests;
-import java.util.Properties;
+import java.net.InetAddress;
+
+import org.apache.ftpserver.DefaultDataConnectionConfig;
+import org.apache.ftpserver.DefaultFtpServerContext;
+import org.apache.ftpserver.FtpServer;
/**
* Test for external passive address configured as hostname rather than
@@ -27,16 +31,15 @@
*/
public class PasvAddressWithHostnameTest extends ClientTestTemplate {
- protected Properties createConfig() {
- Properties config = createDefaultConfig();
-
- config.setProperty("config.listeners.default.data-connection.class",
- "org.apache.ftpserver.DefaultDataConnectionConfig");
- config.setProperty(
- "config.listeners.default.data-connection.passive.external-address",
- "localhost");
+ protected FtpServer createServer() throws Exception {
+ FtpServer server = super.createServer();
+
+ DefaultFtpServerContext context = (DefaultFtpServerContext) server.getServerContext();
- return config;
+ DefaultDataConnectionConfig ddcc = (DefaultDataConnectionConfig) context.getListener("default").getDataConnectionConfig();
+ ddcc.setPassiveExernalAddress(InetAddress.getByName("127.0.0.1"));
+
+ return server;
}
public void testPasvAddress() throws Exception {
Modified: mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/UnlimitedMaxLoginTest.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/UnlimitedMaxLoginTest.java?rev=643147&r1=643146&r2=643147&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/UnlimitedMaxLoginTest.java (original)
+++ mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/clienttests/UnlimitedMaxLoginTest.java Mon Mar 31 14:00:04 2008
@@ -19,9 +19,9 @@
package org.apache.ftpserver.clienttests;
-import java.util.Properties;
-
import org.apache.ftpserver.DefaultConnectionConfig;
+import org.apache.ftpserver.DefaultFtpServerContext;
+import org.apache.ftpserver.FtpServer;
public class UnlimitedMaxLoginTest extends ClientTestTemplate {
@@ -30,12 +30,14 @@
- protected Properties createConfig() {
- Properties config = super.createConfig();
+ protected FtpServer createServer() throws Exception {
+ FtpServer server = super.createServer();
- config.setProperty("config.connection-config.class", DefaultConnectionConfig.class.getName());
- config.setProperty("config.connection-config.max-login-failures", "0");
- return config;
+ DefaultFtpServerContext context = (DefaultFtpServerContext) server.getServerContext();
+
+ DefaultConnectionConfig cc = (DefaultConnectionConfig) context.getConnectionConfig();
+ cc.setMaxLoginFailures(0);
+ return server;
}
Modified: mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/filesystem/FileSystemViewTemplate.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/filesystem/FileSystemViewTemplate.java?rev=643147&r1=643146&r2=643147&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/filesystem/FileSystemViewTemplate.java (original)
+++ mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/filesystem/FileSystemViewTemplate.java Mon Mar 31 14:00:04 2008
@@ -1,8 +1,8 @@
package org.apache.ftpserver.filesystem;
-import org.apache.ftpserver.usermanager.BaseUser;
-
import junit.framework.TestCase;
+
+import org.apache.ftpserver.usermanager.BaseUser;
public abstract class FileSystemViewTemplate extends TestCase {
Modified: mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ftplet/FtpLetReturnDefaultTest.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ftplet/FtpLetReturnDefaultTest.java?rev=643147&r1=643146&r2=643147&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ftplet/FtpLetReturnDefaultTest.java (original)
+++ mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ftplet/FtpLetReturnDefaultTest.java Mon Mar 31 14:00:04 2008
@@ -23,9 +23,9 @@
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.IOException;
-import java.util.Properties;
import org.apache.commons.net.ftp.FTPReply;
+import org.apache.ftpserver.FtpServer;
import org.apache.ftpserver.clienttests.ClientTestTemplate;
import org.apache.ftpserver.test.TestUtil;
@@ -53,18 +53,11 @@
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.ftpserver.clienttests.ClientTestTemplate#createConfig()
- */
- protected Properties createConfig() {
- Properties config = createDefaultConfig();
+ protected FtpServer createServer() throws Exception {
+ FtpServer server = super.createServer();
- config.setProperty("config.ftplets", "f1");
- config.setProperty("config.ftplet.f1.class",
- MockFtplet.class.getName());
- return config;
+ server.getServerContext().getFtpletContainer().addFtplet("f1", new MockFtplet());
+ return server;
}
public void testLogin() throws Exception {
Modified: mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ftplet/FtpLetReturnDisconnectTest.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ftplet/FtpLetReturnDisconnectTest.java?rev=643147&r1=643146&r2=643147&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ftplet/FtpLetReturnDisconnectTest.java (original)
+++ mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ftplet/FtpLetReturnDisconnectTest.java Mon Mar 31 14:00:04 2008
@@ -24,9 +24,9 @@
import java.io.File;
import java.io.IOException;
import java.net.SocketException;
-import java.util.Properties;
import org.apache.commons.net.ftp.FTPConnectionClosedException;
+import org.apache.ftpserver.FtpServer;
import org.apache.ftpserver.clienttests.ClientTestTemplate;
import org.apache.ftpserver.test.TestUtil;
@@ -54,20 +54,13 @@
connectClient();
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.ftpserver.clienttests.ClientTestTemplate#createConfig()
- */
- protected Properties createConfig() {
- Properties config = createDefaultConfig();
+ protected FtpServer createServer() throws Exception {
+ FtpServer server = super.createServer();
- config.setProperty("config.ftplets", "f1");
- config.setProperty("config.ftplet.f1.class",
- MockFtplet.class.getName());
- // #config.ftplet.f1.param=value1
- return config;
+ server.getServerContext().getFtpletContainer().addFtplet("f1", new MockFtplet());
+ return server;
}
+
/* public void testExceptionDuringInit() throws Exception {
MockFtplet.callback = new MockFtpletCallback() {
Modified: mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ftplet/FtpLetReturnSkipTest.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ftplet/FtpLetReturnSkipTest.java?rev=643147&r1=643146&r2=643147&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ftplet/FtpLetReturnSkipTest.java (original)
+++ mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ftplet/FtpLetReturnSkipTest.java Mon Mar 31 14:00:04 2008
@@ -20,8 +20,8 @@
package org.apache.ftpserver.ftplet;
import java.io.IOException;
-import java.util.Properties;
+import org.apache.ftpserver.FtpServer;
import org.apache.ftpserver.clienttests.ClientTestTemplate;
public class FtpLetReturnSkipTest extends ClientTestTemplate {
@@ -43,19 +43,11 @@
connectClient();
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.ftpserver.clienttests.ClientTestTemplate#createConfig()
- */
- protected Properties createConfig() {
- Properties config = createDefaultConfig();
+ protected FtpServer createServer() throws Exception {
+ FtpServer server = super.createServer();
- config.setProperty("config.ftplets", "f1");
- config.setProperty("config.ftplet.f1.class",
- MockFtplet.class.getName());
- // #config.ftplet.f1.param=value1
- return config;
+ server.getServerContext().getFtpletContainer().addFtplet("f1", new MockFtplet());
+ return server;
}
public void testLogin() throws Exception {