Merge branch 'javax.websocket'
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/a9e2f4e1 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/a9e2f4e1 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/a9e2f4e1 Branch: refs/heads/5299-ajax-strategy Commit: a9e2f4e10e092daa70974f4c797ec0c669aa4f64 Parents: 0aade63 23f4bef Author: Martin Tzvetanov Grigorov <mgrigo...@apache.org> Authored: Mon Aug 5 10:47:38 2013 +0200 Committer: Martin Tzvetanov Grigorov <mgrigo...@apache.org> Committed: Mon Aug 5 10:47:38 2013 +0200 ---------------------------------------------------------------------- .../wicket-native-websocket/pom.xml | 1 + .../ws/api/AbstractWebSocketProcessor.java | 1 - .../protocol/ws/api/WebSocketBehavior.java | 4 + .../ws/api/res/js/wicket-websocket-jquery.js | 23 +- .../api/res/js/wicket-websocket-setup.js.tmpl | 2 +- .../wicket-native-websocket-javax/pom.xml | 67 +++ .../ws/javax/JavaxUpgradeHttpRequest.java | 558 +++++++++++++++++++ .../ws/javax/JavaxWebSocketConnection.java | 119 ++++ .../protocol/ws/javax/JavaxWebSocketFilter.java | 280 ++++++++++ .../ws/javax/JavaxWebSocketProcessor.java | 83 +++ .../protocol/ws/javax/WicketEndpoint.java | 70 +++ .../src/test/java/log4j.properties | 16 + .../util/licence/ApacheLicenceHeaderTest.java | 34 ++ 13 files changed, 1243 insertions(+), 15 deletions(-) ----------------------------------------------------------------------
