Move io.netty.logging to io.netty.internal / Move Signal out of internal because we use it in Channel*MessageAdapters

all/pom.xml

@@ -345,8 +345,7 @@
             -group "Central interface for all I/O operations" io.netty.channel*
             -group "Client & Server bootstrapping utilities" io.netty.bootstrap*
             -group "Reusable I/O event interceptors" io.netty.handler*
-            -group "Miscellaneous" io.netty.logging*:io.netty.util*:io.netty.monitor:io.netty.monitor.spi
-            -group "Yammer monitoring support" io.netty.monitor.yammer*
+            -group "Miscellaneous" io.netty.util*
 
             -sourceclasspath ${project.build.outputDirectory}
             -nopackagediagram

codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocket08FrameDecoder.java

@@ -59,8 +59,8 @@ import io.netty.channel.ChannelHandlerContext;
 import io.netty.handler.codec.CorruptedFrameException;
 import io.netty.handler.codec.ReplayingDecoder;
 import io.netty.handler.codec.TooLongFrameException;
-import io.netty.logging.InternalLogger;
-import io.netty.logging.InternalLoggerFactory;
+import io.netty.util.internal.InternalLogger;
+import io.netty.util.internal.InternalLoggerFactory;
 
 /**
  * Decodes a web socket frame from wire protocol version 8 format. This code was forked from <a

codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocket08FrameEncoder.java

@@ -58,8 +58,8 @@ import io.netty.buffer.Unpooled;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.handler.codec.MessageToByteEncoder;
 import io.netty.handler.codec.TooLongFrameException;
-import io.netty.logging.InternalLogger;
-import io.netty.logging.InternalLoggerFactory;
+import io.netty.util.internal.InternalLogger;
+import io.netty.util.internal.InternalLoggerFactory;
 
 import java.nio.ByteBuffer;
 

codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketClientHandshaker07.java

@@ -31,9 +31,9 @@ import io.netty.handler.codec.http.HttpRequestEncoder;
 import io.netty.handler.codec.http.HttpResponseDecoder;
 import io.netty.handler.codec.http.HttpResponseStatus;
 import io.netty.handler.codec.http.HttpVersion;
-import io.netty.logging.InternalLogger;
-import io.netty.logging.InternalLoggerFactory;
 import io.netty.util.CharsetUtil;
+import io.netty.util.internal.InternalLogger;
+import io.netty.util.internal.InternalLoggerFactory;
 
 import java.net.URI;
 

codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketClientHandshaker08.java

@@ -31,9 +31,9 @@ import io.netty.handler.codec.http.HttpRequestEncoder;
 import io.netty.handler.codec.http.HttpResponseDecoder;
 import io.netty.handler.codec.http.HttpResponseStatus;
 import io.netty.handler.codec.http.HttpVersion;
-import io.netty.logging.InternalLogger;
-import io.netty.logging.InternalLoggerFactory;
 import io.netty.util.CharsetUtil;
+import io.netty.util.internal.InternalLogger;
+import io.netty.util.internal.InternalLoggerFactory;
 
 import java.net.URI;
 

codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketClientHandshaker13.java

@@ -31,9 +31,9 @@ import io.netty.handler.codec.http.HttpRequestEncoder;
 import io.netty.handler.codec.http.HttpResponseDecoder;
 import io.netty.handler.codec.http.HttpResponseStatus;
 import io.netty.handler.codec.http.HttpVersion;
-import io.netty.logging.InternalLogger;
-import io.netty.logging.InternalLoggerFactory;
 import io.netty.util.CharsetUtil;
+import io.netty.util.internal.InternalLogger;
+import io.netty.util.internal.InternalLoggerFactory;
 
 import java.net.URI;
 

codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketServerHandshaker00.java

@@ -32,8 +32,8 @@ import io.netty.handler.codec.http.HttpObjectAggregator;
 import io.netty.handler.codec.http.HttpRequestDecoder;
 import io.netty.handler.codec.http.HttpResponseEncoder;
 import io.netty.handler.codec.http.HttpResponseStatus;
-import io.netty.logging.InternalLogger;
-import io.netty.logging.InternalLoggerFactory;
+import io.netty.util.internal.InternalLogger;
+import io.netty.util.internal.InternalLoggerFactory;
 
 import java.util.regex.Pattern;
 

codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketServerHandshaker07.java

@@ -29,9 +29,9 @@ import io.netty.handler.codec.http.HttpObjectAggregator;
 import io.netty.handler.codec.http.HttpRequestDecoder;
 import io.netty.handler.codec.http.HttpResponseEncoder;
 import io.netty.handler.codec.http.HttpResponseStatus;
-import io.netty.logging.InternalLogger;
-import io.netty.logging.InternalLoggerFactory;
 import io.netty.util.CharsetUtil;
+import io.netty.util.internal.InternalLogger;
+import io.netty.util.internal.InternalLoggerFactory;
 
 import static io.netty.handler.codec.http.HttpHeaders.Values.*;
 import static io.netty.handler.codec.http.HttpVersion.*;

codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketServerHandshaker08.java

@@ -29,9 +29,9 @@ import io.netty.handler.codec.http.HttpRequestDecoder;
 import io.netty.handler.codec.http.HttpResponse;
 import io.netty.handler.codec.http.HttpResponseEncoder;
 import io.netty.handler.codec.http.HttpResponseStatus;
-import io.netty.logging.InternalLogger;
-import io.netty.logging.InternalLoggerFactory;
 import io.netty.util.CharsetUtil;
+import io.netty.util.internal.InternalLogger;
+import io.netty.util.internal.InternalLoggerFactory;
 
 import static io.netty.handler.codec.http.HttpHeaders.Values.*;
 import static io.netty.handler.codec.http.HttpVersion.*;

codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketServerHandshaker13.java

@@ -29,9 +29,9 @@ import io.netty.handler.codec.http.HttpRequestDecoder;
 import io.netty.handler.codec.http.HttpResponse;
 import io.netty.handler.codec.http.HttpResponseEncoder;
 import io.netty.handler.codec.http.HttpResponseStatus;
-import io.netty.logging.InternalLogger;
-import io.netty.logging.InternalLoggerFactory;
 import io.netty.util.CharsetUtil;
+import io.netty.util.internal.InternalLogger;
+import io.netty.util.internal.InternalLoggerFactory;
 
 import static io.netty.handler.codec.http.HttpHeaders.Values.*;
 import static io.netty.handler.codec.http.HttpVersion.*;

codec-http/src/test/java/io/netty/handler/codec/spdy/SpdySessionHandlerTest.java

@@ -18,8 +18,8 @@ package io.netty.handler.codec.spdy;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.ChannelInboundMessageHandlerAdapter;
 import io.netty.channel.embedded.EmbeddedMessageChannel;
-import io.netty.logging.InternalLogger;
-import io.netty.logging.InternalLoggerFactory;
+import io.netty.util.internal.InternalLogger;
+import io.netty.util.internal.InternalLoggerFactory;
 import org.junit.Test;
 
 import java.util.List;

codec/src/main/java/io/netty/handler/codec/ReplayingDecoder.java

@@ -20,7 +20,7 @@ import io.netty.buffer.MessageBuf;
 import io.netty.channel.ChannelHandler;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.ChannelPipeline;
-import io.netty.util.internal.Signal;
+import io.netty.util.Signal;
 
 /**
  * A specialized variation of {@link ByteToMessageDecoder} which enables implementation

codec/src/main/java/io/netty/handler/codec/ReplayingDecoderBuffer.java

@@ -21,7 +21,7 @@ import io.netty.buffer.ByteBufAllocator;
 import io.netty.buffer.ByteBufIndexFinder;
 import io.netty.buffer.SwappedByteBuf;
 import io.netty.buffer.Unpooled;
-import io.netty.util.internal.Signal;
+import io.netty.util.Signal;
 
 import java.io.InputStream;
 import java.io.OutputStream;

codec/src/test/java/io/netty/handler/codec/ReplayingDecoderBufferTest.java

@@ -18,7 +18,7 @@ package io.netty.handler.codec;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import io.netty.util.CharsetUtil;
-import io.netty.util.internal.Signal;
+import io.netty.util.Signal;
 import org.junit.Test;
 
 import static org.junit.Assert.*;

common/src/main/java/io/netty/logging/package-info.java

@@ -1,23 +0,0 @@
-/*
- * Copyright 2012 The Netty Project
- *
- * The Netty Project licenses this file to you under the Apache License,
- * version 2.0 (the "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at:
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- */
-
-/**
- * Simplistic <em>internal-use-only</em> logging layer which allows a user to
- * decide what logging framework Netty should use.
- *
- * @apiviz.hidden
- */
-package io.netty.logging;

