Updated Branches: refs/heads/master 7e7ba599e -> d5a910555
Upgrade Spring to 4.0.1 and Jetty to 8.1.14 Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/d5a91055 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/d5a91055 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/d5a91055 Branch: refs/heads/master Commit: d5a91055556e49d2691646b0ff592f2d0d4600f0 Parents: 7e7ba59 Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Thu Jan 30 15:41:19 2014 +0100 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Thu Jan 30 15:41:19 2014 +0100 ---------------------------------------------------------------------- pom.xml | 4 ++-- .../protocol/ws/javax/WicketServerEndpointConfig.java | 11 +++++++++++ 2 files changed, 13 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/d5a91055/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 73dee0c..d42b54b 100644 --- a/pom.xml +++ b/pom.xml @@ -31,9 +31,9 @@ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <mvn.build.java.version>1.7</mvn.build.java.version> <jacoco.version>0.6.3.201306030806</jacoco.version> - <jetty.version>8.1.13.v20130916</jetty.version> + <jetty.version>8.1.14.v20131031</jetty.version> <jetty9.version>9.0.6.v20130930</jetty9.version> - <spring.version>4.0.0.RELEASE</spring.version> + <spring.version>4.0.1.RELEASE</spring.version> <servlet-api.version>3.0.1</servlet-api.version> <maven.javadoc.version>2.9.1</maven.javadoc.version> <maven.surefire.version>2.12.2</maven.surefire.version> http://git-wip-us.apache.org/repos/asf/wicket/blob/d5a91055/wicket-native-websocket/wicket-native-websocket-javax/src/main/java/org/apache/wicket/protocol/ws/javax/WicketServerEndpointConfig.java ---------------------------------------------------------------------- diff --git a/wicket-native-websocket/wicket-native-websocket-javax/src/main/java/org/apache/wicket/protocol/ws/javax/WicketServerEndpointConfig.java b/wicket-native-websocket/wicket-native-websocket-javax/src/main/java/org/apache/wicket/protocol/ws/javax/WicketServerEndpointConfig.java index e3a039b..ce60492 100644 --- a/wicket-native-websocket/wicket-native-websocket-javax/src/main/java/org/apache/wicket/protocol/ws/javax/WicketServerEndpointConfig.java +++ b/wicket-native-websocket/wicket-native-websocket-javax/src/main/java/org/apache/wicket/protocol/ws/javax/WicketServerEndpointConfig.java @@ -28,6 +28,9 @@ import javax.websocket.HandshakeResponse; import javax.websocket.server.HandshakeRequest; import javax.websocket.server.ServerEndpointConfig; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + /** * A ServerEndpointConfig that uses custom Configurator to collect * all available information from the passed HandshakeRequest @@ -107,6 +110,8 @@ class WicketServerEndpointConfig implements ServerEndpointConfig */ private static class JavaxWebSocketConfigurator extends ServerEndpointConfig.Configurator { + private static final Logger LOG = LoggerFactory.getLogger(JavaxWebSocketConfigurator.class); + private final ServerEndpointConfig.Configurator delegate; public JavaxWebSocketConfigurator(ServerEndpointConfig.Configurator delegate) @@ -123,12 +128,14 @@ class WicketServerEndpointConfig implements ServerEndpointConfig Map<String, Object> userProperties = sec.getUserProperties(); Object httpSession = request.getHttpSession(); + LOG.trace("httpSession: {}", httpSession); if (httpSession != null) { userProperties.put("session", httpSession); } Map<String, List<String>> headers = request.getHeaders(); + LOG.trace("headers: {}", headers); if (headers != null) { userProperties.put("headers", headers); @@ -136,6 +143,7 @@ class WicketServerEndpointConfig implements ServerEndpointConfig Map<String, List<String>> parameterMap = request.getParameterMap(); + LOG.trace("parameterMap: {}", parameterMap); if (parameterMap != null) { userProperties.put("parameterMap", parameterMap); @@ -143,6 +151,7 @@ class WicketServerEndpointConfig implements ServerEndpointConfig String queryString = request.getQueryString(); + LOG.trace("queryString: {}", queryString); if (queryString != null) { userProperties.put("queryString", queryString); @@ -150,12 +159,14 @@ class WicketServerEndpointConfig implements ServerEndpointConfig URI requestURI = request.getRequestURI(); + LOG.trace("requestURI: {}", requestURI); if (requestURI != null) { userProperties.put("requestURI", requestURI); } Principal userPrincipal = request.getUserPrincipal(); + LOG.trace("userPrincipal: {}", userPrincipal); if (userPrincipal != null) { userProperties.put("userPrincipal", userPrincipal);
