Rename from io.netty.transport.* to io.netty.channel.*

example/src/main/java/io/netty/example/rxtx/RxtxClient.java

@@ -22,8 +22,8 @@ import io.netty.channel.socket.oio.OioEventLoopGroup;
 import io.netty.handler.codec.LineBasedFrameDecoder;
 import io.netty.handler.codec.string.StringDecoder;
 import io.netty.handler.codec.string.StringEncoder;
-import io.netty.transport.rxtx.RxtxChannel;
-import io.netty.transport.rxtx.RxtxDeviceAddress;
+import io.netty.channel.rxtx.RxtxChannel;
+import io.netty.channel.rxtx.RxtxDeviceAddress;
 
 /**
  * Sends one message to a serial device

example/src/main/java/io/netty/example/udt/echo/bytes/ByteEchoClient.java

@@ -23,8 +23,8 @@ import io.netty.example.udt.util.UtilConsoleReporter;
 import io.netty.example.udt.util.UtilThreadFactory;
 import io.netty.handler.logging.LogLevel;
 import io.netty.handler.logging.LoggingHandler;
-import io.netty.transport.udt.UdtChannel;
-import io.netty.transport.udt.nio.NioUdtProvider;
+import io.netty.channel.udt.UdtChannel;
+import io.netty.channel.udt.nio.NioUdtProvider;
 
 import java.net.InetSocketAddress;
 import java.util.concurrent.ThreadFactory;

example/src/main/java/io/netty/example/udt/echo/bytes/ByteEchoClientHandler.java

@@ -20,7 +20,7 @@ import io.netty.buffer.Unpooled;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.ChannelInboundByteHandlerAdapter;
 import io.netty.channel.ChannelOption;
-import io.netty.transport.udt.nio.NioUdtProvider;
+import io.netty.channel.udt.nio.NioUdtProvider;
 
 import java.util.concurrent.TimeUnit;
 

example/src/main/java/io/netty/example/udt/echo/bytes/ByteEchoServer.java

@@ -23,8 +23,8 @@ import io.netty.channel.socket.nio.NioEventLoopGroup;
 import io.netty.example.udt.util.UtilThreadFactory;
 import io.netty.handler.logging.LogLevel;
 import io.netty.handler.logging.LoggingHandler;
-import io.netty.transport.udt.UdtChannel;
-import io.netty.transport.udt.nio.NioUdtProvider;
+import io.netty.channel.udt.UdtChannel;
+import io.netty.channel.udt.nio.NioUdtProvider;
 
 import java.util.concurrent.ThreadFactory;
 

example/src/main/java/io/netty/example/udt/echo/bytes/ByteEchoServerHandler.java

@@ -20,7 +20,7 @@ import io.netty.channel.ChannelHandler.Sharable;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.ChannelInboundByteHandlerAdapter;
 import io.netty.channel.ChannelOption;
-import io.netty.transport.udt.nio.NioUdtProvider;
+import io.netty.channel.udt.nio.NioUdtProvider;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

example/src/main/java/io/netty/example/udt/echo/message/MsgEchoClient.java

@@ -23,8 +23,8 @@ import io.netty.example.udt.util.UtilConsoleReporter;
 import io.netty.example.udt.util.UtilThreadFactory;
 import io.netty.handler.logging.LogLevel;
 import io.netty.handler.logging.LoggingHandler;
-import io.netty.transport.udt.UdtChannel;
-import io.netty.transport.udt.nio.NioUdtProvider;
+import io.netty.channel.udt.UdtChannel;
+import io.netty.channel.udt.nio.NioUdtProvider;
 
 import java.net.InetSocketAddress;
 import java.util.concurrent.ThreadFactory;

example/src/main/java/io/netty/example/udt/echo/message/MsgEchoClientHandler.java

@@ -20,8 +20,8 @@ import io.netty.buffer.MessageBuf;
 import io.netty.buffer.Unpooled;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.ChannelInboundMessageHandlerAdapter;
-import io.netty.transport.udt.UdtMessage;
-import io.netty.transport.udt.nio.NioUdtProvider;
+import io.netty.channel.udt.UdtMessage;
+import io.netty.channel.udt.nio.NioUdtProvider;
 
 import java.util.concurrent.TimeUnit;
 

example/src/main/java/io/netty/example/udt/echo/message/MsgEchoServer.java

@@ -23,8 +23,8 @@ import io.netty.channel.socket.nio.NioEventLoopGroup;
 import io.netty.example.udt.util.UtilThreadFactory;
 import io.netty.handler.logging.LogLevel;
 import io.netty.handler.logging.LoggingHandler;
-import io.netty.transport.udt.UdtChannel;
-import io.netty.transport.udt.nio.NioUdtProvider;
+import io.netty.channel.udt.UdtChannel;
+import io.netty.channel.udt.nio.NioUdtProvider;
 
 import java.util.concurrent.ThreadFactory;
 

example/src/main/java/io/netty/example/udt/echo/message/MsgEchoServerHandler.java

@@ -19,8 +19,8 @@ import io.netty.buffer.MessageBuf;
 import io.netty.channel.ChannelHandler.Sharable;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.ChannelInboundMessageHandlerAdapter;
-import io.netty.transport.udt.UdtMessage;
-import io.netty.transport.udt.nio.NioUdtProvider;
+import io.netty.channel.udt.UdtMessage;
+import io.netty.channel.udt.nio.NioUdtProvider;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

example/src/main/java/io/netty/example/udt/echo/rendevous/MsgEchoPeerBase.java

@@ -22,8 +22,8 @@ import io.netty.channel.socket.nio.NioEventLoopGroup;
 import io.netty.example.udt.util.UtilThreadFactory;
 import io.netty.handler.logging.LogLevel;
 import io.netty.handler.logging.LoggingHandler;
-import io.netty.transport.udt.UdtChannel;
-import io.netty.transport.udt.nio.NioUdtProvider;
+import io.netty.channel.udt.UdtChannel;
+import io.netty.channel.udt.nio.NioUdtProvider;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

example/src/main/java/io/netty/example/udt/echo/rendevous/MsgEchoPeerHandler.java

@@ -20,8 +20,8 @@ import io.netty.buffer.MessageBuf;
 import io.netty.buffer.Unpooled;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.ChannelInboundMessageHandlerAdapter;
-import io.netty.transport.udt.UdtMessage;
-import io.netty.transport.udt.nio.NioUdtProvider;
+import io.netty.channel.udt.UdtMessage;
+import io.netty.channel.udt.nio.NioUdtProvider;
 
 import java.util.concurrent.TimeUnit;
 

transport-rxtx/src/main/java/io/netty/channel/rxtx/RxtxChannel.java

@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package io.netty.transport.rxtx;
+package io.netty.channel.rxtx;
 
 import gnu.io.CommPort;
 import gnu.io.CommPortIdentifier;
@@ -30,7 +30,7 @@ import java.net.SocketAddress;
 import java.net.SocketTimeoutException;
 import java.nio.channels.NotYetConnectedException;
 
-import static io.netty.transport.rxtx.RxtxChannelOptions.*;
+import static io.netty.channel.rxtx.RxtxChannelOptions.*;
 
 /**
  * A channel to a serial device using the RXTX library.

transport-rxtx/src/main/java/io/netty/channel/rxtx/RxtxChannelConfig.java

@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package io.netty.transport.rxtx;
+package io.netty.channel.rxtx;
 
 import gnu.io.SerialPort;
 import io.netty.channel.ChannelOption;
@@ -21,7 +21,7 @@ import io.netty.channel.DefaultChannelConfig;
 
 import java.util.Map;
 
-import static io.netty.transport.rxtx.RxtxChannelOptions.*;
+import static io.netty.channel.rxtx.RxtxChannelOptions.*;
 
 /**
  * A configuration class for RXTX device connections.

transport-rxtx/src/main/java/io/netty/channel/rxtx/RxtxChannelOptions.java

@@ -13,12 +13,12 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package io.netty.transport.rxtx;
+package io.netty.channel.rxtx;
 
 import io.netty.channel.ChannelOption;
-import io.netty.transport.rxtx.RxtxChannelConfig.Databits;
-import io.netty.transport.rxtx.RxtxChannelConfig.Paritybit;
-import io.netty.transport.rxtx.RxtxChannelConfig.Stopbits;
+import io.netty.channel.rxtx.RxtxChannelConfig.Databits;
+import io.netty.channel.rxtx.RxtxChannelConfig.Paritybit;
+import io.netty.channel.rxtx.RxtxChannelConfig.Stopbits;
 
 /**
  * Options for configuring a serial port connection

transport-rxtx/src/main/java/io/netty/channel/rxtx/RxtxDeviceAddress.java

@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package io.netty.transport.rxtx;
+package io.netty.channel.rxtx;
 
 import java.net.SocketAddress;
 

transport-rxtx/src/main/java/io/netty/channel/rxtx/package-info.java

@@ -17,4 +17,4 @@
 /**
  * A serial and parallel port communication transport based on <a href="http://rxtx.qbang.org/">RXTX</a>.
  */
