james-server-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From adup...@apache.org
Subject [12/12] james-project git commit: Merge remote-tracking branch 'mine/JAMES-1862-2'
Date Tue, 06 Dec 2016 12:25:30 GMT
Merge remote-tracking branch 'mine/JAMES-1862-2'


Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/a816b126
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/a816b126
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/a816b126

Branch: refs/heads/master
Commit: a816b1269a2bcd8896dafeffef9169825bebd89b
Parents: b38510b e0315c4
Author: Antoine Duprat <aduprat@apache.org>
Authored: Tue Dec 6 13:25:00 2016 +0100
Committer: Antoine Duprat <aduprat@apache.org>
Committed: Tue Dec 6 13:25:00 2016 +0100

----------------------------------------------------------------------
 .../apache/james/mpt/smtp/SmtpTestModule.java   |   2 +-
 .../apache/james/mpt/smtp/StarttlsSmtpTest.java |  33 ++
 .../james/mpt/smtp/StarttlsSmtpTestModule.java  |  32 ++
 .../smtp/host/CassandraJamesSmtpHostSystem.java |   4 +-
 .../cassandra/src/test/resources/smtpserver.xml |   4 +-
 .../apache/james/mpt/smtp/ForwardSmtpTest.java  |   3 +-
 .../james/mpt/smtp/SmtpStarttlsCommandTest.java |  65 +++
 .../org/apache/james/smtp/scripts/starttls.test |  11 +
 .../smtp/scripts/starttls_with_injection.test   |  11 +
 mpt/pom.xml                                     |   2 +-
 .../lmtp/netty/NettyLMTPSServerTest.java        |   5 +-
 .../lmtp/netty/NettyLMTPServerTest.java         |   4 +-
 protocols/netty/pom.xml                         |  14 +
 .../netty/AbstractChannelPipelineFactory.java   |  14 +-
 .../AbstractSSLAwareChannelPipelineFactory.java |  11 +-
 .../netty/BasicChannelUpstreamHandler.java      |   6 +-
 .../james/protocols/netty/NettyServer.java      |  64 ++-
 .../james/protocols/netty/NettyServerTest.java  |  71 +++
 .../pop3/netty/NettyPOP3SServerTest.java        |   5 +-
 .../pop3/netty/NettyPOP3ServerTest.java         |   4 +-
 .../pop3/netty/NettyStartTlsPOP3ServerTest.java |   5 +-
 protocols/smtp/pom.xml                          |  33 +-
 .../AllButStartTlsDelimiterChannelHandler.java  |  53 ++
 .../smtp/CommandInjectionDetectedException.java |  23 +
 .../smtp/AbstractStartTlsSMTPServerTest.java    | 168 -------
 .../smtp/netty/NettySMTPSServerTest.java        |   5 +-
 .../smtp/netty/NettySMTPServerTest.java         |   4 +-
 .../smtp/netty/NettyStartTlsSMTPServerTest.java | 262 ++++++++--
 .../mailets/jsieve/FileIntoAction.java          |   2 -
 .../james/transport/mailets/jsieve/Poster.java  |   1 -
 .../james/imapserver/netty/IMAPServer.java      |   8 +-
 .../imapserver/netty/IMAPServerFactory.java     |   1 -
 .../james/imapserver/netty/OioIMAPServer.java   |   1 -
 .../netty/AbstractConfigurableAsyncServer.java  |  12 +-
 ...ractExecutorAwareChannelPipelineFactory.java |   9 +-
 .../james/lmtpserver/netty/LMTPServer.java      |   9 +
 .../netty/ManageSieveServer.java                |  16 +-
 .../james/pop3server/netty/POP3Server.java      |   9 +
 server/protocols/protocols-smtp/pom.xml         |   6 +
 .../james/smtpserver/netty/SMTPServer.java      |   9 +
 .../apache/james/smtpserver/SMTPServerTest.java | 504 ++++++++++++++-----
 .../james/queue/jms/JMSMailQueueFactory.java    |   3 +-
 42 files changed, 1108 insertions(+), 400 deletions(-)
----------------------------------------------------------------------



---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org


Mime
View raw message