You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by el...@apache.org on 2023/04/30 03:32:34 UTC
[mina] 02/07: Merge remote-tracking branch 'origin/2.2.X' into 2.2.X
This is an automated email from the ASF dual-hosted git repository.
elecharny pushed a commit to branch 2.2.X
in repository https://gitbox.apache.org/repos/asf/mina.git
commit 98f45604040b511ae25991ffb915d319643f0d89
Merge: f73351403 a8dc2c56e
Author: emmanuel lecharny <el...@apache.org>
AuthorDate: Sun Apr 30 05:15:04 2023 +0200
Merge remote-tracking branch 'origin/2.2.X' into 2.2.X
.gitignore | 1 +
NOTICE-bin.txt | 2 +-
NOTICE.txt | 2 +-
distribution/pom.xml | 2 +-
mina-core/pom.xml | 2 +-
.../src/main/java/org/apache/mina/core/IoUtil.java | 8 +-
.../apache/mina/core/buffer/AbstractIoBuffer.java | 4 +-
.../mina/core/buffer/CachedBufferAllocator.java | 8 +-
.../java/org/apache/mina/core/buffer/IoBuffer.java | 96 +++++++++++-----------
.../apache/mina/core/buffer/IoBufferAllocator.java | 8 +-
.../apache/mina/core/buffer/IoBufferHexDumper.java | 6 +-
.../java/org/apache/mina/core/file/FileRegion.java | 6 +-
.../filterchain/DefaultIoFilterChainBuilder.java | 6 +-
.../org/apache/mina/core/filterchain/IoFilter.java | 26 +++---
.../mina/core/filterchain/IoFilterChain.java | 40 ++++-----
.../core/filterchain/IoFilterChainBuilder.java | 2 +-
.../org/apache/mina/core/future/CloseFuture.java | 2 +-
.../org/apache/mina/core/future/ConnectFuture.java | 2 +-
.../apache/mina/core/future/DefaultIoFuture.java | 2 +-
.../java/org/apache/mina/core/future/IoFuture.java | 16 ++--
.../org/apache/mina/core/future/ReadFuture.java | 8 +-
.../org/apache/mina/core/future/WriteFuture.java | 4 +-
.../core/polling/AbstractPollingIoConnector.java | 2 +-
.../core/polling/AbstractPollingIoProcessor.java | 18 ++--
.../mina/core/service/AbstractIoConnector.java | 6 +-
.../org/apache/mina/core/service/IoAcceptor.java | 20 ++---
.../org/apache/mina/core/service/IoProcessor.java | 6 +-
.../org/apache/mina/core/service/IoService.java | 11 +--
.../mina/core/service/IoServiceStatistics.java | 12 +--
.../mina/core/service/TransportMetadata.java | 2 +-
.../org/apache/mina/core/session/DummySession.java | 4 +-
.../org/apache/mina/core/session/IdleStatus.java | 6 +-
.../mina/core/session/IdleStatusChecker.java | 2 +-
.../org/apache/mina/core/session/IoSession.java | 92 ++++++++++-----------
.../mina/core/session/IoSessionAttributeMap.java | 14 ++--
.../apache/mina/core/session/IoSessionConfig.java | 12 +--
.../session/IoSessionDataStructureFactory.java | 4 +-
.../org/apache/mina/core/write/WriteRequest.java | 2 +-
.../apache/mina/core/write/WriteRequestQueue.java | 2 +-
.../filter/codec/CumulativeProtocolDecoder.java | 20 ++---
.../apache/mina/filter/codec/ProtocolDecoder.java | 4 +-
.../codec/RecoverableProtocolDecoderException.java | 2 +-
.../filter/codec/SynchronizedProtocolDecoder.java | 2 +-
.../filter/codec/SynchronizedProtocolEncoder.java | 2 +-
.../codec/demux/DemuxingProtocolEncoder.java | 2 +-
.../mina/filter/codec/demux/MessageDecoder.java | 6 +-
.../mina/filter/codec/demux/MessageEncoder.java | 2 +-
.../ObjectSerializationCodecFactory.java | 4 +-
.../serialization/ObjectSerializationDecoder.java | 4 +-
.../ObjectSerializationInputStream.java | 4 +-
.../ConsumeToDynamicTerminatorDecodingState.java | 4 +-
.../ConsumeToLinearWhitespaceDecodingState.java | 2 +-
.../codec/statemachine/CrLfDecodingState.java | 6 +-
.../filter/codec/statemachine/DecodingState.java | 2 +-
.../filter/codec/statemachine/SkippingState.java | 4 +-
.../mina/filter/codec/textline/LineDelimiter.java | 18 ++--
.../codec/textline/TextLineCodecFactory.java | 4 +-
.../filter/codec/textline/TextLineDecoder.java | 18 ++--
.../filter/codec/textline/TextLineEncoder.java | 14 ++--
.../executor/DefaultIoEventSizeEstimator.java | 2 +-
.../mina/filter/executor/ExecutorFilter.java | 4 +-
.../mina/filter/executor/IoEventQueueHandler.java | 10 +--
.../mina/filter/keepalive/KeepAliveFilter.java | 54 ++++++------
.../filter/keepalive/KeepAliveMessageFactory.java | 8 +-
.../apache/mina/filter/ssl/KeyStoreFactory.java | 2 +-
.../apache/mina/filter/ssl/SslContextFactory.java | 18 ++--
.../java/org/apache/mina/filter/ssl/SslFilter.java | 34 +++++---
.../util/SessionAttributeInitializingFilter.java | 14 ++--
.../mina/handler/chain/ChainedIoHandler.java | 8 +-
.../apache/mina/handler/chain/IoHandlerChain.java | 6 +-
.../mina/handler/demux/DemuxingIoHandler.java | 12 +--
.../apache/mina/handler/demux/MessageHandler.java | 2 +-
.../mina/handler/stream/StreamIoHandler.java | 8 +-
.../mina/proxy/AbstractProxyLogicHandler.java | 2 +-
.../org/apache/mina/proxy/ProxyLogicHandler.java | 2 +-
.../apache/mina/proxy/utils/IoBufferDecoder.java | 8 +-
.../apache/mina/proxy/utils/StringUtilities.java | 2 +-
.../socket/AbstractDatagramSessionConfig.java | 30 +++----
.../socket/AbstractSocketSessionConfig.java | 48 +++++------
.../mina/transport/socket/DatagramAcceptor.java | 2 +-
.../transport/socket/DatagramSessionConfig.java | 6 +-
.../mina/transport/socket/SocketAcceptor.java | 4 +-
.../mina/transport/socket/SocketSessionConfig.java | 28 +++----
.../socket/nio/NioDatagramSessionConfig.java | 4 +-
.../transport/socket/nio/NioSocketAcceptor.java | 4 +-
.../org/apache/mina/util/AvailablePortFinder.java | 2 +-
.../org/apache/mina/util/ExceptionMonitor.java | 4 +-
.../apache/mina/util/LazyInitializedCacheMap.java | 2 +-
.../org/apache/mina/util/byteaccess/ByteArray.java | 2 +-
.../byteaccess/CompositeByteArrayRelativeBase.java | 4 +-
.../mina/util/byteaccess/IoAbsoluteReader.java | 16 ++--
.../mina/util/byteaccess/IoRelativeReader.java | 2 +-
mina-example/pom.xml | 2 +-
.../mina/example/chat/client/package-info.java | 17 +---
.../apache/mina/example/chat/client/package.html | 24 ------
.../org/apache/mina/example/chat/package-info.java | 17 +---
.../java/org/apache/mina/example/chat/package.html | 24 ------
.../mina/example/echoserver/package-info.java | 17 +---
.../apache/mina/example/echoserver/package.html | 24 ------
.../mina/example/echoserver/ssl/package-info.java | 17 +---
.../mina/example/echoserver/ssl/package.html | 24 ------
.../apache/mina/example/netcat/package-info.java | 17 +---
.../org/apache/mina/example/netcat/package.html | 25 ------
.../apache/mina/example/proxy/package-info.java | 17 +---
.../org/apache/mina/example/proxy/package.html | 25 ------
.../apache/mina/example/reverser/package-info.java | 17 +---
.../org/apache/mina/example/reverser/package.html | 25 ------
.../sumup/codec/AbstractMessageDecoder.java | 2 +-
.../mina/example/sumup/codec/package-info.java | 17 +---
.../apache/mina/example/sumup/codec/package.html | 25 ------
.../mina/example/sumup/message/package-info.java | 17 +---
.../apache/mina/example/sumup/message/package.html | 25 ------
.../apache/mina/example/sumup/package-info.java | 17 +---
.../org/apache/mina/example/sumup/package.html | 25 ------
.../apache/mina/example/tennis/package-info.java | 17 +---
.../org/apache/mina/example/tennis/package.html | 24 ------
mina-filter-compression/pom.xml | 2 +-
.../mina/filter/compression/CompressionFilter.java | 16 ++--
.../org/apache/mina/filter/compression/Zlib.java | 8 +-
mina-http/pom.xml | 2 +-
.../java/org/apache/mina/http/api/HttpMessage.java | 6 +-
.../java/org/apache/mina/http/api/HttpRequest.java | 2 +-
mina-integration-beans/pom.xml | 2 +-
.../apache/mina/integration/beans/NullEditor.java | 2 +-
mina-integration-jmx/pom.xml | 2 +-
.../apache/mina/integration/jmx/package-info.java | 82 ++++++++++++++++++
.../org/apache/mina/integration/jmx/package.html | 88 --------------------
mina-integration-ognl/pom.xml | 2 +-
.../mina/integration/ognl/IoSessionFinder.java | 6 +-
.../integration/ognl/PropertyTypeConverter.java | 6 +-
mina-integration-xbean/pom.xml | 2 +-
mina-legal/pom.xml | 2 +-
mina-statemachine/pom.xml | 2 +-
.../statemachine/StateMachineProxyBuilder.java | 4 +-
.../context/AbstractStateContextLookup.java | 10 +--
.../transition/AbstractSelfTransition.java | 4 +-
.../transition/AbstractTransition.java | 4 +-
.../statemachine/transition/SelfTransition.java | 4 +-
.../mina/statemachine/transition/Transition.java | 8 +-
mina-transport-apr/pom.xml | 2 +-
.../mina/transport/socket/apr/AprIoProcessor.java | 6 +-
mina-transport-serial/pom.xml | 2 +-
.../mina/transport/serial/SerialAddressEditor.java | 2 +-
pom.xml | 4 +-
144 files changed, 640 insertions(+), 1049 deletions(-)