common/src/main/java/io/netty/util/HashedWheelTimer.java

@@ -15,8 +15,8 @@
  */
 package io.netty.util;
 
-import io.netty.logging.InternalLogger;
-import io.netty.logging.InternalLoggerFactory;
+import io.netty.util.internal.InternalLogger;
+import io.netty.util.internal.InternalLoggerFactory;
 import io.netty.util.internal.PlatformDependent;
 
 import java.util.ArrayList;

common/src/main/java/io/netty/util/NetUtil.java

@@ -15,8 +15,8 @@
  */
 package io.netty.util;
 
-import io.netty.logging.InternalLogger;
-import io.netty.logging.InternalLoggerFactory;
+import io.netty.util.internal.InternalLogger;
+import io.netty.util.internal.InternalLoggerFactory;
 
 import java.io.BufferedReader;
 import java.io.FileReader;

common/src/main/java/io/netty/util/ResourceLeakDetector.java

@@ -16,8 +16,8 @@
 
 package io.netty.util;
 
-import io.netty.logging.InternalLogger;
-import io.netty.logging.InternalLoggerFactory;
+import io.netty.util.internal.InternalLogger;
+import io.netty.util.internal.InternalLoggerFactory;
 import io.netty.util.internal.SystemPropertyUtil;
 
 import java.lang.ref.PhantomReference;

common/src/main/java/io/netty/util/Signal.java

