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/09/09 23:36:46 UTC
svn commit: r693626 [2/2] - in /mina/ftpserver/trunk/core/src:
main/java/org/apache/ftpserver/ main/java/org/apache/ftpserver/command/
main/java/org/apache/ftpserver/command/impl/
main/java/org/apache/ftpserver/impl/ main/java/org/apache/ftpserver/list...
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/RETR.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/RETR.java?rev=693626&r1=693625&r2=693626&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/RETR.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/RETR.java Tue Sep 9 14:36:44 2008
@@ -35,10 +35,10 @@
import org.apache.ftpserver.ftplet.FtpException;
import org.apache.ftpserver.ftplet.FtpReply;
import org.apache.ftpserver.ftplet.FtpRequest;
+import org.apache.ftpserver.impl.LocalizedFtpReply;
import org.apache.ftpserver.interfaces.FtpIoSession;
import org.apache.ftpserver.interfaces.FtpServerContext;
import org.apache.ftpserver.interfaces.ServerFtpStatistics;
-import org.apache.ftpserver.util.FtpReplyUtil;
import org.apache.ftpserver.util.IoUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -74,7 +74,7 @@
String fileName = request.getArgument();
if (fileName == null) {
session
- .write(FtpReplyUtil
+ .write(LocalizedFtpReply
.translate(
session,
request,
@@ -92,7 +92,7 @@
LOG.debug("Exception getting file object", ex);
}
if (file == null) {
- session.write(FtpReplyUtil.translate(session, request, context,
+ session.write(LocalizedFtpReply.translate(session, request, context,
FtpReply.REPLY_550_REQUESTED_ACTION_NOT_TAKEN,
"RETR.missing", fileName));
return;
@@ -101,7 +101,7 @@
// check file existance
if (!file.doesExist()) {
- session.write(FtpReplyUtil.translate(session, request, context,
+ session.write(LocalizedFtpReply.translate(session, request, context,
FtpReply.REPLY_550_REQUESTED_ACTION_NOT_TAKEN,
"RETR.missing", fileName));
return;
@@ -109,7 +109,7 @@
// check valid file
if (!file.isFile()) {
- session.write(FtpReplyUtil.translate(session, request, context,
+ session.write(LocalizedFtpReply.translate(session, request, context,
FtpReply.REPLY_550_REQUESTED_ACTION_NOT_TAKEN,
"RETR.invalid", fileName));
return;
@@ -117,7 +117,7 @@
// check permission
if (!file.hasReadPermission()) {
- session.write(FtpReplyUtil.translate(session, request, context,
+ session.write(LocalizedFtpReply.translate(session, request, context,
FtpReply.REPLY_550_REQUESTED_ACTION_NOT_TAKEN,
"RETR.permission", fileName));
return;
@@ -138,7 +138,7 @@
}
// get data connection
- session.write(FtpReplyUtil.translate(session, request, context,
+ session.write(LocalizedFtpReply.translate(session, request, context,
FtpReply.REPLY_150_FILE_STATUS_OKAY, "RETR", null));
// send file data to client
@@ -150,7 +150,7 @@
dataConnection = session.getDataConnection().openConnection();
} catch (Exception e) {
LOG.debug("Exception getting the output data stream", e);
- session.write(FtpReplyUtil.translate(session, request, context,
+ session.write(LocalizedFtpReply.translate(session, request, context,
FtpReply.REPLY_425_CANT_OPEN_DATA_CONNECTION, "RETR",
null));
return;
@@ -177,14 +177,14 @@
} catch (SocketException ex) {
LOG.debug("Socket exception during data transfer", ex);
failure = true;
- session.write(FtpReplyUtil.translate(session, request, context,
+ session.write(LocalizedFtpReply.translate(session, request, context,
FtpReply.REPLY_426_CONNECTION_CLOSED_TRANSFER_ABORTED,
"RETR", fileName));
} catch (IOException ex) {
LOG.debug("IOException during data transfer", ex);
failure = true;
session
- .write(FtpReplyUtil
+ .write(LocalizedFtpReply
.translate(
session,
request,
@@ -197,7 +197,7 @@
// if data transfer ok - send transfer complete message
if (!failure) {
- session.write(FtpReplyUtil.translate(session, request, context,
+ session.write(LocalizedFtpReply.translate(session, request, context,
FtpReply.REPLY_226_CLOSING_DATA_CONNECTION, "RETR",
fileName));
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/RMD.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/RMD.java?rev=693626&r1=693625&r2=693626&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/RMD.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/RMD.java Tue Sep 9 14:36:44 2008
@@ -26,10 +26,10 @@
import org.apache.ftpserver.ftplet.FtpException;
import org.apache.ftpserver.ftplet.FtpReply;
import org.apache.ftpserver.ftplet.FtpRequest;
+import org.apache.ftpserver.impl.LocalizedFtpReply;
import org.apache.ftpserver.interfaces.FtpIoSession;
import org.apache.ftpserver.interfaces.FtpServerContext;
import org.apache.ftpserver.interfaces.ServerFtpStatistics;
-import org.apache.ftpserver.util.FtpReplyUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -60,7 +60,7 @@
// argument check
String fileName = request.getArgument();
if (fileName == null) {
- session.write(FtpReplyUtil.translate(session, request, context,
+ session.write(LocalizedFtpReply.translate(session, request, context,
FtpReply.REPLY_501_SYNTAX_ERROR_IN_PARAMETERS_OR_ARGUMENTS,
"RMD", null));
return;
@@ -74,7 +74,7 @@
LOG.debug("Exception getting file object", ex);
}
if (file == null) {
- session.write(FtpReplyUtil.translate(session, request, context,
+ session.write(LocalizedFtpReply.translate(session, request, context,
FtpReply.REPLY_550_REQUESTED_ACTION_NOT_TAKEN,
"RMD.permission", fileName));
return;
@@ -83,7 +83,7 @@
// check permission
fileName = file.getFullName();
if (!file.hasDeletePermission()) {
- session.write(FtpReplyUtil.translate(session, request, context,
+ session.write(LocalizedFtpReply.translate(session, request, context,
FtpReply.REPLY_550_REQUESTED_ACTION_NOT_TAKEN,
"RMD.permission", fileName));
return;
@@ -91,7 +91,7 @@
// check file
if (!file.isDirectory()) {
- session.write(FtpReplyUtil.translate(session, request, context,
+ session.write(LocalizedFtpReply.translate(session, request, context,
FtpReply.REPLY_550_REQUESTED_ACTION_NOT_TAKEN,
"RMD.invalid", fileName));
return;
@@ -99,7 +99,7 @@
// now delete directory
if (file.delete()) {
- session.write(FtpReplyUtil.translate(session, request, context,
+ session.write(LocalizedFtpReply.translate(session, request, context,
FtpReply.REPLY_250_REQUESTED_FILE_ACTION_OKAY, "RMD",
fileName));
@@ -113,7 +113,7 @@
ftpStat.setRmdir(session, file);
} else {
- session.write(FtpReplyUtil.translate(session, request, context,
+ session.write(LocalizedFtpReply.translate(session, request, context,
FtpReply.REPLY_450_REQUESTED_FILE_ACTION_NOT_TAKEN, "RMD",
fileName));
}
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/RNFR.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/RNFR.java?rev=693626&r1=693625&r2=693626&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/RNFR.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/RNFR.java Tue Sep 9 14:36:44 2008
@@ -26,9 +26,9 @@
import org.apache.ftpserver.ftplet.FtpException;
import org.apache.ftpserver.ftplet.FtpReply;
import org.apache.ftpserver.ftplet.FtpRequest;
+import org.apache.ftpserver.impl.LocalizedFtpReply;
import org.apache.ftpserver.interfaces.FtpIoSession;
import org.apache.ftpserver.interfaces.FtpServerContext;
-import org.apache.ftpserver.util.FtpReplyUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -59,7 +59,7 @@
// argument check
String fileName = request.getArgument();
if (fileName == null) {
- session.write(FtpReplyUtil.translate(session, request, context,
+ session.write(LocalizedFtpReply.translate(session, request, context,
FtpReply.REPLY_501_SYNTAX_ERROR_IN_PARAMETERS_OR_ARGUMENTS,
"RNFR", null));
return;
@@ -75,14 +75,14 @@
// check file
if (renFr == null) {
- session.write(FtpReplyUtil.translate(session, request, context,
+ session.write(LocalizedFtpReply.translate(session, request, context,
FtpReply.REPLY_550_REQUESTED_ACTION_NOT_TAKEN, "RNFR",
fileName));
} else {
session.setRenameFrom(renFr);
fileName = renFr.getFullName();
session
- .write(FtpReplyUtil
+ .write(LocalizedFtpReply
.translate(
session,
request,
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/RNTO.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/RNTO.java?rev=693626&r1=693625&r2=693626&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/RNTO.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/RNTO.java Tue Sep 9 14:36:44 2008
@@ -26,9 +26,9 @@
import org.apache.ftpserver.ftplet.FtpException;
import org.apache.ftpserver.ftplet.FtpReply;
import org.apache.ftpserver.ftplet.FtpRequest;
+import org.apache.ftpserver.impl.LocalizedFtpReply;
import org.apache.ftpserver.interfaces.FtpIoSession;
import org.apache.ftpserver.interfaces.FtpServerContext;
-import org.apache.ftpserver.util.FtpReplyUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -58,7 +58,7 @@
String toFileStr = request.getArgument();
if (toFileStr == null) {
session
- .write(FtpReplyUtil
+ .write(LocalizedFtpReply
.translate(
session,
request,
@@ -71,7 +71,7 @@
// get the "rename from" file object
FileObject frFile = session.getRenameFrom();
if (frFile == null) {
- session.write(FtpReplyUtil.translate(session, request, context,
+ session.write(LocalizedFtpReply.translate(session, request, context,
FtpReply.REPLY_503_BAD_SEQUENCE_OF_COMMANDS, "RNTO",
null));
return;
@@ -86,7 +86,7 @@
}
if (toFile == null) {
session
- .write(FtpReplyUtil
+ .write(LocalizedFtpReply
.translate(
session,
request,
@@ -100,7 +100,7 @@
// check permission
if (!toFile.hasWritePermission()) {
session
- .write(FtpReplyUtil
+ .write(LocalizedFtpReply
.translate(
session,
request,
@@ -113,7 +113,7 @@
// check file existance
if (!frFile.doesExist()) {
session
- .write(FtpReplyUtil
+ .write(LocalizedFtpReply
.translate(
session,
request,
@@ -125,7 +125,7 @@
// now rename
if (frFile.move(toFile)) {
- session.write(FtpReplyUtil.translate(session, request, context,
+ session.write(LocalizedFtpReply.translate(session, request, context,
FtpReply.REPLY_250_REQUESTED_FILE_ACTION_OKAY, "RNTO",
toFileStr));
@@ -134,7 +134,7 @@
} else {
session
- .write(FtpReplyUtil
+ .write(LocalizedFtpReply
.translate(
session,
request,
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/SITE.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/SITE.java?rev=693626&r1=693625&r2=693626&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/SITE.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/SITE.java Tue Sep 9 14:36:44 2008
@@ -27,9 +27,9 @@
import org.apache.ftpserver.ftplet.FtpException;
import org.apache.ftpserver.ftplet.FtpReply;
import org.apache.ftpserver.ftplet.FtpRequest;
+import org.apache.ftpserver.impl.LocalizedFtpReply;
import org.apache.ftpserver.interfaces.FtpIoSession;
import org.apache.ftpserver.interfaces.FtpServerContext;
-import org.apache.ftpserver.util.FtpReplyUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -66,7 +66,7 @@
// no params
if (argument == null) {
session.resetState();
- session.write(FtpReplyUtil.translate(session, request, context,
+ session.write(LocalizedFtpReply.translate(session, request, context,
FtpReply.REPLY_200_COMMAND_OKAY, "SITE", null));
return;
}
@@ -79,14 +79,14 @@
command.execute(session, context, request);
} else {
session.resetState();
- session.write(FtpReplyUtil.translate(session, request, context,
+ session.write(LocalizedFtpReply.translate(session, request, context,
FtpReply.REPLY_502_COMMAND_NOT_IMPLEMENTED, "SITE",
argument));
}
} catch (Exception ex) {
LOG.warn("SITE.execute()", ex);
session.resetState();
- session.write(FtpReplyUtil.translate(session, request, context,
+ session.write(LocalizedFtpReply.translate(session, request, context,
FtpReply.REPLY_500_SYNTAX_ERROR_COMMAND_UNRECOGNIZED,
"SITE", null));
}
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/SITE_DESCUSER.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/SITE_DESCUSER.java?rev=693626&r1=693625&r2=693626&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/SITE_DESCUSER.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/SITE_DESCUSER.java Tue Sep 9 14:36:44 2008
@@ -28,11 +28,11 @@
import org.apache.ftpserver.ftplet.FtpRequest;
import org.apache.ftpserver.ftplet.User;
import org.apache.ftpserver.ftplet.UserManager;
+import org.apache.ftpserver.impl.LocalizedFtpReply;
import org.apache.ftpserver.interfaces.FtpIoSession;
import org.apache.ftpserver.interfaces.FtpServerContext;
import org.apache.ftpserver.usermanager.TransferRateRequest;
import org.apache.ftpserver.usermanager.WriteRequest;
-import org.apache.ftpserver.util.FtpReplyUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -60,7 +60,7 @@
UserManager userManager = context.getUserManager();
boolean isAdmin = userManager.isAdmin(session.getUser().getName());
if (!isAdmin) {
- session.write(FtpReplyUtil.translate(session, request, context,
+ session.write(LocalizedFtpReply.translate(session, request, context,
FtpReply.REPLY_530_NOT_LOGGED_IN, "SITE", null));
return;
}
@@ -69,7 +69,7 @@
String argument = request.getArgument();
int spIndex = argument.indexOf(' ');
if (spIndex == -1) {
- session.write(FtpReplyUtil.translate(session, request, context,
+ session.write(LocalizedFtpReply.translate(session, request, context,
FtpReply.REPLY_503_BAD_SEQUENCE_OF_COMMANDS,
"SITE.DESCUSER", null));
return;
@@ -88,7 +88,7 @@
user = null;
}
if (user == null) {
- session.write(FtpReplyUtil.translate(session, request, context,
+ session.write(LocalizedFtpReply.translate(session, request, context,
FtpReply.REPLY_501_SYNTAX_ERROR_IN_PARAMETERS_OR_ARGUMENTS,
"SITE.DESCUSER", userName));
return;
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/SITE_HELP.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/SITE_HELP.java?rev=693626&r1=693625&r2=693626&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/SITE_HELP.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/SITE_HELP.java Tue Sep 9 14:36:44 2008
@@ -25,9 +25,9 @@
import org.apache.ftpserver.ftplet.FtpException;
import org.apache.ftpserver.ftplet.FtpReply;
import org.apache.ftpserver.ftplet.FtpRequest;
+import org.apache.ftpserver.impl.LocalizedFtpReply;
import org.apache.ftpserver.interfaces.FtpIoSession;
import org.apache.ftpserver.interfaces.FtpServerContext;
-import org.apache.ftpserver.util.FtpReplyUtil;
/**
* Show SITE help message.
@@ -48,7 +48,7 @@
session.resetState();
// print help message
- session.write(FtpReplyUtil.translate(session, request, context,
+ session.write(LocalizedFtpReply.translate(session, request, context,
FtpReply.REPLY_200_COMMAND_OKAY, "SITE.HELP", null));
}
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/SITE_STAT.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/SITE_STAT.java?rev=693626&r1=693625&r2=693626&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/SITE_STAT.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/SITE_STAT.java Tue Sep 9 14:36:44 2008
@@ -28,10 +28,10 @@
import org.apache.ftpserver.ftplet.FtpRequest;
import org.apache.ftpserver.ftplet.FtpStatistics;
import org.apache.ftpserver.ftplet.UserManager;
+import org.apache.ftpserver.impl.LocalizedFtpReply;
import org.apache.ftpserver.interfaces.FtpIoSession;
import org.apache.ftpserver.interfaces.FtpServerContext;
import org.apache.ftpserver.util.DateUtils;
-import org.apache.ftpserver.util.FtpReplyUtil;
/**
* Show all statistics information.
@@ -55,7 +55,7 @@
UserManager userManager = context.getUserManager();
boolean isAdmin = userManager.isAdmin(session.getUser().getName());
if (!isAdmin) {
- session.write(FtpReplyUtil.translate(session, request, context,
+ session.write(LocalizedFtpReply.translate(session, request, context,
FtpReply.REPLY_530_NOT_LOGGED_IN, "SITE", null));
return;
}
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/SITE_WHO.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/SITE_WHO.java?rev=693626&r1=693625&r2=693626&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/SITE_WHO.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/SITE_WHO.java Tue Sep 9 14:36:44 2008
@@ -31,10 +31,10 @@
import org.apache.ftpserver.ftplet.FtpRequest;
import org.apache.ftpserver.ftplet.User;
import org.apache.ftpserver.ftplet.UserManager;
+import org.apache.ftpserver.impl.LocalizedFtpReply;
import org.apache.ftpserver.interfaces.FtpIoSession;
import org.apache.ftpserver.interfaces.FtpServerContext;
import org.apache.ftpserver.util.DateUtils;
-import org.apache.ftpserver.util.FtpReplyUtil;
import org.apache.ftpserver.util.StringUtils;
import org.apache.mina.core.session.IoSession;
@@ -60,7 +60,7 @@
UserManager userManager = context.getUserManager();
boolean isAdmin = userManager.isAdmin(session.getUser().getName());
if (!isAdmin) {
- session.write(FtpReplyUtil.translate(session, request, context,
+ session.write(LocalizedFtpReply.translate(session, request, context,
FtpReply.REPLY_530_NOT_LOGGED_IN, "SITE", null));
return;
}
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/SIZE.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/SIZE.java?rev=693626&r1=693625&r2=693626&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/SIZE.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/SIZE.java Tue Sep 9 14:36:44 2008
@@ -26,9 +26,9 @@
import org.apache.ftpserver.ftplet.FtpException;
import org.apache.ftpserver.ftplet.FtpReply;
import org.apache.ftpserver.ftplet.FtpRequest;
+import org.apache.ftpserver.impl.LocalizedFtpReply;
import org.apache.ftpserver.interfaces.FtpIoSession;
import org.apache.ftpserver.interfaces.FtpServerContext;
-import org.apache.ftpserver.util.FtpReplyUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -57,7 +57,7 @@
// argument check
String fileName = request.getArgument();
if (fileName == null) {
- session.write(FtpReplyUtil.translate(session, request, context,
+ session.write(LocalizedFtpReply.translate(session, request, context,
FtpReply.REPLY_501_SYNTAX_ERROR_IN_PARAMETERS_OR_ARGUMENTS,
"SIZE", null));
return;
@@ -71,7 +71,7 @@
LOG.debug("Exception getting file object", ex);
}
if (file == null) {
- session.write(FtpReplyUtil.translate(session, request, context,
+ session.write(LocalizedFtpReply.translate(session, request, context,
FtpReply.REPLY_550_REQUESTED_ACTION_NOT_TAKEN,
"SIZE.missing", fileName));
return;
@@ -80,16 +80,16 @@
// print file size
fileName = file.getFullName();
if (!file.doesExist()) {
- session.write(FtpReplyUtil.translate(session, request, context,
+ session.write(LocalizedFtpReply.translate(session, request, context,
FtpReply.REPLY_550_REQUESTED_ACTION_NOT_TAKEN,
"SIZE.missing", fileName));
} else if (!file.isFile()) {
- session.write(FtpReplyUtil.translate(session, request, context,
+ session.write(LocalizedFtpReply.translate(session, request, context,
FtpReply.REPLY_550_REQUESTED_ACTION_NOT_TAKEN,
"SIZE.invalid", fileName));
} else {
String fileLen = String.valueOf(file.getSize());
- session.write(FtpReplyUtil.translate(session, request, context,
+ session.write(LocalizedFtpReply.translate(session, request, context,
FtpReply.REPLY_213_FILE_STATUS, "SIZE", fileLen));
}
}
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/STAT.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/STAT.java?rev=693626&r1=693625&r2=693626&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/STAT.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/STAT.java Tue Sep 9 14:36:44 2008
@@ -24,9 +24,9 @@
import org.apache.ftpserver.command.AbstractCommand;
import org.apache.ftpserver.ftplet.FtpReply;
import org.apache.ftpserver.ftplet.FtpRequest;
+import org.apache.ftpserver.impl.LocalizedFtpReply;
import org.apache.ftpserver.interfaces.FtpIoSession;
import org.apache.ftpserver.interfaces.FtpServerContext;
-import org.apache.ftpserver.util.FtpReplyUtil;
/**
* <code>STAT [<SP> <pathname>] <CRLF></code><br>
@@ -50,7 +50,7 @@
session.resetState();
// write the status info
- session.write(FtpReplyUtil.translate(session, request, context,
+ session.write(LocalizedFtpReply.translate(session, request, context,
FtpReply.REPLY_211_SYSTEM_STATUS_REPLY, "STAT", null));
}
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/STOR.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/STOR.java?rev=693626&r1=693625&r2=693626&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/STOR.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/STOR.java Tue Sep 9 14:36:44 2008
@@ -33,10 +33,10 @@
import org.apache.ftpserver.ftplet.FtpException;
import org.apache.ftpserver.ftplet.FtpReply;
import org.apache.ftpserver.ftplet.FtpRequest;
+import org.apache.ftpserver.impl.LocalizedFtpReply;
import org.apache.ftpserver.interfaces.FtpIoSession;
import org.apache.ftpserver.interfaces.FtpServerContext;
import org.apache.ftpserver.interfaces.ServerFtpStatistics;
-import org.apache.ftpserver.util.FtpReplyUtil;
import org.apache.ftpserver.util.IoUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -73,7 +73,7 @@
String fileName = request.getArgument();
if (fileName == null) {
session
- .write(FtpReplyUtil
+ .write(LocalizedFtpReply
.translate(
session,
request,
@@ -105,7 +105,7 @@
LOG.debug("Exception getting file object", ex);
}
if (file == null) {
- session.write(FtpReplyUtil.translate(session, request, context,
+ session.write(LocalizedFtpReply.translate(session, request, context,
FtpReply.REPLY_550_REQUESTED_ACTION_NOT_TAKEN,
"STOR.invalid", fileName));
return;
@@ -114,7 +114,7 @@
// get permission
if (!file.hasWritePermission()) {
- session.write(FtpReplyUtil.translate(session, request, context,
+ session.write(LocalizedFtpReply.translate(session, request, context,
FtpReply.REPLY_550_REQUESTED_ACTION_NOT_TAKEN,
"STOR.permission", fileName));
return;
@@ -122,7 +122,7 @@
// get data connection
session.write(
- FtpReplyUtil.translate(session, request, context,
+ LocalizedFtpReply.translate(session, request, context,
FtpReply.REPLY_150_FILE_STATUS_OKAY, "STOR",
fileName)).awaitUninterruptibly(10000);
@@ -131,7 +131,7 @@
dataConnection = session.getDataConnection().openConnection();
} catch (Exception e) {
LOG.debug("Exception getting the input data stream", e);
- session.write(FtpReplyUtil.translate(session, request, context,
+ session.write(LocalizedFtpReply.translate(session, request, context,
FtpReply.REPLY_425_CANT_OPEN_DATA_CONNECTION, "STOR",
fileName));
return;
@@ -155,14 +155,14 @@
} catch (SocketException ex) {
LOG.debug("Socket exception during data transfer", ex);
failure = true;
- session.write(FtpReplyUtil.translate(session, request, context,
+ session.write(LocalizedFtpReply.translate(session, request, context,
FtpReply.REPLY_426_CONNECTION_CLOSED_TRANSFER_ABORTED,
"STOR", fileName));
} catch (IOException ex) {
LOG.debug("IOException during data transfer", ex);
failure = true;
session
- .write(FtpReplyUtil
+ .write(LocalizedFtpReply
.translate(
session,
request,
@@ -175,7 +175,7 @@
// if data transfer ok - send transfer complete message
if (!failure) {
- session.write(FtpReplyUtil.translate(session, request, context,
+ session.write(LocalizedFtpReply.translate(session, request, context,
FtpReply.REPLY_226_CLOSING_DATA_CONNECTION, "STOR",
fileName));
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/STOU.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/STOU.java?rev=693626&r1=693625&r2=693626&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/STOU.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/STOU.java Tue Sep 9 14:36:44 2008
@@ -34,10 +34,10 @@
import org.apache.ftpserver.ftplet.FtpException;
import org.apache.ftpserver.ftplet.FtpReply;
import org.apache.ftpserver.ftplet.FtpRequest;
+import org.apache.ftpserver.impl.LocalizedFtpReply;
import org.apache.ftpserver.interfaces.FtpIoSession;
import org.apache.ftpserver.interfaces.FtpServerContext;
import org.apache.ftpserver.interfaces.ServerFtpStatistics;
-import org.apache.ftpserver.util.FtpReplyUtil;
import org.apache.ftpserver.util.IoUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -109,7 +109,7 @@
}
if (file == null) {
- session.write(FtpReplyUtil.translate(session, request, context,
+ session.write(LocalizedFtpReply.translate(session, request, context,
FtpReply.REPLY_550_REQUESTED_ACTION_NOT_TAKEN, "STOU",
null));
return;
@@ -118,7 +118,7 @@
// check permission
if (!file.hasWritePermission()) {
- session.write(FtpReplyUtil.translate(session, request, context,
+ session.write(LocalizedFtpReply.translate(session, request, context,
FtpReply.REPLY_550_REQUESTED_ACTION_NOT_TAKEN,
"STOU.permission", fileName));
return;
@@ -137,7 +137,7 @@
dataConnection = session.getDataConnection().openConnection();
} catch (Exception e) {
LOG.debug("Exception getting the input data stream", e);
- session.write(FtpReplyUtil.translate(session, request, context,
+ session.write(LocalizedFtpReply.translate(session, request, context,
FtpReply.REPLY_425_CANT_OPEN_DATA_CONNECTION, "STOU",
fileName));
return;
@@ -164,14 +164,14 @@
} catch (SocketException ex) {
LOG.debug("Socket exception during data transfer", ex);
failure = true;
- session.write(FtpReplyUtil.translate(session, request, context,
+ session.write(LocalizedFtpReply.translate(session, request, context,
FtpReply.REPLY_426_CONNECTION_CLOSED_TRANSFER_ABORTED,
"STOU", fileName));
} catch (IOException ex) {
LOG.debug("IOException during data transfer", ex);
failure = true;
session
- .write(FtpReplyUtil
+ .write(LocalizedFtpReply
.translate(
session,
request,
@@ -184,7 +184,7 @@
// if data transfer ok - send transfer complete message
if (!failure) {
- session.write(FtpReplyUtil.translate(session, request, context,
+ session.write(LocalizedFtpReply.translate(session, request, context,
FtpReply.REPLY_226_CLOSING_DATA_CONNECTION, "STOU",
fileName));
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/STRU.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/STRU.java?rev=693626&r1=693625&r2=693626&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/STRU.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/STRU.java Tue Sep 9 14:36:44 2008
@@ -25,9 +25,9 @@
import org.apache.ftpserver.ftplet.FtpReply;
import org.apache.ftpserver.ftplet.FtpRequest;
import org.apache.ftpserver.ftplet.Structure;
+import org.apache.ftpserver.impl.LocalizedFtpReply;
import org.apache.ftpserver.interfaces.FtpIoSession;
import org.apache.ftpserver.interfaces.FtpServerContext;
-import org.apache.ftpserver.util.FtpReplyUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -55,7 +55,7 @@
// argument check
if (!request.hasArgument()) {
- session.write(FtpReplyUtil.translate(session, request, context,
+ session.write(LocalizedFtpReply.translate(session, request, context,
FtpReply.REPLY_501_SYNTAX_ERROR_IN_PARAMETERS_OR_ARGUMENTS,
"STRU", null));
return;
@@ -65,14 +65,14 @@
char stru = request.getArgument().charAt(0);
try {
session.setStructure(Structure.parseArgument(stru));
- session.write(FtpReplyUtil.translate(session, request, context,
+ session.write(LocalizedFtpReply.translate(session, request, context,
FtpReply.REPLY_200_COMMAND_OKAY, "STRU", null));
} catch (IllegalArgumentException e) {
LOG
.debug("Illegal structure argument: "
+ request.getArgument(), e);
session
- .write(FtpReplyUtil
+ .write(LocalizedFtpReply
.translate(
session,
request,
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/SYST.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/SYST.java?rev=693626&r1=693625&r2=693626&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/SYST.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/SYST.java Tue Sep 9 14:36:44 2008
@@ -24,9 +24,9 @@
import org.apache.ftpserver.command.AbstractCommand;
import org.apache.ftpserver.ftplet.FtpReply;
import org.apache.ftpserver.ftplet.FtpRequest;
+import org.apache.ftpserver.impl.LocalizedFtpReply;
import org.apache.ftpserver.interfaces.FtpIoSession;
import org.apache.ftpserver.interfaces.FtpServerContext;
-import org.apache.ftpserver.util.FtpReplyUtil;
/**
* <code>SYST <CRLF></code><br>
@@ -57,7 +57,7 @@
systemName = systemName.replace(' ', '-');
}
// print server system info
- session.write(FtpReplyUtil.translate(session, request, context,
+ session.write(LocalizedFtpReply.translate(session, request, context,
FtpReply.REPLY_215_NAME_SYSTEM_TYPE, "SYST", systemName));
}
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/TYPE.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/TYPE.java?rev=693626&r1=693625&r2=693626&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/TYPE.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/TYPE.java Tue Sep 9 14:36:44 2008
@@ -25,9 +25,9 @@
import org.apache.ftpserver.ftplet.DataType;
import org.apache.ftpserver.ftplet.FtpReply;
import org.apache.ftpserver.ftplet.FtpRequest;
+import org.apache.ftpserver.impl.LocalizedFtpReply;
import org.apache.ftpserver.interfaces.FtpIoSession;
import org.apache.ftpserver.interfaces.FtpServerContext;
-import org.apache.ftpserver.util.FtpReplyUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -62,12 +62,12 @@
// set type
try {
session.setDataType(DataType.parseArgument(type));
- session.write(FtpReplyUtil.translate(session, request, context,
+ session.write(LocalizedFtpReply.translate(session, request, context,
FtpReply.REPLY_200_COMMAND_OKAY, "TYPE", null));
} catch (IllegalArgumentException e) {
LOG.debug("Illegal type argument: " + request.getArgument(), e);
session
- .write(FtpReplyUtil
+ .write(LocalizedFtpReply
.translate(
session,
request,
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/USER.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/USER.java?rev=693626&r1=693625&r2=693626&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/USER.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/USER.java Tue Sep 9 14:36:44 2008
@@ -28,11 +28,11 @@
import org.apache.ftpserver.ftplet.FtpReply;
import org.apache.ftpserver.ftplet.FtpRequest;
import org.apache.ftpserver.ftplet.User;
+import org.apache.ftpserver.impl.LocalizedFtpReply;
import org.apache.ftpserver.interfaces.FtpIoSession;
import org.apache.ftpserver.interfaces.FtpServerContext;
import org.apache.ftpserver.interfaces.ServerFtpStatistics;
import org.apache.ftpserver.usermanager.ConcurrentLoginRequest;
-import org.apache.ftpserver.util.FtpReplyUtil;
import org.apache.mina.filter.logging.MdcInjectionFilter;
/**
@@ -67,7 +67,7 @@
String userName = request.getArgument();
if (userName == null) {
session
- .write(FtpReplyUtil
+ .write(LocalizedFtpReply
.translate(
session,
request,
@@ -84,12 +84,12 @@
User user = session.getUser();
if (session.isLoggedIn()) {
if (userName.equals(user.getName())) {
- session.write(FtpReplyUtil.translate(session, request,
+ session.write(LocalizedFtpReply.translate(session, request,
context, FtpReply.REPLY_230_USER_LOGGED_IN, "USER",
null));
success = true;
} else {
- session.write(FtpReplyUtil.translate(session, request,
+ session.write(LocalizedFtpReply.translate(session, request,
context, 530, "USER.invalid", null));
}
return;
@@ -100,7 +100,7 @@
if (anonymous
&& (!context.getConnectionConfig()
.isAnonymousLoginEnabled())) {
- session.write(FtpReplyUtil.translate(session, request, context,
+ session.write(LocalizedFtpReply.translate(session, request, context,
FtpReply.REPLY_530_NOT_LOGGED_IN, "USER.anonymous",
null));
return;
@@ -112,7 +112,7 @@
.getMaxAnonymousLogins();
if (anonymous && (currAnonLogin >= maxAnonLogin)) {
session
- .write(FtpReplyUtil
+ .write(LocalizedFtpReply
.translate(
session,
request,
@@ -127,7 +127,7 @@
int maxLogin = context.getConnectionConfig().getMaxLogins();
if (maxLogin != 0 && currLogin >= maxLogin) {
session
- .write(FtpReplyUtil
+ .write(LocalizedFtpReply
.translate(
session,
request,
@@ -153,7 +153,7 @@
if (configUser.authorize(loginRequest) == null) {
session
- .write(FtpReplyUtil
+ .write(LocalizedFtpReply
.translate(
session,
request,
@@ -168,11 +168,11 @@
success = true;
session.setUserArgument(userName);
if (anonymous) {
- session.write(FtpReplyUtil.translate(session, request, context,
+ session.write(LocalizedFtpReply.translate(session, request, context,
FtpReply.REPLY_331_USER_NAME_OKAY_NEED_PASSWORD,
"USER.anonymous", userName));
} else {
- session.write(FtpReplyUtil.translate(session, request, context,
+ session.write(LocalizedFtpReply.translate(session, request, context,
FtpReply.REPLY_331_USER_NAME_OKAY_NEED_PASSWORD,
"USER", userName));
}
Copied: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/impl/DefaultFtpHandler.java (from r693623, 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/impl/DefaultFtpHandler.java?p2=mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/impl/DefaultFtpHandler.java&p1=mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/DefaultFtpHandler.java&r1=693623&r2=693626&rev=693626&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/impl/DefaultFtpHandler.java Tue Sep 9 14:36:44 2008
@@ -17,10 +17,11 @@
* under the License.
*/
-package org.apache.ftpserver;
+package org.apache.ftpserver.impl;
import java.io.IOException;
+import org.apache.ftpserver.FtpHandler;
import org.apache.ftpserver.command.Command;
import org.apache.ftpserver.command.CommandFactory;
import org.apache.ftpserver.ftplet.FtpReply;
@@ -31,7 +32,6 @@
import org.apache.ftpserver.interfaces.FtpServerContext;
import org.apache.ftpserver.interfaces.ServerFtpStatistics;
import org.apache.ftpserver.listener.Listener;
-import org.apache.ftpserver.util.FtpReplyUtil;
import org.apache.mina.core.session.IdleStatus;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -64,7 +64,7 @@
public void sessionOpened(final FtpIoSession session) throws Exception {
context.getFtpletContainer().onConnect(session.getFtpletSession());
- session.write(FtpReplyUtil.translate(session, null, context,
+ session.write(LocalizedFtpReply.translate(session, null, context,
FtpReply.REPLY_220_SERVICE_READY, null, null));
}
@@ -112,7 +112,7 @@
// make sure the user is authenticated before he issues commands
if (!session.isLoggedIn()
&& !isCommandOkWithoutAuthentication(commandName)) {
- session.write(FtpReplyUtil.translate(session, request, context,
+ session.write(LocalizedFtpReply.translate(session, request, context,
FtpReply.REPLY_530_NOT_LOGGED_IN, "permission", null));
return;
}
@@ -137,7 +137,7 @@
command.execute(session, context, request);
}
} else {
- session.write(FtpReplyUtil.translate(session, request,
+ session.write(LocalizedFtpReply.translate(session, request,
context,
FtpReply.REPLY_502_COMMAND_NOT_IMPLEMENTED,
"not.implemented", null));
@@ -160,7 +160,7 @@
// send error reply
try {
- session.write(FtpReplyUtil.translate(session, request, context,
+ session.write(LocalizedFtpReply.translate(session, request, context,
FtpReply.REPLY_550_REQUESTED_ACTION_NOT_TAKEN, null,
null));
} catch (Exception ex1) {
Copied: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/impl/FtpRequestImpl.java (from r693183, mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/FtpRequestImpl.java)
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/impl/FtpRequestImpl.java?p2=mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/impl/FtpRequestImpl.java&p1=mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/FtpRequestImpl.java&r1=693183&r2=693626&rev=693626&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/FtpRequestImpl.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/impl/FtpRequestImpl.java Tue Sep 9 14:36:44 2008
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.ftpserver;
+package org.apache.ftpserver.impl;
import org.apache.ftpserver.ftplet.FtpRequest;
Propchange: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/impl/FtpRequestImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/impl/FtpRequestImpl.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/impl/LocalizedFtpReply.java (from r693604, mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/util/FtpReplyUtil.java)
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/impl/LocalizedFtpReply.java?p2=mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/impl/LocalizedFtpReply.java&p1=mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/util/FtpReplyUtil.java&r1=693604&r2=693626&rev=693626&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/util/FtpReplyUtil.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/impl/LocalizedFtpReply.java Tue Sep 9 14:36:44 2008
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.ftpserver.util;
+package org.apache.ftpserver.impl;
import java.net.InetAddress;
import java.net.InetSocketAddress;
@@ -31,6 +31,7 @@
import org.apache.ftpserver.interfaces.FtpIoSession;
import org.apache.ftpserver.interfaces.FtpServerContext;
import org.apache.ftpserver.message.MessageResource;
+import org.apache.ftpserver.util.DateUtils;
/**
* FTP reply translator.
@@ -38,7 +39,8 @@
* @author The Apache MINA Project (dev@mina.apache.org)
* @version $Rev$, $Date$
*/
-public class FtpReplyUtil {
+public class LocalizedFtpReply extends DefaultFtpReply {
+
public static final String CLIENT_ACCESS_TIME = "client.access.time";
@@ -97,12 +99,12 @@
public static final String STAT_START_TIME = "stat.start.time";
- public static FtpReply translate(FtpIoSession session, FtpRequest request,
+ public static LocalizedFtpReply translate(FtpIoSession session, FtpRequest request,
FtpServerContext context, int code, String subId, String basicMsg) {
String msg = translateMessage(session, request, context, code, subId,
basicMsg);
- return new DefaultFtpReply(code, msg);
+ return new LocalizedFtpReply(code, msg);
}
private static String translateMessage(FtpIoSession session,
@@ -494,4 +496,12 @@
return varVal;
}
+ /**
+ * Private constructor, only allow creating through factory method
+ */
+ private LocalizedFtpReply(int code, String message) {
+ super(code, message);
+ }
+
+
}
Propchange: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/impl/LocalizedFtpReply.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listener/nio/FtpHandlerAdapter.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listener/nio/FtpHandlerAdapter.java?rev=693626&r1=693625&r2=693626&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listener/nio/FtpHandlerAdapter.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listener/nio/FtpHandlerAdapter.java Tue Sep 9 14:36:44 2008
@@ -20,9 +20,9 @@
package org.apache.ftpserver.listener.nio;
import org.apache.ftpserver.FtpHandler;
-import org.apache.ftpserver.FtpRequestImpl;
import org.apache.ftpserver.ftplet.FtpReply;
import org.apache.ftpserver.ftplet.FtpRequest;
+import org.apache.ftpserver.impl.FtpRequestImpl;
import org.apache.ftpserver.interfaces.FtpIoSession;
import org.apache.ftpserver.interfaces.FtpServerContext;
import org.apache.mina.core.service.IoHandler;
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listener/nio/NioListener.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listener/nio/NioListener.java?rev=693626&r1=693625&r2=693626&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listener/nio/NioListener.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listener/nio/NioListener.java Tue Sep 9 14:36:44 2008
@@ -30,9 +30,9 @@
import java.util.concurrent.ExecutorService;
import java.util.concurrent.TimeUnit;
-import org.apache.ftpserver.DefaultFtpHandler;
import org.apache.ftpserver.FtpHandler;
import org.apache.ftpserver.filter.FtpLoggingFilter;
+import org.apache.ftpserver.impl.DefaultFtpHandler;
import org.apache.ftpserver.interfaces.FtpIoSession;
import org.apache.ftpserver.interfaces.FtpServerContext;
import org.apache.ftpserver.listener.AbstractListener;
Modified: mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/FtpRequestImplTest.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/FtpRequestImplTest.java?rev=693626&r1=693625&r2=693626&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/FtpRequestImplTest.java (original)
+++ mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/FtpRequestImplTest.java Tue Sep 9 14:36:44 2008
@@ -19,6 +19,8 @@
package org.apache.ftpserver;
+import org.apache.ftpserver.impl.FtpRequestImpl;
+
import junit.framework.TestCase;
/**
Modified: mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ftpletcontainer/FtpLetContainerTestTemplate.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ftpletcontainer/FtpLetContainerTestTemplate.java?rev=693626&r1=693625&r2=693626&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ftpletcontainer/FtpLetContainerTestTemplate.java (original)
+++ mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ftpletcontainer/FtpLetContainerTestTemplate.java Tue Sep 9 14:36:44 2008
@@ -25,7 +25,6 @@
import junit.framework.TestCase;
-import org.apache.ftpserver.FtpRequestImpl;
import org.apache.ftpserver.FtpSessionImpl;
import org.apache.ftpserver.ftplet.FileSystemManager;
import org.apache.ftpserver.ftplet.FtpException;
@@ -36,6 +35,7 @@
import org.apache.ftpserver.ftplet.FtpletContext;
import org.apache.ftpserver.ftplet.FtpletResult;
import org.apache.ftpserver.ftplet.UserManager;
+import org.apache.ftpserver.impl.FtpRequestImpl;
public abstract class FtpLetContainerTestTemplate extends TestCase {