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=701234&r1=701233&r2=701234&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 Thu Oct 2 13:28:16 2008 @@ -27,7 +27,7 @@ import junit.framework.TestCase; import org.apache.ftpserver.command.impl.listing.MLSTFileFormater; -import org.apache.ftpserver.ftplet.FileObject; +import org.apache.ftpserver.ftplet.FtpFile; /** * @@ -40,11 +40,11 @@ private static final Date LAST_MODIFIED_IN_2005 = new Date(105, 1, 2, 3, 4); - private static final FileObject TEST_FILE = new MockFileObject(); + private static final FtpFile TEST_FILE = new MockFileObject(); public MLSTFileFormater formater = new MLSTFileFormater(null); - public static class MockFileObject implements FileObject { + public static class MockFileObject implements FtpFile { public InputStream createInputStream(long offset) throws IOException { return null; } @@ -113,7 +113,7 @@ return false; } - public FileObject[] listFiles() { + public FtpFile[] listFiles() { return null; } @@ -121,7 +121,7 @@ return false; } - public boolean move(FileObject destination) { + public boolean move(FtpFile destination) { return false; } } @@ -132,7 +132,7 @@ } public void testSingleDir() { - FileObject dir = new MockFileObject() { + FtpFile dir = new MockFileObject() { public boolean isDirectory() { return true; }
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=701234&r1=701233&r2=701234&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 Thu Oct 2 13:28:16 2008 @@ -26,7 +26,7 @@ import junit.framework.TestCase; import org.apache.ftpserver.command.impl.listing.NLSTFileFormater; -import org.apache.ftpserver.ftplet.FileObject; +import org.apache.ftpserver.ftplet.FtpFile; /** * @@ -36,11 +36,11 @@ */ public class NLSTFileFormaterTest extends TestCase { - private static final FileObject TEST_FILE = new MockFileObject(); + private static final FtpFile TEST_FILE = new MockFileObject(); public NLSTFileFormater formater = new NLSTFileFormater(); - public static class MockFileObject implements FileObject { + public static class MockFileObject implements FtpFile { public InputStream createInputStream(long offset) throws IOException { return null; } @@ -109,7 +109,7 @@ return false; } - public FileObject[] listFiles() { + public FtpFile[] listFiles() { return null; } @@ -117,7 +117,7 @@ return false; } - public boolean move(FileObject destination) { + public boolean move(FtpFile destination) { return false; } } @@ -127,7 +127,7 @@ } public void testSingleDir() { - FileObject dir = new MockFileObject() { + FtpFile dir = new MockFileObject() { public boolean isDirectory() { return true; } Modified: mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/config/spring/SpringConfigTest.java URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/config/spring/SpringConfigTest.java?rev=701234&r1=701233&r2=701234&view=diff ============================================================================== --- mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/config/spring/SpringConfigTest.java (original) +++ mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/config/spring/SpringConfigTest.java Thu Oct 2 13:28:16 2008 @@ -30,7 +30,7 @@ import org.apache.ftpserver.command.impl.DefaultCommandFactory; import org.apache.ftpserver.command.impl.HELP; import org.apache.ftpserver.command.impl.STAT; -import org.apache.ftpserver.filesystem.NativeFileSystemManager; +import org.apache.ftpserver.filesystem.nativefs.NativeFileSystemFactory; import org.apache.ftpserver.listener.Listener; import org.apache.ftpserver.listener.nio.NioListener; import org.apache.ftpserver.ssl.impl.DefaultSslConfiguration; @@ -120,7 +120,7 @@ assertEquals("no", languages[1]); assertEquals("da", languages[2]); - NativeFileSystemManager fs = (NativeFileSystemManager) server.getFileSystem(); + NativeFileSystemFactory fs = (NativeFileSystemFactory) server.getFileSystem(); assertTrue(fs.isCreateHome()); assertTrue(fs.isCaseInsensitive()); } Copied: mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/filesystem/nativefs/impl/FileObjectTestTemplate.java (from r693183, mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/filesystem/FileObjectTestTemplate.java) URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/filesystem/nativefs/impl/FileObjectTestTemplate.java?p2=mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/filesystem/nativefs/impl/FileObjectTestTemplate.java&p1=mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/filesystem/FileObjectTestTemplate.java&r1=693183&r2=701234&rev=701234&view=diff ============================================================================== --- mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/filesystem/FileObjectTestTemplate.java (original) +++ mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/filesystem/nativefs/impl/FileObjectTestTemplate.java Thu Oct 2 13:28:16 2008 @@ -17,12 +17,12 @@ * under the License. */ -package org.apache.ftpserver.filesystem; +package org.apache.ftpserver.filesystem.nativefs.impl; import junit.framework.TestCase; import org.apache.ftpserver.ftplet.AuthorizationRequest; -import org.apache.ftpserver.ftplet.FileObject; +import org.apache.ftpserver.ftplet.FtpFile; import org.apache.ftpserver.ftplet.User; import org.apache.ftpserver.usermanager.BaseUser; @@ -52,7 +52,7 @@ } }; - protected abstract FileObject createFileObject(String fileName, User user); + protected abstract FtpFile createFileObject(String fileName, User user); public void testNullFileName() { try { @@ -91,7 +91,7 @@ } public void testFullName() { - FileObject fileObject = createFileObject(FILE2_PATH, USER); + FtpFile fileObject = createFileObject(FILE2_PATH, USER); assertEquals("/dir1/file2", fileObject.getFullName()); fileObject = createFileObject("/dir1/", USER); @@ -102,7 +102,7 @@ } public void testShortName() { - FileObject fileObject = createFileObject("/dir1/file2", USER); + FtpFile fileObject = createFileObject("/dir1/file2", USER); assertEquals("file2", fileObject.getShortName()); fileObject = createFileObject("/dir1/", USER); @@ -113,9 +113,9 @@ } public void testListFilesInOrder() { - FileObject root = createFileObject("/", USER); + FtpFile root = createFileObject("/", USER); - FileObject[] files = root.listFiles(); + FtpFile[] files = root.listFiles(); assertEquals(3, files.length); assertEquals("dir1", files[0].getShortName()); assertEquals("file1", files[1].getShortName()); Propchange: mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/filesystem/nativefs/impl/FileObjectTestTemplate.java ------------------------------------------------------------------------------ svn:eol-style = native Copied: mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/filesystem/nativefs/impl/FileSystemViewTemplate.java (from r693183, mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/filesystem/FileSystemViewTemplate.java) URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/filesystem/nativefs/impl/FileSystemViewTemplate.java?p2=mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/filesystem/nativefs/impl/FileSystemViewTemplate.java&p1=mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/filesystem/FileSystemViewTemplate.java&r1=693183&r2=701234&rev=701234&view=diff ============================================================================== --- mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/filesystem/FileSystemViewTemplate.java (original) +++ mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/filesystem/nativefs/impl/FileSystemViewTemplate.java Thu Oct 2 13:28:16 2008 @@ -17,10 +17,11 @@ * under the License. */ -package org.apache.ftpserver.filesystem; +package org.apache.ftpserver.filesystem.nativefs.impl; import junit.framework.TestCase; +import org.apache.ftpserver.filesystem.nativefs.impl.NativeFileSystemView; import org.apache.ftpserver.usermanager.BaseUser; /** Propchange: mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/filesystem/nativefs/impl/FileSystemViewTemplate.java ------------------------------------------------------------------------------ svn:eol-style = native Copied: mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/filesystem/nativefs/impl/NativeFileObjectTest.java (from r693183, mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/filesystem/NativeFileObjectTest.java) URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/filesystem/nativefs/impl/NativeFileObjectTest.java?p2=mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/filesystem/nativefs/impl/NativeFileObjectTest.java&p1=mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/filesystem/NativeFileObjectTest.java&r1=693183&r2=701234&rev=701234&view=diff ============================================================================== --- mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/filesystem/NativeFileObjectTest.java (original) +++ mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/filesystem/nativefs/impl/NativeFileObjectTest.java Thu Oct 2 13:28:16 2008 @@ -17,14 +17,15 @@ * under the License. */ -package org.apache.ftpserver.filesystem; +package org.apache.ftpserver.filesystem.nativefs.impl; import java.io.File; import java.io.IOException; import java.util.HashMap; import java.util.Map; -import org.apache.ftpserver.ftplet.FileObject; +import org.apache.ftpserver.filesystem.nativefs.impl.NativeFtpFile; +import org.apache.ftpserver.ftplet.FtpFile; import org.apache.ftpserver.ftplet.User; import org.apache.ftpserver.util.IoUtils; @@ -78,49 +79,49 @@ TEST_FILE3.createNewFile(); } - protected FileObject createFileObject(String fileName, User user) { - return new NativeFileObject(fileName, FILE_MAPPINGS.get(fileName), user); + protected FtpFile createFileObject(String fileName, User user) { + return new NativeFtpFile(fileName, FILE_MAPPINGS.get(fileName), user); } public void testGetPhysicalName() { - assertEquals(FULL_PATH, NativeFileObject.getPhysicalName(ROOT_DIR_PATH + assertEquals(FULL_PATH, NativeFtpFile.getPhysicalName(ROOT_DIR_PATH + "/", "/" + TEST_DIR1.getName() + "/", TEST_FILE2_IN_DIR1 .getName())); assertEquals("No trailing slash on rootDir", FULL_PATH, - NativeFileObject.getPhysicalName(ROOT_DIR_PATH, "/" + NativeFtpFile.getPhysicalName(ROOT_DIR_PATH, "/" + TEST_DIR1.getName() + "/", TEST_FILE2_IN_DIR1 .getName())); assertEquals("No leading slash on currDir", FULL_PATH, - NativeFileObject.getPhysicalName(ROOT_DIR_PATH + "/", TEST_DIR1 + NativeFtpFile.getPhysicalName(ROOT_DIR_PATH + "/", TEST_DIR1 .getName() + "/", TEST_FILE2_IN_DIR1.getName())); assertEquals("No trailing slash on currDir", FULL_PATH, - NativeFileObject.getPhysicalName(ROOT_DIR_PATH + "/", "/" + NativeFtpFile.getPhysicalName(ROOT_DIR_PATH + "/", "/" + TEST_DIR1.getName(), TEST_FILE2_IN_DIR1.getName())); - assertEquals("No slashes on currDir", FULL_PATH, NativeFileObject + assertEquals("No slashes on currDir", FULL_PATH, NativeFtpFile .getPhysicalName(ROOT_DIR_PATH + "/", TEST_DIR1.getName(), TEST_FILE2_IN_DIR1.getName())); - assertEquals("Backslashes in rootDir", FULL_PATH, NativeFileObject + assertEquals("Backslashes in rootDir", FULL_PATH, NativeFtpFile .getPhysicalName(ROOT_DIR.getAbsolutePath() + "/", "/" + TEST_DIR1.getName() + "/", TEST_FILE2_IN_DIR1 .getName())); - assertEquals("Null currDir", FULL_PATH_NO_CURRDIR, NativeFileObject + assertEquals("Null currDir", FULL_PATH_NO_CURRDIR, NativeFtpFile .getPhysicalName(ROOT_DIR.getAbsolutePath() + "/", null, TEST_FILE2_IN_DIR1.getName())); - assertEquals("Empty currDir", FULL_PATH_NO_CURRDIR, NativeFileObject + assertEquals("Empty currDir", FULL_PATH_NO_CURRDIR, NativeFtpFile .getPhysicalName(ROOT_DIR.getAbsolutePath() + "/", "", TEST_FILE2_IN_DIR1.getName())); assertEquals("Absolut fileName in root", FULL_PATH_NO_CURRDIR, - NativeFileObject.getPhysicalName(ROOT_DIR.getAbsolutePath() + NativeFtpFile.getPhysicalName(ROOT_DIR.getAbsolutePath() + "/", TEST_DIR1.getName(), "/" + TEST_FILE2_IN_DIR1.getName())); - assertEquals("Absolut fileName in dir1", FULL_PATH, NativeFileObject + assertEquals("Absolut fileName in dir1", FULL_PATH, NativeFtpFile .getPhysicalName(ROOT_DIR.getAbsolutePath() + "/", null, "/" + TEST_DIR1.getName() + "/" + TEST_FILE2_IN_DIR1.getName())); - assertEquals(". in currDir", FULL_PATH, NativeFileObject + assertEquals(". in currDir", FULL_PATH, NativeFtpFile .getPhysicalName(ROOT_DIR.getAbsolutePath(), TEST_DIR1 .getName() + "/./", "/" + TEST_DIR1.getName() + "/" @@ -129,23 +130,23 @@ } public void testGetPhysicalNameWithRelative() { - assertEquals(".. in fileName", FULL_PATH_NO_CURRDIR, NativeFileObject + assertEquals(".. in fileName", FULL_PATH_NO_CURRDIR, NativeFtpFile .getPhysicalName(ROOT_DIR.getAbsolutePath(), TEST_DIR1 .getName(), "/../" + TEST_FILE2_IN_DIR1.getName())); assertEquals(".. beyond rootDir", FULL_PATH_NO_CURRDIR, - NativeFileObject.getPhysicalName(ROOT_DIR.getAbsolutePath(), + NativeFtpFile.getPhysicalName(ROOT_DIR.getAbsolutePath(), TEST_DIR1.getName(), "/../../" + TEST_FILE2_IN_DIR1.getName())); } public void testGetPhysicalNameWithTilde() { - assertEquals(FULL_PATH_NO_CURRDIR, NativeFileObject.getPhysicalName( + assertEquals(FULL_PATH_NO_CURRDIR, NativeFtpFile.getPhysicalName( ROOT_DIR.getAbsolutePath(), TEST_DIR1.getName(), "/~/" + TEST_FILE2_IN_DIR1.getName())); } public void testGetPhysicalNameCaseInsensitive() { - assertEquals(FULL_PATH, NativeFileObject.getPhysicalName(ROOT_DIR + assertEquals(FULL_PATH, NativeFtpFile.getPhysicalName(ROOT_DIR .getAbsolutePath(), TEST_DIR1.getName(), TEST_FILE2_IN_DIR1 .getName().toUpperCase(), true)); @@ -153,7 +154,7 @@ public void testConstructorWithNullFile() { try { - new NativeFileObject("foo", null, USER); + new NativeFtpFile("foo", null, USER); fail("Must throw IllegalArgumentException"); } catch (IllegalArgumentException e) { // OK @@ -161,7 +162,7 @@ } public void testDeleteReadOnlyFiles(){ - NativeFileObject fileObj=(NativeFileObject)createFileObject(FILE2_PATH, USER); + NativeFtpFile fileObj=(NativeFtpFile)createFileObject(FILE2_PATH, USER); File physicalFile=fileObj.getPhysicalFile(); // First check assertTrue(fileObj.hasDeletePermission()); Propchange: mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/filesystem/nativefs/impl/NativeFileObjectTest.java ------------------------------------------------------------------------------ svn:eol-style = native Copied: mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/filesystem/nativefs/impl/NativeFileSystemViewTest.java (from r693183, mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/filesystem/NativeFileSystemViewTest.java) URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/filesystem/nativefs/impl/NativeFileSystemViewTest.java?p2=mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/filesystem/nativefs/impl/NativeFileSystemViewTest.java&p1=mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/filesystem/NativeFileSystemViewTest.java&r1=693183&r2=701234&rev=701234&view=diff ============================================================================== --- mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/filesystem/NativeFileSystemViewTest.java (original) +++ mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/filesystem/nativefs/impl/NativeFileSystemViewTest.java Thu Oct 2 13:28:16 2008 @@ -17,11 +17,12 @@ * under the License. */ -package org.apache.ftpserver.filesystem; +package org.apache.ftpserver.filesystem.nativefs.impl; import java.io.File; import java.io.IOException; +import org.apache.ftpserver.filesystem.nativefs.impl.NativeFileSystemView; import org.apache.ftpserver.ftplet.FtpException; import org.apache.ftpserver.util.IoUtils; Propchange: mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/filesystem/nativefs/impl/NativeFileSystemViewTest.java ------------------------------------------------------------------------------ svn:eol-style = native Modified: mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ftpletcontainer/FtpLetContainerTestTemplate.java URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ftpletcontainer/FtpLetContainerTestTemplate.java?rev=701234&r1=701233&r2=701234&view=diff ============================================================================== --- mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ftpletcontainer/FtpLetContainerTestTemplate.java (original) +++ mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ftpletcontainer/FtpLetContainerTestTemplate.java Thu Oct 2 13:28:16 2008 @@ -26,7 +26,7 @@ import junit.framework.TestCase; import org.apache.ftpserver.FtpSessionImpl; -import org.apache.ftpserver.ftplet.FileSystemManager; +import org.apache.ftpserver.ftplet.FileSystemFactory; import org.apache.ftpserver.ftplet.FtpException; import org.apache.ftpserver.ftplet.FtpRequest; import org.apache.ftpserver.ftplet.FtpSession; @@ -51,7 +51,7 @@ protected abstract FtpletContainer createFtpletContainer(); private static class MockFtpletContext implements FtpletContext { - public FileSystemManager getFileSystemManager() { + public FileSystemFactory getFileSystemManager() { return null; } Copied: mina/ftpserver/trunk/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/FileSystemFactory.java (from r693183, mina/ftpserver/trunk/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/FileSystemManager.java) URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/FileSystemFactory.java?p2=mina/ftpserver/trunk/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/FileSystemFactory.java&p1=mina/ftpserver/trunk/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/FileSystemManager.java&r1=693183&r2=701234&rev=701234&view=diff ============================================================================== --- mina/ftpserver/trunk/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/FileSystemManager.java (original) +++ mina/ftpserver/trunk/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/FileSystemFactory.java Thu Oct 2 13:28:16 2008 @@ -20,12 +20,12 @@ package org.apache.ftpserver.ftplet; /** - * This is the file system manager - it returns the file system view for user. + * Factory for file system implementations - it returns the file system view for user. * * @author The Apache MINA Project ([EMAIL PROTECTED]) * @version $Rev$, $Date$ */ -public interface FileSystemManager { +public interface FileSystemFactory { /** * Create user specific file system view. Propchange: mina/ftpserver/trunk/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/FileSystemFactory.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: mina/ftpserver/trunk/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/FileSystemFactory.java ------------------------------------------------------------------------------ svn:keywords = Author Date Id Revision Modified: mina/ftpserver/trunk/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/FileSystemView.java URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/FileSystemView.java?rev=701234&r1=701233&r2=701234&view=diff ============================================================================== --- mina/ftpserver/trunk/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/FileSystemView.java (original) +++ mina/ftpserver/trunk/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/FileSystemView.java Thu Oct 2 13:28:16 2008 @@ -30,12 +30,12 @@ /** * Get the user home directory. */ - FileObject getHomeDirectory() throws FtpException; + FtpFile getHomeDirectory() throws FtpException; /** * Get user current directory. */ - FileObject getCurrentDirectory() throws FtpException; + FtpFile getCurrentDirectory() throws FtpException; /** * Change directory. @@ -45,7 +45,7 @@ /** * Get file object. */ - FileObject getFileObject(String file) throws FtpException; + FtpFile getFileObject(String file) throws FtpException; /** * Does the file system support random file access? Copied: mina/ftpserver/trunk/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/FtpFile.java (from r693183, mina/ftpserver/trunk/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/FileObject.java) URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/FtpFile.java?p2=mina/ftpserver/trunk/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/FtpFile.java&p1=mina/ftpserver/trunk/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/FileObject.java&r1=693183&r2=701234&rev=701234&view=diff ============================================================================== --- mina/ftpserver/trunk/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/FileObject.java (original) +++ mina/ftpserver/trunk/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/FtpFile.java Thu Oct 2 13:28:16 2008 @@ -29,7 +29,7 @@ * @author The Apache MINA Project ([EMAIL PROTECTED]) * @version $Rev$, $Date$ */ -public interface FileObject { +public interface FtpFile { /** * Get the fully qualified name. @@ -114,13 +114,13 @@ /** * Move file. */ - boolean move(FileObject destination); + boolean move(FtpFile destination); /** * List file objects. If not a directory or does not exist, null will be * returned. Files must be returned in alphabetical order. */ - FileObject[] listFiles(); + FtpFile[] listFiles(); /** * Create output stream for writing. If the file is not random accessible, Propchange: mina/ftpserver/trunk/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/FtpFile.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: mina/ftpserver/trunk/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/FtpFile.java ------------------------------------------------------------------------------ svn:keywords = Author Date Id Revision Modified: mina/ftpserver/trunk/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/FtpSession.java URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/FtpSession.java?rev=701234&r1=701233&r2=701234&view=diff ============================================================================== --- mina/ftpserver/trunk/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/FtpSession.java (original) +++ mina/ftpserver/trunk/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/FtpSession.java Thu Oct 2 13:28:16 2008 @@ -120,7 +120,7 @@ /** * Get rename from file object. */ - FileObject getRenameFrom(); + FtpFile getRenameFrom(); /** * Get the data type. Modified: mina/ftpserver/trunk/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/FtpletContext.java URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/FtpletContext.java?rev=701234&r1=701233&r2=701234&view=diff ============================================================================== --- mina/ftpserver/trunk/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/FtpletContext.java (original) +++ mina/ftpserver/trunk/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/FtpletContext.java Thu Oct 2 13:28:16 2008 @@ -37,7 +37,7 @@ /** * Get file system manager */ - FileSystemManager getFileSystemManager(); + FileSystemFactory getFileSystemManager(); /** * Get ftp statistics.