@@ -13,18 +13,15 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package io.netty.util.internal;
+package io.netty.util;
 
 
-import io.netty.util.UniqueName;
-
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 
 /**
- * A special {@link Error} which is used to signal some state via an {@link Error}.
- *
- * This instance will have no stacktrace filled or any cause set to safe the overhead.
+ * A special {@link Error} which is used to signal some state or request by throwing it.
+ * {@link Signal} has an empty stack trace and has no cause to save the instantiation overhead.
  */
 public final class Signal extends Error {
 

common/src/main/java/io/netty/util/internal/AbstractInternalLogger.java

@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package io.netty.logging;
+package io.netty.util.internal;
 
 import java.io.ObjectStreamException;
 import java.io.Serializable;

common/src/main/java/io/netty/util/internal/CommonsLogger.java

@@ -37,7 +37,7 @@
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  *
  */
-package io.netty.logging;
+package io.netty.util.internal;
 
 import org.apache.commons.logging.Log;
 

common/src/main/java/io/netty/util/internal/CommonsLoggerFactory.java

@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package io.netty.logging;
+package io.netty.util.internal;
 
 
 import org.apache.commons.logging.LogFactory;

common/src/main/java/io/netty/util/internal/FormattingTuple.java

@@ -37,7 +37,7 @@
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  *
  */
-package io.netty.logging;
+package io.netty.util.internal;
 
 /**
  * Holds the results of formatting done by {@link MessageFormatter}.

common/src/main/java/io/netty/util/internal/InternalLogLevel.java

@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package io.netty.logging;
+package io.netty.util.internal;
 
 /**
  * The log level that {@link InternalLogger} can log at.

common/src/main/java/io/netty/util/internal/InternalLogger.java

@@ -37,7 +37,7 @@
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  *
  */
-package io.netty.logging;
+package io.netty.util.internal;
 
 /**
  * <em>Internal-use-only</em> logger used by Netty.  <strong>DO NOT</strong>

common/src/main/java/io/netty/util/internal/InternalLoggerFactory.java

@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package io.netty.logging;
+package io.netty.util.internal;
 
 /**
  * Creates an {@link InternalLogger} or changes the default factory
@@ -29,7 +29,7 @@ package io.netty.logging;
  * {@link #setDefaultFactory(InternalLoggerFactory)} should be called as early
  * as possible and shouldn't be called more than once.
  * @apiviz.landmark
- * @apiviz.has io.netty.logging.InternalLogger oneway - - creates
+ * @apiviz.has io.netty.util.internal.InternalLogger oneway - - creates
  */
 public abstract class InternalLoggerFactory {
     private static volatile InternalLoggerFactory defaultFactory;

common/src/main/java/io/netty/util/internal/JavassistTypeParameterMatcherGenerator.java

@@ -16,8 +16,6 @@
 
 package io.netty.util.internal;
 
-import io.netty.logging.InternalLogger;
-import io.netty.logging.InternalLoggerFactory;
 import javassist.ClassPool;
 import javassist.CtClass;
 import javassist.Modifier;

common/src/main/java/io/netty/util/internal/JdkLogger.java

@@ -37,7 +37,7 @@
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  *
  */
-package io.netty.logging;
+package io.netty.util.internal;
 
 import java.util.logging.Level;
 import java.util.logging.LogRecord;

common/src/main/java/io/netty/util/internal/JdkLoggerFactory.java

@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package io.netty.logging;
+package io.netty.util.internal;
 
 
 import java.util.logging.Logger;

common/src/main/java/io/netty/util/internal/Log4JLogger.java

@@ -37,7 +37,7 @@
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  *
  */
-package io.netty.logging;
+package io.netty.util.internal;
 
 import org.apache.log4j.Level;
 import org.apache.log4j.Logger;

common/src/main/java/io/netty/util/internal/Log4JLoggerFactory.java

@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package io.netty.logging;
+package io.netty.util.internal;
 
 import org.apache.log4j.Logger;
 

common/src/main/java/io/netty/util/internal/MessageFormatter.java

@@ -37,7 +37,7 @@
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  *
  */
-package io.netty.logging;
+package io.netty.util.internal;
 
 import java.text.MessageFormat;
 import java.util.HashMap;

common/src/main/java/io/netty/util/internal/Slf4JLogger.java

@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package io.netty.logging;
+package io.netty.util.internal;
 
 import org.slf4j.Logger;
 

common/src/main/java/io/netty/util/internal/Slf4JLoggerFactory.java

@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package io.netty.logging;
+package io.netty.util.internal;
 
 
 import org.slf4j.LoggerFactory;

common/src/main/java/io/netty/util/internal/SystemPropertyUtil.java

@@ -15,9 +15,6 @@
  */
 package io.netty.util.internal;
 
-import io.netty.logging.InternalLogger;
-import io.netty.logging.InternalLoggerFactory;
-
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.regex.Pattern;

common/src/main/java/io/netty/util/internal/jzlib/ZStream.java

@@ -47,8 +47,8 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package io.netty.util.internal.jzlib;
 
-import io.netty.logging.InternalLogger;
-import io.netty.logging.InternalLoggerFactory;
+import io.netty.util.internal.InternalLogger;
+import io.netty.util.internal.InternalLoggerFactory;
 import io.netty.util.internal.jzlib.JZlib.WrapperType;
 
 public final class ZStream {

common/src/test/java/io/netty/util/internal/CommonsLoggerFactoryTest.java

@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package io.netty.logging;
+package io.netty.util.internal;
 
 import org.junit.Test;
 

common/src/test/java/io/netty/util/internal/CommonsLoggerTest.java

@@ -13,14 +13,14 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package io.netty.logging;
-
-import static org.easymock.EasyMock.*;
-import static org.junit.Assert.*;
+package io.netty.util.internal;
 
 import org.apache.commons.logging.Log;
 import org.junit.Test;
 
+import static org.easymock.EasyMock.*;
+import static org.junit.Assert.*;
+
 public class CommonsLoggerTest {
     private static final Exception e = new Exception();
 

common/src/test/java/io/netty/util/internal/InternalLoggerFactoryTest.java

@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package io.netty.logging;
+package io.netty.util.internal;
 
 import org.junit.After;
 import org.junit.Before;

common/src/test/java/io/netty/util/internal/JdkLoggerFactoryTest.java

@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package io.netty.logging;
+package io.netty.util.internal;
 
 import org.junit.Test;
 

common/src/test/java/io/netty/util/internal/Log4JLoggerFactoryTest.java

@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package io.netty.logging;
+package io.netty.util.internal;
 
 import org.junit.Test;
 

common/src/test/java/io/netty/util/internal/Slf4JLoggerFactoryTest.java

@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package io.netty.logging;
+package io.netty.util.internal;
 
 import org.junit.Test;
 

common/src/test/java/io/netty/util/internal/Slf4JLoggerTest.java

@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package io.netty.logging;
+package io.netty.util.internal;
 
 import org.junit.Test;
 import org.slf4j.Logger;

common/src/test/resources/META-INF/services/io.netty.monitor.spi.MonitorRegistryFactory

@@ -1,2 +0,0 @@
-io.netty.monitor.support.SampleMonitorRegistryFactory
-io.netty.monitor.support.AnotherSampleMonitorRegistryFactory

example/src/main/java/io/netty/example/http/upload/HttpUploadClient.java

@@ -34,8 +34,8 @@ import io.netty.handler.codec.http.multipart.HttpDataFactory;
 import io.netty.handler.codec.http.multipart.HttpPostRequestEncoder;
 import io.netty.handler.codec.http.multipart.HttpPostRequestEncoder.ErrorDataEncoderException;
 import io.netty.handler.codec.http.multipart.InterfaceHttpData;
-import io.netty.logging.InternalLogger;
-import io.netty.logging.InternalLoggerFactory;
+import io.netty.util.internal.InternalLogger;
+import io.netty.util.internal.InternalLoggerFactory;
 
 import java.io.BufferedWriter;
 import java.io.File;

example/src/main/java/io/netty/example/http/upload/HttpUploadClientHandler.java

@@ -21,9 +21,9 @@ import io.netty.handler.codec.http.HttpContent;
 import io.netty.handler.codec.http.HttpHeaders;
 import io.netty.handler.codec.http.HttpResponse;
 import io.netty.handler.codec.http.LastHttpContent;
-import io.netty.logging.InternalLogger;
-import io.netty.logging.InternalLoggerFactory;
 import io.netty.util.CharsetUtil;
+import io.netty.util.internal.InternalLogger;
+import io.netty.util.internal.InternalLoggerFactory;
 
 /**
  * Handler that just dumps the contents of the response from the server

example/src/main/java/io/netty/example/http/upload/HttpUploadServerHandler.java

@@ -45,9 +45,9 @@ import io.netty.handler.codec.http.multipart.HttpPostRequestDecoder.Incompatible
 import io.netty.handler.codec.http.multipart.HttpPostRequestDecoder.NotEnoughDataDecoderException;
 import io.netty.handler.codec.http.multipart.InterfaceHttpData;
 import io.netty.handler.codec.http.multipart.InterfaceHttpData.HttpDataType;
-import io.netty.logging.InternalLogger;
-import io.netty.logging.InternalLoggerFactory;
 import io.netty.util.CharsetUtil;
+import io.netty.util.internal.InternalLogger;
+import io.netty.util.internal.InternalLoggerFactory;
 
 import java.io.IOException;
 import java.net.URI;

example/src/main/java/io/netty/example/http/websocketx/autobahn/AutobahnServerHandler.java

@@ -33,9 +33,9 @@ import io.netty.handler.codec.http.websocketx.TextWebSocketFrame;
 import io.netty.handler.codec.http.websocketx.WebSocketFrame;
 import io.netty.handler.codec.http.websocketx.WebSocketServerHandshaker;
 import io.netty.handler.codec.http.websocketx.WebSocketServerHandshakerFactory;
-import io.netty.logging.InternalLogger;
-import io.netty.logging.InternalLoggerFactory;
 import io.netty.util.CharsetUtil;
+import io.netty.util.internal.InternalLogger;
+import io.netty.util.internal.InternalLoggerFactory;
 
 import static io.netty.handler.codec.http.HttpHeaders.*;
 import static io.netty.handler.codec.http.HttpMethod.*;

example/src/main/java/io/netty/example/http/websocketx/server/WebSocketServerHandler.java

@@ -31,9 +31,9 @@ import io.netty.handler.codec.http.websocketx.TextWebSocketFrame;
 import io.netty.handler.codec.http.websocketx.WebSocketFrame;
 import io.netty.handler.codec.http.websocketx.WebSocketServerHandshaker;
 import io.netty.handler.codec.http.websocketx.WebSocketServerHandshakerFactory;
-import io.netty.logging.InternalLogger;
-import io.netty.logging.InternalLoggerFactory;
 import io.netty.util.CharsetUtil;
+import io.netty.util.internal.InternalLogger;
+import io.netty.util.internal.InternalLoggerFactory;
 
 import static io.netty.handler.codec.http.HttpHeaders.Names.*;
 import static io.netty.handler.codec.http.HttpHeaders.*;

example/src/main/java/io/netty/example/http/websocketx/sslserver/WebSocketSslServerHandler.java

@@ -32,9 +32,9 @@ import io.netty.handler.codec.http.websocketx.TextWebSocketFrame;
 import io.netty.handler.codec.http.websocketx.WebSocketFrame;
 import io.netty.handler.codec.http.websocketx.WebSocketServerHandshaker;
 import io.netty.handler.codec.http.websocketx.WebSocketServerHandshakerFactory;
-import io.netty.logging.InternalLogger;
-import io.netty.logging.InternalLoggerFactory;
 import io.netty.util.CharsetUtil;
+import io.netty.util.internal.InternalLogger;
+import io.netty.util.internal.InternalLoggerFactory;
 
 import static io.netty.handler.codec.http.HttpHeaders.Names.*;
 import static io.netty.handler.codec.http.HttpHeaders.*;

example/src/main/java/io/netty/example/http/websocketx/sslserver/WebSocketSslServerSslContext.java

@@ -15,8 +15,8 @@
  */
 package io.netty.example.http.websocketx.sslserver;
 
-import io.netty.logging.InternalLogger;
-import io.netty.logging.InternalLoggerFactory;
+import io.netty.util.internal.InternalLogger;
+import io.netty.util.internal.InternalLoggerFactory;
 
 import javax.net.ssl.KeyManagerFactory;
 import javax.net.ssl.SSLContext;

handler/src/main/java/io/netty/handler/logging/LogLevel.java

@@ -15,7 +15,7 @@
  */
 package io.netty.handler.logging;
 
-import io.netty.logging.InternalLogLevel;
+import io.netty.util.internal.InternalLogLevel;
 
 public enum LogLevel {
     TRACE(InternalLogLevel.TRACE),

handler/src/main/java/io/netty/handler/logging/LoggingHandler.java

@@ -20,15 +20,16 @@ import io.netty.channel.ChannelHandler;
 import io.netty.channel.ChannelHandler.Sharable;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.ChannelPromise;
-import io.netty.logging.InternalLogLevel;
-import io.netty.logging.InternalLogger;
-import io.netty.logging.InternalLoggerFactory;
+import io.netty.util.internal.InternalLogLevel;
+import io.netty.util.internal.InternalLogger;
+import io.netty.util.internal.InternalLoggerFactory;
 
 import java.net.SocketAddress;
 
 /**
- * A {@link ChannelHandler} that logs all events via {@link InternalLogger}.
+ * A {@link ChannelHandler} that logs all events using a logging framework.
  * By default, all events are logged at <tt>DEBUG</tt> level.
+ *
  * @apiviz.landmark
  */
 @Sharable
@@ -115,7 +116,7 @@ public class LoggingHandler extends ChannelDuplexHandler {
     }
 
     /**
-     * Returns the {@link InternalLogLevel} that this handler uses to log
+     * Returns the {@link LogLevel} that this handler uses to log
      */
     public LogLevel level() {
         return level;

handler/src/main/java/io/netty/handler/logging/package-info.java

@@ -15,8 +15,7 @@
  */
 
 /**
- * Logs a {@link io.netty.channel.ChannelEvent} for debugging purpose
- * using an {@link io.netty.logging.InternalLogger}.
+ * Logs a {@link io.netty.channel.ChannelEvent} for debugging purpose.
  *
  * @apiviz.hidden
  * @apiviz.exclude \.channel\.

handler/src/main/java/io/netty/handler/ssl/SslHandler.java

@@ -28,8 +28,8 @@ import io.netty.channel.ChannelOutboundByteHandler;
 import io.netty.channel.ChannelPipeline;
 import io.netty.channel.ChannelPromise;
 import io.netty.channel.DefaultChannelPromise;
-import io.netty.logging.InternalLogger;
-import io.netty.logging.InternalLoggerFactory;
+import io.netty.util.internal.InternalLogger;
+import io.netty.util.internal.InternalLoggerFactory;
 import io.netty.util.internal.PlatformDependent;
 
 import javax.net.ssl.SSLEngine;

handler/src/main/java/io/netty/handler/stream/ChunkedWriteHandler.java

@@ -27,8 +27,8 @@ import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.ChannelOutboundMessageHandler;
 import io.netty.channel.ChannelPipeline;
 import io.netty.channel.ChannelPromise;
-import io.netty.logging.InternalLogger;
-import io.netty.logging.InternalLoggerFactory;
+import io.netty.util.internal.InternalLogger;
+import io.netty.util.internal.InternalLoggerFactory;
 
 import java.nio.channels.ClosedChannelException;
 import java.util.concurrent.atomic.AtomicInteger;

testsuite/src/test/java/io/netty/testsuite/transport/sctp/AbstractSctpTest.java

@@ -17,11 +17,11 @@ package io.netty.testsuite.transport.sctp;
 
 import io.netty.bootstrap.Bootstrap;
 import io.netty.bootstrap.ServerBootstrap;
-import io.netty.logging.InternalLogger;
-import io.netty.logging.InternalLoggerFactory;
 import io.netty.testsuite.transport.sctp.SctpTestPermutation.Factory;
 import io.netty.testsuite.util.TestUtils;
 import io.netty.util.NetUtil;
+import io.netty.util.internal.InternalLogger;
+import io.netty.util.internal.InternalLoggerFactory;
 import org.junit.Rule;
 import org.junit.rules.TestName;
 

testsuite/src/test/java/io/netty/testsuite/transport/socket/AbstractClientSocketTest.java

@@ -16,20 +16,19 @@
 package io.netty.testsuite.transport.socket;
 
 import io.netty.bootstrap.Bootstrap;
-import io.netty.logging.InternalLogger;
-import io.netty.logging.InternalLoggerFactory;
 import io.netty.testsuite.transport.socket.SocketTestPermutation.Factory;
 import io.netty.testsuite.util.TestUtils;
 import io.netty.util.NetUtil;
+import io.netty.util.internal.InternalLogger;
+import io.netty.util.internal.InternalLoggerFactory;
+import org.junit.Rule;
+import org.junit.rules.TestName;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.net.InetSocketAddress;
 import java.util.List;
 
-import org.junit.Rule;
-import org.junit.rules.TestName;
-
 public abstract class AbstractClientSocketTest {
 
     private static final List<Factory<Bootstrap>> COMBO = SocketTestPermutation.clientSocket();

testsuite/src/test/java/io/netty/testsuite/transport/socket/AbstractDatagramTest.java

@@ -16,11 +16,11 @@
 package io.netty.testsuite.transport.socket;
 
 import io.netty.bootstrap.Bootstrap;
-import io.netty.logging.InternalLogger;
-import io.netty.logging.InternalLoggerFactory;
 import io.netty.testsuite.transport.socket.SocketTestPermutation.Factory;
 import io.netty.testsuite.util.TestUtils;
 import io.netty.util.NetUtil;
+import io.netty.util.internal.InternalLogger;
+import io.netty.util.internal.InternalLoggerFactory;
 import org.junit.Rule;
 import org.junit.rules.TestName;
 

testsuite/src/test/java/io/netty/testsuite/transport/socket/AbstractServerSocketTest.java

@@ -16,12 +16,11 @@
 package io.netty.testsuite.transport.socket;
 
 import io.netty.bootstrap.ServerBootstrap;
-import io.netty.logging.InternalLogger;
-import io.netty.logging.InternalLoggerFactory;
 import io.netty.testsuite.transport.socket.SocketTestPermutation.Factory;
 import io.netty.testsuite.util.TestUtils;
 import io.netty.util.NetUtil;
-
+import io.netty.util.internal.InternalLogger;
+import io.netty.util.internal.InternalLoggerFactory;
 import org.junit.Rule;
 import org.junit.rules.TestName;
 

testsuite/src/test/java/io/netty/testsuite/transport/socket/AbstractSocketTest.java

@@ -17,12 +17,11 @@ package io.netty.testsuite.transport.socket;
 
 import io.netty.bootstrap.Bootstrap;
 import io.netty.bootstrap.ServerBootstrap;
-import io.netty.logging.InternalLogger;
-import io.netty.logging.InternalLoggerFactory;
 import io.netty.testsuite.transport.socket.SocketTestPermutation.Factory;
 import io.netty.testsuite.util.TestUtils;
 import io.netty.util.NetUtil;
-
+import io.netty.util.internal.InternalLogger;
+import io.netty.util.internal.InternalLoggerFactory;
 import org.junit.Rule;
 import org.junit.rules.TestName;
 

transport-sctp/src/main/java/io/netty/channel/sctp/nio/NioSctpChannel.java

@@ -33,8 +33,8 @@ import io.netty.channel.sctp.SctpChannelConfig;
 import io.netty.channel.sctp.SctpMessage;
 import io.netty.channel.sctp.SctpNotificationHandler;
 import io.netty.channel.sctp.SctpServerChannel;
-import io.netty.logging.InternalLogger;
-import io.netty.logging.InternalLoggerFactory;
+import io.netty.util.internal.InternalLogger;
+import io.netty.util.internal.InternalLoggerFactory;
 
 import java.io.IOException;
 import java.net.InetAddress;

transport-sctp/src/main/java/io/netty/channel/sctp/oio/OioSctpChannel.java

@@ -33,8 +33,8 @@ import io.netty.channel.sctp.SctpChannelConfig;
 import io.netty.channel.sctp.SctpMessage;
 import io.netty.channel.sctp.SctpNotificationHandler;
 import io.netty.channel.sctp.SctpServerChannel;
-import io.netty.logging.InternalLogger;
-import io.netty.logging.InternalLoggerFactory;
+import io.netty.util.internal.InternalLogger;
+import io.netty.util.internal.InternalLoggerFactory;
 
 import java.io.IOException;
 import java.net.InetAddress;

transport-sctp/src/main/java/io/netty/channel/sctp/oio/OioSctpServerChannel.java

@@ -23,11 +23,11 @@ import io.netty.channel.ChannelException;
 import io.netty.channel.ChannelFuture;
 import io.netty.channel.ChannelMetadata;
 import io.netty.channel.ChannelPromise;
+import io.netty.channel.oio.AbstractOioMessageChannel;
 import io.netty.channel.sctp.DefaultSctpServerChannelConfig;
 import io.netty.channel.sctp.SctpServerChannelConfig;
-import io.netty.channel.oio.AbstractOioMessageChannel;
-import io.netty.logging.InternalLogger;
-import io.netty.logging.InternalLoggerFactory;
+import io.netty.util.internal.InternalLogger;
+import io.netty.util.internal.InternalLoggerFactory;
 
 import java.io.IOException;
 import java.net.InetAddress;

transport-udt/src/main/java/io/netty/channel/udt/nio/NioUdtAcceptorChannel.java

@@ -15,21 +15,21 @@
  */
 package io.netty.channel.udt.nio;
 
-import static java.nio.channels.SelectionKey.*;
+import com.barchart.udt.TypeUDT;
+import com.barchart.udt.nio.ServerSocketChannelUDT;
 import io.netty.buffer.MessageBuf;
 import io.netty.channel.ChannelException;
 import io.netty.channel.nio.AbstractNioMessageChannel;
-import io.netty.logging.InternalLogger;
-import io.netty.logging.InternalLoggerFactory;
 import io.netty.channel.udt.DefaultUdtServerChannelConfig;
 import io.netty.channel.udt.UdtServerChannel;
 import io.netty.channel.udt.UdtServerChannelConfig;
+import io.netty.util.internal.InternalLogger;
+import io.netty.util.internal.InternalLoggerFactory;
 
 import java.net.InetSocketAddress;
 import java.net.SocketAddress;
 
-import com.barchart.udt.TypeUDT;
-import com.barchart.udt.nio.ServerSocketChannelUDT;
+import static java.nio.channels.SelectionKey.*;
 
 /**
  * Common base for Netty Byte/Message UDT Stream/Datagram acceptors.

transport-udt/src/main/java/io/netty/channel/udt/nio/NioUdtByteAcceptorChannel.java

@@ -15,23 +15,17 @@
  */
 package io.netty.channel.udt.nio;
 
+import com.barchart.udt.TypeUDT;
+import com.barchart.udt.nio.SocketChannelUDT;
 import io.netty.buffer.BufType;
 import io.netty.buffer.MessageBuf;
 import io.netty.channel.ChannelMetadata;
-import io.netty.logging.InternalLogger;
-import io.netty.logging.InternalLoggerFactory;
-
-import com.barchart.udt.TypeUDT;
-import com.barchart.udt.nio.SocketChannelUDT;
 
 /**
  * Byte Channel Acceptor for UDT Streams.
  */
 public class NioUdtByteAcceptorChannel extends NioUdtAcceptorChannel {
 
-    private static final InternalLogger logger = InternalLoggerFactory
-            .getInstance(NioUdtByteAcceptorChannel.class);
-
     private static final ChannelMetadata METADATA = new ChannelMetadata(
             BufType.BYTE, false);
 

transport-udt/src/main/java/io/netty/channel/udt/nio/NioUdtByteConnectorChannel.java

@@ -26,8 +26,8 @@ import io.netty.channel.nio.AbstractNioByteChannel;
 import io.netty.channel.udt.DefaultUdtChannelConfig;
 import io.netty.channel.udt.UdtChannel;
 import io.netty.channel.udt.UdtChannelConfig;
-import io.netty.logging.InternalLogger;
-import io.netty.logging.InternalLoggerFactory;
+import io.netty.util.internal.InternalLogger;
+import io.netty.util.internal.InternalLoggerFactory;
 
 import java.net.InetSocketAddress;
 import java.net.SocketAddress;

transport-udt/src/main/java/io/netty/channel/udt/nio/NioUdtMessageAcceptorChannel.java

@@ -15,23 +15,17 @@
  */
 package io.netty.channel.udt.nio;
 
+import com.barchart.udt.TypeUDT;
+import com.barchart.udt.nio.SocketChannelUDT;
 import io.netty.buffer.BufType;
 import io.netty.buffer.MessageBuf;
 import io.netty.channel.ChannelMetadata;
-import io.netty.logging.InternalLogger;
-import io.netty.logging.InternalLoggerFactory;
-
-import com.barchart.udt.TypeUDT;
-import com.barchart.udt.nio.SocketChannelUDT;
 
 /**
  * Message Channel Acceptor for UDT Datagrams.
  */
 public class NioUdtMessageAcceptorChannel extends NioUdtAcceptorChannel {
 
-    private static final InternalLogger logger = InternalLoggerFactory
-            .getInstance(NioUdtMessageAcceptorChannel.class);
-
     private static final ChannelMetadata METADATA = new ChannelMetadata(
             BufType.MESSAGE, false);
 

transport-udt/src/main/java/io/netty/channel/udt/nio/NioUdtMessageConnectorChannel.java

@@ -28,8 +28,8 @@ import io.netty.channel.udt.DefaultUdtChannelConfig;
 import io.netty.channel.udt.UdtChannel;
 import io.netty.channel.udt.UdtChannelConfig;
 import io.netty.channel.udt.UdtMessage;
-import io.netty.logging.InternalLogger;
-import io.netty.logging.InternalLoggerFactory;
+import io.netty.util.internal.InternalLogger;
+import io.netty.util.internal.InternalLoggerFactory;
 
 import java.net.InetSocketAddress;
 import java.net.SocketAddress;

transport-udt/src/test/java/io/netty/test/udt/nio/NioUdtByteRendezvousChannelTest.java

@@ -22,11 +22,11 @@ import io.netty.bootstrap.Bootstrap;
 import io.netty.buffer.BufType;
 import io.netty.channel.ChannelFuture;
 import io.netty.channel.udt.nio.NioUdtByteRendezvousChannel;
-import io.netty.logging.InternalLogger;
-import io.netty.logging.InternalLoggerFactory;
 import io.netty.test.udt.util.BootHelp;
 import io.netty.test.udt.util.EchoByteHandler;
 import io.netty.test.udt.util.UnitHelp;
+import io.netty.util.internal.InternalLogger;
+import io.netty.util.internal.InternalLoggerFactory;
 import org.junit.Test;
 
 import java.net.InetSocketAddress;

transport-udt/src/test/java/io/netty/test/udt/nio/NioUdtMessageRendezvousChannelTest.java

@@ -22,11 +22,11 @@ import io.netty.bootstrap.Bootstrap;
 import io.netty.buffer.BufType;
 import io.netty.channel.ChannelFuture;
 import io.netty.channel.udt.nio.NioUdtMessageRendezvousChannel;
-import io.netty.logging.InternalLogger;
-import io.netty.logging.InternalLoggerFactory;
 import io.netty.test.udt.util.BootHelp;
 import io.netty.test.udt.util.EchoMessageHandler;
 import io.netty.test.udt.util.UnitHelp;
+import io.netty.util.internal.InternalLogger;
+import io.netty.util.internal.InternalLoggerFactory;
 import org.junit.Test;
 
 import java.net.InetSocketAddress;

transport/src/main/java/io/netty/bootstrap/Bootstrap.java

@@ -20,9 +20,9 @@ import io.netty.channel.ChannelFuture;
 import io.netty.channel.ChannelFutureListener;
 import io.netty.channel.ChannelOption;
 import io.netty.channel.ChannelPipeline;
-import io.netty.logging.InternalLogger;
-import io.netty.logging.InternalLoggerFactory;
 import io.netty.util.AttributeKey;
+import io.netty.util.internal.InternalLogger;
+import io.netty.util.internal.InternalLoggerFactory;
 
 import java.net.InetAddress;
 import java.net.InetSocketAddress;

transport/src/main/java/io/netty/bootstrap/ServerBootstrap.java

@@ -30,9 +30,9 @@ import io.netty.channel.ChannelStateHandlerAdapter;
 import io.netty.channel.EventLoopGroup;
 import io.netty.channel.ServerChannel;
 import io.netty.channel.socket.SocketChannel;
-import io.netty.logging.InternalLogger;
-import io.netty.logging.InternalLoggerFactory;
 import io.netty.util.AttributeKey;
+import io.netty.util.internal.InternalLogger;
+import io.netty.util.internal.InternalLoggerFactory;
 
 import java.net.SocketAddress;
 import java.util.LinkedHashMap;

transport/src/main/java/io/netty/channel/AbstractChannel.java

@@ -19,9 +19,9 @@ import io.netty.buffer.BufType;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.ByteBufAllocator;
 import io.netty.buffer.MessageBuf;
-import io.netty.logging.InternalLogger;
-import io.netty.logging.InternalLoggerFactory;
 import io.netty.util.DefaultAttributeMap;
+import io.netty.util.internal.InternalLogger;
+import io.netty.util.internal.InternalLoggerFactory;
 import io.netty.util.internal.PlatformDependent;
 
 import java.io.EOFException;

transport/src/main/java/io/netty/channel/ChannelInboundMessageHandlerAdapter.java

@@ -18,7 +18,7 @@ package io.netty.channel;
 import io.netty.buffer.BufUtil;
 import io.netty.buffer.MessageBuf;
 import io.netty.buffer.Unpooled;
-import io.netty.util.internal.Signal;
+import io.netty.util.Signal;
 import io.netty.util.internal.TypeParameterMatcher;
 
 /**

transport/src/main/java/io/netty/channel/ChannelInitializer.java

@@ -18,8 +18,8 @@ package io.netty.channel;
 import io.netty.bootstrap.Bootstrap;
 import io.netty.bootstrap.ServerBootstrap;
 import io.netty.channel.ChannelHandler.Sharable;
-import io.netty.logging.InternalLogger;
-import io.netty.logging.InternalLoggerFactory;
+import io.netty.util.internal.InternalLogger;
+import io.netty.util.internal.InternalLoggerFactory;
 
 /**
  * A special {@link ChannelStateHandler} which offers an easy way to initialize a {@link Channel} once it was

transport/src/main/java/io/netty/channel/ChannelOutboundMessageHandlerAdapter.java

@@ -18,8 +18,8 @@ package io.netty.channel;
 import io.netty.buffer.BufUtil;
 import io.netty.buffer.MessageBuf;
 import io.netty.buffer.Unpooled;
-import io.netty.logging.InternalLoggerFactory;
-import io.netty.util.internal.Signal;
+import io.netty.util.Signal;
+import io.netty.util.internal.InternalLoggerFactory;
 import io.netty.util.internal.TypeParameterMatcher;
 
 /**

transport/src/main/java/io/netty/channel/ChannelTaskScheduler.java

@@ -15,8 +15,8 @@
  */
 package io.netty.channel;
 
-import io.netty.logging.InternalLogger;
-import io.netty.logging.InternalLoggerFactory;
+import io.netty.util.internal.InternalLogger;
+import io.netty.util.internal.InternalLoggerFactory;
 
 import java.util.Iterator;
 import java.util.concurrent.BlockingQueue;

transport/src/main/java/io/netty/channel/DefaultChannelPipeline.java

@@ -21,8 +21,8 @@ import io.netty.buffer.MessageBuf;
 import io.netty.buffer.ReferenceCounted;
 import io.netty.buffer.Unpooled;
 import io.netty.channel.Channel.Unsafe;
-import io.netty.logging.InternalLogger;
-import io.netty.logging.InternalLoggerFactory;
+import io.netty.util.internal.InternalLogger;
+import io.netty.util.internal.InternalLoggerFactory;
 
 import java.net.SocketAddress;
 import java.util.ArrayList;

transport/src/main/java/io/netty/channel/DefaultChannelPromise.java

@@ -16,8 +16,8 @@
 package io.netty.channel;
 
 import io.netty.channel.ChannelFlushPromiseNotifier.FlushCheckpoint;
-import io.netty.logging.InternalLogger;
-import io.netty.logging.InternalLoggerFactory;
+import io.netty.util.internal.InternalLogger;
+import io.netty.util.internal.InternalLoggerFactory;
 
 import java.util.ArrayList;
 import java.util.List;

transport/src/main/java/io/netty/channel/DefaultFileRegion.java

@@ -16,8 +16,8 @@
 package io.netty.channel;
 
 import io.netty.buffer.AbstractReferenceCounted;
-import io.netty.logging.InternalLogger;
-import io.netty.logging.InternalLoggerFactory;
+import io.netty.util.internal.InternalLogger;
+import io.netty.util.internal.InternalLoggerFactory;
 
 import java.io.IOException;
 import java.nio.channels.FileChannel;

transport/src/main/java/io/netty/channel/SingleThreadEventExecutor.java

@@ -15,8 +15,8 @@
  */
 package io.netty.channel;
 
-import io.netty.logging.InternalLogger;
-import io.netty.logging.InternalLoggerFactory;
+import io.netty.util.internal.InternalLogger;
+import io.netty.util.internal.InternalLoggerFactory;
 
 import java.util.ArrayList;
 import java.util.Collections;

transport/src/main/java/io/netty/channel/aio/AioEventLoopGroup.java

@@ -20,8 +20,8 @@ import io.netty.channel.ChannelTaskScheduler;
 import io.netty.channel.EventExecutor;
 import io.netty.channel.EventLoopException;
 import io.netty.channel.MultithreadEventLoopGroup;
-import io.netty.logging.InternalLogger;
-import io.netty.logging.InternalLoggerFactory;
+import io.netty.util.internal.InternalLogger;
+import io.netty.util.internal.InternalLoggerFactory;
 import io.netty.util.internal.PlatformDependent;
 
 import java.io.IOException;

transport/src/main/java/io/netty/channel/embedded/AbstractEmbeddedChannel.java

@@ -33,8 +33,8 @@ import io.netty.channel.ChannelPromise;
 import io.netty.channel.ChannelStateHandlerAdapter;
 import io.netty.channel.DefaultChannelConfig;
 import io.netty.channel.EventLoop;
-import io.netty.logging.InternalLogger;
-import io.netty.logging.InternalLoggerFactory;
+import io.netty.util.internal.InternalLogger;
+import io.netty.util.internal.InternalLoggerFactory;
 
 import java.net.SocketAddress;
 import java.nio.channels.ClosedChannelException;

transport/src/main/java/io/netty/channel/group/DefaultChannelGroupFuture.java

@@ -18,8 +18,8 @@ package io.netty.channel.group;
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelFuture;
 import io.netty.channel.ChannelFutureListener;
-import io.netty.logging.InternalLogger;
-import io.netty.logging.InternalLoggerFactory;
+import io.netty.util.internal.InternalLogger;
+import io.netty.util.internal.InternalLoggerFactory;
 
 import java.util.ArrayList;
 import java.util.Collection;

transport/src/main/java/io/netty/channel/nio/AbstractNioChannel.java

@@ -20,8 +20,8 @@ import io.netty.channel.Channel;
 import io.netty.channel.ChannelException;
 import io.netty.channel.ChannelPromise;
 import io.netty.channel.EventLoop;
-import io.netty.logging.InternalLogger;
-import io.netty.logging.InternalLoggerFactory;
+import io.netty.util.internal.InternalLogger;
+import io.netty.util.internal.InternalLoggerFactory;
 
 import java.io.IOException;
 import java.net.ConnectException;

transport/src/main/java/io/netty/channel/nio/NioEventLoop.java

@@ -22,8 +22,8 @@ import io.netty.channel.ChannelTaskScheduler;
 import io.netty.channel.EventLoopException;
 import io.netty.channel.SingleThreadEventLoop;
 import io.netty.channel.nio.AbstractNioChannel.NioUnsafe;
-import io.netty.logging.InternalLogger;
-import io.netty.logging.InternalLoggerFactory;
+import io.netty.util.internal.InternalLogger;
+import io.netty.util.internal.InternalLoggerFactory;
 
 import java.io.IOException;
 import java.nio.channels.CancelledKeyException;

transport/src/main/java/io/netty/channel/nio/SelectorUtil.java

@@ -15,8 +15,8 @@
  */
 package io.netty.channel.nio;
 
-import io.netty.logging.InternalLogger;
-import io.netty.logging.InternalLoggerFactory;
+import io.netty.util.internal.InternalLogger;
+import io.netty.util.internal.InternalLoggerFactory;
 import io.netty.util.internal.SystemPropertyUtil;
 
 import java.io.IOException;

transport/src/main/java/io/netty/channel/socket/DefaultDatagramChannelConfig.java

@@ -19,8 +19,8 @@ import io.netty.buffer.ByteBufAllocator;
 import io.netty.channel.ChannelException;
 import io.netty.channel.ChannelOption;
 import io.netty.channel.DefaultChannelConfig;
-import io.netty.logging.InternalLogger;
-import io.netty.logging.InternalLoggerFactory;
+import io.netty.util.internal.InternalLogger;
+import io.netty.util.internal.InternalLoggerFactory;
 import io.netty.util.internal.PlatformDependent;
 
 import java.io.IOException;

transport/src/main/java/io/netty/channel/socket/aio/AioServerSocketChannel.java

@@ -25,8 +25,8 @@ import io.netty.channel.aio.AioCompletionHandler;
 import io.netty.channel.aio.AioEventLoopGroup;
 import io.netty.channel.socket.ServerSocketChannel;
 import io.netty.channel.socket.ServerSocketChannelConfig;
-import io.netty.logging.InternalLogger;
-import io.netty.logging.InternalLoggerFactory;
+import io.netty.util.internal.InternalLogger;
+import io.netty.util.internal.InternalLoggerFactory;
 
 import java.io.IOException;
 import java.net.InetSocketAddress;

transport/src/main/java/io/netty/channel/socket/nio/NioSocketChannel.java

@@ -27,8 +27,8 @@ import io.netty.channel.nio.AbstractNioByteChannel;
 import io.netty.channel.socket.DefaultSocketChannelConfig;
 import io.netty.channel.socket.ServerSocketChannel;
 import io.netty.channel.socket.SocketChannelConfig;
-import io.netty.logging.InternalLogger;
-import io.netty.logging.InternalLoggerFactory;
+import io.netty.util.internal.InternalLogger;
+import io.netty.util.internal.InternalLoggerFactory;
 
 import java.io.IOException;
 import java.net.InetSocketAddress;

transport/src/main/java/io/netty/channel/socket/oio/OioDatagramChannel.java

@@ -27,8 +27,8 @@ import io.netty.channel.socket.DatagramChannel;
 import io.netty.channel.socket.DatagramChannelConfig;
 import io.netty.channel.socket.DatagramPacket;
 import io.netty.channel.socket.DefaultDatagramChannelConfig;
-import io.netty.logging.InternalLogger;
-import io.netty.logging.InternalLoggerFactory;
+import io.netty.util.internal.InternalLogger;
+import io.netty.util.internal.InternalLoggerFactory;
 
 import java.io.IOException;
 import java.net.InetAddress;

transport/src/main/java/io/netty/channel/socket/oio/OioServerSocketChannel.java

@@ -19,10 +19,10 @@ import io.netty.buffer.BufType;
 import io.netty.buffer.MessageBuf;
 import io.netty.channel.ChannelException;
 import io.netty.channel.ChannelMetadata;
-import io.netty.channel.socket.ServerSocketChannel;
 import io.netty.channel.oio.AbstractOioMessageChannel;
-import io.netty.logging.InternalLogger;
-import io.netty.logging.InternalLoggerFactory;
+import io.netty.channel.socket.ServerSocketChannel;
+import io.netty.util.internal.InternalLogger;
+import io.netty.util.internal.InternalLoggerFactory;
 
 import java.io.IOException;
 import java.net.InetSocketAddress;

transport/src/main/java/io/netty/channel/socket/oio/OioSocketChannel.java

@@ -21,11 +21,11 @@ import io.netty.channel.ChannelException;
 import io.netty.channel.ChannelFuture;
 import io.netty.channel.ChannelPromise;
 import io.netty.channel.EventLoop;
+import io.netty.channel.oio.OioByteStreamChannel;
 import io.netty.channel.socket.ServerSocketChannel;
 import io.netty.channel.socket.SocketChannel;
-import io.netty.channel.oio.OioByteStreamChannel;
-import io.netty.logging.InternalLogger;
-import io.netty.logging.InternalLoggerFactory;
+import io.netty.util.internal.InternalLogger;
+import io.netty.util.internal.InternalLoggerFactory;
 
 import java.io.IOException;
 import java.net.InetSocketAddress;

transport/src/test/java/io/netty/channel/local/LocalChannelRegistryTest.java

@@ -21,8 +21,8 @@ import io.netty.channel.Channel;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.ChannelInboundMessageHandlerAdapter;
 import io.netty.channel.ChannelInitializer;
-import io.netty.logging.InternalLogger;
-import io.netty.logging.InternalLoggerFactory;
+import io.netty.util.internal.InternalLogger;
+import io.netty.util.internal.InternalLoggerFactory;
 import org.junit.Test;
 
 import java.util.concurrent.CountDownLatch;