Get rid of the Netty WebSocket classes as they are now part of the 3.3 distribution

Author: jfarcand

src/main/java/com/ning/http/client/providers/netty/NettyAsyncHttpProvider.java

@@ -46,9 +46,6 @@
 import com.ning.http.client.ntlm.NTLMEngine;
 import com.ning.http.client.ntlm.NTLMEngineException;
 import com.ning.http.client.providers.netty.spnego.SpnegoEngine;
-import com.ning.http.client.providers.netty.netty4.WebSocket08FrameDecoder;
-import com.ning.http.client.providers.netty.netty4.WebSocket08FrameEncoder;
-import com.ning.http.client.providers.netty.netty4.WebSocketFrame;
 import com.ning.http.client.websocket.WebSocketUpgradeHandler;
 import com.ning.http.multipart.MultipartBody;
 import com.ning.http.multipart.MultipartRequestEntity;
@@ -94,6 +91,9 @@
 import org.jboss.netty.handler.codec.http.HttpResponse;
 import org.jboss.netty.handler.codec.http.HttpResponseDecoder;
 import org.jboss.netty.handler.codec.http.HttpVersion;
+import org.jboss.netty.handler.codec.http.websocketx.WebSocket08FrameDecoder;
+import org.jboss.netty.handler.codec.http.websocketx.WebSocket08FrameEncoder;
+import org.jboss.netty.handler.codec.http.websocketx.WebSocketFrame;
 import org.jboss.netty.handler.ssl.SslHandler;
 import org.jboss.netty.handler.stream.ChunkedFile;
 import org.jboss.netty.handler.stream.ChunkedWriteHandler;

src/main/java/com/ning/http/client/providers/netty/NettyWebSocket.java

@@ -12,15 +12,15 @@
  */
 package com.ning.http.client.providers.netty;
 
-import com.ning.http.client.providers.netty.netty4.BinaryWebSocketFrame;
-import com.ning.http.client.providers.netty.netty4.PingWebSocketFrame;
-import com.ning.http.client.providers.netty.netty4.PongWebSocketFrame;
-import com.ning.http.client.providers.netty.netty4.TextWebSocketFrame;
 import com.ning.http.client.websocket.WebSocket;
 import com.ning.http.client.websocket.WebSocketByteListener;
 import com.ning.http.client.websocket.WebSocketListener;
 import com.ning.http.client.websocket.WebSocketTextListener;
 import org.jboss.netty.channel.Channel;
+import org.jboss.netty.handler.codec.http.websocketx.BinaryWebSocketFrame;
+import org.jboss.netty.handler.codec.http.websocketx.PingWebSocketFrame;
+import org.jboss.netty.handler.codec.http.websocketx.PongWebSocketFrame;
+import org.jboss.netty.handler.codec.http.websocketx.TextWebSocketFrame;
 
 import java.util.concurrent.ConcurrentLinkedQueue;