From a9af028077d2ede3c152622bfc401b3bbe13a4e8 Mon Sep 17 00:00:00 2001 From: Norman Maurer Date: Tue, 4 Dec 2012 09:14:05 +0100 Subject: [PATCH] [#787] Move the socks package to the right place --- .../{ => handler}/codec/socks/SocksAuthRequest.java | 2 +- .../codec/socks/SocksAuthRequestDecoder.java | 2 +- .../{ => handler}/codec/socks/SocksAuthResponse.java | 2 +- .../codec/socks/SocksAuthResponseDecoder.java | 2 +- .../{ => handler}/codec/socks/SocksCmdRequest.java | 2 +- .../codec/socks/SocksCmdRequestDecoder.java | 2 +- .../{ => handler}/codec/socks/SocksCmdResponse.java | 2 +- .../codec/socks/SocksCmdResponseDecoder.java | 2 +- .../{ => handler}/codec/socks/SocksCommonUtils.java | 2 +- .../{ => handler}/codec/socks/SocksInitRequest.java | 2 +- .../codec/socks/SocksInitRequestDecoder.java | 2 +- .../{ => handler}/codec/socks/SocksInitResponse.java | 2 +- .../codec/socks/SocksInitResponseDecoder.java | 2 +- .../{ => handler}/codec/socks/SocksMessage.java | 2 +- .../codec/socks/SocksMessageEncoder.java | 2 +- .../{ => handler}/codec/socks/SocksRequest.java | 2 +- .../{ => handler}/codec/socks/SocksResponse.java | 2 +- .../codec/socks/UnknownSocksMessage.java | 2 +- .../codec/socks/UnknownSocksRequest.java | 2 +- .../codec/socks/UnknownSocksResponse.java | 2 +- .../{ => handler}/codec/socks/package-info.java | 2 +- .../codec/socks/SocksAuthRequestDecoderTest.java | 2 +- .../codec/socks/SocksAuthRequestTest.java | 2 +- .../codec/socks/SocksAuthResponseDecoderTest.java | 2 +- .../codec/socks/SocksAuthResponseTest.java | 2 +- .../codec/socks/SocksCmdRequestDecoderTest.java | 2 +- .../codec/socks/SocksCmdRequestTest.java | 2 +- .../codec/socks/SocksCmdResponseDecoderTest.java | 2 +- .../codec/socks/SocksCmdResponseTest.java | 2 +- .../codec/socks/SocksCommonTestUtils.java | 2 +- .../codec/socks/SocksInitRequestTest.java | 2 +- .../codec/socks/SocksInitResponseTest.java | 2 +- .../socksproxy/SocksServerConnectHandler.java | 6 +++--- .../netty/example/socksproxy/SocksServerHandler.java | 12 ++++++------ .../example/socksproxy/SocksServerInitializer.java | 4 ++-- 35 files changed, 43 insertions(+), 43 deletions(-) rename codec-socks/src/main/java/io/netty/{ => handler}/codec/socks/SocksAuthRequest.java (98%) rename codec-socks/src/main/java/io/netty/{ => handler}/codec/socks/SocksAuthRequestDecoder.java (98%) rename codec-socks/src/main/java/io/netty/{ => handler}/codec/socks/SocksAuthResponse.java (97%) rename codec-socks/src/main/java/io/netty/{ => handler}/codec/socks/SocksAuthResponseDecoder.java (98%) rename codec-socks/src/main/java/io/netty/{ => handler}/codec/socks/SocksCmdRequest.java (99%) rename codec-socks/src/main/java/io/netty/{ => handler}/codec/socks/SocksCmdRequestDecoder.java (98%) rename codec-socks/src/main/java/io/netty/{ => handler}/codec/socks/SocksCmdResponse.java (98%) rename codec-socks/src/main/java/io/netty/{ => handler}/codec/socks/SocksCmdResponseDecoder.java (98%) rename codec-socks/src/main/java/io/netty/{ => handler}/codec/socks/SocksCommonUtils.java (99%) rename codec-socks/src/main/java/io/netty/{ => handler}/codec/socks/SocksInitRequest.java (97%) rename codec-socks/src/main/java/io/netty/{ => handler}/codec/socks/SocksInitRequestDecoder.java (98%) rename codec-socks/src/main/java/io/netty/{ => handler}/codec/socks/SocksInitResponse.java (97%) rename codec-socks/src/main/java/io/netty/{ => handler}/codec/socks/SocksInitResponseDecoder.java (98%) rename codec-socks/src/main/java/io/netty/{ => handler}/codec/socks/SocksMessage.java (99%) rename codec-socks/src/main/java/io/netty/{ => handler}/codec/socks/SocksMessageEncoder.java (97%) rename codec-socks/src/main/java/io/netty/{ => handler}/codec/socks/SocksRequest.java (97%) rename codec-socks/src/main/java/io/netty/{ => handler}/codec/socks/SocksResponse.java (97%) rename codec-socks/src/main/java/io/netty/{ => handler}/codec/socks/UnknownSocksMessage.java (96%) rename codec-socks/src/main/java/io/netty/{ => handler}/codec/socks/UnknownSocksRequest.java (96%) rename codec-socks/src/main/java/io/netty/{ => handler}/codec/socks/UnknownSocksResponse.java (96%) rename codec-socks/src/main/java/io/netty/{ => handler}/codec/socks/package-info.java (94%) rename codec-socks/src/test/java/io/netty/{ => handler}/codec/socks/SocksAuthRequestDecoderTest.java (97%) rename codec-socks/src/test/java/io/netty/{ => handler}/codec/socks/SocksAuthRequestTest.java (98%) rename codec-socks/src/test/java/io/netty/{ => handler}/codec/socks/SocksAuthResponseDecoderTest.java (97%) rename codec-socks/src/test/java/io/netty/{ => handler}/codec/socks/SocksAuthResponseTest.java (96%) rename codec-socks/src/test/java/io/netty/{ => handler}/codec/socks/SocksCmdRequestDecoderTest.java (99%) rename codec-socks/src/test/java/io/netty/{ => handler}/codec/socks/SocksCmdRequestTest.java (98%) rename codec-socks/src/test/java/io/netty/{ => handler}/codec/socks/SocksCmdResponseDecoderTest.java (98%) rename codec-socks/src/test/java/io/netty/{ => handler}/codec/socks/SocksCmdResponseTest.java (96%) rename codec-socks/src/test/java/io/netty/{ => handler}/codec/socks/SocksCommonTestUtils.java (96%) rename codec-socks/src/test/java/io/netty/{ => handler}/codec/socks/SocksInitRequestTest.java (96%) rename codec-socks/src/test/java/io/netty/{ => handler}/codec/socks/SocksInitResponseTest.java (96%) diff --git a/codec-socks/src/main/java/io/netty/codec/socks/SocksAuthRequest.java b/codec-socks/src/main/java/io/netty/handler/codec/socks/SocksAuthRequest.java similarity index 98% rename from codec-socks/src/main/java/io/netty/codec/socks/SocksAuthRequest.java rename to codec-socks/src/main/java/io/netty/handler/codec/socks/SocksAuthRequest.java index 28e70ac3d0..0aab65aa93 100644 --- a/codec-socks/src/main/java/io/netty/codec/socks/SocksAuthRequest.java +++ b/codec-socks/src/main/java/io/netty/handler/codec/socks/SocksAuthRequest.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations * under the License. */ -package io.netty.codec.socks; +package io.netty.handler.codec.socks; import io.netty.buffer.ByteBuf; import io.netty.util.CharsetUtil; diff --git a/codec-socks/src/main/java/io/netty/codec/socks/SocksAuthRequestDecoder.java b/codec-socks/src/main/java/io/netty/handler/codec/socks/SocksAuthRequestDecoder.java similarity index 98% rename from codec-socks/src/main/java/io/netty/codec/socks/SocksAuthRequestDecoder.java rename to codec-socks/src/main/java/io/netty/handler/codec/socks/SocksAuthRequestDecoder.java index 3f4e9e8df7..86461101cb 100644 --- a/codec-socks/src/main/java/io/netty/codec/socks/SocksAuthRequestDecoder.java +++ b/codec-socks/src/main/java/io/netty/handler/codec/socks/SocksAuthRequestDecoder.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations * under the License. */ -package io.netty.codec.socks; +package io.netty.handler.codec.socks; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; diff --git a/codec-socks/src/main/java/io/netty/codec/socks/SocksAuthResponse.java b/codec-socks/src/main/java/io/netty/handler/codec/socks/SocksAuthResponse.java similarity index 97% rename from codec-socks/src/main/java/io/netty/codec/socks/SocksAuthResponse.java rename to codec-socks/src/main/java/io/netty/handler/codec/socks/SocksAuthResponse.java index 59a1bd615d..860273f4b6 100644 --- a/codec-socks/src/main/java/io/netty/codec/socks/SocksAuthResponse.java +++ b/codec-socks/src/main/java/io/netty/handler/codec/socks/SocksAuthResponse.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations * under the License. */ -package io.netty.codec.socks; +package io.netty.handler.codec.socks; import io.netty.buffer.ByteBuf; diff --git a/codec-socks/src/main/java/io/netty/codec/socks/SocksAuthResponseDecoder.java b/codec-socks/src/main/java/io/netty/handler/codec/socks/SocksAuthResponseDecoder.java similarity index 98% rename from codec-socks/src/main/java/io/netty/codec/socks/SocksAuthResponseDecoder.java rename to codec-socks/src/main/java/io/netty/handler/codec/socks/SocksAuthResponseDecoder.java index 32b176de6a..50c5639fbc 100644 --- a/codec-socks/src/main/java/io/netty/codec/socks/SocksAuthResponseDecoder.java +++ b/codec-socks/src/main/java/io/netty/handler/codec/socks/SocksAuthResponseDecoder.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations * under the License. */ -package io.netty.codec.socks; +package io.netty.handler.codec.socks; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; diff --git a/codec-socks/src/main/java/io/netty/codec/socks/SocksCmdRequest.java b/codec-socks/src/main/java/io/netty/handler/codec/socks/SocksCmdRequest.java similarity index 99% rename from codec-socks/src/main/java/io/netty/codec/socks/SocksCmdRequest.java rename to codec-socks/src/main/java/io/netty/handler/codec/socks/SocksCmdRequest.java index 6029937469..796a072176 100644 --- a/codec-socks/src/main/java/io/netty/codec/socks/SocksCmdRequest.java +++ b/codec-socks/src/main/java/io/netty/handler/codec/socks/SocksCmdRequest.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations * under the License. */ -package io.netty.codec.socks; +package io.netty.handler.codec.socks; import io.netty.buffer.ByteBuf; import io.netty.util.CharsetUtil; diff --git a/codec-socks/src/main/java/io/netty/codec/socks/SocksCmdRequestDecoder.java b/codec-socks/src/main/java/io/netty/handler/codec/socks/SocksCmdRequestDecoder.java similarity index 98% rename from codec-socks/src/main/java/io/netty/codec/socks/SocksCmdRequestDecoder.java rename to codec-socks/src/main/java/io/netty/handler/codec/socks/SocksCmdRequestDecoder.java index a5243a1ccb..21888fff6f 100644 --- a/codec-socks/src/main/java/io/netty/codec/socks/SocksCmdRequestDecoder.java +++ b/codec-socks/src/main/java/io/netty/handler/codec/socks/SocksCmdRequestDecoder.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations * under the License. */ -package io.netty.codec.socks; +package io.netty.handler.codec.socks; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; diff --git a/codec-socks/src/main/java/io/netty/codec/socks/SocksCmdResponse.java b/codec-socks/src/main/java/io/netty/handler/codec/socks/SocksCmdResponse.java similarity index 98% rename from codec-socks/src/main/java/io/netty/codec/socks/SocksCmdResponse.java rename to codec-socks/src/main/java/io/netty/handler/codec/socks/SocksCmdResponse.java index 6e0328da76..c6edfb9478 100644 --- a/codec-socks/src/main/java/io/netty/codec/socks/SocksCmdResponse.java +++ b/codec-socks/src/main/java/io/netty/handler/codec/socks/SocksCmdResponse.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations * under the License. */ -package io.netty.codec.socks; +package io.netty.handler.codec.socks; import io.netty.buffer.ByteBuf; diff --git a/codec-socks/src/main/java/io/netty/codec/socks/SocksCmdResponseDecoder.java b/codec-socks/src/main/java/io/netty/handler/codec/socks/SocksCmdResponseDecoder.java similarity index 98% rename from codec-socks/src/main/java/io/netty/codec/socks/SocksCmdResponseDecoder.java rename to codec-socks/src/main/java/io/netty/handler/codec/socks/SocksCmdResponseDecoder.java index 0a4767a5a7..f4d43f868d 100644 --- a/codec-socks/src/main/java/io/netty/codec/socks/SocksCmdResponseDecoder.java +++ b/codec-socks/src/main/java/io/netty/handler/codec/socks/SocksCmdResponseDecoder.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations * under the License. */ -package io.netty.codec.socks; +package io.netty.handler.codec.socks; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; diff --git a/codec-socks/src/main/java/io/netty/codec/socks/SocksCommonUtils.java b/codec-socks/src/main/java/io/netty/handler/codec/socks/SocksCommonUtils.java similarity index 99% rename from codec-socks/src/main/java/io/netty/codec/socks/SocksCommonUtils.java rename to codec-socks/src/main/java/io/netty/handler/codec/socks/SocksCommonUtils.java index c3b84a232c..b16a741e8e 100644 --- a/codec-socks/src/main/java/io/netty/codec/socks/SocksCommonUtils.java +++ b/codec-socks/src/main/java/io/netty/handler/codec/socks/SocksCommonUtils.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations * under the License. */ -package io.netty.codec.socks; +package io.netty.handler.codec.socks; final class SocksCommonUtils { public static final SocksRequest UNKNOWN_SOCKS_REQUEST = new UnknownSocksRequest(); diff --git a/codec-socks/src/main/java/io/netty/codec/socks/SocksInitRequest.java b/codec-socks/src/main/java/io/netty/handler/codec/socks/SocksInitRequest.java similarity index 97% rename from codec-socks/src/main/java/io/netty/codec/socks/SocksInitRequest.java rename to codec-socks/src/main/java/io/netty/handler/codec/socks/SocksInitRequest.java index d4bbfdf6a6..dfa5a4d313 100644 --- a/codec-socks/src/main/java/io/netty/codec/socks/SocksInitRequest.java +++ b/codec-socks/src/main/java/io/netty/handler/codec/socks/SocksInitRequest.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations * under the License. */ -package io.netty.codec.socks; +package io.netty.handler.codec.socks; import io.netty.buffer.ByteBuf; diff --git a/codec-socks/src/main/java/io/netty/codec/socks/SocksInitRequestDecoder.java b/codec-socks/src/main/java/io/netty/handler/codec/socks/SocksInitRequestDecoder.java similarity index 98% rename from codec-socks/src/main/java/io/netty/codec/socks/SocksInitRequestDecoder.java rename to codec-socks/src/main/java/io/netty/handler/codec/socks/SocksInitRequestDecoder.java index 04a51bf8e5..36d98d9cde 100644 --- a/codec-socks/src/main/java/io/netty/codec/socks/SocksInitRequestDecoder.java +++ b/codec-socks/src/main/java/io/netty/handler/codec/socks/SocksInitRequestDecoder.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations * under the License. */ -package io.netty.codec.socks; +package io.netty.handler.codec.socks; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; diff --git a/codec-socks/src/main/java/io/netty/codec/socks/SocksInitResponse.java b/codec-socks/src/main/java/io/netty/handler/codec/socks/SocksInitResponse.java similarity index 97% rename from codec-socks/src/main/java/io/netty/codec/socks/SocksInitResponse.java rename to codec-socks/src/main/java/io/netty/handler/codec/socks/SocksInitResponse.java index 1efb2bdbea..3fc7372e02 100644 --- a/codec-socks/src/main/java/io/netty/codec/socks/SocksInitResponse.java +++ b/codec-socks/src/main/java/io/netty/handler/codec/socks/SocksInitResponse.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations * under the License. */ -package io.netty.codec.socks; +package io.netty.handler.codec.socks; import io.netty.buffer.ByteBuf; diff --git a/codec-socks/src/main/java/io/netty/codec/socks/SocksInitResponseDecoder.java b/codec-socks/src/main/java/io/netty/handler/codec/socks/SocksInitResponseDecoder.java similarity index 98% rename from codec-socks/src/main/java/io/netty/codec/socks/SocksInitResponseDecoder.java rename to codec-socks/src/main/java/io/netty/handler/codec/socks/SocksInitResponseDecoder.java index b1bf2c4c1f..49eb4d4277 100644 --- a/codec-socks/src/main/java/io/netty/codec/socks/SocksInitResponseDecoder.java +++ b/codec-socks/src/main/java/io/netty/handler/codec/socks/SocksInitResponseDecoder.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations * under the License. */ -package io.netty.codec.socks; +package io.netty.handler.codec.socks; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; diff --git a/codec-socks/src/main/java/io/netty/codec/socks/SocksMessage.java b/codec-socks/src/main/java/io/netty/handler/codec/socks/SocksMessage.java similarity index 99% rename from codec-socks/src/main/java/io/netty/codec/socks/SocksMessage.java rename to codec-socks/src/main/java/io/netty/handler/codec/socks/SocksMessage.java index 46e515e183..784bdf27fa 100644 --- a/codec-socks/src/main/java/io/netty/codec/socks/SocksMessage.java +++ b/codec-socks/src/main/java/io/netty/handler/codec/socks/SocksMessage.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations * under the License. */ -package io.netty.codec.socks; +package io.netty.handler.codec.socks; import io.netty.buffer.ByteBuf; diff --git a/codec-socks/src/main/java/io/netty/codec/socks/SocksMessageEncoder.java b/codec-socks/src/main/java/io/netty/handler/codec/socks/SocksMessageEncoder.java similarity index 97% rename from codec-socks/src/main/java/io/netty/codec/socks/SocksMessageEncoder.java rename to codec-socks/src/main/java/io/netty/handler/codec/socks/SocksMessageEncoder.java index 9432ada2fe..d17eec2563 100644 --- a/codec-socks/src/main/java/io/netty/codec/socks/SocksMessageEncoder.java +++ b/codec-socks/src/main/java/io/netty/handler/codec/socks/SocksMessageEncoder.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations * under the License. */ -package io.netty.codec.socks; +package io.netty.handler.codec.socks; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandler; diff --git a/codec-socks/src/main/java/io/netty/codec/socks/SocksRequest.java b/codec-socks/src/main/java/io/netty/handler/codec/socks/SocksRequest.java similarity index 97% rename from codec-socks/src/main/java/io/netty/codec/socks/SocksRequest.java rename to codec-socks/src/main/java/io/netty/handler/codec/socks/SocksRequest.java index bfc96ba11a..6c65c6ac18 100644 --- a/codec-socks/src/main/java/io/netty/codec/socks/SocksRequest.java +++ b/codec-socks/src/main/java/io/netty/handler/codec/socks/SocksRequest.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations * under the License. */ -package io.netty.codec.socks; +package io.netty.handler.codec.socks; /** * An abstract class that defines a SocksRequest, providing common properties for diff --git a/codec-socks/src/main/java/io/netty/codec/socks/SocksResponse.java b/codec-socks/src/main/java/io/netty/handler/codec/socks/SocksResponse.java similarity index 97% rename from codec-socks/src/main/java/io/netty/codec/socks/SocksResponse.java rename to codec-socks/src/main/java/io/netty/handler/codec/socks/SocksResponse.java index b5babe85d3..3456d8d7e0 100644 --- a/codec-socks/src/main/java/io/netty/codec/socks/SocksResponse.java +++ b/codec-socks/src/main/java/io/netty/handler/codec/socks/SocksResponse.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations * under the License. */ -package io.netty.codec.socks; +package io.netty.handler.codec.socks; /** * An abstract class that defines a SocksResponse, providing common properties for diff --git a/codec-socks/src/main/java/io/netty/codec/socks/UnknownSocksMessage.java b/codec-socks/src/main/java/io/netty/handler/codec/socks/UnknownSocksMessage.java similarity index 96% rename from codec-socks/src/main/java/io/netty/codec/socks/UnknownSocksMessage.java rename to codec-socks/src/main/java/io/netty/handler/codec/socks/UnknownSocksMessage.java index bbf04ff8bf..d970e4aca0 100644 --- a/codec-socks/src/main/java/io/netty/codec/socks/UnknownSocksMessage.java +++ b/codec-socks/src/main/java/io/netty/handler/codec/socks/UnknownSocksMessage.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations * under the License. */ -package io.netty.codec.socks; +package io.netty.handler.codec.socks; import io.netty.buffer.ByteBuf; diff --git a/codec-socks/src/main/java/io/netty/codec/socks/UnknownSocksRequest.java b/codec-socks/src/main/java/io/netty/handler/codec/socks/UnknownSocksRequest.java similarity index 96% rename from codec-socks/src/main/java/io/netty/codec/socks/UnknownSocksRequest.java rename to codec-socks/src/main/java/io/netty/handler/codec/socks/UnknownSocksRequest.java index 477b1d939e..e99687c562 100644 --- a/codec-socks/src/main/java/io/netty/codec/socks/UnknownSocksRequest.java +++ b/codec-socks/src/main/java/io/netty/handler/codec/socks/UnknownSocksRequest.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations * under the License. */ -package io.netty.codec.socks; +package io.netty.handler.codec.socks; import io.netty.buffer.ByteBuf; diff --git a/codec-socks/src/main/java/io/netty/codec/socks/UnknownSocksResponse.java b/codec-socks/src/main/java/io/netty/handler/codec/socks/UnknownSocksResponse.java similarity index 96% rename from codec-socks/src/main/java/io/netty/codec/socks/UnknownSocksResponse.java rename to codec-socks/src/main/java/io/netty/handler/codec/socks/UnknownSocksResponse.java index 6f6b27ef16..9f4e5f80e7 100644 --- a/codec-socks/src/main/java/io/netty/codec/socks/UnknownSocksResponse.java +++ b/codec-socks/src/main/java/io/netty/handler/codec/socks/UnknownSocksResponse.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations * under the License. */ -package io.netty.codec.socks; +package io.netty.handler.codec.socks; import io.netty.buffer.ByteBuf; diff --git a/codec-socks/src/main/java/io/netty/codec/socks/package-info.java b/codec-socks/src/main/java/io/netty/handler/codec/socks/package-info.java similarity index 94% rename from codec-socks/src/main/java/io/netty/codec/socks/package-info.java rename to codec-socks/src/main/java/io/netty/handler/codec/socks/package-info.java index fd07765ff4..06d06a4010 100644 --- a/codec-socks/src/main/java/io/netty/codec/socks/package-info.java +++ b/codec-socks/src/main/java/io/netty/handler/codec/socks/package-info.java @@ -17,4 +17,4 @@ /** * Encoder, decoder and their related message types for Socks. */ -package io.netty.codec.socks; +package io.netty.handler.codec.socks; diff --git a/codec-socks/src/test/java/io/netty/codec/socks/SocksAuthRequestDecoderTest.java b/codec-socks/src/test/java/io/netty/handler/codec/socks/SocksAuthRequestDecoderTest.java similarity index 97% rename from codec-socks/src/test/java/io/netty/codec/socks/SocksAuthRequestDecoderTest.java rename to codec-socks/src/test/java/io/netty/handler/codec/socks/SocksAuthRequestDecoderTest.java index 0b91e5e6fd..b411cc7f98 100644 --- a/codec-socks/src/test/java/io/netty/codec/socks/SocksAuthRequestDecoderTest.java +++ b/codec-socks/src/test/java/io/netty/handler/codec/socks/SocksAuthRequestDecoderTest.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations * under the License. */ -package io.netty.codec.socks; +package io.netty.handler.codec.socks; import io.netty.channel.embedded.EmbeddedByteChannel; import org.junit.Test; diff --git a/codec-socks/src/test/java/io/netty/codec/socks/SocksAuthRequestTest.java b/codec-socks/src/test/java/io/netty/handler/codec/socks/SocksAuthRequestTest.java similarity index 98% rename from codec-socks/src/test/java/io/netty/codec/socks/SocksAuthRequestTest.java rename to codec-socks/src/test/java/io/netty/handler/codec/socks/SocksAuthRequestTest.java index 79ae1adb8d..1624c83f74 100644 --- a/codec-socks/src/test/java/io/netty/codec/socks/SocksAuthRequestTest.java +++ b/codec-socks/src/test/java/io/netty/handler/codec/socks/SocksAuthRequestTest.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations * under the License. */ -package io.netty.codec.socks; +package io.netty.handler.codec.socks; import org.junit.Test; import static org.junit.Assert.assertTrue; diff --git a/codec-socks/src/test/java/io/netty/codec/socks/SocksAuthResponseDecoderTest.java b/codec-socks/src/test/java/io/netty/handler/codec/socks/SocksAuthResponseDecoderTest.java similarity index 97% rename from codec-socks/src/test/java/io/netty/codec/socks/SocksAuthResponseDecoderTest.java rename to codec-socks/src/test/java/io/netty/handler/codec/socks/SocksAuthResponseDecoderTest.java index 409db34d99..cb8f26086d 100644 --- a/codec-socks/src/test/java/io/netty/codec/socks/SocksAuthResponseDecoderTest.java +++ b/codec-socks/src/test/java/io/netty/handler/codec/socks/SocksAuthResponseDecoderTest.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations * under the License. */ -package io.netty.codec.socks; +package io.netty.handler.codec.socks; import io.netty.channel.embedded.EmbeddedByteChannel; import org.junit.Test; diff --git a/codec-socks/src/test/java/io/netty/codec/socks/SocksAuthResponseTest.java b/codec-socks/src/test/java/io/netty/handler/codec/socks/SocksAuthResponseTest.java similarity index 96% rename from codec-socks/src/test/java/io/netty/codec/socks/SocksAuthResponseTest.java rename to codec-socks/src/test/java/io/netty/handler/codec/socks/SocksAuthResponseTest.java index ae9f43669b..0c15941327 100644 --- a/codec-socks/src/test/java/io/netty/codec/socks/SocksAuthResponseTest.java +++ b/codec-socks/src/test/java/io/netty/handler/codec/socks/SocksAuthResponseTest.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations * under the License. */ -package io.netty.codec.socks; +package io.netty.handler.codec.socks; import org.junit.Test; import static org.junit.Assert.assertTrue; diff --git a/codec-socks/src/test/java/io/netty/codec/socks/SocksCmdRequestDecoderTest.java b/codec-socks/src/test/java/io/netty/handler/codec/socks/SocksCmdRequestDecoderTest.java similarity index 99% rename from codec-socks/src/test/java/io/netty/codec/socks/SocksCmdRequestDecoderTest.java rename to codec-socks/src/test/java/io/netty/handler/codec/socks/SocksCmdRequestDecoderTest.java index 0f59a99ac1..b25eb6ff02 100644 --- a/codec-socks/src/test/java/io/netty/codec/socks/SocksCmdRequestDecoderTest.java +++ b/codec-socks/src/test/java/io/netty/handler/codec/socks/SocksCmdRequestDecoderTest.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations * under the License. */ -package io.netty.codec.socks; +package io.netty.handler.codec.socks; import io.netty.channel.embedded.EmbeddedByteChannel; import org.junit.Test; diff --git a/codec-socks/src/test/java/io/netty/codec/socks/SocksCmdRequestTest.java b/codec-socks/src/test/java/io/netty/handler/codec/socks/SocksCmdRequestTest.java similarity index 98% rename from codec-socks/src/test/java/io/netty/codec/socks/SocksCmdRequestTest.java rename to codec-socks/src/test/java/io/netty/handler/codec/socks/SocksCmdRequestTest.java index cf6fa6a374..e325a62e51 100644 --- a/codec-socks/src/test/java/io/netty/codec/socks/SocksCmdRequestTest.java +++ b/codec-socks/src/test/java/io/netty/handler/codec/socks/SocksCmdRequestTest.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations * under the License. */ -package io.netty.codec.socks; +package io.netty.handler.codec.socks; import org.junit.Test; import static org.junit.Assert.assertTrue; diff --git a/codec-socks/src/test/java/io/netty/codec/socks/SocksCmdResponseDecoderTest.java b/codec-socks/src/test/java/io/netty/handler/codec/socks/SocksCmdResponseDecoderTest.java similarity index 98% rename from codec-socks/src/test/java/io/netty/codec/socks/SocksCmdResponseDecoderTest.java rename to codec-socks/src/test/java/io/netty/handler/codec/socks/SocksCmdResponseDecoderTest.java index 6aad521477..ed4f196aba 100644 --- a/codec-socks/src/test/java/io/netty/codec/socks/SocksCmdResponseDecoderTest.java +++ b/codec-socks/src/test/java/io/netty/handler/codec/socks/SocksCmdResponseDecoderTest.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations * under the License. */ -package io.netty.codec.socks; +package io.netty.handler.codec.socks; import io.netty.channel.embedded.EmbeddedByteChannel; import org.junit.Test; diff --git a/codec-socks/src/test/java/io/netty/codec/socks/SocksCmdResponseTest.java b/codec-socks/src/test/java/io/netty/handler/codec/socks/SocksCmdResponseTest.java similarity index 96% rename from codec-socks/src/test/java/io/netty/codec/socks/SocksCmdResponseTest.java rename to codec-socks/src/test/java/io/netty/handler/codec/socks/SocksCmdResponseTest.java index a3e7fcfd23..93acf694e1 100644 --- a/codec-socks/src/test/java/io/netty/codec/socks/SocksCmdResponseTest.java +++ b/codec-socks/src/test/java/io/netty/handler/codec/socks/SocksCmdResponseTest.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations * under the License. */ -package io.netty.codec.socks; +package io.netty.handler.codec.socks; import org.junit.Test; import static org.junit.Assert.assertTrue; diff --git a/codec-socks/src/test/java/io/netty/codec/socks/SocksCommonTestUtils.java b/codec-socks/src/test/java/io/netty/handler/codec/socks/SocksCommonTestUtils.java similarity index 96% rename from codec-socks/src/test/java/io/netty/codec/socks/SocksCommonTestUtils.java rename to codec-socks/src/test/java/io/netty/handler/codec/socks/SocksCommonTestUtils.java index fb7ef77fd3..ade7a7e417 100644 --- a/codec-socks/src/test/java/io/netty/codec/socks/SocksCommonTestUtils.java +++ b/codec-socks/src/test/java/io/netty/handler/codec/socks/SocksCommonTestUtils.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations * under the License. */ -package io.netty.codec.socks; +package io.netty.handler.codec.socks; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; diff --git a/codec-socks/src/test/java/io/netty/codec/socks/SocksInitRequestTest.java b/codec-socks/src/test/java/io/netty/handler/codec/socks/SocksInitRequestTest.java similarity index 96% rename from codec-socks/src/test/java/io/netty/codec/socks/SocksInitRequestTest.java rename to codec-socks/src/test/java/io/netty/handler/codec/socks/SocksInitRequestTest.java index 737a5f07ec..a1e92a87e3 100644 --- a/codec-socks/src/test/java/io/netty/codec/socks/SocksInitRequestTest.java +++ b/codec-socks/src/test/java/io/netty/handler/codec/socks/SocksInitRequestTest.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations * under the License. */ -package io.netty.codec.socks; +package io.netty.handler.codec.socks; import org.junit.Test; import static org.junit.Assert.assertTrue; diff --git a/codec-socks/src/test/java/io/netty/codec/socks/SocksInitResponseTest.java b/codec-socks/src/test/java/io/netty/handler/codec/socks/SocksInitResponseTest.java similarity index 96% rename from codec-socks/src/test/java/io/netty/codec/socks/SocksInitResponseTest.java rename to codec-socks/src/test/java/io/netty/handler/codec/socks/SocksInitResponseTest.java index 91c971f5b0..60decff766 100644 --- a/codec-socks/src/test/java/io/netty/codec/socks/SocksInitResponseTest.java +++ b/codec-socks/src/test/java/io/netty/handler/codec/socks/SocksInitResponseTest.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations * under the License. */ -package io.netty.codec.socks; +package io.netty.handler.codec.socks; import org.junit.Test; import static org.junit.Assert.assertTrue; diff --git a/example/src/main/java/io/netty/example/socksproxy/SocksServerConnectHandler.java b/example/src/main/java/io/netty/example/socksproxy/SocksServerConnectHandler.java index aacc62ef38..35c84dcceb 100644 --- a/example/src/main/java/io/netty/example/socksproxy/SocksServerConnectHandler.java +++ b/example/src/main/java/io/netty/example/socksproxy/SocksServerConnectHandler.java @@ -24,9 +24,9 @@ import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelInboundMessageHandlerAdapter; import io.netty.channel.ChannelOption; import io.netty.channel.socket.nio.NioSocketChannel; -import io.netty.codec.socks.SocksCmdRequest; -import io.netty.codec.socks.SocksCmdResponse; -import io.netty.codec.socks.SocksMessage; +import io.netty.handler.codec.socks.SocksCmdRequest; +import io.netty.handler.codec.socks.SocksCmdResponse; +import io.netty.handler.codec.socks.SocksMessage; @ChannelHandler.Sharable diff --git a/example/src/main/java/io/netty/example/socksproxy/SocksServerHandler.java b/example/src/main/java/io/netty/example/socksproxy/SocksServerHandler.java index e571b2cecf..1b5a065353 100644 --- a/example/src/main/java/io/netty/example/socksproxy/SocksServerHandler.java +++ b/example/src/main/java/io/netty/example/socksproxy/SocksServerHandler.java @@ -18,12 +18,12 @@ package io.netty.example.socksproxy; import io.netty.channel.ChannelHandler; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelInboundMessageHandlerAdapter; -import io.netty.codec.socks.SocksCmdRequestDecoder; -import io.netty.codec.socks.SocksInitResponse; -import io.netty.codec.socks.SocksMessage; -import io.netty.codec.socks.SocksRequest; -import io.netty.codec.socks.SocksAuthResponse; -import io.netty.codec.socks.SocksCmdRequest; +import io.netty.handler.codec.socks.SocksCmdRequestDecoder; +import io.netty.handler.codec.socks.SocksInitResponse; +import io.netty.handler.codec.socks.SocksMessage; +import io.netty.handler.codec.socks.SocksRequest; +import io.netty.handler.codec.socks.SocksAuthResponse; +import io.netty.handler.codec.socks.SocksCmdRequest; @ChannelHandler.Sharable diff --git a/example/src/main/java/io/netty/example/socksproxy/SocksServerInitializer.java b/example/src/main/java/io/netty/example/socksproxy/SocksServerInitializer.java index aa978b2ebe..8649de66a0 100644 --- a/example/src/main/java/io/netty/example/socksproxy/SocksServerInitializer.java +++ b/example/src/main/java/io/netty/example/socksproxy/SocksServerInitializer.java @@ -18,8 +18,8 @@ package io.netty.example.socksproxy; import io.netty.channel.ChannelInitializer; import io.netty.channel.ChannelPipeline; import io.netty.channel.socket.SocketChannel; -import io.netty.codec.socks.SocksInitRequestDecoder; -import io.netty.codec.socks.SocksMessageEncoder; +import io.netty.handler.codec.socks.SocksInitRequestDecoder; +import io.netty.handler.codec.socks.SocksMessageEncoder; public final class SocksServerInitializer extends ChannelInitializer { private final SocksMessageEncoder socksMessageEncoder = new SocksMessageEncoder();