You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by ng...@apache.org on 2008/10/01 07:35:49 UTC
svn commit: r700685 - in /mina/ftpserver/trunk/core/src:
main/java/org/apache/ftpserver/command/impl/
main/java/org/apache/ftpserver/command/impl/listing/
main/java/org/apache/ftpserver/listener/nio/
main/java/org/apache/ftpserver/listing/ test/java/or...
Author: ngn
Date: Tue Sep 30 22:35:48 2008
New Revision: 700685
URL: http://svn.apache.org/viewvc?rev=700685&view=rev
Log:
Moved listing classes into the command implementation
Added:
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/listing/
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/listing/DirectoryLister.java (contents, props changed)
- copied, changed from r693183, mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listing/DirectoryLister.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/listing/FileFilter.java (contents, props changed)
- copied, changed from r693183, mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listing/FileFilter.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/listing/FileFormater.java (contents, props changed)
- copied, changed from r693183, mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listing/FileFormater.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/listing/LISTFileFormater.java (contents, props changed)
- copied, changed from r693183, mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listing/LISTFileFormater.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/listing/ListArgument.java (contents, props changed)
- copied, changed from r693183, mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listing/ListArgument.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/listing/ListArgumentParser.java (contents, props changed)
- copied, changed from r693183, mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listing/ListArgumentParser.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/listing/MLSTFileFormater.java (contents, props changed)
- copied, changed from r693183, mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listing/MLSTFileFormater.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/listing/NLSTFileFormater.java (contents, props changed)
- copied, changed from r693183, mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listing/NLSTFileFormater.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/listing/RegexFileFilter.java (contents, props changed)
- copied, changed from r693183, mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listing/RegexFileFilter.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/listing/VisibleFileFilter.java (contents, props changed)
- copied, changed from r693183, mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listing/VisibleFileFilter.java
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/commands/impl/listing/
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/commands/impl/listing/DirectoryListerTest.java
- copied, changed from r693183, mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/listing/DirectoryListerTest.java
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/commands/impl/listing/LISTFileFormaterTest.java (contents, props changed)
- copied, changed from r693183, mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/listing/LISTFileFormaterTest.java
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/commands/impl/listing/ListArgumentParserTest.java (contents, props changed)
- copied, changed from r693183, mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/listing/ListArgumentParserTest.java
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/commands/impl/listing/ListArgumentTest.java (contents, props changed)
- copied, changed from r693183, mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/listing/ListArgumentTest.java
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/commands/impl/listing/MLSTFileFormaterTest.java (contents, props changed)
- copied, changed from r693183, mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/listing/MLSTFileFormaterTest.java
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/commands/impl/listing/NLSTFileFormaterTest.java (contents, props changed)
- copied, changed from r693183, mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/listing/NLSTFileFormaterTest.java
Removed:
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listing/
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/listing/
Modified:
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/LIST.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/MLSD.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/MLST.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/NLST.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listener/nio/NioListener.java
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/LIST.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/LIST.java?rev=700685&r1=700684&r2=700685&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/LIST.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/LIST.java Tue Sep 30 22:35:48 2008
@@ -25,6 +25,10 @@
import org.apache.ftpserver.IODataConnectionFactory;
import org.apache.ftpserver.command.AbstractCommand;
+import org.apache.ftpserver.command.impl.listing.DirectoryLister;
+import org.apache.ftpserver.command.impl.listing.LISTFileFormater;
+import org.apache.ftpserver.command.impl.listing.ListArgument;
+import org.apache.ftpserver.command.impl.listing.ListArgumentParser;
import org.apache.ftpserver.ftplet.DataConnection;
import org.apache.ftpserver.ftplet.DataConnectionFactory;
import org.apache.ftpserver.ftplet.DefaultFtpReply;
@@ -34,10 +38,6 @@
import org.apache.ftpserver.impl.LocalizedFtpReply;
import org.apache.ftpserver.interfaces.FtpIoSession;
import org.apache.ftpserver.interfaces.FtpServerContext;
-import org.apache.ftpserver.listing.DirectoryLister;
-import org.apache.ftpserver.listing.LISTFileFormater;
-import org.apache.ftpserver.listing.ListArgument;
-import org.apache.ftpserver.listing.ListArgumentParser;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/MLSD.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/MLSD.java?rev=700685&r1=700684&r2=700685&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/MLSD.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/MLSD.java Tue Sep 30 22:35:48 2008
@@ -25,6 +25,11 @@
import org.apache.ftpserver.IODataConnectionFactory;
import org.apache.ftpserver.command.AbstractCommand;
+import org.apache.ftpserver.command.impl.listing.DirectoryLister;
+import org.apache.ftpserver.command.impl.listing.FileFormater;
+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.DataConnection;
import org.apache.ftpserver.ftplet.DataConnectionFactory;
import org.apache.ftpserver.ftplet.DefaultFtpReply;
@@ -34,11 +39,6 @@
import org.apache.ftpserver.impl.LocalizedFtpReply;
import org.apache.ftpserver.interfaces.FtpIoSession;
import org.apache.ftpserver.interfaces.FtpServerContext;
-import org.apache.ftpserver.listing.DirectoryLister;
-import org.apache.ftpserver.listing.FileFormater;
-import org.apache.ftpserver.listing.ListArgument;
-import org.apache.ftpserver.listing.ListArgumentParser;
-import org.apache.ftpserver.listing.MLSTFileFormater;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
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=700685&r1=700684&r2=700685&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/MLST.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/MLST.java Tue Sep 30 22:35:48 2008
@@ -22,6 +22,10 @@
import java.io.IOException;
import org.apache.ftpserver.command.AbstractCommand;
+import org.apache.ftpserver.command.impl.listing.FileFormater;
+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.FtpException;
import org.apache.ftpserver.ftplet.FtpReply;
@@ -29,10 +33,6 @@
import org.apache.ftpserver.impl.LocalizedFtpReply;
import org.apache.ftpserver.interfaces.FtpIoSession;
import org.apache.ftpserver.interfaces.FtpServerContext;
-import org.apache.ftpserver.listing.FileFormater;
-import org.apache.ftpserver.listing.ListArgument;
-import org.apache.ftpserver.listing.ListArgumentParser;
-import org.apache.ftpserver.listing.MLSTFileFormater;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/NLST.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/NLST.java?rev=700685&r1=700684&r2=700685&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/NLST.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/NLST.java Tue Sep 30 22:35:48 2008
@@ -25,6 +25,12 @@
import org.apache.ftpserver.IODataConnectionFactory;
import org.apache.ftpserver.command.AbstractCommand;
+import org.apache.ftpserver.command.impl.listing.DirectoryLister;
+import org.apache.ftpserver.command.impl.listing.FileFormater;
+import org.apache.ftpserver.command.impl.listing.LISTFileFormater;
+import org.apache.ftpserver.command.impl.listing.ListArgument;
+import org.apache.ftpserver.command.impl.listing.ListArgumentParser;
+import org.apache.ftpserver.command.impl.listing.NLSTFileFormater;
import org.apache.ftpserver.ftplet.DataConnection;
import org.apache.ftpserver.ftplet.DataConnectionFactory;
import org.apache.ftpserver.ftplet.DefaultFtpReply;
@@ -34,12 +40,6 @@
import org.apache.ftpserver.impl.LocalizedFtpReply;
import org.apache.ftpserver.interfaces.FtpIoSession;
import org.apache.ftpserver.interfaces.FtpServerContext;
-import org.apache.ftpserver.listing.DirectoryLister;
-import org.apache.ftpserver.listing.FileFormater;
-import org.apache.ftpserver.listing.LISTFileFormater;
-import org.apache.ftpserver.listing.ListArgument;
-import org.apache.ftpserver.listing.ListArgumentParser;
-import org.apache.ftpserver.listing.NLSTFileFormater;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Copied: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/listing/DirectoryLister.java (from r693183, mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listing/DirectoryLister.java)
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/listing/DirectoryLister.java?p2=mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/listing/DirectoryLister.java&p1=mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listing/DirectoryLister.java&r1=693183&r2=700685&rev=700685&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listing/DirectoryLister.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/listing/DirectoryLister.java Tue Sep 30 22:35:48 2008
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.ftpserver.listing;
+package org.apache.ftpserver.command.impl.listing;
import java.io.IOException;
Propchange: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/listing/DirectoryLister.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/listing/DirectoryLister.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/listing/FileFilter.java (from r693183, mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listing/FileFilter.java)
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/listing/FileFilter.java?p2=mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/listing/FileFilter.java&p1=mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listing/FileFilter.java&r1=693183&r2=700685&rev=700685&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listing/FileFilter.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/listing/FileFilter.java Tue Sep 30 22:35:48 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.ftpserver.listing;
+package org.apache.ftpserver.command.impl.listing;
import org.apache.ftpserver.ftplet.FileObject;
Propchange: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/listing/FileFilter.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/listing/FileFormater.java (from r693183, mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listing/FileFormater.java)
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/listing/FileFormater.java?p2=mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/listing/FileFormater.java&p1=mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listing/FileFormater.java&r1=693183&r2=700685&rev=700685&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listing/FileFormater.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/listing/FileFormater.java Tue Sep 30 22:35:48 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.ftpserver.listing;
+package org.apache.ftpserver.command.impl.listing;
import org.apache.ftpserver.ftplet.FileObject;
Propchange: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/listing/FileFormater.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/listing/LISTFileFormater.java (from r693183, mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listing/LISTFileFormater.java)
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/listing/LISTFileFormater.java?p2=mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/listing/LISTFileFormater.java&p1=mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listing/LISTFileFormater.java&r1=693183&r2=700685&rev=700685&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listing/LISTFileFormater.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/listing/LISTFileFormater.java Tue Sep 30 22:35:48 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.ftpserver.listing;
+package org.apache.ftpserver.command.impl.listing;
import java.util.Arrays;
Propchange: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/listing/LISTFileFormater.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/listing/ListArgument.java (from r693183, mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listing/ListArgument.java)
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/listing/ListArgument.java?p2=mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/listing/ListArgument.java&p1=mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listing/ListArgument.java&r1=693183&r2=700685&rev=700685&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listing/ListArgument.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/listing/ListArgument.java Tue Sep 30 22:35:48 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.ftpserver.listing;
+package org.apache.ftpserver.command.impl.listing;
/**
* Contains the parsed argument for a list command (e.g. LIST or NLST)
Propchange: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/listing/ListArgument.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/listing/ListArgumentParser.java (from r693183, mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listing/ListArgumentParser.java)
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/listing/ListArgumentParser.java?p2=mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/listing/ListArgumentParser.java&p1=mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listing/ListArgumentParser.java&r1=693183&r2=700685&rev=700685&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listing/ListArgumentParser.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/listing/ListArgumentParser.java Tue Sep 30 22:35:48 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.ftpserver.listing;
+package org.apache.ftpserver.command.impl.listing;
import java.util.StringTokenizer;
Propchange: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/listing/ListArgumentParser.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/listing/MLSTFileFormater.java (from r693183, mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listing/MLSTFileFormater.java)
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/listing/MLSTFileFormater.java?p2=mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/listing/MLSTFileFormater.java&p1=mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listing/MLSTFileFormater.java&r1=693183&r2=700685&rev=700685&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listing/MLSTFileFormater.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/listing/MLSTFileFormater.java Tue Sep 30 22:35:48 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.ftpserver.listing;
+package org.apache.ftpserver.command.impl.listing;
import org.apache.ftpserver.ftplet.FileObject;
import org.apache.ftpserver.util.DateUtils;
Propchange: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/listing/MLSTFileFormater.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/listing/NLSTFileFormater.java (from r693183, mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listing/NLSTFileFormater.java)
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/listing/NLSTFileFormater.java?p2=mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/listing/NLSTFileFormater.java&p1=mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listing/NLSTFileFormater.java&r1=693183&r2=700685&rev=700685&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listing/NLSTFileFormater.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/listing/NLSTFileFormater.java Tue Sep 30 22:35:48 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.ftpserver.listing;
+package org.apache.ftpserver.command.impl.listing;
import org.apache.ftpserver.ftplet.FileObject;
Propchange: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/listing/NLSTFileFormater.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/listing/RegexFileFilter.java (from r693183, mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listing/RegexFileFilter.java)
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/listing/RegexFileFilter.java?p2=mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/listing/RegexFileFilter.java&p1=mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listing/RegexFileFilter.java&r1=693183&r2=700685&rev=700685&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listing/RegexFileFilter.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/listing/RegexFileFilter.java Tue Sep 30 22:35:48 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.ftpserver.listing;
+package org.apache.ftpserver.command.impl.listing;
import org.apache.ftpserver.ftplet.FileObject;
import org.apache.ftpserver.util.RegularExpr;
Propchange: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/listing/RegexFileFilter.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/listing/VisibleFileFilter.java (from r693183, mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listing/VisibleFileFilter.java)
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/listing/VisibleFileFilter.java?p2=mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/listing/VisibleFileFilter.java&p1=mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listing/VisibleFileFilter.java&r1=693183&r2=700685&rev=700685&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listing/VisibleFileFilter.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/listing/VisibleFileFilter.java Tue Sep 30 22:35:48 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.ftpserver.listing;
+package org.apache.ftpserver.command.impl.listing;
import org.apache.ftpserver.ftplet.FileObject;
Propchange: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/impl/listing/VisibleFileFilter.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listener/nio/NioListener.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listener/nio/NioListener.java?rev=700685&r1=700684&r2=700685&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listener/nio/NioListener.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/listener/nio/NioListener.java Tue Sep 30 22:35:48 2008
@@ -109,7 +109,7 @@
/**
* @see Listener#start(FtpServerContext)
*/
- public void start(FtpServerContext context) throws Exception {
+ public synchronized void start(FtpServerContext context) throws Exception {
this.context = context;
acceptor = new NioSocketAcceptor(Runtime.getRuntime()
@@ -210,7 +210,7 @@
/**
* @see Listener#resume()
*/
- public void resume() {
+ public synchronized void resume() {
if (acceptor != null && suspended) {
try {
acceptor.bind(address);
@@ -223,7 +223,7 @@
/**
* @see Listener#suspend()
*/
- public void suspend() {
+ public synchronized void suspend() {
if (acceptor != null && !suspended) {
acceptor.unbind(address);
}
@@ -232,7 +232,7 @@
/**
* @see Listener#getActiveSessions()
*/
- public Set<FtpIoSession> getActiveSessions() {
+ public synchronized Set<FtpIoSession> getActiveSessions() {
Map<Long, IoSession> sessions = acceptor.getManagedSessions();
Set<FtpIoSession> ftpSessions = new HashSet<FtpIoSession>();
Copied: mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/commands/impl/listing/DirectoryListerTest.java (from r693183, mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/listing/DirectoryListerTest.java)
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/commands/impl/listing/DirectoryListerTest.java?p2=mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/commands/impl/listing/DirectoryListerTest.java&p1=mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/listing/DirectoryListerTest.java&r1=693183&r2=700685&rev=700685&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/listing/DirectoryListerTest.java (original)
+++ mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/commands/impl/listing/DirectoryListerTest.java Tue Sep 30 22:35:48 2008
@@ -17,12 +17,16 @@
* under the License.
*/
-package org.apache.ftpserver.listing;
+package org.apache.ftpserver.commands.impl.listing;
import java.io.File;
import junit.framework.TestCase;
+import org.apache.ftpserver.command.impl.listing.DirectoryLister;
+import org.apache.ftpserver.command.impl.listing.FileFormater;
+import org.apache.ftpserver.command.impl.listing.ListArgument;
+import org.apache.ftpserver.command.impl.listing.NLSTFileFormater;
import org.apache.ftpserver.filesystem.NativeFileSystemView;
import org.apache.ftpserver.ftplet.FileSystemView;
import org.apache.ftpserver.test.TestUtil;
Copied: mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/commands/impl/listing/LISTFileFormaterTest.java (from r693183, mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/listing/LISTFileFormaterTest.java)
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/commands/impl/listing/LISTFileFormaterTest.java?p2=mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/commands/impl/listing/LISTFileFormaterTest.java&p1=mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/listing/LISTFileFormaterTest.java&r1=693183&r2=700685&rev=700685&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/listing/LISTFileFormaterTest.java (original)
+++ mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/commands/impl/listing/LISTFileFormaterTest.java Tue Sep 30 22:35:48 2008
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.ftpserver.listing;
+package org.apache.ftpserver.commands.impl.listing;
import java.io.IOException;
import java.io.InputStream;
@@ -26,6 +26,7 @@
import junit.framework.TestCase;
+import org.apache.ftpserver.command.impl.listing.LISTFileFormater;
import org.apache.ftpserver.ftplet.FileObject;
/**
Propchange: mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/commands/impl/listing/LISTFileFormaterTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/commands/impl/listing/ListArgumentParserTest.java (from r693183, mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/listing/ListArgumentParserTest.java)
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/commands/impl/listing/ListArgumentParserTest.java?p2=mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/commands/impl/listing/ListArgumentParserTest.java&p1=mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/listing/ListArgumentParserTest.java&r1=693183&r2=700685&rev=700685&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/listing/ListArgumentParserTest.java (original)
+++ mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/commands/impl/listing/ListArgumentParserTest.java Tue Sep 30 22:35:48 2008
@@ -17,7 +17,10 @@
* under the License.
*/
-package org.apache.ftpserver.listing;
+package org.apache.ftpserver.commands.impl.listing;
+
+import org.apache.ftpserver.command.impl.listing.ListArgument;
+import org.apache.ftpserver.command.impl.listing.ListArgumentParser;
import junit.framework.TestCase;
Propchange: mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/commands/impl/listing/ListArgumentParserTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/commands/impl/listing/ListArgumentTest.java (from r693183, mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/listing/ListArgumentTest.java)
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/commands/impl/listing/ListArgumentTest.java?p2=mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/commands/impl/listing/ListArgumentTest.java&p1=mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/listing/ListArgumentTest.java&r1=693183&r2=700685&rev=700685&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/listing/ListArgumentTest.java (original)
+++ mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/commands/impl/listing/ListArgumentTest.java Tue Sep 30 22:35:48 2008
@@ -17,10 +17,12 @@
* under the License.
*/
-package org.apache.ftpserver.listing;
+package org.apache.ftpserver.commands.impl.listing;
import java.util.Arrays;
+import org.apache.ftpserver.command.impl.listing.ListArgument;
+
import junit.framework.TestCase;
/**
Propchange: mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/commands/impl/listing/ListArgumentTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/commands/impl/listing/MLSTFileFormaterTest.java (from r693183, mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/listing/MLSTFileFormaterTest.java)
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/commands/impl/listing/MLSTFileFormaterTest.java?p2=mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/commands/impl/listing/MLSTFileFormaterTest.java&p1=mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/listing/MLSTFileFormaterTest.java&r1=693183&r2=700685&rev=700685&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/listing/MLSTFileFormaterTest.java (original)
+++ mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/commands/impl/listing/MLSTFileFormaterTest.java Tue Sep 30 22:35:48 2008
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.ftpserver.listing;
+package org.apache.ftpserver.commands.impl.listing;
import java.io.IOException;
import java.io.InputStream;
@@ -26,6 +26,7 @@
import junit.framework.TestCase;
+import org.apache.ftpserver.command.impl.listing.MLSTFileFormater;
import org.apache.ftpserver.ftplet.FileObject;
/**
Propchange: mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/commands/impl/listing/MLSTFileFormaterTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/commands/impl/listing/NLSTFileFormaterTest.java (from r693183, mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/listing/NLSTFileFormaterTest.java)
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/commands/impl/listing/NLSTFileFormaterTest.java?p2=mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/commands/impl/listing/NLSTFileFormaterTest.java&p1=mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/listing/NLSTFileFormaterTest.java&r1=693183&r2=700685&rev=700685&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/listing/NLSTFileFormaterTest.java (original)
+++ mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/commands/impl/listing/NLSTFileFormaterTest.java Tue Sep 30 22:35:48 2008
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.ftpserver.listing;
+package org.apache.ftpserver.commands.impl.listing;
import java.io.IOException;
import java.io.InputStream;
@@ -25,6 +25,7 @@
import junit.framework.TestCase;
+import org.apache.ftpserver.command.impl.listing.NLSTFileFormater;
import org.apache.ftpserver.ftplet.FileObject;
/**
Propchange: mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/commands/impl/listing/NLSTFileFormaterTest.java
------------------------------------------------------------------------------
svn:eol-style = native