Repository: wicket Updated Branches: refs/heads/master 9d06189bf -> e5f6ea091
WICKET-5851 Fix PackageResourceTest and PackageResourceGuardTest under Windows (cherry picked from commit 2ed52c012c5d84c9dfcb5ffb571b9541c0575073) Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/e5f6ea09 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/e5f6ea09 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/e5f6ea09 Branch: refs/heads/master Commit: e5f6ea091077793200fb1fbe957deeee5d03e5cb Parents: 9d06189 Author: Alexander Morozov <[email protected]> Authored: Fri Mar 6 23:51:13 2015 +0600 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Thu Mar 12 10:25:22 2015 +0200 ---------------------------------------------------------------------- .../org/apache/wicket/markup/html/PackageResourceGuard.java | 3 ++- .../apache/wicket/markup/html/PackageResourceGuardTest.java | 7 ++++++- .../org/apache/wicket/markup/html/PackageResourceTest.java | 1 + 3 files changed, 9 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/e5f6ea09/wicket-core/src/main/java/org/apache/wicket/markup/html/PackageResourceGuard.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/PackageResourceGuard.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/PackageResourceGuard.java index 8cd8fe7..c06590b 100644 --- a/wicket-core/src/main/java/org/apache/wicket/markup/html/PackageResourceGuard.java +++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/PackageResourceGuard.java @@ -70,7 +70,8 @@ public class PackageResourceGuard implements IPackageResourceGuard int len = path.length(); final String ext; if (ixExtension <= 0 || ixExtension == len || - (path.lastIndexOf(File.separator) + 1) == ixExtension) + (path.lastIndexOf('/') + 1) == ixExtension || + (path.lastIndexOf('\\') + 1) == ixExtension) { ext = null; } http://git-wip-us.apache.org/repos/asf/wicket/blob/e5f6ea09/wicket-core/src/test/java/org/apache/wicket/markup/html/PackageResourceGuardTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/PackageResourceGuardTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/PackageResourceGuardTest.java index bafd8c4..bcbcd69 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/PackageResourceGuardTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/PackageResourceGuardTest.java @@ -54,16 +54,21 @@ public class PackageResourceGuardTest extends WicketTestCase guard.setAllowAccessToRootResources(false); assertTrue(guard.accept("/test/test.js")); + assertTrue(guard.accept("/test/.java")); assertFalse(guard.accept("/test.js")); - if ("\\".equals(File.pathSeparator)) + if ("\\".equals(File.separator)) { + assertTrue(guard.accept("c:\\test\\org\\apache\\.java")); + assertTrue(guard.accept("\\test\\org\\apache\\.java")); assertTrue(guard.accept("c:\\test\\org\\apache\\test.js")); assertTrue(guard.accept("\\test\\org\\apache\\test.js")); assertFalse(guard.accept("c:\\test.js")); assertFalse(guard.accept("\\test.js")); // java also generates file paths with '/' on windows + assertTrue(guard.accept("c:/test/org/apache/.java")); + assertTrue(guard.accept("/test/org/apache/.java")); assertTrue(guard.accept("c:/test/org/apache/test.js")); assertTrue(guard.accept("/test/org/apache/test.js")); assertFalse(guard.accept("c:/test.js")); http://git-wip-us.apache.org/repos/asf/wicket/blob/e5f6ea09/wicket-core/src/test/java/org/apache/wicket/markup/html/PackageResourceTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/PackageResourceTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/PackageResourceTest.java index 9249f46..19624c7 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/PackageResourceTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/PackageResourceTest.java @@ -82,6 +82,7 @@ public class PackageResourceTest extends WicketTestCase assertTrue(guard.accept(Packages.absolutePath(PackageResourceTest.class, ".Bar"))); assertTrue(guard.accept(Packages.absolutePath(PackageResourceTest.class, ".java"))); assertFalse(guard.accept(Packages.absolutePath(PackageResourceTest.class, "Bar.java"))); + assertTrue(guard.accept(Packages.absolutePath(PackageResourceTest.class, "foo/.java"))); } /**
