[libcommons-net-java] 01/05: Merge tag 'upstream/3.4'

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Mon Nov 30 12:32:00 UTC 2015


This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository libcommons-net-java.

commit 58852512276de425ddebfa1b56463ef626698bb5
Merge: 981e793 fd6092b
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Nov 30 09:45:24 2015 +0100

    Merge tag 'upstream/3.4'
    
    Upstream version 3.4

 NOTICE.txt                                         |   2 +-
 RELEASE-NOTES.txt                                  |  88 ++++-
 checkstyle.xml                                     |  64 ++-
 doap_net.rdf                                       |  26 +-
 pom.xml                                            | 209 ++++++----
 src/{main => }/assembly/bin.xml                    |   0
 src/{main => }/assembly/src.xml                    |   0
 src/changes/changes.xml                            | 174 ++++++++-
 src/main/java/examples/Main.java                   | 115 +++---
 .../java/examples/cidr/SubnetUtilsExample.java     |   5 +-
 src/main/java/examples/ftp/FTPClientExample.java   | 125 ++++--
 src/main/java/examples/ftp/ServerToServerFTP.java  |   1 -
 src/main/java/examples/ftp/TFTPExample.java        |   1 -
 src/main/java/examples/mail/IMAPExportMbox.java    | 433 +++++++++++++++++++++
 src/main/java/examples/mail/IMAPImportMbox.java    | 199 ++++++++++
 src/main/java/examples/mail/IMAPMail.java          |  70 +---
 src/main/java/examples/mail/IMAPUtils.java         |  96 +++++
 src/main/java/examples/mail/POP3Mail.java          |   1 -
 src/main/java/examples/mail/SMTPMail.java          |   1 -
 src/main/java/examples/nntp/ArticleReader.java     |  23 +-
 src/main/java/examples/nntp/ExtendedNNTPOps.java   |   2 -
 src/main/java/examples/nntp/ListNewsgroups.java    |   1 -
 src/main/java/examples/nntp/NNTPUtils.java         |  11 +-
 src/main/java/examples/nntp/PostMessage.java       |   1 -
 src/main/java/examples/ntp/NTPClient.java          |   1 -
 src/main/java/examples/ntp/SimpleNTPServer.java    | 232 +++++++++++
 src/main/java/examples/ntp/TimeClient.java         |   1 -
 .../java/examples/telnet/TelnetClientExample.java  |  73 ++--
 src/main/java/examples/telnet/WeatherTelnet.java   |   3 +-
 src/main/java/examples/unix/chargen.java           |   1 -
 src/main/java/examples/unix/daytime.java           |   1 -
 src/main/java/examples/unix/echo.java              |   1 -
 src/main/java/examples/unix/finger.java            |   1 -
 src/main/java/examples/unix/fwhois.java            |   1 -
 src/main/java/examples/unix/rdate.java             |   2 -
 src/main/java/examples/unix/rexec.java             |   3 +-
 src/main/java/examples/unix/rlogin.java            |   3 +-
 src/main/java/examples/unix/rshell.java            |   3 +-
 src/main/java/examples/util/IOUtil.java            |   2 +-
 .../apache/commons/net/DatagramSocketClient.java   |  28 +-
 .../apache/commons/net/DatagramSocketFactory.java  |  13 +-
 .../commons/net/DefaultDatagramSocketFactory.java  |  12 +-
 .../apache/commons/net/DefaultSocketFactory.java   |  18 +-
 .../commons/net/MalformedServerReplyException.java |   6 +-
 .../apache/commons/net/PrintCommandListener.java   |   5 +-
 .../apache/commons/net/ProtocolCommandEvent.java   |  18 +-
 .../commons/net/ProtocolCommandListener.java       |   8 +-
 .../apache/commons/net/ProtocolCommandSupport.java |  16 +-
 .../java/org/apache/commons/net/SocketClient.java  |  23 +-
 .../org/apache/commons/net/bsd/RCommandClient.java |  18 +-
 .../org/apache/commons/net/bsd/RExecClient.java    |  23 +-
 .../org/apache/commons/net/bsd/RLoginClient.java   |  13 +-
 .../commons/net/chargen/CharGenTCPClient.java      |   5 +-
 .../commons/net/chargen/CharGenUDPClient.java      |  12 +-
 .../commons/net/daytime/DaytimeTCPClient.java      |   2 +-
 .../commons/net/daytime/DaytimeUDPClient.java      |   8 +-
 .../commons/net/discard/DiscardTCPClient.java      |   5 +-
 .../commons/net/discard/DiscardUDPClient.java      |  14 +-
 .../org/apache/commons/net/echo/EchoTCPClient.java |   5 +-
 .../org/apache/commons/net/echo/EchoUDPClient.java |  15 +-
 .../apache/commons/net/finger/FingerClient.java    |  13 +-
 src/main/java/org/apache/commons/net/ftp/FTP.java  | 157 ++++----
 .../java/org/apache/commons/net/ftp/FTPClient.java | 410 ++++++++++++-------
 .../apache/commons/net/ftp/FTPClientConfig.java    |  92 ++++-
 .../java/org/apache/commons/net/ftp/FTPCmd.java    |   2 +-
 .../org/apache/commons/net/ftp/FTPCommand.java     |   5 +-
 .../net/ftp/FTPConnectionClosedException.java      |   5 +-
 .../java/org/apache/commons/net/ftp/FTPFile.java   | 155 ++++++--
 .../apache/commons/net/ftp/FTPFileEntryParser.java |   7 +-
 .../commons/net/ftp/FTPFileEntryParserImpl.java    |   2 +-
 .../org/apache/commons/net/ftp/FTPHTTPClient.java  |  15 +-
 .../apache/commons/net/ftp/FTPListParseEngine.java |  28 +-
 .../java/org/apache/commons/net/ftp/FTPReply.java  |  10 +-
 .../org/apache/commons/net/ftp/FTPSClient.java     |  94 ++++-
 .../org/apache/commons/net/ftp/FTPSCommand.java    |   2 +-
 .../apache/commons/net/ftp/FTPSSocketFactory.java  |  27 +-
 .../apache/commons/net/ftp/FTPSTrustManager.java   |   4 +-
 .../net/ftp/parser/CompositeFileEntryParser.java   |   2 -
 .../parser/ConfigurableFTPFileEntryParserImpl.java |  27 +-
 .../parser/DefaultFTPFileEntryParserFactory.java   |  19 +-
 .../ftp/parser/EnterpriseUnixFTPEntryParser.java   |  65 ++--
 .../net/ftp/parser/FTPTimestampParserImpl.java     | 147 ++++++-
 .../commons/net/ftp/parser/MLSxEntryParser.java    |  85 +++-
 .../commons/net/ftp/parser/MVSFTPEntryParser.java  |   6 +-
 .../net/ftp/parser/MacOsPeterFTPEntryParser.java   |   4 +-
 .../commons/net/ftp/parser/NTFTPEntryParser.java   |   9 +-
 .../net/ftp/parser/NetwareFTPEntryParser.java      |  13 +-
 .../commons/net/ftp/parser/OS2FTPEntryParser.java  |   6 +-
 .../net/ftp/parser/OS400FTPEntryParser.java        | 298 +++++++++++++-
 .../ftp/parser/RegexFTPFileEntryParserImpl.java    |  66 +++-
 .../commons/net/ftp/parser/UnixFTPEntryParser.java | 102 +++--
 .../commons/net/ftp/parser/VMSFTPEntryParser.java  |  12 +-
 .../ftp/parser/VMSVersioningFTPEntryParser.java    |   6 +-
 .../commons/net/imap/AuthenticatingIMAPClient.java |  20 +-
 .../java/org/apache/commons/net/imap/IMAP.java     | 115 +++++-
 .../org/apache/commons/net/imap/IMAPClient.java    |  61 ++-
 .../org/apache/commons/net/imap/IMAPReply.java     |   9 +
 .../org/apache/commons/net/imap/IMAPSClient.java   |  70 +++-
 .../apache/commons/net/io/CopyStreamAdapter.java   |   6 +-
 .../org/apache/commons/net/io/CopyStreamEvent.java |   6 +-
 .../apache/commons/net/io/CopyStreamListener.java  |   6 +-
 .../commons/net/io/DotTerminatedMessageWriter.java |  20 +-
 .../commons/net/io/FromNetASCIIInputStream.java    |  13 +-
 .../commons/net/io/FromNetASCIIOutputStream.java   |  14 +-
 .../apache/commons/net/io/SocketInputStream.java   |   8 +-
 .../apache/commons/net/io/SocketOutputStream.java  |  10 +-
 .../commons/net/io/ToNetASCIIInputStream.java      |  12 +-
 .../commons/net/io/ToNetASCIIOutputStream.java     |  12 +-
 src/main/java/org/apache/commons/net/io/Util.java  |  71 ++--
 .../java/org/apache/commons/net/nntp/Article.java  |  43 +-
 .../apache/commons/net/nntp/ArticlePointer.java    |   2 +-
 .../java/org/apache/commons/net/nntp/NNTP.java     |  17 +-
 .../org/apache/commons/net/nntp/NNTPClient.java    | 282 ++++++++++----
 .../org/apache/commons/net/nntp/NNTPCommand.java   |   3 -
 .../net/nntp/NNTPConnectionClosedException.java    |   3 +-
 .../commons/net/nntp/NewGroupsOrNewsQuery.java     |   3 +-
 .../org/apache/commons/net/nntp/NewsgroupInfo.java |   3 +-
 .../apache/commons/net/nntp/SimpleNNTPHeader.java  |   3 +-
 .../apache/commons/net/nntp/ThreadContainer.java   |   4 +-
 .../org/apache/commons/net/nntp/Threadable.java    |   2 +-
 .../java/org/apache/commons/net/nntp/Threader.java |  57 +--
 .../org/apache/commons/net/ntp/NTPUDPClient.java   |   3 +-
 .../java/org/apache/commons/net/ntp/NtpUtils.java  |   8 +-
 .../java/org/apache/commons/net/ntp/NtpV3Impl.java | 112 +++++-
 .../org/apache/commons/net/ntp/NtpV3Packet.java    |  34 +-
 .../java/org/apache/commons/net/ntp/TimeInfo.java  |  58 ++-
 .../java/org/apache/commons/net/ntp/TimeStamp.java |  39 +-
 .../commons/net/pop3/ExtendedPOP3Client.java       |   5 +-
 .../java/org/apache/commons/net/pop3/POP3.java     |  25 +-
 .../org/apache/commons/net/pop3/POP3Client.java    |  32 +-
 .../org/apache/commons/net/pop3/POP3Command.java   |   7 +-
 .../apache/commons/net/pop3/POP3MessageInfo.java   |   8 +-
 .../org/apache/commons/net/pop3/POP3Reply.java     |   2 -
 .../org/apache/commons/net/pop3/POP3SClient.java   |  70 +++-
 .../commons/net/smtp/AuthenticatingSMTPClient.java |  15 +-
 .../org/apache/commons/net/smtp/RelayPath.java     |   5 +-
 .../java/org/apache/commons/net/smtp/SMTP.java     |   5 +-
 .../org/apache/commons/net/smtp/SMTPClient.java    |  23 +-
 .../org/apache/commons/net/smtp/SMTPCommand.java   |   6 +-
 .../net/smtp/SMTPConnectionClosedException.java    |   6 +-
 .../org/apache/commons/net/smtp/SMTPSClient.java   |  71 +++-
 .../apache/commons/net/smtp/SimpleSMTPHeader.java  |  47 ++-
 .../commons/net/telnet/EchoOptionHandler.java      |  38 --
 .../net/telnet/InvalidTelnetOptionException.java   |   2 -
 .../commons/net/telnet/SimpleOptionHandler.java    |  37 --
 .../net/telnet/SuppressGAOptionHandler.java        |  37 --
 .../java/org/apache/commons/net/telnet/Telnet.java |  80 ++--
 .../apache/commons/net/telnet/TelnetClient.java    |  56 ++-
 .../commons/net/telnet/TelnetInputStream.java      |  14 +-
 .../net/telnet/TelnetNotificationHandler.java      |   8 +-
 .../apache/commons/net/telnet/TelnetOption.java    |   8 +-
 .../commons/net/telnet/TelnetOptionHandler.java    |  33 +-
 .../commons/net/telnet/TelnetOutputStream.java     |  14 +-
 .../net/telnet/TerminalTypeOptionHandler.java      |  26 +-
 .../net/telnet/WindowSizeOptionHandler.java        |  28 +-
 .../java/org/apache/commons/net/tftp/TFTP.java     |  16 +-
 .../org/apache/commons/net/tftp/TFTPAckPacket.java |  20 +-
 .../org/apache/commons/net/tftp/TFTPClient.java    |  24 +-
 .../apache/commons/net/tftp/TFTPDataPacket.java    |  26 +-
 .../apache/commons/net/tftp/TFTPErrorPacket.java   |  16 +-
 .../org/apache/commons/net/tftp/TFTPPacket.java    |  29 +-
 .../commons/net/tftp/TFTPPacketException.java      |   5 +-
 .../commons/net/tftp/TFTPReadRequestPacket.java    |   8 +-
 .../apache/commons/net/tftp/TFTPRequestPacket.java |  16 +-
 .../commons/net/tftp/TFTPWriteRequestPacket.java   |   8 +-
 .../org/apache/commons/net/time/TimeTCPClient.java |   8 +-
 .../org/apache/commons/net/time/TimeUDPClient.java |  20 +-
 .../java/org/apache/commons/net/util/Base64.java   |  10 +-
 .../apache/commons/net/util/KeyManagerUtils.java   |  12 +-
 .../apache/commons/net/util/SSLContextUtils.java   |   7 +-
 .../apache/commons/net/util/SSLSocketUtils.java    |  63 +++
 .../org/apache/commons/net/util/SubnetUtils.java   |  65 +++-
 .../apache/commons/net/util/TrustManagerUtils.java |   5 +-
 .../org/apache/commons/net/whois/WhoisClient.java  |   8 +-
 src/main/resources/examples/examples.properties    |  51 +++
 src/site/custom/project-info-report.properties     |  24 ++
 src/site/resources/download_net.cgi                |   0
 src/site/site.xml                                  |   2 +-
 src/site/xdoc/download_net.xml                     |  32 +-
 src/site/xdoc/migration.xml                        |  18 +
 src/test/java/examples/MainTest.java               | 122 ++++++
 .../org/apache/commons/net/SubnetUtilsTest.java    | 272 +++++++------
 .../net/ftp/FTPClientConfigFunctionalTest.java     |   9 +-
 .../commons/net/ftp/FTPClientConfigTest.java       |  22 +-
 .../org/apache/commons/net/ftp/FTPClientTest.java  |  67 ++++
 .../commons/net/ftp/ListingFunctionalTest.java     |  51 +--
 .../apache/commons/net/ftp/TestConnectTimeout.java |  11 +-
 .../ftp/parser/CompositeFTPParseTestFramework.java |  20 +-
 .../parser/EnterpriseUnixFTPEntryParserTest.java   |  37 +-
 .../net/ftp/parser/FTPConfigEntryParserTest.java   |   6 +-
 .../net/ftp/parser/FTPParseTestFramework.java      |  70 +++-
 .../net/ftp/parser/FTPTimestampParserImplTest.java |  10 +-
 .../commons/net/ftp/parser/MLSDComparison.java     |   4 +-
 .../net/ftp/parser/MLSxEntryParserTest.java        | 108 +++++
 .../net/ftp/parser/MVSFTPEntryParserTest.java      |  22 +-
 .../ftp/parser/MacOsPeterFTPEntryParserTest.java   |  29 +-
 .../net/ftp/parser/NTFTPEntryParserTest.java       | 115 +++++-
 .../net/ftp/parser/NetwareFTPEntryParserTest.java  |  32 +-
 .../net/ftp/parser/OS2FTPEntryParserTest.java      |  33 +-
 ...java => OS400FTPEntryParserAdditionalTest.java} |  75 ++--
 .../net/ftp/parser/OS400FTPEntryParserTest.java    |  43 +-
 .../net/ftp/parser/UnixFTPEntryParserTest.java     | 113 +++---
 .../net/ftp/parser/VMSFTPEntryParserTest.java      |  52 +--
 .../org/apache/commons/net/nntp/TestThreader.java  |  77 ++++
 .../org/apache/commons/net/ntp/TestNtpClient.java  | 115 ++++++
 .../org/apache/commons/net/ntp/TestNtpPacket.java  | 197 ++++++++++
 .../org/apache/commons/net/ntp/TestTimeInfo.java   | 136 +++++++
 .../org/apache/commons/net/ntp/TimeStampTest.java  |  14 +-
 .../commons/net/pop3/POP3ClientCommandsTest.java   |  81 +---
 .../apache/commons/net/pop3/POP3ClientTest.java    |  28 +-
 ...TestSetupParameters.java => POP3Constants.java} |   7 +-
 .../commons/net/pop3/POP3ConstructorTest.java      |  24 +-
 .../commons/net/smtp/SimpleSMTPHeaderTestCase.java | 126 ++++++
 .../commons/net/telnet/EchoOptionHandlerTest.java  |   2 -
 .../telnet/InvalidTelnetOptionExceptionTest.java   |   2 -
 .../net/telnet/SimpleOptionHandlerTest.java        |   2 -
 .../net/telnet/SuppressGAOptionHandlerTest.java    |   2 -
 .../net/telnet/TelnetClientFunctionalTest.java     |  10 +-
 .../commons/net/telnet/TelnetClientTest.java       |  50 ++-
 .../telnet/TelnetOptionHandlerTestAbstract.java    |   2 -
 .../commons/net/telnet/TelnetOptionTest.java       |   2 -
 .../commons/net/telnet/TelnetTestResponder.java    |   2 -
 .../commons/net/telnet/TelnetTestSimpleServer.java |  22 +-
 .../net/telnet/TerminalTypeOptionHandlerTest.java  |  23 +-
 .../net/telnet/WindowSizeOptionHandlerTest.java    |   2 -
 .../org/apache/commons/net/tftp/TFTPServer.java    |  12 +-
 .../commons/net/tftp/TFTPServerPathTest.java       |  20 +-
 .../java/org/apache/commons/net/tftp/TFTPTest.java |  10 +-
 .../apache/commons/net/time/TimeTCPClientTest.java |  43 +-
 .../commons/net/time/TimeTestSimpleServer.java     |  18 +-
 .../java/org/apache/commons/net/util/UtilTest.java | 213 ++++++++++
 231 files changed, 6669 insertions(+), 2364 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libcommons-net-java.git



More information about the pkg-java-commits mailing list