Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/f2add51f Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/f2add51f Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/f2add51f Branch: refs/heads/master Commit: f2add51f6ad1af9c4665fe6488fee2dce7038b8c Parents: 3eb6909 1dac2e8 Author: Martijn Dashorst <[email protected]> Authored: Tue Jul 12 22:51:27 2016 +0200 Committer: Martijn Dashorst <[email protected]> Committed: Tue Jul 12 22:51:27 2016 +0200 ---------------------------------------------------------------------- .../main/resources/archetype-resources/pom.xml | 2 +- pom.xml | 24 +++ testing/wicket-js-tests/pom.xml | 4 +- .../checker/CheckingObjectOutputStream.java | 7 +- .../html/form/upload/MultiFileUploadField.java | 13 +- .../loader/NestedStringResourceLoader.java | 6 +- .../objects/checker/SessionCheckerTest.java | 10 +- .../form/upload/MultiFileUploadFieldTest.java | 19 +- wicket-experimental/pom.xml | 1 + wicket-experimental/wicket-http2/pom.xml | 40 ++++ .../wicket-http2/wicket-http2-core/pom.xml | 41 ++++ .../org/apache/wicket/http2/Http2Settings.java | 108 ++++++++++ .../http2/markup/head/NoopPushBuilder.java | 59 +++++ .../wicket/http2/markup/head/PushBuilder.java | 35 +++ .../http2/markup/head/PushHeaderItem.java | 204 ++++++++++++++++++ .../wicket/http2/markup/head/PushItem.java | 111 ++++++++++ .../util/license/ApacheLicenceHeaderTest.java | 34 +++ .../wicket-http2/wicket-http2-jetty/pom.xml | 47 ++++ .../org/apache/wicket/http2/Initializer.java | 44 ++++ .../http2/markup/head/Jetty9PushBuilder.java | 43 ++++ .../services/org.apache.wicket.IInitializer | 1 + .../util/license/ApacheLicenceHeaderTest.java | 34 +++ .../wicket-http2/wicket-http2-tomcat/pom.xml | 47 ++++ .../org/apache/wicket/http2/Initializer.java | 44 ++++ .../http2/markup/head/Tomcat85PushBuilder.java | 45 ++++ .../services/org.apache.wicket.IInitializer | 1 + .../util/license/ApacheLicenceHeaderTest.java | 34 +++ .../wicket-http2/wicket-http2-undertow/pom.xml | 47 ++++ .../org/apache/wicket/http2/Initializer.java | 46 ++++ .../http2/markup/head/UndertowPushBuilder.java | 48 +++++ .../services/org.apache.wicket.IInitializer | 1 + .../util/license/ApacheLicenceHeaderTest.java | 34 +++ .../guide/bestpractices/bestpractices_2.gdoc | 2 +- wicket-user-guide/src/docs/guide/http2push.gdoc | 3 + .../src/docs/guide/http2push/http2push_1.gdoc | 37 ++++ .../docs/guide/modelsforms/modelsforms_1.gdoc | 15 -- .../docs/guide/modelsforms/modelsforms_10.gdoc | 4 + .../docs/guide/modelsforms/modelsforms_2.gdoc | 125 ++--------- .../docs/guide/modelsforms/modelsforms_3.gdoc | 214 +++++++------------ .../docs/guide/modelsforms/modelsforms_4.gdoc | 181 +++++++++++++--- .../docs/guide/modelsforms/modelsforms_5.gdoc | 123 ++++------- .../docs/guide/modelsforms/modelsforms_6.gdoc | 157 ++++++++------ .../docs/guide/modelsforms/modelsforms_7.gdoc | 92 ++++++-- .../docs/guide/modelsforms/modelsforms_8.gdoc | 26 ++- .../docs/guide/modelsforms/modelsforms_9.gdoc | 22 +- wicket-user-guide/src/docs/guide/toc.yml | 20 +- 46 files changed, 1754 insertions(+), 501 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/f2add51f/pom.xml ----------------------------------------------------------------------
