Updated Branches: refs/heads/wicket-1.4.x 84664817f -> 00d5a7a94
Merge branch 'wicket-1.4.x' of https://git-wip-us.apache.org/repos/asf/wicket into wicket-1.4.x Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/00d5a7a9 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/00d5a7a9 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/00d5a7a9 Branch: refs/heads/wicket-1.4.x Commit: 00d5a7a94960951f11312a2f6b72033cffff1f21 Parents: 25e5b04 8466481 Author: Igor Vaynberg <[email protected]> Authored: Wed Mar 7 08:29:21 2012 -0800 Committer: Igor Vaynberg <[email protected]> Committed: Wed Mar 7 08:29:21 2012 -0800 ---------------------------------------------------------------------- pom.xml | 6 ++ .../velocity/VelocityTemplateApplication.java | 10 ++- .../html/autocomplete/wicket-autocomplete.js | 3 +- .../extensions/ajax/markup/html/modal/res/modal.js | 4 +- .../extensions/markup/html/form/select/Select.java | 7 +- wicket/pom.xml | 4 + .../java/org/apache/wicket/RedirectException.java | 70 +++++++++++++++ .../wicket/ajax/AbstractDefaultAjaxBehavior.java | 10 ++ .../apache/wicket/markup/html/PackageResource.java | 39 +++++++-- .../wicket/markup/html/PackageResourceGuard.java | 6 +- .../markup/html/SecurePackageResourceGuard.java | 30 ++++++- .../org/apache/wicket/markup/html/form/Check.java | 10 +- .../http/request/WebRequestCodingStrategy.java | 12 +++- .../resource/SharedResourceRequestTarget.java | 5 + .../java/org/apache/wicket/settings/Settings.java | 5 +- .../wicket/util/file/WebApplicationPath.java | 39 ++++++--- .../java/org/apache/wicket/util/lang/Packages.java | 7 +- .../locator/EmptyResourceNameIterator.java | 46 ++++++++++ .../resource/locator/ResourceStreamLocator.java | 29 ++++++- .../wicket/util/tester/BaseWicketTester.java | 57 +++++++----- .../org/apache/wicket/SharedResourceUrlTest.java | 35 ++++---- .../html/SecurePackageResourceGuardTest.java | 31 ++++--- .../html/link/AutolinkPageExpectedResult_2.html | 2 +- .../wicket/util/file/WebApplicationPathTest.java | 58 ++++++++++++ .../org/apache/wicket/util/lang/PackagesTest.java | 66 ++++++++++++++ .../wicket/util/tester/WicketTesterTest.java | 26 +++--- 26 files changed, 506 insertions(+), 111 deletions(-) ----------------------------------------------------------------------
