[mina2] 07/09: Merge tag 'upstream/2.0.12'

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository mina2.

commit 6c696fee5b38e60ea6613d245171c86f0c4f111f
Merge: 85698f5 e232a52
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue May 3 22:55:30 2016 +0200

    Merge tag 'upstream/2.0.12'
    
    Upstream version 2.0.12

 src/mina-benchmarks/pom.xml                        |  2 +-
 src/mina-core/META-INF/MANIFEST.MF                 | 90 ++++++++++----------
 src/mina-core/pom.xml                              |  2 +-
 .../core/polling/AbstractPollingIoProcessor.java   | 96 ++++++++++++----------
 .../mina/core/session/AbstractIoSession.java       | 61 ++++++++------
 .../org/apache/mina/core/session/IoSession.java    | 21 +++++
 .../java/org/apache/mina/filter/ssl/SslFilter.java | 24 ++++++
 .../mina/transport/socket/nio/NioSession.java      |  7 ++
 src/mina-example/pom.xml                           |  2 +-
 .../example/echoserver/EchoProtocolHandler.java    |  2 +
 src/mina-filter-compression/META-INF/MANIFEST.MF   | 14 ++--
 src/mina-filter-compression/pom.xml                |  2 +-
 src/mina-http/META-INF/MANIFEST.MF                 | 14 ++--
 src/mina-http/pom.xml                              |  2 +-
 src/mina-integration-beans/META-INF/MANIFEST.MF    |  8 +-
 src/mina-integration-beans/pom.xml                 |  2 +-
 src/mina-integration-jmx/META-INF/MANIFEST.MF      | 14 ++--
 src/mina-integration-jmx/pom.xml                   |  2 +-
 src/mina-integration-ognl/META-INF/MANIFEST.MF     | 14 ++--
 src/mina-integration-ognl/pom.xml                  |  2 +-
 src/mina-integration-xbean/pom.xml                 |  2 +-
 src/mina-legal/pom.xml                             |  2 +-
 src/mina-statemachine/META-INF/MANIFEST.MF         | 24 +++---
 src/mina-statemachine/pom.xml                      |  7 +-
 .../java/org/apache/mina/statemachine/State.java   | 19 +++--
 .../statemachine/context/AbstractStateContext.java | 11 ++-
 .../org/apache/mina/statemachine/event/Event.java  | 32 +++++++-
 .../transition/AbstractTransition.java             | 47 +++++++++--
 .../statemachine/transition/MethodTransition.java  | 32 +++++---
 src/mina-transport-apr/META-INF/MANIFEST.MF        | 18 ++--
 src/mina-transport-apr/pom.xml                     |  2 +-
 src/mina-transport-serial/META-INF/MANIFEST.MF     | 18 ++--
 src/mina-transport-serial/pom.xml                  |  2 +-
 src/pom.xml                                        | 20 ++---
 34 files changed, 378 insertions(+), 239 deletions(-)

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