Merge branch 'master' of https://github.com/TooTallNate/Java-WebSocket

Author: Davidiusdadi

.gitignore

@@ -1,3 +1,3 @@
 *.class
 *.svn
-
+*~

LICENSE

@@ -1,4 +1,4 @@
- Copyright (c) 2010 Nathan Rajlich
+ Copyright (c) 2010-2012 Nathan Rajlich
 
  Permission is hereby granted, free of charge, to any person
  obtaining a copy of this software and associated documentation

README.markdown

@@ -1,15 +1,19 @@
 Java WebSockets
 ===============
 
-### Note: This lib currently only supports the older draft 75 and draft 76.
-###       Pull requests for the latests drafts would be more than accepted!
-
 This repository contains a barebones WebSocket server and client implementation
 written in 100% Java. The underlying classes are implemented using the Java
 `ServerSocketChannel` and `SocketChannel` classes, which allows for a
 non-blocking event-driven model (similar to the
 [WebSocket API](http://dev.w3.org/html5/websockets/) for web browsers).
 
+Implemented WebSocket protocol versions are:
+
+ * [Hixie 75](http://tools.ietf.org/id/draft-hixie-thewebsocketprotocol-75.txt)
+ * [Hixie 76](http://tools.ietf.org/id/draft-hixie-thewebsocketprotocol-76.txt)
+ * [Hybi 10](http://tools.ietf.org/id/draft-ietf-hybi-thewebsocketprotocol-10.txt)
+ * [Hybi 17](http://tools.ietf.org/id/draft-ietf-hybi-thewebsocketprotocol-17.txt)
+
 Running the Example
 -------------------
 

dist/WebSocket.jar

@@ -60,14 +60,8 @@ public enum Role{
    * The byte representing the end of a WebSocket text frame.
    */
   public static final byte END_OF_FRAME = (byte)0xFF;
-  
+
   public static final boolean DEBUG = false;
-  
-  static{
-	if ( DEBUG ) {
-		System.out.println("WebSocket debug mode enabled");
-	}
-  }
 
 
   // INSTANCE PROPERTIES /////////////////////////////////////////////////////

src/net/tootallnate/websocket/Base64.java

@@ -8,6 +8,7 @@
 import java.util.List;
 import java.util.Random;
 
+import net.tootallnate.websocket.Base64;
 import net.tootallnate.websocket.Draft;
 import net.tootallnate.websocket.FrameBuilder;
 import net.tootallnate.websocket.Framedata;
@@ -16,7 +17,6 @@
 import net.tootallnate.websocket.HandshakeBuilder;
 import net.tootallnate.websocket.Handshakedata;
 import net.tootallnate.websocket.exeptions.InvalidHandshakeException;
-import sun.misc.BASE64Encoder;
 
 
 public class Draft_10 extends Draft {
@@ -158,7 +158,7 @@ private String generateFinalKey( String in ){
 		} catch ( NoSuchAlgorithmException e ) {
 			throw new RuntimeException ( e );
 		}
-		return new BASE64Encoder ().encode ( sh1.digest ( acc.getBytes () ) );
+		return Base64.encodeBytes ( sh1.digest ( acc.getBytes () ) );
 	}
 
 	@Override
@@ -169,7 +169,7 @@ public HandshakeBuilder postProcessHandshakeRequestAsClient( HandshakeBuilder re
 
 		byte[] random = new byte[16];
 		new Random().nextBytes( random );
-		request.put( "Sec-WebSocket-Key" , new BASE64Encoder().encode ( random ) );
+		request.put( "Sec-WebSocket-Key" , Base64.encodeBytes( random ) );
 
 		return request;
 	}