[jbosscache-commits] JBoss Cache SVN: r6253 - in core/trunk/src: main/resources and 4 other directories.
jbosscache-commits at lists.jboss.org
jbosscache-commits at lists.jboss.org
Mon Jul 14 04:21:45 EDT 2008
Author: mircea.markus
Date: 2008-07-14 04:21:45 -0400 (Mon, 14 Jul 2008)
New Revision: 6253
Modified:
core/trunk/src/main/java/org/jboss/cache/config/parsing/element/EvictionElementParser.java
core/trunk/src/main/resources/all-elements-file-3.x.xml
core/trunk/src/main/resources/config-samples/cacheloader-enabled.xml
core/trunk/src/main/resources/config-samples/eviction-enabled.xml
core/trunk/src/main/resources/config-samples/optimistically-locked.xml
core/trunk/src/main/resources/config2to3.xslt
core/trunk/src/main/resources/jbosscache-config-3.0.xsd
core/trunk/src/test/java/org/jboss/cache/config/parsing/EvictionElementParserTest.java
core/trunk/src/test/resources/configs/clonable-config.xml
core/trunk/src/test/resources/configs/local-lru-eviction.xml
core/trunk/src/test/resources/configs/local-passivation.xml
core/trunk/src/test/resources/configs/local-tx.xml
core/trunk/src/test/resources/configs/mixedPolicy-eviction.xml
core/trunk/src/test/resources/configs/parser-test.xml
core/trunk/src/test/resources/configs/policyPerRegion-eviction.xml
core/trunk/src/test/resources/configs/string-property-replaced.xml
core/trunk/src/test/resources/jbc2-registry-configs.xml
core/trunk/src/test/resources/unit-test-cache-service.xml
Log:
changed the way eviction is configured
Modified: core/trunk/src/main/java/org/jboss/cache/config/parsing/element/EvictionElementParser.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/config/parsing/element/EvictionElementParser.java 2008-07-11 20:15:20 UTC (rev 6252)
+++ core/trunk/src/main/java/org/jboss/cache/config/parsing/element/EvictionElementParser.java 2008-07-14 08:21:45 UTC (rev 6253)
@@ -1,10 +1,7 @@
package org.jboss.cache.config.parsing.element;
import org.jboss.cache.RegionManagerImpl;
-import org.jboss.cache.config.EvictionConfig;
-import org.jboss.cache.config.EvictionPolicyConfig;
-import org.jboss.cache.config.EvictionRegionConfig;
-import org.jboss.cache.config.MissingPolicyException;
+import org.jboss.cache.config.*;
import org.jboss.cache.config.parsing.ParsedAttributes;
import org.jboss.cache.config.parsing.XmlConfigHelper;
import org.jboss.cache.config.parsing.XmlParserBase;
@@ -32,13 +29,22 @@
{
EvictionConfig evictionConfig = new EvictionConfig();
String wakeUpInterval = getAttributeValue(evictionElement, "wakeUpInterval");
- if (existsAttribute(wakeUpInterval)) evictionConfig.setWakeupInterval(getInt(wakeUpInterval));
+ if (existsAttribute(wakeUpInterval))
+ {
+ evictionConfig.setWakeupInterval(getInt(wakeUpInterval));
+ }
+ else
+ {
+ throw new ConfigurationException("Missing mandatory attribute wakeUpInterval");
+ }
- Element element = getSingleElement("defaults", evictionElement);
- processDefaults(evictionConfig, element);
+ String defaultPolicyClassStr = getAttributeValue(evictionElement, "defaultPolicyClass");
+ if (existsAttribute(defaultPolicyClassStr)) evictionConfig.setDefaultEvictionPolicyClass(defaultPolicyClassStr);
+ String defaultEventQueueSize = getAttributeValue(evictionElement, "defaultEventQueueSize");
+ if (existsAttribute(defaultEventQueueSize)) evictionConfig.setDefaultEventQueueSize(getInt(defaultEventQueueSize));
List<EvictionRegionConfig> evictionRegionConfigs = new ArrayList<EvictionRegionConfig>(3);
- Element rootRegion = getSingleElement("root", evictionElement);
+ Element rootRegion = getSingleElement("default", evictionElement);
String defaultPolicyClass = evictionConfig.getDefaultEvictionPolicyClass();
int defaultEvQueueSize = evictionConfig.getDefaultEventQueueSize();
if (rootRegion != null)
@@ -59,15 +65,6 @@
return evictionConfig;
}
- private void processDefaults(EvictionConfig evictionConfig, Element element)
- {
- if (element == null) return;
- String policyClass = getAttributeValue(element, "policyClass");
- if (existsAttribute(policyClass)) evictionConfig.setDefaultEvictionPolicyClass(policyClass);
- String eventQueueSize = getAttributeValue(element, "eventQueueSize");
- if (existsAttribute(eventQueueSize)) evictionConfig.setDefaultEventQueueSize(getInt(eventQueueSize));
- }
-
private EvictionRegionConfig getEvictionRegionConfig(Element element, String defaultPolicyClass, int defaultEventQueueSize)
{
EvictionRegionConfig erc = new EvictionRegionConfig();
Modified: core/trunk/src/main/resources/all-elements-file-3.x.xml
===================================================================
--- core/trunk/src/main/resources/all-elements-file-3.x.xml 2008-07-11 20:15:20 UTC (rev 6252)
+++ core/trunk/src/main/resources/all-elements-file-3.x.xml 2008-07-14 08:21:45 UTC (rev 6253)
@@ -60,13 +60,12 @@
</jgroupsConfig>
</transport>
- <eviction wakeUpInterval="5">
- <defaults policyClass="org.jboss.cache.eviction.LRUPolicy" eventQueueSize="200000"/>
- <root>
+ <eviction wakeUpInterval="5" defaultPolicyClass="org.jboss.cache.eviction.LRUPolicy" defaultEventQueueSize="200000">
+ <default>
<attribute name="maxNodes">5000</attribute>
<attribute name="timeToLive">1000</attribute>
<attribute name="timeToLive">1000</attribute>
- </root>
+ </default>
<region name="/org/jboss/data">
<attribute name="timeToLive">1002</attribute>
</region>
Modified: core/trunk/src/main/resources/config-samples/cacheloader-enabled.xml
===================================================================
--- core/trunk/src/main/resources/config-samples/cacheloader-enabled.xml 2008-07-11 20:15:20 UTC (rev 6252)
+++ core/trunk/src/main/resources/config-samples/cacheloader-enabled.xml 2008-07-14 08:21:45 UTC (rev 6253)
@@ -3,12 +3,11 @@
xsi:noNamespaceSchemaLocation="http://www.jboss.org/jbosscache/jbosscache-config-3.0.xsd">
<locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="15000" nodeLockingScheme="mvcc"/>
<transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
- <eviction wakeUpInterval="5000">
- <defaults policyClass="org.jboss.cache.eviction.LRUPolicy" eventQueueSize="200000"/>
- <root>
+ <eviction wakeUpInterval="5000" defaultPolicyClass="org.jboss.cache.eviction.LRUPolicy" defaultEventQueueSize="200000">
+ <default>
<attribute name="maxNodes">5000</attribute>
<attribute name="timeToLiveSeconds">3</attribute>
- </root>
+ </default>
<region name="/org/jboss/test/data">
<attribute name="maxNodes">100</attribute>
<attribute name="timeToLiveSeconds">3</attribute>
Modified: core/trunk/src/main/resources/config-samples/eviction-enabled.xml
===================================================================
--- core/trunk/src/main/resources/config-samples/eviction-enabled.xml 2008-07-11 20:15:20 UTC (rev 6252)
+++ core/trunk/src/main/resources/config-samples/eviction-enabled.xml 2008-07-14 08:21:45 UTC (rev 6253)
@@ -3,12 +3,11 @@
xsi:noNamespaceSchemaLocation="http://www.jboss.org/jbosscache/jbosscache-config-3.0.xsd">
<locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="15000" nodeLockingScheme="mvcc"/>
<transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
- <eviction wakeUpInterval="5000">
- <defaults policyClass="org.jboss.cache.eviction.LRUPolicy" eventQueueSize="200000"/>
- <root>
+ <eviction wakeUpInterval="5000" defaultPolicyClass="org.jboss.cache.eviction.LRUPolicy" defaultEventQueueSize="200000">
+ <default>
<attribute name="maxNodes">5000</attribute>
<attribute name="timeToLiveSeconds">1000</attribute>
- </root>
+ </default>
<region name="/org/jboss/data">
<attribute name="maxNodes">5000</attribute>
<attribute name="timeToLiveSeconds">1000</attribute>
Modified: core/trunk/src/main/resources/config-samples/optimistically-locked.xml
===================================================================
--- core/trunk/src/main/resources/config-samples/optimistically-locked.xml 2008-07-11 20:15:20 UTC (rev 6252)
+++ core/trunk/src/main/resources/config-samples/optimistically-locked.xml 2008-07-14 08:21:45 UTC (rev 6253)
@@ -4,13 +4,12 @@
<locking isolationLevel="READ_COMMITTED" lockAcquisitionTimeout="10000" nodeLockingScheme="optimistic"/>
<transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
<stateRetrieval fetchInMemoryState="false"/>
- <eviction wakeUpInterval="1000">
- <defaults policyClass="org.jboss.cache.eviction.LRUPolicy"/>
- <root>
+ <eviction wakeUpInterval="1000" defaultPolicyClass="org.jboss.cache.eviction.LRUPolicy">
+ <default>
<attribute name="maxNodes">10</attribute>
<attribute name="timeToLiveSeconds">0</attribute>
<attribute name="maxAgeSeconds">0</attribute>
- </root>
+ </default>
<region name="/testingRegion">
<attribute name="maxNodes">10</attribute>
<attribute name="timeToLiveSeconds">0</attribute>
Modified: core/trunk/src/main/resources/config2to3.xslt
===================================================================
--- core/trunk/src/main/resources/config2to3.xslt 2008-07-11 20:15:20 UTC (rev 6252)
+++ core/trunk/src/main/resources/config2to3.xslt 2008-07-14 08:21:45 UTC (rev 6253)
@@ -272,22 +272,18 @@
select="concat(normalize-space(./config/attribute[@name='wakeUpIntervalSeconds']), '000')"/>
</xsl:attribute>
</xsl:if>
- <xsl:if test="./config/attribute[@name='policyClass'] | ./config/attribute[@name='policyClass']">
- <defaults>
- <xsl:if test="./config/attribute[@name='policyClass']">
- <xsl:attribute name="policyClass">
- <xsl:value-of select="normalize-space(./config/attribute[@name='policyClass'])"/>
- </xsl:attribute>
- </xsl:if>
- <xsl:if test="./config/attribute[@name='eventQueueSize']">
- <xsl:attribute name="eventQueueSize">
- <xsl:value-of select="normalize-space(./config/attribute[@name='eventQueueSize'])"/>
- </xsl:attribute>
- </xsl:if>
- </defaults>
+ <xsl:if test="./config/attribute[@name='policyClass']">
+ <xsl:attribute name="defaultPolicyClass">
+ <xsl:value-of select="normalize-space(./config/attribute[@name='policyClass'])"/>
+ </xsl:attribute>
</xsl:if>
+ <xsl:if test="./config/attribute[@name='eventQueueSize']">
+ <xsl:attribute name="defaultEventQueueSize">
+ <xsl:value-of select="normalize-space(./config/attribute[@name='eventQueueSize'])"/>
+ </xsl:attribute>
+ </xsl:if>
<xsl:if test="./config/region[@name='/_default_']">
- <root>
+ <default>
<xsl:if test="./config/region[@name='/_default_' and string-length(@policyClass) > 0]">
<xsl:attribute name="policyClass">
<xsl:value-of
@@ -295,7 +291,7 @@
</xsl:attribute>
</xsl:if>
<xsl:copy-of select="./config/region[@name='/_default_']/*"/>
- </root>
+ </default>
</xsl:if>
<xsl:for-each select="./config/region[@name!='/_default_']">
<region>
Modified: core/trunk/src/main/resources/jbosscache-config-3.0.xsd
===================================================================
--- core/trunk/src/main/resources/jbosscache-config-3.0.xsd 2008-07-11 20:15:20 UTC (rev 6252)
+++ core/trunk/src/main/resources/jbosscache-config-3.0.xsd 2008-07-14 08:21:45 UTC (rev 6253)
@@ -153,16 +153,12 @@
<xs:complexType name="evictionType">
<xs:sequence>
- <xs:element name="defaults" minOccurs="0">
- <xs:complexType>
- <xs:attribute name="policyClass" type="xs:string"/>
- <xs:attribute name="eventQueueSize" type="positiveInteger"/>
- </xs:complexType>
- </xs:element>
- <xs:element name="root" type="evictionRegionType" minOccurs="0"/>
+ <xs:element name="default" type="evictionRegionType" minOccurs="0"/>
<xs:element name="region" minOccurs="0" maxOccurs="unbounded" type="evictionRegionType"/>
</xs:sequence>
- <xs:attribute name="wakeUpInterval" type="positiveInteger"/>
+ <xs:attribute name="wakeUpInterval" type="positiveInteger" use="required"/>
+ <xs:attribute name="defaultPolicyClass" type="xs:string"/>
+ <xs:attribute name="defaultEventQueueSize" type="positiveInteger"/>
</xs:complexType>
<xs:complexType name="evictionRegionType">
Modified: core/trunk/src/test/java/org/jboss/cache/config/parsing/EvictionElementParserTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/config/parsing/EvictionElementParserTest.java 2008-07-11 20:15:20 UTC (rev 6252)
+++ core/trunk/src/test/java/org/jboss/cache/config/parsing/EvictionElementParserTest.java 2008-07-14 08:21:45 UTC (rev 6253)
@@ -46,12 +46,11 @@
public void testNormalConfig()
{
String xml =
- " <eviction wakeUpInterval=\"5\">\n" +
- " <defaults policyClass=\"org.jboss.cache.eviction.MRUPolicy\" eventQueueSize=\"123456\"/>\n" +
- " <root>\n" +
+ " <eviction wakeUpInterval=\"5\" defaultPolicyClass=\"org.jboss.cache.eviction.MRUPolicy\" defaultEventQueueSize=\"123456\">\n" +
+ " <default>\n" +
" <attribute name=\"maxNodes\">6</attribute>\n" +
" <attribute name=\"minTimeToLive\">7</attribute>\n" +
- " </root>\n" +
+ " </default>\n" +
" <region name=\"/org/jboss/data\">\n" +
" <attribute name=\"minTimeToLive\">1002</attribute>\n" +
" <attribute name=\"maxNodes\">2021</attribute>\n" +
@@ -95,13 +94,12 @@
public void testLruConfig()
{
String xml =
- " <eviction wakeUpInterval=\"45000\">\n" +
- " <defaults policyClass=\"org.jboss.cache.eviction.LRUPolicy\" eventQueueSize=\"4\"/>\n" +
- " <root>\n" +
+ " <eviction wakeUpInterval=\"45000\" defaultPolicyClass=\"org.jboss.cache.eviction.LRUPolicy\" defaultEventQueueSize=\"4\">\n" +
+ " <default>\n" +
" <attribute name=\"maxNodes\">5000</attribute>\n" +
" <attribute name=\"timeToLive\">1000000</attribute>\n" +
" <attribute name=\"maxAge\">15000</attribute>\n" +
- " </root>\n" +
+ " </default>\n" +
" <region name=\"/fifo\">\n" +
" <attribute name=\"maxNodes\">5000</attribute>\n" +
" <attribute name=\"timeToLive\">1000000</attribute>\n" +
@@ -155,7 +153,7 @@
public void testMissingPolicyOnRegion()
{
String xml =
- " <eviction defaultPolicyClass=\"org.jboss.cache.eviction.LRUPolicy\" defaultEventQueueSize=\"200000\">\n" +
+ " <eviction defaultEventQueueSize=\"200000\" wakeUpInterval=\"5000\">\n" +
" <region name=\"/org/jboss/data\">\n" +
" <attribute name=\"timeToLive\">1002</attribute>\n" +
" </region>\n" +
@@ -189,10 +187,10 @@
{
String xml =
" <eviction wakeUpInterval=\"5000\">\n" +
- " <root>\n" +
+ " <default>\n" +
" <attribute name=\"maxNodes\">5000</attribute>\n" +
" <attribute name=\"timeToLive\">1000</attribute>\n" +
- " </root>\n" +
+ " </default>\n" +
" <region name=\"/org/jboss/data\" policyClass=\"org.jboss.cache.eviction.LFUPolicy\">\n" +
" <attribute name=\"maxNodes\">5000</attribute>\n" +
" <attribute name=\"minNodes\">1000</attribute>\n" +
Modified: core/trunk/src/test/resources/configs/clonable-config.xml
===================================================================
--- core/trunk/src/test/resources/configs/clonable-config.xml 2008-07-11 20:15:20 UTC (rev 6252)
+++ core/trunk/src/test/resources/configs/clonable-config.xml 2008-07-14 08:21:45 UTC (rev 6253)
@@ -44,13 +44,12 @@
</locator>
</buddy>
</replication>
- <eviction wakeUpInterval="45000">
- <defaults policyClass="org.jboss.cache.eviction.LRUPolicy" eventQueueSize="4"/>
- <root>
+ <eviction wakeUpInterval="45000" defaultPolicyClass="org.jboss.cache.eviction.LRUPolicy" defaultEventQueueSize="4">
+ <default>
<attribute name="maxNodes">5000</attribute>
<attribute name="timeToLiveSeconds">1000</attribute>
<attribute name="maxAge">15000</attribute>
- </root>
+ </default>
<region name="/fifo" policyClass="org.jboss.cache.eviction.FIFOPolicy">
<attribute name="maxNodes">5000</attribute>
</region>
Modified: core/trunk/src/test/resources/configs/local-lru-eviction.xml
===================================================================
--- core/trunk/src/test/resources/configs/local-lru-eviction.xml 2008-07-11 20:15:20 UTC (rev 6252)
+++ core/trunk/src/test/resources/configs/local-lru-eviction.xml 2008-07-14 08:21:45 UTC (rev 6253)
@@ -6,12 +6,11 @@
<transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
<stateRetrieval timeout="20000"/>
<transport clusterName="JBossCache-Cluster"/>
- <eviction wakeUpInterval="5000">
- <defaults policyClass="org.jboss.cache.eviction.LRUPolicy" eventQueueSize="200000"/>
- <root>
+ <eviction wakeUpInterval="5000" defaultPolicyClass="org.jboss.cache.eviction.LRUPolicy" defaultEventQueueSize="200000">
+ <default>
<attribute name="maxNodes">5000</attribute>
<attribute name="timeToLiveSeconds">1000</attribute>
- </root>
+ </default>
<region name="/org/jboss/data">
<attribute name="maxNodes">5000</attribute>
<attribute name="timeToLiveSeconds">1000</attribute>
Modified: core/trunk/src/test/resources/configs/local-passivation.xml
===================================================================
--- core/trunk/src/test/resources/configs/local-passivation.xml 2008-07-11 20:15:20 UTC (rev 6252)
+++ core/trunk/src/test/resources/configs/local-passivation.xml 2008-07-14 08:21:45 UTC (rev 6253)
@@ -6,12 +6,11 @@
<transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
<stateRetrieval timeout="20000"/>
<transport clusterName="JBossCache-Cluster"/>
- <eviction wakeUpInterval="1000">
- <defaults policyClass="org.jboss.cache.eviction.LRUPolicy" eventQueueSize="200000"/>
- <root>
+ <eviction wakeUpInterval="1000" defaultPolicyClass="org.jboss.cache.eviction.LRUPolicy" defaultEventQueueSize="200000">
+ <default>
<attribute name="maxNodes">5000</attribute>
<attribute name="timeToLiveSeconds">1</attribute>
- </root>
+ </default>
<region name="/org/jboss/test/data">
<attribute name="maxNodes">100</attribute>
<attribute name="timeToLiveSeconds">1</attribute>
Modified: core/trunk/src/test/resources/configs/local-tx.xml
===================================================================
--- core/trunk/src/test/resources/configs/local-tx.xml 2008-07-11 20:15:20 UTC (rev 6252)
+++ core/trunk/src/test/resources/configs/local-tx.xml 2008-07-14 08:21:45 UTC (rev 6253)
@@ -7,12 +7,11 @@
<serialization useRegionBasedMarshalling="false"/>
<stateRetrieval timeout="20000"/>
<transport clusterName="JBossCache-Cluster"/>
- <eviction wakeUpInterval="5000">
- <defaults policyClass="org.jboss.cache.eviction.LRUPolicy" eventQueueSize="200000"/>
- <root>
+ <eviction wakeUpInterval="5000" defaultPolicyClass="org.jboss.cache.eviction.LRUPolicy" defaultEventQueueSize="200000">
+ <default>
<attribute name="maxNodes">5000</attribute>
<attribute name="timeToLiveSeconds">1000</attribute>
- </root>
+ </default>
<region name="/org/jboss/data">
<attribute name="maxNodes">5000</attribute>
<attribute name="timeToLiveSeconds">1000</attribute>
Modified: core/trunk/src/test/resources/configs/mixedPolicy-eviction.xml
===================================================================
--- core/trunk/src/test/resources/configs/mixedPolicy-eviction.xml 2008-07-11 20:15:20 UTC (rev 6252)
+++ core/trunk/src/test/resources/configs/mixedPolicy-eviction.xml 2008-07-14 08:21:45 UTC (rev 6253)
@@ -34,12 +34,11 @@
<pbcast.FLUSH timeout="0"/>
</jgroupsConfig>
</transport>
- <eviction wakeUpInterval="5000">
- <defaults policyClass="org.jboss.cache.eviction.LRUPolicy" eventQueueSize="200000"/>
- <root>
+ <eviction wakeUpInterval="5000" defaultPolicyClass="org.jboss.cache.eviction.LRUPolicy" defaultEventQueueSize="200000">
+ <default>
<attribute name="maxNodes">5000</attribute>
<attribute name="timeToLiveSeconds">1000</attribute>
- </root>
+ </default>
<region name="/org/jboss/data" policyClass="org.jboss.cache.eviction.FIFOPolicy">
<attribute name="maxNodes">5000</attribute>
</region>
Modified: core/trunk/src/test/resources/configs/parser-test.xml
===================================================================
--- core/trunk/src/test/resources/configs/parser-test.xml 2008-07-11 20:15:20 UTC (rev 6252)
+++ core/trunk/src/test/resources/configs/parser-test.xml 2008-07-14 08:21:45 UTC (rev 6253)
@@ -2,8 +2,8 @@
<!-- file used for functional test of the xml parser -->
-<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="http://www.jboss.org/jbosscache/jbosscache-config-3.0.xsd">
+<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:noNamespaceSchemaLocation="http://www.jboss.org/jbosscache/jbosscache-config-3.0.xsd">
<locking isolationLevel="REPEATABLE_READ" lockParentForChildInsertRemove="true" lockAcquisitionTimeout="10234"
@@ -58,12 +58,11 @@
<jmxStatistics enabled="false"/>
- <eviction wakeUpInterval="5">
- <defaults policyClass="org.jboss.cache.eviction.LRUPolicy" eventQueueSize="200000"/>
- <root>
+ <eviction wakeUpInterval="5" defaultPolicyClass="org.jboss.cache.eviction.LRUPolicy" defaultEventQueueSize="200000">
+ <default>
<attribute name="maxNodes">5000</attribute>
<attribute name="timeToLive">1000</attribute>
- </root>
+ </default>
<region name="/org/jboss/data">
<attribute name="timeToLive">1002</attribute>
</region>
@@ -82,7 +81,7 @@
<!-- we can now have multiple cache loaders, which get chained -->
<loader class="org.jboss.cache.loader.JDBCCacheLoader" async="true" fetchPersistentState="true"
- ignoreModifications="true" purgeOnStartup="true">
+ ignoreModifications="true" purgeOnStartup="true">
<properties>
cache.jdbc.table.name=jbosscache
cache.jdbc.table.create=true
Modified: core/trunk/src/test/resources/configs/policyPerRegion-eviction.xml
===================================================================
--- core/trunk/src/test/resources/configs/policyPerRegion-eviction.xml 2008-07-11 20:15:20 UTC (rev 6252)
+++ core/trunk/src/test/resources/configs/policyPerRegion-eviction.xml 2008-07-14 08:21:45 UTC (rev 6253)
@@ -35,10 +35,10 @@
</transport>
<eviction wakeUpInterval="5000">
- <root policyClass="org.jboss.cache.eviction.LRUPolicy">
+ <default policyClass="org.jboss.cache.eviction.LRUPolicy">
<attribute name="maxNodes">5000</attribute>
<attribute name="timeToLiveSeconds">1000</attribute>
- </root>
+ </default>
<region name="/org/jboss/data" policyClass="org.jboss.cache.eviction.LFUPolicy">
<attribute name="maxNodes">5000</attribute>
<attribute name="minNodes">1000</attribute>
Modified: core/trunk/src/test/resources/configs/string-property-replaced.xml
===================================================================
--- core/trunk/src/test/resources/configs/string-property-replaced.xml 2008-07-11 20:15:20 UTC (rev 6252)
+++ core/trunk/src/test/resources/configs/string-property-replaced.xml 2008-07-14 08:21:45 UTC (rev 6253)
@@ -23,12 +23,11 @@
</locator>
</buddy>
</replication>
- <eviction wakeUpInterval="5000">
- <defaults policyClass="${test.property.EvictionPolicyConfig.policyClass:org.jboss.cache.eviction.LRUPolicy}"/>
- <root>
+ <eviction wakeUpInterval="5000" defaultPolicyClass="${test.property.EvictionPolicyConfig.policyClass:org.jboss.cache.eviction.LRUPolicy}">
+ <default>
<attribute name="maxNodes">${test.property.EvictionPolicyConfig.maxNodes:5000}</attribute>
<attribute name="timeToLiveSeconds">1000</attribute>
- </root>
+ </default>
</eviction>
<loaders passivation="true" shared="false">
<preload>
Modified: core/trunk/src/test/resources/jbc2-registry-configs.xml
===================================================================
(Binary files differ)
Modified: core/trunk/src/test/resources/unit-test-cache-service.xml
===================================================================
--- core/trunk/src/test/resources/unit-test-cache-service.xml 2008-07-11 20:15:20 UTC (rev 6252)
+++ core/trunk/src/test/resources/unit-test-cache-service.xml 2008-07-14 08:21:45 UTC (rev 6253)
@@ -11,12 +11,11 @@
<replication>
<sync replTimeout="15000"/>
</replication>
- <eviction wakeUpInterval="2000">
- <defaults policyClass="org.jboss.cache.eviction.LRUPolicy"/>
- <root>
+ <eviction wakeUpInterval="2000" defaultPolicyClass="org.jboss.cache.eviction.LRUPolicy">
+ <default>
<attribute name="maxNodes">5000</attribute>
<attribute name="timeToLiveSeconds">1000</attribute>
- </root>
+ </default>
<region name="/org/jboss/data">
<attribute name="maxNodes">5000</attribute>
<attribute name="timeToLiveSeconds">1000</attribute>
More information about the jbosscache-commits
mailing list