-package io.netty.transport.rxtx;
+package io.netty.channel.rxtx;

transport-udt/src/main/java/io/netty/channel/udt/DefaultUdtChannelConfig.java

@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package io.netty.transport.udt;
+package io.netty.channel.udt;
 
 import com.barchart.udt.OptionUDT;
 import com.barchart.udt.SocketUDT;

transport-udt/src/main/java/io/netty/channel/udt/UdtChannel.java

@@ -13,10 +13,10 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package io.netty.transport.udt;
+package io.netty.channel.udt;
 
 import io.netty.channel.Channel;
-import io.netty.transport.udt.nio.NioUdtProvider;
+import io.netty.channel.udt.nio.NioUdtProvider;
 
 import java.net.InetSocketAddress;
 

transport-udt/src/main/java/io/netty/channel/udt/UdtChannelConfig.java

@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package io.netty.transport.udt;
+package io.netty.channel.udt;
 
 import io.netty.channel.ChannelConfig;
 import io.netty.channel.ChannelException;

transport-udt/src/main/java/io/netty/channel/udt/UdtMessage.java

@@ -13,11 +13,11 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package io.netty.transport.udt;
+package io.netty.channel.udt;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.DefaultByteBufHolder;
-import io.netty.transport.udt.nio.NioUdtProvider;
+import io.netty.channel.udt.nio.NioUdtProvider;
 
 import com.barchart.udt.TypeUDT;
 

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

