[jbosscache-commits] JBoss Cache SVN: r6235 - in core/trunk/src: main/resources and 2 other directories.

[jbosscache-commits at lists.jboss.org]

Author: mircea.markus
Date: 2008-07-10 06:47:50 -0400 (Thu, 10 Jul 2008)
New Revision: 6235

Modified:
   core/trunk/src/main/java/org/jboss/cache/config/parsing/XmlConfigurationParser.java
   core/trunk/src/main/resources/config-samples/buddy-replication.xml
   core/trunk/src/main/resources/config-samples/multiplexer-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/resources/configs/parser-test.xml
   core/trunk/src/test/resources/configs/string-property-replaced.xml
Log:
inactiveOnStartup -> regionsInactiveOnStartup

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 17:04:59 UTC (rev 6234)
+++ core/trunk/src/main/java/org/jboss/cache/config/parsing/XmlConfigurationParser.java	2008-07-10 10:47:50 UTC (rev 6235)
@@ -306,7 +306,7 @@
    private void configureStartup(Element element)
    {
       if (element == null) return; //we might not have this configured
-      String inactiveOnStartup = getAttributeValue(element, "inactiveOnStartup");
+      String inactiveOnStartup = getAttributeValue(element, "regionsInactiveOnStartup");
       if (existsAttribute(inactiveOnStartup)) config.setInactiveOnStartup(getBoolean(inactiveOnStartup));
    }
 

Modified: core/trunk/src/main/resources/config-samples/buddy-replication.xml
===================================================================
--- core/trunk/src/main/resources/config-samples/buddy-replication.xml	2008-07-09 17:04:59 UTC (rev 6234)
+++ core/trunk/src/main/resources/config-samples/buddy-replication.xml	2008-07-10 10:47:50 UTC (rev 6235)
@@ -5,7 +5,7 @@
    
    <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="10000" nodeLockingScheme="mvcc"/>
    <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
-   <startup stateRetrievalTimeout="20000"/>
+   <stateRetrieval timeout="20000"/>
    <transport clusterName="JBossCache-Cluster">
       <jgroupsConfig>
          <TCP discard_incompatible_packets="true" enable_bundling="true" enable_diagnostics="true"

Modified: core/trunk/src/main/resources/config-samples/multiplexer-enabled.xml
===================================================================
--- core/trunk/src/main/resources/config-samples/multiplexer-enabled.xml	2008-07-09 17:04:59 UTC (rev 6234)
+++ core/trunk/src/main/resources/config-samples/multiplexer-enabled.xml	2008-07-10 10:47:50 UTC (rev 6235)
@@ -3,7 +3,7 @@
             xsi:noNamespaceSchemaLocation="http://www.jboss.org/jbosscache/jbosscache-config-3.0.xsd">
    <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="10000" nodeLockingScheme="mvcc"/>
    <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
-   <startup stateRetrievalTimeout="20000"/>
+   <stateRetrieval timeout="20000"/>
    <transport clusterName="JBossCache-Cluster" multiplexerStack="fc-fast-minimalthreads">
       <jgroupsConfig>
          <TCP recv_buf_size="20000000" use_send_queues="false" loopback="false" discard_incompatible_packets="true"

Modified: core/trunk/src/main/resources/config-samples/optimistically-locked.xml
===================================================================
--- core/trunk/src/main/resources/config-samples/optimistically-locked.xml	2008-07-09 17:04:59 UTC (rev 6234)
+++ core/trunk/src/main/resources/config-samples/optimistically-locked.xml	2008-07-10 10:47:50 UTC (rev 6235)
@@ -3,7 +3,7 @@
             xsi:noNamespaceSchemaLocation="http://www.jboss.org/jbosscache/jbosscache-config-3.0.xsd">
    <locking isolationLevel="READ_COMMITTED" lockAcquisitionTimeout="10000" nodeLockingScheme="optimistic"/>
    <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
-   <startup fetchInMemoryState="false"/>
+   <stateRetrieval fetchInMemoryState="false"/>
    <eviction wakeUpInterval="1000">
       <defaults policyClass="org.jboss.cache.eviction.LRUPolicy"/>
       <root>

Modified: core/trunk/src/main/resources/config2to3.xslt
===================================================================
--- core/trunk/src/main/resources/config2to3.xslt	2008-07-09 17:04:59 UTC (rev 6234)
+++ core/trunk/src/main/resources/config2to3.xslt	2008-07-10 10:47:50 UTC (rev 6235)
@@ -223,7 +223,7 @@
    <xsl:template name="startup">
       <xsl:if test="//attribute[@name='InactiveOnStartup']">
          <xsl:element name="startup">
-            <xsl:attribute name="inactiveOnStartup">
+            <xsl:attribute name="regionsInactiveOnStartup">
                <xsl:value-of select="normalize-space(//attribute[@name='InactiveOnStartup'])"/>
             </xsl:attribute>
          </xsl:element>

Modified: core/trunk/src/main/resources/jbosscache-config-3.0.xsd
===================================================================
--- core/trunk/src/main/resources/jbosscache-config-3.0.xsd	2008-07-09 17:04:59 UTC (rev 6234)
+++ core/trunk/src/main/resources/jbosscache-config-3.0.xsd	2008-07-10 10:47:50 UTC (rev 6235)
@@ -49,7 +49,7 @@
    </xs:complexType>
 
    <xs:complexType name="startupType">
-      <xs:attribute name="inactiveOnStartup" type="booleanType"/>
+      <xs:attribute name="regionsInactiveOnStartup" type="booleanType"/>
    </xs:complexType>
 
    <xs:complexType name="stateRetrievalType">

Modified: core/trunk/src/test/resources/configs/parser-test.xml
===================================================================
--- core/trunk/src/test/resources/configs/parser-test.xml	2008-07-09 17:04:59 UTC (rev 6234)
+++ core/trunk/src/test/resources/configs/parser-test.xml	2008-07-10 10:47:50 UTC (rev 6235)
@@ -30,7 +30,7 @@
    </replication>
 
    <stateRetrieval timeout="15124" fetchInMemoryState="true"/>
-   <startup inactiveOnStartup="true"/>
+   <startup regionsInactiveOnStartup="true"/>
    <shutdown hookBehavior="REGISTER"/>
 
    <transport clusterName="JBossCache-Cluster" multiplexerStack="file_name">

Modified: core/trunk/src/test/resources/configs/string-property-replaced.xml
===================================================================
--- core/trunk/src/test/resources/configs/string-property-replaced.xml	2008-07-09 17:04:59 UTC (rev 6234)
+++ core/trunk/src/test/resources/configs/string-property-replaced.xml	2008-07-10 10:47:50 UTC (rev 6235)
@@ -6,7 +6,7 @@
    <transaction syncCommitPhase="${test.property.SyncCommitPhase:true}" syncRollbackPhase="true"/>
    <serialization useRegionBasedMarshalling="true"/>
    <stateRetrieval fetchInMemoryState="false" timeout="20000"/> 
-   <startup inactiveOnStartup="true"/>
+   <startup regionsInactiveOnStartup="true"/>
    <transport clusterName="optimistic-entity" multiplexerStack="udp-sync">
       <jgroupsConfig/>
    </transport>