From e0a301c2db4975a1aab459906441156e46367da7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E6=9D=B0?= <tiantian.china.2@gmail.com>
Date: Fri, 28 Nov 2014 10:26:50 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BD=BF=E7=94=A8=EF=BC=88https://github.c?=
 =?UTF-8?q?om/wangjiegulu/Java-WebSocket=EF=BC=89websocket?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../example/ChatClient.java                       |   0
 .../example/ChatServer.java                       |   0
 .../example/ExampleClient.java                    |   0
 .../example/FragmentedFramesExample.java          |   0
 .../example/ProxyClientExample.java               |   0
 .../example/SSLClientExample.java                 |   0
 .../example/SSLServerExample.java                 |   0
 .../example/ServerStressTest.java                 |   0
 src/{main => java-websocket}/example/chat.html    |   8 ++++----
 src/{main => java-websocket}/example/prototype.js |   0
 .../example/web-socket-js/WebSocketMain.swf       | Bin
 .../example/web-socket-js/index.html              |   8 ++++----
 .../example/web-socket-js/swfobject.js            |   0
 .../example/web-socket-js/web_socket.js           |   0
 .../AbstractWrappedByteChannel.java               |   0
 .../org/java_websocket/SSLSocketChannel2.java     |  14 +++++++-------
 .../org/java_websocket/SocketChannelIOHelper.java |   0
 .../java/org/java_websocket/WebSocket.java        |   0
 .../java/org/java_websocket/WebSocketAdapter.java |   0
 .../java/org/java_websocket/WebSocketFactory.java |   0
 .../java/org/java_websocket/WebSocketImpl.java    |   0
 .../org/java_websocket/WebSocketListener.java     |   0
 .../org/java_websocket/WrappedByteChannel.java    |   0
 .../client/AbstractClientProxyChannel.java        |   0
 .../java_websocket/client/WebSocketClient.java    |   4 ++--
 .../java/org/java_websocket/drafts/Draft.java     |   0
 .../java/org/java_websocket/drafts/Draft_10.java  |   0
 .../java/org/java_websocket/drafts/Draft_17.java  |   0
 .../java/org/java_websocket/drafts/Draft_75.java  |   0
 .../java/org/java_websocket/drafts/Draft_76.java  |   0
 .../exceptions/IncompleteHandshakeException.java  |   0
 .../exceptions/InvalidDataException.java          |   0
 .../exceptions/InvalidFrameException.java         |   0
 .../exceptions/InvalidHandshakeException.java     |   0
 .../exceptions/LimitExedeedException.java         |   0
 .../exceptions/NotSendableException.java          |   0
 .../WebsocketNotConnectedException.java           |   0
 .../org/java_websocket/framing/CloseFrame.java    |   0
 .../java_websocket/framing/CloseFrameBuilder.java |   0
 .../org/java_websocket/framing/FrameBuilder.java  |   0
 .../org/java_websocket/framing/Framedata.java     |   0
 .../java_websocket/framing/FramedataImpl1.java    |   0
 .../java_websocket/handshake/ClientHandshake.java |   0
 .../handshake/ClientHandshakeBuilder.java         |   0
 .../handshake/HandshakeBuilder.java               |   0
 .../handshake/HandshakeImpl1Client.java           |   0
 .../handshake/HandshakeImpl1Server.java           |   0
 .../java_websocket/handshake/Handshakedata.java   |   0
 .../handshake/HandshakedataImpl1.java             |   0
 .../java_websocket/handshake/ServerHandshake.java |   0
 .../handshake/ServerHandshakeBuilder.java         |   0
 .../server/DefaultSSLWebSocketServerFactory.java  |   0
 .../server/DefaultWebSocketServerFactory.java     |   0
 .../java_websocket/server/WebSocketServer.java    |   0
 .../java/org/java_websocket/util/Base64.java      |   0
 .../org/java_websocket/util/Charsetfunctions.java |   0
 src/test/java/AutobahnClientTest.java             |   0
 src/test/java/AutobahnServerTest.java             |   0
 58 files changed, 17 insertions(+), 17 deletions(-)
 rename src/{main => java-websocket}/example/ChatClient.java (100%)
 mode change 100644 => 100755
 rename src/{main => java-websocket}/example/ChatServer.java (100%)
 mode change 100644 => 100755
 rename src/{main => java-websocket}/example/ExampleClient.java (100%)
 mode change 100644 => 100755
 rename src/{main => java-websocket}/example/FragmentedFramesExample.java (100%)
 mode change 100644 => 100755
 rename src/{main => java-websocket}/example/ProxyClientExample.java (100%)
 mode change 100644 => 100755
 rename src/{main => java-websocket}/example/SSLClientExample.java (100%)
 mode change 100644 => 100755
 rename src/{main => java-websocket}/example/SSLServerExample.java (100%)
 mode change 100644 => 100755
 rename src/{main => java-websocket}/example/ServerStressTest.java (100%)
 mode change 100644 => 100755
 rename src/{main => java-websocket}/example/chat.html (81%)
 mode change 100644 => 100755
 rename src/{main => java-websocket}/example/prototype.js (100%)
 mode change 100644 => 100755
 rename src/{main => java-websocket}/example/web-socket-js/WebSocketMain.swf (100%)
 mode change 100644 => 100755
 rename src/{main => java-websocket}/example/web-socket-js/index.html (76%)
 mode change 100644 => 100755
 rename src/{main => java-websocket}/example/web-socket-js/swfobject.js (100%)
 mode change 100644 => 100755
 rename src/{main => java-websocket}/example/web-socket-js/web_socket.js (100%)
 mode change 100644 => 100755
 rename src/{main => java-websocket}/java/org/java_websocket/AbstractWrappedByteChannel.java (100%)
 mode change 100644 => 100755
 rename src/{main => java-websocket}/java/org/java_websocket/SSLSocketChannel2.java (97%)
 mode change 100644 => 100755
 rename src/{main => java-websocket}/java/org/java_websocket/SocketChannelIOHelper.java (100%)
 mode change 100644 => 100755
 rename src/{main => java-websocket}/java/org/java_websocket/WebSocket.java (100%)
 mode change 100644 => 100755
 rename src/{main => java-websocket}/java/org/java_websocket/WebSocketAdapter.java (100%)
 mode change 100644 => 100755
 rename src/{main => java-websocket}/java/org/java_websocket/WebSocketFactory.java (100%)
 mode change 100644 => 100755
 rename src/{main => java-websocket}/java/org/java_websocket/WebSocketImpl.java (100%)
 mode change 100644 => 100755
 rename src/{main => java-websocket}/java/org/java_websocket/WebSocketListener.java (100%)
 mode change 100644 => 100755
 rename src/{main => java-websocket}/java/org/java_websocket/WrappedByteChannel.java (100%)
 mode change 100644 => 100755
 rename src/{main => java-websocket}/java/org/java_websocket/client/AbstractClientProxyChannel.java (100%)
 mode change 100644 => 100755
 rename src/{main => java-websocket}/java/org/java_websocket/client/WebSocketClient.java (99%)
 mode change 100644 => 100755
 rename src/{main => java-websocket}/java/org/java_websocket/drafts/Draft.java (100%)
 mode change 100644 => 100755
 rename src/{main => java-websocket}/java/org/java_websocket/drafts/Draft_10.java (100%)
 mode change 100644 => 100755
 rename src/{main => java-websocket}/java/org/java_websocket/drafts/Draft_17.java (100%)
 mode change 100644 => 100755
 rename src/{main => java-websocket}/java/org/java_websocket/drafts/Draft_75.java (100%)
 mode change 100644 => 100755
 rename src/{main => java-websocket}/java/org/java_websocket/drafts/Draft_76.java (100%)
 mode change 100644 => 100755
 rename src/{main => java-websocket}/java/org/java_websocket/exceptions/IncompleteHandshakeException.java (100%)
 mode change 100644 => 100755
 rename src/{main => java-websocket}/java/org/java_websocket/exceptions/InvalidDataException.java (100%)
 mode change 100644 => 100755
 rename src/{main => java-websocket}/java/org/java_websocket/exceptions/InvalidFrameException.java (100%)
 mode change 100644 => 100755
 rename src/{main => java-websocket}/java/org/java_websocket/exceptions/InvalidHandshakeException.java (100%)
 mode change 100644 => 100755
 rename src/{main => java-websocket}/java/org/java_websocket/exceptions/LimitExedeedException.java (100%)
 mode change 100644 => 100755
 rename src/{main => java-websocket}/java/org/java_websocket/exceptions/NotSendableException.java (100%)
 mode change 100644 => 100755
 rename src/{main => java-websocket}/java/org/java_websocket/exceptions/WebsocketNotConnectedException.java (100%)
 mode change 100644 => 100755
 rename src/{main => java-websocket}/java/org/java_websocket/framing/CloseFrame.java (100%)
 mode change 100644 => 100755
 rename src/{main => java-websocket}/java/org/java_websocket/framing/CloseFrameBuilder.java (100%)
 mode change 100644 => 100755
 rename src/{main => java-websocket}/java/org/java_websocket/framing/FrameBuilder.java (100%)
 mode change 100644 => 100755
 rename src/{main => java-websocket}/java/org/java_websocket/framing/Framedata.java (100%)
 mode change 100644 => 100755
 rename src/{main => java-websocket}/java/org/java_websocket/framing/FramedataImpl1.java (100%)
 mode change 100644 => 100755
 rename src/{main => java-websocket}/java/org/java_websocket/handshake/ClientHandshake.java (100%)
 mode change 100644 => 100755
 rename src/{main => java-websocket}/java/org/java_websocket/handshake/ClientHandshakeBuilder.java (100%)
 mode change 100644 => 100755
 rename src/{main => java-websocket}/java/org/java_websocket/handshake/HandshakeBuilder.java (100%)
 mode change 100644 => 100755
 rename src/{main => java-websocket}/java/org/java_websocket/handshake/HandshakeImpl1Client.java (100%)
 mode change 100644 => 100755
 rename src/{main => java-websocket}/java/org/java_websocket/handshake/HandshakeImpl1Server.java (100%)
 mode change 100644 => 100755
 rename src/{main => java-websocket}/java/org/java_websocket/handshake/Handshakedata.java (100%)
 mode change 100644 => 100755
 rename src/{main => java-websocket}/java/org/java_websocket/handshake/HandshakedataImpl1.java (100%)
 mode change 100644 => 100755
 rename src/{main => java-websocket}/java/org/java_websocket/handshake/ServerHandshake.java (100%)
 mode change 100644 => 100755
 rename src/{main => java-websocket}/java/org/java_websocket/handshake/ServerHandshakeBuilder.java (100%)
 mode change 100644 => 100755
 rename src/{main => java-websocket}/java/org/java_websocket/server/DefaultSSLWebSocketServerFactory.java (100%)
 mode change 100644 => 100755
 rename src/{main => java-websocket}/java/org/java_websocket/server/DefaultWebSocketServerFactory.java (100%)
 mode change 100644 => 100755
 rename src/{main => java-websocket}/java/org/java_websocket/server/WebSocketServer.java (100%)
 mode change 100644 => 100755
 rename src/{main => java-websocket}/java/org/java_websocket/util/Base64.java (100%)
 mode change 100644 => 100755
 rename src/{main => java-websocket}/java/org/java_websocket/util/Charsetfunctions.java (100%)
 mode change 100644 => 100755
 mode change 100644 => 100755 src/test/java/AutobahnClientTest.java
 mode change 100644 => 100755 src/test/java/AutobahnServerTest.java

