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/10/12 23:16:59 UTC
svn commit: r703878 - in /mina/ftpserver/trunk:
core/src/main/java/org/apache/ftpserver/command/impl/
core/src/main/java/org/apache/ftpserver/command/impl/listing/
core/src/main/java/org/apache/ftpserver/filesystem/nativefs/impl/
core/src/main/java/org...
Author: ngn
Date: Sun Oct 12 14:16:58 2008
New Revision: 703878
URL: http://svn.apache.org/viewvc?rev=703878&view=rev
Log:
Improve the named of FtpFile.getFullName() and FtpFile.getShortName(). (FTPSERVER-182)
Modified:
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/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/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/PWD.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/SIZE.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/listing/LISTFileFormater.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/listing/MLSTFileFormater.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/listing/NLSTFileFormater.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/listing/RegexFileFilter.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/filesystem/nativefs/impl/NativeFtpFile.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/impl/LocalizedFtpReply.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/util/LocalizedFtpReply.java
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/commands/impl/listing/LISTFileFormaterTest.java
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/commands/impl/listing/MLSTFileFormaterTest.java
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/commands/impl/listing/NLSTFileFormaterTest.java
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/filesystem/nativefs/impl/FileSystemViewTemplate.java
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/filesystem/nativefs/impl/FtpFileTestTemplate.java
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/filesystem/nativefs/impl/NativeFileSystemViewTest.java
mina/ftpserver/trunk/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/FtpFile.java
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=703878&r1=703877&r2=703878&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 Sun Oct 12 14:16:58 2008
@@ -110,7 +110,7 @@
"APPE.invalid", fileName));
return;
}
- fileName = file.getFullName();
+ fileName = file.getAbsolutePath();
// check file existance
if (file.doesExist() && !file.isFile()) {
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=703878&r1=703877&r2=703878&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 Sun Oct 12 14:16:58 2008
@@ -66,7 +66,7 @@
LOG.debug("Failed to change directory in file system", ex);
}
if (success) {
- String dirName = fsview.getWorkingDirectory().getFullName();
+ String dirName = fsview.getWorkingDirectory().getAbsolutePath();
session.write(LocalizedFtpReply.translate(session, request, context,
FtpReply.REPLY_250_REQUESTED_FILE_ACTION_OKAY, "CDUP",
dirName));
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=703878&r1=703877&r2=703878&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 Sun Oct 12 14:16:58 2008
@@ -72,7 +72,7 @@
LOG.debug("Failed to change directory in file system", ex);
}
if (success) {
- dirName = fsview.getWorkingDirectory().getFullName();
+ dirName = fsview.getWorkingDirectory().getAbsolutePath();
session.write(LocalizedFtpReply.translate(session, request, context,
FtpReply.REPLY_250_REQUESTED_FILE_ACTION_OKAY, "CWD",
dirName));
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=703878&r1=703877&r2=703878&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 Sun Oct 12 14:16:58 2008
@@ -81,7 +81,7 @@
}
// check file
- fileName = file.getFullName();
+ fileName = file.getAbsolutePath();
if (!file.hasDeletePermission()) {
session.write(LocalizedFtpReply.translate(session, request, context,
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=703878&r1=703877&r2=703878&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 Sun Oct 12 14:16:58 2008
@@ -79,7 +79,7 @@
}
// now print date
- fileName = file.getFullName();
+ fileName = file.getAbsolutePath();
if (file.doesExist()) {
String dateStr = DateUtils.getFtpDate(file.getLastModified());
session.write(LocalizedFtpReply.translate(session, request, context,
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=703878&r1=703877&r2=703878&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 Sun Oct 12 14:16:58 2008
@@ -82,7 +82,7 @@
}
// check permission
- fileName = file.getFullName();
+ fileName = file.getAbsolutePath();
if (!file.hasWritePermission()) {
session.write(LocalizedFtpReply.translate(session, request, context,
FtpReply.REPLY_550_REQUESTED_ACTION_NOT_TAKEN,
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=703878&r1=703877&r2=703878&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 Sun Oct 12 14:16:58 2008
@@ -49,7 +49,7 @@
throws IOException, FtpException {
session.resetState();
FileSystemView fsview = session.getFileSystemView();
- String currDir = fsview.getWorkingDirectory().getFullName();
+ String currDir = fsview.getWorkingDirectory().getAbsolutePath();
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/RETR.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/RETR.java?rev=703878&r1=703877&r2=703878&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 Sun Oct 12 14:16:58 2008
@@ -97,7 +97,7 @@
"RETR.missing", fileName));
return;
}
- fileName = file.getFullName();
+ fileName = file.getAbsolutePath();
// check file existance
if (!file.doesExist()) {
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=703878&r1=703877&r2=703878&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 Sun Oct 12 14:16:58 2008
@@ -81,7 +81,7 @@
}
// check permission
- fileName = file.getFullName();
+ fileName = file.getAbsolutePath();
if (!file.hasDeletePermission()) {
session.write(LocalizedFtpReply.translate(session, request, context,
FtpReply.REPLY_550_REQUESTED_ACTION_NOT_TAKEN,
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=703878&r1=703877&r2=703878&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 Sun Oct 12 14:16:58 2008
@@ -80,7 +80,7 @@
fileName));
} else {
session.setRenameFrom(renFr);
- fileName = renFr.getFullName();
+ fileName = renFr.getAbsolutePath();
session
.write(LocalizedFtpReply
.translate(
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=703878&r1=703877&r2=703878&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 Sun Oct 12 14:16:58 2008
@@ -95,7 +95,7 @@
"RNTO.invalid", null));
return;
}
- toFileStr = toFile.getFullName();
+ toFileStr = toFile.getAbsolutePath();
// check permission
if (!toFile.hasWritePermission()) {
@@ -130,7 +130,7 @@
toFileStr));
LOG.info("File rename (" + session.getUser().getName() + ") "
- + frFile.getFullName() + " -> " + toFile.getFullName());
+ + frFile.getAbsolutePath() + " -> " + toFile.getAbsolutePath());
} else {
session
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=703878&r1=703877&r2=703878&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 Sun Oct 12 14:16:58 2008
@@ -78,7 +78,7 @@
}
// print file size
- fileName = file.getFullName();
+ fileName = file.getAbsolutePath();
if (!file.doesExist()) {
session.write(LocalizedFtpReply.translate(session, request, context,
FtpReply.REPLY_550_REQUESTED_ACTION_NOT_TAKEN,
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=703878&r1=703877&r2=703878&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 Sun Oct 12 14:16:58 2008
@@ -110,7 +110,7 @@
"STOR.invalid", fileName));
return;
}
- fileName = file.getFullName();
+ fileName = file.getAbsolutePath();
// get permission
if (!file.hasWritePermission()) {
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=703878&r1=703877&r2=703878&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 Sun Oct 12 14:16:58 2008
@@ -114,7 +114,7 @@
null));
return;
}
- String fileName = file.getFullName();
+ String fileName = file.getAbsolutePath();
// check permission
if (!file.hasWritePermission()) {
@@ -202,7 +202,7 @@
throws FtpException {
FtpFile newFile = oldFile;
FileSystemView fsView = session.getFileSystemView();
- String fileName = newFile.getFullName();
+ String fileName = newFile.getAbsolutePath();
while (newFile.doesExist()) {
newFile = fsView.getFile(fileName + '.'
+ System.currentTimeMillis());
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/listing/LISTFileFormater.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/listing/LISTFileFormater.java?rev=703878&r1=703877&r2=703878&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/listing/LISTFileFormater.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/listing/LISTFileFormater.java Sun Oct 12 14:16:58 2008
@@ -54,7 +54,7 @@
sb.append(DELIM);
sb.append(getLastModified(file));
sb.append(DELIM);
- sb.append(file.getShortName());
+ sb.append(file.getName());
sb.append(NEWLINE);
return sb.toString();
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/listing/MLSTFileFormater.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/listing/MLSTFileFormater.java?rev=703878&r1=703877&r2=703878&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/listing/MLSTFileFormater.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/listing/MLSTFileFormater.java Sun Oct 12 14:16:58 2008
@@ -96,7 +96,7 @@
}
}
sb.append(' ');
- sb.append(file.getShortName());
+ sb.append(file.getName());
sb.append(NEWLINE);
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/listing/NLSTFileFormater.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/listing/NLSTFileFormater.java?rev=703878&r1=703877&r2=703878&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/listing/NLSTFileFormater.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/listing/NLSTFileFormater.java Sun Oct 12 14:16:58 2008
@@ -35,7 +35,7 @@
*/
public String format(FtpFile file) {
StringBuffer sb = new StringBuffer();
- sb.append(file.getShortName());
+ sb.append(file.getName());
sb.append(NEWLINE);
return sb.toString();
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/listing/RegexFileFilter.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/listing/RegexFileFilter.java?rev=703878&r1=703877&r2=703878&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/listing/RegexFileFilter.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/listing/RegexFileFilter.java Sun Oct 12 14:16:58 2008
@@ -65,7 +65,7 @@
return false;
}
- return regex.isMatch(file.getShortName());
+ return regex.isMatch(file.getName());
}
}
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/filesystem/nativefs/impl/NativeFtpFile.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/filesystem/nativefs/impl/NativeFtpFile.java?rev=703878&r1=703877&r2=703878&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/filesystem/nativefs/impl/NativeFtpFile.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/filesystem/nativefs/impl/NativeFtpFile.java Sun Oct 12 14:16:58 2008
@@ -84,7 +84,7 @@
/**
* Get full name.
*/
- public String getFullName() {
+ public String getAbsolutePath() {
// strip the last '/' if necessary
String fullName = fileName;
@@ -99,7 +99,7 @@
/**
* Get short name.
*/
- public String getShortName() {
+ public String getName() {
// root - the short name will be '/'
if (fileName.equals("/")) {
@@ -195,8 +195,8 @@
* Check file write permission.
*/
public boolean hasWritePermission() {
- LOG.debug("Checking authorization for " + getFullName());
- if (user.authorize(new WriteRequest(getFullName())) == null) {
+ LOG.debug("Checking authorization for " + getAbsolutePath());
+ if (user.authorize(new WriteRequest(getAbsolutePath())) == null) {
LOG.debug("Not authorized");
return false;
}
@@ -226,7 +226,7 @@
* we will check if the parent file has write permission as most systems consider that a file can
* be deleted when their parent directory is writable.
*/
- String fullName=getFullName();
+ String fullName=getAbsolutePath();
// we check FTPServer's write permission for this file.
if (user.authorize(new WriteRequest(fullName)) == null) {
@@ -320,7 +320,7 @@
});
// get the virtual name of the base directory
- String virtualFileStr = getFullName();
+ String virtualFileStr = getAbsolutePath();
if (virtualFileStr.charAt(virtualFileStr.length() - 1) != '/') {
virtualFileStr += '/';
}
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/impl/LocalizedFtpReply.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/impl/LocalizedFtpReply.java?rev=703878&r1=703877&r2=703878&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/impl/LocalizedFtpReply.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/impl/LocalizedFtpReply.java Sun Oct 12 14:16:58 2008
@@ -256,7 +256,7 @@
FileSystemView fsView = session.getFileSystemView();
if (fsView != null) {
try {
- varVal = fsView.getWorkingDirectory().getFullName();
+ varVal = fsView.getWorkingDirectory().getAbsolutePath();
} catch (Exception ex) {
varVal = "";
}
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/util/LocalizedFtpReply.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/util/LocalizedFtpReply.java?rev=703878&r1=703877&r2=703878&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/util/LocalizedFtpReply.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/util/LocalizedFtpReply.java Sun Oct 12 14:16:58 2008
@@ -255,7 +255,7 @@
FileSystemView fsView = session.getFileSystemView();
if (fsView != null) {
try {
- varVal = fsView.getWorkingDirectory().getFullName();
+ varVal = fsView.getWorkingDirectory().getAbsolutePath();
} catch (Exception ex) {
varVal = "";
}
Modified: mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/commands/impl/listing/LISTFileFormaterTest.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/commands/impl/listing/LISTFileFormaterTest.java?rev=703878&r1=703877&r2=703878&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/commands/impl/listing/LISTFileFormaterTest.java (original)
+++ mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/commands/impl/listing/LISTFileFormaterTest.java Sun Oct 12 14:16:58 2008
@@ -66,7 +66,7 @@
return false;
}
- public String getFullName() {
+ public String getAbsolutePath() {
return "fullname";
}
@@ -86,7 +86,7 @@
return "owner";
}
- public String getShortName() {
+ public String getName() {
return "short";
}
Modified: mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/commands/impl/listing/MLSTFileFormaterTest.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/commands/impl/listing/MLSTFileFormaterTest.java?rev=703878&r1=703877&r2=703878&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/commands/impl/listing/MLSTFileFormaterTest.java (original)
+++ mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/commands/impl/listing/MLSTFileFormaterTest.java Sun Oct 12 14:16:58 2008
@@ -62,7 +62,7 @@
return false;
}
- public String getFullName() {
+ public String getAbsolutePath() {
return "fullname";
}
@@ -82,7 +82,7 @@
return "owner";
}
- public String getShortName() {
+ public String getName() {
return "short";
}
Modified: mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/commands/impl/listing/NLSTFileFormaterTest.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/commands/impl/listing/NLSTFileFormaterTest.java?rev=703878&r1=703877&r2=703878&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/commands/impl/listing/NLSTFileFormaterTest.java (original)
+++ mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/commands/impl/listing/NLSTFileFormaterTest.java Sun Oct 12 14:16:58 2008
@@ -58,7 +58,7 @@
return false;
}
- public String getFullName() {
+ public String getAbsolutePath() {
return "fullname";
}
@@ -78,7 +78,7 @@
return "owner";
}
- public String getShortName() {
+ public String getName() {
return "short";
}
Modified: mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/filesystem/nativefs/impl/FileSystemViewTemplate.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/filesystem/nativefs/impl/FileSystemViewTemplate.java?rev=703878&r1=703877&r2=703878&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/filesystem/nativefs/impl/FileSystemViewTemplate.java (original)
+++ mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/filesystem/nativefs/impl/FileSystemViewTemplate.java Sun Oct 12 14:16:58 2008
@@ -37,38 +37,38 @@
public void testChangeDirectory() throws Exception {
NativeFileSystemView view = new NativeFileSystemView(user);
- assertEquals("/", view.getWorkingDirectory().getFullName());
+ assertEquals("/", view.getWorkingDirectory().getAbsolutePath());
assertTrue(view.changeWorkingDirectory(DIR1_NAME));
- assertEquals("/" + DIR1_NAME, view.getWorkingDirectory().getFullName());
+ assertEquals("/" + DIR1_NAME, view.getWorkingDirectory().getAbsolutePath());
assertTrue(view.changeWorkingDirectory("."));
- assertEquals("/" + DIR1_NAME, view.getWorkingDirectory().getFullName());
+ assertEquals("/" + DIR1_NAME, view.getWorkingDirectory().getAbsolutePath());
assertTrue(view.changeWorkingDirectory(".."));
- assertEquals("/", view.getWorkingDirectory().getFullName());
+ assertEquals("/", view.getWorkingDirectory().getAbsolutePath());
assertTrue(view.changeWorkingDirectory("./" + DIR1_NAME));
- assertEquals("/" + DIR1_NAME, view.getWorkingDirectory().getFullName());
+ assertEquals("/" + DIR1_NAME, view.getWorkingDirectory().getAbsolutePath());
assertTrue(view.changeWorkingDirectory("~"));
- assertEquals("/", view.getWorkingDirectory().getFullName());
+ assertEquals("/", view.getWorkingDirectory().getAbsolutePath());
}
public void testChangeDirectoryCaseInsensitive() throws Exception {
NativeFileSystemView view = new NativeFileSystemView(user, true);
- assertEquals("/", view.getWorkingDirectory().getFullName());
+ assertEquals("/", view.getWorkingDirectory().getAbsolutePath());
assertTrue(view.changeWorkingDirectory("/DIR1"));
- assertEquals("/dir1", view.getWorkingDirectory().getFullName());
+ assertEquals("/dir1", view.getWorkingDirectory().getAbsolutePath());
assertTrue(view.getWorkingDirectory().doesExist());
assertTrue(view.changeWorkingDirectory("/dir1"));
- assertEquals("/dir1", view.getWorkingDirectory().getFullName());
+ assertEquals("/dir1", view.getWorkingDirectory().getAbsolutePath());
assertTrue(view.getWorkingDirectory().doesExist());
assertTrue(view.changeWorkingDirectory("/DiR1"));
- assertEquals("/dir1", view.getWorkingDirectory().getFullName());
+ assertEquals("/dir1", view.getWorkingDirectory().getAbsolutePath());
assertTrue(view.getWorkingDirectory().doesExist());
}
Modified: mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/filesystem/nativefs/impl/FtpFileTestTemplate.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/filesystem/nativefs/impl/FtpFileTestTemplate.java?rev=703878&r1=703877&r2=703878&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/filesystem/nativefs/impl/FtpFileTestTemplate.java (original)
+++ mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/filesystem/nativefs/impl/FtpFileTestTemplate.java Sun Oct 12 14:16:58 2008
@@ -94,24 +94,24 @@
public void testFullName() {
FtpFile fileObject = createFileObject(FILE2_PATH, USER);
- assertEquals("/dir1/file2", fileObject.getFullName());
+ assertEquals("/dir1/file2", fileObject.getAbsolutePath());
fileObject = createFileObject("/dir1/", USER);
- assertEquals("/dir1", fileObject.getFullName());
+ assertEquals("/dir1", fileObject.getAbsolutePath());
fileObject = createFileObject("/dir1", USER);
- assertEquals("/dir1", fileObject.getFullName());
+ assertEquals("/dir1", fileObject.getAbsolutePath());
}
public void testShortName() {
FtpFile fileObject = createFileObject("/dir1/file2", USER);
- assertEquals("file2", fileObject.getShortName());
+ assertEquals("file2", fileObject.getName());
fileObject = createFileObject("/dir1/", USER);
- assertEquals("dir1", fileObject.getShortName());
+ assertEquals("dir1", fileObject.getName());
fileObject = createFileObject("/dir1", USER);
- assertEquals("dir1", fileObject.getShortName());
+ assertEquals("dir1", fileObject.getName());
}
public void testListFilesInOrder() {
@@ -119,9 +119,9 @@
List<FtpFile> files = root.listFiles();
assertEquals(3, files.size());
- assertEquals("dir1", files.get(0).getShortName());
- assertEquals("file1", files.get(1).getShortName());
- assertEquals("file3", files.get(2).getShortName());
+ assertEquals("dir1", files.get(0).getName());
+ assertEquals("file1", files.get(1).getName());
+ assertEquals("file3", files.get(2).getName());
}
}
\ No newline at end of file
Modified: mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/filesystem/nativefs/impl/NativeFileSystemViewTest.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/filesystem/nativefs/impl/NativeFileSystemViewTest.java?rev=703878&r1=703877&r2=703878&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/filesystem/nativefs/impl/NativeFileSystemViewTest.java (original)
+++ mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/filesystem/nativefs/impl/NativeFileSystemViewTest.java Sun Oct 12 14:16:58 2008
@@ -49,7 +49,7 @@
public void testConstructor() throws FtpException {
NativeFileSystemView view = new NativeFileSystemView(user);
- assertEquals("/", view.getWorkingDirectory().getFullName());
+ assertEquals("/", view.getWorkingDirectory().getAbsolutePath());
}
public void testConstructorWithNullUser() throws FtpException {
Modified: mina/ftpserver/trunk/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/FtpFile.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/FtpFile.java?rev=703878&r1=703877&r2=703878&view=diff
==============================================================================
--- mina/ftpserver/trunk/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/FtpFile.java (original)
+++ mina/ftpserver/trunk/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/FtpFile.java Sun Oct 12 14:16:58 2008
@@ -33,17 +33,20 @@
public interface FtpFile {
/**
- * Get the fully qualified name.
+ * Get the full path from the base directory of the FileSystemView.
+ * @return a path where the path separator is '/' (even if the operating system
+ * uses another character as path separator).
*/
- String getFullName();
+ String getAbsolutePath();
/**
- * Get the file short name.
+ * Get the file name of the file
+ * @return the last part of the file path (the part after the last '/').
*/
- String getShortName();
+ String getName();
/**
- * Is a hidden file?
+ * Is the file hidden?
*/
boolean isHidden();