Author: michiel
Date: 2009-05-18 20:00:55 +0200 (Mon, 18 May 2009)
New Revision: 35277
Modified:
mmbase/trunk/src/org/mmbase/framework/CachedRenderer.java
Log:
Include also the 'root dir' in the Cached Path, because this may likely appear
in the urls too. Now it's easier to share a data-dir.
Modified: mmbase/trunk/src/org/mmbase/framework/CachedRenderer.java
===================================================================
--- mmbase/trunk/src/org/mmbase/framework/CachedRenderer.java 2009-05-18
17:50:49 UTC (rev 35276)
+++ mmbase/trunk/src/org/mmbase/framework/CachedRenderer.java 2009-05-18
18:00:55 UTC (rev 35277)
@@ -22,6 +22,7 @@
import org.mmbase.util.functions.*;
import org.mmbase.util.*;
import org.mmbase.module.core.MMBase;
+import org.mmbase.module.core.MMBaseContext;
import org.mmbase.util.logging.Logger;
import org.mmbase.util.logging.Logging;
@@ -137,7 +138,8 @@
private static final Pattern INVALID_IN_FILENAME =
Pattern.compile("[\\/\\\\\\s]");
protected File getCacheFile(Parameters blockParameters, RenderHints hints)
{
- File dir = new File(MMBase.getMMBase().getDataDir(), directory);
+ File cachedDir = new File(MMBase.getMMBase().getDataDir(), directory );
+ File dir = new File(cachedDir, MMBaseContext.getHtmlRootUrlPath());
File componentDir = new File(dir, getBlock().getComponent().getName());
File blockDir = new File(componentDir, getBlock().getName());
blockDir.mkdirs();
@@ -220,6 +222,7 @@
}
}
});
+ ThreadPools.identify(future, "Rendering " + f);
rendering.put(f, future);
if (log.isDebugEnabled()) {
log.debug("Now rendering " + rendering);
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
