Updated Branches: refs/heads/master f5fadb6ea -> ab326605b
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/wicket Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/ab326605 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/ab326605 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/ab326605 Branch: refs/heads/master Commit: ab326605b2c8ffd146b44e34a93bec8196c48204 Parents: 4497d7e f5fadb6 Author: Sven Meier <[email protected]> Authored: Wed Feb 8 22:35:30 2012 +0100 Committer: Sven Meier <[email protected]> Committed: Wed Feb 8 22:35:30 2012 +0100 ---------------------------------------------------------------------- .../java/org/apache/wicket/MarkupContainer.java | 2 +- .../java/org/apache/wicket/ResourceBundles.java | 16 ++- .../WicketAjaxDebugJQueryResourceReference.java | 2 +- .../apache/wicket/markup/head/IHeaderResponse.java | 1 - .../head/filter/FilteringHeaderResponse.java | 15 ++- .../head/filter/HeaderResponseContainer.java | 2 +- .../markup/html/internal/HtmlHeaderContainer.java | 4 +- .../AbstractHeaderRenderStrategy.java | 11 ++- .../resource/bundles/ResourceBundleReference.java | 6 +- .../wicket/settings/IRequestCycleSettings.java | 13 -- .../wicket/settings/def/RequestCycleSettings.java | 19 --- .../util/resource/WebExternalResourceStream.java | 10 ++- .../org/apache/wicket/util/tester/TagTester.java | 2 - .../head/filter/FilteringHeaderResponseTest.java | 88 +++++++++++++++ .../main/java/org/apache/wicket/request/Url.java | 3 - .../request/mapper/CompoundRequestMapper.java | 53 ++++++---- 16 files changed, 165 insertions(+), 82 deletions(-) ----------------------------------------------------------------------
