You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2014/05/19 16:57:26 UTC
[1/4] git commit: WICKET-5590 Add a method to clear the cache of
CachingResourceVersion
Repository: wicket
Updated Branches:
refs/heads/master 8e6b4fc72 -> 9a79f67ea
WICKET-5590 Add a method to clear the cache of CachingResourceVersion
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/1274ea56
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/1274ea56
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/1274ea56
Branch: refs/heads/master
Commit: 1274ea5673fe5aa02ac54f40e3635050a8d67e31
Parents: f29fe6f
Author: Fridolin Jackstadt <fr...@lindenbaum.eu>
Authored: Thu May 15 10:22:54 2014 +0200
Committer: Fridolin Jackstadt <fr...@lindenbaum.eu>
Committed: Thu May 15 10:22:54 2014 +0200
----------------------------------------------------------------------
.../FilenameWithVersionResourceCachingStrategy.java | 10 ++++++++++
.../resource/caching/IResourceCachingStrategy.java | 6 ++++++
.../resource/caching/NoOpResourceCachingStrategy.java | 6 ++++++
.../QueryStringWithVersionResourceCachingStrategy.java | 10 ++++++++++
.../resource/caching/version/CachingResourceVersion.java | 4 ++++
5 files changed, 36 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/1274ea56/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 0afd86c..e1b2594 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
@@ -21,6 +21,7 @@ import java.util.regex.Pattern;
import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.request.http.WebResponse;
import org.apache.wicket.request.resource.AbstractResource;
+import org.apache.wicket.request.resource.caching.version.CachingResourceVersion;
import org.apache.wicket.request.resource.caching.version.IResourceVersion;
import org.apache.wicket.util.lang.Args;
import org.slf4j.Logger;
@@ -214,4 +215,13 @@ public class FilenameWithVersionResourceCachingStrategy implements IResourceCach
response.setCacheScope(WebResponse.CacheScope.PUBLIC);
}
}
+
+ @Override
+ public void clearCache()
+ {
+ if (resourceVersion instanceof CachingResourceVersion)
+ {
+ ((CachingResourceVersion) resourceVersion).invalidateAll();
+ }
+ }
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/1274ea56/wicket-core/src/main/java/org/apache/wicket/request/resource/caching/IResourceCachingStrategy.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/request/resource/caching/IResourceCachingStrategy.java b/wicket-core/src/main/java/org/apache/wicket/request/resource/caching/IResourceCachingStrategy.java
index c62a61a..c8d5821 100644
--- a/wicket-core/src/main/java/org/apache/wicket/request/resource/caching/IResourceCachingStrategy.java
+++ b/wicket-core/src/main/java/org/apache/wicket/request/resource/caching/IResourceCachingStrategy.java
@@ -71,4 +71,10 @@ public interface IResourceCachingStrategy
* @param response
*/
void decorateResponse(AbstractResource.ResourceResponse response, IStaticCacheableResource resource);
+
+ /**
+ * Clears any stateful information
+ */
+ void clearCache();
+
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/1274ea56/wicket-core/src/main/java/org/apache/wicket/request/resource/caching/NoOpResourceCachingStrategy.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/request/resource/caching/NoOpResourceCachingStrategy.java b/wicket-core/src/main/java/org/apache/wicket/request/resource/caching/NoOpResourceCachingStrategy.java
index ce39947..c65f209 100644
--- a/wicket-core/src/main/java/org/apache/wicket/request/resource/caching/NoOpResourceCachingStrategy.java
+++ b/wicket-core/src/main/java/org/apache/wicket/request/resource/caching/NoOpResourceCachingStrategy.java
@@ -48,4 +48,10 @@ public class NoOpResourceCachingStrategy implements IResourceCachingStrategy
public void decorateResponse(AbstractResource.ResourceResponse response, IStaticCacheableResource resource)
{
}
+
+ @Override
+ public void clearCache()
+ {
+ }
+
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/1274ea56/wicket-core/src/main/java/org/apache/wicket/request/resource/caching/QueryStringWithVersionResourceCachingStrategy.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/request/resource/caching/QueryStringWithVersionResourceCachingStrategy.java b/wicket-core/src/main/java/org/apache/wicket/request/resource/caching/QueryStringWithVersionResourceCachingStrategy.java
index e40e082..b3d6465 100644
--- a/wicket-core/src/main/java/org/apache/wicket/request/resource/caching/QueryStringWithVersionResourceCachingStrategy.java
+++ b/wicket-core/src/main/java/org/apache/wicket/request/resource/caching/QueryStringWithVersionResourceCachingStrategy.java
@@ -20,6 +20,7 @@ import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.request.http.WebResponse;
import org.apache.wicket.request.mapper.parameter.INamedParameters;
import org.apache.wicket.request.resource.AbstractResource;
+import org.apache.wicket.request.resource.caching.version.CachingResourceVersion;
import org.apache.wicket.request.resource.caching.version.IResourceVersion;
import org.apache.wicket.util.lang.Args;
import org.apache.wicket.util.string.StringValue;
@@ -135,4 +136,13 @@ public class QueryStringWithVersionResourceCachingStrategy implements IResourceC
response.setCacheScope(WebResponse.CacheScope.PUBLIC);
}
}
+
+ @Override
+ public void clearCache()
+ {
+ if (resourceVersion instanceof CachingResourceVersion)
+ {
+ ((CachingResourceVersion) resourceVersion).invalidateAll();
+ }
+ }
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/1274ea56/wicket-core/src/main/java/org/apache/wicket/request/resource/caching/version/CachingResourceVersion.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/request/resource/caching/version/CachingResourceVersion.java b/wicket-core/src/main/java/org/apache/wicket/request/resource/caching/version/CachingResourceVersion.java
index a2639a1..c94ad0c 100644
--- a/wicket-core/src/main/java/org/apache/wicket/request/resource/caching/version/CachingResourceVersion.java
+++ b/wicket-core/src/main/java/org/apache/wicket/request/resource/caching/version/CachingResourceVersion.java
@@ -157,4 +157,8 @@ public class CachingResourceVersion implements IResourceVersion
cache.remove(key);
}
}
+
+ public void invalidateAll() {
+ cache.clear();
+ }
}
[2/4] git commit: WICKET-5592 Add a method to clear the cache of
CachingResourceStreamLocator
Posted by mg...@apache.org.
WICKET-5592 Add a method to clear the cache of CachingResourceStreamLocator
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/234dc01d
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/234dc01d
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/234dc01d
Branch: refs/heads/master
Commit: 234dc01def692a28365dd08bd6ffb16d0b646a3b
Parents: 1274ea5
Author: Fridolin Jackstadt <fr...@lindenbaum.eu>
Authored: Thu May 15 13:57:42 2014 +0200
Committer: Fridolin Jackstadt <fr...@lindenbaum.eu>
Committed: Thu May 15 13:57:42 2014 +0200
----------------------------------------------------------------------
.../resource/locator/caching/CachingResourceStreamLocator.java | 6 ++++++
1 file changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/234dc01d/wicket-core/src/main/java/org/apache/wicket/core/util/resource/locator/caching/CachingResourceStreamLocator.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/core/util/resource/locator/caching/CachingResourceStreamLocator.java b/wicket-core/src/main/java/org/apache/wicket/core/util/resource/locator/caching/CachingResourceStreamLocator.java
index 49301e2..a3f7c4f 100644
--- a/wicket-core/src/main/java/org/apache/wicket/core/util/resource/locator/caching/CachingResourceStreamLocator.java
+++ b/wicket-core/src/main/java/org/apache/wicket/core/util/resource/locator/caching/CachingResourceStreamLocator.java
@@ -137,4 +137,10 @@ public class CachingResourceStreamLocator implements IResourceStreamLocator
{
return delegate.newResourceNameIterator(path, locale, style, variation, extension, strict);
}
+
+ public void clearCache()
+ {
+ cache.clear();
+ }
+
}
[3/4] git commit: WICKET-5573 FilterToolbar generics broken
Posted by mg...@apache.org.
WICKET-5573 FilterToolbar generics broken
Improve the javadoc and error messages
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/dceb444c
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/dceb444c
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/dceb444c
Branch: refs/heads/master
Commit: dceb444c463e2d7b1d82f2de0174138d3044c3a6
Parents: 8e6b4fc
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Mon May 19 10:46:42 2014 +0300
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Mon May 19 10:52:50 2014 +0300
----------------------------------------------------------------------
.../html/repeater/data/table/filter/FilterToolbar.java | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/dceb444c/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterToolbar.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterToolbar.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterToolbar.java
index 62fe752..f7222c3 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterToolbar.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/filter/FilterToolbar.java
@@ -53,7 +53,11 @@ public class FilterToolbar extends AbstractToolbar
* @param form
* the filter form
* @param <T>
- * type of filter state object
+ * the type of the DataTable's model object
+ * @param <S>
+ * the type of the DataTable's sorting parameter
+ * @param <F>
+ * the type of filter state object
*
*/
public <T, S, F> FilterToolbar(final DataTable<T, S> table, final FilterForm<F> form)
@@ -149,7 +153,7 @@ public class FilterToolbar extends AbstractToolbar
{
if (findParent(FilterForm.class) == null)
{
- throw new IllegalStateException("FilterToolbar must be contained within a Form");
+ throw new IllegalStateException("FilterToolbar must be contained within a FilterForm");
}
super.onBeforeRender();
}
[4/4] git commit: Merge branch 'master' of
https://github.com/frido37/wicket into pr-73-master
Posted by mg...@apache.org.
Merge branch 'master' of https://github.com/frido37/wicket into pr-73-master
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/9a79f67e
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/9a79f67e
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/9a79f67e
Branch: refs/heads/master
Commit: 9a79f67ea941585eef5b3f514e0ff4ddd12a9670
Parents: dceb444 234dc01
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Mon May 19 17:54:24 2014 +0300
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Mon May 19 17:54:24 2014 +0300
----------------------------------------------------------------------
.../locator/caching/CachingResourceStreamLocator.java | 6 ++++++
.../FilenameWithVersionResourceCachingStrategy.java | 10 ++++++++++
.../resource/caching/IResourceCachingStrategy.java | 6 ++++++
.../resource/caching/NoOpResourceCachingStrategy.java | 6 ++++++
.../QueryStringWithVersionResourceCachingStrategy.java | 10 ++++++++++
.../resource/caching/version/CachingResourceVersion.java | 4 ++++
6 files changed, 42 insertions(+)
----------------------------------------------------------------------