@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package io.netty.transport.udt.nio;
+package io.netty.channel.udt.nio;
 
 import static java.nio.channels.SelectionKey.*;
 import io.netty.buffer.MessageBuf;
@@ -21,9 +21,9 @@ import io.netty.channel.ChannelException;
 import io.netty.channel.socket.nio.AbstractNioMessageChannel;
 import io.netty.logging.InternalLogger;
 import io.netty.logging.InternalLoggerFactory;
-import io.netty.transport.udt.DefaultUdtChannelConfig;
-import io.netty.transport.udt.UdtChannel;
-import io.netty.transport.udt.UdtChannelConfig;
+import io.netty.channel.udt.DefaultUdtChannelConfig;
+import io.netty.channel.udt.UdtChannel;
+import io.netty.channel.udt.UdtChannelConfig;
 
 import java.net.InetSocketAddress;
 import java.net.SocketAddress;

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

@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package io.netty.transport.udt.nio;
+package io.netty.channel.udt.nio;
 
 import io.netty.buffer.BufType;
 import io.netty.buffer.MessageBuf;

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

@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package io.netty.transport.udt.nio;
+package io.netty.channel.udt.nio;
 
 import static java.nio.channels.SelectionKey.*;
 import io.netty.buffer.BufType;
@@ -24,9 +24,9 @@ import io.netty.channel.ChannelMetadata;
 import io.netty.channel.socket.nio.AbstractNioByteChannel;
 import io.netty.logging.InternalLogger;
 import io.netty.logging.InternalLoggerFactory;
