Updated Branches:
refs/heads/sandbox/resourcefinder 5032891ac -> 3b7febb59
refs/heads/wicket-1.4.x ed102d329 -> d4850e0ac
Merge branch 'master' into sandbox/resourcefinder
Conflicts:
wicket-core/src/test/java/org/apache/wicket/util/resource/PathTest.java
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/3b7febb5
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/3b7febb5
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/3b7febb5
Branch: refs/heads/sandbox/resourcefinder
Commit: 3b7febb59db848c63740346259df3f07bc30541d
Parents: 5032891 d699add
Author: Carl-Eric Menzel <cmen...@wicketbuch.de>
Authored: Tue Jul 3 14:21:24 2012 +0200
Committer: Carl-Eric Menzel <cmen...@wicketbuch.de>
Committed: Tue Jul 3 14:21:24 2012 +0200
----------------------------------------------------------------------
grunt.js | 66 +-
.../wicket/ajax/markup/html/form/AjaxButton.java | 4 +-
.../ajax/markup/html/form/AjaxFallbackButton.java | 4 +-
.../ajax/markup/html/form/AjaxSubmitLink.java | 1 -
.../wicket/ajax/res/js/wicket-ajax-jquery-debug.js | 23 +-
.../wicket/ajax/res/js/wicket-ajax-jquery.js | 16 +-
.../wicket/ajax/res/js/wicket-event-jquery.js | 4 -
.../markup/html/form/AbstractCheckSelector.js | 48 +-
.../org/apache/wicket/markup/html/form/Button.java | 1 -
.../wicket/markup/html/form/CheckBoxSelector.js | 16 +-
.../wicket/markup/html/form/CheckGroupSelector.js | 10 +-
.../html/form/CheckboxMultipleChoiceSelector.js | 13 +-
.../html/form/upload/MultiFileUploadField.js | 25 +-
.../http/servlet/DispatchedRequestUtils.java | 61 +
.../protocol/http/servlet/ErrorAttributes.java | 4 +-
.../protocol/http/servlet/ForwardAttributes.java | 4 +-
.../protocol/http/servlet/ServletWebRequest.java | 4 +-
.../request/handler/render/WebPageRenderer.java | 14 +-
.../request/resource/ResourceStreamResource.java | 24 +-
.../PreserveCookieForTheNextHandlerTest.java | 90 +
.../org/apache/wicket/util/resource/PathTest.java | 2 +
.../wicket/extensions/yui/calendar/wicket-date.js | 545 ++--
.../wicket/examples/compref/TabbedPanelPage.html | 3 -
.../wicket/examples/compref/TabbedPanelPage.java | 13 -
.../wicket/atmosphere/jquery.wicketatmosphere.js | 22 +-
.../html/autocomplete/wicket-autocomplete.js | 1684 ++++----
.../ajax/markup/html/form/upload/progressbar.js | 207 +-
.../extensions/ajax/markup/html/modal/res/modal.js | 3078 ++++++++-------
.../extensions/markup/html/form/palette/palette.js | 190 +-
.../extensions/markup/html/tabs/TabbedPanel.java | 124 +-
.../wicket/extensions/markup/html/tree/res/tree.js | 304 +-
.../markup/html/tabs/TabbedPanelTest.java | 12 +-
.../apache/wicket/util/encoding/UrlDecoder.java | 7 +-
.../apache/wicket/util/encoding/UrlEncoder.java | 31 +-
.../wicket/util/encoding/UrlDecoderTest.java | 42 +
.../wicket/util/encoding/UrlEncoderTest.java | 12 +-
36 files changed, 3481 insertions(+), 3227 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/3b7febb5/wicket-core/src/test/java/org/apache/wicket/util/resource/PathTest.java
----------------------------------------------------------------------
diff --cc
wicket-core/src/test/java/org/apache/wicket/util/resource/PathTest.java
index 50dcd86,9025853..52efe32
--- a/wicket-core/src/test/java/org/apache/wicket/util/resource/PathTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/util/resource/PathTest.java
@@@ -29,6 -30,6 +30,7 @@@ import org.junit.Test
public class PathTest extends WicketTestCase
{
++
@Test
public void loadFromRootUsingSubpathInFilename() throws Exception
{
