* Moved internal utility classes to org.jboss.netty.util.internal

* Made org.jboss.netty.util public
* Moved ObjectSizeEstimator and its implementation to org.jboss.netty.util

pom.xml

@@ -398,7 +398,7 @@
           <docletArtifact>
             <groupId>org.jboss.apiviz</groupId>
             <artifactId>apiviz</artifactId>
-            <version>1.2.5.GA</version>
+            <version>1.2.6.GA-SNAPSHOT</version>
           </docletArtifact>
           <attach>false</attach>
           <useStandardDocletOptions>true</useStandardDocletOptions>
@@ -430,14 +430,13 @@
             -group "Client &amp; Server bootstrapping utilities" ${project.groupId}.bootstrap*
             -group "Reusable I/O event interceptors" ${project.groupId}.handler*
             -group "IoC (Dependency Injection) container integration" ${project.groupId}.container*
-            -group "Miscellaneous" ${project.groupId}.logging*
+            -group "Miscellaneous" ${project.groupId}.logging*:${project.groupId}.util*
 
-            -nopackagediagram
             -sourceclasspath ${project.build.outputDirectory}
           </additionalparam>
           <encoding>UTF-8</encoding>
           <locale>en_US</locale>
-          <excludePackageNames>${project.groupId}.example*:${project.groupId}.util*</excludePackageNames>
+          <excludePackageNames>${project.groupId}.example*:${project.groupId}.util.internal*</excludePackageNames>
         </configuration>
       </plugin>
       <plugin>

src/main/java/org/jboss/netty/bootstrap/Bootstrap.java

@@ -34,7 +34,7 @@ import org.jboss.netty.channel.ChannelFactory;
 import org.jboss.netty.channel.ChannelHandler;
 import org.jboss.netty.channel.ChannelPipeline;
 import org.jboss.netty.channel.ChannelPipelineFactory;