-import io.netty.transport.udt.DefaultUdtChannelConfig;
-import io.netty.transport.udt.UdtChannel;
-import io.netty.transport.udt.UdtChannelConfig;
+import io.netty.channel.udt.DefaultUdtChannelConfig;
+import io.netty.channel.udt.UdtChannel;
+import io.netty.channel.udt.UdtChannelConfig;
 
 import java.net.SocketAddress;
 import java.nio.channels.SelectionKey;

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

@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package io.netty.transport.udt.nio;
+package io.netty.channel.udt.nio;
 
 import com.barchart.udt.TypeUDT;
 

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

@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package io.netty.transport.udt.nio;
+package io.netty.channel.udt.nio;
 
 import io.netty.buffer.BufType;
 import io.netty.buffer.MessageBuf;

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

@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package io.netty.transport.udt.nio;
+package io.netty.channel.udt.nio;
 
 import static java.nio.channels.SelectionKey.*;
 import io.netty.buffer.BufType;
@@ -25,10 +25,10 @@ import io.netty.channel.ChannelMetadata;
 import io.netty.channel.socket.nio.AbstractNioMessageChannel;
 import io.netty.logging.InternalLogger;
 import io.netty.logging.InternalLoggerFactory;
-import io.netty.transport.udt.DefaultUdtChannelConfig;
-import io.netty.transport.udt.UdtChannel;
-import io.netty.transport.udt.UdtChannelConfig;
-import io.netty.transport.udt.UdtMessage;
+import io.netty.channel.udt.DefaultUdtChannelConfig;
+import io.netty.channel.udt.UdtChannel;
+import io.netty.channel.udt.UdtChannelConfig;
+import io.netty.channel.udt.UdtMessage;
 
 import java.net.SocketAddress;
 import java.nio.channels.SelectionKey;

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

@@ -13,10 +13,10 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package io.netty.transport.udt.nio;
+package io.netty.channel.udt.nio;
 
 import com.barchart.udt.TypeUDT;
-import io.netty.transport.udt.UdtMessage;
+import io.netty.channel.udt.UdtMessage;
 
 /**
  * Message Rendezvous for UDT Datagrams.

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

@@ -13,14 +13,14 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package io.netty.transport.udt.nio;
+package io.netty.channel.udt.nio;
 
 import io.netty.bootstrap.AbstractBootstrap.ChannelFactory;
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelException;
 import io.netty.logging.InternalLogger;
 import io.netty.logging.InternalLoggerFactory;
-import io.netty.transport.udt.UdtChannel;
+import io.netty.channel.udt.UdtChannel;
 
 import java.io.IOException;
 import java.nio.channels.spi.SelectorProvider;

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

@@ -18,5 +18,5 @@
  * <p>
  * @see /netty/example/src/main/java/io/netty/example/udt
  */
-package io.netty.transport.udt.nio;
+package io.netty.channel.udt.nio;
 

transport-udt/src/main/java/io/netty/channel/udt/oio/package-info.java

@@ -18,5 +18,5 @@
  * <p>
  * @see /netty/example/src/main/java/io/netty/example/udt
  */
-package io.netty.transport.udt.oio;
+package io.netty.channel.udt.oio;
 

transport-udt/src/main/java/io/netty/channel/udt/package-info.java

@@ -18,5 +18,5 @@
  * <p>
  * @see /netty/example/src/main/java/io/netty/example/udt
  */
-package io.netty.transport.udt;
+package io.netty.channel.udt;
 

transport-udt/src/test/java/io/netty/channel/udt/bench/BenchXfer.java

@@ -14,11 +14,11 @@
  * under the License.
  */
 
-package io.netty.transport.udt.bench;
+package io.netty.channel.udt.bench;
 
