Author: ngn
Date: Sun Oct 5 13:51:37 2008
New Revision: 701885
URL: http://svn.apache.org/viewvc?rev=701885&view=rev
Log:
Make FtpletContainer immutable (FTPSERVER-187)
Modified:
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/FtpServer.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/ftpletcontainer/FtpletContainer.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/ftpletcontainer/impl/DefaultFtpletContainer.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/ssl/impl/DefaultSslConfiguration.java
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ftpletcontainer/DefaultFtpLetContainerTest.java
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ftpletcontainer/FtpLetContainerTestTemplate.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
Modified:
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/FtpServer.java
URL:
http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/FtpServer.java?rev=701885&r1=701884&r2=701885&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/FtpServer.java
(original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/FtpServer.java
Sun Oct 5 13:51:37 2008
@@ -25,6 +25,7 @@
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.listener.Listener;
import org.apache.ftpserver.message.MessageResource;
import org.slf4j.Logger;
@@ -229,7 +230,7 @@
* If a custom server context has been set
*/
public void setFtplets(final Map<String, Ftplet> ftplets) {
- getServerContext().getFtpletContainer().setFtplets(ftplets);
+ checkAndGetContext().setFtpletContainer(new
DefaultFtpletContainer(ftplets));
}
/**
Modified:
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/ftpletcontainer/FtpletContainer.java
URL:
http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/ftpletcontainer/FtpletContainer.java?rev=701885&r1=701884&r2=701885&view=diff
==============================================================================
---
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/ftpletcontainer/FtpletContainer.java
(original)
+++
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/ftpletcontainer/FtpletContainer.java
Sun Oct 5 13:51:37 2008
@@ -21,7 +21,6 @@
import java.util.Map;
-import org.apache.ftpserver.ftplet.FtpException;
import org.apache.ftpserver.ftplet.Ftplet;
/**
@@ -35,31 +34,6 @@
public interface FtpletContainer extends Ftplet {
/**
- * Add an [EMAIL PROTECTED] Ftplet} to the container.
- *
- * @param name
- * The name of the Ftplet to be added
- * @param ftplet
- * The Ftplet
- * @throws FtpException
- * @throws IllegalArgumentException
- * If an Ftplet with the same name already exist within the
- * container
- */
- void addFtplet(String name, Ftplet ftplet) throws FtpException;
-
- /**
- * Remove the [EMAIL PROTECTED] Ftplet} identified by the name (as
provided in the
- * [EMAIL PROTECTED] #addFtplet(String, Ftplet)} method.
- *
- * @param name
- * The name of the Ftplet to be removed
- * @return The removed Ftplet if found, or null if the name is unknown to
- * the container.
- */
- Ftplet removeFtplet(String name);
-
- /**
* Retrive the [EMAIL PROTECTED] Ftplet} identified by the name (as
provided in the
* [EMAIL PROTECTED] #addFtplet(String, Ftplet)} method.
*
@@ -76,13 +50,4 @@
* @return A map of all Ftplets with their name as the key
*/
Map<String, Ftplet> getFtplets();
-
- /**
- * Set the Ftplets for this container. Will remove all previously registred
- * Ftplets in this container
- *
- * @param ftplets
- * A map of all Ftplets with their name as the key
- */
- void setFtplets(Map<String, Ftplet> ftplets);
}
\ No newline at end of file
Modified:
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/ftpletcontainer/impl/DefaultFtpletContainer.java
URL:
http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/ftpletcontainer/impl/DefaultFtpletContainer.java?rev=701885&r1=701884&r2=701885&view=diff
==============================================================================
---
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/ftpletcontainer/impl/DefaultFtpletContainer.java
(original)
+++
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/ftpletcontainer/impl/DefaultFtpletContainer.java
Sun Oct 5 13:51:37 2008
@@ -37,6 +37,8 @@
/**
* This ftplet calls other ftplet methods and returns appropriate return value.
*
+ * <strong>Internal class, do not use directly</strong>
+ *
* @author The Apache MINA Project ([EMAIL PROTECTED])
* @version $Rev$, $Date$
*/
@@ -45,44 +47,13 @@
private final Logger LOG = LoggerFactory
.getLogger(DefaultFtpletContainer.class);
- private FtpletContext ftpletContext;
-
private Map<String, Ftplet> ftplets = new ConcurrentHashMap<String,
Ftplet>();
- public synchronized void dispose() {
-
- for (Entry<String, Ftplet> entry : ftplets.entrySet()) {
- try {
- entry.getValue().destroy();
- } catch (Exception ex) {
- LOG.error(entry.getKey() + " :: FtpletHandler.destroy()", ex);
- }
- }
- ftplets.clear();
- }
-
- public synchronized void addFtplet(String name, Ftplet ftplet) throws
FtpException {
- if (getFtplet(name) != null) {
- throw new IllegalArgumentException("Ftplet with name \"" + name
- + "\" already registred with container");
- }
-
- ftplets.put(name, ftplet);
-
- if(ftpletContext != null) {
- ftplet.init(ftpletContext);
- }
+ public DefaultFtpletContainer() {
}
-
- public synchronized Ftplet removeFtplet(String name) {
- Ftplet ftplet = ftplets.get(name);
-
- if (ftplet != null) {
- ftplets.remove(name);
- return ftplet;
- } else {
- return null;
- }
+
+ public DefaultFtpletContainer(Map<String, Ftplet> ftplets) {
+ this.ftplets = ftplets;
}
/**
@@ -97,10 +68,6 @@
}
public synchronized void init(FtpletContext ftpletContext) throws
FtpException {
- this.ftpletContext = ftpletContext;
-
- // initialize Ftplets already added
-
for (Entry<String, Ftplet> entry : ftplets.entrySet()) {
entry.getValue().init(ftpletContext);
}
@@ -114,17 +81,17 @@
}
/**
- * @see FtpletContainer#setFtplets(Map)
- */
- public synchronized void setFtplets(Map<String, Ftplet> ftplets) {
- this.ftplets = ftplets;
- }
-
- /**
* Destroy all ftplets.
*/
public void destroy() {
- dispose();
+ for (Entry<String, Ftplet> entry : ftplets.entrySet()) {
+ try {
+ entry.getValue().destroy();
+ } catch (Exception ex) {
+ LOG.error(entry.getKey() + " :: FtpletHandler.destroy()", ex);
+ }
+ }
+ ftplets.clear();
}
/**
Modified:
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/ssl/impl/DefaultSslConfiguration.java
URL:
http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/ssl/impl/DefaultSslConfiguration.java?rev=701885&r1=701884&r2=701885&view=diff
==============================================================================
---
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/ssl/impl/DefaultSslConfiguration.java
(original)
+++
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/ssl/impl/DefaultSslConfiguration.java
Sun Oct 5 13:51:37 2008
@@ -20,7 +20,6 @@
package org.apache.ftpserver.ssl.impl;
import java.security.GeneralSecurityException;
-import java.util.HashMap;
import javax.net.ssl.KeyManager;
import javax.net.ssl.KeyManagerFactory;
Modified:
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ftpletcontainer/DefaultFtpLetContainerTest.java
URL:
http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ftpletcontainer/DefaultFtpLetContainerTest.java?rev=701885&r1=701884&r2=701885&view=diff
==============================================================================
---
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ftpletcontainer/DefaultFtpLetContainerTest.java
(original)
+++
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ftpletcontainer/DefaultFtpLetContainerTest.java
Sun Oct 5 13:51:37 2008
@@ -19,6 +19,9 @@
package org.apache.ftpserver.ftpletcontainer;
+import java.util.Map;
+
+import org.apache.ftpserver.ftplet.Ftplet;
import org.apache.ftpserver.ftpletcontainer.impl.DefaultFtpletContainer;
/**
@@ -29,8 +32,8 @@
*/
public class DefaultFtpLetContainerTest extends FtpLetContainerTestTemplate {
- protected FtpletContainer createFtpletContainer() {
- return new DefaultFtpletContainer();
+ protected FtpletContainer createFtpletContainer(Map<String, Ftplet>
ftplets) {
+ return new DefaultFtpletContainer(ftplets);
}
}
Modified:
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ftpletcontainer/FtpLetContainerTestTemplate.java
URL:
http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ftpletcontainer/FtpLetContainerTestTemplate.java?rev=701885&r1=701884&r2=701885&view=diff
==============================================================================
---
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ftpletcontainer/FtpLetContainerTestTemplate.java
(original)
+++
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ftpletcontainer/FtpLetContainerTestTemplate.java
Sun Oct 5 13:51:37 2008
@@ -21,7 +21,9 @@
import java.io.IOException;
import java.util.ArrayList;
+import java.util.LinkedHashMap;
import java.util.List;
+import java.util.Map;
import junit.framework.TestCase;
@@ -39,8 +41,6 @@
public abstract class FtpLetContainerTestTemplate extends TestCase {
- private FtpletContainer container = createFtpletContainer();
-
private final List<String> calls = new ArrayList<String>();
protected void setUp() throws Exception {
@@ -48,7 +48,7 @@
MockFtpletCallback.returnValue = FtpletResult.DEFAULT;
}
- protected abstract FtpletContainer createFtpletContainer();
+ protected abstract FtpletContainer createFtpletContainer(Map<String,
Ftplet> ftplets);
private static class MockFtpletContext implements FtpletContext {
public FileSystemFactory getFileSystemManager() {
@@ -72,11 +72,11 @@
MockFtplet ftplet1 = new MockFtplet();
MockFtplet ftplet2 = new MockFtplet();
- assertNull(container.getFtplet("ftplet1"));
- assertNull(container.getFtplet("ftplet2"));
-
- container.addFtplet("ftplet1", ftplet1);
- container.addFtplet("ftplet2", ftplet2);
+ Map<String, Ftplet> ftplets = new LinkedHashMap<String, Ftplet>();
+ ftplets.put("ftplet1", ftplet1);
+ ftplets.put("ftplet2", ftplet2);
+
+ FtpletContainer container = createFtpletContainer(ftplets);
assertSame(ftplet1, container.getFtplet("ftplet1"));
assertSame(ftplet2, container.getFtplet("ftplet2"));
@@ -85,30 +85,14 @@
public void testFtpletLifecyclePreContainerInit() throws FtpException {
MockFtplet ftplet = new MockFtplet();
- container.addFtplet("ftplet1", ftplet);
-
- // ftplet should be initialized before the container is
- assertNull(ftplet.context);
- container.init(new MockFtpletContext());
- assertNotNull(ftplet.context);
-
- // make sure ftplets get's destroyed
- assertFalse(ftplet.destroyed);
-
- container.destroy();
-
- assertTrue(ftplet.destroyed);
-
- }
+ Map<String, Ftplet> ftplets = new LinkedHashMap<String, Ftplet>();
+ ftplets.put("ftplet1", ftplet);
- public void testFtpletLifecyclePostContainerInit() throws FtpException {
- MockFtplet ftplet = new MockFtplet();
+ FtpletContainer container = createFtpletContainer(ftplets);
+ // ftplet should be initialized before the container is
assertNull(ftplet.context);
container.init(new MockFtpletContext());
-
- container.addFtplet("ftplet1", ftplet);
-
assertNotNull(ftplet.context);
// make sure ftplets get's destroyed
@@ -119,44 +103,7 @@
assertTrue(ftplet.destroyed);
}
-
- public void testAddFtpletWithDuplicateName() throws FtpException {
- MockFtplet ftplet1 = new MockFtplet();
- MockFtplet ftplet2 = new MockFtplet();
-
- assertNull(container.getFtplet("ftplet1"));
-
- container.addFtplet("ftplet1", ftplet1);
-
- try {
- container.addFtplet("ftplet1", ftplet2);
- fail("IllegalArgumentException must be thrown");
- } catch (IllegalArgumentException e) {
- // ok
- }
-
- assertSame(ftplet1, container.getFtplet("ftplet1"));
- }
-
- public void testRemoveFtplet() throws FtpException {
- MockFtplet ftplet1 = new MockFtplet();
- MockFtplet ftplet2 = new MockFtplet();
-
- container.addFtplet("ftplet1", ftplet1);
- container.addFtplet("ftplet2", ftplet2);
-
- assertSame(ftplet1, container.getFtplet("ftplet1"));
- assertSame(ftplet2, container.getFtplet("ftplet2"));
-
- assertSame(ftplet1, container.removeFtplet("ftplet1"));
-
- assertNull(container.getFtplet("ftplet1"));
- assertSame(ftplet2, container.getFtplet("ftplet2"));
-
- assertNull(container.removeFtplet("ftplet1"));
- }
-
public void testOnConnect() throws FtpException, IOException {
MockFtplet ftplet1 = new MockFtplet() {
public FtpletResult onConnect(FtpSession session)
@@ -173,8 +120,11 @@
}
};
- container.addFtplet("ftplet1", ftplet1);
- container.addFtplet("ftplet2", ftplet2);
+ Map<String, Ftplet> ftplets = new LinkedHashMap<String, Ftplet>();
+ ftplets.put("ftplet1", ftplet1);
+ ftplets.put("ftplet2", ftplet2);
+
+ FtpletContainer container = createFtpletContainer(ftplets);
container.onConnect(new FtpSessionImpl(null));
@@ -199,9 +149,12 @@
}
};
- container.addFtplet("ftplet1", ftplet1);
- container.addFtplet("ftplet2", ftplet2);
+ Map<String, Ftplet> ftplets = new LinkedHashMap<String, Ftplet>();
+ ftplets.put("ftplet1", ftplet1);
+ ftplets.put("ftplet2", ftplet2);
+ FtpletContainer container = createFtpletContainer(ftplets);
+
container.onDisconnect(new FtpSessionImpl(null));
assertEquals(2, calls.size());
@@ -225,8 +178,11 @@
}
};
- container.addFtplet("ftplet1", ftplet1);
- container.addFtplet("ftplet2", ftplet2);
+ Map<String, Ftplet> ftplets = new LinkedHashMap<String, Ftplet>();
+ ftplets.put("ftplet1", ftplet1);
+ ftplets.put("ftplet2", ftplet2);
+
+ FtpletContainer container = createFtpletContainer(ftplets);
container.afterCommand(new FtpSessionImpl(null), new FtpRequestImpl(
"PASS"));
@@ -252,8 +208,11 @@
}
};
- container.addFtplet("ftplet1", ftplet1);
- container.addFtplet("ftplet2", ftplet2);
+ Map<String, Ftplet> ftplets = new LinkedHashMap<String, Ftplet>();
+ ftplets.put("ftplet1", ftplet1);
+ ftplets.put("ftplet2", ftplet2);
+
+ FtpletContainer container = createFtpletContainer(ftplets);
container.beforeCommand(new FtpSessionImpl(null), new FtpRequestImpl(
"DELE"));
@@ -279,8 +238,11 @@
}
};
- container.addFtplet("ftplet1", ftplet1);
- container.addFtplet("ftplet2", ftplet2);
+ Map<String, Ftplet> ftplets = new LinkedHashMap<String, Ftplet>();
+ ftplets.put("ftplet1", ftplet1);
+ ftplets.put("ftplet2", ftplet2);
+
+ FtpletContainer container = createFtpletContainer(ftplets);
container.afterCommand(new FtpSessionImpl(null), new FtpRequestImpl(
"DELE"));
@@ -306,8 +268,11 @@
}
};
- container.addFtplet("ftplet1", ftplet1);
- container.addFtplet("ftplet2", ftplet2);
+ Map<String, Ftplet> ftplets = new LinkedHashMap<String, Ftplet>();
+ ftplets.put("ftplet1", ftplet1);
+ ftplets.put("ftplet2", ftplet2);
+
+ FtpletContainer container = createFtpletContainer(ftplets);
container.beforeCommand(new FtpSessionImpl(null), new FtpRequestImpl(
"STOR"));
@@ -333,8 +298,11 @@
}
};
- container.addFtplet("ftplet1", ftplet1);
- container.addFtplet("ftplet2", ftplet2);
+ Map<String, Ftplet> ftplets = new LinkedHashMap<String, Ftplet>();
+ ftplets.put("ftplet1", ftplet1);
+ ftplets.put("ftplet2", ftplet2);
+
+ FtpletContainer container = createFtpletContainer(ftplets);
container.afterCommand(new FtpSessionImpl(null), new FtpRequestImpl(
"STOR"));
@@ -360,8 +328,11 @@
}
};
- container.addFtplet("ftplet1", ftplet1);
- container.addFtplet("ftplet2", ftplet2);
+ Map<String, Ftplet> ftplets = new LinkedHashMap<String, Ftplet>();
+ ftplets.put("ftplet1", ftplet1);
+ ftplets.put("ftplet2", ftplet2);
+
+ FtpletContainer container = createFtpletContainer(ftplets);
container.beforeCommand(new FtpSessionImpl(null), new FtpRequestImpl(
"RETR"));
@@ -387,8 +358,11 @@
}
};
- container.addFtplet("ftplet1", ftplet1);
- container.addFtplet("ftplet2", ftplet2);
+ Map<String, Ftplet> ftplets = new LinkedHashMap<String, Ftplet>();
+ ftplets.put("ftplet1", ftplet1);
+ ftplets.put("ftplet2", ftplet2);
+
+ FtpletContainer container = createFtpletContainer(ftplets);
container.afterCommand(new FtpSessionImpl(null), new FtpRequestImpl(
"RETR"));
@@ -414,8 +388,11 @@
}
};
- container.addFtplet("ftplet1", ftplet1);
- container.addFtplet("ftplet2", ftplet2);
+ Map<String, Ftplet> ftplets = new LinkedHashMap<String, Ftplet>();
+ ftplets.put("ftplet1", ftplet1);
+ ftplets.put("ftplet2", ftplet2);
+
+ FtpletContainer container = createFtpletContainer(ftplets);
container.beforeCommand(new FtpSessionImpl(null), new FtpRequestImpl(
"RMD"));
@@ -441,8 +418,11 @@
}
};
- container.addFtplet("ftplet1", ftplet1);
- container.addFtplet("ftplet2", ftplet2);
+ Map<String, Ftplet> ftplets = new LinkedHashMap<String, Ftplet>();
+ ftplets.put("ftplet1", ftplet1);
+ ftplets.put("ftplet2", ftplet2);
+
+ FtpletContainer container = createFtpletContainer(ftplets);
container.afterCommand(new FtpSessionImpl(null), new FtpRequestImpl(
"RMD"));
@@ -468,8 +448,11 @@
}
};
- container.addFtplet("ftplet1", ftplet1);
- container.addFtplet("ftplet2", ftplet2);
+ Map<String, Ftplet> ftplets = new LinkedHashMap<String, Ftplet>();
+ ftplets.put("ftplet1", ftplet1);
+ ftplets.put("ftplet2", ftplet2);
+
+ FtpletContainer container = createFtpletContainer(ftplets);
container.beforeCommand(new FtpSessionImpl(null), new FtpRequestImpl(
"MKD"));
@@ -495,8 +478,11 @@
}
};
- container.addFtplet("ftplet1", ftplet1);
- container.addFtplet("ftplet2", ftplet2);
+ Map<String, Ftplet> ftplets = new LinkedHashMap<String, Ftplet>();
+ ftplets.put("ftplet1", ftplet1);
+ ftplets.put("ftplet2", ftplet2);
+
+ FtpletContainer container = createFtpletContainer(ftplets);
container.afterCommand(new FtpSessionImpl(null), new FtpRequestImpl(
"MKD"));
@@ -522,8 +508,11 @@
}
};
- container.addFtplet("ftplet1", ftplet1);
- container.addFtplet("ftplet2", ftplet2);
+ Map<String, Ftplet> ftplets = new LinkedHashMap<String, Ftplet>();
+ ftplets.put("ftplet1", ftplet1);
+ ftplets.put("ftplet2", ftplet2);
+
+ FtpletContainer container = createFtpletContainer(ftplets);
container.beforeCommand(new FtpSessionImpl(null), new FtpRequestImpl(
"APPE"));
@@ -549,8 +538,11 @@
}
};
- container.addFtplet("ftplet1", ftplet1);
- container.addFtplet("ftplet2", ftplet2);
+ Map<String, Ftplet> ftplets = new LinkedHashMap<String, Ftplet>();
+ ftplets.put("ftplet1", ftplet1);
+ ftplets.put("ftplet2", ftplet2);
+
+ FtpletContainer container = createFtpletContainer(ftplets);
container.afterCommand(new FtpSessionImpl(null), new FtpRequestImpl(
"APPE"));
@@ -576,8 +568,11 @@
}
};
- container.addFtplet("ftplet1", ftplet1);
- container.addFtplet("ftplet2", ftplet2);
+ Map<String, Ftplet> ftplets = new LinkedHashMap<String, Ftplet>();
+ ftplets.put("ftplet1", ftplet1);
+ ftplets.put("ftplet2", ftplet2);
+
+ FtpletContainer container = createFtpletContainer(ftplets);
container.beforeCommand(new FtpSessionImpl(null), new FtpRequestImpl(
"STOU"));
@@ -603,8 +598,11 @@
}
};
- container.addFtplet("ftplet1", ftplet1);
- container.addFtplet("ftplet2", ftplet2);
+ Map<String, Ftplet> ftplets = new LinkedHashMap<String, Ftplet>();
+ ftplets.put("ftplet1", ftplet1);
+ ftplets.put("ftplet2", ftplet2);
+
+ FtpletContainer container = createFtpletContainer(ftplets);
container.afterCommand(new FtpSessionImpl(null), new FtpRequestImpl(
"STOU"));
@@ -630,8 +628,11 @@
}
};
- container.addFtplet("ftplet1", ftplet1);
- container.addFtplet("ftplet2", ftplet2);
+ Map<String, Ftplet> ftplets = new LinkedHashMap<String, Ftplet>();
+ ftplets.put("ftplet1", ftplet1);
+ ftplets.put("ftplet2", ftplet2);
+
+ FtpletContainer container = createFtpletContainer(ftplets);
container.beforeCommand(new FtpSessionImpl(null), new FtpRequestImpl(
"RNTO"));
@@ -657,8 +658,11 @@
}
};
- container.addFtplet("ftplet1", ftplet1);
- container.addFtplet("ftplet2", ftplet2);
+ Map<String, Ftplet> ftplets = new LinkedHashMap<String, Ftplet>();
+ ftplets.put("ftplet1", ftplet1);
+ ftplets.put("ftplet2", ftplet2);
+
+ FtpletContainer container = createFtpletContainer(ftplets);
container.afterCommand(new FtpSessionImpl(null), new FtpRequestImpl(
"RNTO"));
@@ -684,8 +688,11 @@
}
};
- container.addFtplet("ftplet1", ftplet1);
- container.addFtplet("ftplet2", ftplet2);
+ Map<String, Ftplet> ftplets = new LinkedHashMap<String, Ftplet>();
+ ftplets.put("ftplet1", ftplet1);
+ ftplets.put("ftplet2", ftplet2);
+
+ FtpletContainer container = createFtpletContainer(ftplets);
container.afterCommand(new FtpSessionImpl(null), new FtpRequestImpl(
"SITE"));
Modified:
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ftpletcontainer/FtpLetReturnDefaultTest.java
URL:
http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ftpletcontainer/FtpLetReturnDefaultTest.java?rev=701885&r1=701884&r2=701885&view=diff
==============================================================================
---
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ftpletcontainer/FtpLetReturnDefaultTest.java
(original)
+++
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ftpletcontainer/FtpLetReturnDefaultTest.java
Sun Oct 5 13:51:37 2008
@@ -23,6 +23,8 @@
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
import org.apache.commons.net.ftp.FTPReply;
import org.apache.ftpserver.FtpServer;
@@ -30,6 +32,7 @@
import org.apache.ftpserver.ftplet.FtpException;
import org.apache.ftpserver.ftplet.FtpRequest;
import org.apache.ftpserver.ftplet.FtpSession;
+import org.apache.ftpserver.ftplet.Ftplet;
import org.apache.ftpserver.ftplet.FtpletResult;
import org.apache.ftpserver.test.TestUtil;
@@ -70,8 +73,11 @@
protected FtpServer createServer() throws Exception {
FtpServer server = super.createServer();
- server.getServerContext().getFtpletContainer().addFtplet("f1",
- new MockFtplet());
+ Map<String, Ftplet> ftplets = new HashMap<String, Ftplet>();
+ ftplets.put("f1", new MockFtplet());
+
+ server.setFtplets(ftplets);
+
return server;
}
Modified:
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ftpletcontainer/FtpLetReturnDisconnectTest.java
URL:
http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ftpletcontainer/FtpLetReturnDisconnectTest.java?rev=701885&r1=701884&r2=701885&view=diff
==============================================================================
---
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ftpletcontainer/FtpLetReturnDisconnectTest.java
(original)
+++
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ftpletcontainer/FtpLetReturnDisconnectTest.java
Sun Oct 5 13:51:37 2008
@@ -24,6 +24,8 @@
import java.io.File;
import java.io.IOException;
import java.net.SocketException;
+import java.util.LinkedHashMap;
+import java.util.Map;
import org.apache.commons.net.ftp.FTPConnectionClosedException;
import org.apache.ftpserver.FtpServer;
@@ -31,6 +33,7 @@
import org.apache.ftpserver.ftplet.FtpException;
import org.apache.ftpserver.ftplet.FtpRequest;
import org.apache.ftpserver.ftplet.FtpSession;
+import org.apache.ftpserver.ftplet.Ftplet;
import org.apache.ftpserver.ftplet.FtpletResult;
import org.apache.ftpserver.test.TestUtil;
@@ -71,8 +74,10 @@
protected FtpServer createServer() throws Exception {
FtpServer server = super.createServer();
- server.getServerContext().getFtpletContainer().addFtplet("f1",
- new MockFtplet());
+ Map<String, Ftplet> ftplets = new LinkedHashMap<String, Ftplet>();
+ ftplets.put("f1", new MockFtplet());
+ server.setFtplets(ftplets);
+
return server;
}
Modified:
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ftpletcontainer/FtpLetReturnSkipTest.java
URL:
http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ftpletcontainer/FtpLetReturnSkipTest.java?rev=701885&r1=701884&r2=701885&view=diff
==============================================================================
---
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ftpletcontainer/FtpLetReturnSkipTest.java
(original)
+++
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ftpletcontainer/FtpLetReturnSkipTest.java
Sun Oct 5 13:51:37 2008
@@ -23,6 +23,8 @@
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.IOException;
+import java.util.LinkedHashMap;
+import java.util.Map;
import org.apache.commons.net.ftp.FTPReply;
import org.apache.ftpserver.FtpServer;
@@ -32,6 +34,7 @@
import org.apache.ftpserver.ftplet.FtpReply;
import org.apache.ftpserver.ftplet.FtpRequest;
import org.apache.ftpserver.ftplet.FtpSession;
+import org.apache.ftpserver.ftplet.Ftplet;
import org.apache.ftpserver.ftplet.FtpletResult;
import org.apache.ftpserver.test.TestUtil;
@@ -72,8 +75,10 @@
protected FtpServer createServer() throws Exception {
FtpServer server = super.createServer();
- server.getServerContext().getFtpletContainer().addFtplet("f1",
- new MockFtplet());
+ Map<String, Ftplet> ftplets = new LinkedHashMap<String, Ftplet>();
+ ftplets.put("f1", new MockFtplet());
+ server.setFtplets(ftplets);
+
return server;
}
