Merge remote-tracking branch 'origin/master' into lambdas
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/6d749402 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/6d749402 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/6d749402 Branch: refs/heads/lambdas Commit: 6d749402233e5c882be56d3e4604efd8efe1ab19 Parents: dd32093 d3abc0e Author: Michael Mosmann <[email protected]> Authored: Sun Nov 29 16:54:13 2015 +0100 Committer: Michael Mosmann <[email protected]> Committed: Sun Nov 29 16:54:13 2015 +0100 ---------------------------------------------------------------------- .gitignore | 1 + pom.xml | 2 +- .../deployment/AbstractDeploymentTest.java | 2 +- .../src/test/resources/arquillian.xml | 3 +- testing/wicket-js-tests/pom.xml | 4 +- wicket-core/Wicket - Tests.launch | 18 -- .../java/org/apache/wicket/Application.java | 2 - .../main/java/org/apache/wicket/Component.java | 2 +- .../java/org/apache/wicket/MarkupContainer.java | 130 +++++---- ...AjaxFormChoiceComponentUpdatingBehavior.java | 22 +- .../AjaxFormChoiceComponentUpdatingBehavior.js | 71 ----- .../wicket/ajax/res/js/wicket-ajax-jquery.js | 1 - .../util/objects/checker/IObjectChecker.java | 4 +- .../org/apache/wicket/markup/MarkupParser.java | 2 - .../org/apache/wicket/markup/WicketTag.java | 10 +- .../html/TransparentWebMarkupContainer.java | 4 +- .../wicket/markup/html/border/Border.java | 43 ++- .../wicket/markup/html/list/ListItem.java | 10 +- .../wicket/markup/html/list/ListView.java | 2 +- .../panel/AbstractMarkupSourcingStrategy.java | 117 ++++++-- .../parser/filter/ConditionalCommentFilter.java | 264 ------------------- .../markup/parser/filter/HtmlHandler.java | 2 +- .../parser/filter/WicketTagIdentifier.java | 37 ++- .../markup/resolver/AutoLinkResolver.java | 3 - .../resolver/MarkupInheritanceResolver.java | 66 ----- .../wicket/model/IObjectClassAwareModel.java | 2 +- .../java/org/apache/wicket/model/Model.java | 8 +- .../wicket/model/util/GenericBaseModel.java | 10 +- .../wicket/pageStore/memory/PageTable.java | 6 + .../servlet/MultipartServletWebRequestImpl.java | 5 +- .../http/servlet/ServletPartFileItem.java | 6 +- .../wicket/request/cycle/RequestCycle.java | 30 +++ .../resource/PackageResourceReference.java | 34 ++- .../html/TransparentWebMarkupContainerTest.java | 43 +++ .../wicket/markup/html/list/ListViewTest.java | 2 +- .../wicket/queueing/ComponentQueueingTest.java | 11 +- .../wicket/queueing/IncorrectCloseTagPanel.html | 7 + .../wicket/queueing/IncorrectCloseTagPanel.java | 31 +++ .../resource/PackageResourceReferenceTest.java | 19 ++ .../locator/ResourceNameIteratorTest.java | 2 +- .../ajax/markup/html/modal/ModalWindow.java | 30 +-- .../markup/html/form/select/SelectOptions.java | 9 +- .../wicket/request/RequestHandlerStack.java | 4 + .../src/docs/guide/resources/resources_15.gdoc | 20 +- .../src/docs/guide/resources/resources_16.gdoc | 7 + wicket-user-guide/src/docs/guide/toc.yml | 3 +- 46 files changed, 516 insertions(+), 595 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/6d749402/pom.xml ----------------------------------------------------------------------
