[jbosscache-commits] JBoss Cache SVN: r6295 - in core/trunk/src/main: resources/config-samples and 1 other directory.

Author: manik.surtani(a)jboss.com Date: 2008-07-16 08:38:02 -0400 (Wed, 16 Jul 2008) New Revision: 6295 Modified: core/trunk/src/main/java/org/jboss/cache/DefaultCacheFactory.java core/trunk/src/main/resources/config-samples/buddy-replication.xml core/trunk/src/main/resources/config-samples/cacheloader-enabled.xml core/trunk/src/main/resources/config-samples/invalidation-async.xml core/trunk/src/main/resources/config-samples/multiplexer-enabled.xml Log: Wording and typos Modified: core/trunk/src/main/java/org/jboss/cache/DefaultCacheFactory.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/DefaultCacheFactory.java 2008-07-16 12:17:46 UTC (rev 6294) +++ core/trunk/src/main/java/org/jboss/cache/DefaultCacheFactory.java 2008-07-16 12:38:02 UTC (rev 6295) @@ -56,7 +56,7 @@ } catch (OldFileFormatException e) { - log.warn(configFileName + " is an old configuration file; We stronly suggest migrating to the new file format(tools are available for that)"); + log.warn("Detected legacy configuration file format when parsing [" + configFileName + "]. Migrating to the new (3.x) file format is recommended. See FAQs for details."); XmlConfigurationParser2x oldParser = new XmlConfigurationParser2x(); c = oldParser.parseFile(configFileName); } @@ -145,7 +145,7 @@ } catch (OldFileFormatException e) { - log.warn("This is an old configuration file; We stronly suggest migrating to the new file format (tools are available for that)"); + log.warn("Detected legacy configuration file format when parsing configuration file. Migrating to the new (3.x) file format is recommended. See FAQs for details."); XmlConfigurationParser2x oldParser = new XmlConfigurationParser2x(); c = oldParser.parseStream(is); } Modified: core/trunk/src/main/resources/config-samples/buddy-replication.xml =================================================================== --- core/trunk/src/main/resources/config-samples/buddy-replication.xml 2008-07-16 12:17:46 UTC (rev 6294) +++ core/trunk/src/main/resources/config-samples/buddy-replication.xml 2008-07-16 12:38:02 UTC (rev 6295) @@ -19,10 +19,10 @@ <!-- Configure the TransactionManager --> <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/> - <!-- - timeout: The max amount of time (in milliseconds) we wait until the state (ie. the contents of the cache) is - retrieved from existing members in a clustered environment - --> + <!-- + timeout: The max amount of time (in milliseconds) we wait until the state (i.e. the contents of the cache) is + retrieved from existing members in a clustered environment + --> <stateRetrieval timeout="20000"/> <transport clusterName="JBossCache-Cluster"> @@ -63,7 +63,7 @@ <!-- poolName: A way to specify a preferred replication group. If specified, we try and pick a buddy why shares the same pool name (falling back to other buddies if not available). This allows the sysdmin - to hint at backup buddies are picked, so for example, nodes may be hinted topick buddies + to hint at backup buddies are picked, so for example, nodes may be hinted to pick buddies on a different physical rack or power supply for added fault tolerance. communicationTimeout : communication timeout for inter-buddy group organisation messages (such as assigning to and removing from groups Modified: core/trunk/src/main/resources/config-samples/cacheloader-enabled.xml =================================================================== --- core/trunk/src/main/resources/config-samples/cacheloader-enabled.xml 2008-07-16 12:17:46 UTC (rev 6294) +++ core/trunk/src/main/resources/config-samples/cacheloader-enabled.xml 2008-07-16 12:38:02 UTC (rev 6295) @@ -19,7 +19,8 @@ <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/> <!-- Specific eviction policy configurations --> - <eviction wakeUpInterval="5000" defaultPolicyClass="org.jboss.cache.eviction.LRUPolicy" defaultEventQueueSize="200000"> + <eviction wakeUpInterval="5000" defaultPolicyClass="org.jboss.cache.eviction.LRUPolicy" + defaultEventQueueSize="200000"> <!-- Cache wide default --> <default> <attribute name="maxNodes">5000</attribute> @@ -32,10 +33,10 @@ </eviction> <!-- Cache Passivation for Tree Cache - On pasivation, The objects are written to the backend store on eviction if passivation - is true, otheriwse the objects are persisted. On activation, the objects are restored in + On passivation, The objects are written to the backend store on eviction if passivation + is true, otherwise the objects are persisted. On activation, the objects are restored in the memory cache and removed from the cache loader if 'passivation' attribute is true, - otherwise the objects are only loaded from the cache loader --> + otherwise the objects are only loaded from the cache loader --> <loaders passivation="false" shared="false"> <preload> <node fqn="/"/> Modified: core/trunk/src/main/resources/config-samples/invalidation-async.xml =================================================================== --- core/trunk/src/main/resources/config-samples/invalidation-async.xml 2008-07-16 12:17:46 UTC (rev 6294) +++ core/trunk/src/main/resources/config-samples/invalidation-async.xml 2008-07-16 12:38:02 UTC (rev 6295) @@ -19,11 +19,11 @@ <!-- Configure the TransactionManager --> <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/> - <!-- - timeout: The max amount of time (in milliseconds) we wait until the - state (ie. the contents of the cache) are retrieved from - existing members in a clustered environment - --> + <!-- + timeout: The max amount of time (in milliseconds) we wait until the + state (i.e. the contents of the cache) are retrieved from + existing members in a clustered environment + --> <stateRetrieval timeout="20000"/> <transport clusterName="JBossCache-Cluster"> Modified: core/trunk/src/main/resources/config-samples/multiplexer-enabled.xml =================================================================== --- core/trunk/src/main/resources/config-samples/multiplexer-enabled.xml 2008-07-16 12:17:46 UTC (rev 6294) +++ core/trunk/src/main/resources/config-samples/multiplexer-enabled.xml 2008-07-16 12:38:02 UTC (rev 6295) @@ -20,7 +20,7 @@ <!-- timeout: The max amount of time (in milliseconds) we wait until the - state (ie. the contents of the cache) are retrieved from + state (i.e. the contents of the cache) are retrieved from existing members in a clustered environment --> <stateRetrieval timeout="20000"/> @@ -35,8 +35,8 @@ <sync replTimeout="15000"/> <!-- poolName: A way to specify a preferred replication group. If specified, we try and pick a buddy why shares - the same pool name (falling back to other buddies if not available). This allows the sysdmin - to hint at backup buddies are picked, so for example, nodes may be hinted topick buddies + the same pool name (falling back to other buddies if not available). This allows the sysadmin + to hint at backup buddies are picked, so for example, nodes may be hinted to pick buddies on a different physical rack or power supply for added fault tolerance. communicationTimeout : communication timeout for inter-buddy group organisation messages (such as assigning to and removing from groups @@ -62,5 +62,5 @@ </locator> </buddy> </replication> - + </jbosscache>