diff --git a/Aria/build.gradle b/Aria/build.gradle index 025b23bb..7e21ecf5 100644 --- a/Aria/build.gradle +++ b/Aria/build.gradle @@ -30,4 +30,4 @@ dependencies { // compile project(':AriaFtpPlug') } -apply from: 'bintray-release.gradle' +//apply from: 'bintray-release.gradle' diff --git a/AriaAnnotations/build.gradle b/AriaAnnotations/build.gradle index a9f2139b..0b581ad5 100644 --- a/AriaAnnotations/build.gradle +++ b/AriaAnnotations/build.gradle @@ -11,4 +11,4 @@ dependencies { compile fileTree(dir: 'libs', include: ['*.jar']) } -apply from: 'bintray-release.gradle' \ No newline at end of file +//apply from: 'bintray-release.gradle' \ No newline at end of file diff --git a/AriaCompiler/build.gradle b/AriaCompiler/build.gradle index a76e8659..38de01a1 100644 --- a/AriaCompiler/build.gradle +++ b/AriaCompiler/build.gradle @@ -14,4 +14,4 @@ dependencies { compile project(':AriaAnnotations') } -apply from: 'bintray-release.gradle' \ No newline at end of file +//apply from: 'bintray-release.gradle' \ No newline at end of file diff --git a/AriaFtpPlug/build.gradle b/AriaFtpPlug/build.gradle index 0b581ad5..a9f2139b 100644 --- a/AriaFtpPlug/build.gradle +++ b/AriaFtpPlug/build.gradle @@ -11,4 +11,4 @@ dependencies { compile fileTree(dir: 'libs', include: ['*.jar']) } -//apply from: 'bintray-release.gradle' \ No newline at end of file +apply from: 'bintray-release.gradle' \ No newline at end of file diff --git a/AriaFtpPlug/src/main/java/org/apache/commons/net/DatagramSocketClient.java b/AriaFtpPlug/src/main/java/aria/apache/commons/net/DatagramSocketClient.java similarity index 99% rename from AriaFtpPlug/src/main/java/org/apache/commons/net/DatagramSocketClient.java rename to AriaFtpPlug/src/main/java/aria/apache/commons/net/DatagramSocketClient.java index 38e49fcc..2ddf9be4 100644 --- a/AriaFtpPlug/src/main/java/org/apache/commons/net/DatagramSocketClient.java +++ b/AriaFtpPlug/src/main/java/aria/apache/commons/net/DatagramSocketClient.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.net; +package aria.apache.commons.net; import java.net.DatagramSocket; import java.net.InetAddress; @@ -33,7 +33,7 @@ import java.nio.charset.Charset; * especially useful for adding things like proxy support as well as better * support for applets. For * example, you could create a - * {@link org.apache.commons.net.DatagramSocketFactory} + * {@link DatagramSocketFactory} * that * requests browser security capabilities before creating a socket. * All classes derived from DatagramSocketClient should use the diff --git a/AriaFtpPlug/src/main/java/org/apache/commons/net/DatagramSocketFactory.java b/AriaFtpPlug/src/main/java/aria/apache/commons/net/DatagramSocketFactory.java similarity index 98% rename from AriaFtpPlug/src/main/java/org/apache/commons/net/DatagramSocketFactory.java rename to AriaFtpPlug/src/main/java/aria/apache/commons/net/DatagramSocketFactory.java index e2013155..385cceb4 100644 --- a/AriaFtpPlug/src/main/java/org/apache/commons/net/DatagramSocketFactory.java +++ b/AriaFtpPlug/src/main/java/aria/apache/commons/net/DatagramSocketFactory.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.net; +package aria.apache.commons.net; import java.net.DatagramSocket; import java.net.InetAddress; diff --git a/AriaFtpPlug/src/main/java/org/apache/commons/net/DefaultDatagramSocketFactory.java b/AriaFtpPlug/src/main/java/aria/apache/commons/net/DefaultDatagramSocketFactory.java similarity index 98% rename from AriaFtpPlug/src/main/java/org/apache/commons/net/DefaultDatagramSocketFactory.java rename to AriaFtpPlug/src/main/java/aria/apache/commons/net/DefaultDatagramSocketFactory.java index 8ba558b8..e269124d 100644 --- a/AriaFtpPlug/src/main/java/org/apache/commons/net/DefaultDatagramSocketFactory.java +++ b/AriaFtpPlug/src/main/java/aria/apache/commons/net/DefaultDatagramSocketFactory.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.net; +package aria.apache.commons.net; import java.net.DatagramSocket; import java.net.InetAddress; diff --git a/AriaFtpPlug/src/main/java/org/apache/commons/net/DefaultSocketFactory.java b/AriaFtpPlug/src/main/java/aria/apache/commons/net/DefaultSocketFactory.java similarity index 99% rename from AriaFtpPlug/src/main/java/org/apache/commons/net/DefaultSocketFactory.java rename to AriaFtpPlug/src/main/java/aria/apache/commons/net/DefaultSocketFactory.java index d5d0faa9..1fec9085 100644 --- a/AriaFtpPlug/src/main/java/org/apache/commons/net/DefaultSocketFactory.java +++ b/AriaFtpPlug/src/main/java/aria/apache/commons/net/DefaultSocketFactory.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.net; +package aria.apache.commons.net; import java.io.IOException; import java.net.InetAddress; diff --git a/AriaFtpPlug/src/main/java/org/apache/commons/net/MalformedServerReplyException.java b/AriaFtpPlug/src/main/java/aria/apache/commons/net/MalformedServerReplyException.java similarity index 98% rename from AriaFtpPlug/src/main/java/org/apache/commons/net/MalformedServerReplyException.java rename to AriaFtpPlug/src/main/java/aria/apache/commons/net/MalformedServerReplyException.java index fe0fa919..c63818fc 100644 --- a/AriaFtpPlug/src/main/java/org/apache/commons/net/MalformedServerReplyException.java +++ b/AriaFtpPlug/src/main/java/aria/apache/commons/net/MalformedServerReplyException.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.net; +package aria.apache.commons.net; import java.io.IOException; diff --git a/AriaFtpPlug/src/main/java/org/apache/commons/net/PrintCommandListener.java b/AriaFtpPlug/src/main/java/aria/apache/commons/net/PrintCommandListener.java similarity index 99% rename from AriaFtpPlug/src/main/java/org/apache/commons/net/PrintCommandListener.java rename to AriaFtpPlug/src/main/java/aria/apache/commons/net/PrintCommandListener.java index 9ef813db..14f92c78 100644 --- a/AriaFtpPlug/src/main/java/org/apache/commons/net/PrintCommandListener.java +++ b/AriaFtpPlug/src/main/java/aria/apache/commons/net/PrintCommandListener.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.net; +package aria.apache.commons.net; import java.io.PrintStream; import java.io.PrintWriter; diff --git a/AriaFtpPlug/src/main/java/org/apache/commons/net/ProtocolCommandEvent.java b/AriaFtpPlug/src/main/java/aria/apache/commons/net/ProtocolCommandEvent.java similarity index 98% rename from AriaFtpPlug/src/main/java/org/apache/commons/net/ProtocolCommandEvent.java rename to AriaFtpPlug/src/main/java/aria/apache/commons/net/ProtocolCommandEvent.java index 4c2f094f..9f0154e7 100644 --- a/AriaFtpPlug/src/main/java/org/apache/commons/net/ProtocolCommandEvent.java +++ b/AriaFtpPlug/src/main/java/aria/apache/commons/net/ProtocolCommandEvent.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.net; +package aria.apache.commons.net; import java.util.EventObject; @@ -25,7 +25,7 @@ import java.util.EventObject; * ASCII text reply. For debugging and other purposes, it is extremely * useful to log or keep track of the contents of the protocol messages. * The ProtocolCommandEvent class coupled with the - * {@link org.apache.commons.net.ProtocolCommandListener} + * {@link ProtocolCommandListener} * interface facilitate this process. * * diff --git a/AriaFtpPlug/src/main/java/org/apache/commons/net/ProtocolCommandListener.java b/AriaFtpPlug/src/main/java/aria/apache/commons/net/ProtocolCommandListener.java similarity index 95% rename from AriaFtpPlug/src/main/java/org/apache/commons/net/ProtocolCommandListener.java rename to AriaFtpPlug/src/main/java/aria/apache/commons/net/ProtocolCommandListener.java index e9bf74ef..12f8e00e 100644 --- a/AriaFtpPlug/src/main/java/org/apache/commons/net/ProtocolCommandListener.java +++ b/AriaFtpPlug/src/main/java/aria/apache/commons/net/ProtocolCommandListener.java @@ -15,8 +15,9 @@ * limitations under the License. */ -package org.apache.commons.net; +package aria.apache.commons.net; +import aria.apache.commons.net.ftp.FTPClient; import java.util.EventListener; /*** @@ -30,7 +31,7 @@ import java.util.EventListener; * To receive ProtocolCommandEvents, you merely implement the * ProtocolCommandListener interface and register the class as a listener * with a ProtocolCommandEvent source such as - * {@link org.apache.commons.net.ftp.FTPClient}. + * {@link FTPClient}. * * * @see ProtocolCommandEvent diff --git a/AriaFtpPlug/src/main/java/org/apache/commons/net/ProtocolCommandSupport.java b/AriaFtpPlug/src/main/java/aria/apache/commons/net/ProtocolCommandSupport.java similarity index 93% rename from AriaFtpPlug/src/main/java/org/apache/commons/net/ProtocolCommandSupport.java rename to AriaFtpPlug/src/main/java/aria/apache/commons/net/ProtocolCommandSupport.java index c420259f..01b1888e 100644 --- a/AriaFtpPlug/src/main/java/org/apache/commons/net/ProtocolCommandSupport.java +++ b/AriaFtpPlug/src/main/java/aria/apache/commons/net/ProtocolCommandSupport.java @@ -15,12 +15,12 @@ * limitations under the License. */ -package org.apache.commons.net; +package aria.apache.commons.net; import java.io.Serializable; import java.util.EventListener; -import org.apache.commons.net.util.ListenerList; +import aria.apache.commons.net.util.ListenerList; /*** * ProtocolCommandSupport is a convenience class for managing a list of @@ -53,7 +53,7 @@ public class ProtocolCommandSupport implements Serializable { /*** * Fires a ProtocolCommandEvent signalling the sending of a command to all * registered listeners, invoking their - * {@link org.apache.commons.net.ProtocolCommandListener#protocolCommandSent protocolCommandSent() } + * {@link ProtocolCommandListener#protocolCommandSent protocolCommandSent() } * methods. * * @param command The string representation of the command type sent, not @@ -74,7 +74,7 @@ public class ProtocolCommandSupport implements Serializable { /*** * Fires a ProtocolCommandEvent signalling the reception of a command reply * to all registered listeners, invoking their - * {@link org.apache.commons.net.ProtocolCommandListener#protocolReplyReceived protocolReplyReceived() } + * {@link ProtocolCommandListener#protocolReplyReceived protocolReplyReceived() } * methods. * * @param replyCode The integer code indicating the natureof the reply. diff --git a/AriaFtpPlug/src/main/java/org/apache/commons/net/SocketClient.java b/AriaFtpPlug/src/main/java/aria/apache/commons/net/SocketClient.java similarity index 99% rename from AriaFtpPlug/src/main/java/org/apache/commons/net/SocketClient.java rename to AriaFtpPlug/src/main/java/aria/apache/commons/net/SocketClient.java index bd472916..0ac183a7 100644 --- a/AriaFtpPlug/src/main/java/org/apache/commons/net/SocketClient.java +++ b/AriaFtpPlug/src/main/java/aria/apache/commons/net/SocketClient.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.net; +package aria.apache.commons.net; import java.io.Closeable; import java.io.IOException; @@ -119,7 +119,7 @@ public abstract class SocketClient { * _socket_ to null, _timeout_ to 0, _defaultPort to 0, * _isConnected_ to false, charset to {@code Charset.defaultCharset()} * and _socketFactory_ to a shared instance of - * {@link org.apache.commons.net.DefaultSocketFactory}. + * {@link DefaultSocketFactory}. */ public SocketClient() { _socket_ = null; diff --git a/AriaFtpPlug/src/main/java/org/apache/commons/net/ftp/Configurable.java b/AriaFtpPlug/src/main/java/aria/apache/commons/net/ftp/Configurable.java similarity index 97% rename from AriaFtpPlug/src/main/java/org/apache/commons/net/ftp/Configurable.java rename to AriaFtpPlug/src/main/java/aria/apache/commons/net/ftp/Configurable.java index dd8767ee..b0361f80 100644 --- a/AriaFtpPlug/src/main/java/org/apache/commons/net/ftp/Configurable.java +++ b/AriaFtpPlug/src/main/java/aria/apache/commons/net/ftp/Configurable.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.net.ftp; +package aria.apache.commons.net.ftp; /** * This interface adds the aspect of configurability by means of diff --git a/AriaFtpPlug/src/main/java/org/apache/commons/net/ftp/FTP.java b/AriaFtpPlug/src/main/java/aria/apache/commons/net/ftp/FTP.java similarity index 97% rename from AriaFtpPlug/src/main/java/org/apache/commons/net/ftp/FTP.java rename to AriaFtpPlug/src/main/java/aria/apache/commons/net/ftp/FTP.java index de9c840f..12a99b15 100644 --- a/AriaFtpPlug/src/main/java/org/apache/commons/net/ftp/FTP.java +++ b/AriaFtpPlug/src/main/java/aria/apache/commons/net/ftp/FTP.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.net.ftp; +package aria.apache.commons.net.ftp; import java.io.BufferedReader; import java.io.BufferedWriter; @@ -30,21 +30,21 @@ import java.net.SocketException; import java.net.SocketTimeoutException; import java.util.ArrayList; -import org.apache.commons.net.MalformedServerReplyException; -import org.apache.commons.net.ProtocolCommandSupport; -import org.apache.commons.net.SocketClient; -import org.apache.commons.net.io.CRLFLineReader; +import aria.apache.commons.net.MalformedServerReplyException; +import aria.apache.commons.net.ProtocolCommandSupport; +import aria.apache.commons.net.SocketClient; +import aria.apache.commons.net.io.CRLFLineReader; /*** * FTP provides the basic the functionality necessary to implement your - * own FTP client. It extends org.apache.commons.net.SocketClient since + * own FTP client. It extends SocketClient since * extending TelnetClient was causing unwanted behavior (like connections * that did not time out properly). *

* To derive the full benefits of the FTP class requires some knowledge * of the FTP protocol defined in RFC 959. However, there is no reason * why you should have to use the FTP class. The - * {@link org.apache.commons.net.ftp.FTPClient} class, + * {@link FTPClient} class, * derived from FTP, * implements all the functionality required of an FTP client. The * FTP class is made public to provide access to various FTP constants @@ -57,16 +57,16 @@ import org.apache.commons.net.io.CRLFLineReader; * close a connection if the client has been idle for longer than a * given time period (usually 900 seconds). The FTP class will detect a * premature FTP server connection closing when it receives a - * {@link org.apache.commons.net.ftp.FTPReply#SERVICE_NOT_AVAILABLE FTPReply.SERVICE_NOT_AVAILABLE } + * {@link FTPReply#SERVICE_NOT_AVAILABLE FTPReply.SERVICE_NOT_AVAILABLE } * response to a command. * When that occurs, the FTP class method encountering that reply will throw - * an {@link org.apache.commons.net.ftp.FTPConnectionClosedException} + * an {@link FTPConnectionClosedException} * . FTPConectionClosedException * is a subclass of IOException and therefore need not be * caught separately, but if you are going to catch it separately, its * catch block must appear before the more general IOException * catch block. When you encounter an - * {@link org.apache.commons.net.ftp.FTPConnectionClosedException} + * {@link FTPConnectionClosedException} * , you must disconnect the connection with * {@link #disconnect disconnect() } to properly clean up the * system resources used by FTP. Before disconnecting, you may check the @@ -80,7 +80,7 @@ import org.apache.commons.net.io.CRLFLineReader; * Rather than list it separately for each method, we mention here that * every method communicating with the server and throwing an IOException * can also throw a - * {@link org.apache.commons.net.MalformedServerReplyException} + * {@link MalformedServerReplyException} * , which is a subclass * of IOException. A MalformedServerReplyException will be thrown when * the reply received from the server deviates enough from the protocol @@ -89,7 +89,7 @@ import org.apache.commons.net.io.CRLFLineReader; * * @see FTPClient * @see FTPConnectionClosedException - * @see org.apache.commons.net.MalformedServerReplyException + * @see MalformedServerReplyException * @version $Id: FTP.java 1782546 2017-02-11 00:05:41Z sebb $ ***/ @@ -1105,7 +1105,7 @@ public class FTP extends SocketClient { * A convenience method to send the FTP RETR command to the server, * receive the reply, and return the reply code. Remember, it is up * to you to manage the data connection. If you don't need this low - * level of access, use {@link org.apache.commons.net.ftp.FTPClient} + * level of access, use {@link FTPClient} * , which will handle all low level details for you. * * @param pathname The pathname of the file to retrieve. @@ -1126,7 +1126,7 @@ public class FTP extends SocketClient { * A convenience method to send the FTP STOR command to the server, * receive the reply, and return the reply code. Remember, it is up * to you to manage the data connection. If you don't need this low - * level of access, use {@link org.apache.commons.net.ftp.FTPClient} + * level of access, use {@link FTPClient} * , which will handle all low level details for you. * * @param pathname The pathname to use for the file when stored at @@ -1148,7 +1148,7 @@ public class FTP extends SocketClient { * A convenience method to send the FTP STOU command to the server, * receive the reply, and return the reply code. Remember, it is up * to you to manage the data connection. If you don't need this low - * level of access, use {@link org.apache.commons.net.ftp.FTPClient} + * level of access, use {@link FTPClient} * , which will handle all low level details for you. * * @return The reply code received from the server. @@ -1168,7 +1168,7 @@ public class FTP extends SocketClient { * A convenience method to send the FTP STOU command to the server, * receive the reply, and return the reply code. Remember, it is up * to you to manage the data connection. If you don't need this low - * level of access, use {@link org.apache.commons.net.ftp.FTPClient} + * level of access, use {@link FTPClient} * , which will handle all low level details for you. * @param pathname The base pathname to use for the file when stored at * the remote end of the transfer. Some FTP servers @@ -1190,7 +1190,7 @@ public class FTP extends SocketClient { * A convenience method to send the FTP APPE command to the server, * receive the reply, and return the reply code. Remember, it is up * to you to manage the data connection. If you don't need this low - * level of access, use {@link org.apache.commons.net.ftp.FTPClient} + * level of access, use {@link FTPClient} * , which will handle all low level details for you. * * @param pathname The pathname to use for the file when stored at @@ -1418,7 +1418,7 @@ public class FTP extends SocketClient { * A convenience method to send the FTP LIST command to the server, * receive the reply, and return the reply code. Remember, it is up * to you to manage the data connection. If you don't need this low - * level of access, use {@link org.apache.commons.net.ftp.FTPClient} + * level of access, use {@link FTPClient} * , which will handle all low level details for you. * * @return The reply code received from the server. @@ -1438,7 +1438,7 @@ public class FTP extends SocketClient { * A convenience method to send the FTP LIST command to the server, * receive the reply, and return the reply code. Remember, it is up * to you to manage the data connection. If you don't need this low - * level of access, use {@link org.apache.commons.net.ftp.FTPClient} + * level of access, use {@link FTPClient} * , which will handle all low level details for you. * * @param pathname The pathname to list, @@ -1460,7 +1460,7 @@ public class FTP extends SocketClient { * A convenience method to send the FTP MLSD command to the server, * receive the reply, and return the reply code. Remember, it is up * to you to manage the data connection. If you don't need this low - * level of access, use {@link org.apache.commons.net.ftp.FTPClient} + * level of access, use {@link FTPClient} * , which will handle all low level details for you. * * @return The reply code received from the server. @@ -1481,7 +1481,7 @@ public class FTP extends SocketClient { * A convenience method to send the FTP MLSD command to the server, * receive the reply, and return the reply code. Remember, it is up * to you to manage the data connection. If you don't need this low - * level of access, use {@link org.apache.commons.net.ftp.FTPClient} + * level of access, use {@link FTPClient} * , which will handle all low level details for you. * * @param path the path to report on @@ -1504,7 +1504,7 @@ public class FTP extends SocketClient { * A convenience method to send the FTP MLST command to the server, * receive the reply, and return the reply code. Remember, it is up * to you to manage the data connection. If you don't need this low - * level of access, use {@link org.apache.commons.net.ftp.FTPClient} + * level of access, use {@link FTPClient} * , which will handle all low level details for you. * * @return The reply code received from the server. @@ -1525,7 +1525,7 @@ public class FTP extends SocketClient { * A convenience method to send the FTP MLST command to the server, * receive the reply, and return the reply code. Remember, it is up * to you to manage the data connection. If you don't need this low - * level of access, use {@link org.apache.commons.net.ftp.FTPClient} + * level of access, use {@link FTPClient} * , which will handle all low level details for you. * * @param path the path to report on @@ -1548,7 +1548,7 @@ public class FTP extends SocketClient { * A convenience method to send the FTP NLST command to the server, * receive the reply, and return the reply code. Remember, it is up * to you to manage the data connection. If you don't need this low - * level of access, use {@link org.apache.commons.net.ftp.FTPClient} + * level of access, use {@link FTPClient} * , which will handle all low level details for you. * * @return The reply code received from the server. @@ -1568,7 +1568,7 @@ public class FTP extends SocketClient { * A convenience method to send the FTP NLST command to the server, * receive the reply, and return the reply code. Remember, it is up * to you to manage the data connection. If you don't need this low - * level of access, use {@link org.apache.commons.net.ftp.FTPClient} + * level of access, use {@link FTPClient} * , which will handle all low level details for you. * * @param pathname The pathname to list, diff --git a/AriaFtpPlug/src/main/java/org/apache/commons/net/ftp/FTPClient.java b/AriaFtpPlug/src/main/java/aria/apache/commons/net/ftp/FTPClient.java similarity index 98% rename from AriaFtpPlug/src/main/java/org/apache/commons/net/ftp/FTPClient.java rename to AriaFtpPlug/src/main/java/aria/apache/commons/net/ftp/FTPClient.java index 862bea2f..4bcf98dc 100644 --- a/AriaFtpPlug/src/main/java/org/apache/commons/net/ftp/FTPClient.java +++ b/AriaFtpPlug/src/main/java/aria/apache/commons/net/ftp/FTPClient.java @@ -14,8 +14,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.net.ftp; - +package aria.apache.commons.net.ftp; + +import aria.apache.commons.net.SocketClient; +import aria.apache.commons.net.ftp.parser.ParserInitializationException; +import aria.apache.commons.net.io.CopyStreamAdapter; +import aria.apache.commons.net.io.CopyStreamEvent; +import aria.apache.commons.net.io.CopyStreamException; +import aria.apache.commons.net.io.CopyStreamListener; +import aria.apache.commons.net.io.FromNetASCIIInputStream; +import aria.apache.commons.net.io.SocketInputStream; +import aria.apache.commons.net.io.SocketOutputStream; +import aria.apache.commons.net.io.ToNetASCIIOutputStream; +import aria.apache.commons.net.io.Util; import java.io.BufferedInputStream; import java.io.BufferedOutputStream; import java.io.BufferedReader; @@ -42,28 +53,22 @@ import java.util.Properties; import java.util.Random; import java.util.Set; -import org.apache.commons.net.MalformedServerReplyException; -import org.apache.commons.net.ftp.parser.DefaultFTPFileEntryParserFactory; -import org.apache.commons.net.ftp.parser.FTPFileEntryParserFactory; -import org.apache.commons.net.ftp.parser.MLSxEntryParser; -import org.apache.commons.net.io.CRLFLineReader; -import org.apache.commons.net.io.CopyStreamAdapter; -import org.apache.commons.net.io.CopyStreamEvent; -import org.apache.commons.net.io.CopyStreamListener; -import org.apache.commons.net.io.FromNetASCIIInputStream; -import org.apache.commons.net.io.ToNetASCIIOutputStream; -import org.apache.commons.net.io.Util; +import aria.apache.commons.net.MalformedServerReplyException; +import aria.apache.commons.net.ftp.parser.DefaultFTPFileEntryParserFactory; +import aria.apache.commons.net.ftp.parser.FTPFileEntryParserFactory; +import aria.apache.commons.net.ftp.parser.MLSxEntryParser; +import aria.apache.commons.net.io.CRLFLineReader; /** * FTPClient encapsulates all the functionality necessary to store and * retrieve files from an FTP server. This class takes care of all * low level details of interacting with an FTP server and provides * a convenient higher level interface. As with all classes derived - * from {@link org.apache.commons.net.SocketClient}, + * from {@link SocketClient}, * you must first connect to the server with - * {@link org.apache.commons.net.SocketClient#connect connect } + * {@link SocketClient#connect connect } * before doing anything, and finally - * {@link org.apache.commons.net.SocketClient#disconnect disconnect } + * {@link SocketClient#disconnect disconnect } * after you're completely finished interacting with the server. * Then you need to check the FTP reply code to see if the connection * was successful. For example: @@ -162,14 +167,14 @@ import org.apache.commons.net.io.Util; * {@link FTPReply#SERVICE_NOT_AVAILABLE FTPReply.SERVICE_NOT_AVAILABLE } * response to a command. * When that occurs, the FTP class method encountering that reply will throw - * an {@link org.apache.commons.net.ftp.FTPConnectionClosedException} + * an {@link FTPConnectionClosedException} * . * FTPConnectionClosedException * is a subclass of IOException and therefore need not be * caught separately, but if you are going to catch it separately, its * catch block must appear before the more general IOException * catch block. When you encounter an - * {@link org.apache.commons.net.ftp.FTPConnectionClosedException} + * {@link FTPConnectionClosedException} * , you must disconnect the connection with * {@link #disconnect disconnect() } to properly clean up the * system resources used by FTPClient. Before disconnecting, you may check the @@ -184,7 +189,7 @@ import org.apache.commons.net.io.Util; * Rather than list it separately for each method, we mention here that * every method communicating with the server and throwing an IOException * can also throw a - * {@link org.apache.commons.net.MalformedServerReplyException} + * {@link MalformedServerReplyException} * , which is a subclass * of IOException. A MalformedServerReplyException will be thrown when * the reply received from the server deviates enough from the protocol @@ -291,7 +296,7 @@ import org.apache.commons.net.io.Util; * @see FTPFileEntryParserFactory * @see DefaultFTPFileEntryParserFactory * @see FTPClientConfig - * @see org.apache.commons.net.MalformedServerReplyException + * @see MalformedServerReplyException */ public class FTPClient extends FTP implements Configurable { /** @@ -320,7 +325,7 @@ public class FTPClient extends FTP implements Configurable { * For example: * 

    * Plan 9=Unix
-   * OS410=org.apache.commons.net.ftp.parser.OS400FTPEntryParser
+   * OS410=OS400FTPEntryParser
    *
* * @since 3.0 @@ -713,7 +718,7 @@ public class FTPClient extends FTP implements Configurable { } else { output = socket.getOutputStream(); } - return new org.apache.commons.net.io.SocketOutputStream(socket, output); + return new SocketOutputStream(socket, output); } /** @@ -1757,7 +1762,7 @@ public class FTPClient extends FTP implements Configurable { * of the client being idle or some other reason causing the server * to send FTP reply code 421. This exception may be caught either * as an IOException or independently as itself. - * @throws org.apache.commons.net.io.CopyStreamException If an I/O error occurs while actually + * @throws CopyStreamException If an I/O error occurs while actually * transferring the file. The CopyStreamException allows you to * determine the number of bytes transferred and the IOException * causing the error. This exception may be caught either @@ -1874,7 +1879,7 @@ public class FTPClient extends FTP implements Configurable { } else { input = socket.getInputStream(); } - return new org.apache.commons.net.io.SocketInputStream(socket, input); + return new SocketInputStream(socket, input); } /** @@ -1892,7 +1897,7 @@ public class FTPClient extends FTP implements Configurable { * of the client being idle or some other reason causing the server * to send FTP reply code 421. This exception may be caught either * as an IOException or independently as itself. - * @throws org.apache.commons.net.io.CopyStreamException If an I/O error occurs while actually + * @throws CopyStreamException If an I/O error occurs while actually * transferring the file. The CopyStreamException allows you to * determine the number of bytes transferred and the IOException * causing the error. This exception may be caught either @@ -1965,7 +1970,7 @@ public class FTPClient extends FTP implements Configurable { * of the client being idle or some other reason causing the server * to send FTP reply code 421. This exception may be caught either * as an IOException or independently as itself. - * @throws org.apache.commons.net.io.CopyStreamException If an I/O error occurs while actually + * @throws CopyStreamException If an I/O error occurs while actually * transferring the file. The CopyStreamException allows you to * determine the number of bytes transferred and the IOException * causing the error. This exception may be caught either @@ -2026,7 +2031,7 @@ public class FTPClient extends FTP implements Configurable { * of the client being idle or some other reason causing the server * to send FTP reply code 421. This exception may be caught either * as an IOException or independently as itself. - * @throws org.apache.commons.net.io.CopyStreamException If an I/O error occurs while actually + * @throws CopyStreamException If an I/O error occurs while actually * transferring the file. The CopyStreamException allows you to * determine the number of bytes transferred and the IOException * causing the error. This exception may be caught either @@ -2087,7 +2092,7 @@ public class FTPClient extends FTP implements Configurable { * of the client being idle or some other reason causing the server * to send FTP reply code 421. This exception may be caught either * as an IOException or independently as itself. - * @throws org.apache.commons.net.io.CopyStreamException If an I/O error occurs while actually + * @throws CopyStreamException If an I/O error occurs while actually * transferring the file. The CopyStreamException allows you to * determine the number of bytes transferred and the IOException * causing the error. This exception may be caught either @@ -2826,7 +2831,7 @@ public class FTPClient extends FTP implements Configurable { * @throws IOException If an I/O error occurs while either sending a * command to the server or receiving a reply * from the server. - * @throws org.apache.commons.net.ftp.parser.ParserInitializationException Thrown if the + * @throws ParserInitializationException Thrown if the * parserKey * parameter cannot be * resolved by the selected parser factory. @@ -2834,13 +2839,13 @@ public class FTPClient extends FTP implements Configurable { * happen when parserKey is neither * the fully qualified class name of a class * implementing the interface - * org.apache.commons.net.ftp.FTPFileEntryParser + * FTPFileEntryParser * nor a string containing one of the recognized keys * mapping to such a parser or if class loader * security issues prevent its being loaded. * @see DefaultFTPFileEntryParserFactory * @see FTPFileEntryParserFactory - * @see org.apache.commons.net.ftp.FTPFileEntryParser + * @see FTPFileEntryParser */ public FTPFile[] listFiles(String pathname) throws IOException { FTPListParseEngine engine = initiateListParsing((String) null, pathname); @@ -2875,7 +2880,7 @@ public class FTPClient extends FTP implements Configurable { * @throws IOException If an I/O error occurs while either sending a * command to the server or receiving a reply * from the server. - * @throws org.apache.commons.net.ftp.parser.ParserInitializationException Thrown if the + * @throws ParserInitializationException Thrown if the * parserKey * parameter cannot be * resolved by the selected parser factory. @@ -2883,13 +2888,13 @@ public class FTPClient extends FTP implements Configurable { * happen when parserKey is neither * the fully qualified class name of a class * implementing the interface - * org.apache.commons.net.ftp.FTPFileEntryParser + * FTPFileEntryParser * nor a string containing one of the recognized keys * mapping to such a parser or if class loader * security issues prevent its being loaded. * @see DefaultFTPFileEntryParserFactory * @see FTPFileEntryParserFactory - * @see org.apache.commons.net.ftp.FTPFileEntryParser + * @see FTPFileEntryParser */ public FTPFile[] listFiles() throws IOException { return listFiles((String) null); @@ -2934,7 +2939,7 @@ public class FTPClient extends FTP implements Configurable { * @throws IOException If an I/O error occurs while either sending a * command to the server or receiving a reply * from the server. - * @throws org.apache.commons.net.ftp.parser.ParserInitializationException Thrown if the + * @throws ParserInitializationException Thrown if the * parserKey * parameter cannot be * resolved by the selected parser factory. @@ -2942,13 +2947,13 @@ public class FTPClient extends FTP implements Configurable { * happen when parserKey is neither * the fully qualified class name of a class * implementing the interface - * org.apache.commons.net.ftp.FTPFileEntryParser + * FTPFileEntryParser * nor a string containing one of the recognized keys * mapping to such a parser or if class loader * security issues prevent its being loaded. * @see DefaultFTPFileEntryParserFactory * @see FTPFileEntryParserFactory - * @see org.apache.commons.net.ftp.FTPFileEntryParser + * @see FTPFileEntryParser * @since 3.0 */ public FTPFile[] listDirectories() throws IOException { @@ -2980,7 +2985,7 @@ public class FTPClient extends FTP implements Configurable { * @throws IOException If an I/O error occurs while either sending a * command to the server or receiving a reply * from the server. - * @throws org.apache.commons.net.ftp.parser.ParserInitializationException Thrown if the + * @throws ParserInitializationException Thrown if the * parserKey * parameter cannot be * resolved by the selected parser factory. @@ -2988,13 +2993,13 @@ public class FTPClient extends FTP implements Configurable { * happen when parserKey is neither * the fully qualified class name of a class * implementing the interface - * org.apache.commons.net.ftp.FTPFileEntryParser + * FTPFileEntryParser * nor a string containing one of the recognized keys * mapping to such a parser or if class loader * security issues prevent its being loaded. * @see DefaultFTPFileEntryParserFactory * @see FTPFileEntryParserFactory - * @see org.apache.commons.net.ftp.FTPFileEntryParser + * @see FTPFileEntryParser * @since 3.0 */ public FTPFile[] listDirectories(String parent) throws IOException { @@ -3027,7 +3032,7 @@ public class FTPClient extends FTP implements Configurable { * as an IOException or independently as itself. * @throws IOException If an I/O error occurs while either sending a * command to the server or receiving a reply from the server. - * @throws org.apache.commons.net.ftp.parser.ParserInitializationException Thrown if the + * @throws ParserInitializationException Thrown if the * autodetect mechanism cannot * resolve the type of system we are connected with. * @see FTPListParseEngine @@ -3079,7 +3084,7 @@ public class FTPClient extends FTP implements Configurable { * as an IOException or independently as itself. * @throws IOException If an I/O error occurs while either sending a * command to the server or receiving a reply from the server. - * @throws org.apache.commons.net.ftp.parser.ParserInitializationException Thrown if the + * @throws ParserInitializationException Thrown if the * autodetect mechanism cannot * resolve the type of system we are connected with. * @see FTPListParseEngine @@ -3127,7 +3132,7 @@ public class FTPClient extends FTP implements Configurable { * as an IOException or independently as itself. * @throws IOException If an I/O error occurs while either sending a * command to the server or receiving a reply from the server. - * @throws org.apache.commons.net.ftp.parser.ParserInitializationException Thrown if the + * @throws ParserInitializationException Thrown if the * parserKey * parameter cannot be * resolved by the selected parser factory. @@ -3135,7 +3140,7 @@ public class FTPClient extends FTP implements Configurable { * happen when parserKey is neither * the fully qualified class name of a class * implementing the interface - * org.apache.commons.net.ftp.FTPFileEntryParser + * FTPFileEntryParser * nor a string containing one of the recognized keys * mapping to such a parser or if class loader * security issues prevent its being loaded. diff --git a/AriaFtpPlug/src/main/java/org/apache/commons/net/ftp/FTPClientConfig.java b/AriaFtpPlug/src/main/java/aria/apache/commons/net/ftp/FTPClientConfig.java similarity index 98% rename from AriaFtpPlug/src/main/java/org/apache/commons/net/ftp/FTPClientConfig.java rename to AriaFtpPlug/src/main/java/aria/apache/commons/net/ftp/FTPClientConfig.java index 4d8acf56..abe8902e 100644 --- a/AriaFtpPlug/src/main/java/org/apache/commons/net/ftp/FTPClientConfig.java +++ b/AriaFtpPlug/src/main/java/aria/apache/commons/net/ftp/FTPClientConfig.java @@ -15,8 +15,10 @@ * limitations under the License. */ -package org.apache.commons.net.ftp; +package aria.apache.commons.net.ftp; +import aria.apache.commons.net.ftp.parser.ConfigurableFTPFileEntryParserImpl; +import aria.apache.commons.net.ftp.parser.FTPTimestampParserImpl; import java.text.DateFormatSymbols; import java.util.Collection; import java.util.Locale; @@ -131,8 +133,8 @@ import java.util.TreeMap; * * @see Configurable * @see FTPClient - * @see org.apache.commons.net.ftp.parser.FTPTimestampParserImpl#configure(FTPClientConfig) - * @see org.apache.commons.net.ftp.parser.ConfigurableFTPFileEntryParserImpl + * @see FTPTimestampParserImpl#configure(FTPClientConfig) + * @see ConfigurableFTPFileEntryParserImpl * @since 1.4 */ public class FTPClientConfig { diff --git a/AriaFtpPlug/src/main/java/org/apache/commons/net/ftp/FTPCmd.java b/AriaFtpPlug/src/main/java/aria/apache/commons/net/ftp/FTPCmd.java similarity index 98% rename from AriaFtpPlug/src/main/java/org/apache/commons/net/ftp/FTPCmd.java rename to AriaFtpPlug/src/main/java/aria/apache/commons/net/ftp/FTPCmd.java index a56fb772..de14835b 100644 --- a/AriaFtpPlug/src/main/java/org/apache/commons/net/ftp/FTPCmd.java +++ b/AriaFtpPlug/src/main/java/aria/apache/commons/net/ftp/FTPCmd.java @@ -16,7 +16,7 @@ * */ -package org.apache.commons.net.ftp; +package aria.apache.commons.net.ftp; /** * @since 3.3 diff --git a/AriaFtpPlug/src/main/java/org/apache/commons/net/ftp/FTPCommand.java b/AriaFtpPlug/src/main/java/aria/apache/commons/net/ftp/FTPCommand.java similarity index 99% rename from AriaFtpPlug/src/main/java/org/apache/commons/net/ftp/FTPCommand.java rename to AriaFtpPlug/src/main/java/aria/apache/commons/net/ftp/FTPCommand.java index dee027f4..3a1aef89 100644 --- a/AriaFtpPlug/src/main/java/org/apache/commons/net/ftp/FTPCommand.java +++ b/AriaFtpPlug/src/main/java/aria/apache/commons/net/ftp/FTPCommand.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.net.ftp; +package aria.apache.commons.net.ftp; /** * FTPCommand stores a set of constants for FTP command codes. To interpret diff --git a/AriaFtpPlug/src/main/java/org/apache/commons/net/ftp/FTPConnectionClosedException.java b/AriaFtpPlug/src/main/java/aria/apache/commons/net/ftp/FTPConnectionClosedException.java similarity index 98% rename from AriaFtpPlug/src/main/java/org/apache/commons/net/ftp/FTPConnectionClosedException.java rename to AriaFtpPlug/src/main/java/aria/apache/commons/net/ftp/FTPConnectionClosedException.java index 381aa19d..aa95277e 100644 --- a/AriaFtpPlug/src/main/java/org/apache/commons/net/ftp/FTPConnectionClosedException.java +++ b/AriaFtpPlug/src/main/java/aria/apache/commons/net/ftp/FTPConnectionClosedException.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.net.ftp; +package aria.apache.commons.net.ftp; import java.io.IOException; diff --git a/AriaFtpPlug/src/main/java/org/apache/commons/net/ftp/FTPFile.java b/AriaFtpPlug/src/main/java/aria/apache/commons/net/ftp/FTPFile.java similarity index 99% rename from AriaFtpPlug/src/main/java/org/apache/commons/net/ftp/FTPFile.java rename to AriaFtpPlug/src/main/java/aria/apache/commons/net/ftp/FTPFile.java index 937c704a..5edcc119 100644 --- a/AriaFtpPlug/src/main/java/org/apache/commons/net/ftp/FTPFile.java +++ b/AriaFtpPlug/src/main/java/aria/apache/commons/net/ftp/FTPFile.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.net.ftp; +package aria.apache.commons.net.ftp; import java.io.Serializable; import java.util.Calendar; diff --git a/AriaFtpPlug/src/main/java/org/apache/commons/net/ftp/FTPFileEntryParser.java b/AriaFtpPlug/src/main/java/aria/apache/commons/net/ftp/FTPFileEntryParser.java similarity index 99% rename from AriaFtpPlug/src/main/java/org/apache/commons/net/ftp/FTPFileEntryParser.java rename to AriaFtpPlug/src/main/java/aria/apache/commons/net/ftp/FTPFileEntryParser.java index 955c02d7..0c04b265 100644 --- a/AriaFtpPlug/src/main/java/org/apache/commons/net/ftp/FTPFileEntryParser.java +++ b/AriaFtpPlug/src/main/java/aria/apache/commons/net/ftp/FTPFileEntryParser.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.net.ftp; +package aria.apache.commons.net.ftp; import java.io.BufferedReader; import java.io.IOException; diff --git a/AriaFtpPlug/src/main/java/org/apache/commons/net/ftp/FTPFileEntryParserImpl.java b/AriaFtpPlug/src/main/java/aria/apache/commons/net/ftp/FTPFileEntryParserImpl.java similarity index 98% rename from AriaFtpPlug/src/main/java/org/apache/commons/net/ftp/FTPFileEntryParserImpl.java rename to AriaFtpPlug/src/main/java/aria/apache/commons/net/ftp/FTPFileEntryParserImpl.java index 599f7609..5af13643 100644 --- a/AriaFtpPlug/src/main/java/org/apache/commons/net/ftp/FTPFileEntryParserImpl.java +++ b/AriaFtpPlug/src/main/java/aria/apache/commons/net/ftp/FTPFileEntryParserImpl.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.net.ftp; +package aria.apache.commons.net.ftp; import java.io.BufferedReader; import java.io.IOException; diff --git a/AriaFtpPlug/src/main/java/org/apache/commons/net/ftp/FTPFileFilter.java b/AriaFtpPlug/src/main/java/aria/apache/commons/net/ftp/FTPFileFilter.java similarity index 96% rename from AriaFtpPlug/src/main/java/org/apache/commons/net/ftp/FTPFileFilter.java rename to AriaFtpPlug/src/main/java/aria/apache/commons/net/ftp/FTPFileFilter.java index 84fd5efc..898ee154 100644 --- a/AriaFtpPlug/src/main/java/org/apache/commons/net/ftp/FTPFileFilter.java +++ b/AriaFtpPlug/src/main/java/aria/apache/commons/net/ftp/FTPFileFilter.java @@ -16,7 +16,7 @@ * */ -package org.apache.commons.net.ftp; +package aria.apache.commons.net.ftp; /** * Perform filtering on FTPFile entries. diff --git a/AriaFtpPlug/src/main/java/org/apache/commons/net/ftp/FTPFileFilters.java b/AriaFtpPlug/src/main/java/aria/apache/commons/net/ftp/FTPFileFilters.java similarity index 97% rename from AriaFtpPlug/src/main/java/org/apache/commons/net/ftp/FTPFileFilters.java rename to AriaFtpPlug/src/main/java/aria/apache/commons/net/ftp/FTPFileFilters.java index 138ebc42..40a59a99 100644 --- a/AriaFtpPlug/src/main/java/org/apache/commons/net/ftp/FTPFileFilters.java +++ b/AriaFtpPlug/src/main/java/aria/apache/commons/net/ftp/FTPFileFilters.java @@ -16,7 +16,7 @@ * */ -package org.apache.commons.net.ftp; +package aria.apache.commons.net.ftp; /** * Implements some simple FTPFileFilter classes. diff --git a/AriaFtpPlug/src/main/java/org/apache/commons/net/ftp/FTPHTTPClient.java b/AriaFtpPlug/src/main/java/aria/apache/commons/net/ftp/FTPHTTPClient.java similarity index 98% rename from AriaFtpPlug/src/main/java/org/apache/commons/net/ftp/FTPHTTPClient.java rename to AriaFtpPlug/src/main/java/aria/apache/commons/net/ftp/FTPHTTPClient.java index caa39687..0304e427 100644 --- a/AriaFtpPlug/src/main/java/org/apache/commons/net/ftp/FTPHTTPClient.java +++ b/AriaFtpPlug/src/main/java/aria/apache/commons/net/ftp/FTPHTTPClient.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.net.ftp; +package aria.apache.commons.net.ftp; import java.io.BufferedReader; import java.io.IOException; @@ -30,7 +30,7 @@ import java.net.SocketException; import java.util.ArrayList; import java.util.List; -import org.apache.commons.net.util.Base64; +import aria.apache.commons.net.util.Base64; /** * Experimental attempt at FTP client that tunnels over an HTTP proxy connection. diff --git a/AriaFtpPlug/src/main/java/org/apache/commons/net/ftp/FTPListParseEngine.java b/AriaFtpPlug/src/main/java/aria/apache/commons/net/ftp/FTPListParseEngine.java similarity index 99% rename from AriaFtpPlug/src/main/java/org/apache/commons/net/ftp/FTPListParseEngine.java rename to AriaFtpPlug/src/main/java/aria/apache/commons/net/ftp/FTPListParseEngine.java index 4998a939..51e117e5 100644 --- a/AriaFtpPlug/src/main/java/org/apache/commons/net/ftp/FTPListParseEngine.java +++ b/AriaFtpPlug/src/main/java/aria/apache/commons/net/ftp/FTPListParseEngine.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.net.ftp; +package aria.apache.commons.net.ftp; import java.io.BufferedReader; import java.io.IOException; @@ -27,7 +27,7 @@ import java.util.LinkedList; import java.util.List; import java.util.ListIterator; -import org.apache.commons.net.util.Charsets; +import aria.apache.commons.net.util.Charsets; /** * This class handles the entire process of parsing a listing of diff --git a/AriaFtpPlug/src/main/java/org/apache/commons/net/ftp/FTPReply.java b/AriaFtpPlug/src/main/java/aria/apache/commons/net/ftp/FTPReply.java similarity index 99% rename from AriaFtpPlug/src/main/java/org/apache/commons/net/ftp/FTPReply.java rename to AriaFtpPlug/src/main/java/aria/apache/commons/net/ftp/FTPReply.java index 986d76fd..991cb93d 100644 --- a/AriaFtpPlug/src/main/java/org/apache/commons/net/ftp/FTPReply.java +++ b/AriaFtpPlug/src/main/java/aria/apache/commons/net/ftp/FTPReply.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.net.ftp; +package aria.apache.commons.net.ftp; /*** * FTPReply stores a set of constants for FTP reply codes. To interpret diff --git a/AriaFtpPlug/src/main/java/org/apache/commons/net/ftp/FTPSClient.java b/AriaFtpPlug/src/main/java/aria/apache/commons/net/ftp/FTPSClient.java similarity index 98% rename from AriaFtpPlug/src/main/java/org/apache/commons/net/ftp/FTPSClient.java rename to AriaFtpPlug/src/main/java/aria/apache/commons/net/ftp/FTPSClient.java index 512a5628..7f79e98b 100644 --- a/AriaFtpPlug/src/main/java/org/apache/commons/net/ftp/FTPSClient.java +++ b/AriaFtpPlug/src/main/java/aria/apache/commons/net/ftp/FTPSClient.java @@ -15,8 +15,10 @@ * limitations under the License. */ -package org.apache.commons.net.ftp; +package aria.apache.commons.net.ftp; +import aria.apache.commons.net.SocketClient; +import aria.apache.commons.net.util.KeyManagerUtils; import java.io.BufferedReader; import java.io.BufferedWriter; import java.io.IOException; @@ -33,10 +35,10 @@ import javax.net.ssl.SSLSocket; import javax.net.ssl.SSLSocketFactory; import javax.net.ssl.TrustManager; -import org.apache.commons.net.util.Base64; -import org.apache.commons.net.util.SSLContextUtils; -import org.apache.commons.net.util.SSLSocketUtils; -import org.apache.commons.net.util.TrustManagerUtils; +import aria.apache.commons.net.util.Base64; +import aria.apache.commons.net.util.SSLContextUtils; +import aria.apache.commons.net.util.SSLSocketUtils; +import aria.apache.commons.net.util.TrustManagerUtils; /** * FTP over SSL processing. If desired, the JVM property -Djavax.net.debug=all can be used to @@ -219,7 +221,7 @@ public class FTPSClient extends FTPClient { * rather than reimplementing all of the connect() methods. * * @throws IOException If it throw by _connectAction_. - * @see org.apache.commons.net.SocketClient#_connectAction_() + * @see SocketClient#_connectAction_() */ @Override protected void _connectAction_() throws IOException { // Implicit mode. @@ -324,7 +326,7 @@ public class FTPSClient extends FTPClient { * Set a {@link KeyManager} to use * * @param keyManager The KeyManager implementation to set. - * @see org.apache.commons.net.util.KeyManagerUtils + * @see KeyManagerUtils */ public void setKeyManager(KeyManager keyManager) { this.keyManager = keyManager; @@ -697,7 +699,7 @@ public class FTPSClient extends FTPClient { * the default TrustManager from the JVM will be used. * * @param trustManager The TrustManager implementation to set, may be {@code null} - * @see org.apache.commons.net.util.TrustManagerUtils + * @see TrustManagerUtils */ public void setTrustManager(TrustManager trustManager) { this.trustManager = trustManager; diff --git a/AriaFtpPlug/src/main/java/org/apache/commons/net/ftp/FTPSCommand.java b/AriaFtpPlug/src/main/java/aria/apache/commons/net/ftp/FTPSCommand.java similarity index 98% rename from AriaFtpPlug/src/main/java/org/apache/commons/net/ftp/FTPSCommand.java rename to AriaFtpPlug/src/main/java/aria/apache/commons/net/ftp/FTPSCommand.java index 1cbb46f8..5937638b 100644 --- a/AriaFtpPlug/src/main/java/org/apache/commons/net/ftp/FTPSCommand.java +++ b/AriaFtpPlug/src/main/java/aria/apache/commons/net/ftp/FTPSCommand.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.net.ftp; +package aria.apache.commons.net.ftp; /** * FTPS-specific commands. diff --git a/AriaFtpPlug/src/main/java/org/apache/commons/net/ftp/FTPSServerSocketFactory.java b/AriaFtpPlug/src/main/java/aria/apache/commons/net/ftp/FTPSServerSocketFactory.java similarity index 98% rename from AriaFtpPlug/src/main/java/org/apache/commons/net/ftp/FTPSServerSocketFactory.java rename to AriaFtpPlug/src/main/java/aria/apache/commons/net/ftp/FTPSServerSocketFactory.java index 2ef046e5..168067bc 100644 --- a/AriaFtpPlug/src/main/java/org/apache/commons/net/ftp/FTPSServerSocketFactory.java +++ b/AriaFtpPlug/src/main/java/aria/apache/commons/net/ftp/FTPSServerSocketFactory.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.net.ftp; +package aria.apache.commons.net.ftp; import java.io.IOException; import java.net.InetAddress; diff --git a/AriaFtpPlug/src/main/java/org/apache/commons/net/ftp/FTPSSocketFactory.java b/AriaFtpPlug/src/main/java/aria/apache/commons/net/ftp/FTPSSocketFactory.java similarity index 99% rename from AriaFtpPlug/src/main/java/org/apache/commons/net/ftp/FTPSSocketFactory.java rename to AriaFtpPlug/src/main/java/aria/apache/commons/net/ftp/FTPSSocketFactory.java index 2015681e..7bbf818c 100644 --- a/AriaFtpPlug/src/main/java/org/apache/commons/net/ftp/FTPSSocketFactory.java +++ b/AriaFtpPlug/src/main/java/aria/apache/commons/net/ftp/FTPSSocketFactory.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.net.ftp; +package aria.apache.commons.net.ftp; import java.io.IOException; import java.net.InetAddress; diff --git a/AriaFtpPlug/src/main/java/org/apache/commons/net/ftp/FTPSTrustManager.java b/AriaFtpPlug/src/main/java/aria/apache/commons/net/ftp/FTPSTrustManager.java similarity index 91% rename from AriaFtpPlug/src/main/java/org/apache/commons/net/ftp/FTPSTrustManager.java rename to AriaFtpPlug/src/main/java/aria/apache/commons/net/ftp/FTPSTrustManager.java index 5a5d7e93..0923ac02 100644 --- a/AriaFtpPlug/src/main/java/org/apache/commons/net/ftp/FTPSTrustManager.java +++ b/AriaFtpPlug/src/main/java/aria/apache/commons/net/ftp/FTPSTrustManager.java @@ -15,8 +15,9 @@ * limitations under the License. */ -package org.apache.commons.net.ftp; +package aria.apache.commons.net.ftp; +import aria.apache.commons.net.util.TrustManagerUtils; import java.security.cert.CertificateException; import java.security.cert.X509Certificate; @@ -27,7 +28,7 @@ import javax.net.ssl.X509TrustManager; * * @since 2.0 * @deprecated 3.0 use - * {@link org.apache.commons.net.util.TrustManagerUtils#getValidateServerCertificateTrustManager() + * {@link TrustManagerUtils#getValidateServerCertificateTrustManager() * TrustManagerUtils#getValidateServerCertificateTrustManager()} instead */ @Deprecated public class FTPSTrustManager implements X509TrustManager { diff --git a/AriaFtpPlug/src/main/java/org/apache/commons/net/ftp/OnFtpInputStreamListener.java b/AriaFtpPlug/src/main/java/aria/apache/commons/net/ftp/OnFtpInputStreamListener.java similarity index 92% rename from AriaFtpPlug/src/main/java/org/apache/commons/net/ftp/OnFtpInputStreamListener.java rename to AriaFtpPlug/src/main/java/aria/apache/commons/net/ftp/OnFtpInputStreamListener.java index 9966080e..f7adaf6d 100644 --- a/AriaFtpPlug/src/main/java/org/apache/commons/net/ftp/OnFtpInputStreamListener.java +++ b/AriaFtpPlug/src/main/java/aria/apache/commons/net/ftp/OnFtpInputStreamListener.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.net.ftp; +package aria.apache.commons.net.ftp; -import org.apache.commons.net.io.CopyStreamListener; +import aria.apache.commons.net.io.CopyStreamListener; /** * Created by AriaL on 2017/9/26. diff --git a/AriaFtpPlug/src/main/java/org/apache/commons/net/ftp/package-info.java b/AriaFtpPlug/src/main/java/aria/apache/commons/net/ftp/package-info.java similarity index 95% rename from AriaFtpPlug/src/main/java/org/apache/commons/net/ftp/package-info.java rename to AriaFtpPlug/src/main/java/aria/apache/commons/net/ftp/package-info.java index 496aba13..f7df7cf0 100644 --- a/AriaFtpPlug/src/main/java/org/apache/commons/net/ftp/package-info.java +++ b/AriaFtpPlug/src/main/java/aria/apache/commons/net/ftp/package-info.java @@ -18,4 +18,4 @@ /** * FTP and FTPS support classes */ -package org.apache.commons.net.ftp; \ No newline at end of file +package aria.apache.commons.net.ftp; \ No newline at end of file diff --git a/AriaFtpPlug/src/main/java/org/apache/commons/net/ftp/parser/CompositeFileEntryParser.java b/AriaFtpPlug/src/main/java/aria/apache/commons/net/ftp/parser/CompositeFileEntryParser.java similarity index 91% rename from AriaFtpPlug/src/main/java/org/apache/commons/net/ftp/parser/CompositeFileEntryParser.java rename to AriaFtpPlug/src/main/java/aria/apache/commons/net/ftp/parser/CompositeFileEntryParser.java index a05e7ba7..638f67fb 100644 --- a/AriaFtpPlug/src/main/java/org/apache/commons/net/ftp/parser/CompositeFileEntryParser.java +++ b/AriaFtpPlug/src/main/java/aria/apache/commons/net/ftp/parser/CompositeFileEntryParser.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package org.apache.commons.net.ftp.parser; +package aria.apache.commons.net.ftp.parser; -import org.apache.commons.net.ftp.FTPFile; -import org.apache.commons.net.ftp.FTPFileEntryParser; -import org.apache.commons.net.ftp.FTPFileEntryParserImpl; +import aria.apache.commons.net.ftp.FTPFile; +import aria.apache.commons.net.ftp.FTPFileEntryParser; +import aria.apache.commons.net.ftp.FTPFileEntryParserImpl; /** * This implementation allows to pack some FileEntryParsers together diff --git a/AriaFtpPlug/src/main/java/org/apache/commons/net/ftp/parser/ConfigurableFTPFileEntryParserImpl.java b/AriaFtpPlug/src/main/java/aria/apache/commons/net/ftp/parser/ConfigurableFTPFileEntryParserImpl.java similarity index 96% rename from AriaFtpPlug/src/main/java/org/apache/commons/net/ftp/parser/ConfigurableFTPFileEntryParserImpl.java rename to AriaFtpPlug/src/main/java/aria/apache/commons/net/ftp/parser/ConfigurableFTPFileEntryParserImpl.java index 3aebd8a7..1d8988b6 100644 --- a/AriaFtpPlug/src/main/java/org/apache/commons/net/ftp/parser/ConfigurableFTPFileEntryParserImpl.java +++ b/AriaFtpPlug/src/main/java/aria/apache/commons/net/ftp/parser/ConfigurableFTPFileEntryParserImpl.java @@ -15,14 +15,13 @@ * limitations under the License. */ -package org.apache.commons.net.ftp.parser; +package aria.apache.commons.net.ftp.parser; +import aria.apache.commons.net.ftp.Configurable; +import aria.apache.commons.net.ftp.FTPClientConfig; import java.text.ParseException; import java.util.Calendar; -import org.apache.commons.net.ftp.Configurable; -import org.apache.commons.net.ftp.FTPClientConfig; - /** *

* This abstract class implements the common timestamp parsing diff --git a/AriaFtpPlug/src/main/java/org/apache/commons/net/ftp/parser/DefaultFTPFileEntryParserFactory.java b/AriaFtpPlug/src/main/java/aria/apache/commons/net/ftp/parser/DefaultFTPFileEntryParserFactory.java similarity index 96% rename from AriaFtpPlug/src/main/java/org/apache/commons/net/ftp/parser/DefaultFTPFileEntryParserFactory.java rename to AriaFtpPlug/src/main/java/aria/apache/commons/net/ftp/parser/DefaultFTPFileEntryParserFactory.java index 80888917..cc499c71 100644 --- a/AriaFtpPlug/src/main/java/org/apache/commons/net/ftp/parser/DefaultFTPFileEntryParserFactory.java +++ b/AriaFtpPlug/src/main/java/aria/apache/commons/net/ftp/parser/DefaultFTPFileEntryParserFactory.java @@ -15,23 +15,23 @@ * limitations under the License. */ -package org.apache.commons.net.ftp.parser; +package aria.apache.commons.net.ftp.parser; +import aria.apache.commons.net.ftp.Configurable; +import aria.apache.commons.net.ftp.FTPClient; +import aria.apache.commons.net.ftp.FTPClientConfig; +import aria.apache.commons.net.ftp.FTPFileEntryParser; import java.util.regex.Pattern; -import org.apache.commons.net.ftp.Configurable; -import org.apache.commons.net.ftp.FTPClientConfig; -import org.apache.commons.net.ftp.FTPFileEntryParser; - /** * This is the default implementation of the * FTPFileEntryParserFactory interface. This is the * implementation that will be used by - * org.apache.commons.net.ftp.FTPClient.listFiles() + * FTPClient.listFiles() * if no other implementation has been specified. * - * @see org.apache.commons.net.ftp.FTPClient#listFiles - * @see org.apache.commons.net.ftp.FTPClient#setParserFactory + * @see FTPClient#listFiles + * @see FTPClient#setParserFactory */ public class DefaultFTPFileEntryParserFactory implements FTPFileEntryParserFactory { @@ -104,7 +104,7 @@ public class DefaultFTPFileEntryParserFactory implements FTPFileEntryParserFacto } catch (ClassCastException e) { throw new ParserInitializationException(parserClass.getName() + " does not implement the interface " - + "org.apache.commons.net.ftp.FTPFileEntryParser.", e); + + "FTPFileEntryParser.", e); } catch (Exception e) { throw new ParserInitializationException("Error initializing parser", e); } catch (ExceptionInInitializerError e) { diff --git a/AriaFtpPlug/src/main/java/org/apache/commons/net/ftp/parser/EnterpriseUnixFTPEntryParser.java b/AriaFtpPlug/src/main/java/aria/apache/commons/net/ftp/parser/EnterpriseUnixFTPEntryParser.java similarity index 95% rename from AriaFtpPlug/src/main/java/org/apache/commons/net/ftp/parser/EnterpriseUnixFTPEntryParser.java rename to AriaFtpPlug/src/main/java/aria/apache/commons/net/ftp/parser/EnterpriseUnixFTPEntryParser.java index 98ae8aee..ca31583a 100644 --- a/AriaFtpPlug/src/main/java/org/apache/commons/net/ftp/parser/EnterpriseUnixFTPEntryParser.java +++ b/AriaFtpPlug/src/main/java/aria/apache/commons/net/ftp/parser/EnterpriseUnixFTPEntryParser.java @@ -15,12 +15,12 @@ * limitations under the License. */ -package org.apache.commons.net.ftp.parser; +package aria.apache.commons.net.ftp.parser; +import aria.apache.commons.net.ftp.FTPFile; +import aria.apache.commons.net.ftp.FTPFileEntryParser; import java.util.Calendar; -import org.apache.commons.net.ftp.FTPFile; - /** * Parser for the Connect Enterprise Unix FTP Server From Sterling Commerce. * Here is a sample of the sort of output line this parser processes: @@ -32,8 +32,8 @@ import org.apache.commons.net.ftp.FTPFile; * * * @version $Id: EnterpriseUnixFTPEntryParser.java 1741829 2016-05-01 00:24:44Z sebb $ - * @see org.apache.commons.net.ftp.FTPFileEntryParser FTPFileEntryParser (for usage instructions) - * @see org.apache.commons.net.ftp.parser.DefaultFTPFileEntryParserFactory + * @see FTPFileEntryParser FTPFileEntryParser (for usage instructions) + * @see DefaultFTPFileEntryParserFactory */ public class EnterpriseUnixFTPEntryParser extends RegexFTPFileEntryParserImpl { diff --git a/AriaFtpPlug/src/main/java/org/apache/commons/net/ftp/parser/FTPFileEntryParserFactory.java b/AriaFtpPlug/src/main/java/aria/apache/commons/net/ftp/parser/FTPFileEntryParserFactory.java similarity index 94% rename from AriaFtpPlug/src/main/java/org/apache/commons/net/ftp/parser/FTPFileEntryParserFactory.java rename to AriaFtpPlug/src/main/java/aria/apache/commons/net/ftp/parser/FTPFileEntryParserFactory.java index c01cac15..2e3c84e0 100644 --- a/AriaFtpPlug/src/main/java/org/apache/commons/net/ftp/parser/FTPFileEntryParserFactory.java +++ b/AriaFtpPlug/src/main/java/aria/apache/commons/net/ftp/parser/FTPFileEntryParserFactory.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.apache.commons.net.ftp.parser; +package aria.apache.commons.net.ftp.parser; -import org.apache.commons.net.ftp.FTPClientConfig; -import org.apache.commons.net.ftp.FTPFileEntryParser; +import aria.apache.commons.net.ftp.FTPClientConfig; +import aria.apache.commons.net.ftp.FTPFileEntryParser; /** * The interface describes a factory for creating FTPFileEntryParsers. diff --git a/AriaFtpPlug/src/main/java/org/apache/commons/net/ftp/parser/FTPTimestampParser.java b/AriaFtpPlug/src/main/java/aria/apache/commons/net/ftp/parser/FTPTimestampParser.java similarity index 97% rename from AriaFtpPlug/src/main/java/org/apache/commons/net/ftp/parser/FTPTimestampParser.java rename to AriaFtpPlug/src/main/java/aria/apache/commons/net/ftp/parser/FTPTimestampParser.java index 52f48de1..dab122a4 100644 --- a/AriaFtpPlug/src/main/java/org/apache/commons/net/ftp/parser/FTPTimestampParser.java +++ b/AriaFtpPlug/src/main/java/aria/apache/commons/net/ftp/parser/FTPTimestampParser.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.net.ftp.parser; +package aria.apache.commons.net.ftp.parser; import java.text.ParseException; import java.util.Calendar; diff --git a/AriaFtpPlug/src/main/java/org/apache/commons/net/ftp/parser/FTPTimestampParserImpl.java b/AriaFtpPlug/src/main/java/aria/apache/commons/net/ftp/parser/FTPTimestampParserImpl.java similarity index 97% rename from AriaFtpPlug/src/main/java/org/apache/commons/net/ftp/parser/FTPTimestampParserImpl.java rename to AriaFtpPlug/src/main/java/aria/apache/commons/net/ftp/parser/FTPTimestampParserImpl.java index b0291dce..e84209ff 100644 --- a/AriaFtpPlug/src/main/java/org/apache/commons/net/ftp/parser/FTPTimestampParserImpl.java +++ b/AriaFtpPlug/src/main/java/aria/apache/commons/net/ftp/parser/FTPTimestampParserImpl.java @@ -15,8 +15,10 @@ * limitations under the License. */ -package org.apache.commons.net.ftp.parser; +package aria.apache.commons.net.ftp.parser; +import aria.apache.commons.net.ftp.Configurable; +import aria.apache.commons.net.ftp.FTPClientConfig; import java.text.DateFormatSymbols; import java.text.ParseException; import java.text.ParsePosition; @@ -25,12 +27,9 @@ import java.util.Calendar; import java.util.Date; import java.util.TimeZone; -import org.apache.commons.net.ftp.Configurable; -import org.apache.commons.net.ftp.FTPClientConfig; - /** * Default implementation of the {@link FTPTimestampParser FTPTimestampParser} - * interface also implements the {@link org.apache.commons.net.ftp.Configurable Configurable} + * interface also implements the {@link Configurable Configurable} * interface to allow the parsing to be configured from the outside. * * @see ConfigurableFTPFileEntryParserImpl @@ -355,7 +354,7 @@ public class FTPTimestampParserImpl implements FTPTimestampParser, Configurable * to parse timestamps. *

  • otherwise use default English month names
    • *

    - * Finally if a {@link org.apache.commons.net.ftp.FTPClientConfig#setServerTimeZoneId(String) + * Finally if a {@link FTPClientConfig#setServerTimeZoneId(String) * serverTimeZoneId} * has been supplied via the config, set that into all date formats that have * been configured. diff --git a/AriaFtpPlug/src/main/java/org/apache/commons/net/ftp/parser/MLSxEntryParser.java b/AriaFtpPlug/src/main/java/aria/apache/commons/net/ftp/parser/MLSxEntryParser.java similarity index 98% rename from AriaFtpPlug/src/main/java/org/apache/commons/net/ftp/parser/MLSxEntryParser.java rename to AriaFtpPlug/src/main/java/aria/apache/commons/net/ftp/parser/MLSxEntryParser.java index c28b4a3f..b6d11bb8 100644 --- a/AriaFtpPlug/src/main/java/org/apache/commons/net/ftp/parser/MLSxEntryParser.java +++ b/AriaFtpPlug/src/main/java/aria/apache/commons/net/ftp/parser/MLSxEntryParser.java @@ -15,8 +15,10 @@ * limitations under the License. */ -package org.apache.commons.net.ftp.parser; +package aria.apache.commons.net.ftp.parser; +import aria.apache.commons.net.ftp.FTPFile; +import aria.apache.commons.net.ftp.FTPFileEntryParserImpl; import java.text.ParsePosition; import java.text.SimpleDateFormat; import java.util.Calendar; @@ -26,9 +28,6 @@ import java.util.HashMap; import java.util.Locale; import java.util.TimeZone; -import org.apache.commons.net.ftp.FTPFile; -import org.apache.commons.net.ftp.FTPFileEntryParserImpl; - /** * Parser class for MSLT and MLSD replies. See RFC 3659. *

    diff --git a/AriaFtpPlug/src/main/java/org/apache/commons/net/ftp/parser/MVSFTPEntryParser.java b/AriaFtpPlug/src/main/java/aria/apache/commons/net/ftp/parser/MVSFTPEntryParser.java similarity index 98% rename from AriaFtpPlug/src/main/java/org/apache/commons/net/ftp/parser/MVSFTPEntryParser.java rename to AriaFtpPlug/src/main/java/aria/apache/commons/net/ftp/parser/MVSFTPEntryParser.java index ff87813f..85a01925 100644 --- a/AriaFtpPlug/src/main/java/org/apache/commons/net/ftp/parser/MVSFTPEntryParser.java +++ b/AriaFtpPlug/src/main/java/aria/apache/commons/net/ftp/parser/MVSFTPEntryParser.java @@ -15,20 +15,20 @@ * limitations under the License. */ -package org.apache.commons.net.ftp.parser; +package aria.apache.commons.net.ftp.parser; +import aria.apache.commons.net.ftp.FTPClientConfig; +import aria.apache.commons.net.ftp.FTPFile; +import aria.apache.commons.net.ftp.FTPFileEntryParser; import java.text.ParseException; import java.util.List; -import org.apache.commons.net.ftp.FTPClientConfig; -import org.apache.commons.net.ftp.FTPFile; - /** * Implementation of FTPFileEntryParser and FTPFileListParser for IBM zOS/MVS * Systems. * * @version $Id: MVSFTPEntryParser.java 1752660 2016-07-14 13:25:39Z sebb $ - * @see org.apache.commons.net.ftp.FTPFileEntryParser FTPFileEntryParser (for + * @see FTPFileEntryParser FTPFileEntryParser (for * usage instructions) */ public class MVSFTPEntryParser extends ConfigurableFTPFileEntryParserImpl { diff --git a/AriaFtpPlug/src/main/java/org/apache/commons/net/ftp/parser/MacOsPeterFTPEntryParser.java b/AriaFtpPlug/src/main/java/aria/apache/commons/net/ftp/parser/MacOsPeterFTPEntryParser.java similarity index 96% rename from AriaFtpPlug/src/main/java/org/apache/commons/net/ftp/parser/MacOsPeterFTPEntryParser.java rename to AriaFtpPlug/src/main/java/aria/apache/commons/net/ftp/parser/MacOsPeterFTPEntryParser.java index 5752a9b9..2c8414d6 100644 --- a/AriaFtpPlug/src/main/java/org/apache/commons/net/ftp/parser/MacOsPeterFTPEntryParser.java +++ b/AriaFtpPlug/src/main/java/aria/apache/commons/net/ftp/parser/MacOsPeterFTPEntryParser.java @@ -15,18 +15,18 @@ * limitations under the License. */ -package org.apache.commons.net.ftp.parser; +package aria.apache.commons.net.ftp.parser; +import aria.apache.commons.net.ftp.FTPClientConfig; +import aria.apache.commons.net.ftp.FTPFile; +import aria.apache.commons.net.ftp.FTPFileEntryParser; import java.text.ParseException; -import org.apache.commons.net.ftp.FTPClientConfig; -import org.apache.commons.net.ftp.FTPFile; - /** * Implementation FTPFileEntryParser and FTPFileListParser for pre MacOS-X Systems. * * @version $Id: MacOsPeterFTPEntryParser.java 1752660 2016-07-14 13:25:39Z sebb $ - * @see org.apache.commons.net.ftp.FTPFileEntryParser FTPFileEntryParser (for usage instructions) + * @see FTPFileEntryParser FTPFileEntryParser (for usage instructions) * @since 3.1 */ public class diff --git a/AriaFtpPlug/src/main/java/org/apache/commons/net/ftp/parser/NTFTPEntryParser.java b/AriaFtpPlug/src/main/java/aria/apache/commons/net/ftp/parser/NTFTPEntryParser.java similarity index 93% rename from AriaFtpPlug/src/main/java/org/apache/commons/net/ftp/parser/NTFTPEntryParser.java rename to AriaFtpPlug/src/main/java/aria/apache/commons/net/ftp/parser/NTFTPEntryParser.java index 7a45a226..cee2811a 100644 --- a/AriaFtpPlug/src/main/java/org/apache/commons/net/ftp/parser/NTFTPEntryParser.java +++ b/AriaFtpPlug/src/main/java/aria/apache/commons/net/ftp/parser/NTFTPEntryParser.java @@ -15,20 +15,20 @@ * limitations under the License. */ -package org.apache.commons.net.ftp.parser; +package aria.apache.commons.net.ftp.parser; +import aria.apache.commons.net.ftp.Configurable; +import aria.apache.commons.net.ftp.FTPClientConfig; +import aria.apache.commons.net.ftp.FTPFile; +import aria.apache.commons.net.ftp.FTPFileEntryParser; import java.text.ParseException; import java.util.regex.Pattern; -import org.apache.commons.net.ftp.Configurable; -import org.apache.commons.net.ftp.FTPClientConfig; -import org.apache.commons.net.ftp.FTPFile; - /** * Implementation of FTPFileEntryParser and FTPFileListParser for NT Systems. * * @version $Id: NTFTPEntryParser.java 1752660 2016-07-14 13:25:39Z sebb $ - * @see org.apache.commons.net.ftp.FTPFileEntryParser FTPFileEntryParser (for usage instructions) + * @see FTPFileEntryParser FTPFileEntryParser (for usage instructions) */ public class NTFTPEntryParser extends ConfigurableFTPFileEntryParserImpl { diff --git a/AriaFtpPlug/src/main/java/org/apache/commons/net/ftp/parser/NetwareFTPEntryParser.java b/AriaFtpPlug/src/main/java/aria/apache/commons/net/ftp/parser/NetwareFTPEntryParser.java similarity index 95% rename from AriaFtpPlug/src/main/java/org/apache/commons/net/ftp/parser/NetwareFTPEntryParser.java rename to AriaFtpPlug/src/main/java/aria/apache/commons/net/ftp/parser/NetwareFTPEntryParser.java index 387755ea..7585ebbe 100644 --- a/AriaFtpPlug/src/main/java/org/apache/commons/net/ftp/parser/NetwareFTPEntryParser.java +++ b/AriaFtpPlug/src/main/java/aria/apache/commons/net/ftp/parser/NetwareFTPEntryParser.java @@ -15,13 +15,13 @@ * limitations under the License. */ -package org.apache.commons.net.ftp.parser; +package aria.apache.commons.net.ftp.parser; +import aria.apache.commons.net.ftp.FTPClientConfig; +import aria.apache.commons.net.ftp.FTPFile; +import aria.apache.commons.net.ftp.FTPFileEntryParser; import java.text.ParseException; -import org.apache.commons.net.ftp.FTPClientConfig; -import org.apache.commons.net.ftp.FTPFile; - /** * Implementation of FTPFileEntryParser and FTPFileListParser for Netware Systems. Note that some of * the proprietary @@ -31,7 +31,7 @@ import org.apache.commons.net.ftp.FTPFile; * for more details. * * @version $Id: NetwareFTPEntryParser.java 1752660 2016-07-14 13:25:39Z sebb $ - * @see org.apache.commons.net.ftp.FTPFileEntryParser FTPFileEntryParser (for usage instructions) + * @see FTPFileEntryParser FTPFileEntryParser (for usage instructions) * @since 1.5 */ public class NetwareFTPEntryParser extends ConfigurableFTPFileEntryParserImpl { diff --git a/AriaFtpPlug/src/main/java/org/apache/commons/net/ftp/parser/OS2FTPEntryParser.java b/AriaFtpPlug/src/main/java/aria/apache/commons/net/ftp/parser/OS2FTPEntryParser.java similarity index 93% rename from AriaFtpPlug/src/main/java/org/apache/commons/net/ftp/parser/OS2FTPEntryParser.java rename to AriaFtpPlug/src/main/java/aria/apache/commons/net/ftp/parser/OS2FTPEntryParser.java index 261aa7f6..fc2413e9 100644 --- a/AriaFtpPlug/src/main/java/org/apache/commons/net/ftp/parser/OS2FTPEntryParser.java +++ b/AriaFtpPlug/src/main/java/aria/apache/commons/net/ftp/parser/OS2FTPEntryParser.java @@ -15,18 +15,18 @@ * limitations under the License. */ -package org.apache.commons.net.ftp.parser; +package aria.apache.commons.net.ftp.parser; +import aria.apache.commons.net.ftp.FTPClientConfig; +import aria.apache.commons.net.ftp.FTPFile; +import aria.apache.commons.net.ftp.FTPFileEntryParser; import java.text.ParseException; -import org.apache.commons.net.ftp.FTPClientConfig; -import org.apache.commons.net.ftp.FTPFile; - /** * Implementation of FTPFileEntryParser and FTPFileListParser for OS2 Systems. * * @version $Id: OS2FTPEntryParser.java 1752660 2016-07-14 13:25:39Z sebb $ - * @see org.apache.commons.net.ftp.FTPFileEntryParser FTPFileEntryParser (for usage instructions) + * @see FTPFileEntryParser FTPFileEntryParser (for usage instructions) */ public class OS2FTPEntryParser extends ConfigurableFTPFileEntryParserImpl diff --git a/AriaFtpPlug/src/main/java/org/apache/commons/net/ftp/parser/OS400FTPEntryParser.java b/AriaFtpPlug/src/main/java/aria/apache/commons/net/ftp/parser/OS400FTPEntryParser.java similarity index 99% rename from AriaFtpPlug/src/main/java/org/apache/commons/net/ftp/parser/OS400FTPEntryParser.java rename to AriaFtpPlug/src/main/java/aria/apache/commons/net/ftp/parser/OS400FTPEntryParser.java index 306a911d..43198267 100644 --- a/AriaFtpPlug/src/main/java/org/apache/commons/net/ftp/parser/OS400FTPEntryParser.java +++ b/AriaFtpPlug/src/main/java/aria/apache/commons/net/ftp/parser/OS400FTPEntryParser.java @@ -15,14 +15,13 @@ * limitations under the License. */ -package org.apache.commons.net.ftp.parser; +package aria.apache.commons.net.ftp.parser; +import aria.apache.commons.net.ftp.FTPClientConfig; +import aria.apache.commons.net.ftp.FTPFile; import java.io.File; import java.text.ParseException; -import org.apache.commons.net.ftp.FTPClientConfig; -import org.apache.commons.net.ftp.FTPFile; - /** * @version $Id: OS400FTPEntryParser.java 1752660 2016-07-14 13:25:39Z sebb $ * 

    diff --git a/AriaFtpPlug/src/main/java/org/apache/commons/net/ftp/parser/ParserInitializationException.java b/AriaFtpPlug/src/main/java/aria/apache/commons/net/ftp/parser/ParserInitializationException.java
similarity index 97%
rename from AriaFtpPlug/src/main/java/org/apache/commons/net/ftp/parser/ParserInitializationException.java
rename to AriaFtpPlug/src/main/java/aria/apache/commons/net/ftp/parser/ParserInitializationException.java
index dacc3468..72576687 100644
--- a/AriaFtpPlug/src/main/java/org/apache/commons/net/ftp/parser/ParserInitializationException.java
+++ b/AriaFtpPlug/src/main/java/aria/apache/commons/net/ftp/parser/ParserInitializationException.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.net.ftp.parser;
+package aria.apache.commons.net.ftp.parser;
 
 /**
  * This class encapsulates all errors that may be thrown by
diff --git a/AriaFtpPlug/src/main/java/org/apache/commons/net/ftp/parser/RegexFTPFileEntryParserImpl.java b/AriaFtpPlug/src/main/java/aria/apache/commons/net/ftp/parser/RegexFTPFileEntryParserImpl.java
similarity index 98%
rename from AriaFtpPlug/src/main/java/org/apache/commons/net/ftp/parser/RegexFTPFileEntryParserImpl.java
rename to AriaFtpPlug/src/main/java/aria/apache/commons/net/ftp/parser/RegexFTPFileEntryParserImpl.java
index 035d8349..90100f89 100644
--- a/AriaFtpPlug/src/main/java/org/apache/commons/net/ftp/parser/RegexFTPFileEntryParserImpl.java
+++ b/AriaFtpPlug/src/main/java/aria/apache/commons/net/ftp/parser/RegexFTPFileEntryParserImpl.java
@@ -15,15 +15,14 @@
  * limitations under the License.
  */
 
-package org.apache.commons.net.ftp.parser;
+package aria.apache.commons.net.ftp.parser;
 
+import aria.apache.commons.net.ftp.FTPFileEntryParserImpl;
 import java.util.regex.MatchResult;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.regex.PatternSyntaxException;
 
-import org.apache.commons.net.ftp.FTPFileEntryParserImpl;
-
 /**
  * This abstract class implements both the older FTPFileListParser and
  * newer FTPFileEntryParser interfaces with default functionality.
diff --git a/AriaFtpPlug/src/main/java/org/apache/commons/net/ftp/parser/UnixFTPEntryParser.java b/AriaFtpPlug/src/main/java/aria/apache/commons/net/ftp/parser/UnixFTPEntryParser.java
similarity index 97%
rename from AriaFtpPlug/src/main/java/org/apache/commons/net/ftp/parser/UnixFTPEntryParser.java
rename to AriaFtpPlug/src/main/java/aria/apache/commons/net/ftp/parser/UnixFTPEntryParser.java
index 5a1a49c5..5e35f308 100644
--- a/AriaFtpPlug/src/main/java/org/apache/commons/net/ftp/parser/UnixFTPEntryParser.java
+++ b/AriaFtpPlug/src/main/java/aria/apache/commons/net/ftp/parser/UnixFTPEntryParser.java
@@ -15,15 +15,15 @@
  * limitations under the License.
  */
 
-package org.apache.commons.net.ftp.parser;
+package aria.apache.commons.net.ftp.parser;
 
+import aria.apache.commons.net.ftp.FTPClientConfig;
+import aria.apache.commons.net.ftp.FTPFile;
+import aria.apache.commons.net.ftp.FTPFileEntryParser;
 import java.text.ParseException;
 import java.util.List;
 import java.util.ListIterator;
 
-import org.apache.commons.net.ftp.FTPClientConfig;
-import org.apache.commons.net.ftp.FTPFile;
-
 /**
  * Implementation FTPFileEntryParser and FTPFileListParser for standard
  * Unix Systems.
@@ -33,7 +33,7 @@ import org.apache.commons.net.ftp.FTPFile;
  * new FTPFileEntryParser interface.
  *
  * @version $Id: UnixFTPEntryParser.java 1781925 2017-02-06 16:43:40Z sebb $
- * @see org.apache.commons.net.ftp.FTPFileEntryParser FTPFileEntryParser (for usage instructions)
+ * @see FTPFileEntryParser FTPFileEntryParser (for usage instructions)
  */
 public class UnixFTPEntryParser extends ConfigurableFTPFileEntryParserImpl {
 
diff --git a/AriaFtpPlug/src/main/java/org/apache/commons/net/ftp/parser/VMSFTPEntryParser.java b/AriaFtpPlug/src/main/java/aria/apache/commons/net/ftp/parser/VMSFTPEntryParser.java
similarity index 95%
rename from AriaFtpPlug/src/main/java/org/apache/commons/net/ftp/parser/VMSFTPEntryParser.java
rename to AriaFtpPlug/src/main/java/aria/apache/commons/net/ftp/parser/VMSFTPEntryParser.java
index 3371371a..b2578cd0 100644
--- a/AriaFtpPlug/src/main/java/org/apache/commons/net/ftp/parser/VMSFTPEntryParser.java
+++ b/AriaFtpPlug/src/main/java/aria/apache/commons/net/ftp/parser/VMSFTPEntryParser.java
@@ -15,16 +15,17 @@
  * limitations under the License.
  */
 
-package org.apache.commons.net.ftp.parser;
+package aria.apache.commons.net.ftp.parser;
 
+import aria.apache.commons.net.ftp.FTPClientConfig;
+import aria.apache.commons.net.ftp.FTPFile;
+import aria.apache.commons.net.ftp.FTPFileEntryParser;
+import aria.apache.commons.net.ftp.FTPListParseEngine;
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.text.ParseException;
 import java.util.StringTokenizer;
 
-import org.apache.commons.net.ftp.FTPClientConfig;
-import org.apache.commons.net.ftp.FTPFile;
-
 /**
  * Implementation FTPFileEntryParser and FTPFileListParser for VMS Systems.
  * This is a sample of VMS LIST output
@@ -43,8 +44,8 @@ import org.apache.commons.net.ftp.FTPFile;
  * 
    
  *
  * @version $Id: VMSFTPEntryParser.java 1752660 2016-07-14 13:25:39Z sebb $
- * @see org.apache.commons.net.ftp.FTPFileEntryParser FTPFileEntryParser (for usage instructions)
- * @see org.apache.commons.net.ftp.parser.DefaultFTPFileEntryParserFactory
+ * @see FTPFileEntryParser FTPFileEntryParser (for usage instructions)
+ * @see DefaultFTPFileEntryParserFactory
  */
 public class VMSFTPEntryParser extends ConfigurableFTPFileEntryParserImpl {
 
@@ -234,8 +235,8 @@ public class VMSFTPEntryParser extends ConfigurableFTPFileEntryParserImpl {
    * @deprecated (2.2) No other FTPFileEntryParser implementations have this method.
    */
   @Deprecated public FTPFile[] parseFileList(java.io.InputStream listStream) throws IOException {
-    org.apache.commons.net.ftp.FTPListParseEngine engine =
-        new org.apache.commons.net.ftp.FTPListParseEngine(this);
+    FTPListParseEngine engine =
+        new FTPListParseEngine(this);
     engine.readServerList(listStream, null);
     return engine.getFiles();
   }
diff --git a/AriaFtpPlug/src/main/java/org/apache/commons/net/ftp/parser/VMSVersioningFTPEntryParser.java b/AriaFtpPlug/src/main/java/aria/apache/commons/net/ftp/parser/VMSVersioningFTPEntryParser.java
similarity index 96%
rename from AriaFtpPlug/src/main/java/org/apache/commons/net/ftp/parser/VMSVersioningFTPEntryParser.java
rename to AriaFtpPlug/src/main/java/aria/apache/commons/net/ftp/parser/VMSVersioningFTPEntryParser.java
index b8d0d396..948662a7 100644
--- a/AriaFtpPlug/src/main/java/org/apache/commons/net/ftp/parser/VMSVersioningFTPEntryParser.java
+++ b/AriaFtpPlug/src/main/java/aria/apache/commons/net/ftp/parser/VMSVersioningFTPEntryParser.java
@@ -15,8 +15,10 @@
  * limitations under the License.
  */
 
-package org.apache.commons.net.ftp.parser;
+package aria.apache.commons.net.ftp.parser;
 
+import aria.apache.commons.net.ftp.FTPClientConfig;
+import aria.apache.commons.net.ftp.FTPFileEntryParser;
 import java.util.HashMap;
 import java.util.List;
 import java.util.ListIterator;
@@ -25,8 +27,6 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.regex.PatternSyntaxException;
 
-import org.apache.commons.net.ftp.FTPClientConfig;
-
 /**
  * Special implementation VMSFTPEntryParser with versioning turned on.
  * This parser removes all duplicates and only leaves the version with the highest
@@ -43,7 +43,7 @@ import org.apache.commons.net.ftp.FTPClientConfig;
  * 
    
  *
  * @version $Id: VMSVersioningFTPEntryParser.java 1747119 2016-06-07 02:22:24Z ggregory $
- * @see org.apache.commons.net.ftp.FTPFileEntryParser FTPFileEntryParser (for usage instructions)
+ * @see FTPFileEntryParser FTPFileEntryParser (for usage instructions)
  */
 public class VMSVersioningFTPEntryParser extends VMSFTPEntryParser {
 
diff --git a/AriaFtpPlug/src/main/java/org/apache/commons/net/ftp/parser/package-info.java b/AriaFtpPlug/src/main/java/aria/apache/commons/net/ftp/parser/package-info.java
similarity index 95%
rename from AriaFtpPlug/src/main/java/org/apache/commons/net/ftp/parser/package-info.java
rename to AriaFtpPlug/src/main/java/aria/apache/commons/net/ftp/parser/package-info.java
index 7dc0ffd5..147da7ad 100644
--- a/AriaFtpPlug/src/main/java/org/apache/commons/net/ftp/parser/package-info.java
+++ b/AriaFtpPlug/src/main/java/aria/apache/commons/net/ftp/parser/package-info.java
@@ -18,4 +18,4 @@
 /**
  * FTP file listing parser classes
  */
-package org.apache.commons.net.ftp.parser;
\ No newline at end of file
+package aria.apache.commons.net.ftp.parser;
\ No newline at end of file
diff --git a/AriaFtpPlug/src/main/java/org/apache/commons/net/io/CRLFLineReader.java b/AriaFtpPlug/src/main/java/aria/apache/commons/net/io/CRLFLineReader.java
similarity index 98%
rename from AriaFtpPlug/src/main/java/org/apache/commons/net/io/CRLFLineReader.java
rename to AriaFtpPlug/src/main/java/aria/apache/commons/net/io/CRLFLineReader.java
index d124115a..593214d7 100644
--- a/AriaFtpPlug/src/main/java/org/apache/commons/net/io/CRLFLineReader.java
+++ b/AriaFtpPlug/src/main/java/aria/apache/commons/net/io/CRLFLineReader.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.net.io;
+package aria.apache.commons.net.io;
 
 import java.io.BufferedReader;
 import java.io.IOException;
diff --git a/AriaFtpPlug/src/main/java/org/apache/commons/net/io/CopyStreamAdapter.java b/AriaFtpPlug/src/main/java/aria/apache/commons/net/io/CopyStreamAdapter.java
similarity index 98%
rename from AriaFtpPlug/src/main/java/org/apache/commons/net/io/CopyStreamAdapter.java
rename to AriaFtpPlug/src/main/java/aria/apache/commons/net/io/CopyStreamAdapter.java
index 81ca9a50..0f67dda9 100644
--- a/AriaFtpPlug/src/main/java/org/apache/commons/net/io/CopyStreamAdapter.java
+++ b/AriaFtpPlug/src/main/java/aria/apache/commons/net/io/CopyStreamAdapter.java
@@ -15,11 +15,11 @@
  * limitations under the License.
  */
 
-package org.apache.commons.net.io;
+package aria.apache.commons.net.io;
 
 import java.util.EventListener;
 
-import org.apache.commons.net.util.ListenerList;
+import aria.apache.commons.net.util.ListenerList;
 
 /**
  * The CopyStreamAdapter will relay CopyStreamEvents to a list of listeners
diff --git a/AriaFtpPlug/src/main/java/org/apache/commons/net/io/CopyStreamEvent.java b/AriaFtpPlug/src/main/java/aria/apache/commons/net/io/CopyStreamEvent.java
similarity index 98%
rename from AriaFtpPlug/src/main/java/org/apache/commons/net/io/CopyStreamEvent.java
rename to AriaFtpPlug/src/main/java/aria/apache/commons/net/io/CopyStreamEvent.java
index cd45f083..f44d918e 100644
--- a/AriaFtpPlug/src/main/java/org/apache/commons/net/io/CopyStreamEvent.java
+++ b/AriaFtpPlug/src/main/java/aria/apache/commons/net/io/CopyStreamEvent.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.net.io;
+package aria.apache.commons.net.io;
 
 import java.util.EventObject;
 
diff --git a/AriaFtpPlug/src/main/java/org/apache/commons/net/io/CopyStreamException.java b/AriaFtpPlug/src/main/java/aria/apache/commons/net/io/CopyStreamException.java
similarity index 98%
rename from AriaFtpPlug/src/main/java/org/apache/commons/net/io/CopyStreamException.java
rename to AriaFtpPlug/src/main/java/aria/apache/commons/net/io/CopyStreamException.java
index f4ad9faf..4314967c 100644
--- a/AriaFtpPlug/src/main/java/org/apache/commons/net/io/CopyStreamException.java
+++ b/AriaFtpPlug/src/main/java/aria/apache/commons/net/io/CopyStreamException.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.net.io;
+package aria.apache.commons.net.io;
 
 import java.io.IOException;
 
diff --git a/AriaFtpPlug/src/main/java/org/apache/commons/net/io/CopyStreamListener.java b/AriaFtpPlug/src/main/java/aria/apache/commons/net/io/CopyStreamListener.java
similarity index 98%
rename from AriaFtpPlug/src/main/java/org/apache/commons/net/io/CopyStreamListener.java
rename to AriaFtpPlug/src/main/java/aria/apache/commons/net/io/CopyStreamListener.java
index da0da990..14670feb 100644
--- a/AriaFtpPlug/src/main/java/org/apache/commons/net/io/CopyStreamListener.java
+++ b/AriaFtpPlug/src/main/java/aria/apache/commons/net/io/CopyStreamListener.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.net.io;
+package aria.apache.commons.net.io;
 
 import java.util.EventListener;
 
diff --git a/AriaFtpPlug/src/main/java/org/apache/commons/net/io/DotTerminatedMessageReader.java b/AriaFtpPlug/src/main/java/aria/apache/commons/net/io/DotTerminatedMessageReader.java
similarity index 99%
rename from AriaFtpPlug/src/main/java/org/apache/commons/net/io/DotTerminatedMessageReader.java
rename to AriaFtpPlug/src/main/java/aria/apache/commons/net/io/DotTerminatedMessageReader.java
index 9d703510..e554a359 100644
--- a/AriaFtpPlug/src/main/java/org/apache/commons/net/io/DotTerminatedMessageReader.java
+++ b/AriaFtpPlug/src/main/java/aria/apache/commons/net/io/DotTerminatedMessageReader.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.net.io;
+package aria.apache.commons.net.io;
 
 import java.io.BufferedReader;
 import java.io.IOException;
diff --git a/AriaFtpPlug/src/main/java/org/apache/commons/net/io/DotTerminatedMessageWriter.java b/AriaFtpPlug/src/main/java/aria/apache/commons/net/io/DotTerminatedMessageWriter.java
similarity index 99%
rename from AriaFtpPlug/src/main/java/org/apache/commons/net/io/DotTerminatedMessageWriter.java
rename to AriaFtpPlug/src/main/java/aria/apache/commons/net/io/DotTerminatedMessageWriter.java
index 2102dccf..637399bd 100644
--- a/AriaFtpPlug/src/main/java/org/apache/commons/net/io/DotTerminatedMessageWriter.java
+++ b/AriaFtpPlug/src/main/java/aria/apache/commons/net/io/DotTerminatedMessageWriter.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.net.io;
+package aria.apache.commons.net.io;
 
 import java.io.IOException;
 import java.io.Writer;
diff --git a/AriaFtpPlug/src/main/java/org/apache/commons/net/io/FromNetASCIIInputStream.java b/AriaFtpPlug/src/main/java/aria/apache/commons/net/io/FromNetASCIIInputStream.java
similarity index 99%
rename from AriaFtpPlug/src/main/java/org/apache/commons/net/io/FromNetASCIIInputStream.java
rename to AriaFtpPlug/src/main/java/aria/apache/commons/net/io/FromNetASCIIInputStream.java
index a65793e8..f8aeeded 100644
--- a/AriaFtpPlug/src/main/java/org/apache/commons/net/io/FromNetASCIIInputStream.java
+++ b/AriaFtpPlug/src/main/java/aria/apache/commons/net/io/FromNetASCIIInputStream.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.net.io;
+package aria.apache.commons.net.io;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/AriaFtpPlug/src/main/java/org/apache/commons/net/io/FromNetASCIIOutputStream.java b/AriaFtpPlug/src/main/java/aria/apache/commons/net/io/FromNetASCIIOutputStream.java
similarity index 99%
rename from AriaFtpPlug/src/main/java/org/apache/commons/net/io/FromNetASCIIOutputStream.java
rename to AriaFtpPlug/src/main/java/aria/apache/commons/net/io/FromNetASCIIOutputStream.java
index 160fd17e..85e6112d 100644
--- a/AriaFtpPlug/src/main/java/org/apache/commons/net/io/FromNetASCIIOutputStream.java
+++ b/AriaFtpPlug/src/main/java/aria/apache/commons/net/io/FromNetASCIIOutputStream.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.net.io;
+package aria.apache.commons.net.io;
 
 import java.io.FilterOutputStream;
 import java.io.IOException;
diff --git a/AriaFtpPlug/src/main/java/org/apache/commons/net/io/SocketInputStream.java b/AriaFtpPlug/src/main/java/aria/apache/commons/net/io/SocketInputStream.java
similarity index 98%
rename from AriaFtpPlug/src/main/java/org/apache/commons/net/io/SocketInputStream.java
rename to AriaFtpPlug/src/main/java/aria/apache/commons/net/io/SocketInputStream.java
index 87e27727..531e4029 100644
--- a/AriaFtpPlug/src/main/java/org/apache/commons/net/io/SocketInputStream.java
+++ b/AriaFtpPlug/src/main/java/aria/apache/commons/net/io/SocketInputStream.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.net.io;
+package aria.apache.commons.net.io;
 
 import java.io.FilterInputStream;
 import java.io.IOException;
diff --git a/AriaFtpPlug/src/main/java/org/apache/commons/net/io/SocketOutputStream.java b/AriaFtpPlug/src/main/java/aria/apache/commons/net/io/SocketOutputStream.java
similarity index 98%
rename from AriaFtpPlug/src/main/java/org/apache/commons/net/io/SocketOutputStream.java
rename to AriaFtpPlug/src/main/java/aria/apache/commons/net/io/SocketOutputStream.java
index 77e54755..3393ded7 100644
--- a/AriaFtpPlug/src/main/java/org/apache/commons/net/io/SocketOutputStream.java
+++ b/AriaFtpPlug/src/main/java/aria/apache/commons/net/io/SocketOutputStream.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.net.io;
+package aria.apache.commons.net.io;
 
 import java.io.FilterOutputStream;
 import java.io.IOException;
diff --git a/AriaFtpPlug/src/main/java/org/apache/commons/net/io/ToNetASCIIInputStream.java b/AriaFtpPlug/src/main/java/aria/apache/commons/net/io/ToNetASCIIInputStream.java
similarity index 99%
rename from AriaFtpPlug/src/main/java/org/apache/commons/net/io/ToNetASCIIInputStream.java
rename to AriaFtpPlug/src/main/java/aria/apache/commons/net/io/ToNetASCIIInputStream.java
index f51191e5..e7ee8bc5 100644
--- a/AriaFtpPlug/src/main/java/org/apache/commons/net/io/ToNetASCIIInputStream.java
+++ b/AriaFtpPlug/src/main/java/aria/apache/commons/net/io/ToNetASCIIInputStream.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.net.io;
+package aria.apache.commons.net.io;
 
 import java.io.FilterInputStream;
 import java.io.IOException;
diff --git a/AriaFtpPlug/src/main/java/org/apache/commons/net/io/ToNetASCIIOutputStream.java b/AriaFtpPlug/src/main/java/aria/apache/commons/net/io/ToNetASCIIOutputStream.java
similarity index 98%
rename from AriaFtpPlug/src/main/java/org/apache/commons/net/io/ToNetASCIIOutputStream.java
rename to AriaFtpPlug/src/main/java/aria/apache/commons/net/io/ToNetASCIIOutputStream.java
index 08235538..d54a8758 100644
--- a/AriaFtpPlug/src/main/java/org/apache/commons/net/io/ToNetASCIIOutputStream.java
+++ b/AriaFtpPlug/src/main/java/aria/apache/commons/net/io/ToNetASCIIOutputStream.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.net.io;
+package aria.apache.commons.net.io;
 
 import java.io.FilterOutputStream;
 import java.io.IOException;
diff --git a/AriaFtpPlug/src/main/java/org/apache/commons/net/io/Util.java b/AriaFtpPlug/src/main/java/aria/apache/commons/net/io/Util.java
similarity index 99%
rename from AriaFtpPlug/src/main/java/org/apache/commons/net/io/Util.java
rename to AriaFtpPlug/src/main/java/aria/apache/commons/net/io/Util.java
index 8b8fa789..bdf74b76 100644
--- a/AriaFtpPlug/src/main/java/org/apache/commons/net/io/Util.java
+++ b/AriaFtpPlug/src/main/java/aria/apache/commons/net/io/Util.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.net.io;
+package aria.apache.commons.net.io;
 
 import java.io.Closeable;
 import java.io.IOException;
diff --git a/AriaFtpPlug/src/main/java/org/apache/commons/net/io/package-info.java b/AriaFtpPlug/src/main/java/aria/apache/commons/net/io/package-info.java
similarity index 96%
rename from AriaFtpPlug/src/main/java/org/apache/commons/net/io/package-info.java
rename to AriaFtpPlug/src/main/java/aria/apache/commons/net/io/package-info.java
index 90fd4baa..06207d12 100644
--- a/AriaFtpPlug/src/main/java/org/apache/commons/net/io/package-info.java
+++ b/AriaFtpPlug/src/main/java/aria/apache/commons/net/io/package-info.java
@@ -18,4 +18,4 @@
 /**
  * Utility classes for IO support.
  */
-package org.apache.commons.net.io;
\ No newline at end of file
+package aria.apache.commons.net.io;
\ No newline at end of file
diff --git a/AriaFtpPlug/src/main/java/org/apache/commons/net/util/Base64.java b/AriaFtpPlug/src/main/java/aria/apache/commons/net/util/Base64.java
similarity index 99%
rename from AriaFtpPlug/src/main/java/org/apache/commons/net/util/Base64.java
rename to AriaFtpPlug/src/main/java/aria/apache/commons/net/util/Base64.java
index 93a7f206..a03150e0 100644
--- a/AriaFtpPlug/src/main/java/org/apache/commons/net/util/Base64.java
+++ b/AriaFtpPlug/src/main/java/aria/apache/commons/net/util/Base64.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.net.util;
+package aria.apache.commons.net.util;
 
 import java.io.UnsupportedEncodingException;
 import java.math.BigInteger;
diff --git a/AriaFtpPlug/src/main/java/org/apache/commons/net/util/Charsets.java b/AriaFtpPlug/src/main/java/aria/apache/commons/net/util/Charsets.java
similarity index 98%
rename from AriaFtpPlug/src/main/java/org/apache/commons/net/util/Charsets.java
rename to AriaFtpPlug/src/main/java/aria/apache/commons/net/util/Charsets.java
index c5968197..5001fcc0 100644
--- a/AriaFtpPlug/src/main/java/org/apache/commons/net/util/Charsets.java
+++ b/AriaFtpPlug/src/main/java/aria/apache/commons/net/util/Charsets.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.net.util;
+package aria.apache.commons.net.util;
 
 import java.nio.charset.Charset;
 
diff --git a/AriaFtpPlug/src/main/java/org/apache/commons/net/util/KeyManagerUtils.java b/AriaFtpPlug/src/main/java/aria/apache/commons/net/util/KeyManagerUtils.java
similarity index 99%
rename from AriaFtpPlug/src/main/java/org/apache/commons/net/util/KeyManagerUtils.java
rename to AriaFtpPlug/src/main/java/aria/apache/commons/net/util/KeyManagerUtils.java
index a90f1e59..012493b0 100644
--- a/AriaFtpPlug/src/main/java/org/apache/commons/net/util/KeyManagerUtils.java
+++ b/AriaFtpPlug/src/main/java/aria/apache/commons/net/util/KeyManagerUtils.java
@@ -16,8 +16,9 @@
  *
  */
 
-package org.apache.commons.net.util;
+package aria.apache.commons.net.util;
 
+import aria.apache.commons.net.io.Util;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
@@ -34,8 +35,6 @@ import java.util.Enumeration;
 import javax.net.ssl.KeyManager;
 import javax.net.ssl.X509ExtendedKeyManager;
 
-import org.apache.commons.net.io.Util;
-
 /**
  * General KeyManager utilities
  * 
    
diff --git a/AriaFtpPlug/src/main/java/org/apache/commons/net/util/ListenerList.java b/AriaFtpPlug/src/main/java/aria/apache/commons/net/util/ListenerList.java
similarity index 97%
rename from AriaFtpPlug/src/main/java/org/apache/commons/net/util/ListenerList.java
rename to AriaFtpPlug/src/main/java/aria/apache/commons/net/util/ListenerList.java
index 72f81597..2ddfa637 100644
--- a/AriaFtpPlug/src/main/java/org/apache/commons/net/util/ListenerList.java
+++ b/AriaFtpPlug/src/main/java/aria/apache/commons/net/util/ListenerList.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.net.util;
+package aria.apache.commons.net.util;
 
 import java.io.Serializable;
 import java.util.EventListener;
diff --git a/AriaFtpPlug/src/main/java/org/apache/commons/net/util/SSLContextUtils.java b/AriaFtpPlug/src/main/java/aria/apache/commons/net/util/SSLContextUtils.java
similarity index 98%
rename from AriaFtpPlug/src/main/java/org/apache/commons/net/util/SSLContextUtils.java
rename to AriaFtpPlug/src/main/java/aria/apache/commons/net/util/SSLContextUtils.java
index 469a7037..ddec2139 100644
--- a/AriaFtpPlug/src/main/java/org/apache/commons/net/util/SSLContextUtils.java
+++ b/AriaFtpPlug/src/main/java/aria/apache/commons/net/util/SSLContextUtils.java
@@ -16,7 +16,7 @@
  *
  */
 
-package org.apache.commons.net.util;
+package aria.apache.commons.net.util;
 
 import java.io.IOException;
 import java.security.GeneralSecurityException;
diff --git a/AriaFtpPlug/src/main/java/org/apache/commons/net/util/SSLSocketUtils.java b/AriaFtpPlug/src/main/java/aria/apache/commons/net/util/SSLSocketUtils.java
similarity index 98%
rename from AriaFtpPlug/src/main/java/org/apache/commons/net/util/SSLSocketUtils.java
rename to AriaFtpPlug/src/main/java/aria/apache/commons/net/util/SSLSocketUtils.java
index ff3f1b62..24f335ed 100644
--- a/AriaFtpPlug/src/main/java/org/apache/commons/net/util/SSLSocketUtils.java
+++ b/AriaFtpPlug/src/main/java/aria/apache/commons/net/util/SSLSocketUtils.java
@@ -16,7 +16,7 @@
  *
  */
 
-package org.apache.commons.net.util;
+package aria.apache.commons.net.util;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
diff --git a/AriaFtpPlug/src/main/java/org/apache/commons/net/util/SubnetUtils.java b/AriaFtpPlug/src/main/java/aria/apache/commons/net/util/SubnetUtils.java
similarity index 99%
rename from AriaFtpPlug/src/main/java/org/apache/commons/net/util/SubnetUtils.java
rename to AriaFtpPlug/src/main/java/aria/apache/commons/net/util/SubnetUtils.java
index 05a35fe6..9dd2e22e 100644
--- a/AriaFtpPlug/src/main/java/org/apache/commons/net/util/SubnetUtils.java
+++ b/AriaFtpPlug/src/main/java/aria/apache/commons/net/util/SubnetUtils.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.commons.net.util;
+package aria.apache.commons.net.util;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
diff --git a/AriaFtpPlug/src/main/java/org/apache/commons/net/util/TrustManagerUtils.java b/AriaFtpPlug/src/main/java/aria/apache/commons/net/util/TrustManagerUtils.java
similarity index 98%
rename from AriaFtpPlug/src/main/java/org/apache/commons/net/util/TrustManagerUtils.java
rename to AriaFtpPlug/src/main/java/aria/apache/commons/net/util/TrustManagerUtils.java
index 35894ced..63559d36 100644
--- a/AriaFtpPlug/src/main/java/org/apache/commons/net/util/TrustManagerUtils.java
+++ b/AriaFtpPlug/src/main/java/aria/apache/commons/net/util/TrustManagerUtils.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.commons.net.util;
+package aria.apache.commons.net.util;
 
 import java.security.GeneralSecurityException;
 import java.security.KeyStore;
diff --git a/AriaFtpPlug/src/main/java/org/apache/commons/net/util/package-info.java b/AriaFtpPlug/src/main/java/aria/apache/commons/net/util/package-info.java
similarity index 95%
rename from AriaFtpPlug/src/main/java/org/apache/commons/net/util/package-info.java
rename to AriaFtpPlug/src/main/java/aria/apache/commons/net/util/package-info.java
index 5515190e..7b95d75d 100644
--- a/AriaFtpPlug/src/main/java/org/apache/commons/net/util/package-info.java
+++ b/AriaFtpPlug/src/main/java/aria/apache/commons/net/util/package-info.java
@@ -18,4 +18,4 @@
 /**
  * Utility classes
  */
-package org.apache.commons.net.util;
\ No newline at end of file
+package aria.apache.commons.net.util;
\ No newline at end of file
diff --git a/DEV_LOG.md b/DEV_LOG.md
index b5895bbc..8abd2966 100644
--- a/DEV_LOG.md
+++ b/DEV_LOG.md
@@ -8,6 +8,7 @@
         ...
       }
       ```
+     - fix bug https://github.com/AriaLyy/Aria/issues/322
   + v_3.5.1
     - 优化`taskExists`方法
     - 添加`post`参数请求支持
diff --git a/build.gradle b/build.gradle
index cf51dcf8..2b43b342 100644
--- a/build.gradle
+++ b/build.gradle
@@ -39,8 +39,8 @@ task clean(type: Delete) {
 ext {
   userOrg = 'arialyy'
   groupId = 'com.arialyy.aria'
-  publishVersion = '3.5.1'
-//  publishVersion = '1.0.3'  //FTP插件
+//  publishVersion = '3.5.1'
+  publishVersion = '1.0.4'  //FTP插件
   repoName='maven'
   desc = 'android 下载框架'
   website = 'https://github.com/AriaLyy/Aria'
diff --git a/gradle.properties b/gradle.properties
index 99bf62fd..36ed63a9 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -13,8 +13,8 @@
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
 #Wed Dec 07 20:19:22 CST 2016
-org.gradle.daemon=true
-org.gradle.jvmargs=-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005
+#org.gradle.daemon=true
+#org.gradle.jvmargs=-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005
 # gradle proxy https://chaosleong.github.io/2017/02/10/Configuring-Gradle-Proxy/
 #systemProp.socksProxyHost=127.0.0.1
 #systemProp.socksProxyPort=60777