Overall cleanup / Add lost old jzlib headers

src/main/java/org/jboss/netty/buffer/ChannelBuffer.java

@@ -130,6 +130,8 @@ import java.nio.charset.UnsupportedCharsetException;
  *      +-------------------+------------------+------------------+
  *      |                   |                  |                  |
  *      0      <=      readerIndex   <=   writerIndex    <=    capacity
+ *
+ *
  *  AFTER discardReadBytes()
  *
  *      +------------------+--------------------------------------+
@@ -160,6 +162,8 @@ import java.nio.charset.UnsupportedCharsetException;
  *      +-------------------+------------------+------------------+
  *      |                   |                  |                  |
  *      0      <=      readerIndex   <=   writerIndex    <=    capacity
+ *
+ *
  *  AFTER clear()
  *
  *      +---------------------------------------------------------+
@@ -1330,7 +1334,7 @@ public interface ChannelBuffer extends Comparable<ChannelBuffer> {
      * @throws IndexOutOfBoundsException
      *         if {@code src.readableBytes} is greater than
      *            {@code this.writableBytes}
- */
+     */
     void writeBytes(ChannelBuffer src);
 
     /**
@@ -1584,7 +1588,7 @@ public interface ChannelBuffer extends Comparable<ChannelBuffer> {
      * This method is identical to {@code buf.copy(buf.readerIndex(), buf.readableBytes())}.
      * This method does not modify {@code readerIndex} or {@code writerIndex} of
      * this buffer.
- */
+     */
     ChannelBuffer copy();
 
     /**

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

@@ -219,7 +219,7 @@ public interface ChannelHandler {
      * <p>
      * This annotation is provided for documentation purpose, just like
      * <a href="http://www.javaconcurrencyinpractice.com/annotations/doc/">the JCIP annotations</a>.
- */
+     */
     @Inherited
     @Documented
     @Target(ElementType.TYPE)

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

@@ -37,10 +37,6 @@ public class ChannelLocal<T> {
 
 
     private final ChannelFutureListener remover = new ChannelFutureListener() {
-        /*
-         * (non-Javadoc)
-         * @see org.jboss.netty.channel.ChannelFutureListener#operationComplete(org.jboss.netty.channel.ChannelFuture)
-         */
         public void operationComplete(ChannelFuture future) throws Exception {
             remove(future.getChannel());
         }

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

@@ -27,8 +27,6 @@ import org.jboss.netty.channel.ChannelState;
 import org.jboss.netty.channel.ChannelStateEvent;
 import org.jboss.netty.channel.MessageEvent;
 
-/**
- */
 final class LocalServerChannelSink extends AbstractChannelSink {
 
     LocalServerChannelSink() {

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

@@ -26,8 +26,6 @@ import org.jboss.netty.channel.ChannelState;
 import org.jboss.netty.channel.ChannelStateEvent;
 import org.jboss.netty.channel.MessageEvent;
 
-/**
- */
 final class HttpTunnelingClientSocketPipelineSink extends AbstractChannelSink {
 
     HttpTunnelingClientSocketPipelineSink() {

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

@@ -23,12 +23,6 @@ import java.util.concurrent.TimeUnit;
 import org.jboss.netty.channel.MessageEvent;
 import org.jboss.netty.util.internal.QueueFactory;
 
-/**
- * 
- *
-
-
- */
 abstract class AbstractWriteRequestQueue implements BlockingQueue<MessageEvent> {
 
     protected final BlockingQueue<MessageEvent> queue;
@@ -37,188 +31,95 @@ abstract class AbstractWriteRequestQueue implements BlockingQueue<MessageEvent>
         this.queue = QueueFactory.createQueue(MessageEvent.class);
     }
 
-    /*
-     * (non-Javadoc)
-     * @see java.util.Queue#remove()
-     */
     public MessageEvent remove() {
         return queue.remove();
     }
 
-    /*
-     * (non-Javadoc)
-     * @see java.util.Queue#element()
-     */
     public MessageEvent element() {
         return queue.element();
     }
 
-    /*
-     * (non-Javadoc)
-     * @see java.util.Queue#peek()
-     */
     public MessageEvent peek() {
         return queue.peek();
     }
 
-    /*
-     * (non-Javadoc)
-     * @see java.util.Collection#size()
-     */
     public int size() {
         return queue.size();
     }
 
-    /*
-     * (non-Javadoc)
-     * @see java.util.Collection#isEmpty()
-     */
     public boolean isEmpty() {
         return queue.isEmpty();
     }
 
-    /*
-     * (non-Javadoc)
-     * @see java.util.Collection#iterator()
-     */
     public Iterator<MessageEvent> iterator() {
         return queue.iterator();
     }
 
-    /*
-     * (non-Javadoc)
-     * @see java.util.Collection#toArray()
-     */
     public Object[] toArray() {
         return queue.toArray();
     }
 
-    /*
-     * (non-Javadoc)
-     * @see java.util.Collection#toArray(T[])
-     */
     public <T> T[] toArray(T[] a) {
         return queue.toArray(a);
     }
 
-    /*
-     * (non-Javadoc)
-     * @see java.util.Collection#containsAll(java.util.Collection)
-     */
     public boolean containsAll(Collection<?> c) {
         return queue.containsAll(c);
     }
 
-    /*
-     * (non-Javadoc)
-     * @see java.util.Collection#addAll(java.util.Collection)
-     */
     public boolean addAll(Collection<? extends MessageEvent> c) {
         return queue.addAll(c);
     }
 
-    /*
-     * (non-Javadoc)
-     * @see java.util.Collection#removeAll(java.util.Collection)
-     */
     public boolean removeAll(Collection<?> c) {
         return queue.removeAll(c);
     }
 
-    /*
-     * (non-Javadoc)
-     * @see java.util.Collection#retainAll(java.util.Collection)
-     */
     public boolean retainAll(Collection<?> c) {
         return queue.retainAll(c);
     }
 
-    /*
-     * (non-Javadoc)
-     * @see java.util.Collection#clear()
-     */
     public void clear() {
         queue.clear();        
     }
 
-    /*
-     * (non-Javadoc)
-     * @see java.util.concurrent.BlockingQueue#add(java.lang.Object)
-     */
     public boolean add(MessageEvent e) {
         return queue.add(e);
     }
 
-    /*
-     * (non-Javadoc)
-     * @see java.util.concurrent.BlockingQueue#put(java.lang.Object)
-     */
     public void put(MessageEvent e) throws InterruptedException {
         queue.put(e);
     }
 
-    /*
-     * (non-Javadoc)
-     * @see java.util.concurrent.BlockingQueue#offer(java.lang.Object, long, java.util.concurrent.TimeUnit)
-     */
     public boolean offer(MessageEvent e, long timeout, TimeUnit unit) throws InterruptedException {
         return queue.offer(e, timeout, unit);
     }
 
-    /*
-     * (non-Javadoc)
-     * @see java.util.concurrent.BlockingQueue#take()
-     */
     public MessageEvent take() throws InterruptedException {
         return queue.take();
     }
 
-    /*
-     * (non-Javadoc)
-     * @see java.util.concurrent.BlockingQueue#poll(long, java.util.concurrent.TimeUnit)
-     */
     public MessageEvent poll(long timeout, TimeUnit unit) throws InterruptedException {
         return queue.poll(timeout, unit);
     }
 
-    /*
-     * (non-Javadoc)
-     * @see java.util.concurrent.BlockingQueue#remainingCapacity()
-     */
     public int remainingCapacity() {
         return queue.remainingCapacity();
     }
 
-    /*
-     * (non-Javadoc)
-     * @see java.util.concurrent.BlockingQueue#remove(java.lang.Object)
-     */
     public boolean remove(Object o) {
         return queue.remove(o);
     }
 
-    /*
-     * (non-Javadoc)
-     * @see java.util.concurrent.BlockingQueue#contains(java.lang.Object)
-     */
     public boolean contains(Object o) {
         return queue.contains(o);
     }
 
-    /*
-     * (non-Javadoc)
-     * @see java.util.concurrent.BlockingQueue#drainTo(java.util.Collection)
-     */
     public int drainTo(Collection<? super MessageEvent> c) {
         return queue.drainTo(c);
     }
 
-    /*
-     * (non-Javadoc)
-     * @see java.util.concurrent.BlockingQueue#drainTo(java.util.Collection, int)
-     */
     public int drainTo(Collection<? super MessageEvent> c, int maxElements) {
         return queue.drainTo(c, maxElements);
     }
-  
 }

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

@@ -24,8 +24,6 @@ import org.jboss.netty.channel.ChannelFactory;
 import org.jboss.netty.channel.ChannelPipeline;
 import org.jboss.netty.channel.ChannelSink;
 
-/**
- */
 final class NioAcceptedSocketChannel extends NioSocketChannel {
 
     final Thread bossThread;

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

@@ -28,8 +28,6 @@ import org.jboss.netty.channel.ChannelSink;
 import org.jboss.netty.logging.InternalLogger;
 import org.jboss.netty.logging.InternalLoggerFactory;
 
-/**
- */
 final class NioClientSocketChannel extends NioSocketChannel {
 
     private static final InternalLogger logger =

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

@@ -46,8 +46,6 @@ import org.jboss.netty.util.ThreadRenamingRunnable;
 import org.jboss.netty.util.internal.DeadLockProofWorker;
 import org.jboss.netty.util.internal.QueueFactory;
 
-/**
- */
 class NioClientSocketPipelineSink extends AbstractChannelSink {
 
     static final InternalLogger logger =

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

@@ -306,7 +306,7 @@ class NioDatagramChannel extends AbstractChannel
 
     /**
      * WriteTask is a simple runnable performs writes by delegating the {@link NioDatagramWorker}.
- */
+     */
     private final class WriteTask implements Runnable {
         WriteTask() {
             super();

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

@@ -837,7 +837,7 @@ class NioDatagramWorker implements Runnable {
         /**
          * This runnable's task. Does the actual registering by calling the
          * underlying DatagramChannels peer DatagramSocket register method.
- */
+         */
         public void run() {
             final SocketAddress localAddress = channel.getLocalAddress();
             if (localAddress == null) {

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

@@ -34,8 +34,6 @@ import org.jboss.netty.channel.socket.ServerSocketChannelConfig;
 import org.jboss.netty.logging.InternalLogger;
 import org.jboss.netty.logging.InternalLoggerFactory;
 
-/**
- */
 class NioServerSocketChannel extends AbstractServerChannel
                              implements org.jboss.netty.channel.socket.ServerSocketChannel {
 

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

@@ -42,8 +42,6 @@ import org.jboss.netty.logging.InternalLoggerFactory;
 import org.jboss.netty.util.ThreadRenamingRunnable;
 import org.jboss.netty.util.internal.DeadLockProofWorker;
 
-/**
- */
 class NioServerSocketPipelineSink extends AbstractChannelSink {
 
     static final InternalLogger logger =

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

@@ -35,8 +35,6 @@ import org.jboss.netty.channel.MessageEvent;
 import org.jboss.netty.channel.socket.nio.SocketSendBufferPool.SendBuffer;
 import org.jboss.netty.util.internal.ThreadLocalBoolean;
 
-/**
- */
 class NioSocketChannel extends AbstractChannel
                                 implements org.jboss.netty.channel.socket.SocketChannel {
 

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

@@ -50,8 +50,6 @@ import org.jboss.netty.util.ThreadRenamingRunnable;
 import org.jboss.netty.util.internal.DeadLockProofWorker;
 import org.jboss.netty.util.internal.QueueFactory;
 
-/**
- */
 class NioWorker implements Runnable {
 
     private static final InternalLogger logger =

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

@@ -22,8 +22,6 @@ import java.nio.channels.Selector;
 import org.jboss.netty.logging.InternalLogger;
 import org.jboss.netty.logging.InternalLoggerFactory;
 
-/**
- */
 final class SelectorUtil {
     private static final InternalLogger logger =
         InternalLoggerFactory.getInstance(SelectorUtil.class);

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

@@ -18,8 +18,6 @@ package org.jboss.netty.channel.socket.nio;
 import java.lang.ref.SoftReference;
 import java.nio.ByteBuffer;
 
-/**
- */
 final class SocketReceiveBufferPool {
 
     private static final int POOL_SIZE = 8;

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

@@ -26,8 +26,6 @@ import org.jboss.netty.buffer.ChannelBuffer;
 import org.jboss.netty.channel.DefaultFileRegion;
 import org.jboss.netty.channel.FileRegion;
 
-/**
- */
 final class SocketSendBufferPool {
 
     private static final SendBuffer EMPTY_BUFFER = new EmptySendBuffer();

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

@@ -29,8 +29,6 @@ import org.jboss.netty.channel.ChannelFactory;
 import org.jboss.netty.channel.ChannelPipeline;
 import org.jboss.netty.channel.ChannelSink;
 
-/**
- */
 class OioAcceptedSocketChannel extends OioSocketChannel {
 
     private final PushbackInputStream in;

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

@@ -25,8 +25,6 @@ import org.jboss.netty.channel.ChannelFactory;
 import org.jboss.netty.channel.ChannelPipeline;
 import org.jboss.netty.channel.ChannelSink;
 
-/**
- */
 class OioClientSocketChannel extends OioSocketChannel {
 
     volatile PushbackInputStream in;

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

@@ -32,8 +32,6 @@ import org.jboss.netty.channel.MessageEvent;
 import org.jboss.netty.util.ThreadRenamingRunnable;
 import org.jboss.netty.util.internal.DeadLockProofWorker;
 
-/**
- */
 class OioClientSocketPipelineSink extends AbstractChannelSink {
 
     private final Executor workerExecutor;

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

@@ -35,8 +35,6 @@ import org.jboss.netty.channel.socket.DatagramChannel;
 import org.jboss.netty.channel.socket.DatagramChannelConfig;
 import org.jboss.netty.channel.socket.DefaultDatagramChannelConfig;
 
-/**
- */
 final class OioDatagramChannel extends AbstractChannel
                                 implements DatagramChannel {
 

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

@@ -31,8 +31,6 @@ import org.jboss.netty.channel.MessageEvent;
 import org.jboss.netty.util.ThreadRenamingRunnable;
 import org.jboss.netty.util.internal.DeadLockProofWorker;
 
-/**
- */
 class OioDatagramPipelineSink extends AbstractChannelSink {
 
     private final Executor workerExecutor;

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

@@ -28,8 +28,6 @@ import org.jboss.netty.channel.Channel;
 import org.jboss.netty.channel.ChannelFuture;
 import org.jboss.netty.channel.ReceiveBufferSizePredictor;
 
-/**
- */
 class OioDatagramWorker implements Runnable {
 
     private final OioDatagramChannel channel;

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

@@ -34,8 +34,6 @@ import org.jboss.netty.channel.socket.ServerSocketChannelConfig;
 import org.jboss.netty.logging.InternalLogger;
 import org.jboss.netty.logging.InternalLoggerFactory;
 
-/**
- */
 class OioServerSocketChannel extends AbstractServerChannel
                              implements ServerSocketChannel {
 

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

@@ -36,8 +36,6 @@ import org.jboss.netty.logging.InternalLoggerFactory;
 import org.jboss.netty.util.ThreadRenamingRunnable;
 import org.jboss.netty.util.internal.DeadLockProofWorker;
 
-/**
- */
 class OioServerSocketPipelineSink extends AbstractChannelSink {
 
     static final InternalLogger logger =

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

@@ -31,8 +31,6 @@ import org.jboss.netty.channel.socket.DefaultSocketChannelConfig;
 import org.jboss.netty.channel.socket.SocketChannel;
 import org.jboss.netty.channel.socket.SocketChannelConfig;
 
-/**
- */
 abstract class OioSocketChannel extends AbstractChannel
                                 implements SocketChannel {
 

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

@@ -31,8 +31,6 @@ import org.jboss.netty.channel.ChannelFuture;
 import org.jboss.netty.channel.DefaultFileRegion;
 import org.jboss.netty.channel.FileRegion;
 
-/**
- */
 class OioWorker implements Runnable {
 
     private static final Pattern SOCKET_CLOSED_MESSAGE = Pattern.compile(

src/main/java/org/jboss/netty/example/discard/DiscardClient.java

@@ -50,8 +50,6 @@ public class DiscardClient {
         }
         
         new DiscardClient(host, port, firstMessageSize).run();
-
-
     }
     
     private final String host;

src/main/java/org/jboss/netty/example/discard/DiscardServer.java

@@ -31,7 +31,6 @@ public class DiscardServer {
 
     public static void main(String[] args) throws Exception {
         new DiscardServer().run();
-
     }
 
     public void run() {

src/main/java/org/jboss/netty/example/echo/EchoServer.java

@@ -31,7 +31,6 @@ public class EchoServer {
 
     public static void main(String[] args) throws Exception {
         new EchoServer().run();
-
     }
 
     public void run() {

src/main/java/org/jboss/netty/example/factorial/FactorialServer.java

@@ -29,7 +29,6 @@ public class FactorialServer {
 
     public static void main(String[] args) throws Exception {
         new FactorialServer().run();
-
     }
 
     public void run() {

src/main/java/org/jboss/netty/example/http/file/HttpStaticFileServer.java

@@ -21,8 +21,6 @@ import java.util.concurrent.Executors;
 import org.jboss.netty.bootstrap.ServerBootstrap;
 import org.jboss.netty.channel.socket.nio.NioServerSocketChannelFactory;
 
-/**
- */
 public class HttpStaticFileServer {
     public static void main(String[] args) {
         // Configure the server.

src/main/java/org/jboss/netty/example/http/file/HttpStaticFileServerHandler.java

@@ -48,6 +48,50 @@ import org.jboss.netty.handler.stream.ChunkedFile;
 import org.jboss.netty.util.CharsetUtil;
 
 /**
+ * A simple handler that serves incoming HTTP requests to send their respective
+ * HTTP responses.  It also implements {@code 'If-Modified-Since'} header to
+ * take advantage of browser cache, as described in
+ * <a href="http://tools.ietf.org/html/rfc2616#section-14.25">RFC 2616</a>.
+ *
+ * <h3>How Browser Caching Works</h3>
+ *
+ * Web browser caching works with HTTP headers as illustrated by the following
+ * sample:
+ * <ol>
+ * <li>Request #1 returns the content of <code>/file1.txt</code>.</li>
+ * <li>Contents of <code>/file1.txt</code> is cached by the browser.</li>
+ * <li>Request #2 for <code>/file1.txt</code> does return the contents of the
+ *     file again. Rather, a 304 Not Modified is returned. This tells the
+ *     browser to use the contents stored in its cache.</li>
+ * <li>The server knows the file has not been modified because the
+ *     <code>If-Modified-Since</code> date is the same as the file's last
+ *     modified date.</li>
+ * </ol>
+ *
+ * <pre>
+ * Request #1 Headers
+ * ===================
+ * GET /file1.txt HTTP/1.1
+ *
+ * Response #1 Headers
+ * ===================
+ * HTTP/1.1 200 OK
+ * Date:               Tue, 01 Mar 2011 22:44:26 GMT
+ * Last-Modified:      Wed, 30 Jun 2010 21:36:48 GMT
+ * Expires:            Tue, 01 Mar 2012 22:44:26 GMT
+ * Cache-Control:      private, max-age=31536000
+ *
+ * Request #2 Headers
+ * ===================
+ * GET /file1.txt HTTP/1.1
+ * If-Modified-Since:  Wed, 30 Jun 2010 21:36:48 GMT
+ *
+ * Response #2 Headers
+ * ===================
+ * HTTP/1.1 304 Not Modified
+ * Date:               Tue, 01 Mar 2011 22:44:28 GMT
+ *
+ * </pre>
  */
 public class HttpStaticFileServerHandler extends SimpleChannelUpstreamHandler {
 

src/main/java/org/jboss/netty/example/http/file/HttpStaticFileServerPipelineFactory.java

@@ -24,8 +24,6 @@ import org.jboss.netty.handler.codec.http.HttpRequestDecoder;
 import org.jboss.netty.handler.codec.http.HttpResponseEncoder;
 import org.jboss.netty.handler.stream.ChunkedWriteHandler;
 
-/**
- */
 public class HttpStaticFileServerPipelineFactory implements ChannelPipelineFactory {
     public ChannelPipeline getPipeline() throws Exception {
         // Create a default pipeline implementation.

src/main/java/org/jboss/netty/example/http/snoop/HttpClientPipelineFactory.java

@@ -26,8 +26,6 @@ import org.jboss.netty.handler.codec.http.HttpClientCodec;
 import org.jboss.netty.handler.codec.http.HttpContentDecompressor;
 import org.jboss.netty.handler.ssl.SslHandler;
 
-/**
- */
 public class HttpClientPipelineFactory implements ChannelPipelineFactory {
 
     private final boolean ssl;

src/main/java/org/jboss/netty/example/http/snoop/HttpRequestHandler.java

@@ -44,8 +44,6 @@ import org.jboss.netty.handler.codec.http.HttpResponse;
 import org.jboss.netty.handler.codec.http.QueryStringDecoder;
 import org.jboss.netty.util.CharsetUtil;
 
-/**
- */
 public class HttpRequestHandler extends SimpleChannelUpstreamHandler {
 
     private HttpRequest request;

src/main/java/org/jboss/netty/example/http/snoop/HttpResponseHandler.java

@@ -23,8 +23,6 @@ import org.jboss.netty.handler.codec.http.HttpChunk;
 import org.jboss.netty.handler.codec.http.HttpResponse;
 import org.jboss.netty.util.CharsetUtil;
 
-/**
- */
 public class HttpResponseHandler extends SimpleChannelUpstreamHandler {
 
     private boolean readingChunks;

src/main/java/org/jboss/netty/example/http/snoop/HttpServerPipelineFactory.java

@@ -23,8 +23,6 @@ import org.jboss.netty.handler.codec.http.HttpContentCompressor;
 import org.jboss.netty.handler.codec.http.HttpRequestDecoder;
 import org.jboss.netty.handler.codec.http.HttpResponseEncoder;
 
-/**
- */
 public class HttpServerPipelineFactory implements ChannelPipelineFactory {
     public ChannelPipeline getPipeline() throws Exception {
         // Create a default pipeline implementation.

src/main/java/org/jboss/netty/example/local/LocalExample.java

@@ -33,8 +33,6 @@ import org.jboss.netty.handler.codec.string.StringEncoder;
 import org.jboss.netty.handler.logging.LoggingHandler;
 import org.jboss.netty.logging.InternalLogLevel;
 
-/**
- */
 public class LocalExample {
     public static void main(String[] args) throws Exception {
         // Address to bind on / connect to.

src/main/java/org/jboss/netty/example/local/LocalExampleMultthreaded.java

@@ -32,8 +32,6 @@ import org.jboss.netty.handler.execution.OrderedMemoryAwareThreadPoolExecutor;
 import org.jboss.netty.handler.logging.LoggingHandler;
 import org.jboss.netty.logging.InternalLogLevel;
 
-/**
- */
 public class LocalExampleMultthreaded {
 
     public static void main(String[] args) throws Exception {

src/main/java/org/jboss/netty/example/local/LocalServerPipelineFactory.java

@@ -29,8 +29,6 @@ import org.jboss.netty.handler.codec.string.StringDecoder;
 import org.jboss.netty.handler.codec.string.StringEncoder;
 import org.jboss.netty.handler.execution.ExecutionHandler;
 
-/**
- */
 public class LocalServerPipelineFactory implements ChannelPipelineFactory {
 
     private final ExecutionHandler executionHandler;

src/main/java/org/jboss/netty/example/localtime/LocalTimeClientHandler.java

@@ -37,8 +37,6 @@ import org.jboss.netty.example.localtime.LocalTimeProtocol.LocalTimes;
 import org.jboss.netty.example.localtime.LocalTimeProtocol.Location;
 import org.jboss.netty.example.localtime.LocalTimeProtocol.Locations;
 
-/**
- */
 public class LocalTimeClientHandler extends SimpleChannelUpstreamHandler {
 
     private static final Logger logger = Logger.getLogger(

src/main/java/org/jboss/netty/example/localtime/LocalTimeClientPipelineFactory.java

@@ -24,8 +24,6 @@ import org.jboss.netty.handler.codec.protobuf.ProtobufEncoder;
 import org.jboss.netty.handler.codec.protobuf.ProtobufVarint32FrameDecoder;
 import org.jboss.netty.handler.codec.protobuf.ProtobufVarint32LengthFieldPrepender;
 
-/**
- */
 public class LocalTimeClientPipelineFactory implements ChannelPipelineFactory {
 
     public ChannelPipeline getPipeline() throws Exception {

src/main/java/org/jboss/netty/example/localtime/LocalTimeServerHandler.java

@@ -35,8 +35,6 @@ import org.jboss.netty.example.localtime.LocalTimeProtocol.LocalTimes;
 import org.jboss.netty.example.localtime.LocalTimeProtocol.Location;
 import org.jboss.netty.example.localtime.LocalTimeProtocol.Locations;
 
-/**
- */
 public class LocalTimeServerHandler extends SimpleChannelUpstreamHandler {
 
     private static final Logger logger = Logger.getLogger(

src/main/java/org/jboss/netty/example/localtime/LocalTimeServerPipelineFactory.java

@@ -24,8 +24,6 @@ import org.jboss.netty.handler.codec.protobuf.ProtobufEncoder;
 import org.jboss.netty.handler.codec.protobuf.ProtobufVarint32FrameDecoder;
 import org.jboss.netty.handler.codec.protobuf.ProtobufVarint32LengthFieldPrepender;
 
-/**
- */
 public class LocalTimeServerPipelineFactory implements ChannelPipelineFactory {
 
     public ChannelPipeline getPipeline() throws Exception {

src/main/java/org/jboss/netty/example/proxy/HexDumpProxy.java

@@ -24,8 +24,6 @@ import org.jboss.netty.channel.socket.ClientSocketChannelFactory;
 import org.jboss.netty.channel.socket.nio.NioClientSocketChannelFactory;
 import org.jboss.netty.channel.socket.nio.NioServerSocketChannelFactory;
 
-/**
- */
 public class HexDumpProxy {
 
     public static void main(String[] args) throws Exception {

src/main/java/org/jboss/netty/example/proxy/HexDumpProxyInboundHandler.java

@@ -30,8 +30,6 @@ import org.jboss.netty.channel.MessageEvent;
 import org.jboss.netty.channel.SimpleChannelUpstreamHandler;
 import org.jboss.netty.channel.socket.ClientSocketChannelFactory;
 
-/**
- */
 public class HexDumpProxyInboundHandler extends SimpleChannelUpstreamHandler {
 
     private final ClientSocketChannelFactory cf;

src/main/java/org/jboss/netty/example/proxy/HexDumpProxyPipelineFactory.java

@@ -21,8 +21,6 @@ import org.jboss.netty.channel.ChannelPipeline;
 import org.jboss.netty.channel.ChannelPipelineFactory;
 import org.jboss.netty.channel.socket.ClientSocketChannelFactory;
 
-/**
- */
 public class HexDumpProxyPipelineFactory implements ChannelPipelineFactory {
 
     private final ClientSocketChannelFactory cf;

src/main/java/org/jboss/netty/example/qotm/QuoteOfTheMomentClientHandler.java

@@ -20,8 +20,6 @@ import org.jboss.netty.channel.ExceptionEvent;
 import org.jboss.netty.channel.MessageEvent;
 import org.jboss.netty.channel.SimpleChannelUpstreamHandler;
 
-/**
- */
 public class QuoteOfTheMomentClientHandler extends SimpleChannelUpstreamHandler {
 
     @Override

src/main/java/org/jboss/netty/example/qotm/QuoteOfTheMomentServerHandler.java

@@ -22,8 +22,6 @@ import org.jboss.netty.channel.ExceptionEvent;
 import org.jboss.netty.channel.MessageEvent;
 import org.jboss.netty.channel.SimpleChannelUpstreamHandler;
 
-/**
- */
 public class QuoteOfTheMomentServerHandler extends SimpleChannelUpstreamHandler {
 
     private static final Random random = new Random();

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

@@ -105,8 +105,6 @@ public class SecureChatServerHandler extends SimpleChannelUpstreamHandler {
         e.getChannel().close();
     }
 
-    /**
-     */
     private static final class Greeter implements ChannelFutureListener {
 
         private final SslHandler sslHandler;

src/main/java/org/jboss/netty/handler/codec/embedder/EmbeddedSocketAddress.java

@@ -17,8 +17,6 @@ package org.jboss.netty.handler.codec.embedder;
 
 import java.net.SocketAddress;
 
-/**
- */
 class EmbeddedSocketAddress extends SocketAddress {
     private static final long serialVersionUID = 1400788804624980619L;
 

src/main/java/org/jboss/netty/handler/codec/frame/LengthFieldBasedFrameDecoder.java

@@ -206,7 +206,7 @@ public class LengthFieldBasedFrameDecoder extends FrameDecoder {
      *        the offset of the length field
      * @param lengthFieldLength
      *        the length of the length field
- */
+     */
     public LengthFieldBasedFrameDecoder(
             int maxFrameLength,
             int lengthFieldOffset, int lengthFieldLength) {

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

@@ -18,8 +18,6 @@ package org.jboss.netty.handler.codec.http;
 import java.io.Serializable;
 import java.util.Comparator;
 
-/**
- */
 final class CaseIgnoringComparator implements Comparator<String>, Serializable {
 
     private static final long serialVersionUID = 4582133183775373862L;

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

@@ -19,8 +19,6 @@ import java.text.SimpleDateFormat;
 import java.util.Locale;
 import java.util.TimeZone;
 
-/**
- */
 final class CookieDateFormat extends SimpleDateFormat {
 
     private static final long serialVersionUID = 1789486337887402640L;

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

@@ -15,8 +15,6 @@
  */
 package org.jboss.netty.handler.codec.http;
 
-/**
- */
 final class CookieHeaderNames {
     static final String PATH = "Path";
 

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

@@ -35,7 +35,7 @@ public interface HttpChunkTrailer extends HttpChunk {
      * header name, the first value is returned.
      *
      * @return the header value or {@code null} if there is no such header
- */
+     */
     String getHeader(String name);
 
     /**

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

@@ -20,8 +20,6 @@ import java.util.List;
 
 import org.jboss.netty.util.CharsetUtil;
 
-/**
- */
 final class HttpCodecUtil {
     //space ' '
     static final byte SP = 32;

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

@@ -38,7 +38,7 @@ public interface HttpMessage {
      * value is returned.
      *
      * @return the header value or {@code null} if there is no such header
- */
+     */
     String getHeader(String name);
 
     /**

src/main/java/org/jboss/netty/handler/codec/replay/ReplayError.java

@@ -16,8 +16,6 @@
 package org.jboss.netty.handler.codec.replay;
 
 
-/**
- */
 class ReplayError extends Error {
 
     private static final long serialVersionUID = 2666698631187527681L;

src/main/java/org/jboss/netty/handler/codec/replay/ReplayingDecoderBuffer.java

@@ -29,8 +29,6 @@ import org.jboss.netty.buffer.ChannelBufferFactory;
 import org.jboss.netty.buffer.ChannelBufferIndexFinder;
 import org.jboss.netty.buffer.ChannelBuffers;
 
-/**
- */
 class ReplayingDecoderBuffer implements ChannelBuffer {
 
     private static final Error REPLAY = new ReplayError();

src/main/java/org/jboss/netty/handler/codec/replay/UnsafeDynamicChannelBuffer.java

@@ -18,8 +18,6 @@ package org.jboss.netty.handler.codec.replay;
 import org.jboss.netty.buffer.ChannelBufferFactory;
 import org.jboss.netty.buffer.DynamicChannelBuffer;
 
-/**
- */
 class UnsafeDynamicChannelBuffer extends DynamicChannelBuffer {
 
     UnsafeDynamicChannelBuffer(ChannelBufferFactory factory) {

src/main/java/org/jboss/netty/handler/codec/rtsp/RtspHeaders.java

@@ -27,7 +27,7 @@ public final class RtspHeaders {
 
     /**
      * Standard RTSP header names.
- */
+     */
     public static final class Names {
         /**
          * {@code "Accept"}
@@ -213,7 +213,7 @@ public final class RtspHeaders {
 
     /**
      * Standard RTSP header values.
- */
+     */
     public static final class Values {
         /**
          * {@code "append"}

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

@@ -22,8 +22,6 @@ import java.io.ObjectInputStream;
 import java.io.ObjectStreamClass;
 import java.io.StreamCorruptedException;
 
-/**
- */
 class CompactObjectInputStream extends ObjectInputStream {
     
     private final ClassResolver classResolver;

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

@@ -21,8 +21,6 @@ import java.io.ObjectStreamClass;
 import java.io.OutputStream;
 import java.io.Serializable;
 
-/**
- */
 class CompactObjectOutputStream extends ObjectOutputStream {
 
     static final int TYPE_FAT_DESCRIPTOR = 0;

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

@@ -15,8 +15,6 @@
  */
 package org.jboss.netty.handler.codec.serialization;
 
-/**
- */
 enum CompatibleObjectDecoderState {
     READ_HEADER,
     READ_OBJECT,

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

@@ -98,6 +98,7 @@ public class ObjectDecoder extends LengthFieldBasedFrameDecoder {
 
     /**
      * Create a new decoder with the specified maximum object size and the {@link ClassLoader} wrapped in {@link ClassResolvers#weakCachingResolver(ClassLoader)}
+     *
      * @param maxObjectSize  the maximum byte length of the serialized object.
      *                       if the length of the received object is greater
      *                       than this value, {@link StreamCorruptedException}

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

@@ -281,15 +281,11 @@ public class OrderedMemoryAwareThreadPoolExecutor extends
 
     private final class ChildExecutor implements Executor, Runnable {
         private final Queue<Runnable> tasks = QueueFactory.createQueue(Runnable.class);
-        private final AtomicBoolean isRunning = new AtomicBoolean(false);
+        private final AtomicBoolean isRunning = new AtomicBoolean();
         
         ChildExecutor() {
         }
 
-        /*
-         * (non-Javadoc)
-         * @see java.util.concurrent.Executor#execute(java.lang.Runnable)
-         */
         public void execute(Runnable command) {
             // TODO: What todo if the add return false ?
             tasks.add(command);
@@ -300,10 +296,6 @@ public class OrderedMemoryAwareThreadPoolExecutor extends
             }
         }
 
-        /*
-         * (non-Javadoc)
-         * @see java.lang.Runnable#run()
-         */
         public void run() {
             // check if its already running by using CAS. If so just return here. So in the worst case the thread
             // is executed and do nothing

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

@@ -199,17 +199,11 @@ public class SslHandler extends FrameDecoder
     private volatile boolean issueHandshake;
     
     private static final ChannelFutureListener HANDSHAKE_LISTENER = new ChannelFutureListener() {
-
-        /*
-         * (non-Javadoc)
-         * @see org.jboss.netty.channel.ChannelFutureListener#operationComplete(org.jboss.netty.channel.ChannelFuture)
-         */
         public void operationComplete(ChannelFuture future) throws Exception {
             if (!future.isSuccess()) {
                 Channels.fireExceptionCaught(future.getChannel(), future.getCause());
             }
         }
-
     };
     
     /**
@@ -435,7 +429,7 @@ public class SslHandler extends FrameDecoder
      * Enables or disables the automatic handshake once the {@link Channel} is
      * connected. The value will only have affect if its set before the
      * {@link Channel} is connected.
- */
+     */
     public void setIssueHandshake(boolean issueHandshake) {
         this.issueHandshake = issueHandshake;
     }

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

@@ -187,8 +187,6 @@ public class WriteTimeoutHandler extends SimpleChannelDownstreamHandler
         }
     }
 
-    /**
-     */
     private static final class TimeoutCanceller implements ChannelFutureListener {
         private final Timeout timeout;
 

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

@@ -15,8 +15,6 @@
  */
 package org.jboss.netty.logging;
 
-
-
 /**
  * Logger factory which creates an
  * <a href="http://logging.apache.org/log4j/1.2/index.html">Apache Log4J</a>

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

@@ -20,9 +20,6 @@ import java.util.concurrent.atomic.AtomicInteger;
 
 /**
  * Utility which checks if {@value #UNSAFE} class can be found in the classpath
- *
-
-
  */
 public final class UnsafeDetectUtil {
 

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

@@ -18,8 +18,6 @@ package org.jboss.netty.util.internal;
 import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
 import java.util.concurrent.atomic.AtomicReferenceFieldUpdater;
 
-/**
- */
 final class AtomicFieldUpdaterUtil {
 
     private static final boolean AVAILABLE;

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

@@ -32,6 +32,7 @@ import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
 import java.util.concurrent.atomic.AtomicReferenceFieldUpdater;
 import java.util.concurrent.locks.LockSupport;
+
 /**
  * <strong>
  * This version does work even if sun.misc.Unsafe is not found in the classpath. So this is kept for compatibility reasons.

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

@@ -20,8 +20,6 @@ import java.util.concurrent.locks.AbstractQueuedSynchronizer;
 import java.util.concurrent.locks.Condition;
 import java.util.concurrent.locks.Lock;
 
-/**
- */
 public final class NonReentrantLock extends AbstractQueuedSynchronizer
                              implements Lock {
 

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

@@ -21,10 +21,8 @@ import java.util.concurrent.BlockingQueue;
 import org.jboss.netty.util.UnsafeDetectUtil;
 
 /**
- * This factory should be used to create the "optimal" {@link BlockingQueue} instance for the running JVM. 
+ * This factory should be used to create the "optimal" {@link BlockingQueue}
- *
+ * instance for the running JVM.
-
-
  */
 public final class QueueFactory {
     

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

@@ -17,8 +17,6 @@ package org.jboss.netty.util.internal;
 
 import java.util.Iterator;
 
-/**
- */
 public interface ReusableIterator<E> extends Iterator<E> {
     void rewind();
 }

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

@@ -15,8 +15,6 @@
  */
 package org.jboss.netty.util.internal;
 
-/**
- */
 public class ThreadLocalBoolean extends ThreadLocal<Boolean> {
 
     private final boolean defaultValue;

src/main/java/org/jboss/netty/util/internal/jzlib/Adler32.java

@@ -13,7 +13,33 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
+/*
+Copyright (c) 2000,2001,2002,2003 ymnk, JCraft,Inc. All rights reserved.
 
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+  1. Redistributions of source code must retain the above copyright notice,
+     this list of conditions and the following disclaimer.
+
+  2. Redistributions in binary form must reproduce the above copyright
+     notice, this list of conditions and the following disclaimer in
+     the documentation and/or other materials provided with the distribution.
+
+  3. The names of the authors may not be used to endorse or promote products
+     derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
+INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JCRAFT,
+INC. OR ANY CONTRIBUTORS TO THIS SOFTWARE BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
 /*
  * This program is based on zlib-1.1.3, so all credit should go authors
  * Jean-loup Gailly(jloup@gzip.org) and Mark Adler(madler@alumni.caltech.edu)

src/main/java/org/jboss/netty/util/internal/jzlib/CRC32.java

@@ -13,6 +13,38 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
+/*
+Copyright (c) 2000,2001,2002,2003 ymnk, JCraft,Inc. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+  1. Redistributions of source code must retain the above copyright notice,
+     this list of conditions and the following disclaimer.
+
+  2. Redistributions in binary form must reproduce the above copyright
+     notice, this list of conditions and the following disclaimer in
+     the documentation and/or other materials provided with the distribution.
+
+  3. The names of the authors may not be used to endorse or promote products
+     derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
+INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JCRAFT,
+INC. OR ANY CONTRIBUTORS TO THIS SOFTWARE BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/*
+ * This program is based on zlib-1.1.3, so all credit should go authors
+ * Jean-loup Gailly(jloup@gzip.org) and Mark Adler(madler@alumni.caltech.edu)
+ * and contributors of zlib.
+ */
 package org.jboss.netty.util.internal.jzlib;
 
 final class CRC32 {

src/main/java/org/jboss/netty/util/internal/jzlib/Deflate.java

@@ -13,13 +13,38 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
+/*
+Copyright (c) 2000,2001,2002,2003 ymnk, JCraft,Inc. All rights reserved.
 
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+  1. Redistributions of source code must retain the above copyright notice,
+     this list of conditions and the following disclaimer.
+
+  2. Redistributions in binary form must reproduce the above copyright
+     notice, this list of conditions and the following disclaimer in
+     the documentation and/or other materials provided with the distribution.
+
+  3. The names of the authors may not be used to endorse or promote products
+     derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
+INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JCRAFT,
+INC. OR ANY CONTRIBUTORS TO THIS SOFTWARE BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
 /*
  * This program is based on zlib-1.1.3, so all credit should go authors
  * Jean-loup Gailly(jloup@gzip.org) and Mark Adler(madler@alumni.caltech.edu)
  * and contributors of zlib.
  */
-
 package org.jboss.netty.util.internal.jzlib;
 
 import org.jboss.netty.util.internal.jzlib.JZlib.WrapperType;

src/main/java/org/jboss/netty/util/internal/jzlib/InfBlocks.java

@@ -13,13 +13,38 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
+/*
+Copyright (c) 2000,2001,2002,2003 ymnk, JCraft,Inc. All rights reserved.
 
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+  1. Redistributions of source code must retain the above copyright notice,
+     this list of conditions and the following disclaimer.
+
+  2. Redistributions in binary form must reproduce the above copyright
+     notice, this list of conditions and the following disclaimer in
+     the documentation and/or other materials provided with the distribution.
+
+  3. The names of the authors may not be used to endorse or promote products
+     derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
+INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JCRAFT,
+INC. OR ANY CONTRIBUTORS TO THIS SOFTWARE BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
 /*
  * This program is based on zlib-1.1.3, so all credit should go authors
  * Jean-loup Gailly(jloup@gzip.org) and Mark Adler(madler@alumni.caltech.edu)
  * and contributors of zlib.
  */
-
 package org.jboss.netty.util.internal.jzlib;
 
 final class InfBlocks {

src/main/java/org/jboss/netty/util/internal/jzlib/InfCodes.java

@@ -13,13 +13,38 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
+/*
+Copyright (c) 2000,2001,2002,2003 ymnk, JCraft,Inc. All rights reserved.
 
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+  1. Redistributions of source code must retain the above copyright notice,
+     this list of conditions and the following disclaimer.
+
+  2. Redistributions in binary form must reproduce the above copyright
+     notice, this list of conditions and the following disclaimer in
+     the documentation and/or other materials provided with the distribution.
+
+  3. The names of the authors may not be used to endorse or promote products
+     derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
+INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JCRAFT,
+INC. OR ANY CONTRIBUTORS TO THIS SOFTWARE BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
 /*
  * This program is based on zlib-1.1.3, so all credit should go authors
  * Jean-loup Gailly(jloup@gzip.org) and Mark Adler(madler@alumni.caltech.edu)
  * and contributors of zlib.
  */
-
 package org.jboss.netty.util.internal.jzlib;
 
 final class InfCodes {

src/main/java/org/jboss/netty/util/internal/jzlib/InfTree.java

@@ -13,13 +13,38 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
+/*
+Copyright (c) 2000,2001,2002,2003 ymnk, JCraft,Inc. All rights reserved.
 
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+  1. Redistributions of source code must retain the above copyright notice,
+     this list of conditions and the following disclaimer.
+
+  2. Redistributions in binary form must reproduce the above copyright
+     notice, this list of conditions and the following disclaimer in
+     the documentation and/or other materials provided with the distribution.
+
+  3. The names of the authors may not be used to endorse or promote products
+     derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
+INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JCRAFT,
+INC. OR ANY CONTRIBUTORS TO THIS SOFTWARE BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
 /*
  * This program is based on zlib-1.1.3, so all credit should go authors
  * Jean-loup Gailly(jloup@gzip.org) and Mark Adler(madler@alumni.caltech.edu)
  * and contributors of zlib.
  */
-
 package org.jboss.netty.util.internal.jzlib;
 
 final class InfTree {

src/main/java/org/jboss/netty/util/internal/jzlib/Inflate.java

@@ -13,13 +13,38 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
+/*
+Copyright (c) 2000,2001,2002,2003 ymnk, JCraft,Inc. All rights reserved.
 
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+  1. Redistributions of source code must retain the above copyright notice,
+     this list of conditions and the following disclaimer.
+
+  2. Redistributions in binary form must reproduce the above copyright
+     notice, this list of conditions and the following disclaimer in
+     the documentation and/or other materials provided with the distribution.
+
+  3. The names of the authors may not be used to endorse or promote products
+     derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
+INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JCRAFT,
+INC. OR ANY CONTRIBUTORS TO THIS SOFTWARE BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
 /*
  * This program is based on zlib-1.1.3, so all credit should go authors
  * Jean-loup Gailly(jloup@gzip.org) and Mark Adler(madler@alumni.caltech.edu)
  * and contributors of zlib.
  */
-
 package org.jboss.netty.util.internal.jzlib;
 
 import org.jboss.netty.util.internal.jzlib.JZlib.WrapperType;

src/main/java/org/jboss/netty/util/internal/jzlib/JZlib.java

@@ -13,13 +13,38 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
+/*
+Copyright (c) 2000,2001,2002,2003 ymnk, JCraft,Inc. All rights reserved.
 
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+  1. Redistributions of source code must retain the above copyright notice,
+     this list of conditions and the following disclaimer.
+
+  2. Redistributions in binary form must reproduce the above copyright
+     notice, this list of conditions and the following disclaimer in
+     the documentation and/or other materials provided with the distribution.
+
+  3. The names of the authors may not be used to endorse or promote products
+     derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
+INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JCRAFT,
+INC. OR ANY CONTRIBUTORS TO THIS SOFTWARE BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
 /*
  * This program is based on zlib-1.1.3, so all credit should go authors
  * Jean-loup Gailly(jloup@gzip.org) and Mark Adler(madler@alumni.caltech.edu)
  * and contributors of zlib.
  */
-
 package org.jboss.netty.util.internal.jzlib;
 
 public final class JZlib {

src/main/java/org/jboss/netty/util/internal/jzlib/StaticTree.java

@@ -13,13 +13,38 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
+/*
+Copyright (c) 2000,2001,2002,2003 ymnk, JCraft,Inc. All rights reserved.
 
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+  1. Redistributions of source code must retain the above copyright notice,
+     this list of conditions and the following disclaimer.
+
+  2. Redistributions in binary form must reproduce the above copyright
+     notice, this list of conditions and the following disclaimer in
+     the documentation and/or other materials provided with the distribution.
+
+  3. The names of the authors may not be used to endorse or promote products
+     derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
+INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JCRAFT,
+INC. OR ANY CONTRIBUTORS TO THIS SOFTWARE BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
 /*
  * This program is based on zlib-1.1.3, so all credit should go authors
  * Jean-loup Gailly(jloup@gzip.org) and Mark Adler(madler@alumni.caltech.edu)
  * and contributors of zlib.
  */
-
 package org.jboss.netty.util.internal.jzlib;
 
 final class StaticTree {

src/main/java/org/jboss/netty/util/internal/jzlib/Tree.java

@@ -13,13 +13,38 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
+/*
+Copyright (c) 2000,2001,2002,2003 ymnk, JCraft,Inc. All rights reserved.
 
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+  1. Redistributions of source code must retain the above copyright notice,
+     this list of conditions and the following disclaimer.
+
+  2. Redistributions in binary form must reproduce the above copyright
+     notice, this list of conditions and the following disclaimer in
+     the documentation and/or other materials provided with the distribution.
+
+  3. The names of the authors may not be used to endorse or promote products
+     derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
+INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JCRAFT,
+INC. OR ANY CONTRIBUTORS TO THIS SOFTWARE BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
 /*
  * This program is based on zlib-1.1.3, so all credit should go authors
  * Jean-loup Gailly(jloup@gzip.org) and Mark Adler(madler@alumni.caltech.edu)
  * and contributors of zlib.
  */
-
 package org.jboss.netty.util.internal.jzlib;
 
 final class Tree {

src/main/java/org/jboss/netty/util/internal/jzlib/ZStream.java

@@ -13,13 +13,38 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
+/*
+Copyright (c) 2000,2001,2002,2003 ymnk, JCraft,Inc. All rights reserved.
 
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+  1. Redistributions of source code must retain the above copyright notice,
+     this list of conditions and the following disclaimer.
+
+  2. Redistributions in binary form must reproduce the above copyright
+     notice, this list of conditions and the following disclaimer in
+     the documentation and/or other materials provided with the distribution.
+
+  3. The names of the authors may not be used to endorse or promote products
+     derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
+INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JCRAFT,
+INC. OR ANY CONTRIBUTORS TO THIS SOFTWARE BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
 /*
  * This program is based on zlib-1.1.3, so all credit should go authors
  * Jean-loup Gailly(jloup@gzip.org) and Mark Adler(madler@alumni.caltech.edu)
  * and contributors of zlib.
  */
-
 package org.jboss.netty.util.internal.jzlib;
 
 import org.jboss.netty.util.internal.jzlib.JZlib.WrapperType;

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

@@ -38,6 +38,7 @@ import org.junit.Test;
 
 
 /**
+ * An abstract test class to test socket client bootstraps
  */
 public abstract class AbstractSocketClientBootstrapTest {
 

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

@@ -45,6 +45,7 @@ import org.junit.Test;
 
 
 /**
+ * An abstract test class to test server socket bootstraps
  */
 public abstract class AbstractSocketServerBootstrapTest {
 

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

@@ -27,6 +27,7 @@ import org.junit.Test;
 
 
 /**
+ * A test to make sure that a bootstrap can recognize ordered maps
  */
 public class BootstrapOrderedMapTest {
 

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

@@ -34,6 +34,7 @@ import org.junit.Test;
 
 
 /**
+ * A bootstrap test
  */
 public class BootstrapTest {
     @Test(expected = IllegalStateException.class)

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

@@ -21,6 +21,7 @@ import org.jboss.netty.channel.ChannelFactory;
 import org.jboss.netty.channel.socket.nio.NioClientSocketChannelFactory;
 
 /**
+ * A test for New I/O socket client bootstraps
  */
 public class NioSocketClientBootstrapTest extends
         AbstractSocketClientBootstrapTest {

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

@@ -21,6 +21,7 @@ import org.jboss.netty.channel.ChannelFactory;
 import org.jboss.netty.channel.socket.nio.NioServerSocketChannelFactory;
 
 /**
+ * A test for New I/O socket server bootstraps
  */
 public class NioSocketServerBootstrapTest extends
         AbstractSocketServerBootstrapTest {

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

@@ -21,6 +21,7 @@ import org.jboss.netty.channel.ChannelFactory;
 import org.jboss.netty.channel.socket.oio.OioClientSocketChannelFactory;
 
 /**
+ * A test for "Old" I/O socket client bootstraps
  */
 public class OioSocketClientBootstrapTest extends
         AbstractSocketClientBootstrapTest {

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

@@ -21,6 +21,7 @@ import org.jboss.netty.channel.ChannelFactory;
 import org.jboss.netty.channel.socket.oio.OioServerSocketChannelFactory;
 
 /**
+ * A socket server bootstrap test for "Old" I/O
  */
 public class OioSocketServerBootstrapTest extends
         AbstractSocketServerBootstrapTest {

src/test/java/org/jboss/netty/buffer/AbstractChannelBufferTest.java

@@ -33,6 +33,7 @@ import org.junit.Before;
 import org.junit.Test;
 
 /**
+ * An abstract test class for channel buffers
  */
 public abstract class AbstractChannelBufferTest {
 

src/test/java/org/jboss/netty/buffer/AbstractCompositeChannelBufferTest.java

@@ -26,6 +26,7 @@ import java.util.List;
 import org.junit.Test;
 
 /**
+ * An abstract test class for composite channel buffers
  */
 public abstract class AbstractCompositeChannelBufferTest extends
         AbstractChannelBufferTest {