diff --git a/rwiki/rwiki-api/api/src/java/org/radeox/api/engine/context/RenderContext.java b/rwiki/rwiki-api/api/src/java/org/radeox/api/engine/context/RenderContext.java index 0bbf5c83e812..535e57b2fba9 100755 --- a/rwiki/rwiki-api/api/src/java/org/radeox/api/engine/context/RenderContext.java +++ b/rwiki/rwiki-api/api/src/java/org/radeox/api/engine/context/RenderContext.java @@ -84,10 +84,4 @@ public interface RenderContext * Map of parameters with name,value pairs */ public void setParameters(Map parameters); - - public void setCacheable(boolean cacheable); - - public void commitCache(); - - public boolean isCacheable(); } diff --git a/rwiki/rwiki-api/api/src/java/uk/ac/cam/caret/sakai/rwiki/service/api/radeox/RenderCache.java b/rwiki/rwiki-api/api/src/java/uk/ac/cam/caret/sakai/rwiki/service/api/radeox/RenderCache.java deleted file mode 100644 index 55f6d9970f68..000000000000 --- a/rwiki/rwiki-api/api/src/java/uk/ac/cam/caret/sakai/rwiki/service/api/radeox/RenderCache.java +++ /dev/null @@ -1,35 +0,0 @@ -/********************************************************************************** - * $URL$ - * $Id$ - *********************************************************************************** - * - * Copyright (c) 2003, 2004, 2005, 2006 The Sakai Foundation. - * - * Licensed under the Educational Community License, Version 1.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.opensource.org/licenses/ecl1.php - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - **********************************************************************************/ - -package uk.ac.cam.caret.sakai.rwiki.service.api.radeox; - -/** - * Provides a cache service - * - * @author ieb - */ -// FIXME: Service -public interface RenderCache -{ - String getRenderedContent(String key); - - void putRenderedContent(String key, String content); -} diff --git a/rwiki/rwiki-impl/impl/pom.xml b/rwiki/rwiki-impl/impl/pom.xml index d05644b964d0..b6d5e848a5e0 100644 --- a/rwiki/rwiki-impl/impl/pom.xml +++ b/rwiki/rwiki-impl/impl/pom.xml @@ -144,10 +144,6 @@ hibernate-core jar - - net.sf.ehcache - ehcache-core - org.springframework spring-core diff --git a/rwiki/rwiki-impl/impl/src/java/uk/ac/cam/caret/sakai/rwiki/component/radeox/service/impl/RenderCacheImpl.java b/rwiki/rwiki-impl/impl/src/java/uk/ac/cam/caret/sakai/rwiki/component/radeox/service/impl/RenderCacheImpl.java deleted file mode 100644 index 8c1464bd9aa5..000000000000 --- a/rwiki/rwiki-impl/impl/src/java/uk/ac/cam/caret/sakai/rwiki/component/radeox/service/impl/RenderCacheImpl.java +++ /dev/null @@ -1,93 +0,0 @@ -/********************************************************************************** - * $URL$ - * $Id$ - *********************************************************************************** - * - * Copyright (c) 2003, 2004, 2005, 2006 The Sakai Foundation. - * - * Licensed under the Educational Community License, Version 1.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.opensource.org/licenses/ecl1.php - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - **********************************************************************************/ - -package uk.ac.cam.caret.sakai.rwiki.component.radeox.service.impl; - -import net.sf.ehcache.Cache; -import net.sf.ehcache.Element; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -import uk.ac.cam.caret.sakai.rwiki.service.api.radeox.RenderCache; - -/** - * @author ieb - */ -public class RenderCacheImpl implements RenderCache -{ - - private static Log log = LogFactory.getLog(RenderCacheImpl.class); - - private Cache cache = null; - - public String getRenderedContent(String key) - { - String cacheValue = null; - try - { - Element e = cache.get(key); - if (e != null) - { - cacheValue = (String) e.getValue(); - } - } - catch (Exception ex) - { - log.error("RenderCache threw Exception for key: " + key, ex); - } - - if (cacheValue != null) - log.debug("Cache hit for " + key + " size " + cacheValue.length()); - else - log.debug("Cache miss for " + key); - return cacheValue; - } - - public void putRenderedContent(String key, String content) - { - Element e = new Element(key, content); - cache.put(e); - log.debug("Put " + key + " size " + content.length()); - } - - public void init() - { - log.info(cache.getName()+" cache is ");} - - /** - * @return the cache - */ - public Cache getCache() - { - return cache; - } - - /** - * @param cache the cache to set - */ - public void setCache(Cache cache) - { - this.cache = cache; - } - - -} diff --git a/rwiki/rwiki-impl/impl/src/java/uk/ac/cam/caret/sakai/rwiki/component/service/impl/RenderServiceImpl.java b/rwiki/rwiki-impl/impl/src/java/uk/ac/cam/caret/sakai/rwiki/component/service/impl/RenderServiceImpl.java index f2a05350530c..326778a38176 100644 --- a/rwiki/rwiki-impl/impl/src/java/uk/ac/cam/caret/sakai/rwiki/component/service/impl/RenderServiceImpl.java +++ b/rwiki/rwiki-impl/impl/src/java/uk/ac/cam/caret/sakai/rwiki/component/service/impl/RenderServiceImpl.java @@ -31,7 +31,6 @@ import uk.ac.cam.caret.sakai.rwiki.service.api.RenderService; import uk.ac.cam.caret.sakai.rwiki.service.api.model.RWikiObject; import uk.ac.cam.caret.sakai.rwiki.service.api.radeox.CachableRenderContext; -import uk.ac.cam.caret.sakai.rwiki.service.api.radeox.RenderCache; import uk.ac.cam.caret.sakai.rwiki.service.api.radeox.RenderContextFactory; import uk.ac.cam.caret.sakai.rwiki.service.api.radeox.RenderEngineFactory; import uk.ac.cam.caret.sakai.rwiki.utils.TimeLogger; @@ -48,8 +47,6 @@ public class RenderServiceImpl implements RenderService private RenderContextFactory renderContextFactory; - private RenderCache renderCache; - public void init() { ComponentManager cm = org.sakaiproject.component.cover.ComponentManager @@ -58,8 +55,6 @@ public void init() .getName()); renderContextFactory = (RenderContextFactory) load(cm, RenderContextFactory.class.getName()); - renderCache = (RenderCache) load(cm, RenderCache.class - .getName()); } private Object load(ComponentManager cm, String name) @@ -79,25 +74,8 @@ public String renderPage(RWikiObject rwo, String pageSpace, long start = System.currentTimeMillis(); String renderedPage = null; - String cacheKey = getCacheKey(rwo, plr); try { - if (plr.canUseCache() && renderCache != null) - { - renderedPage = renderCache.getRenderedContent(cacheKey); - if (renderedPage != null) - { - if (TimeLogger.getLogResponse()) - log.info("Cache HIT " + cacheKey); - else - log.debug("Cache HIT " + cacheKey); - return renderedPage; - } - } - else - { - log.debug("Render Cache Disabled"); - } RenderEngine renderEngine = renderEngineFactory.getRenderEngine( pageSpace, plr); RenderContext renderContext = renderContextFactory @@ -107,34 +85,6 @@ public String renderPage(RWikiObject rwo, String pageSpace, { renderedPage = "

