You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by ng...@apache.org on 2008/08/17 22:13:29 UTC
svn commit: r686639 - in /mina/ftpserver/trunk:
core/src/main/java/org/apache/ftpserver/
core/src/main/java/org/apache/ftpserver/ftplet/
core/src/test/java/org/apache/ftpserver/ftplet/
ftplet-api/src/main/java/org/apache/ftpserver/ftplet/ ftplet-api/sr...
Author: ngn
Date: Sun Aug 17 13:13:28 2008
New Revision: 686639
URL: http://svn.apache.org/viewvc?rev=686639&view=rev
Log:
Convert type safe enums into real enums (FTPSERVER-156) and clean up FtpletResult
Added:
mina/ftpserver/trunk/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/FtpletResult.java (contents, props changed)
- copied, changed from r686637, mina/ftpserver/trunk/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/FtpletEnum.java
Removed:
mina/ftpserver/trunk/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/FtpletEnum.java
Modified:
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/DefaultFtpHandler.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/ftplet/DefaultFtpletContainer.java
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ftplet/FtpLetContainerTestTemplate.java
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ftplet/FtpLetReturnDefaultTest.java
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ftplet/FtpLetReturnDisconnectTest.java
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ftplet/FtpLetReturnSkipTest.java
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ftplet/MockFtplet.java
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ftplet/MockFtpletCallback.java
mina/ftpserver/trunk/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/DataType.java
mina/ftpserver/trunk/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/DefaultFtplet.java
mina/ftpserver/trunk/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/Ftplet.java
mina/ftpserver/trunk/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/Structure.java
mina/ftpserver/trunk/ftplet-api/src/test/java/org/apache/ftpserver/ftplet/ExampleFtplet.java
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/DefaultFtpHandler.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/DefaultFtpHandler.java?rev=686639&r1=686638&r2=686639&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/DefaultFtpHandler.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/DefaultFtpHandler.java Sun Aug 17 13:13:28 2008
@@ -24,7 +24,7 @@
import org.apache.ftpserver.ftplet.FtpReply;
import org.apache.ftpserver.ftplet.FtpRequest;
import org.apache.ftpserver.ftplet.FtpletContainer;
-import org.apache.ftpserver.ftplet.FtpletEnum;
+import org.apache.ftpserver.ftplet.FtpletResult;
import org.apache.ftpserver.interfaces.Command;
import org.apache.ftpserver.interfaces.CommandFactory;
import org.apache.ftpserver.interfaces.FtpIoSession;
@@ -119,18 +119,18 @@
FtpletContainer ftplets = context.getFtpletContainer();
- FtpletEnum ftpletRet;
+ FtpletResult ftpletRet;
try {
ftpletRet = ftplets.beforeCommand(session.getFtpletSession(),
request);
} catch (Exception e) {
LOG.debug("Ftplet container threw exception", e);
- ftpletRet = FtpletEnum.RET_DISCONNECT;
+ ftpletRet = FtpletResult.DISCONNECT;
}
- if (ftpletRet == FtpletEnum.RET_DISCONNECT) {
+ if (ftpletRet == FtpletResult.DISCONNECT) {
session.closeOnFlush().awaitUninterruptibly(10000);
return;
- } else if (ftpletRet != FtpletEnum.RET_SKIP) {
+ } else if (ftpletRet != FtpletResult.SKIP) {
if (command != null) {
synchronized (session) {
@@ -149,9 +149,9 @@
request);
} catch (Exception e) {
LOG.debug("Ftplet container threw exception", e);
- ftpletRet = FtpletEnum.RET_DISCONNECT;
+ ftpletRet = FtpletResult.DISCONNECT;
}
- if (ftpletRet == FtpletEnum.RET_DISCONNECT) {
+ if (ftpletRet == FtpletResult.DISCONNECT) {
session.closeOnFlush().awaitUninterruptibly(10000);
return;
}
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/ftplet/DefaultFtpletContainer.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/ftplet/DefaultFtpletContainer.java?rev=686639&r1=686638&r2=686639&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/ftplet/DefaultFtpletContainer.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/ftplet/DefaultFtpletContainer.java Sun Aug 17 13:13:28 2008
@@ -111,17 +111,17 @@
/**
* Call ftplet onConnect.
*/
- public FtpletEnum onConnect(FtpSession session) throws FtpException,
+ public FtpletResult onConnect(FtpSession session) throws FtpException,
IOException {
- FtpletEnum retVal = FtpletEnum.RET_DEFAULT;
+ FtpletResult retVal = FtpletResult.DEFAULT;
for (Entry<String, Ftplet> entry : ftplets.entrySet()) {
retVal = entry.getValue().onConnect(session);
if (retVal == null) {
- retVal = FtpletEnum.RET_DEFAULT;
+ retVal = FtpletResult.DEFAULT;
}
- // proceed only if the return value is FtpletEnum.RET_DEFAULT
- if (retVal != FtpletEnum.RET_DEFAULT) {
+ // proceed only if the return value is FtpletResult.DEFAULT
+ if (retVal != FtpletResult.DEFAULT) {
break;
}
}
@@ -131,54 +131,54 @@
/**
* Call ftplet onDisconnect.
*/
- public FtpletEnum onDisconnect(FtpSession session) throws FtpException,
+ public FtpletResult onDisconnect(FtpSession session) throws FtpException,
IOException {
- FtpletEnum retVal = FtpletEnum.RET_DEFAULT;
+ FtpletResult retVal = FtpletResult.DEFAULT;
for (Entry<String, Ftplet> entry : ftplets.entrySet()) {
retVal = entry.getValue().onDisconnect(session);
if (retVal == null) {
- retVal = FtpletEnum.RET_DEFAULT;
+ retVal = FtpletResult.DEFAULT;
}
- // proceed only if the return value is FtpletEnum.RET_DEFAULT
- if (retVal != FtpletEnum.RET_DEFAULT) {
+ // proceed only if the return value is FtpletResult.DEFAULT
+ if (retVal != FtpletResult.DEFAULT) {
break;
}
}
return retVal;
}
- public FtpletEnum afterCommand(FtpSession session, FtpRequest request)
+ public FtpletResult afterCommand(FtpSession session, FtpRequest request)
throws FtpException, IOException {
- FtpletEnum retVal = FtpletEnum.RET_DEFAULT;
+ FtpletResult retVal = FtpletResult.DEFAULT;
for (Entry<String, Ftplet> entry : ftplets.entrySet()) {
retVal = entry.getValue().afterCommand(session, request);
if (retVal == null) {
- retVal = FtpletEnum.RET_DEFAULT;
+ retVal = FtpletResult.DEFAULT;
}
- // proceed only if the return value is FtpletEnum.RET_DEFAULT
- if (retVal != FtpletEnum.RET_DEFAULT) {
+ // proceed only if the return value is FtpletResult.DEFAULT
+ if (retVal != FtpletResult.DEFAULT) {
break;
}
}
return retVal;
}
- public FtpletEnum beforeCommand(FtpSession session, FtpRequest request)
+ public FtpletResult beforeCommand(FtpSession session, FtpRequest request)
throws FtpException, IOException {
- FtpletEnum retVal = FtpletEnum.RET_DEFAULT;
+ FtpletResult retVal = FtpletResult.DEFAULT;
for (Entry<String, Ftplet> entry : ftplets.entrySet()) {
retVal = entry.getValue().beforeCommand(session, request);
if (retVal == null) {
- retVal = FtpletEnum.RET_DEFAULT;
+ retVal = FtpletResult.DEFAULT;
}
- // proceed only if the return value is FtpletEnum.RET_DEFAULT
- if (retVal != FtpletEnum.RET_DEFAULT) {
+ // proceed only if the return value is FtpletResult.DEFAULT
+ if (retVal != FtpletResult.DEFAULT) {
break;
}
}
Modified: mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ftplet/FtpLetContainerTestTemplate.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ftplet/FtpLetContainerTestTemplate.java?rev=686639&r1=686638&r2=686639&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ftplet/FtpLetContainerTestTemplate.java (original)
+++ mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ftplet/FtpLetContainerTestTemplate.java Sun Aug 17 13:13:28 2008
@@ -36,7 +36,7 @@
protected void setUp() throws Exception {
MockFtplet.callback = new MockFtpletCallback();
- MockFtpletCallback.returnValue = FtpletEnum.RET_DEFAULT;
+ MockFtpletCallback.returnValue = FtpletResult.DEFAULT;
}
protected abstract FtpletContainer createFtpletContainer();
@@ -93,14 +93,14 @@
public void testOnConnect() throws FtpException, IOException {
MockFtplet ftplet1 = new MockFtplet() {
- public FtpletEnum onConnect(FtpSession session)
+ public FtpletResult onConnect(FtpSession session)
throws FtpException, IOException {
calls.add("ftplet1");
return super.onConnect(session);
}
};
MockFtplet ftplet2 = new MockFtplet() {
- public FtpletEnum onConnect(FtpSession session)
+ public FtpletResult onConnect(FtpSession session)
throws FtpException, IOException {
calls.add("ftplet2");
return super.onConnect(session);
@@ -119,14 +119,14 @@
public void testOnDisconnect() throws FtpException, IOException {
MockFtplet ftplet1 = new MockFtplet() {
- public FtpletEnum onDisconnect(FtpSession session)
+ public FtpletResult onDisconnect(FtpSession session)
throws FtpException, IOException {
calls.add("ftplet1");
return super.onDisconnect(session);
}
};
MockFtplet ftplet2 = new MockFtplet() {
- public FtpletEnum onDisconnect(FtpSession session)
+ public FtpletResult onDisconnect(FtpSession session)
throws FtpException, IOException {
calls.add("ftplet2");
return super.onDisconnect(session);
@@ -145,14 +145,14 @@
public void testOnLogin() throws FtpException, IOException {
MockFtplet ftplet1 = new MockFtplet() {
- public FtpletEnum onLogin(FtpSession session, FtpRequest request)
+ public FtpletResult onLogin(FtpSession session, FtpRequest request)
throws FtpException, IOException {
calls.add("ftplet1");
return super.onLogin(session, request);
}
};
MockFtplet ftplet2 = new MockFtplet() {
- public FtpletEnum onLogin(FtpSession session, FtpRequest request)
+ public FtpletResult onLogin(FtpSession session, FtpRequest request)
throws FtpException, IOException {
calls.add("ftplet2");
return super.onLogin(session, request);
@@ -172,14 +172,14 @@
public void testOnDeleteStart() throws FtpException, IOException {
MockFtplet ftplet1 = new MockFtplet() {
- public FtpletEnum onDeleteStart(FtpSession session,
+ public FtpletResult onDeleteStart(FtpSession session,
FtpRequest request) throws FtpException, IOException {
calls.add("ftplet1");
return super.onDeleteStart(session, request);
}
};
MockFtplet ftplet2 = new MockFtplet() {
- public FtpletEnum onDeleteStart(FtpSession session,
+ public FtpletResult onDeleteStart(FtpSession session,
FtpRequest request) throws FtpException, IOException {
calls.add("ftplet2");
return super.onDeleteStart(session, request);
@@ -199,14 +199,14 @@
public void testOnDeleteEnd() throws FtpException, IOException {
MockFtplet ftplet1 = new MockFtplet() {
- public FtpletEnum onDeleteEnd(FtpSession session, FtpRequest request)
+ public FtpletResult onDeleteEnd(FtpSession session, FtpRequest request)
throws FtpException, IOException {
calls.add("ftplet1");
return super.onDeleteEnd(session, request);
}
};
MockFtplet ftplet2 = new MockFtplet() {
- public FtpletEnum onDeleteEnd(FtpSession session, FtpRequest request)
+ public FtpletResult onDeleteEnd(FtpSession session, FtpRequest request)
throws FtpException, IOException {
calls.add("ftplet2");
return super.onDeleteEnd(session, request);
@@ -226,14 +226,14 @@
public void testOnUploadStart() throws FtpException, IOException {
MockFtplet ftplet1 = new MockFtplet() {
- public FtpletEnum onUploadStart(FtpSession session,
+ public FtpletResult onUploadStart(FtpSession session,
FtpRequest request) throws FtpException, IOException {
calls.add("ftplet1");
return super.onUploadStart(session, request);
}
};
MockFtplet ftplet2 = new MockFtplet() {
- public FtpletEnum onUploadStart(FtpSession session,
+ public FtpletResult onUploadStart(FtpSession session,
FtpRequest request) throws FtpException, IOException {
calls.add("ftplet2");
return super.onUploadStart(session, request);
@@ -253,14 +253,14 @@
public void testOnUploadEnd() throws FtpException, IOException {
MockFtplet ftplet1 = new MockFtplet() {
- public FtpletEnum onUploadEnd(FtpSession session, FtpRequest request)
+ public FtpletResult onUploadEnd(FtpSession session, FtpRequest request)
throws FtpException, IOException {
calls.add("ftplet1");
return super.onUploadEnd(session, request);
}
};
MockFtplet ftplet2 = new MockFtplet() {
- public FtpletEnum onUploadEnd(FtpSession session, FtpRequest request)
+ public FtpletResult onUploadEnd(FtpSession session, FtpRequest request)
throws FtpException, IOException {
calls.add("ftplet2");
return super.onUploadEnd(session, request);
@@ -280,14 +280,14 @@
public void testOnDownloadStart() throws FtpException, IOException {
MockFtplet ftplet1 = new MockFtplet() {
- public FtpletEnum onDownloadStart(FtpSession session,
+ public FtpletResult onDownloadStart(FtpSession session,
FtpRequest request) throws FtpException, IOException {
calls.add("ftplet1");
return super.onDownloadStart(session, request);
}
};
MockFtplet ftplet2 = new MockFtplet() {
- public FtpletEnum onDownloadStart(FtpSession session,
+ public FtpletResult onDownloadStart(FtpSession session,
FtpRequest request) throws FtpException, IOException {
calls.add("ftplet2");
return super.onDownloadStart(session, request);
@@ -307,14 +307,14 @@
public void testOnDownloadEnd() throws FtpException, IOException {
MockFtplet ftplet1 = new MockFtplet() {
- public FtpletEnum onDownloadEnd(FtpSession session,
+ public FtpletResult onDownloadEnd(FtpSession session,
FtpRequest request) throws FtpException, IOException {
calls.add("ftplet1");
return super.onDownloadEnd(session, request);
}
};
MockFtplet ftplet2 = new MockFtplet() {
- public FtpletEnum onDownloadEnd(FtpSession session,
+ public FtpletResult onDownloadEnd(FtpSession session,
FtpRequest request) throws FtpException, IOException {
calls.add("ftplet2");
return super.onDownloadEnd(session, request);
@@ -334,14 +334,14 @@
public void testOnRmdirStart() throws FtpException, IOException {
MockFtplet ftplet1 = new MockFtplet() {
- public FtpletEnum onRmdirStart(FtpSession session,
+ public FtpletResult onRmdirStart(FtpSession session,
FtpRequest request) throws FtpException, IOException {
calls.add("ftplet1");
return super.onRmdirStart(session, request);
}
};
MockFtplet ftplet2 = new MockFtplet() {
- public FtpletEnum onRmdirStart(FtpSession session,
+ public FtpletResult onRmdirStart(FtpSession session,
FtpRequest request) throws FtpException, IOException {
calls.add("ftplet2");
return super.onRmdirStart(session, request);
@@ -361,14 +361,14 @@
public void testOnRmdirEnd() throws FtpException, IOException {
MockFtplet ftplet1 = new MockFtplet() {
- public FtpletEnum onRmdirEnd(FtpSession session, FtpRequest request)
+ public FtpletResult onRmdirEnd(FtpSession session, FtpRequest request)
throws FtpException, IOException {
calls.add("ftplet1");
return super.onRmdirEnd(session, request);
}
};
MockFtplet ftplet2 = new MockFtplet() {
- public FtpletEnum onRmdirEnd(FtpSession session, FtpRequest request)
+ public FtpletResult onRmdirEnd(FtpSession session, FtpRequest request)
throws FtpException, IOException {
calls.add("ftplet2");
return super.onRmdirEnd(session, request);
@@ -388,14 +388,14 @@
public void testOnMkdirStart() throws FtpException, IOException {
MockFtplet ftplet1 = new MockFtplet() {
- public FtpletEnum onMkdirStart(FtpSession session,
+ public FtpletResult onMkdirStart(FtpSession session,
FtpRequest request) throws FtpException, IOException {
calls.add("ftplet1");
return super.onMkdirStart(session, request);
}
};
MockFtplet ftplet2 = new MockFtplet() {
- public FtpletEnum onMkdirStart(FtpSession session,
+ public FtpletResult onMkdirStart(FtpSession session,
FtpRequest request) throws FtpException, IOException {
calls.add("ftplet2");
return super.onMkdirStart(session, request);
@@ -415,14 +415,14 @@
public void testOnMkdirEnd() throws FtpException, IOException {
MockFtplet ftplet1 = new MockFtplet() {
- public FtpletEnum onMkdirEnd(FtpSession session, FtpRequest request)
+ public FtpletResult onMkdirEnd(FtpSession session, FtpRequest request)
throws FtpException, IOException {
calls.add("ftplet1");
return super.onMkdirEnd(session, request);
}
};
MockFtplet ftplet2 = new MockFtplet() {
- public FtpletEnum onMkdirEnd(FtpSession session, FtpRequest request)
+ public FtpletResult onMkdirEnd(FtpSession session, FtpRequest request)
throws FtpException, IOException {
calls.add("ftplet2");
return super.onMkdirEnd(session, request);
@@ -442,14 +442,14 @@
public void testOnAppendStart() throws FtpException, IOException {
MockFtplet ftplet1 = new MockFtplet() {
- public FtpletEnum onAppendStart(FtpSession session,
+ public FtpletResult onAppendStart(FtpSession session,
FtpRequest request) throws FtpException, IOException {
calls.add("ftplet1");
return super.onAppendStart(session, request);
}
};
MockFtplet ftplet2 = new MockFtplet() {
- public FtpletEnum onAppendStart(FtpSession session,
+ public FtpletResult onAppendStart(FtpSession session,
FtpRequest request) throws FtpException, IOException {
calls.add("ftplet2");
return super.onAppendStart(session, request);
@@ -469,14 +469,14 @@
public void testOnAppendEnd() throws FtpException, IOException {
MockFtplet ftplet1 = new MockFtplet() {
- public FtpletEnum onAppendEnd(FtpSession session, FtpRequest request)
+ public FtpletResult onAppendEnd(FtpSession session, FtpRequest request)
throws FtpException, IOException {
calls.add("ftplet1");
return super.onAppendEnd(session, request);
}
};
MockFtplet ftplet2 = new MockFtplet() {
- public FtpletEnum onAppendEnd(FtpSession session, FtpRequest request)
+ public FtpletResult onAppendEnd(FtpSession session, FtpRequest request)
throws FtpException, IOException {
calls.add("ftplet2");
return super.onAppendEnd(session, request);
@@ -496,14 +496,14 @@
public void testOnUploadUniqueStart() throws FtpException, IOException {
MockFtplet ftplet1 = new MockFtplet() {
- public FtpletEnum onUploadUniqueStart(FtpSession session,
+ public FtpletResult onUploadUniqueStart(FtpSession session,
FtpRequest request) throws FtpException, IOException {
calls.add("ftplet1");
return super.onUploadUniqueStart(session, request);
}
};
MockFtplet ftplet2 = new MockFtplet() {
- public FtpletEnum onUploadUniqueStart(FtpSession session,
+ public FtpletResult onUploadUniqueStart(FtpSession session,
FtpRequest request) throws FtpException, IOException {
calls.add("ftplet2");
return super.onUploadUniqueStart(session, request);
@@ -523,14 +523,14 @@
public void testOnUploadUniqueEnd() throws FtpException, IOException {
MockFtplet ftplet1 = new MockFtplet() {
- public FtpletEnum onUploadUniqueEnd(FtpSession session,
+ public FtpletResult onUploadUniqueEnd(FtpSession session,
FtpRequest request) throws FtpException, IOException {
calls.add("ftplet1");
return super.onUploadUniqueEnd(session, request);
}
};
MockFtplet ftplet2 = new MockFtplet() {
- public FtpletEnum onUploadUniqueEnd(FtpSession session,
+ public FtpletResult onUploadUniqueEnd(FtpSession session,
FtpRequest request) throws FtpException, IOException {
calls.add("ftplet2");
return super.onUploadUniqueEnd(session, request);
@@ -550,14 +550,14 @@
public void testOnRenameStart() throws FtpException, IOException {
MockFtplet ftplet1 = new MockFtplet() {
- public FtpletEnum onRenameStart(FtpSession session,
+ public FtpletResult onRenameStart(FtpSession session,
FtpRequest request) throws FtpException, IOException {
calls.add("ftplet1");
return super.onRenameStart(session, request);
}
};
MockFtplet ftplet2 = new MockFtplet() {
- public FtpletEnum onRenameStart(FtpSession session,
+ public FtpletResult onRenameStart(FtpSession session,
FtpRequest request) throws FtpException, IOException {
calls.add("ftplet2");
return super.onRenameStart(session, request);
@@ -577,14 +577,14 @@
public void testOnRenameEnd() throws FtpException, IOException {
MockFtplet ftplet1 = new MockFtplet() {
- public FtpletEnum onRenameEnd(FtpSession session, FtpRequest request)
+ public FtpletResult onRenameEnd(FtpSession session, FtpRequest request)
throws FtpException, IOException {
calls.add("ftplet1");
return super.onRenameEnd(session, request);
}
};
MockFtplet ftplet2 = new MockFtplet() {
- public FtpletEnum onRenameEnd(FtpSession session, FtpRequest request)
+ public FtpletResult onRenameEnd(FtpSession session, FtpRequest request)
throws FtpException, IOException {
calls.add("ftplet2");
return super.onRenameEnd(session, request);
@@ -604,14 +604,14 @@
public void testOnSite() throws FtpException, IOException {
MockFtplet ftplet1 = new MockFtplet() {
- public FtpletEnum onSite(FtpSession session, FtpRequest request)
+ public FtpletResult onSite(FtpSession session, FtpRequest request)
throws FtpException, IOException {
calls.add("ftplet1");
return super.onSite(session, request);
}
};
MockFtplet ftplet2 = new MockFtplet() {
- public FtpletEnum onSite(FtpSession session, FtpRequest request)
+ public FtpletResult onSite(FtpSession session, FtpRequest request)
throws FtpException, IOException {
calls.add("ftplet2");
return super.onSite(session, request);
Modified: mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ftplet/FtpLetReturnDefaultTest.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ftplet/FtpLetReturnDefaultTest.java?rev=686639&r1=686638&r2=686639&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ftplet/FtpLetReturnDefaultTest.java (original)
+++ mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ftplet/FtpLetReturnDefaultTest.java Sun Aug 17 13:13:28 2008
@@ -53,7 +53,7 @@
*/
protected void setUp() throws Exception {
MockFtplet.callback = new MockFtpletCallback();
- MockFtpletCallback.returnValue = FtpletEnum.RET_DEFAULT;
+ MockFtpletCallback.returnValue = FtpletResult.DEFAULT;
initDirs();
@@ -73,7 +73,7 @@
public void testLogin() throws Exception {
MockFtplet.callback = new MockFtpletCallback() {
- public FtpletEnum onLogin(FtpSession session, FtpRequest request)
+ public FtpletResult onLogin(FtpSession session, FtpRequest request)
throws FtpException, IOException {
assertNotNull(session.getUserArgument());
@@ -81,7 +81,7 @@
}
};
- MockFtpletCallback.returnValue = FtpletEnum.RET_DEFAULT;
+ MockFtpletCallback.returnValue = FtpletResult.DEFAULT;
assertTrue(client.login(ADMIN_USERNAME, ADMIN_PASSWORD));
}
Modified: mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ftplet/FtpLetReturnDisconnectTest.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ftplet/FtpLetReturnDisconnectTest.java?rev=686639&r1=686638&r2=686639&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ftplet/FtpLetReturnDisconnectTest.java (original)
+++ mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ftplet/FtpLetReturnDisconnectTest.java Sun Aug 17 13:13:28 2008
@@ -47,7 +47,7 @@
private static final File TEST_DIR1 = new File(ROOT_DIR, "dir1");
- protected FtpletEnum mockReturnValue = FtpletEnum.RET_DISCONNECT;
+ protected FtpletResult mockReturnValue = FtpletResult.DISCONNECT;
/*
* (non-Javadoc)
@@ -74,7 +74,7 @@
public void testExceptionDuringLogin() throws Exception {
MockFtplet.callback = new MockFtpletCallback() {
- public FtpletEnum onLogin(FtpSession session, FtpRequest request)
+ public FtpletResult onLogin(FtpSession session, FtpRequest request)
throws FtpException, IOException {
throwException();
return mockReturnValue;
@@ -94,7 +94,7 @@
public void testExceptionDuringDeleteStart() throws Exception {
MockFtplet.callback = new MockFtpletCallback() {
- public FtpletEnum onDeleteStart(FtpSession session,
+ public FtpletResult onDeleteStart(FtpSession session,
FtpRequest request) throws FtpException, IOException {
throwException();
return mockReturnValue;
@@ -118,7 +118,7 @@
public void testExceptionDuringDeleteEnd() throws Exception {
MockFtplet.callback = new MockFtpletCallback() {
- public FtpletEnum onDeleteEnd(FtpSession session, FtpRequest request)
+ public FtpletResult onDeleteEnd(FtpSession session, FtpRequest request)
throws FtpException, IOException {
throwException();
return mockReturnValue;
@@ -143,7 +143,7 @@
public void testExceptionDuringMkdirStart() throws Exception {
MockFtplet.callback = new MockFtpletCallback() {
- public FtpletEnum onMkdirStart(FtpSession session,
+ public FtpletResult onMkdirStart(FtpSession session,
FtpRequest request) throws FtpException, IOException {
throwException();
return mockReturnValue;
@@ -165,7 +165,7 @@
public void testExceptionDuringMkdirEnd() throws Exception {
MockFtplet.callback = new MockFtpletCallback() {
- public FtpletEnum onMkdirEnd(FtpSession session, FtpRequest request)
+ public FtpletResult onMkdirEnd(FtpSession session, FtpRequest request)
throws FtpException, IOException {
throwException();
return mockReturnValue;
@@ -188,7 +188,7 @@
public void testExceptionDuringRmdirStart() throws Exception {
MockFtplet.callback = new MockFtpletCallback() {
- public FtpletEnum onRmdirStart(FtpSession session,
+ public FtpletResult onRmdirStart(FtpSession session,
FtpRequest request) throws FtpException, IOException {
throwException();
return mockReturnValue;
@@ -212,7 +212,7 @@
public void testExceptionDuringRmdirEnd() throws Exception {
MockFtplet.callback = new MockFtpletCallback() {
- public FtpletEnum onRmdirEnd(FtpSession session, FtpRequest request)
+ public FtpletResult onRmdirEnd(FtpSession session, FtpRequest request)
throws FtpException, IOException {
throwException();
return mockReturnValue;
@@ -237,7 +237,7 @@
public void testExceptionDuringSite() throws Exception {
MockFtplet.callback = new MockFtpletCallback() {
- public FtpletEnum onSite(FtpSession session, FtpRequest request)
+ public FtpletResult onSite(FtpSession session, FtpRequest request)
throws FtpException, IOException {
throwException();
return mockReturnValue;
@@ -258,7 +258,7 @@
public void testExceptionDuringRenameStart() throws Exception {
MockFtplet.callback = new MockFtpletCallback() {
- public FtpletEnum onRenameStart(FtpSession session,
+ public FtpletResult onRenameStart(FtpSession session,
FtpRequest request) throws FtpException, IOException {
throwException();
return mockReturnValue;
@@ -283,7 +283,7 @@
public void testExceptionDuringRenameEnd() throws Exception {
MockFtplet.callback = new MockFtpletCallback() {
- public FtpletEnum onRenameEnd(FtpSession session, FtpRequest request)
+ public FtpletResult onRenameEnd(FtpSession session, FtpRequest request)
throws FtpException, IOException {
throwException();
return mockReturnValue;
@@ -310,7 +310,7 @@
public void testExceptionDuringDownloadStart() throws Exception {
MockFtplet.callback = new MockFtpletCallback() {
- public FtpletEnum onDownloadStart(FtpSession session,
+ public FtpletResult onDownloadStart(FtpSession session,
FtpRequest request) throws FtpException, IOException {
throwException();
return mockReturnValue;
@@ -332,7 +332,7 @@
public void testExceptionDuringDownloadEnd() throws Exception {
MockFtplet.callback = new MockFtpletCallback() {
- public FtpletEnum onDownloadEnd(FtpSession session,
+ public FtpletResult onDownloadEnd(FtpSession session,
FtpRequest request) throws FtpException, IOException {
throwException();
return mockReturnValue;
@@ -358,7 +358,7 @@
public void testExceptionDuringAppendStart() throws Exception {
MockFtplet.callback = new MockFtpletCallback() {
- public FtpletEnum onAppendStart(FtpSession session,
+ public FtpletResult onAppendStart(FtpSession session,
FtpRequest request) throws FtpException, IOException {
throwException();
return mockReturnValue;
@@ -383,7 +383,7 @@
public void testExceptionDuringAppendEnd() throws Exception {
MockFtplet.callback = new MockFtpletCallback() {
- public FtpletEnum onAppendEnd(FtpSession session, FtpRequest request)
+ public FtpletResult onAppendEnd(FtpSession session, FtpRequest request)
throws FtpException, IOException {
// throwException();
return mockReturnValue;
@@ -409,7 +409,7 @@
public void testExceptionDuringUploadStart() throws Exception {
MockFtplet.callback = new MockFtpletCallback() {
- public FtpletEnum onUploadStart(FtpSession session,
+ public FtpletResult onUploadStart(FtpSession session,
FtpRequest request) throws FtpException, IOException {
throwException();
return mockReturnValue;
@@ -432,7 +432,7 @@
public void testExceptionDuringUploadEnd() throws Exception {
MockFtplet.callback = new MockFtpletCallback() {
- public FtpletEnum onUploadEnd(FtpSession session, FtpRequest request)
+ public FtpletResult onUploadEnd(FtpSession session, FtpRequest request)
throws FtpException, IOException {
throwException();
return mockReturnValue;
@@ -456,7 +456,7 @@
public void testExceptionDuringUploadUniqueStart() throws Exception {
MockFtplet.callback = new MockFtpletCallback() {
- public FtpletEnum onUploadUniqueStart(FtpSession session,
+ public FtpletResult onUploadUniqueStart(FtpSession session,
FtpRequest request) throws FtpException, IOException {
throwException();
return mockReturnValue;
@@ -479,7 +479,7 @@
public void testExceptionDuringUploadUniqueEnd() throws Exception {
MockFtplet.callback = new MockFtpletCallback() {
- public FtpletEnum onUploadUniqueEnd(FtpSession session,
+ public FtpletResult onUploadUniqueEnd(FtpSession session,
FtpRequest request) throws FtpException, IOException {
throwException();
Modified: mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ftplet/FtpLetReturnSkipTest.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ftplet/FtpLetReturnSkipTest.java?rev=686639&r1=686638&r2=686639&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ftplet/FtpLetReturnSkipTest.java (original)
+++ mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ftplet/FtpLetReturnSkipTest.java Sun Aug 17 13:13:28 2008
@@ -46,7 +46,7 @@
private static final File TEST_DIR1 = new File(ROOT_DIR, "dir1");;
- protected FtpletEnum mockReturnValue = FtpletEnum.RET_SKIP;
+ protected FtpletResult mockReturnValue = FtpletResult.SKIP;
/*
* (non-Javadoc)
@@ -73,7 +73,7 @@
public void testLogin() throws Exception {
MockFtplet.callback = new MockFtpletCallback() {
- public FtpletEnum onLogin(FtpSession session, FtpRequest request)
+ public FtpletResult onLogin(FtpSession session, FtpRequest request)
throws FtpException, IOException {
session.write(new DefaultFtpReply(
FtpReply.REPLY_530_NOT_LOGGED_IN, "foo"));
@@ -88,7 +88,7 @@
public void testExceptionDuringDeleteStart() throws Exception {
MockFtplet.callback = new MockFtpletCallback() {
- public FtpletEnum onDeleteStart(FtpSession session,
+ public FtpletResult onDeleteStart(FtpSession session,
FtpRequest request) throws FtpException, IOException {
session.write(new DefaultFtpReply(
@@ -109,7 +109,7 @@
public void testExceptionDuringDeleteEnd() throws Exception {
MockFtplet.callback = new MockFtpletCallback() {
- public FtpletEnum onDeleteEnd(FtpSession session, FtpRequest request)
+ public FtpletResult onDeleteEnd(FtpSession session, FtpRequest request)
throws FtpException, IOException {
throwException();
return mockReturnValue;
@@ -126,7 +126,7 @@
public void testExceptionDuringMkdirStart() throws Exception {
MockFtplet.callback = new MockFtpletCallback() {
- public FtpletEnum onMkdirStart(FtpSession session,
+ public FtpletResult onMkdirStart(FtpSession session,
FtpRequest request) throws FtpException, IOException {
session.write(new DefaultFtpReply(
@@ -144,7 +144,7 @@
public void testExceptionDuringMkdirEnd() throws Exception {
MockFtplet.callback = new MockFtpletCallback() {
- public FtpletEnum onMkdirEnd(FtpSession session, FtpRequest request)
+ public FtpletResult onMkdirEnd(FtpSession session, FtpRequest request)
throws FtpException, IOException {
throwException();
return mockReturnValue;
@@ -159,7 +159,7 @@
public void testExceptionDuringRmdirStart() throws Exception {
MockFtplet.callback = new MockFtpletCallback() {
- public FtpletEnum onRmdirStart(FtpSession session,
+ public FtpletResult onRmdirStart(FtpSession session,
FtpRequest request) throws FtpException, IOException {
session.write(new DefaultFtpReply(
FtpReply.REPLY_450_REQUESTED_FILE_ACTION_NOT_TAKEN,
@@ -180,7 +180,7 @@
public void testExceptionDuringRmdirEnd() throws Exception {
MockFtplet.callback = new MockFtpletCallback() {
- public FtpletEnum onRmdirEnd(FtpSession session, FtpRequest request)
+ public FtpletResult onRmdirEnd(FtpSession session, FtpRequest request)
throws FtpException, IOException {
throwException();
return mockReturnValue;
@@ -197,7 +197,7 @@
public void testExceptionDuringSite() throws Exception {
MockFtplet.callback = new MockFtpletCallback() {
- public FtpletEnum onSite(FtpSession session, FtpRequest request)
+ public FtpletResult onSite(FtpSession session, FtpRequest request)
throws FtpException, IOException {
throwException();
return mockReturnValue;
@@ -211,7 +211,7 @@
public void testExceptionDuringRenameStart() throws Exception {
MockFtplet.callback = new MockFtpletCallback() {
- public FtpletEnum onRenameStart(FtpSession session,
+ public FtpletResult onRenameStart(FtpSession session,
FtpRequest request) throws FtpException, IOException {
session
.write(new DefaultFtpReply(
@@ -234,7 +234,7 @@
public void testExceptionDuringRenameEnd() throws Exception {
MockFtplet.callback = new MockFtpletCallback() {
- public FtpletEnum onRenameEnd(FtpSession session, FtpRequest request)
+ public FtpletResult onRenameEnd(FtpSession session, FtpRequest request)
throws FtpException, IOException {
throwException();
return mockReturnValue;
@@ -253,7 +253,7 @@
public void testExceptionDuringDownloadStart() throws Exception {
MockFtplet.callback = new MockFtpletCallback() {
- public FtpletEnum onDownloadStart(FtpSession session,
+ public FtpletResult onDownloadStart(FtpSession session,
FtpRequest request) throws FtpException, IOException {
session.write(new DefaultFtpReply(
FtpReply.REPLY_550_REQUESTED_ACTION_NOT_TAKEN, "foo"));
@@ -273,7 +273,7 @@
public void testExceptionDuringDownloadEnd() throws Exception {
MockFtplet.callback = new MockFtpletCallback() {
- public FtpletEnum onDownloadEnd(FtpSession session,
+ public FtpletResult onDownloadEnd(FtpSession session,
FtpRequest request) throws FtpException, IOException {
throwException();
return mockReturnValue;
@@ -291,7 +291,7 @@
public void testExceptionDuringAppendStart() throws Exception {
MockFtplet.callback = new MockFtpletCallback() {
- public FtpletEnum onAppendStart(FtpSession session,
+ public FtpletResult onAppendStart(FtpSession session,
FtpRequest request) throws FtpException, IOException {
session.write(new DefaultFtpReply(
FtpReply.REPLY_550_REQUESTED_ACTION_NOT_TAKEN, "foo"));
@@ -312,7 +312,7 @@
public void testExceptionDuringAppendEnd() throws Exception {
MockFtplet.callback = new MockFtpletCallback() {
- public FtpletEnum onAppendEnd(FtpSession session, FtpRequest request)
+ public FtpletResult onAppendEnd(FtpSession session, FtpRequest request)
throws FtpException, IOException {
throwException();
return mockReturnValue;
@@ -330,7 +330,7 @@
public void testExceptionDuringUploadStart() throws Exception {
MockFtplet.callback = new MockFtpletCallback() {
- public FtpletEnum onUploadStart(FtpSession session,
+ public FtpletResult onUploadStart(FtpSession session,
FtpRequest request) throws FtpException, IOException {
session.write(new DefaultFtpReply(
FtpReply.REPLY_550_REQUESTED_ACTION_NOT_TAKEN, "foo"));
@@ -349,7 +349,7 @@
public void testExceptionDuringUploadEnd() throws Exception {
MockFtplet.callback = new MockFtpletCallback() {
- public FtpletEnum onUploadEnd(FtpSession session, FtpRequest request)
+ public FtpletResult onUploadEnd(FtpSession session, FtpRequest request)
throws FtpException, IOException {
throwException();
return mockReturnValue;
@@ -365,7 +365,7 @@
public void testExceptionDuringUploadUniqueStart() throws Exception {
MockFtplet.callback = new MockFtpletCallback() {
- public FtpletEnum onUploadUniqueStart(FtpSession session,
+ public FtpletResult onUploadUniqueStart(FtpSession session,
FtpRequest request) throws FtpException, IOException {
session.write(new DefaultFtpReply(
FtpReply.REPLY_550_REQUESTED_ACTION_NOT_TAKEN, "foo"));
@@ -383,7 +383,7 @@
public void testExceptionDuringUploadUniqueEnd() throws Exception {
MockFtplet.callback = new MockFtpletCallback() {
- public FtpletEnum onUploadUniqueEnd(FtpSession session,
+ public FtpletResult onUploadUniqueEnd(FtpSession session,
FtpRequest request) throws FtpException, IOException {
throwException();
Modified: mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ftplet/MockFtplet.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ftplet/MockFtplet.java?rev=686639&r1=686638&r2=686639&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ftplet/MockFtplet.java (original)
+++ mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ftplet/MockFtplet.java Sun Aug 17 13:13:28 2008
@@ -39,102 +39,102 @@
callback.init(ftpletContext);
}
- public FtpletEnum onAppendEnd(FtpSession session, FtpRequest request)
+ public FtpletResult onAppendEnd(FtpSession session, FtpRequest request)
throws FtpException, IOException {
return callback.onAppendEnd(session, request);
}
- public FtpletEnum onAppendStart(FtpSession session, FtpRequest request)
+ public FtpletResult onAppendStart(FtpSession session, FtpRequest request)
throws FtpException, IOException {
return callback.onAppendStart(session, request);
}
- public FtpletEnum onConnect(FtpSession session) throws FtpException,
+ public FtpletResult onConnect(FtpSession session) throws FtpException,
IOException {
return callback.onConnect(session);
}
- public FtpletEnum onDeleteEnd(FtpSession session, FtpRequest request)
+ public FtpletResult onDeleteEnd(FtpSession session, FtpRequest request)
throws FtpException, IOException {
return callback.onDeleteEnd(session, request);
}
- public FtpletEnum onDeleteStart(FtpSession session, FtpRequest request)
+ public FtpletResult onDeleteStart(FtpSession session, FtpRequest request)
throws FtpException, IOException {
return callback.onDeleteStart(session, request);
}
- public FtpletEnum onDisconnect(FtpSession session) throws FtpException,
+ public FtpletResult onDisconnect(FtpSession session) throws FtpException,
IOException {
return callback.onDisconnect(session);
}
- public FtpletEnum onDownloadEnd(FtpSession session, FtpRequest request)
+ public FtpletResult onDownloadEnd(FtpSession session, FtpRequest request)
throws FtpException, IOException {
return callback.onDownloadEnd(session, request);
}
- public FtpletEnum onDownloadStart(FtpSession session, FtpRequest request)
+ public FtpletResult onDownloadStart(FtpSession session, FtpRequest request)
throws FtpException, IOException {
return callback.onDownloadStart(session, request);
}
- public FtpletEnum onLogin(FtpSession session, FtpRequest request)
+ public FtpletResult onLogin(FtpSession session, FtpRequest request)
throws FtpException, IOException {
return callback.onLogin(session, request);
}
- public FtpletEnum onMkdirEnd(FtpSession session, FtpRequest request)
+ public FtpletResult onMkdirEnd(FtpSession session, FtpRequest request)
throws FtpException, IOException {
return callback.onMkdirEnd(session, request);
}
- public FtpletEnum onMkdirStart(FtpSession session, FtpRequest request)
+ public FtpletResult onMkdirStart(FtpSession session, FtpRequest request)
throws FtpException, IOException {
return callback.onMkdirStart(session, request);
}
- public FtpletEnum onRenameEnd(FtpSession session, FtpRequest request)
+ public FtpletResult onRenameEnd(FtpSession session, FtpRequest request)
throws FtpException, IOException {
return callback.onRenameEnd(session, request);
}
- public FtpletEnum onRenameStart(FtpSession session, FtpRequest request)
+ public FtpletResult onRenameStart(FtpSession session, FtpRequest request)
throws FtpException, IOException {
return callback.onRenameStart(session, request);
}
- public FtpletEnum onRmdirEnd(FtpSession session, FtpRequest request)
+ public FtpletResult onRmdirEnd(FtpSession session, FtpRequest request)
throws FtpException, IOException {
return callback.onRmdirEnd(session, request);
}
- public FtpletEnum onRmdirStart(FtpSession session, FtpRequest request)
+ public FtpletResult onRmdirStart(FtpSession session, FtpRequest request)
throws FtpException, IOException {
return callback.onRmdirStart(session, request);
}
- public FtpletEnum onSite(FtpSession session, FtpRequest request)
+ public FtpletResult onSite(FtpSession session, FtpRequest request)
throws FtpException, IOException {
return callback.onSite(session, request);
}
- public FtpletEnum onUploadEnd(FtpSession session, FtpRequest request)
+ public FtpletResult onUploadEnd(FtpSession session, FtpRequest request)
throws FtpException, IOException {
return callback.onUploadEnd(session, request);
}
- public FtpletEnum onUploadStart(FtpSession session, FtpRequest request)
+ public FtpletResult onUploadStart(FtpSession session, FtpRequest request)
throws FtpException, IOException {
return callback.onUploadStart(session, request);
}
- public FtpletEnum onUploadUniqueEnd(FtpSession session, FtpRequest request)
+ public FtpletResult onUploadUniqueEnd(FtpSession session, FtpRequest request)
throws FtpException, IOException {
return callback.onUploadUniqueEnd(session, request);
}
- public FtpletEnum onUploadUniqueStart(FtpSession session, FtpRequest request)
+ public FtpletResult onUploadUniqueStart(FtpSession session, FtpRequest request)
throws FtpException, IOException {
return callback.onUploadUniqueStart(session, request);
}
Modified: mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ftplet/MockFtpletCallback.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ftplet/MockFtpletCallback.java?rev=686639&r1=686638&r2=686639&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ftplet/MockFtpletCallback.java (original)
+++ mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ftplet/MockFtpletCallback.java Sun Aug 17 13:13:28 2008
@@ -29,7 +29,7 @@
*/
public class MockFtpletCallback extends DefaultFtplet {
- public static FtpletEnum returnValue;
+ public static FtpletResult returnValue;
public void destroy() {
}
@@ -37,102 +37,102 @@
public void init(FtpletContext ftpletContext) throws FtpException {
}
- public FtpletEnum onAppendEnd(FtpSession session, FtpRequest request)
+ public FtpletResult onAppendEnd(FtpSession session, FtpRequest request)
throws FtpException, IOException {
return returnValue;
}
- public FtpletEnum onAppendStart(FtpSession session, FtpRequest request)
+ public FtpletResult onAppendStart(FtpSession session, FtpRequest request)
throws FtpException, IOException {
return returnValue;
}
- public FtpletEnum onConnect(FtpSession session) throws FtpException,
+ public FtpletResult onConnect(FtpSession session) throws FtpException,
IOException {
return returnValue;
}
- public FtpletEnum onDeleteEnd(FtpSession session, FtpRequest request)
+ public FtpletResult onDeleteEnd(FtpSession session, FtpRequest request)
throws FtpException, IOException {
return returnValue;
}
- public FtpletEnum onDeleteStart(FtpSession session, FtpRequest request)
+ public FtpletResult onDeleteStart(FtpSession session, FtpRequest request)
throws FtpException, IOException {
return returnValue;
}
- public FtpletEnum onDisconnect(FtpSession session) throws FtpException,
+ public FtpletResult onDisconnect(FtpSession session) throws FtpException,
IOException {
return returnValue;
}
- public FtpletEnum onDownloadEnd(FtpSession session, FtpRequest request)
+ public FtpletResult onDownloadEnd(FtpSession session, FtpRequest request)
throws FtpException, IOException {
return returnValue;
}
- public FtpletEnum onDownloadStart(FtpSession session, FtpRequest request)
+ public FtpletResult onDownloadStart(FtpSession session, FtpRequest request)
throws FtpException, IOException {
return returnValue;
}
- public FtpletEnum onLogin(FtpSession session, FtpRequest request)
+ public FtpletResult onLogin(FtpSession session, FtpRequest request)
throws FtpException, IOException {
return returnValue;
}
- public FtpletEnum onMkdirEnd(FtpSession session, FtpRequest request)
+ public FtpletResult onMkdirEnd(FtpSession session, FtpRequest request)
throws FtpException, IOException {
return returnValue;
}
- public FtpletEnum onMkdirStart(FtpSession session, FtpRequest request)
+ public FtpletResult onMkdirStart(FtpSession session, FtpRequest request)
throws FtpException, IOException {
return returnValue;
}
- public FtpletEnum onRenameEnd(FtpSession session, FtpRequest request)
+ public FtpletResult onRenameEnd(FtpSession session, FtpRequest request)
throws FtpException, IOException {
return returnValue;
}
- public FtpletEnum onRenameStart(FtpSession session, FtpRequest request)
+ public FtpletResult onRenameStart(FtpSession session, FtpRequest request)
throws FtpException, IOException {
return returnValue;
}
- public FtpletEnum onRmdirEnd(FtpSession session, FtpRequest request)
+ public FtpletResult onRmdirEnd(FtpSession session, FtpRequest request)
throws FtpException, IOException {
return returnValue;
}
- public FtpletEnum onRmdirStart(FtpSession session, FtpRequest request)
+ public FtpletResult onRmdirStart(FtpSession session, FtpRequest request)
throws FtpException, IOException {
return returnValue;
}
- public FtpletEnum onSite(FtpSession session, FtpRequest request)
+ public FtpletResult onSite(FtpSession session, FtpRequest request)
throws FtpException, IOException {
return returnValue;
}
- public FtpletEnum onUploadEnd(FtpSession session, FtpRequest request)
+ public FtpletResult onUploadEnd(FtpSession session, FtpRequest request)
throws FtpException, IOException {
return returnValue;
}
- public FtpletEnum onUploadStart(FtpSession session, FtpRequest request)
+ public FtpletResult onUploadStart(FtpSession session, FtpRequest request)
throws FtpException, IOException {
return returnValue;
}
- public FtpletEnum onUploadUniqueEnd(FtpSession session, FtpRequest request)
+ public FtpletResult onUploadUniqueEnd(FtpSession session, FtpRequest request)
throws FtpException, IOException {
return returnValue;
}
- public FtpletEnum onUploadUniqueStart(FtpSession session, FtpRequest request)
+ public FtpletResult onUploadUniqueStart(FtpSession session, FtpRequest request)
throws FtpException, IOException {
return returnValue;
}
Modified: mina/ftpserver/trunk/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/DataType.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/DataType.java?rev=686639&r1=686638&r2=686639&view=diff
==============================================================================
--- mina/ftpserver/trunk/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/DataType.java (original)
+++ mina/ftpserver/trunk/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/DataType.java Sun Aug 17 13:13:28 2008
@@ -25,17 +25,17 @@
* @author The Apache MINA Project (dev@mina.apache.org)
* @version $Rev$, $Date$
*/
-public class DataType {
+public enum DataType {
/**
* Binary data type
*/
- public static final DataType BINARY = new DataType("I");
+ BINARY,
/**
* ASCII data type
*/
- public static final DataType ASCII = new DataType("A");
+ ASCII;
/**
* Parses the argument value from the TYPE command into the type safe class
@@ -58,20 +58,4 @@
throw new IllegalArgumentException("Unknown data type: " + argument);
}
}
-
- private String type;
-
- /**
- * Private constructor.
- */
- private DataType(String type) {
- this.type = type;
- }
-
- /**
- * Return the data type string.
- */
- public String toString() {
- return type;
- }
}
Modified: mina/ftpserver/trunk/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/DefaultFtplet.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/DefaultFtplet.java?rev=686639&r1=686638&r2=686639&view=diff
==============================================================================
--- mina/ftpserver/trunk/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/DefaultFtplet.java (original)
+++ mina/ftpserver/trunk/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/DefaultFtplet.java Sun Aug 17 13:13:28 2008
@@ -37,17 +37,17 @@
public void destroy() {
}
- public FtpletEnum onConnect(FtpSession session) throws FtpException,
+ public FtpletResult onConnect(FtpSession session) throws FtpException,
IOException {
return null;
}
- public FtpletEnum onDisconnect(FtpSession session) throws FtpException,
+ public FtpletResult onDisconnect(FtpSession session) throws FtpException,
IOException {
return null;
}
- public FtpletEnum beforeCommand(FtpSession session, FtpRequest request)
+ public FtpletResult beforeCommand(FtpSession session, FtpRequest request)
throws FtpException, IOException {
String command = request.getCommand().toUpperCase();
@@ -73,7 +73,7 @@
}
}
- public FtpletEnum afterCommand(FtpSession session, FtpRequest request)
+ public FtpletResult afterCommand(FtpSession session, FtpRequest request)
throws FtpException, IOException {
String command = request.getCommand().toUpperCase();
@@ -104,92 +104,92 @@
}
}
- public FtpletEnum onLogin(FtpSession session, FtpRequest request)
+ public FtpletResult onLogin(FtpSession session, FtpRequest request)
throws FtpException, IOException {
return null;
}
- public FtpletEnum onDeleteStart(FtpSession session, FtpRequest request)
+ public FtpletResult onDeleteStart(FtpSession session, FtpRequest request)
throws FtpException, IOException {
return null;
}
- public FtpletEnum onDeleteEnd(FtpSession session, FtpRequest request)
+ public FtpletResult onDeleteEnd(FtpSession session, FtpRequest request)
throws FtpException, IOException {
return null;
}
- public FtpletEnum onUploadStart(FtpSession session, FtpRequest request)
+ public FtpletResult onUploadStart(FtpSession session, FtpRequest request)
throws FtpException, IOException {
return null;
}
- public FtpletEnum onUploadEnd(FtpSession session, FtpRequest request)
+ public FtpletResult onUploadEnd(FtpSession session, FtpRequest request)
throws FtpException, IOException {
return null;
}
- public FtpletEnum onDownloadStart(FtpSession session, FtpRequest request)
+ public FtpletResult onDownloadStart(FtpSession session, FtpRequest request)
throws FtpException, IOException {
return null;
}
- public FtpletEnum onDownloadEnd(FtpSession session, FtpRequest request)
+ public FtpletResult onDownloadEnd(FtpSession session, FtpRequest request)
throws FtpException, IOException {
return null;
}
- public FtpletEnum onRmdirStart(FtpSession session, FtpRequest request)
+ public FtpletResult onRmdirStart(FtpSession session, FtpRequest request)
throws FtpException, IOException {
return null;
}
- public FtpletEnum onRmdirEnd(FtpSession session, FtpRequest request)
+ public FtpletResult onRmdirEnd(FtpSession session, FtpRequest request)
throws FtpException, IOException {
return null;
}
- public FtpletEnum onMkdirStart(FtpSession session, FtpRequest request)
+ public FtpletResult onMkdirStart(FtpSession session, FtpRequest request)
throws FtpException, IOException {
return null;
}
- public FtpletEnum onMkdirEnd(FtpSession session, FtpRequest request)
+ public FtpletResult onMkdirEnd(FtpSession session, FtpRequest request)
throws FtpException, IOException {
return null;
}
- public FtpletEnum onAppendStart(FtpSession session, FtpRequest request)
+ public FtpletResult onAppendStart(FtpSession session, FtpRequest request)
throws FtpException, IOException {
return null;
}
- public FtpletEnum onAppendEnd(FtpSession session, FtpRequest request)
+ public FtpletResult onAppendEnd(FtpSession session, FtpRequest request)
throws FtpException, IOException {
return null;
}
- public FtpletEnum onUploadUniqueStart(FtpSession session, FtpRequest request)
+ public FtpletResult onUploadUniqueStart(FtpSession session, FtpRequest request)
throws FtpException, IOException {
return null;
}
- public FtpletEnum onUploadUniqueEnd(FtpSession session, FtpRequest request)
+ public FtpletResult onUploadUniqueEnd(FtpSession session, FtpRequest request)
throws FtpException, IOException {
return null;
}
- public FtpletEnum onRenameStart(FtpSession session, FtpRequest request)
+ public FtpletResult onRenameStart(FtpSession session, FtpRequest request)
throws FtpException, IOException {
return null;
}
- public FtpletEnum onRenameEnd(FtpSession session, FtpRequest request)
+ public FtpletResult onRenameEnd(FtpSession session, FtpRequest request)
throws FtpException, IOException {
return null;
}
- public FtpletEnum onSite(FtpSession session, FtpRequest request)
+ public FtpletResult onSite(FtpSession session, FtpRequest request)
throws FtpException, IOException {
return null;
}
Modified: mina/ftpserver/trunk/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/Ftplet.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/Ftplet.java?rev=686639&r1=686638&r2=686639&view=diff
==============================================================================
--- mina/ftpserver/trunk/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/Ftplet.java (original)
+++ mina/ftpserver/trunk/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/Ftplet.java Sun Aug 17 13:13:28 2008
@@ -41,7 +41,7 @@
* </ol>
*
* All the callback methods return FtpletEnum. If it returns null
- * FtpletEnum.RET_DEFAULT will be assumed. If any ftplet callback method throws
+ * FtpletEnum.DEFAULT will be assumed. If any ftplet callback method throws
* exception, that particular connection will be disconnected.
*
* @author The Apache MINA Project (dev@mina.apache.org)
@@ -71,17 +71,17 @@
* server. The implementation should return based on the desired action to
* be taken by the server:
* <ul>
- * <li>{@link FtpletEnum#RET_DEFAULT}: The server continues as normal and
+ * <li>{@link FtpletResult#DEFAULT}: The server continues as normal and
* executes the command</li>
- * <li>{@link FtpletEnum#RET_NO_FTPLET}: The server does not call any more
+ * <li>{@link FtpletResult#NO_FTPLET}: The server does not call any more
* Ftplets before this command but continues execution of the command as
* usual</li>
- * <li>{@link FtpletEnum#RET_SKIP}: The server skips over execution of the
+ * <li>{@link FtpletResult#SKIP}: The server skips over execution of the
* command. Note that the Ftplet is responsible for returning the
* appropriate reply to the client, or the client might deadlock.</li>
- * <li>{@link FtpletEnum#RET_DISCONNECT}: The server will immediately
+ * <li>{@link FtpletResult#DISCONNECT}: The server will immediately
* disconnect the client.</li>
- * <li>Ftplet throws exception: Same as {@link FtpletEnum#RET_DISCONNECT}</li>
+ * <li>Ftplet throws exception: Same as {@link FtpletResult#DISCONNECT}</li>
* </ul>
*
* @param session
@@ -92,7 +92,7 @@
* @throws FtpException
* @throws IOException
*/
- FtpletEnum beforeCommand(FtpSession session, FtpRequest request)
+ FtpletResult beforeCommand(FtpSession session, FtpRequest request)
throws FtpException, IOException;
/**
@@ -100,13 +100,13 @@
* server. The implementation should return based on the desired action to
* be taken by the server:
* <ul>
- * <li>{@link FtpletEnum#RET_DEFAULT}: The server continues as normal</li>
- * <li>{@link FtpletEnum#RET_NO_FTPLET}: The server does not call any more
+ * <li>{@link FtpletResult#DEFAULT}: The server continues as normal</li>
+ * <li>{@link FtpletResult#NO_FTPLET}: The server does not call any more
* Ftplets before this command but continues as normal</li>
- * <li>{@link FtpletEnum#RET_SKIP}: Same as {@link FtpletEnum#RET_DEFAULT}</li>
- * <li>{@link FtpletEnum#RET_DISCONNECT}: The server will immediately
+ * <li>{@link FtpletResult#SKIP}: Same as {@link FtpletResult#DEFAULT}</li>
+ * <li>{@link FtpletResult#DISCONNECT}: The server will immediately
* disconnect the client.</li>
- * <li>Ftplet throws exception: Same as {@link FtpletEnum#RET_DISCONNECT}</li>
+ * <li>Ftplet throws exception: Same as {@link FtpletResult#DISCONNECT}</li>
* </ul>
*
* @param session
@@ -117,17 +117,17 @@
* @throws FtpException
* @throws IOException
*/
- FtpletEnum afterCommand(FtpSession session, FtpRequest request)
+ FtpletResult afterCommand(FtpSession session, FtpRequest request)
throws FtpException, IOException;
/**
* Client connect notification method.
*/
- FtpletEnum onConnect(FtpSession session) throws FtpException, IOException;
+ FtpletResult onConnect(FtpSession session) throws FtpException, IOException;
/**
* Client disconnect notification method. This is the last callback method.
*/
- FtpletEnum onDisconnect(FtpSession session) throws FtpException,
+ FtpletResult onDisconnect(FtpSession session) throws FtpException,
IOException;
}
\ No newline at end of file
Copied: mina/ftpserver/trunk/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/FtpletResult.java (from r686637, mina/ftpserver/trunk/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/FtpletEnum.java)
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/FtpletResult.java?p2=mina/ftpserver/trunk/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/FtpletResult.java&p1=mina/ftpserver/trunk/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/FtpletEnum.java&r1=686637&r2=686639&rev=686639&view=diff
==============================================================================
--- mina/ftpserver/trunk/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/FtpletEnum.java (original)
+++ mina/ftpserver/trunk/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/FtpletResult.java Sun Aug 17 13:13:28 2008
@@ -22,61 +22,34 @@
/**
* This class encapsulates the return values of the ftplet methods.
*
- * RET_DEFAULT < RET_NO_FTPLET < RET_SKIP < RET_DISCONNECT
+ * DEFAULT < NO_FTPLET < SKIP < DISCONNECT
*
* @author The Apache MINA Project (dev@mina.apache.org)
* @version $Rev$, $Date$
*/
-public final class FtpletEnum {
+public enum FtpletResult {
/**
* This return value indicates that the next ftplet method will be called.
* If no other ftplet is available, the ftpserver will process the request.
*/
- public static final FtpletEnum RET_DEFAULT = new FtpletEnum(0);
+ DEFAULT,
/**
* This return value indicates that the other ftplet methods will not be
* called but the ftpserver will continue processing this request.
*/
- public static final FtpletEnum RET_NO_FTPLET = new FtpletEnum(1);
+ NO_FTPLET,
/**
* It indicates that the ftpserver will skip everything. No further
* processing (both ftplet and server) will be done for this request.
*/
- public static final FtpletEnum RET_SKIP = new FtpletEnum(2);
+ SKIP,
/**
* It indicates that the server will skip and disconnect the client. No
* other request from the same client will be served.
*/
- public static final FtpletEnum RET_DISCONNECT = new FtpletEnum(3);
-
- private int type;
-
- /**
- * Private constructor - set the type
- */
- private FtpletEnum(int type) {
- this.type = type;
- }
-
- /**
- * Equality check
- */
- public boolean equals(Object obj) {
- if (obj instanceof FtpletEnum) {
- return type == ((FtpletEnum) obj).type;
- }
- return false;
- }
-
- /**
- * String representation
- */
- public String toString() {
- return String.valueOf(type);
- }
-
+ DISCONNECT;
}
Propchange: mina/ftpserver/trunk/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/FtpletResult.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: mina/ftpserver/trunk/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/FtpletResult.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: mina/ftpserver/trunk/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/Structure.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/Structure.java?rev=686639&r1=686638&r2=686639&view=diff
==============================================================================
--- mina/ftpserver/trunk/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/Structure.java (original)
+++ mina/ftpserver/trunk/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/Structure.java Sun Aug 17 13:13:28 2008
@@ -25,12 +25,12 @@
* @author The Apache MINA Project (dev@mina.apache.org)
* @version $Rev$, $Date$
*/
-public class Structure {
+public enum Structure {
/**
* File structure
*/
- public static final Structure FILE = new Structure("F");
+ FILE;
/**
* Parses the argument value from the STRU command into the type safe class
@@ -51,20 +51,4 @@
throw new IllegalArgumentException("Unknown structure: " + argument);
}
}
-
- private String structure;
-
- /**
- * Private constructor.
- */
- private Structure(String structure) {
- this.structure = structure;
- }
-
- /**
- * String representation of the structure.
- */
- public String toString() {
- return structure;
- }
}
Modified: mina/ftpserver/trunk/ftplet-api/src/test/java/org/apache/ftpserver/ftplet/ExampleFtplet.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/ftplet-api/src/test/java/org/apache/ftpserver/ftplet/ExampleFtplet.java?rev=686639&r1=686638&r2=686639&view=diff
==============================================================================
--- mina/ftpserver/trunk/ftplet-api/src/test/java/org/apache/ftpserver/ftplet/ExampleFtplet.java (original)
+++ mina/ftpserver/trunk/ftplet-api/src/test/java/org/apache/ftpserver/ftplet/ExampleFtplet.java Sun Aug 17 13:13:28 2008
@@ -29,14 +29,14 @@
public class ExampleFtplet extends DefaultFtplet {
@Override
- public FtpletEnum onMkdirEnd(FtpSession session, FtpRequest request)
+ public FtpletResult onMkdirEnd(FtpSession session, FtpRequest request)
throws FtpException, IOException {
session.write(new DefaultFtpReply(550, "Error!"));
- return FtpletEnum.RET_SKIP;
+ return FtpletResult.SKIP;
}
@Override
- public FtpletEnum onMkdirStart(FtpSession session, FtpRequest request)
+ public FtpletResult onMkdirStart(FtpSession session, FtpRequest request)
throws FtpException, IOException {
if (session.isSecure() && session.getDataConnection().isSecure()) {
// all is good