393473 - Add support for JSR-356 (javax.websocket) draft

 + Restarting branch, copying over work from November with new JSR-356
   Draft 012 api in mind.

1 files changed, 13 insertions, 4 deletions

diff --git a/jetty-websocket/websocket-servlet/src/main/java/org/eclipse/jetty/websocket/servlet/WebSocketServlet.java b/jetty-websocket/websocket-servlet/src/main/java/org/eclipse/jetty/websocket/servlet/WebSocketServlet.java
index 355accfbae..9ce65c4a0b 100644
--- a/jetty-websocket/websocket-servlet/src/main/java/org/eclipse/jetty/websocket/servlet/WebSocketServlet.java
+++ b/jetty-websocket/websocket-servlet/src/main/java/org/eclipse/jetty/websocket/servlet/WebSocketServlet.java
@@ -69,8 +69,11 @@ import org.eclipse.jetty.websocket.api.annotations.WebSocket;
  * <dt>maxIdleTime</dt>
  * <dd>set the time in ms that a websocket may be idle before closing<br>
  * 
- * <dt>maxMessagesSize</dt>
- * <dd>set the size in bytes that a websocket may be accept before closing<br>
+ * <dt>maxTextMessageSize</dt>
+ * <dd>set the size in UTF-8 bytes that a websocket may be accept as a Text Message before closing<br>
+ * 
+ * <dt>maxBinaryMessageSize</dt>
+ * <dd>set the size in bytes that a websocket may be accept as a Binary Message before closing<br>
  * 
  * <dt>inputBufferSize</dt>
  * <dd>set the size in bytes of the buffer used to read raw bytes from the network layer<br>
@@ -105,10 +108,16 @@ public abstract class WebSocketServlet extends HttpServlet
                 policy.setIdleTimeout(Long.parseLong(max));
             }
 
-            max = getInitParameter("maxMessageSize");
+            max = getInitParameter("maxTextMessageSize");
+            if (max != null)
+            {
+                policy.setMaxTextMessageSize(Integer.parseInt(max));
+            }
+
+            max = getInitParameter("maxBinaryMessageSize");
             if (max != null)
             {
-                policy.setMaxMessageSize(Long.parseLong(max));
+                policy.setMaxBinaryMessageSize(Integer.parseInt(max));
             }
 
             max = getInitParameter("inputBufferSize");