You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2013/08/14 11:41:38 UTC
[09/37] git commit: WICKET-5301 Create a module for Native WebSocket
based on JSR 356
WICKET-5301 Create a module for Native WebSocket based on JSR 356
Fix javadoc
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/23f4bef6
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/23f4bef6
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/23f4bef6
Branch: refs/heads/5299-ajax-strategy
Commit: 23f4bef62e6802984d33eb6a1056187e42080151
Parents: 36ad94d
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Mon Aug 5 10:28:17 2013 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Mon Aug 5 10:31:33 2013 +0200
----------------------------------------------------------------------
.../wicket/protocol/ws/javax/JavaxWebSocketConnection.java | 6 +++---
.../wicket/protocol/ws/javax/JavaxWebSocketProcessor.java | 4 ++--
.../org/apache/wicket/protocol/ws/javax/WicketEndpoint.java | 3 +++
3 files changed, 8 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/23f4bef6/wicket-experimental/wicket-native-websocket/wicket-native-websocket-javax/src/main/java/org/apache/wicket/protocol/ws/javax/JavaxWebSocketConnection.java
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-native-websocket/wicket-native-websocket-javax/src/main/java/org/apache/wicket/protocol/ws/javax/JavaxWebSocketConnection.java b/wicket-experimental/wicket-native-websocket/wicket-native-websocket-javax/src/main/java/org/apache/wicket/protocol/ws/javax/JavaxWebSocketConnection.java
index 553682a..dfd875e 100644
--- a/wicket-experimental/wicket-native-websocket/wicket-native-websocket-javax/src/main/java/org/apache/wicket/protocol/ws/javax/JavaxWebSocketConnection.java
+++ b/wicket-experimental/wicket-native-websocket/wicket-native-websocket-javax/src/main/java/org/apache/wicket/protocol/ws/javax/JavaxWebSocketConnection.java
@@ -30,9 +30,9 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
- * A wrapper around Jetty9's native WebSocketConnection.
+ * A wrapper around JSR 356's native Session.
*
- * @since 6.2
+ * @since 7.0.0
*/
public class JavaxWebSocketConnection extends AbstractWebSocketConnection
{
@@ -44,7 +44,7 @@ public class JavaxWebSocketConnection extends AbstractWebSocketConnection
* Constructor.
*
* @param session
- * the jetty websocket connection
+ * the WebSocket session
*/
public JavaxWebSocketConnection(Session session, AbstractWebSocketProcessor webSocketProcessor)
{
http://git-wip-us.apache.org/repos/asf/wicket/blob/23f4bef6/wicket-experimental/wicket-native-websocket/wicket-native-websocket-javax/src/main/java/org/apache/wicket/protocol/ws/javax/JavaxWebSocketProcessor.java
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-native-websocket/wicket-native-websocket-javax/src/main/java/org/apache/wicket/protocol/ws/javax/JavaxWebSocketProcessor.java b/wicket-experimental/wicket-native-websocket/wicket-native-websocket-javax/src/main/java/org/apache/wicket/protocol/ws/javax/JavaxWebSocketProcessor.java
index 1fa18a9..06a6bc3 100644
--- a/wicket-experimental/wicket-native-websocket/wicket-native-websocket-javax/src/main/java/org/apache/wicket/protocol/ws/javax/JavaxWebSocketProcessor.java
+++ b/wicket-experimental/wicket-native-websocket/wicket-native-websocket-javax/src/main/java/org/apache/wicket/protocol/ws/javax/JavaxWebSocketProcessor.java
@@ -28,9 +28,9 @@ import org.slf4j.LoggerFactory;
/**
* An {@link org.apache.wicket.protocol.ws.api.IWebSocketProcessor processor} that integrates with
- * Jetty 9.x {@link Session web socket} implementation.
+ * JSR 356 {@link Session web socket} implementation.
*
- * @since 6.2
+ * @since 7.0.0
*/
public class JavaxWebSocketProcessor extends AbstractWebSocketProcessor
{
http://git-wip-us.apache.org/repos/asf/wicket/blob/23f4bef6/wicket-experimental/wicket-native-websocket/wicket-native-websocket-javax/src/main/java/org/apache/wicket/protocol/ws/javax/WicketEndpoint.java
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-native-websocket/wicket-native-websocket-javax/src/main/java/org/apache/wicket/protocol/ws/javax/WicketEndpoint.java b/wicket-experimental/wicket-native-websocket/wicket-native-websocket-javax/src/main/java/org/apache/wicket/protocol/ws/javax/WicketEndpoint.java
index 57b4e0b..11b843c 100644
--- a/wicket-experimental/wicket-native-websocket/wicket-native-websocket-javax/src/main/java/org/apache/wicket/protocol/ws/javax/WicketEndpoint.java
+++ b/wicket-experimental/wicket-native-websocket/wicket-native-websocket-javax/src/main/java/org/apache/wicket/protocol/ws/javax/WicketEndpoint.java
@@ -26,6 +26,9 @@ import org.apache.wicket.protocol.http.WebApplication;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+/**
+ * JSR 356 WebSocket Endpoint that integrates with Wicket Native WebSocket's IWebSocketProcessor
+ */
public class WicketEndpoint extends Endpoint
{
private static final Logger LOG = LoggerFactory.getLogger(WicketEndpoint.class);