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 2015/06/24 14:58:19 UTC
[13/50] [abbrv] wicket git commit: allow to initialize the websocket
filter with a WebApplication to support java-based servlet 3.0 applications
allow to initialize the websocket filter with a WebApplication to support java-based servlet 3.0 applications
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/26cf61d9
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/26cf61d9
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/26cf61d9
Branch: refs/heads/master
Commit: 26cf61d98c036f60b8fb8c5fce668f23e823337d
Parents: ce8fcf0
Author: Robert Gruendler <ro...@dubture.com>
Authored: Tue Jun 16 09:52:17 2015 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Wed Jun 24 14:56:33 2015 +0300
----------------------------------------------------------------------
.../protocol/ws/AbstractUpgradeFilter.java | 23 +++++++++++++-----
.../protocol/ws/javax/JavaxWebSocketFilter.java | 19 +++++++++++----
.../ws/jetty/Jetty7WebSocketFilter.java | 19 +++++++++++----
.../ws/jetty9/Jetty9WebSocketFilter.java | 25 ++++++++++++++------
.../ws/tomcat7/Tomcat7WebSocketFilter.java | 22 ++++++++++++-----
5 files changed, 81 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/26cf61d9/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/AbstractUpgradeFilter.java
----------------------------------------------------------------------
diff --git a/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/AbstractUpgradeFilter.java b/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/AbstractUpgradeFilter.java
index 72fc261..475a5af 100644
--- a/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/AbstractUpgradeFilter.java
+++ b/wicket-native-websocket/wicket-native-websocket-core/src/main/java/org/apache/wicket/protocol/ws/AbstractUpgradeFilter.java
@@ -16,6 +16,13 @@
*/
package org.apache.wicket.protocol.ws;
+import org.apache.wicket.ThreadContext;
+import org.apache.wicket.protocol.http.WebApplication;
+import org.apache.wicket.protocol.http.WicketFilter;
+import org.apache.wicket.request.cycle.RequestCycle;
+import org.apache.wicket.request.http.WebResponse;
+import org.apache.wicket.util.string.Strings;
+
import java.io.IOException;
import java.util.ArrayList;
import java.util.Enumeration;
@@ -26,12 +33,6 @@ import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.wicket.ThreadContext;
-import org.apache.wicket.protocol.http.WicketFilter;
-import org.apache.wicket.request.cycle.RequestCycle;
-import org.apache.wicket.request.http.WebResponse;
-import org.apache.wicket.util.string.Strings;
-
/**
* An extension of WicketFilter that is used to check whether
* the processed HttpServletRequest needs to upgrade its protocol
@@ -41,6 +42,16 @@ import org.apache.wicket.util.string.Strings;
*/
public class AbstractUpgradeFilter extends WicketFilter
{
+ public AbstractUpgradeFilter()
+ {
+ super();
+ }
+
+ public AbstractUpgradeFilter(WebApplication application)
+ {
+ super(application);
+ }
+
protected boolean processRequestCycle(final RequestCycle requestCycle, final WebResponse webResponse,
final HttpServletRequest httpServletRequest, final HttpServletResponse httpServletResponse,
final FilterChain chain)
http://git-wip-us.apache.org/repos/asf/wicket/blob/26cf61d9/wicket-native-websocket/wicket-native-websocket-javax/src/main/java/org/apache/wicket/protocol/ws/javax/JavaxWebSocketFilter.java
----------------------------------------------------------------------
diff --git a/wicket-native-websocket/wicket-native-websocket-javax/src/main/java/org/apache/wicket/protocol/ws/javax/JavaxWebSocketFilter.java b/wicket-native-websocket/wicket-native-websocket-javax/src/main/java/org/apache/wicket/protocol/ws/javax/JavaxWebSocketFilter.java
index 28dfa02..82a40e2 100644
--- a/wicket-native-websocket/wicket-native-websocket-javax/src/main/java/org/apache/wicket/protocol/ws/javax/JavaxWebSocketFilter.java
+++ b/wicket-native-websocket/wicket-native-websocket-javax/src/main/java/org/apache/wicket/protocol/ws/javax/JavaxWebSocketFilter.java
@@ -16,21 +16,32 @@
*/
package org.apache.wicket.protocol.ws.javax;
+import org.apache.wicket.protocol.http.WebApplication;
+import org.apache.wicket.protocol.http.WicketFilter;
+import org.apache.wicket.protocol.ws.AbstractUpgradeFilter;
+import org.apache.wicket.util.string.Strings;
+
import java.util.Enumeration;
import javax.servlet.FilterConfig;
import javax.servlet.ServletContext;
import javax.servlet.ServletException;
-import org.apache.wicket.protocol.http.WicketFilter;
-import org.apache.wicket.protocol.ws.AbstractUpgradeFilter;
-import org.apache.wicket.util.string.Strings;
-
/**
* An upgrade filter that setups javax.websocket
*/
public class JavaxWebSocketFilter extends AbstractUpgradeFilter
{
+ public JavaxWebSocketFilter()
+ {
+ super();
+ }
+
+ public JavaxWebSocketFilter(WebApplication application)
+ {
+ super(application);
+ }
+
@Override
public void init(final boolean isServlet, final FilterConfig filterConfig) throws ServletException
{
http://git-wip-us.apache.org/repos/asf/wicket/blob/26cf61d9/wicket-native-websocket/wicket-native-websocket-jetty/src/main/java/org/apache/wicket/protocol/ws/jetty/Jetty7WebSocketFilter.java
----------------------------------------------------------------------
diff --git a/wicket-native-websocket/wicket-native-websocket-jetty/src/main/java/org/apache/wicket/protocol/ws/jetty/Jetty7WebSocketFilter.java b/wicket-native-websocket/wicket-native-websocket-jetty/src/main/java/org/apache/wicket/protocol/ws/jetty/Jetty7WebSocketFilter.java
index d4f749a..eebdd6c 100644
--- a/wicket-native-websocket/wicket-native-websocket-jetty/src/main/java/org/apache/wicket/protocol/ws/jetty/Jetty7WebSocketFilter.java
+++ b/wicket-native-websocket/wicket-native-websocket-jetty/src/main/java/org/apache/wicket/protocol/ws/jetty/Jetty7WebSocketFilter.java
@@ -16,6 +16,11 @@
*/
package org.apache.wicket.protocol.ws.jetty;
+import org.apache.wicket.protocol.http.WebApplication;
+import org.apache.wicket.protocol.ws.AbstractUpgradeFilter;
+import org.eclipse.jetty.websocket.WebSocket;
+import org.eclipse.jetty.websocket.WebSocketFactory;
+
import java.io.IOException;
import javax.servlet.FilterConfig;
@@ -23,10 +28,6 @@ import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.eclipse.jetty.websocket.WebSocket;
-import org.eclipse.jetty.websocket.WebSocketFactory;
-import org.apache.wicket.protocol.ws.AbstractUpgradeFilter;
-
/**
* An upgrade filter that uses Jetty's WebSocketFactory to decide whether to upgrade or not.
*/
@@ -34,6 +35,16 @@ public class Jetty7WebSocketFilter extends AbstractUpgradeFilter implements WebS
{
private WebSocketFactory _webSocketFactory;
+ public Jetty7WebSocketFilter()
+ {
+ super();
+ }
+
+ public Jetty7WebSocketFilter(WebApplication application)
+ {
+ super(application);
+ }
+
@Override
public void init(final boolean isServlet, final FilterConfig filterConfig)
throws ServletException
http://git-wip-us.apache.org/repos/asf/wicket/blob/26cf61d9/wicket-native-websocket/wicket-native-websocket-jetty9/src/main/java/org/apache/wicket/protocol/ws/jetty9/Jetty9WebSocketFilter.java
----------------------------------------------------------------------
diff --git a/wicket-native-websocket/wicket-native-websocket-jetty9/src/main/java/org/apache/wicket/protocol/ws/jetty9/Jetty9WebSocketFilter.java b/wicket-native-websocket/wicket-native-websocket-jetty9/src/main/java/org/apache/wicket/protocol/ws/jetty9/Jetty9WebSocketFilter.java
index 817ccd8..ed6ed1d 100644
--- a/wicket-native-websocket/wicket-native-websocket-jetty9/src/main/java/org/apache/wicket/protocol/ws/jetty9/Jetty9WebSocketFilter.java
+++ b/wicket-native-websocket/wicket-native-websocket-jetty9/src/main/java/org/apache/wicket/protocol/ws/jetty9/Jetty9WebSocketFilter.java
@@ -16,13 +16,7 @@
*/
package org.apache.wicket.protocol.ws.jetty9;
-import java.io.IOException;
-
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
+import org.apache.wicket.protocol.http.WebApplication;
import org.apache.wicket.protocol.ws.AbstractUpgradeFilter;
import org.eclipse.jetty.websocket.api.UpgradeRequest;
import org.eclipse.jetty.websocket.api.UpgradeResponse;
@@ -32,6 +26,13 @@ import org.eclipse.jetty.websocket.servlet.WebSocketCreator;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.io.IOException;
+
+import javax.servlet.FilterConfig;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
/**
* An upgrade filter that uses Jetty9's WebSocketServerFactory to decide whether to upgrade or not.
*/
@@ -41,6 +42,16 @@ public class Jetty9WebSocketFilter extends AbstractUpgradeFilter
private WebSocketServerFactory _webSocketFactory;
+ public Jetty9WebSocketFilter()
+ {
+ super();
+ }
+
+ public Jetty9WebSocketFilter(WebApplication application)
+ {
+ super(application);
+ }
+
@Override
public void init(final boolean isServlet, final FilterConfig filterConfig)
throws ServletException
http://git-wip-us.apache.org/repos/asf/wicket/blob/26cf61d9/wicket-native-websocket/wicket-native-websocket-tomcat/src/main/java/org/apache/wicket/protocol/ws/tomcat7/Tomcat7WebSocketFilter.java
----------------------------------------------------------------------
diff --git a/wicket-native-websocket/wicket-native-websocket-tomcat/src/main/java/org/apache/wicket/protocol/ws/tomcat7/Tomcat7WebSocketFilter.java b/wicket-native-websocket/wicket-native-websocket-tomcat/src/main/java/org/apache/wicket/protocol/ws/tomcat7/Tomcat7WebSocketFilter.java
index 1021868..8dc6582 100644
--- a/wicket-native-websocket/wicket-native-websocket-tomcat/src/main/java/org/apache/wicket/protocol/ws/tomcat7/Tomcat7WebSocketFilter.java
+++ b/wicket-native-websocket/wicket-native-websocket-tomcat/src/main/java/org/apache/wicket/protocol/ws/tomcat7/Tomcat7WebSocketFilter.java
@@ -16,6 +16,12 @@
*/
package org.apache.wicket.protocol.ws.tomcat7;
+import org.apache.catalina.connector.RequestFacade;
+import org.apache.catalina.util.Base64;
+import org.apache.tomcat.util.buf.B2CConverter;
+import org.apache.wicket.protocol.http.WebApplication;
+import org.apache.wicket.protocol.ws.AbstractUpgradeFilter;
+
import java.io.IOException;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
@@ -26,12 +32,6 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletRequestWrapper;
import javax.servlet.http.HttpServletResponse;
-import org.apache.catalina.connector.RequestFacade;
-import org.apache.catalina.util.Base64;
-import org.apache.tomcat.util.buf.B2CConverter;
-import org.apache.wicket.protocol.http.WebApplication;
-import org.apache.wicket.protocol.ws.AbstractUpgradeFilter;
-
/**
* An upgrade filter that uses code borrowed from Tomcat's WebSocketServlet
* to decide whether to upgrade the request protocol to websocket or not.
@@ -47,6 +47,16 @@ public class Tomcat7WebSocketFilter extends AbstractUpgradeFilter
private MessageDigest sha1Helper;
+ public Tomcat7WebSocketFilter()
+ {
+ super();
+ }
+
+ public Tomcat7WebSocketFilter(WebApplication application)
+ {
+ super(application);
+ }
+
@Override
public void init(final boolean isServlet, final FilterConfig filterConfig)
throws ServletException