diff --git a/src/main/example/ChatClient.java b/src/java-websocket/example/ChatClient.java
old mode 100644
new mode 100755
similarity index 100%
rename from src/main/example/ChatClient.java
rename to src/java-websocket/example/ChatClient.java
diff --git a/src/main/example/ChatServer.java b/src/java-websocket/example/ChatServer.java
old mode 100644
new mode 100755
similarity index 100%
rename from src/main/example/ChatServer.java
rename to src/java-websocket/example/ChatServer.java
diff --git a/src/main/example/ExampleClient.java b/src/java-websocket/example/ExampleClient.java
old mode 100644
new mode 100755
similarity index 100%
rename from src/main/example/ExampleClient.java
rename to src/java-websocket/example/ExampleClient.java
diff --git a/src/main/example/FragmentedFramesExample.java b/src/java-websocket/example/FragmentedFramesExample.java
old mode 100644
new mode 100755
similarity index 100%
rename from src/main/example/FragmentedFramesExample.java
rename to src/java-websocket/example/FragmentedFramesExample.java
diff --git a/src/main/example/ProxyClientExample.java b/src/java-websocket/example/ProxyClientExample.java
old mode 100644
new mode 100755
similarity index 100%
rename from src/main/example/ProxyClientExample.java
rename to src/java-websocket/example/ProxyClientExample.java
diff --git a/src/main/example/SSLClientExample.java b/src/java-websocket/example/SSLClientExample.java
old mode 100644
new mode 100755
similarity index 100%
rename from src/main/example/SSLClientExample.java
rename to src/java-websocket/example/SSLClientExample.java
diff --git a/src/main/example/SSLServerExample.java b/src/java-websocket/example/SSLServerExample.java
old mode 100644
new mode 100755
similarity index 100%
rename from src/main/example/SSLServerExample.java
rename to src/java-websocket/example/SSLServerExample.java
diff --git a/src/main/example/ServerStressTest.java b/src/java-websocket/example/ServerStressTest.java
old mode 100644
new mode 100755
similarity index 100%
rename from src/main/example/ServerStressTest.java
rename to src/java-websocket/example/ServerStressTest.java
diff --git a/src/main/example/chat.html b/src/java-websocket/example/chat.html
old mode 100644
new mode 100755
similarity index 81%
rename from src/main/example/chat.html
rename to src/java-websocket/example/chat.html
index 4a1327e86..4bd2c2d65
--- a/src/main/example/chat.html
+++ b/src/java-websocket/example/chat.html
@@ -4,9 +4,9 @@
     <title>WebSocket Chat Client</title>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 