"+renderedPage+"

"; } - boolean canCache = false; - if (renderContext instanceof CachableRenderContext) - { - CachableRenderContext crc = (CachableRenderContext) renderContext; - canCache = crc.isCachable(); - } - if (canCache && plr.isCachable() && plr.canUseCache()) - { - if (renderCache != null) - { - renderCache.putRenderedContent(cacheKey, renderedPage); - if (TimeLogger.getLogResponse()) - log.info("Cache PUT " + cacheKey); - else - log.debug("Cache PUT " + cacheKey); - } - else - { - log.debug("Could have cached output"); - } - } - else - { - if (TimeLogger.getLogResponse()) - log.info("Cant Cache " + cacheKey); - else - log.debug("Cant Cache " + cacheKey); - } return renderedPage; } finally @@ -144,21 +94,4 @@ public String renderPage(RWikiObject rwo, String pageSpace, } } - - /** - * Generates a key for the page taking into account the page, version and - * link render mecahnism - * - * @param rwo - * @param plr - * @return - */ - public String getCacheKey(RWikiObject rwo, PageLinkRenderer plr) - { - String classNameHash = plr.getClass().getName(); - classNameHash = classNameHash.substring(classNameHash.lastIndexOf(".")); - return rwo.getId() + "." + rwo.getVersion().getTime() + "." - + classNameHash; - } - } diff --git a/rwiki/rwiki-impl/pack/src/webapp/WEB-INF/coreServiceComponents.xml b/rwiki/rwiki-impl/pack/src/webapp/WEB-INF/coreServiceComponents.xml index bf1eacf418a0..82289334fcb8 100755 --- a/rwiki/rwiki-impl/pack/src/webapp/WEB-INF/coreServiceComponents.xml +++ b/rwiki/rwiki-impl/pack/src/webapp/WEB-INF/coreServiceComponents.xml @@ -97,29 +97,6 @@ > - - - - - - - - - - uk.ac.cam.caret.sakai.rwiki.service.api.radeox.RenderCache - 10000 - false - false - 300 - 600 - - - - diff --git a/rwiki/rwiki-util/radeox/src/java/org/radeox/engine/context/BaseRenderContext.java b/rwiki/rwiki-util/radeox/src/java/org/radeox/engine/context/BaseRenderContext.java index b53a0dce8df4..581c5c9b41b4 100755 --- a/rwiki/rwiki-util/radeox/src/java/org/radeox/engine/context/BaseRenderContext.java +++ b/rwiki/rwiki-util/radeox/src/java/org/radeox/engine/context/BaseRenderContext.java @@ -39,10 +39,6 @@ public class BaseRenderContext implements RenderContext { - private boolean cacheable = true; - - private boolean tempCacheable = false;; - private RenderEngine engine; private Map params; @@ -84,19 +80,4 @@ public void setRenderEngine(RenderEngine engine) this.engine = engine; } - public void setCacheable(boolean cacheable) - { - tempCacheable = cacheable; - } - - public void commitCache() - { - cacheable = cacheable && tempCacheable; - tempCacheable = false; - } - - public boolean isCacheable() - { - return cacheable; - } } diff --git a/rwiki/rwiki-util/radeox/src/java/org/radeox/filter/FilterPipe.java b/rwiki/rwiki-util/radeox/src/java/org/radeox/filter/FilterPipe.java index c6a5f421a8ad..4736978bdf01 100755 --- a/rwiki/rwiki-util/radeox/src/java/org/radeox/filter/FilterPipe.java +++ b/rwiki/rwiki-util/radeox/src/java/org/radeox/filter/FilterPipe.java @@ -186,20 +186,7 @@ public String filter(String input, FilterContext context) Filter f = (Filter) filterIterator.next(); try { - // assume all filters non cacheable - if (f instanceof CacheFilter) - { - renderContext.setCacheable(true); - } - else - { - renderContext.setCacheable(false); - } String tmp = f.filter(output, context); - if (output.equals(tmp)) - { - renderContext.setCacheable(true); - } if (null == tmp) { log.warn("FilterPipe.filter: error while filtering: " + f); @@ -208,7 +195,6 @@ public String filter(String input, FilterContext context) { output = tmp; } - renderContext.commitCache(); } catch (Exception e) { @@ -222,4 +208,4 @@ public Filter getFilter(int index) { return (Filter) filterList.get(index); } -} \ No newline at end of file +} diff --git a/rwiki/rwiki-util/radeox/src/java/org/radeox/filter/LinkTestFilter.java b/rwiki/rwiki-util/radeox/src/java/org/radeox/filter/LinkTestFilter.java index 5c1642d01aa0..811f2118c375 100755 --- a/rwiki/rwiki-util/radeox/src/java/org/radeox/filter/LinkTestFilter.java +++ b/rwiki/rwiki-util/radeox/src/java/org/radeox/filter/LinkTestFilter.java @@ -64,11 +64,6 @@ protected String getLocaleKey() return "filter.linktest"; //$NON-NLS-1$ } - protected void setUp(FilterContext context) - { - context.getRenderContext().setCacheable(true); - } - public void handleMatch(StringBuffer buffer, MatchResult result, FilterContext context) { @@ -228,9 +223,6 @@ else if (wikiEngine.showCreate()) view = alias; } wikiEngine.appendCreateLink(buffer, name, view); - // links with "create" are not cacheable because - // a missing wiki could be created - context.getRenderContext().setCacheable(false); } else { diff --git a/rwiki/rwiki-util/radeox/src/java/org/radeox/test/filter/InterWikiTest.java b/rwiki/rwiki-util/radeox/src/java/org/radeox/test/filter/InterWikiTest.java index cff85dbd34b8..6c12d830d213 100755 --- a/rwiki/rwiki-util/radeox/src/java/org/radeox/test/filter/InterWikiTest.java +++ b/rwiki/rwiki-util/radeox/src/java/org/radeox/test/filter/InterWikiTest.java @@ -99,11 +99,4 @@ public void testInterWikiExpander() writer.toString()); } - public void testCacheable() - { - RenderContext renderContext = context.getRenderContext(); - renderContext.setCacheable(false); - filter.filter("[stephan@SnipSnap]", context); - assertTrue("InterWiki is cacheable", renderContext.isCacheable()); - } } diff --git a/rwiki/rwiki-util/radeox/src/java/org/radeox/test/filter/LinkTestFilterTest.java b/rwiki/rwiki-util/radeox/src/java/org/radeox/test/filter/LinkTestFilterTest.java index fa8d0f4f30c7..983118fabf7b 100755 --- a/rwiki/rwiki-util/radeox/src/java/org/radeox/test/filter/LinkTestFilterTest.java +++ b/rwiki/rwiki-util/radeox/src/java/org/radeox/test/filter/LinkTestFilterTest.java @@ -90,25 +90,6 @@ public void testLinkAliasAnchorType() "[alias|type:stephan#hash]", context)); } - public void testLinkCacheable() - { - RenderContext renderContext = context.getRenderContext(); - renderContext.setCacheable(false); - filter.filter("[SnipSnap]", context); - renderContext.commitCache(); - assertTrue("Normal link is cacheable", renderContext.isCacheable()); - } - - public void testCreateLinkNotCacheable() - { - RenderContext renderContext = context.getRenderContext(); - renderContext.setCacheable(false); - filter.filter("[Roller]", context); - renderContext.commitCache(); - assertTrue("Non existing link is not cacheable", !renderContext - .isCacheable()); - } - public void testLinksWithEscapedChars() { assertEquals("'' - '<link>'", filter.filter("[]",