You are viewing a plain text version of this content. The canonical link for it is here.
Posted to ftpserver-commits@incubator.apache.org by ng...@apache.org on 2007/01/21 22:47:43 UTC
svn commit: r498474 [2/3] - in /incubator/ftpserver/trunk:
core/src/java/org/apache/ftpserver/
core/src/java/org/apache/ftpserver/command/
core/src/java/org/apache/ftpserver/ftplet/
core/src/java/org/apache/ftpserver/listener/ core/src/java/org/apache/...
Modified: incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/command/RMD.java
URL: http://svn.apache.org/viewvc/incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/command/RMD.java?view=diff&rev=498474&r1=498473&r2=498474
==============================================================================
--- incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/command/RMD.java (original)
+++ incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/command/RMD.java Sun Jan 21 14:47:40 2007
@@ -27,7 +27,7 @@
import org.apache.ftpserver.ftplet.FileObject;
import org.apache.ftpserver.ftplet.FtpException;
import org.apache.ftpserver.ftplet.FtpRequest;
-import org.apache.ftpserver.ftplet.FtpResponse;
+import org.apache.ftpserver.ftplet.FtpReply;
import org.apache.ftpserver.ftplet.Ftplet;
import org.apache.ftpserver.ftplet.FtpletEnum;
import org.apache.ftpserver.interfaces.FtpServerContext;
@@ -64,7 +64,7 @@
// argument check
String fileName = request.getArgument();
if(fileName == null) {
- out.write(FtpReplyUtil.translate(session, FtpResponse.REPLY_501_SYNTAX_ERROR_IN_PARAMETERS_OR_ARGUMENTS, "RMD", null));
+ out.write(FtpReplyUtil.translate(session, FtpReply.REPLY_501_SYNTAX_ERROR_IN_PARAMETERS_OR_ARGUMENTS, "RMD", null));
return;
}
@@ -94,26 +94,26 @@
log.debug("Exception getting file object", ex);
}
if(file == null) {
- out.write(FtpReplyUtil.translate(session, FtpResponse.REPLY_550_REQUESTED_ACTION_NOT_TAKEN, "RMD.permission", fileName));
+ out.write(FtpReplyUtil.translate(session, FtpReply.REPLY_550_REQUESTED_ACTION_NOT_TAKEN, "RMD.permission", fileName));
return;
}
// check permission
fileName = file.getFullName();
if( !file.hasDeletePermission() ) {
- out.write(FtpReplyUtil.translate(session, FtpResponse.REPLY_550_REQUESTED_ACTION_NOT_TAKEN, "RMD.permission", fileName));
+ out.write(FtpReplyUtil.translate(session, FtpReply.REPLY_550_REQUESTED_ACTION_NOT_TAKEN, "RMD.permission", fileName));
return;
}
// check file
if(!file.isDirectory()) {
- out.write(FtpReplyUtil.translate(session, FtpResponse.REPLY_550_REQUESTED_ACTION_NOT_TAKEN, "RMD.invalid", fileName));
+ out.write(FtpReplyUtil.translate(session, FtpReply.REPLY_550_REQUESTED_ACTION_NOT_TAKEN, "RMD.invalid", fileName));
return;
}
// now delete directory
if(file.delete()) {
- out.write(FtpReplyUtil.translate(session, FtpResponse.REPLY_250_REQUESTED_FILE_ACTION_OKAY, "RMD", fileName));
+ out.write(FtpReplyUtil.translate(session, FtpReply.REPLY_250_REQUESTED_FILE_ACTION_OKAY, "RMD", fileName));
// write log message
String userName = session.getUser().getName();
@@ -138,7 +138,7 @@
}
else {
- out.write(FtpReplyUtil.translate(session, FtpResponse.REPLY_450_REQUESTED_FILE_ACTION_NOT_TAKEN, "RMD", fileName));
+ out.write(FtpReplyUtil.translate(session, FtpReply.REPLY_450_REQUESTED_FILE_ACTION_NOT_TAKEN, "RMD", fileName));
}
}
}
Modified: incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/command/RNFR.java
URL: http://svn.apache.org/viewvc/incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/command/RNFR.java?view=diff&rev=498474&r1=498473&r2=498474
==============================================================================
--- incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/command/RNFR.java (original)
+++ incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/command/RNFR.java Sun Jan 21 14:47:40 2007
@@ -26,7 +26,7 @@
import org.apache.ftpserver.ftplet.FileObject;
import org.apache.ftpserver.ftplet.FtpException;
import org.apache.ftpserver.ftplet.FtpRequest;
-import org.apache.ftpserver.ftplet.FtpResponse;
+import org.apache.ftpserver.ftplet.FtpReply;
import org.apache.ftpserver.listener.Connection;
import org.apache.ftpserver.util.FtpReplyUtil;
@@ -56,7 +56,7 @@
// argument check
String fileName = request.getArgument();
if(fileName == null) {
- out.write(FtpReplyUtil.translate(session, FtpResponse.REPLY_501_SYNTAX_ERROR_IN_PARAMETERS_OR_ARGUMENTS, "RNFR", null));
+ out.write(FtpReplyUtil.translate(session, FtpReply.REPLY_501_SYNTAX_ERROR_IN_PARAMETERS_OR_ARGUMENTS, "RNFR", null));
return;
}
@@ -71,12 +71,12 @@
// check file
if(renFr == null) {
- out.write(FtpReplyUtil.translate(session, FtpResponse.REPLY_550_REQUESTED_ACTION_NOT_TAKEN, "RNFR", fileName));
+ out.write(FtpReplyUtil.translate(session, FtpReply.REPLY_550_REQUESTED_ACTION_NOT_TAKEN, "RNFR", fileName));
}
else {
session.setRenameFrom(renFr);
fileName = renFr.getFullName();
- out.write(FtpReplyUtil.translate(session, FtpResponse.REPLY_350_REQUESTED_FILE_ACTION_PENDING_FURTHER_INFORMATION, "RNFR", fileName));
+ out.write(FtpReplyUtil.translate(session, FtpReply.REPLY_350_REQUESTED_FILE_ACTION_PENDING_FURTHER_INFORMATION, "RNFR", fileName));
}
}
Modified: incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/command/RNTO.java
URL: http://svn.apache.org/viewvc/incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/command/RNTO.java?view=diff&rev=498474&r1=498473&r2=498474
==============================================================================
--- incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/command/RNTO.java (original)
+++ incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/command/RNTO.java Sun Jan 21 14:47:40 2007
@@ -27,7 +27,7 @@
import org.apache.ftpserver.ftplet.FileObject;
import org.apache.ftpserver.ftplet.FtpException;
import org.apache.ftpserver.ftplet.FtpRequest;
-import org.apache.ftpserver.ftplet.FtpResponse;
+import org.apache.ftpserver.ftplet.FtpReply;
import org.apache.ftpserver.ftplet.Ftplet;
import org.apache.ftpserver.ftplet.FtpletEnum;
import org.apache.ftpserver.interfaces.FtpServerContext;
@@ -60,7 +60,7 @@
// argument check
String toFileStr = request.getArgument();
if(toFileStr == null) {
- out.write(FtpReplyUtil.translate(session, FtpResponse.REPLY_501_SYNTAX_ERROR_IN_PARAMETERS_OR_ARGUMENTS, "RNTO", null));
+ out.write(FtpReplyUtil.translate(session, FtpReply.REPLY_501_SYNTAX_ERROR_IN_PARAMETERS_OR_ARGUMENTS, "RNTO", null));
return;
}
@@ -85,7 +85,7 @@
// get the "rename from" file object
FileObject frFile = session.getRenameFrom();
if( frFile == null ) {
- out.write(FtpReplyUtil.translate(session, FtpResponse.REPLY_503_BAD_SEQUENCE_OF_COMMANDS, "RNTO", null));
+ out.write(FtpReplyUtil.translate(session, FtpReply.REPLY_503_BAD_SEQUENCE_OF_COMMANDS, "RNTO", null));
return;
}
@@ -98,26 +98,26 @@
log.debug("Exception getting file object", ex);
}
if(toFile == null) {
- out.write(FtpReplyUtil.translate(session, FtpResponse.REPLY_553_REQUESTED_ACTION_NOT_TAKEN_FILE_NAME_NOT_ALLOWED, "RNTO.invalid", null));
+ out.write(FtpReplyUtil.translate(session, FtpReply.REPLY_553_REQUESTED_ACTION_NOT_TAKEN_FILE_NAME_NOT_ALLOWED, "RNTO.invalid", null));
return;
}
toFileStr = toFile.getFullName();
// check permission
if( !toFile.hasWritePermission() ) {
- out.write(FtpReplyUtil.translate(session, FtpResponse.REPLY_553_REQUESTED_ACTION_NOT_TAKEN_FILE_NAME_NOT_ALLOWED, "RNTO.permission", null));
+ out.write(FtpReplyUtil.translate(session, FtpReply.REPLY_553_REQUESTED_ACTION_NOT_TAKEN_FILE_NAME_NOT_ALLOWED, "RNTO.permission", null));
return;
}
// check file existance
if( !frFile.doesExist() ) {
- out.write(FtpReplyUtil.translate(session, FtpResponse.REPLY_553_REQUESTED_ACTION_NOT_TAKEN_FILE_NAME_NOT_ALLOWED, "RNTO.missing", null));
+ out.write(FtpReplyUtil.translate(session, FtpReply.REPLY_553_REQUESTED_ACTION_NOT_TAKEN_FILE_NAME_NOT_ALLOWED, "RNTO.missing", null));
return;
}
// now rename
if( frFile.move(toFile) ) {
- out.write(FtpReplyUtil.translate(session, FtpResponse.REPLY_250_REQUESTED_FILE_ACTION_OKAY, "RNTO", toFileStr));
+ out.write(FtpReplyUtil.translate(session, FtpReply.REPLY_250_REQUESTED_FILE_ACTION_OKAY, "RNTO", toFileStr));
Log log = serverContext.getLogFactory().getInstance(getClass());
log.info("File rename (" + session.getUser().getName() + ") "
@@ -136,7 +136,7 @@
}
}
else {
- out.write(FtpReplyUtil.translate(session, FtpResponse.REPLY_553_REQUESTED_ACTION_NOT_TAKEN_FILE_NAME_NOT_ALLOWED, "RNTO", toFileStr));
+ out.write(FtpReplyUtil.translate(session, FtpReply.REPLY_553_REQUESTED_ACTION_NOT_TAKEN_FILE_NAME_NOT_ALLOWED, "RNTO", toFileStr));
}
}
Modified: incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/command/SITE.java
URL: http://svn.apache.org/viewvc/incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/command/SITE.java?view=diff&rev=498474&r1=498473&r2=498474
==============================================================================
--- incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/command/SITE.java (original)
+++ incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/command/SITE.java Sun Jan 21 14:47:40 2007
@@ -27,7 +27,7 @@
import org.apache.ftpserver.FtpWriter;
import org.apache.ftpserver.ftplet.FtpException;
import org.apache.ftpserver.ftplet.FtpRequest;
-import org.apache.ftpserver.ftplet.FtpResponse;
+import org.apache.ftpserver.ftplet.FtpReply;
import org.apache.ftpserver.ftplet.Ftplet;
import org.apache.ftpserver.ftplet.FtpletEnum;
import org.apache.ftpserver.interfaces.Command;
@@ -86,7 +86,7 @@
// no params
if(argument == null) {
session.resetState();
- out.write(FtpReplyUtil.translate(session, FtpResponse.REPLY_200_COMMAND_OKAY, "SITE", null));
+ out.write(FtpReplyUtil.translate(session, FtpReply.REPLY_200_COMMAND_OKAY, "SITE", null));
return;
}
@@ -99,14 +99,14 @@
}
else {
session.resetState();
- out.write(FtpReplyUtil.translate(session, FtpResponse.REPLY_502_COMMAND_NOT_IMPLEMENTED, "SITE", argument));
+ out.write(FtpReplyUtil.translate(session, FtpReply.REPLY_502_COMMAND_NOT_IMPLEMENTED, "SITE", argument));
}
}
catch(Exception ex) {
Log log = serverContext.getLogFactory().getInstance(getClass());
log.warn("SITE.execute()", ex);
session.resetState();
- out.write(FtpReplyUtil.translate(session, FtpResponse.REPLY_500_SYNTAX_ERROR_COMMAND_UNRECOGNIZED, "SITE", null));
+ out.write(FtpReplyUtil.translate(session, FtpReply.REPLY_500_SYNTAX_ERROR_COMMAND_UNRECOGNIZED, "SITE", null));
}
}
Modified: incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/command/SITE_DESCUSER.java
URL: http://svn.apache.org/viewvc/incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/command/SITE_DESCUSER.java?view=diff&rev=498474&r1=498473&r2=498474
==============================================================================
--- incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/command/SITE_DESCUSER.java (original)
+++ incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/command/SITE_DESCUSER.java Sun Jan 21 14:47:40 2007
@@ -21,12 +21,12 @@
import java.io.IOException;
-import org.apache.ftpserver.FtpResponseImpl;
+import org.apache.ftpserver.DefaultFtpReply;
import org.apache.ftpserver.FtpSessionImpl;
import org.apache.ftpserver.FtpWriter;
import org.apache.ftpserver.ftplet.FtpException;
import org.apache.ftpserver.ftplet.FtpRequest;
-import org.apache.ftpserver.ftplet.FtpResponse;
+import org.apache.ftpserver.ftplet.FtpReply;
import org.apache.ftpserver.ftplet.User;
import org.apache.ftpserver.ftplet.UserManager;
import org.apache.ftpserver.interfaces.FtpServerContext;
@@ -58,7 +58,7 @@
UserManager userManager = connection.getServerContext().getUserManager();
boolean isAdmin = userManager.isAdmin(session.getUser().getName());
if(!isAdmin) {
- out.write(FtpReplyUtil.translate(session, FtpResponse.REPLY_530_NOT_LOGGED_IN, "SITE", null));
+ out.write(FtpReplyUtil.translate(session, FtpReply.REPLY_530_NOT_LOGGED_IN, "SITE", null));
return;
}
@@ -66,7 +66,7 @@
String argument = request.getArgument();
int spIndex = argument.indexOf(' ');
if(spIndex == -1) {
- out.write(FtpReplyUtil.translate(session, FtpResponse.REPLY_503_BAD_SEQUENCE_OF_COMMANDS, "SITE.DESCUSER", null));
+ out.write(FtpReplyUtil.translate(session, FtpReply.REPLY_503_BAD_SEQUENCE_OF_COMMANDS, "SITE.DESCUSER", null));
return;
}
String userName = argument.substring(spIndex + 1);
@@ -85,7 +85,7 @@
user = null;
}
if(user == null) {
- out.write(FtpReplyUtil.translate(session, FtpResponse.REPLY_501_SYNTAX_ERROR_IN_PARAMETERS_OR_ARGUMENTS, "SITE.DESCUSER", userName));
+ out.write(FtpReplyUtil.translate(session, FtpReply.REPLY_501_SYNTAX_ERROR_IN_PARAMETERS_OR_ARGUMENTS, "SITE.DESCUSER", userName));
return;
}
@@ -110,7 +110,7 @@
sb.append("downloadrate : 0\n");
}
sb.append('\n');
- out.write(new FtpResponseImpl(FtpResponse.REPLY_200_COMMAND_OKAY, sb.toString()));
+ out.write(new DefaultFtpReply(FtpReply.REPLY_200_COMMAND_OKAY, sb.toString()));
}
}
Modified: incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/command/SITE_HELP.java
URL: http://svn.apache.org/viewvc/incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/command/SITE_HELP.java?view=diff&rev=498474&r1=498473&r2=498474
==============================================================================
--- incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/command/SITE_HELP.java (original)
+++ incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/command/SITE_HELP.java Sun Jan 21 14:47:40 2007
@@ -25,7 +25,7 @@
import org.apache.ftpserver.FtpWriter;
import org.apache.ftpserver.ftplet.FtpException;
import org.apache.ftpserver.ftplet.FtpRequest;
-import org.apache.ftpserver.ftplet.FtpResponse;
+import org.apache.ftpserver.ftplet.FtpReply;
import org.apache.ftpserver.listener.Connection;
import org.apache.ftpserver.util.FtpReplyUtil;
@@ -50,7 +50,7 @@
session.resetState();
// print help message
- out.write(FtpReplyUtil.translate(session, FtpResponse.REPLY_200_COMMAND_OKAY, "SITE.HELP", null));
+ out.write(FtpReplyUtil.translate(session, FtpReply.REPLY_200_COMMAND_OKAY, "SITE.HELP", null));
}
}
Modified: incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/command/SITE_STAT.java
URL: http://svn.apache.org/viewvc/incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/command/SITE_STAT.java?view=diff&rev=498474&r1=498473&r2=498474
==============================================================================
--- incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/command/SITE_STAT.java (original)
+++ incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/command/SITE_STAT.java Sun Jan 21 14:47:40 2007
@@ -21,12 +21,12 @@
import java.io.IOException;
-import org.apache.ftpserver.FtpResponseImpl;
+import org.apache.ftpserver.DefaultFtpReply;
import org.apache.ftpserver.FtpSessionImpl;
import org.apache.ftpserver.FtpWriter;
import org.apache.ftpserver.ftplet.FtpException;
import org.apache.ftpserver.ftplet.FtpRequest;
-import org.apache.ftpserver.ftplet.FtpResponse;
+import org.apache.ftpserver.ftplet.FtpReply;
import org.apache.ftpserver.ftplet.FtpStatistics;
import org.apache.ftpserver.ftplet.UserManager;
import org.apache.ftpserver.listener.Connection;
@@ -56,7 +56,7 @@
UserManager userManager = connection.getServerContext().getUserManager();
boolean isAdmin = userManager.isAdmin(session.getUser().getName());
if(!isAdmin) {
- out.write(FtpReplyUtil.translate(session, FtpResponse.REPLY_530_NOT_LOGGED_IN, "SITE", null));
+ out.write(FtpReplyUtil.translate(session, FtpReply.REPLY_530_NOT_LOGGED_IN, "SITE", null));
return;
}
@@ -79,7 +79,7 @@
sb.append("Current Connections : ").append( stat.getCurrentConnectionNumber() ).append('\n');
sb.append("Total Connections : ").append( stat.getTotalConnectionNumber() ).append('\n');
sb.append('\n');
- out.write(new FtpResponseImpl(FtpResponse.REPLY_200_COMMAND_OKAY, sb.toString()));
+ out.write(new DefaultFtpReply(FtpReply.REPLY_200_COMMAND_OKAY, sb.toString()));
}
}
Modified: incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/command/SITE_WHO.java
URL: http://svn.apache.org/viewvc/incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/command/SITE_WHO.java?view=diff&rev=498474&r1=498473&r2=498474
==============================================================================
--- incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/command/SITE_WHO.java (original)
+++ incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/command/SITE_WHO.java Sun Jan 21 14:47:40 2007
@@ -23,12 +23,12 @@
import java.util.Iterator;
import java.util.List;
-import org.apache.ftpserver.FtpResponseImpl;
+import org.apache.ftpserver.DefaultFtpReply;
import org.apache.ftpserver.FtpSessionImpl;
import org.apache.ftpserver.FtpWriter;
import org.apache.ftpserver.ftplet.FtpException;
import org.apache.ftpserver.ftplet.FtpRequest;
-import org.apache.ftpserver.ftplet.FtpResponse;
+import org.apache.ftpserver.ftplet.FtpReply;
import org.apache.ftpserver.ftplet.FtpSession;
import org.apache.ftpserver.ftplet.User;
import org.apache.ftpserver.ftplet.UserManager;
@@ -61,7 +61,7 @@
UserManager userManager = connection.getServerContext().getUserManager();
boolean isAdmin = userManager.isAdmin(session.getUser().getName());
if(!isAdmin) {
- out.write(FtpReplyUtil.translate(session, FtpResponse.REPLY_530_NOT_LOGGED_IN, "SITE", null));
+ out.write(FtpReplyUtil.translate(session, FtpReply.REPLY_530_NOT_LOGGED_IN, "SITE", null));
return;
}
@@ -85,7 +85,7 @@
sb.append('\n');
}
sb.append('\n');
- out.write(new FtpResponseImpl(FtpResponse.REPLY_200_COMMAND_OKAY, sb.toString()));
+ out.write(new DefaultFtpReply(FtpReply.REPLY_200_COMMAND_OKAY, sb.toString()));
}
}
Modified: incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/command/SITE_ZONE.java
URL: http://svn.apache.org/viewvc/incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/command/SITE_ZONE.java?view=diff&rev=498474&r1=498473&r2=498474
==============================================================================
--- incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/command/SITE_ZONE.java (original)
+++ incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/command/SITE_ZONE.java Sun Jan 21 14:47:40 2007
@@ -23,12 +23,12 @@
import java.text.SimpleDateFormat;
import java.util.Date;
-import org.apache.ftpserver.FtpResponseImpl;
+import org.apache.ftpserver.DefaultFtpReply;
import org.apache.ftpserver.FtpSessionImpl;
import org.apache.ftpserver.FtpWriter;
import org.apache.ftpserver.ftplet.FtpException;
import org.apache.ftpserver.ftplet.FtpRequest;
-import org.apache.ftpserver.ftplet.FtpResponse;
+import org.apache.ftpserver.ftplet.FtpReply;
import org.apache.ftpserver.listener.Connection;
/**
@@ -54,6 +54,6 @@
// send timezone data
String timezone = TIMEZONE_FMT.format(new Date());
- out.write(new FtpResponseImpl(FtpResponse.REPLY_200_COMMAND_OKAY, timezone));
+ out.write(new DefaultFtpReply(FtpReply.REPLY_200_COMMAND_OKAY, timezone));
}
}
Modified: incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/command/SIZE.java
URL: http://svn.apache.org/viewvc/incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/command/SIZE.java?view=diff&rev=498474&r1=498473&r2=498474
==============================================================================
--- incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/command/SIZE.java (original)
+++ incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/command/SIZE.java Sun Jan 21 14:47:40 2007
@@ -26,7 +26,7 @@
import org.apache.ftpserver.ftplet.FileObject;
import org.apache.ftpserver.ftplet.FtpException;
import org.apache.ftpserver.ftplet.FtpRequest;
-import org.apache.ftpserver.ftplet.FtpResponse;
+import org.apache.ftpserver.ftplet.FtpReply;
import org.apache.ftpserver.listener.Connection;
import org.apache.ftpserver.util.FtpReplyUtil;
@@ -54,7 +54,7 @@
// argument check
String fileName = request.getArgument();
if(fileName == null) {
- out.write(FtpReplyUtil.translate(session, FtpResponse.REPLY_501_SYNTAX_ERROR_IN_PARAMETERS_OR_ARGUMENTS, "SIZE", null));
+ out.write(FtpReplyUtil.translate(session, FtpReply.REPLY_501_SYNTAX_ERROR_IN_PARAMETERS_OR_ARGUMENTS, "SIZE", null));
return;
}
@@ -67,21 +67,21 @@
log.debug("Exception getting file object", ex);
}
if(file == null) {
- out.write(FtpReplyUtil.translate(session, FtpResponse.REPLY_550_REQUESTED_ACTION_NOT_TAKEN, "SIZE.missing", fileName));
+ out.write(FtpReplyUtil.translate(session, FtpReply.REPLY_550_REQUESTED_ACTION_NOT_TAKEN, "SIZE.missing", fileName));
return;
}
// print file size
fileName = file.getFullName();
if(!file.doesExist()) {
- out.write(FtpReplyUtil.translate(session, FtpResponse.REPLY_550_REQUESTED_ACTION_NOT_TAKEN, "SIZE.missing", fileName));
+ out.write(FtpReplyUtil.translate(session, FtpReply.REPLY_550_REQUESTED_ACTION_NOT_TAKEN, "SIZE.missing", fileName));
}
else if(!file.isFile()) {
- out.write(FtpReplyUtil.translate(session, FtpResponse.REPLY_550_REQUESTED_ACTION_NOT_TAKEN, "SIZE.invalid", fileName));
+ out.write(FtpReplyUtil.translate(session, FtpReply.REPLY_550_REQUESTED_ACTION_NOT_TAKEN, "SIZE.invalid", fileName));
}
else {
String fileLen = String.valueOf(file.getSize());
- out.write(FtpReplyUtil.translate(session, FtpResponse.REPLY_213_FILE_STATUS, "SIZE", fileLen));
+ out.write(FtpReplyUtil.translate(session, FtpReply.REPLY_213_FILE_STATUS, "SIZE", fileLen));
}
}
Modified: incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/command/STAT.java
URL: http://svn.apache.org/viewvc/incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/command/STAT.java?view=diff&rev=498474&r1=498473&r2=498474
==============================================================================
--- incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/command/STAT.java (original)
+++ incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/command/STAT.java Sun Jan 21 14:47:40 2007
@@ -24,7 +24,7 @@
import org.apache.ftpserver.FtpSessionImpl;
import org.apache.ftpserver.FtpWriter;
import org.apache.ftpserver.ftplet.FtpRequest;
-import org.apache.ftpserver.ftplet.FtpResponse;
+import org.apache.ftpserver.ftplet.FtpReply;
import org.apache.ftpserver.listener.Connection;
import org.apache.ftpserver.util.FtpReplyUtil;
@@ -51,7 +51,7 @@
session.resetState();
// write the status info
- out.write(FtpReplyUtil.translate(session, FtpResponse.REPLY_211_SYSTEM_STATUS_REPLY, "STAT", null));
+ out.write(FtpReplyUtil.translate(session, FtpReply.REPLY_211_SYSTEM_STATUS_REPLY, "STAT", null));
}
}
Modified: incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/command/STOR.java
URL: http://svn.apache.org/viewvc/incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/command/STOR.java?view=diff&rev=498474&r1=498473&r2=498474
==============================================================================
--- incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/command/STOR.java (original)
+++ incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/command/STOR.java Sun Jan 21 14:47:40 2007
@@ -29,7 +29,7 @@
import org.apache.ftpserver.ftplet.FileObject;
import org.apache.ftpserver.ftplet.FtpException;
import org.apache.ftpserver.ftplet.FtpRequest;
-import org.apache.ftpserver.ftplet.FtpResponse;
+import org.apache.ftpserver.ftplet.FtpReply;
import org.apache.ftpserver.ftplet.Ftplet;
import org.apache.ftpserver.ftplet.FtpletEnum;
import org.apache.ftpserver.interfaces.FtpServerContext;
@@ -72,7 +72,7 @@
// argument check
String fileName = request.getArgument();
if(fileName == null) {
- out.write(FtpReplyUtil.translate(session, FtpResponse.REPLY_501_SYNTAX_ERROR_IN_PARAMETERS_OR_ARGUMENTS, "STOR", null));
+ out.write(FtpReplyUtil.translate(session, FtpReply.REPLY_501_SYNTAX_ERROR_IN_PARAMETERS_OR_ARGUMENTS, "STOR", null));
return;
}
@@ -102,26 +102,26 @@
log.debug("Exception getting file object", ex);
}
if(file == null) {
- out.write(FtpReplyUtil.translate(session, FtpResponse.REPLY_550_REQUESTED_ACTION_NOT_TAKEN, "STOR.invalid", fileName));
+ out.write(FtpReplyUtil.translate(session, FtpReply.REPLY_550_REQUESTED_ACTION_NOT_TAKEN, "STOR.invalid", fileName));
return;
}
fileName = file.getFullName();
// get permission
if( !file.hasWritePermission() ) {
- out.write(FtpReplyUtil.translate(session, FtpResponse.REPLY_550_REQUESTED_ACTION_NOT_TAKEN, "STOR.permission", fileName));
+ out.write(FtpReplyUtil.translate(session, FtpReply.REPLY_550_REQUESTED_ACTION_NOT_TAKEN, "STOR.permission", fileName));
return;
}
// get data connection
- out.write(FtpReplyUtil.translate(session, FtpResponse.REPLY_150_FILE_STATUS_OKAY, "STOR", fileName));
+ out.write(FtpReplyUtil.translate(session, FtpReply.REPLY_150_FILE_STATUS_OKAY, "STOR", fileName));
FtpDataConnection dataConnection;
try {
dataConnection = session.getFtpDataConnection().openConnection();
} catch (Exception e) {
log.debug("Exception getting the input data stream", e);
- out.write(FtpReplyUtil.translate(session, FtpResponse.REPLY_425_CANT_OPEN_DATA_CONNECTION, "STOR", fileName));
+ out.write(FtpReplyUtil.translate(session, FtpReply.REPLY_425_CANT_OPEN_DATA_CONNECTION, "STOR", fileName));
return;
}
@@ -143,12 +143,12 @@
catch(SocketException ex) {
log.debug("Socket exception during data transfer", ex);
failure = true;
- out.write(FtpReplyUtil.translate(session, FtpResponse.REPLY_426_CONNECTION_CLOSED_TRANSFER_ABORTED, "STOR", fileName));
+ out.write(FtpReplyUtil.translate(session, FtpReply.REPLY_426_CONNECTION_CLOSED_TRANSFER_ABORTED, "STOR", fileName));
}
catch(IOException ex) {
log.debug("IOException during data transfer", ex);
failure = true;
- out.write(FtpReplyUtil.translate(session, FtpResponse.REPLY_551_REQUESTED_ACTION_ABORTED_PAGE_TYPE_UNKNOWN, "STOR", fileName));
+ out.write(FtpReplyUtil.translate(session, FtpReply.REPLY_551_REQUESTED_ACTION_ABORTED_PAGE_TYPE_UNKNOWN, "STOR", fileName));
}
finally {
IoUtils.close(outStream);
@@ -156,7 +156,7 @@
// if data transfer ok - send transfer complete message
if(!failure) {
- out.write(FtpReplyUtil.translate(session, FtpResponse.REPLY_226_CLOSING_DATA_CONNECTION, "STOR", fileName));
+ out.write(FtpReplyUtil.translate(session, FtpReply.REPLY_226_CLOSING_DATA_CONNECTION, "STOR", fileName));
// call Ftplet.onUploadEnd() method
try {
Modified: incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/command/STOU.java
URL: http://svn.apache.org/viewvc/incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/command/STOU.java?view=diff&rev=498474&r1=498473&r2=498474
==============================================================================
--- incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/command/STOU.java (original)
+++ incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/command/STOU.java Sun Jan 21 14:47:40 2007
@@ -30,7 +30,7 @@
import org.apache.ftpserver.ftplet.FileSystemView;
import org.apache.ftpserver.ftplet.FtpException;
import org.apache.ftpserver.ftplet.FtpRequest;
-import org.apache.ftpserver.ftplet.FtpResponse;
+import org.apache.ftpserver.ftplet.FtpReply;
import org.apache.ftpserver.ftplet.FtpSession;
import org.apache.ftpserver.ftplet.Ftplet;
import org.apache.ftpserver.ftplet.FtpletEnum;
@@ -106,31 +106,31 @@
log.debug("Exception getting file object", ex);
}
if(file == null) {
- out.write(FtpReplyUtil.translate(session, FtpResponse.REPLY_550_REQUESTED_ACTION_NOT_TAKEN, "STOU", null));
+ out.write(FtpReplyUtil.translate(session, FtpReply.REPLY_550_REQUESTED_ACTION_NOT_TAKEN, "STOU", null));
return;
}
String fileName = file.getFullName();
// check permission
if(!file.hasWritePermission()) {
- out.write(FtpReplyUtil.translate(session, FtpResponse.REPLY_550_REQUESTED_ACTION_NOT_TAKEN, "STOU.permission", fileName));
+ out.write(FtpReplyUtil.translate(session, FtpReply.REPLY_550_REQUESTED_ACTION_NOT_TAKEN, "STOU.permission", fileName));
return;
}
// get data connection
- out.write(FtpReplyUtil.translate(session, FtpResponse.REPLY_150_FILE_STATUS_OKAY, "STOU", null));
+ out.write(FtpReplyUtil.translate(session, FtpReply.REPLY_150_FILE_STATUS_OKAY, "STOU", null));
// get data from client
boolean failure = false;
OutputStream os = null;
- out.write(FtpReplyUtil.translate(session, FtpResponse.REPLY_250_REQUESTED_FILE_ACTION_OKAY, "STOU", fileName));
+ out.write(FtpReplyUtil.translate(session, FtpReply.REPLY_250_REQUESTED_FILE_ACTION_OKAY, "STOU", fileName));
FtpDataConnection dataConnection;
try {
dataConnection = session.getFtpDataConnection().openConnection();
} catch (Exception e) {
log.debug("Exception getting the input data stream", e);
- out.write(FtpReplyUtil.translate(session, FtpResponse.REPLY_425_CANT_OPEN_DATA_CONNECTION, "STOU", fileName));
+ out.write(FtpReplyUtil.translate(session, FtpReply.REPLY_425_CANT_OPEN_DATA_CONNECTION, "STOU", fileName));
return;
}
@@ -155,12 +155,12 @@
catch(SocketException ex) {
log.debug("Socket exception during data transfer", ex);
failure = true;
- out.write(FtpReplyUtil.translate(session, FtpResponse.REPLY_426_CONNECTION_CLOSED_TRANSFER_ABORTED, "STOU", fileName));
+ out.write(FtpReplyUtil.translate(session, FtpReply.REPLY_426_CONNECTION_CLOSED_TRANSFER_ABORTED, "STOU", fileName));
}
catch(IOException ex) {
log.debug("IOException during data transfer", ex);
failure = true;
- out.write(FtpReplyUtil.translate(session, FtpResponse.REPLY_551_REQUESTED_ACTION_ABORTED_PAGE_TYPE_UNKNOWN, "STOU", fileName));
+ out.write(FtpReplyUtil.translate(session, FtpReply.REPLY_551_REQUESTED_ACTION_ABORTED_PAGE_TYPE_UNKNOWN, "STOU", fileName));
}
finally {
IoUtils.close(os);
@@ -168,7 +168,7 @@
// if data transfer ok - send transfer complete message
if(!failure) {
- out.write(FtpReplyUtil.translate(session, FtpResponse.REPLY_226_CLOSING_DATA_CONNECTION, "STOU", fileName));
+ out.write(FtpReplyUtil.translate(session, FtpReply.REPLY_226_CLOSING_DATA_CONNECTION, "STOU", fileName));
// call Ftplet.onUploadUniqueEnd() method
try {
Modified: incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/command/STRU.java
URL: http://svn.apache.org/viewvc/incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/command/STRU.java?view=diff&rev=498474&r1=498473&r2=498474
==============================================================================
--- incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/command/STRU.java (original)
+++ incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/command/STRU.java Sun Jan 21 14:47:40 2007
@@ -24,7 +24,7 @@
import org.apache.ftpserver.FtpSessionImpl;
import org.apache.ftpserver.FtpWriter;
import org.apache.ftpserver.ftplet.FtpRequest;
-import org.apache.ftpserver.ftplet.FtpResponse;
+import org.apache.ftpserver.ftplet.FtpReply;
import org.apache.ftpserver.ftplet.Structure;
import org.apache.ftpserver.listener.Connection;
import org.apache.ftpserver.util.FtpReplyUtil;
@@ -53,7 +53,7 @@
// argument check
if(!request.hasArgument()) {
- out.write(FtpReplyUtil.translate(session, FtpResponse.REPLY_501_SYNTAX_ERROR_IN_PARAMETERS_OR_ARGUMENTS, "STRU", null));
+ out.write(FtpReplyUtil.translate(session, FtpReply.REPLY_501_SYNTAX_ERROR_IN_PARAMETERS_OR_ARGUMENTS, "STRU", null));
return;
}
@@ -61,11 +61,11 @@
char stru = request.getArgument().charAt(0);
try {
session.setStructure(Structure.parseArgument(stru));
- out.write(FtpReplyUtil.translate(session, FtpResponse.REPLY_200_COMMAND_OKAY, "STRU", null));
+ out.write(FtpReplyUtil.translate(session, FtpReply.REPLY_200_COMMAND_OKAY, "STRU", null));
}
catch(IllegalArgumentException e) {
log.debug("Illegal structure argument: " + request.getArgument(), e);
- out.write(FtpReplyUtil.translate(session, FtpResponse.REPLY_504_COMMAND_NOT_IMPLEMENTED_FOR_THAT_PARAMETER, "STRU", null));
+ out.write(FtpReplyUtil.translate(session, FtpReply.REPLY_504_COMMAND_NOT_IMPLEMENTED_FOR_THAT_PARAMETER, "STRU", null));
}
}
Modified: incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/command/SYST.java
URL: http://svn.apache.org/viewvc/incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/command/SYST.java?view=diff&rev=498474&r1=498473&r2=498474
==============================================================================
--- incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/command/SYST.java (original)
+++ incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/command/SYST.java Sun Jan 21 14:47:40 2007
@@ -24,7 +24,7 @@
import org.apache.ftpserver.FtpSessionImpl;
import org.apache.ftpserver.FtpWriter;
import org.apache.ftpserver.ftplet.FtpRequest;
-import org.apache.ftpserver.ftplet.FtpResponse;
+import org.apache.ftpserver.ftplet.FtpReply;
import org.apache.ftpserver.listener.Connection;
import org.apache.ftpserver.util.FtpReplyUtil;
@@ -61,7 +61,7 @@
systemName = systemName.replace(' ', '-');
}
// print server system info
- out.write(FtpReplyUtil.translate(session, FtpResponse.REPLY_215_NAME_SYSTEM_TYPE, "SYST", systemName));
+ out.write(FtpReplyUtil.translate(session, FtpReply.REPLY_215_NAME_SYSTEM_TYPE, "SYST", systemName));
}
}
Modified: incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/command/TYPE.java
URL: http://svn.apache.org/viewvc/incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/command/TYPE.java?view=diff&rev=498474&r1=498473&r2=498474
==============================================================================
--- incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/command/TYPE.java (original)
+++ incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/command/TYPE.java Sun Jan 21 14:47:40 2007
@@ -25,7 +25,7 @@
import org.apache.ftpserver.FtpWriter;
import org.apache.ftpserver.ftplet.DataType;
import org.apache.ftpserver.ftplet.FtpRequest;
-import org.apache.ftpserver.ftplet.FtpResponse;
+import org.apache.ftpserver.ftplet.FtpReply;
import org.apache.ftpserver.listener.Connection;
import org.apache.ftpserver.util.FtpReplyUtil;
@@ -59,11 +59,11 @@
// set type
try {
session.setDataType(DataType.parseArgument(type));
- out.write(FtpReplyUtil.translate(session, FtpResponse.REPLY_200_COMMAND_OKAY, "TYPE", null));
+ out.write(FtpReplyUtil.translate(session, FtpReply.REPLY_200_COMMAND_OKAY, "TYPE", null));
}
catch(IllegalArgumentException e) {
log.debug("Illegal type argument: " + request.getArgument(), e);
- out.write(FtpReplyUtil.translate(session, FtpResponse.REPLY_504_COMMAND_NOT_IMPLEMENTED_FOR_THAT_PARAMETER, "TYPE", null));
+ out.write(FtpReplyUtil.translate(session, FtpReply.REPLY_504_COMMAND_NOT_IMPLEMENTED_FOR_THAT_PARAMETER, "TYPE", null));
}
}
Modified: incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/command/USER.java
URL: http://svn.apache.org/viewvc/incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/command/USER.java?view=diff&rev=498474&r1=498473&r2=498474
==============================================================================
--- incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/command/USER.java (original)
+++ incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/command/USER.java Sun Jan 21 14:47:40 2007
@@ -25,7 +25,7 @@
import org.apache.ftpserver.FtpWriter;
import org.apache.ftpserver.ftplet.FtpException;
import org.apache.ftpserver.ftplet.FtpRequest;
-import org.apache.ftpserver.ftplet.FtpResponse;
+import org.apache.ftpserver.ftplet.FtpReply;
import org.apache.ftpserver.ftplet.User;
import org.apache.ftpserver.interfaces.FtpServerContext;
import org.apache.ftpserver.interfaces.ServerFtpStatistics;
@@ -69,7 +69,7 @@
// argument check
String userName = request.getArgument();
if(userName == null) {
- out.write(FtpReplyUtil.translate(session, FtpResponse.REPLY_501_SYNTAX_ERROR_IN_PARAMETERS_OR_ARGUMENTS, "USER", null));
+ out.write(FtpReplyUtil.translate(session, FtpReply.REPLY_501_SYNTAX_ERROR_IN_PARAMETERS_OR_ARGUMENTS, "USER", null));
return;
}
@@ -77,7 +77,7 @@
BaseUser user = (BaseUser)session.getUser();
if(session.isLoggedIn()) {
if( userName.equals(user.getName()) ) {
- out.write(FtpReplyUtil.translate(session, FtpResponse.REPLY_230_USER_LOGGED_IN, "USER", null));
+ out.write(FtpReplyUtil.translate(session, FtpReply.REPLY_230_USER_LOGGED_IN, "USER", null));
success = true;
}
else {
@@ -89,7 +89,7 @@
// anonymous login is not enabled
boolean anonymous = userName.equals("anonymous");
if( anonymous && (!conManager.isAnonymousLoginEnabled()) ) {
- out.write(FtpReplyUtil.translate(session, FtpResponse.REPLY_530_NOT_LOGGED_IN, "USER.anonymous", null));
+ out.write(FtpReplyUtil.translate(session, FtpReply.REPLY_530_NOT_LOGGED_IN, "USER.anonymous", null));
return;
}
@@ -97,7 +97,7 @@
int currAnonLogin = stat.getCurrentAnonymousLoginNumber();
int maxAnonLogin = conManager.getMaxAnonymousLogins();
if( anonymous && (currAnonLogin >= maxAnonLogin) ) {
- out.write(FtpReplyUtil.translate(session, FtpResponse.REPLY_421_SERVICE_NOT_AVAILABLE_CLOSING_CONTROL_CONNECTION, "USER.anonymous", null));
+ out.write(FtpReplyUtil.translate(session, FtpReply.REPLY_421_SERVICE_NOT_AVAILABLE_CLOSING_CONTROL_CONNECTION, "USER.anonymous", null));
return;
}
@@ -105,7 +105,7 @@
int currLogin = stat.getCurrentLoginNumber();
int maxLogin = conManager.getMaxLogins();
if(maxLogin != 0 && currLogin >= maxLogin) {
- out.write(FtpReplyUtil.translate(session, FtpResponse.REPLY_421_SERVICE_NOT_AVAILABLE_CLOSING_CONTROL_CONNECTION, "USER.login", null));
+ out.write(FtpReplyUtil.translate(session, FtpReply.REPLY_421_SERVICE_NOT_AVAILABLE_CLOSING_CONTROL_CONNECTION, "USER.login", null));
return;
}
@@ -118,7 +118,7 @@
stat.getCurrentUserLoginNumber(configUser, session.getClientAddress()) + 1);
if(configUser.authorize(loginRequest) == null) {
- out.write(FtpReplyUtil.translate(session, FtpResponse.REPLY_421_SERVICE_NOT_AVAILABLE_CLOSING_CONTROL_CONNECTION, "USER.login", null));
+ out.write(FtpReplyUtil.translate(session, FtpReply.REPLY_421_SERVICE_NOT_AVAILABLE_CLOSING_CONTROL_CONNECTION, "USER.login", null));
return;
}
}
@@ -127,10 +127,10 @@
success = true;
session.setUserArgument(userName);
if(anonymous) {
- out.write(FtpReplyUtil.translate(session, FtpResponse.REPLY_331_USER_NAME_OKAY_NEED_PASSWORD, "USER.anonymous", userName));
+ out.write(FtpReplyUtil.translate(session, FtpReply.REPLY_331_USER_NAME_OKAY_NEED_PASSWORD, "USER.anonymous", userName));
}
else {
- out.write(FtpReplyUtil.translate(session, FtpResponse.REPLY_331_USER_NAME_OKAY_NEED_PASSWORD, "USER", userName));
+ out.write(FtpReplyUtil.translate(session, FtpReply.REPLY_331_USER_NAME_OKAY_NEED_PASSWORD, "USER", userName));
}
}
finally {
Modified: incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/ftplet/DefaultFtpletContainer.java
URL: http://svn.apache.org/viewvc/incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/ftplet/DefaultFtpletContainer.java?view=diff&rev=498474&r1=498473&r2=498474
==============================================================================
--- incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/ftplet/DefaultFtpletContainer.java (original)
+++ incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/ftplet/DefaultFtpletContainer.java Sun Jan 21 14:47:40 2007
@@ -126,7 +126,7 @@
/**
* Call ftplet onConnect.
*/
- public FtpletEnum onConnect(FtpSession session, FtpResponseOutput response) throws FtpException, IOException {
+ public FtpletEnum onConnect(FtpSession session, FtpReplyOutput response) throws FtpException, IOException {
FtpletEnum retVal = FtpletEnum.RET_DEFAULT;
int sz = ftplets.size();
for(int i=0; i<sz; ++i) {
@@ -147,7 +147,7 @@
/**
* Call ftplet onDisconnect.
*/
- public FtpletEnum onDisconnect(FtpSession session, FtpResponseOutput response) throws FtpException, IOException {
+ public FtpletEnum onDisconnect(FtpSession session, FtpReplyOutput response) throws FtpException, IOException {
FtpletEnum retVal = FtpletEnum.RET_DEFAULT;
int sz = ftplets.size();
for(int i=0; i<sz; ++i) {
@@ -168,7 +168,7 @@
/**
* Call ftplet onLogin.
*/
- public FtpletEnum onLogin(FtpSession session, FtpRequest request, FtpResponseOutput response) throws FtpException, IOException {
+ public FtpletEnum onLogin(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {
FtpletEnum retVal = FtpletEnum.RET_DEFAULT;
int sz = ftplets.size();
for(int i=0; i<sz; ++i) {
@@ -189,7 +189,7 @@
/**
* Call ftplet onDeleteStart.
*/
- public FtpletEnum onDeleteStart(FtpSession session, FtpRequest request, FtpResponseOutput response) throws FtpException, IOException {
+ public FtpletEnum onDeleteStart(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {
FtpletEnum retVal = FtpletEnum.RET_DEFAULT;
int sz = ftplets.size();
for(int i=0; i<sz; ++i) {
@@ -211,7 +211,7 @@
/**
* Call ftplet onDeleteEnd.
*/
- public FtpletEnum onDeleteEnd(FtpSession session, FtpRequest request, FtpResponseOutput response) throws FtpException, IOException {
+ public FtpletEnum onDeleteEnd(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {
FtpletEnum retVal = FtpletEnum.RET_DEFAULT;
int sz = ftplets.size();
for(int i=0; i<sz; ++i) {
@@ -232,7 +232,7 @@
/**
* Call ftplet onUploadStart.
*/
- public FtpletEnum onUploadStart(FtpSession session, FtpRequest request, FtpResponseOutput response) throws FtpException, IOException {
+ public FtpletEnum onUploadStart(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {
FtpletEnum retVal = FtpletEnum.RET_DEFAULT;
int sz = ftplets.size();
for(int i=0; i<sz; ++i) {
@@ -253,7 +253,7 @@
/**
* Call ftplet onUploadEnd.
*/
- public FtpletEnum onUploadEnd(FtpSession session, FtpRequest request, FtpResponseOutput response) throws FtpException, IOException {
+ public FtpletEnum onUploadEnd(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {
FtpletEnum retVal = FtpletEnum.RET_DEFAULT;
int sz = ftplets.size();
for(int i=0; i<sz; ++i) {
@@ -274,7 +274,7 @@
/**
* Call ftplet onDownloadStart.
*/
- public FtpletEnum onDownloadStart(FtpSession session, FtpRequest request, FtpResponseOutput response) throws FtpException, IOException {
+ public FtpletEnum onDownloadStart(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {
FtpletEnum retVal = FtpletEnum.RET_DEFAULT;
int sz = ftplets.size();
for(int i=0; i<sz; ++i) {
@@ -295,7 +295,7 @@
/**
* Call ftplet onDownloadEnd.
*/
- public FtpletEnum onDownloadEnd(FtpSession session, FtpRequest request, FtpResponseOutput response) throws FtpException, IOException {
+ public FtpletEnum onDownloadEnd(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {
FtpletEnum retVal = FtpletEnum.RET_DEFAULT;
int sz = ftplets.size();
for(int i=0; i<sz; ++i) {
@@ -316,7 +316,7 @@
/**
* Call ftplet onRmdirStart.
*/
- public FtpletEnum onRmdirStart(FtpSession session, FtpRequest request, FtpResponseOutput response) throws FtpException, IOException {
+ public FtpletEnum onRmdirStart(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {
FtpletEnum retVal = FtpletEnum.RET_DEFAULT;
int sz = ftplets.size();
for(int i=0; i<sz; ++i) {
@@ -337,7 +337,7 @@
/**
* Call ftplet onRmdirEnd.
*/
- public FtpletEnum onRmdirEnd(FtpSession session, FtpRequest request, FtpResponseOutput response) throws FtpException, IOException {
+ public FtpletEnum onRmdirEnd(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {
FtpletEnum retVal = FtpletEnum.RET_DEFAULT;
int sz = ftplets.size();
for(int i=0; i<sz; ++i) {
@@ -358,7 +358,7 @@
/**
* Call ftplet onMkdirStart.
*/
- public FtpletEnum onMkdirStart(FtpSession session, FtpRequest request, FtpResponseOutput response) throws FtpException, IOException {
+ public FtpletEnum onMkdirStart(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {
FtpletEnum retVal = FtpletEnum.RET_DEFAULT;
int sz = ftplets.size();
for(int i=0; i<sz; ++i) {
@@ -379,7 +379,7 @@
/**
* Call ftplet onMkdirEnd.
*/
- public FtpletEnum onMkdirEnd(FtpSession session, FtpRequest request, FtpResponseOutput response) throws FtpException, IOException {
+ public FtpletEnum onMkdirEnd(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {
FtpletEnum retVal = FtpletEnum.RET_DEFAULT;
int sz = ftplets.size();
for(int i=0; i<sz; ++i) {
@@ -400,7 +400,7 @@
/**
* Call ftplet onAppendStart.
*/
- public FtpletEnum onAppendStart(FtpSession session, FtpRequest request, FtpResponseOutput response) throws FtpException, IOException {
+ public FtpletEnum onAppendStart(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {
FtpletEnum retVal = FtpletEnum.RET_DEFAULT;
int sz = ftplets.size();
for(int i=0; i<sz; ++i) {
@@ -421,7 +421,7 @@
/**
* Call ftplet onAppendEnd.
*/
- public FtpletEnum onAppendEnd(FtpSession session, FtpRequest request, FtpResponseOutput response) throws FtpException, IOException {
+ public FtpletEnum onAppendEnd(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {
FtpletEnum retVal = FtpletEnum.RET_DEFAULT;
int sz = ftplets.size();
for(int i=0; i<sz; ++i) {
@@ -442,7 +442,7 @@
/**
* Call ftplet onUploadUniqueStart.
*/
- public FtpletEnum onUploadUniqueStart(FtpSession session, FtpRequest request, FtpResponseOutput response) throws FtpException, IOException {
+ public FtpletEnum onUploadUniqueStart(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {
FtpletEnum retVal = FtpletEnum.RET_DEFAULT;
int sz = ftplets.size();
for(int i=0; i<sz; ++i) {
@@ -463,7 +463,7 @@
/**
* Call ftplet onUploadUniqueEnd.
*/
- public FtpletEnum onUploadUniqueEnd(FtpSession session, FtpRequest request, FtpResponseOutput response) throws FtpException, IOException {
+ public FtpletEnum onUploadUniqueEnd(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {
FtpletEnum retVal = FtpletEnum.RET_DEFAULT;
int sz = ftplets.size();
for(int i=0; i<sz; ++i) {
@@ -484,7 +484,7 @@
/**
* Call ftplet onRenameStart.
*/
- public FtpletEnum onRenameStart(FtpSession session, FtpRequest request, FtpResponseOutput response) throws FtpException, IOException {
+ public FtpletEnum onRenameStart(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {
FtpletEnum retVal = FtpletEnum.RET_DEFAULT;
int sz = ftplets.size();
for(int i=0; i<sz; ++i) {
@@ -505,7 +505,7 @@
/**
* Call ftplet onRenameEnd.
*/
- public FtpletEnum onRenameEnd(FtpSession session, FtpRequest request, FtpResponseOutput response) throws FtpException, IOException {
+ public FtpletEnum onRenameEnd(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {
FtpletEnum retVal = FtpletEnum.RET_DEFAULT;
int sz = ftplets.size();
for(int i=0; i<sz; ++i) {
@@ -526,7 +526,7 @@
/**
* Call ftplet onSite.
*/
- public FtpletEnum onSite(FtpSession session, FtpRequest request, FtpResponseOutput response) throws FtpException, IOException {
+ public FtpletEnum onSite(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {
FtpletEnum retVal = FtpletEnum.RET_DEFAULT;
int sz = ftplets.size();
for(int i=0; i<sz; ++i) {
Modified: incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/listener/FtpProtocolHandler.java
URL: http://svn.apache.org/viewvc/incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/listener/FtpProtocolHandler.java?view=diff&rev=498474&r1=498473&r2=498474
==============================================================================
--- incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/listener/FtpProtocolHandler.java (original)
+++ incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/listener/FtpProtocolHandler.java Sun Jan 21 14:47:40 2007
@@ -28,7 +28,7 @@
import org.apache.ftpserver.ftplet.FileSystemView;
import org.apache.ftpserver.ftplet.FtpException;
import org.apache.ftpserver.ftplet.FtpRequest;
-import org.apache.ftpserver.ftplet.FtpResponse;
+import org.apache.ftpserver.ftplet.FtpReply;
import org.apache.ftpserver.ftplet.FtpSession;
import org.apache.ftpserver.ftplet.Ftplet;
import org.apache.ftpserver.ftplet.FtpletEnum;
@@ -89,7 +89,7 @@
IpRestrictor ipRestrictor = serverContext.getIpRestrictor();
if( !ipRestrictor.hasPermission(clientAddr) ) {
log.warn("No permission to access from " + hostAddress);
- writer.write(FtpReplyUtil.translate(session, FtpResponse.REPLY_530_NOT_LOGGED_IN, "ip.restricted", null));
+ writer.write(FtpReplyUtil.translate(session, FtpReply.REPLY_530_NOT_LOGGED_IN, "ip.restricted", null));
return;
}
@@ -98,12 +98,12 @@
if(maxConnections != 0 && ftpStat.getCurrentConnectionNumber() > maxConnections) {
log.warn("Maximum connection limit reached.");
- writer.write(FtpReplyUtil.translate(session, FtpResponse.REPLY_530_NOT_LOGGED_IN, "connection.limit", null));
+ writer.write(FtpReplyUtil.translate(session, FtpReply.REPLY_530_NOT_LOGGED_IN, "connection.limit", null));
return;
}
// everything is fine - go ahead
- writer.write(FtpReplyUtil.translate(session, FtpResponse.REPLY_220_SERVICE_READY, null, null));
+ writer.write(FtpReplyUtil.translate(session, FtpReply.REPLY_220_SERVICE_READY, null, null));
}
}
@@ -111,7 +111,7 @@
session.setCurrentRequest(request);
if(!hasPermission(session, request)) {
- writer.write(FtpReplyUtil.translate(session, FtpResponse.REPLY_530_NOT_LOGGED_IN, "permission", null));
+ writer.write(FtpReplyUtil.translate(session, FtpReply.REPLY_530_NOT_LOGGED_IN, "permission", null));
return;
}
@@ -183,14 +183,14 @@
command.execute(connection, request, session, out);
}
else {
- out.write(FtpReplyUtil.translate(session, FtpResponse.REPLY_502_COMMAND_NOT_IMPLEMENTED, "not.implemented", null));
+ out.write(FtpReplyUtil.translate(session, FtpReply.REPLY_502_COMMAND_NOT_IMPLEMENTED, "not.implemented", null));
}
}
catch(Exception ex) {
// send error reply
try {
- out.write(FtpReplyUtil.translate(session, FtpResponse.REPLY_550_REQUESTED_ACTION_NOT_TAKEN, null, null));
+ out.write(FtpReplyUtil.translate(session, FtpReply.REPLY_550_REQUESTED_ACTION_NOT_TAKEN, null, null));
}
catch(Exception ex1) {
}
Modified: incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/listener/io/IOFtpResponseOutput.java
URL: http://svn.apache.org/viewvc/incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/listener/io/IOFtpResponseOutput.java?view=diff&rev=498474&r1=498473&r2=498474
==============================================================================
--- incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/listener/io/IOFtpResponseOutput.java (original)
+++ incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/listener/io/IOFtpResponseOutput.java Sun Jan 21 14:47:40 2007
@@ -25,7 +25,7 @@
import java.net.Socket;
import org.apache.ftpserver.FtpWriter;
-import org.apache.ftpserver.ftplet.FtpResponse;
+import org.apache.ftpserver.ftplet.FtpReply;
import org.apache.ftpserver.util.IoUtils;
public class IOFtpResponseOutput extends FtpWriter {
@@ -38,7 +38,7 @@
}
}
- public void write(FtpResponse response) throws IOException {
+ public void write(FtpReply response) throws IOException {
String out = response.toString();
Modified: incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/listener/mina/FtpResponseEncoder.java
URL: http://svn.apache.org/viewvc/incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/listener/mina/FtpResponseEncoder.java?view=diff&rev=498474&r1=498473&r2=498474
==============================================================================
--- incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/listener/mina/FtpResponseEncoder.java (original)
+++ incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/listener/mina/FtpResponseEncoder.java Sun Jan 21 14:47:40 2007
@@ -22,7 +22,7 @@
import java.nio.charset.Charset;
import java.nio.charset.CharsetEncoder;
-import org.apache.ftpserver.ftplet.FtpResponse;
+import org.apache.ftpserver.ftplet.FtpReply;
import org.apache.mina.common.ByteBuffer;
import org.apache.mina.common.IoSession;
import org.apache.mina.filter.codec.ProtocolEncoderAdapter;
@@ -30,7 +30,7 @@
import org.apache.mina.filter.codec.demux.MessageEncoder;
/**
- * A {@link MessageEncoder} that encodes {@link FtpResponse}.
+ * A {@link MessageEncoder} that encodes {@link FtpReply}.
*/
public class FtpResponseEncoder extends ProtocolEncoderAdapter
{
@@ -39,7 +39,7 @@
public void encode( IoSession session, Object message,
ProtocolEncoderOutput out ) throws Exception
{
- FtpResponse ftpResponse = (FtpResponse) message;
+ FtpReply ftpResponse = (FtpReply) message;
ByteBuffer buf = ByteBuffer.allocate( 256 );
Modified: incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/listener/mina/MinaFtpResponseOutput.java
URL: http://svn.apache.org/viewvc/incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/listener/mina/MinaFtpResponseOutput.java?view=diff&rev=498474&r1=498473&r2=498474
==============================================================================
--- incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/listener/mina/MinaFtpResponseOutput.java (original)
+++ incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/listener/mina/MinaFtpResponseOutput.java Sun Jan 21 14:47:40 2007
@@ -24,7 +24,7 @@
import java.net.InetSocketAddress;
import org.apache.ftpserver.FtpWriter;
-import org.apache.ftpserver.ftplet.FtpResponse;
+import org.apache.ftpserver.ftplet.FtpReply;
import org.apache.mina.common.IoSession;
public class MinaFtpResponseOutput extends FtpWriter {
@@ -35,7 +35,7 @@
this.session = session;
}
- public void write(FtpResponse response) throws IOException {
+ public void write(FtpReply response) throws IOException {
session.write(response).join();
}
Modified: incubator/ftpserver/trunk/core/src/test/org/apache/ftpserver/FtpResponseImplTest.java
URL: http://svn.apache.org/viewvc/incubator/ftpserver/trunk/core/src/test/org/apache/ftpserver/FtpResponseImplTest.java?view=diff&rev=498474&r1=498473&r2=498474
==============================================================================
--- incubator/ftpserver/trunk/core/src/test/org/apache/ftpserver/FtpResponseImplTest.java (original)
+++ incubator/ftpserver/trunk/core/src/test/org/apache/ftpserver/FtpResponseImplTest.java Sun Jan 21 14:47:40 2007
@@ -25,25 +25,25 @@
public class FtpResponseImplTest extends TestCase {
public void testSingleLineToString() {
- FtpResponseImpl response = new FtpResponseImpl(123, "foo bar");
+ DefaultFtpReply response = new DefaultFtpReply(123, "foo bar");
assertEquals("123 foo bar\r\n", response.toString());
}
public void testNullToString() {
- FtpResponseImpl response = new FtpResponseImpl(123, null);
+ DefaultFtpReply response = new DefaultFtpReply(123, null);
assertEquals("123 \r\n", response.toString());
}
public void testMultipleLinesToString() {
- FtpResponseImpl response = new FtpResponseImpl(123, "foo\nbar\nbaz");
+ DefaultFtpReply response = new DefaultFtpReply(123, "foo\nbar\nbaz");
assertEquals("123-foo\r\nbar\r\n123 baz\r\n", response.toString());
}
public void testMultipleLinesToString1() {
- FtpResponseImpl response = new FtpResponseImpl(123, "\nfoo\nbar\nbaz");
+ DefaultFtpReply response = new DefaultFtpReply(123, "\nfoo\nbar\nbaz");
assertEquals("123-\r\nfoo\r\nbar\r\n123 baz\r\n", response.toString());
}
Modified: incubator/ftpserver/trunk/core/src/test/org/apache/ftpserver/ftplet/FtpLetContainerTestTemplate.java
URL: http://svn.apache.org/viewvc/incubator/ftpserver/trunk/core/src/test/org/apache/ftpserver/ftplet/FtpLetContainerTestTemplate.java?view=diff&rev=498474&r1=498473&r2=498474
==============================================================================
--- incubator/ftpserver/trunk/core/src/test/org/apache/ftpserver/ftplet/FtpLetContainerTestTemplate.java (original)
+++ incubator/ftpserver/trunk/core/src/test/org/apache/ftpserver/ftplet/FtpLetContainerTestTemplate.java Sun Jan 21 14:47:40 2007
@@ -94,13 +94,13 @@
public void testOnConnect() throws FtpException, IOException {
MockFtplet ftplet1 = new MockFtplet() {
- public FtpletEnum onConnect(FtpSession session, FtpResponseOutput response) throws FtpException, IOException {
+ public FtpletEnum onConnect(FtpSession session, FtpReplyOutput response) throws FtpException, IOException {
calls.add("ftplet1");
return super.onConnect(session, response);
}
};
MockFtplet ftplet2 = new MockFtplet() {
- public FtpletEnum onConnect(FtpSession session, FtpResponseOutput response) throws FtpException, IOException {
+ public FtpletEnum onConnect(FtpSession session, FtpReplyOutput response) throws FtpException, IOException {
calls.add("ftplet2");
return super.onConnect(session, response);
}
@@ -118,13 +118,13 @@
public void testOnDisconnect() throws FtpException, IOException {
MockFtplet ftplet1 = new MockFtplet() {
- public FtpletEnum onDisconnect(FtpSession session, FtpResponseOutput response) throws FtpException, IOException {
+ public FtpletEnum onDisconnect(FtpSession session, FtpReplyOutput response) throws FtpException, IOException {
calls.add("ftplet1");
return super.onDisconnect(session, response);
}
};
MockFtplet ftplet2 = new MockFtplet() {
- public FtpletEnum onDisconnect(FtpSession session, FtpResponseOutput response) throws FtpException, IOException {
+ public FtpletEnum onDisconnect(FtpSession session, FtpReplyOutput response) throws FtpException, IOException {
calls.add("ftplet2");
return super.onDisconnect(session, response);
}
@@ -142,13 +142,13 @@
public void testOnLogin() throws FtpException, IOException {
MockFtplet ftplet1 = new MockFtplet() {
- public FtpletEnum onLogin(FtpSession session, FtpRequest request, FtpResponseOutput response) throws FtpException, IOException {
+ public FtpletEnum onLogin(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {
calls.add("ftplet1");
return super.onLogin(session, request, response);
}
};
MockFtplet ftplet2 = new MockFtplet() {
- public FtpletEnum onLogin(FtpSession session, FtpRequest request, FtpResponseOutput response) throws FtpException, IOException {
+ public FtpletEnum onLogin(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {
calls.add("ftplet2");
return super.onLogin(session, request, response);
}
@@ -166,13 +166,13 @@
public void testOnDeleteStart() throws FtpException, IOException {
MockFtplet ftplet1 = new MockFtplet() {
- public FtpletEnum onDeleteStart(FtpSession session, FtpRequest request, FtpResponseOutput response) throws FtpException, IOException {
+ public FtpletEnum onDeleteStart(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {
calls.add("ftplet1");
return super.onDeleteStart(session, request, response);
}
};
MockFtplet ftplet2 = new MockFtplet() {
- public FtpletEnum onDeleteStart(FtpSession session, FtpRequest request, FtpResponseOutput response) throws FtpException, IOException {
+ public FtpletEnum onDeleteStart(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {
calls.add("ftplet2");
return super.onDeleteStart(session, request, response);
}
@@ -190,13 +190,13 @@
public void testOnDeleteEnd() throws FtpException, IOException {
MockFtplet ftplet1 = new MockFtplet() {
- public FtpletEnum onDeleteEnd(FtpSession session, FtpRequest request, FtpResponseOutput response) throws FtpException, IOException {
+ public FtpletEnum onDeleteEnd(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {
calls.add("ftplet1");
return super.onDeleteEnd(session, request, response);
}
};
MockFtplet ftplet2 = new MockFtplet() {
- public FtpletEnum onDeleteEnd(FtpSession session, FtpRequest request, FtpResponseOutput response) throws FtpException, IOException {
+ public FtpletEnum onDeleteEnd(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {
calls.add("ftplet2");
return super.onDeleteEnd(session, request, response);
}
@@ -214,13 +214,13 @@
public void testOnUploadStart() throws FtpException, IOException {
MockFtplet ftplet1 = new MockFtplet() {
- public FtpletEnum onUploadStart(FtpSession session, FtpRequest request, FtpResponseOutput response) throws FtpException, IOException {
+ public FtpletEnum onUploadStart(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {
calls.add("ftplet1");
return super.onUploadStart(session, request, response);
}
};
MockFtplet ftplet2 = new MockFtplet() {
- public FtpletEnum onUploadStart(FtpSession session, FtpRequest request, FtpResponseOutput response) throws FtpException, IOException {
+ public FtpletEnum onUploadStart(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {
calls.add("ftplet2");
return super.onUploadStart(session, request, response);
}
@@ -238,13 +238,13 @@
public void testOnUploadEnd() throws FtpException, IOException {
MockFtplet ftplet1 = new MockFtplet() {
- public FtpletEnum onUploadEnd(FtpSession session, FtpRequest request, FtpResponseOutput response) throws FtpException, IOException {
+ public FtpletEnum onUploadEnd(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {
calls.add("ftplet1");
return super.onUploadEnd(session, request, response);
}
};
MockFtplet ftplet2 = new MockFtplet() {
- public FtpletEnum onUploadEnd(FtpSession session, FtpRequest request, FtpResponseOutput response) throws FtpException, IOException {
+ public FtpletEnum onUploadEnd(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {
calls.add("ftplet2");
return super.onUploadEnd(session, request, response);
}
@@ -262,13 +262,13 @@
public void testOnDownloadStart() throws FtpException, IOException {
MockFtplet ftplet1 = new MockFtplet() {
- public FtpletEnum onDownloadStart(FtpSession session, FtpRequest request, FtpResponseOutput response) throws FtpException, IOException {
+ public FtpletEnum onDownloadStart(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {
calls.add("ftplet1");
return super.onDownloadStart(session, request, response);
}
};
MockFtplet ftplet2 = new MockFtplet() {
- public FtpletEnum onDownloadStart(FtpSession session, FtpRequest request, FtpResponseOutput response) throws FtpException, IOException {
+ public FtpletEnum onDownloadStart(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {
calls.add("ftplet2");
return super.onDownloadStart(session, request, response);
}
@@ -286,13 +286,13 @@
public void testOnDownloadEnd() throws FtpException, IOException {
MockFtplet ftplet1 = new MockFtplet() {
- public FtpletEnum onDownloadEnd(FtpSession session, FtpRequest request, FtpResponseOutput response) throws FtpException, IOException {
+ public FtpletEnum onDownloadEnd(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {
calls.add("ftplet1");
return super.onDownloadEnd(session, request, response);
}
};
MockFtplet ftplet2 = new MockFtplet() {
- public FtpletEnum onDownloadEnd(FtpSession session, FtpRequest request, FtpResponseOutput response) throws FtpException, IOException {
+ public FtpletEnum onDownloadEnd(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {
calls.add("ftplet2");
return super.onDownloadEnd(session, request, response);
}
@@ -310,13 +310,13 @@
public void testOnRmdirStart() throws FtpException, IOException {
MockFtplet ftplet1 = new MockFtplet() {
- public FtpletEnum onRmdirStart(FtpSession session, FtpRequest request, FtpResponseOutput response) throws FtpException, IOException {
+ public FtpletEnum onRmdirStart(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {
calls.add("ftplet1");
return super.onRmdirStart(session, request, response);
}
};
MockFtplet ftplet2 = new MockFtplet() {
- public FtpletEnum onRmdirStart(FtpSession session, FtpRequest request, FtpResponseOutput response) throws FtpException, IOException {
+ public FtpletEnum onRmdirStart(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {
calls.add("ftplet2");
return super.onRmdirStart(session, request, response);
}
@@ -334,13 +334,13 @@
public void testOnRmdirEnd() throws FtpException, IOException {
MockFtplet ftplet1 = new MockFtplet() {
- public FtpletEnum onRmdirEnd(FtpSession session, FtpRequest request, FtpResponseOutput response) throws FtpException, IOException {
+ public FtpletEnum onRmdirEnd(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {
calls.add("ftplet1");
return super.onRmdirEnd(session, request, response);
}
};
MockFtplet ftplet2 = new MockFtplet() {
- public FtpletEnum onRmdirEnd(FtpSession session, FtpRequest request, FtpResponseOutput response) throws FtpException, IOException {
+ public FtpletEnum onRmdirEnd(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {
calls.add("ftplet2");
return super.onRmdirEnd(session, request, response);
}
@@ -358,13 +358,13 @@
public void testOnMkdirStart() throws FtpException, IOException {
MockFtplet ftplet1 = new MockFtplet() {
- public FtpletEnum onMkdirStart(FtpSession session, FtpRequest request, FtpResponseOutput response) throws FtpException, IOException {
+ public FtpletEnum onMkdirStart(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {
calls.add("ftplet1");
return super.onMkdirStart(session, request, response);
}
};
MockFtplet ftplet2 = new MockFtplet() {
- public FtpletEnum onMkdirStart(FtpSession session, FtpRequest request, FtpResponseOutput response) throws FtpException, IOException {
+ public FtpletEnum onMkdirStart(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {
calls.add("ftplet2");
return super.onMkdirStart(session, request, response);
}
@@ -382,13 +382,13 @@
public void testOnMkdirEnd() throws FtpException, IOException {
MockFtplet ftplet1 = new MockFtplet() {
- public FtpletEnum onMkdirEnd(FtpSession session, FtpRequest request, FtpResponseOutput response) throws FtpException, IOException {
+ public FtpletEnum onMkdirEnd(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {
calls.add("ftplet1");
return super.onMkdirEnd(session, request, response);
}
};
MockFtplet ftplet2 = new MockFtplet() {
- public FtpletEnum onMkdirEnd(FtpSession session, FtpRequest request, FtpResponseOutput response) throws FtpException, IOException {
+ public FtpletEnum onMkdirEnd(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {
calls.add("ftplet2");
return super.onMkdirEnd(session, request, response);
}
@@ -406,13 +406,13 @@
public void testOnAppendStart() throws FtpException, IOException {
MockFtplet ftplet1 = new MockFtplet() {
- public FtpletEnum onAppendStart(FtpSession session, FtpRequest request, FtpResponseOutput response) throws FtpException, IOException {
+ public FtpletEnum onAppendStart(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {
calls.add("ftplet1");
return super.onAppendStart(session, request, response);
}
};
MockFtplet ftplet2 = new MockFtplet() {
- public FtpletEnum onAppendStart(FtpSession session, FtpRequest request, FtpResponseOutput response) throws FtpException, IOException {
+ public FtpletEnum onAppendStart(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {
calls.add("ftplet2");
return super.onAppendStart(session, request, response);
}
@@ -430,13 +430,13 @@
public void testOnAppendEnd() throws FtpException, IOException {
MockFtplet ftplet1 = new MockFtplet() {
- public FtpletEnum onAppendEnd(FtpSession session, FtpRequest request, FtpResponseOutput response) throws FtpException, IOException {
+ public FtpletEnum onAppendEnd(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {
calls.add("ftplet1");
return super.onAppendEnd(session, request, response);
}
};
MockFtplet ftplet2 = new MockFtplet() {
- public FtpletEnum onAppendEnd(FtpSession session, FtpRequest request, FtpResponseOutput response) throws FtpException, IOException {
+ public FtpletEnum onAppendEnd(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {
calls.add("ftplet2");
return super.onAppendEnd(session, request, response);
}
@@ -454,13 +454,13 @@
public void testOnUploadUniqueStart() throws FtpException, IOException {
MockFtplet ftplet1 = new MockFtplet() {
- public FtpletEnum onUploadUniqueStart(FtpSession session, FtpRequest request, FtpResponseOutput response) throws FtpException, IOException {
+ public FtpletEnum onUploadUniqueStart(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {
calls.add("ftplet1");
return super.onUploadUniqueStart(session, request, response);
}
};
MockFtplet ftplet2 = new MockFtplet() {
- public FtpletEnum onUploadUniqueStart(FtpSession session, FtpRequest request, FtpResponseOutput response) throws FtpException, IOException {
+ public FtpletEnum onUploadUniqueStart(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {
calls.add("ftplet2");
return super.onUploadUniqueStart(session, request, response);
}
@@ -478,13 +478,13 @@
public void testOnUploadUniqueEnd() throws FtpException, IOException {
MockFtplet ftplet1 = new MockFtplet() {
- public FtpletEnum onUploadUniqueEnd(FtpSession session, FtpRequest request, FtpResponseOutput response) throws FtpException, IOException {
+ public FtpletEnum onUploadUniqueEnd(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {
calls.add("ftplet1");
return super.onUploadUniqueEnd(session, request, response);
}
};
MockFtplet ftplet2 = new MockFtplet() {
- public FtpletEnum onUploadUniqueEnd(FtpSession session, FtpRequest request, FtpResponseOutput response) throws FtpException, IOException {
+ public FtpletEnum onUploadUniqueEnd(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {
calls.add("ftplet2");
return super.onUploadUniqueEnd(session, request, response);
}
@@ -502,13 +502,13 @@
public void testOnRenameStart() throws FtpException, IOException {
MockFtplet ftplet1 = new MockFtplet() {
- public FtpletEnum onRenameStart(FtpSession session, FtpRequest request, FtpResponseOutput response) throws FtpException, IOException {
+ public FtpletEnum onRenameStart(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {
calls.add("ftplet1");
return super.onRenameStart(session, request, response);
}
};
MockFtplet ftplet2 = new MockFtplet() {
- public FtpletEnum onRenameStart(FtpSession session, FtpRequest request, FtpResponseOutput response) throws FtpException, IOException {
+ public FtpletEnum onRenameStart(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {
calls.add("ftplet2");
return super.onRenameStart(session, request, response);
}
@@ -526,13 +526,13 @@
public void testOnRenameEnd() throws FtpException, IOException {
MockFtplet ftplet1 = new MockFtplet() {
- public FtpletEnum onRenameEnd(FtpSession session, FtpRequest request, FtpResponseOutput response) throws FtpException, IOException {
+ public FtpletEnum onRenameEnd(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {
calls.add("ftplet1");
return super.onRenameEnd(session, request, response);
}
};
MockFtplet ftplet2 = new MockFtplet() {
- public FtpletEnum onRenameEnd(FtpSession session, FtpRequest request, FtpResponseOutput response) throws FtpException, IOException {
+ public FtpletEnum onRenameEnd(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {
calls.add("ftplet2");
return super.onRenameEnd(session, request, response);
}
@@ -550,13 +550,13 @@
public void testOnSite() throws FtpException, IOException {
MockFtplet ftplet1 = new MockFtplet() {
- public FtpletEnum onSite(FtpSession session, FtpRequest request, FtpResponseOutput response) throws FtpException, IOException {
+ public FtpletEnum onSite(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {
calls.add("ftplet1");
return super.onSite(session, request, response);
}
};
MockFtplet ftplet2 = new MockFtplet() {
- public FtpletEnum onSite(FtpSession session, FtpRequest request, FtpResponseOutput response) throws FtpException, IOException {
+ public FtpletEnum onSite(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {
calls.add("ftplet2");
return super.onSite(session, request, response);
}
Modified: incubator/ftpserver/trunk/core/src/test/org/apache/ftpserver/ftplet/FtpLetReturnDefaultTest.java
URL: http://svn.apache.org/viewvc/incubator/ftpserver/trunk/core/src/test/org/apache/ftpserver/ftplet/FtpLetReturnDefaultTest.java?view=diff&rev=498474&r1=498473&r2=498474
==============================================================================
--- incubator/ftpserver/trunk/core/src/test/org/apache/ftpserver/ftplet/FtpLetReturnDefaultTest.java (original)
+++ incubator/ftpserver/trunk/core/src/test/org/apache/ftpserver/ftplet/FtpLetReturnDefaultTest.java Sun Jan 21 14:47:40 2007
@@ -69,7 +69,7 @@
public void testLogin() throws Exception {
MockFtplet.callback = new MockFtpletCallback() {
- public FtpletEnum onLogin(FtpSession session, FtpRequest request, FtpResponseOutput response) throws FtpException, IOException {
+ public FtpletEnum onLogin(FtpSession session, FtpRequest request, FtpReplyOutput response) throws FtpException, IOException {
assertNotNull(session.getUser());
return super.onLogin(session, request, response);