Updated Branches: refs/heads/wicket-1.4.x 0bb3c3825 -> 6a1358fe7
WICKET-4430: By using int as the scope, it is possible to read arbitrary resources from the classpath of a wicket application Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/6a1358fe Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/6a1358fe Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/6a1358fe Branch: refs/heads/wicket-1.4.x Commit: 6a1358fe79daf00a3229bc70eb4395a17d6009af Parents: 0bb3c38 Author: Peter Ertl <p...@apache.org> Authored: Sat Feb 25 01:45:48 2012 +0100 Committer: Peter Ertl <p...@apache.org> Committed: Sat Feb 25 01:45:48 2012 +0100 ---------------------------------------------------------------------- .../resource/SharedResourceRequestTarget.java | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/6a1358fe/wicket/src/main/java/org/apache/wicket/request/target/resource/SharedResourceRequestTarget.java ---------------------------------------------------------------------- diff --git a/wicket/src/main/java/org/apache/wicket/request/target/resource/SharedResourceRequestTarget.java b/wicket/src/main/java/org/apache/wicket/request/target/resource/SharedResourceRequestTarget.java index f8d24f2..7b6ca35 100644 --- a/wicket/src/main/java/org/apache/wicket/request/target/resource/SharedResourceRequestTarget.java +++ b/wicket/src/main/java/org/apache/wicket/request/target/resource/SharedResourceRequestTarget.java @@ -149,6 +149,11 @@ public class SharedResourceRequestTarget implements ISharedResourceRequestTarget if (scope == null) { scope = resolver.resolveClass(className); + + if(scope.getPackage() == null) // do not accept default package as scope + { + scope = null; + } } // get path component of resource key, replace '..' with
