Merge branch 'master' of https://github.com/apache/wicket
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/6886c2b2 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/6886c2b2 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/6886c2b2 Branch: refs/heads/master Commit: 6886c2b229059c36ae347f5e976cd06d6ff47985 Parents: 0e975d7 fb5a2fa Author: Manuel Barzi <[email protected]> Authored: Thu Mar 16 12:57:01 2017 +0100 Committer: Manuel Barzi <[email protected]> Committed: Thu Mar 16 12:57:01 2017 +0100 ---------------------------------------------------------------------- .../main/resources/archetype-resources/pom.xml | 6 +- pom.xml | 22 ++-- wicket-core/pom.xml | 4 +- .../org/apache/wicket/DefaultMapperContext.java | 2 +- .../java/org/apache/wicket/ResourceBundles.java | 32 ++++- .../main/java/org/apache/wicket/Session.java | 4 +- .../ajax/AbstractDefaultAjaxBehavior.java | 9 +- .../org/apache/wicket/ajax/json/JsonUtils.java | 6 +- .../wicket/ajax/markup/html/AjaxLink.java | 54 -------- .../ajax/markup/html/form/AjaxButton.java | 64 --------- .../ajax/markup/html/form/AjaxCheckBox.java | 28 ---- .../markup/html/form/AjaxFallbackButton.java | 14 +- .../ajax/markup/html/form/AjaxSubmitLink.java | 64 --------- .../wicket/core/util/lang/WicketObjects.java | 16 ++- .../java/org/apache/wicket/lambda/Lambdas.java | 132 +------------------ .../apache/wicket/markup/html/form/Button.java | 65 +-------- .../html/form/CheckBoxMultipleChoice.java | 68 ++++++++-- .../wicket/markup/html/form/RadioChoice.java | 22 ++-- .../apache/wicket/markup/html/link/Link.java | 29 +--- .../org/apache/wicket/mock/MockPageManager.java | 12 +- .../apache/wicket/page/AbstractPageManager.java | 18 ++- .../org/apache/wicket/page/IPageManager.java | 9 ++ .../wicket/page/PageAccessSynchronizer.java | 16 +++ .../wicket/page/PageManagerDecorator.java | 5 + .../apache/wicket/page/PageStoreManager.java | 22 ++++ .../org/apache/wicket/page/RequestAdapter.java | 9 ++ .../http/servlet/DispatchedRequestUtils.java | 2 +- .../protocol/http/servlet/ErrorAttributes.java | 27 ++-- .../http/servlet/ForwardAttributes.java | 48 ++++--- .../java/org/apache/wicket/ajax/HomePage.java | 5 - .../wicket/ajax/form/AjaxFormSubmitTest.java | 76 +++++++++-- .../ajax/form/AjaxFormSubmitTestPage.java | 50 +++++-- .../form/AjaxFormSubmitTestPage_expected.html | 14 +- ...ketComponentTreeTestPage_ExpectedResult.html | 4 +- .../html/form/CheckBoxMultipleChoiceTest.java | 62 +++++++-- .../html/form/FormWithMultipleButtonsTest.java | 5 - .../resource/BundlesPage_result_defer.html | 6 + .../request/resource/ResouceBundleTest.java | 17 +++ .../devutils/inspector/EnhancedPageView.java | 7 +- .../devutils/inspector/SessionSizeModel.java | 2 +- .../inspector/SessionSizeModelTest.java | 2 +- .../wicket/examples/ajax/builtin/LinksPage.java | 28 ++-- .../examples/ajax/builtin/WorldClockPage.java | 14 +- .../wicket/examples/authorization/Index.java | 6 +- .../pages/AnnotationsPanelsPage.java | 24 ++-- .../examples/captcha/AbstractCaptchaForm.java | 13 +- .../examples/cdi/AutoConversationPage1.java | 16 ++- .../wicket/examples/cdi/ConversationPage1.java | 20 ++- .../wicket/examples/cdi/ConversationPage2.java | 8 +- .../wicket/examples/cdi/InjectionPage.java | 8 +- .../wicket/examples/compref/LinkPage.java | 18 ++- .../examples/compref/NonBookmarkablePage.java | 6 +- .../events/DecoupledAjaxUpdatePage.java | 10 +- .../wicket/examples/forminput/FormInput.java | 21 +-- .../apache/wicket/examples/guice/HomePage.java | 9 +- .../apache/wicket/examples/hangman/Lose.java | 13 +- .../org/apache/wicket/examples/hangman/Win.java | 13 +- .../wicket/examples/kittenCaptcha/HomePage.java | 31 +++-- .../apache/wicket/examples/linkomatic/Home.java | 86 ++++++++---- .../org/apache/wicket/examples/media/Home.java | 2 +- .../wicket/examples/repeater/OIRPage.java | 16 ++- .../examples/repeater/RefreshingPage.java | 11 +- .../wicket/examples/stateless/StatefulPage.java | 17 ++- .../template/border/TemplateBorder.java | 21 +-- .../template/pageinheritance/TemplatePage.java | 21 +-- .../wicket/examples/tree/AdvancedTreePage.java | 29 +++- .../content/CheckedSelectableFolderContent.java | 2 +- .../tree/content/EditableFolderContent.java | 2 +- .../content/MultiSelectableFolderContent.java | 2 +- .../tree/content/SelectableFolderContent.java | 4 +- .../wicket/examples/upload/UploadPage.java | 13 +- .../http2/markup/head/NoopPushBuilder.java | 7 +- .../http2/markup/head/Tomcat85PushBuilder.java | 3 - .../html/autocomplete/wicket-autocomplete.js | 6 +- .../ajax/markup/html/modal/ModalWindow.java | 2 +- .../data/table/export/ExportToolbar.java | 34 +++-- .../markup/html/repeater/tree/AbstractTree.java | 21 +-- .../markup/html/repeater/tree/NestedTree.java | 65 ++++----- .../markup/html/repeater/tree/Node.java | 9 +- .../markup/html/repeater/tree/TableTree.java | 38 +++--- .../html/repeater/util/TreeModelProvider.java | 5 +- .../InstrumentationObjectSizeOfStrategy.java | 8 +- .../request/mapper/CompoundRequestMapper.java | 6 +- .../mapper/parameter/INamedParameters.java | 2 +- .../mapper/parameter/PageParameters.java | 2 + .../mapper/parameter/PageParametersTest.java | 35 ++++- wicket-user-guide/pom.xml | 13 -- .../src/main/asciidoc/ajax/ajax_3.adoc | 2 +- .../src/main/asciidoc/contributing.adoc | 4 +- .../main/asciidoc/helloWorld/helloWorld_2.adoc | 12 +- .../main/asciidoc/img/quickstart-webpage.png | Bin 184410 -> 73601 bytes .../main/asciidoc/internals/pagestoring.adoc | 5 +- .../main/asciidoc/resources/resources_15.adoc | 3 +- .../src/main/asciidoc/security/security_4.adoc | 2 +- .../main/asciidoc/security/security_4_1.adoc | 2 +- wicket-user-guide/src/main/asciidoc/single.adoc | 4 - .../src/main/asciidoc/whyLearn/whyLearn_1.adoc | 6 +- .../src/main/asciidoc/whyLearn/whyLearn_2.adoc | 6 +- .../src/main/asciidoc/whyLearn/whyLearn_3.adoc | 4 +- .../src/main/asciidoc/whyLearn/whyLearn_4.adoc | 4 +- .../asciidoc/wicketstuff/wicketstuff_7.adoc | 6 - .../wicket/util/crypt/ClassCryptFactory.java | 2 +- 102 files changed, 983 insertions(+), 878 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/6886c2b2/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/6886c2b2/wicket-core/pom.xml ---------------------------------------------------------------------- diff --cc wicket-core/pom.xml index a1ee73d,5349989..f8bb354 --- a/wicket-core/pom.xml +++ b/wicket-core/pom.xml @@@ -63,19 -63,9 +63,19 @@@ <artifactId>mockito-core</artifactId> </dependency> <dependency> - <groupId>com.tdunning</groupId> - <artifactId>json</artifactId> + <groupId>com.github.openjson</groupId> + <artifactId>openjson</artifactId> </dependency> + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + <scope>test</scope> + </dependency> </dependencies> <build> <pluginManagement>