-    <script type="text/javascript" src="prototype.js"></script>
+    <script typ="text/javascript" src="prototype.js"></script>
 
-    <script type="text/javascript">
+    <script typ="text/javascript">
         document.observe("dom:loaded", function() {
             function log(text) {
                 $("log").innerHTML = (new Date).getTime() + ": " + (!Object.isUndefined(text) && text !== null ? text.escapeHTML() : "null") + $("log").innerHTML;
@@ -59,8 +59,8 @@
     </script>
   </head>
   <body>
-      <form id="uriForm"><input type="text" id="uri" value="ws://localhost:8887" style="width:200px;"> <input type="submit" id="connect" value="Connect"><input type="button" id="disconnect" value="Disconnect" disabled="disabled"></form><br>
-      <form id="sendForm"><input type="text" id="textField" value="" style="width:200px;"> <input type="submit" value="Send"></form><br>
+      <form id="uriForm"><input typ="text" id="uri" value="ws://localhost:8887" style="width:200px;"> <input typ="submit" id="connect" value="Connect"><input typ="button" id="disconnect" value="Disconnect" disabled="disabled"></form><br>
+      <form id="sendForm"><input typ="text" id="textField" value="" style="width:200px;"> <input typ="submit" value="Send"></form><br>
       <form><textarea id="log" rows="30" cols="100" style="font-family:monospace; color:red;"></textarea></form><br>
   </body>
 </html>
diff --git a/src/main/example/prototype.js b/src/java-websocket/example/prototype.js
old mode 100644
new mode 100755
similarity index 100%
rename from src/main/example/prototype.js
rename to src/java-websocket/example/prototype.js
diff --git a/src/main/example/web-socket-js/WebSocketMain.swf b/src/java-websocket/example/web-socket-js/WebSocketMain.swf
old mode 100644
new mode 100755
similarity index 100%
rename from src/main/example/web-socket-js/WebSocketMain.swf
rename to src/java-websocket/example/web-socket-js/WebSocketMain.swf
diff --git a/src/main/example/web-socket-js/index.html b/src/java-websocket/example/web-socket-js/index.html
old mode 100644
new mode 100755
similarity index 76%
rename from src/main/example/web-socket-js/index.html
rename to src/java-websocket/example/web-socket-js/index.html
index ee8db6e68..a12339b26
--- a/src/main/example/web-socket-js/index.html
+++ b/src/java-websocket/example/web-socket-js/index.html
@@ -1,4 +1,4 @@
-<script type="text/javascript">
+<script typ="text/javascript">
   // Let the library know where WebSocketMain.swf is:
   WEB_SOCKET_FORCE_FLASH = true
 
@@ -7,10 +7,10 @@
 </script>
 
 <!-- Import JavaScript Libraries. -->
-<script type="text/javascript" src="swfobject.js"></script>
-<script type="text/javascript" src="web_socket.js"></script>
+<script typ="text/javascript" src="swfobject.js"></script>
+<script typ="text/javascript" src="web_socket.js"></script>
 
-<script type="text/javascript">
+<script typ="text/javascript">
 
   // Write your code in the same way as for native WebSocket:
   var ws = new WebSocket('ws://localhost:8887')
diff --git a/src/main/example/web-socket-js/swfobject.js b/src/java-websocket/example/web-socket-js/swfobject.js
old mode 100644
new mode 100755
similarity index 100%
rename from src/main/example/web-socket-js/swfobject.js
rename to src/java-websocket/example/web-socket-js/swfobject.js
diff --git a/src/main/example/web-socket-js/web_socket.js b/src/java-websocket/example/web-socket-js/web_socket.js
old mode 100644
new mode 100755
similarity index 100%
rename from src/main/example/web-socket-js/web_socket.js
rename to src/java-websocket/example/web-socket-js/web_socket.js
diff --git a/src/main/java/org/java_websocket/AbstractWrappedByteChannel.java b/src/java-websocket/java/org/java_websocket/AbstractWrappedByteChannel.java
old mode 100644
new mode 100755
similarity index 100%
rename from src/main/java/org/java_websocket/AbstractWrappedByteChannel.java
rename to src/java-websocket/java/org/java_websocket/AbstractWrappedByteChannel.java
diff --git a/src/main/java/org/java_websocket/SSLSocketChannel2.java b/src/java-websocket/java/org/java_websocket/SSLSocketChannel2.java
old mode 100644
new mode 100755
similarity index 97%
rename from src/main/java/org/java_websocket/SSLSocketChannel2.java
rename to src/java-websocket/java/org/java_websocket/SSLSocketChannel2.java
index ba8d8f88a..110cf3805
--- a/src/main/java/org/java_websocket/SSLSocketChannel2.java
+++ b/src/java-websocket/java/org/java_websocket/SSLSocketChannel2.java
@@ -179,8 +179,8 @@ protected void consumeDelegatedTasks() {
 	}
 
 	protected void createBuffers( SSLSession session ) {
+		int appBufferMax = session.getApplicationBufferSize();
 		int netBufferMax = session.getPacketBufferSize();
-		int appBufferMax = Math.max(session.getApplicationBufferSize(), netBufferMax);
 
 		if( inData == null ) {
 			inData = ByteBuffer.allocate( appBufferMax );
@@ -209,9 +209,9 @@ public int write( ByteBuffer src ) throws IOException {
 			return 0;
 		}
 		// assert ( bufferallocations > 1 ); //see #190
-		//if( bufferallocations <= 1 ) {
-		//	createBuffers( sslEngine.getSession() );
-		//}
+		if( bufferallocations <= 1 ) {
+			createBuffers( sslEngine.getSession() );
+		}
 		int num = socketChannel.write( wrap( src ) );
 		return num;
 
@@ -239,9 +239,9 @@ public int read( ByteBuffer dst ) throws IOException {
 			}
 		}
 		// assert ( bufferallocations > 1 ); //see #190
-		//if( bufferallocations <= 1 ) {
-		//	createBuffers( sslEngine.getSession() );
-		//}
+		if( bufferallocations <= 1 ) {
+			createBuffers( sslEngine.getSession() );
+		}
 		/* 1. When "dst" is smaller than "inData" readRemaining will fill "dst" with data decoded in a previous read call.
 		 * 2. When "inCrypt" contains more data than "inData" has remaining space, unwrap has to be called on more time(readRemaining)
 		 */
diff --git a/src/main/java/org/java_websocket/SocketChannelIOHelper.java b/src/java-websocket/java/org/java_websocket/SocketChannelIOHelper.java
old mode 100644
new mode 100755
similarity index 100%
rename from src/main/java/org/java_websocket/SocketChannelIOHelper.java
rename to src/java-websocket/java/org/java_websocket/SocketChannelIOHelper.java
diff --git a/src/main/java/org/java_websocket/WebSocket.java b/src/java-websocket/java/org/java_websocket/WebSocket.java
old mode 100644
new mode 100755
similarity index 100%
rename from src/main/java/org/java_websocket/WebSocket.java
rename to src/java-websocket/java/org/java_websocket/WebSocket.java
diff --git a/src/main/java/org/java_websocket/WebSocketAdapter.java b/src/java-websocket/java/org/java_websocket/WebSocketAdapter.java
old mode 100644
new mode 100755
similarity index 100%
rename from src/main/java/org/java_websocket/WebSocketAdapter.java
rename to src/java-websocket/java/org/java_websocket/WebSocketAdapter.java
diff --git a/src/main/java/org/java_websocket/WebSocketFactory.java b/src/java-websocket/java/org/java_websocket/WebSocketFactory.java
old mode 100644
new mode 100755
similarity index 100%
rename from src/main/java/org/java_websocket/WebSocketFactory.java
rename to src/java-websocket/java/org/java_websocket/WebSocketFactory.java
diff --git a/src/main/java/org/java_websocket/WebSocketImpl.java b/src/java-websocket/java/org/java_websocket/WebSocketImpl.java
old mode 100644
new mode 100755
similarity index 100%
rename from src/main/java/org/java_websocket/WebSocketImpl.java
rename to src/java-websocket/java/org/java_websocket/WebSocketImpl.java
diff --git a/src/main/java/org/java_websocket/WebSocketListener.java b/src/java-websocket/java/org/java_websocket/WebSocketListener.java
old mode 100644
new mode 100755
similarity index 100%
rename from src/main/java/org/java_websocket/WebSocketListener.java
rename to src/java-websocket/java/org/java_websocket/WebSocketListener.java
diff --git a/src/main/java/org/java_websocket/WrappedByteChannel.java b/src/java-websocket/java/org/java_websocket/WrappedByteChannel.java
old mode 100644
new mode 100755
similarity index 100%
rename from src/main/java/org/java_websocket/WrappedByteChannel.java
rename to src/java-websocket/java/org/java_websocket/WrappedByteChannel.java
diff --git a/src/main/java/org/java_websocket/client/AbstractClientProxyChannel.java b/src/java-websocket/java/org/java_websocket/client/AbstractClientProxyChannel.java
old mode 100644
new mode 100755
similarity index 100%
rename from src/main/java/org/java_websocket/client/AbstractClientProxyChannel.java
rename to src/java-websocket/java/org/java_websocket/client/AbstractClientProxyChannel.java
diff --git a/src/main/java/org/java_websocket/client/WebSocketClient.java b/src/java-websocket/java/org/java_websocket/client/WebSocketClient.java
old mode 100644
new mode 100755
similarity index 99%
rename from src/main/java/org/java_websocket/client/WebSocketClient.java
rename to src/java-websocket/java/org/java_websocket/client/WebSocketClient.java
index 86eff7947..38d5b5f7d
--- a/src/main/java/org/java_websocket/client/WebSocketClient.java
+++ b/src/java-websocket/java/org/java_websocket/client/WebSocketClient.java
@@ -73,9 +73,9 @@ public WebSocketClient( URI serverUri , Draft draft ) {
 	}
 
 	public WebSocketClient( URI serverUri , Draft protocolDraft , Map<String,String> httpHeaders , int connectTimeout ) {
-		if( serverUri == null ) {
+		/*if( serverUri == null ) {
 			throw new IllegalArgumentException();
-		} else if( protocolDraft == null ) {
+		} else */if( protocolDraft == null ) {
 			throw new IllegalArgumentException( "null as draft is permitted for `WebSocketServer` only!" );
 		}
 		this.uri = serverUri;
diff --git a/src/main/java/org/java_websocket/drafts/Draft.java b/src/java-websocket/java/org/java_websocket/drafts/Draft.java
old mode 100644
new mode 100755
similarity index 100%
rename from src/main/java/org/java_websocket/drafts/Draft.java
rename to src/java-websocket/java/org/java_websocket/drafts/Draft.java
diff --git a/src/main/java/org/java_websocket/drafts/Draft_10.java b/src/java-websocket/java/org/java_websocket/drafts/Draft_10.java
old mode 100644
new mode 100755
similarity index 100%
rename from src/main/java/org/java_websocket/drafts/Draft_10.java
rename to src/java-websocket/java/org/java_websocket/drafts/Draft_10.java
diff --git a/src/main/java/org/java_websocket/drafts/Draft_17.java b/src/java-websocket/java/org/java_websocket/drafts/Draft_17.java
old mode 100644
new mode 100755
similarity index 100%
rename from src/main/java/org/java_websocket/drafts/Draft_17.java
rename to src/java-websocket/java/org/java_websocket/drafts/Draft_17.java
diff --git a/src/main/java/org/java_websocket/drafts/Draft_75.java b/src/java-websocket/java/org/java_websocket/drafts/Draft_75.java
old mode 100644
new mode 100755
similarity index 100%
rename from src/main/java/org/java_websocket/drafts/Draft_75.java
rename to src/java-websocket/java/org/java_websocket/drafts/Draft_75.java
diff --git a/src/main/java/org/java_websocket/drafts/Draft_76.java b/src/java-websocket/java/org/java_websocket/drafts/Draft_76.java
old mode 100644
new mode 100755
similarity index 100%
rename from src/main/java/org/java_websocket/drafts/Draft_76.java
rename to src/java-websocket/java/org/java_websocket/drafts/Draft_76.java
diff --git a/src/main/java/org/java_websocket/exceptions/IncompleteHandshakeException.java b/src/java-websocket/java/org/java_websocket/exceptions/IncompleteHandshakeException.java
old mode 100644
new mode 100755
similarity index 100%
rename from src/main/java/org/java_websocket/exceptions/IncompleteHandshakeException.java
rename to src/java-websocket/java/org/java_websocket/exceptions/IncompleteHandshakeException.java
diff --git a/src/main/java/org/java_websocket/exceptions/InvalidDataException.java b/src/java-websocket/java/org/java_websocket/exceptions/InvalidDataException.java
old mode 100644
new mode 100755
similarity index 100%
rename from src/main/java/org/java_websocket/exceptions/InvalidDataException.java
rename to src/java-websocket/java/org/java_websocket/exceptions/InvalidDataException.java
diff --git a/src/main/java/org/java_websocket/exceptions/InvalidFrameException.java b/src/java-websocket/java/org/java_websocket/exceptions/InvalidFrameException.java
old mode 100644
new mode 100755
similarity index 100%
rename from src/main/java/org/java_websocket/exceptions/InvalidFrameException.java
rename to src/java-websocket/java/org/java_websocket/exceptions/InvalidFrameException.java
diff --git a/src/main/java/org/java_websocket/exceptions/InvalidHandshakeException.java b/src/java-websocket/java/org/java_websocket/exceptions/InvalidHandshakeException.java
old mode 100644
new mode 100755
similarity index 100%
rename from src/main/java/org/java_websocket/exceptions/InvalidHandshakeException.java
rename to src/java-websocket/java/org/java_websocket/exceptions/InvalidHandshakeException.java
diff --git a/src/main/java/org/java_websocket/exceptions/LimitExedeedException.java b/src/java-websocket/java/org/java_websocket/exceptions/LimitExedeedException.java
old mode 100644
new mode 100755
similarity index 100%
rename from src/main/java/org/java_websocket/exceptions/LimitExedeedException.java
rename to src/java-websocket/java/org/java_websocket/exceptions/LimitExedeedException.java
diff --git a/src/main/java/org/java_websocket/exceptions/NotSendableException.java b/src/java-websocket/java/org/java_websocket/exceptions/NotSendableException.java
old mode 100644
new mode 100755
similarity index 100%
rename from src/main/java/org/java_websocket/exceptions/NotSendableException.java
rename to src/java-websocket/java/org/java_websocket/exceptions/NotSendableException.java
diff --git a/src/main/java/org/java_websocket/exceptions/WebsocketNotConnectedException.java b/src/java-websocket/java/org/java_websocket/exceptions/WebsocketNotConnectedException.java
old mode 100644
new mode 100755
similarity index 100%
rename from src/main/java/org/java_websocket/exceptions/WebsocketNotConnectedException.java
rename to src/java-websocket/java/org/java_websocket/exceptions/WebsocketNotConnectedException.java
diff --git a/src/main/java/org/java_websocket/framing/CloseFrame.java b/src/java-websocket/java/org/java_websocket/framing/CloseFrame.java
old mode 100644
new mode 100755
similarity index 100%
rename from src/main/java/org/java_websocket/framing/CloseFrame.java
rename to src/java-websocket/java/org/java_websocket/framing/CloseFrame.java
diff --git a/src/main/java/org/java_websocket/framing/CloseFrameBuilder.java b/src/java-websocket/java/org/java_websocket/framing/CloseFrameBuilder.java
old mode 100644
new mode 100755
similarity index 100%
rename from src/main/java/org/java_websocket/framing/CloseFrameBuilder.java
rename to src/java-websocket/java/org/java_websocket/framing/CloseFrameBuilder.java
diff --git a/src/main/java/org/java_websocket/framing/FrameBuilder.java b/src/java-websocket/java/org/java_websocket/framing/FrameBuilder.java
old mode 100644
new mode 100755
similarity index 100%
rename from src/main/java/org/java_websocket/framing/FrameBuilder.java
rename to src/java-websocket/java/org/java_websocket/framing/FrameBuilder.java
diff --git a/src/main/java/org/java_websocket/framing/Framedata.java b/src/java-websocket/java/org/java_websocket/framing/Framedata.java
old mode 100644
new mode 100755
similarity index 100%
rename from src/main/java/org/java_websocket/framing/Framedata.java
rename to src/java-websocket/java/org/java_websocket/framing/Framedata.java
diff --git a/src/main/java/org/java_websocket/framing/FramedataImpl1.java b/src/java-websocket/java/org/java_websocket/framing/FramedataImpl1.java
old mode 100644
new mode 100755
similarity index 100%
rename from src/main/java/org/java_websocket/framing/FramedataImpl1.java
rename to src/java-websocket/java/org/java_websocket/framing/FramedataImpl1.java
diff --git a/src/main/java/org/java_websocket/handshake/ClientHandshake.java b/src/java-websocket/java/org/java_websocket/handshake/ClientHandshake.java
old mode 100644
new mode 100755
similarity index 100%
rename from src/main/java/org/java_websocket/handshake/ClientHandshake.java
rename to src/java-websocket/java/org/java_websocket/handshake/ClientHandshake.java
diff --git a/src/main/java/org/java_websocket/handshake/ClientHandshakeBuilder.java b/src/java-websocket/java/org/java_websocket/handshake/ClientHandshakeBuilder.java
old mode 100644
new mode 100755
similarity index 100%
rename from src/main/java/org/java_websocket/handshake/ClientHandshakeBuilder.java
rename to src/java-websocket/java/org/java_websocket/handshake/ClientHandshakeBuilder.java
diff --git a/src/main/java/org/java_websocket/handshake/HandshakeBuilder.java b/src/java-websocket/java/org/java_websocket/handshake/HandshakeBuilder.java
old mode 100644
new mode 100755
similarity index 100%
rename from src/main/java/org/java_websocket/handshake/HandshakeBuilder.java
rename to src/java-websocket/java/org/java_websocket/handshake/HandshakeBuilder.java
diff --git a/src/main/java/org/java_websocket/handshake/HandshakeImpl1Client.java b/src/java-websocket/java/org/java_websocket/handshake/HandshakeImpl1Client.java
old mode 100644
new mode 100755
similarity index 100%
rename from src/main/java/org/java_websocket/handshake/HandshakeImpl1Client.java
rename to src/java-websocket/java/org/java_websocket/handshake/HandshakeImpl1Client.java
diff --git a/src/main/java/org/java_websocket/handshake/HandshakeImpl1Server.java b/src/java-websocket/java/org/java_websocket/handshake/HandshakeImpl1Server.java
old mode 100644
new mode 100755
similarity index 100%
rename from src/main/java/org/java_websocket/handshake/HandshakeImpl1Server.java
rename to src/java-websocket/java/org/java_websocket/handshake/HandshakeImpl1Server.java
diff --git a/src/main/java/org/java_websocket/handshake/Handshakedata.java b/src/java-websocket/java/org/java_websocket/handshake/Handshakedata.java
old mode 100644
new mode 100755
similarity index 100%
rename from src/main/java/org/java_websocket/handshake/Handshakedata.java
rename to src/java-websocket/java/org/java_websocket/handshake/Handshakedata.java
diff --git a/src/main/java/org/java_websocket/handshake/HandshakedataImpl1.java b/src/java-websocket/java/org/java_websocket/handshake/HandshakedataImpl1.java
old mode 100644
new mode 100755
similarity index 100%
rename from src/main/java/org/java_websocket/handshake/HandshakedataImpl1.java
rename to src/java-websocket/java/org/java_websocket/handshake/HandshakedataImpl1.java
diff --git a/src/main/java/org/java_websocket/handshake/ServerHandshake.java b/src/java-websocket/java/org/java_websocket/handshake/ServerHandshake.java
old mode 100644
new mode 100755
similarity index 100%
rename from src/main/java/org/java_websocket/handshake/ServerHandshake.java
rename to src/java-websocket/java/org/java_websocket/handshake/ServerHandshake.java
diff --git a/src/main/java/org/java_websocket/handshake/ServerHandshakeBuilder.java b/src/java-websocket/java/org/java_websocket/handshake/ServerHandshakeBuilder.java
old mode 100644
new mode 100755
similarity index 100%
rename from src/main/java/org/java_websocket/handshake/ServerHandshakeBuilder.java
rename to src/java-websocket/java/org/java_websocket/handshake/ServerHandshakeBuilder.java
diff --git a/src/main/java/org/java_websocket/server/DefaultSSLWebSocketServerFactory.java b/src/java-websocket/java/org/java_websocket/server/DefaultSSLWebSocketServerFactory.java
old mode 100644
new mode 100755
similarity index 100%
rename from src/main/java/org/java_websocket/server/DefaultSSLWebSocketServerFactory.java
rename to src/java-websocket/java/org/java_websocket/server/DefaultSSLWebSocketServerFactory.java
diff --git a/src/main/java/org/java_websocket/server/DefaultWebSocketServerFactory.java b/src/java-websocket/java/org/java_websocket/server/DefaultWebSocketServerFactory.java
old mode 100644
new mode 100755
similarity index 100%
rename from src/main/java/org/java_websocket/server/DefaultWebSocketServerFactory.java
rename to src/java-websocket/java/org/java_websocket/server/DefaultWebSocketServerFactory.java
diff --git a/src/main/java/org/java_websocket/server/WebSocketServer.java b/src/java-websocket/java/org/java_websocket/server/WebSocketServer.java
old mode 100644
new mode 100755
similarity index 100%
rename from src/main/java/org/java_websocket/server/WebSocketServer.java
rename to src/java-websocket/java/org/java_websocket/server/WebSocketServer.java
diff --git a/src/main/java/org/java_websocket/util/Base64.java b/src/java-websocket/java/org/java_websocket/util/Base64.java
old mode 100644
new mode 100755
similarity index 100%
rename from src/main/java/org/java_websocket/util/Base64.java
rename to src/java-websocket/java/org/java_websocket/util/Base64.java
diff --git a/src/main/java/org/java_websocket/util/Charsetfunctions.java b/src/java-websocket/java/org/java_websocket/util/Charsetfunctions.java
old mode 100644
new mode 100755
similarity index 100%
rename from src/main/java/org/java_websocket/util/Charsetfunctions.java
rename to src/java-websocket/java/org/java_websocket/util/Charsetfunctions.java
diff --git a/src/test/java/AutobahnClientTest.java b/src/test/java/AutobahnClientTest.java
old mode 100644
new mode 100755
diff --git a/src/test/java/AutobahnServerTest.java b/src/test/java/AutobahnServerTest.java
old mode 100644
new mode 100755

From f005a02b655644e6050886948c3bfd1bb7c9d428 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E6=9D=B0?= <tiantian.china.2@gmail.com>
Date: Tue, 6 Jan 2015 18:45:34 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E4=B8=BA=E5=AE=88?=
 =?UTF-8?q?=E6=8A=A4=E7=BA=BF=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/org/java_websocket/client/WebSocketClient.java         | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/java-websocket/java/org/java_websocket/client/WebSocketClient.java b/src/java-websocket/java/org/java_websocket/client/WebSocketClient.java
index 38d5b5f7d..bf2666aea 100755
--- a/src/java-websocket/java/org/java_websocket/client/WebSocketClient.java
+++ b/src/java-websocket/java/org/java_websocket/client/WebSocketClient.java
@@ -345,6 +345,8 @@ public void onFragment( Framedata frame ) {
 	private class WebsocketWriteThread implements Runnable {
 		@Override
 		public void run() {
+            // 设置为守护线程
+            Thread.currentThread().setDaemon(true);
 			Thread.currentThread().setName( "WebsocketWriteThread" );
 			try {
 				while ( !Thread.interrupted() ) {

From 46913efcbfedcb1d2cec0b0782e3a3646eb53c11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E6=9D=B0?= <tiantian.china.2@gmail.com>
Date: Tue, 6 Jan 2015 18:48:40 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E4=B8=BA=E5=AE=88?=
 =?UTF-8?q?=E6=8A=A4=E7=BA=BF=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/org/java_websocket/client/WebSocketClient.java        | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/java-websocket/java/org/java_websocket/client/WebSocketClient.java b/src/java-websocket/java/org/java_websocket/client/WebSocketClient.java
index bf2666aea..f76c7236f 100755
--- a/src/java-websocket/java/org/java_websocket/client/WebSocketClient.java
+++ b/src/java-websocket/java/org/java_websocket/client/WebSocketClient.java
@@ -107,6 +107,7 @@ public void connect() {
 		if( writeThread != null )
 			throw new IllegalStateException( "WebSocketClient objects are not reuseable" );
 		writeThread = new Thread( this );
+        writeThread.setDaemon(true);
 		writeThread.start();
 	}
 
@@ -175,6 +176,7 @@ public void run() {
 		}
 
 		writeThread = new Thread( new WebsocketWriteThread() );
+        writeThread.setDaemon(true);
 		writeThread.start();
 
 		byte[] rawbuffer = new byte[ WebSocketImpl.RCVBUF ];
@@ -346,7 +348,6 @@ private class WebsocketWriteThread implements Runnable {
 		@Override
 		public void run() {
             // 设置为守护线程
-            Thread.currentThread().setDaemon(true);
 			Thread.currentThread().setName( "WebsocketWriteThread" );
 			try {
 				while ( !Thread.interrupted() ) {