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/5e2c00f1 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/5e2c00f1 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/5e2c00f1 Branch: refs/heads/master Commit: 5e2c00f1f3c1988ed250793ca55768c8fcf1bbac Parents: 5ffb19d 8c827e3 Author: Michael Mosmann <[email protected]> Authored: Sun Dec 16 19:05:24 2012 +0100 Committer: Michael Mosmann <[email protected]> Committed: Sun Dec 16 19:05:24 2012 +0100 ---------------------------------------------------------------------- pom.xml | 36 ++ testing/wicket-common-tests/pom.xml | 30 ++ testing/wicket-threadtest/pom.xml | 2 +- wicket-cdi/pom.xml | 29 + .../apache/wicket/ajax/AbstractAjaxResponse.java | 16 +- .../org/apache/wicket/ajax/XmlAjaxResponse.java | 13 +- .../wicket/ajax/attributes/IAjaxCallListener.java | 141 +++--- .../wicket/core/request/mapper/CryptoMapper.java | 2 + .../wicket/core/util/string/JavaScriptUtils.java | 48 +- .../protocol/http/HeaderBufferingWebResponse.java | 98 ++-- .../apache/wicket/protocol/http/WicketFilter.java | 46 ++- .../protocol/http/servlet/ServletWebRequest.java | 6 + .../UtfPropertiesFilePropertiesLoader.java | 38 +-- .../apache/wicket/TestDetachPageAjaxResult.html | 2 +- .../AjaxHeaderContributionPage2_ajax_expected.html | 2 +- .../AjaxHeaderContributionPage_ajax_expected.html | 2 +- .../ajax/DomReadyOrderPage_ajax_expected.html | 2 +- .../SimpleTestPageExpectedResult-1.html | 2 +- .../core/request/mapper/CryptoMapperTest.java | 36 ++- .../core/util/string/JavaScriptUtilsTest.java | 31 ++- .../http/HeaderBufferingWebResponseTest.java | 119 ++--- .../protocol/http/ResponseIOExceptionTest.java | 134 +++++ .../wicket/request/cycle/UrlRendererTest.java | 13 + .../wicket/resource/PageWithUTF8Properties.java | 36 ++ .../PageWithUTF8Properties.utf8.properties | 21 + .../UtfPropertiesFilePropertiesLoaderTest.java | 36 ++ .../org/apache/wicket/util/resource/PathTest.java | 4 +- .../org/apache/wicket/bootstrap/Bootstrap.java | 106 ++-- .../wicket/bootstrap/css/bootstrap-responsive.css | 6 +- .../bootstrap/css/bootstrap-responsive.min.css | 4 +- .../org/apache/wicket/bootstrap/css/bootstrap.css | 398 ++++++++++----- .../apache/wicket/bootstrap/css/bootstrap.min.css | 4 +- .../org/apache/wicket/bootstrap/js/bootstrap.js | 196 ++++++-- .../apache/wicket/bootstrap/js/bootstrap.min.js | 2 +- .../wicket/ajax/IWebSocketRequestHandler.java | 45 -- .../wicket/ajax/WebSocketRequestHandler.java | 270 ---------- .../protocol/http/AbstractUpgradeFilter.java | 258 ---------- .../wicket/protocol/ws/AbstractUpgradeFilter.java | 197 +++++++ .../wicket/protocol/ws/IWebSocketSettings.java | 6 +- .../ws/api/AbstractWebSocketProcessor.java | 3 +- .../protocol/ws/api/IWebSocketRequestHandler.java | 45 ++ .../wicket/protocol/ws/api/WebSocketBehavior.java | 1 - .../protocol/ws/api/WebSocketPushBroadcaster.java | 12 +- .../protocol/ws/api/WebSocketRequestHandler.java | 272 ++++++++++ .../ws/api/event/WebSocketBinaryPayload.java | 2 +- .../ws/api/event/WebSocketClosedPayload.java | 2 +- .../ws/api/event/WebSocketConnectedPayload.java | 2 +- .../protocol/ws/api/event/WebSocketPayload.java | 2 +- .../ws/api/event/WebSocketPushPayload.java | 2 +- .../ws/api/event/WebSocketTextPayload.java | 2 +- .../ws/api/res/js/wicket-websocket-jquery.js | 29 +- .../ws/util/tester/TestWebSocketProcessor.java | 20 +- .../protocol/ws/util/tester/WebSocketTester.java | 23 +- .../protocol/ws/util/tester/WebSocketTestPage.java | 7 +- .../ws/util/tester/WebSocketTesterTest.java | 68 +++- .../protocol/http/Jetty7WebSocketFilter.java | 107 ---- .../protocol/ws/jetty/Jetty7WebSocketFilter.java | 106 ++++ .../protocol/http/Jetty9WebSocketFilter.java | 119 ----- .../ws/jetty/Jetty9WebSocketConnection.java | 113 ---- .../ws/jetty/Jetty9WebSocketProcessor.java | 102 ---- .../ws/jetty9/Jetty9WebSocketConnection.java | 113 ++++ .../protocol/ws/jetty9/Jetty9WebSocketFilter.java | 117 +++++ .../ws/jetty9/Jetty9WebSocketProcessor.java | 102 ++++ .../protocol/http/Tomcat7WebSocketFilter.java | 90 ---- .../ws/tomcat7/Tomcat7WebSocketFilter.java | 91 ++++ .../ajax/markup/html/AjaxEditableChoiceLabel.java | 2 +- .../extensions/markup/html/tree/AbstractTree.java | 5 + .../apache/wicket/proxy/LazyInitProxyFactory.java | 2 +- .../wicket/request/HttpHeaderCollection.java | 62 ++-- .../org/apache/wicket/request/UrlRenderer.java | 10 +- .../org/apache/wicket/request/http/WebRequest.java | 6 + .../wicket/request/HttpHeaderCollectionTest.java | 15 +- .../java/org/apache/wicket/util/file/Path.java | 6 + 73 files changed, 2375 insertions(+), 1722 deletions(-) ----------------------------------------------------------------------
