git commit: WICKET-5263 FilenameWithVersionResourceCachingStrategy breaks silently when the versionPrefix is contained in the original filename
Updated Branches:
refs/heads/master ff1cbdee1 - 6c79db3ec
WICKET-5263 FilenameWithVersionResourceCachingStrategy breaks silently when the
versionPrefix is contained in the original filename
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/6c79db3e
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/6c79db3e
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/6c79db3e
Branch: refs/heads/master
Commit: 6c79db3ec88201d485aa62457089a1f1dfe72db3
Parents: ff1cbde
Author: Martin Tzvetanov Grigorov mgrigo...@apache.org
Authored: Wed Jul 3 10:13:44 2013 +0300
Committer: Martin Tzvetanov Grigorov mgrigo...@apache.org
Committed: Wed Jul 3 10:13:44 2013 +0300
--
.../FilenameWithVersionResourceCachingStrategy.java | 10 ++
1 file changed, 10 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/wicket/blob/6c79db3e/wicket-core/src/main/java/org/apache/wicket/request/resource/caching/FilenameWithVersionResourceCachingStrategy.java
--
diff --git
a/wicket-core/src/main/java/org/apache/wicket/request/resource/caching/FilenameWithVersionResourceCachingStrategy.java
b/wicket-core/src/main/java/org/apache/wicket/request/resource/caching/FilenameWithVersionResourceCachingStrategy.java
index 9581bbf..d470986 100644
---
a/wicket-core/src/main/java/org/apache/wicket/request/resource/caching/FilenameWithVersionResourceCachingStrategy.java
+++
b/wicket-core/src/main/java/org/apache/wicket/request/resource/caching/FilenameWithVersionResourceCachingStrategy.java
@@ -20,6 +20,8 @@ import org.apache.wicket.request.http.WebResponse;
import org.apache.wicket.request.resource.AbstractResource;
import org.apache.wicket.request.resource.caching.version.IResourceVersion;
import org.apache.wicket.util.lang.Args;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* resource caching strategy that adds a version for the
@@ -43,6 +45,8 @@ import org.apache.wicket.util.lang.Args;
*/
public class FilenameWithVersionResourceCachingStrategy implements
IResourceCachingStrategy
{
+ private static final Logger LOG =
LoggerFactory.getLogger(FilenameWithVersionResourceCachingStrategy.class);
+
private static final String DEFAULT_VERSION_PREFIX = -ver-;
/** string that marks the beginning the of the version in the decorated
filename */
@@ -105,6 +109,12 @@ public class FilenameWithVersionResourceCachingStrategy
implements IResourceCach
// get undecorated filename
final String filename = url.getFileName();
+ if (filename.contains(getVersionPrefix()))
+ {
+ LOG.error(A resource with name '{}' contains the
version prefix '{}' so the un-decoration will not work. +
+Either use a different version prefix
or rename this resource., filename, getVersionPrefix());
+ }
+
// check if resource name has extension
final int extensionAt = filename.lastIndexOf('.');
git commit: WICKET-5263 FilenameWithVersionResourceCachingStrategy breaks silently when the versionPrefix is contained in the original filename
Updated Branches:
refs/heads/wicket-6.x 73a7dff79 - 0a4c0a900
WICKET-5263 FilenameWithVersionResourceCachingStrategy breaks silently when the
versionPrefix is contained in the original filename
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/0a4c0a90
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/0a4c0a90
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/0a4c0a90
Branch: refs/heads/wicket-6.x
Commit: 0a4c0a900f77e22cf03ef8b75f5ce87429cfdfcb
Parents: 73a7dff
Author: Martin Tzvetanov Grigorov mgrigo...@apache.org
Authored: Wed Jul 3 10:13:44 2013 +0300
Committer: Martin Tzvetanov Grigorov mgrigo...@apache.org
Committed: Wed Jul 3 10:14:17 2013 +0300
--
.../FilenameWithVersionResourceCachingStrategy.java | 10 ++
1 file changed, 10 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/wicket/blob/0a4c0a90/wicket-core/src/main/java/org/apache/wicket/request/resource/caching/FilenameWithVersionResourceCachingStrategy.java
--
diff --git
a/wicket-core/src/main/java/org/apache/wicket/request/resource/caching/FilenameWithVersionResourceCachingStrategy.java
b/wicket-core/src/main/java/org/apache/wicket/request/resource/caching/FilenameWithVersionResourceCachingStrategy.java
index 8c7b565..4da94a1 100644
---
a/wicket-core/src/main/java/org/apache/wicket/request/resource/caching/FilenameWithVersionResourceCachingStrategy.java
+++
b/wicket-core/src/main/java/org/apache/wicket/request/resource/caching/FilenameWithVersionResourceCachingStrategy.java
@@ -20,6 +20,8 @@ import org.apache.wicket.request.http.WebResponse;
import org.apache.wicket.request.resource.AbstractResource;
import org.apache.wicket.request.resource.caching.version.IResourceVersion;
import org.apache.wicket.util.lang.Args;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* resource caching strategy that adds a version for the
@@ -43,6 +45,8 @@ import org.apache.wicket.util.lang.Args;
*/
public class FilenameWithVersionResourceCachingStrategy implements
IResourceCachingStrategy
{
+ private static final Logger LOG =
LoggerFactory.getLogger(FilenameWithVersionResourceCachingStrategy.class);
+
private static final String DEFAULT_VERSION_PREFIX = -ver-;
/** string that marks the beginning the of the version in the decorated
filename */
@@ -105,6 +109,12 @@ public class FilenameWithVersionResourceCachingStrategy
implements IResourceCach
// get undecorated filename
final String filename = url.getFileName();
+ if (filename.contains(getVersionPrefix()))
+ {
+ LOG.error(A resource with name '{}' contains the
version prefix '{}' so the un-decoration will not work. +
+Either use a different version prefix
or rename this resource., filename, getVersionPrefix());
+ }
+
// check if resource name has extension
final int extensionAt = filename.lastIndexOf('.');
