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/08/07 21:19:32 UTC
svn commit: r683682 - in /mina/ftpserver/trunk:
core/src/main/java/org/apache/ftpserver/
core/src/main/java/org/apache/ftpserver/command/
core/src/main/java/org/apache/ftpserver/util/
core/src/test/java/org/apache/ftpserver/ ftplet-api/src/main/java/or...
Author: ngn
Date: Thu Aug 7 12:19:30 2008
New Revision: 683682
URL: http://svn.apache.org/viewvc?rev=683682&view=rev
Log:
Move DefaultFtpReply to ftplet-api to make it useful from Ftplets
Added:
mina/ftpserver/trunk/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/DefaultFtpReply.java (with props)
Removed:
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/DefaultFtpReply.java
Modified:
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/APPE.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/LIST.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/MLSD.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/NLST.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/RETR.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/SITE_DESCUSER.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/SITE_STAT.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/SITE_WHO.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/SITE_ZONE.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/STOR.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/STOU.java
mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/util/FtpReplyUtil.java
mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/DefaultFtpReplyTest.java
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/APPE.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/APPE.java?rev=683682&r1=683681&r2=683682&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/APPE.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/APPE.java Thu Aug 7 12:19:30 2008
@@ -24,10 +24,10 @@
import java.net.InetAddress;
import java.net.SocketException;
-import org.apache.ftpserver.DefaultFtpReply;
import org.apache.ftpserver.IODataConnectionFactory;
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.FtpException;
import org.apache.ftpserver.ftplet.FtpReply;
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/LIST.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/LIST.java?rev=683682&r1=683681&r2=683682&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/LIST.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/LIST.java Thu Aug 7 12:19:30 2008
@@ -23,10 +23,10 @@
import java.net.InetAddress;
import java.net.SocketException;
-import org.apache.ftpserver.DefaultFtpReply;
import org.apache.ftpserver.IODataConnectionFactory;
import org.apache.ftpserver.ftplet.DataConnection;
import org.apache.ftpserver.ftplet.DataConnectionFactory;
+import org.apache.ftpserver.ftplet.DefaultFtpReply;
import org.apache.ftpserver.ftplet.FtpException;
import org.apache.ftpserver.ftplet.FtpReply;
import org.apache.ftpserver.ftplet.FtpRequest;
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/MLSD.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/MLSD.java?rev=683682&r1=683681&r2=683682&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/MLSD.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/MLSD.java Thu Aug 7 12:19:30 2008
@@ -23,10 +23,10 @@
import java.net.InetAddress;
import java.net.SocketException;
-import org.apache.ftpserver.DefaultFtpReply;
import org.apache.ftpserver.IODataConnectionFactory;
import org.apache.ftpserver.ftplet.DataConnection;
import org.apache.ftpserver.ftplet.DataConnectionFactory;
+import org.apache.ftpserver.ftplet.DefaultFtpReply;
import org.apache.ftpserver.ftplet.FtpException;
import org.apache.ftpserver.ftplet.FtpReply;
import org.apache.ftpserver.ftplet.FtpRequest;
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/NLST.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/NLST.java?rev=683682&r1=683681&r2=683682&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/NLST.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/NLST.java Thu Aug 7 12:19:30 2008
@@ -23,10 +23,10 @@
import java.net.InetAddress;
import java.net.SocketException;
-import org.apache.ftpserver.DefaultFtpReply;
import org.apache.ftpserver.IODataConnectionFactory;
import org.apache.ftpserver.ftplet.DataConnection;
import org.apache.ftpserver.ftplet.DataConnectionFactory;
+import org.apache.ftpserver.ftplet.DefaultFtpReply;
import org.apache.ftpserver.ftplet.FtpException;
import org.apache.ftpserver.ftplet.FtpReply;
import org.apache.ftpserver.ftplet.FtpRequest;
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/RETR.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/RETR.java?rev=683682&r1=683681&r2=683682&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/RETR.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/RETR.java Thu Aug 7 12:19:30 2008
@@ -25,11 +25,11 @@
import java.net.InetAddress;
import java.net.SocketException;
-import org.apache.ftpserver.DefaultFtpReply;
import org.apache.ftpserver.IODataConnectionFactory;
import org.apache.ftpserver.ftplet.DataConnection;
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.FtpException;
import org.apache.ftpserver.ftplet.FtpReply;
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/SITE_DESCUSER.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/SITE_DESCUSER.java?rev=683682&r1=683681&r2=683682&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/SITE_DESCUSER.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/SITE_DESCUSER.java Thu Aug 7 12:19:30 2008
@@ -21,7 +21,7 @@
import java.io.IOException;
-import org.apache.ftpserver.DefaultFtpReply;
+import org.apache.ftpserver.ftplet.DefaultFtpReply;
import org.apache.ftpserver.ftplet.FtpException;
import org.apache.ftpserver.ftplet.FtpReply;
import org.apache.ftpserver.ftplet.FtpRequest;
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/SITE_STAT.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/SITE_STAT.java?rev=683682&r1=683681&r2=683682&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/SITE_STAT.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/SITE_STAT.java Thu Aug 7 12:19:30 2008
@@ -21,7 +21,7 @@
import java.io.IOException;
-import org.apache.ftpserver.DefaultFtpReply;
+import org.apache.ftpserver.ftplet.DefaultFtpReply;
import org.apache.ftpserver.ftplet.FtpException;
import org.apache.ftpserver.ftplet.FtpReply;
import org.apache.ftpserver.ftplet.FtpRequest;
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/SITE_WHO.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/SITE_WHO.java?rev=683682&r1=683681&r2=683682&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/SITE_WHO.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/SITE_WHO.java Thu Aug 7 12:19:30 2008
@@ -24,7 +24,7 @@
import java.util.Iterator;
import java.util.Map;
-import org.apache.ftpserver.DefaultFtpReply;
+import org.apache.ftpserver.ftplet.DefaultFtpReply;
import org.apache.ftpserver.ftplet.FtpException;
import org.apache.ftpserver.ftplet.FtpReply;
import org.apache.ftpserver.ftplet.FtpRequest;
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/SITE_ZONE.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/SITE_ZONE.java?rev=683682&r1=683681&r2=683682&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/SITE_ZONE.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/SITE_ZONE.java Thu Aug 7 12:19:30 2008
@@ -23,7 +23,7 @@
import java.text.SimpleDateFormat;
import java.util.Date;
-import org.apache.ftpserver.DefaultFtpReply;
+import org.apache.ftpserver.ftplet.DefaultFtpReply;
import org.apache.ftpserver.ftplet.FtpException;
import org.apache.ftpserver.ftplet.FtpReply;
import org.apache.ftpserver.ftplet.FtpRequest;
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/STOR.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/STOR.java?rev=683682&r1=683681&r2=683682&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/STOR.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/STOR.java Thu Aug 7 12:19:30 2008
@@ -24,10 +24,10 @@
import java.net.InetAddress;
import java.net.SocketException;
-import org.apache.ftpserver.DefaultFtpReply;
import org.apache.ftpserver.IODataConnectionFactory;
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.FtpException;
import org.apache.ftpserver.ftplet.FtpReply;
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/STOU.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/STOU.java?rev=683682&r1=683681&r2=683682&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/STOU.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/STOU.java Thu Aug 7 12:19:30 2008
@@ -24,10 +24,10 @@
import java.net.InetAddress;
import java.net.SocketException;
-import org.apache.ftpserver.DefaultFtpReply;
import org.apache.ftpserver.IODataConnectionFactory;
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.FileSystemView;
import org.apache.ftpserver.ftplet.FtpException;
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/util/FtpReplyUtil.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/util/FtpReplyUtil.java?rev=683682&r1=683681&r2=683682&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/util/FtpReplyUtil.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/util/FtpReplyUtil.java Thu Aug 7 12:19:30 2008
@@ -23,7 +23,7 @@
import java.net.InetSocketAddress;
import java.net.SocketAddress;
-import org.apache.ftpserver.DefaultFtpReply;
+import org.apache.ftpserver.ftplet.DefaultFtpReply;
import org.apache.ftpserver.ftplet.FileSystemView;
import org.apache.ftpserver.ftplet.FtpReply;
import org.apache.ftpserver.ftplet.FtpRequest;
Modified: mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/DefaultFtpReplyTest.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/DefaultFtpReplyTest.java?rev=683682&r1=683681&r2=683682&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/DefaultFtpReplyTest.java (original)
+++ mina/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/DefaultFtpReplyTest.java Thu Aug 7 12:19:30 2008
@@ -19,6 +19,8 @@
package org.apache.ftpserver;
+import org.apache.ftpserver.ftplet.DefaultFtpReply;
+
import junit.framework.TestCase;
Added: mina/ftpserver/trunk/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/DefaultFtpReply.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/DefaultFtpReply.java?rev=683682&view=auto
==============================================================================
--- mina/ftpserver/trunk/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/DefaultFtpReply.java (added)
+++ mina/ftpserver/trunk/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/DefaultFtpReply.java Thu Aug 7 12:19:30 2008
@@ -0,0 +1,104 @@
+/*
+ * 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.
+ */
+
+package org.apache.ftpserver.ftplet;
+
+
+/**
+ * FTP reply object.
+ */
+public class DefaultFtpReply implements FtpReply {
+
+ private int code;
+ private String message;
+ private final static String CRLF = "\r\n";
+ /**
+ * @param code
+ * @param message
+ */
+ public DefaultFtpReply(final int code, final String message) {
+ this.code = code;
+ this.message = message;
+ }
+
+ public DefaultFtpReply(final int code, final String[] message) {
+ this.code = code;
+
+ StringBuffer sb = new StringBuffer();
+ for(int i = 0; i<message.length; i++) {
+ sb.append(message[i]);
+ sb.append('\n');
+ }
+ this.message = sb.toString();
+ }
+ /**
+ * @return the code
+ */
+ public int getCode() {
+ return code;
+ }
+ /**
+ * @return the message
+ */
+ public String getMessage() {
+ return message;
+ }
+
+ /* (non-Javadoc)
+ * @see java.lang.Object#toString()
+ */
+ public String toString() {
+ int code = getCode();
+ String notNullMessage = getMessage();
+ if(notNullMessage == null) {
+ notNullMessage = "";
+ }
+
+ StringBuffer sb = new StringBuffer();
+
+ // no newline
+ if (notNullMessage.indexOf('\n') == -1) {
+ sb.append(code);
+ sb.append(" ");
+ sb.append(notNullMessage);
+ sb.append(CRLF);
+ } else {
+ String[] lines = notNullMessage.split("\n");
+
+ sb.append(code);
+ sb.append("-");
+
+ for (int i = 0; i < lines.length; i++) {
+ String line = lines[i];
+
+ if(i + 1 == lines.length) {
+ sb.append(code);
+ sb.append(" ");
+ }
+
+ sb.append(line);
+ sb.append(CRLF);
+ }
+
+ }
+
+ return sb.toString();
+ }
+
+}
Propchange: mina/ftpserver/trunk/ftplet-api/src/main/java/org/apache/ftpserver/ftplet/DefaultFtpReply.java
------------------------------------------------------------------------------
svn:mime-type = text/plain