Author: jbq
Date: Fri Feb 23 03:30:09 2007
New Revision: 510910
URL: http://svn.apache.org/viewvc?view=rev&rev=510910
Log:
WICKET-280 Allow to access html resources if they are not associated with a
java class
Modified:
incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/markup/html/PackageResourceGuard.java
Modified:
incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/markup/html/PackageResourceGuard.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/markup/html/PackageResourceGuard.java?view=diff&rev=510910&r1=510909&r2=510910
==============================================================================
---
incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/markup/html/PackageResourceGuard.java
(original)
+++
incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/markup/html/PackageResourceGuard.java
Fri Feb 23 03:30:09 2007
@@ -40,7 +40,6 @@
blockedExtensions.add("properties");
blockedExtensions.add("class");
blockedExtensions.add("java");
- blockedExtensions.add("html");
}
/**
@@ -73,6 +72,10 @@
else
{
ext = path.substring(ixExtension + 1).toLowerCase();
+ }
+ if ("html".equals(ext) &&
getClass().getClassLoader().getResource(path.replaceAll(".html", ".class")) !=
null)
+ {
+ return false;
}
return acceptExtension(ext);
}