-import io.netty.transport.udt.util.CaliperBench;
-import io.netty.transport.udt.util.CaliperRunner;
-import io.netty.transport.udt.util.TrafficControl;
+import io.netty.channel.udt.util.CaliperBench;
+import io.netty.channel.udt.util.CaliperRunner;
+import io.netty.channel.udt.util.TrafficControl;
 
 import java.util.List;
 

transport-udt/src/test/java/io/netty/channel/udt/bench/package-info.java

@@ -17,5 +17,5 @@
 /**
  * UDT Benchmarks
  */
-package io.netty.transport.udt.bench;
+package io.netty.channel.udt.bench;
 

transport-udt/src/test/java/io/netty/channel/udt/bench/xfer/TcpNative.java

@@ -14,11 +14,11 @@
  * under the License.
  */
 
-package io.netty.transport.udt.bench.xfer;
+package io.netty.channel.udt.bench.xfer;
 
-import io.netty.transport.udt.bench.BenchXfer;
-import io.netty.transport.udt.util.CaliperRunner;
-import io.netty.transport.udt.util.TrafficControl;
+import io.netty.channel.udt.bench.BenchXfer;
+import io.netty.channel.udt.util.CaliperRunner;
+import io.netty.channel.udt.util.TrafficControl;
 
 import java.util.List;
 

transport-udt/src/test/java/io/netty/channel/udt/bench/xfer/UdtNative.java

@@ -14,15 +14,15 @@
  * under the License.
  */
 
-package io.netty.transport.udt.bench.xfer;
+package io.netty.channel.udt.bench.xfer;
 
 import com.barchart.udt.SocketUDT;
 import com.barchart.udt.StatusUDT;
 import com.barchart.udt.TypeUDT;
 import com.google.caliper.Param;
-import io.netty.transport.udt.bench.BenchXfer;
-import io.netty.transport.udt.util.CaliperRunner;
-import io.netty.transport.udt.util.TrafficControl;
+import io.netty.channel.udt.bench.BenchXfer;
+import io.netty.channel.udt.util.CaliperRunner;
+import io.netty.channel.udt.util.TrafficControl;
 
 import java.net.InetSocketAddress;
 import java.nio.ByteBuffer;
@@ -32,7 +32,7 @@ import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import static io.netty.transport.udt.util.UnitHelp.*;
+import static io.netty.channel.udt.util.UnitHelp.*;
 
 /**
  * perform two way native UDT socket send/recv

transport-udt/src/test/java/io/netty/channel/udt/bench/xfer/UdtNetty.java

@@ -14,7 +14,7 @@
  * under the License.
  */
 
-package io.netty.transport.udt.bench.xfer;
+package io.netty.channel.udt.bench.xfer;
 
 import com.yammer.metrics.Metrics;
 import com.yammer.metrics.core.Counter;
@@ -24,11 +24,11 @@ import io.netty.channel.ChannelFuture;
 import io.netty.channel.ChannelHandler;
 import io.netty.logging.InternalLoggerFactory;
 import io.netty.logging.Slf4JLoggerFactory;
-import io.netty.transport.udt.util.BootHelp;
-import io.netty.transport.udt.util.CustomReporter;
-import io.netty.transport.udt.util.EchoMessageHandler;
-import io.netty.transport.udt.util.TrafficControl;
-import io.netty.transport.udt.util.UnitHelp;
+import io.netty.channel.udt.util.BootHelp;
+import io.netty.channel.udt.util.CustomReporter;
+import io.netty.channel.udt.util.EchoMessageHandler;
+import io.netty.channel.udt.util.TrafficControl;
+import io.netty.channel.udt.util.UnitHelp;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

transport-udt/src/test/java/io/netty/channel/udt/bench/xfer/package-info.java

@@ -17,5 +17,5 @@
 /**
  * UDT Transfer Speed Benchmarks
  */
-package io.netty.transport.udt.bench.xfer;
+package io.netty.channel.udt.bench.xfer;
 

transport-udt/src/test/java/io/netty/channel/udt/nio/NioUdtByteAcceptorChannelTest.java

