Author: michiel
Date: 2010-06-11 12:14:09 +0200 (Fri, 11 Jun 2010)
New Revision: 42518

Added:
   mmbase/trunk/bridge/src/main/config/caches.xml
Removed:
   mmbase/trunk/core/src/main/config/caches.xml
Log:
moved caches.xml to same jar as CacheManager

Copied: mmbase/trunk/bridge/src/main/config/caches.xml (from rev 42285, 
mmbase/trunk/core/src/main/config/caches.xml)
===================================================================
--- mmbase/trunk/bridge/src/main/config/caches.xml                              
(rev 0)
+++ mmbase/trunk/bridge/src/main/config/caches.xml      2010-06-11 10:14:09 UTC 
(rev 42518)
@@ -0,0 +1,165 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE caches PUBLIC "-//MMBase//DTD cache config 1.0//EN" 
"http://www.mmbase.org/dtd/caches_1_0.dtd";>
+<!--
+  Not all caches are configurable already, but those which are, can be
+  configured here. It can also be done by the admin pages, but
+  changing it here works just as well (better for the moment, because
+  the changes are persistent then)
+
+  @since   MMBase-1.6
+  @version $Id$
+  @author  Michiel Meeuwissen
+  @author  Ernst Bunders
+
+-->
+<caches>
+
+  <!--
+       Here you can add release strategies to all QueryResultCache 
specializations.
+       You can allso add them to individual (multilevel) caches.
+    For more information about the release strategies see the documentation
+  -->
+  <releaseStrategies>
+    <strategy>org.mmbase.cache.BetterStrategy</strategy>   
+    <!--
+        ConstraintsMatchingStrategy will sometimes give more CPU overhead then 
it is worth.
+        Therefore it is commented out. You can try it if your caches still 
don't perform well enough.
+
+    <strategy>org.mmbase.cache.ConstraintsMatchingStrategy</strategy>
+    -->
+  </releaseStrategies>
+
+
+  <!-- 
================================================================================
+  Node caches
+  
================================================================================
  -->
+
+  <!-- simple nodes -->
+  <cache name="Nodes">
+    <status>active</status>
+    <size>4096</size>
+  </cache>
+
+  <!-- simple node lists -->
+  <cache name="NodeListCache">
+    <status>active</status>
+    <size>300</size>
+    <!--
+      If you want to use the OSCache implementation to overflow on disk, you 
can uncomment
+      this code
+    <implementation>
+      <class>org.mmbase.cache.oscache.OSCacheImplementation</class>
+      <param name="usememory">true</param>
+      <param name="path">/tmp</param>
+      <param name="overflowdisk">true</param>
+    </implementation>
+    -->
+  </cache>
+
+  <!-- cluster nodes -->
+  <cache name="MultilevelCache">
+    <status>active</status>
+    <size>300</size>
+  </cache>
+
+  <!-- used for queries like select max(votes) and select count(title) -->
+  <cache name="AggregatedResultCache">
+    <status>active</status>
+    <size>300</size>
+  </cache>
+
+  <!-- related nodes -->
+  <cache name="RelatedNodesCache">
+    <status>active</status>
+    <size>300</size>
+  </cache>
+
+  <!-- relation nodes -->
+  <cache name="RelationsCache">
+    <status>active</status>
+    <size>300</size>
+  </cache>
+
+  <!-- related nodes, (not?) used in InsRel -->
+  <cache name="RelatedCache">
+    <status>active</status>
+    <size>25</size>
+  </cache>
+
+  <!-- Alias to number cache, used in OALias -->
+  <cache name="AliasCache">
+    <status>active</status>
+    <size>128</size>
+  </cache>
+
+  <!-- Object type cache in MMObjectBuilder.
+       Used by MMBase to perform
+       object number to object type lookup
+  -->
+  <cache name="TypeCache">
+    <status>active</status>
+    <size>20000</size>
+  </cache>
+
+  <!-- 
================================================================================
+  Caches for XSL Transformations
+  
================================================================================
  -->
+
+  <!-- Compiled templates -->
+  <cache name="XSLTemplates">
+    <status>active</status>
+    <size>50</size>
+  </cache>
+
+  <!-- A factory for every URIResolver -->
+  <cache name="XSLFactories">
+    <status>active</status>
+    <size>50</size>
+  </cache>
+
+  <!-- If it makes sense (e.g. not in Editwizard) also the results of
+  XSL transformations can be cached. Because it is a little difficult
+  to invalidate cache entries, this cache is now inactive on default.
+  -->
+  <cache name="XSLTResults">
+    <status>inactive</status>
+    <size>50</size>
+    <maxEntrySize>5000</maxEntrySize>
+  </cache>
+
+  <!-- 
================================================================================
+  Caches related to images/icaches/attachments
+  
================================================================================
  -->
+
+  <!-- Quick search of the icache node number (by template/ckey) -->
+  <cache name="CkeyNumberCache">
+    <status>active</status>
+    <size>500</size>
+  </cache>
+
+  <!-- The 'handle' field of small images (and icaches) objects are cached in 
a dedicated cache -->
+  <cache name="ImageHandles">
+    <status>active</status>
+    <size>200</size>
+    <maxEntrySize>100000</maxEntrySize>
+  </cache>
+
+
+  <!-- All other blobs -->
+  <cache name="GenericBlobCache">
+    <status>active</status>
+    <size>200</size>
+    <maxEntrySize>100000</maxEntrySize>
+  </cache>
+
+
+  <!-- 
================================================================================
+  Jumpers cache
+  
================================================================================
  -->
