[hornetq-commits] JBoss hornetq SVN: r9050 - trunk/src/main/org/hornetq/integration/transports/netty.

[do-not-reply at jboss.org]

Author: jmesnil
Date: 2010-04-02 06:02:01 -0400 (Fri, 02 Apr 2010)
New Revision: 9050

Modified:
   trunk/src/main/org/hornetq/integration/transports/netty/HornetQFrameDecoder2.java
   trunk/src/main/org/hornetq/integration/transports/netty/HttpAcceptorHandler.java
   trunk/src/main/org/hornetq/integration/transports/netty/NettyAcceptor.java
   trunk/src/main/org/hornetq/integration/transports/netty/NettyConnection.java
   trunk/src/main/org/hornetq/integration/transports/netty/NettyConnector.java
Log:
netty integration

* updated calls to deprecated Netty methods

Modified: trunk/src/main/org/hornetq/integration/transports/netty/HornetQFrameDecoder2.java
===================================================================
--- trunk/src/main/org/hornetq/integration/transports/netty/HornetQFrameDecoder2.java	2010-04-01 22:18:17 UTC (rev 9049)
+++ trunk/src/main/org/hornetq/integration/transports/netty/HornetQFrameDecoder2.java	2010-04-02 10:02:01 UTC (rev 9050)
@@ -18,7 +18,6 @@
 import org.jboss.netty.buffer.ChannelBuffers;
 import org.jboss.netty.buffer.DynamicChannelBuffer;
 import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.channel.ChannelPipelineCoverage;
 import org.jboss.netty.channel.Channels;
 import org.jboss.netty.channel.MessageEvent;
 import org.jboss.netty.channel.SimpleChannelUpstreamHandler;
@@ -30,7 +29,6 @@
  *
  * @version $Revision: 7839 $, $Date: 2009-08-21 02:26:39 +0900 (2009-08-21, 금) $
  */
- at ChannelPipelineCoverage("one")
 public class HornetQFrameDecoder2 extends SimpleChannelUpstreamHandler
 {
    private ChannelBuffer previousData = ChannelBuffers.EMPTY_BUFFER;

Modified: trunk/src/main/org/hornetq/integration/transports/netty/HttpAcceptorHandler.java
===================================================================
--- trunk/src/main/org/hornetq/integration/transports/netty/HttpAcceptorHandler.java	2010-04-01 22:18:17 UTC (rev 9049)
+++ trunk/src/main/org/hornetq/integration/transports/netty/HttpAcceptorHandler.java	2010-04-02 10:02:01 UTC (rev 9050)
@@ -22,7 +22,6 @@
 import org.jboss.netty.buffer.ChannelBuffers;
 import org.jboss.netty.channel.Channel;
 import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.channel.ChannelPipelineCoverage;
 import org.jboss.netty.channel.ChannelStateEvent;
 import org.jboss.netty.channel.Channels;
 import org.jboss.netty.channel.MessageEvent;
@@ -40,7 +39,6 @@
  * takes care of making sure that every request has a response and also that any uninitiated responses always wait for a response.
  * @author <a href="mailto:andy.taylor at jboss.org">Andy Taylor</a>
  */
- at ChannelPipelineCoverage("one")
 class HttpAcceptorHandler extends SimpleChannelHandler
 {
    private final BlockingQueue<ResponseHolder> responses = new LinkedBlockingQueue<ResponseHolder>();

Modified: trunk/src/main/org/hornetq/integration/transports/netty/NettyAcceptor.java
===================================================================
--- trunk/src/main/org/hornetq/integration/transports/netty/NettyAcceptor.java	2010-04-01 22:18:17 UTC (rev 9049)
+++ trunk/src/main/org/hornetq/integration/transports/netty/NettyAcceptor.java	2010-04-02 10:02:01 UTC (rev 9050)
@@ -55,7 +55,6 @@
 import org.jboss.netty.channel.ChannelHandler;
 import org.jboss.netty.channel.ChannelHandlerContext;
 import org.jboss.netty.channel.ChannelPipeline;
-import org.jboss.netty.channel.ChannelPipelineCoverage;
 import org.jboss.netty.channel.ChannelPipelineFactory;
 import org.jboss.netty.channel.ChannelStateEvent;
 import org.jboss.netty.channel.StaticChannelPipeline;
@@ -563,7 +562,6 @@
 
    // Inner classes -----------------------------------------------------------------------------
 
-   @ChannelPipelineCoverage("one")
    private final class HornetQServerChannelHandler extends HornetQChannelHandler
    {
       HornetQServerChannelHandler(final ChannelGroup group,
@@ -581,7 +579,7 @@
          SslHandler sslHandler = ctx.getPipeline().get(SslHandler.class);
          if (sslHandler != null)
          {
-            sslHandler.handshake(e.getChannel()).addListener(new ChannelFutureListener()
+            sslHandler.handshake().addListener(new ChannelFutureListener()
             {
                public void operationComplete(final ChannelFuture future) throws Exception
                {

Modified: trunk/src/main/org/hornetq/integration/transports/netty/NettyConnection.java
===================================================================
--- trunk/src/main/org/hornetq/integration/transports/netty/NettyConnection.java	2010-04-01 22:18:17 UTC (rev 9049)
+++ trunk/src/main/org/hornetq/integration/transports/netty/NettyConnection.java	2010-04-02 10:02:01 UTC (rev 9050)
@@ -85,7 +85,7 @@
       {
          try
          {
-            ChannelFuture sslCloseFuture = sslHandler.close(channel);
+            ChannelFuture sslCloseFuture = sslHandler.close();
 
             if (!sslCloseFuture.awaitUninterruptibly(10000))
             {

Modified: trunk/src/main/org/hornetq/integration/transports/netty/NettyConnector.java
===================================================================
--- trunk/src/main/org/hornetq/integration/transports/netty/NettyConnector.java	2010-04-01 22:18:17 UTC (rev 9049)
+++ trunk/src/main/org/hornetq/integration/transports/netty/NettyConnector.java	2010-04-02 10:02:01 UTC (rev 9050)
@@ -49,7 +49,6 @@
 import org.jboss.netty.channel.ChannelHandler;
 import org.jboss.netty.channel.ChannelHandlerContext;
 import org.jboss.netty.channel.ChannelPipeline;
-import org.jboss.netty.channel.ChannelPipelineCoverage;
 import org.jboss.netty.channel.ChannelPipelineFactory;
 import org.jboss.netty.channel.ChannelStateEvent;
 import org.jboss.netty.channel.Channels;
@@ -454,7 +453,7 @@
          SslHandler sslHandler = ch.getPipeline().get(SslHandler.class);
          if (sslHandler != null)
          {
-            ChannelFuture handshakeFuture = sslHandler.handshake(ch);
+            ChannelFuture handshakeFuture = sslHandler.handshake();
             handshakeFuture.awaitUninterruptibly();
             if (handshakeFuture.isSuccess())
             {
@@ -498,7 +497,6 @@
 
    // Inner classes -------------------------------------------------
 
-   @ChannelPipelineCoverage("one")
    private final class HornetQClientChannelHandler extends HornetQChannelHandler
    {
       HornetQClientChannelHandler(final ChannelGroup group,
@@ -509,7 +507,6 @@
       }
    }
 
-   @ChannelPipelineCoverage("one")
    class HttpHandler extends SimpleChannelHandler
    {
       private Channel channel;