-import org.jboss.netty.util.MapUtil;
+import org.jboss.netty.util.internal.MapUtil;
 
 /**
  * A helper class which initializes a {@link Channel}.  This class provides

src/main/java/org/jboss/netty/channel/AbstractChannel.java

@@ -25,7 +25,7 @@ package org.jboss.netty.channel;
 import java.net.SocketAddress;
 import java.util.concurrent.ConcurrentMap;
 
-import org.jboss.netty.util.ConcurrentHashMap;
+import org.jboss.netty.util.internal.ConcurrentHashMap;
 
 /**
  * A skeletal {@link Channel} implementation.

src/main/java/org/jboss/netty/channel/ChannelLocal.java

@@ -24,7 +24,7 @@ package org.jboss.netty.channel;
 
 import java.util.concurrent.ConcurrentMap;
 
-import org.jboss.netty.util.ConcurrentIdentityWeakKeyHashMap;
+import org.jboss.netty.util.internal.ConcurrentIdentityWeakKeyHashMap;
 
 /**
  * @author The Netty Project (netty-dev@lists.jboss.org)

src/main/java/org/jboss/netty/channel/DefaultExceptionEvent.java

@@ -24,7 +24,7 @@ package org.jboss.netty.channel;
 
 import static org.jboss.netty.channel.Channels.*;
 
-import org.jboss.netty.util.StackTraceSimplifier;
+import org.jboss.netty.util.internal.StackTraceSimplifier;
 
 /**
  * The default {@link ExceptionEvent} implementation.

src/main/java/org/jboss/netty/channel/DownstreamMessageEvent.java

@@ -24,7 +24,7 @@ package org.jboss.netty.channel;
 
 import java.net.SocketAddress;
 
-import org.jboss.netty.util.StringUtil;
+import org.jboss.netty.util.internal.StringUtil;
 
 /**
  * The default {@link MessageEvent} implementation.

src/main/java/org/jboss/netty/channel/UpstreamMessageEvent.java

@@ -26,7 +26,7 @@ import static org.jboss.netty.channel.Channels.*;
 
 import java.net.SocketAddress;
 
-import org.jboss.netty.util.StringUtil;
+import org.jboss.netty.util.internal.StringUtil;
 
 /**
  * The default {@link MessageEvent} implementation.

src/main/java/org/jboss/netty/channel/group/DefaultChannelGroup.java

@@ -37,8 +37,8 @@ import org.jboss.netty.channel.Channel;
 import org.jboss.netty.channel.ChannelFuture;
 import org.jboss.netty.channel.ChannelFutureListener;
 import org.jboss.netty.channel.ServerChannel;
-import org.jboss.netty.util.CombinedIterator;
+import org.jboss.netty.util.internal.CombinedIterator;
-import org.jboss.netty.util.ConcurrentHashMap;
+import org.jboss.netty.util.internal.ConcurrentHashMap;
 
 /**
  * @author The Netty Project (netty-dev@lists.jboss.org)

src/main/java/org/jboss/netty/channel/local/DefaultLocalChannel.java

@@ -36,8 +36,8 @@ import org.jboss.netty.channel.ChannelPipeline;
 import org.jboss.netty.channel.ChannelSink;
 import org.jboss.netty.channel.DefaultChannelConfig;
 import org.jboss.netty.channel.MessageEvent;
-import org.jboss.netty.util.LinkedTransferQueue;
+import org.jboss.netty.util.internal.LinkedTransferQueue;
-import org.jboss.netty.util.ThreadLocalBoolean;
+import org.jboss.netty.util.internal.ThreadLocalBoolean;
 
 /**
  * @author The Netty Project (netty-dev@lists.jboss.org)

src/main/java/org/jboss/netty/channel/local/LocalChannelRegistry.java

@@ -25,7 +25,7 @@ package org.jboss.netty.channel.local;
 import java.util.concurrent.ConcurrentMap;
 
 import org.jboss.netty.channel.Channel;
-import org.jboss.netty.util.ConcurrentHashMap;
+import org.jboss.netty.util.internal.ConcurrentHashMap;
 
 /**
  * @author The Netty Project (netty-dev@lists.jboss.org)

src/main/java/org/jboss/netty/channel/socket/DefaultDatagramChannelConfig.java

@@ -33,7 +33,7 @@ import org.jboss.netty.channel.ChannelException;
 import org.jboss.netty.channel.DefaultChannelConfig;
 import org.jboss.netty.channel.FixedReceiveBufferSizePredictor;
 import org.jboss.netty.channel.ReceiveBufferSizePredictor;
-import org.jboss.netty.util.ConversionUtil;
+import org.jboss.netty.util.internal.ConversionUtil;
 
 /**
  * The default {@link SocketChannelConfig} implementation.

src/main/java/org/jboss/netty/channel/socket/DefaultServerSocketChannelConfig.java

@@ -27,7 +27,7 @@ import java.net.SocketException;
 
 import org.jboss.netty.channel.ChannelException;
 import org.jboss.netty.channel.DefaultServerChannelConfig;
-import org.jboss.netty.util.ConversionUtil;
+import org.jboss.netty.util.internal.ConversionUtil;
 
 /**
  * The default {@link ServerSocketChannelConfig} implementation.

src/main/java/org/jboss/netty/channel/socket/DefaultSocketChannelConfig.java

@@ -27,7 +27,7 @@ import java.net.SocketException;
 
 import org.jboss.netty.channel.ChannelException;
 import org.jboss.netty.channel.DefaultChannelConfig;
-import org.jboss.netty.util.ConversionUtil;
+import org.jboss.netty.util.internal.ConversionUtil;
 
 /**
  * The default {@link SocketChannelConfig} implementation.

src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelingClientSocketChannel.java

@@ -47,7 +47,7 @@ import org.jboss.netty.channel.socket.ClientSocketChannelFactory;
 import org.jboss.netty.channel.socket.SocketChannel;
 import org.jboss.netty.channel.socket.SocketChannelConfig;
 import org.jboss.netty.handler.codec.frame.DelimiterBasedFrameDecoder;
-import org.jboss.netty.util.LinkedTransferQueue;
+import org.jboss.netty.util.internal.LinkedTransferQueue;
 
 /**
  * @author The Netty Project (netty-dev@lists.jboss.org)

src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelingClientSocketChannelFactory.java

@@ -28,7 +28,7 @@ import org.jboss.netty.channel.ChannelPipeline;
 import org.jboss.netty.channel.ChannelSink;
 import org.jboss.netty.channel.socket.ClientSocketChannelFactory;
 import org.jboss.netty.channel.socket.SocketChannel;
-import org.jboss.netty.util.ExecutorUtil;
+import org.jboss.netty.util.internal.ExecutorUtil;
 
 /**
  * @author The Netty Project (netty-dev@lists.jboss.org)

src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelingClientSocketPipelineSink.java

@@ -35,7 +35,7 @@ import org.jboss.netty.channel.ChannelPipeline;
 import org.jboss.netty.channel.ChannelState;
 import org.jboss.netty.channel.ChannelStateEvent;
 import org.jboss.netty.channel.MessageEvent;
-import org.jboss.netty.util.ThreadRenamingRunnable;
+import org.jboss.netty.util.internal.ThreadRenamingRunnable;
 
 /**
  * @author The Netty Project (netty-dev@lists.jboss.org)

src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelingSocketChannelConfig.java

@@ -28,7 +28,7 @@ import java.net.SocketException;
 import org.jboss.netty.channel.ChannelException;
 import org.jboss.netty.channel.DefaultChannelConfig;
 import org.jboss.netty.channel.socket.SocketChannelConfig;
-import org.jboss.netty.util.ConversionUtil;
+import org.jboss.netty.util.internal.ConversionUtil;
 
 /**
  * @author The Netty Project (netty-dev@lists.jboss.org)

src/main/java/org/jboss/netty/channel/socket/nio/DefaultNioSocketChannelConfig.java

@@ -30,7 +30,7 @@ import org.jboss.netty.channel.ReceiveBufferSizePredictor;
 import org.jboss.netty.channel.socket.DefaultSocketChannelConfig;
 import org.jboss.netty.logging.InternalLogger;
 import org.jboss.netty.logging.InternalLoggerFactory;
-import org.jboss.netty.util.ConversionUtil;
+import org.jboss.netty.util.internal.ConversionUtil;
 
 /**
  * The default {@link NioSocketChannelConfig} implementation.

src/main/java/org/jboss/netty/channel/socket/nio/NioClientSocketChannelFactory.java

@@ -31,7 +31,7 @@ import org.jboss.netty.channel.Channel;
 import org.jboss.netty.channel.ChannelPipeline;
 import org.jboss.netty.channel.socket.ClientSocketChannelFactory;
 import org.jboss.netty.channel.socket.SocketChannel;
-import org.jboss.netty.util.ExecutorUtil;
+import org.jboss.netty.util.internal.ExecutorUtil;
 
 /**
  * A {@link ClientSocketChannelFactory} which creates a client-side NIO-based

src/main/java/org/jboss/netty/channel/socket/nio/NioClientSocketPipelineSink.java

@@ -48,8 +48,8 @@ import org.jboss.netty.channel.ChannelStateEvent;
 import org.jboss.netty.channel.MessageEvent;
 import org.jboss.netty.logging.InternalLogger;
 import org.jboss.netty.logging.InternalLoggerFactory;
-import org.jboss.netty.util.LinkedTransferQueue;
+import org.jboss.netty.util.internal.LinkedTransferQueue;
-import org.jboss.netty.util.ThreadRenamingRunnable;
+import org.jboss.netty.util.internal.ThreadRenamingRunnable;
 
 /**
  *

src/main/java/org/jboss/netty/channel/socket/nio/NioProviderMetadata.java

@@ -37,8 +37,8 @@ import java.util.concurrent.TimeUnit;
 
 import org.jboss.netty.logging.InternalLogger;
 import org.jboss.netty.logging.InternalLoggerFactory;
-import org.jboss.netty.util.SystemPropertyUtil;
+import org.jboss.netty.util.internal.SystemPropertyUtil;
-import org.jboss.netty.util.ThreadRenamingRunnable;
+import org.jboss.netty.util.internal.ThreadRenamingRunnable;
 
 /**
  * Provides information which is specific to a NIO service provider

src/main/java/org/jboss/netty/channel/socket/nio/NioServerSocketChannelFactory.java

@@ -32,7 +32,7 @@ import org.jboss.netty.channel.ChannelPipeline;
 import org.jboss.netty.channel.ChannelSink;
 import org.jboss.netty.channel.socket.ServerSocketChannel;
 import org.jboss.netty.channel.socket.ServerSocketChannelFactory;
-import org.jboss.netty.util.ExecutorUtil;
+import org.jboss.netty.util.internal.ExecutorUtil;
 
 /**
  * A {@link ServerSocketChannelFactory} which creates a server-side NIO-based

src/main/java/org/jboss/netty/channel/socket/nio/NioServerSocketPipelineSink.java

@@ -42,7 +42,7 @@ import org.jboss.netty.channel.ChannelStateEvent;
 import org.jboss.netty.channel.MessageEvent;
 import org.jboss.netty.logging.InternalLogger;
 import org.jboss.netty.logging.InternalLoggerFactory;
-import org.jboss.netty.util.ThreadRenamingRunnable;
+import org.jboss.netty.util.internal.ThreadRenamingRunnable;
 
 /**
  *

src/main/java/org/jboss/netty/channel/socket/nio/NioSocketChannel.java

@@ -39,8 +39,8 @@ import org.jboss.netty.channel.ChannelFuture;
 import org.jboss.netty.channel.ChannelPipeline;
 import org.jboss.netty.channel.ChannelSink;
 import org.jboss.netty.channel.MessageEvent;
-import org.jboss.netty.util.LinkedTransferQueue;
+import org.jboss.netty.util.internal.LinkedTransferQueue;
-import org.jboss.netty.util.ThreadLocalBoolean;
+import org.jboss.netty.util.internal.ThreadLocalBoolean;
 
 /**
  * @author The Netty Project (netty-dev@lists.jboss.org)

src/main/java/org/jboss/netty/channel/socket/nio/NioSocketChannelConfig.java

@@ -25,8 +25,8 @@ package org.jboss.netty.channel.socket.nio;
 import java.nio.ByteBuffer;
 import java.nio.channels.WritableByteChannel;
 
-import org.jboss.netty.channel.ChannelConfig;
 import org.jboss.netty.channel.AdaptiveReceiveBufferSizePredictor;
+import org.jboss.netty.channel.ChannelConfig;
 import org.jboss.netty.channel.ReceiveBufferSizePredictor;
 import org.jboss.netty.channel.socket.SocketChannel;
 import org.jboss.netty.channel.socket.SocketChannelConfig;

src/main/java/org/jboss/netty/channel/socket/nio/NioWorker.java

@@ -51,8 +51,8 @@ import org.jboss.netty.channel.MessageEvent;
 import org.jboss.netty.channel.ReceiveBufferSizePredictor;
 import org.jboss.netty.logging.InternalLogger;
 import org.jboss.netty.logging.InternalLoggerFactory;
-import org.jboss.netty.util.LinkedTransferQueue;
+import org.jboss.netty.util.internal.LinkedTransferQueue;
-import org.jboss.netty.util.ThreadRenamingRunnable;
+import org.jboss.netty.util.internal.ThreadRenamingRunnable;
 
 /**
  *

src/main/java/org/jboss/netty/channel/socket/oio/OioClientSocketChannelFactory.java

@@ -29,7 +29,7 @@ import org.jboss.netty.channel.Channel;
 import org.jboss.netty.channel.ChannelPipeline;
 import org.jboss.netty.channel.socket.ClientSocketChannelFactory;
 import org.jboss.netty.channel.socket.SocketChannel;
-import org.jboss.netty.util.ExecutorUtil;
+import org.jboss.netty.util.internal.ExecutorUtil;
 
 /**
  * A {@link ClientSocketChannelFactory} which creates a client-side blocking

src/main/java/org/jboss/netty/channel/socket/oio/OioClientSocketPipelineSink.java

@@ -36,7 +36,7 @@ import org.jboss.netty.channel.ChannelPipeline;
 import org.jboss.netty.channel.ChannelState;
 import org.jboss.netty.channel.ChannelStateEvent;
 import org.jboss.netty.channel.MessageEvent;
-import org.jboss.netty.util.ThreadRenamingRunnable;
+import org.jboss.netty.util.internal.ThreadRenamingRunnable;
 
 /**
  *

src/main/java/org/jboss/netty/channel/socket/oio/OioDatagramChannelFactory.java

@@ -29,7 +29,7 @@ import org.jboss.netty.channel.Channel;
 import org.jboss.netty.channel.ChannelPipeline;
 import org.jboss.netty.channel.socket.DatagramChannel;
 import org.jboss.netty.channel.socket.DatagramChannelFactory;
-import org.jboss.netty.util.ExecutorUtil;
+import org.jboss.netty.util.internal.ExecutorUtil;
 
 /**
  * A {@link DatagramChannelFactory} which creates a client-side blocking

src/main/java/org/jboss/netty/channel/socket/oio/OioDatagramPipelineSink.java

@@ -35,7 +35,7 @@ import org.jboss.netty.channel.ChannelPipeline;
 import org.jboss.netty.channel.ChannelState;
 import org.jboss.netty.channel.ChannelStateEvent;
 import org.jboss.netty.channel.MessageEvent;
-import org.jboss.netty.util.ThreadRenamingRunnable;
+import org.jboss.netty.util.internal.ThreadRenamingRunnable;
 
 /**
  *

src/main/java/org/jboss/netty/channel/socket/oio/OioServerSocketChannelFactory.java

@@ -32,7 +32,7 @@ import org.jboss.netty.channel.ChannelPipeline;
 import org.jboss.netty.channel.ChannelSink;
 import org.jboss.netty.channel.socket.ServerSocketChannel;
 import org.jboss.netty.channel.socket.ServerSocketChannelFactory;
-import org.jboss.netty.util.ExecutorUtil;
+import org.jboss.netty.util.internal.ExecutorUtil;
 
 /**
  * A {@link ServerSocketChannelFactory} which creates a server-side blocking

src/main/java/org/jboss/netty/channel/socket/oio/OioServerSocketPipelineSink.java

@@ -40,7 +40,7 @@ import org.jboss.netty.channel.ChannelStateEvent;
 import org.jboss.netty.channel.MessageEvent;
 import org.jboss.netty.logging.InternalLogger;
 import org.jboss.netty.logging.InternalLoggerFactory;
-import org.jboss.netty.util.ThreadRenamingRunnable;
+import org.jboss.netty.util.internal.ThreadRenamingRunnable;
 
 /**
  *

src/main/java/org/jboss/netty/channel/xnio/BaseXnioChannel.java

@@ -37,8 +37,8 @@ import org.jboss.netty.channel.ChannelFuture;
 import org.jboss.netty.channel.ChannelPipeline;
 import org.jboss.netty.channel.ChannelSink;
 import org.jboss.netty.channel.MessageEvent;
-import org.jboss.netty.util.LinkedTransferQueue;
+import org.jboss.netty.util.internal.LinkedTransferQueue;
-import org.jboss.netty.util.ThreadLocalBoolean;
+import org.jboss.netty.util.internal.ThreadLocalBoolean;
 import org.jboss.xnio.IoUtils;
 import org.jboss.xnio.channels.BoundChannel;
 import org.jboss.xnio.channels.ConnectedChannel;

src/main/java/org/jboss/netty/channel/xnio/DefaultXnioChannelConfig.java

@@ -27,12 +27,12 @@ import java.util.Map.Entry;
 
 import org.jboss.netty.buffer.ChannelBufferFactory;
 import org.jboss.netty.buffer.HeapChannelBufferFactory;
-import org.jboss.netty.channel.ChannelPipelineFactory;
 import org.jboss.netty.channel.AdaptiveReceiveBufferSizePredictor;
+import org.jboss.netty.channel.ChannelPipelineFactory;
 import org.jboss.netty.channel.ReceiveBufferSizePredictor;
 import org.jboss.netty.logging.InternalLogger;
 import org.jboss.netty.logging.InternalLoggerFactory;
-import org.jboss.netty.util.ConversionUtil;
+import org.jboss.netty.util.internal.ConversionUtil;
 
 /**
  * The default {@link XnioChannelConfig} implementation.

src/main/java/org/jboss/netty/channel/xnio/XnioChannelConfig.java

@@ -25,8 +25,8 @@ package org.jboss.netty.channel.xnio;
 import java.nio.ByteBuffer;
 import java.nio.channels.WritableByteChannel;
 
-import org.jboss.netty.channel.ChannelConfig;
 import org.jboss.netty.channel.AdaptiveReceiveBufferSizePredictor;
+import org.jboss.netty.channel.ChannelConfig;
 import org.jboss.netty.channel.ReceiveBufferSizePredictor;
 import org.jboss.netty.channel.socket.SocketChannelConfig;
 

src/main/java/org/jboss/netty/channel/xnio/XnioChannelRegistry.java

@@ -27,8 +27,8 @@ import java.net.InetSocketAddress;
 import java.net.SocketAddress;
 import java.util.concurrent.ConcurrentMap;
 
-import org.jboss.netty.util.ConcurrentHashMap;
+import org.jboss.netty.util.internal.ConcurrentHashMap;
-import org.jboss.netty.util.ConcurrentIdentityHashMap;
+import org.jboss.netty.util.internal.ConcurrentIdentityHashMap;
 
 /**
  * @author The Netty Project (netty-dev@lists.jboss.org)

src/main/java/org/jboss/netty/container/guice/NettyModule.java

@@ -32,8 +32,8 @@ import org.jboss.netty.channel.socket.nio.NioClientSocketChannelFactory;
 import org.jboss.netty.channel.socket.nio.NioServerSocketChannelFactory;
 import org.jboss.netty.channel.socket.oio.OioClientSocketChannelFactory;
 import org.jboss.netty.channel.socket.oio.OioServerSocketChannelFactory;
-import org.jboss.netty.util.ExecutorUtil;
+import org.jboss.netty.util.internal.ExecutorUtil;
-import org.jboss.netty.util.UnterminatableExecutor;
+import org.jboss.netty.util.internal.UnterminatableExecutor;
 
 import com.google.inject.AbstractModule;
 import com.google.inject.Scopes;

src/main/java/org/jboss/netty/container/microcontainer/NettyResourceFactory.java

@@ -27,8 +27,8 @@ import java.util.concurrent.Executors;
 
 import org.jboss.netty.logging.InternalLoggerFactory;
 import org.jboss.netty.logging.JBossLoggerFactory;
-import org.jboss.netty.util.ExecutorUtil;
+import org.jboss.netty.util.internal.ExecutorUtil;
-import org.jboss.netty.util.UnterminatableExecutor;
+import org.jboss.netty.util.internal.UnterminatableExecutor;
 
 /**
  * @author The Netty Project (netty-dev@lists.jboss.org)

src/main/java/org/jboss/netty/container/osgi/NettyBundleActivator.java

@@ -37,7 +37,7 @@ import org.jboss.netty.channel.socket.oio.OioClientSocketChannelFactory;
 import org.jboss.netty.channel.socket.oio.OioServerSocketChannelFactory;
 import org.jboss.netty.logging.InternalLoggerFactory;
 import org.jboss.netty.logging.OsgiLoggerFactory;
-import org.jboss.netty.util.ExecutorUtil;
+import org.jboss.netty.util.internal.ExecutorUtil;
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceRegistration;

src/main/java/org/jboss/netty/container/spring/NettyResourceFactory.java

@@ -27,8 +27,8 @@ import java.util.concurrent.Executors;
 
 import org.jboss.netty.logging.CommonsLoggerFactory;
 import org.jboss.netty.logging.InternalLoggerFactory;
-import org.jboss.netty.util.ExecutorUtil;
+import org.jboss.netty.util.internal.ExecutorUtil;
-import org.jboss.netty.util.UnterminatableExecutor;
+import org.jboss.netty.util.internal.UnterminatableExecutor;
 import org.springframework.beans.factory.DisposableBean;
 import org.springframework.beans.factory.InitializingBean;
 

src/main/java/org/jboss/netty/example/securechat/SecureChatServerHandler.java

@@ -39,7 +39,7 @@ import org.jboss.netty.channel.ExceptionEvent;
 import org.jboss.netty.channel.MessageEvent;
 import org.jboss.netty.channel.SimpleChannelHandler;
 import org.jboss.netty.handler.ssl.SslHandler;
-import org.jboss.netty.util.MapBackedSet;
+import org.jboss.netty.util.internal.MapBackedSet;
 
 /**
  * Handles a server-side channel.
@@ -125,13 +125,13 @@ public class SecureChatServerHandler extends SimpleChannelHandler {
      * @version $Rev$, $Date$
      */
     private static final class Greeter implements ChannelFutureListener {
-    
+
         private final SslHandler sslHandler;
-    
+
         Greeter(SslHandler sslHandler) {
             this.sslHandler = sslHandler;
         }
-    
+
         public void operationComplete(ChannelFuture future) throws Exception {
             if (future.isSuccess()) {
                 // Once session is secured, send a greeting.
@@ -142,7 +142,7 @@ public class SecureChatServerHandler extends SimpleChannelHandler {
                         "Your session is protected by " +
                         sslHandler.getEngine().getSession().getCipherSuite() +
                         " cipher suite.\n");
-    
+
                 // Register the channel to the global channel list
                 // so the channel received the messages from others.
                 channels.add(future.getChannel());

src/main/java/org/jboss/netty/handler/codec/http/DefaultCookie.java

@@ -25,7 +25,7 @@ import java.util.Collections;
 import java.util.Set;
 import java.util.TreeSet;
 
-import org.jboss.netty.util.CaseIgnoringComparator;
+import org.jboss.netty.util.internal.CaseIgnoringComparator;
 
 
 /**

src/main/java/org/jboss/netty/handler/codec/http/DefaultHttpMessage.java

@@ -30,7 +30,7 @@ import java.util.TreeMap;
 
 import org.jboss.netty.buffer.ChannelBuffer;
 import org.jboss.netty.buffer.ChannelBuffers;
-import org.jboss.netty.util.CaseIgnoringComparator;
+import org.jboss.netty.util.internal.CaseIgnoringComparator;
 
 /**
  * a default Http Message which holds the headers and body.

src/main/java/org/jboss/netty/handler/codec/serialization/CompatibleObjectDecoder.java

@@ -32,7 +32,7 @@ import org.jboss.netty.buffer.ChannelBufferInputStream;
 import org.jboss.netty.channel.Channel;
 import org.jboss.netty.channel.ChannelHandlerContext;
 import org.jboss.netty.handler.codec.replay.ReplayingDecoder;
-import org.jboss.netty.util.SwitchableInputStream;
+import org.jboss.netty.util.internal.SwitchableInputStream;
 
 /**
  * A decoder which deserializes the received {@link ChannelBuffer}s into Java

src/main/java/org/jboss/netty/handler/execution/ExecutionHandler.java

@@ -33,8 +33,8 @@ import org.jboss.netty.channel.ChannelPipelineCoverage;
 import org.jboss.netty.channel.ChannelState;
 import org.jboss.netty.channel.ChannelStateEvent;
 import org.jboss.netty.channel.ChannelUpstreamHandler;
-import org.jboss.netty.util.ExecutorUtil;
 import org.jboss.netty.util.ExternalResourceReleasable;
+import org.jboss.netty.util.internal.ExecutorUtil;
 
 /**
  * Forwards an upstream {@link ChannelEvent} to an {@link Executor}.

src/main/java/org/jboss/netty/handler/execution/MemoryAwareThreadPoolExecutor.java

@@ -43,8 +43,10 @@ import org.jboss.netty.channel.ChannelState;
 import org.jboss.netty.channel.ChannelStateEvent;
 import org.jboss.netty.logging.InternalLogger;
 import org.jboss.netty.logging.InternalLoggerFactory;
-import org.jboss.netty.util.ConcurrentIdentityHashMap;
+import org.jboss.netty.util.DefaultObjectSizeEstimator;
-import org.jboss.netty.util.LinkedTransferQueue;
+import org.jboss.netty.util.ObjectSizeEstimator;
+import org.jboss.netty.util.internal.ConcurrentIdentityHashMap;
+import org.jboss.netty.util.internal.LinkedTransferQueue;
 
 /**
  * A {@link ThreadPoolExecutor} which blocks the task submission when there's
@@ -82,7 +84,7 @@ import org.jboss.netty.util.LinkedTransferQueue;
  *
  * @version $Rev$, $Date$
  *
- * @apiviz.uses org.jboss.netty.handler.execution.ObjectSizeEstimator
+ * @apiviz.uses org.jboss.netty.util.ObjectSizeEstimator
  * @apiviz.uses org.jboss.netty.handler.execution.ChannelEventRunnable
  */
 public class MemoryAwareThreadPoolExecutor extends ThreadPoolExecutor {

src/main/java/org/jboss/netty/handler/execution/OrderedMemoryAwareThreadPoolExecutor.java

@@ -32,7 +32,8 @@ import org.jboss.netty.channel.Channel;
 import org.jboss.netty.channel.ChannelEvent;
 import org.jboss.netty.channel.ChannelState;
 import org.jboss.netty.channel.ChannelStateEvent;
-import org.jboss.netty.util.ConcurrentIdentityHashMap;
+import org.jboss.netty.util.ObjectSizeEstimator;
+import org.jboss.netty.util.internal.ConcurrentIdentityHashMap;
 
 /**
  * A {@link MemoryAwareThreadPoolExecutor} which maintains the

src/main/java/org/jboss/netty/handler/ssl/SslHandler.java

@@ -53,7 +53,7 @@ import org.jboss.netty.channel.MessageEvent;
 import org.jboss.netty.handler.codec.frame.FrameDecoder;
 import org.jboss.netty.logging.InternalLogger;
 import org.jboss.netty.logging.InternalLoggerFactory;
-import org.jboss.netty.util.ImmediateExecutor;
+import org.jboss.netty.util.internal.ImmediateExecutor;
 
 /**
  * Adds <a href="http://en.wikipedia.org/wiki/Transport_Layer_Security">SSL

src/main/java/org/jboss/netty/handler/timeout/HashedWheelTimer.java

@@ -37,10 +37,10 @@ import java.util.concurrent.locks.ReentrantReadWriteLock;
 
 import org.jboss.netty.logging.InternalLogger;
 import org.jboss.netty.logging.InternalLoggerFactory;
-import org.jboss.netty.util.ConcurrentIdentityHashMap;
+import org.jboss.netty.util.internal.ConcurrentIdentityHashMap;
-import org.jboss.netty.util.MapBackedSet;
+import org.jboss.netty.util.internal.MapBackedSet;
-import org.jboss.netty.util.ReusableIterator;
+import org.jboss.netty.util.internal.ReusableIterator;
-import org.jboss.netty.util.ThreadRenamingRunnable;
+import org.jboss.netty.util.internal.ThreadRenamingRunnable;
 
 /**
  * @author The Netty Project (netty-dev@lists.jboss.org)

src/main/java/org/jboss/netty/handler/traffic/TrafficShapingHandler.java

@@ -30,8 +30,8 @@ import org.jboss.netty.channel.ChannelState;
 import org.jboss.netty.channel.ChannelStateEvent;
 import org.jboss.netty.channel.MessageEvent;
 import org.jboss.netty.channel.SimpleChannelHandler;
-import org.jboss.netty.handler.execution.DefaultObjectSizeEstimator;
+import org.jboss.netty.util.DefaultObjectSizeEstimator;
-import org.jboss.netty.handler.execution.ObjectSizeEstimator;
+import org.jboss.netty.util.ObjectSizeEstimator;
 
 /**
  * @author The Netty Project (netty-dev@lists.jboss.org)

src/main/java/org/jboss/netty/handler/traffic/package-info.java

@@ -99,7 +99,4 @@
  */
 package org.jboss.netty.handler.traffic;
 
-import org.jboss.netty.handler.execution.DefaultObjectSizeEstimator;
+
-import org.jboss.netty.handler.execution.ObjectSizeEstimator;
-import org.jboss.netty.handler.execution.MemoryAwareThreadPoolExecutor;
-import org.jboss.netty.handler.execution.OrderedMemoryAwareThreadPoolExecutor;

src/main/java/org/jboss/netty/logging/InternalLoggerFactory.java

@@ -22,7 +22,7 @@
  */
 package org.jboss.netty.logging;
 
-import org.jboss.netty.util.StackTraceSimplifier;
+import org.jboss.netty.util.internal.StackTraceSimplifier;
 
 /**
  * Creates an {@link InternalLogger} or changes the default factory

src/main/java/org/jboss/netty/util/DebugUtil.java

@@ -22,6 +22,8 @@
  */
 package org.jboss.netty.util;
 
+import org.jboss.netty.util.internal.SystemPropertyUtil;
+
 /**
  * Determines if Netty is running in a debug mode or not.  Please note that
  * this is not a Java debug mode.  You can enable Netty debug mode by

src/main/java/org/jboss/netty/util/DefaultObjectSizeEstimator.java

@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jboss.netty.handler.execution;
+package org.jboss.netty.util;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
@@ -31,7 +31,8 @@ import java.util.concurrent.ConcurrentMap;
 
 import org.jboss.netty.buffer.ChannelBuffer;
 import org.jboss.netty.channel.MessageEvent;
-import org.jboss.netty.util.ConcurrentIdentityWeakKeyHashMap;
+import org.jboss.netty.handler.execution.ChannelEventRunnable;
+import org.jboss.netty.util.internal.ConcurrentIdentityWeakKeyHashMap;
 
 /**
  * The default {@link ObjectSizeEstimator} implementation for general purpose.

src/main/java/org/jboss/netty/util/ObjectSizeEstimator.java

@@ -20,7 +20,10 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jboss.netty.handler.execution;
+package org.jboss.netty.util;
+
+import org.jboss.netty.handler.execution.MemoryAwareThreadPoolExecutor;
+import org.jboss.netty.handler.execution.OrderedMemoryAwareThreadPoolExecutor;
 
 /**
  * Estimates the size of an object in bytes.

src/main/java/org/jboss/netty/util/internal/CaseIgnoringComparator.java

@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jboss.netty.util;
+package org.jboss.netty.util.internal;
 
 import java.io.Serializable;
 import java.util.Comparator;

src/main/java/org/jboss/netty/util/internal/CombinedIterator.java

@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jboss.netty.util;
+package org.jboss.netty.util.internal;
 
 import java.util.Iterator;
 import java.util.NoSuchElementException;

src/main/java/org/jboss/netty/util/internal/ConcurrentHashMap.java

@@ -25,7 +25,7 @@
  * Expert Group and released to the public domain, as explained at
  * http://creativecommons.org/licenses/publicdomain
  */
-package org.jboss.netty.util;
+package org.jboss.netty.util.internal;
 
 import java.util.AbstractCollection;
 import java.util.AbstractMap;
@@ -41,6 +41,7 @@ import java.util.Set;
 import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.locks.ReentrantLock;
 
+
 /**
  * An alternative {@link ConcurrentMap} implementation which is similar to
  * {@link java.util.concurrent.ConcurrentHashMap}.

src/main/java/org/jboss/netty/util/internal/ConcurrentIdentityHashMap.java

@@ -25,7 +25,7 @@
  * Expert Group and released to the public domain, as explained at
  * http://creativecommons.org/licenses/publicdomain
  */
-package org.jboss.netty.util;
+package org.jboss.netty.util.internal;
 
 import java.util.AbstractCollection;
 import java.util.AbstractMap;
@@ -41,6 +41,7 @@ import java.util.Set;
 import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.locks.ReentrantLock;
 
+
 /**
  * An alternative identity-comparing {@link ConcurrentMap} which is similar to
  * {@link java.util.concurrent.ConcurrentHashMap}.

src/main/java/org/jboss/netty/util/internal/ConcurrentIdentityWeakKeyHashMap.java

@@ -25,7 +25,7 @@
  * Expert Group and released to the public domain, as explained at
  * http://creativecommons.org/licenses/publicdomain
  */
-package org.jboss.netty.util;
+package org.jboss.netty.util.internal;
 
 import java.lang.ref.Reference;
 import java.lang.ref.ReferenceQueue;
@@ -44,6 +44,7 @@ import java.util.Set;
 import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.locks.ReentrantLock;
 
+
 /**
  * An alternative weak-key identity-comparing {@link ConcurrentMap} which is
  * similar to {@link java.util.concurrent.ConcurrentHashMap}.

src/main/java/org/jboss/netty/util/internal/ConcurrentWeakKeyHashMap.java

@@ -25,7 +25,7 @@
  * Expert Group and released to the public domain, as explained at
  * http://creativecommons.org/licenses/publicdomain
  */
-package org.jboss.netty.util;
+package org.jboss.netty.util.internal;
 
 import java.lang.ref.Reference;
 import java.lang.ref.ReferenceQueue;
@@ -44,6 +44,7 @@ import java.util.Set;
 import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.locks.ReentrantLock;
 
+
 /**
  * An alternative weak-key {@link ConcurrentMap} which is similar to
  * {@link java.util.concurrent.ConcurrentHashMap}.

src/main/java/org/jboss/netty/util/internal/ConversionUtil.java

@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jboss.netty.util;
+package org.jboss.netty.util.internal;
 
 /**
  * Conversion utility class to parse a property represented as a string or

src/main/java/org/jboss/netty/util/internal/ExecutorUtil.java

@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jboss.netty.util;
+package org.jboss.netty.util.internal;
 
 import java.util.concurrent.Executor;
 import java.util.concurrent.ExecutorService;

src/main/java/org/jboss/netty/util/internal/ImmediateExecutor.java

@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jboss.netty.util;
+package org.jboss.netty.util.internal;
 
 import java.util.concurrent.Executor;
 

src/main/java/org/jboss/netty/util/internal/LinkedTransferQueue.java

@@ -27,7 +27,7 @@
  * http://creativecommons.org/licenses/publicdomain
  */
 
-package org.jboss.netty.util;
+package org.jboss.netty.util.internal;
 
 import java.util.AbstractQueue;
 import java.util.Collection;

src/main/java/org/jboss/netty/util/internal/MapBackedSet.java

@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jboss.netty.util;
+package org.jboss.netty.util.internal;
 
 import java.io.Serializable;
 import java.util.AbstractSet;

src/main/java/org/jboss/netty/util/internal/MapUtil.java

@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jboss.netty.util;
+package org.jboss.netty.util.internal;
 
 import java.util.ArrayList;
 import java.util.Iterator;

src/main/java/org/jboss/netty/util/internal/ReusableIterator.java

@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jboss.netty.util;
+package org.jboss.netty.util.internal;
 
 import java.util.Iterator;
 

src/main/java/org/jboss/netty/util/internal/StackTraceSimplifier.java

@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jboss.netty.util;
+package org.jboss.netty.util.internal;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -28,6 +28,7 @@ import java.util.regex.Pattern;
 
 import org.jboss.netty.channel.DefaultChannelPipeline;
 import org.jboss.netty.channel.SimpleChannelHandler;
+import org.jboss.netty.util.DebugUtil;
 
 /**
  * Simplifies an exception stack trace by removing unnecessary
@@ -46,7 +47,7 @@ public class StackTraceSimplifier {
     private static final Pattern EXCLUDED_STACK_TRACE =
         Pattern.compile(
                 "^org\\.jboss\\.netty\\." +
-                "(util\\.(ThreadRenamingRunnable)" +
+                "(util\\.internal\\.(ThreadRenamingRunnable)" +
                 "|channel\\.(SimpleChannelHandler|DefaultChannelPipeline.*))$");
 
     /**

src/main/java/org/jboss/netty/util/internal/StringUtil.java

@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jboss.netty.util;
+package org.jboss.netty.util.internal;
 
 /**
  * @author The Netty Project (netty-dev@lists.jboss.org)

src/main/java/org/jboss/netty/util/internal/SwitchableInputStream.java

@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jboss.netty.util;
+package org.jboss.netty.util.internal;
 
 import java.io.FilterInputStream;
 import java.io.InputStream;

src/main/java/org/jboss/netty/util/internal/SystemPropertyUtil.java

@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jboss.netty.util;
+package org.jboss.netty.util.internal;
 
 /**
  * Accesses the system property swallowing a {@link SecurityException}.

src/main/java/org/jboss/netty/util/internal/ThreadLocalBoolean.java

@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jboss.netty.util;
+package org.jboss.netty.util.internal;
 
 /**
  * @author The Netty Project (netty-dev@lists.jboss.org)

src/main/java/org/jboss/netty/util/internal/ThreadRenamingRunnable.java

@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jboss.netty.util;
+package org.jboss.netty.util.internal;
 
 
 /**

src/main/java/org/jboss/netty/util/internal/UnterminatableExecutor.java

@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jboss.netty.util;
+package org.jboss.netty.util.internal;
 
 import java.util.concurrent.Executor;
 

src/main/java/org/jboss/netty/util/internal/package-info.java

@@ -0,0 +1,28 @@
+/*
+ * JBoss, Home of Professional Open Source
+ *
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * by the @author tags. See the COPYRIGHT.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+/**
+ * <em>Internal-use-only</em> utilities which is not allowed to be used
+ * outside Netty.
+ */
+package org.jboss.netty.util.internal;

src/main/java/org/jboss/netty/util/package-info.java

@@ -22,7 +22,8 @@
  */
 
 /**
- * <em>Internal-use-only</em> utilities which is not allowed to be used
+ * Miscellaneous utility types.
- * outside Netty.
+ *
+ * @apiviz.exclude
  */
 package org.jboss.netty.util;

src/test/java/org/jboss/netty/bootstrap/AbstractSocketClientBootstrapTest.java

@@ -37,8 +37,8 @@ import org.jboss.netty.channel.ChannelFuture;
 import org.jboss.netty.channel.ChannelPipelineException;
 import org.jboss.netty.channel.ChannelPipelineFactory;
 import org.jboss.netty.util.DummyHandler;
-import org.jboss.netty.util.ExecutorUtil;
 import org.jboss.netty.util.TestUtil;
+import org.jboss.netty.util.internal.ExecutorUtil;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;

src/test/java/org/jboss/netty/bootstrap/AbstractSocketServerBootstrapTest.java

@@ -44,8 +44,8 @@ import org.jboss.netty.channel.ServerChannelFactory;
 import org.jboss.netty.channel.SimpleChannelHandler;
 import org.jboss.netty.channel.socket.SocketChannelConfig;
 import org.jboss.netty.util.DummyHandler;
-import org.jboss.netty.util.ExecutorUtil;
 import org.jboss.netty.util.TestUtil;
+import org.jboss.netty.util.internal.ExecutorUtil;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;

src/test/java/org/jboss/netty/channel/socket/AbstractSocketEchoTest.java

@@ -45,8 +45,8 @@ import org.jboss.netty.channel.ChannelStateEvent;
 import org.jboss.netty.channel.ExceptionEvent;
 import org.jboss.netty.channel.MessageEvent;
 import org.jboss.netty.channel.SimpleChannelHandler;
-import org.jboss.netty.util.ExecutorUtil;
 import org.jboss.netty.util.TestUtil;
+import org.jboss.netty.util.internal.ExecutorUtil;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;

src/test/java/org/jboss/netty/handler/codec/frame/AbstractSocketFixedLengthEchoTest.java

@@ -45,8 +45,8 @@ import org.jboss.netty.channel.ChannelStateEvent;
 import org.jboss.netty.channel.ExceptionEvent;
 import org.jboss.netty.channel.MessageEvent;
 import org.jboss.netty.channel.SimpleChannelHandler;
-import org.jboss.netty.util.ExecutorUtil;
 import org.jboss.netty.util.TestUtil;
+import org.jboss.netty.util.internal.ExecutorUtil;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;

src/test/java/org/jboss/netty/handler/codec/serialization/AbstractSocketCompatibleObjectStreamEchoTest.java

@@ -43,8 +43,8 @@ import org.jboss.netty.channel.ChannelStateEvent;
 import org.jboss.netty.channel.ExceptionEvent;
 import org.jboss.netty.channel.MessageEvent;
 import org.jboss.netty.channel.SimpleChannelHandler;
-import org.jboss.netty.util.ExecutorUtil;
 import org.jboss.netty.util.TestUtil;
+import org.jboss.netty.util.internal.ExecutorUtil;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;

src/test/java/org/jboss/netty/handler/codec/serialization/AbstractSocketObjectStreamEchoTest.java

@@ -43,8 +43,8 @@ import org.jboss.netty.channel.ChannelStateEvent;
 import org.jboss.netty.channel.ExceptionEvent;
 import org.jboss.netty.channel.MessageEvent;
 import org.jboss.netty.channel.SimpleChannelHandler;
-import org.jboss.netty.util.ExecutorUtil;
 import org.jboss.netty.util.TestUtil;
+import org.jboss.netty.util.internal.ExecutorUtil;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;

src/test/java/org/jboss/netty/handler/codec/string/AbstractSocketStringEchoTest.java

@@ -45,8 +45,8 @@ import org.jboss.netty.channel.MessageEvent;
 import org.jboss.netty.channel.SimpleChannelHandler;
 import org.jboss.netty.handler.codec.frame.DelimiterBasedFrameDecoder;
 import org.jboss.netty.handler.codec.frame.Delimiters;
-import org.jboss.netty.util.ExecutorUtil;
 import org.jboss.netty.util.TestUtil;
+import org.jboss.netty.util.internal.ExecutorUtil;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;

src/test/java/org/jboss/netty/handler/ssl/AbstractSocketSslEchoTest.java

@@ -52,8 +52,8 @@ import org.jboss.netty.handler.execution.ExecutionHandler;
 import org.jboss.netty.handler.execution.OrderedMemoryAwareThreadPoolExecutor;
 import org.jboss.netty.logging.InternalLogger;
 import org.jboss.netty.logging.InternalLoggerFactory;
-import org.jboss.netty.util.ExecutorUtil;
 import org.jboss.netty.util.TestUtil;
+import org.jboss.netty.util.internal.ExecutorUtil;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;

src/test/java/org/jboss/netty/util/TestUtil.java

@@ -25,6 +25,8 @@ package org.jboss.netty.util;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 
+import org.jboss.netty.util.internal.ConversionUtil;
+
 
 /**
  * @author The Netty Project (netty-dev@lists.jboss.org)

src/test/java/org/jboss/netty/util/internal/ConversionUtilTest.java

@@ -20,10 +20,11 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jboss.netty.util;
+package org.jboss.netty.util.internal;
 
 import static org.junit.Assert.*;
 
+import org.jboss.netty.util.internal.ConversionUtil;
 import org.junit.Test;
 
 

src/test/java/org/jboss/netty/util/internal/ImmediateExecutorTest.java

@@ -20,10 +20,11 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jboss.netty.util;
+package org.jboss.netty.util.internal;
 
 import static org.junit.Assert.*;
 
+import org.jboss.netty.util.internal.ImmediateExecutor;
 import org.junit.Test;
 
 

src/test/java/org/jboss/netty/util/internal/MapBackedSetTest.java

@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jboss.netty.util;
+package org.jboss.netty.util.internal;
 
 import static org.easymock.EasyMock.*;
 import static org.junit.Assert.*;

src/test/java/org/jboss/netty/util/internal/MapUtilTest.java

@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jboss.netty.util;
+package org.jboss.netty.util.internal;
 
 import static org.junit.Assert.*;
 

src/test/java/org/jboss/netty/util/internal/StackTraceSimplifierTest.java

@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jboss.netty.util;
+package org.jboss.netty.util.internal;
 
 import static org.easymock.EasyMock.*;
 import static org.easymock.classextension.EasyMock.*;

src/test/java/org/jboss/netty/util/internal/SwitchableInputStreamTest.java

@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jboss.netty.util;
+package org.jboss.netty.util.internal;
 
 import static org.easymock.EasyMock.*;
 import static org.easymock.classextension.EasyMock.*;

src/test/java/org/jboss/netty/util/internal/ThreadRenamingRunnableTest.java

@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jboss.netty.util;
+package org.jboss.netty.util.internal;
 
 import static org.easymock.EasyMock.*;
 import static org.junit.Assert.*;