@@ -14,7 +14,7 @@
  * under the License.
  */
 
-package io.netty.transport.udt.nio;
+package io.netty.channel.udt.nio;
 
 import io.netty.buffer.BufType;
 import org.junit.Test;

transport-udt/src/test/java/io/netty/channel/udt/nio/NioUdtByteConnectorChannelTest.java

@@ -14,7 +14,7 @@
  * under the License.
  */
 
-package io.netty.transport.udt.nio;
+package io.netty.channel.udt.nio;
 
 import io.netty.buffer.BufType;
 import org.junit.Test;

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

@@ -14,16 +14,16 @@
  * under the License.
  */
 
-package io.netty.transport.udt.nio;
+package io.netty.channel.udt.nio;
 
 import com.yammer.metrics.Metrics;
 import com.yammer.metrics.core.Meter;
 import io.netty.bootstrap.Bootstrap;
 import io.netty.buffer.BufType;
 import io.netty.channel.ChannelFuture;
-import io.netty.transport.udt.util.BootHelp;
-import io.netty.transport.udt.util.EchoByteHandler;
-import io.netty.transport.udt.util.UnitHelp;
+import io.netty.channel.udt.util.BootHelp;
+import io.netty.channel.udt.util.EchoByteHandler;
+import io.netty.channel.udt.util.UnitHelp;
 import org.junit.Test;
 
 import java.net.InetSocketAddress;

transport-udt/src/test/java/io/netty/channel/udt/nio/NioUdtMessageAcceptorChannelTest.java

@@ -14,7 +14,7 @@
  * under the License.
  */
 
-package io.netty.transport.udt.nio;
+package io.netty.channel.udt.nio;
 
 import io.netty.buffer.BufType;
 import org.junit.Test;

transport-udt/src/test/java/io/netty/channel/udt/nio/NioUdtMessageConnectorChannelTest.java

@@ -14,7 +14,7 @@
  * under the License.
  */
 
-package io.netty.transport.udt.nio;
+package io.netty.channel.udt.nio;
 
 import io.netty.buffer.BufType;
 import org.junit.Test;

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

@@ -14,16 +14,16 @@
  * under the License.
  */
 
-package io.netty.transport.udt.nio;
+package io.netty.channel.udt.nio;
 
 import com.yammer.metrics.Metrics;
 import com.yammer.metrics.core.Meter;
 import io.netty.bootstrap.Bootstrap;
 import io.netty.buffer.BufType;
 import io.netty.channel.ChannelFuture;
-import io.netty.transport.udt.util.BootHelp;
-import io.netty.transport.udt.util.EchoMessageHandler;
-import io.netty.transport.udt.util.UnitHelp;
+import io.netty.channel.udt.util.BootHelp;
+import io.netty.channel.udt.util.EchoMessageHandler;
+import io.netty.channel.udt.util.UnitHelp;
 import org.junit.Test;
 
 import java.net.InetSocketAddress;

transport-udt/src/test/java/io/netty/channel/udt/nio/NioUdtProviderTest.java

@@ -14,7 +14,7 @@
  * under the License.
  */
 
-package io.netty.transport.udt.nio;
+package io.netty.channel.udt.nio;
 
 import org.junit.Test;
 

transport-udt/src/test/java/io/netty/channel/udt/nio/TestAny.java

@@ -14,7 +14,7 @@
  * under the License.
  */
 
-package io.netty.transport.udt.nio;
+package io.netty.channel.udt.nio;
 
 import io.netty.logging.InternalLoggerFactory;
 import io.netty.logging.Slf4JLoggerFactory;

transport-udt/src/test/java/io/netty/channel/udt/util/BootHelp.java

@@ -14,12 +14,12 @@
  * under the License.
  */
 
-package io.netty.transport.udt.util;
+package io.netty.channel.udt.util;
 
 import io.netty.bootstrap.Bootstrap;
 import io.netty.channel.ChannelHandler;
 import io.netty.channel.socket.nio.NioEventLoopGroup;
