Author: ngn
Date: Thu Oct 2 13:28:16 2008
New Revision: 701234
URL:
http://svn.apache.org/viewvc?rev=701234&view=revLog:
Restructuring the file system interfaces and nativefs implementation
Moving filters to listeners
Added:
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/filesystem/nativefs/
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/filesystem/nativefs/NativeFileSystemFactory.java (contents, props changed)
- copied, changed from r693183, mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/filesystem/NativeFileSystemManager.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/filesystem/nativefs/impl/
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/filesystem/nativefs/impl/NameEqualsFileFilter.java
- copied, changed from r693183, mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/filesystem/NameEqualsFileFilter.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/filesystem/nativefs/impl/NativeFileSystemView.java (contents, props changed)
- copied, changed from r693183, mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/filesystem/NativeFileSystemView.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/filesystem/nativefs/impl/NativeFtpFile.java (contents, props changed)
- copied, changed from r693183, mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/filesystem/NativeFileObject.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listener/nio/FtpLoggingFilter.java
- copied, changed from r693183, mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/filter/FtpLoggingFilter.java
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/filesystem/nativefs/
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/filesystem/nativefs/impl/
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/filesystem/nativefs/impl/FileObjectTestTemplate.java (contents, props changed)
- copied, changed from r693183, mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/filesystem/FileObjectTestTemplate.java
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/filesystem/nativefs/impl/FileSystemViewTemplate.java (contents, props changed)
- copied, changed from r693183, mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/filesystem/FileSystemViewTemplate.java
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/filesystem/nativefs/impl/NativeFileObjectTest.java (contents, props changed)
- copied, changed from r693183, mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/filesystem/NativeFileObjectTest.java
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/filesystem/nativefs/impl/NativeFileSystemViewTest.java (contents, props changed)
- copied, changed from r693183, mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/filesystem/NativeFileSystemViewTest.java
mina/ftpserver/trunk/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/FileSystemFactory.java (contents, props changed)
- copied, changed from r693183, mina/ftpserver/trunk/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/FileSystemManager.java
mina/ftpserver/trunk/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/FtpFile.java (contents, props changed)
- copied, changed from r693183, mina/ftpserver/trunk/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/FileObject.java
Removed:
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/filesystem/NameEqualsFileFilter.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/filesystem/NativeFileObject.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/filesystem/NativeFileSystemManager.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/filesystem/NativeFileSystemView.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/filter/
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/filesystem/FileObjectTestTemplate.java
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/filesystem/FileSystemViewTemplate.java
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/filesystem/NativeFileObjectTest.java
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/filesystem/NativeFileSystemViewTest.java
mina/ftpserver/trunk/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/FileObject.java
mina/ftpserver/trunk/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/FileSystemManager.java
Modified:
mina/ftpserver/trunk/core/pom.xml
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/DefaultFtpServerContext.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/FtpServer.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/FtpSessionImpl.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/FtpStatisticsImpl.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/DELE.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/MLST.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/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/DirectoryLister.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/listing/FileFilter.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/listing/FileFormater.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/command/impl/listing/VisibleFileFilter.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/config/spring/FileSystemBeanDefinitionParser.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/interfaces/FileObserver.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/interfaces/FtpIoSession.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/interfaces/ServerFtpStatistics.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listener/nio/AbstractListener.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/clienttests/CdCaseInsensitiveTest.java
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/commands/impl/listing/DirectoryListerTest.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/config/spring/SpringConfigTest.java
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ftpletcontainer/FtpLetContainerTestTemplate.java
mina/ftpserver/trunk/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/FileSystemView.java
mina/ftpserver/trunk/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/FtpSession.java
mina/ftpserver/trunk/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/FtpletContext.java
Modified: mina/ftpserver/trunk/core/pom.xml
URL:
http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/pom.xml?rev=701234&r1=701233&r2=701234&view=diff==============================================================================
--- mina/ftpserver/trunk/core/pom.xml (original)
+++ mina/ftpserver/trunk/core/pom.xml Thu Oct 2 13:28:16 2008
@@ -1,152 +1,169 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
-
http://www.apache.org/licenses/LICENSE-2.0-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License. -->
-
+ <!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to you under the Apache License, Version
+ 2.0 (the "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
http://www.apache.org/licenses/LICENSE-2.0 Unless required by
+ applicable law or agreed to in writing, software distributed under the
+ License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+ CONDITIONS OF ANY KIND, either express or implied. See the License for
+ the specific language governing permissions and limitations under the
+ License.
+ -->
<project>
- <parent>
- <artifactId>ftpserver-parent</artifactId>
- <groupId>org.apache.ftpserver</groupId>
- <version>1.0.0-M4-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.ftpserver</groupId>
- <artifactId>ftpserver-core</artifactId>
- <name>Apache FtpServer Core</name>
- <version>1.0.0-M4-SNAPSHOT</version>
- <packaging>jar</packaging>
- <scm>
- <connection>
- scm:svn:
http://svn.apache.org/repos/asf/mina/ftpserver/trunk/core- </connection>
- <developerConnection>
- scm:svn:
https://svn.apache.org/repos/asf/mina/ftpserver/trunk/core- </developerConnection>
- <url>
-
http://svn.apache.org/viewvc/mina/ftpserver/trunk/core- </url>
- </scm>
- <build>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- <includes>
- <include>**/*.properties</include>
- <include>**/*.handlers</include>
- <include>**/*.schemas</include>
- <include>**/*.xsd</include>
- </includes>
- </resource>
- </resources>
- <testResources>
- <testResource>
- <directory>src/test/resources</directory>
- <includes>
- <include>*.properties</include>
- </includes>
- </testResource>
- </testResources>
-
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>rat-maven-plugin</artifactId>
- <version>1.0-alpha-3</version>
- <configuration>
- <excludes>
- <exclude>res/user.gen</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
- <dependency>
- <groupId>${groupId}</groupId>
- <artifactId>ftplet-api</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.mina</groupId>
- <artifactId>mina-core</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
- <optional>true</optional>
- </dependency>
+ <parent>
+ <artifactId>ftpserver-parent</artifactId>
+ <groupId>org.apache.ftpserver</groupId>
+ <version>1.0.0-M4-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.ftpserver</groupId>
+ <artifactId>ftpserver-core</artifactId>
+ <name>Apache FtpServer Core</name>
+ <version>1.0.0-M4-SNAPSHOT</version>
+ <packaging>bundle</packaging>
+ <scm>
+ <connection>
+ scm:svn:
http://svn.apache.org/repos/asf/mina/ftpserver/trunk/core+ </connection>
+ <developerConnection>
+ scm:svn:
https://svn.apache.org/repos/asf/mina/ftpserver/trunk/core+ </developerConnection>
+ <url>
http://svn.apache.org/viewvc/mina/ftpserver/trunk/core</url>
+ </scm>
+ <build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <includes>
+ <include>**/*.properties</include>
+ <include>**/*.handlers</include>
+ <include>**/*.schemas</include>
+ <include>**/*.xsd</include>
+ </includes>
+ </resource>
+ </resources>
+ <testResources>
+ <testResource>
+ <directory>src/test/resources</directory>
+ <includes>
+ <include>*.properties</include>
+ </includes>
+ </testResource>
+ </testResources>
+ <plugins>
+ <plugin>
+ <!-- This is still very much work in progress -->
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>1.4.1</version>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Bundle-SymbolicName> ${artifactId}</Bundle-SymbolicName>
+ <Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
+ <Export-Package>
+ org.apache.ftpserver,
+ org.apache.ftpserver.command,
+ org.apache.ftpserver.filesystem.nativefs,
+ org.apache.ftpserver.ftpletcontainer,
+ org.apache.ftpserver.listener,
+ org.apache.ftpserver.main,
+ org.apache.ftpserver.message,
+ org.apache.ftpserver.ssl
+ </Export-Package>
+ <Private-Package>
+ org.apache.ftpserver.command.impl,
+ org.apache.ftpserver.config.spring,
+ org.apache.ftpserver.filesystem.nativefs.impl,
+ org.apache.ftpserver.ftpletcontainer.impl,
+ org.apache.ftpserver.impl,
+ org.apache.ftpserver.listener.nio,
+ org.apache.ftpserver.message.impl,
+ org.apache.ftpserver.ssl.impl,
+ org.apache.ftpserver.util,
+ *
+ </Private-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>rat-maven-plugin</artifactId>
+ <version>1.0-alpha-3</version>
+ <configuration>
+ <excludes>
+ <exclude>res/user.gen</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>${groupId}</groupId>
+ <artifactId>ftplet-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.mina</groupId>
+ <artifactId>mina-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ <optional>true</optional>
+ </dependency>
<!-- Use as Spring uses JCL -->
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl-over-slf4j</artifactId>
- <optional>true</optional>
- </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <optional>true</optional>
+ </dependency>
<!-- Test dependencies -->
- <dependency>
- <groupId>commons-net</groupId>
- <artifactId>commons-net</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>oro</groupId>
- <artifactId>oro</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>hsqldb</groupId>
- <artifactId>hsqldb</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
-</project>
+ <dependency>
+ <groupId>commons-net</groupId>
+ <artifactId>commons-net</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>oro</groupId>
+ <artifactId>oro</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>hsqldb</groupId>
+ <artifactId>hsqldb</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+</project>
\ No newline at end of file
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/DefaultFtpServerContext.java
URL:
http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/DefaultFtpServerContext.java?rev=701234&r1=701233&r2=701234&view=diff==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/DefaultFtpServerContext.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/DefaultFtpServerContext.java Thu Oct 2 13:28:16 2008
@@ -25,9 +25,9 @@
import org.apache.ftpserver.command.CommandFactory;
import org.apache.ftpserver.command.impl.DefaultCommandFactory;
-import org.apache.ftpserver.filesystem.NativeFileSystemManager;
+import org.apache.ftpserver.filesystem.nativefs.NativeFileSystemFactory;
import org.apache.ftpserver.ftplet.Authority;
-import org.apache.ftpserver.ftplet.FileSystemManager;
+import org.apache.ftpserver.ftplet.FileSystemFactory;
import org.apache.ftpserver.ftplet.FtpStatistics;
import org.apache.ftpserver.ftplet.Ftplet;
import org.apache.ftpserver.ftplet.UserManager;
@@ -62,7 +62,7 @@
private UserManager userManager = new PropertiesUserManager();
- private FileSystemManager fileSystemManager = new NativeFileSystemManager();
+ private FileSystemFactory fileSystemManager = new NativeFileSystemFactory();
private FtpletContainer ftpletContainer = new DefaultFtpletContainer();
@@ -134,7 +134,7 @@
/**
* Get file system manager.
*/
- public FileSystemManager getFileSystemManager() {
+ public FileSystemFactory getFileSystemManager() {
return fileSystemManager;
}
@@ -217,7 +217,7 @@
this.commandFactory = commandFactory;
}
- public void setFileSystemManager(FileSystemManager fileSystemManager) {
+ public void setFileSystemManager(FileSystemFactory fileSystemManager) {
this.fileSystemManager = fileSystemManager;
}
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/FtpServer.java
URL:
http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/FtpServer.java?rev=701234&r1=701233&r2=701234&view=diff==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/FtpServer.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/FtpServer.java Thu Oct 2 13:28:16 2008
@@ -22,7 +22,7 @@
import java.util.Map;
import org.apache.ftpserver.command.CommandFactory;
-import org.apache.ftpserver.ftplet.FileSystemManager;
+import org.apache.ftpserver.ftplet.FileSystemFactory;
import org.apache.ftpserver.ftplet.Ftplet;
import org.apache.ftpserver.ftplet.UserManager;
import org.apache.ftpserver.interfaces.FtpServerContext;
@@ -257,9 +257,9 @@
/**
* Retrieve the file system used with this server
*
- * @return The {@link FileSystemManager}
+ * @return The {@link FileSystemFactory}
*/
- public FileSystemManager getFileSystem() {
+ public FileSystemFactory getFileSystem() {
return getServerContext().getFileSystemManager();
}
@@ -267,11 +267,11 @@
* Set the file system to be used for this server
*
* @param fileSystem
- * The {@link FileSystemManager}
+ * The {@link FileSystemFactory}
* @throws IllegalStateException
* If a custom server context has been set
*/
- public void setFileSystem(final FileSystemManager fileSystem) {
+ public void setFileSystem(final FileSystemFactory fileSystem) {
checkAndGetContext().setFileSystemManager(fileSystem);
}
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/FtpSessionImpl.java
URL:
http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/FtpSessionImpl.java?rev=701234&r1=701233&r2=701234&view=diff==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/FtpSessionImpl.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/FtpSessionImpl.java Thu Oct 2 13:28:16 2008
@@ -26,7 +26,7 @@
import org.apache.ftpserver.ftplet.DataConnectionFactory;
import org.apache.ftpserver.ftplet.DataType;
-import org.apache.ftpserver.ftplet.FileObject;
+import org.apache.ftpserver.ftplet.FtpFile;
import org.apache.ftpserver.ftplet.FileSystemView;
import org.apache.ftpserver.ftplet.FtpException;
import org.apache.ftpserver.ftplet.FtpReply;
@@ -104,7 +104,7 @@
/**
* Get rename from file object.
*/
- public FileObject getRenameFrom() {
+ public FtpFile getRenameFrom() {
return ioSession.getRenameFrom();
}
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/FtpStatisticsImpl.java
URL:
http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/FtpStatisticsImpl.java?rev=701234&r1=701233&r2=701234&view=diff==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/FtpStatisticsImpl.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/FtpStatisticsImpl.java Thu Oct 2 13:28:16 2008
@@ -27,7 +27,7 @@
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicLong;
-import org.apache.ftpserver.ftplet.FileObject;
+import org.apache.ftpserver.ftplet.FtpFile;
import org.apache.ftpserver.ftplet.User;
import org.apache.ftpserver.interfaces.FileObserver;
import org.apache.ftpserver.interfaces.FtpIoSession;
@@ -268,7 +268,7 @@
* Increment upload count.
*/
public synchronized void setUpload(final FtpIoSession session,
- final FileObject file, final long size) {
+ final FtpFile file, final long size) {
uploadCount.incrementAndGet();
bytesUpload.addAndGet(size);
notifyUpload(session, file, size);
@@ -278,7 +278,7 @@
* Increment download count.
*/
public synchronized void setDownload(final FtpIoSession session,
- final FileObject file, final long size) {
+ final FtpFile file, final long size) {
downloadCount.incrementAndGet();
bytesDownload.addAndGet(size);
notifyDownload(session, file, size);
@@ -288,7 +288,7 @@
* Increment delete count.
*/
public synchronized void setDelete(final FtpIoSession session,
- final FileObject file) {
+ final FtpFile file) {
deleteCount.incrementAndGet();
notifyDelete(session, file);
}
@@ -297,7 +297,7 @@
* Increment make directory count.
*/
public synchronized void setMkdir(final FtpIoSession session,
- final FileObject file) {
+ final FtpFile file) {
mkdirCount.incrementAndGet();
notifyMkdir(session, file);
}
@@ -306,7 +306,7 @@
* Increment remove directory count.
*/
public synchronized void setRmdir(final FtpIoSession session,
- final FileObject file) {
+ final FtpFile file) {
rmdirCount.incrementAndGet();
notifyRmdir(session, file);
}
@@ -418,7 +418,7 @@
* Observer upload notification.
*/
private void notifyUpload(final FtpIoSession session,
- final FileObject file, long size) {
+ final FtpFile file, long size) {
StatisticsObserver observer = this.observer;
if (observer != null) {
observer.notifyUpload();
@@ -434,7 +434,7 @@
* Observer download notification.
*/
private void notifyDownload(final FtpIoSession session,
- final FileObject file, final long size) {
+ final FtpFile file, final long size) {
StatisticsObserver observer = this.observer;
if (observer != null) {
observer.notifyDownload();
@@ -449,7 +449,7 @@
/**
* Observer delete notification.
*/
- private void notifyDelete(final FtpIoSession session, final FileObject file) {
+ private void notifyDelete(final FtpIoSession session, final FtpFile file) {
StatisticsObserver observer = this.observer;
if (observer != null) {
observer.notifyDelete();
@@ -464,7 +464,7 @@
/**
* Observer make directory notification.
*/
- private void notifyMkdir(final FtpIoSession session, final FileObject file) {
+ private void notifyMkdir(final FtpIoSession session, final FtpFile file) {
StatisticsObserver observer = this.observer;
if (observer != null) {
observer.notifyMkdir();
@@ -479,7 +479,7 @@
/**
* Observer remove directory notification.
*/
- private void notifyRmdir(final FtpIoSession session, final FileObject file) {
+ private void notifyRmdir(final FtpIoSession session, final FtpFile file) {
StatisticsObserver observer = this.observer;
if (observer != null) {
observer.notifyRmdir();
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=701234&r1=701233&r2=701234&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 Thu Oct 2 13:28:16 2008
@@ -29,7 +29,7 @@
import org.apache.ftpserver.ftplet.DataConnection;
import org.apache.ftpserver.ftplet.DataConnectionFactory;
import org.apache.ftpserver.ftplet.DefaultFtpReply;
-import org.apache.ftpserver.ftplet.FileObject;
+import org.apache.ftpserver.ftplet.FtpFile;
import org.apache.ftpserver.ftplet.FtpException;
import org.apache.ftpserver.ftplet.FtpReply;
import org.apache.ftpserver.ftplet.FtpRequest;
@@ -98,7 +98,7 @@
}
// get filenames
- FileObject file = null;
+ FtpFile file = null;
try {
file = session.getFileSystemView().getFileObject(fileName);
} catch (Exception e) {
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=701234&r1=701233&r2=701234&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 Thu Oct 2 13:28:16 2008
@@ -22,7 +22,7 @@
import java.io.IOException;
import org.apache.ftpserver.command.AbstractCommand;
-import org.apache.ftpserver.ftplet.FileObject;
+import org.apache.ftpserver.ftplet.FtpFile;
import org.apache.ftpserver.ftplet.FtpException;
import org.apache.ftpserver.ftplet.FtpReply;
import org.apache.ftpserver.ftplet.FtpRequest;
@@ -66,7 +66,7 @@
}
// get file object
- FileObject file = null;
+ FtpFile file = null;
try {
file = session.getFileSystemView().getFileObject(fileName);
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=701234&r1=701233&r2=701234&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 Thu Oct 2 13:28:16 2008
@@ -26,7 +26,7 @@
import java.security.NoSuchAlgorithmException;
import org.apache.ftpserver.command.AbstractCommand;
-import org.apache.ftpserver.ftplet.FileObject;
+import org.apache.ftpserver.ftplet.FtpFile;
import org.apache.ftpserver.ftplet.FtpReply;
import org.apache.ftpserver.ftplet.FtpRequest;
import org.apache.ftpserver.impl.LocalizedFtpReply;
@@ -93,7 +93,7 @@
String fileName = fileNames[i].trim();
// get file object
- FileObject file = null;
+ FtpFile file = null;
try {
file = session.getFileSystemView().getFileObject(fileName);
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=701234&r1=701233&r2=701234&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 Thu Oct 2 13:28:16 2008
@@ -22,7 +22,7 @@
import java.io.IOException;
import org.apache.ftpserver.command.AbstractCommand;
-import org.apache.ftpserver.ftplet.FileObject;
+import org.apache.ftpserver.ftplet.FtpFile;
import org.apache.ftpserver.ftplet.FtpException;
import org.apache.ftpserver.ftplet.FtpReply;
import org.apache.ftpserver.ftplet.FtpRequest;
@@ -65,7 +65,7 @@
}
// get file object
- FileObject file = null;
+ FtpFile file = null;
try {
file = session.getFileSystemView().getFileObject(fileName);
} catch (Exception ex) {
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=701234&r1=701233&r2=701234&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 Thu Oct 2 13:28:16 2008
@@ -23,7 +23,7 @@
import java.io.IOException;
import org.apache.ftpserver.command.AbstractCommand;
-import org.apache.ftpserver.ftplet.FileObject;
+import org.apache.ftpserver.ftplet.FtpFile;
import org.apache.ftpserver.ftplet.FtpException;
import org.apache.ftpserver.ftplet.FtpReply;
import org.apache.ftpserver.ftplet.FtpRequest;
@@ -68,7 +68,7 @@
}
// get file object
- FileObject file = null;
+ FtpFile file = null;
try {
file = session.getFileSystemView().getFileObject(fileName);
} catch (Exception ex) {
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=701234&r1=701233&r2=701234&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 Thu Oct 2 13:28:16 2008
@@ -26,7 +26,7 @@
import org.apache.ftpserver.command.impl.listing.ListArgument;
import org.apache.ftpserver.command.impl.listing.ListArgumentParser;
import org.apache.ftpserver.command.impl.listing.MLSTFileFormater;
-import org.apache.ftpserver.ftplet.FileObject;
+import org.apache.ftpserver.ftplet.FtpFile;
import org.apache.ftpserver.ftplet.FtpException;
import org.apache.ftpserver.ftplet.FtpReply;
import org.apache.ftpserver.ftplet.FtpRequest;
@@ -62,7 +62,7 @@
ListArgument parsedArg = ListArgumentParser
.parse(request.getArgument());
- FileObject file = null;
+ FtpFile file = null;
try {
file = session.getFileSystemView().getFileObject(
parsedArg.getFile());
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=701234&r1=701233&r2=701234&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 Thu Oct 2 13:28:16 2008
@@ -25,7 +25,7 @@
import org.apache.ftpserver.command.AbstractCommand;
import org.apache.ftpserver.ftplet.Authentication;
import org.apache.ftpserver.ftplet.AuthenticationFailedException;
-import org.apache.ftpserver.ftplet.FileSystemManager;
+import org.apache.ftpserver.ftplet.FileSystemFactory;
import org.apache.ftpserver.ftplet.FileSystemView;
import org.apache.ftpserver.ftplet.FtpException;
import org.apache.ftpserver.ftplet.FtpReply;
@@ -212,7 +212,7 @@
}
// update different objects
- FileSystemManager fmanager = context.getFileSystemManager();
+ FileSystemFactory fmanager = context.getFileSystemManager();
FileSystemView fsview = fmanager
.createFileSystemView(authenticatedUser);
session.setLogin(fsview);
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=701234&r1=701233&r2=701234&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 Thu Oct 2 13:28:16 2008
@@ -31,7 +31,7 @@
import org.apache.ftpserver.ftplet.DataConnectionFactory;
import org.apache.ftpserver.ftplet.DataType;
import org.apache.ftpserver.ftplet.DefaultFtpReply;
-import org.apache.ftpserver.ftplet.FileObject;
+import org.apache.ftpserver.ftplet.FtpFile;
import org.apache.ftpserver.ftplet.FtpException;
import org.apache.ftpserver.ftplet.FtpReply;
import org.apache.ftpserver.ftplet.FtpRequest;
@@ -85,7 +85,7 @@
}
// get file object
- FileObject file = null;
+ FtpFile file = null;
try {
file = session.getFileSystemView().getFileObject(fileName);
} catch (Exception ex) {
@@ -211,7 +211,7 @@
/**
* Skip length and open input stream.
*/
- public InputStream openInputStream(FtpIoSession session, FileObject file,
+ public InputStream openInputStream(FtpIoSession session, FtpFile file,
long skipLen) throws IOException {
InputStream in;
if (session.getDataType() == DataType.ASCII) {
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=701234&r1=701233&r2=701234&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 Thu Oct 2 13:28:16 2008
@@ -22,7 +22,7 @@
import java.io.IOException;
import org.apache.ftpserver.command.AbstractCommand;
-import org.apache.ftpserver.ftplet.FileObject;
+import org.apache.ftpserver.ftplet.FtpFile;
import org.apache.ftpserver.ftplet.FtpException;
import org.apache.ftpserver.ftplet.FtpReply;
import org.apache.ftpserver.ftplet.FtpRequest;
@@ -67,7 +67,7 @@
}
// get file object
- FileObject file = null;
+ FtpFile file = null;
try {
file = session.getFileSystemView().getFileObject(fileName);
} catch (Exception ex) {
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=701234&r1=701233&r2=701234&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 Thu Oct 2 13:28:16 2008
@@ -22,7 +22,7 @@
import java.io.IOException;
import org.apache.ftpserver.command.AbstractCommand;
-import org.apache.ftpserver.ftplet.FileObject;
+import org.apache.ftpserver.ftplet.FtpFile;
import org.apache.ftpserver.ftplet.FtpException;
import org.apache.ftpserver.ftplet.FtpReply;
import org.apache.ftpserver.ftplet.FtpRequest;
@@ -66,7 +66,7 @@
}
// get filename
- FileObject renFr = null;
+ FtpFile renFr = null;
try {
renFr = session.getFileSystemView().getFileObject(fileName);
} catch (Exception ex) {
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=701234&r1=701233&r2=701234&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 Thu Oct 2 13:28:16 2008
@@ -22,7 +22,7 @@
import java.io.IOException;
import org.apache.ftpserver.command.AbstractCommand;
-import org.apache.ftpserver.ftplet.FileObject;
+import org.apache.ftpserver.ftplet.FtpFile;
import org.apache.ftpserver.ftplet.FtpException;
import org.apache.ftpserver.ftplet.FtpReply;
import org.apache.ftpserver.ftplet.FtpRequest;
@@ -69,7 +69,7 @@
}
// get the "rename from" file object
- FileObject frFile = session.getRenameFrom();
+ FtpFile frFile = session.getRenameFrom();
if (frFile == null) {
session.write(LocalizedFtpReply.translate(session, request, context,
FtpReply.REPLY_503_BAD_SEQUENCE_OF_COMMANDS, "RNTO",
@@ -78,7 +78,7 @@
}
// get target file
- FileObject toFile = null;
+ FtpFile toFile = null;
try {
toFile = session.getFileSystemView().getFileObject(toFileStr);
} catch (Exception ex) {
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=701234&r1=701233&r2=701234&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 Thu Oct 2 13:28:16 2008
@@ -22,7 +22,7 @@
import java.io.IOException;
import org.apache.ftpserver.command.AbstractCommand;
-import org.apache.ftpserver.ftplet.FileObject;
+import org.apache.ftpserver.ftplet.FtpFile;
import org.apache.ftpserver.ftplet.FtpException;
import org.apache.ftpserver.ftplet.FtpReply;
import org.apache.ftpserver.ftplet.FtpRequest;
@@ -64,7 +64,7 @@
}
// get file object
- FileObject file = null;
+ FtpFile file = null;
try {
file = session.getFileSystemView().getFileObject(fileName);
} catch (Exception ex) {
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=701234&r1=701233&r2=701234&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 Thu Oct 2 13:28:16 2008
@@ -29,7 +29,7 @@
import org.apache.ftpserver.ftplet.DataConnection;
import org.apache.ftpserver.ftplet.DataConnectionFactory;
import org.apache.ftpserver.ftplet.DefaultFtpReply;
-import org.apache.ftpserver.ftplet.FileObject;
+import org.apache.ftpserver.ftplet.FtpFile;
import org.apache.ftpserver.ftplet.FtpException;
import org.apache.ftpserver.ftplet.FtpReply;
import org.apache.ftpserver.ftplet.FtpRequest;
@@ -98,7 +98,7 @@
}
// get filename
- FileObject file = null;
+ FtpFile file = null;
try {
file = session.getFileSystemView().getFileObject(fileName);
} catch (Exception ex) {
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=701234&r1=701233&r2=701234&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 Thu Oct 2 13:28:16 2008
@@ -29,7 +29,7 @@
import org.apache.ftpserver.ftplet.DataConnection;
import org.apache.ftpserver.ftplet.DataConnectionFactory;
import org.apache.ftpserver.ftplet.DefaultFtpReply;
-import org.apache.ftpserver.ftplet.FileObject;
+import org.apache.ftpserver.ftplet.FtpFile;
import org.apache.ftpserver.ftplet.FileSystemView;
import org.apache.ftpserver.ftplet.FtpException;
import org.apache.ftpserver.ftplet.FtpReply;
@@ -85,13 +85,13 @@
String pathName = request.getArgument();
// get filenames
- FileObject file = null;
+ FtpFile file = null;
try {
String filePrefix;
if (pathName == null) {
filePrefix = "ftp.dat";
} else {
- FileObject dir = session.getFileSystemView().getFileObject(
+ FtpFile dir = session.getFileSystemView().getFileObject(
pathName);
if (dir.isDirectory()) {
filePrefix = pathName + "/ftp.dat";
@@ -198,9 +198,9 @@
/**
* Get unique file object.
*/
- protected FileObject getUniqueFile(FtpIoSession session, FileObject oldFile)
+ protected FtpFile getUniqueFile(FtpIoSession session, FtpFile oldFile)
throws FtpException {
- FileObject newFile = oldFile;
+ FtpFile newFile = oldFile;
FileSystemView fsView = session.getFileSystemView();
String fileName = newFile.getFullName();
while (newFile.doesExist()) {
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/listing/DirectoryLister.java
URL:
http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/listing/DirectoryLister.java?rev=701234&r1=701233&r2=701234&view=diff==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/listing/DirectoryLister.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/listing/DirectoryLister.java Thu Oct 2 13:28:16 2008
@@ -21,7 +21,7 @@
import java.io.IOException;
-import org.apache.ftpserver.ftplet.FileObject;
+import org.apache.ftpserver.ftplet.FtpFile;
import org.apache.ftpserver.ftplet.FileSystemView;
import org.apache.ftpserver.ftplet.FtpException;
@@ -33,7 +33,7 @@
*/
public class DirectoryLister {
- private String traverseFiles(final FileObject[] files,
+ private String traverseFiles(final FtpFile[] files,
final FileFilter filter, final FileFormater formater) {
StringBuffer sb = new StringBuffer();
@@ -43,7 +43,7 @@
return sb.toString();
}
- private String traverseFiles(final FileObject[] files,
+ private String traverseFiles(final FtpFile[] files,
final FileFilter filter, final FileFormater formater,
boolean matchDirs) {
StringBuffer sb = new StringBuffer();
@@ -69,7 +69,7 @@
StringBuffer sb = new StringBuffer();
// get all the file objects
- FileObject[] files = listFiles(fileSystemView, argument.getFile());
+ FtpFile[] files = listFiles(fileSystemView, argument.getFile());
if (files != null) {
FileFilter filter = null;
if ((argument.hasOption('a'))) {
@@ -88,12 +88,12 @@
/**
* Get the file list. Files will be listed in alphabetlical order.
*/
- private FileObject[] listFiles(FileSystemView fileSystemView, String file) {
- FileObject[] files = null;
+ private FtpFile[] listFiles(FileSystemView fileSystemView, String file) {
+ FtpFile[] files = null;
try {
- FileObject virtualFile = fileSystemView.getFileObject(file);
+ FtpFile virtualFile = fileSystemView.getFileObject(file);
if (virtualFile.isFile()) {
- files = new FileObject[] { virtualFile };
+ files = new FtpFile[] { virtualFile };
} else {
files = virtualFile.listFiles();
}
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/listing/FileFilter.java
URL:
http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/listing/FileFilter.java?rev=701234&r1=701233&r2=701234&view=diff==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/listing/FileFilter.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/listing/FileFilter.java Thu Oct 2 13:28:16 2008
@@ -18,7 +18,7 @@
*/
package org.apache.ftpserver.command.impl.listing;
-import org.apache.ftpserver.ftplet.FileObject;
+import org.apache.ftpserver.ftplet.FtpFile;
/**
* Interface for selecting files based on some critera.
@@ -31,12 +31,12 @@
public interface FileFilter {
/**
- * Decide if the {@link FileObject} should be selected
+ * Decide if the {@link FtpFile} should be selected
*
* @param file
- * The {@link FileObject}
- * @return true if the {@link FileObject} was selected
+ * The {@link FtpFile}
+ * @return true if the {@link FtpFile} was selected
*/
- boolean accept(FileObject file);
+ boolean accept(FtpFile file);
}
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/listing/FileFormater.java
URL:
http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/listing/FileFormater.java?rev=701234&r1=701233&r2=701234&view=diff==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/listing/FileFormater.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/listing/FileFormater.java Thu Oct 2 13:28:16 2008
@@ -18,10 +18,10 @@
*/
package org.apache.ftpserver.command.impl.listing;
-import org.apache.ftpserver.ftplet.FileObject;
+import org.apache.ftpserver.ftplet.FtpFile;
/**
- * Interface for formating output based on a {@link FileObject}
+ * Interface for formating output based on a {@link FtpFile}
*
* @author The Apache MINA Project (
dev@...)
* @version $Rev$, $Date$
@@ -32,9 +32,9 @@
* Format the file
*
* @param file
- * The {@link FileObject}
- * @return The formated string based on the {@link FileObject}
+ * The {@link FtpFile}
+ * @return The formated string based on the {@link FtpFile}
*/
- String format(FileObject file);
+ String format(FtpFile file);
}
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=701234&r1=701233&r2=701234&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 Thu Oct 2 13:28:16 2008
@@ -20,7 +20,7 @@
import java.util.Arrays;
-import org.apache.ftpserver.ftplet.FileObject;
+import org.apache.ftpserver.ftplet.FtpFile;
import org.apache.ftpserver.util.DateUtils;
/**
@@ -36,9 +36,9 @@
private final static char[] NEWLINE = { '\r', '\n' };
/**
- * @see FileFormater#format(FileObject)
+ * @see FileFormater#format(FtpFile)
*/
- public String format(FileObject file) {
+ public String format(FtpFile file) {
StringBuffer sb = new StringBuffer();
sb.append(getPermission(file));
sb.append(DELIM);
@@ -63,7 +63,7 @@
/**
* Get size
*/
- private String getLength(FileObject file) {
+ private String getLength(FtpFile file) {
String initStr = " ";
long sz = 0;
if (file.isFile()) {
@@ -79,14 +79,14 @@
/**
* Get last modified date string.
*/
- private String getLastModified(FileObject file) {
+ private String getLastModified(FtpFile file) {
return DateUtils.getUnixDate(file.getLastModified());
}
/**
* Get permission string.
*/
- private char[] getPermission(FileObject file) {
+ private char[] getPermission(FtpFile file) {
char permission[] = new char[10];
Arrays.fill(permission, '-');
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=701234&r1=701233&r2=701234&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 Thu Oct 2 13:28:16 2008
@@ -18,7 +18,7 @@
*/
package org.apache.ftpserver.command.impl.listing;
-import org.apache.ftpserver.ftplet.FileObject;
+import org.apache.ftpserver.ftplet.FtpFile;
import org.apache.ftpserver.util.DateUtils;
/**
@@ -47,9 +47,9 @@
}
/**
- * @see FileFormater#format(FileObject)
+ * @see FileFormater#format(FtpFile)
*/
- public String format(FileObject file) {
+ public String format(FtpFile file) {
StringBuffer sb = new StringBuffer();
for (int i = 0; i < selectedTypes.length; ++i) {
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=701234&r1=701233&r2=701234&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 Thu Oct 2 13:28:16 2008
@@ -18,7 +18,7 @@
*/
package org.apache.ftpserver.command.impl.listing;
-import org.apache.ftpserver.ftplet.FileObject;
+import org.apache.ftpserver.ftplet.FtpFile;
/**
* Formats files according to the NLST specification
@@ -31,9 +31,9 @@
private final static char[] NEWLINE = { '\r', '\n' };
/**
- * @see FileFormater#format(FileObject)
+ * @see FileFormater#format(FtpFile)
*/
- public String format(FileObject file) {
+ public String format(FtpFile file) {
StringBuffer sb = new StringBuffer();
sb.append(file.getShortName());
sb.append(NEWLINE);
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=701234&r1=701233&r2=701234&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 Thu Oct 2 13:28:16 2008
@@ -18,7 +18,7 @@
*/
package org.apache.ftpserver.command.impl.listing;
-import org.apache.ftpserver.ftplet.FileObject;
+import org.apache.ftpserver.ftplet.FtpFile;
import org.apache.ftpserver.util.RegularExpr;
/**
@@ -58,9 +58,9 @@
}
/**
- * @see FileFilter#accept(FileObject)
+ * @see FileFilter#accept(FtpFile)
*/
- public boolean accept(FileObject file) {
+ public boolean accept(FtpFile file) {
if (wrappedFilter != null && !wrappedFilter.accept(file)) {
return false;
}
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/listing/VisibleFileFilter.java
URL:
http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/listing/VisibleFileFilter.java?rev=701234&r1=701233&r2=701234&view=diff==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/listing/VisibleFileFilter.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/listing/VisibleFileFilter.java Thu Oct 2 13:28:16 2008
@@ -18,7 +18,7 @@
*/
package org.apache.ftpserver.command.impl.listing;
-import org.apache.ftpserver.ftplet.FileObject;
+import org.apache.ftpserver.ftplet.FtpFile;
/**
* Selects files that are visible
@@ -48,9 +48,9 @@
}
/**
- * @see FileFilter#accept(FileObject)
+ * @see FileFilter#accept(FtpFile)
*/
- public boolean accept(FileObject file) {
+ public boolean accept(FtpFile file) {
if (wrappedFilter != null && !wrappedFilter.accept(file)) {
return false;
}
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/config/spring/FileSystemBeanDefinitionParser.java
URL:
http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/config/spring/FileSystemBeanDefinitionParser.java?rev=701234&r1=701233&r2=701234&view=diff==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/config/spring/FileSystemBeanDefinitionParser.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/config/spring/FileSystemBeanDefinitionParser.java Thu Oct 2 13:28:16 2008
@@ -19,8 +19,8 @@
package org.apache.ftpserver.config.spring;
-import org.apache.ftpserver.filesystem.NativeFileSystemManager;
-import org.apache.ftpserver.ftplet.FileSystemManager;
+import org.apache.ftpserver.filesystem.nativefs.NativeFileSystemFactory;
+import org.apache.ftpserver.ftplet.FileSystemFactory;
import org.springframework.beans.factory.support.BeanDefinitionBuilder;
import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser;
import org.springframework.beans.factory.xml.ParserContext;
@@ -40,9 +40,9 @@
* {@inheritDoc}
*/
@Override
- protected Class<? extends FileSystemManager> getBeanClass(
+ protected Class<? extends FileSystemFactory> getBeanClass(
final Element element) {
- return NativeFileSystemManager.class;
+ return NativeFileSystemFactory.class;
}
/**
Copied: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/filesystem/nativefs/NativeFileSystemFactory.java (from r693183, mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/filesystem/NativeFileSystemManager.java)
URL:
http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/filesystem/nativefs/NativeFileSystemFactory.java?p2=mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/filesystem/nativefs/NativeFileSystemFactory.java&p1=mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/filesystem/NativeFileSystemManager.java&r1=693183&r2=701234&rev=701234&view=diff==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/filesystem/NativeFileSystemManager.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/filesystem/nativefs/NativeFileSystemFactory.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;
import java.io.File;
-import org.apache.ftpserver.ftplet.FileSystemManager;
+import org.apache.ftpserver.filesystem.nativefs.impl.NativeFileSystemView;
+import org.apache.ftpserver.ftplet.FileSystemFactory;
import org.apache.ftpserver.ftplet.FileSystemView;
import org.apache.ftpserver.ftplet.FtpException;
import org.apache.ftpserver.ftplet.User;
@@ -29,15 +30,15 @@
import org.slf4j.LoggerFactory;
/**
- * Native file system manager. It uses the OS file system.
+ * Native file system factory. It uses the OS file system.
*
* @author The Apache MINA Project (
dev@...)
* @version $Rev$, $Date$
*/
-public class NativeFileSystemManager implements FileSystemManager {
+public class NativeFileSystemFactory implements FileSystemFactory {
private final Logger LOG = LoggerFactory
- .getLogger(NativeFileSystemManager.class);
+ .getLogger(NativeFileSystemFactory.class);
private boolean createHome;
@@ -63,24 +64,25 @@
* Create the appropriate user file system view.
*/
public FileSystemView createFileSystemView(User user) throws FtpException {
-
- // create home if does not exist
- if (createHome) {
- String homeDirStr = user.getHomeDirectory();
- File homeDir = new File(homeDirStr);
- if (homeDir.isFile()) {
- LOG.warn("Not a directory :: " + homeDirStr);
- throw new FtpException("Not a directory :: " + homeDirStr);
- }
- if ((!homeDir.exists()) && (!homeDir.mkdirs())) {
- LOG.warn("Cannot create user home :: " + homeDirStr);
- throw new FtpException("Cannot create user home :: "
- + homeDirStr);
+ synchronized (user) {
+ // create home if does not exist
+ if (createHome) {
+ String homeDirStr = user.getHomeDirectory();
+ File homeDir = new File(homeDirStr);
+ if (homeDir.isFile()) {
+ LOG.warn("Not a directory :: " + homeDirStr);
+ throw new FtpException("Not a directory :: " + homeDirStr);
+ }
+ if ((!homeDir.exists()) && (!homeDir.mkdirs())) {
+ LOG.warn("Cannot create user home :: " + homeDirStr);
+ throw new FtpException("Cannot create user home :: "
+ + homeDirStr);
+ }
}
+
+ FileSystemView fsView = new NativeFileSystemView(user, caseInsensitive);
+ return fsView;
}
-
- FileSystemView fsView = new NativeFileSystemView(user, caseInsensitive);
- return fsView;
}
}
Propchange: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/filesystem/nativefs/NativeFileSystemFactory.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/filesystem/nativefs/NativeFileSystemFactory.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/filesystem/nativefs/impl/NameEqualsFileFilter.java (from r693183, mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/filesystem/NameEqualsFileFilter.java)
URL:
http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/filesystem/nativefs/impl/NameEqualsFileFilter.java?p2=mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/filesystem/nativefs/impl/NameEqualsFileFilter.java&p1=mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/filesystem/NameEqualsFileFilter.java&r1=693183&r2=701234&rev=701234&view=diff==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/filesystem/NameEqualsFileFilter.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/filesystem/nativefs/impl/NameEqualsFileFilter.java Thu Oct 2 13:28:16 2008
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.ftpserver.filesystem;
+package org.apache.ftpserver.filesystem.nativefs.impl;
import java.io.File;
import java.io.FileFilter;
Copied: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/filesystem/nativefs/impl/NativeFileSystemView.java (from r693183, mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/filesystem/NativeFileSystemView.java)
URL:
http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/filesystem/nativefs/impl/NativeFileSystemView.java?p2=mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/filesystem/nativefs/impl/NativeFileSystemView.java&p1=mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/filesystem/NativeFileSystemView.java&r1=693183&r2=701234&rev=701234&view=diff==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/filesystem/NativeFileSystemView.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/filesystem/nativefs/impl/NativeFileSystemView.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 org.apache.ftpserver.ftplet.FileObject;
+import org.apache.ftpserver.filesystem.nativefs.NativeFileSystemFactory;
+import org.apache.ftpserver.ftplet.FtpFile;
import org.apache.ftpserver.ftplet.FileSystemView;
import org.apache.ftpserver.ftplet.FtpException;
import org.apache.ftpserver.ftplet.User;
@@ -49,16 +50,16 @@
private boolean caseInsensitive = false;
/**
- * Constructor - set the user object.
+ * Constructor - internal do not use directly, use {@link NativeFileSystemFactory} instead
*/
protected NativeFileSystemView(User user) throws FtpException {
this(user, false);
}
/**
- * Constructor - set the user object.
+ * Constructor - internal do not use directly, use {@link NativeFileSystemFactory} instead
*/
- protected NativeFileSystemView(User user, boolean caseInsensitive)
+ public NativeFileSystemView(User user, boolean caseInsensitive)
throws FtpException {
if (user == null) {
throw new IllegalArgumentException("user can not be null");
@@ -72,7 +73,7 @@
// add last '/' if necessary
String rootDir = user.getHomeDirectory();
- rootDir = NativeFileObject.normalizeSeparateChar(rootDir);
+ rootDir = NativeFtpFile.normalizeSeparateChar(rootDir);
if (!rootDir.endsWith("/")) {
rootDir += '/';
}
@@ -87,20 +88,20 @@
* Get the user home directory. It would be the file system root for the
* user.
*/
- public FileObject getHomeDirectory() {
- return new NativeFileObject("/", new File(rootDir), user);
+ public FtpFile getHomeDirectory() {
+ return new NativeFtpFile("/", new File(rootDir), user);
}
/**
* Get the current directory.
*/
- public FileObject getCurrentDirectory() {
- FileObject fileObj = null;
+ public FtpFile getCurrentDirectory() {
+ FtpFile fileObj = null;
if (currDir.equals("/")) {
- fileObj = new NativeFileObject("/", new File(rootDir), user);
+ fileObj = new NativeFtpFile("/", new File(rootDir), user);
} else {
File file = new File(rootDir, currDir.substring(1));
- fileObj = new NativeFileObject(currDir, file, user);
+ fileObj = new NativeFtpFile(currDir, file, user);
}
return fileObj;
@@ -109,16 +110,16 @@
/**
* Get file object.
*/
- public FileObject getFileObject(String file) {
+ public FtpFile getFileObject(String file) {
// get actual file object
- String physicalName = NativeFileObject.getPhysicalName(rootDir,
+ String physicalName = NativeFtpFile.getPhysicalName(rootDir,
currDir, file, caseInsensitive);
File fileObj = new File(physicalName);
// strip the root directory and return
String userFileName = physicalName.substring(rootDir.length() - 1);
- return new NativeFileObject(userFileName, fileObj, user);
+ return new NativeFtpFile(userFileName, fileObj, user);
}
/**
@@ -127,7 +128,7 @@
public boolean changeDirectory(String dir) {
// not a directory - return false
- dir = NativeFileObject.getPhysicalName(rootDir, currDir, dir,
+ dir = NativeFtpFile.getPhysicalName(rootDir, currDir, dir,
caseInsensitive);
File dirObj = new File(dir);
if (!dirObj.isDirectory()) {
Propchange: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/filesystem/nativefs/impl/NativeFileSystemView.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/filesystem/nativefs/impl/NativeFileSystemView.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/filesystem/nativefs/impl/NativeFtpFile.java (from r693183, mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/filesystem/NativeFileObject.java)
URL:
http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/filesystem/nativefs/impl/NativeFtpFile.java?p2=mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/filesystem/nativefs/impl/NativeFtpFile.java&p1=mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/filesystem/NativeFileObject.java&r1=693183&r2=701234&rev=701234&view=diff==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/filesystem/NativeFileObject.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/filesystem/nativefs/impl/NativeFtpFile.java Thu Oct 2 13:28:16 2008
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.ftpserver.filesystem;
+package org.apache.ftpserver.filesystem.nativefs.impl;
import java.io.File;
import java.io.FileInputStream;
@@ -30,9 +30,8 @@
import java.util.Comparator;
import java.util.StringTokenizer;
-import org.apache.ftpserver.ftplet.FileObject;
+import org.apache.ftpserver.ftplet.FtpFile;
import org.apache.ftpserver.ftplet.User;
-import org.apache.ftpserver.usermanager.BaseUser;
import org.apache.ftpserver.usermanager.WriteRequest;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -43,9 +42,9 @@
* @author The Apache MINA Project (
dev@...)
* @version $Rev$, $Date$
*/
-public class NativeFileObject implements FileObject {
+public class NativeFtpFile implements FtpFile {
- private final Logger LOG = LoggerFactory.getLogger(NativeFileObject.class);
+ private final Logger LOG = LoggerFactory.getLogger(NativeFtpFile.class);
// the file name with respect to the user root.
// The path separator character will be '/' and
@@ -57,9 +56,9 @@
private User user;
/**
- * Constructor.
+ * Constructor, internal do not use directly.
*/
- protected NativeFileObject(final String fileName, final File file,
+ protected NativeFtpFile(final String fileName, final File file,
final User user) {
if (fileName == null) {
throw new IllegalArgumentException("fileName can not be null");
@@ -242,7 +241,7 @@
}
// we check if the parent FileObject is writable.
- NativeFileObject parentObject=new NativeFileObject(parentFullName,file.getAbsoluteFile().getParentFile(),user);
+ NativeFtpFile parentObject=new NativeFtpFile(parentFullName,file.getAbsoluteFile().getParentFile(),user);
return parentObject.hasWritePermission();
}
@@ -260,10 +259,10 @@
/**
* Move file object.
*/
- public boolean move(final FileObject dest) {
+ public boolean move(final FtpFile dest) {
boolean retVal = false;
if (dest.hasWritePermission() && hasReadPermission()) {
- File destFile = ((NativeFileObject) dest).file;
+ File destFile = ((NativeFtpFile) dest).file;
if (destFile.exists()) {
// renameTo behaves differently on different platforms
@@ -298,7 +297,7 @@
/**
* List files. If not a directory or does not exist, null will be returned.
*/
- public FileObject[] listFiles() {
+ public FtpFile[] listFiles() {
// is a directory
if (!file.isDirectory()) {
@@ -325,11 +324,11 @@
}
// now return all the files under the directory
- FileObject[] virtualFiles = new FileObject[files.length];
+ FtpFile[] virtualFiles = new FtpFile[files.length];
for (int i = 0; i < files.length; ++i) {
File fileObj = files[i];
String fileName = virtualFileStr + fileObj.getName();
- virtualFiles[i] = new NativeFileObject(fileName, fileObj, user);
+ virtualFiles[i] = new NativeFtpFile(fileName, fileObj, user);
}
return virtualFiles;
Propchange: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/filesystem/nativefs/impl/NativeFtpFile.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/filesystem/nativefs/impl/NativeFtpFile.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/interfaces/FileObserver.java
URL:
http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/interfaces/FileObserver.java?rev=701234&r1=701233&r2=701234&view=diff==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/interfaces/FileObserver.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/interfaces/FileObserver.java Thu Oct 2 13:28:16 2008
@@ -19,7 +19,7 @@
package org.apache.ftpserver.interfaces;
-import org.apache.ftpserver.ftplet.FileObject;
+import org.apache.ftpserver.ftplet.FtpFile;
/**
* This is the file related activity observer.
@@ -32,26 +32,26 @@
/**
* User file upload notification.
*/
- void notifyUpload(FtpIoSession session, FileObject file, long size);
+ void notifyUpload(FtpIoSession session, FtpFile file, long size);
/**
* User file download notification.
*/
- void notifyDownload(FtpIoSession session, FileObject file, long size);
+ void notifyDownload(FtpIoSession session, FtpFile file, long size);
/**
* User file delete notification.
*/
- void notifyDelete(FtpIoSession session, FileObject file);
+ void notifyD
