andreacavalli/netty5
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source 
* Made org.jboss.netty.util public
* Moved ObjectSizeEstimator and its implementation to org.jboss.netty.util
This commit is contained in:
Trustin Lee 2009-04-03 07:41:54 +00:00
parent f5e42348c7
commit ec0b3fe3f2
93 changed files with 164 additions and 121 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pom.xml
View File

@ -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>

2
src/main/java/org/jboss/netty/bootstrap/Bootstrap.java
View File

@ -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

2
src/main/java/org/jboss/netty/channel/AbstractChannel.java
View File

@ -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.

2
src/main/java/org/jboss/netty/channel/ChannelLocal.java
View File

@ -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)

2
src/main/java/org/jboss/netty/channel/DefaultExceptionEvent.java
View File

@ -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.

2
src/main/java/org/jboss/netty/channel/DownstreamMessageEvent.java
View File

@ -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.

2
src/main/java/org/jboss/netty/channel/UpstreamMessageEvent.java
View File

@ -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.

4
src/main/java/org/jboss/netty/channel/group/DefaultChannelGroup.java
View File

@ -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.ConcurrentHashMap;
import org.jboss.netty.util.internal.CombinedIterator;
import org.jboss.netty.util.internal.ConcurrentHashMap;
/**
* @author The Netty Project (netty-dev@lists.jboss.org)

4
src/main/java/org/jboss/netty/channel/local/DefaultLocalChannel.java
View File

@ -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.ThreadLocalBoolean;
import org.jboss.netty.util.internal.LinkedTransferQueue;
import org.jboss.netty.util.internal.ThreadLocalBoolean;
/**
* @author The Netty Project (netty-dev@lists.jboss.org)

2
src/main/java/org/jboss/netty/channel/local/LocalChannelRegistry.java
View File

@ -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)

2
src/main/java/org/jboss/netty/channel/socket/DefaultDatagramChannelConfig.java
View File

@ -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.

2
src/main/java/org/jboss/netty/channel/socket/DefaultServerSocketChannelConfig.java
View File

@ -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.

2
src/main/java/org/jboss/netty/channel/socket/DefaultSocketChannelConfig.java
View File

@ -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.

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

@ -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)

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

@ -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)

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

@ -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)

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

@ -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)

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

@ -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.

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

@ -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

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

@ -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.ThreadRenamingRunnable;
import org.jboss.netty.util.internal.LinkedTransferQueue;
import org.jboss.netty.util.internal.ThreadRenamingRunnable;
/**
*

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

@ -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.ThreadRenamingRunnable;
import org.jboss.netty.util.internal.SystemPropertyUtil;
import org.jboss.netty.util.internal.ThreadRenamingRunnable;
/**
* Provides information which is specific to a NIO service provider

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

@ -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

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

@ -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;
/**
*

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

@ -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.ThreadLocalBoolean;
import org.jboss.netty.util.internal.LinkedTransferQueue;
import org.jboss.netty.util.internal.ThreadLocalBoolean;
/**
* @author The Netty Project (netty-dev@lists.jboss.org)

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

@ -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;

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

@ -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.ThreadRenamingRunnable;
import org.jboss.netty.util.internal.LinkedTransferQueue;
import org.jboss.netty.util.internal.ThreadRenamingRunnable;
/**
*

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

@ -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

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

@ -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;
/**
*

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

@ -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

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

@ -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;
/**
*

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

@ -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

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

@ -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;
/**
*

4
src/main/java/org/jboss/netty/channel/xnio/BaseXnioChannel.java
View File

@ -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.ThreadLocalBoolean;
import org.jboss.netty.util.internal.LinkedTransferQueue;
import org.jboss.netty.util.internal.ThreadLocalBoolean;
import org.jboss.xnio.IoUtils;
import org.jboss.xnio.channels.BoundChannel;
import org.jboss.xnio.channels.ConnectedChannel;

4
src/main/java/org/jboss/netty/channel/xnio/DefaultXnioChannelConfig.java
View File

@ -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.

2
src/main/java/org/jboss/netty/channel/xnio/XnioChannelConfig.java
View File

@ -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;

4
src/main/java/org/jboss/netty/channel/xnio/XnioChannelRegistry.java
View File

@ -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.ConcurrentIdentityHashMap;
import org.jboss.netty.util.internal.ConcurrentHashMap;
import org.jboss.netty.util.internal.ConcurrentIdentityHashMap;
/**
* @author The Netty Project (netty-dev@lists.jboss.org)

4
src/main/java/org/jboss/netty/container/guice/NettyModule.java
View File

@ -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.UnterminatableExecutor;
import org.jboss.netty.util.internal.ExecutorUtil;
import org.jboss.netty.util.internal.UnterminatableExecutor;
import com.google.inject.AbstractModule;
import com.google.inject.Scopes;

4
src/main/java/org/jboss/netty/container/microcontainer/NettyResourceFactory.java
View File

@ -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.UnterminatableExecutor;
import org.jboss.netty.util.internal.ExecutorUtil;
import org.jboss.netty.util.internal.UnterminatableExecutor;
/**
* @author The Netty Project (netty-dev@lists.jboss.org)

2
src/main/java/org/jboss/netty/container/osgi/NettyBundleActivator.java
View File

@ -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;

4
src/main/java/org/jboss/netty/container/spring/NettyResourceFactory.java
View File

@ -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.UnterminatableExecutor;
import org.jboss.netty.util.internal.ExecutorUtil;
import org.jboss.netty.util.internal.UnterminatableExecutor;
import org.springframework.beans.factory.DisposableBean;
import org.springframework.beans.factory.InitializingBean;

10
src/main/java/org/jboss/netty/example/securechat/SecureChatServerHandler.java
View File

@ -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());

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

@ -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;
/**

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

@ -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.

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

@ -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

2
src/main/java/org/jboss/netty/handler/execution/ExecutionHandler.java
View File

@ -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}.

8
src/main/java/org/jboss/netty/handler/execution/MemoryAwareThreadPoolExecutor.java
View File

@ -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.LinkedTransferQueue;
import org.jboss.netty.util.DefaultObjectSizeEstimator;
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 {

3
src/main/java/org/jboss/netty/handler/execution/OrderedMemoryAwareThreadPoolExecutor.java
View File

@ -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

2
src/main/java/org/jboss/netty/handler/ssl/SslHandler.java
View File

@ -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

8
src/main/java/org/jboss/netty/handler/timeout/HashedWheelTimer.java
View File

@ -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.MapBackedSet;
import org.jboss.netty.util.ReusableIterator;
import org.jboss.netty.util.ThreadRenamingRunnable;
import org.jboss.netty.util.internal.ConcurrentIdentityHashMap;
import org.jboss.netty.util.internal.MapBackedSet;
import org.jboss.netty.util.internal.ReusableIterator;
import org.jboss.netty.util.internal.ThreadRenamingRunnable;
/**
* @author The Netty Project (netty-dev@lists.jboss.org)

4
src/main/java/org/jboss/netty/handler/traffic/TrafficShapingHandler.java
View File

@ -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.handler.execution.ObjectSizeEstimator;
import org.jboss.netty.util.DefaultObjectSizeEstimator;
import org.jboss.netty.util.ObjectSizeEstimator;
/**
* @author The Netty Project (netty-dev@lists.jboss.org)

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

@ -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;

2
src/main/java/org/jboss/netty/logging/InternalLoggerFactory.java
View File

@ -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

2
src/main/java/org/jboss/netty/util/DebugUtil.java
View File

@ -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

5
src/main/java/org/jboss/netty/handler/execution/DefaultObjectSizeEstimator.java → src/main/java/org/jboss/netty/util/DefaultObjectSizeEstimator.java
View File

@ -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.

5
src/main/java/org/jboss/netty/handler/execution/ObjectSizeEstimator.java → src/main/java/org/jboss/netty/util/ObjectSizeEstimator.java
View File

@ -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.

2
src/main/java/org/jboss/netty/util/CaseIgnoringComparator.java → src/main/java/org/jboss/netty/util/internal/CaseIgnoringComparator.java
View File

@ -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;

2
src/main/java/org/jboss/netty/util/CombinedIterator.java → src/main/java/org/jboss/netty/util/internal/CombinedIterator.java
View File

@ -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;

3
src/main/java/org/jboss/netty/util/ConcurrentHashMap.java → src/main/java/org/jboss/netty/util/internal/ConcurrentHashMap.java
View File

@ -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}.

3
src/main/java/org/jboss/netty/util/ConcurrentIdentityHashMap.java → src/main/java/org/jboss/netty/util/internal/ConcurrentIdentityHashMap.java
View File

@ -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}.

3
src/main/java/org/jboss/netty/util/ConcurrentIdentityWeakKeyHashMap.java → src/main/java/org/jboss/netty/util/internal/ConcurrentIdentityWeakKeyHashMap.java
View File

@ -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}.

3
src/main/java/org/jboss/netty/util/ConcurrentWeakKeyHashMap.java → src/main/java/org/jboss/netty/util/internal/ConcurrentWeakKeyHashMap.java
View File

@ -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}.

2
src/main/java/org/jboss/netty/util/ConversionUtil.java → src/main/java/org/jboss/netty/util/internal/ConversionUtil.java
View File

@ -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

2
src/main/java/org/jboss/netty/util/ExecutorUtil.java → src/main/java/org/jboss/netty/util/internal/ExecutorUtil.java
View File

@ -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;

2
src/main/java/org/jboss/netty/util/ImmediateExecutor.java → src/main/java/org/jboss/netty/util/internal/ImmediateExecutor.java
View File

@ -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;

2
src/main/java/org/jboss/netty/util/LinkedTransferQueue.java → src/main/java/org/jboss/netty/util/internal/LinkedTransferQueue.java
View File

@ -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;

2
src/main/java/org/jboss/netty/util/MapBackedSet.java → src/main/java/org/jboss/netty/util/internal/MapBackedSet.java
View File

@ -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;

2
src/main/java/org/jboss/netty/util/MapUtil.java → src/main/java/org/jboss/netty/util/internal/MapUtil.java
View File

@ -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;

2
src/main/java/org/jboss/netty/util/ReusableIterator.java → src/main/java/org/jboss/netty/util/internal/ReusableIterator.java
View File

@ -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;

5
src/main/java/org/jboss/netty/util/StackTraceSimplifier.java → src/main/java/org/jboss/netty/util/internal/StackTraceSimplifier.java
View File

@ -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.*))$");
/**

2
src/main/java/org/jboss/netty/util/StringUtil.java → src/main/java/org/jboss/netty/util/internal/StringUtil.java
View File

@ -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)

2
src/main/java/org/jboss/netty/util/SwitchableInputStream.java → src/main/java/org/jboss/netty/util/internal/SwitchableInputStream.java
View File

@ -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;

2
src/main/java/org/jboss/netty/util/SystemPropertyUtil.java → src/main/java/org/jboss/netty/util/internal/SystemPropertyUtil.java
View File

@ -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}.

2
src/main/java/org/jboss/netty/util/ThreadLocalBoolean.java → src/main/java/org/jboss/netty/util/internal/ThreadLocalBoolean.java
View File

@ -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)

2
src/main/java/org/jboss/netty/util/ThreadRenamingRunnable.java → src/main/java/org/jboss/netty/util/internal/ThreadRenamingRunnable.java
View File

@ -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;
/**

2
src/main/java/org/jboss/netty/util/UnterminatableExecutor.java → src/main/java/org/jboss/netty/util/internal/UnterminatableExecutor.java
View File

@ -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;

28
src/main/java/org/jboss/netty/util/internal/package-info.java Normal file
View File

@ -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;

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

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

2
src/test/java/org/jboss/netty/bootstrap/AbstractSocketClientBootstrapTest.java
View File

@ -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;

2
src/test/java/org/jboss/netty/bootstrap/AbstractSocketServerBootstrapTest.java
View File

@ -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;

2
src/test/java/org/jboss/netty/channel/socket/AbstractSocketEchoTest.java
View File

@ -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;

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

@ -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;

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

@ -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;

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

@ -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;

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

@ -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;

2
src/test/java/org/jboss/netty/handler/ssl/AbstractSocketSslEchoTest.java
View File

@ -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;

2
src/test/java/org/jboss/netty/util/TestUtil.java
View File

@ -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)

3
src/test/java/org/jboss/netty/util/ConversionUtilTest.java → src/test/java/org/jboss/netty/util/internal/ConversionUtilTest.java
View File

@ -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;

3
src/test/java/org/jboss/netty/util/ImmediateExecutorTest.java → src/test/java/org/jboss/netty/util/internal/ImmediateExecutorTest.java
View File

@ -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;

2
src/test/java/org/jboss/netty/util/MapBackedSetTest.java → src/test/java/org/jboss/netty/util/internal/MapBackedSetTest.java
View File

@ -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.*;

2
src/test/java/org/jboss/netty/util/MapUtilTest.java → src/test/java/org/jboss/netty/util/internal/MapUtilTest.java
View File

@ -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.*;

2
src/test/java/org/jboss/netty/util/StackTraceSimplifierTest.java → src/test/java/org/jboss/netty/util/internal/StackTraceSimplifierTest.java
View File

@ -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.*;

2
src/test/java/org/jboss/netty/util/SwitchableInputStreamTest.java → src/test/java/org/jboss/netty/util/internal/SwitchableInputStreamTest.java
View File

@ -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.*;

2
src/test/java/org/jboss/netty/util/ThreadRenamingRunnableTest.java → src/test/java/org/jboss/netty/util/internal/ThreadRenamingRunnableTest.java
View File

@ -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.*;