-import io.netty.transport.udt.nio.NioUdtProvider;
+import io.netty.channel.udt.nio.NioUdtProvider;
 
 import java.net.InetSocketAddress;
 import java.util.concurrent.ThreadFactory;

transport-udt/src/test/java/io/netty/channel/udt/util/CaliperBench.java

@@ -14,7 +14,7 @@
  * under the License.
  */
 
-package io.netty.transport.udt.util;
+package io.netty.channel.udt.util;
 
 import io.netty.logging.InternalLoggerFactory;
 import io.netty.logging.Slf4JLoggerFactory;

transport-udt/src/test/java/io/netty/channel/udt/util/CaliperMeasure.java

@@ -14,7 +14,7 @@
  * under the License.
  */
 
-package io.netty.transport.udt.util;
+package io.netty.channel.udt.util;
 
 import com.google.caliper.Measurement;
 import com.google.caliper.MeasurementSet;

transport-udt/src/test/java/io/netty/channel/udt/util/CaliperRunner.java

@@ -15,7 +15,7 @@
  * under the License.
  */
 
-package io.netty.transport.udt.util;
+package io.netty.channel.udt.util;
 
 import com.google.caliper.ConfiguredBenchmark;
 import com.google.caliper.Environment;

transport-udt/src/test/java/io/netty/channel/udt/util/CustomReporter.java

@@ -14,7 +14,7 @@
  * under the License.
  */
 
-package io.netty.transport.udt.util;
+package io.netty.channel.udt.util;
 
 import com.yammer.metrics.Metrics;
 import com.yammer.metrics.core.Clock;

transport-udt/src/test/java/io/netty/channel/udt/util/EchoByteHandler.java

@@ -14,14 +14,14 @@
  * under the License.
  */
 
-package io.netty.transport.udt.util;
+package io.netty.channel.udt.util;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.ChannelInboundByteHandlerAdapter;
 import io.netty.channel.ChannelOption;
-import io.netty.transport.udt.nio.NioUdtProvider;
+import io.netty.channel.udt.nio.NioUdtProvider;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

transport-udt/src/test/java/io/netty/channel/udt/util/EchoMessageHandler.java

@@ -14,7 +14,7 @@
  * under the License.
  */
 
-package io.netty.transport.udt.util;
+package io.netty.channel.udt.util;
 
 import com.yammer.metrics.core.Meter;
 import io.netty.buffer.ByteBuf;
@@ -22,8 +22,8 @@ import io.netty.buffer.MessageBuf;
 import io.netty.buffer.Unpooled;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.ChannelInboundMessageHandlerAdapter;
-import io.netty.transport.udt.UdtMessage;
-import io.netty.transport.udt.nio.NioUdtProvider;
+import io.netty.channel.udt.UdtMessage;
+import io.netty.channel.udt.nio.NioUdtProvider;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

transport-udt/src/test/java/io/netty/channel/udt/util/TrafficControl.java

@@ -14,7 +14,7 @@
  * under the License.
  */
 
-package io.netty.transport.udt.util;
+package io.netty.channel.udt.util;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

transport-udt/src/test/java/io/netty/channel/udt/util/UnitHelp.java

@@ -14,7 +14,7 @@
  * under the License.
  */
 
-package io.netty.transport.udt.util;
+package io.netty.channel.udt.util;
 
 import com.barchart.udt.SocketUDT;
 import com.barchart.udt.StatusUDT;

transport-udt/src/test/java/io/netty/channel/udt/util/UtilThreadFactory.java

@@ -14,7 +14,7 @@
  * under the License.
  */
 
-package io.netty.transport.udt.util;
+package io.netty.channel.udt.util;
 
 import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.atomic.AtomicInteger;

transport-udt/src/test/java/io/netty/channel/udt/util/package-info.java

@@ -17,5 +17,5 @@
 /**
  * UDT Benchmarks and Tests Utilities
  */
-package io.netty.transport.udt.util;
+package io.netty.channel.udt.util;