You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2013/06/18 10:09:28 UTC
[04/21] git commit: Merge branch 'master' into
wicket-examples-gym-tests
Merge branch 'master' into wicket-examples-gym-tests
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/f38d32e0
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/f38d32e0
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/f38d32e0
Branch: refs/heads/master
Commit: f38d32e0d6ca18877ce41255a58b37ea4f6849d3
Parents: ff55cb8 4bc2074
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Mon Jun 17 10:18:24 2013 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Mon Jun 17 10:18:24 2013 +0200
----------------------------------------------------------------------
.gitignore | 2 +-
wicket-cdi/pom.xml | 6 +
.../apache/wicket/cdi/ComponentInjector.java | 18 +-
.../wicket/cdi/ComponentInjectorTest.java | 131 +++++++
.../main/java/org/apache/wicket/Component.java | 2 +-
.../wicket/ajax/AbstractAjaxResponse.java | 9 +
.../ajax/markup/html/AjaxFallbackLink.java | 4 +-
.../wicket/ajax/markup/html/AjaxLink.java | 2 +-
.../ajax/markup/html/form/AjaxSubmitLink.java | 4 +-
.../core/request/mapper/MountedMapper.java | 10 +-
.../core/request/mapper/PageInstanceMapper.java | 4 +
.../core/util/string/ComponentRenderer.java | 21 +-
.../apache/wicket/markup/html/form/Button.java | 13 +-
.../wicket/markup/html/form/SubmitLink.java | 12 +-
.../wicket/markup/html/link/AbstractLink.java | 125 +-----
.../markup/html/link/DisabledLinkBehavior.java | 174 +++++++++
.../wicket/markup/html/link/ExternalLink.java | 2 +-
.../apache/wicket/markup/html/link/Link.java | 10 +-
.../request/handler/render/WebPageRenderer.java | 242 +++++++-----
.../apache/wicket/settings/IMarkupSettings.java | 22 --
.../wicket/settings/def/MarkupSettings.java | 42 --
.../util/template/PackageTextTemplate.java | 128 +++++--
.../core/request/mapper/MountedMapperTest.java | 58 +++
.../request/mapper/PageInstanceMapperTest.java | 49 ++-
.../core/util/string/ComponentRendererTest.java | 2 +-
.../html/autolink/MyPageExpectedResult.html | 2 +-
.../html/autolink/PageAExpectedResult.html | 4 +-
.../html/autolink/PageBExpectedResult.html | 2 +-
.../wicket/markup/html/form/ButtonTest.java | 21 +-
...talTableNavigationPage_ExpectedResult_1.html | 2 +-
.../PagedTableNavigatorExpectedResult_1.html | 6 +-
.../PagedTableNavigatorExpectedResult_2.html | 2 +-
.../PagedTableNavigatorExpectedResult_3.html | 6 +-
.../PagedTableNavigatorExpectedResult_4.html | 6 +-
.../PagedTableNavigatorExpectedResult_5.html | 6 +-
.../PagedTableNavigatorExpectedResult_6.html | 2 +-
.../PagedTableNavigatorExpectedResult_7.html | 2 +-
.../PagedTableNavigatorExpectedResult_8.html | 6 +-
...igatorWithLabelProviderExpectedResult_1.html | 6 +-
...igatorWithLabelProviderExpectedResult_2.html | 2 +-
...igatorWithLabelProviderExpectedResult_3.html | 6 +-
...igatorWithLabelProviderExpectedResult_4.html | 6 +-
...igatorWithLabelProviderExpectedResult_5.html | 6 +-
...igatorWithLabelProviderExpectedResult_6.html | 2 +-
...igatorWithLabelProviderExpectedResult_7.html | 2 +-
...igatorWithLabelProviderExpectedResult_8.html | 4 +-
...ableNavigatorWithMarginExpectedResult_1.html | 6 +-
...ableNavigatorWithMarginExpectedResult_2.html | 2 +-
...ableNavigatorWithMarginExpectedResult_3.html | 6 +-
...ableNavigatorWithMarginExpectedResult_4.html | 6 +-
...ableNavigatorWithMarginExpectedResult_5.html | 6 +-
...ableNavigatorWithMarginExpectedResult_6.html | 2 +-
...ableNavigatorWithMarginExpectedResult_7.html | 2 +-
.../html/list/PagedTablePageExpectedResult.html | 2 +-
.../wicket/markup/html/list/PagedTableTest.java | 4 +-
.../handler/render/AbstractVariations.java | 40 ++
.../render/ShouldRedirectToTargetUrl.java | 62 +++
...uldRenderPageAndWriteResponseVariations.java | 64 ++++
.../handler/render/TestPageRenderer.java | 85 +++++
.../request/handler/render/TestVariations.java | 74 ++++
.../request/handler/render/Variation.java | 50 +++
.../handler/render/VariationIterator.java | 92 +++++
.../handler/render/WebPageRendererTest.java | 379 ++++++++++++++++---
.../yui/calendar/DateTimeFieldTest.java | 39 +-
.../wicket/examples/asemail/MailTemplate.java | 4 +-
.../wicket/examples/cdi/ConversationPage2.java | 23 +-
.../navomatic/NavomaticApplication.java | 11 +-
.../ajax/markup/html/modal/ModalWindow.java | 7 +-
.../ajax/markup/html/modal/res/modal.js | 6 +-
.../html/repeater/data/sort/OrderByLink.java | 2 +-
.../org/apache/wicket/jmx/MarkupSettings.java | 36 --
.../apache/wicket/jmx/MarkupSettingsMBean.java | 22 --
72 files changed, 1666 insertions(+), 559 deletions(-)
----------------------------------------------------------------------