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/03/11 13:32:55 UTC
[3/22] git commit: Merge remote-tracking branch 'upstream/master'
into trunk
Merge remote-tracking branch 'upstream/master' into trunk
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/698bfb77
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/698bfb77
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/698bfb77
Branch: refs/heads/master
Commit: 698bfb771128fd157a4e5a47af5e61ff40a06d68
Parents: 9a2f8c8 77ac600
Author: Michael Mosmann <mi...@mosmann.de>
Authored: Mon Oct 1 19:17:46 2012 +0200
Committer: Michael Mosmann <mi...@mosmann.de>
Committed: Mon Oct 1 19:17:46 2012 +0200
----------------------------------------------------------------------
pom.xml | 1 +
.../org/apache/wicket/markup/html/form/Form.java | 9 +-
.../markup/resolver/WicketMessageResolver.java | 8 +-
.../wicket/protocol/http/WebApplication.java | 15 --
.../protocol/http/MultiPartTestApplication.java | 49 ------
.../http/servlet/ServletWebRequestTest.java | 22 ---
.../wicket/request/cycle/UrlRendererTest.java | 12 +-
.../wicket-native-websocket/pom.xml | 1 +
.../wicket-native-websocket-jetty9/pom.xml | 82 ++++++++++
.../protocol/http/Jetty9WebSocketFilter.java | 119 +++++++++++++++
.../ws/jetty/Jetty9WebSocketConnection.java | 110 +++++++++++++
.../ws/jetty/Jetty9WebSocketProcessor.java | 102 ++++++++++++
.../ws/util/license/ApacheLicenceHeaderTest.java | 34 ++++
.../ajax/markup/html/form/upload/progressbar.js | 8 +-
.../org/apache/wicket/request/UrlRenderer.java | 2 +
15 files changed, 470 insertions(+), 104 deletions(-)
----------------------------------------------------------------------