Update of
/var/cvs/applications/vpro-wizards/src/org/mmbase/applications/vprowizards/spring/cache
In directory
james.mmbase.org:/tmp/cvs-serv2827/applications/vpro-wizards/src/org/mmbase/applications/vprowizards/spring/cache
Modified Files:
CacheHandlerInterceptor.java TokenizerCacheNameResolver.java
BasicCacheHandlerInterceptor.java CacheFlushHint.java
Log Message:
tests are finished
See also:
http://cvs.mmbase.org/viewcvs/applications/vpro-wizards/src/org/mmbase/applications/vprowizards/spring/cache
Index: CacheHandlerInterceptor.java
===================================================================
RCS file:
/var/cvs/applications/vpro-wizards/src/org/mmbase/applications/vprowizards/spring/cache/CacheHandlerInterceptor.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- CacheHandlerInterceptor.java 28 Nov 2008 20:20:48 -0000 1.2
+++ CacheHandlerInterceptor.java 10 Dec 2008 15:44:18 -0000 1.3
@@ -42,7 +42,6 @@
public void afterCompletion(HttpServletRequest request,
HttpServletResponse response, Object handler, Exception ex)
throws Exception {
- //do niets
}
/**
Index: TokenizerCacheNameResolver.java
===================================================================
RCS file:
/var/cvs/applications/vpro-wizards/src/org/mmbase/applications/vprowizards/spring/cache/TokenizerCacheNameResolver.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- TokenizerCacheNameResolver.java 8 Dec 2008 19:37:08 -0000 1.3
+++ TokenizerCacheNameResolver.java 10 Dec 2008 15:44:18 -0000 1.4
@@ -40,11 +40,7 @@
private String input = null;
private static final String REGEX_NAMESPACE = "^[\\w_]+:";
- private static final String REGEX_VALUE = "[\\w_]+";
- private static final String REGEX_TEMPLATE = "(" + REGEX_VALUE +
"(\\[[\\w_]+(:[0-9])?\\])?)?";
- private static final String REGEX_COMPOSITE = REGEX_NAMESPACE +
REGEX_TEMPLATE + "(," + REGEX_TEMPLATE + ")*";
-
- private static Logger log =
Logging.getLoggerInstance(TokenizerCacheNameResolver.class);
+ private static final String REGEX_COMPOSITE = REGEX_NAMESPACE + ".+$";
public List<String> getNames(String nameSpace) {
if (StringUtils.isEmpty(nameSpace)) {
Index: BasicCacheHandlerInterceptor.java
===================================================================
RCS file:
/var/cvs/applications/vpro-wizards/src/org/mmbase/applications/vprowizards/spring/cache/BasicCacheHandlerInterceptor.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- BasicCacheHandlerInterceptor.java 28 Nov 2008 20:20:48 -0000 1.2
+++ BasicCacheHandlerInterceptor.java 10 Dec 2008 15:44:18 -0000 1.3
@@ -55,7 +55,7 @@
throws Exception {
log.debug("handling request type flush hint");
- if (shouldFlush(request) &&
request.getParameterMap().get("flushname") != null) {
+ if (shouldFlush(request)) {
CacheNameResolver resolver =
cacheNameResolverFactory.newInstance();
resolver.setInput(ServletRequestUtils.getStringParameter(request, "flushname",
""));
flushForNames(resolver.getNames("request"));
Index: CacheFlushHint.java
===================================================================
RCS file:
/var/cvs/applications/vpro-wizards/src/org/mmbase/applications/vprowizards/spring/cache/CacheFlushHint.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- CacheFlushHint.java 12 Nov 2008 14:52:56 -0000 1.1
+++ CacheFlushHint.java 10 Dec 2008 15:44:18 -0000 1.2
@@ -13,6 +13,7 @@
/**
* FIXME: why is there no indicator for the type of mutation
(add:update:delete)?
+ * TODO: create an enum for the types
* @author Ernst Bunders
*
*/
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
