Merge branch 'master' into WICKET-6518-quickstart-logback
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/1d20044b Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/1d20044b Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/1d20044b Branch: refs/heads/WICKET-6498_deferred_javascript_2 Commit: 1d20044b5e9a5d282217514bffd040c13794b808 Parents: da3b69f eb9f6c9 Author: Maxim Solodovnik <[email protected]> Authored: Mon Jan 22 10:21:59 2018 +0700 Committer: Maxim Solodovnik <[email protected]> Committed: Mon Jan 22 10:21:59 2018 +0700 ---------------------------------------------------------------------- pom.xml | 4 +- .../main/java/org/apache/wicket/Component.java | 332 ++++++------------- .../java/org/apache/wicket/MarkupContainer.java | 22 -- .../src/main/java/org/apache/wicket/Page.java | 36 +- .../ComponentRenderingRequestHandler.java | 9 +- .../handler/PageAndComponentProvider.java | 2 +- .../core/util/string/ComponentRenderer.java | 3 +- .../apache/wicket/feedback/FeedbackDelay.java | 119 +++++++ .../org/apache/wicket/feedback/IFeedback.java | 5 +- .../apache/wicket/page/PartialPageUpdate.java | 74 ++++- .../wicket/page/XmlPartialPageUpdate.java | 50 +-- .../wicket/feedback/FeedbackRenderTest.java | 22 +- .../apache/wicket/feedback/FeedbacksPage.html | 16 +- .../apache/wicket/feedback/FeedbacksPage.java | 31 +- .../markup/html/internal/EnclosurePage_1.java | 50 ++- .../markup/html/internal/EnclosureTest.java | 4 + wicket-eclipse-settings/pom.xml | 2 +- .../componentLifecycle_1.adoc | 11 +- .../componentLifecycle_2.adoc | 9 +- .../componentLifecycle_3.adoc | 6 +- .../componentLifecycle_4.adoc | 23 +- .../componentLifecycle_5.adoc | 6 +- .../componentLifecycle_6.adoc | 3 +- .../componentLifecycle_7.adoc | 5 + .../main/asciidoc/img/component-lifecycle.png | Bin 10587 -> 34960 bytes wicket-user-guide/src/main/asciidoc/single.adoc | 8 +- 26 files changed, 474 insertions(+), 378 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/1d20044b/pom.xml ----------------------------------------------------------------------
