Modified: ofbiz/branches/OFBIZ-4098-make-cache-pluggable/framework/service/src/org/ofbiz/service/engine/BSFEngine.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-4098-make-cache-pluggable/framework/service/src/org/ofbiz/service/engine/BSFEngine.java?rev=1647483&r1=1647482&r2=1647483&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-4098-make-cache-pluggable/framework/service/src/org/ofbiz/service/engine/BSFEngine.java (original) +++ ofbiz/branches/OFBIZ-4098-make-cache-pluggable/framework/service/src/org/ofbiz/service/engine/BSFEngine.java Tue Dec 23 05:04:35 2014 @@ -23,6 +23,7 @@ import java.util.Map; import org.ofbiz.base.util.HttpClient; import org.ofbiz.base.util.HttpClientException; +import org.ofbiz.base.util.cache.OFBizCache; import org.ofbiz.base.util.cache.UtilCache; import org.ofbiz.base.util.UtilGenerics; import org.ofbiz.base.util.UtilURL; @@ -40,7 +41,7 @@ import org.apache.bsf.BSFManager; public class BSFEngine extends GenericAsyncEngine { public static final String module = BSFEngine.class.getName(); - private static final UtilCache<String, String> scriptCache = UtilCache.createUtilCache("BSFScripts", 0, 0); + private static final OFBizCache<String, String> scriptCache = UtilCache.createUtilCache("BSFScripts", 0, 0); public BSFEngine(ServiceDispatcher dispatcher) { super(dispatcher);
Modified: ofbiz/branches/OFBIZ-4098-make-cache-pluggable/framework/service/src/org/ofbiz/service/mail/ServiceMcaUtil.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-4098-make-cache-pluggable/framework/service/src/org/ofbiz/service/mail/ServiceMcaUtil.java?rev=1647483&r1=1647482&r2=1647483&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-4098-make-cache-pluggable/framework/service/src/org/ofbiz/service/mail/ServiceMcaUtil.java (original) +++ ofbiz/branches/OFBIZ-4098-make-cache-pluggable/framework/service/src/org/ofbiz/service/mail/ServiceMcaUtil.java Tue Dec 23 05:04:35 2014 @@ -27,6 +27,7 @@ import org.ofbiz.base.config.GenericConf import org.ofbiz.base.config.ResourceHandler; import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.UtilXml; +import org.ofbiz.base.util.cache.OFBizCache; import org.ofbiz.base.util.cache.UtilCache; import org.ofbiz.entity.GenericValue; import org.ofbiz.service.GenericServiceException; @@ -36,7 +37,7 @@ import org.w3c.dom.Element; public class ServiceMcaUtil { public static final String module = ServiceMcaUtil.class.getName(); - private static final UtilCache<String, ServiceMcaRule> mcaCache = UtilCache.createUtilCache("service.ServiceMCAs", 0, 0, false); + private static final OFBizCache<String, ServiceMcaRule> mcaCache = UtilCache.createUtilCache("service.ServiceMCAs", 0, 0, false); public static void reloadConfig() { mcaCache.clear(); Modified: ofbiz/branches/OFBIZ-4098-make-cache-pluggable/framework/webapp/src/org/ofbiz/webapp/WebAppUtil.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-4098-make-cache-pluggable/framework/webapp/src/org/ofbiz/webapp/WebAppUtil.java?rev=1647483&r1=1647482&r2=1647483&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-4098-make-cache-pluggable/framework/webapp/src/org/ofbiz/webapp/WebAppUtil.java (original) +++ ofbiz/branches/OFBIZ-4098-make-cache-pluggable/framework/webapp/src/org/ofbiz/webapp/WebAppUtil.java Tue Dec 23 05:04:35 2014 @@ -35,6 +35,7 @@ import org.ofbiz.base.util.Assert; import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.UtilXml.LocalErrorHandler; import org.ofbiz.base.util.UtilXml.LocalResolver; +import org.ofbiz.base.util.cache.OFBizCache; import org.ofbiz.base.util.cache.UtilCache; import org.xml.sax.ErrorHandler; import org.xml.sax.InputSource; @@ -50,7 +51,7 @@ public final class WebAppUtil { public static final String module = WebAppUtil.class.getName(); private static final String webAppFileName = "/WEB-INF/web.xml"; - private static final UtilCache<String, WebXml> webXmlCache = UtilCache.createUtilCache("webapp.WebXml"); + private static final OFBizCache<String, WebXml> webXmlCache = UtilCache.createUtilCache("webapp.WebXml"); /** * Returns the control servlet path. The path consists of the web application's mount-point Modified: ofbiz/branches/OFBIZ-4098-make-cache-pluggable/framework/webapp/src/org/ofbiz/webapp/control/ConfigXMLReader.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-4098-make-cache-pluggable/framework/webapp/src/org/ofbiz/webapp/control/ConfigXMLReader.java?rev=1647483&r1=1647482&r2=1647483&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-4098-make-cache-pluggable/framework/webapp/src/org/ofbiz/webapp/control/ConfigXMLReader.java (original) +++ ofbiz/branches/OFBIZ-4098-make-cache-pluggable/framework/webapp/src/org/ofbiz/webapp/control/ConfigXMLReader.java Tue Dec 23 05:04:35 2014 @@ -43,6 +43,7 @@ import org.ofbiz.base.util.GeneralExcept import org.ofbiz.base.util.UtilHttp; import org.ofbiz.base.util.UtilValidate; import org.ofbiz.base.util.UtilXml; +import org.ofbiz.base.util.cache.OFBizCache; import org.ofbiz.base.util.cache.UtilCache; import org.ofbiz.base.util.collections.MapContext; import org.w3c.dom.Document; @@ -55,8 +56,8 @@ public class ConfigXMLReader { public static final String module = ConfigXMLReader.class.getName(); public static final String controllerXmlFileName = "/WEB-INF/controller.xml"; - private static final UtilCache<URL, ControllerConfig> controllerCache = UtilCache.createUtilCache("webapp.ControllerConfig"); - private static final UtilCache<String, List<ControllerConfig>> controllerSearchResultsCache = UtilCache.createUtilCache("webapp.ControllerSearchResults"); + private static final OFBizCache<URL, ControllerConfig> controllerCache = UtilCache.createUtilCache("webapp.ControllerConfig"); + private static final OFBizCache<String, List<ControllerConfig>> controllerSearchResultsCache = UtilCache.createUtilCache("webapp.ControllerSearchResults"); public static final RequestResponse emptyNoneRequestResponse = RequestResponse.createEmptyNoneRequestResponse(); public static Set<String> findControllerFilesWithRequest(String requestUri, String controllerPartialPath) throws GeneralException { Modified: ofbiz/branches/OFBIZ-4098-make-cache-pluggable/framework/webapp/src/org/ofbiz/webapp/event/BsfEventHandler.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-4098-make-cache-pluggable/framework/webapp/src/org/ofbiz/webapp/event/BsfEventHandler.java?rev=1647483&r1=1647482&r2=1647483&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-4098-make-cache-pluggable/framework/webapp/src/org/ofbiz/webapp/event/BsfEventHandler.java (original) +++ ofbiz/branches/OFBIZ-4098-make-cache-pluggable/framework/webapp/src/org/ofbiz/webapp/event/BsfEventHandler.java Tue Dec 23 05:04:35 2014 @@ -34,6 +34,7 @@ import org.apache.bsf.util.IOUtils; import org.ofbiz.base.location.FlexibleLocation; import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.UtilValidate; +import org.ofbiz.base.util.cache.OFBizCache; import org.ofbiz.base.util.cache.UtilCache; import org.ofbiz.webapp.control.ConfigXMLReader; @@ -43,7 +44,7 @@ import org.ofbiz.webapp.control.ConfigXM public class BsfEventHandler implements EventHandler { public static final String module = BsfEventHandler.class.getName(); - private static final UtilCache<String, String> eventCache = UtilCache.createUtilCache("webapp.BsfEvents"); + private static final OFBizCache<String, String> eventCache = UtilCache.createUtilCache("webapp.BsfEvents"); /** * @see org.ofbiz.webapp.event.EventHandler#init(javax.servlet.ServletContext) Modified: ofbiz/branches/OFBIZ-4098-make-cache-pluggable/framework/webapp/src/org/ofbiz/webapp/ftl/OfbizCacheStorage.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-4098-make-cache-pluggable/framework/webapp/src/org/ofbiz/webapp/ftl/OfbizCacheStorage.java?rev=1647483&r1=1647482&r2=1647483&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-4098-make-cache-pluggable/framework/webapp/src/org/ofbiz/webapp/ftl/OfbizCacheStorage.java (original) +++ ofbiz/branches/OFBIZ-4098-make-cache-pluggable/framework/webapp/src/org/ofbiz/webapp/ftl/OfbizCacheStorage.java Tue Dec 23 05:04:35 2014 @@ -20,6 +20,7 @@ package org.ofbiz.webapp.ftl; import freemarker.cache.CacheStorage; +import org.ofbiz.base.util.cache.OFBizCache; import org.ofbiz.base.util.cache.UtilCache; /** @@ -27,7 +28,7 @@ import org.ofbiz.base.util.cache.UtilCac */ public class OfbizCacheStorage implements CacheStorage { //can't have global cache because names/keys are relative to the webapp - protected final UtilCache<Object, Object> localCache; + protected final OFBizCache<Object, Object> localCache; public OfbizCacheStorage(String id) { this.localCache = UtilCache.createUtilCache("webapp.FreeMarkerCache." + id, 0, 0, false); Modified: ofbiz/branches/OFBIZ-4098-make-cache-pluggable/framework/webtools/src/org/ofbiz/webtools/UtilCacheEvents.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-4098-make-cache-pluggable/framework/webtools/src/org/ofbiz/webtools/UtilCacheEvents.java?rev=1647483&r1=1647482&r2=1647483&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-4098-make-cache-pluggable/framework/webtools/src/org/ofbiz/webtools/UtilCacheEvents.java (original) +++ ofbiz/branches/OFBIZ-4098-make-cache-pluggable/framework/webtools/src/org/ofbiz/webtools/UtilCacheEvents.java Tue Dec 23 05:04:35 2014 @@ -28,6 +28,7 @@ import org.ofbiz.base.util.UtilDateTime; import org.ofbiz.base.util.UtilHttp; import org.ofbiz.base.util.UtilMisc; import org.ofbiz.base.util.UtilProperties; +import org.ofbiz.base.util.cache.OFBizCache; import org.ofbiz.base.util.cache.UtilCache; import org.ofbiz.security.Security; @@ -75,7 +76,7 @@ public class UtilCacheEvents { return "error"; } - UtilCache<?, ?> utilCache = UtilCache.findCache(name); + OFBizCache<?, ?> utilCache = UtilCache.findCache(name); if (utilCache != null) { Object key = null; @@ -133,7 +134,7 @@ public class UtilCacheEvents { request.setAttribute("_ERROR_MESSAGE_", errMsg); return "error"; } - UtilCache<?, ?> utilCache = UtilCache.findCache(name); + OFBizCache<?, ?> utilCache = UtilCache.findCache(name); if (utilCache != null) { utilCache.clear(); @@ -206,7 +207,7 @@ public class UtilCacheEvents { expireTime = Long.valueOf(expireTimeStr); } catch (Exception e) {} - UtilCache<?, ?> utilCache = UtilCache.findCache(name); + OFBizCache<?, ?> utilCache = UtilCache.findCache(name); if (utilCache != null) { if (maxInMemory != null) Modified: ofbiz/branches/OFBIZ-4098-make-cache-pluggable/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ArtifactInfoFactory.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-4098-make-cache-pluggable/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ArtifactInfoFactory.java?rev=1647483&r1=1647482&r2=1647483&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-4098-make-cache-pluggable/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ArtifactInfoFactory.java (original) +++ ofbiz/branches/OFBIZ-4098-make-cache-pluggable/framework/webtools/src/org/ofbiz/webtools/artifactinfo/ArtifactInfoFactory.java Tue Dec 23 05:04:35 2014 @@ -41,6 +41,7 @@ import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.FileUtil; import org.ofbiz.base.util.GeneralException; import org.ofbiz.base.util.UtilValidate; +import org.ofbiz.base.util.cache.OFBizCache; import org.ofbiz.base.util.cache.UtilCache; import org.ofbiz.entity.GenericEntityException; import org.ofbiz.entity.config.model.DelegatorElement; @@ -67,7 +68,7 @@ public class ArtifactInfoFactory { public static final String module = ArtifactInfoFactory.class.getName(); - private static final UtilCache<String, ArtifactInfoFactory> artifactInfoFactoryCache = UtilCache.createUtilCache("ArtifactInfoFactory"); + private static final OFBizCache<String, ArtifactInfoFactory> artifactInfoFactoryCache = UtilCache.createUtilCache("ArtifactInfoFactory"); public static final String EntityInfoTypeId = "entity"; public static final String ServiceInfoTypeId = "service"; Modified: ofbiz/branches/OFBIZ-4098-make-cache-pluggable/framework/widget/src/org/ofbiz/widget/cache/AbstractCache.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-4098-make-cache-pluggable/framework/widget/src/org/ofbiz/widget/cache/AbstractCache.java?rev=1647483&r1=1647482&r2=1647483&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-4098-make-cache-pluggable/framework/widget/src/org/ofbiz/widget/cache/AbstractCache.java (original) +++ ofbiz/branches/OFBIZ-4098-make-cache-pluggable/framework/widget/src/org/ofbiz/widget/cache/AbstractCache.java Tue Dec 23 05:04:35 2014 @@ -18,6 +18,7 @@ *******************************************************************************/ package org.ofbiz.widget.cache; +import org.ofbiz.base.util.cache.OFBizCache; import org.ofbiz.base.util.cache.UtilCache; public abstract class AbstractCache { @@ -44,11 +45,11 @@ public abstract class AbstractCache { return getCacheNamePrefix() + widgetName; } - protected <K,V> UtilCache<K,V> getCache(String widgetName) { + protected <K,V> OFBizCache<K,V> getCache(String widgetName) { return UtilCache.findCache(getCacheName(widgetName)); } - protected UtilCache<WidgetContextCacheKey, GenericWidgetOutput> getOrCreateCache(String widgetName) { + protected OFBizCache<WidgetContextCacheKey, GenericWidgetOutput> getOrCreateCache(String widgetName) { String name = getCacheName(widgetName); return UtilCache.getOrCreateUtilCache(name, 0, 0, 0, true, false, name); } Modified: ofbiz/branches/OFBIZ-4098-make-cache-pluggable/framework/widget/src/org/ofbiz/widget/cache/ScreenCache.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-4098-make-cache-pluggable/framework/widget/src/org/ofbiz/widget/cache/ScreenCache.java?rev=1647483&r1=1647482&r2=1647483&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-4098-make-cache-pluggable/framework/widget/src/org/ofbiz/widget/cache/ScreenCache.java (original) +++ ofbiz/branches/OFBIZ-4098-make-cache-pluggable/framework/widget/src/org/ofbiz/widget/cache/ScreenCache.java Tue Dec 23 05:04:35 2014 @@ -19,7 +19,7 @@ package org.ofbiz.widget.cache; import org.ofbiz.base.util.Debug; -import org.ofbiz.base.util.cache.UtilCache; +import org.ofbiz.base.util.cache.OFBizCache; public class ScreenCache extends AbstractCache { public static final String module = ScreenCache.class.getName(); @@ -29,18 +29,18 @@ public class ScreenCache extends Abstrac } public GenericWidgetOutput get(String screenName, WidgetContextCacheKey wcck) { - UtilCache<WidgetContextCacheKey,GenericWidgetOutput> screenCache = getCache(screenName); + OFBizCache<WidgetContextCacheKey,GenericWidgetOutput> screenCache = getCache(screenName); if (screenCache == null) return null; return screenCache.get(wcck); } public GenericWidgetOutput put(String screenName, WidgetContextCacheKey wcck, GenericWidgetOutput output) { - UtilCache<WidgetContextCacheKey, GenericWidgetOutput> screenCache = getOrCreateCache(screenName); + OFBizCache<WidgetContextCacheKey, GenericWidgetOutput> screenCache = getOrCreateCache(screenName); return screenCache.put(wcck, output); } public GenericWidgetOutput remove(String screenName, WidgetContextCacheKey wcck) { - UtilCache<WidgetContextCacheKey,GenericWidgetOutput> screenCache = getCache(screenName); + OFBizCache<WidgetContextCacheKey,GenericWidgetOutput> screenCache = getCache(screenName); if (Debug.verboseOn()) Debug.logVerbose("Removing from ScreenCache with key [" + wcck + "], will remove from this cache: " + (screenCache == null ? "[No cache found to remove from]" : screenCache.getName()), module); if (screenCache == null) return null; GenericWidgetOutput retVal = screenCache.remove(wcck); Modified: ofbiz/branches/OFBIZ-4098-make-cache-pluggable/framework/widget/src/org/ofbiz/widget/form/FormFactory.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-4098-make-cache-pluggable/framework/widget/src/org/ofbiz/widget/form/FormFactory.java?rev=1647483&r1=1647482&r2=1647483&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-4098-make-cache-pluggable/framework/widget/src/org/ofbiz/widget/form/FormFactory.java (original) +++ ofbiz/branches/OFBIZ-4098-make-cache-pluggable/framework/widget/src/org/ofbiz/widget/form/FormFactory.java Tue Dec 23 05:04:35 2014 @@ -30,6 +30,7 @@ import javax.xml.parsers.ParserConfigura import org.ofbiz.base.location.FlexibleLocation; import org.ofbiz.base.util.UtilHttp; import org.ofbiz.base.util.UtilXml; +import org.ofbiz.base.util.cache.OFBizCache; import org.ofbiz.base.util.cache.UtilCache; import org.ofbiz.entity.Delegator; import org.ofbiz.entity.model.ModelReader; @@ -47,8 +48,8 @@ import org.xml.sax.SAXException; public class FormFactory { public static final String module = FormFactory.class.getName(); - private static final UtilCache<String, ModelForm> formLocationCache = UtilCache.createUtilCache("widget.form.locationResource", 0, 0, false); - private static final UtilCache<String, ModelForm> formWebappCache = UtilCache.createUtilCache("widget.form.webappResource", 0, 0, false); + private static final OFBizCache<String, ModelForm> formLocationCache = UtilCache.createUtilCache("widget.form.locationResource", 0, 0, false); + private static final OFBizCache<String, ModelForm> formWebappCache = UtilCache.createUtilCache("widget.form.webappResource", 0, 0, false); public static Map<String, ModelForm> getFormsFromLocation(String resourceName, ModelReader entityModelReader, DispatchContext dispatchContext) throws IOException, SAXException, ParserConfigurationException { Modified: ofbiz/branches/OFBIZ-4098-make-cache-pluggable/framework/widget/src/org/ofbiz/widget/menu/MenuFactory.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-4098-make-cache-pluggable/framework/widget/src/org/ofbiz/widget/menu/MenuFactory.java?rev=1647483&r1=1647482&r2=1647483&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-4098-make-cache-pluggable/framework/widget/src/org/ofbiz/widget/menu/MenuFactory.java (original) +++ ofbiz/branches/OFBIZ-4098-make-cache-pluggable/framework/widget/src/org/ofbiz/widget/menu/MenuFactory.java Tue Dec 23 05:04:35 2014 @@ -31,6 +31,7 @@ import org.ofbiz.base.location.FlexibleL import org.ofbiz.base.util.UtilHttp; import org.ofbiz.base.util.UtilValidate; import org.ofbiz.base.util.UtilXml; +import org.ofbiz.base.util.cache.OFBizCache; import org.ofbiz.base.util.cache.UtilCache; import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -44,8 +45,8 @@ public class MenuFactory { public static final String module = MenuFactory.class.getName(); - public static final UtilCache<String, Map<String, ModelMenu>> menuWebappCache = UtilCache.createUtilCache("widget.menu.webappResource", 0, 0, false); - public static final UtilCache<String, Map<String, ModelMenu>> menuLocationCache = UtilCache.createUtilCache("widget.menu.locationResource", 0, 0, false); + public static final OFBizCache<String, Map<String, ModelMenu>> menuWebappCache = UtilCache.createUtilCache("widget.menu.webappResource", 0, 0, false); + public static final OFBizCache<String, Map<String, ModelMenu>> menuLocationCache = UtilCache.createUtilCache("widget.menu.locationResource", 0, 0, false); public static ModelMenu getMenuFromWebappContext(String resourceName, String menuName, HttpServletRequest request) throws IOException, SAXException, ParserConfigurationException { Modified: ofbiz/branches/OFBIZ-4098-make-cache-pluggable/framework/widget/src/org/ofbiz/widget/screen/HtmlWidget.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-4098-make-cache-pluggable/framework/widget/src/org/ofbiz/widget/screen/HtmlWidget.java?rev=1647483&r1=1647482&r2=1647483&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-4098-make-cache-pluggable/framework/widget/src/org/ofbiz/widget/screen/HtmlWidget.java (original) +++ ofbiz/branches/OFBIZ-4098-make-cache-pluggable/framework/widget/src/org/ofbiz/widget/screen/HtmlWidget.java Tue Dec 23 05:04:35 2014 @@ -33,6 +33,7 @@ import org.ofbiz.base.util.StringUtil; import org.ofbiz.base.util.UtilGenerics; import org.ofbiz.base.util.UtilValidate; import org.ofbiz.base.util.UtilXml; +import org.ofbiz.base.util.cache.OFBizCache; import org.ofbiz.base.util.cache.UtilCache; import org.ofbiz.base.util.collections.MapStack; import org.ofbiz.base.util.string.FlexibleStringExpander; @@ -59,7 +60,7 @@ import freemarker.template.Version; public class HtmlWidget extends ModelScreenWidget { public static final String module = HtmlWidget.class.getName(); - private static final UtilCache<String, Template> specialTemplateCache = UtilCache.createUtilCache("widget.screen.template.ftl.general", 0, 0, false); + private static final OFBizCache<String, Template> specialTemplateCache = UtilCache.createUtilCache("widget.screen.template.ftl.general", 0, 0, false); protected static Configuration specialConfig = FreeMarkerWorker.makeConfiguration(new ExtendedWrapper(FreeMarkerWorker.version)); // not sure if this is the best way to get FTL to use my fancy MapModel derivative, but should work at least... Modified: ofbiz/branches/OFBIZ-4098-make-cache-pluggable/framework/widget/src/org/ofbiz/widget/screen/ScreenFactory.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-4098-make-cache-pluggable/framework/widget/src/org/ofbiz/widget/screen/ScreenFactory.java?rev=1647483&r1=1647482&r2=1647483&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-4098-make-cache-pluggable/framework/widget/src/org/ofbiz/widget/screen/ScreenFactory.java (original) +++ ofbiz/branches/OFBIZ-4098-make-cache-pluggable/framework/widget/src/org/ofbiz/widget/screen/ScreenFactory.java Tue Dec 23 05:04:35 2014 @@ -34,6 +34,7 @@ import org.ofbiz.base.util.GeneralExcept import org.ofbiz.base.util.UtilHttp; import org.ofbiz.base.util.UtilValidate; import org.ofbiz.base.util.UtilXml; +import org.ofbiz.base.util.cache.OFBizCache; import org.ofbiz.base.util.cache.UtilCache; import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -47,8 +48,8 @@ public class ScreenFactory { public static final String module = ScreenFactory.class.getName(); - public static final UtilCache<String, Map<String, ModelScreen>> screenLocationCache = UtilCache.createUtilCache("widget.screen.locationResource", 0, 0, false); - public static final UtilCache<String, Map<String, ModelScreen>> screenWebappCache = UtilCache.createUtilCache("widget.screen.webappResource", 0, 0, false); + public static final OFBizCache<String, Map<String, ModelScreen>> screenLocationCache = UtilCache.createUtilCache("widget.screen.locationResource", 0, 0, false); + public static final OFBizCache<String, Map<String, ModelScreen>> screenWebappCache = UtilCache.createUtilCache("widget.screen.webappResource", 0, 0, false); public static boolean isCombinedName(String combinedName) { int numSignIndex = combinedName.lastIndexOf("#"); Modified: ofbiz/branches/OFBIZ-4098-make-cache-pluggable/framework/widget/src/org/ofbiz/widget/tree/TreeFactory.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-4098-make-cache-pluggable/framework/widget/src/org/ofbiz/widget/tree/TreeFactory.java?rev=1647483&r1=1647482&r2=1647483&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-4098-make-cache-pluggable/framework/widget/src/org/ofbiz/widget/tree/TreeFactory.java (original) +++ ofbiz/branches/OFBIZ-4098-make-cache-pluggable/framework/widget/src/org/ofbiz/widget/tree/TreeFactory.java Tue Dec 23 05:04:35 2014 @@ -27,6 +27,7 @@ import javax.xml.parsers.ParserConfigura import org.ofbiz.base.location.FlexibleLocation; import org.ofbiz.base.util.UtilXml; +import org.ofbiz.base.util.cache.OFBizCache; import org.ofbiz.base.util.cache.UtilCache; import org.ofbiz.entity.Delegator; import org.ofbiz.service.LocalDispatcher; @@ -42,7 +43,7 @@ public class TreeFactory { public static final String module = TreeFactory.class.getName(); - public static final UtilCache<String, Map<String, ModelTree>> treeLocationCache = UtilCache.createUtilCache("widget.tree.locationResource", 0, 0, false); + public static final OFBizCache<String, Map<String, ModelTree>> treeLocationCache = UtilCache.createUtilCache("widget.tree.locationResource", 0, 0, false); public static ModelTree getTreeFromLocation(String resourceName, String treeName, Delegator delegator, LocalDispatcher dispatcher) throws IOException, SAXException, ParserConfigurationException { Modified: ofbiz/branches/OFBIZ-4098-make-cache-pluggable/specialpurpose/pos/src/org/ofbiz/pos/config/ButtonEventConfig.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-4098-make-cache-pluggable/specialpurpose/pos/src/org/ofbiz/pos/config/ButtonEventConfig.java?rev=1647483&r1=1647482&r2=1647483&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-4098-make-cache-pluggable/specialpurpose/pos/src/org/ofbiz/pos/config/ButtonEventConfig.java (original) +++ ofbiz/branches/OFBIZ-4098-make-cache-pluggable/specialpurpose/pos/src/org/ofbiz/pos/config/ButtonEventConfig.java Tue Dec 23 05:04:35 2014 @@ -33,6 +33,7 @@ import org.ofbiz.base.util.GeneralExcept import org.ofbiz.base.util.UtilValidate; import org.ofbiz.base.util.UtilXml; import org.ofbiz.base.util.Debug; +import org.ofbiz.base.util.cache.OFBizCache; import org.ofbiz.base.util.cache.UtilCache; import org.ofbiz.pos.screen.PosScreen; @@ -43,7 +44,7 @@ public class ButtonEventConfig implement public static final String module = ButtonEventConfig.class.getName(); public static final String BUTTON_EVENT_CONFIG = "buttonevents.xml"; - private static transient UtilCache<String, ButtonEventConfig> buttonConfig = UtilCache.createUtilCache("pos.ButtonEvent", 0, 0, 0, false, true); + private static transient OFBizCache<String, ButtonEventConfig> buttonConfig = UtilCache.createUtilCache("pos.ButtonEvent", 0, 0, 0, false, true); protected String buttonName = null; protected String className = null; Modified: ofbiz/branches/OFBIZ-4098-make-cache-pluggable/specialpurpose/pos/src/org/ofbiz/pos/screen/PosDialog.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-4098-make-cache-pluggable/specialpurpose/pos/src/org/ofbiz/pos/screen/PosDialog.java?rev=1647483&r1=1647482&r2=1647483&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-4098-make-cache-pluggable/specialpurpose/pos/src/org/ofbiz/pos/screen/PosDialog.java (original) +++ ofbiz/branches/OFBIZ-4098-make-cache-pluggable/specialpurpose/pos/src/org/ofbiz/pos/screen/PosDialog.java Tue Dec 23 05:04:35 2014 @@ -43,12 +43,13 @@ import net.xoetrope.xui.XPage; import net.xoetrope.xui.XProjectManager; import org.ofbiz.base.util.Debug; +import org.ofbiz.base.util.cache.OFBizCache; import org.ofbiz.base.util.cache.UtilCache; public class PosDialog { public static final String module = PosDialog.class.getName(); - private static final UtilCache<XPage, PosDialog> instances = UtilCache.createUtilCache("pos.Dialogs", 0, 0); + private static final OFBizCache<XPage, PosDialog> instances = UtilCache.createUtilCache("pos.Dialogs", 0, 0); protected final Frame clientFrame = XProjectManager.getCurrentProject().getAppFrame(); protected final Window appWindow = XProjectManager.getCurrentProject().getAppWindow();
