[jbosscache-commits] JBoss Cache SVN: r6234 - in core/trunk/src: main/java/org/jboss/cache/config/parsing and 6 other directories.
jbosscache-commits at lists.jboss.org
jbosscache-commits at lists.jboss.org
Wed Jul 9 13:04:59 EDT 2008
Author: mircea.markus
Date: 2008-07-09 13:04:59 -0400 (Wed, 09 Jul 2008)
New Revision: 6234
Modified:
core/trunk/src/main/java/org/jboss/cache/DefaultCacheFactory.java
core/trunk/src/main/java/org/jboss/cache/config/parsing/XmlConfigurationParser.java
core/trunk/src/main/java/org/jboss/cache/eviction/LRUConfiguration.java
core/trunk/src/main/resources/all-elements-file-3.x.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/ConfigurationCloningTest.java
core/trunk/src/test/java/org/jboss/cache/config/ConfigurationTest.java
core/trunk/src/test/java/org/jboss/cache/config/parsing/BuddyElementParserTest.java
core/trunk/src/test/java/org/jboss/cache/config/parsing/EvictionElementParserTest.java
core/trunk/src/test/java/org/jboss/cache/config/parsing/XmlConfigurationParserTest.java
core/trunk/src/test/resources/configs/buddy-replication-cache.xml
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/mux.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/replSync.xml
core/trunk/src/test/resources/configs/string-property-replaced.xml
core/trunk/src/test/resources/unit-test-cache-service.xml
Log:
added stateRetreival element and fixed tests
Modified: core/trunk/src/main/java/org/jboss/cache/DefaultCacheFactory.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/DefaultCacheFactory.java 2008-07-09 12:47:56 UTC (rev 6233)
+++ core/trunk/src/main/java/org/jboss/cache/DefaultCacheFactory.java 2008-07-09 17:04:59 UTC (rev 6234)
@@ -71,6 +71,7 @@
c = parser.parseFile(configFileName);
} catch (OldFileFormatException e)
{
+ //todo mmarkus add an warning
XmlConfigurationParser2x oldParser = new XmlConfigurationParser2x();
c = oldParser.parseFile(configFileName);
}
Modified: core/trunk/src/main/java/org/jboss/cache/config/parsing/XmlConfigurationParser.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/config/parsing/XmlConfigurationParser.java 2008-07-09 12:47:56 UTC (rev 6233)
+++ core/trunk/src/main/java/org/jboss/cache/config/parsing/XmlConfigurationParser.java 2008-07-09 17:04:59 UTC (rev 6234)
@@ -48,7 +48,7 @@
* By default this class uses a validating parser (configurable).
* <p/>
* In order to make the parser non-validating by default, the follwing system property is expected:
- * <b>-Djbc.config.validation=false</b>
+ * <b>-Djbosscache.config.validate=false</b>
* <p/>
* Implementation note: this class is stateful and one instance should be used for parsing a single configuration file.
*
@@ -59,7 +59,7 @@
{
private static final Log log = LogFactory.getLog(XmlConfigurationParser.class);
- public static final String VALIDATING_SYSTEM_PROPERTY = "jbc.config.validation";
+ public static final String VALIDATING_SYSTEM_PROPERTY = "jbosscache.config.validate";
/**
* the resulting configuration.
@@ -72,9 +72,9 @@
{
isValidating = true;
String validatingStr = System.getProperty(VALIDATING_SYSTEM_PROPERTY);
- if ("false".equalsIgnoreCase(validatingStr))
+ if (validatingStr != null)
{
- isValidating = false;
+ isValidating = Boolean.getBoolean(VALIDATING_SYSTEM_PROPERTY);
}
}
@@ -165,6 +165,7 @@
configureSerialization(getSingleElement("serialization"));
configureInvalidation(getSingleElement("invalidation"));
configureStartup(getSingleElement("startup"));
+ configureStateRetrieval(getSingleElement("stateRetrieval"));
configureTransport(getSingleElement("transport"));
configureShutdown(getSingleElement("shutdown"));
configureJmxStatistics(getSingleElement("jmxStatistics"));
@@ -178,6 +179,16 @@
return config;
}
+ private void configureStateRetrieval(Element element)
+ {
+ if (element == null) return; //we might not have this configured
+ String fetchInMemoryState = getAttributeValue(element, "fetchInMemoryState");
+ if (existsAttribute(fetchInMemoryState)) config.setFetchInMemoryState(getBoolean(fetchInMemoryState));
+ String stateRetrievalTimeout = getAttributeValue(element, "timeout");
+ if (existsAttribute(stateRetrievalTimeout)) config.setStateRetrievalTimeout(getLong(stateRetrievalTimeout));
+
+ }
+
private void configureTransaction(Element element)
{
if (element == null) return;
@@ -295,10 +306,6 @@
private void configureStartup(Element element)
{
if (element == null) return; //we might not have this configured
- String fetchInMemoryState = getAttributeValue(element, "fetchInMemoryState");
- if (existsAttribute(fetchInMemoryState)) config.setFetchInMemoryState(getBoolean(fetchInMemoryState));
- String stateRetrievalTimeout = getAttributeValue(element, "stateRetrievalTimeout");
- if (existsAttribute(stateRetrievalTimeout)) config.setStateRetrievalTimeout(getLong(stateRetrievalTimeout));
String inactiveOnStartup = getAttributeValue(element, "inactiveOnStartup");
if (existsAttribute(inactiveOnStartup)) config.setInactiveOnStartup(getBoolean(inactiveOnStartup));
}
Modified: core/trunk/src/main/java/org/jboss/cache/eviction/LRUConfiguration.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/eviction/LRUConfiguration.java 2008-07-09 12:47:56 UTC (rev 6233)
+++ core/trunk/src/main/java/org/jboss/cache/eviction/LRUConfiguration.java 2008-07-09 17:04:59 UTC (rev 6234)
@@ -148,7 +148,7 @@
if (timeToLive < 0)
{
throw new ConfigurationException("timeToLive must be " +
- "configured to a value greater than or equal to 0");
+ "configured to a value greater than or equal to 0 for " + getEvictionPolicyClass());
}
}
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-09 12:47:56 UTC (rev 6233)
+++ core/trunk/src/main/resources/all-elements-file-3.x.xml 2008-07-09 17:04:59 UTC (rev 6234)
@@ -13,6 +13,7 @@
<serialization objectInputStreamPoolSize="10" objectOutputStreamPoolSize="20" version="5.1.0"
marshallerClass="some.Clazz" useLazyDeserialization="true" useRegionBasedMarshalling="false"/>
+ <!-- local mode is achieved by not specifying replication or invalidation -->
<!-- either replication or invalidation tags will be present, not both -->
<replication>
<sync replTimeout="15421"/>
@@ -33,7 +34,9 @@
<sync replTimeout="15421"/>
</invalidation>
- <startup fetchInMemoryState="true" stateRetrievalTimeout="1524" inactiveOnStartup="true"/>
+ <!-- todo mmarkus -->
+ <stateRetrieval timeout="1524" fetchInMemoryState="true"/>
+ <startup inactiveOnStartup="true"/>
<shutdown hookBehavior="REGISTER"/>
<jmxStatistics enabled="false"/>
Modified: core/trunk/src/main/resources/config2to3.xslt
===================================================================
--- core/trunk/src/main/resources/config2to3.xslt 2008-07-09 12:47:56 UTC (rev 6233)
+++ core/trunk/src/main/resources/config2to3.xslt 2008-07-09 17:04:59 UTC (rev 6234)
@@ -9,6 +9,7 @@
<xsl:call-template name="transaction"/>
<xsl:call-template name="serialization"/>
<xsl:call-template name="startup"/>
+ <xsl:call-template name="stateRetrieval"/>
<xsl:call-template name="transport"/>
<xsl:apply-templates select="//attribute"/>
</xsl:element>
@@ -220,24 +221,29 @@
</xsl:template>
<xsl:template name="startup">
+ <xsl:if test="//attribute[@name='InactiveOnStartup']">
+ <xsl:element name="startup">
+ <xsl:attribute name="inactiveOnStartup">
+ <xsl:value-of select="normalize-space(//attribute[@name='InactiveOnStartup'])"/>
+ </xsl:attribute>
+ </xsl:element>
+ </xsl:if>
+ </xsl:template>
+
+ <xsl:template name="stateRetrieval">
<xsl:if
- test="//attribute[@name='FetchInMemoryState'] | //attribute[@name='StateRetrievalTimeout'] | //attribute[@name='InactiveOnStartup']">
- <xsl:element name="startup">
+ test="//attribute[@name='FetchInMemoryState'] | //attribute[@name='StateRetrievalTimeout']">
+ <xsl:element name="stateRetrieval">
<xsl:if test="//attribute[@name='FetchInMemoryState']">
<xsl:attribute name="fetchInMemoryState">
<xsl:value-of select="normalize-space(//attribute[@name='FetchInMemoryState'])"/>
</xsl:attribute>
</xsl:if>
<xsl:if test="//attribute[@name='StateRetrievalTimeout']">
- <xsl:attribute name="stateRetrievalTimeout">
+ <xsl:attribute name="timeout">
<xsl:value-of select="normalize-space(//attribute[@name='StateRetrievalTimeout'])"/>
</xsl:attribute>
</xsl:if>
- <xsl:if test="//attribute[@name='InactiveOnStartup']">
- <xsl:attribute name="inactiveOnStartup">
- <xsl:value-of select="normalize-space(//attribute[@name='InactiveOnStartup'])"/>
- </xsl:attribute>
- </xsl:if>
</xsl:element>
</xsl:if>
</xsl:template>
@@ -262,7 +268,8 @@
<eviction>
<xsl:if test="./config/attribute[@name='wakeUpIntervalSeconds']">
<xsl:attribute name="wakeUpInterval">
- <xsl:value-of select="concat(normalize-space(./config/attribute[@name='wakeUpIntervalSeconds']), '000')"/>
+ <xsl:value-of
+ select="concat(normalize-space(./config/attribute[@name='wakeUpIntervalSeconds']), '000')"/>
</xsl:attribute>
</xsl:if>
<xsl:if test="./config/attribute[@name='policyClass'] | ./config/attribute[@name='policyClass']">
@@ -283,7 +290,8 @@
<root>
<xsl:if test="./config/region[@name='/_default_' and string-length(@policyClass) > 0]">
<xsl:attribute name="policyClass">
- <xsl:value-of select="./config/region[@name='/_default_' and string-length(@policyClass) > 0]/@policyClass"/>
+ <xsl:value-of
+ select="./config/region[@name='/_default_' and string-length(@policyClass) > 0]/@policyClass"/>
</xsl:attribute>
</xsl:if>
<xsl:copy-of select="./config/region[@name='/_default_']/*"/>
Modified: core/trunk/src/main/resources/jbosscache-config-3.0.xsd
===================================================================
--- core/trunk/src/main/resources/jbosscache-config-3.0.xsd 2008-07-09 12:47:56 UTC (rev 6233)
+++ core/trunk/src/main/resources/jbosscache-config-3.0.xsd 2008-07-09 17:04:59 UTC (rev 6234)
@@ -7,6 +7,7 @@
<xs:element name="locking" type="lockingType" minOccurs="0"/>
<xs:element name="transaction" type="transactionType" minOccurs="0"/>
<xs:element name="startup" type="startupType" minOccurs="0"/>
+ <xs:element name="stateRetrieval" type="stateRetrievalType" minOccurs="0"/>
<xs:element name="shutdown" type="shutdownType" minOccurs="0"/>
<xs:element name="serialization" type="serializationType" minOccurs="0"/>
<xs:element name="replication" type="replicationType" minOccurs="0"/>
@@ -48,11 +49,14 @@
</xs:complexType>
<xs:complexType name="startupType">
- <xs:attribute name="fetchInMemoryState" type="booleanType"/>
<xs:attribute name="inactiveOnStartup" type="booleanType"/>
- <xs:attribute name="stateRetrievalTimeout" type="positiveInteger"/>
</xs:complexType>
+ <xs:complexType name="stateRetrievalType">
+ <xs:attribute name="fetchInMemoryState" type="booleanType"/>
+ <xs:attribute name="timeout" type="positiveInteger"/>
+ </xs:complexType>
+
<xs:complexType name="shutdownType">
<xs:attribute name="hookBehavior">
<xs:simpleType>
Modified: core/trunk/src/test/java/org/jboss/cache/config/ConfigurationCloningTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/config/ConfigurationCloningTest.java 2008-07-09 12:47:56 UTC (rev 6233)
+++ core/trunk/src/test/java/org/jboss/cache/config/ConfigurationCloningTest.java 2008-07-09 17:04:59 UTC (rev 6234)
@@ -31,7 +31,7 @@
public class ConfigurationCloningTest
{
/** A file that includes every configuration element I could think of */
- public static final String DEFAULT_CONFIGURATION_FILE = "/configs/clonable-config.xml";
+ public static final String DEFAULT_CONFIGURATION_FILE = "configs/clonable-config.xml";
private static final Log log = LogFactory.getLog(ConfigurationCloningTest.class);
Modified: core/trunk/src/test/java/org/jboss/cache/config/ConfigurationTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/config/ConfigurationTest.java 2008-07-09 12:47:56 UTC (rev 6233)
+++ core/trunk/src/test/java/org/jboss/cache/config/ConfigurationTest.java 2008-07-09 17:04:59 UTC (rev 6234)
@@ -31,8 +31,6 @@
assertEquals(TransactionSetup.getManagerLookup(), conf.getTransactionManagerLookupClass());
assertEquals(IsolationLevel.REPEATABLE_READ, conf.getIsolationLevel());
assertEquals(false, conf.isUseReplQueue());
- assertEquals(0, conf.getReplQueueInterval());
- assertEquals(0, conf.getReplQueueMaxElements());
assertEquals("JBossCache-Cluster", conf.getClusterName());
assertEquals(true, conf.isFetchInMemoryState());
assertEquals(15000, conf.getStateRetrievalTimeout());
Modified: core/trunk/src/test/java/org/jboss/cache/config/parsing/BuddyElementParserTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/config/parsing/BuddyElementParserTest.java 2008-07-09 12:47:56 UTC (rev 6233)
+++ core/trunk/src/test/java/org/jboss/cache/config/parsing/BuddyElementParserTest.java 2008-07-09 17:04:59 UTC (rev 6234)
@@ -42,12 +42,12 @@
public void testDefaultParamsForNextMemberBuddyLocator() throws Exception
{
String xmlConfig =
- " <buddyReplication enabled=\"true\" buddyPoolName=\"groupOne\">\n" +
- " <buddyLocator>\n" +
+ " <buddyReplication enabled=\"true\" poolName=\"groupOne\">\n" +
+ " <locator>\n" +
" <properties>\n" +
" numBuddies = 3\n" +
" </properties>\n" +
- " </buddyLocator>\n" +
+ " </locator>\n" +
" </buddyReplication>";
Element element = XmlConfigHelper.stringToElement(xmlConfig);
BuddyReplicationConfig brConfig = parser.parseBuddyElement(element);
@@ -59,12 +59,12 @@
public void testNormalConfig() throws Exception
{
String xmlConfig =
- " <buddyReplication enabled=\"true\" buddyPoolName=\"groupOne\">\n" +
- " <buddyLocator>\n" +
+ " <buddyReplication enabled=\"true\" poolName=\"groupOne\">\n" +
+ " <locator>\n" +
" <properties>\n" +
" numBuddies = 3\n" +
" </properties>\n" +
- " </buddyLocator>\n" +
+ " </locator>\n" +
" </buddyReplication>";
Element element = XmlConfigHelper.stringToElement(xmlConfig);
BuddyReplicationConfig brConfig = parser.parseBuddyElement(element);
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-09 12:47:56 UTC (rev 6233)
+++ core/trunk/src/test/java/org/jboss/cache/config/parsing/EvictionElementParserTest.java 2008-07-09 17:04:59 UTC (rev 6234)
@@ -99,18 +99,21 @@
" <defaults policyClass=\"org.jboss.cache.eviction.LRUPolicy\" eventQueueSize=\"4\"/>\n" +
" <root>\n" +
" <attribute name=\"maxNodes\">5000</attribute>\n" +
- " <attribute name=\"timeToLiveSeconds\">1000</attribute>\n" +
+ " <attribute name=\"timeToLive\">1000000</attribute>\n" +
" <attribute name=\"maxAge\">15000</attribute>\n" +
" </root>\n" +
" <region name=\"/fifo\">\n" +
" <attribute name=\"maxNodes\">5000</attribute>\n" +
+ " <attribute name=\"timeToLive\">1000000</attribute>\n" +
" </region>\n" +
" <region name=\"/mru\">\n" +
" <attribute name=\"maxNodes\">10000</attribute>\n" +
+ " <attribute name=\"timeToLive\">1000000</attribute>\n" +
" </region>\n" +
" <region name=\"/lfu\">\n" +
" <attribute name=\"maxNodes\">5000</attribute>\n" +
" <attribute name=\"minNodes\">4000</attribute>\n" +
+ " <attribute name=\"timeToLive\">1000000</attribute>\n" +
" </region>\n" +
" </eviction>";
EvictionConfig evConfig = getEvictionConfig(xml);
@@ -190,7 +193,7 @@
" <eviction wakeUpInterval=\"5000\">\n" +
" <root>\n" +
" <attribute name=\"maxNodes\">5000</attribute>\n" +
- " <attribute name=\"timeToLiveSeconds\">1000</attribute>\n" +
+ " <attribute name=\"timeToLive\">1000</attribute>\n" +
" </root>\n" +
" <region name=\"/org/jboss/data\" policyClass=\"org.jboss.cache.eviction.LFUPolicy\">\n" +
" <attribute name=\"maxNodes\">5000</attribute>\n" +
Modified: core/trunk/src/test/java/org/jboss/cache/config/parsing/XmlConfigurationParserTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/config/parsing/XmlConfigurationParserTest.java 2008-07-09 12:47:56 UTC (rev 6233)
+++ core/trunk/src/test/java/org/jboss/cache/config/parsing/XmlConfigurationParserTest.java 2008-07-09 17:04:59 UTC (rev 6234)
@@ -24,7 +24,7 @@
@BeforeMethod
public void setUp()
{
- XmlConfigurationParser parser = new XmlConfigurationParser();
+ XmlConfigurationParser parser = new XmlConfigurationParser(false, null);
config = parser.parseFile("configs/parser-test.xml");
}
Modified: core/trunk/src/test/resources/configs/buddy-replication-cache.xml
===================================================================
--- core/trunk/src/test/resources/configs/buddy-replication-cache.xml 2008-07-09 12:47:56 UTC (rev 6233)
+++ core/trunk/src/test/resources/configs/buddy-replication-cache.xml 2008-07-09 17:04:59 UTC (rev 6234)
@@ -4,7 +4,7 @@
xsi:noNamespaceSchemaLocation="http://www.jboss.org/jbosscache/jbosscache-config-3.0.xsd">
<locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="10000"/>
<transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
- <startup stateRetrievalTimeout="20000"/>
+ <stateRetrieval timeout="20000"/>
<transport clusterName="JBossCache-Cluster">
<jgroupsConfig>
<TCP recv_buf_size="20000000" use_send_queues="false" loopback="false" discard_incompatible_packets="true"
Modified: core/trunk/src/test/resources/configs/clonable-config.xml
===================================================================
--- core/trunk/src/test/resources/configs/clonable-config.xml 2008-07-09 12:47:56 UTC (rev 6233)
+++ core/trunk/src/test/resources/configs/clonable-config.xml 2008-07-09 17:04:59 UTC (rev 6234)
@@ -3,7 +3,7 @@
xsi:noNamespaceSchemaLocation="http://www.jboss.org/jbosscache/jbosscache-config-3.0.xsd">
<locking isolationLevel="SERIALIZABLE" lockAcquisitionTimeout="1" nodeLockingScheme="optimistic"/>
<transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
- <startup fetchInMemoryState="false" stateRetrievalTimeout="3"/>
+ <stateRetrieval fetchInMemoryState="false" timeout="3"/>
<transport clusterName="CloneCluster" multiplexerStack="udp">
<jgroupsConfig>
<UDP mcast_addr="228.10.10.10" mcast_port="45588" tos="8" ucast_recv_buf_size="20000000"
Modified: core/trunk/src/test/resources/configs/local-lru-eviction.xml
===================================================================
--- core/trunk/src/test/resources/configs/local-lru-eviction.xml 2008-07-09 12:47:56 UTC (rev 6233)
+++ core/trunk/src/test/resources/configs/local-lru-eviction.xml 2008-07-09 17:04:59 UTC (rev 6234)
@@ -4,7 +4,7 @@
<locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="15000"/>
<transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
- <startup stateRetrievalTimeout="20000"/>
+ <stateRetrieval timeout="20000"/>
<transport clusterName="JBossCache-Cluster"/>
<eviction wakeUpInterval="5000">
<defaults policyClass="org.jboss.cache.eviction.LRUPolicy" eventQueueSize="200000"/>
Modified: core/trunk/src/test/resources/configs/local-passivation.xml
===================================================================
--- core/trunk/src/test/resources/configs/local-passivation.xml 2008-07-09 12:47:56 UTC (rev 6233)
+++ core/trunk/src/test/resources/configs/local-passivation.xml 2008-07-09 17:04:59 UTC (rev 6234)
@@ -4,7 +4,7 @@
<locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="15000"/>
<transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
- <startup stateRetrievalTimeout="20000"/>
+ <stateRetrieval timeout="20000"/>
<transport clusterName="JBossCache-Cluster"/>
<eviction wakeUpInterval="1000">
<defaults policyClass="org.jboss.cache.eviction.LRUPolicy" eventQueueSize="200000"/>
Modified: core/trunk/src/test/resources/configs/local-tx.xml
===================================================================
--- core/trunk/src/test/resources/configs/local-tx.xml 2008-07-09 12:47:56 UTC (rev 6233)
+++ core/trunk/src/test/resources/configs/local-tx.xml 2008-07-09 17:04:59 UTC (rev 6234)
@@ -5,7 +5,7 @@
<locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="15000"/>
<transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
<serialization useRegionBasedMarshalling="false"/>
- <startup stateRetrievalTimeout="20000"/>
+ <stateRetrieval timeout="20000"/>
<transport clusterName="JBossCache-Cluster"/>
<eviction wakeUpInterval="5000">
<defaults policyClass="org.jboss.cache.eviction.LRUPolicy" eventQueueSize="200000"/>
Modified: core/trunk/src/test/resources/configs/mixedPolicy-eviction.xml
===================================================================
--- core/trunk/src/test/resources/configs/mixedPolicy-eviction.xml 2008-07-09 12:47:56 UTC (rev 6233)
+++ core/trunk/src/test/resources/configs/mixedPolicy-eviction.xml 2008-07-09 17:04:59 UTC (rev 6234)
@@ -4,7 +4,7 @@
<locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="15000"/>
<transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
- <startup stateRetrievalTimeout="20000"/>
+ <stateRetrieval timeout="20000"/>
<transport clusterName="JBossCache-Cluster">
<jgroupsConfig>
<UDP mcast_addr="228.10.10.10" mcast_port="45588" tos="8" ucast_recv_buf_size="20000000"
Modified: core/trunk/src/test/resources/configs/mux.xml
===================================================================
--- core/trunk/src/test/resources/configs/mux.xml 2008-07-09 12:47:56 UTC (rev 6233)
+++ core/trunk/src/test/resources/configs/mux.xml 2008-07-09 17:04:59 UTC (rev 6234)
@@ -4,6 +4,6 @@
<locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="10000"/>
<transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
- <startup stateRetrievalTimeout="20000"/>
+ <stateRetrieval timeout="20000"/>
<transport clusterName="JBossCache-Cluster" multiplexerStack="tcp"/>
</jbosscache>
Modified: core/trunk/src/test/resources/configs/parser-test.xml
===================================================================
--- core/trunk/src/test/resources/configs/parser-test.xml 2008-07-09 12:47:56 UTC (rev 6233)
+++ core/trunk/src/test/resources/configs/parser-test.xml 2008-07-09 17:04:59 UTC (rev 6234)
@@ -29,7 +29,8 @@
</buddy>
</replication>
- <startup fetchInMemoryState="true" stateRetrievalTimeout="15124" inactiveOnStartup="true"/>
+ <stateRetrieval timeout="15124" fetchInMemoryState="true"/>
+ <startup inactiveOnStartup="true"/>
<shutdown hookBehavior="REGISTER"/>
<transport clusterName="JBossCache-Cluster" multiplexerStack="file_name">
Modified: core/trunk/src/test/resources/configs/policyPerRegion-eviction.xml
===================================================================
--- core/trunk/src/test/resources/configs/policyPerRegion-eviction.xml 2008-07-09 12:47:56 UTC (rev 6233)
+++ core/trunk/src/test/resources/configs/policyPerRegion-eviction.xml 2008-07-09 17:04:59 UTC (rev 6234)
@@ -3,7 +3,7 @@
xsi:noNamespaceSchemaLocation="http://www.jboss.org/jbosscache/jbosscache-config-3.0.xsd">
<locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="15000"/>
<transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
- <startup stateRetrievalTimeout="20000"/>
+ <stateRetrieval timeout="20000"/>
<transport clusterName="JBossCache-Cluster">
<jgroupsConfig>
<UDP mcast_addr="228.10.10.10" mcast_port="45588" tos="8" ucast_recv_buf_size="20000000"
Modified: core/trunk/src/test/resources/configs/replSync.xml
===================================================================
--- core/trunk/src/test/resources/configs/replSync.xml 2008-07-09 12:47:56 UTC (rev 6233)
+++ core/trunk/src/test/resources/configs/replSync.xml 2008-07-09 17:04:59 UTC (rev 6234)
@@ -4,7 +4,7 @@
<locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="10000"/>
<transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
<serialization useRegionBasedMarshalling="true"/>
- <startup fetchInMemoryState="true" stateRetrievalTimeout="15000"/>
+ <stateRetrieval fetchInMemoryState="true" timeout="15000"/>
<transport clusterName="JBossCache-Cluster">
<jgroupsConfig>
<UDP mcast_addr="228.10.10.10" mcast_port="45588" tos="8" ucast_recv_buf_size="20000000"
Modified: core/trunk/src/test/resources/configs/string-property-replaced.xml
===================================================================
--- core/trunk/src/test/resources/configs/string-property-replaced.xml 2008-07-09 12:47:56 UTC (rev 6233)
+++ core/trunk/src/test/resources/configs/string-property-replaced.xml 2008-07-09 17:04:59 UTC (rev 6234)
@@ -5,7 +5,8 @@
nodeLockingScheme="${test.property.NodeLockingScheme:OPTIMISTIC}"/>
<transaction syncCommitPhase="${test.property.SyncCommitPhase:true}" syncRollbackPhase="true"/>
<serialization useRegionBasedMarshalling="true"/>
- <startup fetchInMemoryState="false" stateRetrievalTimeout="20000" inactiveOnStartup="true"/>
+ <stateRetrieval fetchInMemoryState="false" timeout="20000"/>
+ <startup inactiveOnStartup="true"/>
<transport clusterName="optimistic-entity" multiplexerStack="udp-sync">
<jgroupsConfig/>
</transport>
Modified: core/trunk/src/test/resources/unit-test-cache-service.xml
===================================================================
--- core/trunk/src/test/resources/unit-test-cache-service.xml 2008-07-09 12:47:56 UTC (rev 6233)
+++ core/trunk/src/test/resources/unit-test-cache-service.xml 2008-07-09 17:04:59 UTC (rev 6234)
@@ -6,7 +6,7 @@
<locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="10000"/>
<transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
<serialization useRegionBasedMarshalling="false"/>
- <startup fetchInMemoryState="true" stateRetrievalTimeout="15000"/>
+ <stateRetrieval fetchInMemoryState="true" timeout="15000"/>
<transport clusterName="JBossCache-Cluster"/>
<replication>
<sync replTimeout="15000"/>
More information about the jbosscache-commits
mailing list