From 8663716d38040537f6660cf2b81ee74549e0ab6d Mon Sep 17 00:00:00 2001 From: Trustin Lee Date: Wed, 28 Dec 2011 19:44:04 +0900 Subject: [PATCH] Issue #60: Make the project multi-module Split the project into the following modules: * common * buffer * codec * codec-http * transport * transport-* * handler * example * testsuite (integration tests that involve 2+ modules) * all (does nothing yet, but will make it generate netty.jar) This commit also fixes the compilation errors with transport-sctp on non-Linux systems. It will at least compile without complaints. --- .gitignore | 20 +- all/pom.xml | 32 + buffer/pom.xml | 40 ++ .../netty/buffer/AbstractChannelBuffer.java | 0 .../buffer/AbstractChannelBufferFactory.java | 0 .../buffer/BigEndianHeapChannelBuffer.java | 0 .../buffer/ByteBufferBackedChannelBuffer.java | 0 .../java/io/netty/buffer/ChannelBuffer.java | 0 .../io/netty/buffer/ChannelBufferFactory.java | 0 .../buffer/ChannelBufferIndexFinder.java | 0 .../buffer/ChannelBufferInputStream.java | 0 .../buffer/ChannelBufferOutputStream.java | 0 .../java/io/netty/buffer/ChannelBuffers.java | 0 .../netty/buffer/CompositeChannelBuffer.java | 0 .../buffer/DirectChannelBufferFactory.java | 0 .../netty/buffer/DuplicatedChannelBuffer.java | 0 .../io/netty/buffer/DynamicChannelBuffer.java | 0 .../io/netty/buffer/HeapChannelBuffer.java | 0 .../buffer/HeapChannelBufferFactory.java | 0 .../buffer/LittleEndianHeapChannelBuffer.java | 0 .../netty/buffer/ReadOnlyChannelBuffer.java | 0 .../io/netty/buffer/SlicedChannelBuffer.java | 0 .../netty/buffer/TruncatedChannelBuffer.java | 0 .../io/netty/buffer/WrappedChannelBuffer.java | 0 .../java/io/netty/buffer/package-info.java | 0 .../buffer/AbstractChannelBufferTest.java | 0 .../AbstractCompositeChannelBufferTest.java | 0 .../BigEndianCompositeChannelBufferTest.java | 0 .../BigEndianDirectChannelBufferTest.java | 0 .../BigEndianHeapChannelBufferTest.java | 0 ...ByteBufferBackedHeapChannelBufferTest.java | 0 .../buffer/ChannelBufferIndexFinderTest.java | 0 .../netty/buffer/ChannelBufferStreamTest.java | 0 .../io/netty/buffer/ChannelBuffersTest.java | 0 .../buffer/DuplicateChannelBufferTest.java | 0 .../buffer/DynamicChannelBufferTest.java | 0 ...ittleEndianCompositeChannelBufferTest.java | 0 .../LittleEndianDirectChannelBufferTest.java | 0 .../LittleEndianHeapChannelBufferTest.java | 0 .../buffer/ReadOnlyChannelBufferTest.java | 0 .../netty/buffer/SlicedChannelBufferTest.java | 0 .../buffer/TruncatedChannelBufferTest.java | 0 codec-http/pom.xml | 45 ++ .../codec/http/AbstractDiskHttpData.java | 0 .../handler/codec/http/AbstractHttpData.java | 0 .../codec/http/AbstractMemoryHttpData.java | 0 .../netty/handler/codec/http/Attribute.java | 0 .../codec/http/CaseIgnoringComparator.java | 0 .../io/netty/handler/codec/http/Cookie.java | 0 .../handler/codec/http/CookieDecoder.java | 0 .../handler/codec/http/CookieEncoder.java | 0 .../handler/codec/http/CookieHeaderNames.java | 0 .../handler/codec/http/DefaultCookie.java | 0 .../handler/codec/http/DefaultHttpChunk.java | 0 .../codec/http/DefaultHttpChunkTrailer.java | 0 .../codec/http/DefaultHttpDataFactory.java | 0 .../codec/http/DefaultHttpMessage.java | 0 .../codec/http/DefaultHttpRequest.java | 0 .../codec/http/DefaultHttpResponse.java | 0 .../handler/codec/http/DiskAttribute.java | 0 .../handler/codec/http/DiskFileUpload.java | 0 .../netty/handler/codec/http/FileUpload.java | 0 .../netty/handler/codec/http/HttpChunk.java | 0 .../codec/http/HttpChunkAggregator.java | 0 .../handler/codec/http/HttpChunkTrailer.java | 0 .../handler/codec/http/HttpClientCodec.java | 0 .../handler/codec/http/HttpCodecUtil.java | 0 .../codec/http/HttpContentCompressor.java | 0 .../codec/http/HttpContentDecoder.java | 0 .../codec/http/HttpContentDecompressor.java | 0 .../codec/http/HttpContentEncoder.java | 0 .../io/netty/handler/codec/http/HttpData.java | 0 .../handler/codec/http/HttpDataFactory.java | 0 .../codec/http/HttpHeaderDateFormat.java | 0 .../netty/handler/codec/http/HttpHeaders.java | 0 .../netty/handler/codec/http/HttpMessage.java | 0 .../codec/http/HttpMessageDecoder.java | 0 .../codec/http/HttpMessageEncoder.java | 0 .../netty/handler/codec/http/HttpMethod.java | 0 .../handler/codec/http/HttpPostBodyUtil.java | 0 .../codec/http/HttpPostRequestDecoder.java | 0 .../codec/http/HttpPostRequestEncoder.java | 0 .../netty/handler/codec/http/HttpRequest.java | 0 .../codec/http/HttpRequestDecoder.java | 0 .../codec/http/HttpRequestEncoder.java | 0 .../handler/codec/http/HttpResponse.java | 0 .../codec/http/HttpResponseDecoder.java | 0 .../codec/http/HttpResponseEncoder.java | 0 .../codec/http/HttpResponseStatus.java | 0 .../handler/codec/http/HttpServerCodec.java | 0 .../netty/handler/codec/http/HttpVersion.java | 0 .../handler/codec/http/InterfaceHttpData.java | 0 .../handler/codec/http/InternalAttribute.java | 0 .../handler/codec/http/MemoryAttribute.java | 0 .../handler/codec/http/MemoryFileUpload.java | 0 .../handler/codec/http/MixedAttribute.java | 0 .../handler/codec/http/MixedFileUpload.java | 0 .../codec/http/QueryStringDecoder.java | 0 .../codec/http/QueryStringEncoder.java | 0 .../handler/codec/http/package-info.java | 0 .../http/websocketx/BinaryWebSocketFrame.java | 0 .../http/websocketx/CloseWebSocketFrame.java | 0 .../ContinuationWebSocketFrame.java | 0 .../http/websocketx/PingWebSocketFrame.java | 0 .../http/websocketx/PongWebSocketFrame.java | 0 .../http/websocketx/TextWebSocketFrame.java | 0 .../codec/http/websocketx/UTF8Exception.java | 0 .../codec/http/websocketx/UTF8Output.java | 0 .../websocketx/WebSocket00FrameDecoder.java | 0 .../websocketx/WebSocket00FrameEncoder.java | 0 .../websocketx/WebSocket08FrameDecoder.java | 0 .../websocketx/WebSocket08FrameEncoder.java | 0 .../websocketx/WebSocket13FrameDecoder.java | 0 .../websocketx/WebSocket13FrameEncoder.java | 0 .../websocketx/WebSocketClientHandshaker.java | 0 .../WebSocketClientHandshaker00.java | 0 .../WebSocketClientHandshaker08.java | 0 .../WebSocketClientHandshaker13.java | 0 .../WebSocketClientHandshakerFactory.java | 0 .../codec/http/websocketx/WebSocketFrame.java | 0 .../http/websocketx/WebSocketFrameType.java | 0 .../WebSocketHandshakeException.java | 0 .../websocketx/WebSocketServerHandshaker.java | 0 .../WebSocketServerHandshaker00.java | 0 .../WebSocketServerHandshaker08.java | 0 .../WebSocketServerHandshaker13.java | 0 .../WebSocketServerHandshakerFactory.java | 0 .../http/websocketx/WebSocketVersion.java | 0 .../codec/http/websocketx/package-info.java | 0 .../netty/handler/codec/rtsp/RtspHeaders.java | 0 .../codec/rtsp/RtspMessageDecoder.java | 0 .../codec/rtsp/RtspMessageEncoder.java | 0 .../netty/handler/codec/rtsp/RtspMethods.java | 0 .../codec/rtsp/RtspRequestDecoder.java | 0 .../codec/rtsp/RtspRequestEncoder.java | 0 .../codec/rtsp/RtspResponseDecoder.java | 0 .../codec/rtsp/RtspResponseEncoder.java | 0 .../codec/rtsp/RtspResponseStatuses.java | 0 .../handler/codec/rtsp/RtspVersions.java | 0 .../handler/codec/rtsp/package-info.java | 0 .../handler/codec/http/CookieDecoderTest.java | 0 .../handler/codec/http/CookieEncoderTest.java | 0 .../codec/http/DefaultHttpMessageTest.java | 0 .../codec/http/HttpHeaderDateFormatTest.java | 0 .../codec/http/QueryStringDecoderTest.java | 0 .../WebSocketServerHandshaker00Test.java | 0 .../WebSocketServerHandshaker08Test.java | 0 .../WebSocketServerHandshaker13Test.java | 0 codec/pom.xml | 45 ++ .../io/netty/handler/codec/base64/Base64.java | 0 .../handler/codec/base64/Base64Decoder.java | 0 .../handler/codec/base64/Base64Dialect.java | 0 .../handler/codec/base64/Base64Encoder.java | 0 .../handler/codec/base64/package-info.java | 0 .../handler/codec/bytes/ByteArrayDecoder.java | 0 .../handler/codec/bytes/ByteArrayEncoder.java | 0 .../handler/codec/bytes/package-info.java | 0 .../compression/CompressionException.java | 0 .../codec/compression/ZlibDecoder.java | 0 .../codec/compression/ZlibEncoder.java | 0 .../handler/codec/compression/ZlibUtil.java | 0 .../codec/compression/ZlibWrapper.java | 0 .../codec/compression/package-info.java | 0 .../codec/embedder/AbstractCodecEmbedder.java | 0 .../handler/codec/embedder/CodecEmbedder.java | 0 .../embedder/CodecEmbedderException.java | 0 .../codec/embedder/DecoderEmbedder.java | 0 .../codec/embedder/EmbeddedChannel.java | 0 .../embedder/EmbeddedChannelFactory.java | 0 .../codec/embedder/EmbeddedSocketAddress.java | 0 .../codec/embedder/EncoderEmbedder.java | 0 .../handler/codec/embedder/package-info.java | 0 .../codec/frame/CorruptedFrameException.java | 0 .../frame/DelimiterBasedFrameDecoder.java | 0 .../netty/handler/codec/frame/Delimiters.java | 0 .../codec/frame/FixedLengthFrameDecoder.java | 0 .../handler/codec/frame/FrameDecoder.java | 0 .../frame/LengthFieldBasedFrameDecoder.java | 0 .../codec/frame/LengthFieldPrepender.java | 0 .../codec/frame/TooLongFrameException.java | 0 .../handler/codec/frame/package-info.java | 0 .../handler/codec/oneone/OneToOneDecoder.java | 0 .../handler/codec/oneone/OneToOneEncoder.java | 0 .../handler/codec/oneone/package-info.java | 0 .../codec/protobuf/ProtobufDecoder.java | 0 .../codec/protobuf/ProtobufEncoder.java | 0 .../ProtobufVarint32FrameDecoder.java | 0 .../ProtobufVarint32LengthFieldPrepender.java | 0 .../handler/codec/protobuf/package-info.java | 0 .../handler/codec/replay/ReplayError.java | 0 .../codec/replay/ReplayingDecoder.java | 0 .../codec/replay/ReplayingDecoderBuffer.java | 0 .../UnreplayableOperationException.java | 0 .../replay/UnsafeDynamicChannelBuffer.java | 0 .../netty/handler/codec/replay/VoidEnum.java | 0 .../handler/codec/replay/package-info.java | 0 .../serialization/CachingClassResolver.java | 0 .../ClassLoaderClassResolver.java | 0 .../codec/serialization/ClassResolver.java | 0 .../codec/serialization/ClassResolvers.java | 0 .../CompactObjectInputStream.java | 0 .../CompactObjectOutputStream.java | 0 .../CompatibleObjectDecoder.java | 0 .../CompatibleObjectDecoderState.java | 0 .../CompatibleObjectEncoder.java | 0 .../codec/serialization/ObjectDecoder.java | 0 .../ObjectDecoderInputStream.java | 0 .../codec/serialization/ObjectEncoder.java | 0 .../ObjectEncoderOutputStream.java | 0 .../codec/serialization/ReferenceMap.java | 0 .../codec/serialization/SoftReferenceMap.java | 0 .../serialization/SwitchableInputStream.java | 0 .../codec/serialization/WeakReferenceMap.java | 0 .../codec/serialization/package-info.java | 0 .../handler/codec/string/StringDecoder.java | 0 .../handler/codec/string/StringEncoder.java | 0 .../handler/codec/string/package-info.java | 0 .../codec/bytes/ByteArrayDecoderTest.java | 0 .../codec/bytes/ByteArrayEncoderTest.java | 0 .../frame/DelimiterBasedFrameDecoderTest.java | 0 .../LengthFieldBasedFrameDecoderTest.java | 0 .../ProtobufVarint32FrameDecoderTest.java | 0 ...tobufVarint32LengthFieldPrependerTest.java | 0 .../codec/replay/ReplayingDecoderTest.java | 0 .../CompactObjectSerializationTest.java | 0 .../SwitchableInputStreamTest.java | 0 common/pom.xml | 77 +++ .../netty/logging/AbstractInternalLogger.java | 0 .../java/io/netty/logging/CommonsLogger.java | 0 .../netty/logging/CommonsLoggerFactory.java | 0 .../io/netty/logging/InternalLogLevel.java | 0 .../java/io/netty/logging/InternalLogger.java | 0 .../netty/logging/InternalLoggerFactory.java | 14 - .../java/io/netty/logging/JBossLogger.java | 0 .../io/netty/logging/JBossLoggerFactory.java | 0 .../main/java/io/netty/logging/JdkLogger.java | 0 .../io/netty/logging/JdkLoggerFactory.java | 0 .../java/io/netty/logging/Log4JLogger.java | 0 .../io/netty/logging/Log4JLoggerFactory.java | 0 .../java/io/netty/logging/OsgiLogger.java | 0 .../io/netty/logging/OsgiLoggerFactory.java | 0 .../java/io/netty/logging/Slf4JLogger.java | 0 .../io/netty/logging/Slf4JLoggerFactory.java | 0 .../java/io/netty/logging/package-info.java | 0 .../main/java/io/netty/util/CharsetUtil.java | 0 .../netty/util/EstimatableObjectWrapper.java | 0 .../util/ExternalResourceReleasable.java | 0 .../io/netty/util/ExternalResourceUtil.java | 0 .../java/io/netty/util/HashedWheelTimer.java | 5 +- .../main/java/io/netty/util/MapBackedSet.java | 0 .../java/io/netty/util/SocketAddresses.java | 20 +- .../src}/main/java/io/netty/util/Timeout.java | 0 .../src}/main/java/io/netty/util/Timer.java | 0 .../main/java/io/netty/util/TimerTask.java | 0 .../java/io/netty/util/UnsafeDetectUtil.java | 0 .../util/internal/AtomicFieldUpdaterUtil.java | 0 .../util/internal/ConcurrentHashMap.java | 0 .../internal/ConcurrentIdentityHashMap.java | 0 .../ConcurrentIdentityWeakKeyHashMap.java | 0 .../internal/ConcurrentWeakKeyHashMap.java | 0 .../netty/util/internal/ConversionUtil.java | 0 .../util/internal/DeadLockProofWorker.java | 0 .../io/netty/util/internal/ExecutorUtil.java | 0 .../internal/LegacyLinkedTransferQueue.java | 0 .../util/internal/LinkedTransferQueue.java | 0 .../netty/util/internal/NonReentrantLock.java | 0 .../io/netty/util/internal/QueueFactory.java | 0 .../netty/util/internal/ReusableIterator.java | 0 .../SharedResourceMisuseDetector.java | 0 .../io/netty/util/internal/StringUtil.java | 0 .../util/internal/SystemPropertyUtil.java | 0 .../util/internal/ThreadLocalBoolean.java | 0 .../util/internal/ThreadLocalRandom.java | 0 .../util/internal/UnterminatableExecutor.java | 0 .../io/netty/util/internal/jzlib/Adler32.java | 0 .../io/netty/util/internal/jzlib/CRC32.java | 0 .../io/netty/util/internal/jzlib/Deflate.java | 0 .../netty/util/internal/jzlib/InfBlocks.java | 0 .../netty/util/internal/jzlib/InfCodes.java | 0 .../io/netty/util/internal/jzlib/InfTree.java | 0 .../io/netty/util/internal/jzlib/Inflate.java | 0 .../io/netty/util/internal/jzlib/JZlib.java | 0 .../netty/util/internal/jzlib/StaticTree.java | 0 .../io/netty/util/internal/jzlib/Tree.java | 0 .../io/netty/util/internal/jzlib/ZStream.java | 0 .../io/netty/util/internal/package-info.java | 0 .../main/java/io/netty/util/package-info.java | 0 .../logging/CommonsLoggerFactoryTest.java | 0 .../io/netty/logging/CommonsLoggerTest.java | 0 .../logging/InternalLoggerFactoryTest.java | 0 .../netty/logging/JBossLoggerFactoryTest.java | 0 .../io/netty/logging/JBossLoggerTest.java | 0 .../netty/logging/JdkLoggerFactoryTest.java | 0 .../java/io/netty/logging/JdkLoggerTest.java | 0 .../netty/logging/Log4JLoggerFactoryTest.java | 0 .../io/netty/logging/Log4JLoggerTest.java | 0 .../netty/logging/Slf4JLoggerFactoryTest.java | 0 .../io/netty/logging/Slf4JLoggerTest.java | 0 .../java/io/netty/util/MapBackedSetTest.java | 0 .../util/internal/ConversionUtilTest.java | 0 .../netty/util/internal/StringUtilTest.java | 0 example/pom.xml | 55 ++ .../netty/example/discard/DiscardClient.java | 0 .../example/discard/DiscardClientHandler.java | 0 .../netty/example/discard/DiscardServer.java | 0 .../example/discard/DiscardServerHandler.java | 0 .../io/netty/example/echo/EchoClient.java | 0 .../netty/example/echo/EchoClientHandler.java | 0 .../io/netty/example/echo/EchoServer.java | 0 .../netty/example/echo/EchoServerHandler.java | 0 .../example/factorial/BigIntegerDecoder.java | 0 .../example/factorial/FactorialClient.java | 0 .../factorial/FactorialClientHandler.java | 0 .../FactorialClientPipelineFactory.java | 0 .../example/factorial/FactorialServer.java | 0 .../factorial/FactorialServerHandler.java | 0 .../FactorialServerPipelineFactory.java | 0 .../example/factorial/NumberEncoder.java | 0 .../http/file/HttpStaticFileServer.java | 0 .../file/HttpStaticFileServerHandler.java | 0 .../HttpStaticFileServerPipelineFactory.java | 0 .../netty/example/http/snoop/HttpClient.java | 0 .../http/snoop/HttpClientPipelineFactory.java | 0 .../http/snoop/HttpRequestHandler.java | 0 .../http/snoop/HttpResponseHandler.java | 0 .../netty/example/http/snoop/HttpServer.java | 0 .../http/snoop/HttpServerPipelineFactory.java | 0 .../netty/example/http/upload/HttpClient.java | 0 .../upload/HttpClientPipelineFactory.java | 0 .../http/upload/HttpRequestHandler.java | 0 .../http/upload/HttpResponseHandler.java | 0 .../netty/example/http/upload/HttpServer.java | 0 .../upload/HttpServerPipelineFactory.java | 0 .../websocketx/autobahn/WebSocketServer.java | 0 .../autobahn/WebSocketServerHandler.java | 0 .../WebSocketServerPipelineFactory.java | 0 .../websocketx/autobahn/package-info.java | 0 .../example/http/websocketx/client/App.java | 0 .../websocketx/client/WebSocketCallback.java | 0 .../websocketx/client/WebSocketClient.java | 0 .../client/WebSocketClientFactory.java | 0 .../client/WebSocketClientHandler.java | 0 .../websocketx/client/WebSocketException.java | 0 .../client/WebSocketHttpResponseDecoder.java | 0 .../http/websocketx/client/package-info.java | 0 .../websocketx/server/WebSocketServer.java | 0 .../server/WebSocketServerHandler.java | 0 .../server/WebSocketServerIndexPage.java | 0 .../WebSocketServerPipelineFactory.java | 0 .../http/websocketx/server/package-info.java | 0 .../sslserver/WebSocketSslServer.java | 0 .../sslserver/WebSocketSslServerHandler.java | 0 .../WebSocketSslServerIndexPage.java | 0 .../WebSocketSslServerPipelineFactory.java | 0 .../WebSocketSslServerSslContext.java | 0 .../websocketx/sslserver/package-info.java | 0 .../io/netty/example/iostream/IOStream.java | 0 .../io/netty/example/local/LocalExample.java | 0 .../local/LocalExampleMultthreaded.java | 0 .../local/LocalServerPipelineFactory.java | 0 .../example/localtime/LocalTimeClient.java | 0 .../localtime/LocalTimeClientHandler.java | 0 .../LocalTimeClientPipelineFactory.java | 0 .../example/localtime/LocalTimeProtocol.java | 0 .../example/localtime/LocalTimeProtocol.proto | 0 .../example/localtime/LocalTimeServer.java | 0 .../localtime/LocalTimeServerHandler.java | 0 .../LocalTimeServerPipelineFactory.java | 0 .../example/objectecho/ObjectEchoClient.java | 0 .../objectecho/ObjectEchoClientHandler.java | 0 .../example/objectecho/ObjectEchoServer.java | 0 .../objectecho/ObjectEchoServerHandler.java | 0 .../PortUnificationServer.java | 0 .../PortUnificationServerHandler.java | 0 .../io/netty/example/proxy/HexDumpProxy.java | 0 .../proxy/HexDumpProxyInboundHandler.java | 0 .../proxy/HexDumpProxyPipelineFactory.java | 0 .../example/qotm/QuoteOfTheMomentClient.java | 0 .../qotm/QuoteOfTheMomentClientHandler.java | 0 .../example/qotm/QuoteOfTheMomentServer.java | 0 .../qotm/QuoteOfTheMomentServerHandler.java | 0 .../io/netty/example/sctp/SctpClient.java | 2 +- .../netty/example/sctp/SctpClientHandler.java | 2 +- .../io/netty/example/sctp/SctpServer.java | 2 +- .../netty/example/sctp/SctpServerHandler.java | 0 .../example/securechat/SecureChatClient.java | 0 .../securechat/SecureChatClientHandler.java | 0 .../SecureChatClientPipelineFactory.java | 0 .../securechat/SecureChatKeyStore.java | 0 .../example/securechat/SecureChatServer.java | 0 .../securechat/SecureChatServerHandler.java | 0 .../SecureChatServerPipelineFactory.java | 0 .../SecureChatSslContextFactory.java | 0 .../SecureChatTrustManagerFactory.java | 0 .../io/netty/example/telnet/TelnetClient.java | 0 .../example/telnet/TelnetClientHandler.java | 0 .../telnet/TelnetClientPipelineFactory.java | 0 .../io/netty/example/telnet/TelnetServer.java | 0 .../example/telnet/TelnetServerHandler.java | 0 .../telnet/TelnetServerPipelineFactory.java | 0 .../io/netty/example/uptime/UptimeClient.java | 0 .../example/uptime/UptimeClientHandler.java | 0 handler/pom.xml | 55 ++ .../handler/execution/ChainedExecutor.java | 0 .../ChannelDownstreamEventRunnable.java | 0 .../execution/ChannelEventRunnable.java | 0 .../ChannelUpstreamEventRunnable.java | 0 .../DefaultObjectSizeEstimator.java | 2 +- .../execution/EstimatableObjectWrapper.java | 20 +- .../handler/execution/ExecutionHandler.java | 0 .../MemoryAwareThreadPoolExecutor.java | 2 - .../execution}/ObjectSizeEstimator.java | 2 +- .../OrderedMemoryAwareThreadPoolExecutor.java | 1 - .../ChannelDownstreamEventRunnableFilter.java | 0 .../filter/ChannelEventRunnableFilter.java | 0 .../ChannelUpstreamEventRunnableFilter.java | 0 .../netty/handler/execution/package-info.java | 0 .../java/io/netty/handler/ipfilter/CIDR.java | 0 .../java/io/netty/handler/ipfilter/CIDR4.java | 0 .../java/io/netty/handler/ipfilter/CIDR6.java | 0 .../handler/ipfilter/IpFilterListener.java | 0 .../netty/handler/ipfilter/IpFilterRule.java | 0 .../handler/ipfilter/IpFilterRuleHandler.java | 0 .../handler/ipfilter/IpFilterRuleList.java | 0 .../handler/ipfilter/IpFilteringHandler.java | 0 .../ipfilter/IpFilteringHandlerImpl.java | 0 .../java/io/netty/handler/ipfilter/IpSet.java | 0 .../io/netty/handler/ipfilter/IpSubnet.java | 0 .../handler/ipfilter/IpSubnetFilterRule.java | 0 .../io/netty/handler/ipfilter/IpV4Subnet.java | 0 .../ipfilter/IpV4SubnetFilterRule.java | 0 .../handler/ipfilter/OneIpFilterHandler.java | 0 .../netty/handler/ipfilter/PatternRule.java | 0 .../netty/handler/ipfilter/package-info.java | 0 .../netty/handler/logging/LoggingHandler.java | 0 .../netty/handler/logging/package-info.java | 0 .../handler/queue/BlockingReadHandler.java | 0 .../queue/BlockingReadTimeoutException.java | 0 .../handler/queue/BufferedWriteHandler.java | 0 .../io/netty/handler/queue/package-info.java | 0 .../region/ChannelWritableByteChannel.java | 0 .../handler/region/FileRegionEncoder.java | 0 .../netty/handler/ssl/ImmediateExecutor.java | 0 .../io/netty/handler/ssl/SslBufferPool.java | 0 .../java/io/netty/handler/ssl/SslHandler.java | 0 .../io/netty/handler/ssl/package-info.java | 0 .../io/netty/handler/stream/ChunkedFile.java | 0 .../io/netty/handler/stream/ChunkedInput.java | 0 .../netty/handler/stream/ChunkedNioFile.java | 0 .../handler/stream/ChunkedNioStream.java | 0 .../netty/handler/stream/ChunkedStream.java | 0 .../handler/stream/ChunkedWriteHandler.java | 0 .../io/netty/handler/stream/package-info.java | 0 .../timeout/DefaultIdleStateEvent.java | 0 .../io/netty/handler/timeout/IdleState.java | 0 .../timeout/IdleStateAwareChannelHandler.java | 0 .../IdleStateAwareChannelUpstreamHandler.java | 0 .../netty/handler/timeout/IdleStateEvent.java | 0 .../handler/timeout/IdleStateHandler.java | 0 .../handler/timeout/ReadTimeoutException.java | 0 .../handler/timeout/ReadTimeoutHandler.java | 0 .../handler/timeout/TimeoutException.java | 0 .../timeout/WriteTimeoutException.java | 0 .../handler/timeout/WriteTimeoutHandler.java | 0 .../netty/handler/timeout/package-info.java | 0 .../AbstractTrafficShapingHandler.java | 147 +--- .../traffic/ChannelTrafficShapingHandler.java | 62 -- .../traffic/GlobalTrafficShapingHandler.java | 67 -- .../netty/handler/traffic/TrafficCounter.java | 0 .../netty/handler/traffic/package-info.java | 0 .../handler/ipfilter/IpFilterRuleTest.java | 0 .../handler/ssl/ImmediateExecutorTest.java | 0 pom.xml | 558 +++------------ src/assembly/default.xml | 73 -- src/javadoc/overview.html | 24 - .../container/osgi/NettyBundleActivator.java | 45 -- src/main/java/io/netty/util/DebugUtil.java | 61 -- .../io/netty/util/NamedThreadFactory.java | 91 --- .../io/netty/util/VirtualExecutorService.java | 195 ------ .../util/internal/StackTraceSimplifier.java | 81 --- src/site/template.vm | 26 - .../socket/nio/NioDatagramChannelTest.java | 119 ---- .../channel/socket/nio/SimpleHandler.java | 43 -- .../ssl/AbstractSocketSslEchoTest.java | 238 ------- .../java/io/netty/util/DebugUtilTest.java | 78 --- .../internal/StackTraceSimplifierTest.java | 119 ---- testsuite/pom.xml | 44 ++ .../AbstractSocketClientBootstrapTest.java | 36 +- ...tSocketCompatibleObjectStreamEchoTest.java | 8 +- .../socket/AbstractSocketEchoTest.java | 6 +- .../AbstractSocketFixedLengthEchoTest.java | 7 +- .../AbstractSocketObjectStreamEchoTest.java | 8 +- .../AbstractSocketServerBootstrapTest.java | 27 +- .../socket/AbstractSocketSslEchoTest.java | 652 ++++++++++++++++++ .../socket}/AbstractSocketStringEchoTest.java | 8 +- ...oSocketCompatibleObjectStreamEchoTest.java | 2 +- .../NioNioSocketFixedLengthEchoTest.java | 2 +- .../NioNioSocketObjectStreamEchoTest.java | 2 +- .../socket}/NioNioSocketStringEchoTest.java | 2 +- ...oSocketCompatibleObjectStreamEchoTest.java | 2 +- .../NioOioSocketFixedLengthEchoTest.java | 2 +- .../NioOioSocketObjectStreamEchoTest.java | 2 +- .../socket}/NioOioSocketStringEchoTest.java | 2 +- ...oSocketCompatibleObjectStreamEchoTest.java | 2 +- .../OioNioSocketFixedLengthEchoTest.java | 2 +- .../OioNioSocketObjectStreamEchoTest.java | 2 +- .../socket}/OioNioSocketStringEchoTest.java | 2 +- ...oSocketCompatibleObjectStreamEchoTest.java | 2 +- .../OioOioSocketFixedLengthEchoTest.java | 2 +- .../OioOioSocketObjectStreamEchoTest.java | 2 +- .../socket}/OioOioSocketStringEchoTest.java | 2 +- .../nio}/NioClientSocketShutdownTimeTest.java | 12 +- .../nio}/NioServerSocketShutdownTimeTest.java | 6 +- .../nio}/NioSocketClientBootstrapTest.java | 3 +- .../nio}/NioSocketServerBootstrapTest.java | 3 +- .../transport}/socket/nio/UdpClient.java | 5 +- .../socket/nio/nio}/NioNioSocketEchoTest.java | 3 +- .../nio/nio}/NioNioSocketSslEchoTest.java | 3 +- .../socket/nio/oio}/NioOioSocketEchoTest.java | 3 +- .../nio/oio}/NioOioSocketSslEchoTest.java | 3 +- .../oio}/OioSocketClientBootstrapTest.java | 3 +- .../oio}/OioSocketServerBootstrapTest.java | 3 +- .../socket/oio/nio}/OioNioSocketEchoTest.java | 3 +- .../oio/nio}/OioNioSocketSslEchoTest.java | 3 +- .../socket/oio/oio}/OioOioSocketEchoTest.java | 3 +- .../oio/oio}/OioOioSocketSslEchoTest.java | 3 +- .../netty/testsuite}/util/DummyHandler.java | 7 +- transport-http/pom.xml | 40 ++ .../AcceptedServerChannelPipelineFactory.java | 0 .../AcceptedServerChannelRequestDispatch.java | 0 .../socket/http/DefaultTunnelIdGenerator.java | 0 .../http/HttpTunnelAcceptedChannel.java | 0 .../http/HttpTunnelAcceptedChannelConfig.java | 0 .../HttpTunnelAcceptedChannelFactory.java | 0 .../HttpTunnelAcceptedChannelReceiver.java | 0 .../http/HttpTunnelAcceptedChannelSink.java | 0 .../socket/http/HttpTunnelChannelConfig.java | 0 .../socket/http/HttpTunnelClientChannel.java | 0 .../http/HttpTunnelClientChannelConfig.java | 0 .../http/HttpTunnelClientChannelFactory.java | 0 .../http/HttpTunnelClientChannelSink.java | 0 .../http/HttpTunnelClientPollHandler.java | 0 .../http/HttpTunnelClientSendHandler.java | 0 .../http/HttpTunnelClientWorkerOwner.java | 0 .../socket/http/HttpTunnelMessageUtils.java | 0 .../socket/http/HttpTunnelServerChannel.java | 0 .../http/HttpTunnelServerChannelConfig.java | 0 .../http/HttpTunnelServerChannelFactory.java | 0 .../http/HttpTunnelServerChannelSink.java | 0 .../socket/http/SaturationManager.java | 0 .../socket/http/SaturationStateChange.java | 0 .../socket/http/ServerMessageSwitch.java | 0 ...erverMessageSwitchDownstreamInterface.java | 0 .../ServerMessageSwitchUpstreamInterface.java | 0 .../socket/http/TunnelIdGenerator.java | 0 .../TunnelWrappedServerChannelHandler.java | 0 .../channel/socket/http/WriteFragmenter.java | 0 .../channel/socket/http/WriteSplitter.java | 0 .../channel/socket/http/package-info.java | 0 ...eptedServerChannelRequestDispatchTest.java | 0 .../socket/http/FakeChannelConfig.java | 0 .../channel/socket/http/FakeChannelSink.java | 0 .../http/FakeClientSocketChannelFactory.java | 0 .../socket/http/FakeServerSocketChannel.java | 0 .../http/FakeServerSocketChannelConfig.java | 0 .../http/FakeServerSocketChannelFactory.java | 0 .../socket/http/FakeSocketChannel.java | 0 .../HttpTunnelAcceptedChannelSinkTest.java | 0 .../HttpTunnelClientChannelConfigTest.java | 0 .../http/HttpTunnelClientChannelTest.java | 0 .../http/HttpTunnelClientPollHandlerTest.java | 0 .../http/HttpTunnelClientSendHandlerTest.java | 0 .../HttpTunnelServerChannelFactoryTest.java | 0 .../http/HttpTunnelServerChannelSinkTest.java | 0 .../http/HttpTunnelServerChannelTest.java | 0 .../socket/http/HttpTunnelSoakTester.java | 0 .../channel/socket/http/HttpTunnelTest.java | 0 .../socket/http/MockChannelStateListener.java | 0 .../channel/socket/http/NettyTestUtils.java | 0 .../socket/http/NettyTestUtilsTest.java | 0 .../socket/http/NullChannelHandler.java | 0 .../socket/http/SaturationManagerTest.java | 0 .../socket/http/ServerMessageSwitchTest.java | 0 .../socket/http/UpstreamEventCatcher.java | 0 .../socket/http/WriteFragmenterTest.java | 0 .../socket/http/WriteSplitterTest.java | 0 transport-rxtx/pom.xml | 44 ++ .../io/netty/channel/rxtx/RXTXChannel.java | 0 .../netty/channel/rxtx/RXTXChannelConfig.java | 0 .../channel/rxtx/RXTXChannelFactory.java | 0 .../netty/channel/rxtx/RXTXChannelSink.java | 0 .../netty/channel/rxtx/RXTXDeviceAddress.java | 0 transport-sctp/pom.xml | 39 ++ .../nio/sctp/AbstractNotificationHandler.java | 42 ++ .../java/com/sun/nio/sctp/Association.java | 12 +- .../sctp/AssociationChangeNotification.java | 22 + .../java/com/sun/nio/sctp/HandlerResult.java | 25 + .../java/com/sun/nio/sctp/MessageInfo.java | 36 + .../java/com/sun/nio/sctp/Notification.java | 10 +- .../com/sun/nio/sctp/NotificationHandler.java | 9 +- .../sctp/PeerAddressChangeNotification.java | 22 + .../java/com/sun/nio/sctp/SctpChannel.java | 50 ++ .../com/sun/nio/sctp/SctpServerChannel.java | 45 ++ .../com/sun/nio/sctp/SctpSocketOption.java | 21 + .../nio/sctp/SctpStandardSocketOptions.java | 38 + .../sun/nio/sctp/SendFailedNotification.java | 22 + .../sun/nio/sctp/ShutdownNotification.java | 22 + .../UnsupportedOperatingSystemException.java | 28 +- .../sctp/AbstractWriteRequestQueue.java | 149 ++++ .../sctp/DefaultNioSctpChannelConfig.java | 2 +- .../sctp/DefaultSctpChannelConfig.java | 2 +- .../sctp/DefaultSctpServerChannelConfig.java | 2 +- .../channel}/sctp/NioSctpChannelConfig.java | 6 +- .../channel}/sctp/SctpAcceptedChannel.java | 2 +- .../io/netty/channel}/sctp/SctpChannel.java | 2 +- .../channel}/sctp/SctpChannelConfig.java | 6 +- .../netty/channel}/sctp/SctpChannelImpl.java | 11 +- .../channel}/sctp/SctpClientChannel.java | 2 +- .../channel}/sctp/SctpClientPipelineSink.java | 6 +- .../sctp/SctpClientSocketChannelFactory.java | 2 +- .../channel}/sctp/SctpNotificationEvent.java | 2 +- .../sctp/SctpNotificationHandler.java | 2 +- .../io/netty/channel}/sctp/SctpPayload.java | 2 +- .../channel}/sctp/SctpProviderMetadata.java | 4 +- .../channel}/sctp/SctpReceiveBufferPool.java | 2 +- .../channel}/sctp/SctpSendBufferPool.java | 2 +- .../channel}/sctp/SctpServerChannel.java | 2 +- .../sctp/SctpServerChannelConfig.java | 2 +- .../channel}/sctp/SctpServerChannelImpl.java | 2 +- .../channel}/sctp/SctpServerPipelineSink.java | 2 +- .../sctp/SctpServerSocketChannelFactory.java | 2 +- .../io/netty/channel}/sctp/SctpWorker.java | 10 +- .../io/netty/channel}/sctp/SelectorUtil.java | 2 +- .../io/netty/channel}/sctp/package-info.java | 2 +- transport/pom.xml | 40 ++ .../java/io/netty/bootstrap/Bootstrap.java | 0 .../io/netty/bootstrap/ClientBootstrap.java | 0 .../bootstrap/ConnectionlessBootstrap.java | 0 .../io/netty/bootstrap/ServerBootstrap.java | 0 .../java/io/netty/bootstrap/package-info.java | 0 .../io/netty/channel/AbstractChannel.java | 0 .../io/netty/channel/AbstractChannelSink.java | 0 .../netty/channel/AbstractServerChannel.java | 0 .../AdaptiveReceiveBufferSizePredictor.java | 0 ...tiveReceiveBufferSizePredictorFactory.java | 0 .../main/java/io/netty/channel/Channel.java | 0 .../java/io/netty/channel/ChannelConfig.java | 0 .../channel/ChannelDownstreamHandler.java | 0 .../java/io/netty/channel/ChannelEvent.java | 0 .../io/netty/channel/ChannelException.java | 0 .../java/io/netty/channel/ChannelFactory.java | 0 .../java/io/netty/channel/ChannelFuture.java | 6 +- .../channel/ChannelFutureAggregator.java | 0 .../netty/channel/ChannelFutureListener.java | 0 .../ChannelFutureProgressListener.java | 0 .../java/io/netty/channel/ChannelHandler.java | 0 .../netty/channel/ChannelHandlerContext.java | 0 .../ChannelHandlerLifeCycleException.java | 0 .../java/io/netty/channel/ChannelLocal.java | 0 .../io/netty/channel/ChannelPipeline.java | 11 +- .../channel/ChannelPipelineException.java | 0 .../netty/channel/ChannelPipelineFactory.java | 0 .../java/io/netty/channel/ChannelSink.java | 0 .../java/io/netty/channel/ChannelState.java | 0 .../io/netty/channel/ChannelStateEvent.java | 0 .../netty/channel/ChannelUpstreamHandler.java | 11 +- .../main/java/io/netty/channel/Channels.java | 0 .../netty/channel/ChildChannelStateEvent.java | 0 .../netty/channel/CompleteChannelFuture.java | 0 .../netty/channel/DefaultChannelConfig.java | 0 .../netty/channel/DefaultChannelFuture.java | 0 .../netty/channel/DefaultChannelPipeline.java | 0 .../DefaultChildChannelStateEvent.java | 0 .../netty/channel/DefaultExceptionEvent.java | 3 - .../io/netty/channel/DefaultFileRegion.java | 0 .../channel/DefaultServerChannelConfig.java | 0 .../channel/DefaultWriteCompletionEvent.java | 0 .../channel/DownstreamChannelStateEvent.java | 0 .../netty/channel/DownstreamMessageEvent.java | 0 .../java/io/netty/channel/ExceptionEvent.java | 0 .../io/netty/channel/FailedChannelFuture.java | 0 .../java/io/netty/channel/FileRegion.java | 0 .../FixedReceiveBufferSizePredictor.java | 0 ...ixedReceiveBufferSizePredictorFactory.java | 0 .../channel/LifeCycleAwareChannelHandler.java | 0 .../java/io/netty/channel/MessageEvent.java | 0 .../channel/ReceiveBufferSizePredictor.java | 0 .../ReceiveBufferSizePredictorFactory.java | 0 .../java/io/netty/channel/ServerChannel.java | 0 .../netty/channel/ServerChannelFactory.java | 0 .../SimpleChannelDownstreamHandler.java | 0 .../netty/channel/SimpleChannelHandler.java | 0 .../channel/SimpleChannelUpstreamHandler.java | 0 .../netty/channel/StaticChannelPipeline.java | 0 .../netty/channel/SucceededChannelFuture.java | 0 .../channel/UpstreamChannelStateEvent.java | 0 .../netty/channel/UpstreamMessageEvent.java | 0 .../netty/channel/WriteCompletionEvent.java | 0 .../io/netty/channel/group/ChannelGroup.java | 0 .../channel/group/ChannelGroupFuture.java | 5 +- .../group/ChannelGroupFutureListener.java | 0 .../netty/channel/group/CombinedIterator.java | 0 .../channel/group/DefaultChannelGroup.java | 0 .../group/DefaultChannelGroupFuture.java | 0 .../io/netty/channel/group/package-info.java | 0 .../channel/iostream/IOStreamAddress.java | 0 .../channel/iostream/IOStreamChannel.java | 0 .../iostream/IOStreamChannelFactory.java | 0 .../channel/iostream/IOStreamChannelSink.java | 0 .../channel/local/DefaultLocalChannel.java | 0 .../DefaultLocalClientChannelFactory.java | 0 .../local/DefaultLocalServerChannel.java | 0 .../DefaultLocalServerChannelFactory.java | 0 .../io/netty/channel/local/LocalAddress.java | 0 .../io/netty/channel/local/LocalChannel.java | 0 .../channel/local/LocalChannelRegistry.java | 0 .../local/LocalClientChannelFactory.java | 0 .../channel/local/LocalClientChannelSink.java | 0 .../channel/local/LocalServerChannel.java | 0 .../local/LocalServerChannelFactory.java | 0 .../channel/local/LocalServerChannelSink.java | 0 .../io/netty/channel/local/package-info.java | 0 .../java/io/netty/channel/package-info.java | 0 .../socket/ClientSocketChannelFactory.java | 0 .../netty/channel/socket/DatagramChannel.java | 0 .../channel/socket/DatagramChannelConfig.java | 0 .../socket/DatagramChannelFactory.java | 0 .../socket/DefaultDatagramChannelConfig.java | 0 .../DefaultServerSocketChannelConfig.java | 0 .../socket/DefaultSocketChannelConfig.java | 0 .../channel/socket/ServerSocketChannel.java | 0 .../socket/ServerSocketChannelConfig.java | 0 .../socket/ServerSocketChannelFactory.java | 0 .../netty/channel/socket/SocketChannel.java | 0 .../channel/socket/SocketChannelConfig.java | 0 .../socket/nio/AbstractWriteRequestQueue.java | 0 .../nio/DefaultNioDatagramChannelConfig.java | 0 .../nio/DefaultNioSocketChannelConfig.java | 0 .../socket/nio/NioAcceptedSocketChannel.java | 0 .../socket/nio/NioClientSocketChannel.java | 0 .../nio/NioClientSocketChannelFactory.java | 0 .../nio/NioClientSocketPipelineSink.java | 0 .../socket/nio/NioDatagramChannel.java | 0 .../socket/nio/NioDatagramChannelConfig.java | 0 .../socket/nio/NioDatagramChannelFactory.java | 0 .../socket/nio/NioDatagramPipelineSink.java | 0 .../channel/socket/nio/NioDatagramWorker.java | 0 .../socket/nio/NioProviderMetadata.java | 0 .../socket/nio/NioServerSocketChannel.java | 0 .../nio/NioServerSocketChannelFactory.java | 0 .../nio/NioServerSocketPipelineSink.java | 0 .../channel/socket/nio/NioSocketChannel.java | 0 .../socket/nio/NioSocketChannelConfig.java | 0 .../netty/channel/socket/nio/NioWorker.java | 0 .../channel/socket/nio/SelectorUtil.java | 0 .../socket/nio/SocketReceiveBufferPool.java | 0 .../socket/nio/SocketSendBufferPool.java | 0 .../channel/socket/nio/package-info.java | 0 .../socket/oio/OioAcceptedSocketChannel.java | 0 .../socket/oio/OioClientSocketChannel.java | 0 .../oio/OioClientSocketChannelFactory.java | 0 .../oio/OioClientSocketPipelineSink.java | 0 .../socket/oio/OioDatagramChannel.java | 0 .../socket/oio/OioDatagramChannelFactory.java | 0 .../socket/oio/OioDatagramPipelineSink.java | 0 .../channel/socket/oio/OioDatagramWorker.java | 0 .../socket/oio/OioServerSocketChannel.java | 0 .../oio/OioServerSocketChannelFactory.java | 0 .../oio/OioServerSocketPipelineSink.java | 0 .../channel/socket/oio/OioSocketChannel.java | 0 .../netty/channel/socket/oio/OioWorker.java | 0 .../channel/socket/oio/package-info.java | 0 .../io/netty/channel/socket/package-info.java | 0 .../bootstrap/BootstrapOrderedMapTest.java | 0 .../io/netty/bootstrap/BootstrapTest.java | 20 +- .../channel/CompleteChannelFutureTest.java | 0 .../channel/DefaultChannelPipelineTest.java | 0 .../channel/FailedChannelFutureTest.java | 0 .../channel/StaticChannelPipelineTest.java | 0 .../channel/SucceededChannelFutureTest.java | 0 780 files changed, 2056 insertions(+), 2159 deletions(-) create mode 100644 all/pom.xml create mode 100644 buffer/pom.xml rename {src => buffer/src}/main/java/io/netty/buffer/AbstractChannelBuffer.java (100%) rename {src => buffer/src}/main/java/io/netty/buffer/AbstractChannelBufferFactory.java (100%) rename {src => buffer/src}/main/java/io/netty/buffer/BigEndianHeapChannelBuffer.java (100%) rename {src => buffer/src}/main/java/io/netty/buffer/ByteBufferBackedChannelBuffer.java (100%) rename {src => buffer/src}/main/java/io/netty/buffer/ChannelBuffer.java (100%) rename {src => buffer/src}/main/java/io/netty/buffer/ChannelBufferFactory.java (100%) rename {src => buffer/src}/main/java/io/netty/buffer/ChannelBufferIndexFinder.java (100%) rename {src => buffer/src}/main/java/io/netty/buffer/ChannelBufferInputStream.java (100%) rename {src => buffer/src}/main/java/io/netty/buffer/ChannelBufferOutputStream.java (100%) rename {src => buffer/src}/main/java/io/netty/buffer/ChannelBuffers.java (100%) rename {src => buffer/src}/main/java/io/netty/buffer/CompositeChannelBuffer.java (100%) rename {src => buffer/src}/main/java/io/netty/buffer/DirectChannelBufferFactory.java (100%) rename {src => buffer/src}/main/java/io/netty/buffer/DuplicatedChannelBuffer.java (100%) rename {src => buffer/src}/main/java/io/netty/buffer/DynamicChannelBuffer.java (100%) rename {src => buffer/src}/main/java/io/netty/buffer/HeapChannelBuffer.java (100%) rename {src => buffer/src}/main/java/io/netty/buffer/HeapChannelBufferFactory.java (100%) rename {src => buffer/src}/main/java/io/netty/buffer/LittleEndianHeapChannelBuffer.java (100%) rename {src => buffer/src}/main/java/io/netty/buffer/ReadOnlyChannelBuffer.java (100%) rename {src => buffer/src}/main/java/io/netty/buffer/SlicedChannelBuffer.java (100%) rename {src => buffer/src}/main/java/io/netty/buffer/TruncatedChannelBuffer.java (100%) rename {src => buffer/src}/main/java/io/netty/buffer/WrappedChannelBuffer.java (100%) rename {src => buffer/src}/main/java/io/netty/buffer/package-info.java (100%) rename {src => buffer/src}/test/java/io/netty/buffer/AbstractChannelBufferTest.java (100%) rename {src => buffer/src}/test/java/io/netty/buffer/AbstractCompositeChannelBufferTest.java (100%) rename {src => buffer/src}/test/java/io/netty/buffer/BigEndianCompositeChannelBufferTest.java (100%) rename {src => buffer/src}/test/java/io/netty/buffer/BigEndianDirectChannelBufferTest.java (100%) rename {src => buffer/src}/test/java/io/netty/buffer/BigEndianHeapChannelBufferTest.java (100%) rename {src => buffer/src}/test/java/io/netty/buffer/ByteBufferBackedHeapChannelBufferTest.java (100%) rename {src => buffer/src}/test/java/io/netty/buffer/ChannelBufferIndexFinderTest.java (100%) rename {src => buffer/src}/test/java/io/netty/buffer/ChannelBufferStreamTest.java (100%) rename {src => buffer/src}/test/java/io/netty/buffer/ChannelBuffersTest.java (100%) rename {src => buffer/src}/test/java/io/netty/buffer/DuplicateChannelBufferTest.java (100%) rename {src => buffer/src}/test/java/io/netty/buffer/DynamicChannelBufferTest.java (100%) rename {src => buffer/src}/test/java/io/netty/buffer/LittleEndianCompositeChannelBufferTest.java (100%) rename {src => buffer/src}/test/java/io/netty/buffer/LittleEndianDirectChannelBufferTest.java (100%) rename {src => buffer/src}/test/java/io/netty/buffer/LittleEndianHeapChannelBufferTest.java (100%) rename {src => buffer/src}/test/java/io/netty/buffer/ReadOnlyChannelBufferTest.java (100%) rename {src => buffer/src}/test/java/io/netty/buffer/SlicedChannelBufferTest.java (100%) rename {src => buffer/src}/test/java/io/netty/buffer/TruncatedChannelBufferTest.java (100%) create mode 100644 codec-http/pom.xml rename {src => codec-http/src}/main/java/io/netty/handler/codec/http/AbstractDiskHttpData.java (100%) rename {src => codec-http/src}/main/java/io/netty/handler/codec/http/AbstractHttpData.java (100%) rename {src => codec-http/src}/main/java/io/netty/handler/codec/http/AbstractMemoryHttpData.java (100%) rename {src => codec-http/src}/main/java/io/netty/handler/codec/http/Attribute.java (100%) rename {src => codec-http/src}/main/java/io/netty/handler/codec/http/CaseIgnoringComparator.java (100%) rename {src => codec-http/src}/main/java/io/netty/handler/codec/http/Cookie.java (100%) rename {src => codec-http/src}/main/java/io/netty/handler/codec/http/CookieDecoder.java (100%) rename {src => codec-http/src}/main/java/io/netty/handler/codec/http/CookieEncoder.java (100%) rename {src => codec-http/src}/main/java/io/netty/handler/codec/http/CookieHeaderNames.java (100%) rename {src => codec-http/src}/main/java/io/netty/handler/codec/http/DefaultCookie.java (100%) rename {src => codec-http/src}/main/java/io/netty/handler/codec/http/DefaultHttpChunk.java (100%) rename {src => codec-http/src}/main/java/io/netty/handler/codec/http/DefaultHttpChunkTrailer.java (100%) rename {src => codec-http/src}/main/java/io/netty/handler/codec/http/DefaultHttpDataFactory.java (100%) rename {src => codec-http/src}/main/java/io/netty/handler/codec/http/DefaultHttpMessage.java (100%) rename {src => codec-http/src}/main/java/io/netty/handler/codec/http/DefaultHttpRequest.java (100%) rename {src => codec-http/src}/main/java/io/netty/handler/codec/http/DefaultHttpResponse.java (100%) rename {src => codec-http/src}/main/java/io/netty/handler/codec/http/DiskAttribute.java (100%) rename {src => codec-http/src}/main/java/io/netty/handler/codec/http/DiskFileUpload.java (100%) rename {src => codec-http/src}/main/java/io/netty/handler/codec/http/FileUpload.java (100%) rename {src => codec-http/src}/main/java/io/netty/handler/codec/http/HttpChunk.java (100%) rename {src => codec-http/src}/main/java/io/netty/handler/codec/http/HttpChunkAggregator.java (100%) rename {src => codec-http/src}/main/java/io/netty/handler/codec/http/HttpChunkTrailer.java (100%) rename {src => codec-http/src}/main/java/io/netty/handler/codec/http/HttpClientCodec.java (100%) rename {src => codec-http/src}/main/java/io/netty/handler/codec/http/HttpCodecUtil.java (100%) rename {src => codec-http/src}/main/java/io/netty/handler/codec/http/HttpContentCompressor.java (100%) rename {src => codec-http/src}/main/java/io/netty/handler/codec/http/HttpContentDecoder.java (100%) rename {src => codec-http/src}/main/java/io/netty/handler/codec/http/HttpContentDecompressor.java (100%) rename {src => codec-http/src}/main/java/io/netty/handler/codec/http/HttpContentEncoder.java (100%) rename {src => codec-http/src}/main/java/io/netty/handler/codec/http/HttpData.java (100%) rename {src => codec-http/src}/main/java/io/netty/handler/codec/http/HttpDataFactory.java (100%) rename {src => codec-http/src}/main/java/io/netty/handler/codec/http/HttpHeaderDateFormat.java (100%) rename {src => codec-http/src}/main/java/io/netty/handler/codec/http/HttpHeaders.java (100%) rename {src => codec-http/src}/main/java/io/netty/handler/codec/http/HttpMessage.java (100%) rename {src => codec-http/src}/main/java/io/netty/handler/codec/http/HttpMessageDecoder.java (100%) rename {src => codec-http/src}/main/java/io/netty/handler/codec/http/HttpMessageEncoder.java (100%) rename {src => codec-http/src}/main/java/io/netty/handler/codec/http/HttpMethod.java (100%) rename {src => codec-http/src}/main/java/io/netty/handler/codec/http/HttpPostBodyUtil.java (100%) rename {src => codec-http/src}/main/java/io/netty/handler/codec/http/HttpPostRequestDecoder.java (100%) rename {src => codec-http/src}/main/java/io/netty/handler/codec/http/HttpPostRequestEncoder.java (100%) rename {src => codec-http/src}/main/java/io/netty/handler/codec/http/HttpRequest.java (100%) rename {src => codec-http/src}/main/java/io/netty/handler/codec/http/HttpRequestDecoder.java (100%) rename {src => codec-http/src}/main/java/io/netty/handler/codec/http/HttpRequestEncoder.java (100%) rename {src => codec-http/src}/main/java/io/netty/handler/codec/http/HttpResponse.java (100%) rename {src => codec-http/src}/main/java/io/netty/handler/codec/http/HttpResponseDecoder.java (100%) rename {src => codec-http/src}/main/java/io/netty/handler/codec/http/HttpResponseEncoder.java (100%) rename {src => codec-http/src}/main/java/io/netty/handler/codec/http/HttpResponseStatus.java (100%) rename {src => codec-http/src}/main/java/io/netty/handler/codec/http/HttpServerCodec.java (100%) rename {src => codec-http/src}/main/java/io/netty/handler/codec/http/HttpVersion.java (100%) rename {src => codec-http/src}/main/java/io/netty/handler/codec/http/InterfaceHttpData.java (100%) rename {src => codec-http/src}/main/java/io/netty/handler/codec/http/InternalAttribute.java (100%) rename {src => codec-http/src}/main/java/io/netty/handler/codec/http/MemoryAttribute.java (100%) rename {src => codec-http/src}/main/java/io/netty/handler/codec/http/MemoryFileUpload.java (100%) rename {src => codec-http/src}/main/java/io/netty/handler/codec/http/MixedAttribute.java (100%) rename {src => codec-http/src}/main/java/io/netty/handler/codec/http/MixedFileUpload.java (100%) rename {src => codec-http/src}/main/java/io/netty/handler/codec/http/QueryStringDecoder.java (100%) rename {src => codec-http/src}/main/java/io/netty/handler/codec/http/QueryStringEncoder.java (100%) rename {src => codec-http/src}/main/java/io/netty/handler/codec/http/package-info.java (100%) rename {src => codec-http/src}/main/java/io/netty/handler/codec/http/websocketx/BinaryWebSocketFrame.java (100%) rename {src => codec-http/src}/main/java/io/netty/handler/codec/http/websocketx/CloseWebSocketFrame.java (100%) rename {src => codec-http/src}/main/java/io/netty/handler/codec/http/websocketx/ContinuationWebSocketFrame.java (100%) rename {src => codec-http/src}/main/java/io/netty/handler/codec/http/websocketx/PingWebSocketFrame.java (100%) rename {src => codec-http/src}/main/java/io/netty/handler/codec/http/websocketx/PongWebSocketFrame.java (100%) rename {src => codec-http/src}/main/java/io/netty/handler/codec/http/websocketx/TextWebSocketFrame.java (100%) rename {src => codec-http/src}/main/java/io/netty/handler/codec/http/websocketx/UTF8Exception.java (100%) rename {src => codec-http/src}/main/java/io/netty/handler/codec/http/websocketx/UTF8Output.java (100%) rename {src => codec-http/src}/main/java/io/netty/handler/codec/http/websocketx/WebSocket00FrameDecoder.java (100%) rename {src => codec-http/src}/main/java/io/netty/handler/codec/http/websocketx/WebSocket00FrameEncoder.java (100%) rename {src => codec-http/src}/main/java/io/netty/handler/codec/http/websocketx/WebSocket08FrameDecoder.java (100%) rename {src => codec-http/src}/main/java/io/netty/handler/codec/http/websocketx/WebSocket08FrameEncoder.java (100%) rename {src => codec-http/src}/main/java/io/netty/handler/codec/http/websocketx/WebSocket13FrameDecoder.java (100%) rename {src => codec-http/src}/main/java/io/netty/handler/codec/http/websocketx/WebSocket13FrameEncoder.java (100%) rename {src => codec-http/src}/main/java/io/netty/handler/codec/http/websocketx/WebSocketClientHandshaker.java (100%) rename {src => codec-http/src}/main/java/io/netty/handler/codec/http/websocketx/WebSocketClientHandshaker00.java (100%) rename {src => codec-http/src}/main/java/io/netty/handler/codec/http/websocketx/WebSocketClientHandshaker08.java (100%) rename {src => codec-http/src}/main/java/io/netty/handler/codec/http/websocketx/WebSocketClientHandshaker13.java (100%) rename {src => codec-http/src}/main/java/io/netty/handler/codec/http/websocketx/WebSocketClientHandshakerFactory.java (100%) rename {src => codec-http/src}/main/java/io/netty/handler/codec/http/websocketx/WebSocketFrame.java (100%) rename {src => codec-http/src}/main/java/io/netty/handler/codec/http/websocketx/WebSocketFrameType.java (100%) rename {src => codec-http/src}/main/java/io/netty/handler/codec/http/websocketx/WebSocketHandshakeException.java (100%) rename {src => codec-http/src}/main/java/io/netty/handler/codec/http/websocketx/WebSocketServerHandshaker.java (100%) rename {src => codec-http/src}/main/java/io/netty/handler/codec/http/websocketx/WebSocketServerHandshaker00.java (100%) rename {src => codec-http/src}/main/java/io/netty/handler/codec/http/websocketx/WebSocketServerHandshaker08.java (100%) rename {src => codec-http/src}/main/java/io/netty/handler/codec/http/websocketx/WebSocketServerHandshaker13.java (100%) rename {src => codec-http/src}/main/java/io/netty/handler/codec/http/websocketx/WebSocketServerHandshakerFactory.java (100%) rename {src => codec-http/src}/main/java/io/netty/handler/codec/http/websocketx/WebSocketVersion.java (100%) rename {src => codec-http/src}/main/java/io/netty/handler/codec/http/websocketx/package-info.java (100%) rename {src => codec-http/src}/main/java/io/netty/handler/codec/rtsp/RtspHeaders.java (100%) rename {src => codec-http/src}/main/java/io/netty/handler/codec/rtsp/RtspMessageDecoder.java (100%) rename {src => codec-http/src}/main/java/io/netty/handler/codec/rtsp/RtspMessageEncoder.java (100%) rename {src => codec-http/src}/main/java/io/netty/handler/codec/rtsp/RtspMethods.java (100%) rename {src => codec-http/src}/main/java/io/netty/handler/codec/rtsp/RtspRequestDecoder.java (100%) rename {src => codec-http/src}/main/java/io/netty/handler/codec/rtsp/RtspRequestEncoder.java (100%) rename {src => codec-http/src}/main/java/io/netty/handler/codec/rtsp/RtspResponseDecoder.java (100%) rename {src => codec-http/src}/main/java/io/netty/handler/codec/rtsp/RtspResponseEncoder.java (100%) rename {src => codec-http/src}/main/java/io/netty/handler/codec/rtsp/RtspResponseStatuses.java (100%) rename {src => codec-http/src}/main/java/io/netty/handler/codec/rtsp/RtspVersions.java (100%) rename {src => codec-http/src}/main/java/io/netty/handler/codec/rtsp/package-info.java (100%) rename {src => codec-http/src}/test/java/io/netty/handler/codec/http/CookieDecoderTest.java (100%) rename {src => codec-http/src}/test/java/io/netty/handler/codec/http/CookieEncoderTest.java (100%) rename {src => codec-http/src}/test/java/io/netty/handler/codec/http/DefaultHttpMessageTest.java (100%) rename {src => codec-http/src}/test/java/io/netty/handler/codec/http/HttpHeaderDateFormatTest.java (100%) rename {src => codec-http/src}/test/java/io/netty/handler/codec/http/QueryStringDecoderTest.java (100%) rename {src => codec-http/src}/test/java/io/netty/handler/codec/http/websocketx/WebSocketServerHandshaker00Test.java (100%) rename {src => codec-http/src}/test/java/io/netty/handler/codec/http/websocketx/WebSocketServerHandshaker08Test.java (100%) rename {src => codec-http/src}/test/java/io/netty/handler/codec/http/websocketx/WebSocketServerHandshaker13Test.java (100%) create mode 100644 codec/pom.xml rename {src => codec/src}/main/java/io/netty/handler/codec/base64/Base64.java (100%) rename {src => codec/src}/main/java/io/netty/handler/codec/base64/Base64Decoder.java (100%) rename {src => codec/src}/main/java/io/netty/handler/codec/base64/Base64Dialect.java (100%) rename {src => codec/src}/main/java/io/netty/handler/codec/base64/Base64Encoder.java (100%) rename {src => codec/src}/main/java/io/netty/handler/codec/base64/package-info.java (100%) rename {src => codec/src}/main/java/io/netty/handler/codec/bytes/ByteArrayDecoder.java (100%) rename {src => codec/src}/main/java/io/netty/handler/codec/bytes/ByteArrayEncoder.java (100%) rename {src => codec/src}/main/java/io/netty/handler/codec/bytes/package-info.java (100%) rename {src => codec/src}/main/java/io/netty/handler/codec/compression/CompressionException.java (100%) rename {src => codec/src}/main/java/io/netty/handler/codec/compression/ZlibDecoder.java (100%) rename {src => codec/src}/main/java/io/netty/handler/codec/compression/ZlibEncoder.java (100%) rename {src => codec/src}/main/java/io/netty/handler/codec/compression/ZlibUtil.java (100%) rename {src => codec/src}/main/java/io/netty/handler/codec/compression/ZlibWrapper.java (100%) rename {src => codec/src}/main/java/io/netty/handler/codec/compression/package-info.java (100%) rename {src => codec/src}/main/java/io/netty/handler/codec/embedder/AbstractCodecEmbedder.java (100%) rename {src => codec/src}/main/java/io/netty/handler/codec/embedder/CodecEmbedder.java (100%) rename {src => codec/src}/main/java/io/netty/handler/codec/embedder/CodecEmbedderException.java (100%) rename {src => codec/src}/main/java/io/netty/handler/codec/embedder/DecoderEmbedder.java (100%) rename {src => codec/src}/main/java/io/netty/handler/codec/embedder/EmbeddedChannel.java (100%) rename {src => codec/src}/main/java/io/netty/handler/codec/embedder/EmbeddedChannelFactory.java (100%) rename {src => codec/src}/main/java/io/netty/handler/codec/embedder/EmbeddedSocketAddress.java (100%) rename {src => codec/src}/main/java/io/netty/handler/codec/embedder/EncoderEmbedder.java (100%) rename {src => codec/src}/main/java/io/netty/handler/codec/embedder/package-info.java (100%) rename {src => codec/src}/main/java/io/netty/handler/codec/frame/CorruptedFrameException.java (100%) rename {src => codec/src}/main/java/io/netty/handler/codec/frame/DelimiterBasedFrameDecoder.java (100%) rename {src => codec/src}/main/java/io/netty/handler/codec/frame/Delimiters.java (100%) rename {src => codec/src}/main/java/io/netty/handler/codec/frame/FixedLengthFrameDecoder.java (100%) rename {src => codec/src}/main/java/io/netty/handler/codec/frame/FrameDecoder.java (100%) rename {src => codec/src}/main/java/io/netty/handler/codec/frame/LengthFieldBasedFrameDecoder.java (100%) rename {src => codec/src}/main/java/io/netty/handler/codec/frame/LengthFieldPrepender.java (100%) rename {src => codec/src}/main/java/io/netty/handler/codec/frame/TooLongFrameException.java (100%) rename {src => codec/src}/main/java/io/netty/handler/codec/frame/package-info.java (100%) rename {src => codec/src}/main/java/io/netty/handler/codec/oneone/OneToOneDecoder.java (100%) rename {src => codec/src}/main/java/io/netty/handler/codec/oneone/OneToOneEncoder.java (100%) rename {src => codec/src}/main/java/io/netty/handler/codec/oneone/package-info.java (100%) rename {src => codec/src}/main/java/io/netty/handler/codec/protobuf/ProtobufDecoder.java (100%) rename {src => codec/src}/main/java/io/netty/handler/codec/protobuf/ProtobufEncoder.java (100%) rename {src => codec/src}/main/java/io/netty/handler/codec/protobuf/ProtobufVarint32FrameDecoder.java (100%) rename {src => codec/src}/main/java/io/netty/handler/codec/protobuf/ProtobufVarint32LengthFieldPrepender.java (100%) rename {src => codec/src}/main/java/io/netty/handler/codec/protobuf/package-info.java (100%) rename {src => codec/src}/main/java/io/netty/handler/codec/replay/ReplayError.java (100%) rename {src => codec/src}/main/java/io/netty/handler/codec/replay/ReplayingDecoder.java (100%) rename {src => codec/src}/main/java/io/netty/handler/codec/replay/ReplayingDecoderBuffer.java (100%) rename {src => codec/src}/main/java/io/netty/handler/codec/replay/UnreplayableOperationException.java (100%) rename {src => codec/src}/main/java/io/netty/handler/codec/replay/UnsafeDynamicChannelBuffer.java (100%) rename {src => codec/src}/main/java/io/netty/handler/codec/replay/VoidEnum.java (100%) rename {src => codec/src}/main/java/io/netty/handler/codec/replay/package-info.java (100%) rename {src => codec/src}/main/java/io/netty/handler/codec/serialization/CachingClassResolver.java (100%) rename {src => codec/src}/main/java/io/netty/handler/codec/serialization/ClassLoaderClassResolver.java (100%) rename {src => codec/src}/main/java/io/netty/handler/codec/serialization/ClassResolver.java (100%) rename {src => codec/src}/main/java/io/netty/handler/codec/serialization/ClassResolvers.java (100%) rename {src => codec/src}/main/java/io/netty/handler/codec/serialization/CompactObjectInputStream.java (100%) rename {src => codec/src}/main/java/io/netty/handler/codec/serialization/CompactObjectOutputStream.java (100%) rename {src => codec/src}/main/java/io/netty/handler/codec/serialization/CompatibleObjectDecoder.java (100%) rename {src => codec/src}/main/java/io/netty/handler/codec/serialization/CompatibleObjectDecoderState.java (100%) rename {src => codec/src}/main/java/io/netty/handler/codec/serialization/CompatibleObjectEncoder.java (100%) rename {src => codec/src}/main/java/io/netty/handler/codec/serialization/ObjectDecoder.java (100%) rename {src => codec/src}/main/java/io/netty/handler/codec/serialization/ObjectDecoderInputStream.java (100%) rename {src => codec/src}/main/java/io/netty/handler/codec/serialization/ObjectEncoder.java (100%) rename {src => codec/src}/main/java/io/netty/handler/codec/serialization/ObjectEncoderOutputStream.java (100%) rename {src => codec/src}/main/java/io/netty/handler/codec/serialization/ReferenceMap.java (100%) rename {src => codec/src}/main/java/io/netty/handler/codec/serialization/SoftReferenceMap.java (100%) rename {src => codec/src}/main/java/io/netty/handler/codec/serialization/SwitchableInputStream.java (100%) rename {src => codec/src}/main/java/io/netty/handler/codec/serialization/WeakReferenceMap.java (100%) rename {src => codec/src}/main/java/io/netty/handler/codec/serialization/package-info.java (100%) rename {src => codec/src}/main/java/io/netty/handler/codec/string/StringDecoder.java (100%) rename {src => codec/src}/main/java/io/netty/handler/codec/string/StringEncoder.java (100%) rename {src => codec/src}/main/java/io/netty/handler/codec/string/package-info.java (100%) rename {src => codec/src}/test/java/io/netty/handler/codec/bytes/ByteArrayDecoderTest.java (100%) rename {src => codec/src}/test/java/io/netty/handler/codec/bytes/ByteArrayEncoderTest.java (100%) rename {src => codec/src}/test/java/io/netty/handler/codec/frame/DelimiterBasedFrameDecoderTest.java (100%) rename {src => codec/src}/test/java/io/netty/handler/codec/frame/LengthFieldBasedFrameDecoderTest.java (100%) rename {src => codec/src}/test/java/io/netty/handler/codec/protobuf/ProtobufVarint32FrameDecoderTest.java (100%) rename {src => codec/src}/test/java/io/netty/handler/codec/protobuf/ProtobufVarint32LengthFieldPrependerTest.java (100%) rename {src => codec/src}/test/java/io/netty/handler/codec/replay/ReplayingDecoderTest.java (100%) rename {src => codec/src}/test/java/io/netty/handler/codec/serialization/CompactObjectSerializationTest.java (100%) rename {src => codec/src}/test/java/io/netty/handler/codec/serialization/SwitchableInputStreamTest.java (100%) create mode 100644 common/pom.xml rename {src => common/src}/main/java/io/netty/logging/AbstractInternalLogger.java (100%) rename {src => common/src}/main/java/io/netty/logging/CommonsLogger.java (100%) rename {src => common/src}/main/java/io/netty/logging/CommonsLoggerFactory.java (100%) rename {src => common/src}/main/java/io/netty/logging/InternalLogLevel.java (100%) rename {src => common/src}/main/java/io/netty/logging/InternalLogger.java (100%) rename {src => common/src}/main/java/io/netty/logging/InternalLoggerFactory.java (89%) rename {src => common/src}/main/java/io/netty/logging/JBossLogger.java (100%) rename {src => common/src}/main/java/io/netty/logging/JBossLoggerFactory.java (100%) rename {src => common/src}/main/java/io/netty/logging/JdkLogger.java (100%) rename {src => common/src}/main/java/io/netty/logging/JdkLoggerFactory.java (100%) rename {src => common/src}/main/java/io/netty/logging/Log4JLogger.java (100%) rename {src => common/src}/main/java/io/netty/logging/Log4JLoggerFactory.java (100%) rename {src => common/src}/main/java/io/netty/logging/OsgiLogger.java (100%) rename {src => common/src}/main/java/io/netty/logging/OsgiLoggerFactory.java (100%) rename {src => common/src}/main/java/io/netty/logging/Slf4JLogger.java (100%) rename {src => common/src}/main/java/io/netty/logging/Slf4JLoggerFactory.java (100%) rename {src => common/src}/main/java/io/netty/logging/package-info.java (100%) rename {src => common/src}/main/java/io/netty/util/CharsetUtil.java (100%) rename {src => common/src}/main/java/io/netty/util/EstimatableObjectWrapper.java (100%) rename {src => common/src}/main/java/io/netty/util/ExternalResourceReleasable.java (100%) rename {src => common/src}/main/java/io/netty/util/ExternalResourceUtil.java (100%) rename {src => common/src}/main/java/io/netty/util/HashedWheelTimer.java (98%) rename {src => common/src}/main/java/io/netty/util/MapBackedSet.java (100%) rename src/test/java/io/netty/util/TestUtil.java => common/src/main/java/io/netty/util/SocketAddresses.java (88%) rename {src => common/src}/main/java/io/netty/util/Timeout.java (100%) rename {src => common/src}/main/java/io/netty/util/Timer.java (100%) rename {src => common/src}/main/java/io/netty/util/TimerTask.java (100%) rename {src => common/src}/main/java/io/netty/util/UnsafeDetectUtil.java (100%) rename {src => common/src}/main/java/io/netty/util/internal/AtomicFieldUpdaterUtil.java (100%) rename {src => common/src}/main/java/io/netty/util/internal/ConcurrentHashMap.java (100%) rename {src => common/src}/main/java/io/netty/util/internal/ConcurrentIdentityHashMap.java (100%) rename {src => common/src}/main/java/io/netty/util/internal/ConcurrentIdentityWeakKeyHashMap.java (100%) rename {src => common/src}/main/java/io/netty/util/internal/ConcurrentWeakKeyHashMap.java (100%) rename {src => common/src}/main/java/io/netty/util/internal/ConversionUtil.java (100%) rename {src => common/src}/main/java/io/netty/util/internal/DeadLockProofWorker.java (100%) rename {src => common/src}/main/java/io/netty/util/internal/ExecutorUtil.java (100%) rename {src => common/src}/main/java/io/netty/util/internal/LegacyLinkedTransferQueue.java (100%) rename {src => common/src}/main/java/io/netty/util/internal/LinkedTransferQueue.java (100%) rename {src => common/src}/main/java/io/netty/util/internal/NonReentrantLock.java (100%) rename {src => common/src}/main/java/io/netty/util/internal/QueueFactory.java (100%) rename {src => common/src}/main/java/io/netty/util/internal/ReusableIterator.java (100%) rename {src => common/src}/main/java/io/netty/util/internal/SharedResourceMisuseDetector.java (100%) rename {src => common/src}/main/java/io/netty/util/internal/StringUtil.java (100%) rename {src => common/src}/main/java/io/netty/util/internal/SystemPropertyUtil.java (100%) rename {src => common/src}/main/java/io/netty/util/internal/ThreadLocalBoolean.java (100%) rename {src => common/src}/main/java/io/netty/util/internal/ThreadLocalRandom.java (100%) rename {src => common/src}/main/java/io/netty/util/internal/UnterminatableExecutor.java (100%) rename {src => common/src}/main/java/io/netty/util/internal/jzlib/Adler32.java (100%) rename {src => common/src}/main/java/io/netty/util/internal/jzlib/CRC32.java (100%) rename {src => common/src}/main/java/io/netty/util/internal/jzlib/Deflate.java (100%) rename {src => common/src}/main/java/io/netty/util/internal/jzlib/InfBlocks.java (100%) rename {src => common/src}/main/java/io/netty/util/internal/jzlib/InfCodes.java (100%) rename {src => common/src}/main/java/io/netty/util/internal/jzlib/InfTree.java (100%) rename {src => common/src}/main/java/io/netty/util/internal/jzlib/Inflate.java (100%) rename {src => common/src}/main/java/io/netty/util/internal/jzlib/JZlib.java (100%) rename {src => common/src}/main/java/io/netty/util/internal/jzlib/StaticTree.java (100%) rename {src => common/src}/main/java/io/netty/util/internal/jzlib/Tree.java (100%) rename {src => common/src}/main/java/io/netty/util/internal/jzlib/ZStream.java (100%) rename {src => common/src}/main/java/io/netty/util/internal/package-info.java (100%) rename {src => common/src}/main/java/io/netty/util/package-info.java (100%) rename {src => common/src}/test/java/io/netty/logging/CommonsLoggerFactoryTest.java (100%) rename {src => common/src}/test/java/io/netty/logging/CommonsLoggerTest.java (100%) rename {src => common/src}/test/java/io/netty/logging/InternalLoggerFactoryTest.java (100%) rename {src => common/src}/test/java/io/netty/logging/JBossLoggerFactoryTest.java (100%) rename {src => common/src}/test/java/io/netty/logging/JBossLoggerTest.java (100%) rename {src => common/src}/test/java/io/netty/logging/JdkLoggerFactoryTest.java (100%) rename {src => common/src}/test/java/io/netty/logging/JdkLoggerTest.java (100%) rename {src => common/src}/test/java/io/netty/logging/Log4JLoggerFactoryTest.java (100%) rename {src => common/src}/test/java/io/netty/logging/Log4JLoggerTest.java (100%) rename {src => common/src}/test/java/io/netty/logging/Slf4JLoggerFactoryTest.java (100%) rename {src => common/src}/test/java/io/netty/logging/Slf4JLoggerTest.java (100%) rename {src => common/src}/test/java/io/netty/util/MapBackedSetTest.java (100%) rename {src => common/src}/test/java/io/netty/util/internal/ConversionUtilTest.java (100%) rename {src => common/src}/test/java/io/netty/util/internal/StringUtilTest.java (100%) create mode 100644 example/pom.xml rename {src => example/src}/main/java/io/netty/example/discard/DiscardClient.java (100%) rename {src => example/src}/main/java/io/netty/example/discard/DiscardClientHandler.java (100%) rename {src => example/src}/main/java/io/netty/example/discard/DiscardServer.java (100%) rename {src => example/src}/main/java/io/netty/example/discard/DiscardServerHandler.java (100%) rename {src => example/src}/main/java/io/netty/example/echo/EchoClient.java (100%) rename {src => example/src}/main/java/io/netty/example/echo/EchoClientHandler.java (100%) rename {src => example/src}/main/java/io/netty/example/echo/EchoServer.java (100%) rename {src => example/src}/main/java/io/netty/example/echo/EchoServerHandler.java (100%) rename {src => example/src}/main/java/io/netty/example/factorial/BigIntegerDecoder.java (100%) rename {src => example/src}/main/java/io/netty/example/factorial/FactorialClient.java (100%) rename {src => example/src}/main/java/io/netty/example/factorial/FactorialClientHandler.java (100%) rename {src => example/src}/main/java/io/netty/example/factorial/FactorialClientPipelineFactory.java (100%) rename {src => example/src}/main/java/io/netty/example/factorial/FactorialServer.java (100%) rename {src => example/src}/main/java/io/netty/example/factorial/FactorialServerHandler.java (100%) rename {src => example/src}/main/java/io/netty/example/factorial/FactorialServerPipelineFactory.java (100%) rename {src => example/src}/main/java/io/netty/example/factorial/NumberEncoder.java (100%) rename {src => example/src}/main/java/io/netty/example/http/file/HttpStaticFileServer.java (100%) rename {src => example/src}/main/java/io/netty/example/http/file/HttpStaticFileServerHandler.java (100%) rename {src => example/src}/main/java/io/netty/example/http/file/HttpStaticFileServerPipelineFactory.java (100%) rename {src => example/src}/main/java/io/netty/example/http/snoop/HttpClient.java (100%) rename {src => example/src}/main/java/io/netty/example/http/snoop/HttpClientPipelineFactory.java (100%) rename {src => example/src}/main/java/io/netty/example/http/snoop/HttpRequestHandler.java (100%) rename {src => example/src}/main/java/io/netty/example/http/snoop/HttpResponseHandler.java (100%) rename {src => example/src}/main/java/io/netty/example/http/snoop/HttpServer.java (100%) rename {src => example/src}/main/java/io/netty/example/http/snoop/HttpServerPipelineFactory.java (100%) rename {src => example/src}/main/java/io/netty/example/http/upload/HttpClient.java (100%) rename {src => example/src}/main/java/io/netty/example/http/upload/HttpClientPipelineFactory.java (100%) rename {src => example/src}/main/java/io/netty/example/http/upload/HttpRequestHandler.java (100%) rename {src => example/src}/main/java/io/netty/example/http/upload/HttpResponseHandler.java (100%) rename {src => example/src}/main/java/io/netty/example/http/upload/HttpServer.java (100%) rename {src => example/src}/main/java/io/netty/example/http/upload/HttpServerPipelineFactory.java (100%) rename {src => example/src}/main/java/io/netty/example/http/websocketx/autobahn/WebSocketServer.java (100%) rename {src => example/src}/main/java/io/netty/example/http/websocketx/autobahn/WebSocketServerHandler.java (100%) rename {src => example/src}/main/java/io/netty/example/http/websocketx/autobahn/WebSocketServerPipelineFactory.java (100%) rename {src => example/src}/main/java/io/netty/example/http/websocketx/autobahn/package-info.java (100%) rename {src => example/src}/main/java/io/netty/example/http/websocketx/client/App.java (100%) rename {src => example/src}/main/java/io/netty/example/http/websocketx/client/WebSocketCallback.java (100%) rename {src => example/src}/main/java/io/netty/example/http/websocketx/client/WebSocketClient.java (100%) rename {src => example/src}/main/java/io/netty/example/http/websocketx/client/WebSocketClientFactory.java (100%) rename {src => example/src}/main/java/io/netty/example/http/websocketx/client/WebSocketClientHandler.java (100%) rename {src => example/src}/main/java/io/netty/example/http/websocketx/client/WebSocketException.java (100%) rename {src => example/src}/main/java/io/netty/example/http/websocketx/client/WebSocketHttpResponseDecoder.java (100%) rename {src => example/src}/main/java/io/netty/example/http/websocketx/client/package-info.java (100%) rename {src => example/src}/main/java/io/netty/example/http/websocketx/server/WebSocketServer.java (100%) rename {src => example/src}/main/java/io/netty/example/http/websocketx/server/WebSocketServerHandler.java (100%) rename {src => example/src}/main/java/io/netty/example/http/websocketx/server/WebSocketServerIndexPage.java (100%) rename {src => example/src}/main/java/io/netty/example/http/websocketx/server/WebSocketServerPipelineFactory.java (100%) rename {src => example/src}/main/java/io/netty/example/http/websocketx/server/package-info.java (100%) rename {src => example/src}/main/java/io/netty/example/http/websocketx/sslserver/WebSocketSslServer.java (100%) rename {src => example/src}/main/java/io/netty/example/http/websocketx/sslserver/WebSocketSslServerHandler.java (100%) rename {src => example/src}/main/java/io/netty/example/http/websocketx/sslserver/WebSocketSslServerIndexPage.java (100%) rename {src => example/src}/main/java/io/netty/example/http/websocketx/sslserver/WebSocketSslServerPipelineFactory.java (100%) rename {src => example/src}/main/java/io/netty/example/http/websocketx/sslserver/WebSocketSslServerSslContext.java (100%) rename {src => example/src}/main/java/io/netty/example/http/websocketx/sslserver/package-info.java (100%) rename {src => example/src}/main/java/io/netty/example/iostream/IOStream.java (100%) rename {src => example/src}/main/java/io/netty/example/local/LocalExample.java (100%) rename {src => example/src}/main/java/io/netty/example/local/LocalExampleMultthreaded.java (100%) rename {src => example/src}/main/java/io/netty/example/local/LocalServerPipelineFactory.java (100%) rename {src => example/src}/main/java/io/netty/example/localtime/LocalTimeClient.java (100%) rename {src => example/src}/main/java/io/netty/example/localtime/LocalTimeClientHandler.java (100%) rename {src => example/src}/main/java/io/netty/example/localtime/LocalTimeClientPipelineFactory.java (100%) rename {src => example/src}/main/java/io/netty/example/localtime/LocalTimeProtocol.java (100%) rename {src => example/src}/main/java/io/netty/example/localtime/LocalTimeProtocol.proto (100%) rename {src => example/src}/main/java/io/netty/example/localtime/LocalTimeServer.java (100%) rename {src => example/src}/main/java/io/netty/example/localtime/LocalTimeServerHandler.java (100%) rename {src => example/src}/main/java/io/netty/example/localtime/LocalTimeServerPipelineFactory.java (100%) rename {src => example/src}/main/java/io/netty/example/objectecho/ObjectEchoClient.java (100%) rename {src => example/src}/main/java/io/netty/example/objectecho/ObjectEchoClientHandler.java (100%) rename {src => example/src}/main/java/io/netty/example/objectecho/ObjectEchoServer.java (100%) rename {src => example/src}/main/java/io/netty/example/objectecho/ObjectEchoServerHandler.java (100%) rename {src => example/src}/main/java/io/netty/example/portunification/PortUnificationServer.java (100%) rename {src => example/src}/main/java/io/netty/example/portunification/PortUnificationServerHandler.java (100%) rename {src => example/src}/main/java/io/netty/example/proxy/HexDumpProxy.java (100%) rename {src => example/src}/main/java/io/netty/example/proxy/HexDumpProxyInboundHandler.java (100%) rename {src => example/src}/main/java/io/netty/example/proxy/HexDumpProxyPipelineFactory.java (100%) rename {src => example/src}/main/java/io/netty/example/qotm/QuoteOfTheMomentClient.java (100%) rename {src => example/src}/main/java/io/netty/example/qotm/QuoteOfTheMomentClientHandler.java (100%) rename {src => example/src}/main/java/io/netty/example/qotm/QuoteOfTheMomentServer.java (100%) rename {src => example/src}/main/java/io/netty/example/qotm/QuoteOfTheMomentServerHandler.java (100%) rename {src => example/src}/main/java/io/netty/example/sctp/SctpClient.java (97%) rename {src => example/src}/main/java/io/netty/example/sctp/SctpClientHandler.java (97%) rename {src => example/src}/main/java/io/netty/example/sctp/SctpServer.java (97%) rename {src => example/src}/main/java/io/netty/example/sctp/SctpServerHandler.java (100%) rename {src => example/src}/main/java/io/netty/example/securechat/SecureChatClient.java (100%) rename {src => example/src}/main/java/io/netty/example/securechat/SecureChatClientHandler.java (100%) rename {src => example/src}/main/java/io/netty/example/securechat/SecureChatClientPipelineFactory.java (100%) rename {src => example/src}/main/java/io/netty/example/securechat/SecureChatKeyStore.java (100%) rename {src => example/src}/main/java/io/netty/example/securechat/SecureChatServer.java (100%) rename {src => example/src}/main/java/io/netty/example/securechat/SecureChatServerHandler.java (100%) rename {src => example/src}/main/java/io/netty/example/securechat/SecureChatServerPipelineFactory.java (100%) rename {src => example/src}/main/java/io/netty/example/securechat/SecureChatSslContextFactory.java (100%) rename {src => example/src}/main/java/io/netty/example/securechat/SecureChatTrustManagerFactory.java (100%) rename {src => example/src}/main/java/io/netty/example/telnet/TelnetClient.java (100%) rename {src => example/src}/main/java/io/netty/example/telnet/TelnetClientHandler.java (100%) rename {src => example/src}/main/java/io/netty/example/telnet/TelnetClientPipelineFactory.java (100%) rename {src => example/src}/main/java/io/netty/example/telnet/TelnetServer.java (100%) rename {src => example/src}/main/java/io/netty/example/telnet/TelnetServerHandler.java (100%) rename {src => example/src}/main/java/io/netty/example/telnet/TelnetServerPipelineFactory.java (100%) rename {src => example/src}/main/java/io/netty/example/uptime/UptimeClient.java (100%) rename {src => example/src}/main/java/io/netty/example/uptime/UptimeClientHandler.java (100%) create mode 100644 handler/pom.xml rename {src => handler/src}/main/java/io/netty/handler/execution/ChainedExecutor.java (100%) rename {src => handler/src}/main/java/io/netty/handler/execution/ChannelDownstreamEventRunnable.java (100%) rename {src => handler/src}/main/java/io/netty/handler/execution/ChannelEventRunnable.java (100%) rename {src => handler/src}/main/java/io/netty/handler/execution/ChannelUpstreamEventRunnable.java (100%) rename {src/main/java/io/netty/util => handler/src/main/java/io/netty/handler/execution}/DefaultObjectSizeEstimator.java (99%) rename src/main/java/io/netty/container/microcontainer/NettyLoggerConfigurator.java => handler/src/main/java/io/netty/handler/execution/EstimatableObjectWrapper.java (59%) rename {src => handler/src}/main/java/io/netty/handler/execution/ExecutionHandler.java (100%) rename {src => handler/src}/main/java/io/netty/handler/execution/MemoryAwareThreadPoolExecutor.java (99%) rename {src/main/java/io/netty/util => handler/src/main/java/io/netty/handler/execution}/ObjectSizeEstimator.java (96%) rename {src => handler/src}/main/java/io/netty/handler/execution/OrderedMemoryAwareThreadPoolExecutor.java (99%) rename {src => handler/src}/main/java/io/netty/handler/execution/filter/ChannelDownstreamEventRunnableFilter.java (100%) rename {src => handler/src}/main/java/io/netty/handler/execution/filter/ChannelEventRunnableFilter.java (100%) rename {src => handler/src}/main/java/io/netty/handler/execution/filter/ChannelUpstreamEventRunnableFilter.java (100%) rename {src => handler/src}/main/java/io/netty/handler/execution/package-info.java (100%) rename {src => handler/src}/main/java/io/netty/handler/ipfilter/CIDR.java (100%) rename {src => handler/src}/main/java/io/netty/handler/ipfilter/CIDR4.java (100%) rename {src => handler/src}/main/java/io/netty/handler/ipfilter/CIDR6.java (100%) rename {src => handler/src}/main/java/io/netty/handler/ipfilter/IpFilterListener.java (100%) rename {src => handler/src}/main/java/io/netty/handler/ipfilter/IpFilterRule.java (100%) rename {src => handler/src}/main/java/io/netty/handler/ipfilter/IpFilterRuleHandler.java (100%) rename {src => handler/src}/main/java/io/netty/handler/ipfilter/IpFilterRuleList.java (100%) rename {src => handler/src}/main/java/io/netty/handler/ipfilter/IpFilteringHandler.java (100%) rename {src => handler/src}/main/java/io/netty/handler/ipfilter/IpFilteringHandlerImpl.java (100%) rename {src => handler/src}/main/java/io/netty/handler/ipfilter/IpSet.java (100%) rename {src => handler/src}/main/java/io/netty/handler/ipfilter/IpSubnet.java (100%) rename {src => handler/src}/main/java/io/netty/handler/ipfilter/IpSubnetFilterRule.java (100%) rename {src => handler/src}/main/java/io/netty/handler/ipfilter/IpV4Subnet.java (100%) rename {src => handler/src}/main/java/io/netty/handler/ipfilter/IpV4SubnetFilterRule.java (100%) rename {src => handler/src}/main/java/io/netty/handler/ipfilter/OneIpFilterHandler.java (100%) rename {src => handler/src}/main/java/io/netty/handler/ipfilter/PatternRule.java (100%) rename {src => handler/src}/main/java/io/netty/handler/ipfilter/package-info.java (100%) rename {src => handler/src}/main/java/io/netty/handler/logging/LoggingHandler.java (100%) rename {src => handler/src}/main/java/io/netty/handler/logging/package-info.java (100%) rename {src => handler/src}/main/java/io/netty/handler/queue/BlockingReadHandler.java (100%) rename {src => handler/src}/main/java/io/netty/handler/queue/BlockingReadTimeoutException.java (100%) rename {src => handler/src}/main/java/io/netty/handler/queue/BufferedWriteHandler.java (100%) rename {src => handler/src}/main/java/io/netty/handler/queue/package-info.java (100%) rename {src => handler/src}/main/java/io/netty/handler/region/ChannelWritableByteChannel.java (100%) rename {src => handler/src}/main/java/io/netty/handler/region/FileRegionEncoder.java (100%) rename {src => handler/src}/main/java/io/netty/handler/ssl/ImmediateExecutor.java (100%) rename {src => handler/src}/main/java/io/netty/handler/ssl/SslBufferPool.java (100%) rename {src => handler/src}/main/java/io/netty/handler/ssl/SslHandler.java (100%) rename {src => handler/src}/main/java/io/netty/handler/ssl/package-info.java (100%) rename {src => handler/src}/main/java/io/netty/handler/stream/ChunkedFile.java (100%) rename {src => handler/src}/main/java/io/netty/handler/stream/ChunkedInput.java (100%) rename {src => handler/src}/main/java/io/netty/handler/stream/ChunkedNioFile.java (100%) rename {src => handler/src}/main/java/io/netty/handler/stream/ChunkedNioStream.java (100%) rename {src => handler/src}/main/java/io/netty/handler/stream/ChunkedStream.java (100%) rename {src => handler/src}/main/java/io/netty/handler/stream/ChunkedWriteHandler.java (100%) rename {src => handler/src}/main/java/io/netty/handler/stream/package-info.java (100%) rename {src => handler/src}/main/java/io/netty/handler/timeout/DefaultIdleStateEvent.java (100%) rename {src => handler/src}/main/java/io/netty/handler/timeout/IdleState.java (100%) rename {src => handler/src}/main/java/io/netty/handler/timeout/IdleStateAwareChannelHandler.java (100%) rename {src => handler/src}/main/java/io/netty/handler/timeout/IdleStateAwareChannelUpstreamHandler.java (100%) rename {src => handler/src}/main/java/io/netty/handler/timeout/IdleStateEvent.java (100%) rename {src => handler/src}/main/java/io/netty/handler/timeout/IdleStateHandler.java (100%) rename {src => handler/src}/main/java/io/netty/handler/timeout/ReadTimeoutException.java (100%) rename {src => handler/src}/main/java/io/netty/handler/timeout/ReadTimeoutHandler.java (100%) rename {src => handler/src}/main/java/io/netty/handler/timeout/TimeoutException.java (100%) rename {src => handler/src}/main/java/io/netty/handler/timeout/WriteTimeoutException.java (100%) rename {src => handler/src}/main/java/io/netty/handler/timeout/WriteTimeoutHandler.java (100%) rename {src => handler/src}/main/java/io/netty/handler/timeout/package-info.java (100%) rename {src => handler/src}/main/java/io/netty/handler/traffic/AbstractTrafficShapingHandler.java (71%) rename {src => handler/src}/main/java/io/netty/handler/traffic/ChannelTrafficShapingHandler.java (73%) rename {src => handler/src}/main/java/io/netty/handler/traffic/GlobalTrafficShapingHandler.java (67%) rename {src => handler/src}/main/java/io/netty/handler/traffic/TrafficCounter.java (100%) rename {src => handler/src}/main/java/io/netty/handler/traffic/package-info.java (100%) rename {src => handler/src}/test/java/io/netty/handler/ipfilter/IpFilterRuleTest.java (100%) rename {src => handler/src}/test/java/io/netty/handler/ssl/ImmediateExecutorTest.java (100%) delete mode 100644 src/assembly/default.xml delete mode 100644 src/javadoc/overview.html delete mode 100644 src/main/java/io/netty/container/osgi/NettyBundleActivator.java delete mode 100644 src/main/java/io/netty/util/DebugUtil.java delete mode 100644 src/main/java/io/netty/util/NamedThreadFactory.java delete mode 100644 src/main/java/io/netty/util/VirtualExecutorService.java delete mode 100644 src/main/java/io/netty/util/internal/StackTraceSimplifier.java delete mode 100644 src/site/template.vm delete mode 100644 src/test/java/io/netty/channel/socket/nio/NioDatagramChannelTest.java delete mode 100644 src/test/java/io/netty/channel/socket/nio/SimpleHandler.java delete mode 100644 src/test/java/io/netty/handler/ssl/AbstractSocketSslEchoTest.java delete mode 100644 src/test/java/io/netty/util/DebugUtilTest.java delete mode 100644 src/test/java/io/netty/util/internal/StackTraceSimplifierTest.java create mode 100644 testsuite/pom.xml rename {src/test/java/io/netty/bootstrap => testsuite/src/test/java/io/netty/testsuite/transport/socket}/AbstractSocketClientBootstrapTest.java (84%) rename {src/test/java/io/netty/handler/codec/serialization => testsuite/src/test/java/io/netty/testsuite/transport/socket}/AbstractSocketCompatibleObjectStreamEchoTest.java (94%) rename {src/test/java/io/netty/channel => testsuite/src/test/java/io/netty/testsuite/transport}/socket/AbstractSocketEchoTest.java (96%) rename {src/test/java/io/netty/handler/codec/frame => testsuite/src/test/java/io/netty/testsuite/transport/socket}/AbstractSocketFixedLengthEchoTest.java (96%) rename {src/test/java/io/netty/handler/codec/serialization => testsuite/src/test/java/io/netty/testsuite/transport/socket}/AbstractSocketObjectStreamEchoTest.java (95%) rename {src/test/java/io/netty/bootstrap => testsuite/src/test/java/io/netty/testsuite/transport/socket}/AbstractSocketServerBootstrapTest.java (88%) create mode 100644 testsuite/src/test/java/io/netty/testsuite/transport/socket/AbstractSocketSslEchoTest.java rename {src/test/java/io/netty/handler/codec/string => testsuite/src/test/java/io/netty/testsuite/transport/socket}/AbstractSocketStringEchoTest.java (95%) rename {src/test/java/io/netty/handler/codec/serialization => testsuite/src/test/java/io/netty/testsuite/transport/socket}/NioNioSocketCompatibleObjectStreamEchoTest.java (96%) rename {src/test/java/io/netty/handler/codec/frame => testsuite/src/test/java/io/netty/testsuite/transport/socket}/NioNioSocketFixedLengthEchoTest.java (96%) rename {src/test/java/io/netty/handler/codec/serialization => testsuite/src/test/java/io/netty/testsuite/transport/socket}/NioNioSocketObjectStreamEchoTest.java (96%) rename {src/test/java/io/netty/handler/codec/string => testsuite/src/test/java/io/netty/testsuite/transport/socket}/NioNioSocketStringEchoTest.java (96%) rename {src/test/java/io/netty/handler/codec/serialization => testsuite/src/test/java/io/netty/testsuite/transport/socket}/NioOioSocketCompatibleObjectStreamEchoTest.java (96%) rename {src/test/java/io/netty/handler/codec/frame => testsuite/src/test/java/io/netty/testsuite/transport/socket}/NioOioSocketFixedLengthEchoTest.java (96%) rename {src/test/java/io/netty/handler/codec/serialization => testsuite/src/test/java/io/netty/testsuite/transport/socket}/NioOioSocketObjectStreamEchoTest.java (96%) rename {src/test/java/io/netty/handler/codec/string => testsuite/src/test/java/io/netty/testsuite/transport/socket}/NioOioSocketStringEchoTest.java (96%) rename {src/test/java/io/netty/handler/codec/serialization => testsuite/src/test/java/io/netty/testsuite/transport/socket}/OioNioSocketCompatibleObjectStreamEchoTest.java (96%) rename {src/test/java/io/netty/handler/codec/frame => testsuite/src/test/java/io/netty/testsuite/transport/socket}/OioNioSocketFixedLengthEchoTest.java (96%) rename {src/test/java/io/netty/handler/codec/serialization => testsuite/src/test/java/io/netty/testsuite/transport/socket}/OioNioSocketObjectStreamEchoTest.java (96%) rename {src/test/java/io/netty/handler/codec/string => testsuite/src/test/java/io/netty/testsuite/transport/socket}/OioNioSocketStringEchoTest.java (96%) rename {src/test/java/io/netty/handler/codec/serialization => testsuite/src/test/java/io/netty/testsuite/transport/socket}/OioOioSocketCompatibleObjectStreamEchoTest.java (96%) rename {src/test/java/io/netty/handler/codec/frame => testsuite/src/test/java/io/netty/testsuite/transport/socket}/OioOioSocketFixedLengthEchoTest.java (96%) rename {src/test/java/io/netty/handler/codec/serialization => testsuite/src/test/java/io/netty/testsuite/transport/socket}/OioOioSocketObjectStreamEchoTest.java (96%) rename {src/test/java/io/netty/handler/codec/string => testsuite/src/test/java/io/netty/testsuite/transport/socket}/OioOioSocketStringEchoTest.java (96%) rename {src/test/java/io/netty/channel/socket => testsuite/src/test/java/io/netty/testsuite/transport/socket/nio}/NioClientSocketShutdownTimeTest.java (93%) rename {src/test/java/io/netty/channel/socket => testsuite/src/test/java/io/netty/testsuite/transport/socket/nio}/NioServerSocketShutdownTimeTest.java (96%) rename {src/test/java/io/netty/bootstrap => testsuite/src/test/java/io/netty/testsuite/transport/socket/nio}/NioSocketClientBootstrapTest.java (90%) rename {src/test/java/io/netty/bootstrap => testsuite/src/test/java/io/netty/testsuite/transport/socket/nio}/NioSocketServerBootstrapTest.java (90%) rename {src/test/java/io/netty/channel => testsuite/src/test/java/io/netty/testsuite/transport}/socket/nio/UdpClient.java (95%) rename {src/test/java/io/netty/channel/socket => testsuite/src/test/java/io/netty/testsuite/transport/socket/nio/nio}/NioNioSocketEchoTest.java (91%) rename {src/test/java/io/netty/handler/ssl => testsuite/src/test/java/io/netty/testsuite/transport/socket/nio/nio}/NioNioSocketSslEchoTest.java (91%) rename {src/test/java/io/netty/channel/socket => testsuite/src/test/java/io/netty/testsuite/transport/socket/nio/oio}/NioOioSocketEchoTest.java (91%) rename {src/test/java/io/netty/handler/ssl => testsuite/src/test/java/io/netty/testsuite/transport/socket/nio/oio}/NioOioSocketSslEchoTest.java (91%) rename {src/test/java/io/netty/bootstrap => testsuite/src/test/java/io/netty/testsuite/transport/socket/oio}/OioSocketClientBootstrapTest.java (90%) rename {src/test/java/io/netty/bootstrap => testsuite/src/test/java/io/netty/testsuite/transport/socket/oio}/OioSocketServerBootstrapTest.java (90%) rename {src/test/java/io/netty/channel/socket => testsuite/src/test/java/io/netty/testsuite/transport/socket/oio/nio}/OioNioSocketEchoTest.java (91%) rename {src/test/java/io/netty/handler/ssl => testsuite/src/test/java/io/netty/testsuite/transport/socket/oio/nio}/OioNioSocketSslEchoTest.java (91%) rename {src/test/java/io/netty/channel/socket => testsuite/src/test/java/io/netty/testsuite/transport/socket/oio/oio}/OioOioSocketEchoTest.java (91%) rename {src/test/java/io/netty/handler/ssl => testsuite/src/test/java/io/netty/testsuite/transport/socket/oio/oio}/OioOioSocketSslEchoTest.java (91%) rename {src/test/java/io/netty => testsuite/src/test/java/io/netty/testsuite}/util/DummyHandler.java (92%) create mode 100644 transport-http/pom.xml rename {src => transport-http/src}/main/java/io/netty/channel/socket/http/AcceptedServerChannelPipelineFactory.java (100%) rename {src => transport-http/src}/main/java/io/netty/channel/socket/http/AcceptedServerChannelRequestDispatch.java (100%) rename {src => transport-http/src}/main/java/io/netty/channel/socket/http/DefaultTunnelIdGenerator.java (100%) rename {src => transport-http/src}/main/java/io/netty/channel/socket/http/HttpTunnelAcceptedChannel.java (100%) rename {src => transport-http/src}/main/java/io/netty/channel/socket/http/HttpTunnelAcceptedChannelConfig.java (100%) rename {src => transport-http/src}/main/java/io/netty/channel/socket/http/HttpTunnelAcceptedChannelFactory.java (100%) rename {src => transport-http/src}/main/java/io/netty/channel/socket/http/HttpTunnelAcceptedChannelReceiver.java (100%) rename {src => transport-http/src}/main/java/io/netty/channel/socket/http/HttpTunnelAcceptedChannelSink.java (100%) rename {src => transport-http/src}/main/java/io/netty/channel/socket/http/HttpTunnelChannelConfig.java (100%) rename {src => transport-http/src}/main/java/io/netty/channel/socket/http/HttpTunnelClientChannel.java (100%) rename {src => transport-http/src}/main/java/io/netty/channel/socket/http/HttpTunnelClientChannelConfig.java (100%) rename {src => transport-http/src}/main/java/io/netty/channel/socket/http/HttpTunnelClientChannelFactory.java (100%) rename {src => transport-http/src}/main/java/io/netty/channel/socket/http/HttpTunnelClientChannelSink.java (100%) rename {src => transport-http/src}/main/java/io/netty/channel/socket/http/HttpTunnelClientPollHandler.java (100%) rename {src => transport-http/src}/main/java/io/netty/channel/socket/http/HttpTunnelClientSendHandler.java (100%) rename {src => transport-http/src}/main/java/io/netty/channel/socket/http/HttpTunnelClientWorkerOwner.java (100%) rename {src => transport-http/src}/main/java/io/netty/channel/socket/http/HttpTunnelMessageUtils.java (100%) rename {src => transport-http/src}/main/java/io/netty/channel/socket/http/HttpTunnelServerChannel.java (100%) rename {src => transport-http/src}/main/java/io/netty/channel/socket/http/HttpTunnelServerChannelConfig.java (100%) rename {src => transport-http/src}/main/java/io/netty/channel/socket/http/HttpTunnelServerChannelFactory.java (100%) rename {src => transport-http/src}/main/java/io/netty/channel/socket/http/HttpTunnelServerChannelSink.java (100%) rename {src => transport-http/src}/main/java/io/netty/channel/socket/http/SaturationManager.java (100%) rename {src => transport-http/src}/main/java/io/netty/channel/socket/http/SaturationStateChange.java (100%) rename {src => transport-http/src}/main/java/io/netty/channel/socket/http/ServerMessageSwitch.java (100%) rename {src => transport-http/src}/main/java/io/netty/channel/socket/http/ServerMessageSwitchDownstreamInterface.java (100%) rename {src => transport-http/src}/main/java/io/netty/channel/socket/http/ServerMessageSwitchUpstreamInterface.java (100%) rename {src => transport-http/src}/main/java/io/netty/channel/socket/http/TunnelIdGenerator.java (100%) rename {src => transport-http/src}/main/java/io/netty/channel/socket/http/TunnelWrappedServerChannelHandler.java (100%) rename {src => transport-http/src}/main/java/io/netty/channel/socket/http/WriteFragmenter.java (100%) rename {src => transport-http/src}/main/java/io/netty/channel/socket/http/WriteSplitter.java (100%) rename {src => transport-http/src}/main/java/io/netty/channel/socket/http/package-info.java (100%) rename {src => transport-http/src}/test/java/io/netty/channel/socket/http/AcceptedServerChannelRequestDispatchTest.java (100%) rename {src => transport-http/src}/test/java/io/netty/channel/socket/http/FakeChannelConfig.java (100%) rename {src => transport-http/src}/test/java/io/netty/channel/socket/http/FakeChannelSink.java (100%) rename {src => transport-http/src}/test/java/io/netty/channel/socket/http/FakeClientSocketChannelFactory.java (100%) rename {src => transport-http/src}/test/java/io/netty/channel/socket/http/FakeServerSocketChannel.java (100%) rename {src => transport-http/src}/test/java/io/netty/channel/socket/http/FakeServerSocketChannelConfig.java (100%) rename {src => transport-http/src}/test/java/io/netty/channel/socket/http/FakeServerSocketChannelFactory.java (100%) rename {src => transport-http/src}/test/java/io/netty/channel/socket/http/FakeSocketChannel.java (100%) rename {src => transport-http/src}/test/java/io/netty/channel/socket/http/HttpTunnelAcceptedChannelSinkTest.java (100%) rename {src => transport-http/src}/test/java/io/netty/channel/socket/http/HttpTunnelClientChannelConfigTest.java (100%) rename {src => transport-http/src}/test/java/io/netty/channel/socket/http/HttpTunnelClientChannelTest.java (100%) rename {src => transport-http/src}/test/java/io/netty/channel/socket/http/HttpTunnelClientPollHandlerTest.java (100%) rename {src => transport-http/src}/test/java/io/netty/channel/socket/http/HttpTunnelClientSendHandlerTest.java (100%) rename {src => transport-http/src}/test/java/io/netty/channel/socket/http/HttpTunnelServerChannelFactoryTest.java (100%) rename {src => transport-http/src}/test/java/io/netty/channel/socket/http/HttpTunnelServerChannelSinkTest.java (100%) rename {src => transport-http/src}/test/java/io/netty/channel/socket/http/HttpTunnelServerChannelTest.java (100%) rename {src => transport-http/src}/test/java/io/netty/channel/socket/http/HttpTunnelSoakTester.java (100%) rename {src => transport-http/src}/test/java/io/netty/channel/socket/http/HttpTunnelTest.java (100%) rename {src => transport-http/src}/test/java/io/netty/channel/socket/http/MockChannelStateListener.java (100%) rename {src => transport-http/src}/test/java/io/netty/channel/socket/http/NettyTestUtils.java (100%) rename {src => transport-http/src}/test/java/io/netty/channel/socket/http/NettyTestUtilsTest.java (100%) rename {src => transport-http/src}/test/java/io/netty/channel/socket/http/NullChannelHandler.java (100%) rename {src => transport-http/src}/test/java/io/netty/channel/socket/http/SaturationManagerTest.java (100%) rename {src => transport-http/src}/test/java/io/netty/channel/socket/http/ServerMessageSwitchTest.java (100%) rename {src => transport-http/src}/test/java/io/netty/channel/socket/http/UpstreamEventCatcher.java (100%) rename {src => transport-http/src}/test/java/io/netty/channel/socket/http/WriteFragmenterTest.java (100%) rename {src => transport-http/src}/test/java/io/netty/channel/socket/http/WriteSplitterTest.java (100%) create mode 100644 transport-rxtx/pom.xml rename {src => transport-rxtx/src}/main/java/io/netty/channel/rxtx/RXTXChannel.java (100%) rename {src => transport-rxtx/src}/main/java/io/netty/channel/rxtx/RXTXChannelConfig.java (100%) rename {src => transport-rxtx/src}/main/java/io/netty/channel/rxtx/RXTXChannelFactory.java (100%) rename {src => transport-rxtx/src}/main/java/io/netty/channel/rxtx/RXTXChannelSink.java (100%) rename {src => transport-rxtx/src}/main/java/io/netty/channel/rxtx/RXTXDeviceAddress.java (100%) create mode 100644 transport-sctp/pom.xml create mode 100644 transport-sctp/src/main/java/com/sun/nio/sctp/AbstractNotificationHandler.java rename src/main/java/io/netty/container/osgi/package-info.java => transport-sctp/src/main/java/com/sun/nio/sctp/Association.java (83%) create mode 100644 transport-sctp/src/main/java/com/sun/nio/sctp/AssociationChangeNotification.java create mode 100644 transport-sctp/src/main/java/com/sun/nio/sctp/HandlerResult.java create mode 100644 transport-sctp/src/main/java/com/sun/nio/sctp/MessageInfo.java rename src/main/java/io/netty/container/spring/package-info.java => transport-sctp/src/main/java/com/sun/nio/sctp/Notification.java (81%) rename src/main/java/io/netty/container/microcontainer/package-info.java => transport-sctp/src/main/java/com/sun/nio/sctp/NotificationHandler.java (80%) create mode 100644 transport-sctp/src/main/java/com/sun/nio/sctp/PeerAddressChangeNotification.java create mode 100644 transport-sctp/src/main/java/com/sun/nio/sctp/SctpChannel.java create mode 100644 transport-sctp/src/main/java/com/sun/nio/sctp/SctpServerChannel.java create mode 100644 transport-sctp/src/main/java/com/sun/nio/sctp/SctpSocketOption.java create mode 100644 transport-sctp/src/main/java/com/sun/nio/sctp/SctpStandardSocketOptions.java create mode 100644 transport-sctp/src/main/java/com/sun/nio/sctp/SendFailedNotification.java create mode 100644 transport-sctp/src/main/java/com/sun/nio/sctp/ShutdownNotification.java rename src/main/java/io/netty/container/spring/NettyLoggerConfigurator.java => transport-sctp/src/main/java/com/sun/nio/sctp/UnsupportedOperatingSystemException.java (52%) create mode 100644 transport-sctp/src/main/java/io/netty/channel/sctp/AbstractWriteRequestQueue.java rename {src/main/java/io/netty/channel/socket => transport-sctp/src/main/java/io/netty/channel}/sctp/DefaultNioSctpChannelConfig.java (99%) rename {src/main/java/io/netty/channel/socket => transport-sctp/src/main/java/io/netty/channel}/sctp/DefaultSctpChannelConfig.java (99%) rename {src/main/java/io/netty/channel/socket => transport-sctp/src/main/java/io/netty/channel}/sctp/DefaultSctpServerChannelConfig.java (98%) rename {src/main/java/io/netty/channel/socket => transport-sctp/src/main/java/io/netty/channel}/sctp/NioSctpChannelConfig.java (95%) rename {src/main/java/io/netty/channel/socket => transport-sctp/src/main/java/io/netty/channel}/sctp/SctpAcceptedChannel.java (97%) rename {src/main/java/io/netty/channel/socket => transport-sctp/src/main/java/io/netty/channel}/sctp/SctpChannel.java (97%) rename {src/main/java/io/netty/channel/socket => transport-sctp/src/main/java/io/netty/channel}/sctp/SctpChannelConfig.java (95%) rename {src/main/java/io/netty/channel/socket => transport-sctp/src/main/java/io/netty/channel}/sctp/SctpChannelImpl.java (96%) rename {src/main/java/io/netty/channel/socket => transport-sctp/src/main/java/io/netty/channel}/sctp/SctpClientChannel.java (98%) rename {src/main/java/io/netty/channel/socket => transport-sctp/src/main/java/io/netty/channel}/sctp/SctpClientPipelineSink.java (98%) rename {src/main/java/io/netty/channel/socket => transport-sctp/src/main/java/io/netty/channel}/sctp/SctpClientSocketChannelFactory.java (99%) rename {src/main/java/io/netty/channel/socket => transport-sctp/src/main/java/io/netty/channel}/sctp/SctpNotificationEvent.java (97%) rename {src/main/java/io/netty/channel/socket => transport-sctp/src/main/java/io/netty/channel}/sctp/SctpNotificationHandler.java (98%) rename {src/main/java/io/netty/channel/socket => transport-sctp/src/main/java/io/netty/channel}/sctp/SctpPayload.java (98%) rename {src/main/java/io/netty/channel/socket => transport-sctp/src/main/java/io/netty/channel}/sctp/SctpProviderMetadata.java (99%) rename {src/main/java/io/netty/channel/socket => transport-sctp/src/main/java/io/netty/channel}/sctp/SctpReceiveBufferPool.java (98%) rename {src/main/java/io/netty/channel/socket => transport-sctp/src/main/java/io/netty/channel}/sctp/SctpSendBufferPool.java (99%) rename {src/main/java/io/netty/channel/socket => transport-sctp/src/main/java/io/netty/channel}/sctp/SctpServerChannel.java (97%) rename {src/main/java/io/netty/channel/socket => transport-sctp/src/main/java/io/netty/channel}/sctp/SctpServerChannelConfig.java (98%) rename {src/main/java/io/netty/channel/socket => transport-sctp/src/main/java/io/netty/channel}/sctp/SctpServerChannelImpl.java (99%) rename {src/main/java/io/netty/channel/socket => transport-sctp/src/main/java/io/netty/channel}/sctp/SctpServerPipelineSink.java (99%) rename {src/main/java/io/netty/channel/socket => transport-sctp/src/main/java/io/netty/channel}/sctp/SctpServerSocketChannelFactory.java (99%) rename {src/main/java/io/netty/channel/socket => transport-sctp/src/main/java/io/netty/channel}/sctp/SctpWorker.java (98%) rename {src/main/java/io/netty/channel/socket => transport-sctp/src/main/java/io/netty/channel}/sctp/SelectorUtil.java (97%) rename {src/main/java/io/netty/channel/socket => transport-sctp/src/main/java/io/netty/channel}/sctp/package-info.java (95%) create mode 100644 transport/pom.xml rename {src => transport/src}/main/java/io/netty/bootstrap/Bootstrap.java (100%) rename {src => transport/src}/main/java/io/netty/bootstrap/ClientBootstrap.java (100%) rename {src => transport/src}/main/java/io/netty/bootstrap/ConnectionlessBootstrap.java (100%) rename {src => transport/src}/main/java/io/netty/bootstrap/ServerBootstrap.java (100%) rename {src => transport/src}/main/java/io/netty/bootstrap/package-info.java (100%) rename {src => transport/src}/main/java/io/netty/channel/AbstractChannel.java (100%) rename {src => transport/src}/main/java/io/netty/channel/AbstractChannelSink.java (100%) rename {src => transport/src}/main/java/io/netty/channel/AbstractServerChannel.java (100%) rename {src => transport/src}/main/java/io/netty/channel/AdaptiveReceiveBufferSizePredictor.java (100%) rename {src => transport/src}/main/java/io/netty/channel/AdaptiveReceiveBufferSizePredictorFactory.java (100%) rename {src => transport/src}/main/java/io/netty/channel/Channel.java (100%) rename {src => transport/src}/main/java/io/netty/channel/ChannelConfig.java (100%) rename {src => transport/src}/main/java/io/netty/channel/ChannelDownstreamHandler.java (100%) rename {src => transport/src}/main/java/io/netty/channel/ChannelEvent.java (100%) rename {src => transport/src}/main/java/io/netty/channel/ChannelException.java (100%) rename {src => transport/src}/main/java/io/netty/channel/ChannelFactory.java (100%) rename {src => transport/src}/main/java/io/netty/channel/ChannelFuture.java (97%) rename {src => transport/src}/main/java/io/netty/channel/ChannelFutureAggregator.java (100%) rename {src => transport/src}/main/java/io/netty/channel/ChannelFutureListener.java (100%) rename {src => transport/src}/main/java/io/netty/channel/ChannelFutureProgressListener.java (100%) rename {src => transport/src}/main/java/io/netty/channel/ChannelHandler.java (100%) rename {src => transport/src}/main/java/io/netty/channel/ChannelHandlerContext.java (100%) rename {src => transport/src}/main/java/io/netty/channel/ChannelHandlerLifeCycleException.java (100%) rename {src => transport/src}/main/java/io/netty/channel/ChannelLocal.java (100%) rename {src => transport/src}/main/java/io/netty/channel/ChannelPipeline.java (97%) rename {src => transport/src}/main/java/io/netty/channel/ChannelPipelineException.java (100%) rename {src => transport/src}/main/java/io/netty/channel/ChannelPipelineFactory.java (100%) rename {src => transport/src}/main/java/io/netty/channel/ChannelSink.java (100%) rename {src => transport/src}/main/java/io/netty/channel/ChannelState.java (100%) rename {src => transport/src}/main/java/io/netty/channel/ChannelStateEvent.java (100%) rename {src => transport/src}/main/java/io/netty/channel/ChannelUpstreamHandler.java (90%) rename {src => transport/src}/main/java/io/netty/channel/Channels.java (100%) rename {src => transport/src}/main/java/io/netty/channel/ChildChannelStateEvent.java (100%) rename {src => transport/src}/main/java/io/netty/channel/CompleteChannelFuture.java (100%) rename {src => transport/src}/main/java/io/netty/channel/DefaultChannelConfig.java (100%) rename {src => transport/src}/main/java/io/netty/channel/DefaultChannelFuture.java (100%) rename {src => transport/src}/main/java/io/netty/channel/DefaultChannelPipeline.java (100%) rename {src => transport/src}/main/java/io/netty/channel/DefaultChildChannelStateEvent.java (100%) rename {src => transport/src}/main/java/io/netty/channel/DefaultExceptionEvent.java (94%) rename {src => transport/src}/main/java/io/netty/channel/DefaultFileRegion.java (100%) rename {src => transport/src}/main/java/io/netty/channel/DefaultServerChannelConfig.java (100%) rename {src => transport/src}/main/java/io/netty/channel/DefaultWriteCompletionEvent.java (100%) rename {src => transport/src}/main/java/io/netty/channel/DownstreamChannelStateEvent.java (100%) rename {src => transport/src}/main/java/io/netty/channel/DownstreamMessageEvent.java (100%) rename {src => transport/src}/main/java/io/netty/channel/ExceptionEvent.java (100%) rename {src => transport/src}/main/java/io/netty/channel/FailedChannelFuture.java (100%) rename {src => transport/src}/main/java/io/netty/channel/FileRegion.java (100%) rename {src => transport/src}/main/java/io/netty/channel/FixedReceiveBufferSizePredictor.java (100%) rename {src => transport/src}/main/java/io/netty/channel/FixedReceiveBufferSizePredictorFactory.java (100%) rename {src => transport/src}/main/java/io/netty/channel/LifeCycleAwareChannelHandler.java (100%) rename {src => transport/src}/main/java/io/netty/channel/MessageEvent.java (100%) rename {src => transport/src}/main/java/io/netty/channel/ReceiveBufferSizePredictor.java (100%) rename {src => transport/src}/main/java/io/netty/channel/ReceiveBufferSizePredictorFactory.java (100%) rename {src => transport/src}/main/java/io/netty/channel/ServerChannel.java (100%) rename {src => transport/src}/main/java/io/netty/channel/ServerChannelFactory.java (100%) rename {src => transport/src}/main/java/io/netty/channel/SimpleChannelDownstreamHandler.java (100%) rename {src => transport/src}/main/java/io/netty/channel/SimpleChannelHandler.java (100%) rename {src => transport/src}/main/java/io/netty/channel/SimpleChannelUpstreamHandler.java (100%) rename {src => transport/src}/main/java/io/netty/channel/StaticChannelPipeline.java (100%) rename {src => transport/src}/main/java/io/netty/channel/SucceededChannelFuture.java (100%) rename {src => transport/src}/main/java/io/netty/channel/UpstreamChannelStateEvent.java (100%) rename {src => transport/src}/main/java/io/netty/channel/UpstreamMessageEvent.java (100%) rename {src => transport/src}/main/java/io/netty/channel/WriteCompletionEvent.java (100%) rename {src => transport/src}/main/java/io/netty/channel/group/ChannelGroup.java (100%) rename {src => transport/src}/main/java/io/netty/channel/group/ChannelGroupFuture.java (98%) rename {src => transport/src}/main/java/io/netty/channel/group/ChannelGroupFutureListener.java (100%) rename {src => transport/src}/main/java/io/netty/channel/group/CombinedIterator.java (100%) rename {src => transport/src}/main/java/io/netty/channel/group/DefaultChannelGroup.java (100%) rename {src => transport/src}/main/java/io/netty/channel/group/DefaultChannelGroupFuture.java (100%) rename {src => transport/src}/main/java/io/netty/channel/group/package-info.java (100%) rename {src => transport/src}/main/java/io/netty/channel/iostream/IOStreamAddress.java (100%) rename {src => transport/src}/main/java/io/netty/channel/iostream/IOStreamChannel.java (100%) rename {src => transport/src}/main/java/io/netty/channel/iostream/IOStreamChannelFactory.java (100%) rename {src => transport/src}/main/java/io/netty/channel/iostream/IOStreamChannelSink.java (100%) rename {src => transport/src}/main/java/io/netty/channel/local/DefaultLocalChannel.java (100%) rename {src => transport/src}/main/java/io/netty/channel/local/DefaultLocalClientChannelFactory.java (100%) rename {src => transport/src}/main/java/io/netty/channel/local/DefaultLocalServerChannel.java (100%) rename {src => transport/src}/main/java/io/netty/channel/local/DefaultLocalServerChannelFactory.java (100%) rename {src => transport/src}/main/java/io/netty/channel/local/LocalAddress.java (100%) rename {src => transport/src}/main/java/io/netty/channel/local/LocalChannel.java (100%) rename {src => transport/src}/main/java/io/netty/channel/local/LocalChannelRegistry.java (100%) rename {src => transport/src}/main/java/io/netty/channel/local/LocalClientChannelFactory.java (100%) rename {src => transport/src}/main/java/io/netty/channel/local/LocalClientChannelSink.java (100%) rename {src => transport/src}/main/java/io/netty/channel/local/LocalServerChannel.java (100%) rename {src => transport/src}/main/java/io/netty/channel/local/LocalServerChannelFactory.java (100%) rename {src => transport/src}/main/java/io/netty/channel/local/LocalServerChannelSink.java (100%) rename {src => transport/src}/main/java/io/netty/channel/local/package-info.java (100%) rename {src => transport/src}/main/java/io/netty/channel/package-info.java (100%) rename {src => transport/src}/main/java/io/netty/channel/socket/ClientSocketChannelFactory.java (100%) rename {src => transport/src}/main/java/io/netty/channel/socket/DatagramChannel.java (100%) rename {src => transport/src}/main/java/io/netty/channel/socket/DatagramChannelConfig.java (100%) rename {src => transport/src}/main/java/io/netty/channel/socket/DatagramChannelFactory.java (100%) rename {src => transport/src}/main/java/io/netty/channel/socket/DefaultDatagramChannelConfig.java (100%) rename {src => transport/src}/main/java/io/netty/channel/socket/DefaultServerSocketChannelConfig.java (100%) rename {src => transport/src}/main/java/io/netty/channel/socket/DefaultSocketChannelConfig.java (100%) rename {src => transport/src}/main/java/io/netty/channel/socket/ServerSocketChannel.java (100%) rename {src => transport/src}/main/java/io/netty/channel/socket/ServerSocketChannelConfig.java (100%) rename {src => transport/src}/main/java/io/netty/channel/socket/ServerSocketChannelFactory.java (100%) rename {src => transport/src}/main/java/io/netty/channel/socket/SocketChannel.java (100%) rename {src => transport/src}/main/java/io/netty/channel/socket/SocketChannelConfig.java (100%) rename {src => transport/src}/main/java/io/netty/channel/socket/nio/AbstractWriteRequestQueue.java (100%) rename {src => transport/src}/main/java/io/netty/channel/socket/nio/DefaultNioDatagramChannelConfig.java (100%) rename {src => transport/src}/main/java/io/netty/channel/socket/nio/DefaultNioSocketChannelConfig.java (100%) rename {src => transport/src}/main/java/io/netty/channel/socket/nio/NioAcceptedSocketChannel.java (100%) rename {src => transport/src}/main/java/io/netty/channel/socket/nio/NioClientSocketChannel.java (100%) rename {src => transport/src}/main/java/io/netty/channel/socket/nio/NioClientSocketChannelFactory.java (100%) rename {src => transport/src}/main/java/io/netty/channel/socket/nio/NioClientSocketPipelineSink.java (100%) rename {src => transport/src}/main/java/io/netty/channel/socket/nio/NioDatagramChannel.java (100%) rename {src => transport/src}/main/java/io/netty/channel/socket/nio/NioDatagramChannelConfig.java (100%) rename {src => transport/src}/main/java/io/netty/channel/socket/nio/NioDatagramChannelFactory.java (100%) rename {src => transport/src}/main/java/io/netty/channel/socket/nio/NioDatagramPipelineSink.java (100%) rename {src => transport/src}/main/java/io/netty/channel/socket/nio/NioDatagramWorker.java (100%) rename {src => transport/src}/main/java/io/netty/channel/socket/nio/NioProviderMetadata.java (100%) rename {src => transport/src}/main/java/io/netty/channel/socket/nio/NioServerSocketChannel.java (100%) rename {src => transport/src}/main/java/io/netty/channel/socket/nio/NioServerSocketChannelFactory.java (100%) rename {src => transport/src}/main/java/io/netty/channel/socket/nio/NioServerSocketPipelineSink.java (100%) rename {src => transport/src}/main/java/io/netty/channel/socket/nio/NioSocketChannel.java (100%) rename {src => transport/src}/main/java/io/netty/channel/socket/nio/NioSocketChannelConfig.java (100%) rename {src => transport/src}/main/java/io/netty/channel/socket/nio/NioWorker.java (100%) rename {src => transport/src}/main/java/io/netty/channel/socket/nio/SelectorUtil.java (100%) rename {src => transport/src}/main/java/io/netty/channel/socket/nio/SocketReceiveBufferPool.java (100%) rename {src => transport/src}/main/java/io/netty/channel/socket/nio/SocketSendBufferPool.java (100%) rename {src => transport/src}/main/java/io/netty/channel/socket/nio/package-info.java (100%) rename {src => transport/src}/main/java/io/netty/channel/socket/oio/OioAcceptedSocketChannel.java (100%) rename {src => transport/src}/main/java/io/netty/channel/socket/oio/OioClientSocketChannel.java (100%) rename {src => transport/src}/main/java/io/netty/channel/socket/oio/OioClientSocketChannelFactory.java (100%) rename {src => transport/src}/main/java/io/netty/channel/socket/oio/OioClientSocketPipelineSink.java (100%) rename {src => transport/src}/main/java/io/netty/channel/socket/oio/OioDatagramChannel.java (100%) rename {src => transport/src}/main/java/io/netty/channel/socket/oio/OioDatagramChannelFactory.java (100%) rename {src => transport/src}/main/java/io/netty/channel/socket/oio/OioDatagramPipelineSink.java (100%) rename {src => transport/src}/main/java/io/netty/channel/socket/oio/OioDatagramWorker.java (100%) rename {src => transport/src}/main/java/io/netty/channel/socket/oio/OioServerSocketChannel.java (100%) rename {src => transport/src}/main/java/io/netty/channel/socket/oio/OioServerSocketChannelFactory.java (100%) rename {src => transport/src}/main/java/io/netty/channel/socket/oio/OioServerSocketPipelineSink.java (100%) rename {src => transport/src}/main/java/io/netty/channel/socket/oio/OioSocketChannel.java (100%) rename {src => transport/src}/main/java/io/netty/channel/socket/oio/OioWorker.java (100%) rename {src => transport/src}/main/java/io/netty/channel/socket/oio/package-info.java (100%) rename {src => transport/src}/main/java/io/netty/channel/socket/package-info.java (100%) rename {src => transport/src}/test/java/io/netty/bootstrap/BootstrapOrderedMapTest.java (100%) rename {src => transport/src}/test/java/io/netty/bootstrap/BootstrapTest.java (94%) rename {src => transport/src}/test/java/io/netty/channel/CompleteChannelFutureTest.java (100%) rename {src => transport/src}/test/java/io/netty/channel/DefaultChannelPipelineTest.java (100%) rename {src => transport/src}/test/java/io/netty/channel/FailedChannelFutureTest.java (100%) rename {src => transport/src}/test/java/io/netty/channel/StaticChannelPipelineTest.java (100%) rename {src => transport/src}/test/java/io/netty/channel/SucceededChannelFutureTest.java (100%) diff --git a/.gitignore b/.gitignore index bec6213641..a490df6613 100644 --- a/.gitignore +++ b/.gitignore @@ -1,10 +1,12 @@ -/.project -/.classpath -/.settings -/target +.project +.classpath +.settings +*.iml +*.ipr +*.iws +.geany +*/target +*/target /reports -/src/main/java/io/netty/util/Version.java -/*.iml -/*.ipr -/*.iws -/*.geany +*/reports + diff --git a/all/pom.xml b/all/pom.xml new file mode 100644 index 0000000000..0af1390cfc --- /dev/null +++ b/all/pom.xml @@ -0,0 +1,32 @@ + + + + + 4.0.0 + + io.netty + netty-parent + 4.0.0.Alpha1-SNAPSHOT + + + io.netty + netty + jar + + Netty/All-in-One + + diff --git a/buffer/pom.xml b/buffer/pom.xml new file mode 100644 index 0000000000..eb1d841c09 --- /dev/null +++ b/buffer/pom.xml @@ -0,0 +1,40 @@ + + + + + 4.0.0 + + io.netty + netty-parent + 4.0.0.Alpha1-SNAPSHOT + + + io.netty + netty-buffer + jar + + Netty/Buffer + + + + ${project.groupId} + netty-common + ${project.version} + + + + diff --git a/src/main/java/io/netty/buffer/AbstractChannelBuffer.java b/buffer/src/main/java/io/netty/buffer/AbstractChannelBuffer.java similarity index 100% rename from src/main/java/io/netty/buffer/AbstractChannelBuffer.java rename to buffer/src/main/java/io/netty/buffer/AbstractChannelBuffer.java diff --git a/src/main/java/io/netty/buffer/AbstractChannelBufferFactory.java b/buffer/src/main/java/io/netty/buffer/AbstractChannelBufferFactory.java similarity index 100% rename from src/main/java/io/netty/buffer/AbstractChannelBufferFactory.java rename to buffer/src/main/java/io/netty/buffer/AbstractChannelBufferFactory.java diff --git a/src/main/java/io/netty/buffer/BigEndianHeapChannelBuffer.java b/buffer/src/main/java/io/netty/buffer/BigEndianHeapChannelBuffer.java similarity index 100% rename from src/main/java/io/netty/buffer/BigEndianHeapChannelBuffer.java rename to buffer/src/main/java/io/netty/buffer/BigEndianHeapChannelBuffer.java diff --git a/src/main/java/io/netty/buffer/ByteBufferBackedChannelBuffer.java b/buffer/src/main/java/io/netty/buffer/ByteBufferBackedChannelBuffer.java similarity index 100% rename from src/main/java/io/netty/buffer/ByteBufferBackedChannelBuffer.java rename to buffer/src/main/java/io/netty/buffer/ByteBufferBackedChannelBuffer.java diff --git a/src/main/java/io/netty/buffer/ChannelBuffer.java b/buffer/src/main/java/io/netty/buffer/ChannelBuffer.java similarity index 100% rename from src/main/java/io/netty/buffer/ChannelBuffer.java rename to buffer/src/main/java/io/netty/buffer/ChannelBuffer.java diff --git a/src/main/java/io/netty/buffer/ChannelBufferFactory.java b/buffer/src/main/java/io/netty/buffer/ChannelBufferFactory.java similarity index 100% rename from src/main/java/io/netty/buffer/ChannelBufferFactory.java rename to buffer/src/main/java/io/netty/buffer/ChannelBufferFactory.java diff --git a/src/main/java/io/netty/buffer/ChannelBufferIndexFinder.java b/buffer/src/main/java/io/netty/buffer/ChannelBufferIndexFinder.java similarity index 100% rename from src/main/java/io/netty/buffer/ChannelBufferIndexFinder.java rename to buffer/src/main/java/io/netty/buffer/ChannelBufferIndexFinder.java diff --git a/src/main/java/io/netty/buffer/ChannelBufferInputStream.java b/buffer/src/main/java/io/netty/buffer/ChannelBufferInputStream.java similarity index 100% rename from src/main/java/io/netty/buffer/ChannelBufferInputStream.java rename to buffer/src/main/java/io/netty/buffer/ChannelBufferInputStream.java diff --git a/src/main/java/io/netty/buffer/ChannelBufferOutputStream.java b/buffer/src/main/java/io/netty/buffer/ChannelBufferOutputStream.java similarity index 100% rename from src/main/java/io/netty/buffer/ChannelBufferOutputStream.java rename to buffer/src/main/java/io/netty/buffer/ChannelBufferOutputStream.java diff --git a/src/main/java/io/netty/buffer/ChannelBuffers.java b/buffer/src/main/java/io/netty/buffer/ChannelBuffers.java similarity index 100% rename from src/main/java/io/netty/buffer/ChannelBuffers.java rename to buffer/src/main/java/io/netty/buffer/ChannelBuffers.java diff --git a/src/main/java/io/netty/buffer/CompositeChannelBuffer.java b/buffer/src/main/java/io/netty/buffer/CompositeChannelBuffer.java similarity index 100% rename from src/main/java/io/netty/buffer/CompositeChannelBuffer.java rename to buffer/src/main/java/io/netty/buffer/CompositeChannelBuffer.java diff --git a/src/main/java/io/netty/buffer/DirectChannelBufferFactory.java b/buffer/src/main/java/io/netty/buffer/DirectChannelBufferFactory.java similarity index 100% rename from src/main/java/io/netty/buffer/DirectChannelBufferFactory.java rename to buffer/src/main/java/io/netty/buffer/DirectChannelBufferFactory.java diff --git a/src/main/java/io/netty/buffer/DuplicatedChannelBuffer.java b/buffer/src/main/java/io/netty/buffer/DuplicatedChannelBuffer.java similarity index 100% rename from src/main/java/io/netty/buffer/DuplicatedChannelBuffer.java rename to buffer/src/main/java/io/netty/buffer/DuplicatedChannelBuffer.java diff --git a/src/main/java/io/netty/buffer/DynamicChannelBuffer.java b/buffer/src/main/java/io/netty/buffer/DynamicChannelBuffer.java similarity index 100% rename from src/main/java/io/netty/buffer/DynamicChannelBuffer.java rename to buffer/src/main/java/io/netty/buffer/DynamicChannelBuffer.java diff --git a/src/main/java/io/netty/buffer/HeapChannelBuffer.java b/buffer/src/main/java/io/netty/buffer/HeapChannelBuffer.java similarity index 100% rename from src/main/java/io/netty/buffer/HeapChannelBuffer.java rename to buffer/src/main/java/io/netty/buffer/HeapChannelBuffer.java diff --git a/src/main/java/io/netty/buffer/HeapChannelBufferFactory.java b/buffer/src/main/java/io/netty/buffer/HeapChannelBufferFactory.java similarity index 100% rename from src/main/java/io/netty/buffer/HeapChannelBufferFactory.java rename to buffer/src/main/java/io/netty/buffer/HeapChannelBufferFactory.java diff --git a/src/main/java/io/netty/buffer/LittleEndianHeapChannelBuffer.java b/buffer/src/main/java/io/netty/buffer/LittleEndianHeapChannelBuffer.java similarity index 100% rename from src/main/java/io/netty/buffer/LittleEndianHeapChannelBuffer.java rename to buffer/src/main/java/io/netty/buffer/LittleEndianHeapChannelBuffer.java diff --git a/src/main/java/io/netty/buffer/ReadOnlyChannelBuffer.java b/buffer/src/main/java/io/netty/buffer/ReadOnlyChannelBuffer.java similarity index 100% rename from src/main/java/io/netty/buffer/ReadOnlyChannelBuffer.java rename to buffer/src/main/java/io/netty/buffer/ReadOnlyChannelBuffer.java diff --git a/src/main/java/io/netty/buffer/SlicedChannelBuffer.java b/buffer/src/main/java/io/netty/buffer/SlicedChannelBuffer.java similarity index 100% rename from src/main/java/io/netty/buffer/SlicedChannelBuffer.java rename to buffer/src/main/java/io/netty/buffer/SlicedChannelBuffer.java diff --git a/src/main/java/io/netty/buffer/TruncatedChannelBuffer.java b/buffer/src/main/java/io/netty/buffer/TruncatedChannelBuffer.java similarity index 100% rename from src/main/java/io/netty/buffer/TruncatedChannelBuffer.java rename to buffer/src/main/java/io/netty/buffer/TruncatedChannelBuffer.java diff --git a/src/main/java/io/netty/buffer/WrappedChannelBuffer.java b/buffer/src/main/java/io/netty/buffer/WrappedChannelBuffer.java similarity index 100% rename from src/main/java/io/netty/buffer/WrappedChannelBuffer.java rename to buffer/src/main/java/io/netty/buffer/WrappedChannelBuffer.java diff --git a/src/main/java/io/netty/buffer/package-info.java b/buffer/src/main/java/io/netty/buffer/package-info.java similarity index 100% rename from src/main/java/io/netty/buffer/package-info.java rename to buffer/src/main/java/io/netty/buffer/package-info.java diff --git a/src/test/java/io/netty/buffer/AbstractChannelBufferTest.java b/buffer/src/test/java/io/netty/buffer/AbstractChannelBufferTest.java similarity index 100% rename from src/test/java/io/netty/buffer/AbstractChannelBufferTest.java rename to buffer/src/test/java/io/netty/buffer/AbstractChannelBufferTest.java diff --git a/src/test/java/io/netty/buffer/AbstractCompositeChannelBufferTest.java b/buffer/src/test/java/io/netty/buffer/AbstractCompositeChannelBufferTest.java similarity index 100% rename from src/test/java/io/netty/buffer/AbstractCompositeChannelBufferTest.java rename to buffer/src/test/java/io/netty/buffer/AbstractCompositeChannelBufferTest.java diff --git a/src/test/java/io/netty/buffer/BigEndianCompositeChannelBufferTest.java b/buffer/src/test/java/io/netty/buffer/BigEndianCompositeChannelBufferTest.java similarity index 100% rename from src/test/java/io/netty/buffer/BigEndianCompositeChannelBufferTest.java rename to buffer/src/test/java/io/netty/buffer/BigEndianCompositeChannelBufferTest.java diff --git a/src/test/java/io/netty/buffer/BigEndianDirectChannelBufferTest.java b/buffer/src/test/java/io/netty/buffer/BigEndianDirectChannelBufferTest.java similarity index 100% rename from src/test/java/io/netty/buffer/BigEndianDirectChannelBufferTest.java rename to buffer/src/test/java/io/netty/buffer/BigEndianDirectChannelBufferTest.java diff --git a/src/test/java/io/netty/buffer/BigEndianHeapChannelBufferTest.java b/buffer/src/test/java/io/netty/buffer/BigEndianHeapChannelBufferTest.java similarity index 100% rename from src/test/java/io/netty/buffer/BigEndianHeapChannelBufferTest.java rename to buffer/src/test/java/io/netty/buffer/BigEndianHeapChannelBufferTest.java diff --git a/src/test/java/io/netty/buffer/ByteBufferBackedHeapChannelBufferTest.java b/buffer/src/test/java/io/netty/buffer/ByteBufferBackedHeapChannelBufferTest.java similarity index 100% rename from src/test/java/io/netty/buffer/ByteBufferBackedHeapChannelBufferTest.java rename to buffer/src/test/java/io/netty/buffer/ByteBufferBackedHeapChannelBufferTest.java diff --git a/src/test/java/io/netty/buffer/ChannelBufferIndexFinderTest.java b/buffer/src/test/java/io/netty/buffer/ChannelBufferIndexFinderTest.java similarity index 100% rename from src/test/java/io/netty/buffer/ChannelBufferIndexFinderTest.java rename to buffer/src/test/java/io/netty/buffer/ChannelBufferIndexFinderTest.java diff --git a/src/test/java/io/netty/buffer/ChannelBufferStreamTest.java b/buffer/src/test/java/io/netty/buffer/ChannelBufferStreamTest.java similarity index 100% rename from src/test/java/io/netty/buffer/ChannelBufferStreamTest.java rename to buffer/src/test/java/io/netty/buffer/ChannelBufferStreamTest.java diff --git a/src/test/java/io/netty/buffer/ChannelBuffersTest.java b/buffer/src/test/java/io/netty/buffer/ChannelBuffersTest.java similarity index 100% rename from src/test/java/io/netty/buffer/ChannelBuffersTest.java rename to buffer/src/test/java/io/netty/buffer/ChannelBuffersTest.java diff --git a/src/test/java/io/netty/buffer/DuplicateChannelBufferTest.java b/buffer/src/test/java/io/netty/buffer/DuplicateChannelBufferTest.java similarity index 100% rename from src/test/java/io/netty/buffer/DuplicateChannelBufferTest.java rename to buffer/src/test/java/io/netty/buffer/DuplicateChannelBufferTest.java diff --git a/src/test/java/io/netty/buffer/DynamicChannelBufferTest.java b/buffer/src/test/java/io/netty/buffer/DynamicChannelBufferTest.java similarity index 100% rename from src/test/java/io/netty/buffer/DynamicChannelBufferTest.java rename to buffer/src/test/java/io/netty/buffer/DynamicChannelBufferTest.java diff --git a/src/test/java/io/netty/buffer/LittleEndianCompositeChannelBufferTest.java b/buffer/src/test/java/io/netty/buffer/LittleEndianCompositeChannelBufferTest.java similarity index 100% rename from src/test/java/io/netty/buffer/LittleEndianCompositeChannelBufferTest.java rename to buffer/src/test/java/io/netty/buffer/LittleEndianCompositeChannelBufferTest.java diff --git a/src/test/java/io/netty/buffer/LittleEndianDirectChannelBufferTest.java b/buffer/src/test/java/io/netty/buffer/LittleEndianDirectChannelBufferTest.java similarity index 100% rename from src/test/java/io/netty/buffer/LittleEndianDirectChannelBufferTest.java rename to buffer/src/test/java/io/netty/buffer/LittleEndianDirectChannelBufferTest.java diff --git a/src/test/java/io/netty/buffer/LittleEndianHeapChannelBufferTest.java b/buffer/src/test/java/io/netty/buffer/LittleEndianHeapChannelBufferTest.java similarity index 100% rename from src/test/java/io/netty/buffer/LittleEndianHeapChannelBufferTest.java rename to buffer/src/test/java/io/netty/buffer/LittleEndianHeapChannelBufferTest.java diff --git a/src/test/java/io/netty/buffer/ReadOnlyChannelBufferTest.java b/buffer/src/test/java/io/netty/buffer/ReadOnlyChannelBufferTest.java similarity index 100% rename from src/test/java/io/netty/buffer/ReadOnlyChannelBufferTest.java rename to buffer/src/test/java/io/netty/buffer/ReadOnlyChannelBufferTest.java diff --git a/src/test/java/io/netty/buffer/SlicedChannelBufferTest.java b/buffer/src/test/java/io/netty/buffer/SlicedChannelBufferTest.java similarity index 100% rename from src/test/java/io/netty/buffer/SlicedChannelBufferTest.java rename to buffer/src/test/java/io/netty/buffer/SlicedChannelBufferTest.java diff --git a/src/test/java/io/netty/buffer/TruncatedChannelBufferTest.java b/buffer/src/test/java/io/netty/buffer/TruncatedChannelBufferTest.java similarity index 100% rename from src/test/java/io/netty/buffer/TruncatedChannelBufferTest.java rename to buffer/src/test/java/io/netty/buffer/TruncatedChannelBufferTest.java diff --git a/codec-http/pom.xml b/codec-http/pom.xml new file mode 100644 index 0000000000..3227f5e442 --- /dev/null +++ b/codec-http/pom.xml @@ -0,0 +1,45 @@ + + + + + 4.0.0 + + io.netty + netty-parent + 4.0.0.Alpha1-SNAPSHOT + + + io.netty + netty-codec-http + jar + + Netty/Codec/HTTP + + + + ${project.groupId} + netty-codec + ${project.version} + + + ${project.groupId} + netty-handler + ${project.version} + + + + diff --git a/src/main/java/io/netty/handler/codec/http/AbstractDiskHttpData.java b/codec-http/src/main/java/io/netty/handler/codec/http/AbstractDiskHttpData.java similarity index 100% rename from src/main/java/io/netty/handler/codec/http/AbstractDiskHttpData.java rename to codec-http/src/main/java/io/netty/handler/codec/http/AbstractDiskHttpData.java diff --git a/src/main/java/io/netty/handler/codec/http/AbstractHttpData.java b/codec-http/src/main/java/io/netty/handler/codec/http/AbstractHttpData.java similarity index 100% rename from src/main/java/io/netty/handler/codec/http/AbstractHttpData.java rename to codec-http/src/main/java/io/netty/handler/codec/http/AbstractHttpData.java diff --git a/src/main/java/io/netty/handler/codec/http/AbstractMemoryHttpData.java b/codec-http/src/main/java/io/netty/handler/codec/http/AbstractMemoryHttpData.java similarity index 100% rename from src/main/java/io/netty/handler/codec/http/AbstractMemoryHttpData.java rename to codec-http/src/main/java/io/netty/handler/codec/http/AbstractMemoryHttpData.java diff --git a/src/main/java/io/netty/handler/codec/http/Attribute.java b/codec-http/src/main/java/io/netty/handler/codec/http/Attribute.java similarity index 100% rename from src/main/java/io/netty/handler/codec/http/Attribute.java rename to codec-http/src/main/java/io/netty/handler/codec/http/Attribute.java diff --git a/src/main/java/io/netty/handler/codec/http/CaseIgnoringComparator.java b/codec-http/src/main/java/io/netty/handler/codec/http/CaseIgnoringComparator.java similarity index 100% rename from src/main/java/io/netty/handler/codec/http/CaseIgnoringComparator.java rename to codec-http/src/main/java/io/netty/handler/codec/http/CaseIgnoringComparator.java diff --git a/src/main/java/io/netty/handler/codec/http/Cookie.java b/codec-http/src/main/java/io/netty/handler/codec/http/Cookie.java similarity index 100% rename from src/main/java/io/netty/handler/codec/http/Cookie.java rename to codec-http/src/main/java/io/netty/handler/codec/http/Cookie.java diff --git a/src/main/java/io/netty/handler/codec/http/CookieDecoder.java b/codec-http/src/main/java/io/netty/handler/codec/http/CookieDecoder.java similarity index 100% rename from src/main/java/io/netty/handler/codec/http/CookieDecoder.java rename to codec-http/src/main/java/io/netty/handler/codec/http/CookieDecoder.java diff --git a/src/main/java/io/netty/handler/codec/http/CookieEncoder.java b/codec-http/src/main/java/io/netty/handler/codec/http/CookieEncoder.java similarity index 100% rename from src/main/java/io/netty/handler/codec/http/CookieEncoder.java rename to codec-http/src/main/java/io/netty/handler/codec/http/CookieEncoder.java diff --git a/src/main/java/io/netty/handler/codec/http/CookieHeaderNames.java b/codec-http/src/main/java/io/netty/handler/codec/http/CookieHeaderNames.java similarity index 100% rename from src/main/java/io/netty/handler/codec/http/CookieHeaderNames.java rename to codec-http/src/main/java/io/netty/handler/codec/http/CookieHeaderNames.java diff --git a/src/main/java/io/netty/handler/codec/http/DefaultCookie.java b/codec-http/src/main/java/io/netty/handler/codec/http/DefaultCookie.java similarity index 100% rename from src/main/java/io/netty/handler/codec/http/DefaultCookie.java rename to codec-http/src/main/java/io/netty/handler/codec/http/DefaultCookie.java diff --git a/src/main/java/io/netty/handler/codec/http/DefaultHttpChunk.java b/codec-http/src/main/java/io/netty/handler/codec/http/DefaultHttpChunk.java similarity index 100% rename from src/main/java/io/netty/handler/codec/http/DefaultHttpChunk.java rename to codec-http/src/main/java/io/netty/handler/codec/http/DefaultHttpChunk.java diff --git a/src/main/java/io/netty/handler/codec/http/DefaultHttpChunkTrailer.java b/codec-http/src/main/java/io/netty/handler/codec/http/DefaultHttpChunkTrailer.java similarity index 100% rename from src/main/java/io/netty/handler/codec/http/DefaultHttpChunkTrailer.java rename to codec-http/src/main/java/io/netty/handler/codec/http/DefaultHttpChunkTrailer.java diff --git a/src/main/java/io/netty/handler/codec/http/DefaultHttpDataFactory.java b/codec-http/src/main/java/io/netty/handler/codec/http/DefaultHttpDataFactory.java similarity index 100% rename from src/main/java/io/netty/handler/codec/http/DefaultHttpDataFactory.java rename to codec-http/src/main/java/io/netty/handler/codec/http/DefaultHttpDataFactory.java diff --git a/src/main/java/io/netty/handler/codec/http/DefaultHttpMessage.java b/codec-http/src/main/java/io/netty/handler/codec/http/DefaultHttpMessage.java similarity index 100% rename from src/main/java/io/netty/handler/codec/http/DefaultHttpMessage.java rename to codec-http/src/main/java/io/netty/handler/codec/http/DefaultHttpMessage.java diff --git a/src/main/java/io/netty/handler/codec/http/DefaultHttpRequest.java b/codec-http/src/main/java/io/netty/handler/codec/http/DefaultHttpRequest.java similarity index 100% rename from src/main/java/io/netty/handler/codec/http/DefaultHttpRequest.java rename to codec-http/src/main/java/io/netty/handler/codec/http/DefaultHttpRequest.java diff --git a/src/main/java/io/netty/handler/codec/http/DefaultHttpResponse.java b/codec-http/src/main/java/io/netty/handler/codec/http/DefaultHttpResponse.java similarity index 100% rename from src/main/java/io/netty/handler/codec/http/DefaultHttpResponse.java rename to codec-http/src/main/java/io/netty/handler/codec/http/DefaultHttpResponse.java diff --git a/src/main/java/io/netty/handler/codec/http/DiskAttribute.java b/codec-http/src/main/java/io/netty/handler/codec/http/DiskAttribute.java similarity index 100% rename from src/main/java/io/netty/handler/codec/http/DiskAttribute.java rename to codec-http/src/main/java/io/netty/handler/codec/http/DiskAttribute.java diff --git a/src/main/java/io/netty/handler/codec/http/DiskFileUpload.java b/codec-http/src/main/java/io/netty/handler/codec/http/DiskFileUpload.java similarity index 100% rename from src/main/java/io/netty/handler/codec/http/DiskFileUpload.java rename to codec-http/src/main/java/io/netty/handler/codec/http/DiskFileUpload.java diff --git a/src/main/java/io/netty/handler/codec/http/FileUpload.java b/codec-http/src/main/java/io/netty/handler/codec/http/FileUpload.java similarity index 100% rename from src/main/java/io/netty/handler/codec/http/FileUpload.java rename to codec-http/src/main/java/io/netty/handler/codec/http/FileUpload.java diff --git a/src/main/java/io/netty/handler/codec/http/HttpChunk.java b/codec-http/src/main/java/io/netty/handler/codec/http/HttpChunk.java similarity index 100% rename from src/main/java/io/netty/handler/codec/http/HttpChunk.java rename to codec-http/src/main/java/io/netty/handler/codec/http/HttpChunk.java diff --git a/src/main/java/io/netty/handler/codec/http/HttpChunkAggregator.java b/codec-http/src/main/java/io/netty/handler/codec/http/HttpChunkAggregator.java similarity index 100% rename from src/main/java/io/netty/handler/codec/http/HttpChunkAggregator.java rename to codec-http/src/main/java/io/netty/handler/codec/http/HttpChunkAggregator.java diff --git a/src/main/java/io/netty/handler/codec/http/HttpChunkTrailer.java b/codec-http/src/main/java/io/netty/handler/codec/http/HttpChunkTrailer.java similarity index 100% rename from src/main/java/io/netty/handler/codec/http/HttpChunkTrailer.java rename to codec-http/src/main/java/io/netty/handler/codec/http/HttpChunkTrailer.java diff --git a/src/main/java/io/netty/handler/codec/http/HttpClientCodec.java b/codec-http/src/main/java/io/netty/handler/codec/http/HttpClientCodec.java similarity index 100% rename from src/main/java/io/netty/handler/codec/http/HttpClientCodec.java rename to codec-http/src/main/java/io/netty/handler/codec/http/HttpClientCodec.java diff --git a/src/main/java/io/netty/handler/codec/http/HttpCodecUtil.java b/codec-http/src/main/java/io/netty/handler/codec/http/HttpCodecUtil.java similarity index 100% rename from src/main/java/io/netty/handler/codec/http/HttpCodecUtil.java rename to codec-http/src/main/java/io/netty/handler/codec/http/HttpCodecUtil.java diff --git a/src/main/java/io/netty/handler/codec/http/HttpContentCompressor.java b/codec-http/src/main/java/io/netty/handler/codec/http/HttpContentCompressor.java similarity index 100% rename from src/main/java/io/netty/handler/codec/http/HttpContentCompressor.java rename to codec-http/src/main/java/io/netty/handler/codec/http/HttpContentCompressor.java diff --git a/src/main/java/io/netty/handler/codec/http/HttpContentDecoder.java b/codec-http/src/main/java/io/netty/handler/codec/http/HttpContentDecoder.java similarity index 100% rename from src/main/java/io/netty/handler/codec/http/HttpContentDecoder.java rename to codec-http/src/main/java/io/netty/handler/codec/http/HttpContentDecoder.java diff --git a/src/main/java/io/netty/handler/codec/http/HttpContentDecompressor.java b/codec-http/src/main/java/io/netty/handler/codec/http/HttpContentDecompressor.java similarity index 100% rename from src/main/java/io/netty/handler/codec/http/HttpContentDecompressor.java rename to codec-http/src/main/java/io/netty/handler/codec/http/HttpContentDecompressor.java diff --git a/src/main/java/io/netty/handler/codec/http/HttpContentEncoder.java b/codec-http/src/main/java/io/netty/handler/codec/http/HttpContentEncoder.java similarity index 100% rename from src/main/java/io/netty/handler/codec/http/HttpContentEncoder.java rename to codec-http/src/main/java/io/netty/handler/codec/http/HttpContentEncoder.java diff --git a/src/main/java/io/netty/handler/codec/http/HttpData.java b/codec-http/src/main/java/io/netty/handler/codec/http/HttpData.java similarity index 100% rename from src/main/java/io/netty/handler/codec/http/HttpData.java rename to codec-http/src/main/java/io/netty/handler/codec/http/HttpData.java diff --git a/src/main/java/io/netty/handler/codec/http/HttpDataFactory.java b/codec-http/src/main/java/io/netty/handler/codec/http/HttpDataFactory.java similarity index 100% rename from src/main/java/io/netty/handler/codec/http/HttpDataFactory.java rename to codec-http/src/main/java/io/netty/handler/codec/http/HttpDataFactory.java diff --git a/src/main/java/io/netty/handler/codec/http/HttpHeaderDateFormat.java b/codec-http/src/main/java/io/netty/handler/codec/http/HttpHeaderDateFormat.java similarity index 100% rename from src/main/java/io/netty/handler/codec/http/HttpHeaderDateFormat.java rename to codec-http/src/main/java/io/netty/handler/codec/http/HttpHeaderDateFormat.java diff --git a/src/main/java/io/netty/handler/codec/http/HttpHeaders.java b/codec-http/src/main/java/io/netty/handler/codec/http/HttpHeaders.java similarity index 100% rename from src/main/java/io/netty/handler/codec/http/HttpHeaders.java rename to codec-http/src/main/java/io/netty/handler/codec/http/HttpHeaders.java diff --git a/src/main/java/io/netty/handler/codec/http/HttpMessage.java b/codec-http/src/main/java/io/netty/handler/codec/http/HttpMessage.java similarity index 100% rename from src/main/java/io/netty/handler/codec/http/HttpMessage.java rename to codec-http/src/main/java/io/netty/handler/codec/http/HttpMessage.java diff --git a/src/main/java/io/netty/handler/codec/http/HttpMessageDecoder.java b/codec-http/src/main/java/io/netty/handler/codec/http/HttpMessageDecoder.java similarity index 100% rename from src/main/java/io/netty/handler/codec/http/HttpMessageDecoder.java rename to codec-http/src/main/java/io/netty/handler/codec/http/HttpMessageDecoder.java diff --git a/src/main/java/io/netty/handler/codec/http/HttpMessageEncoder.java b/codec-http/src/main/java/io/netty/handler/codec/http/HttpMessageEncoder.java similarity index 100% rename from src/main/java/io/netty/handler/codec/http/HttpMessageEncoder.java rename to codec-http/src/main/java/io/netty/handler/codec/http/HttpMessageEncoder.java diff --git a/src/main/java/io/netty/handler/codec/http/HttpMethod.java b/codec-http/src/main/java/io/netty/handler/codec/http/HttpMethod.java similarity index 100% rename from src/main/java/io/netty/handler/codec/http/HttpMethod.java rename to codec-http/src/main/java/io/netty/handler/codec/http/HttpMethod.java diff --git a/src/main/java/io/netty/handler/codec/http/HttpPostBodyUtil.java b/codec-http/src/main/java/io/netty/handler/codec/http/HttpPostBodyUtil.java similarity index 100% rename from src/main/java/io/netty/handler/codec/http/HttpPostBodyUtil.java rename to codec-http/src/main/java/io/netty/handler/codec/http/HttpPostBodyUtil.java diff --git a/src/main/java/io/netty/handler/codec/http/HttpPostRequestDecoder.java b/codec-http/src/main/java/io/netty/handler/codec/http/HttpPostRequestDecoder.java similarity index 100% rename from src/main/java/io/netty/handler/codec/http/HttpPostRequestDecoder.java rename to codec-http/src/main/java/io/netty/handler/codec/http/HttpPostRequestDecoder.java diff --git a/src/main/java/io/netty/handler/codec/http/HttpPostRequestEncoder.java b/codec-http/src/main/java/io/netty/handler/codec/http/HttpPostRequestEncoder.java similarity index 100% rename from src/main/java/io/netty/handler/codec/http/HttpPostRequestEncoder.java rename to codec-http/src/main/java/io/netty/handler/codec/http/HttpPostRequestEncoder.java diff --git a/src/main/java/io/netty/handler/codec/http/HttpRequest.java b/codec-http/src/main/java/io/netty/handler/codec/http/HttpRequest.java similarity index 100% rename from src/main/java/io/netty/handler/codec/http/HttpRequest.java rename to codec-http/src/main/java/io/netty/handler/codec/http/HttpRequest.java diff --git a/src/main/java/io/netty/handler/codec/http/HttpRequestDecoder.java b/codec-http/src/main/java/io/netty/handler/codec/http/HttpRequestDecoder.java similarity index 100% rename from src/main/java/io/netty/handler/codec/http/HttpRequestDecoder.java rename to codec-http/src/main/java/io/netty/handler/codec/http/HttpRequestDecoder.java diff --git a/src/main/java/io/netty/handler/codec/http/HttpRequestEncoder.java b/codec-http/src/main/java/io/netty/handler/codec/http/HttpRequestEncoder.java similarity index 100% rename from src/main/java/io/netty/handler/codec/http/HttpRequestEncoder.java rename to codec-http/src/main/java/io/netty/handler/codec/http/HttpRequestEncoder.java diff --git a/src/main/java/io/netty/handler/codec/http/HttpResponse.java b/codec-http/src/main/java/io/netty/handler/codec/http/HttpResponse.java similarity index 100% rename from src/main/java/io/netty/handler/codec/http/HttpResponse.java rename to codec-http/src/main/java/io/netty/handler/codec/http/HttpResponse.java diff --git a/src/main/java/io/netty/handler/codec/http/HttpResponseDecoder.java b/codec-http/src/main/java/io/netty/handler/codec/http/HttpResponseDecoder.java similarity index 100% rename from src/main/java/io/netty/handler/codec/http/HttpResponseDecoder.java rename to codec-http/src/main/java/io/netty/handler/codec/http/HttpResponseDecoder.java diff --git a/src/main/java/io/netty/handler/codec/http/HttpResponseEncoder.java b/codec-http/src/main/java/io/netty/handler/codec/http/HttpResponseEncoder.java similarity index 100% rename from src/main/java/io/netty/handler/codec/http/HttpResponseEncoder.java rename to codec-http/src/main/java/io/netty/handler/codec/http/HttpResponseEncoder.java diff --git a/src/main/java/io/netty/handler/codec/http/HttpResponseStatus.java b/codec-http/src/main/java/io/netty/handler/codec/http/HttpResponseStatus.java similarity index 100% rename from src/main/java/io/netty/handler/codec/http/HttpResponseStatus.java rename to codec-http/src/main/java/io/netty/handler/codec/http/HttpResponseStatus.java diff --git a/src/main/java/io/netty/handler/codec/http/HttpServerCodec.java b/codec-http/src/main/java/io/netty/handler/codec/http/HttpServerCodec.java similarity index 100% rename from src/main/java/io/netty/handler/codec/http/HttpServerCodec.java rename to codec-http/src/main/java/io/netty/handler/codec/http/HttpServerCodec.java diff --git a/src/main/java/io/netty/handler/codec/http/HttpVersion.java b/codec-http/src/main/java/io/netty/handler/codec/http/HttpVersion.java similarity index 100% rename from src/main/java/io/netty/handler/codec/http/HttpVersion.java rename to codec-http/src/main/java/io/netty/handler/codec/http/HttpVersion.java diff --git a/src/main/java/io/netty/handler/codec/http/InterfaceHttpData.java b/codec-http/src/main/java/io/netty/handler/codec/http/InterfaceHttpData.java similarity index 100% rename from src/main/java/io/netty/handler/codec/http/InterfaceHttpData.java rename to codec-http/src/main/java/io/netty/handler/codec/http/InterfaceHttpData.java diff --git a/src/main/java/io/netty/handler/codec/http/InternalAttribute.java b/codec-http/src/main/java/io/netty/handler/codec/http/InternalAttribute.java similarity index 100% rename from src/main/java/io/netty/handler/codec/http/InternalAttribute.java rename to codec-http/src/main/java/io/netty/handler/codec/http/InternalAttribute.java diff --git a/src/main/java/io/netty/handler/codec/http/MemoryAttribute.java b/codec-http/src/main/java/io/netty/handler/codec/http/MemoryAttribute.java similarity index 100% rename from src/main/java/io/netty/handler/codec/http/MemoryAttribute.java rename to codec-http/src/main/java/io/netty/handler/codec/http/MemoryAttribute.java diff --git a/src/main/java/io/netty/handler/codec/http/MemoryFileUpload.java b/codec-http/src/main/java/io/netty/handler/codec/http/MemoryFileUpload.java similarity index 100% rename from src/main/java/io/netty/handler/codec/http/MemoryFileUpload.java rename to codec-http/src/main/java/io/netty/handler/codec/http/MemoryFileUpload.java diff --git a/src/main/java/io/netty/handler/codec/http/MixedAttribute.java b/codec-http/src/main/java/io/netty/handler/codec/http/MixedAttribute.java similarity index 100% rename from src/main/java/io/netty/handler/codec/http/MixedAttribute.java rename to codec-http/src/main/java/io/netty/handler/codec/http/MixedAttribute.java diff --git a/src/main/java/io/netty/handler/codec/http/MixedFileUpload.java b/codec-http/src/main/java/io/netty/handler/codec/http/MixedFileUpload.java similarity index 100% rename from src/main/java/io/netty/handler/codec/http/MixedFileUpload.java rename to codec-http/src/main/java/io/netty/handler/codec/http/MixedFileUpload.java diff --git a/src/main/java/io/netty/handler/codec/http/QueryStringDecoder.java b/codec-http/src/main/java/io/netty/handler/codec/http/QueryStringDecoder.java similarity index 100% rename from src/main/java/io/netty/handler/codec/http/QueryStringDecoder.java rename to codec-http/src/main/java/io/netty/handler/codec/http/QueryStringDecoder.java diff --git a/src/main/java/io/netty/handler/codec/http/QueryStringEncoder.java b/codec-http/src/main/java/io/netty/handler/codec/http/QueryStringEncoder.java similarity index 100% rename from src/main/java/io/netty/handler/codec/http/QueryStringEncoder.java rename to codec-http/src/main/java/io/netty/handler/codec/http/QueryStringEncoder.java diff --git a/src/main/java/io/netty/handler/codec/http/package-info.java b/codec-http/src/main/java/io/netty/handler/codec/http/package-info.java similarity index 100% rename from src/main/java/io/netty/handler/codec/http/package-info.java rename to codec-http/src/main/java/io/netty/handler/codec/http/package-info.java diff --git a/src/main/java/io/netty/handler/codec/http/websocketx/BinaryWebSocketFrame.java b/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/BinaryWebSocketFrame.java similarity index 100% rename from src/main/java/io/netty/handler/codec/http/websocketx/BinaryWebSocketFrame.java rename to codec-http/src/main/java/io/netty/handler/codec/http/websocketx/BinaryWebSocketFrame.java diff --git a/src/main/java/io/netty/handler/codec/http/websocketx/CloseWebSocketFrame.java b/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/CloseWebSocketFrame.java similarity index 100% rename from src/main/java/io/netty/handler/codec/http/websocketx/CloseWebSocketFrame.java rename to codec-http/src/main/java/io/netty/handler/codec/http/websocketx/CloseWebSocketFrame.java diff --git a/src/main/java/io/netty/handler/codec/http/websocketx/ContinuationWebSocketFrame.java b/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/ContinuationWebSocketFrame.java similarity index 100% rename from src/main/java/io/netty/handler/codec/http/websocketx/ContinuationWebSocketFrame.java rename to codec-http/src/main/java/io/netty/handler/codec/http/websocketx/ContinuationWebSocketFrame.java diff --git a/src/main/java/io/netty/handler/codec/http/websocketx/PingWebSocketFrame.java b/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/PingWebSocketFrame.java similarity index 100% rename from src/main/java/io/netty/handler/codec/http/websocketx/PingWebSocketFrame.java rename to codec-http/src/main/java/io/netty/handler/codec/http/websocketx/PingWebSocketFrame.java diff --git a/src/main/java/io/netty/handler/codec/http/websocketx/PongWebSocketFrame.java b/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/PongWebSocketFrame.java similarity index 100% rename from src/main/java/io/netty/handler/codec/http/websocketx/PongWebSocketFrame.java rename to codec-http/src/main/java/io/netty/handler/codec/http/websocketx/PongWebSocketFrame.java diff --git a/src/main/java/io/netty/handler/codec/http/websocketx/TextWebSocketFrame.java b/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/TextWebSocketFrame.java similarity index 100% rename from src/main/java/io/netty/handler/codec/http/websocketx/TextWebSocketFrame.java rename to codec-http/src/main/java/io/netty/handler/codec/http/websocketx/TextWebSocketFrame.java diff --git a/src/main/java/io/netty/handler/codec/http/websocketx/UTF8Exception.java b/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/UTF8Exception.java similarity index 100% rename from src/main/java/io/netty/handler/codec/http/websocketx/UTF8Exception.java rename to codec-http/src/main/java/io/netty/handler/codec/http/websocketx/UTF8Exception.java diff --git a/src/main/java/io/netty/handler/codec/http/websocketx/UTF8Output.java b/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/UTF8Output.java similarity index 100% rename from src/main/java/io/netty/handler/codec/http/websocketx/UTF8Output.java rename to codec-http/src/main/java/io/netty/handler/codec/http/websocketx/UTF8Output.java diff --git a/src/main/java/io/netty/handler/codec/http/websocketx/WebSocket00FrameDecoder.java b/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocket00FrameDecoder.java similarity index 100% rename from src/main/java/io/netty/handler/codec/http/websocketx/WebSocket00FrameDecoder.java rename to codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocket00FrameDecoder.java diff --git a/src/main/java/io/netty/handler/codec/http/websocketx/WebSocket00FrameEncoder.java b/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocket00FrameEncoder.java similarity index 100% rename from src/main/java/io/netty/handler/codec/http/websocketx/WebSocket00FrameEncoder.java rename to codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocket00FrameEncoder.java diff --git a/src/main/java/io/netty/handler/codec/http/websocketx/WebSocket08FrameDecoder.java b/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocket08FrameDecoder.java similarity index 100% rename from src/main/java/io/netty/handler/codec/http/websocketx/WebSocket08FrameDecoder.java rename to codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocket08FrameDecoder.java diff --git a/src/main/java/io/netty/handler/codec/http/websocketx/WebSocket08FrameEncoder.java b/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocket08FrameEncoder.java similarity index 100% rename from src/main/java/io/netty/handler/codec/http/websocketx/WebSocket08FrameEncoder.java rename to codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocket08FrameEncoder.java diff --git a/src/main/java/io/netty/handler/codec/http/websocketx/WebSocket13FrameDecoder.java b/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocket13FrameDecoder.java similarity index 100% rename from src/main/java/io/netty/handler/codec/http/websocketx/WebSocket13FrameDecoder.java rename to codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocket13FrameDecoder.java diff --git a/src/main/java/io/netty/handler/codec/http/websocketx/WebSocket13FrameEncoder.java b/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocket13FrameEncoder.java similarity index 100% rename from src/main/java/io/netty/handler/codec/http/websocketx/WebSocket13FrameEncoder.java rename to codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocket13FrameEncoder.java diff --git a/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketClientHandshaker.java b/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketClientHandshaker.java similarity index 100% rename from src/main/java/io/netty/handler/codec/http/websocketx/WebSocketClientHandshaker.java rename to codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketClientHandshaker.java diff --git a/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketClientHandshaker00.java b/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketClientHandshaker00.java similarity index 100% rename from src/main/java/io/netty/handler/codec/http/websocketx/WebSocketClientHandshaker00.java rename to codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketClientHandshaker00.java diff --git a/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketClientHandshaker08.java b/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketClientHandshaker08.java similarity index 100% rename from src/main/java/io/netty/handler/codec/http/websocketx/WebSocketClientHandshaker08.java rename to codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketClientHandshaker08.java diff --git a/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketClientHandshaker13.java b/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketClientHandshaker13.java similarity index 100% rename from src/main/java/io/netty/handler/codec/http/websocketx/WebSocketClientHandshaker13.java rename to codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketClientHandshaker13.java diff --git a/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketClientHandshakerFactory.java b/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketClientHandshakerFactory.java similarity index 100% rename from src/main/java/io/netty/handler/codec/http/websocketx/WebSocketClientHandshakerFactory.java rename to codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketClientHandshakerFactory.java diff --git a/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketFrame.java b/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketFrame.java similarity index 100% rename from src/main/java/io/netty/handler/codec/http/websocketx/WebSocketFrame.java rename to codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketFrame.java diff --git a/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketFrameType.java b/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketFrameType.java similarity index 100% rename from src/main/java/io/netty/handler/codec/http/websocketx/WebSocketFrameType.java rename to codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketFrameType.java diff --git a/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketHandshakeException.java b/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketHandshakeException.java similarity index 100% rename from src/main/java/io/netty/handler/codec/http/websocketx/WebSocketHandshakeException.java rename to codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketHandshakeException.java diff --git a/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketServerHandshaker.java b/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketServerHandshaker.java similarity index 100% rename from src/main/java/io/netty/handler/codec/http/websocketx/WebSocketServerHandshaker.java rename to codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketServerHandshaker.java diff --git a/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketServerHandshaker00.java b/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketServerHandshaker00.java similarity index 100% rename from src/main/java/io/netty/handler/codec/http/websocketx/WebSocketServerHandshaker00.java rename to codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketServerHandshaker00.java diff --git a/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketServerHandshaker08.java b/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketServerHandshaker08.java similarity index 100% rename from src/main/java/io/netty/handler/codec/http/websocketx/WebSocketServerHandshaker08.java rename to codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketServerHandshaker08.java diff --git a/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketServerHandshaker13.java b/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketServerHandshaker13.java similarity index 100% rename from src/main/java/io/netty/handler/codec/http/websocketx/WebSocketServerHandshaker13.java rename to codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketServerHandshaker13.java diff --git a/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketServerHandshakerFactory.java b/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketServerHandshakerFactory.java similarity index 100% rename from src/main/java/io/netty/handler/codec/http/websocketx/WebSocketServerHandshakerFactory.java rename to codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketServerHandshakerFactory.java diff --git a/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketVersion.java b/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketVersion.java similarity index 100% rename from src/main/java/io/netty/handler/codec/http/websocketx/WebSocketVersion.java rename to codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketVersion.java diff --git a/src/main/java/io/netty/handler/codec/http/websocketx/package-info.java b/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/package-info.java similarity index 100% rename from src/main/java/io/netty/handler/codec/http/websocketx/package-info.java rename to codec-http/src/main/java/io/netty/handler/codec/http/websocketx/package-info.java diff --git a/src/main/java/io/netty/handler/codec/rtsp/RtspHeaders.java b/codec-http/src/main/java/io/netty/handler/codec/rtsp/RtspHeaders.java similarity index 100% rename from src/main/java/io/netty/handler/codec/rtsp/RtspHeaders.java rename to codec-http/src/main/java/io/netty/handler/codec/rtsp/RtspHeaders.java diff --git a/src/main/java/io/netty/handler/codec/rtsp/RtspMessageDecoder.java b/codec-http/src/main/java/io/netty/handler/codec/rtsp/RtspMessageDecoder.java similarity index 100% rename from src/main/java/io/netty/handler/codec/rtsp/RtspMessageDecoder.java rename to codec-http/src/main/java/io/netty/handler/codec/rtsp/RtspMessageDecoder.java diff --git a/src/main/java/io/netty/handler/codec/rtsp/RtspMessageEncoder.java b/codec-http/src/main/java/io/netty/handler/codec/rtsp/RtspMessageEncoder.java similarity index 100% rename from src/main/java/io/netty/handler/codec/rtsp/RtspMessageEncoder.java rename to codec-http/src/main/java/io/netty/handler/codec/rtsp/RtspMessageEncoder.java diff --git a/src/main/java/io/netty/handler/codec/rtsp/RtspMethods.java b/codec-http/src/main/java/io/netty/handler/codec/rtsp/RtspMethods.java similarity index 100% rename from src/main/java/io/netty/handler/codec/rtsp/RtspMethods.java rename to codec-http/src/main/java/io/netty/handler/codec/rtsp/RtspMethods.java diff --git a/src/main/java/io/netty/handler/codec/rtsp/RtspRequestDecoder.java b/codec-http/src/main/java/io/netty/handler/codec/rtsp/RtspRequestDecoder.java similarity index 100% rename from src/main/java/io/netty/handler/codec/rtsp/RtspRequestDecoder.java rename to codec-http/src/main/java/io/netty/handler/codec/rtsp/RtspRequestDecoder.java diff --git a/src/main/java/io/netty/handler/codec/rtsp/RtspRequestEncoder.java b/codec-http/src/main/java/io/netty/handler/codec/rtsp/RtspRequestEncoder.java similarity index 100% rename from src/main/java/io/netty/handler/codec/rtsp/RtspRequestEncoder.java rename to codec-http/src/main/java/io/netty/handler/codec/rtsp/RtspRequestEncoder.java diff --git a/src/main/java/io/netty/handler/codec/rtsp/RtspResponseDecoder.java b/codec-http/src/main/java/io/netty/handler/codec/rtsp/RtspResponseDecoder.java similarity index 100% rename from src/main/java/io/netty/handler/codec/rtsp/RtspResponseDecoder.java rename to codec-http/src/main/java/io/netty/handler/codec/rtsp/RtspResponseDecoder.java diff --git a/src/main/java/io/netty/handler/codec/rtsp/RtspResponseEncoder.java b/codec-http/src/main/java/io/netty/handler/codec/rtsp/RtspResponseEncoder.java similarity index 100% rename from src/main/java/io/netty/handler/codec/rtsp/RtspResponseEncoder.java rename to codec-http/src/main/java/io/netty/handler/codec/rtsp/RtspResponseEncoder.java diff --git a/src/main/java/io/netty/handler/codec/rtsp/RtspResponseStatuses.java b/codec-http/src/main/java/io/netty/handler/codec/rtsp/RtspResponseStatuses.java similarity index 100% rename from src/main/java/io/netty/handler/codec/rtsp/RtspResponseStatuses.java rename to codec-http/src/main/java/io/netty/handler/codec/rtsp/RtspResponseStatuses.java diff --git a/src/main/java/io/netty/handler/codec/rtsp/RtspVersions.java b/codec-http/src/main/java/io/netty/handler/codec/rtsp/RtspVersions.java similarity index 100% rename from src/main/java/io/netty/handler/codec/rtsp/RtspVersions.java rename to codec-http/src/main/java/io/netty/handler/codec/rtsp/RtspVersions.java diff --git a/src/main/java/io/netty/handler/codec/rtsp/package-info.java b/codec-http/src/main/java/io/netty/handler/codec/rtsp/package-info.java similarity index 100% rename from src/main/java/io/netty/handler/codec/rtsp/package-info.java rename to codec-http/src/main/java/io/netty/handler/codec/rtsp/package-info.java diff --git a/src/test/java/io/netty/handler/codec/http/CookieDecoderTest.java b/codec-http/src/test/java/io/netty/handler/codec/http/CookieDecoderTest.java similarity index 100% rename from src/test/java/io/netty/handler/codec/http/CookieDecoderTest.java rename to codec-http/src/test/java/io/netty/handler/codec/http/CookieDecoderTest.java diff --git a/src/test/java/io/netty/handler/codec/http/CookieEncoderTest.java b/codec-http/src/test/java/io/netty/handler/codec/http/CookieEncoderTest.java similarity index 100% rename from src/test/java/io/netty/handler/codec/http/CookieEncoderTest.java rename to codec-http/src/test/java/io/netty/handler/codec/http/CookieEncoderTest.java diff --git a/src/test/java/io/netty/handler/codec/http/DefaultHttpMessageTest.java b/codec-http/src/test/java/io/netty/handler/codec/http/DefaultHttpMessageTest.java similarity index 100% rename from src/test/java/io/netty/handler/codec/http/DefaultHttpMessageTest.java rename to codec-http/src/test/java/io/netty/handler/codec/http/DefaultHttpMessageTest.java diff --git a/src/test/java/io/netty/handler/codec/http/HttpHeaderDateFormatTest.java b/codec-http/src/test/java/io/netty/handler/codec/http/HttpHeaderDateFormatTest.java similarity index 100% rename from src/test/java/io/netty/handler/codec/http/HttpHeaderDateFormatTest.java rename to codec-http/src/test/java/io/netty/handler/codec/http/HttpHeaderDateFormatTest.java diff --git a/src/test/java/io/netty/handler/codec/http/QueryStringDecoderTest.java b/codec-http/src/test/java/io/netty/handler/codec/http/QueryStringDecoderTest.java similarity index 100% rename from src/test/java/io/netty/handler/codec/http/QueryStringDecoderTest.java rename to codec-http/src/test/java/io/netty/handler/codec/http/QueryStringDecoderTest.java diff --git a/src/test/java/io/netty/handler/codec/http/websocketx/WebSocketServerHandshaker00Test.java b/codec-http/src/test/java/io/netty/handler/codec/http/websocketx/WebSocketServerHandshaker00Test.java similarity index 100% rename from src/test/java/io/netty/handler/codec/http/websocketx/WebSocketServerHandshaker00Test.java rename to codec-http/src/test/java/io/netty/handler/codec/http/websocketx/WebSocketServerHandshaker00Test.java diff --git a/src/test/java/io/netty/handler/codec/http/websocketx/WebSocketServerHandshaker08Test.java b/codec-http/src/test/java/io/netty/handler/codec/http/websocketx/WebSocketServerHandshaker08Test.java similarity index 100% rename from src/test/java/io/netty/handler/codec/http/websocketx/WebSocketServerHandshaker08Test.java rename to codec-http/src/test/java/io/netty/handler/codec/http/websocketx/WebSocketServerHandshaker08Test.java diff --git a/src/test/java/io/netty/handler/codec/http/websocketx/WebSocketServerHandshaker13Test.java b/codec-http/src/test/java/io/netty/handler/codec/http/websocketx/WebSocketServerHandshaker13Test.java similarity index 100% rename from src/test/java/io/netty/handler/codec/http/websocketx/WebSocketServerHandshaker13Test.java rename to codec-http/src/test/java/io/netty/handler/codec/http/websocketx/WebSocketServerHandshaker13Test.java diff --git a/codec/pom.xml b/codec/pom.xml new file mode 100644 index 0000000000..a8691be22c --- /dev/null +++ b/codec/pom.xml @@ -0,0 +1,45 @@ + + + + + 4.0.0 + + io.netty + netty-parent + 4.0.0.Alpha1-SNAPSHOT + + + io.netty + netty-codec + jar + + Netty/Codec + + + + ${project.groupId} + netty-transport + ${project.version} + + + com.google.protobuf + protobuf-java + true + + + + diff --git a/src/main/java/io/netty/handler/codec/base64/Base64.java b/codec/src/main/java/io/netty/handler/codec/base64/Base64.java similarity index 100% rename from src/main/java/io/netty/handler/codec/base64/Base64.java rename to codec/src/main/java/io/netty/handler/codec/base64/Base64.java diff --git a/src/main/java/io/netty/handler/codec/base64/Base64Decoder.java b/codec/src/main/java/io/netty/handler/codec/base64/Base64Decoder.java similarity index 100% rename from src/main/java/io/netty/handler/codec/base64/Base64Decoder.java rename to codec/src/main/java/io/netty/handler/codec/base64/Base64Decoder.java diff --git a/src/main/java/io/netty/handler/codec/base64/Base64Dialect.java b/codec/src/main/java/io/netty/handler/codec/base64/Base64Dialect.java similarity index 100% rename from src/main/java/io/netty/handler/codec/base64/Base64Dialect.java rename to codec/src/main/java/io/netty/handler/codec/base64/Base64Dialect.java diff --git a/src/main/java/io/netty/handler/codec/base64/Base64Encoder.java b/codec/src/main/java/io/netty/handler/codec/base64/Base64Encoder.java similarity index 100% rename from src/main/java/io/netty/handler/codec/base64/Base64Encoder.java rename to codec/src/main/java/io/netty/handler/codec/base64/Base64Encoder.java diff --git a/src/main/java/io/netty/handler/codec/base64/package-info.java b/codec/src/main/java/io/netty/handler/codec/base64/package-info.java similarity index 100% rename from src/main/java/io/netty/handler/codec/base64/package-info.java rename to codec/src/main/java/io/netty/handler/codec/base64/package-info.java diff --git a/src/main/java/io/netty/handler/codec/bytes/ByteArrayDecoder.java b/codec/src/main/java/io/netty/handler/codec/bytes/ByteArrayDecoder.java similarity index 100% rename from src/main/java/io/netty/handler/codec/bytes/ByteArrayDecoder.java rename to codec/src/main/java/io/netty/handler/codec/bytes/ByteArrayDecoder.java diff --git a/src/main/java/io/netty/handler/codec/bytes/ByteArrayEncoder.java b/codec/src/main/java/io/netty/handler/codec/bytes/ByteArrayEncoder.java similarity index 100% rename from src/main/java/io/netty/handler/codec/bytes/ByteArrayEncoder.java rename to codec/src/main/java/io/netty/handler/codec/bytes/ByteArrayEncoder.java diff --git a/src/main/java/io/netty/handler/codec/bytes/package-info.java b/codec/src/main/java/io/netty/handler/codec/bytes/package-info.java similarity index 100% rename from src/main/java/io/netty/handler/codec/bytes/package-info.java rename to codec/src/main/java/io/netty/handler/codec/bytes/package-info.java diff --git a/src/main/java/io/netty/handler/codec/compression/CompressionException.java b/codec/src/main/java/io/netty/handler/codec/compression/CompressionException.java similarity index 100% rename from src/main/java/io/netty/handler/codec/compression/CompressionException.java rename to codec/src/main/java/io/netty/handler/codec/compression/CompressionException.java diff --git a/src/main/java/io/netty/handler/codec/compression/ZlibDecoder.java b/codec/src/main/java/io/netty/handler/codec/compression/ZlibDecoder.java similarity index 100% rename from src/main/java/io/netty/handler/codec/compression/ZlibDecoder.java rename to codec/src/main/java/io/netty/handler/codec/compression/ZlibDecoder.java diff --git a/src/main/java/io/netty/handler/codec/compression/ZlibEncoder.java b/codec/src/main/java/io/netty/handler/codec/compression/ZlibEncoder.java similarity index 100% rename from src/main/java/io/netty/handler/codec/compression/ZlibEncoder.java rename to codec/src/main/java/io/netty/handler/codec/compression/ZlibEncoder.java diff --git a/src/main/java/io/netty/handler/codec/compression/ZlibUtil.java b/codec/src/main/java/io/netty/handler/codec/compression/ZlibUtil.java similarity index 100% rename from src/main/java/io/netty/handler/codec/compression/ZlibUtil.java rename to codec/src/main/java/io/netty/handler/codec/compression/ZlibUtil.java diff --git a/src/main/java/io/netty/handler/codec/compression/ZlibWrapper.java b/codec/src/main/java/io/netty/handler/codec/compression/ZlibWrapper.java similarity index 100% rename from src/main/java/io/netty/handler/codec/compression/ZlibWrapper.java rename to codec/src/main/java/io/netty/handler/codec/compression/ZlibWrapper.java diff --git a/src/main/java/io/netty/handler/codec/compression/package-info.java b/codec/src/main/java/io/netty/handler/codec/compression/package-info.java similarity index 100% rename from src/main/java/io/netty/handler/codec/compression/package-info.java rename to codec/src/main/java/io/netty/handler/codec/compression/package-info.java diff --git a/src/main/java/io/netty/handler/codec/embedder/AbstractCodecEmbedder.java b/codec/src/main/java/io/netty/handler/codec/embedder/AbstractCodecEmbedder.java similarity index 100% rename from src/main/java/io/netty/handler/codec/embedder/AbstractCodecEmbedder.java rename to codec/src/main/java/io/netty/handler/codec/embedder/AbstractCodecEmbedder.java diff --git a/src/main/java/io/netty/handler/codec/embedder/CodecEmbedder.java b/codec/src/main/java/io/netty/handler/codec/embedder/CodecEmbedder.java similarity index 100% rename from src/main/java/io/netty/handler/codec/embedder/CodecEmbedder.java rename to codec/src/main/java/io/netty/handler/codec/embedder/CodecEmbedder.java diff --git a/src/main/java/io/netty/handler/codec/embedder/CodecEmbedderException.java b/codec/src/main/java/io/netty/handler/codec/embedder/CodecEmbedderException.java similarity index 100% rename from src/main/java/io/netty/handler/codec/embedder/CodecEmbedderException.java rename to codec/src/main/java/io/netty/handler/codec/embedder/CodecEmbedderException.java diff --git a/src/main/java/io/netty/handler/codec/embedder/DecoderEmbedder.java b/codec/src/main/java/io/netty/handler/codec/embedder/DecoderEmbedder.java similarity index 100% rename from src/main/java/io/netty/handler/codec/embedder/DecoderEmbedder.java rename to codec/src/main/java/io/netty/handler/codec/embedder/DecoderEmbedder.java diff --git a/src/main/java/io/netty/handler/codec/embedder/EmbeddedChannel.java b/codec/src/main/java/io/netty/handler/codec/embedder/EmbeddedChannel.java similarity index 100% rename from src/main/java/io/netty/handler/codec/embedder/EmbeddedChannel.java rename to codec/src/main/java/io/netty/handler/codec/embedder/EmbeddedChannel.java diff --git a/src/main/java/io/netty/handler/codec/embedder/EmbeddedChannelFactory.java b/codec/src/main/java/io/netty/handler/codec/embedder/EmbeddedChannelFactory.java similarity index 100% rename from src/main/java/io/netty/handler/codec/embedder/EmbeddedChannelFactory.java rename to codec/src/main/java/io/netty/handler/codec/embedder/EmbeddedChannelFactory.java diff --git a/src/main/java/io/netty/handler/codec/embedder/EmbeddedSocketAddress.java b/codec/src/main/java/io/netty/handler/codec/embedder/EmbeddedSocketAddress.java similarity index 100% rename from src/main/java/io/netty/handler/codec/embedder/EmbeddedSocketAddress.java rename to codec/src/main/java/io/netty/handler/codec/embedder/EmbeddedSocketAddress.java diff --git a/src/main/java/io/netty/handler/codec/embedder/EncoderEmbedder.java b/codec/src/main/java/io/netty/handler/codec/embedder/EncoderEmbedder.java similarity index 100% rename from src/main/java/io/netty/handler/codec/embedder/EncoderEmbedder.java rename to codec/src/main/java/io/netty/handler/codec/embedder/EncoderEmbedder.java diff --git a/src/main/java/io/netty/handler/codec/embedder/package-info.java b/codec/src/main/java/io/netty/handler/codec/embedder/package-info.java similarity index 100% rename from src/main/java/io/netty/handler/codec/embedder/package-info.java rename to codec/src/main/java/io/netty/handler/codec/embedder/package-info.java diff --git a/src/main/java/io/netty/handler/codec/frame/CorruptedFrameException.java b/codec/src/main/java/io/netty/handler/codec/frame/CorruptedFrameException.java similarity index 100% rename from src/main/java/io/netty/handler/codec/frame/CorruptedFrameException.java rename to codec/src/main/java/io/netty/handler/codec/frame/CorruptedFrameException.java diff --git a/src/main/java/io/netty/handler/codec/frame/DelimiterBasedFrameDecoder.java b/codec/src/main/java/io/netty/handler/codec/frame/DelimiterBasedFrameDecoder.java similarity index 100% rename from src/main/java/io/netty/handler/codec/frame/DelimiterBasedFrameDecoder.java rename to codec/src/main/java/io/netty/handler/codec/frame/DelimiterBasedFrameDecoder.java diff --git a/src/main/java/io/netty/handler/codec/frame/Delimiters.java b/codec/src/main/java/io/netty/handler/codec/frame/Delimiters.java similarity index 100% rename from src/main/java/io/netty/handler/codec/frame/Delimiters.java rename to codec/src/main/java/io/netty/handler/codec/frame/Delimiters.java diff --git a/src/main/java/io/netty/handler/codec/frame/FixedLengthFrameDecoder.java b/codec/src/main/java/io/netty/handler/codec/frame/FixedLengthFrameDecoder.java similarity index 100% rename from src/main/java/io/netty/handler/codec/frame/FixedLengthFrameDecoder.java rename to codec/src/main/java/io/netty/handler/codec/frame/FixedLengthFrameDecoder.java diff --git a/src/main/java/io/netty/handler/codec/frame/FrameDecoder.java b/codec/src/main/java/io/netty/handler/codec/frame/FrameDecoder.java similarity index 100% rename from src/main/java/io/netty/handler/codec/frame/FrameDecoder.java rename to codec/src/main/java/io/netty/handler/codec/frame/FrameDecoder.java diff --git a/src/main/java/io/netty/handler/codec/frame/LengthFieldBasedFrameDecoder.java b/codec/src/main/java/io/netty/handler/codec/frame/LengthFieldBasedFrameDecoder.java similarity index 100% rename from src/main/java/io/netty/handler/codec/frame/LengthFieldBasedFrameDecoder.java rename to codec/src/main/java/io/netty/handler/codec/frame/LengthFieldBasedFrameDecoder.java diff --git a/src/main/java/io/netty/handler/codec/frame/LengthFieldPrepender.java b/codec/src/main/java/io/netty/handler/codec/frame/LengthFieldPrepender.java similarity index 100% rename from src/main/java/io/netty/handler/codec/frame/LengthFieldPrepender.java rename to codec/src/main/java/io/netty/handler/codec/frame/LengthFieldPrepender.java diff --git a/src/main/java/io/netty/handler/codec/frame/TooLongFrameException.java b/codec/src/main/java/io/netty/handler/codec/frame/TooLongFrameException.java similarity index 100% rename from src/main/java/io/netty/handler/codec/frame/TooLongFrameException.java rename to codec/src/main/java/io/netty/handler/codec/frame/TooLongFrameException.java diff --git a/src/main/java/io/netty/handler/codec/frame/package-info.java b/codec/src/main/java/io/netty/handler/codec/frame/package-info.java similarity index 100% rename from src/main/java/io/netty/handler/codec/frame/package-info.java rename to codec/src/main/java/io/netty/handler/codec/frame/package-info.java diff --git a/src/main/java/io/netty/handler/codec/oneone/OneToOneDecoder.java b/codec/src/main/java/io/netty/handler/codec/oneone/OneToOneDecoder.java similarity index 100% rename from src/main/java/io/netty/handler/codec/oneone/OneToOneDecoder.java rename to codec/src/main/java/io/netty/handler/codec/oneone/OneToOneDecoder.java diff --git a/src/main/java/io/netty/handler/codec/oneone/OneToOneEncoder.java b/codec/src/main/java/io/netty/handler/codec/oneone/OneToOneEncoder.java similarity index 100% rename from src/main/java/io/netty/handler/codec/oneone/OneToOneEncoder.java rename to codec/src/main/java/io/netty/handler/codec/oneone/OneToOneEncoder.java diff --git a/src/main/java/io/netty/handler/codec/oneone/package-info.java b/codec/src/main/java/io/netty/handler/codec/oneone/package-info.java similarity index 100% rename from src/main/java/io/netty/handler/codec/oneone/package-info.java rename to codec/src/main/java/io/netty/handler/codec/oneone/package-info.java diff --git a/src/main/java/io/netty/handler/codec/protobuf/ProtobufDecoder.java b/codec/src/main/java/io/netty/handler/codec/protobuf/ProtobufDecoder.java similarity index 100% rename from src/main/java/io/netty/handler/codec/protobuf/ProtobufDecoder.java rename to codec/src/main/java/io/netty/handler/codec/protobuf/ProtobufDecoder.java diff --git a/src/main/java/io/netty/handler/codec/protobuf/ProtobufEncoder.java b/codec/src/main/java/io/netty/handler/codec/protobuf/ProtobufEncoder.java similarity index 100% rename from src/main/java/io/netty/handler/codec/protobuf/ProtobufEncoder.java rename to codec/src/main/java/io/netty/handler/codec/protobuf/ProtobufEncoder.java diff --git a/src/main/java/io/netty/handler/codec/protobuf/ProtobufVarint32FrameDecoder.java b/codec/src/main/java/io/netty/handler/codec/protobuf/ProtobufVarint32FrameDecoder.java similarity index 100% rename from src/main/java/io/netty/handler/codec/protobuf/ProtobufVarint32FrameDecoder.java rename to codec/src/main/java/io/netty/handler/codec/protobuf/ProtobufVarint32FrameDecoder.java diff --git a/src/main/java/io/netty/handler/codec/protobuf/ProtobufVarint32LengthFieldPrepender.java b/codec/src/main/java/io/netty/handler/codec/protobuf/ProtobufVarint32LengthFieldPrepender.java similarity index 100% rename from src/main/java/io/netty/handler/codec/protobuf/ProtobufVarint32LengthFieldPrepender.java rename to codec/src/main/java/io/netty/handler/codec/protobuf/ProtobufVarint32LengthFieldPrepender.java diff --git a/src/main/java/io/netty/handler/codec/protobuf/package-info.java b/codec/src/main/java/io/netty/handler/codec/protobuf/package-info.java similarity index 100% rename from src/main/java/io/netty/handler/codec/protobuf/package-info.java rename to codec/src/main/java/io/netty/handler/codec/protobuf/package-info.java diff --git a/src/main/java/io/netty/handler/codec/replay/ReplayError.java b/codec/src/main/java/io/netty/handler/codec/replay/ReplayError.java similarity index 100% rename from src/main/java/io/netty/handler/codec/replay/ReplayError.java rename to codec/src/main/java/io/netty/handler/codec/replay/ReplayError.java diff --git a/src/main/java/io/netty/handler/codec/replay/ReplayingDecoder.java b/codec/src/main/java/io/netty/handler/codec/replay/ReplayingDecoder.java similarity index 100% rename from src/main/java/io/netty/handler/codec/replay/ReplayingDecoder.java rename to codec/src/main/java/io/netty/handler/codec/replay/ReplayingDecoder.java diff --git a/src/main/java/io/netty/handler/codec/replay/ReplayingDecoderBuffer.java b/codec/src/main/java/io/netty/handler/codec/replay/ReplayingDecoderBuffer.java similarity index 100% rename from src/main/java/io/netty/handler/codec/replay/ReplayingDecoderBuffer.java rename to codec/src/main/java/io/netty/handler/codec/replay/ReplayingDecoderBuffer.java diff --git a/src/main/java/io/netty/handler/codec/replay/UnreplayableOperationException.java b/codec/src/main/java/io/netty/handler/codec/replay/UnreplayableOperationException.java similarity index 100% rename from src/main/java/io/netty/handler/codec/replay/UnreplayableOperationException.java rename to codec/src/main/java/io/netty/handler/codec/replay/UnreplayableOperationException.java diff --git a/src/main/java/io/netty/handler/codec/replay/UnsafeDynamicChannelBuffer.java b/codec/src/main/java/io/netty/handler/codec/replay/UnsafeDynamicChannelBuffer.java similarity index 100% rename from src/main/java/io/netty/handler/codec/replay/UnsafeDynamicChannelBuffer.java rename to codec/src/main/java/io/netty/handler/codec/replay/UnsafeDynamicChannelBuffer.java diff --git a/src/main/java/io/netty/handler/codec/replay/VoidEnum.java b/codec/src/main/java/io/netty/handler/codec/replay/VoidEnum.java similarity index 100% rename from src/main/java/io/netty/handler/codec/replay/VoidEnum.java rename to codec/src/main/java/io/netty/handler/codec/replay/VoidEnum.java diff --git a/src/main/java/io/netty/handler/codec/replay/package-info.java b/codec/src/main/java/io/netty/handler/codec/replay/package-info.java similarity index 100% rename from src/main/java/io/netty/handler/codec/replay/package-info.java rename to codec/src/main/java/io/netty/handler/codec/replay/package-info.java diff --git a/src/main/java/io/netty/handler/codec/serialization/CachingClassResolver.java b/codec/src/main/java/io/netty/handler/codec/serialization/CachingClassResolver.java similarity index 100% rename from src/main/java/io/netty/handler/codec/serialization/CachingClassResolver.java rename to codec/src/main/java/io/netty/handler/codec/serialization/CachingClassResolver.java diff --git a/src/main/java/io/netty/handler/codec/serialization/ClassLoaderClassResolver.java b/codec/src/main/java/io/netty/handler/codec/serialization/ClassLoaderClassResolver.java similarity index 100% rename from src/main/java/io/netty/handler/codec/serialization/ClassLoaderClassResolver.java rename to codec/src/main/java/io/netty/handler/codec/serialization/ClassLoaderClassResolver.java diff --git a/src/main/java/io/netty/handler/codec/serialization/ClassResolver.java b/codec/src/main/java/io/netty/handler/codec/serialization/ClassResolver.java similarity index 100% rename from src/main/java/io/netty/handler/codec/serialization/ClassResolver.java rename to codec/src/main/java/io/netty/handler/codec/serialization/ClassResolver.java diff --git a/src/main/java/io/netty/handler/codec/serialization/ClassResolvers.java b/codec/src/main/java/io/netty/handler/codec/serialization/ClassResolvers.java similarity index 100% rename from src/main/java/io/netty/handler/codec/serialization/ClassResolvers.java rename to codec/src/main/java/io/netty/handler/codec/serialization/ClassResolvers.java diff --git a/src/main/java/io/netty/handler/codec/serialization/CompactObjectInputStream.java b/codec/src/main/java/io/netty/handler/codec/serialization/CompactObjectInputStream.java similarity index 100% rename from src/main/java/io/netty/handler/codec/serialization/CompactObjectInputStream.java rename to codec/src/main/java/io/netty/handler/codec/serialization/CompactObjectInputStream.java diff --git a/src/main/java/io/netty/handler/codec/serialization/CompactObjectOutputStream.java b/codec/src/main/java/io/netty/handler/codec/serialization/CompactObjectOutputStream.java similarity index 100% rename from src/main/java/io/netty/handler/codec/serialization/CompactObjectOutputStream.java rename to codec/src/main/java/io/netty/handler/codec/serialization/CompactObjectOutputStream.java diff --git a/src/main/java/io/netty/handler/codec/serialization/CompatibleObjectDecoder.java b/codec/src/main/java/io/netty/handler/codec/serialization/CompatibleObjectDecoder.java similarity index 100% rename from src/main/java/io/netty/handler/codec/serialization/CompatibleObjectDecoder.java rename to codec/src/main/java/io/netty/handler/codec/serialization/CompatibleObjectDecoder.java diff --git a/src/main/java/io/netty/handler/codec/serialization/CompatibleObjectDecoderState.java b/codec/src/main/java/io/netty/handler/codec/serialization/CompatibleObjectDecoderState.java similarity index 100% rename from src/main/java/io/netty/handler/codec/serialization/CompatibleObjectDecoderState.java rename to codec/src/main/java/io/netty/handler/codec/serialization/CompatibleObjectDecoderState.java diff --git a/src/main/java/io/netty/handler/codec/serialization/CompatibleObjectEncoder.java b/codec/src/main/java/io/netty/handler/codec/serialization/CompatibleObjectEncoder.java similarity index 100% rename from src/main/java/io/netty/handler/codec/serialization/CompatibleObjectEncoder.java rename to codec/src/main/java/io/netty/handler/codec/serialization/CompatibleObjectEncoder.java diff --git a/src/main/java/io/netty/handler/codec/serialization/ObjectDecoder.java b/codec/src/main/java/io/netty/handler/codec/serialization/ObjectDecoder.java similarity index 100% rename from src/main/java/io/netty/handler/codec/serialization/ObjectDecoder.java rename to codec/src/main/java/io/netty/handler/codec/serialization/ObjectDecoder.java diff --git a/src/main/java/io/netty/handler/codec/serialization/ObjectDecoderInputStream.java b/codec/src/main/java/io/netty/handler/codec/serialization/ObjectDecoderInputStream.java similarity index 100% rename from src/main/java/io/netty/handler/codec/serialization/ObjectDecoderInputStream.java rename to codec/src/main/java/io/netty/handler/codec/serialization/ObjectDecoderInputStream.java diff --git a/src/main/java/io/netty/handler/codec/serialization/ObjectEncoder.java b/codec/src/main/java/io/netty/handler/codec/serialization/ObjectEncoder.java similarity index 100% rename from src/main/java/io/netty/handler/codec/serialization/ObjectEncoder.java rename to codec/src/main/java/io/netty/handler/codec/serialization/ObjectEncoder.java diff --git a/src/main/java/io/netty/handler/codec/serialization/ObjectEncoderOutputStream.java b/codec/src/main/java/io/netty/handler/codec/serialization/ObjectEncoderOutputStream.java similarity index 100% rename from src/main/java/io/netty/handler/codec/serialization/ObjectEncoderOutputStream.java rename to codec/src/main/java/io/netty/handler/codec/serialization/ObjectEncoderOutputStream.java diff --git a/src/main/java/io/netty/handler/codec/serialization/ReferenceMap.java b/codec/src/main/java/io/netty/handler/codec/serialization/ReferenceMap.java similarity index 100% rename from src/main/java/io/netty/handler/codec/serialization/ReferenceMap.java rename to codec/src/main/java/io/netty/handler/codec/serialization/ReferenceMap.java diff --git a/src/main/java/io/netty/handler/codec/serialization/SoftReferenceMap.java b/codec/src/main/java/io/netty/handler/codec/serialization/SoftReferenceMap.java similarity index 100% rename from src/main/java/io/netty/handler/codec/serialization/SoftReferenceMap.java rename to codec/src/main/java/io/netty/handler/codec/serialization/SoftReferenceMap.java diff --git a/src/main/java/io/netty/handler/codec/serialization/SwitchableInputStream.java b/codec/src/main/java/io/netty/handler/codec/serialization/SwitchableInputStream.java similarity index 100% rename from src/main/java/io/netty/handler/codec/serialization/SwitchableInputStream.java rename to codec/src/main/java/io/netty/handler/codec/serialization/SwitchableInputStream.java diff --git a/src/main/java/io/netty/handler/codec/serialization/WeakReferenceMap.java b/codec/src/main/java/io/netty/handler/codec/serialization/WeakReferenceMap.java similarity index 100% rename from src/main/java/io/netty/handler/codec/serialization/WeakReferenceMap.java rename to codec/src/main/java/io/netty/handler/codec/serialization/WeakReferenceMap.java diff --git a/src/main/java/io/netty/handler/codec/serialization/package-info.java b/codec/src/main/java/io/netty/handler/codec/serialization/package-info.java similarity index 100% rename from src/main/java/io/netty/handler/codec/serialization/package-info.java rename to codec/src/main/java/io/netty/handler/codec/serialization/package-info.java diff --git a/src/main/java/io/netty/handler/codec/string/StringDecoder.java b/codec/src/main/java/io/netty/handler/codec/string/StringDecoder.java similarity index 100% rename from src/main/java/io/netty/handler/codec/string/StringDecoder.java rename to codec/src/main/java/io/netty/handler/codec/string/StringDecoder.java diff --git a/src/main/java/io/netty/handler/codec/string/StringEncoder.java b/codec/src/main/java/io/netty/handler/codec/string/StringEncoder.java similarity index 100% rename from src/main/java/io/netty/handler/codec/string/StringEncoder.java rename to codec/src/main/java/io/netty/handler/codec/string/StringEncoder.java diff --git a/src/main/java/io/netty/handler/codec/string/package-info.java b/codec/src/main/java/io/netty/handler/codec/string/package-info.java similarity index 100% rename from src/main/java/io/netty/handler/codec/string/package-info.java rename to codec/src/main/java/io/netty/handler/codec/string/package-info.java diff --git a/src/test/java/io/netty/handler/codec/bytes/ByteArrayDecoderTest.java b/codec/src/test/java/io/netty/handler/codec/bytes/ByteArrayDecoderTest.java similarity index 100% rename from src/test/java/io/netty/handler/codec/bytes/ByteArrayDecoderTest.java rename to codec/src/test/java/io/netty/handler/codec/bytes/ByteArrayDecoderTest.java diff --git a/src/test/java/io/netty/handler/codec/bytes/ByteArrayEncoderTest.java b/codec/src/test/java/io/netty/handler/codec/bytes/ByteArrayEncoderTest.java similarity index 100% rename from src/test/java/io/netty/handler/codec/bytes/ByteArrayEncoderTest.java rename to codec/src/test/java/io/netty/handler/codec/bytes/ByteArrayEncoderTest.java diff --git a/src/test/java/io/netty/handler/codec/frame/DelimiterBasedFrameDecoderTest.java b/codec/src/test/java/io/netty/handler/codec/frame/DelimiterBasedFrameDecoderTest.java similarity index 100% rename from src/test/java/io/netty/handler/codec/frame/DelimiterBasedFrameDecoderTest.java rename to codec/src/test/java/io/netty/handler/codec/frame/DelimiterBasedFrameDecoderTest.java diff --git a/src/test/java/io/netty/handler/codec/frame/LengthFieldBasedFrameDecoderTest.java b/codec/src/test/java/io/netty/handler/codec/frame/LengthFieldBasedFrameDecoderTest.java similarity index 100% rename from src/test/java/io/netty/handler/codec/frame/LengthFieldBasedFrameDecoderTest.java rename to codec/src/test/java/io/netty/handler/codec/frame/LengthFieldBasedFrameDecoderTest.java diff --git a/src/test/java/io/netty/handler/codec/protobuf/ProtobufVarint32FrameDecoderTest.java b/codec/src/test/java/io/netty/handler/codec/protobuf/ProtobufVarint32FrameDecoderTest.java similarity index 100% rename from src/test/java/io/netty/handler/codec/protobuf/ProtobufVarint32FrameDecoderTest.java rename to codec/src/test/java/io/netty/handler/codec/protobuf/ProtobufVarint32FrameDecoderTest.java diff --git a/src/test/java/io/netty/handler/codec/protobuf/ProtobufVarint32LengthFieldPrependerTest.java b/codec/src/test/java/io/netty/handler/codec/protobuf/ProtobufVarint32LengthFieldPrependerTest.java similarity index 100% rename from src/test/java/io/netty/handler/codec/protobuf/ProtobufVarint32LengthFieldPrependerTest.java rename to codec/src/test/java/io/netty/handler/codec/protobuf/ProtobufVarint32LengthFieldPrependerTest.java diff --git a/src/test/java/io/netty/handler/codec/replay/ReplayingDecoderTest.java b/codec/src/test/java/io/netty/handler/codec/replay/ReplayingDecoderTest.java similarity index 100% rename from src/test/java/io/netty/handler/codec/replay/ReplayingDecoderTest.java rename to codec/src/test/java/io/netty/handler/codec/replay/ReplayingDecoderTest.java diff --git a/src/test/java/io/netty/handler/codec/serialization/CompactObjectSerializationTest.java b/codec/src/test/java/io/netty/handler/codec/serialization/CompactObjectSerializationTest.java similarity index 100% rename from src/test/java/io/netty/handler/codec/serialization/CompactObjectSerializationTest.java rename to codec/src/test/java/io/netty/handler/codec/serialization/CompactObjectSerializationTest.java diff --git a/src/test/java/io/netty/handler/codec/serialization/SwitchableInputStreamTest.java b/codec/src/test/java/io/netty/handler/codec/serialization/SwitchableInputStreamTest.java similarity index 100% rename from src/test/java/io/netty/handler/codec/serialization/SwitchableInputStreamTest.java rename to codec/src/test/java/io/netty/handler/codec/serialization/SwitchableInputStreamTest.java diff --git a/common/pom.xml b/common/pom.xml new file mode 100644 index 0000000000..24edd61632 --- /dev/null +++ b/common/pom.xml @@ -0,0 +1,77 @@ + + + + + 4.0.0 + + io.netty + netty-parent + 4.0.0.Alpha1-SNAPSHOT + + + io.netty + netty-common + jar + + Netty/Common + + + + + org.slf4j + slf4j-api + compile + true + + + commons-logging + commons-logging + compile + true + + + org.jboss.logging + jboss-logging-spi + compile + true + + + log4j + log4j + compile + true + + + org.apache.felix + org.osgi.core + compile + true + + + org.apache.felix + org.osgi.compendium + compile + true + + + + + + + + + diff --git a/src/main/java/io/netty/logging/AbstractInternalLogger.java b/common/src/main/java/io/netty/logging/AbstractInternalLogger.java similarity index 100% rename from src/main/java/io/netty/logging/AbstractInternalLogger.java rename to common/src/main/java/io/netty/logging/AbstractInternalLogger.java diff --git a/src/main/java/io/netty/logging/CommonsLogger.java b/common/src/main/java/io/netty/logging/CommonsLogger.java similarity index 100% rename from src/main/java/io/netty/logging/CommonsLogger.java rename to common/src/main/java/io/netty/logging/CommonsLogger.java diff --git a/src/main/java/io/netty/logging/CommonsLoggerFactory.java b/common/src/main/java/io/netty/logging/CommonsLoggerFactory.java similarity index 100% rename from src/main/java/io/netty/logging/CommonsLoggerFactory.java rename to common/src/main/java/io/netty/logging/CommonsLoggerFactory.java diff --git a/src/main/java/io/netty/logging/InternalLogLevel.java b/common/src/main/java/io/netty/logging/InternalLogLevel.java similarity index 100% rename from src/main/java/io/netty/logging/InternalLogLevel.java rename to common/src/main/java/io/netty/logging/InternalLogLevel.java diff --git a/src/main/java/io/netty/logging/InternalLogger.java b/common/src/main/java/io/netty/logging/InternalLogger.java similarity index 100% rename from src/main/java/io/netty/logging/InternalLogger.java rename to common/src/main/java/io/netty/logging/InternalLogger.java diff --git a/src/main/java/io/netty/logging/InternalLoggerFactory.java b/common/src/main/java/io/netty/logging/InternalLoggerFactory.java similarity index 89% rename from src/main/java/io/netty/logging/InternalLoggerFactory.java rename to common/src/main/java/io/netty/logging/InternalLoggerFactory.java index 54052c969c..badb9d88cf 100644 --- a/src/main/java/io/netty/logging/InternalLoggerFactory.java +++ b/common/src/main/java/io/netty/logging/InternalLoggerFactory.java @@ -15,8 +15,6 @@ */ package io.netty.logging; -import io.netty.util.internal.StackTraceSimplifier; - /** * Creates an {@link InternalLogger} or changes the default factory * implementation. This factory allows you to choose what logging framework @@ -36,13 +34,6 @@ import io.netty.util.internal.StackTraceSimplifier; public abstract class InternalLoggerFactory { private static volatile InternalLoggerFactory defaultFactory = new JdkLoggerFactory(); - static { - // Load the dependent classes in advance to avoid the case where - // the VM fails to load the required classes because of too many open - // files. - StackTraceSimplifier.simplify(new Exception()); - } - /** * Returns the default factory. The initial default factory is * {@link JdkLoggerFactory}. @@ -82,7 +73,6 @@ public abstract class InternalLoggerFactory { @Override public void debug(String msg, Throwable cause) { - StackTraceSimplifier.simplify(cause); logger.debug(msg, cause); } @@ -93,7 +83,6 @@ public abstract class InternalLoggerFactory { @Override public void error(String msg, Throwable cause) { - StackTraceSimplifier.simplify(cause); logger.error(msg, cause); } @@ -104,7 +93,6 @@ public abstract class InternalLoggerFactory { @Override public void info(String msg, Throwable cause) { - StackTraceSimplifier.simplify(cause); logger.info(msg, cause); } @@ -135,7 +123,6 @@ public abstract class InternalLoggerFactory { @Override public void warn(String msg, Throwable cause) { - StackTraceSimplifier.simplify(cause); logger.warn(msg, cause); } @@ -151,7 +138,6 @@ public abstract class InternalLoggerFactory { @Override public void log(InternalLogLevel level, String msg, Throwable cause) { - StackTraceSimplifier.simplify(cause); logger.log(level, msg, cause); } }; diff --git a/src/main/java/io/netty/logging/JBossLogger.java b/common/src/main/java/io/netty/logging/JBossLogger.java similarity index 100% rename from src/main/java/io/netty/logging/JBossLogger.java rename to common/src/main/java/io/netty/logging/JBossLogger.java diff --git a/src/main/java/io/netty/logging/JBossLoggerFactory.java b/common/src/main/java/io/netty/logging/JBossLoggerFactory.java similarity index 100% rename from src/main/java/io/netty/logging/JBossLoggerFactory.java rename to common/src/main/java/io/netty/logging/JBossLoggerFactory.java diff --git a/src/main/java/io/netty/logging/JdkLogger.java b/common/src/main/java/io/netty/logging/JdkLogger.java similarity index 100% rename from src/main/java/io/netty/logging/JdkLogger.java rename to common/src/main/java/io/netty/logging/JdkLogger.java diff --git a/src/main/java/io/netty/logging/JdkLoggerFactory.java b/common/src/main/java/io/netty/logging/JdkLoggerFactory.java similarity index 100% rename from src/main/java/io/netty/logging/JdkLoggerFactory.java rename to common/src/main/java/io/netty/logging/JdkLoggerFactory.java diff --git a/src/main/java/io/netty/logging/Log4JLogger.java b/common/src/main/java/io/netty/logging/Log4JLogger.java similarity index 100% rename from src/main/java/io/netty/logging/Log4JLogger.java rename to common/src/main/java/io/netty/logging/Log4JLogger.java diff --git a/src/main/java/io/netty/logging/Log4JLoggerFactory.java b/common/src/main/java/io/netty/logging/Log4JLoggerFactory.java similarity index 100% rename from src/main/java/io/netty/logging/Log4JLoggerFactory.java rename to common/src/main/java/io/netty/logging/Log4JLoggerFactory.java diff --git a/src/main/java/io/netty/logging/OsgiLogger.java b/common/src/main/java/io/netty/logging/OsgiLogger.java similarity index 100% rename from src/main/java/io/netty/logging/OsgiLogger.java rename to common/src/main/java/io/netty/logging/OsgiLogger.java diff --git a/src/main/java/io/netty/logging/OsgiLoggerFactory.java b/common/src/main/java/io/netty/logging/OsgiLoggerFactory.java similarity index 100% rename from src/main/java/io/netty/logging/OsgiLoggerFactory.java rename to common/src/main/java/io/netty/logging/OsgiLoggerFactory.java diff --git a/src/main/java/io/netty/logging/Slf4JLogger.java b/common/src/main/java/io/netty/logging/Slf4JLogger.java similarity index 100% rename from src/main/java/io/netty/logging/Slf4JLogger.java rename to common/src/main/java/io/netty/logging/Slf4JLogger.java diff --git a/src/main/java/io/netty/logging/Slf4JLoggerFactory.java b/common/src/main/java/io/netty/logging/Slf4JLoggerFactory.java similarity index 100% rename from src/main/java/io/netty/logging/Slf4JLoggerFactory.java rename to common/src/main/java/io/netty/logging/Slf4JLoggerFactory.java diff --git a/src/main/java/io/netty/logging/package-info.java b/common/src/main/java/io/netty/logging/package-info.java similarity index 100% rename from src/main/java/io/netty/logging/package-info.java rename to common/src/main/java/io/netty/logging/package-info.java diff --git a/src/main/java/io/netty/util/CharsetUtil.java b/common/src/main/java/io/netty/util/CharsetUtil.java similarity index 100% rename from src/main/java/io/netty/util/CharsetUtil.java rename to common/src/main/java/io/netty/util/CharsetUtil.java diff --git a/src/main/java/io/netty/util/EstimatableObjectWrapper.java b/common/src/main/java/io/netty/util/EstimatableObjectWrapper.java similarity index 100% rename from src/main/java/io/netty/util/EstimatableObjectWrapper.java rename to common/src/main/java/io/netty/util/EstimatableObjectWrapper.java diff --git a/src/main/java/io/netty/util/ExternalResourceReleasable.java b/common/src/main/java/io/netty/util/ExternalResourceReleasable.java similarity index 100% rename from src/main/java/io/netty/util/ExternalResourceReleasable.java rename to common/src/main/java/io/netty/util/ExternalResourceReleasable.java diff --git a/src/main/java/io/netty/util/ExternalResourceUtil.java b/common/src/main/java/io/netty/util/ExternalResourceUtil.java similarity index 100% rename from src/main/java/io/netty/util/ExternalResourceUtil.java rename to common/src/main/java/io/netty/util/ExternalResourceUtil.java diff --git a/src/main/java/io/netty/util/HashedWheelTimer.java b/common/src/main/java/io/netty/util/HashedWheelTimer.java similarity index 98% rename from src/main/java/io/netty/util/HashedWheelTimer.java rename to common/src/main/java/io/netty/util/HashedWheelTimer.java index 8f0ec16847..b4bfe997b7 100644 --- a/src/main/java/io/netty/util/HashedWheelTimer.java +++ b/common/src/main/java/io/netty/util/HashedWheelTimer.java @@ -28,7 +28,6 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.locks.ReadWriteLock; import java.util.concurrent.locks.ReentrantReadWriteLock; -import io.netty.channel.ChannelPipelineFactory; import io.netty.logging.InternalLogger; import io.netty.logging.InternalLoggerFactory; import io.netty.util.internal.ConcurrentIdentityHashMap; @@ -64,9 +63,7 @@ import io.netty.util.internal.SharedResourceMisuseDetector; * {@link HashedWheelTimer} creates a new thread whenever it is instantiated and * started. Therefore, you should make sure to create only one instance and * share it across your application. One of the common mistakes, that makes - * your application unresponsive, is to create a new instance in - * {@link ChannelPipelineFactory}, which results in the creation of a new thread - * for every connection. + * your application unresponsive, is to create a new instance for every connection. * *

