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 [1/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...
Author: ngn
Date: Tue Sep 9 14:36:44 2008
New Revision: 693626
URL: http://svn.apache.org/viewvc?rev=693626&view=rev
Log:
Refactoring FtpReplyUtil to a real FtpReply implementation
Cleaning up package structure for LocalizedFtpReply and FtpRequestImpl
Added:
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/impl/
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/impl/DefaultFtpHandler.java
- copied, changed from r693623, mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/DefaultFtpHandler.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/impl/FtpRequestImpl.java (contents, props changed)
- copied, changed from r693183, mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/FtpRequestImpl.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/impl/LocalizedFtpReply.java (contents, props changed)
- copied, changed from r693604, mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/util/FtpReplyUtil.java
Removed:
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/DefaultFtpHandler.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/FtpRequestImpl.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/util/FtpReplyUtil.java
Modified:
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/NotSupportedCommand.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/ABOR.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/ACCT.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/APPE.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/AUTH.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/CDUP.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/CWD.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/DELE.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/EPRT.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/EPSV.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/FEAT.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/HELP.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/LANG.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/LIST.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/MD5.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/MDTM.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/MKD.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/MLSD.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/MLST.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/MODE.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/NLST.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/NOOP.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/OPTS.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/OPTS_MLST.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/OPTS_UTF8.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/PASS.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/PASV.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/PBSZ.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/PORT.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/PROT.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/PWD.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/QUIT.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/REIN.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/REST.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/RETR.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/RMD.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/RNFR.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/RNTO.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/SITE.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/SITE_DESCUSER.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/SITE_HELP.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/SITE_STAT.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/SITE_WHO.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/SIZE.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/STAT.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/STOR.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/STOU.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/STRU.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/SYST.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/TYPE.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/USER.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listener/nio/FtpHandlerAdapter.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listener/nio/NioListener.java
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/FtpRequestImplTest.java
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ftpletcontainer/FtpLetContainerTestTemplate.java
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/NotSupportedCommand.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/NotSupportedCommand.java?rev=693626&r1=693625&r2=693626&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/NotSupportedCommand.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/NotSupportedCommand.java Tue Sep 9 14:36:44 2008
@@ -23,9 +23,9 @@
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;
/**
* A command used primarily for overriding already installed commands when one
@@ -47,7 +47,7 @@
session.resetState();
// We do not support this command
- session.write(FtpReplyUtil.translate(session, request, context,
+ session.write(LocalizedFtpReply.translate(session, request, context,
FtpReply.REPLY_502_COMMAND_NOT_IMPLEMENTED, "Not supported",
null));
}
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/ABOR.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/ABOR.java?rev=693626&r1=693625&r2=693626&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/ABOR.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/ABOR.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>ABOR <CRLF></code><br>
@@ -55,7 +55,7 @@
// and abort any data connection
session.getDataConnection().closeDataConnection();
- session.write(FtpReplyUtil.translate(session, request, context,
+ session.write(LocalizedFtpReply.translate(session, request, context,
FtpReply.REPLY_226_CLOSING_DATA_CONNECTION, "ABOR", null));
}
}
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/ACCT.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/ACCT.java?rev=693626&r1=693625&r2=693626&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/ACCT.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/ACCT.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>ACCT <CRLF></code><br>
@@ -50,7 +50,7 @@
session.resetState();
// and abort any data connection
- session.write(FtpReplyUtil.translate(session, request, context,
+ session.write(LocalizedFtpReply.translate(session, request, context,
FtpReply.REPLY_202_COMMAND_NOT_IMPLEMENTED, "ACCT", null));
}
}
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/APPE.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/APPE.java?rev=693626&r1=693625&r2=693626&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/APPE.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/APPE.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("File system threw exception", e);
}
if (file == null) {
- session.write(FtpReplyUtil.translate(session, request, context,
+ session.write(LocalizedFtpReply.translate(session, request, context,
FtpReply.REPLY_550_REQUESTED_ACTION_NOT_TAKEN,
"APPE.invalid", fileName));
return;
@@ -114,7 +114,7 @@
// check file existance
if (file.doesExist() && !file.isFile()) {
- session.write(FtpReplyUtil.translate(session, request, context,
+ session.write(LocalizedFtpReply.translate(session, request, context,
FtpReply.REPLY_550_REQUESTED_ACTION_NOT_TAKEN,
"APPE.invalid", fileName));
return;
@@ -122,14 +122,14 @@
// 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,
"APPE.permission", fileName));
return;
}
// get data connection
- session.write(FtpReplyUtil.translate(session, request, context,
+ session.write(LocalizedFtpReply.translate(session, request, context,
FtpReply.REPLY_150_FILE_STATUS_OKAY, "APPE", fileName));
DataConnection dataConnection;
@@ -137,7 +137,7 @@
dataConnection = session.getDataConnection().openConnection();
} catch (Exception e) {
LOG.debug("Exception when getting data input stream", e);
- session.write(FtpReplyUtil.translate(session, request, context,
+ session.write(LocalizedFtpReply.translate(session, request, context,
FtpReply.REPLY_425_CANT_OPEN_DATA_CONNECTION, "APPE",
fileName));
return;
@@ -172,14 +172,14 @@
} catch (SocketException e) {
LOG.debug("SocketException during file upload", e);
failure = true;
- session.write(FtpReplyUtil.translate(session, request, context,
+ session.write(LocalizedFtpReply.translate(session, request, context,
FtpReply.REPLY_426_CONNECTION_CLOSED_TRANSFER_ABORTED,
"APPE", fileName));
} catch (IOException e) {
LOG.debug("IOException during file upload", e);
failure = true;
session
- .write(FtpReplyUtil
+ .write(LocalizedFtpReply
.translate(
session,
request,
@@ -192,7 +192,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, "APPE",
fileName));
}
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/AUTH.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/AUTH.java?rev=693626&r1=693625&r2=693626&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/AUTH.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/AUTH.java Tue Sep 9 14:36:44 2008
@@ -26,11 +26,11 @@
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.ssl.ClientAuth;
import org.apache.ftpserver.ssl.SslConfiguration;
-import org.apache.ftpserver.util.FtpReplyUtil;
import org.apache.mina.filter.ssl.SslFilter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -59,7 +59,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,
"AUTH", null));
return;
@@ -67,7 +67,7 @@
// check SSL configuration
if (session.getListener().getSslConfiguration() == null) {
- session.write(FtpReplyUtil.translate(session, request, context,
+ session.write(LocalizedFtpReply.translate(session, request, context,
431, "AUTH", null));
return;
}
@@ -87,7 +87,7 @@
// Here we choose not to support reissued AUTH
if (session.getFilterChain().contains(SslFilter.class)) {
- session.write(FtpReplyUtil.translate(session, request, context,
+ session.write(LocalizedFtpReply.translate(session, request, context,
534, "AUTH", null));
return;
}
@@ -97,7 +97,7 @@
if (authType.equals("SSL")) {
try {
secureSession(session, "SSL");
- session.write(FtpReplyUtil.translate(session, request, context,
+ session.write(LocalizedFtpReply.translate(session, request, context,
234, "AUTH.SSL", null));
} catch (FtpException ex) {
throw ex;
@@ -108,7 +108,7 @@
} else if (authType.equals("TLS")) {
try {
secureSession(session, "TLS");
- session.write(FtpReplyUtil.translate(session, request, context,
+ session.write(LocalizedFtpReply.translate(session, request, context,
234, "AUTH.TLS", null));
} catch (FtpException ex) {
throw ex;
@@ -117,7 +117,7 @@
throw new FtpException("AUTH.execute()", ex);
}
} else {
- session.write(FtpReplyUtil.translate(session, request, context,
+ session.write(LocalizedFtpReply.translate(session, request, context,
FtpReply.REPLY_502_COMMAND_NOT_IMPLEMENTED, "AUTH", null));
}
}
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/CDUP.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/CDUP.java?rev=693626&r1=693625&r2=693626&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/CDUP.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/CDUP.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;
@@ -67,11 +67,11 @@
}
if (success) {
String dirName = fsview.getCurrentDirectory().getFullName();
- session.write(FtpReplyUtil.translate(session, request, context,
+ session.write(LocalizedFtpReply.translate(session, request, context,
FtpReply.REPLY_250_REQUESTED_FILE_ACTION_OKAY, "CDUP",
dirName));
} else {
- session.write(FtpReplyUtil
+ session.write(LocalizedFtpReply
.translate(session, request, context,
FtpReply.REPLY_550_REQUESTED_ACTION_NOT_TAKEN,
"CDUP", null));
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/CWD.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/CWD.java?rev=693626&r1=693625&r2=693626&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/CWD.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/CWD.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;
@@ -73,12 +73,12 @@
}
if (success) {
dirName = fsview.getCurrentDirectory().getFullName();
- session.write(FtpReplyUtil.translate(session, request, context,
+ session.write(LocalizedFtpReply.translate(session, request, context,
FtpReply.REPLY_250_REQUESTED_FILE_ACTION_OKAY, "CWD",
dirName));
} else {
session
- .write(FtpReplyUtil.translate(session, request, context,
+ .write(LocalizedFtpReply.translate(session, request, context,
FtpReply.REPLY_550_REQUESTED_ACTION_NOT_TAKEN,
"CWD", null));
}
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/DELE.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/DELE.java?rev=693626&r1=693625&r2=693626&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/DELE.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/DELE.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;
@@ -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,
"DELE", null));
return;
@@ -74,7 +74,7 @@
LOG.debug("Could not get file " + fileName, 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,
"DELE.invalid", fileName));
return;
@@ -84,7 +84,7 @@
fileName = file.getFullName();
if (!file.hasDeletePermission()) {
- session.write(FtpReplyUtil.translate(session, request, context,
+ session.write(LocalizedFtpReply.translate(session, request, context,
FtpReply.REPLY_450_REQUESTED_FILE_ACTION_NOT_TAKEN,
"DELE.permission", fileName));
return;
@@ -92,7 +92,7 @@
// now delete
if (file.delete()) {
- session.write(FtpReplyUtil.translate(session, request, context,
+ session.write(LocalizedFtpReply.translate(session, request, context,
FtpReply.REPLY_250_REQUESTED_FILE_ACTION_OKAY, "DELE",
fileName));
@@ -106,7 +106,7 @@
.getFtpStatistics();
ftpStat.setDelete(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, "DELE",
fileName));
}
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/EPRT.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/EPRT.java?rev=693626&r1=693625&r2=693626&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/EPRT.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/EPRT.java Tue Sep 9 14:36:44 2008
@@ -27,10 +27,10 @@
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.DataConnectionConfiguration;
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;
@@ -61,7 +61,7 @@
// argument check
String arg = request.getArgument();
if (arg == null) {
- session.write(FtpReplyUtil.translate(session, request, context,
+ session.write(LocalizedFtpReply.translate(session, request, context,
FtpReply.REPLY_501_SYNTAX_ERROR_IN_PARAMETERS_OR_ARGUMENTS,
"EPRT", null));
return;
@@ -71,7 +71,7 @@
DataConnectionConfiguration dataCfg = session.getListener()
.getDataConnectionConfiguration();
if (!dataCfg.isActiveEnabled()) {
- session.write(FtpReplyUtil.translate(session, request, context,
+ session.write(LocalizedFtpReply.translate(session, request, context,
510, "EPRT.disabled", null));
return;
}
@@ -86,7 +86,7 @@
port = arg.substring(lastDelimIdx + 1, arg.length() - 1);
} catch (Exception ex) {
LOG.debug("Exception parsing host and port: " + arg, ex);
- session.write(FtpReplyUtil.translate(session, request, context,
+ session.write(LocalizedFtpReply.translate(session, request, context,
510, "EPRT", null));
return;
}
@@ -98,7 +98,7 @@
} catch (UnknownHostException ex) {
LOG.debug("Unknown host: " + host, ex);
session
- .write(FtpReplyUtil
+ .write(LocalizedFtpReply
.translate(
session,
request,
@@ -114,7 +114,7 @@
InetAddress clientAddr = ((InetSocketAddress) session
.getRemoteAddress()).getAddress();
if (!dataAddr.equals(clientAddr)) {
- session.write(FtpReplyUtil.translate(session, request,
+ session.write(LocalizedFtpReply.translate(session, request,
context, 510, "EPRT.mismatch", null));
return;
}
@@ -128,7 +128,7 @@
} catch (NumberFormatException ex) {
LOG.debug("Invalid port: " + port, ex);
session
- .write(FtpReplyUtil
+ .write(LocalizedFtpReply
.translate(
session,
request,
@@ -140,7 +140,7 @@
session.getDataConnection().initActiveDataConnection(
new InetSocketAddress(dataAddr, dataPort));
- session.write(FtpReplyUtil.translate(session, request, context,
+ session.write(LocalizedFtpReply.translate(session, request, context,
FtpReply.REPLY_200_COMMAND_OKAY, "EPRT", null));
}
}
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/EPSV.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/EPSV.java?rev=693626&r1=693625&r2=693626&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/EPSV.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/EPSV.java Tue Sep 9 14:36:44 2008
@@ -27,9 +27,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;
/**
* The EPSV command requests that a server listen on a data port and wait for a
@@ -68,12 +68,12 @@
// send connection info to client
String portStr = "|||" + servPort + '|';
- session.write(FtpReplyUtil.translate(session, request, context,
+ session.write(LocalizedFtpReply.translate(session, request, context,
229, "EPSV", portStr));
} catch (DataConnectionException e) {
session
- .write(FtpReplyUtil.translate(session, request, context,
+ .write(LocalizedFtpReply.translate(session, request, context,
FtpReply.REPLY_425_CANT_OPEN_DATA_CONNECTION,
"EPSV", null));
return;
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/FEAT.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/FEAT.java?rev=693626&r1=693625&r2=693626&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/FEAT.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/FEAT.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;
/**
* The FEAT command (introduced in [RFC-2389]) allows servers with additional
@@ -47,7 +47,7 @@
// reset state variables
session.resetState();
- session.write(FtpReplyUtil.translate(session, request, context,
+ session.write(LocalizedFtpReply.translate(session, request, context,
FtpReply.REPLY_211_SYSTEM_STATUS_REPLY, "FEAT", null));
}
}
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/HELP.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/HELP.java?rev=693626&r1=693625&r2=693626&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/HELP.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/HELP.java Tue Sep 9 14:36:44 2008
@@ -24,10 +24,10 @@
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.message.MessageResource;
-import org.apache.ftpserver.util.FtpReplyUtil;
/**
* <code>HELP [<SP> <string>] <CRLF></code><br>
@@ -54,7 +54,7 @@
// print global help
if (!request.hasArgument()) {
- session.write(FtpReplyUtil.translate(session, request, context,
+ session.write(LocalizedFtpReply.translate(session, request, context,
FtpReply.REPLY_214_HELP_MESSAGE, null, null));
return;
}
@@ -66,7 +66,7 @@
session.getLanguage()) == null) {
ftpCmd = null;
}
- session.write(FtpReplyUtil.translate(session, request, context,
+ session.write(LocalizedFtpReply.translate(session, request, context,
FtpReply.REPLY_214_HELP_MESSAGE, ftpCmd, null));
}
}
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/LANG.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/LANG.java?rev=693626&r1=693625&r2=693626&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/LANG.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/LANG.java Tue Sep 9 14:36:44 2008
@@ -25,10 +25,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.message.MessageResource;
-import org.apache.ftpserver.util.FtpReplyUtil;
/**
* A new command "LANG" is added to the FTP command set to allow server-FTP
@@ -54,7 +54,7 @@
String language = request.getArgument();
if (language == null) {
session.setLanguage(null);
- session.write(FtpReplyUtil.translate(session, request, context,
+ session.write(LocalizedFtpReply.translate(session, request, context,
FtpReply.REPLY_200_COMMAND_OKAY, "LANG", null));
return;
}
@@ -67,7 +67,7 @@
for (int i = 0; i < availableLanguages.length; ++i) {
if (availableLanguages[i].equals(language)) {
session.setLanguage(language);
- session.write(FtpReplyUtil.translate(session, request,
+ session.write(LocalizedFtpReply.translate(session, request,
context, FtpReply.REPLY_200_COMMAND_OKAY, "LANG",
null));
return;
@@ -76,7 +76,7 @@
}
// not found - send error message
- session.write(FtpReplyUtil.translate(session, request, context,
+ session.write(LocalizedFtpReply.translate(session, request, context,
FtpReply.REPLY_504_COMMAND_NOT_IMPLEMENTED_FOR_THAT_PARAMETER,
"LANG", null));
}
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/LIST.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/LIST.java?rev=693626&r1=693625&r2=693626&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/LIST.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/LIST.java Tue Sep 9 14:36:44 2008
@@ -31,13 +31,13 @@
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.listing.DirectoryLister;
import org.apache.ftpserver.listing.LISTFileFormater;
import org.apache.ftpserver.listing.ListArgument;
import org.apache.ftpserver.listing.ListArgumentParser;
-import org.apache.ftpserver.util.FtpReplyUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -89,7 +89,7 @@
}
// get data connection
- session.write(FtpReplyUtil.translate(session, request, context,
+ session.write(LocalizedFtpReply.translate(session, request, context,
FtpReply.REPLY_150_FILE_STATUS_OKAY, "LIST", null));
DataConnection dataConnection;
@@ -97,7 +97,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, "LIST",
null));
return;
@@ -117,14 +117,14 @@
} catch (SocketException ex) {
LOG.debug("Socket exception during list 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,
"LIST", null));
} catch (IOException ex) {
LOG.debug("IOException during list transfer", ex);
failure = true;
session
- .write(FtpReplyUtil
+ .write(LocalizedFtpReply
.translate(
session,
request,
@@ -135,7 +135,7 @@
LOG.debug("Illegal list syntax: " + request.getArgument(), e);
// if listing syntax error - send message
session
- .write(FtpReplyUtil
+ .write(LocalizedFtpReply
.translate(
session,
request,
@@ -146,7 +146,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, "LIST",
null));
}
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/MD5.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/MD5.java?rev=693626&r1=693625&r2=693626&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/MD5.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/MD5.java Tue Sep 9 14:36:44 2008
@@ -29,9 +29,9 @@
import org.apache.ftpserver.ftplet.FileObject;
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.apache.ftpserver.util.IoUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -71,7 +71,7 @@
if (argument == null || argument.trim().length() == 0) {
session
- .write(FtpReplyUtil
+ .write(LocalizedFtpReply
.translate(
session,
request,
@@ -103,7 +103,7 @@
if (file == null) {
session
- .write(FtpReplyUtil
+ .write(LocalizedFtpReply
.translate(
session,
request,
@@ -116,7 +116,7 @@
// check file
if (!file.isFile()) {
session
- .write(FtpReplyUtil
+ .write(LocalizedFtpReply
.translate(
session,
request,
@@ -141,7 +141,7 @@
} catch (NoSuchAlgorithmException e) {
LOG.debug("MD5 algorithm not available", e);
- session.write(FtpReplyUtil.translate(session, request, context,
+ session.write(LocalizedFtpReply.translate(session, request, context,
FtpReply.REPLY_502_COMMAND_NOT_IMPLEMENTED,
"MD5.notimplemened", null));
} finally {
@@ -149,10 +149,10 @@
}
}
if (isMMD5) {
- session.write(FtpReplyUtil.translate(session, request, context,
+ session.write(LocalizedFtpReply.translate(session, request, context,
252, "MMD5", sb.toString()));
} else {
- session.write(FtpReplyUtil.translate(session, request, context,
+ session.write(LocalizedFtpReply.translate(session, request, context,
251, "MD5", sb.toString()));
}
}
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/MDTM.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/MDTM.java?rev=693626&r1=693625&r2=693626&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/MDTM.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/MDTM.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.util.DateUtils;
-import org.apache.ftpserver.util.FtpReplyUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -58,7 +58,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,
"MDTM", null));
return;
@@ -72,7 +72,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, "MDTM",
fileName));
return;
@@ -82,10 +82,10 @@
fileName = file.getFullName();
if (file.doesExist()) {
String dateStr = DateUtils.getFtpDate(file.getLastModified());
- session.write(FtpReplyUtil.translate(session, request, context,
+ session.write(LocalizedFtpReply.translate(session, request, context,
FtpReply.REPLY_213_FILE_STATUS, "MDTM", dateStr));
} else {
- session.write(FtpReplyUtil.translate(session, request, context,
+ session.write(LocalizedFtpReply.translate(session, request, context,
FtpReply.REPLY_550_REQUESTED_ACTION_NOT_TAKEN, "MDTM",
fileName));
}
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/MKD.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/MKD.java?rev=693626&r1=693625&r2=693626&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/MKD.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/MKD.java Tue Sep 9 14:36:44 2008
@@ -27,10 +27,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;
@@ -61,7 +61,7 @@
// argument check
String fileName = request.getArgument();
if (fileName == null || fileName.indexOf(File.pathSeparatorChar) > -1) {
- session.write(FtpReplyUtil.translate(session, request, context,
+ session.write(LocalizedFtpReply.translate(session, request, context,
FtpReply.REPLY_501_SYNTAX_ERROR_IN_PARAMETERS_OR_ARGUMENTS,
"MKD", null));
return;
@@ -75,7 +75,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,
"MKD.invalid", fileName));
return;
@@ -84,7 +84,7 @@
// check permission
fileName = file.getFullName();
if (!file.hasWritePermission()) {
- session.write(FtpReplyUtil.translate(session, request, context,
+ session.write(LocalizedFtpReply.translate(session, request, context,
FtpReply.REPLY_550_REQUESTED_ACTION_NOT_TAKEN,
"MKD.permission", fileName));
return;
@@ -92,7 +92,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,
"MKD.exists", fileName));
return;
@@ -100,7 +100,7 @@
// now create directory
if (file.mkdir()) {
- session.write(FtpReplyUtil.translate(session, request, context,
+ session.write(LocalizedFtpReply.translate(session, request, context,
FtpReply.REPLY_257_PATHNAME_CREATED, "MKD", fileName));
// write log message
@@ -113,7 +113,7 @@
ftpStat.setMkdir(session, file);
} else {
- session.write(FtpReplyUtil.translate(session, request, context,
+ session.write(LocalizedFtpReply.translate(session, request, context,
FtpReply.REPLY_550_REQUESTED_ACTION_NOT_TAKEN, "MKD",
fileName));
}
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/MLSD.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/MLSD.java?rev=693626&r1=693625&r2=693626&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/MLSD.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/MLSD.java Tue Sep 9 14:36:44 2008
@@ -31,6 +31,7 @@
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.listing.DirectoryLister;
@@ -38,7 +39,6 @@
import org.apache.ftpserver.listing.ListArgument;
import org.apache.ftpserver.listing.ListArgumentParser;
import org.apache.ftpserver.listing.MLSTFileFormater;
-import org.apache.ftpserver.util.FtpReplyUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -86,7 +86,7 @@
}
// get data connection
- session.write(FtpReplyUtil.translate(session, request, context,
+ session.write(LocalizedFtpReply.translate(session, request, context,
FtpReply.REPLY_150_FILE_STATUS_OKAY, "MLSD", null));
// print listing data
@@ -95,7 +95,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, "MLSD",
null));
return;
@@ -115,14 +115,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,
"MLSD", null));
} catch (IOException ex) {
LOG.debug("IOException during data transfer", ex);
failure = true;
session
- .write(FtpReplyUtil
+ .write(LocalizedFtpReply
.translate(
session,
request,
@@ -135,7 +135,7 @@
+ request.getArgument(), e);
// if listing syntax error - send message
session
- .write(FtpReplyUtil
+ .write(LocalizedFtpReply
.translate(
session,
request,
@@ -146,7 +146,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, "MLSD",
null));
}
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/MLST.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/MLST.java?rev=693626&r1=693625&r2=693626&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/MLST.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/MLST.java Tue Sep 9 14:36:44 2008
@@ -26,13 +26,13 @@
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.listing.FileFormater;
import org.apache.ftpserver.listing.ListArgument;
import org.apache.ftpserver.listing.ListArgumentParser;
import org.apache.ftpserver.listing.MLSTFileFormater;
-import org.apache.ftpserver.util.FtpReplyUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -69,12 +69,12 @@
if (file != null && file.doesExist()) {
FileFormater formater = new MLSTFileFormater((String[]) session
.getAttribute("MLST.types"));
- session.write(FtpReplyUtil.translate(session, request, context,
+ session.write(LocalizedFtpReply.translate(session, request, context,
FtpReply.REPLY_250_REQUESTED_FILE_ACTION_OKAY, "MLST",
formater.format(file)));
} else {
session
- .write(FtpReplyUtil
+ .write(LocalizedFtpReply
.translate(
session,
request,
@@ -84,7 +84,7 @@
}
} catch (FtpException ex) {
LOG.debug("Exception sending the file listing", ex);
- session.write(FtpReplyUtil.translate(session, request, context,
+ session.write(LocalizedFtpReply.translate(session, request, context,
FtpReply.REPLY_501_SYNTAX_ERROR_IN_PARAMETERS_OR_ARGUMENTS,
"MLST", null));
}
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/MODE.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/MODE.java?rev=693626&r1=693625&r2=693626&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/MODE.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/MODE.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>MODE <SP> <mode-code> <CRLF></code><br>
@@ -51,7 +51,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,
"MODE", null));
return;
@@ -62,15 +62,15 @@
md = Character.toUpperCase(md);
if (md == 'S') {
session.getDataConnection().setZipMode(false);
- session.write(FtpReplyUtil.translate(session, request, context,
+ session.write(LocalizedFtpReply.translate(session, request, context,
FtpReply.REPLY_200_COMMAND_OKAY, "MODE", "S"));
} else if (md == 'Z') {
session.getDataConnection().setZipMode(true);
- session.write(FtpReplyUtil.translate(session, request, context,
+ session.write(LocalizedFtpReply.translate(session, request, context,
FtpReply.REPLY_200_COMMAND_OKAY, "MODE", "Z"));
} else {
session
- .write(FtpReplyUtil
+ .write(LocalizedFtpReply
.translate(
session,
request,
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/NLST.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/NLST.java?rev=693626&r1=693625&r2=693626&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/NLST.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/NLST.java Tue Sep 9 14:36:44 2008
@@ -31,6 +31,7 @@
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.listing.DirectoryLister;
@@ -39,7 +40,6 @@
import org.apache.ftpserver.listing.ListArgument;
import org.apache.ftpserver.listing.ListArgumentParser;
import org.apache.ftpserver.listing.NLSTFileFormater;
-import org.apache.ftpserver.util.FtpReplyUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -91,7 +91,7 @@
}
// get data connection
- session.write(FtpReplyUtil.translate(session, request, context,
+ session.write(LocalizedFtpReply.translate(session, request, context,
FtpReply.REPLY_150_FILE_STATUS_OKAY, "NLST", null));
// print listing data
@@ -100,7 +100,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, "NLST",
null));
return;
@@ -124,14 +124,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,
"NLST", null));
} catch (IOException ex) {
LOG.debug("IOException during data transfer", ex);
failure = true;
session
- .write(FtpReplyUtil
+ .write(LocalizedFtpReply
.translate(
session,
request,
@@ -144,7 +144,7 @@
+ request.getArgument(), e);
// if listing syntax error - send message
session
- .write(FtpReplyUtil
+ .write(LocalizedFtpReply
.translate(
session,
request,
@@ -155,7 +155,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, "NLST",
null));
}
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/NOOP.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/NOOP.java?rev=693626&r1=693625&r2=693626&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/NOOP.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/NOOP.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;
/**
* <code>NOOP <CRLF></code><br>
@@ -48,7 +48,7 @@
throws IOException, FtpException {
session.resetState();
- session.write(FtpReplyUtil.translate(session, request, context,
+ session.write(LocalizedFtpReply.translate(session, request, context,
FtpReply.REPLY_200_COMMAND_OKAY, "NOOP", null));
}
}
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/OPTS.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/OPTS.java?rev=693626&r1=693625&r2=693626&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/OPTS.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/OPTS.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;
@@ -62,7 +62,7 @@
// no params
String argument = request.getArgument();
if (argument == null) {
- session.write(FtpReplyUtil.translate(session, request, context,
+ session.write(LocalizedFtpReply.translate(session, request, context,
FtpReply.REPLY_501_SYNTAX_ERROR_IN_PARAMETERS_OR_ARGUMENTS,
"OPTS", null));
return;
@@ -83,14 +83,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,
"OPTS.not.implemented", argument));
}
} catch (Exception ex) {
LOG.warn("OPTS.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,
"OPTS", null));
}
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/OPTS_MLST.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/OPTS_MLST.java?rev=693626&r1=693625&r2=693626&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/OPTS_MLST.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/OPTS_MLST.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;
/**
* Client-Server listing negotation. Instruct the server what listing types to
@@ -56,7 +56,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, "OPTS.MLST",
null));
return;
@@ -74,10 +74,10 @@
String[] validatedTypes = validateSelectedTypes(types);
if (validatedTypes != null) {
session.setAttribute("MLST.types", validatedTypes);
- session.write(FtpReplyUtil.translate(session, request, context,
+ session.write(LocalizedFtpReply.translate(session, request, context,
FtpReply.REPLY_200_COMMAND_OKAY, "OPTS.MLST", listTypes));
} else {
- session.write(FtpReplyUtil.translate(session, request, context,
+ session.write(LocalizedFtpReply.translate(session, request, context,
FtpReply.REPLY_501_SYNTAX_ERROR_IN_PARAMETERS_OR_ARGUMENTS,
"OPTS.MLST", listTypes));
}
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/OPTS_UTF8.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/OPTS_UTF8.java?rev=693626&r1=693625&r2=693626&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/OPTS_UTF8.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/OPTS_UTF8.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;
/**
* Client-Server encoding negotiation. Force server from default encoding to
@@ -50,7 +50,7 @@
session.resetState();
// send default message
- session.write(FtpReplyUtil.translate(session, request, context,
+ session.write(LocalizedFtpReply.translate(session, request, context,
FtpReply.REPLY_200_COMMAND_OKAY, "OPTS.UTF8", null));
}
}
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/PASS.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/PASS.java?rev=693626&r1=693625&r2=693626&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/PASS.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/PASS.java Tue Sep 9 14:36:44 2008
@@ -32,13 +32,13 @@
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.interfaces.ServerFtpStatistics;
import org.apache.ftpserver.usermanager.AnonymousAuthentication;
import org.apache.ftpserver.usermanager.UserMetadata;
import org.apache.ftpserver.usermanager.UsernamePasswordAuthentication;
-import org.apache.ftpserver.util.FtpReplyUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -75,7 +75,7 @@
String password = request.getArgument();
if (password == null) {
session
- .write(FtpReplyUtil
+ .write(LocalizedFtpReply
.translate(
session,
request,
@@ -89,7 +89,7 @@
String userName = session.getUserArgument();
if (userName == null && session.getUser() == null) {
- session.write(FtpReplyUtil.translate(session, request, context,
+ session.write(LocalizedFtpReply.translate(session, request, context,
FtpReply.REPLY_503_BAD_SEQUENCE_OF_COMMANDS, "PASS",
null));
return;
@@ -97,7 +97,7 @@
// already logged-in
if (session.isLoggedIn()) {
- session.write(FtpReplyUtil.translate(session, request, context,
+ session.write(LocalizedFtpReply.translate(session, request, context,
FtpReply.REPLY_202_COMMAND_NOT_IMPLEMENTED, "PASS",
null));
return;
@@ -113,7 +113,7 @@
.getMaxAnonymousLogins();
if (currAnonLogin >= maxAnonLogin) {
session
- .write(FtpReplyUtil
+ .write(LocalizedFtpReply
.translate(
session,
request,
@@ -129,7 +129,7 @@
int maxLogin = context.getConnectionConfig().getMaxLogins();
if (maxLogin != 0 && currLogin >= maxLogin) {
session
- .write(FtpReplyUtil
+ .write(LocalizedFtpReply
.translate(
session,
request,
@@ -194,7 +194,7 @@
.getLoginFailureDelay());
LOG.warn("Login failure - " + userName);
- session.write(FtpReplyUtil.translate(session, request, context,
+ session.write(LocalizedFtpReply.translate(session, request, context,
FtpReply.REPLY_530_NOT_LOGGED_IN, "PASS", userName));
stat.setLoginFail(session);
@@ -219,7 +219,7 @@
stat.setLogin(session);
// everything is fine - send login ok message
- session.write(FtpReplyUtil.translate(session, request, context,
+ session.write(LocalizedFtpReply.translate(session, request, context,
FtpReply.REPLY_230_USER_LOGGED_IN, "PASS", userName));
if (anonymous) {
LOG.info("Anonymous login success - " + password);
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/PASV.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/PASV.java?rev=693626&r1=693625&r2=693626&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/PASV.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/PASV.java Tue Sep 9 14:36:44 2008
@@ -29,9 +29,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.apache.ftpserver.util.SocketAddressEncoder;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -84,12 +84,12 @@
String addrStr = SocketAddressEncoder
.encode(externalDataConAddress);
- session.write(FtpReplyUtil.translate(session, request, context,
+ session.write(LocalizedFtpReply.translate(session, request, context,
FtpReply.REPLY_227_ENTERING_PASSIVE_MODE, "PASV", addrStr));
} catch (DataConnectionException e) {
LOG.warn("Failed to open passive data connection", e);
session
- .write(FtpReplyUtil.translate(session, request, context,
+ .write(LocalizedFtpReply.translate(session, request, context,
FtpReply.REPLY_425_CANT_OPEN_DATA_CONNECTION,
"PASV", null));
return;
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/PBSZ.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/PBSZ.java?rev=693626&r1=693625&r2=693626&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/PBSZ.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/PBSZ.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;
/**
* Protection buffer size.
@@ -45,7 +45,7 @@
throws IOException, FtpException {
session.resetState();
- session.write(FtpReplyUtil.translate(session, request, context,
+ session.write(LocalizedFtpReply.translate(session, request, context,
FtpReply.REPLY_200_COMMAND_OKAY, "PBSZ", null));
}
}
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/PORT.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/PORT.java?rev=693626&r1=693625&r2=693626&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/PORT.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/PORT.java Tue Sep 9 14:36:44 2008
@@ -27,10 +27,10 @@
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.DataConnectionConfiguration;
import org.apache.ftpserver.interfaces.FtpIoSession;
import org.apache.ftpserver.interfaces.FtpServerContext;
-import org.apache.ftpserver.util.FtpReplyUtil;
import org.apache.ftpserver.util.IllegalInetAddressException;
import org.apache.ftpserver.util.IllegalPortException;
import org.apache.ftpserver.util.SocketAddressEncoder;
@@ -72,7 +72,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,
"PORT", null));
return;
@@ -82,7 +82,7 @@
DataConnectionConfiguration dataCfg = session.getListener()
.getDataConnectionConfiguration();
if (!dataCfg.isActiveEnabled()) {
- session.write(FtpReplyUtil.translate(session, request, context,
+ session.write(LocalizedFtpReply.translate(session, request, context,
510, "PORT.disabled", null));
return;
}
@@ -91,13 +91,13 @@
try {
address = SocketAddressEncoder.decode(request.getArgument());
} catch (IllegalInetAddressException e) {
- session.write(FtpReplyUtil.translate(session, request, context,
+ session.write(LocalizedFtpReply.translate(session, request, context,
510, "PORT", null));
return;
} catch (IllegalPortException e) {
LOG.debug("Invalid data port: " + request.getArgument(), e);
session
- .write(FtpReplyUtil
+ .write(LocalizedFtpReply
.translate(
session,
request,
@@ -108,7 +108,7 @@
} catch (UnknownHostException e) {
LOG.debug("Unknown host", e);
session
- .write(FtpReplyUtil
+ .write(LocalizedFtpReply
.translate(
session,
request,
@@ -124,7 +124,7 @@
InetAddress clientAddr = ((InetSocketAddress) session
.getRemoteAddress()).getAddress();
if (!address.getAddress().equals(clientAddr)) {
- session.write(FtpReplyUtil.translate(session, request,
+ session.write(LocalizedFtpReply.translate(session, request,
context, 510, "PORT.mismatch", null));
return;
}
@@ -132,7 +132,7 @@
}
session.getDataConnection().initActiveDataConnection(address);
- session.write(FtpReplyUtil.translate(session, request, context,
+ session.write(LocalizedFtpReply.translate(session, request, context,
FtpReply.REPLY_200_COMMAND_OKAY, "PORT", null));
}
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/PROT.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/PROT.java?rev=693626&r1=693625&r2=693626&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/PROT.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/PROT.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;
/**
* Data channel protection level.
@@ -51,7 +51,7 @@
// check argument
String arg = request.getArgument();
if (arg == null) {
- session.write(FtpReplyUtil.translate(session, request, context,
+ session.write(LocalizedFtpReply.translate(session, request, context,
FtpReply.REPLY_501_SYNTAX_ERROR_IN_PARAMETERS_OR_ARGUMENTS,
"PROT", null));
return;
@@ -62,21 +62,21 @@
ServerDataConnectionFactory dcon = session.getDataConnection();
if (arg.equals("C")) {
dcon.setSecure(false);
- session.write(FtpReplyUtil.translate(session, request, context,
+ session.write(LocalizedFtpReply.translate(session, request, context,
FtpReply.REPLY_200_COMMAND_OKAY, "PROT", null));
} else if (arg.equals("P")) {
if (session.getListener().getDataConnectionConfiguration()
.getSslConfiguration() == null) {
- session.write(FtpReplyUtil.translate(session, request, context,
+ session.write(LocalizedFtpReply.translate(session, request, context,
431, "PROT", null));
} else {
dcon.setSecure(true);
- session.write(FtpReplyUtil.translate(session, request, context,
+ session.write(LocalizedFtpReply.translate(session, request, context,
FtpReply.REPLY_200_COMMAND_OKAY, "PROT", null));
}
} else {
session
- .write(FtpReplyUtil
+ .write(LocalizedFtpReply
.translate(
session,
request,
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/PWD.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/PWD.java?rev=693626&r1=693625&r2=693626&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/PWD.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/PWD.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;
/**
* <code>PWD <CRLF></code><br>
@@ -50,7 +50,7 @@
session.resetState();
FileSystemView fsview = session.getFileSystemView();
String currDir = fsview.getCurrentDirectory().getFullName();
- session.write(FtpReplyUtil.translate(session, request, context,
+ session.write(LocalizedFtpReply.translate(session, request, context,
FtpReply.REPLY_257_PATHNAME_CREATED, "PWD", currDir));
}
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/QUIT.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/QUIT.java?rev=693626&r1=693625&r2=693626&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/QUIT.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/QUIT.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>QUIT <CRLF></code><br>
@@ -46,7 +46,7 @@
final FtpServerContext context, final FtpRequest request)
throws IOException {
session.resetState();
- session.write(FtpReplyUtil.translate(session, request, context,
+ session.write(LocalizedFtpReply.translate(session, request, context,
FtpReply.REPLY_221_CLOSING_CONTROL_CONNECTION, "QUIT", null));
session.closeOnFlush().awaitUninterruptibly(10000);
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/REIN.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/REIN.java?rev=693626&r1=693625&r2=693626&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/REIN.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/REIN.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>REIN <CRLF></code><br>
@@ -48,7 +48,7 @@
session.reinitialize();
session.setLanguage(null);
- session.write(FtpReplyUtil.translate(session, request, context,
+ session.write(LocalizedFtpReply.translate(session, request, context,
FtpReply.REPLY_220_SERVICE_READY, "REIN", null));
}
}
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/REST.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/REST.java?rev=693626&r1=693625&r2=693626&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/REST.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/REST.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;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -56,7 +56,7 @@
// argument check
String argument = request.getArgument();
if (argument == null) {
- session.write(FtpReplyUtil.translate(session, request, context,
+ session.write(LocalizedFtpReply.translate(session, request, context,
FtpReply.REPLY_501_SYNTAX_ERROR_IN_PARAMETERS_OR_ARGUMENTS,
"REST", null));
return;
@@ -72,7 +72,7 @@
if (skipLen < 0L) {
skipLen = 0L;
session
- .write(FtpReplyUtil
+ .write(LocalizedFtpReply
.translate(
session,
request,
@@ -81,7 +81,7 @@
"REST.negetive", null));
} else {
session
- .write(FtpReplyUtil
+ .write(LocalizedFtpReply
.translate(
session,
request,
@@ -91,7 +91,7 @@
}
} catch (NumberFormatException ex) {
LOG.debug("Invalid restart position: " + argument, ex);
- session.write(FtpReplyUtil.translate(session, request, context,
+ session.write(LocalizedFtpReply.translate(session, request, context,
FtpReply.REPLY_501_SYNTAX_ERROR_IN_PARAMETERS_OR_ARGUMENTS,
"REST.invalid", null));
}