+  <!-- If you use jumpers, you might want to configure its cache
+  <cache name="JumpersCache">
+    <status>active</status>
+    <size>1000</size>
+  </cache>
+  -->
+</caches>

Deleted: mmbase/trunk/core/src/main/config/caches.xml
===================================================================
--- mmbase/trunk/core/src/main/config/caches.xml        2010-06-11 10:13:10 UTC 
(rev 42517)
+++ mmbase/trunk/core/src/main/config/caches.xml        2010-06-11 10:14:09 UTC 
(rev 42518)
@@ -1,165 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE caches PUBLIC "-//MMBase//DTD cache config 1.0//EN" 
"http://www.mmbase.org/dtd/caches_1_0.dtd";>
-<!--
-  Not all caches are configurable already, but those which are, can be
-  configured here. It can also be done by the admin pages, but
-  changing it here works just as well (better for the moment, because
-  the changes are persistent then)
-
-  @since   MMBase-1.6
-  @version $Id$
-  @author  Michiel Meeuwissen
-  @author  Ernst Bunders
-
--->
-<caches>
-
-  <!--
-       Here you can add release strategies to all QueryResultCache 
specializations.
-       You can allso add them to individual (multilevel) caches.
-    For more information about the release strategies see the documentation
-  -->
-  <releaseStrategies>
-    <strategy>org.mmbase.cache.BetterStrategy</strategy>   
-    <!--
-        ConstraintsMatchingStrategy will sometimes give more CPU overhead then 
it is worth.
-        Therefore it is commented out. You can try it if your caches still 
don't perform well enough.
-
-    <strategy>org.mmbase.cache.ConstraintsMatchingStrategy</strategy>
-    -->
-  </releaseStrategies>
-
-
-  <!-- 
================================================================================
-  Node caches
-  
================================================================================
  -->
-
-  <!-- simple nodes -->
-  <cache name="Nodes">
-    <status>active</status>
-    <size>4096</size>
-  </cache>
-
-  <!-- simple node lists -->
-  <cache name="NodeListCache">
-    <status>active</status>
-    <size>300</size>
-    <!--
-      If you want to use the OSCache implementation to overflow on disk, you 
can uncomment
-      this code
-    <implementation>
-      <class>org.mmbase.cache.oscache.OSCacheImplementation</class>
-      <param name="usememory">true</param>
-      <param name="path">/tmp</param>
-      <param name="overflowdisk">true</param>
-    </implementation>
-    -->
-  </cache>
-
-  <!-- cluster nodes -->
-  <cache name="MultilevelCache">
-    <status>active</status>
-    <size>300</size>
-  </cache>
-
-  <!-- used for queries like select max(votes) and select count(title) -->
-  <cache name="AggregatedResultCache">
-    <status>active</status>
-    <size>300</size>
-  </cache>
-
-  <!-- related nodes -->
-  <cache name="RelatedNodesCache">
-    <status>active</status>
-    <size>300</size>
-  </cache>
-
-  <!-- relation nodes -->
-  <cache name="RelationsCache">
-    <status>active</status>
-    <size>300</size>
-  </cache>
-
-  <!-- related nodes, (not?) used in InsRel -->
-  <cache name="RelatedCache">
-    <status>active</status>
-    <size>25</size>
-  </cache>
-
-  <!-- Alias to number cache, used in OALias -->
-  <cache name="AliasCache">
-    <status>active</status>
-    <size>128</size>
-  </cache>
-
-  <!-- Object type cache in MMObjectBuilder.
-       Used by MMBase to perform
-       object number to object type lookup
-  -->
-  <cache name="TypeCache">
-    <status>active</status>
-    <size>20000</size>
-  </cache>
-
-  <!-- 
================================================================================
-  Caches for XSL Transformations
-  
================================================================================
  -->
-
-  <!-- Compiled templates -->
-  <cache name="XSLTemplates">
-    <status>active</status>
-    <size>50</size>
-  </cache>
-
-  <!-- A factory for every URIResolver -->
-  <cache name="XSLFactories">
-    <status>active</status>
-    <size>50</size>
-  </cache>
-
-  <!-- If it makes sense (e.g. not in Editwizard) also the results of
-  XSL transformations can be cached. Because it is a little difficult
-  to invalidate cache entries, this cache is now inactive on default.
-  -->
-  <cache name="XSLTResults">
-    <status>inactive</status>
-    <size>50</size>
-    <maxEntrySize>5000</maxEntrySize>
-  </cache>
-
-  <!-- 
================================================================================
-  Caches related to images/icaches/attachments
-  
================================================================================
  -->
-
-  <!-- Quick search of the icache node number (by template/ckey) -->
-  <cache name="CkeyNumberCache">
-    <status>active</status>
-    <size>500</size>
-  </cache>
-
-  <!-- The 'handle' field of small images (and icaches) objects are cached in 
a dedicated cache -->
-  <cache name="ImageHandles">
-    <status>active</status>
-    <size>200</size>
-    <maxEntrySize>100000</maxEntrySize>
-  </cache>
-
-
-  <!-- All other blobs -->
-  <cache name="GenericBlobCache">
-    <status>active</status>
-    <size>200</size>
-    <maxEntrySize>100000</maxEntrySize>
-  </cache>
-
-
-  <!-- 
================================================================================
-  Jumpers cache
-  
================================================================================
  -->
-  <!-- If you use jumpers, you might want to configure its cache
-  <cache name="JumpersCache">
-    <status>active</status>
-    <size>1000</size>
-  </cache>
-  -->
-</caches>

_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs

Reply via email to