incubator-ftpserver-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From n..@apache.org
Subject svn commit: r609446 [5/5] - in /incubator/ftpserver/trunk: core/ core/src/main/java/org/apache/ftpserver/ core/src/main/java/org/apache/ftpserver/command/ core/src/main/java/org/apache/ftpserver/ftplet/ core/src/main/java/org/apache/ftpserver/interface...
Date Sun, 06 Jan 2008 22:24:34 GMT
Modified: incubator/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ftplet/FtpLetContainerTestTemplate.java
URL: http://svn.apache.org/viewvc/incubator/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ftplet/FtpLetContainerTestTemplate.java?rev=609446&r1=609445&r2=609446&view=diff
==============================================================================
--- incubator/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ftplet/FtpLetContainerTestTemplate.java (original)
+++ incubator/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ftplet/FtpLetContainerTestTemplate.java Sun Jan  6 14:24:29 2008
@@ -27,17 +27,16 @@
 
 import org.apache.ftpserver.FtpRequestImpl;
 import org.apache.ftpserver.FtpSessionImpl;
-import org.apache.ftpserver.listener.io.IOFtpResponseOutput;
 
 
 public abstract class FtpLetContainerTestTemplate extends TestCase {
 
     private FtpletContainer container = createFtpletContainer();
-    private final List calls = new ArrayList();
+    private final List<String> calls = new ArrayList<String>();
     
     protected void setUp() throws Exception {
         MockFtplet.callback = new MockFtpletCallback();
-        MockFtplet.callback.returnValue = FtpletEnum.RET_DEFAULT;
+        MockFtpletCallback.returnValue = FtpletEnum.RET_DEFAULT;
      } 
     
     protected abstract FtpletContainer createFtpletContainer();
@@ -94,22 +93,22 @@
     
     public void testOnConnect() throws FtpException, IOException {
         MockFtplet ftplet1 = new MockFtplet() {
-            public FtpletEnum onConnect(FtpSession session, FtpReplyOutput response) throws FtpException, IOException {
+            public FtpletEnum onConnect(FtpSession session) throws FtpException, IOException {
                 calls.add("ftplet1");
-                return super.onConnect(session, response);
+                return super.onConnect(session);
             }
         };
         MockFtplet ftplet2 = new MockFtplet() {
-            public FtpletEnum onConnect(FtpSession session, FtpReplyOutput response) throws FtpException, IOException {
+            public FtpletEnum onConnect(FtpSession session) throws FtpException, IOException {
                 calls.add("ftplet2");
-                return super.onConnect(session, response);
+                return super.onConnect(session);
             }
         };
         
         container.addFtplet("ftplet1", ftplet1);
         container.addFtplet("ftplet2", ftplet2);
         
-        container.onConnect(new FtpSessionImpl(null), new IOFtpResponseOutput(null));
+        container.onConnect(new FtpSessionImpl(null));
         
         assertEquals(2, calls.size());
         assertEquals("ftplet1", calls.get(0));
@@ -118,22 +117,22 @@
     
     public void testOnDisconnect() throws FtpException, IOException {
         MockFtplet ftplet1 = new MockFtplet() {
-            public FtpletEnum onDisconnect(FtpSession session, FtpReplyOutput response) throws FtpException, IOException {
+            public FtpletEnum onDisconnect(FtpSession session) throws FtpException, IOException {
                 calls.add("ftplet1");
-                return super.onDisconnect(session, response);
+                return super.onDisconnect(session);
             }
         };
         MockFtplet ftplet2 = new MockFtplet() {
-            public FtpletEnum onDisconnect(FtpSession session, FtpReplyOutput response) throws FtpException, IOException {
+            public FtpletEnum onDisconnect(FtpSession session) throws FtpException, IOException {
                 calls.add("ftplet2");
-                return super.onDisconnect(session, response);
+                return super.onDisconnect(session);
             }
         };
         
         container.addFtplet("ftplet1", ftplet1);
         container.addFtplet("ftplet2", ftplet2);
         
-        container.onDisconnect(new FtpSessionImpl(null), new IOFtpResponseOutput(null));
+        container.onDisconnect(new FtpSessionImpl(null));
         
         assertEquals(2, calls.size());
         assertEquals("ftplet1", calls.get(0));
@@ -142,22 +141,22 @@
     
     public void testOnLogin() throws FtpException, IOException {
         MockFtplet ftplet1 = new MockFtplet() {
-            public FtpletEnum onLogin(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {
+            public FtpletEnum onLogin(FtpSession session, FtpRequest request) throws FtpException, IOException {
                 calls.add("ftplet1");
-                return super.onLogin(session, request, response);
+                return super.onLogin(session, request);
             }
         };
         MockFtplet ftplet2 = new MockFtplet() {
-            public FtpletEnum onLogin(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {
+            public FtpletEnum onLogin(FtpSession session, FtpRequest request) throws FtpException, IOException {
                 calls.add("ftplet2");
-                return super.onLogin(session, request, response);
+                return super.onLogin(session, request);
             }
         };
         
         container.addFtplet("ftplet1", ftplet1);
         container.addFtplet("ftplet2", ftplet2);
         
-        container.onLogin(new FtpSessionImpl(null), new FtpRequestImpl("foo"), new IOFtpResponseOutput(null));
+        container.onLogin(new FtpSessionImpl(null), new FtpRequestImpl("foo"));
         
         assertEquals(2, calls.size());
         assertEquals("ftplet1", calls.get(0));
@@ -166,22 +165,22 @@
     
     public void testOnDeleteStart() throws FtpException, IOException {
         MockFtplet ftplet1 = new MockFtplet() {
-            public FtpletEnum onDeleteStart(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {
+            public FtpletEnum onDeleteStart(FtpSession session, FtpRequest request) throws FtpException, IOException {
                 calls.add("ftplet1");
-                return super.onDeleteStart(session, request, response);
+                return super.onDeleteStart(session, request);
             }
         };
         MockFtplet ftplet2 = new MockFtplet() {
-            public FtpletEnum onDeleteStart(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {
+            public FtpletEnum onDeleteStart(FtpSession session, FtpRequest request) throws FtpException, IOException {
                 calls.add("ftplet2");
-                return super.onDeleteStart(session, request, response);
+                return super.onDeleteStart(session, request);
             }
         };
         
         container.addFtplet("ftplet1", ftplet1);
         container.addFtplet("ftplet2", ftplet2);
         
-        container.onDeleteStart(new FtpSessionImpl(null), new FtpRequestImpl("foo"), new IOFtpResponseOutput(null));
+        container.onDeleteStart(new FtpSessionImpl(null), new FtpRequestImpl("foo"));
         
         assertEquals(2, calls.size());
         assertEquals("ftplet1", calls.get(0));
@@ -190,22 +189,22 @@
 
     public void testOnDeleteEnd() throws FtpException, IOException {
         MockFtplet ftplet1 = new MockFtplet() {
-            public FtpletEnum onDeleteEnd(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {
+            public FtpletEnum onDeleteEnd(FtpSession session, FtpRequest request) throws FtpException, IOException {
                 calls.add("ftplet1");
-                return super.onDeleteEnd(session, request, response);
+                return super.onDeleteEnd(session, request);
             }
         };
         MockFtplet ftplet2 = new MockFtplet() {
-            public FtpletEnum onDeleteEnd(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {
+            public FtpletEnum onDeleteEnd(FtpSession session, FtpRequest request) throws FtpException, IOException {
                 calls.add("ftplet2");
-                return super.onDeleteEnd(session, request, response);
+                return super.onDeleteEnd(session, request);
             }
         };
         
         container.addFtplet("ftplet1", ftplet1);
         container.addFtplet("ftplet2", ftplet2);
         
-        container.onDeleteEnd(new FtpSessionImpl(null), new FtpRequestImpl("foo"), new IOFtpResponseOutput(null));
+        container.onDeleteEnd(new FtpSessionImpl(null), new FtpRequestImpl("foo"));
         
         assertEquals(2, calls.size());
         assertEquals("ftplet1", calls.get(0));
@@ -214,22 +213,22 @@
 
     public void testOnUploadStart() throws FtpException, IOException {
         MockFtplet ftplet1 = new MockFtplet() {
-            public FtpletEnum onUploadStart(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {
+            public FtpletEnum onUploadStart(FtpSession session, FtpRequest request) throws FtpException, IOException {
                 calls.add("ftplet1");
-                return super.onUploadStart(session, request, response);
+                return super.onUploadStart(session, request);
             }
         };
         MockFtplet ftplet2 = new MockFtplet() {
-            public FtpletEnum onUploadStart(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {
+            public FtpletEnum onUploadStart(FtpSession session, FtpRequest request) throws FtpException, IOException {
                 calls.add("ftplet2");
-                return super.onUploadStart(session, request, response);
+                return super.onUploadStart(session, request);
             }
         };
         
         container.addFtplet("ftplet1", ftplet1);
         container.addFtplet("ftplet2", ftplet2);
         
-        container.onUploadStart(new FtpSessionImpl(null), new FtpRequestImpl("foo"), new IOFtpResponseOutput(null));
+        container.onUploadStart(new FtpSessionImpl(null), new FtpRequestImpl("foo"));
         
         assertEquals(2, calls.size());
         assertEquals("ftplet1", calls.get(0));
@@ -238,22 +237,22 @@
 
     public void testOnUploadEnd() throws FtpException, IOException {
         MockFtplet ftplet1 = new MockFtplet() {
-            public FtpletEnum onUploadEnd(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {
+            public FtpletEnum onUploadEnd(FtpSession session, FtpRequest request) throws FtpException, IOException {
                 calls.add("ftplet1");
-                return super.onUploadEnd(session, request, response);
+                return super.onUploadEnd(session, request);
             }
         };
         MockFtplet ftplet2 = new MockFtplet() {
-            public FtpletEnum onUploadEnd(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {
+            public FtpletEnum onUploadEnd(FtpSession session, FtpRequest request) throws FtpException, IOException {
                 calls.add("ftplet2");
-                return super.onUploadEnd(session, request, response);
+                return super.onUploadEnd(session, request);
             }
         };
         
         container.addFtplet("ftplet1", ftplet1);
         container.addFtplet("ftplet2", ftplet2);
         
-        container.onUploadEnd(new FtpSessionImpl(null), new FtpRequestImpl("foo"), new IOFtpResponseOutput(null));
+        container.onUploadEnd(new FtpSessionImpl(null), new FtpRequestImpl("foo"));
         
         assertEquals(2, calls.size());
         assertEquals("ftplet1", calls.get(0));
@@ -262,22 +261,22 @@
 
     public void testOnDownloadStart() throws FtpException, IOException {
         MockFtplet ftplet1 = new MockFtplet() {
-            public FtpletEnum onDownloadStart(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {
+            public FtpletEnum onDownloadStart(FtpSession session, FtpRequest request) throws FtpException, IOException {
                 calls.add("ftplet1");
-                return super.onDownloadStart(session, request, response);
+                return super.onDownloadStart(session, request);
             }
         };
         MockFtplet ftplet2 = new MockFtplet() {
-            public FtpletEnum onDownloadStart(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {
+            public FtpletEnum onDownloadStart(FtpSession session, FtpRequest request) throws FtpException, IOException {
                 calls.add("ftplet2");
-                return super.onDownloadStart(session, request, response);
+                return super.onDownloadStart(session, request);
             }
         };
         
         container.addFtplet("ftplet1", ftplet1);
         container.addFtplet("ftplet2", ftplet2);
         
-        container.onDownloadStart(new FtpSessionImpl(null), new FtpRequestImpl("foo"), new IOFtpResponseOutput(null));
+        container.onDownloadStart(new FtpSessionImpl(null), new FtpRequestImpl("foo"));
         
         assertEquals(2, calls.size());
         assertEquals("ftplet1", calls.get(0));
@@ -286,22 +285,22 @@
     
     public void testOnDownloadEnd() throws FtpException, IOException {
         MockFtplet ftplet1 = new MockFtplet() {
-            public FtpletEnum onDownloadEnd(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {
+            public FtpletEnum onDownloadEnd(FtpSession session, FtpRequest request) throws FtpException, IOException {
                 calls.add("ftplet1");
-                return super.onDownloadEnd(session, request, response);
+                return super.onDownloadEnd(session, request);
             }
         };
         MockFtplet ftplet2 = new MockFtplet() {
-            public FtpletEnum onDownloadEnd(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {
+            public FtpletEnum onDownloadEnd(FtpSession session, FtpRequest request) throws FtpException, IOException {
                 calls.add("ftplet2");
-                return super.onDownloadEnd(session, request, response);
+                return super.onDownloadEnd(session, request);
             }
         };
         
         container.addFtplet("ftplet1", ftplet1);
         container.addFtplet("ftplet2", ftplet2);
         
-        container.onDownloadEnd(new FtpSessionImpl(null), new FtpRequestImpl("foo"), new IOFtpResponseOutput(null));
+        container.onDownloadEnd(new FtpSessionImpl(null), new FtpRequestImpl("foo"));
         
         assertEquals(2, calls.size());
         assertEquals("ftplet1", calls.get(0));
@@ -310,22 +309,22 @@
     
     public void testOnRmdirStart() throws FtpException, IOException {
         MockFtplet ftplet1 = new MockFtplet() {
-            public FtpletEnum onRmdirStart(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {
+            public FtpletEnum onRmdirStart(FtpSession session, FtpRequest request) throws FtpException, IOException {
                 calls.add("ftplet1");
-                return super.onRmdirStart(session, request, response);
+                return super.onRmdirStart(session, request);
             }
         };
         MockFtplet ftplet2 = new MockFtplet() {
-            public FtpletEnum onRmdirStart(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {
+            public FtpletEnum onRmdirStart(FtpSession session, FtpRequest request) throws FtpException, IOException {
                 calls.add("ftplet2");
-                return super.onRmdirStart(session, request, response);
+                return super.onRmdirStart(session, request);
             }
         };
         
         container.addFtplet("ftplet1", ftplet1);
         container.addFtplet("ftplet2", ftplet2);
         
-        container.onRmdirStart(new FtpSessionImpl(null), new FtpRequestImpl("foo"), new IOFtpResponseOutput(null));
+        container.onRmdirStart(new FtpSessionImpl(null), new FtpRequestImpl("foo"));
         
         assertEquals(2, calls.size());
         assertEquals("ftplet1", calls.get(0));
@@ -334,22 +333,22 @@
     
     public void testOnRmdirEnd() throws FtpException, IOException {
         MockFtplet ftplet1 = new MockFtplet() {
-            public FtpletEnum onRmdirEnd(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {
+            public FtpletEnum onRmdirEnd(FtpSession session, FtpRequest request) throws FtpException, IOException {
                 calls.add("ftplet1");
-                return super.onRmdirEnd(session, request, response);
+                return super.onRmdirEnd(session, request);
             }
         };
         MockFtplet ftplet2 = new MockFtplet() {
-            public FtpletEnum onRmdirEnd(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {
+            public FtpletEnum onRmdirEnd(FtpSession session, FtpRequest request) throws FtpException, IOException {
                 calls.add("ftplet2");
-                return super.onRmdirEnd(session, request, response);
+                return super.onRmdirEnd(session, request);
             }
         };
         
         container.addFtplet("ftplet1", ftplet1);
         container.addFtplet("ftplet2", ftplet2);
         
-        container.onRmdirEnd(new FtpSessionImpl(null), new FtpRequestImpl("foo"), new IOFtpResponseOutput(null));
+        container.onRmdirEnd(new FtpSessionImpl(null), new FtpRequestImpl("foo"));
         
         assertEquals(2, calls.size());
         assertEquals("ftplet1", calls.get(0));
@@ -358,22 +357,22 @@
     
     public void testOnMkdirStart() throws FtpException, IOException {
         MockFtplet ftplet1 = new MockFtplet() {
-            public FtpletEnum onMkdirStart(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {
+            public FtpletEnum onMkdirStart(FtpSession session, FtpRequest request) throws FtpException, IOException {
                 calls.add("ftplet1");
-                return super.onMkdirStart(session, request, response);
+                return super.onMkdirStart(session, request);
             }
         };
         MockFtplet ftplet2 = new MockFtplet() {
-            public FtpletEnum onMkdirStart(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {
+            public FtpletEnum onMkdirStart(FtpSession session, FtpRequest request) throws FtpException, IOException {
                 calls.add("ftplet2");
-                return super.onMkdirStart(session, request, response);
+                return super.onMkdirStart(session, request);
             }
         };
         
         container.addFtplet("ftplet1", ftplet1);
         container.addFtplet("ftplet2", ftplet2);
         
-        container.onMkdirStart(new FtpSessionImpl(null), new FtpRequestImpl("foo"), new IOFtpResponseOutput(null));
+        container.onMkdirStart(new FtpSessionImpl(null), new FtpRequestImpl("foo"));
         
         assertEquals(2, calls.size());
         assertEquals("ftplet1", calls.get(0));
@@ -382,22 +381,22 @@
 
     public void testOnMkdirEnd() throws FtpException, IOException {
         MockFtplet ftplet1 = new MockFtplet() {
-            public FtpletEnum onMkdirEnd(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {
+            public FtpletEnum onMkdirEnd(FtpSession session, FtpRequest request) throws FtpException, IOException {
                 calls.add("ftplet1");
-                return super.onMkdirEnd(session, request, response);
+                return super.onMkdirEnd(session, request);
             }
         };
         MockFtplet ftplet2 = new MockFtplet() {
-            public FtpletEnum onMkdirEnd(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {
+            public FtpletEnum onMkdirEnd(FtpSession session, FtpRequest request) throws FtpException, IOException {
                 calls.add("ftplet2");
-                return super.onMkdirEnd(session, request, response);
+                return super.onMkdirEnd(session, request);
             }
         };
         
         container.addFtplet("ftplet1", ftplet1);
         container.addFtplet("ftplet2", ftplet2);
         
-        container.onMkdirEnd(new FtpSessionImpl(null), new FtpRequestImpl("foo"), new IOFtpResponseOutput(null));
+        container.onMkdirEnd(new FtpSessionImpl(null), new FtpRequestImpl("foo"));
         
         assertEquals(2, calls.size());
         assertEquals("ftplet1", calls.get(0));
@@ -406,22 +405,22 @@
     
     public void testOnAppendStart() throws FtpException, IOException {
         MockFtplet ftplet1 = new MockFtplet() {
-            public FtpletEnum onAppendStart(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {
+            public FtpletEnum onAppendStart(FtpSession session, FtpRequest request) throws FtpException, IOException {
                 calls.add("ftplet1");
-                return super.onAppendStart(session, request, response);
+                return super.onAppendStart(session, request);
             }
         };
         MockFtplet ftplet2 = new MockFtplet() {
-            public FtpletEnum onAppendStart(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {
+            public FtpletEnum onAppendStart(FtpSession session, FtpRequest request) throws FtpException, IOException {
                 calls.add("ftplet2");
-                return super.onAppendStart(session, request, response);
+                return super.onAppendStart(session, request);
             }
         };
         
         container.addFtplet("ftplet1", ftplet1);
         container.addFtplet("ftplet2", ftplet2);
         
-        container.onAppendStart(new FtpSessionImpl(null), new FtpRequestImpl("foo"), new IOFtpResponseOutput(null));
+        container.onAppendStart(new FtpSessionImpl(null), new FtpRequestImpl("foo"));
         
         assertEquals(2, calls.size());
         assertEquals("ftplet1", calls.get(0));
@@ -430,22 +429,22 @@
     
     public void testOnAppendEnd() throws FtpException, IOException {
         MockFtplet ftplet1 = new MockFtplet() {
-            public FtpletEnum onAppendEnd(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {
+            public FtpletEnum onAppendEnd(FtpSession session, FtpRequest request) throws FtpException, IOException {
                 calls.add("ftplet1");
-                return super.onAppendEnd(session, request, response);
+                return super.onAppendEnd(session, request);
             }
         };
         MockFtplet ftplet2 = new MockFtplet() {
-            public FtpletEnum onAppendEnd(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {
+            public FtpletEnum onAppendEnd(FtpSession session, FtpRequest request) throws FtpException, IOException {
                 calls.add("ftplet2");
-                return super.onAppendEnd(session, request, response);
+                return super.onAppendEnd(session, request);
             }
         };
         
         container.addFtplet("ftplet1", ftplet1);
         container.addFtplet("ftplet2", ftplet2);
         
-        container.onAppendEnd(new FtpSessionImpl(null), new FtpRequestImpl("foo"), new IOFtpResponseOutput(null));
+        container.onAppendEnd(new FtpSessionImpl(null), new FtpRequestImpl("foo"));
         
         assertEquals(2, calls.size());
         assertEquals("ftplet1", calls.get(0));
@@ -454,22 +453,22 @@
     
     public void testOnUploadUniqueStart() throws FtpException, IOException {
         MockFtplet ftplet1 = new MockFtplet() {
-            public FtpletEnum onUploadUniqueStart(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {
+            public FtpletEnum onUploadUniqueStart(FtpSession session, FtpRequest request) throws FtpException, IOException {
                 calls.add("ftplet1");
-                return super.onUploadUniqueStart(session, request, response);
+                return super.onUploadUniqueStart(session, request);
             }
         };
         MockFtplet ftplet2 = new MockFtplet() {
-            public FtpletEnum onUploadUniqueStart(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {
+            public FtpletEnum onUploadUniqueStart(FtpSession session, FtpRequest request) throws FtpException, IOException {
                 calls.add("ftplet2");
-                return super.onUploadUniqueStart(session, request, response);
+                return super.onUploadUniqueStart(session, request);
             }
         };
         
         container.addFtplet("ftplet1", ftplet1);
         container.addFtplet("ftplet2", ftplet2);
         
-        container.onUploadUniqueStart(new FtpSessionImpl(null), new FtpRequestImpl("foo"), new IOFtpResponseOutput(null));
+        container.onUploadUniqueStart(new FtpSessionImpl(null), new FtpRequestImpl("foo"));
         
         assertEquals(2, calls.size());
         assertEquals("ftplet1", calls.get(0));
@@ -478,22 +477,22 @@
 
     public void testOnUploadUniqueEnd() throws FtpException, IOException {
         MockFtplet ftplet1 = new MockFtplet() {
-            public FtpletEnum onUploadUniqueEnd(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {
+            public FtpletEnum onUploadUniqueEnd(FtpSession session, FtpRequest request) throws FtpException, IOException {
                 calls.add("ftplet1");
-                return super.onUploadUniqueEnd(session, request, response);
+                return super.onUploadUniqueEnd(session, request);
             }
         };
         MockFtplet ftplet2 = new MockFtplet() {
-            public FtpletEnum onUploadUniqueEnd(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {
+            public FtpletEnum onUploadUniqueEnd(FtpSession session, FtpRequest request) throws FtpException, IOException {
                 calls.add("ftplet2");
-                return super.onUploadUniqueEnd(session, request, response);
+                return super.onUploadUniqueEnd(session, request);
             }
         };
         
         container.addFtplet("ftplet1", ftplet1);
         container.addFtplet("ftplet2", ftplet2);
         
-        container.onUploadUniqueEnd(new FtpSessionImpl(null), new FtpRequestImpl("foo"), new IOFtpResponseOutput(null));
+        container.onUploadUniqueEnd(new FtpSessionImpl(null), new FtpRequestImpl("foo"));
         
         assertEquals(2, calls.size());
         assertEquals("ftplet1", calls.get(0));
@@ -502,22 +501,22 @@
     
     public void testOnRenameStart() throws FtpException, IOException {
         MockFtplet ftplet1 = new MockFtplet() {
-            public FtpletEnum onRenameStart(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {
+            public FtpletEnum onRenameStart(FtpSession session, FtpRequest request) throws FtpException, IOException {
                 calls.add("ftplet1");
-                return super.onRenameStart(session, request, response);
+                return super.onRenameStart(session, request);
             }
         };
         MockFtplet ftplet2 = new MockFtplet() {
-            public FtpletEnum onRenameStart(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {
+            public FtpletEnum onRenameStart(FtpSession session, FtpRequest request) throws FtpException, IOException {
                 calls.add("ftplet2");
-                return super.onRenameStart(session, request, response);
+                return super.onRenameStart(session, request);
             }
         };
         
         container.addFtplet("ftplet1", ftplet1);
         container.addFtplet("ftplet2", ftplet2);
         
-        container.onRenameStart(new FtpSessionImpl(null), new FtpRequestImpl("foo"), new IOFtpResponseOutput(null));
+        container.onRenameStart(new FtpSessionImpl(null), new FtpRequestImpl("foo"));
         
         assertEquals(2, calls.size());
         assertEquals("ftplet1", calls.get(0));
@@ -526,22 +525,22 @@
     
     public void testOnRenameEnd() throws FtpException, IOException {
         MockFtplet ftplet1 = new MockFtplet() {
-            public FtpletEnum onRenameEnd(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {
+            public FtpletEnum onRenameEnd(FtpSession session, FtpRequest request) throws FtpException, IOException {
                 calls.add("ftplet1");
-                return super.onRenameEnd(session, request, response);
+                return super.onRenameEnd(session, request);
             }
         };
         MockFtplet ftplet2 = new MockFtplet() {
-            public FtpletEnum onRenameEnd(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {
+            public FtpletEnum onRenameEnd(FtpSession session, FtpRequest request) throws FtpException, IOException {
                 calls.add("ftplet2");
-                return super.onRenameEnd(session, request, response);
+                return super.onRenameEnd(session, request);
             }
         };
         
         container.addFtplet("ftplet1", ftplet1);
         container.addFtplet("ftplet2", ftplet2);
         
-        container.onRenameEnd(new FtpSessionImpl(null), new FtpRequestImpl("foo"), new IOFtpResponseOutput(null));
+        container.onRenameEnd(new FtpSessionImpl(null), new FtpRequestImpl("foo"));
         
         assertEquals(2, calls.size());
         assertEquals("ftplet1", calls.get(0));
@@ -550,22 +549,22 @@
     
     public void testOnSite() throws FtpException, IOException {
         MockFtplet ftplet1 = new MockFtplet() {
-            public FtpletEnum onSite(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {
+            public FtpletEnum onSite(FtpSession session, FtpRequest request) throws FtpException, IOException {
                 calls.add("ftplet1");
-                return super.onSite(session, request, response);
+                return super.onSite(session, request);
             }
         };
         MockFtplet ftplet2 = new MockFtplet() {
-            public FtpletEnum onSite(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {
+            public FtpletEnum onSite(FtpSession session, FtpRequest request) throws FtpException, IOException {
                 calls.add("ftplet2");
-                return super.onSite(session, request, response);
+                return super.onSite(session, request);
             }
         };
         
         container.addFtplet("ftplet1", ftplet1);
         container.addFtplet("ftplet2", ftplet2);
         
-        container.onSite(new FtpSessionImpl(null), new FtpRequestImpl("foo"), new IOFtpResponseOutput(null));
+        container.onSite(new FtpSessionImpl(null), new FtpRequestImpl("foo"));
         
         assertEquals(2, calls.size());
         assertEquals("ftplet1", calls.get(0));

Modified: incubator/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ftplet/FtpLetReturnDefaultTest.java
URL: http://svn.apache.org/viewvc/incubator/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ftplet/FtpLetReturnDefaultTest.java?rev=609446&r1=609445&r2=609446&view=diff
==============================================================================
--- incubator/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ftplet/FtpLetReturnDefaultTest.java (original)
+++ incubator/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ftplet/FtpLetReturnDefaultTest.java Sun Jan  6 14:24:29 2008
@@ -69,10 +69,10 @@
 
     public void testLogin() throws Exception {
         MockFtplet.callback = new MockFtpletCallback() {
-            public FtpletEnum onLogin(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {
+            public FtpletEnum onLogin(FtpSession session, FtpRequest request) throws FtpException, IOException {
                 assertNotNull(session.getUser());
                 
-                return super.onLogin(session, request, response);
+                return super.onLogin(session, request);
             }
             
         };

Modified: incubator/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ftplet/FtpLetReturnDisconnectTest.java
URL: http://svn.apache.org/viewvc/incubator/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ftplet/FtpLetReturnDisconnectTest.java?rev=609446&r1=609445&r2=609446&view=diff
==============================================================================
--- incubator/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ftplet/FtpLetReturnDisconnectTest.java (original)
+++ incubator/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ftplet/FtpLetReturnDisconnectTest.java Sun Jan  6 14:24:29 2008
@@ -87,7 +87,7 @@
 
     public void testExceptionDuringLogin() throws Exception {
         MockFtplet.callback = new MockFtpletCallback() {
-            public FtpletEnum onLogin(FtpSession session, FtpRequest request, FtpReplyOutput response)
+            public FtpletEnum onLogin(FtpSession session, FtpRequest request)
                     throws FtpException, IOException {
                 throwException();
                 return mockReturnValue;
@@ -104,7 +104,7 @@
 
     public void testExceptionDuringDeleteStart() throws Exception {
         MockFtplet.callback = new MockFtpletCallback() {
-            public FtpletEnum onDeleteStart(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {
+            public FtpletEnum onDeleteStart(FtpSession session, FtpRequest request) throws FtpException, IOException {
                 throwException();
                 return mockReturnValue;
             }
@@ -125,7 +125,7 @@
 
     public void testExceptionDuringDeleteEnd() throws Exception {
         MockFtplet.callback = new MockFtpletCallback() {
-            public FtpletEnum onDeleteEnd(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {
+            public FtpletEnum onDeleteEnd(FtpSession session, FtpRequest request) throws FtpException, IOException {
                 throwException();
                 return mockReturnValue;
             }
@@ -149,7 +149,7 @@
 
     public void testExceptionDuringMkdirStart() throws Exception {
         MockFtplet.callback = new MockFtpletCallback() {
-            public FtpletEnum onMkdirStart(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {
+            public FtpletEnum onMkdirStart(FtpSession session, FtpRequest request) throws FtpException, IOException {
                 throwException();
                 return mockReturnValue;
             }
@@ -168,7 +168,7 @@
 
     public void testExceptionDuringMkdirEnd() throws Exception {
         MockFtplet.callback = new MockFtpletCallback() {
-            public FtpletEnum onMkdirEnd(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {
+            public FtpletEnum onMkdirEnd(FtpSession session, FtpRequest request) throws FtpException, IOException {
                 throwException();
                 return mockReturnValue;
             }
@@ -190,7 +190,7 @@
 
     public void testExceptionDuringRmdirStart() throws Exception {
         MockFtplet.callback = new MockFtpletCallback() {
-            public FtpletEnum onRmdirStart(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {
+            public FtpletEnum onRmdirStart(FtpSession session, FtpRequest request) throws FtpException, IOException {
                 throwException();
                 return mockReturnValue;
             }
@@ -211,7 +211,7 @@
 
     public void testExceptionDuringRmdirEnd() throws Exception {
         MockFtplet.callback = new MockFtpletCallback() {
-            public FtpletEnum onRmdirEnd(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {
+            public FtpletEnum onRmdirEnd(FtpSession session, FtpRequest request) throws FtpException, IOException {
                 throwException();
                 return mockReturnValue;
             }
@@ -235,7 +235,7 @@
 
     public void testExceptionDuringSite() throws Exception {
         MockFtplet.callback = new MockFtpletCallback() {
-            public FtpletEnum onSite(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {
+            public FtpletEnum onSite(FtpSession session, FtpRequest request) throws FtpException, IOException {
                 throwException();
                 return mockReturnValue;
             }
@@ -252,7 +252,7 @@
 
     public void testExceptionDuringRenameStart() throws Exception {
         MockFtplet.callback = new MockFtpletCallback() {
-            public FtpletEnum onRenameStart(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {
+            public FtpletEnum onRenameStart(FtpSession session, FtpRequest request) throws FtpException, IOException {
                 throwException();
                 return mockReturnValue;
             }
@@ -274,7 +274,7 @@
     
     public void testExceptionDuringRenameEnd() throws Exception {
         MockFtplet.callback = new MockFtpletCallback() {
-            public FtpletEnum onRenameEnd(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {
+            public FtpletEnum onRenameEnd(FtpSession session, FtpRequest request) throws FtpException, IOException {
                 throwException();
                 return mockReturnValue;
             }
@@ -300,7 +300,7 @@
 
     public void testExceptionDuringDownloadStart() throws Exception {
         MockFtplet.callback = new MockFtpletCallback() {
-            public FtpletEnum onDownloadStart(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {
+            public FtpletEnum onDownloadStart(FtpSession session, FtpRequest request) throws FtpException, IOException {
                 throwException();
                 return mockReturnValue;
             }
@@ -319,7 +319,7 @@
 
     public void testExceptionDuringDownloadEnd() throws Exception {
         MockFtplet.callback = new MockFtpletCallback() {
-            public FtpletEnum onDownloadEnd(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {
+            public FtpletEnum onDownloadEnd(FtpSession session, FtpRequest request) throws FtpException, IOException {
                 throwException();
                 return mockReturnValue;
             }
@@ -342,7 +342,7 @@
 
     public void testExceptionDuringAppendStart() throws Exception {
         MockFtplet.callback = new MockFtpletCallback() {
-            public FtpletEnum onAppendStart(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {
+            public FtpletEnum onAppendStart(FtpSession session, FtpRequest request) throws FtpException, IOException {
                 throwException();
                 return mockReturnValue;
             }
@@ -363,8 +363,8 @@
     
     public void testExceptionDuringAppendEnd() throws Exception {
         MockFtplet.callback = new MockFtpletCallback() {
-            public FtpletEnum onAppendEnd(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {
-                throwException();
+            public FtpletEnum onAppendEnd(FtpSession session, FtpRequest request) throws FtpException, IOException {
+                //throwException();
                 return mockReturnValue;
             }
         };
@@ -385,7 +385,7 @@
 
     public void testExceptionDuringUploadStart() throws Exception {
         MockFtplet.callback = new MockFtpletCallback() {
-            public FtpletEnum onUploadStart(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {
+            public FtpletEnum onUploadStart(FtpSession session, FtpRequest request) throws FtpException, IOException {
                 throwException();
                 return mockReturnValue;
             }
@@ -404,7 +404,7 @@
     
     public void testExceptionDuringUploadEnd() throws Exception {
         MockFtplet.callback = new MockFtpletCallback() {
-            public FtpletEnum onUploadEnd(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {
+            public FtpletEnum onUploadEnd(FtpSession session, FtpRequest request) throws FtpException, IOException {
                 throwException();
                 return mockReturnValue;
             }
@@ -424,7 +424,7 @@
     
     public void testExceptionDuringUploadUniqueStart() throws Exception {
         MockFtplet.callback = new MockFtpletCallback() {
-            public FtpletEnum onUploadUniqueStart(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {
+            public FtpletEnum onUploadUniqueStart(FtpSession session, FtpRequest request) throws FtpException, IOException {
                 throwException();
                 return mockReturnValue;
             }
@@ -443,7 +443,7 @@
     
     public void testExceptionDuringUploadUniqueEnd() throws Exception {
         MockFtplet.callback = new MockFtpletCallback() {
-            public FtpletEnum onUploadUniqueEnd(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {
+            public FtpletEnum onUploadUniqueEnd(FtpSession session, FtpRequest request) throws FtpException, IOException {
                 throwException();
                 
                 return mockReturnValue;

Modified: incubator/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ftplet/FtpLetReturnSkipTest.java
URL: http://svn.apache.org/viewvc/incubator/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ftplet/FtpLetReturnSkipTest.java?rev=609446&r1=609445&r2=609446&view=diff
==============================================================================
--- incubator/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ftplet/FtpLetReturnSkipTest.java (original)
+++ incubator/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ftplet/FtpLetReturnSkipTest.java Sun Jan  6 14:24:29 2008
@@ -66,7 +66,7 @@
 
     public void testLogin() throws Exception {
         MockFtplet.callback = new MockFtpletCallback() {
-            public FtpletEnum onLogin(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {
+            public FtpletEnum onLogin(FtpSession session, FtpRequest request) throws FtpException, IOException {
                 return FtpletEnum.RET_SKIP;
             }
         };

Modified: incubator/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ftplet/MockFtplet.java
URL: http://svn.apache.org/viewvc/incubator/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ftplet/MockFtplet.java?rev=609446&r1=609445&r2=609446&view=diff
==============================================================================
--- incubator/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ftplet/MockFtplet.java (original)
+++ incubator/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ftplet/MockFtplet.java Sun Jan  6 14:24:29 2008
@@ -33,84 +33,84 @@
         callback.init(ftpletContext, config);
     }
 
-    public FtpletEnum onAppendEnd(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {
-        return callback.onAppendEnd(session, request, response);
+    public FtpletEnum onAppendEnd(FtpSession session, FtpRequest request) throws FtpException, IOException {
+        return callback.onAppendEnd(session, request);
     }
 
-    public FtpletEnum onAppendStart(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {
-        return callback.onAppendStart(session, request, response);
+    public FtpletEnum onAppendStart(FtpSession session, FtpRequest request) throws FtpException, IOException {
+        return callback.onAppendStart(session, request);
     }
 
-    public FtpletEnum onConnect(FtpSession session, FtpReplyOutput response) throws FtpException, IOException {
-        return callback.onConnect(session, response);
+    public FtpletEnum onConnect(FtpSession session) throws FtpException, IOException {
+        return callback.onConnect(session);
     }
 
-    public FtpletEnum onDeleteEnd(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {
-        return callback.onDeleteEnd(session, request, response);
+    public FtpletEnum onDeleteEnd(FtpSession session, FtpRequest request) throws FtpException, IOException {
+        return callback.onDeleteEnd(session, request);
     }
 
-    public FtpletEnum onDeleteStart(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {
-        return callback.onDeleteStart(session, request, response);
+    public FtpletEnum onDeleteStart(FtpSession session, FtpRequest request) throws FtpException, IOException {
+        return callback.onDeleteStart(session, request);
     }
 
-    public FtpletEnum onDisconnect(FtpSession session, FtpReplyOutput response) throws FtpException, IOException {
-        return callback.onDisconnect(session, response);
+    public FtpletEnum onDisconnect(FtpSession session) throws FtpException, IOException {
+        return callback.onDisconnect(session);
     }
 
-    public FtpletEnum onDownloadEnd(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {
-        return callback.onDownloadEnd(session, request, response);
+    public FtpletEnum onDownloadEnd(FtpSession session, FtpRequest request) throws FtpException, IOException {
+        return callback.onDownloadEnd(session, request);
     }
 
-    public FtpletEnum onDownloadStart(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {
-        return callback.onDownloadStart(session, request, response);
+    public FtpletEnum onDownloadStart(FtpSession session, FtpRequest request) throws FtpException, IOException {
+        return callback.onDownloadStart(session, request);
     }
 
-    public FtpletEnum onLogin(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {
-        return callback.onLogin(session, request, response);
+    public FtpletEnum onLogin(FtpSession session, FtpRequest request) throws FtpException, IOException {
+        return callback.onLogin(session, request);
     }
 
-    public FtpletEnum onMkdirEnd(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {
-        return callback.onMkdirEnd(session, request, response);
+    public FtpletEnum onMkdirEnd(FtpSession session, FtpRequest request) throws FtpException, IOException {
+        return callback.onMkdirEnd(session, request);
     }
 
-    public FtpletEnum onMkdirStart(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {
-        return callback.onMkdirStart(session, request, response);
+    public FtpletEnum onMkdirStart(FtpSession session, FtpRequest request) throws FtpException, IOException {
+        return callback.onMkdirStart(session, request);
     }
 
-    public FtpletEnum onRenameEnd(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {
-        return callback.onRenameEnd(session, request, response);
+    public FtpletEnum onRenameEnd(FtpSession session, FtpRequest request) throws FtpException, IOException {
+        return callback.onRenameEnd(session, request);
     }
 
-    public FtpletEnum onRenameStart(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {
-        return callback.onRenameStart(session, request, response);
+    public FtpletEnum onRenameStart(FtpSession session, FtpRequest request) throws FtpException, IOException {
+        return callback.onRenameStart(session, request);
     }
 
-    public FtpletEnum onRmdirEnd(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {
-        return callback.onRmdirEnd(session, request, response);
+    public FtpletEnum onRmdirEnd(FtpSession session, FtpRequest request) throws FtpException, IOException {
+        return callback.onRmdirEnd(session, request);
     }
 
-    public FtpletEnum onRmdirStart(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {
-        return callback.onRmdirStart(session, request, response);
+    public FtpletEnum onRmdirStart(FtpSession session, FtpRequest request) throws FtpException, IOException {
+        return callback.onRmdirStart(session, request);
     }
 
-    public FtpletEnum onSite(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {
-        return callback.onSite(session, request, response);
+    public FtpletEnum onSite(FtpSession session, FtpRequest request) throws FtpException, IOException {
+        return callback.onSite(session, request);
     }
 
-    public FtpletEnum onUploadEnd(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {
-        return callback.onUploadEnd(session, request, response);
+    public FtpletEnum onUploadEnd(FtpSession session, FtpRequest request) throws FtpException, IOException {
+        return callback.onUploadEnd(session, request);
     }
 
-    public FtpletEnum onUploadStart(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {
-        return callback.onUploadStart(session, request, response);
+    public FtpletEnum onUploadStart(FtpSession session, FtpRequest request) throws FtpException, IOException {
+        return callback.onUploadStart(session, request);
     }
 
-    public FtpletEnum onUploadUniqueEnd(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {
-        return callback.onUploadUniqueEnd(session, request, response);
+    public FtpletEnum onUploadUniqueEnd(FtpSession session, FtpRequest request) throws FtpException, IOException {
+        return callback.onUploadUniqueEnd(session, request);
     }
 
-    public FtpletEnum onUploadUniqueStart(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {
-        return callback.onUploadUniqueStart(session, request, response);
+    public FtpletEnum onUploadUniqueStart(FtpSession session, FtpRequest request) throws FtpException, IOException {
+        return callback.onUploadUniqueStart(session, request);
     }
 }
 

Modified: incubator/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ftplet/MockFtpletCallback.java
URL: http://svn.apache.org/viewvc/incubator/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ftplet/MockFtpletCallback.java?rev=609446&r1=609445&r2=609446&view=diff
==============================================================================
--- incubator/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ftplet/MockFtpletCallback.java (original)
+++ incubator/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ftplet/MockFtpletCallback.java Sun Jan  6 14:24:29 2008
@@ -31,83 +31,83 @@
     public void init(FtpletContext ftpletContext, Configuration config) throws FtpException {
     }
 
-    public FtpletEnum onAppendEnd(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {
+    public FtpletEnum onAppendEnd(FtpSession session, FtpRequest request) throws FtpException, IOException {
         return returnValue;
     }
 
-    public FtpletEnum onAppendStart(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {
+    public FtpletEnum onAppendStart(FtpSession session, FtpRequest request) throws FtpException, IOException {
         return returnValue;
     }
 
-    public FtpletEnum onConnect(FtpSession session, FtpReplyOutput response) throws FtpException, IOException {
+    public FtpletEnum onConnect(FtpSession session) throws FtpException, IOException {
         return returnValue;
     }
 
-    public FtpletEnum onDeleteEnd(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {
+    public FtpletEnum onDeleteEnd(FtpSession session, FtpRequest request) throws FtpException, IOException {
         return returnValue;
     }
 
-    public FtpletEnum onDeleteStart(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {
+    public FtpletEnum onDeleteStart(FtpSession session, FtpRequest request) throws FtpException, IOException {
         return returnValue;
     }
 
-    public FtpletEnum onDisconnect(FtpSession session, FtpReplyOutput response) throws FtpException, IOException {
+    public FtpletEnum onDisconnect(FtpSession session) throws FtpException, IOException {
         return returnValue;
     }
 
-    public FtpletEnum onDownloadEnd(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {
+    public FtpletEnum onDownloadEnd(FtpSession session, FtpRequest request) throws FtpException, IOException {
         return returnValue;
     }
 
-    public FtpletEnum onDownloadStart(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {
+    public FtpletEnum onDownloadStart(FtpSession session, FtpRequest request) throws FtpException, IOException {
         return returnValue;
     }
 
-    public FtpletEnum onLogin(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {
+    public FtpletEnum onLogin(FtpSession session, FtpRequest request) throws FtpException, IOException {
         return returnValue;
     }
 
-    public FtpletEnum onMkdirEnd(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {
+    public FtpletEnum onMkdirEnd(FtpSession session, FtpRequest request) throws FtpException, IOException {
         return returnValue;
     }
 
-    public FtpletEnum onMkdirStart(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {
+    public FtpletEnum onMkdirStart(FtpSession session, FtpRequest request) throws FtpException, IOException {
         return returnValue;
     }
 
-    public FtpletEnum onRenameEnd(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {
+    public FtpletEnum onRenameEnd(FtpSession session, FtpRequest request) throws FtpException, IOException {
         return returnValue;
     }
 
-    public FtpletEnum onRenameStart(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {
+    public FtpletEnum onRenameStart(FtpSession session, FtpRequest request) throws FtpException, IOException {
         return returnValue;
     }
 
-    public FtpletEnum onRmdirEnd(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {
+    public FtpletEnum onRmdirEnd(FtpSession session, FtpRequest request) throws FtpException, IOException {
         return returnValue;
     }
 
-    public FtpletEnum onRmdirStart(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {
+    public FtpletEnum onRmdirStart(FtpSession session, FtpRequest request) throws FtpException, IOException {
         return returnValue;
     }
 
-    public FtpletEnum onSite(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {
+    public FtpletEnum onSite(FtpSession session, FtpRequest request) throws FtpException, IOException {
         return returnValue;
     }
 
-    public FtpletEnum onUploadEnd(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {
+    public FtpletEnum onUploadEnd(FtpSession session, FtpRequest request) throws FtpException, IOException {
         return returnValue;
     }
 
-    public FtpletEnum onUploadStart(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {
+    public FtpletEnum onUploadStart(FtpSession session, FtpRequest request) throws FtpException, IOException {
         return returnValue;
     }
 
-    public FtpletEnum onUploadUniqueEnd(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {
+    public FtpletEnum onUploadUniqueEnd(FtpSession session, FtpRequest request) throws FtpException, IOException {
         return returnValue;
     }
 
-    public FtpletEnum onUploadUniqueStart(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {
+    public FtpletEnum onUploadUniqueStart(FtpSession session, FtpRequest request) throws FtpException, IOException {
         return returnValue;
     }
 

Modified: incubator/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/interfaces/ServerFtpStatisticsTestTemplate.java
URL: http://svn.apache.org/viewvc/incubator/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/interfaces/ServerFtpStatisticsTestTemplate.java?rev=609446&r1=609445&r2=609446&view=diff
==============================================================================
--- incubator/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/interfaces/ServerFtpStatisticsTestTemplate.java (original)
+++ incubator/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/interfaces/ServerFtpStatisticsTestTemplate.java Sun Jan  6 14:24:29 2008
@@ -77,24 +77,24 @@
         assertEquals(0, stats.getTotalConnectionNumber());
         assertEquals(0, stats.getCurrentConnectionNumber());
 
-        stats.setOpenConnection(new MockConnection());
+        stats.setOpenConnection(new FtpIoSession(null, null));
         assertEquals(1, stats.getTotalConnectionNumber());
         assertEquals(1, stats.getCurrentConnectionNumber());
 
-        stats.setOpenConnection(new MockConnection());
+        stats.setOpenConnection(new FtpIoSession(null, null));
         assertEquals(2, stats.getTotalConnectionNumber());
         assertEquals(2, stats.getCurrentConnectionNumber());
         
-        stats.setCloseConnection(new MockConnection());
+        stats.setCloseConnection(new FtpIoSession(null, null));
         assertEquals(2, stats.getTotalConnectionNumber());
         assertEquals(1, stats.getCurrentConnectionNumber());
 
-        stats.setCloseConnection(new MockConnection());
+        stats.setCloseConnection(new FtpIoSession(null, null));
         assertEquals(2, stats.getTotalConnectionNumber());
         assertEquals(0, stats.getCurrentConnectionNumber());
 
         // This should never occure
-        stats.setCloseConnection(new MockConnection());
+        stats.setCloseConnection(new FtpIoSession(null, null));
         assertEquals(2, stats.getTotalConnectionNumber());
         assertEquals(0, stats.getCurrentConnectionNumber());
     }

Modified: incubator/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ssl/SSLTestTemplate.java
URL: http://svn.apache.org/viewvc/incubator/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ssl/SSLTestTemplate.java?rev=609446&r1=609445&r2=609446&view=diff
==============================================================================
--- incubator/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ssl/SSLTestTemplate.java (original)
+++ incubator/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ssl/SSLTestTemplate.java Sun Jan  6 14:24:29 2008
@@ -46,11 +46,11 @@
 
     private final Logger LOG = LoggerFactory.getLogger(SSLTestTemplate.class);
     
-    private static final File USERS_FILE = new File(getBaseDir(), "src/test/users.gen");
-    protected static final File FTPCLIENT_KEYSTORE = new File(getBaseDir(), "src/test/client.jks");
+    private static final File USERS_FILE = new File(getBaseDir(), "src/test/resources/users.gen");
+    protected static final File FTPCLIENT_KEYSTORE = new File(getBaseDir(), "src/test/resources/client.jks");
     protected static final char[] KEYSTORE_PASSWORD = "password".toCharArray();
 
-    private static final File FTPSERVER_KEYSTORE = new File(getBaseDir(), "src/test/ftpserver.jks");
+    private static final File FTPSERVER_KEYSTORE = new File(getBaseDir(), "src/test/resources/ftpserver.jks");
 
     private static final int DEFAULT_PORT = 12322;
 

Modified: incubator/ftpserver/trunk/core/src/test/resources/users.gen
URL: http://svn.apache.org/viewvc/incubator/ftpserver/trunk/core/src/test/resources/users.gen?rev=609446&r1=609445&r2=609446&view=diff
==============================================================================
--- incubator/ftpserver/trunk/core/src/test/resources/users.gen (original)
+++ incubator/ftpserver/trunk/core/src/test/resources/users.gen Sun Jan  6 14:24:29 2008
@@ -17,14 +17,9 @@
 
 #Generated file - don't edit (please)
 #Wed Feb 07 20:58:22 CET 2007
-ftpserver.user.anonymous.writepermission=false
-ftpserver.user.anonymous.maxloginnumber=20
-ftpserver.user.anonymous.enableflag=true
-ftpserver.user.anonymous.userpassword=
 ftpserver.user.admin.homedirectory=./test-tmp/ftproot
 ftpserver.user.admin.maxloginperip=0
-ftpserver.user.anonymous.homedirectory=./test-tmp/ftproot
-ftpserver.user.anonymous.idletime=300
+
 ftpserver.user.admin.idletime=0
 ftpserver.user.admin.enableflag=true
 ftpserver.user.testuser2.userpassword=password
@@ -43,3 +38,10 @@
 ftpserver.user.anonymous.downloadrate=4800
 ftpserver.user.testuser1.userpassword=password
 ftpserver.user.admin.writepermission=true
+
+ftpserver.user.anonymous.writepermission=false
+ftpserver.user.anonymous.maxloginnumber=20
+ftpserver.user.anonymous.enableflag=true
+ftpserver.user.anonymous.userpassword=
+ftpserver.user.anonymous.homedirectory=./test-tmp/ftproot
+ftpserver.user.anonymous.idletime=300

Modified: incubator/ftpserver/trunk/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/DataConnection.java
URL: http://svn.apache.org/viewvc/incubator/ftpserver/trunk/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/DataConnection.java?rev=609446&r1=609445&r2=609446&view=diff
==============================================================================
--- incubator/ftpserver/trunk/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/DataConnection.java (original)
+++ incubator/ftpserver/trunk/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/DataConnection.java Sun Jan  6 14:24:29 2008
@@ -48,5 +48,5 @@
      * @throws IOException
      */
     void transferToClient(String str) throws IOException;
-
+    
 }

Modified: incubator/ftpserver/trunk/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/DefaultFtplet.java
URL: http://svn.apache.org/viewvc/incubator/ftpserver/trunk/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/DefaultFtplet.java?rev=609446&r1=609445&r2=609446&view=diff
==============================================================================
--- incubator/ftpserver/trunk/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/DefaultFtplet.java (original)
+++ incubator/ftpserver/trunk/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/DefaultFtplet.java Sun Jan  6 14:24:29 2008
@@ -32,33 +32,33 @@
     public void init(FtpletContext ftpletContext, Configuration config) throws FtpException {}
     public void destroy() {}
     
-    public FtpletEnum onConnect(FtpSession session, FtpReplyOutput response) throws FtpException, IOException {return null;}
-    public FtpletEnum onDisconnect(FtpSession session, FtpReplyOutput response) throws FtpException, IOException {return null;}
-    public FtpletEnum onLogin(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {return null;}
+    public FtpletEnum onConnect(FtpSession session) throws FtpException, IOException {return null;}
+    public FtpletEnum onDisconnect(FtpSession session) throws FtpException, IOException {return null;}
+    public FtpletEnum onLogin(FtpSession session, FtpRequest request) throws FtpException, IOException {return null;}
     
-    public FtpletEnum onDeleteStart(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {return null;}
-    public FtpletEnum onDeleteEnd(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {return null;}
+    public FtpletEnum onDeleteStart(FtpSession session, FtpRequest request) throws FtpException, IOException {return null;}
+    public FtpletEnum onDeleteEnd(FtpSession session, FtpRequest request) throws FtpException, IOException {return null;}
     
-    public FtpletEnum onUploadStart(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {return null;}
-    public FtpletEnum onUploadEnd(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {return null;}
+    public FtpletEnum onUploadStart(FtpSession session, FtpRequest request) throws FtpException, IOException {return null;}
+    public FtpletEnum onUploadEnd(FtpSession session, FtpRequest request) throws FtpException, IOException {return null;}
     
-    public FtpletEnum onDownloadStart(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {return null;}
-    public FtpletEnum onDownloadEnd(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {return null;}
+    public FtpletEnum onDownloadStart(FtpSession session, FtpRequest request) throws FtpException, IOException {return null;}
+    public FtpletEnum onDownloadEnd(FtpSession session, FtpRequest request) throws FtpException, IOException {return null;}
     
-    public FtpletEnum onRmdirStart(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {return null;}
-    public FtpletEnum onRmdirEnd(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {return null;}
+    public FtpletEnum onRmdirStart(FtpSession session, FtpRequest request) throws FtpException, IOException {return null;}
+    public FtpletEnum onRmdirEnd(FtpSession session, FtpRequest request) throws FtpException, IOException {return null;}
     
-    public FtpletEnum onMkdirStart(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {return null;}
-    public FtpletEnum onMkdirEnd(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {return null;}
+    public FtpletEnum onMkdirStart(FtpSession session, FtpRequest request) throws FtpException, IOException {return null;}
+    public FtpletEnum onMkdirEnd(FtpSession session, FtpRequest request) throws FtpException, IOException {return null;}
         
-    public FtpletEnum onAppendStart(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {return null;}
-    public FtpletEnum onAppendEnd(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {return null;}
+    public FtpletEnum onAppendStart(FtpSession session, FtpRequest request) throws FtpException, IOException {return null;}
+    public FtpletEnum onAppendEnd(FtpSession session, FtpRequest request) throws FtpException, IOException {return null;}
     
-    public FtpletEnum onUploadUniqueStart(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {return null;}
-    public FtpletEnum onUploadUniqueEnd(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {return null;}
+    public FtpletEnum onUploadUniqueStart(FtpSession session, FtpRequest request) throws FtpException, IOException {return null;}
+    public FtpletEnum onUploadUniqueEnd(FtpSession session, FtpRequest request) throws FtpException, IOException {return null;}
     
-    public FtpletEnum onRenameStart(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {return null;}
-    public FtpletEnum onRenameEnd(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {return null;}
+    public FtpletEnum onRenameStart(FtpSession session, FtpRequest request) throws FtpException, IOException {return null;}
+    public FtpletEnum onRenameEnd(FtpSession session, FtpRequest request) throws FtpException, IOException {return null;}
     
-    public FtpletEnum onSite(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {return null;}
+    public FtpletEnum onSite(FtpSession session, FtpRequest request) throws FtpException, IOException {return null;}
 }

Modified: incubator/ftpserver/trunk/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/FtpSession.java
URL: http://svn.apache.org/viewvc/incubator/ftpserver/trunk/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/FtpSession.java?rev=609446&r1=609445&r2=609446&view=diff
==============================================================================
--- incubator/ftpserver/trunk/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/FtpSession.java (original)
+++ incubator/ftpserver/trunk/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/FtpSession.java Sun Jan  6 14:24:29 2008
@@ -35,13 +35,6 @@
 interface FtpSession {
 
     /**
-     * Receive the current ongoing {@link FtpRequest}. If no request
-     * is currently active, this method will return null.
-     * @return The active {@link FtpRequest} or null.
-     */
-    FtpRequest getCurrentRequest();
-    
-    /**
      * Returns the IP address of the client that sent the request.
      */
     InetAddress getClientAddress();
@@ -154,9 +147,4 @@
      * Removes an attribute from this request.
      */
     void removeAttribute(String name);
-    
-    /**
-     * Clear all attributes
-     */
-    void clear();
 }

Modified: incubator/ftpserver/trunk/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/Ftplet.java
URL: http://svn.apache.org/viewvc/incubator/ftpserver/trunk/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/Ftplet.java?rev=609446&r1=609445&r2=609446&view=diff
==============================================================================
--- incubator/ftpserver/trunk/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/Ftplet.java (original)
+++ incubator/ftpserver/trunk/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/Ftplet.java Sun Jan  6 14:24:29 2008
@@ -67,12 +67,12 @@
     /**
      * Client connect notification method.
      */
-    FtpletEnum onConnect(FtpSession session, FtpReplyOutput response) throws FtpException, IOException;
+    FtpletEnum onConnect(FtpSession session) throws FtpException, IOException;
     
     /**
      * Client disconnect notification method. This is the last callback method.
      */
-    FtpletEnum onDisconnect(FtpSession session, FtpReplyOutput response) throws FtpException, IOException;
+    FtpletEnum onDisconnect(FtpSession session) throws FtpException, IOException;
     
     /**
      * Client successful login notification method. 
@@ -80,90 +80,90 @@
      * {@link FtpSession#getUser()} method will return the user,
      * otherwise it will return null.
      */
-    FtpletEnum onLogin(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException;
+    FtpletEnum onLogin(FtpSession session, FtpRequest request) throws FtpException, IOException;
             
     /**
      * File delete request notification method.
      */
-    FtpletEnum onDeleteStart(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException;
+    FtpletEnum onDeleteStart(FtpSession session, FtpRequest request) throws FtpException, IOException;
     
     /**
      * File delete success notification method.
      */
-    FtpletEnum onDeleteEnd(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException;
+    FtpletEnum onDeleteEnd(FtpSession session, FtpRequest request) throws FtpException, IOException;
     
     /**
      * File upload request notification method.
      */
-    FtpletEnum onUploadStart(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException;
+    FtpletEnum onUploadStart(FtpSession session, FtpRequest request) throws FtpException, IOException;
 
     /**
      * File upload success notification method.
      */
-    FtpletEnum onUploadEnd(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException;
+    FtpletEnum onUploadEnd(FtpSession session, FtpRequest request) throws FtpException, IOException;
     
     /**
      * File download request notification method.
      */
-    FtpletEnum onDownloadStart(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException;
+    FtpletEnum onDownloadStart(FtpSession session, FtpRequest request) throws FtpException, IOException;
     
     /**
      * File download success notification method.
      */
-    FtpletEnum onDownloadEnd(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException;
+    FtpletEnum onDownloadEnd(FtpSession session, FtpRequest request) throws FtpException, IOException;
     
     /**
      * Remove directory request notification method.
      */
-    FtpletEnum onRmdirStart(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException;
+    FtpletEnum onRmdirStart(FtpSession session, FtpRequest request) throws FtpException, IOException;
     
     /**
      * Directory removal success notification method.
      */
-    FtpletEnum onRmdirEnd(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException;
+    FtpletEnum onRmdirEnd(FtpSession session, FtpRequest request) throws FtpException, IOException;
     
     /**
      * Directory creation request notification method.
      */
-    FtpletEnum onMkdirStart(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException;
+    FtpletEnum onMkdirStart(FtpSession session, FtpRequest request) throws FtpException, IOException;
     
     /**
      * Directory creation success notification method.
      */
-    FtpletEnum onMkdirEnd(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException;
+    FtpletEnum onMkdirEnd(FtpSession session, FtpRequest request) throws FtpException, IOException;
             
     /**
      * File append request notification method.
      */
-    FtpletEnum onAppendStart(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException;
+    FtpletEnum onAppendStart(FtpSession session, FtpRequest request) throws FtpException, IOException;
     
     /**
      * File append success notification method.
      */
-    FtpletEnum onAppendEnd(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException;
+    FtpletEnum onAppendEnd(FtpSession session, FtpRequest request) throws FtpException, IOException;
     
     /**
      * Unique file create request notification method.
      */
-    FtpletEnum onUploadUniqueStart(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException;
+    FtpletEnum onUploadUniqueStart(FtpSession session, FtpRequest request) throws FtpException, IOException;
     
     /**
      * Unique file create success notification method.
      */
-    FtpletEnum onUploadUniqueEnd(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException;
+    FtpletEnum onUploadUniqueEnd(FtpSession session, FtpRequest request) throws FtpException, IOException;
     
     /**
      * Rename start notification method.
      */
-    FtpletEnum onRenameStart(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException;
+    FtpletEnum onRenameStart(FtpSession session, FtpRequest request) throws FtpException, IOException;
     
     /**
      * Rename end notification method.
      */
-    FtpletEnum onRenameEnd(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException;
+    FtpletEnum onRenameEnd(FtpSession session, FtpRequest request) throws FtpException, IOException;
     
     /**
      * SITE command notification method.
      */
-    FtpletEnum onSite(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException;
+    FtpletEnum onSite(FtpSession session, FtpRequest request) throws FtpException, IOException;
 }



Mime
View raw message