Implementation Details

* diff --git a/src/main/java/io/netty/util/MapBackedSet.java b/common/src/main/java/io/netty/util/MapBackedSet.java similarity index 100% rename from src/main/java/io/netty/util/MapBackedSet.java rename to common/src/main/java/io/netty/util/MapBackedSet.java diff --git a/src/test/java/io/netty/util/TestUtil.java b/common/src/main/java/io/netty/util/SocketAddresses.java similarity index 88% rename from src/test/java/io/netty/util/TestUtil.java rename to common/src/main/java/io/netty/util/SocketAddresses.java index a57824f6c0..edc0ef6220 100644 --- a/src/test/java/io/netty/util/TestUtil.java +++ b/common/src/main/java/io/netty/util/SocketAddresses.java @@ -18,15 +18,14 @@ package io.netty.util; import java.net.InetAddress; import java.net.UnknownHostException; +public final class SocketAddresses { -/** - */ -@org.junit.Ignore -public final class TestUtil { - - private static final InetAddress LOCALHOST; + public static final InetAddress LOCALHOST; static { + // We cache this because some machine takes almost forever to return + // from InetAddress.getLocalHost(). I think it's due to the incorrect + // /etc/hosts or /etc/resolve.conf. InetAddress localhost = null; try { localhost = InetAddress.getLocalHost(); @@ -46,14 +45,7 @@ public final class TestUtil { LOCALHOST = localhost; } - public static InetAddress getLocalHost() { - // We cache this because some machine takes almost forever to return - // from InetAddress.getLocalHost(). I think it's due to the incorrect - // /etc/hosts or /etc/resolve.conf. - return LOCALHOST; - } - - private TestUtil() { + private SocketAddresses() { // Unused } } diff --git a/src/main/java/io/netty/util/Timeout.java b/common/src/main/java/io/netty/util/Timeout.java similarity index 100% rename from src/main/java/io/netty/util/Timeout.java rename to common/src/main/java/io/netty/util/Timeout.java diff --git a/src/main/java/io/netty/util/Timer.java b/common/src/main/java/io/netty/util/Timer.java similarity index 100% rename from src/main/java/io/netty/util/Timer.java rename to common/src/main/java/io/netty/util/Timer.java diff --git a/src/main/java/io/netty/util/TimerTask.java b/common/src/main/java/io/netty/util/TimerTask.java similarity index 100% rename from src/main/java/io/netty/util/TimerTask.java rename to common/src/main/java/io/netty/util/TimerTask.java diff --git a/src/main/java/io/netty/util/UnsafeDetectUtil.java b/common/src/main/java/io/netty/util/UnsafeDetectUtil.java similarity index 100% rename from src/main/java/io/netty/util/UnsafeDetectUtil.java rename to common/src/main/java/io/netty/util/UnsafeDetectUtil.java diff --git a/src/main/java/io/netty/util/internal/AtomicFieldUpdaterUtil.java b/common/src/main/java/io/netty/util/internal/AtomicFieldUpdaterUtil.java similarity index 100% rename from src/main/java/io/netty/util/internal/AtomicFieldUpdaterUtil.java rename to common/src/main/java/io/netty/util/internal/AtomicFieldUpdaterUtil.java diff --git a/src/main/java/io/netty/util/internal/ConcurrentHashMap.java b/common/src/main/java/io/netty/util/internal/ConcurrentHashMap.java similarity index 100% rename from src/main/java/io/netty/util/internal/ConcurrentHashMap.java rename to common/src/main/java/io/netty/util/internal/ConcurrentHashMap.java diff --git a/src/main/java/io/netty/util/internal/ConcurrentIdentityHashMap.java b/common/src/main/java/io/netty/util/internal/ConcurrentIdentityHashMap.java similarity index 100% rename from src/main/java/io/netty/util/internal/ConcurrentIdentityHashMap.java rename to common/src/main/java/io/netty/util/internal/ConcurrentIdentityHashMap.java diff --git a/src/main/java/io/netty/util/internal/ConcurrentIdentityWeakKeyHashMap.java b/common/src/main/java/io/netty/util/internal/ConcurrentIdentityWeakKeyHashMap.java similarity index 100% rename from src/main/java/io/netty/util/internal/ConcurrentIdentityWeakKeyHashMap.java rename to common/src/main/java/io/netty/util/internal/ConcurrentIdentityWeakKeyHashMap.java diff --git a/src/main/java/io/netty/util/internal/ConcurrentWeakKeyHashMap.java b/common/src/main/java/io/netty/util/internal/ConcurrentWeakKeyHashMap.java similarity index 100% rename from src/main/java/io/netty/util/internal/ConcurrentWeakKeyHashMap.java rename to common/src/main/java/io/netty/util/internal/ConcurrentWeakKeyHashMap.java diff --git a/src/main/java/io/netty/util/internal/ConversionUtil.java b/common/src/main/java/io/netty/util/internal/ConversionUtil.java similarity index 100% rename from src/main/java/io/netty/util/internal/ConversionUtil.java rename to common/src/main/java/io/netty/util/internal/ConversionUtil.java diff --git a/src/main/java/io/netty/util/internal/DeadLockProofWorker.java b/common/src/main/java/io/netty/util/internal/DeadLockProofWorker.java similarity index 100% rename from src/main/java/io/netty/util/internal/DeadLockProofWorker.java rename to common/src/main/java/io/netty/util/internal/DeadLockProofWorker.java diff --git a/src/main/java/io/netty/util/internal/ExecutorUtil.java b/common/src/main/java/io/netty/util/internal/ExecutorUtil.java similarity index 100% rename from src/main/java/io/netty/util/internal/ExecutorUtil.java rename to common/src/main/java/io/netty/util/internal/ExecutorUtil.java diff --git a/src/main/java/io/netty/util/internal/LegacyLinkedTransferQueue.java b/common/src/main/java/io/netty/util/internal/LegacyLinkedTransferQueue.java similarity index 100% rename from src/main/java/io/netty/util/internal/LegacyLinkedTransferQueue.java rename to common/src/main/java/io/netty/util/internal/LegacyLinkedTransferQueue.java diff --git a/src/main/java/io/netty/util/internal/LinkedTransferQueue.java b/common/src/main/java/io/netty/util/internal/LinkedTransferQueue.java similarity index 100% rename from src/main/java/io/netty/util/internal/LinkedTransferQueue.java rename to common/src/main/java/io/netty/util/internal/LinkedTransferQueue.java diff --git a/src/main/java/io/netty/util/internal/NonReentrantLock.java b/common/src/main/java/io/netty/util/internal/NonReentrantLock.java similarity index 100% rename from src/main/java/io/netty/util/internal/NonReentrantLock.java rename to common/src/main/java/io/netty/util/internal/NonReentrantLock.java diff --git a/src/main/java/io/netty/util/internal/QueueFactory.java b/common/src/main/java/io/netty/util/internal/QueueFactory.java similarity index 100% rename from src/main/java/io/netty/util/internal/QueueFactory.java rename to common/src/main/java/io/netty/util/internal/QueueFactory.java diff --git a/src/main/java/io/netty/util/internal/ReusableIterator.java b/common/src/main/java/io/netty/util/internal/ReusableIterator.java similarity index 100% rename from src/main/java/io/netty/util/internal/ReusableIterator.java rename to common/src/main/java/io/netty/util/internal/ReusableIterator.java diff --git a/src/main/java/io/netty/util/internal/SharedResourceMisuseDetector.java b/common/src/main/java/io/netty/util/internal/SharedResourceMisuseDetector.java similarity index 100% rename from src/main/java/io/netty/util/internal/SharedResourceMisuseDetector.java rename to common/src/main/java/io/netty/util/internal/SharedResourceMisuseDetector.java diff --git a/src/main/java/io/netty/util/internal/StringUtil.java b/common/src/main/java/io/netty/util/internal/StringUtil.java similarity index 100% rename from src/main/java/io/netty/util/internal/StringUtil.java rename to common/src/main/java/io/netty/util/internal/StringUtil.java diff --git a/src/main/java/io/netty/util/internal/SystemPropertyUtil.java b/common/src/main/java/io/netty/util/internal/SystemPropertyUtil.java similarity index 100% rename from src/main/java/io/netty/util/internal/SystemPropertyUtil.java rename to common/src/main/java/io/netty/util/internal/SystemPropertyUtil.java diff --git a/src/main/java/io/netty/util/internal/ThreadLocalBoolean.java b/common/src/main/java/io/netty/util/internal/ThreadLocalBoolean.java similarity index 100% rename from src/main/java/io/netty/util/internal/ThreadLocalBoolean.java rename to common/src/main/java/io/netty/util/internal/ThreadLocalBoolean.java diff --git a/src/main/java/io/netty/util/internal/ThreadLocalRandom.java b/common/src/main/java/io/netty/util/internal/ThreadLocalRandom.java similarity index 100% rename from src/main/java/io/netty/util/internal/ThreadLocalRandom.java rename to common/src/main/java/io/netty/util/internal/ThreadLocalRandom.java diff --git a/src/main/java/io/netty/util/internal/UnterminatableExecutor.java b/common/src/main/java/io/netty/util/internal/UnterminatableExecutor.java similarity index 100% rename from src/main/java/io/netty/util/internal/UnterminatableExecutor.java rename to common/src/main/java/io/netty/util/internal/UnterminatableExecutor.java diff --git a/src/main/java/io/netty/util/internal/jzlib/Adler32.java b/common/src/main/java/io/netty/util/internal/jzlib/Adler32.java similarity index 100% rename from src/main/java/io/netty/util/internal/jzlib/Adler32.java rename to common/src/main/java/io/netty/util/internal/jzlib/Adler32.java diff --git a/src/main/java/io/netty/util/internal/jzlib/CRC32.java b/common/src/main/java/io/netty/util/internal/jzlib/CRC32.java similarity index 100% rename from src/main/java/io/netty/util/internal/jzlib/CRC32.java rename to common/src/main/java/io/netty/util/internal/jzlib/CRC32.java diff --git a/src/main/java/io/netty/util/internal/jzlib/Deflate.java b/common/src/main/java/io/netty/util/internal/jzlib/Deflate.java similarity index 100% rename from src/main/java/io/netty/util/internal/jzlib/Deflate.java rename to common/src/main/java/io/netty/util/internal/jzlib/Deflate.java diff --git a/src/main/java/io/netty/util/internal/jzlib/InfBlocks.java b/common/src/main/java/io/netty/util/internal/jzlib/InfBlocks.java similarity index 100% rename from src/main/java/io/netty/util/internal/jzlib/InfBlocks.java rename to common/src/main/java/io/netty/util/internal/jzlib/InfBlocks.java diff --git a/src/main/java/io/netty/util/internal/jzlib/InfCodes.java b/common/src/main/java/io/netty/util/internal/jzlib/InfCodes.java similarity index 100% rename from src/main/java/io/netty/util/internal/jzlib/InfCodes.java rename to common/src/main/java/io/netty/util/internal/jzlib/InfCodes.java diff --git a/src/main/java/io/netty/util/internal/jzlib/InfTree.java b/common/src/main/java/io/netty/util/internal/jzlib/InfTree.java similarity index 100% rename from src/main/java/io/netty/util/internal/jzlib/InfTree.java rename to common/src/main/java/io/netty/util/internal/jzlib/InfTree.java diff --git a/src/main/java/io/netty/util/internal/jzlib/Inflate.java b/common/src/main/java/io/netty/util/internal/jzlib/Inflate.java similarity index 100% rename from src/main/java/io/netty/util/internal/jzlib/Inflate.java rename to common/src/main/java/io/netty/util/internal/jzlib/Inflate.java diff --git a/src/main/java/io/netty/util/internal/jzlib/JZlib.java b/common/src/main/java/io/netty/util/internal/jzlib/JZlib.java similarity index 100% rename from src/main/java/io/netty/util/internal/jzlib/JZlib.java rename to common/src/main/java/io/netty/util/internal/jzlib/JZlib.java diff --git a/src/main/java/io/netty/util/internal/jzlib/StaticTree.java b/common/src/main/java/io/netty/util/internal/jzlib/StaticTree.java similarity index 100% rename from src/main/java/io/netty/util/internal/jzlib/StaticTree.java rename to common/src/main/java/io/netty/util/internal/jzlib/StaticTree.java diff --git a/src/main/java/io/netty/util/internal/jzlib/Tree.java b/common/src/main/java/io/netty/util/internal/jzlib/Tree.java similarity index 100% rename from src/main/java/io/netty/util/internal/jzlib/Tree.java rename to common/src/main/java/io/netty/util/internal/jzlib/Tree.java diff --git a/src/main/java/io/netty/util/internal/jzlib/ZStream.java b/common/src/main/java/io/netty/util/internal/jzlib/ZStream.java similarity index 100% rename from src/main/java/io/netty/util/internal/jzlib/ZStream.java rename to common/src/main/java/io/netty/util/internal/jzlib/ZStream.java diff --git a/src/main/java/io/netty/util/internal/package-info.java b/common/src/main/java/io/netty/util/internal/package-info.java similarity index 100% rename from src/main/java/io/netty/util/internal/package-info.java rename to common/src/main/java/io/netty/util/internal/package-info.java diff --git a/src/main/java/io/netty/util/package-info.java b/common/src/main/java/io/netty/util/package-info.java similarity index 100% rename from src/main/java/io/netty/util/package-info.java rename to common/src/main/java/io/netty/util/package-info.java diff --git a/src/test/java/io/netty/logging/CommonsLoggerFactoryTest.java b/common/src/test/java/io/netty/logging/CommonsLoggerFactoryTest.java similarity index 100% rename from src/test/java/io/netty/logging/CommonsLoggerFactoryTest.java rename to common/src/test/java/io/netty/logging/CommonsLoggerFactoryTest.java diff --git a/src/test/java/io/netty/logging/CommonsLoggerTest.java b/common/src/test/java/io/netty/logging/CommonsLoggerTest.java similarity index 100% rename from src/test/java/io/netty/logging/CommonsLoggerTest.java rename to common/src/test/java/io/netty/logging/CommonsLoggerTest.java diff --git a/src/test/java/io/netty/logging/InternalLoggerFactoryTest.java b/common/src/test/java/io/netty/logging/InternalLoggerFactoryTest.java similarity index 100% rename from src/test/java/io/netty/logging/InternalLoggerFactoryTest.java rename to common/src/test/java/io/netty/logging/InternalLoggerFactoryTest.java diff --git a/src/test/java/io/netty/logging/JBossLoggerFactoryTest.java b/common/src/test/java/io/netty/logging/JBossLoggerFactoryTest.java similarity index 100% rename from src/test/java/io/netty/logging/JBossLoggerFactoryTest.java rename to common/src/test/java/io/netty/logging/JBossLoggerFactoryTest.java diff --git a/src/test/java/io/netty/logging/JBossLoggerTest.java b/common/src/test/java/io/netty/logging/JBossLoggerTest.java similarity index 100% rename from src/test/java/io/netty/logging/JBossLoggerTest.java rename to common/src/test/java/io/netty/logging/JBossLoggerTest.java diff --git a/src/test/java/io/netty/logging/JdkLoggerFactoryTest.java b/common/src/test/java/io/netty/logging/JdkLoggerFactoryTest.java similarity index 100% rename from src/test/java/io/netty/logging/JdkLoggerFactoryTest.java rename to common/src/test/java/io/netty/logging/JdkLoggerFactoryTest.java diff --git a/src/test/java/io/netty/logging/JdkLoggerTest.java b/common/src/test/java/io/netty/logging/JdkLoggerTest.java similarity index 100% rename from src/test/java/io/netty/logging/JdkLoggerTest.java rename to common/src/test/java/io/netty/logging/JdkLoggerTest.java diff --git a/src/test/java/io/netty/logging/Log4JLoggerFactoryTest.java b/common/src/test/java/io/netty/logging/Log4JLoggerFactoryTest.java similarity index 100% rename from src/test/java/io/netty/logging/Log4JLoggerFactoryTest.java rename to common/src/test/java/io/netty/logging/Log4JLoggerFactoryTest.java diff --git a/src/test/java/io/netty/logging/Log4JLoggerTest.java b/common/src/test/java/io/netty/logging/Log4JLoggerTest.java similarity index 100% rename from src/test/java/io/netty/logging/Log4JLoggerTest.java rename to common/src/test/java/io/netty/logging/Log4JLoggerTest.java diff --git a/src/test/java/io/netty/logging/Slf4JLoggerFactoryTest.java b/common/src/test/java/io/netty/logging/Slf4JLoggerFactoryTest.java similarity index 100% rename from src/test/java/io/netty/logging/Slf4JLoggerFactoryTest.java rename to common/src/test/java/io/netty/logging/Slf4JLoggerFactoryTest.java diff --git a/src/test/java/io/netty/logging/Slf4JLoggerTest.java b/common/src/test/java/io/netty/logging/Slf4JLoggerTest.java similarity index 100% rename from src/test/java/io/netty/logging/Slf4JLoggerTest.java rename to common/src/test/java/io/netty/logging/Slf4JLoggerTest.java diff --git a/src/test/java/io/netty/util/MapBackedSetTest.java b/common/src/test/java/io/netty/util/MapBackedSetTest.java similarity index 100% rename from src/test/java/io/netty/util/MapBackedSetTest.java rename to common/src/test/java/io/netty/util/MapBackedSetTest.java diff --git a/src/test/java/io/netty/util/internal/ConversionUtilTest.java b/common/src/test/java/io/netty/util/internal/ConversionUtilTest.java similarity index 100% rename from src/test/java/io/netty/util/internal/ConversionUtilTest.java rename to common/src/test/java/io/netty/util/internal/ConversionUtilTest.java diff --git a/src/test/java/io/netty/util/internal/StringUtilTest.java b/common/src/test/java/io/netty/util/internal/StringUtilTest.java similarity index 100% rename from src/test/java/io/netty/util/internal/StringUtilTest.java rename to common/src/test/java/io/netty/util/internal/StringUtilTest.java diff --git a/example/pom.xml b/example/pom.xml new file mode 100644 index 0000000000..b21e2ea2e3 --- /dev/null +++ b/example/pom.xml @@ -0,0 +1,55 @@ + + + + + 4.0.0 + + io.netty + netty-parent + 4.0.0.Alpha1-SNAPSHOT + + + io.netty + netty-example + jar + + Netty/Example + + + + ${project.groupId} + netty-handler + ${project.version} + + + ${project.groupId} + netty-codec-http + ${project.version} + + + ${project.groupId} + netty-transport-sctp + ${project.version} + + + + com.google.protobuf + protobuf-java + + + + diff --git a/src/main/java/io/netty/example/discard/DiscardClient.java b/example/src/main/java/io/netty/example/discard/DiscardClient.java similarity index 100% rename from src/main/java/io/netty/example/discard/DiscardClient.java rename to example/src/main/java/io/netty/example/discard/DiscardClient.java diff --git a/src/main/java/io/netty/example/discard/DiscardClientHandler.java b/example/src/main/java/io/netty/example/discard/DiscardClientHandler.java similarity index 100% rename from src/main/java/io/netty/example/discard/DiscardClientHandler.java rename to example/src/main/java/io/netty/example/discard/DiscardClientHandler.java diff --git a/src/main/java/io/netty/example/discard/DiscardServer.java b/example/src/main/java/io/netty/example/discard/DiscardServer.java similarity index 100% rename from src/main/java/io/netty/example/discard/DiscardServer.java rename to example/src/main/java/io/netty/example/discard/DiscardServer.java diff --git a/src/main/java/io/netty/example/discard/DiscardServerHandler.java b/example/src/main/java/io/netty/example/discard/DiscardServerHandler.java similarity index 100% rename from src/main/java/io/netty/example/discard/DiscardServerHandler.java rename to example/src/main/java/io/netty/example/discard/DiscardServerHandler.java diff --git a/src/main/java/io/netty/example/echo/EchoClient.java b/example/src/main/java/io/netty/example/echo/EchoClient.java similarity index 100% rename from src/main/java/io/netty/example/echo/EchoClient.java rename to example/src/main/java/io/netty/example/echo/EchoClient.java diff --git a/src/main/java/io/netty/example/echo/EchoClientHandler.java b/example/src/main/java/io/netty/example/echo/EchoClientHandler.java similarity index 100% rename from src/main/java/io/netty/example/echo/EchoClientHandler.java rename to example/src/main/java/io/netty/example/echo/EchoClientHandler.java diff --git a/src/main/java/io/netty/example/echo/EchoServer.java b/example/src/main/java/io/netty/example/echo/EchoServer.java similarity index 100% rename from src/main/java/io/netty/example/echo/EchoServer.java rename to example/src/main/java/io/netty/example/echo/EchoServer.java diff --git a/src/main/java/io/netty/example/echo/EchoServerHandler.java b/example/src/main/java/io/netty/example/echo/EchoServerHandler.java similarity index 100% rename from src/main/java/io/netty/example/echo/EchoServerHandler.java rename to example/src/main/java/io/netty/example/echo/EchoServerHandler.java diff --git a/src/main/java/io/netty/example/factorial/BigIntegerDecoder.java b/example/src/main/java/io/netty/example/factorial/BigIntegerDecoder.java similarity index 100% rename from src/main/java/io/netty/example/factorial/BigIntegerDecoder.java rename to example/src/main/java/io/netty/example/factorial/BigIntegerDecoder.java diff --git a/src/main/java/io/netty/example/factorial/FactorialClient.java b/example/src/main/java/io/netty/example/factorial/FactorialClient.java similarity index 100% rename from src/main/java/io/netty/example/factorial/FactorialClient.java rename to example/src/main/java/io/netty/example/factorial/FactorialClient.java diff --git a/src/main/java/io/netty/example/factorial/FactorialClientHandler.java b/example/src/main/java/io/netty/example/factorial/FactorialClientHandler.java similarity index 100% rename from src/main/java/io/netty/example/factorial/FactorialClientHandler.java rename to example/src/main/java/io/netty/example/factorial/FactorialClientHandler.java diff --git a/src/main/java/io/netty/example/factorial/FactorialClientPipelineFactory.java b/example/src/main/java/io/netty/example/factorial/FactorialClientPipelineFactory.java similarity index 100% rename from src/main/java/io/netty/example/factorial/FactorialClientPipelineFactory.java rename to example/src/main/java/io/netty/example/factorial/FactorialClientPipelineFactory.java diff --git a/src/main/java/io/netty/example/factorial/FactorialServer.java b/example/src/main/java/io/netty/example/factorial/FactorialServer.java similarity index 100% rename from src/main/java/io/netty/example/factorial/FactorialServer.java rename to example/src/main/java/io/netty/example/factorial/FactorialServer.java diff --git a/src/main/java/io/netty/example/factorial/FactorialServerHandler.java b/example/src/main/java/io/netty/example/factorial/FactorialServerHandler.java similarity index 100% rename from src/main/java/io/netty/example/factorial/FactorialServerHandler.java rename to example/src/main/java/io/netty/example/factorial/FactorialServerHandler.java diff --git a/src/main/java/io/netty/example/factorial/FactorialServerPipelineFactory.java b/example/src/main/java/io/netty/example/factorial/FactorialServerPipelineFactory.java similarity index 100% rename from src/main/java/io/netty/example/factorial/FactorialServerPipelineFactory.java rename to example/src/main/java/io/netty/example/factorial/FactorialServerPipelineFactory.java diff --git a/src/main/java/io/netty/example/factorial/NumberEncoder.java b/example/src/main/java/io/netty/example/factorial/NumberEncoder.java similarity index 100% rename from src/main/java/io/netty/example/factorial/NumberEncoder.java rename to example/src/main/java/io/netty/example/factorial/NumberEncoder.java diff --git a/src/main/java/io/netty/example/http/file/HttpStaticFileServer.java b/example/src/main/java/io/netty/example/http/file/HttpStaticFileServer.java similarity index 100% rename from src/main/java/io/netty/example/http/file/HttpStaticFileServer.java rename to example/src/main/java/io/netty/example/http/file/HttpStaticFileServer.java diff --git a/src/main/java/io/netty/example/http/file/HttpStaticFileServerHandler.java b/example/src/main/java/io/netty/example/http/file/HttpStaticFileServerHandler.java similarity index 100% rename from src/main/java/io/netty/example/http/file/HttpStaticFileServerHandler.java rename to example/src/main/java/io/netty/example/http/file/HttpStaticFileServerHandler.java diff --git a/src/main/java/io/netty/example/http/file/HttpStaticFileServerPipelineFactory.java b/example/src/main/java/io/netty/example/http/file/HttpStaticFileServerPipelineFactory.java similarity index 100% rename from src/main/java/io/netty/example/http/file/HttpStaticFileServerPipelineFactory.java rename to example/src/main/java/io/netty/example/http/file/HttpStaticFileServerPipelineFactory.java diff --git a/src/main/java/io/netty/example/http/snoop/HttpClient.java b/example/src/main/java/io/netty/example/http/snoop/HttpClient.java similarity index 100% rename from src/main/java/io/netty/example/http/snoop/HttpClient.java rename to example/src/main/java/io/netty/example/http/snoop/HttpClient.java diff --git a/src/main/java/io/netty/example/http/snoop/HttpClientPipelineFactory.java b/example/src/main/java/io/netty/example/http/snoop/HttpClientPipelineFactory.java similarity index 100% rename from src/main/java/io/netty/example/http/snoop/HttpClientPipelineFactory.java rename to example/src/main/java/io/netty/example/http/snoop/HttpClientPipelineFactory.java diff --git a/src/main/java/io/netty/example/http/snoop/HttpRequestHandler.java b/example/src/main/java/io/netty/example/http/snoop/HttpRequestHandler.java similarity index 100% rename from src/main/java/io/netty/example/http/snoop/HttpRequestHandler.java rename to example/src/main/java/io/netty/example/http/snoop/HttpRequestHandler.java diff --git a/src/main/java/io/netty/example/http/snoop/HttpResponseHandler.java b/example/src/main/java/io/netty/example/http/snoop/HttpResponseHandler.java similarity index 100% rename from src/main/java/io/netty/example/http/snoop/HttpResponseHandler.java rename to example/src/main/java/io/netty/example/http/snoop/HttpResponseHandler.java diff --git a/src/main/java/io/netty/example/http/snoop/HttpServer.java b/example/src/main/java/io/netty/example/http/snoop/HttpServer.java similarity index 100% rename from src/main/java/io/netty/example/http/snoop/HttpServer.java rename to example/src/main/java/io/netty/example/http/snoop/HttpServer.java diff --git a/src/main/java/io/netty/example/http/snoop/HttpServerPipelineFactory.java b/example/src/main/java/io/netty/example/http/snoop/HttpServerPipelineFactory.java similarity index 100% rename from src/main/java/io/netty/example/http/snoop/HttpServerPipelineFactory.java rename to example/src/main/java/io/netty/example/http/snoop/HttpServerPipelineFactory.java diff --git a/src/main/java/io/netty/example/http/upload/HttpClient.java b/example/src/main/java/io/netty/example/http/upload/HttpClient.java similarity index 100% rename from src/main/java/io/netty/example/http/upload/HttpClient.java rename to example/src/main/java/io/netty/example/http/upload/HttpClient.java diff --git a/src/main/java/io/netty/example/http/upload/HttpClientPipelineFactory.java b/example/src/main/java/io/netty/example/http/upload/HttpClientPipelineFactory.java similarity index 100% rename from src/main/java/io/netty/example/http/upload/HttpClientPipelineFactory.java rename to example/src/main/java/io/netty/example/http/upload/HttpClientPipelineFactory.java diff --git a/src/main/java/io/netty/example/http/upload/HttpRequestHandler.java b/example/src/main/java/io/netty/example/http/upload/HttpRequestHandler.java similarity index 100% rename from src/main/java/io/netty/example/http/upload/HttpRequestHandler.java rename to example/src/main/java/io/netty/example/http/upload/HttpRequestHandler.java diff --git a/src/main/java/io/netty/example/http/upload/HttpResponseHandler.java b/example/src/main/java/io/netty/example/http/upload/HttpResponseHandler.java similarity index 100% rename from src/main/java/io/netty/example/http/upload/HttpResponseHandler.java rename to example/src/main/java/io/netty/example/http/upload/HttpResponseHandler.java diff --git a/src/main/java/io/netty/example/http/upload/HttpServer.java b/example/src/main/java/io/netty/example/http/upload/HttpServer.java similarity index 100% rename from src/main/java/io/netty/example/http/upload/HttpServer.java rename to example/src/main/java/io/netty/example/http/upload/HttpServer.java diff --git a/src/main/java/io/netty/example/http/upload/HttpServerPipelineFactory.java b/example/src/main/java/io/netty/example/http/upload/HttpServerPipelineFactory.java similarity index 100% rename from src/main/java/io/netty/example/http/upload/HttpServerPipelineFactory.java rename to example/src/main/java/io/netty/example/http/upload/HttpServerPipelineFactory.java diff --git a/src/main/java/io/netty/example/http/websocketx/autobahn/WebSocketServer.java b/example/src/main/java/io/netty/example/http/websocketx/autobahn/WebSocketServer.java similarity index 100% rename from src/main/java/io/netty/example/http/websocketx/autobahn/WebSocketServer.java rename to example/src/main/java/io/netty/example/http/websocketx/autobahn/WebSocketServer.java diff --git a/src/main/java/io/netty/example/http/websocketx/autobahn/WebSocketServerHandler.java b/example/src/main/java/io/netty/example/http/websocketx/autobahn/WebSocketServerHandler.java similarity index 100% rename from src/main/java/io/netty/example/http/websocketx/autobahn/WebSocketServerHandler.java rename to example/src/main/java/io/netty/example/http/websocketx/autobahn/WebSocketServerHandler.java diff --git a/src/main/java/io/netty/example/http/websocketx/autobahn/WebSocketServerPipelineFactory.java b/example/src/main/java/io/netty/example/http/websocketx/autobahn/WebSocketServerPipelineFactory.java similarity index 100% rename from src/main/java/io/netty/example/http/websocketx/autobahn/WebSocketServerPipelineFactory.java rename to example/src/main/java/io/netty/example/http/websocketx/autobahn/WebSocketServerPipelineFactory.java diff --git a/src/main/java/io/netty/example/http/websocketx/autobahn/package-info.java b/example/src/main/java/io/netty/example/http/websocketx/autobahn/package-info.java similarity index 100% rename from src/main/java/io/netty/example/http/websocketx/autobahn/package-info.java rename to example/src/main/java/io/netty/example/http/websocketx/autobahn/package-info.java diff --git a/src/main/java/io/netty/example/http/websocketx/client/App.java b/example/src/main/java/io/netty/example/http/websocketx/client/App.java similarity index 100% rename from src/main/java/io/netty/example/http/websocketx/client/App.java rename to example/src/main/java/io/netty/example/http/websocketx/client/App.java diff --git a/src/main/java/io/netty/example/http/websocketx/client/WebSocketCallback.java b/example/src/main/java/io/netty/example/http/websocketx/client/WebSocketCallback.java similarity index 100% rename from src/main/java/io/netty/example/http/websocketx/client/WebSocketCallback.java rename to example/src/main/java/io/netty/example/http/websocketx/client/WebSocketCallback.java diff --git a/src/main/java/io/netty/example/http/websocketx/client/WebSocketClient.java b/example/src/main/java/io/netty/example/http/websocketx/client/WebSocketClient.java similarity index 100% rename from src/main/java/io/netty/example/http/websocketx/client/WebSocketClient.java rename to example/src/main/java/io/netty/example/http/websocketx/client/WebSocketClient.java diff --git a/src/main/java/io/netty/example/http/websocketx/client/WebSocketClientFactory.java b/example/src/main/java/io/netty/example/http/websocketx/client/WebSocketClientFactory.java similarity index 100% rename from src/main/java/io/netty/example/http/websocketx/client/WebSocketClientFactory.java rename to example/src/main/java/io/netty/example/http/websocketx/client/WebSocketClientFactory.java diff --git a/src/main/java/io/netty/example/http/websocketx/client/WebSocketClientHandler.java b/example/src/main/java/io/netty/example/http/websocketx/client/WebSocketClientHandler.java similarity index 100% rename from src/main/java/io/netty/example/http/websocketx/client/WebSocketClientHandler.java rename to example/src/main/java/io/netty/example/http/websocketx/client/WebSocketClientHandler.java diff --git a/src/main/java/io/netty/example/http/websocketx/client/WebSocketException.java b/example/src/main/java/io/netty/example/http/websocketx/client/WebSocketException.java similarity index 100% rename from src/main/java/io/netty/example/http/websocketx/client/WebSocketException.java rename to example/src/main/java/io/netty/example/http/websocketx/client/WebSocketException.java diff --git a/src/main/java/io/netty/example/http/websocketx/client/WebSocketHttpResponseDecoder.java b/example/src/main/java/io/netty/example/http/websocketx/client/WebSocketHttpResponseDecoder.java similarity index 100% rename from src/main/java/io/netty/example/http/websocketx/client/WebSocketHttpResponseDecoder.java rename to example/src/main/java/io/netty/example/http/websocketx/client/WebSocketHttpResponseDecoder.java diff --git a/src/main/java/io/netty/example/http/websocketx/client/package-info.java b/example/src/main/java/io/netty/example/http/websocketx/client/package-info.java similarity index 100% rename from src/main/java/io/netty/example/http/websocketx/client/package-info.java rename to example/src/main/java/io/netty/example/http/websocketx/client/package-info.java diff --git a/src/main/java/io/netty/example/http/websocketx/server/WebSocketServer.java b/example/src/main/java/io/netty/example/http/websocketx/server/WebSocketServer.java similarity index 100% rename from src/main/java/io/netty/example/http/websocketx/server/WebSocketServer.java rename to example/src/main/java/io/netty/example/http/websocketx/server/WebSocketServer.java diff --git a/src/main/java/io/netty/example/http/websocketx/server/WebSocketServerHandler.java b/example/src/main/java/io/netty/example/http/websocketx/server/WebSocketServerHandler.java similarity index 100% rename from src/main/java/io/netty/example/http/websocketx/server/WebSocketServerHandler.java rename to example/src/main/java/io/netty/example/http/websocketx/server/WebSocketServerHandler.java diff --git a/src/main/java/io/netty/example/http/websocketx/server/WebSocketServerIndexPage.java b/example/src/main/java/io/netty/example/http/websocketx/server/WebSocketServerIndexPage.java similarity index 100% rename from src/main/java/io/netty/example/http/websocketx/server/WebSocketServerIndexPage.java rename to example/src/main/java/io/netty/example/http/websocketx/server/WebSocketServerIndexPage.java diff --git a/src/main/java/io/netty/example/http/websocketx/server/WebSocketServerPipelineFactory.java b/example/src/main/java/io/netty/example/http/websocketx/server/WebSocketServerPipelineFactory.java similarity index 100% rename from src/main/java/io/netty/example/http/websocketx/server/WebSocketServerPipelineFactory.java rename to example/src/main/java/io/netty/example/http/websocketx/server/WebSocketServerPipelineFactory.java diff --git a/src/main/java/io/netty/example/http/websocketx/server/package-info.java b/example/src/main/java/io/netty/example/http/websocketx/server/package-info.java similarity index 100% rename from src/main/java/io/netty/example/http/websocketx/server/package-info.java rename to example/src/main/java/io/netty/example/http/websocketx/server/package-info.java diff --git a/src/main/java/io/netty/example/http/websocketx/sslserver/WebSocketSslServer.java b/example/src/main/java/io/netty/example/http/websocketx/sslserver/WebSocketSslServer.java similarity index 100% rename from src/main/java/io/netty/example/http/websocketx/sslserver/WebSocketSslServer.java rename to example/src/main/java/io/netty/example/http/websocketx/sslserver/WebSocketSslServer.java diff --git a/src/main/java/io/netty/example/http/websocketx/sslserver/WebSocketSslServerHandler.java b/example/src/main/java/io/netty/example/http/websocketx/sslserver/WebSocketSslServerHandler.java similarity index 100% rename from src/main/java/io/netty/example/http/websocketx/sslserver/WebSocketSslServerHandler.java rename to example/src/main/java/io/netty/example/http/websocketx/sslserver/WebSocketSslServerHandler.java diff --git a/src/main/java/io/netty/example/http/websocketx/sslserver/WebSocketSslServerIndexPage.java b/example/src/main/java/io/netty/example/http/websocketx/sslserver/WebSocketSslServerIndexPage.java similarity index 100% rename from src/main/java/io/netty/example/http/websocketx/sslserver/WebSocketSslServerIndexPage.java rename to example/src/main/java/io/netty/example/http/websocketx/sslserver/WebSocketSslServerIndexPage.java diff --git a/src/main/java/io/netty/example/http/websocketx/sslserver/WebSocketSslServerPipelineFactory.java b/example/src/main/java/io/netty/example/http/websocketx/sslserver/WebSocketSslServerPipelineFactory.java similarity index 100% rename from src/main/java/io/netty/example/http/websocketx/sslserver/WebSocketSslServerPipelineFactory.java rename to example/src/main/java/io/netty/example/http/websocketx/sslserver/WebSocketSslServerPipelineFactory.java diff --git a/src/main/java/io/netty/example/http/websocketx/sslserver/WebSocketSslServerSslContext.java b/example/src/main/java/io/netty/example/http/websocketx/sslserver/WebSocketSslServerSslContext.java similarity index 100% rename from src/main/java/io/netty/example/http/websocketx/sslserver/WebSocketSslServerSslContext.java rename to example/src/main/java/io/netty/example/http/websocketx/sslserver/WebSocketSslServerSslContext.java diff --git a/src/main/java/io/netty/example/http/websocketx/sslserver/package-info.java b/example/src/main/java/io/netty/example/http/websocketx/sslserver/package-info.java similarity index 100% rename from src/main/java/io/netty/example/http/websocketx/sslserver/package-info.java rename to example/src/main/java/io/netty/example/http/websocketx/sslserver/package-info.java diff --git a/src/main/java/io/netty/example/iostream/IOStream.java b/example/src/main/java/io/netty/example/iostream/IOStream.java similarity index 100% rename from src/main/java/io/netty/example/iostream/IOStream.java rename to example/src/main/java/io/netty/example/iostream/IOStream.java diff --git a/src/main/java/io/netty/example/local/LocalExample.java b/example/src/main/java/io/netty/example/local/LocalExample.java similarity index 100% rename from src/main/java/io/netty/example/local/LocalExample.java rename to example/src/main/java/io/netty/example/local/LocalExample.java diff --git a/src/main/java/io/netty/example/local/LocalExampleMultthreaded.java b/example/src/main/java/io/netty/example/local/LocalExampleMultthreaded.java similarity index 100% rename from src/main/java/io/netty/example/local/LocalExampleMultthreaded.java rename to example/src/main/java/io/netty/example/local/LocalExampleMultthreaded.java diff --git a/src/main/java/io/netty/example/local/LocalServerPipelineFactory.java b/example/src/main/java/io/netty/example/local/LocalServerPipelineFactory.java similarity index 100% rename from src/main/java/io/netty/example/local/LocalServerPipelineFactory.java rename to example/src/main/java/io/netty/example/local/LocalServerPipelineFactory.java diff --git a/src/main/java/io/netty/example/localtime/LocalTimeClient.java b/example/src/main/java/io/netty/example/localtime/LocalTimeClient.java similarity index 100% rename from src/main/java/io/netty/example/localtime/LocalTimeClient.java rename to example/src/main/java/io/netty/example/localtime/LocalTimeClient.java diff --git a/src/main/java/io/netty/example/localtime/LocalTimeClientHandler.java b/example/src/main/java/io/netty/example/localtime/LocalTimeClientHandler.java similarity index 100% rename from src/main/java/io/netty/example/localtime/LocalTimeClientHandler.java rename to example/src/main/java/io/netty/example/localtime/LocalTimeClientHandler.java diff --git a/src/main/java/io/netty/example/localtime/LocalTimeClientPipelineFactory.java b/example/src/main/java/io/netty/example/localtime/LocalTimeClientPipelineFactory.java similarity index 100% rename from src/main/java/io/netty/example/localtime/LocalTimeClientPipelineFactory.java rename to example/src/main/java/io/netty/example/localtime/LocalTimeClientPipelineFactory.java diff --git a/src/main/java/io/netty/example/localtime/LocalTimeProtocol.java b/example/src/main/java/io/netty/example/localtime/LocalTimeProtocol.java similarity index 100% rename from src/main/java/io/netty/example/localtime/LocalTimeProtocol.java rename to example/src/main/java/io/netty/example/localtime/LocalTimeProtocol.java diff --git a/src/main/java/io/netty/example/localtime/LocalTimeProtocol.proto b/example/src/main/java/io/netty/example/localtime/LocalTimeProtocol.proto similarity index 100% rename from src/main/java/io/netty/example/localtime/LocalTimeProtocol.proto rename to example/src/main/java/io/netty/example/localtime/LocalTimeProtocol.proto diff --git a/src/main/java/io/netty/example/localtime/LocalTimeServer.java b/example/src/main/java/io/netty/example/localtime/LocalTimeServer.java similarity index 100% rename from src/main/java/io/netty/example/localtime/LocalTimeServer.java rename to example/src/main/java/io/netty/example/localtime/LocalTimeServer.java diff --git a/src/main/java/io/netty/example/localtime/LocalTimeServerHandler.java b/example/src/main/java/io/netty/example/localtime/LocalTimeServerHandler.java similarity index 100% rename from src/main/java/io/netty/example/localtime/LocalTimeServerHandler.java rename to example/src/main/java/io/netty/example/localtime/LocalTimeServerHandler.java diff --git a/src/main/java/io/netty/example/localtime/LocalTimeServerPipelineFactory.java b/example/src/main/java/io/netty/example/localtime/LocalTimeServerPipelineFactory.java similarity index 100% rename from src/main/java/io/netty/example/localtime/LocalTimeServerPipelineFactory.java rename to example/src/main/java/io/netty/example/localtime/LocalTimeServerPipelineFactory.java diff --git a/src/main/java/io/netty/example/objectecho/ObjectEchoClient.java b/example/src/main/java/io/netty/example/objectecho/ObjectEchoClient.java similarity index 100% rename from src/main/java/io/netty/example/objectecho/ObjectEchoClient.java rename to example/src/main/java/io/netty/example/objectecho/ObjectEchoClient.java diff --git a/src/main/java/io/netty/example/objectecho/ObjectEchoClientHandler.java b/example/src/main/java/io/netty/example/objectecho/ObjectEchoClientHandler.java similarity index 100% rename from src/main/java/io/netty/example/objectecho/ObjectEchoClientHandler.java rename to example/src/main/java/io/netty/example/objectecho/ObjectEchoClientHandler.java diff --git a/src/main/java/io/netty/example/objectecho/ObjectEchoServer.java b/example/src/main/java/io/netty/example/objectecho/ObjectEchoServer.java similarity index 100% rename from src/main/java/io/netty/example/objectecho/ObjectEchoServer.java rename to example/src/main/java/io/netty/example/objectecho/ObjectEchoServer.java diff --git a/src/main/java/io/netty/example/objectecho/ObjectEchoServerHandler.java b/example/src/main/java/io/netty/example/objectecho/ObjectEchoServerHandler.java similarity index 100% rename from src/main/java/io/netty/example/objectecho/ObjectEchoServerHandler.java rename to example/src/main/java/io/netty/example/objectecho/ObjectEchoServerHandler.java diff --git a/src/main/java/io/netty/example/portunification/PortUnificationServer.java b/example/src/main/java/io/netty/example/portunification/PortUnificationServer.java similarity index 100% rename from src/main/java/io/netty/example/portunification/PortUnificationServer.java rename to example/src/main/java/io/netty/example/portunification/PortUnificationServer.java diff --git a/src/main/java/io/netty/example/portunification/PortUnificationServerHandler.java b/example/src/main/java/io/netty/example/portunification/PortUnificationServerHandler.java similarity index 100% rename from src/main/java/io/netty/example/portunification/PortUnificationServerHandler.java rename to example/src/main/java/io/netty/example/portunification/PortUnificationServerHandler.java diff --git a/src/main/java/io/netty/example/proxy/HexDumpProxy.java b/example/src/main/java/io/netty/example/proxy/HexDumpProxy.java similarity index 100% rename from src/main/java/io/netty/example/proxy/HexDumpProxy.java rename to example/src/main/java/io/netty/example/proxy/HexDumpProxy.java diff --git a/src/main/java/io/netty/example/proxy/HexDumpProxyInboundHandler.java b/example/src/main/java/io/netty/example/proxy/HexDumpProxyInboundHandler.java similarity index 100% rename from src/main/java/io/netty/example/proxy/HexDumpProxyInboundHandler.java rename to example/src/main/java/io/netty/example/proxy/HexDumpProxyInboundHandler.java diff --git a/src/main/java/io/netty/example/proxy/HexDumpProxyPipelineFactory.java b/example/src/main/java/io/netty/example/proxy/HexDumpProxyPipelineFactory.java similarity index 100% rename from src/main/java/io/netty/example/proxy/HexDumpProxyPipelineFactory.java rename to example/src/main/java/io/netty/example/proxy/HexDumpProxyPipelineFactory.java diff --git a/src/main/java/io/netty/example/qotm/QuoteOfTheMomentClient.java b/example/src/main/java/io/netty/example/qotm/QuoteOfTheMomentClient.java similarity index 100% rename from src/main/java/io/netty/example/qotm/QuoteOfTheMomentClient.java rename to example/src/main/java/io/netty/example/qotm/QuoteOfTheMomentClient.java diff --git a/src/main/java/io/netty/example/qotm/QuoteOfTheMomentClientHandler.java b/example/src/main/java/io/netty/example/qotm/QuoteOfTheMomentClientHandler.java similarity index 100% rename from src/main/java/io/netty/example/qotm/QuoteOfTheMomentClientHandler.java rename to example/src/main/java/io/netty/example/qotm/QuoteOfTheMomentClientHandler.java diff --git a/src/main/java/io/netty/example/qotm/QuoteOfTheMomentServer.java b/example/src/main/java/io/netty/example/qotm/QuoteOfTheMomentServer.java similarity index 100% rename from src/main/java/io/netty/example/qotm/QuoteOfTheMomentServer.java rename to example/src/main/java/io/netty/example/qotm/QuoteOfTheMomentServer.java diff --git a/src/main/java/io/netty/example/qotm/QuoteOfTheMomentServerHandler.java b/example/src/main/java/io/netty/example/qotm/QuoteOfTheMomentServerHandler.java similarity index 100% rename from src/main/java/io/netty/example/qotm/QuoteOfTheMomentServerHandler.java rename to example/src/main/java/io/netty/example/qotm/QuoteOfTheMomentServerHandler.java diff --git a/src/main/java/io/netty/example/sctp/SctpClient.java b/example/src/main/java/io/netty/example/sctp/SctpClient.java similarity index 97% rename from src/main/java/io/netty/example/sctp/SctpClient.java rename to example/src/main/java/io/netty/example/sctp/SctpClient.java index d12c171fac..39d1f4e24b 100644 --- a/src/main/java/io/netty/example/sctp/SctpClient.java +++ b/example/src/main/java/io/netty/example/sctp/SctpClient.java @@ -20,7 +20,7 @@ import io.netty.channel.ChannelFuture; import io.netty.channel.ChannelPipeline; import io.netty.channel.ChannelPipelineFactory; import io.netty.channel.Channels; -import io.netty.channel.socket.sctp.SctpClientSocketChannelFactory; +import io.netty.channel.sctp.SctpClientSocketChannelFactory; import io.netty.handler.execution.ExecutionHandler; import io.netty.handler.execution.OrderedMemoryAwareThreadPoolExecutor; diff --git a/src/main/java/io/netty/example/sctp/SctpClientHandler.java b/example/src/main/java/io/netty/example/sctp/SctpClientHandler.java similarity index 97% rename from src/main/java/io/netty/example/sctp/SctpClientHandler.java rename to example/src/main/java/io/netty/example/sctp/SctpClientHandler.java index 75702c6708..9c09e0a4e7 100644 --- a/src/main/java/io/netty/example/sctp/SctpClientHandler.java +++ b/example/src/main/java/io/netty/example/sctp/SctpClientHandler.java @@ -17,7 +17,7 @@ package io.netty.example.sctp; import io.netty.buffer.ChannelBuffers; import io.netty.channel.*; -import io.netty.channel.socket.sctp.SctpPayload; +import io.netty.channel.sctp.SctpPayload; import java.util.concurrent.atomic.AtomicLong; import java.util.logging.Level; diff --git a/src/main/java/io/netty/example/sctp/SctpServer.java b/example/src/main/java/io/netty/example/sctp/SctpServer.java similarity index 97% rename from src/main/java/io/netty/example/sctp/SctpServer.java rename to example/src/main/java/io/netty/example/sctp/SctpServer.java index e6150556e4..15a9749aac 100644 --- a/src/main/java/io/netty/example/sctp/SctpServer.java +++ b/example/src/main/java/io/netty/example/sctp/SctpServer.java @@ -19,7 +19,7 @@ import io.netty.bootstrap.ServerBootstrap; import io.netty.channel.ChannelPipeline; import io.netty.channel.ChannelPipelineFactory; import io.netty.channel.Channels; -import io.netty.channel.socket.sctp.SctpServerSocketChannelFactory; +import io.netty.channel.sctp.SctpServerSocketChannelFactory; import io.netty.handler.execution.ExecutionHandler; import io.netty.handler.execution.OrderedMemoryAwareThreadPoolExecutor; diff --git a/src/main/java/io/netty/example/sctp/SctpServerHandler.java b/example/src/main/java/io/netty/example/sctp/SctpServerHandler.java similarity index 100% rename from src/main/java/io/netty/example/sctp/SctpServerHandler.java rename to example/src/main/java/io/netty/example/sctp/SctpServerHandler.java diff --git a/src/main/java/io/netty/example/securechat/SecureChatClient.java b/example/src/main/java/io/netty/example/securechat/SecureChatClient.java similarity index 100% rename from src/main/java/io/netty/example/securechat/SecureChatClient.java rename to example/src/main/java/io/netty/example/securechat/SecureChatClient.java diff --git a/src/main/java/io/netty/example/securechat/SecureChatClientHandler.java b/example/src/main/java/io/netty/example/securechat/SecureChatClientHandler.java similarity index 100% rename from src/main/java/io/netty/example/securechat/SecureChatClientHandler.java rename to example/src/main/java/io/netty/example/securechat/SecureChatClientHandler.java diff --git a/src/main/java/io/netty/example/securechat/SecureChatClientPipelineFactory.java b/example/src/main/java/io/netty/example/securechat/SecureChatClientPipelineFactory.java similarity index 100% rename from src/main/java/io/netty/example/securechat/SecureChatClientPipelineFactory.java rename to example/src/main/java/io/netty/example/securechat/SecureChatClientPipelineFactory.java diff --git a/src/main/java/io/netty/example/securechat/SecureChatKeyStore.java b/example/src/main/java/io/netty/example/securechat/SecureChatKeyStore.java similarity index 100% rename from src/main/java/io/netty/example/securechat/SecureChatKeyStore.java rename to example/src/main/java/io/netty/example/securechat/SecureChatKeyStore.java diff --git a/src/main/java/io/netty/example/securechat/SecureChatServer.java b/example/src/main/java/io/netty/example/securechat/SecureChatServer.java similarity index 100% rename from src/main/java/io/netty/example/securechat/SecureChatServer.java rename to example/src/main/java/io/netty/example/securechat/SecureChatServer.java diff --git a/src/main/java/io/netty/example/securechat/SecureChatServerHandler.java b/example/src/main/java/io/netty/example/securechat/SecureChatServerHandler.java similarity index 100% rename from src/main/java/io/netty/example/securechat/SecureChatServerHandler.java rename to example/src/main/java/io/netty/example/securechat/SecureChatServerHandler.java diff --git a/src/main/java/io/netty/example/securechat/SecureChatServerPipelineFactory.java b/example/src/main/java/io/netty/example/securechat/SecureChatServerPipelineFactory.java similarity index 100% rename from src/main/java/io/netty/example/securechat/SecureChatServerPipelineFactory.java rename to example/src/main/java/io/netty/example/securechat/SecureChatServerPipelineFactory.java diff --git a/src/main/java/io/netty/example/securechat/SecureChatSslContextFactory.java b/example/src/main/java/io/netty/example/securechat/SecureChatSslContextFactory.java similarity index 100% rename from src/main/java/io/netty/example/securechat/SecureChatSslContextFactory.java rename to example/src/main/java/io/netty/example/securechat/SecureChatSslContextFactory.java diff --git a/src/main/java/io/netty/example/securechat/SecureChatTrustManagerFactory.java b/example/src/main/java/io/netty/example/securechat/SecureChatTrustManagerFactory.java similarity index 100% rename from src/main/java/io/netty/example/securechat/SecureChatTrustManagerFactory.java rename to example/src/main/java/io/netty/example/securechat/SecureChatTrustManagerFactory.java diff --git a/src/main/java/io/netty/example/telnet/TelnetClient.java b/example/src/main/java/io/netty/example/telnet/TelnetClient.java similarity index 100% rename from src/main/java/io/netty/example/telnet/TelnetClient.java rename to example/src/main/java/io/netty/example/telnet/TelnetClient.java diff --git a/src/main/java/io/netty/example/telnet/TelnetClientHandler.java b/example/src/main/java/io/netty/example/telnet/TelnetClientHandler.java similarity index 100% rename from src/main/java/io/netty/example/telnet/TelnetClientHandler.java rename to example/src/main/java/io/netty/example/telnet/TelnetClientHandler.java diff --git a/src/main/java/io/netty/example/telnet/TelnetClientPipelineFactory.java b/example/src/main/java/io/netty/example/telnet/TelnetClientPipelineFactory.java similarity index 100% rename from src/main/java/io/netty/example/telnet/TelnetClientPipelineFactory.java rename to example/src/main/java/io/netty/example/telnet/TelnetClientPipelineFactory.java diff --git a/src/main/java/io/netty/example/telnet/TelnetServer.java b/example/src/main/java/io/netty/example/telnet/TelnetServer.java similarity index 100% rename from src/main/java/io/netty/example/telnet/TelnetServer.java rename to example/src/main/java/io/netty/example/telnet/TelnetServer.java diff --git a/src/main/java/io/netty/example/telnet/TelnetServerHandler.java b/example/src/main/java/io/netty/example/telnet/TelnetServerHandler.java similarity index 100% rename from src/main/java/io/netty/example/telnet/TelnetServerHandler.java rename to example/src/main/java/io/netty/example/telnet/TelnetServerHandler.java diff --git a/src/main/java/io/netty/example/telnet/TelnetServerPipelineFactory.java b/example/src/main/java/io/netty/example/telnet/TelnetServerPipelineFactory.java similarity index 100% rename from src/main/java/io/netty/example/telnet/TelnetServerPipelineFactory.java rename to example/src/main/java/io/netty/example/telnet/TelnetServerPipelineFactory.java diff --git a/src/main/java/io/netty/example/uptime/UptimeClient.java b/example/src/main/java/io/netty/example/uptime/UptimeClient.java similarity index 100% rename from src/main/java/io/netty/example/uptime/UptimeClient.java rename to example/src/main/java/io/netty/example/uptime/UptimeClient.java diff --git a/src/main/java/io/netty/example/uptime/UptimeClientHandler.java b/example/src/main/java/io/netty/example/uptime/UptimeClientHandler.java similarity index 100% rename from src/main/java/io/netty/example/uptime/UptimeClientHandler.java rename to example/src/main/java/io/netty/example/uptime/UptimeClientHandler.java diff --git a/handler/pom.xml b/handler/pom.xml new file mode 100644 index 0000000000..9c9c64263e --- /dev/null +++ b/handler/pom.xml @@ -0,0 +1,55 @@ + + + + + 4.0.0 + + io.netty + netty-parent + 4.0.0.Alpha1-SNAPSHOT + + + io.netty + netty-handler + jar + + Netty/Handler + + + + ${project.groupId} + netty-buffer + ${project.version} + + + ${project.groupId} + netty-codec + ${project.version} + + + ${project.groupId} + netty-transport + ${project.version} + + + + + + + + + diff --git a/src/main/java/io/netty/handler/execution/ChainedExecutor.java b/handler/src/main/java/io/netty/handler/execution/ChainedExecutor.java similarity index 100% rename from src/main/java/io/netty/handler/execution/ChainedExecutor.java rename to handler/src/main/java/io/netty/handler/execution/ChainedExecutor.java diff --git a/src/main/java/io/netty/handler/execution/ChannelDownstreamEventRunnable.java b/handler/src/main/java/io/netty/handler/execution/ChannelDownstreamEventRunnable.java similarity index 100% rename from src/main/java/io/netty/handler/execution/ChannelDownstreamEventRunnable.java rename to handler/src/main/java/io/netty/handler/execution/ChannelDownstreamEventRunnable.java diff --git a/src/main/java/io/netty/handler/execution/ChannelEventRunnable.java b/handler/src/main/java/io/netty/handler/execution/ChannelEventRunnable.java similarity index 100% rename from src/main/java/io/netty/handler/execution/ChannelEventRunnable.java rename to handler/src/main/java/io/netty/handler/execution/ChannelEventRunnable.java diff --git a/src/main/java/io/netty/handler/execution/ChannelUpstreamEventRunnable.java b/handler/src/main/java/io/netty/handler/execution/ChannelUpstreamEventRunnable.java similarity index 100% rename from src/main/java/io/netty/handler/execution/ChannelUpstreamEventRunnable.java rename to handler/src/main/java/io/netty/handler/execution/ChannelUpstreamEventRunnable.java diff --git a/src/main/java/io/netty/util/DefaultObjectSizeEstimator.java b/handler/src/main/java/io/netty/handler/execution/DefaultObjectSizeEstimator.java similarity index 99% rename from src/main/java/io/netty/util/DefaultObjectSizeEstimator.java rename to handler/src/main/java/io/netty/handler/execution/DefaultObjectSizeEstimator.java index 806986a062..738ca828d1 100644 --- a/src/main/java/io/netty/util/DefaultObjectSizeEstimator.java +++ b/handler/src/main/java/io/netty/handler/execution/DefaultObjectSizeEstimator.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations * under the License. */ -package io.netty.util; +package io.netty.handler.execution; import java.lang.reflect.Field; import java.lang.reflect.Modifier; diff --git a/src/main/java/io/netty/container/microcontainer/NettyLoggerConfigurator.java b/handler/src/main/java/io/netty/handler/execution/EstimatableObjectWrapper.java similarity index 59% rename from src/main/java/io/netty/container/microcontainer/NettyLoggerConfigurator.java rename to handler/src/main/java/io/netty/handler/execution/EstimatableObjectWrapper.java index e06f91c7b8..21e55a97f0 100644 --- a/src/main/java/io/netty/container/microcontainer/NettyLoggerConfigurator.java +++ b/handler/src/main/java/io/netty/handler/execution/EstimatableObjectWrapper.java @@ -13,16 +13,18 @@ * License for the specific language governing permissions and limitations * under the License. */ -package io.netty.container.microcontainer; - -import io.netty.logging.InternalLoggerFactory; -import io.netty.logging.JBossLoggerFactory; +package io.netty.handler.execution; /** - * A bean that configures the default {@link InternalLoggerFactory}. + * Represents an object which contains another object that needs to be taken + * into account by {@link ObjectSizeEstimator} for more accurate object size + * estimation. */ -public class NettyLoggerConfigurator { - public NettyLoggerConfigurator() { - InternalLoggerFactory.setDefaultFactory(new JBossLoggerFactory()); - } +public interface EstimatableObjectWrapper { + + /** + * Returns the underlying object that needs to be taken into account + * by {@link ObjectSizeEstimator} for more accurate object size estimation. + */ + Object unwrap(); } diff --git a/src/main/java/io/netty/handler/execution/ExecutionHandler.java b/handler/src/main/java/io/netty/handler/execution/ExecutionHandler.java similarity index 100% rename from src/main/java/io/netty/handler/execution/ExecutionHandler.java rename to handler/src/main/java/io/netty/handler/execution/ExecutionHandler.java diff --git a/src/main/java/io/netty/handler/execution/MemoryAwareThreadPoolExecutor.java b/handler/src/main/java/io/netty/handler/execution/MemoryAwareThreadPoolExecutor.java similarity index 99% rename from src/main/java/io/netty/handler/execution/MemoryAwareThreadPoolExecutor.java rename to handler/src/main/java/io/netty/handler/execution/MemoryAwareThreadPoolExecutor.java index efb91aea08..c50811882a 100644 --- a/src/main/java/io/netty/handler/execution/MemoryAwareThreadPoolExecutor.java +++ b/handler/src/main/java/io/netty/handler/execution/MemoryAwareThreadPoolExecutor.java @@ -33,8 +33,6 @@ import io.netty.channel.ChannelState; import io.netty.channel.ChannelStateEvent; import io.netty.channel.MessageEvent; import io.netty.channel.WriteCompletionEvent; -import io.netty.util.DefaultObjectSizeEstimator; -import io.netty.util.ObjectSizeEstimator; import io.netty.util.internal.ConcurrentIdentityHashMap; import io.netty.util.internal.QueueFactory; import io.netty.util.internal.SharedResourceMisuseDetector; diff --git a/src/main/java/io/netty/util/ObjectSizeEstimator.java b/handler/src/main/java/io/netty/handler/execution/ObjectSizeEstimator.java similarity index 96% rename from src/main/java/io/netty/util/ObjectSizeEstimator.java rename to handler/src/main/java/io/netty/handler/execution/ObjectSizeEstimator.java index 8810282d14..5603687f92 100644 --- a/src/main/java/io/netty/util/ObjectSizeEstimator.java +++ b/handler/src/main/java/io/netty/handler/execution/ObjectSizeEstimator.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations * under the License. */ -package io.netty.util; +package io.netty.handler.execution; /** diff --git a/src/main/java/io/netty/handler/execution/OrderedMemoryAwareThreadPoolExecutor.java b/handler/src/main/java/io/netty/handler/execution/OrderedMemoryAwareThreadPoolExecutor.java similarity index 99% rename from src/main/java/io/netty/handler/execution/OrderedMemoryAwareThreadPoolExecutor.java rename to handler/src/main/java/io/netty/handler/execution/OrderedMemoryAwareThreadPoolExecutor.java index 924c329a45..a6cfd6637d 100644 --- a/src/main/java/io/netty/handler/execution/OrderedMemoryAwareThreadPoolExecutor.java +++ b/handler/src/main/java/io/netty/handler/execution/OrderedMemoryAwareThreadPoolExecutor.java @@ -29,7 +29,6 @@ import io.netty.channel.Channel; import io.netty.channel.ChannelEvent; import io.netty.channel.ChannelState; import io.netty.channel.ChannelStateEvent; -import io.netty.util.ObjectSizeEstimator; import io.netty.util.internal.ConcurrentIdentityWeakKeyHashMap; import io.netty.util.internal.QueueFactory; diff --git a/src/main/java/io/netty/handler/execution/filter/ChannelDownstreamEventRunnableFilter.java b/handler/src/main/java/io/netty/handler/execution/filter/ChannelDownstreamEventRunnableFilter.java similarity index 100% rename from src/main/java/io/netty/handler/execution/filter/ChannelDownstreamEventRunnableFilter.java rename to handler/src/main/java/io/netty/handler/execution/filter/ChannelDownstreamEventRunnableFilter.java diff --git a/src/main/java/io/netty/handler/execution/filter/ChannelEventRunnableFilter.java b/handler/src/main/java/io/netty/handler/execution/filter/ChannelEventRunnableFilter.java similarity index 100% rename from src/main/java/io/netty/handler/execution/filter/ChannelEventRunnableFilter.java rename to handler/src/main/java/io/netty/handler/execution/filter/ChannelEventRunnableFilter.java diff --git a/src/main/java/io/netty/handler/execution/filter/ChannelUpstreamEventRunnableFilter.java b/handler/src/main/java/io/netty/handler/execution/filter/ChannelUpstreamEventRunnableFilter.java similarity index 100% rename from src/main/java/io/netty/handler/execution/filter/ChannelUpstreamEventRunnableFilter.java rename to handler/src/main/java/io/netty/handler/execution/filter/ChannelUpstreamEventRunnableFilter.java diff --git a/src/main/java/io/netty/handler/execution/package-info.java b/handler/src/main/java/io/netty/handler/execution/package-info.java similarity index 100% rename from src/main/java/io/netty/handler/execution/package-info.java rename to handler/src/main/java/io/netty/handler/execution/package-info.java diff --git a/src/main/java/io/netty/handler/ipfilter/CIDR.java b/handler/src/main/java/io/netty/handler/ipfilter/CIDR.java similarity index 100% rename from src/main/java/io/netty/handler/ipfilter/CIDR.java rename to handler/src/main/java/io/netty/handler/ipfilter/CIDR.java diff --git a/src/main/java/io/netty/handler/ipfilter/CIDR4.java b/handler/src/main/java/io/netty/handler/ipfilter/CIDR4.java similarity index 100% rename from src/main/java/io/netty/handler/ipfilter/CIDR4.java rename to handler/src/main/java/io/netty/handler/ipfilter/CIDR4.java diff --git a/src/main/java/io/netty/handler/ipfilter/CIDR6.java b/handler/src/main/java/io/netty/handler/ipfilter/CIDR6.java similarity index 100% rename from src/main/java/io/netty/handler/ipfilter/CIDR6.java rename to handler/src/main/java/io/netty/handler/ipfilter/CIDR6.java diff --git a/src/main/java/io/netty/handler/ipfilter/IpFilterListener.java b/handler/src/main/java/io/netty/handler/ipfilter/IpFilterListener.java similarity index 100% rename from src/main/java/io/netty/handler/ipfilter/IpFilterListener.java rename to handler/src/main/java/io/netty/handler/ipfilter/IpFilterListener.java diff --git a/src/main/java/io/netty/handler/ipfilter/IpFilterRule.java b/handler/src/main/java/io/netty/handler/ipfilter/IpFilterRule.java similarity index 100% rename from src/main/java/io/netty/handler/ipfilter/IpFilterRule.java rename to handler/src/main/java/io/netty/handler/ipfilter/IpFilterRule.java diff --git a/src/main/java/io/netty/handler/ipfilter/IpFilterRuleHandler.java b/handler/src/main/java/io/netty/handler/ipfilter/IpFilterRuleHandler.java similarity index 100% rename from src/main/java/io/netty/handler/ipfilter/IpFilterRuleHandler.java rename to handler/src/main/java/io/netty/handler/ipfilter/IpFilterRuleHandler.java diff --git a/src/main/java/io/netty/handler/ipfilter/IpFilterRuleList.java b/handler/src/main/java/io/netty/handler/ipfilter/IpFilterRuleList.java similarity index 100% rename from src/main/java/io/netty/handler/ipfilter/IpFilterRuleList.java rename to handler/src/main/java/io/netty/handler/ipfilter/IpFilterRuleList.java diff --git a/src/main/java/io/netty/handler/ipfilter/IpFilteringHandler.java b/handler/src/main/java/io/netty/handler/ipfilter/IpFilteringHandler.java similarity index 100% rename from src/main/java/io/netty/handler/ipfilter/IpFilteringHandler.java rename to handler/src/main/java/io/netty/handler/ipfilter/IpFilteringHandler.java diff --git a/src/main/java/io/netty/handler/ipfilter/IpFilteringHandlerImpl.java b/handler/src/main/java/io/netty/handler/ipfilter/IpFilteringHandlerImpl.java similarity index 100% rename from src/main/java/io/netty/handler/ipfilter/IpFilteringHandlerImpl.java rename to handler/src/main/java/io/netty/handler/ipfilter/IpFilteringHandlerImpl.java diff --git a/src/main/java/io/netty/handler/ipfilter/IpSet.java b/handler/src/main/java/io/netty/handler/ipfilter/IpSet.java similarity index 100% rename from src/main/java/io/netty/handler/ipfilter/IpSet.java rename to handler/src/main/java/io/netty/handler/ipfilter/IpSet.java diff --git a/src/main/java/io/netty/handler/ipfilter/IpSubnet.java b/handler/src/main/java/io/netty/handler/ipfilter/IpSubnet.java similarity index 100% rename from src/main/java/io/netty/handler/ipfilter/IpSubnet.java rename to handler/src/main/java/io/netty/handler/ipfilter/IpSubnet.java diff --git a/src/main/java/io/netty/handler/ipfilter/IpSubnetFilterRule.java b/handler/src/main/java/io/netty/handler/ipfilter/IpSubnetFilterRule.java similarity index 100% rename from src/main/java/io/netty/handler/ipfilter/IpSubnetFilterRule.java rename to handler/src/main/java/io/netty/handler/ipfilter/IpSubnetFilterRule.java diff --git a/src/main/java/io/netty/handler/ipfilter/IpV4Subnet.java b/handler/src/main/java/io/netty/handler/ipfilter/IpV4Subnet.java similarity index 100% rename from src/main/java/io/netty/handler/ipfilter/IpV4Subnet.java rename to handler/src/main/java/io/netty/handler/ipfilter/IpV4Subnet.java diff --git a/src/main/java/io/netty/handler/ipfilter/IpV4SubnetFilterRule.java b/handler/src/main/java/io/netty/handler/ipfilter/IpV4SubnetFilterRule.java similarity index 100% rename from src/main/java/io/netty/handler/ipfilter/IpV4SubnetFilterRule.java rename to handler/src/main/java/io/netty/handler/ipfilter/IpV4SubnetFilterRule.java diff --git a/src/main/java/io/netty/handler/ipfilter/OneIpFilterHandler.java b/handler/src/main/java/io/netty/handler/ipfilter/OneIpFilterHandler.java similarity index 100% rename from src/main/java/io/netty/handler/ipfilter/OneIpFilterHandler.java rename to handler/src/main/java/io/netty/handler/ipfilter/OneIpFilterHandler.java diff --git a/src/main/java/io/netty/handler/ipfilter/PatternRule.java b/handler/src/main/java/io/netty/handler/ipfilter/PatternRule.java similarity index 100% rename from src/main/java/io/netty/handler/ipfilter/PatternRule.java rename to handler/src/main/java/io/netty/handler/ipfilter/PatternRule.java diff --git a/src/main/java/io/netty/handler/ipfilter/package-info.java b/handler/src/main/java/io/netty/handler/ipfilter/package-info.java similarity index 100% rename from src/main/java/io/netty/handler/ipfilter/package-info.java rename to handler/src/main/java/io/netty/handler/ipfilter/package-info.java diff --git a/src/main/java/io/netty/handler/logging/LoggingHandler.java b/handler/src/main/java/io/netty/handler/logging/LoggingHandler.java similarity index 100% rename from src/main/java/io/netty/handler/logging/LoggingHandler.java rename to handler/src/main/java/io/netty/handler/logging/LoggingHandler.java diff --git a/src/main/java/io/netty/handler/logging/package-info.java b/handler/src/main/java/io/netty/handler/logging/package-info.java similarity index 100% rename from src/main/java/io/netty/handler/logging/package-info.java rename to handler/src/main/java/io/netty/handler/logging/package-info.java diff --git a/src/main/java/io/netty/handler/queue/BlockingReadHandler.java b/handler/src/main/java/io/netty/handler/queue/BlockingReadHandler.java similarity index 100% rename from src/main/java/io/netty/handler/queue/BlockingReadHandler.java rename to handler/src/main/java/io/netty/handler/queue/BlockingReadHandler.java diff --git a/src/main/java/io/netty/handler/queue/BlockingReadTimeoutException.java b/handler/src/main/java/io/netty/handler/queue/BlockingReadTimeoutException.java similarity index 100% rename from src/main/java/io/netty/handler/queue/BlockingReadTimeoutException.java rename to handler/src/main/java/io/netty/handler/queue/BlockingReadTimeoutException.java diff --git a/src/main/java/io/netty/handler/queue/BufferedWriteHandler.java b/handler/src/main/java/io/netty/handler/queue/BufferedWriteHandler.java similarity index 100% rename from src/main/java/io/netty/handler/queue/BufferedWriteHandler.java rename to handler/src/main/java/io/netty/handler/queue/BufferedWriteHandler.java diff --git a/src/main/java/io/netty/handler/queue/package-info.java b/handler/src/main/java/io/netty/handler/queue/package-info.java similarity index 100% rename from src/main/java/io/netty/handler/queue/package-info.java rename to handler/src/main/java/io/netty/handler/queue/package-info.java diff --git a/src/main/java/io/netty/handler/region/ChannelWritableByteChannel.java b/handler/src/main/java/io/netty/handler/region/ChannelWritableByteChannel.java similarity index 100% rename from src/main/java/io/netty/handler/region/ChannelWritableByteChannel.java rename to handler/src/main/java/io/netty/handler/region/ChannelWritableByteChannel.java diff --git a/src/main/java/io/netty/handler/region/FileRegionEncoder.java b/handler/src/main/java/io/netty/handler/region/FileRegionEncoder.java similarity index 100% rename from src/main/java/io/netty/handler/region/FileRegionEncoder.java rename to handler/src/main/java/io/netty/handler/region/FileRegionEncoder.java diff --git a/src/main/java/io/netty/handler/ssl/ImmediateExecutor.java b/handler/src/main/java/io/netty/handler/ssl/ImmediateExecutor.java similarity index 100% rename from src/main/java/io/netty/handler/ssl/ImmediateExecutor.java rename to handler/src/main/java/io/netty/handler/ssl/ImmediateExecutor.java diff --git a/src/main/java/io/netty/handler/ssl/SslBufferPool.java b/handler/src/main/java/io/netty/handler/ssl/SslBufferPool.java similarity index 100% rename from src/main/java/io/netty/handler/ssl/SslBufferPool.java rename to handler/src/main/java/io/netty/handler/ssl/SslBufferPool.java diff --git a/src/main/java/io/netty/handler/ssl/SslHandler.java b/handler/src/main/java/io/netty/handler/ssl/SslHandler.java similarity index 100% rename from src/main/java/io/netty/handler/ssl/SslHandler.java rename to handler/src/main/java/io/netty/handler/ssl/SslHandler.java diff --git a/src/main/java/io/netty/handler/ssl/package-info.java b/handler/src/main/java/io/netty/handler/ssl/package-info.java similarity index 100% rename from src/main/java/io/netty/handler/ssl/package-info.java rename to handler/src/main/java/io/netty/handler/ssl/package-info.java diff --git a/src/main/java/io/netty/handler/stream/ChunkedFile.java b/handler/src/main/java/io/netty/handler/stream/ChunkedFile.java similarity index 100% rename from src/main/java/io/netty/handler/stream/ChunkedFile.java rename to handler/src/main/java/io/netty/handler/stream/ChunkedFile.java diff --git a/src/main/java/io/netty/handler/stream/ChunkedInput.java b/handler/src/main/java/io/netty/handler/stream/ChunkedInput.java similarity index 100% rename from src/main/java/io/netty/handler/stream/ChunkedInput.java rename to handler/src/main/java/io/netty/handler/stream/ChunkedInput.java diff --git a/src/main/java/io/netty/handler/stream/ChunkedNioFile.java b/handler/src/main/java/io/netty/handler/stream/ChunkedNioFile.java similarity index 100% rename from src/main/java/io/netty/handler/stream/ChunkedNioFile.java rename to handler/src/main/java/io/netty/handler/stream/ChunkedNioFile.java diff --git a/src/main/java/io/netty/handler/stream/ChunkedNioStream.java b/handler/src/main/java/io/netty/handler/stream/ChunkedNioStream.java similarity index 100% rename from src/main/java/io/netty/handler/stream/ChunkedNioStream.java rename to handler/src/main/java/io/netty/handler/stream/ChunkedNioStream.java diff --git a/src/main/java/io/netty/handler/stream/ChunkedStream.java b/handler/src/main/java/io/netty/handler/stream/ChunkedStream.java similarity index 100% rename from src/main/java/io/netty/handler/stream/ChunkedStream.java rename to handler/src/main/java/io/netty/handler/stream/ChunkedStream.java diff --git a/src/main/java/io/netty/handler/stream/ChunkedWriteHandler.java b/handler/src/main/java/io/netty/handler/stream/ChunkedWriteHandler.java similarity index 100% rename from src/main/java/io/netty/handler/stream/ChunkedWriteHandler.java rename to handler/src/main/java/io/netty/handler/stream/ChunkedWriteHandler.java diff --git a/src/main/java/io/netty/handler/stream/package-info.java b/handler/src/main/java/io/netty/handler/stream/package-info.java similarity index 100% rename from src/main/java/io/netty/handler/stream/package-info.java rename to handler/src/main/java/io/netty/handler/stream/package-info.java diff --git a/src/main/java/io/netty/handler/timeout/DefaultIdleStateEvent.java b/handler/src/main/java/io/netty/handler/timeout/DefaultIdleStateEvent.java similarity index 100% rename from src/main/java/io/netty/handler/timeout/DefaultIdleStateEvent.java rename to handler/src/main/java/io/netty/handler/timeout/DefaultIdleStateEvent.java diff --git a/src/main/java/io/netty/handler/timeout/IdleState.java b/handler/src/main/java/io/netty/handler/timeout/IdleState.java similarity index 100% rename from src/main/java/io/netty/handler/timeout/IdleState.java rename to handler/src/main/java/io/netty/handler/timeout/IdleState.java diff --git a/src/main/java/io/netty/handler/timeout/IdleStateAwareChannelHandler.java b/handler/src/main/java/io/netty/handler/timeout/IdleStateAwareChannelHandler.java similarity index 100% rename from src/main/java/io/netty/handler/timeout/IdleStateAwareChannelHandler.java rename to handler/src/main/java/io/netty/handler/timeout/IdleStateAwareChannelHandler.java diff --git a/src/main/java/io/netty/handler/timeout/IdleStateAwareChannelUpstreamHandler.java b/handler/src/main/java/io/netty/handler/timeout/IdleStateAwareChannelUpstreamHandler.java similarity index 100% rename from src/main/java/io/netty/handler/timeout/IdleStateAwareChannelUpstreamHandler.java rename to handler/src/main/java/io/netty/handler/timeout/IdleStateAwareChannelUpstreamHandler.java diff --git a/src/main/java/io/netty/handler/timeout/IdleStateEvent.java b/handler/src/main/java/io/netty/handler/timeout/IdleStateEvent.java similarity index 100% rename from src/main/java/io/netty/handler/timeout/IdleStateEvent.java rename to handler/src/main/java/io/netty/handler/timeout/IdleStateEvent.java diff --git a/src/main/java/io/netty/handler/timeout/IdleStateHandler.java b/handler/src/main/java/io/netty/handler/timeout/IdleStateHandler.java similarity index 100% rename from src/main/java/io/netty/handler/timeout/IdleStateHandler.java rename to handler/src/main/java/io/netty/handler/timeout/IdleStateHandler.java diff --git a/src/main/java/io/netty/handler/timeout/ReadTimeoutException.java b/handler/src/main/java/io/netty/handler/timeout/ReadTimeoutException.java similarity index 100% rename from src/main/java/io/netty/handler/timeout/ReadTimeoutException.java rename to handler/src/main/java/io/netty/handler/timeout/ReadTimeoutException.java diff --git a/src/main/java/io/netty/handler/timeout/ReadTimeoutHandler.java b/handler/src/main/java/io/netty/handler/timeout/ReadTimeoutHandler.java similarity index 100% rename from src/main/java/io/netty/handler/timeout/ReadTimeoutHandler.java rename to handler/src/main/java/io/netty/handler/timeout/ReadTimeoutHandler.java diff --git a/src/main/java/io/netty/handler/timeout/TimeoutException.java b/handler/src/main/java/io/netty/handler/timeout/TimeoutException.java similarity index 100% rename from src/main/java/io/netty/handler/timeout/TimeoutException.java rename to handler/src/main/java/io/netty/handler/timeout/TimeoutException.java diff --git a/src/main/java/io/netty/handler/timeout/WriteTimeoutException.java b/handler/src/main/java/io/netty/handler/timeout/WriteTimeoutException.java similarity index 100% rename from src/main/java/io/netty/handler/timeout/WriteTimeoutException.java rename to handler/src/main/java/io/netty/handler/timeout/WriteTimeoutException.java diff --git a/src/main/java/io/netty/handler/timeout/WriteTimeoutHandler.java b/handler/src/main/java/io/netty/handler/timeout/WriteTimeoutHandler.java similarity index 100% rename from src/main/java/io/netty/handler/timeout/WriteTimeoutHandler.java rename to handler/src/main/java/io/netty/handler/timeout/WriteTimeoutHandler.java diff --git a/src/main/java/io/netty/handler/timeout/package-info.java b/handler/src/main/java/io/netty/handler/timeout/package-info.java similarity index 100% rename from src/main/java/io/netty/handler/timeout/package-info.java rename to handler/src/main/java/io/netty/handler/timeout/package-info.java diff --git a/src/main/java/io/netty/handler/traffic/AbstractTrafficShapingHandler.java b/handler/src/main/java/io/netty/handler/traffic/AbstractTrafficShapingHandler.java similarity index 71% rename from src/main/java/io/netty/handler/traffic/AbstractTrafficShapingHandler.java rename to handler/src/main/java/io/netty/handler/traffic/AbstractTrafficShapingHandler.java index edd22e13f0..8e2dfa8b75 100644 --- a/src/main/java/io/netty/handler/traffic/AbstractTrafficShapingHandler.java +++ b/handler/src/main/java/io/netty/handler/traffic/AbstractTrafficShapingHandler.java @@ -18,6 +18,7 @@ package io.netty.handler.traffic; import java.util.concurrent.Executor; import java.util.concurrent.atomic.AtomicBoolean; +import io.netty.buffer.ChannelBuffer; import io.netty.channel.Channel; import io.netty.channel.ChannelEvent; import io.netty.channel.ChannelHandlerContext; @@ -27,9 +28,7 @@ import io.netty.channel.MessageEvent; import io.netty.channel.SimpleChannelHandler; import io.netty.logging.InternalLogger; import io.netty.logging.InternalLoggerFactory; -import io.netty.util.DefaultObjectSizeEstimator; import io.netty.util.ExternalResourceReleasable; -import io.netty.util.ObjectSizeEstimator; import io.netty.util.internal.ExecutorUtil; /** @@ -41,10 +40,6 @@ import io.netty.util.internal.ExecutorUtil; * the method doAccounting of this handler.
*
* - * An {@link ObjectSizeEstimator} can be passed at construction to specify what - * is the size of the object to be read or write accordingly to the type of - * object. If not specified, it will used the {@link DefaultObjectSizeEstimator} implementation.

- * * If you want for any particular reasons to stop the monitoring (accounting) or to change * the read/write limit or the check interval, several methods allow that for you:
*