Merge branch 'master' into sandbox/resourcefinder
Conflicts:
wicket-core/src/test/java/org/apache/wicket/util/resource/ResourceStreamLocatorTest.java
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/d11c4073
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/d11c4073
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/d11c4073
Branch: refs/heads/sandbox/resourcefinder
Commit: d11c4073745c9587eb467541d111da7b973d0c6b
Parents: 45db0cd ec7a022
Author: Carl-Eric Menzel <cmen...@wicketbuch.de>
Authored: Wed Jun 27 18:40:58 2012 +0200
Committer: Carl-Eric Menzel <cmen...@wicketbuch.de>
Committed: Wed Jun 27 18:40:58 2012 +0200
----------------------------------------------------------------------
grunt.js | 43 ++++
.../wicket/ajax/res/js/wicket-ajax-jquery.js | 10 +-
.../wicket/ajax/res/js/wicket-event-jquery.js | 4 +-
.../resource/locator/ResourceStreamLocator.java | 3 +-
.../wicket/markup/html/form/NumberTextField.java | 60 ++++-
.../validator/AbstractRangeValidator.java | 10 +-
.../org/apache/wicket/util/resource/PathTest.java | 55 ++++
.../util/resource/ResourceStreamLocatorTest.java | 193 +++++++++++++++
.../util/resource/ResourceStreamLocatorTest.txt | 1 +
.../util/resource/ResourceStreamLocatorTest_de.txt | 1 +
.../resource/ResourceStreamLocatorTest_de_DE.txt | 1 +
.../ResourceStreamLocatorTest_de_DE_POSIX.txt | 1 +
.../ResourceStreamLocatorTest_de__POSIX.txt | 1 +
.../util/resource/ResourceStreamLocatorTest_fr.txt | 1 +
.../resource/ResourceStreamLocatorTest_style.txt | 1 +
.../ResourceStreamLocatorTest_style_de.txt | 1 +
.../ResourceStreamLocatorTest_style_de_DE.txt | 1 +
...ResourceStreamLocatorTest_style_de_DE_POSIX.txt | 1 +
.../ResourceStreamLocatorTest_style_de__POSIX.txt | 1 +
.../apache/wicket/util/resource/ResourceTest.java | 175 -------------
.../apache/wicket/util/resource/ResourceTest.txt | 1 -
.../wicket/util/resource/ResourceTest_de.txt | 1 -
.../wicket/util/resource/ResourceTest_de_DE.txt | 1 -
.../util/resource/ResourceTest_de_DE_POSIX.txt | 1 -
.../util/resource/ResourceTest_de__POSIX.txt | 1 -
.../wicket/util/resource/ResourceTest_fr.txt | 1 -
.../wicket/util/resource/ResourceTest_style.txt | 1 -
.../wicket/util/resource/ResourceTest_style_de.txt | 1 -
.../util/resource/ResourceTest_style_de_DE.txt | 1 -
.../resource/ResourceTest_style_de_DE_POSIX.txt | 1 -
.../util/resource/ResourceTest_style_de__POSIX.txt | 1 -
.../sourcePath/ResourceStreamLocatorTest.txt | 1 +
.../sourcePath/ResourceStreamLocatorTest_de.txt | 1 +
.../sourcePath/ResourceStreamLocatorTest_de_DE.txt | 1 +
.../ResourceStreamLocatorTest_de_DE_POSIX.txt | 1 +
.../ResourceStreamLocatorTest_de__POSIX.txt | 1 +
.../sourcePath/ResourceStreamLocatorTest_style.txt | 1 +
.../ResourceStreamLocatorTest_style_de.txt | 1 +
.../ResourceStreamLocatorTest_style_de_DE.txt | 1 +
...ResourceStreamLocatorTest_style_de_DE_POSIX.txt | 1 +
.../ResourceStreamLocatorTest_style_de__POSIX.txt | 1 +
.../util/resource/sourcePath/ResourceTest.txt | 1 -
.../util/resource/sourcePath/ResourceTest_de.txt | 1 -
.../resource/sourcePath/ResourceTest_de_DE.txt | 1 -
.../sourcePath/ResourceTest_de_DE_POSIX.txt | 1 -
.../resource/sourcePath/ResourceTest_de__POSIX.txt | 1 -
.../resource/sourcePath/ResourceTest_style.txt | 1 -
.../resource/sourcePath/ResourceTest_style_de.txt | 1 -
.../sourcePath/ResourceTest_style_de_DE.txt | 1 -
.../sourcePath/ResourceTest_style_de_DE_POSIX.txt | 1 -
.../sourcePath/ResourceTest_style_de__POSIX.txt | 1 -
.../validation/validator/RangeValidatorTest.java | 22 ++-
.../java/org/apache/wicket/util/lang/Numbers.java | 108 ++++++++
.../org/apache/wicket/util/lang/NumbersTest.java | 69 +++++
54 files changed, 578 insertions(+), 216 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/d11c4073/wicket-core/src/main/java/org/apache/wicket/core/util/resource/locator/ResourceStreamLocator.java
----------------------------------------------------------------------
