Author: manik.surtani(a)jboss.com Date: 2008-11-13 13:15:23 -0500 (Thu, 13 Nov 2008) New Revision: 7133 Removed: core/branches/flat/src/main/resources/config2to3.bat core/branches/flat/src/main/resources/config2to3.sh core/branches/flat/src/main/resources/config2to3.xslt core/branches/flat/src/test/resources/configs/conf2x/ core/branches/flat/src/test/resources/configs/repl-with-cl.xml core/branches/flat/src/test/resources/configs/repl-with-cl2.xml core/branches/flat/src/test/resources/jbc2-registry-configs.xml Modified: core/branches/flat/src/main/resources/config-samples/buddy-replication.xml core/branches/flat/src/main/resources/config-samples/cacheloader-enabled.xml core/branches/flat/src/main/resources/config-samples/eviction-enabled.xml core/branches/flat/src/main/resources/config-samples/invalidation-async.xml core/branches/flat/src/main/resources/config-samples/local.xml core/branches/flat/src/main/resources/config-samples/multiplexer-enabled.xml core/branches/flat/src/main/resources/config-samples/total-replication.xml core/branches/flat/src/main/resources/schema/jbosscache-config-3.0.xsd core/branches/flat/src/test/java/org/jboss/starobrno/profiling/MemConsumptionTest.java core/branches/flat/src/test/resources/configs/buddy-replication-cache.xml core/branches/flat/src/test/resources/configs/clonable-config.xml core/branches/flat/src/test/resources/configs/local-lru-eviction.xml core/branches/flat/src/test/resources/configs/local-passivation.xml core/branches/flat/src/test/resources/configs/local-tx.xml core/branches/flat/src/test/resources/configs/mixedPolicy-eviction.xml core/branches/flat/src/test/resources/configs/mux.xml core/branches/flat/src/test/resources/configs/mvcc-repl-sync-br.xml core/branches/flat/src/test/resources/configs/parser-test-async.xml core/branches/flat/src/test/resources/configs/parser-test.xml core/branches/flat/src/test/resources/configs/policyPerRegion-eviction.xml core/branches/flat/src/test/resources/configs/replSync.xml core/branches/flat/src/test/resources/configs/string-property-replaced.xml core/branches/flat/src/test/resources/unit-test-cache-service.xml Log: Brought configs in line with trunk Modified: core/branches/flat/src/main/resources/config-samples/buddy-replication.xml =================================================================== --- core/branches/flat/src/main/resources/config-samples/buddy-replication.xml 2008-11-13 18:08:44 UTC (rev 7132) +++ core/branches/flat/src/main/resources/config-samples/buddy-replication.xml 2008-11-13 18:15:23 UTC (rev 7133) @@ -1,93 +1,77 @@ <?xml version="1.0" encoding="UTF-8"?> -<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns="urn:jboss:jbosscache-core:config:3.0"> +<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:jboss:jbosscache-core:config:3.0"> - <!-- - isolationLevel : SERIALIZABLE - (not supported in mvcc) - REPEATABLE_READ (default) - READ_COMMITTED - READ_UNCOMMITTED (not supported in mvcc) - NONE - lockAcquisitionTimeout: max number of milliseconds to wait for a lock acquisition - nodeLockingScheme : mvcc (default) - optimistic - pessimistic - --> - <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="10000" nodeLockingScheme="mvcc"/> + <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/> - <!-- Configure the TransactionManager --> - <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/> + <clustering mode="replication"> + <!-- + 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"/> - <!-- - 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"> - <!-- JGroups protocol stack properties. --> - <jgroupsConfig> - <TCP discard_incompatible_packets="true" enable_bundling="false" enable_diagnostics="true" - enable_unicast_bundling="false" loopback="false" max_bundle_size="64000" max_bundle_timeout="30" - oob_thread_pool.enabled="true" oob_thread_pool.keep_alive_time="10000" oob_thread_pool.max_threads="8" - oob_thread_pool.min_threads="2" oob_thread_pool.queue_enabled="false" oob_thread_pool.queue_max_size="10" - oob_thread_pool.rejection_policy="Run" recv_buf_size="20000000" thread_naming_pattern="pl" - thread_pool.enabled="true" thread_pool.keep_alive_time="30000" thread_pool.max_threads="4" - thread_pool.min_threads="1" thread_pool.queue_enabled="true" thread_pool.queue_max_size="10000" - thread_pool.rejection_policy="discard" use_concurrent_stack="true" - use_send_queues="false"/> - <MPING mcast_addr="232.1.2.3" num_initial_members="3" timeout="2000"/> - <MERGE2 max_interval="30000" min_interval="10000"/> - <FD_SOCK/> - <FD max_tries="5" shun="true" timeout="10000"/> - <VERIFY_SUSPECT timeout="1500"/> - <pbcast.NAKACK discard_delivered_msgs="true" gc_lag="0" retransmit_timeout="300,600,1200,2400,4800" - use_mcast_xmit="false"/> - <pbcast.STABLE desired_avg_gossip="50000" max_bytes="400000" stability_delay="1000"/> - <pbcast.GMS join_timeout="5000" print_local_addr="true" shun="false" - view_ack_collection_timeout="5000" view_bundling="true"/> - <FC max_credits="1000000" min_threshold="0.20"/> - <FRAG2 frag_size="60000"/> - <pbcast.STREAMING_STATE_TRANSFER/> - <pbcast.FLUSH timeout="0"/> - </jgroupsConfig> - </transport> + <!-- JGroups protocol stack properties. --> + <jgroupsConfig> + <TCP discard_incompatible_packets="true" enable_bundling="false" enable_diagnostics="true" + enable_unicast_bundling="false" loopback="false" max_bundle_size="64000" max_bundle_timeout="30" + oob_thread_pool.enabled="true" oob_thread_pool.keep_alive_time="10000" oob_thread_pool.max_threads="8" + oob_thread_pool.min_threads="2" oob_thread_pool.queue_enabled="false" + oob_thread_pool.queue_max_size="10" + oob_thread_pool.rejection_policy="Run" recv_buf_size="20000000" thread_naming_pattern="pl" + thread_pool.enabled="true" thread_pool.keep_alive_time="30000" thread_pool.max_threads="4" + thread_pool.min_threads="1" thread_pool.queue_enabled="true" thread_pool.queue_max_size="10000" + thread_pool.rejection_policy="discard" use_concurrent_stack="true" + use_send_queues="false"/> + <MPING mcast_addr="232.1.2.3" num_initial_members="3" timeout="2000"/> + <MERGE2 max_interval="30000" min_interval="10000"/> + <FD_SOCK/> + <FD max_tries="5" shun="true" timeout="10000"/> + <VERIFY_SUSPECT timeout="1500"/> + <pbcast.NAKACK discard_delivered_msgs="true" gc_lag="0" retransmit_timeout="300,600,1200,2400,4800" + use_mcast_xmit="false"/> + <pbcast.STABLE desired_avg_gossip="50000" max_bytes="400000" stability_delay="1000"/> + <pbcast.GMS join_timeout="5000" print_local_addr="true" shun="false" + view_ack_collection_timeout="5000" view_bundling="true"/> + <FC max_credits="1000000" min_threshold="0.20"/> + <FRAG2 frag_size="60000"/> + <pbcast.STREAMING_STATE_TRANSFER/> + <pbcast.FLUSH timeout="0"/> + </jgroupsConfig> - <!-- this is a replicated cache--> - <replication> - <!-- Number of milliseconds to wait until all responses for a synchronous call have been received --> - <sync replTimeout="15000"/> + <!-- Number of milliseconds to wait until all responses for a synchronous call have been received --> + <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 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 - --> - <buddy enabled="true" poolName="myBuddyPoolReplicationGroup" communicationTimeout="2000"> + <!-- +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 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 + --> + <buddy enabled="true" poolName="myBuddyPoolReplicationGroup" communicationTimeout="2000"> - <!-- - auto : Should data gravitation be attempted whenever there is a cache miss on finding a node? - If false, data will only be gravitated if an Option is set enabling it - removeOnFind: removes data on remote caches' trees and backup subtrees when gravitated to a - new data owner - searchBackupTrees: search backup subtrees as well for data when gravitating. Results in backup nodes - being able to answer data gravitation requests.--> - <dataGravitation auto="false" removeOnFind="true" searchBackupTrees="true"/> + <!-- +auto : Should data gravitation be attempted whenever there is a cache miss on finding a node? +If false, data will only be gravitated if an Option is set enabling it +removeOnFind: removes data on remote caches' trees and backup subtrees when gravitated to a + new data owner +searchBackupTrees: search backup subtrees as well for data when gravitating. Results in backup nodes + being able to answer data gravitation requests.--> + <dataGravitation auto="false" removeOnFind="true" searchBackupTrees="true"/> - <locator class="org.jboss.cache.buddyreplication.NextMemberBuddyLocator"> - <!-- numBuddies is the number of backup nodes each node maintains. ignoreColocatedBuddies means that - each node will *try* to select a buddy on a different physical host. If not able to do so though, - it will fall back to colocated nodes. --> - <properties> - numBuddies = 1 - ignoreColocatedBuddies = true - </properties> - </locator> - </buddy> - </replication> + <locator class="org.jboss.cache.buddyreplication.NextMemberBuddyLocator"> + <!-- numBuddies is the number of backup nodes each node maintains. ignoreColocatedBuddies means that + each node will *try* to select a buddy on a different physical host. If not able to do so though, + it will fall back to colocated nodes. --> + <properties> + numBuddies = 1 + ignoreColocatedBuddies = true + </properties> + </locator> + </buddy> + </clustering> </jbosscache> Modified: core/branches/flat/src/main/resources/config-samples/cacheloader-enabled.xml =================================================================== --- core/branches/flat/src/main/resources/config-samples/cacheloader-enabled.xml 2008-11-13 18:08:44 UTC (rev 7132) +++ core/branches/flat/src/main/resources/config-samples/cacheloader-enabled.xml 2008-11-13 18:15:23 UTC (rev 7133) @@ -1,64 +1,54 @@ <?xml version="1.0" encoding="UTF-8"?> -<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns="urn:jboss:jbosscache-core:config:3.0"> +<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:jboss:jbosscache-core:config:3.0"> - <!-- - isolationLevel : SERIALIZABLE - (not supported in mvcc) - REPEATABLE_READ (default) - READ_COMMITTED - READ_UNCOMMITTED (not supported in mvcc) - NONE - lockAcquisitionTimeout: max number of milliseconds to wait for a lock acquisition - nodeLockingScheme : mvcc (default) - optimistic - pessimistic - --> - <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="15000" nodeLockingScheme="mvcc"/> + <!-- Configure the TransactionManager --> + <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/> - <!-- Configure the TransactionManager --> - <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/> + <!-- Specific eviction policy configurations --> + <eviction wakeUpInterval="5000"> + <!-- Cache wide default --> + <default algorithmClass="org.jboss.cache.eviction.LRUAlgorithm" eventQueueSize="200000"> + <property name="maxNodes" value="5000"/> + <property name="timeToLive" value="3000"/> + </default> + <region name="/org/jboss/test/data"> + <property name="maxNodes" value="100"/> + <property name="timeToLive" value="3000"/> + </region> + </eviction> - <!-- Specific eviction policy configurations --> - <eviction wakeUpInterval="5000"> - <!-- Cache wide default --> - <default algorithmClass="org.jboss.starobrno.eviction.algorithms.lru.LRUAlgorithm" eventQueueSize="200000"> - <attribute name="maxNodes">5000</attribute> - <attribute name="timeToLive">3000</attribute> - </default> - <region name="/org/jboss/test/data"> - <attribute name="maxNodes">100</attribute> - <attribute name="timeToLive">3000</attribute> - </region> - </eviction> - - <!-- Cache Passivation for Tree Cache - 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 --> - <loaders passivation="false" shared="false"> - <preload> - <node fqn="/"/> - </preload> - <!-- if passivation is true, only the first cache loader is used; the rest are ignored --> - <loader class="org.jboss.cache.loader.JDBCCacheLoader" async="false" fetchPersistentState="true" - ignoreModifications="false" purgeOnStartup="false"> - <properties> - cache.jdbc.table.name=jbosscache - cache.jdbc.table.create=true - cache.jdbc.table.drop=true - cache.jdbc.table.primarykey=jbosscache_pk - cache.jdbc.fqn.column=fqn - cache.jdbc.fqn.type=varchar(255) - cache.jdbc.node.column=node - cache.jdbc.node.type=blob - cache.jdbc.parent.column=parent - cache.jdbc.sql-concat=1 || 2 - cache.jdbc.driver = org.apache.derby.jdbc.EmbeddedDriver - cache.jdbc.url=jdbc:derby:jbossdb;create=true - cache.jdbc.user=user1 - cache.jdbc.password=user1 - </properties> - </loader> - </loaders> + <!-- Cache Passivation for Tree Cache +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 --> + <loaders passivation="false" shared="false"> + <preload> + <node fqn="/"/> + </preload> + <!-- if passivation is true, only the first cache loader is used; the rest are ignored --> + <loader + class="org.jboss.cache.loader.JDBCCacheLoader" + async="false" + fetchPersistentState="true" + ignoreModifications="false" + purgeOnStartup="false"> + <properties> + cache.jdbc.table.name=jbosscache + cache.jdbc.table.create=true + cache.jdbc.table.drop=true + cache.jdbc.table.primarykey=jbosscache_pk + cache.jdbc.fqn.column=fqn + cache.jdbc.fqn.type=varchar(255) + cache.jdbc.node.column=node + cache.jdbc.node.type=blob + cache.jdbc.parent.column=parent + cache.jdbc.sql-concat=1 || 2 + cache.jdbc.driver = org.apache.derby.jdbc.EmbeddedDriver + cache.jdbc.url=jdbc:derby:jbossdb;create=true + cache.jdbc.user=user1 + cache.jdbc.password=user1 + </properties> + </loader> + </loaders> </jbosscache> Modified: core/branches/flat/src/main/resources/config-samples/eviction-enabled.xml =================================================================== --- core/branches/flat/src/main/resources/config-samples/eviction-enabled.xml 2008-11-13 18:08:44 UTC (rev 7132) +++ core/branches/flat/src/main/resources/config-samples/eviction-enabled.xml 2008-11-13 18:15:23 UTC (rev 7133) @@ -1,52 +1,41 @@ <?xml version="1.0" encoding="UTF-8"?> -<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns="urn:jboss:jbosscache-core:config:3.0"> +<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:jboss:jbosscache-core:config:3.0"> - <!-- - isolationLevel : SERIALIZABLE - (not supported in mvcc) - REPEATABLE_READ (default) - READ_COMMITTED - READ_UNCOMMITTED (not supported in mvcc) - NONE - lockAcquisitionTimeout: max number of milliseconds to wait for a lock acquisition - nodeLockingScheme : mvcc (default) - optimistic - pessimistic - --> - <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="15000" nodeLockingScheme="mvcc"/> + <!-- Configure the TransactionManager --> + <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/> - <!-- Configure the TransactionManager --> - <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/> + <!-- + wakeUpInterval: time interval (millis) when the eviction thread kicks in. + --> + <eviction wakeUpInterval="5000"> + <!-- + Cache wide defaults + default algorithmClass: if an algorithm class is not specified for a region, this one is used by default. + default eventQueueSize if an event queue size is not specified for a region, this one is used by default. + --> + <default algorithmClass="org.jboss.cache.eviction.LRUAlgorithm" eventQueueSize="200000"> + <property name="maxNodes" value="5000"/> + <property name="timeToLive" value="1000000"/> + </default> - <!-- - wakeUpInterval: time interval (millis) when the eviction thread kicks in - defaultPolicyClass: if policy class is not specified for a region, this one is considered as default - defaultEventQueueSize if policy event queue size is not specified for a region, this one is considered as default - --> - <eviction wakeUpInterval="5000"> - <!-- Cache wide default --> - <default algorithmClass="org.jboss.starobrno.eviction.algorithms.lru.LRUAlgorithm" eventQueueSize="200000"> - <attribute name="maxNodes">5000</attribute> - <attribute name="timeToLive">1000000</attribute> - </default> - - <!-- configurations for various regions--> - <region name="/org/jboss/data"> - <attribute name="maxNodes">5000</attribute> - <attribute name="timeToLive">1000000</attribute> - </region> - <region name="/org/jboss/test/data"> - <attribute name="maxNodes">5</attribute> - <attribute name="timeToLive">4000</attribute> - </region> - <region name="/test"> - <attribute name="maxNodes">10000</attribute> - <attribute name="timeToLive">4000</attribute> - </region> - <region name="/maxAgeTest"> - <attribute name="maxNodes">10000</attribute> - <attribute name="timeToLive">8000</attribute> - <attribute name="maxAge">10000</attribute> - </region> - </eviction> + <!-- configurations for various regions--> + <region name="/org/jboss/data1"> + <property name="maxNodes" value="5000"/> + <property name="timeToLive" value="1000000"/> + </region> + <region name="/org/jboss/data2" actionPolicyClass="org.jboss.cache.eviction.RemoveOnEvictActionPolicy"> + <property name="maxNodes" value="5"/> + <property name="timeToLive" value="4000"/> + </region> + <region name="/org/jboss/data3" algorithmClass="org.jboss.cache.eviction.FIFOAlgorithm"> + <property name="maxNodes" value="10000"/> + <property name="minTimeToLive" value="4000"/> + </region> + <region name="/org/jboss/data1/otherstuff" eventQueueSize="100000"> + <property name="maxNodes" value="10000"/> + <property name="timeToLive" value="8000"/> + <property name="maxAge" value="10000"/> + </region> + <region name="/org/jboss/data1/inherit"/> + </eviction> </jbosscache> Modified: core/branches/flat/src/main/resources/config-samples/invalidation-async.xml =================================================================== --- core/branches/flat/src/main/resources/config-samples/invalidation-async.xml 2008-11-13 18:08:44 UTC (rev 7132) +++ core/branches/flat/src/main/resources/config-samples/invalidation-async.xml 2008-11-13 18:15:23 UTC (rev 7133) @@ -1,65 +1,52 @@ <?xml version="1.0" encoding="UTF-8"?> -<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns="urn:jboss:jbosscache-core:config:3.0"> +<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:jboss:jbosscache-core:config:3.0"> - <!-- - isolationLevel : SERIALIZABLE - (not supported in mvcc) - REPEATABLE_READ (default) - READ_COMMITTED - READ_UNCOMMITTED (not supported in mvcc) - NONE - lockAcquisitionTimeout: max number of milliseconds to wait for a lock acquisition - nodeLockingScheme : mvcc (default) - optimistic - pessimistic - --> - <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="10000" nodeLockingScheme="mvcc"/> + <!-- Configure the TransactionManager --> + <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/> - <!-- Configure the TransactionManager --> - <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/> + <clustering mode="invalidation"> + <!-- + 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"/> - <!-- - 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"/> + <!-- JGroups protocol stack properties. --> + <jgroupsConfig> + <UDP discard_incompatible_packets="true" enable_bundling="true" enable_diagnostics="false" ip_ttl="2" + loopback="false" max_bundle_size="64000" max_bundle_timeout="30" mcast_addr="228.10.10.10" + mcast_port="45588" mcast_recv_buf_size="100000000" mcast_send_buf_size="640000" + oob_thread_pool.enabled="true" oob_thread_pool.keep_alive_time="10000" oob_thread_pool.max_threads="20" + oob_thread_pool.min_threads="8" oob_thread_pool.queue_enabled="false" + oob_thread_pool.queue_max_size="10" + oob_thread_pool.rejection_policy="Run" thread_naming_pattern="pl" thread_pool.enabled="true" + thread_pool.keep_alive_time="10000" thread_pool.max_threads="15" thread_pool.min_threads="8" + thread_pool.queue_enabled="true" thread_pool.queue_max_size="100000" + thread_pool.rejection_policy="Discard" + tos="8" ucast_recv_buf_size="20000000" ucast_send_buf_size="640000" use_concurrent_stack="true" + use_incoming_packet_handler="true"/> + <PING num_initial_members="3" timeout="2000"/> + <MERGE2 max_interval="30000" min_interval="10000"/> + <FD_SOCK/> + <FD max_tries="5" shun="true" timeout="10000"/> + <VERIFY_SUSPECT timeout="1500"/> + <pbcast.NAKACK discard_delivered_msgs="true" gc_lag="0" retransmit_timeout="300,600,1200,2400,4800" + use_mcast_xmit="true"/> + <UNICAST timeout="300,600,1200,2400,3600"/> + <pbcast.STABLE desired_avg_gossip="50000" max_bytes="400000" stability_delay="1000"/> + <pbcast.GMS join_timeout="5000" print_local_addr="true" shun="false" view_ack_collection_timeout="5000" + view_bundling="true"/> + <FC max_credits="500000" min_threshold="0.2"/> + <FRAG2 frag_size="60000"/> + <pbcast.STREAMING_STATE_TRANSFER/> + <pbcast.FLUSH timeout="0"/> + </jgroupsConfig> - <transport clusterName="JBossCache-Cluster"> - <!-- JGroups protocol stack properties. --> - <jgroupsConfig> - <UDP discard_incompatible_packets="true" enable_bundling="true" enable_diagnostics="false" ip_ttl="2" - loopback="false" max_bundle_size="64000" max_bundle_timeout="30" mcast_addr="228.10.10.10" - mcast_port="45588" mcast_recv_buf_size="100000000" mcast_send_buf_size="640000" - oob_thread_pool.enabled="true" oob_thread_pool.keep_alive_time="10000" oob_thread_pool.max_threads="20" - oob_thread_pool.min_threads="8" oob_thread_pool.queue_enabled="false" oob_thread_pool.queue_max_size="10" - oob_thread_pool.rejection_policy="Run" thread_naming_pattern="pl" thread_pool.enabled="true" - thread_pool.keep_alive_time="10000" thread_pool.max_threads="15" thread_pool.min_threads="8" - thread_pool.queue_enabled="true" thread_pool.queue_max_size="100000" thread_pool.rejection_policy="Discard" - tos="8" ucast_recv_buf_size="20000000" ucast_send_buf_size="640000" use_concurrent_stack="true" - use_incoming_packet_handler="true"/> - <PING num_initial_members="3" timeout="2000"/> - <MERGE2 max_interval="30000" min_interval="10000"/> - <FD_SOCK/> - <FD max_tries="5" shun="true" timeout="10000"/> - <VERIFY_SUSPECT timeout="1500"/> - <pbcast.NAKACK discard_delivered_msgs="true" gc_lag="0" retransmit_timeout="300,600,1200,2400,4800" - use_mcast_xmit="true"/> - <UNICAST timeout="300,600,1200,2400,3600"/> - <pbcast.STABLE desired_avg_gossip="50000" max_bytes="400000" stability_delay="1000"/> - <pbcast.GMS join_timeout="5000" print_local_addr="true" shun="false" view_ack_collection_timeout="5000" - view_bundling="true"/> - <FC max_credits="500000" min_threshold="0.2"/> - <FRAG2 frag_size="60000"/> - <pbcast.STREAMING_STATE_TRANSFER use_reading_thread="true"/> - <pbcast.FLUSH timeout="0"/> - </jgroupsConfig> - </transport> + <async/> + <!-- Alternatively, to use sync replication, comment out the element above and uncomment the element below. --> + <!-- <sync /> --> - <!-- this uses replication rather than invalidation --> - <invalidation> - <!-- invalidation messages are not being sent synchronously --> - <async useReplQueue="false"/> - </invalidation> + </clustering> </jbosscache> Modified: core/branches/flat/src/main/resources/config-samples/local.xml =================================================================== --- core/branches/flat/src/main/resources/config-samples/local.xml 2008-11-13 18:08:44 UTC (rev 7132) +++ core/branches/flat/src/main/resources/config-samples/local.xml 2008-11-13 18:15:23 UTC (rev 7133) @@ -1,24 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns="urn:jboss:jbosscache-core:config:3.0"> +<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:jboss:jbosscache-core:config:3.0"> - <!-- By not specifying neither an 'replication' nor an 'invalidation' element, the cache is defaulted to local --> - - - <!-- - isolcationLevels : SERIALIZABLE - (not supported in mvcc) - REPEATABLE_READ (default) - READ_COMMITTED - READ_UNCOMMITTED (not supported in mvcc) - NONE - lockAcquisitionTimeout: max number of milliseconds to wait for a lock acquisition - nodeLockingScheme : mvcc (default) - optimistic - pessimistic - --> - <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="15000" nodeLockingScheme="mvcc"/> - - <!-- Configure the TransactionManager --> - <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/> + <!-- By not specifying the 'clustering' element, the cache runs in LOCAL mode. --> + <!-- Configure the TransactionManager --> + <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/> </jbosscache> Modified: core/branches/flat/src/main/resources/config-samples/multiplexer-enabled.xml =================================================================== --- core/branches/flat/src/main/resources/config-samples/multiplexer-enabled.xml 2008-11-13 18:08:44 UTC (rev 7132) +++ core/branches/flat/src/main/resources/config-samples/multiplexer-enabled.xml 2008-11-13 18:15:23 UTC (rev 7133) @@ -1,66 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns="urn:jboss:jbosscache-core:config:3.0"> +<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:jboss:jbosscache-core:config:3.0"> - <!-- - isolationLevel : SERIALIZABLE - (not supported in mvcc) - REPEATABLE_READ (default) - READ_COMMITTED - READ_UNCOMMITTED (not supported in mvcc) - NONE - lockAcquisitionTimeout: max number of milliseconds to wait for a lock acquisition - nodeLockingScheme : mvcc (default) - optimistic - pessimistic - --> - <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="10000" nodeLockingScheme="mvcc"/> + <!-- Configure the TransactionManager --> + <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/> - <!-- Configure the TransactionManager --> - <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/> - - <!-- - 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"/> - - <!-- here is where we specify the multiplexer stack --> - <transport clusterName="JBossCache-Cluster" multiplexerStack="fc-fast-minimalthreads"/> - - <!-- this is replicated cache--> - <replication> - <!-- Number of milliseconds to wait until all responses for a - synchronous call have been received --> - <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 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 - --> - <buddy enabled="true" poolName="myBuddyPoolReplicationGroup" communicationTimeout="2000"> - - <!-- auto : Should data gravitation be attempted whenever there is a cache miss on finding a node? - If false, data will only be gravitated if an Option is set enabling it - removeOnFind: removes data on remote caches' trees and backup subtrees when gravitated to a - new data owner - searchBackupTrees: search backup subtrees as well for data when gravitating. Results in backup nodes - being able to answer data gravitation requests.--> - <dataGravitation auto="false" removeOnFind="true" searchBackupTrees="true"/> - - <locator class="org.jboss.cache.buddyreplication.NextMemberBuddyLocator"> - <!-- numBuddies is the number of backup nodes each node maintains. ignoreColocatedBuddies means that - each node will *try* to select a buddy on a different physical host. If not able to do so though, - it will fall back to colocated nodes. --> - <properties> - numBuddies = 1 - ignoreColocatedBuddies = true - </properties> - </locator> - </buddy> - </replication> - + <clustering> + <sync/> + <!-- Here is where we specify the multiplexer stack to use. --> + <jgroupsConfig multiplexerStack="fc-fast-minimalthreads"/> + </clustering> </jbosscache> Modified: core/branches/flat/src/main/resources/config-samples/total-replication.xml =================================================================== --- core/branches/flat/src/main/resources/config-samples/total-replication.xml 2008-11-13 18:08:44 UTC (rev 7132) +++ core/branches/flat/src/main/resources/config-samples/total-replication.xml 2008-11-13 18:15:23 UTC (rev 7133) @@ -1,67 +1,44 @@ <?xml version="1.0" encoding="UTF-8"?> -<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns="urn:jboss:jbosscache-core:config:3.0"> +<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:jboss:jbosscache-core:config:3.0"> - <!-- - isolationLevel : SERIALIZABLE - (not supported in mvcc) - REPEATABLE_READ (default) - READ_COMMITTED - READ_UNCOMMITTED (not supported in mvcc) - NONE - lockAcquisitionTimeout: max number of milliseconds to wait for a lock acquisition - nodeLockingScheme : mvcc (default) - optimistic - pessimistic - --> - <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="10000" nodeLockingScheme="mvcc"/> + <!-- Configure the TransactionManager --> + <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/> - <!-- Configure the TransactionManager --> - <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/> + <clustering mode="replication"> + <!-- JGroups protocol stack properties. --> + <jgroupsConfig> + <UDP discard_incompatible_packets="true" enable_bundling="false" enable_diagnostics="false" ip_ttl="2" + loopback="false" max_bundle_size="64000" max_bundle_timeout="30" mcast_addr="228.10.10.10" + mcast_port="45588" mcast_recv_buf_size="25000000" mcast_send_buf_size="640000" + oob_thread_pool.enabled="true" oob_thread_pool.keep_alive_time="10000" oob_thread_pool.max_threads="4" + oob_thread_pool.min_threads="1" oob_thread_pool.queue_enabled="true" + oob_thread_pool.queue_max_size="10" + oob_thread_pool.rejection_policy="Run" thread_naming_pattern="pl" thread_pool.enabled="true" + thread_pool.keep_alive_time="30000" thread_pool.max_threads="25" thread_pool.min_threads="1" + thread_pool.queue_enabled="true" thread_pool.queue_max_size="10" thread_pool.rejection_policy="Run" + tos="8" ucast_recv_buf_size="20000000" ucast_send_buf_size="640000" use_concurrent_stack="true" + use_incoming_packet_handler="true"/> + <PING num_initial_members="3" timeout="2000"/> + <MERGE2 max_interval="30000" min_interval="10000"/> + <FD_SOCK/> + <FD max_tries="5" shun="true" timeout="10000"/> + <VERIFY_SUSPECT timeout="1500"/> + <pbcast.NAKACK discard_delivered_msgs="true" gc_lag="0" retransmit_timeout="300,600,1200,2400,4800" + use_mcast_xmit="false"/> + <UNICAST timeout="300,600,1200,2400,3600"/> + <pbcast.STABLE desired_avg_gossip="50000" max_bytes="400000" stability_delay="1000"/> + <pbcast.GMS join_timeout="5000" print_local_addr="true" shun="false" view_ack_collection_timeout="5000" + view_bundling="true"/> + <FRAG2 frag_size="60000"/> + <pbcast.STREAMING_STATE_TRANSFER/> + <pbcast.FLUSH timeout="0"/> - <!-- - 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"/> + </jgroupsConfig> - <transport clusterName="JBossCache-Cluster"> - <!-- JGroups protocol stack properties. --> - <jgroupsConfig> - <UDP discard_incompatible_packets="true" enable_bundling="false" enable_diagnostics="false" ip_ttl="2" - loopback="false" max_bundle_size="64000" max_bundle_timeout="30" mcast_addr="228.10.10.10" - mcast_port="45588" mcast_recv_buf_size="25000000" mcast_send_buf_size="640000" - oob_thread_pool.enabled="true" oob_thread_pool.keep_alive_time="10000" oob_thread_pool.max_threads="4" - oob_thread_pool.min_threads="1" oob_thread_pool.queue_enabled="true" oob_thread_pool.queue_max_size="10" - oob_thread_pool.rejection_policy="Run" thread_naming_pattern="pl" thread_pool.enabled="true" - thread_pool.keep_alive_time="30000" thread_pool.max_threads="25" thread_pool.min_threads="1" - thread_pool.queue_enabled="true" thread_pool.queue_max_size="10" thread_pool.rejection_policy="Run" - tos="8" ucast_recv_buf_size="20000000" ucast_send_buf_size="640000" use_concurrent_stack="true" - use_incoming_packet_handler="true"/> - <PING num_initial_members="3" timeout="2000"/> - <MERGE2 max_interval="30000" min_interval="10000"/> - <FD_SOCK/> - <FD max_tries="5" shun="true" timeout="10000"/> - <VERIFY_SUSPECT timeout="1500"/> - <pbcast.NAKACK discard_delivered_msgs="true" gc_lag="0" retransmit_timeout="300,600,1200,2400,4800" - use_mcast_xmit="false"/> - <UNICAST timeout="300,600,1200,2400,3600"/> - <pbcast.STABLE desired_avg_gossip="50000" max_bytes="400000" stability_delay="1000"/> - <pbcast.GMS join_timeout="5000" print_local_addr="true" shun="false" view_ack_collection_timeout="5000" - view_bundling="true"/> - <FRAG2 frag_size="60000"/> - <pbcast.STREAMING_STATE_TRANSFER use_reading_thread="true"/> - <pbcast.FLUSH timeout="0"/> - - </jgroupsConfig> - </transport> + <sync/> + <!-- Alternatively, to use async replication, comment out the element above and uncomment the element below. --> + <!-- <async /> --> - - <!-- this is a replicated cache--> - <replication> - <!-- Number of milliseconds to wait until all responses for a synchronous call have been received --> - <sync replTimeout="15000"/> - - <!--<async useReplQueue="false" replQueueInterval="1500" replQueueMaxElements="30000"/>--> - </replication> + </clustering> </jbosscache> Deleted: core/branches/flat/src/main/resources/config2to3.bat =================================================================== --- core/branches/flat/src/main/resources/config2to3.bat 2008-11-13 18:08:44 UTC (rev 7132) +++ core/branches/flat/src/main/resources/config2to3.bat 2008-11-13 18:15:23 UTC (rev 7133) @@ -1,24 +0,0 @@ -@echo off - -if "%1a" == "a" goto noParams -if "%2a" == "a" goto noParams - -setlocal enabledelayedexpansion - -set LIB= -for %%f in (..\lib\compile\*.jar) do set LIB=!LIB!;%%f -for %%f in (..\lib\test\*.jar) do set LIB=!LIB!;%%f -for %%f in (..\lib\*.jar) do set LIB=!LIB!;%%f -rem echo libs: %LIB% - -set CP=%LIB%;..\jbosscache-core.jar;%CP% -rem echo cp is %CP% - -java -classpath "%CP%" -Dsource=%1 -Ddestination=%2 org.jboss.cache.config.parsing.ConfigFilesConvertor - -goto fileEnd - -:noParams -echo usage: "%0 <file_to_transform> <destination_file>" - -:fileEnd \ No newline at end of file Deleted: core/branches/flat/src/main/resources/config2to3.sh =================================================================== --- core/branches/flat/src/main/resources/config2to3.sh 2008-11-13 18:08:44 UTC (rev 7132) +++ core/branches/flat/src/main/resources/config2to3.sh 2008-11-13 18:15:23 UTC (rev 7133) @@ -1,28 +0,0 @@ -#!/bin/bash -if [ -z $1 ] -then - echo Usage: - echo $0 [source_file] [destination_file] - exit 1; -fi -if [ -e ../lib/compile ] -then - for JAR in ../lib/compile/* - do - CLASSPATH=$CLASSPATH:$JAR - done -fi -if [ -e ../lib/test ] -then - for JAR in ../lib/test/* - do - CLASSPATH=$CLASSPATH:$JAR - done -fi -for JAR in ../lib/* -do - CLASSPATH=$CLASSPATH:$JAR -done -CLASSPATH=../jbosscache-core.jar:$CLASSPATH -echo classpath is $CLASSPATH -java -classpath $CLASSPATH -Dsource=$1 -Ddestination=$2 org.jboss.cache.config.parsing.ConfigFilesConvertor \ No newline at end of file Deleted: core/branches/flat/src/main/resources/config2to3.xslt =================================================================== --- core/branches/flat/src/main/resources/config2to3.xslt 2008-11-13 18:08:44 UTC (rev 7132) +++ core/branches/flat/src/main/resources/config2to3.xslt 2008-11-13 18:15:23 UTC (rev 7133) @@ -1,499 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> - -<xsl:stylesheet xmlns="urn:jboss:jbosscache-core:config:3.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" - version="1.0"> - <xsl:output method="xml" indent="yes"/> - - <xsl:template match="/"> - <xsl:element name="jbosscache"> - <xsl:call-template name="locking"/> - <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> - </xsl:template> - - <xsl:template match="//attribute"/> - - <xsl:template name="locking"> - <xsl:if - test="//attribute[@name='IsolationLevel'] | //attribute[@name='LockAcquisitionTimeout'] | //attribute[@name='LockParentForChildInsertRemove']"> - <xsl:element name="locking"> - <xsl:if test="//attribute[@name='IsolationLevel']"> - <xsl:attribute name="isolationLevel"> - <xsl:value-of select="normalize-space(//attribute[@name='IsolationLevel'])"/> - </xsl:attribute> - </xsl:if> - <xsl:if test="//attribute[@name='LockAcquisitionTimeout']"> - <xsl:attribute name="lockAcquisitionTimeout"> - <xsl:value-of select="normalize-space(//attribute[@name='LockAcquisitionTimeout'])"/> - </xsl:attribute> - </xsl:if> - <xsl:if test="//attribute[@name='LockParentForChildInsertRemove']"> - <xsl:attribute name="lockParentForChildInsertRemove"> - <xsl:value-of select="normalize-space(//attribute[@name='LockParentForChildInsertRemove'])"/> - </xsl:attribute> - </xsl:if> - <xsl:if test="//attribute[@name='NodeLockingScheme']"> - <xsl:attribute name="nodeLockingScheme"> - <xsl:value-of select="normalize-space(//attribute[@name='NodeLockingScheme'])"/> - </xsl:attribute> - </xsl:if> - </xsl:element> - </xsl:if> - </xsl:template> - - <xsl:template name="transaction"> - <xsl:if - test="//attribute[@name='TransactionManagerLookupClass'] | //attribute[@name='SyncRollbackPhase'] | //attribute[@name='SyncCommitPhase']"> - <xsl:element name="transaction"> - <xsl:if test="//attribute[@name='TransactionManagerLookupClass']"> - <xsl:attribute name="transactionManagerLookupClass"> - <xsl:value-of select="normalize-space(//attribute[@name='TransactionManagerLookupClass'])"/> - </xsl:attribute> - </xsl:if> - <xsl:if test="//attribute[@name='SyncCommitPhase']"> - <xsl:attribute name="syncCommitPhase"> - <xsl:value-of select="normalize-space(//attribute[@name='SyncCommitPhase'])"/> - </xsl:attribute> - </xsl:if> - <xsl:if test="//attribute[@name='SyncRollbackPhase']"> - <xsl:attribute name="syncRollbackPhase"> - <xsl:value-of select="normalize-space(//attribute[@name='SyncRollbackPhase'])"/> - </xsl:attribute> - </xsl:if> - </xsl:element> - </xsl:if> - </xsl:template> - - <xsl:template name="serialization"> - <xsl:if - test="//attribute[@name='ObjectInputStreamPoolSize'] | //attribute[@name='ObjectOutputStreamPoolSize'] | //attribute[@name='ReplicationVersion'] | //attribute[@name='MarshallerClass'] | //attribute[@name='UseLazyDeserialization'] | //attribute[@name='UseRegionBasedMarshalling']"> - <serialization> - <xsl:if test="//attribute[@name='ObjectInputStreamPoolSize']"> - <xsl:attribute name="objectInputStreamPoolSize"> - <xsl:value-of select="normalize-space(//attribute[@name='ObjectInputStreamPoolSize'])"/> - </xsl:attribute> - </xsl:if> - <xsl:if test="//attribute[@name='ObjectOutputStreamPoolSize']"> - <xsl:attribute name="objectOutputStreamPoolSize"> - <xsl:value-of select="normalize-space(//attribute[@name='ObjectOutputStreamPoolSize'])"/> - </xsl:attribute> - </xsl:if> - <xsl:if test="//attribute[@name='ReplicationVersion']"> - <xsl:attribute name="version"> - <xsl:value-of select="normalize-space(//attribute[@name='ReplicationVersion'])"/> - </xsl:attribute> - </xsl:if> - <xsl:if test="//attribute[@name='MarshallerClass']"> - <xsl:attribute name="marshallerClass"> - <xsl:value-of select="normalize-space(//attribute[@name='MarshallerClass'])"/> - </xsl:attribute> - </xsl:if> - <xsl:if test="//attribute[@name='UseLazyDeserialization']"> - <xsl:attribute name="useLazyDeserialization"> - <xsl:value-of select="normalize-space(//attribute[@name='UseLazyDeserialization'])"/> - </xsl:attribute> - </xsl:if> - - <xsl:if test="//attribute[@name='UseRegionBasedMarshalling']"> - <xsl:attribute name="useRegionBasedMarshalling"> - <xsl:value-of select="normalize-space(//attribute[@name='UseRegionBasedMarshalling'])"/> - </xsl:attribute> - </xsl:if> - </serialization> - </xsl:if> - </xsl:template> - - <xsl:template match="//attribute[@name='CacheMode']"> - <xsl:if test="(normalize-space(.) = 'INVALIDATION_ASYNC') or (normalize-space(.) = 'INVALIDATION_SYNC')"> - <invalidation> - <xsl:if test="(normalize-space(.) = 'INVALIDATION_ASYNC')"> - <xsl:element name="async"> - <xsl:call-template name="asyncAttributes"/> - </xsl:element> - </xsl:if> - <xsl:if test="(normalize-space(.) = 'INVALIDATION_SYNC')"> - <xsl:element name="sync"> - <xsl:call-template name="syncAttributes"/> - </xsl:element> - </xsl:if> - </invalidation> - </xsl:if> - <xsl:if test="(normalize-space(.) = 'REPL_ASYNC') or (normalize-space(.) = 'REPL_SYNC')"> - <replication> - <xsl:if test="(normalize-space(.) = 'REPL_ASYNC')"> - <xsl:element name="async"> - <xsl:call-template name="asyncAttributes"/> - </xsl:element> - </xsl:if> - <xsl:if test="(normalize-space(.) = 'REPL_SYNC')"> - <xsl:element name="sync"> - <xsl:call-template name="syncAttributes"/> - </xsl:element> - </xsl:if> - <xsl:call-template name="buddy"/> - </replication> - </xsl:if> - </xsl:template> - - <xsl:template name="buddy"> - <xsl:if test="//attribute[@name='BuddyReplicationConfig']"> - <buddy> - <xsl:if test="//buddyReplicationEnabled"> - <xsl:attribute name="enabled"> - <xsl:value-of select="//buddyReplicationEnabled"/> - </xsl:attribute> - </xsl:if> - <xsl:if test="//buddyPoolName"> - <xsl:attribute name="poolName"> - <xsl:value-of select="//buddyPoolName"/> - </xsl:attribute> - </xsl:if> - <xsl:if test="//buddyCommunicationTimeout"> - <xsl:attribute name="communicationTimeout"> - <xsl:value-of select="//buddyCommunicationTimeout"/> - </xsl:attribute> - </xsl:if> - <xsl:if test="//autoDataGravitation | //dataGravitationRemoveOnFind | //dataGravitationSearchBackupTrees"> - <dataGravitation> - <xsl:if test="//autoDataGravitation"> - <xsl:attribute name="auto"> - <xsl:value-of select="//autoDataGravitation"/> - </xsl:attribute> - </xsl:if> - <xsl:if test="//dataGravitationRemoveOnFind"> - <xsl:attribute name="removeOnFind"> - <xsl:value-of select="//dataGravitationRemoveOnFind"/> - </xsl:attribute> - </xsl:if> - <xsl:if test="//dataGravitationSearchBackupTrees"> - <xsl:attribute name="searchBackupTrees"> - <xsl:value-of select="//dataGravitationSearchBackupTrees"/> - </xsl:attribute> - </xsl:if> - </dataGravitation> - </xsl:if> - <xsl:if test="//buddyLocatorProperties"> - <locator> - <xsl:if test="//buddyLocatorClass"> - <xsl:attribute name="class"> - <xsl:value-of select="//buddyLocatorClass"/> - </xsl:attribute> - </xsl:if> - <xsl:if test="//buddyLocatorProperties"> - <properties> - <xsl:value-of select="//buddyLocatorProperties"/> - </properties> - </xsl:if> - </locator> - </xsl:if> - </buddy> - </xsl:if> - </xsl:template> - - <xsl:template name="asyncAttributes"> - <xsl:if test="//attribute[@name='UseReplQueue']"> - <xsl:attribute name="useReplQueue"> - <xsl:value-of select="//attribute[@name='UseReplQueue']"/> - </xsl:attribute> - </xsl:if> - <xsl:if test="//attribute[@name='ReplQueueInterval']"> - <xsl:attribute name="replQueueInterval"> - <xsl:value-of select="//attribute[@name='ReplQueueInterval']"/> - </xsl:attribute> - </xsl:if> - <xsl:if test="//attribute[@name='ReplQueueMaxElements']"> - <xsl:attribute name="replQueueMaxElements"> - <xsl:value-of select="//attribute[@name='ReplQueueMaxElements']"/> - </xsl:attribute> - </xsl:if> - </xsl:template> - - <xsl:template name="syncAttributes"> - <xsl:if test="//attribute[@name='SyncReplTimeout']"> - <xsl:attribute name="replTimeout"> - <xsl:value-of select="//attribute[@name='SyncReplTimeout']"/> - </xsl:attribute> - </xsl:if> - </xsl:template> - - <xsl:template name="startup"> - <xsl:if test="//attribute[@name='InactiveOnStartup']"> - <xsl:element name="startup"> - <xsl:attribute name="regionsInactiveOnStartup"> - <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']"> - <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="timeout"> - <xsl:value-of select="normalize-space(//attribute[@name='StateRetrievalTimeout'])"/> - </xsl:attribute> - </xsl:if> - </xsl:element> - </xsl:if> - </xsl:template> - - <xsl:template match="//attribute[@name='ShutdownHookBehavior']"> - <shutdown> - <xsl:attribute name="hookBehavior"> - <xsl:value-of select="normalize-space(.)"/> - </xsl:attribute> - </shutdown> - </xsl:template> - - <xsl:template match="//attribute[@name='ExposeManagementStatistics']"> - <jmxStatistics> - <xsl:attribute name="enabled"> - <xsl:value-of select="normalize-space(.)"/> - </xsl:attribute> - </jmxStatistics> - </xsl:template> - - <xsl:template match="//attribute[@name='EvictionPolicyConfig']"> - <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:attribute> - </xsl:if> - <xsl:if test="./config/region[@name='/_default_']"> - <default> - <xsl:choose> - <xsl:when test="./config/region[@name='/_default_' and @policyClass]"> - <xsl:if test="./config/region[@name='/_default_' and not(starts-with((a)policyClass,&#39;org.jboss.cache.eviction&#39;))]&quot;&gt; - <xsl:message terminate="yes">A custom eviction policy is used for '/_default_' region. Starting with JBossCache 3.x the eviction API changed, so this config file will require manual transformation.</xsl:message> - </xsl:if> - <xsl:attribute name="algorithmClass"> - <xsl:value-of - select="concat(substring-before(./config/region[@name='/_default_']/@policyClass,'Policy'), 'Algorithm')"/> - </xsl:attribute> - </xsl:when> - <xsl:otherwise> - <xsl:if - test="./config/attribute[@name='policyClass' and starts-with(string(.), 'org.jboss.cache.eviction')]"> - <xsl:attribute name="algorithmClass"> - <xsl:value-of - select="concat(substring-before(./config/attribute[@name='policyClass'],'Policy'), 'Algorithm')"/> - </xsl:attribute> - </xsl:if> - </xsl:otherwise> - </xsl:choose> - <xsl:if - test="./config/attribute[@name='policyClass' and not(starts-with(string(.), 'org.jboss.cache.eviction'))]"> - <xsl:message terminate="yes">Custom eviction policies require manual transformation.</xsl:message> - </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> - <xsl:for-each select="./config/region[@name='/_default_']/attribute"> - <xsl:call-template name="attributesSecondsSubstitution"> - <xsl:with-param name="attr" select="."/> - </xsl:call-template> - </xsl:for-each> - </default> - </xsl:if> - <xsl:for-each select="./config/region[@name!='/_default_']"> - <region> - <xsl:if test="@name"> - <xsl:attribute name="name"> - <xsl:value-of select="@name"/> - </xsl:attribute> - </xsl:if> - <xsl:if test="@policyClass and starts-with(string(@policyClass), 'org.jboss.cache.eviction')"> - <xsl:attribute name="algorithmClass"> - <xsl:value-of select="concat(substring-before(@policyClass,'Policy'), 'Algorithm')"/> - </xsl:attribute> - </xsl:if> - <xsl:if test="@policyClass and not(starts-with(string(@policyClass), 'org.jboss.cache.eviction'))"> - <xsl:message terminate="yes">Custom eviction policies require manual transformation.</xsl:message> - </xsl:if> - <xsl:if test="not(@policyClass)"> - <xsl:attribute name="algorithmClass"> - <xsl:value-of - select="concat(substring-before(../attribute[@name='policyClass'],'Policy'), 'Algorithm')"/> - </xsl:attribute> - </xsl:if> - <xsl:if test="@eventQueueSize"> - <xsl:attribute name="eventQueueSize"> - <xsl:value-of select="normalize-space(@eventQueueSize)"/> - </xsl:attribute> - </xsl:if> - <xsl:if test="not(@eventQueueSize)"> - <xsl:attribute name="eventQueueSize"> - <xsl:value-of select="normalize-space(../attribute[@name='eventQueueSize'])"/> - </xsl:attribute> - </xsl:if> - <xsl:for-each select="./*"> - <xsl:call-template name="attributesSecondsSubstitution"> - <xsl:with-param name="attr" select="."/> - </xsl:call-template> - </xsl:for-each> - </region> - </xsl:for-each> - </eviction> - </xsl:template> - - <xsl:template name="attributesSecondsSubstitution"> - <xsl:param name="attr"/> - <attribute> - <xsl:choose> - <xsl:when test="contains($attr/@name,'Seconds')"> - <xsl:attribute name="name"> - <xsl:value-of select="substring-before($attr/@name,'Seconds')"/> - </xsl:attribute> - <xsl:value-of select="concat($attr,'000')"/> - </xsl:when> - <xsl:otherwise> - <xsl:attribute name="name"> - <xsl:value-of select="string($attr/@name)"/> - </xsl:attribute> - <xsl:value-of select="$attr"/> - </xsl:otherwise> - </xsl:choose> - </attribute> - </xsl:template> - - <xsl:template match="//attribute[@name='CacheLoaderConfig'] | //attribute[@name='CacheLoaderConfiguration']"> - <loaders> - <xsl:if test="./config/passivation"> - <xsl:attribute name="passivation"> - <xsl:value-of select="./config/passivation"/> - </xsl:attribute> - </xsl:if> - <xsl:if test="./config/shared"> - <xsl:attribute name="shared"> - <xsl:value-of select="./config/shared"/> - </xsl:attribute> - </xsl:if> - <xsl:if test="./config/preload"> - <preload> - <xsl:call-template name="preloadTokenizer"> - <xsl:with-param name="string" select="./config/preload"/> - <xsl:with-param name="delimiter" select="','"/> - </xsl:call-template> - </preload> - </xsl:if> - <xsl:for-each select="./config/cacheloader"> - <loader> - <xsl:if test="./class"> - <xsl:attribute name="class"> - <xsl:value-of select="./class"/> - </xsl:attribute> - </xsl:if> - <xsl:if test="./async"> - <xsl:attribute name="async"> - <xsl:value-of select="./async"/> - </xsl:attribute> - </xsl:if> - <xsl:if test="./fetchPersistentState"> - <xsl:attribute name="fetchPersistentState"> - <xsl:value-of select="./fetchPersistentState"/> - </xsl:attribute> - </xsl:if> - <xsl:if test="./ignoreModifications"> - <xsl:attribute name="ignoreModifications"> - <xsl:value-of select="./ignoreModifications"/> - </xsl:attribute> - </xsl:if> - <xsl:if test="./purgeOnStartup"> - <xsl:attribute name="purgeOnStartup"> - <xsl:value-of select="./purgeOnStartup"/> - </xsl:attribute> - </xsl:if> - <xsl:if test="./properties"> - <xsl:copy-of select="./properties"/> - </xsl:if> - <xsl:if test="./singletonStore"> - <singletonStore> - <xsl:if test="./singletonStore/enabled"> - <xsl:attribute name="enabled"> - <xsl:value-of select="./singletonStore/enabled"/> - </xsl:attribute> - </xsl:if> - <xsl:if test="./singletonStore/enabled"> - <xsl:attribute name="enabled"> - <xsl:value-of select="./singletonStore/enabled"/> - </xsl:attribute> - </xsl:if> - <xsl:if test="./singletonStore/class"> - <xsl:attribute name="class"> - <xsl:value-of select="./singletonStore/class"/> - </xsl:attribute> - </xsl:if> - <xsl:copy-of select="./singletonStore/properties"/> - </singletonStore> - </xsl:if> - </loader> - </xsl:for-each> - </loaders> - </xsl:template> - - - <xsl:template name="preloadTokenizer"> - <xsl:param name="string"/> - <xsl:param name="delimiter" select="' '"/> - <xsl:choose> - <xsl:when test="$delimiter and contains($string, $delimiter)"> - <node> - <xsl:attribute name="fqn"> - <xsl:value-of select="substring-before($string,$delimiter)"/> - </xsl:attribute> - </node> - <xsl:call-template name="preloadTokenizer"> - <xsl:with-param name="string" select="substring-after($string,$delimiter)"/> - <xsl:with-param name="delimiter" select="$delimiter"/> - </xsl:call-template> - </xsl:when> - <xsl:otherwise> - <node> - <xsl:attribute name="fqn"> - <xsl:value-of select="$string"/> - </xsl:attribute> - </node> - </xsl:otherwise> - </xsl:choose> - </xsl:template> - - <xsl:template name="transport"> - <xsl:if - test="//attribute[@name='ClusterName'] | //attribute[@name='MultiplexerStack'] | //attribute[@name='ClusterConfig']"> - <transport> - <xsl:if test="//attribute[@name='ClusterName']"> - <xsl:attribute name="clusterName"> - <xsl:value-of select="normalize-space(//attribute[@name='ClusterName'])"/> - </xsl:attribute> - </xsl:if> - <xsl:if test="//attribute[@name='MultiplexerStack']"> - <xsl:attribute name="multiplexerStack"> - <xsl:value-of select="normalize-space(//attribute[@name='MultiplexerStack'])"/> - </xsl:attribute> - </xsl:if> - <xsl:if test="//attribute[@name='ClusterConfig']"> - <jgroupsConfig> - <xsl:copy-of select="//attribute[@name='ClusterConfig']/config/*"/> - </jgroupsConfig> - </xsl:if> - </transport> - </xsl:if> - </xsl:template> - -</xsl:stylesheet> Modified: core/branches/flat/src/main/resources/schema/jbosscache-config-3.0.xsd =================================================================== --- core/branches/flat/src/main/resources/schema/jbosscache-config-3.0.xsd 2008-11-13 18:08:44 UTC (rev 7132) +++ core/branches/flat/src/main/resources/schema/jbosscache-config-3.0.xsd 2008-11-13 18:15:23 UTC (rev 7133) @@ -3,255 +3,259 @@ xmlns:tns="urn:jboss:jbosscache-core:config:3.0" targetNamespace="urn:jboss:jbosscache-core:config:3.0" xmlns:xs="http://www.w3.org/2001/XMLSchema" version="1.0"> - <xs:element name="jbosscache" type="tns:cacheConfigurationType"/> + <xs:element name="jbosscache" type="tns:cacheConfigurationType"/> - <xs:complexType name="cacheConfigurationType"> - <xs:all> - <xs:element name="locking" type="tns:lockingType" minOccurs="0" maxOccurs="1"/> - <xs:element name="transaction" type="tns:transactionType" minOccurs="0" maxOccurs="1"/> - <xs:element name="startup" type="tns:startupType" minOccurs="0" maxOccurs="1"/> - <xs:element name="stateRetrieval" type="tns:stateRetrievalType" minOccurs="0" maxOccurs="1"/> - <xs:element name="shutdown" type="tns:shutdownType" minOccurs="0" maxOccurs="1"/> - <xs:element name="serialization" type="tns:serializationType" minOccurs="0" maxOccurs="1"/> - <xs:element name="replication" type="tns:replicationType" minOccurs="0" maxOccurs="1"/> - <xs:element name="invalidation" type="tns:invalidationType" minOccurs="0" maxOccurs="1"/> - <xs:element name="jmxStatistics" type="tns:jmxStatisticsType" minOccurs="0" maxOccurs="1"/> - <xs:element name="listeners" type="tns:listenersType" minOccurs="0" maxOccurs="1"/> - <xs:element name="invocationBatching" type="tns:invocationBatchingType" minOccurs="0" maxOccurs="1"/> - <xs:element name="transport" type="tns:transportType" minOccurs="0" maxOccurs="1"/> - <xs:element name="eviction" type="tns:evictionType" minOccurs="0" maxOccurs="1"/> - <xs:element name="loaders" type="tns:loadersType" minOccurs="0" maxOccurs="1"/> - <xs:element name="customInterceptors" type="tns:customInterceptorsType" minOccurs="0" maxOccurs="1"/> - </xs:all> - </xs:complexType> + <xs:complexType name="cacheConfigurationType"> + <xs:all> + <xs:element name="locking" type="tns:lockingType" minOccurs="0" maxOccurs="1"/> + <xs:element name="transaction" type="tns:transactionType" minOccurs="0" maxOccurs="1"/> + <xs:element name="startup" type="tns:startupType" minOccurs="0" maxOccurs="1"/> + <xs:element name="shutdown" type="tns:shutdownType" minOccurs="0" maxOccurs="1"/> + <xs:element name="serialization" type="tns:serializationType" minOccurs="0" maxOccurs="1"/> + <xs:element name="jmxStatistics" type="tns:jmxStatisticsType" minOccurs="0" maxOccurs="1"/> + <xs:element name="listeners" type="tns:listenersType" minOccurs="0" maxOccurs="1"/> + <xs:element name="invocationBatching" type="tns:invocationBatchingType" minOccurs="0" maxOccurs="1"/> + <xs:element name="eviction" type="tns:evictionType" minOccurs="0" maxOccurs="1"/> + <xs:element name="loaders" type="tns:loadersType" minOccurs="0" maxOccurs="1"/> + <xs:element name="customInterceptors" type="tns:customInterceptorsType" minOccurs="0" maxOccurs="1"/> + <xs:element name="clustering" type="tns:clusteringType" minOccurs="0" maxOccurs="1"/> + </xs:all> + </xs:complexType> - <xs:complexType name="lockingType"> - <xs:attribute name="isolationLevel"> - <xs:simpleType> - <xs:restriction base="xs:string"> - <xs:pattern - value="[Ss][Ee][Rr][Ii][Aa][Ll][Ii][Zz][Aa][Bb][Ll][Ee]|[Rr][Ee][Pp][Ee][Aa][Tt][Aa][Bb][Ll][Ee]_[Rr][Ee][Aa][Dd]|[Rr][Ee][Aa][Dd]_[Cc][Oo][Mm][Mm][Ii][Tt][Tt][Ee][Dd]|[Nn][Oo][Nn][Ee]|\$\{.*\}"/> - </xs:restriction> - </xs:simpleType> - </xs:attribute> - <xs:attribute name="lockParentForChildInsertRemove" type="tns:booleanType"/> - <xs:attribute name="lockAcquisitionTimeout" type="tns:positiveInteger"/> - <xs:attribute name="nodeLockingScheme"> - <xs:simpleType> - <xs:restriction base="xs:string"> - <xs:pattern - value="[Mm][Vv][Cc][Cc]|[Oo][Pp][Tt][Ii][Mm][Ii][Ss][Tt][Ii][Cc]|[Pp][Ee][Ss][Ss][Ii][Mm][Ii][Ss][Tt][Ii][Cc]|\$\{.*\}"/> - </xs:restriction> - </xs:simpleType> - </xs:attribute> - <xs:attribute name="writeSkewCheck" type="tns:booleanType"/> - <xs:attribute name="concurrencyLevel" type="xs:integer"/> - </xs:complexType> + <xs:complexType name="clusteringType"> + <xs:all> + <xs:element name="sync" type="tns:syncType" minOccurs="0" maxOccurs="1"/> + <xs:element name="async" type="tns:asyncType" minOccurs="0" maxOccurs="1"/> + <xs:element name="stateRetrieval" type="tns:stateRetrievalType" minOccurs="0" maxOccurs="1"/> + <xs:element name="buddy" minOccurs="0" maxOccurs="1"> + <xs:complexType> + <xs:all minOccurs="0"> + <xs:element name="dataGravitation" maxOccurs="1"> + <xs:complexType> + <xs:attribute name="auto" type="tns:booleanType"/> + <xs:attribute name="removeOnFind" type="tns:booleanType"/> + <xs:attribute name="searchBackupTrees" type="tns:booleanType"/> + </xs:complexType> + </xs:element> + <xs:element name="locator" maxOccurs="1"> + <xs:complexType> + <xs:all> + <xs:element name="properties" type="xs:string" maxOccurs="1"/> + </xs:all> + <xs:attribute name="class" type="xs:string"/> + </xs:complexType> + </xs:element> + </xs:all> + <xs:attribute name="enabled" type="tns:booleanType"/> + <xs:attribute name="poolName" type="xs:string"/> + <xs:attribute name="communicationTimeout" type="xs:integer"/> + </xs:complexType> + </xs:element> + <xs:element name="jgroupsConfig" type="tns:jgroupsConfigType" minOccurs="0" maxOccurs="1"/> + </xs:all> + <xs:attribute name="mode"> + <xs:simpleType> + <xs:restriction base="xs:string"> + <xs:pattern + value="[Rr][Ee][Pp][Ll][Ii][Cc][Aa][Tt][Ii][Oo][Nn]|[Ii][Nn][Vv][Aa][Ll][Ii][Dd][Aa][Tt][Ii][Oo][Nn]|[Rr]|[Ii]|\$\{.*\}"/> + </xs:restriction> + </xs:simpleType> + </xs:attribute> + <xs:attribute name="clusterName" type="xs:string"/> - <xs:complexType name="transactionType"> - <xs:attribute name="transactionManagerLookupClass" type="xs:string"/> - <xs:attribute name="syncRollbackPhase" type="tns:booleanType"/> - <xs:attribute name="syncCommitPhase" type="tns:booleanType"/> - </xs:complexType> - <xs:complexType name="startupType"> - <xs:attribute name="regionsInactiveOnStartup" type="tns:booleanType"/> - </xs:complexType> + </xs:complexType> - <xs:complexType name="stateRetrievalType"> - <xs:attribute name="fetchInMemoryState" type="tns:booleanType"/> - <xs:attribute name="timeout" type="tns:positiveInteger"/> - </xs:complexType> + <xs:complexType name="lockingType"> + <xs:attribute name="isolationLevel"> + <xs:simpleType> + <xs:restriction base="xs:string"> + <xs:pattern + value="[Ss][Ee][Rr][Ii][Aa][Ll][Ii][Zz][Aa][Bb][Ll][Ee]|[Rr][Ee][Pp][Ee][Aa][Tt][Aa][Bb][Ll][Ee]_[Rr][Ee][Aa][Dd]|[Rr][Ee][Aa][Dd]_[Cc][Oo][Mm][Mm][Ii][Tt][Tt][Ee][Dd]|[Nn][Oo][Nn][Ee]|\$\{.*\}"/> + </xs:restriction> + </xs:simpleType> + </xs:attribute> + <xs:attribute name="lockParentForChildInsertRemove" type="tns:booleanType"/> + <xs:attribute name="lockAcquisitionTimeout" type="tns:positiveInteger"/> + <xs:attribute name="nodeLockingScheme"> + <xs:simpleType> + <xs:restriction base="xs:string"> + <xs:pattern + value="[Mm][Vv][Cc][Cc]|[Oo][Pp][Tt][Ii][Mm][Ii][Ss][Tt][Ii][Cc]|[Pp][Ee][Ss][Ss][Ii][Mm][Ii][Ss][Tt][Ii][Cc]|\$\{.*\}"/> + </xs:restriction> + </xs:simpleType> + </xs:attribute> + <xs:attribute name="writeSkewCheck" type="tns:booleanType"/> + <xs:attribute name="concurrencyLevel" type="xs:integer"/> + </xs:complexType> - <xs:complexType name="shutdownType"> - <xs:attribute name="hookBehavior"> - <xs:simpleType> - <xs:restriction base="xs:string"> - <xs:pattern - value="[Dd][Ee][Ff][Aa][Uu][Ll][Tt]|[Rr][Ee][Gg][Ii][Ss][Tt][Ee][Rr]|[Dd][Oo][Nn][Tt]_[Rr][Ee][Gg][Ii][Ss][Tt][Ee][Rr]|\$\{.*\}"/> - </xs:restriction> - </xs:simpleType> - </xs:attribute> - </xs:complexType> + <xs:complexType name="transactionType"> + <xs:attribute name="transactionManagerLookupClass" type="xs:string"/> + <xs:attribute name="syncRollbackPhase" type="tns:booleanType"/> + <xs:attribute name="syncCommitPhase" type="tns:booleanType"/> + </xs:complexType> - <xs:complexType name="serializationType"> - <xs:attribute name="objectInputStreamPoolSize" type="tns:positiveInteger"/> - <xs:attribute name="objectOutputStreamPoolSize" type="tns:positiveInteger"/> - <xs:attribute name="version" type="xs:string"/> - <xs:attribute name="marshallerClass" type="xs:string"/> - <xs:attribute name="useLazyDeserialization" type="tns:booleanType"/> - <xs:attribute name="useRegionBasedMarshalling" type="tns:booleanType"/> - </xs:complexType> + <xs:complexType name="startupType"> + <xs:attribute name="regionsInactiveOnStartup" type="tns:booleanType"/> + </xs:complexType> - <xs:simpleType name="booleanType"> - <xs:restriction base="xs:string"> - <xs:pattern value="\$\{.*\}|[Tt][Rr][Uu][Ee]|[Ff][Aa][Ll][Ss][Ee]"/> - </xs:restriction> - </xs:simpleType> + <xs:complexType name="stateRetrievalType"> + <xs:attribute name="fetchInMemoryState" type="tns:booleanType"/> + <xs:attribute name="timeout" type="tns:positiveInteger"/> + </xs:complexType> - <xs:simpleType name="positiveInteger"> - <xs:restriction base="xs:string"> - <xs:pattern value="\$\{.*\}|\+?[0-9]*"/> - </xs:restriction> - </xs:simpleType> + <xs:complexType name="shutdownType"> + <xs:attribute name="hookBehavior"> + <xs:simpleType> + <xs:restriction base="xs:string"> + <xs:pattern + value="[Dd][Ee][Ff][Aa][Uu][Ll][Tt]|[Rr][Ee][Gg][Ii][Ss][Tt][Ee][Rr]|[Dd][Oo][Nn][Tt]_[Rr][Ee][Gg][Ii][Ss][Tt][Ee][Rr]|\$\{.*\}"/> + </xs:restriction> + </xs:simpleType> + </xs:attribute> + </xs:complexType> - <xs:complexType name="replicationType"> - <xs:sequence> - <xs:choice> - <xs:element name="sync" type="tns:syncType" minOccurs="0" maxOccurs="1"/> - <xs:element name="async" type="tns:asyncType" minOccurs="0" maxOccurs="1"/> - </xs:choice> - <xs:element name="buddy" minOccurs="0" maxOccurs="1"> - <xs:complexType> - <xs:all minOccurs="0"> - <xs:element name="dataGravitation" maxOccurs="1"> - <xs:complexType> - <xs:attribute name="auto" type="tns:booleanType"/> - <xs:attribute name="removeOnFind" type="tns:booleanType"/> - <xs:attribute name="searchBackupTrees" type="tns:booleanType"/> - </xs:complexType> - </xs:element> - <xs:element name="locator" maxOccurs="1"> - <xs:complexType> - <xs:all> - <xs:element name="properties" type="xs:string" maxOccurs="1"/> - </xs:all> - <xs:attribute name="class" type="xs:string"/> - </xs:complexType> - </xs:element> - </xs:all> - <xs:attribute name="enabled" type="tns:booleanType"/> - <xs:attribute name="poolName" type="xs:string"/> - <xs:attribute name="communicationTimeout" type="xs:integer"/> - </xs:complexType> - </xs:element> - </xs:sequence> - </xs:complexType> + <xs:complexType name="serializationType"> + <xs:attribute name="objectInputStreamPoolSize" type="tns:positiveInteger"/> + <xs:attribute name="objectOutputStreamPoolSize" type="tns:positiveInteger"/> + <xs:attribute name="version" type="xs:string"/> + <xs:attribute name="marshallerClass" type="xs:string"/> + <xs:attribute name="useLazyDeserialization" type="tns:booleanType"/> + <xs:attribute name="useRegionBasedMarshalling" type="tns:booleanType"/> + </xs:complexType> - <xs:complexType name="invalidationType"> - <xs:choice> - <xs:element name="sync" type="tns:syncType"/> - <xs:element name="async" type="tns:asyncType"/> - </xs:choice> - </xs:complexType> + <xs:simpleType name="booleanType"> + <xs:restriction base="xs:string"> + <xs:pattern value="\$\{.*\}|[Tt][Rr][Uu][Ee]|[Ff][Aa][Ll][Ss][Ee]"/> + </xs:restriction> + </xs:simpleType> - <xs:complexType name="jmxStatisticsType"> - <xs:attribute name="enabled" type="tns:booleanType"/> - </xs:complexType> + <xs:simpleType name="positiveInteger"> + <xs:restriction base="xs:string"> + <xs:pattern value="\$\{.*\}|\+?[0-9]*"/> + </xs:restriction> + </xs:simpleType> - <xs:complexType name="listenersType"> - <xs:attribute name="asyncPoolSize" type="tns:positiveInteger"/> - </xs:complexType> + <xs:complexType name="jmxStatisticsType"> + <xs:attribute name="enabled" type="tns:booleanType"/> + </xs:complexType> - <xs:complexType name="invocationBatchingType"> - <xs:attribute name="enabled" type="tns:booleanType"/> - </xs:complexType> + <xs:complexType name="listenersType"> + <xs:attribute name="asyncPoolSize" type="tns:positiveInteger"/> + <xs:attribute name="asyncQueueSize" type="tns:positiveInteger"/> + </xs:complexType> - <xs:complexType name="transportType"> - <xs:sequence> - <xs:element name="jgroupsConfig" type="xs:anyType" minOccurs="0" maxOccurs="1"/> - </xs:sequence> - <xs:attribute name="clusterName" type="xs:string"/> - <xs:attribute name="multiplexerStack" type="xs:string"/> - </xs:complexType> + <xs:complexType name="invocationBatchingType"> + <xs:attribute name="enabled" type="tns:booleanType"/> + </xs:complexType> - <xs:complexType name="syncType"> - <xs:attribute name="replTimeout" type="tns:positiveInteger"/> - </xs:complexType> + <xs:complexType name="jgroupsConfigType"> + <xs:sequence> + <xs:any processContents="lax" minOccurs="0" maxOccurs="unbounded"/> + </xs:sequence> + <xs:attribute name="configFile" type="xs:string"/> + <xs:attribute name="multiplexerStack" type="xs:string"/> + </xs:complexType> - <xs:complexType name="asyncType"> - <xs:attribute name="useReplQueue" type="tns:booleanType"/> - <xs:attribute name="replQueueInterval" type="tns:positiveInteger"/> - <xs:attribute name="replQueueMaxElements" type="tns:positiveInteger"/> - <xs:attribute name="serializationExecutorPoolSize" type="tns:positiveInteger"/> - </xs:complexType> + <xs:complexType name="syncType"> + <xs:attribute name="replTimeout" type="tns:positiveInteger"/> + </xs:complexType> - <xs:complexType name="evictionType"> - <xs:sequence> - <xs:element name="default" type="tns:evictionRegionType" minOccurs="0" maxOccurs="1"/> - <xs:element name="region" minOccurs="0" maxOccurs="unbounded" type="tns:evictionRegionType"/> - </xs:sequence> - <xs:attribute name="wakeUpInterval" type="tns:positiveInteger" use="required"/> - </xs:complexType> + <xs:complexType name="asyncType"> + <xs:attribute name="useReplQueue" type="tns:booleanType"/> + <xs:attribute name="replQueueInterval" type="tns:positiveInteger"/> + <xs:attribute name="replQueueMaxElements" type="tns:positiveInteger"/> + <xs:attribute name="serializationExecutorPoolSize" type="tns:positiveInteger"/> + <xs:attribute name="serializationExecutorQueueSize" type="tns:positiveInteger"/> + </xs:complexType> - <xs:complexType name="evictionRegionType"> - <xs:sequence> - <xs:element name="attribute" maxOccurs="unbounded" type="tns:attributeType"/> - </xs:sequence> - <xs:attribute name="name" type="xs:string"/> - <xs:attribute name="algorithmClass" type="xs:string"/> - <xs:attribute name="actionPolicyClass" type="xs:string"/> - <xs:attribute name="eventQueueSize" type="tns:positiveInteger"/> - </xs:complexType> + <xs:complexType name="evictionType"> + <xs:sequence> + <xs:element name="default" type="tns:evictionRegionType" minOccurs="0" maxOccurs="1"/> + <xs:element name="region" minOccurs="0" maxOccurs="unbounded" type="tns:evictionRegionType"/> + </xs:sequence> + <xs:attribute name="wakeUpInterval" type="tns:positiveInteger" use="required"/> + </xs:complexType> - <xs:complexType name="loadersType"> - <xs:sequence> - <xs:element name="preload" minOccurs="0" maxOccurs="1"> - <xs:complexType> - <xs:sequence> - <xs:element name="node" maxOccurs="unbounded"> - <xs:complexType> - <xs:attribute name="fqn" type="xs:string"/> - </xs:complexType> - </xs:element> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="loader" maxOccurs="unbounded"> - <xs:complexType> - <xs:all> - <xs:element name="properties"/> - <xs:element name="singletonStore" minOccurs="0" maxOccurs="1"> - <xs:complexType> - <xs:all> - <xs:element name="properties" type="xs:string" minOccurs="0" maxOccurs="1"/> - </xs:all> - <xs:attribute name="enabled" type="tns:booleanType"/> - <xs:attribute name="class" type="xs:string"/> - </xs:complexType> - </xs:element> - </xs:all> - <xs:attribute name="class" type="xs:string"/> - <xs:attribute name="async" type="tns:booleanType"/> - <xs:attribute name="fetchPersistentState" type="tns:booleanType"/> - <xs:attribute name="ignoreModifications" type="tns:booleanType"/> - <xs:attribute name="purgeOnStartup" type="tns:booleanType"/> - </xs:complexType> - </xs:element> - </xs:sequence> - <xs:attribute name="passivation" type="tns:booleanType"/> - <xs:attribute name="shared" type="tns:booleanType"/> - </xs:complexType> + <xs:complexType name="evictionRegionType"> + <xs:sequence> + <xs:element name="property" minOccurs="0" maxOccurs="unbounded" type="tns:propertyType"/> + </xs:sequence> + <xs:attribute name="name" type="xs:string"/> + <xs:attribute name="algorithmClass" type="xs:string"/> + <xs:attribute name="actionPolicyClass" type="xs:string"/> + <xs:attribute name="eventQueueSize" type="tns:positiveInteger"/> + </xs:complexType> - <xs:complexType name="customInterceptorsType"> - <xs:sequence> - <xs:element name="interceptor" maxOccurs="unbounded"> - <xs:complexType> - <xs:sequence> - <xs:element name="attribute" maxOccurs="unbounded" type="tns:attributeType" minOccurs="0"/> - </xs:sequence> - <xs:attribute name="class" type="xs:string"/> - <xs:attribute name="position"> - <xs:simpleType> - <xs:restriction base="xs:string"> - <xs:pattern value="[Ff][Ii][Rr][Ss][Tt]|[Ll][Aa][Ss][Tt]"/> - </xs:restriction> - </xs:simpleType> - </xs:attribute> - <xs:attribute name="before" type="xs:string"/> - <xs:attribute name="after" type="xs:string"/> - <xs:attribute name="index" type="tns:positiveInteger"/> - </xs:complexType> - </xs:element> - </xs:sequence> - </xs:complexType> + <xs:complexType name="loadersType"> + <xs:sequence> + <xs:element name="preload" minOccurs="0" maxOccurs="1"> + <xs:complexType> + <xs:sequence> + <xs:element name="node" maxOccurs="unbounded"> + <xs:complexType> + <xs:attribute name="fqn" type="xs:string"/> + </xs:complexType> + </xs:element> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="loader" maxOccurs="unbounded"> + <xs:complexType> + <xs:all> + <xs:element name="properties"/> + <xs:element name="singletonStore" minOccurs="0" maxOccurs="1"> + <xs:complexType> + <xs:all> + <xs:element name="properties" type="xs:string" minOccurs="0" maxOccurs="1"/> + </xs:all> + <xs:attribute name="enabled" type="tns:booleanType"/> + <xs:attribute name="class" type="xs:string"/> + </xs:complexType> + </xs:element> + </xs:all> + <xs:attribute name="class" type="xs:string"/> + <xs:attribute name="async" type="tns:booleanType"/> + <xs:attribute name="fetchPersistentState" type="tns:booleanType"/> + <xs:attribute name="ignoreModifications" type="tns:booleanType"/> + <xs:attribute name="purgeOnStartup" type="tns:booleanType"/> + </xs:complexType> + </xs:element> + </xs:sequence> + <xs:attribute name="passivation" type="tns:booleanType"/> + <xs:attribute name="shared" type="tns:booleanType"/> + </xs:complexType> - <xs:complexType name="attributeType"> - <xs:simpleContent> - <xs:extension base="xs:string"> - <xs:attribute name="name" type="xs:string"/> - </xs:extension> - </xs:simpleContent> - </xs:complexType> + <xs:complexType name="customInterceptorsType"> + <xs:sequence> + <xs:element name="interceptor" maxOccurs="unbounded"> + <xs:complexType> + <xs:sequence> + <xs:element name="property" maxOccurs="unbounded" type="tns:propertyType" minOccurs="0"/> + </xs:sequence> + <xs:attribute name="class" type="xs:string"/> + <xs:attribute name="position"> + <xs:simpleType> + <xs:restriction base="xs:string"> + <xs:pattern value="[Ff][Ii][Rr][Ss][Tt]|[Ll][Aa][Ss][Tt]"/> + </xs:restriction> + </xs:simpleType> + </xs:attribute> + <xs:attribute name="before" type="xs:string"/> + <xs:attribute name="after" type="xs:string"/> + <xs:attribute name="index" type="tns:positiveInteger"/> + </xs:complexType> + </xs:element> + </xs:sequence> + </xs:complexType> + + <xs:complexType name="propertyType"> + <xs:simpleContent> + <xs:extension base="xs:string"> + <xs:attribute name="name" type="xs:string"/> + <xs:attribute name="value" type="xs:string"/> + </xs:extension> + </xs:simpleContent> + </xs:complexType> </xs:schema> Modified: core/branches/flat/src/test/java/org/jboss/starobrno/profiling/MemConsumptionTest.java =================================================================== --- core/branches/flat/src/test/java/org/jboss/starobrno/profiling/MemConsumptionTest.java 2008-11-13 18:08:44 UTC (rev 7132) +++ core/branches/flat/src/test/java/org/jboss/starobrno/profiling/MemConsumptionTest.java 2008-11-13 18:15:23 UTC (rev 7133) @@ -21,9 +21,9 @@ */ package org.jboss.starobrno.profiling; +import org.jboss.cache.DefaultCacheFactory; import org.jboss.starobrno.Cache; import org.jboss.starobrno.CacheException; -import org.jboss.starobrno.UnitTestCacheFactory; import org.jboss.starobrno.util.TestingUtil; import org.testng.annotations.Test; @@ -37,7 +37,7 @@ { // adjust the next 4 values int numEntries = 1000000; - int payloadSize = 20; // bytes + int payloadSize = 60; // bytes int keySize = 10; // bytes PayloadType payloadType = PayloadType.STRINGS; @@ -55,7 +55,8 @@ int kBytesCached = (bytesPerCharacter * numEntries * (payloadSize + keySize)) / 1024; System.out.println("Bytes to be cached: " + NumberFormat.getIntegerInstance().format(kBytesCached) + " kb"); - Cache c = new UnitTestCacheFactory().createCache(); // default LOCAL cache +// Cache c = new UnitTestCacheFactory().createCache(false); // default LOCAL cache + Cache c = new DefaultCacheFactory().createCache(); for (int i = 0; i < numEntries; i++) { switch (payloadType) Modified: core/branches/flat/src/test/resources/configs/buddy-replication-cache.xml =================================================================== --- core/branches/flat/src/test/resources/configs/buddy-replication-cache.xml 2008-11-13 18:08:44 UTC (rev 7132) +++ core/branches/flat/src/test/resources/configs/buddy-replication-cache.xml 2008-11-13 18:15:23 UTC (rev 7133) @@ -1,47 +1,48 @@ <?xml version="1.0" encoding="UTF-8"?> -<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns="urn:jboss:jbosscache-core:config:3.0"> - <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="10000"/> - <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/> - <stateRetrieval timeout="20000"/> - <transport clusterName="JBossCache-Cluster"> - <jgroupsConfig> - <TCP recv_buf_size="20000000" use_send_queues="false" loopback="false" discard_incompatible_packets="true" - max_bundle_size="64000" max_bundle_timeout="30" use_incoming_packet_handler="true" enable_bundling="true" - enable_unicast_bundling="true" enable_diagnostics="true" use_concurrent_stack="true" - thread_naming_pattern="pl" thread_pool.enabled="true" thread_pool.min_threads="1" - thread_pool.max_threads="4" thread_pool.keep_alive_time="30000" thread_pool.queue_enabled="true" - thread_pool.queue_max_size="50000" thread_pool.rejection_policy="discard" oob_thread_pool.enabled="true" - oob_thread_pool.min_threads="2" oob_thread_pool.max_threads="4" oob_thread_pool.keep_alive_time="10000" - oob_thread_pool.queue_enabled="false" oob_thread_pool.queue_max_size="10" - oob_thread_pool.rejection_policy="Run"/> - <MPING mcast_addr="232.1.2.3" timeout="2000" num_initial_members="3"/> - <MERGE2 max_interval="30000" min_interval="10000"/> - <FD_SOCK/> - <FD timeout="10000" max_tries="5" shun="true"/> - <VERIFY_SUSPECT timeout="1500"/> - <pbcast.NAKACK use_mcast_xmit="false" gc_lag="0" retransmit_timeout="300,600,1200,2400,4800" - discard_delivered_msgs="true"/> - <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000" max_bytes="400000"/> - <pbcast.GMS print_local_addr="true" join_timeout="5000" join_retry_timeout="2000" shun="false" - view_bundling="true" view_ack_collection_timeout="5000"/> - <FC max_credits="5000000" min_threshold="0.20"/> - <FRAG2 frag_size="60000"/> - <pbcast.STREAMING_STATE_TRANSFER use_reading_thread="true"/> - <pbcast.FLUSH timeout="0"/> - </jgroupsConfig> - </transport> - <replication> - <sync replTimeout="15000"/> - <buddy enabled="true" poolName="myBuddyPoolReplicationGroup" communicationTimeout="2000"> - <dataGravitation auto="false" removeOnFind="true" searchBackupTrees="true"/> - <locator class="org.jboss.cache.buddyreplication.NextMemberBuddyLocator"> - <properties> - numBuddies = 1 - ignoreColocatedBuddies = true - </properties> - </locator> - </buddy> - </replication> +<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns="urn:jboss:jbosscache-core:config:3.0"> + <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="10000"/> + <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/> + <clustering clusterName="JBossCache-Cluster"> + <sync replTimeout="15000"/> + + <buddy enabled="true" poolName="myBuddyPoolReplicationGroup" communicationTimeout="2000"> + <dataGravitation auto="false" removeOnFind="true" searchBackupTrees="true"/> + <locator class="org.jboss.cache.buddyreplication.NextMemberBuddyLocator"> + <properties> + numBuddies = 1 + ignoreColocatedBuddies = true + </properties> + </locator> + </buddy> + <stateRetrieval timeout="20000"/> + <jgroupsConfig> + <TCP recv_buf_size="20000000" use_send_queues="false" loopback="false" discard_incompatible_packets="true" + max_bundle_size="64000" max_bundle_timeout="30" use_incoming_packet_handler="true" + enable_bundling="true" + enable_unicast_bundling="true" enable_diagnostics="true" use_concurrent_stack="true" + thread_naming_pattern="pl" thread_pool.enabled="true" thread_pool.min_threads="1" + thread_pool.max_threads="4" thread_pool.keep_alive_time="30000" thread_pool.queue_enabled="true" + thread_pool.queue_max_size="50000" thread_pool.rejection_policy="discard" + oob_thread_pool.enabled="true" + oob_thread_pool.min_threads="2" oob_thread_pool.max_threads="4" oob_thread_pool.keep_alive_time="10000" + oob_thread_pool.queue_enabled="false" oob_thread_pool.queue_max_size="10" + oob_thread_pool.rejection_policy="Run"/> + <MPING mcast_addr="232.1.2.3" timeout="2000" num_initial_members="3"/> + <MERGE2 max_interval="30000" min_interval="10000"/> + <FD_SOCK/> + <FD timeout="10000" max_tries="5" shun="true"/> + <VERIFY_SUSPECT timeout="1500"/> + <pbcast.NAKACK use_mcast_xmit="false" gc_lag="0" retransmit_timeout="300,600,1200,2400,4800" + discard_delivered_msgs="true"/> + <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000" max_bytes="400000"/> + <pbcast.GMS print_local_addr="true" join_timeout="5000" join_retry_timeout="2000" shun="false" + view_bundling="true" view_ack_collection_timeout="5000"/> + <FC max_credits="5000000" min_threshold="0.20"/> + <FRAG2 frag_size="60000"/> + <pbcast.STREAMING_STATE_TRANSFER use_reading_thread="true"/> + <pbcast.FLUSH timeout="0"/> + </jgroupsConfig> + </clustering> </jbosscache> Modified: core/branches/flat/src/test/resources/configs/clonable-config.xml =================================================================== --- core/branches/flat/src/test/resources/configs/clonable-config.xml 2008-11-13 18:08:44 UTC (rev 7132) +++ core/branches/flat/src/test/resources/configs/clonable-config.xml 2008-11-13 18:15:23 UTC (rev 7133) @@ -1,144 +1,144 @@ <?xml version="1.0" encoding="UTF-8"?> <jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:jboss:jbosscache-core:config:3.0"> - <locking isolationLevel="SERIALIZABLE" lockAcquisitionTimeout="1" nodeLockingScheme="optimistic"/> - <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/> - <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" - ucast_send_buf_size="640000" mcast_recv_buf_size="25000000" mcast_send_buf_size="640000" loopback="false" - discard_incompatible_packets="true" max_bundle_size="64000" max_bundle_timeout="30" - use_incoming_packet_handler="true" ip_ttl="2" enable_bundling="false" enable_diagnostics="true" - use_concurrent_stack="true" thread_naming_pattern="pl" thread_pool.enabled="true" - thread_pool.min_threads="1" thread_pool.max_threads="25" thread_pool.keep_alive_time="30000" - thread_pool.queue_enabled="true" thread_pool.queue_max_size="10" thread_pool.rejection_policy="Run" - oob_thread_pool.enabled="true" oob_thread_pool.min_threads="1" oob_thread_pool.max_threads="4" - oob_thread_pool.keep_alive_time="10000" oob_thread_pool.queue_enabled="true" - oob_thread_pool.queue_max_size="10" oob_thread_pool.rejection_policy="Run"/> - <PING timeout="2000" num_initial_members="3"/> - <MERGE2 max_interval="30000" min_interval="10000"/> - <FD_SOCK/> - <FD timeout="10000" max_tries="5" shun="true"/> - <VERIFY_SUSPECT timeout="1500"/> - <pbcast.NAKACK use_mcast_xmit="false" gc_lag="0" retransmit_timeout="300,600,1200,2400,4800" - discard_delivered_msgs="true"/> - <UNICAST timeout="300,600,1200,2400,3600"/> - <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000" max_bytes="400000"/> - <pbcast.GMS print_local_addr="true" join_timeout="5000" shun="false" view_bundling="true" - view_ack_collection_timeout="5000"/> - <FRAG2 frag_size="60000"/> - <pbcast.STREAMING_STATE_TRANSFER use_reading_thread="true"/> - <pbcast.FLUSH timeout="0"/> - </jgroupsConfig> - </transport> - <replication> - <sync replTimeout="2"/> - <buddy enabled="true" poolName="cloneGroup" communicationTimeout="7"> - <dataGravitation auto="false" removeOnFind="true" searchBackupTrees="true"/> - <locator class="org.jboss.cache.buddyreplication.NextMemberBuddyLocator"> + <locking isolationLevel="SERIALIZABLE" lockAcquisitionTimeout="1" nodeLockingScheme="optimistic"/> + <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/> + <clustering clusterName="CloneCluster"> + <stateRetrieval fetchInMemoryState="false" timeout="3"/> + <jgroupsConfig multiplexerStack="udp"> + <UDP mcast_addr="228.10.10.10" mcast_port="45588" tos="8" ucast_recv_buf_size="20000000" + ucast_send_buf_size="640000" mcast_recv_buf_size="25000000" mcast_send_buf_size="640000" + loopback="false" + discard_incompatible_packets="true" max_bundle_size="64000" max_bundle_timeout="30" + use_incoming_packet_handler="true" ip_ttl="2" enable_bundling="false" enable_diagnostics="true" + use_concurrent_stack="true" thread_naming_pattern="pl" thread_pool.enabled="true" + thread_pool.min_threads="1" thread_pool.max_threads="25" thread_pool.keep_alive_time="30000" + thread_pool.queue_enabled="true" thread_pool.queue_max_size="10" thread_pool.rejection_policy="Run" + oob_thread_pool.enabled="true" oob_thread_pool.min_threads="1" oob_thread_pool.max_threads="4" + oob_thread_pool.keep_alive_time="10000" oob_thread_pool.queue_enabled="true" + oob_thread_pool.queue_max_size="10" oob_thread_pool.rejection_policy="Run"/> + <PING timeout="2000" num_initial_members="3"/> + <MERGE2 max_interval="30000" min_interval="10000"/> + <FD_SOCK/> + <FD timeout="10000" max_tries="5" shun="true"/> + <VERIFY_SUSPECT timeout="1500"/> + <pbcast.NAKACK use_mcast_xmit="false" gc_lag="0" retransmit_timeout="300,600,1200,2400,4800" + discard_delivered_msgs="true"/> + <UNICAST timeout="300,600,1200,2400,3600"/> + <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000" max_bytes="400000"/> + <pbcast.GMS print_local_addr="true" join_timeout="5000" shun="false" view_bundling="true" + view_ack_collection_timeout="5000"/> + <FRAG2 frag_size="60000"/> + <pbcast.STREAMING_STATE_TRANSFER use_reading_thread="true"/> + <pbcast.FLUSH timeout="0"/> + </jgroupsConfig> + <sync replTimeout="2"/> + <buddy enabled="true" poolName="cloneGroup" communicationTimeout="7"> + <dataGravitation auto="false" removeOnFind="true" searchBackupTrees="true"/> + <locator class="org.jboss.cache.buddyreplication.NextMemberBuddyLocator"> + <properties> + numBuddies = 11 + ignoreColocatedBuddies = true + </properties> + </locator> + </buddy> + + </clustering> + <eviction wakeUpInterval="45000"> + <default algorithmClass="org.jboss.cache.eviction.LRUAlgorithm" eventQueueSize="4"> + <property name="maxNodes" value="5000"/> + <property name="timeToLive" value="1000000"/> + <property name="maxAge" value="15000"/> + </default> + <region name="/fifo" algorithmClass="org.jboss.cache.eviction.FIFOAlgorithm"> + <property name="maxNodes" value="5000"/> + </region> + <region name="/mru" algorithmClass="org.jboss.cache.eviction.MRUAlgorithm"> + <property name="maxNodes" value="10000"/> + </region> + <region name="/lfu" algorithmClass="org.jboss.cache.eviction.LFUAlgorithm"> + <property name="maxNodes" value="5000"/> + <property name="minNodes" value="4000"/> + </region> + </eviction> + <loaders passivation="false" shared="true"> + <preload> + <node fqn="/"/> + </preload> + <loader class="org.jboss.cache.loader.FileCacheLoader" async="false" fetchPersistentState="true" + ignoreModifications="false"> <properties> - numBuddies = 11 - ignoreColocatedBuddies = true + location=/tmp/FileCacheLoader </properties> - </locator> - </buddy> - </replication> - <eviction wakeUpInterval="45000"> - <default algorithmClass="org.jboss.starobrno.eviction.algorithms.lru.LRUAlgorithm" eventQueueSize="4"> - <attribute name="maxNodes">5000</attribute> - <attribute name="timeToLive">1000000</attribute> - <attribute name="maxAge">15000</attribute> - </default> - <region name="/fifo" algorithmClass="org.jboss.starobrno.eviction.algorithms.fifo.FIFOAlgorithm"> - <attribute name="maxNodes">5000</attribute> - </region> - <region name="/mru" algorithmClass="org.jboss.starobrno.eviction.algorithms.mru.MRUAlgorithm"> - <attribute name="maxNodes">10000</attribute> - </region> - <region name="/lfu" algorithmClass="org.jboss.starobrno.eviction.algorithms.lfu.LFUAlgorithm"> - <attribute name="maxNodes">5000</attribute> - <attribute name="minNodes">4000</attribute> - </region> - </eviction> - <loaders passivation="false" shared="true"> - <preload> - <node fqn="/"/> - </preload> - <loader class="org.jboss.cache.loader.FileCacheLoader" async="false" fetchPersistentState="true" - ignoreModifications="false"> - <properties> - location=/tmp/FileCacheLoader - </properties> - <singletonStore enabled="false"> + <singletonStore enabled="false"> + <properties> + pushStateWhenCoordinator=true + pushStateWhenCoordinatorTimeout=5000 + </properties> + </singletonStore> + </loader> + <loader class="org.jboss.cache.loader.bdbje.BdbjeCacheLoader" async="false" fetchPersistentState="false" + ignoreModifications="false"> <properties> - pushStateWhenCoordinator=true - pushStateWhenCoordinatorTimeout=5000 + location=/tmp/BdbjeCacheLoader </properties> - </singletonStore> - </loader> - <loader class="org.jboss.cache.loader.bdbje.BdbjeCacheLoader" async="false" fetchPersistentState="false" - ignoreModifications="false"> - <properties> - location=/tmp/BdbjeCacheLoader - </properties> - <singletonStore enabled="false"> + <singletonStore enabled="false"> + <properties> + pushStateWhenCoordinator=true + pushStateWhenCoordinatorTimeout=5000 + </properties> + </singletonStore> + </loader> + <loader class="org.jboss.cache.loader.jdbm.JdbmCacheLoader" async="false" fetchPersistentState="false" + ignoreModifications="false"> <properties> - pushStateWhenCoordinator=true - pushStateWhenCoordinatorTimeout=5000 + location=/tmp/JdbmCacheLoader </properties> - </singletonStore> - </loader> - <loader class="org.jboss.cache.loader.jdbm.JdbmCacheLoader" async="false" fetchPersistentState="false" - ignoreModifications="false"> - <properties> - location=/tmp/JdbmCacheLoader - </properties> - <singletonStore enabled="false"> + <singletonStore enabled="false"> + <properties> + pushStateWhenCoordinator=true + pushStateWhenCoordinatorTimeout=5000 + </properties> + </singletonStore> + </loader> + <loader class="org.jboss.cache.loader.JDBCCacheLoader" async="false" fetchPersistentState="false" + ignoreModifications="false"> <properties> - pushStateWhenCoordinator=true - pushStateWhenCoordinatorTimeout=5000 + cache.jdbc.driver=com.foo.jdbc.Driver + cache.jdbc.url=foo://driver + cache.jdbc.user=sa + cache.jdbc.password=secret </properties> - </singletonStore> - </loader> - <loader class="org.jboss.cache.loader.JDBCCacheLoader" async="false" fetchPersistentState="false" - ignoreModifications="false"> - <properties> - cache.jdbc.driver=com.foo.jdbc.Driver - cache.jdbc.url=foo://driver - cache.jdbc.user=sa - cache.jdbc.password=secret - </properties> - <singletonStore enabled="false"> + <singletonStore enabled="false"> + <properties> + pushStateWhenCoordinator=true + pushStateWhenCoordinatorTimeout=5000 + </properties> + </singletonStore> + </loader> + <loader class="org.jboss.cache.loader.TcpDelegatingCacheLoader" async="false" fetchPersistentState="false" + ignoreModifications="false"> <properties> - pushStateWhenCoordinator=true - pushStateWhenCoordinatorTimeout=5000 + host=127.0.0.1\nport=12121 </properties> - </singletonStore> - </loader> - <loader class="org.jboss.cache.loader.TcpDelegatingCacheLoader" async="false" fetchPersistentState="false" - ignoreModifications="false"> - <properties> - host=127.0.0.1\nport=12121 - </properties> - <singletonStore enabled="false"> + <singletonStore enabled="false"> + <properties> + pushStateWhenCoordinator=true + pushStateWhenCoordinatorTimeout=5000 + </properties> + </singletonStore> + </loader> + <loader class="org.jboss.cache.loader.ClusteredCacheLoader" async="false" fetchPersistentState="false" + ignoreModifications="false"> <properties> - pushStateWhenCoordinator=true - pushStateWhenCoordinatorTimeout=5000 + timeout=500 </properties> - </singletonStore> - </loader> - <loader class="org.jboss.cache.loader.ClusteredCacheLoader" async="false" fetchPersistentState="false" - ignoreModifications="false"> - <properties> - timeout=500 - </properties> - <singletonStore enabled="false"> - <properties> - pushStateWhenCoordinator=true - pushStateWhenCoordinatorTimeout=5000 - </properties> - </singletonStore> - </loader> - </loaders> + <singletonStore enabled="false"> + <properties> + pushStateWhenCoordinator=true + pushStateWhenCoordinatorTimeout=5000 + </properties> + </singletonStore> + </loader> + </loaders> </jbosscache> Modified: core/branches/flat/src/test/resources/configs/local-lru-eviction.xml =================================================================== --- core/branches/flat/src/test/resources/configs/local-lru-eviction.xml 2008-11-13 18:08:44 UTC (rev 7132) +++ core/branches/flat/src/test/resources/configs/local-lru-eviction.xml 2008-11-13 18:15:23 UTC (rev 7133) @@ -2,31 +2,33 @@ <jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:jboss:jbosscache-core:config:3.0"> - <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="15000"/> - <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/> - <stateRetrieval timeout="20000"/> - <transport clusterName="JBossCache-Cluster"/> - <eviction wakeUpInterval="5000"> - <default algorithmClass="org.jboss.starobrno.eviction.algorithms.lru.LRUAlgorithm" eventQueueSize="200000"> - <attribute name="maxNodes">5000</attribute> - <attribute name="timeToLive">1000000</attribute> - </default> - <region name="/org/jboss/data"> - <attribute name="maxNodes">5000</attribute> - <attribute name="timeToLive">1000000</attribute> - </region> - <region name="/org/jboss/test/data"> - <attribute name="maxNodes">5</attribute> - <attribute name="timeToLive">4000</attribute> - </region> - <region name="/test"> - <attribute name="maxNodes">10000</attribute> - <attribute name="timeToLive">4000</attribute> - </region> - <region name="/maxAgeTest"> - <attribute name="maxNodes">10000</attribute> - <attribute name="timeToLive">8000</attribute> - <attribute name="maxAge">10000</attribute> - </region> - </eviction> + <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="15000"/> + <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/> + <clustering clusterName="JBossCache-Cluster"> + <stateRetrieval timeout="20000"/> + </clustering> + + <eviction wakeUpInterval="5000"> + <default algorithmClass="org.jboss.cache.eviction.LRUAlgorithm" eventQueueSize="200000"> + <property name="maxNodes" value="5000"/> + <property name="timeToLive" value="1000000"/> + </default> + <region name="/org/jboss/data"> + <property name="maxNodes" value="5000"/> + <property name="timeToLive" value="1000000"/> + </region> + <region name="/org/jboss/test/data"> + <property name="maxNodes" value="5"/> + <property name="timeToLive" value="4000"/> + </region> + <region name="/test"> + <property name="maxNodes" value="10000"/> + <property name="timeToLive" value="4000"/> + </region> + <region name="/maxAgeTest"> + <property name="maxNodes" value="10000"/> + <property name="timeToLive" value="8000"/> + <property name="maxAge" value="10000"/> + </region> + </eviction> </jbosscache> Modified: core/branches/flat/src/test/resources/configs/local-passivation.xml =================================================================== --- core/branches/flat/src/test/resources/configs/local-passivation.xml 2008-11-13 18:08:44 UTC (rev 7132) +++ core/branches/flat/src/test/resources/configs/local-passivation.xml 2008-11-13 18:15:23 UTC (rev 7133) @@ -2,28 +2,26 @@ <jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:jboss:jbosscache-core:config:3.0"> - <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="15000"/> - <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/> - <stateRetrieval timeout="20000"/> - <transport clusterName="JBossCache-Cluster"/> - <eviction wakeUpInterval="1000"> - <default algorithmClass="org.jboss.starobrno.eviction.algorithms.lru.LRUAlgorithm" eventQueueSize="200000"> - <attribute name="maxNodes">5000</attribute> - <attribute name="timeToLive">1000</attribute> - </default> - <region name="/org/jboss/test/data"> - <attribute name="maxNodes">100</attribute> - <attribute name="timeToLive">1000</attribute> - </region> - </eviction> - <loaders passivation="true" shared="false"> - <preload> - <node fqn="/"/> - </preload> - <loader class="org.jboss.cache.loader.FileCacheLoader" async="false" fetchPersistentState="true" - ignoreModifications="false"> - <properties> - </properties> - </loader> - </loaders> + <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="15000"/> + <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/> + <eviction wakeUpInterval="1000"> + <default algorithmClass="org.jboss.cache.eviction.LRUAlgorithm" eventQueueSize="200000"> + <property name="maxNodes" value="5000"/> + <property name="timeToLive" value="1000"/> + </default> + <region name="/org/jboss/test/data"> + <property name="maxNodes" value="100"/> + <property name="timeToLive" value="1000"/> + </region> + </eviction> + <loaders passivation="true" shared="false"> + <preload> + <node fqn="/"/> + </preload> + <loader class="org.jboss.cache.loader.FileCacheLoader" async="false" fetchPersistentState="true" + ignoreModifications="false"> + <properties> + </properties> + </loader> + </loaders> </jbosscache> Modified: core/branches/flat/src/test/resources/configs/local-tx.xml =================================================================== --- core/branches/flat/src/test/resources/configs/local-tx.xml 2008-11-13 18:08:44 UTC (rev 7132) +++ core/branches/flat/src/test/resources/configs/local-tx.xml 2008-11-13 18:15:23 UTC (rev 7133) @@ -2,9 +2,21 @@ <jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:jboss:jbosscache-core:config:3.0"> - <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="15000"/> - <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/> - <serialization useRegionBasedMarshalling="false"/> - <stateRetrieval timeout="20000"/> - <transport clusterName="JBossCache-Cluster"/> + <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="15000"/> + <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/> + <serialization useRegionBasedMarshalling="false"/> + <eviction wakeUpInterval="5000"> + <default algorithmClass="org.jboss.cache.eviction.LRUAlgorithm" eventQueueSize="200000"> + <property name="maxNodes" value="5000"/> + <property name="timeToLive" value="1000000"/> + </default> + <region name="/org/jboss/data"> + <property name="maxNodes" value="5000"/> + <property name="timeToLive" value="1000000"/> + </region> + <region name="/org/jboss/test/data"> + <property name="maxNodes" value="5"/> + <property name="timeToLive" value="4000"/> + </region> + </eviction> </jbosscache> Modified: core/branches/flat/src/test/resources/configs/mixedPolicy-eviction.xml =================================================================== --- core/branches/flat/src/test/resources/configs/mixedPolicy-eviction.xml 2008-11-13 18:08:44 UTC (rev 7132) +++ core/branches/flat/src/test/resources/configs/mixedPolicy-eviction.xml 2008-11-13 18:15:23 UTC (rev 7133) @@ -2,53 +2,28 @@ <jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:jboss:jbosscache-core:config:3.0"> - <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="15000"/> - <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/> - <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" - ucast_send_buf_size="640000" mcast_recv_buf_size="25000000" mcast_send_buf_size="640000" loopback="false" - discard_incompatible_packets="true" max_bundle_size="64000" max_bundle_timeout="30" - use_incoming_packet_handler="true" ip_ttl="2" enable_bundling="false" enable_diagnostics="true" - use_concurrent_stack="true" thread_naming_pattern="pl" thread_pool.enabled="true" - thread_pool.min_threads="1" thread_pool.max_threads="25" thread_pool.keep_alive_time="30000" - thread_pool.queue_enabled="true" thread_pool.queue_max_size="10" thread_pool.rejection_policy="Run" - oob_thread_pool.enabled="true" oob_thread_pool.min_threads="1" oob_thread_pool.max_threads="4" - oob_thread_pool.keep_alive_time="10000" oob_thread_pool.queue_enabled="true" - oob_thread_pool.queue_max_size="10" oob_thread_pool.rejection_policy="Run"/> - <PING timeout="2000" num_initial_members="3"/> - <MERGE2 max_interval="30000" min_interval="10000"/> - <FD_SOCK/> - <FD timeout="10000" max_tries="5" shun="true"/> - <VERIFY_SUSPECT timeout="1500"/> - <pbcast.NAKACK use_mcast_xmit="false" gc_lag="0" retransmit_timeout="300,600,1200,2400,4800" - discard_delivered_msgs="true"/> - <UNICAST timeout="300,600,1200,2400,3600"/> - <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000" max_bytes="400000"/> - <pbcast.GMS print_local_addr="true" join_timeout="5000" shun="false" view_bundling="true" - view_ack_collection_timeout="5000"/> - <FC max_credits="20000000" min_threshold="0.10"/> - <FRAG2 frag_size="60000"/> - <pbcast.STREAMING_STATE_TRANSFER use_reading_thread="true"/> - <pbcast.FLUSH timeout="0"/> - </jgroupsConfig> - </transport> - <eviction wakeUpInterval="5000"> - <default algorithmClass="org.jboss.starobrno.eviction.algorithms.lru.LRUAlgorithm" eventQueueSize="200000"> - <attribute name="maxNodes">5000</attribute> - <attribute name="timeToLive">1000000</attribute> - </default> - <region name="/org/jboss/data" algorithmClass="org.jboss.starobrno.eviction.algorithms.fifo.FIFOAlgorithm"> - <attribute name="maxNodes">5000</attribute> - </region> - <region name="/test/" algorithmClass="org.jboss.starobrno.eviction.algorithms.mru.MRUAlgorithm"> - <attribute name="maxNodes">10000</attribute> - </region> - <region name="/maxAgeTest/"> - <attribute name="maxNodes">10000</attribute> - <attribute name="timeToLive">8000</attribute> - <attribute name="maxAge">10000</attribute> - </region> - </eviction> + <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="15000"/> + <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/> + <clustering> + <stateRetrieval timeout="20000"/> + <jgroupsConfig configFile="udp.xml"/> + </clustering> + + <eviction wakeUpInterval="5000"> + <default algorithmClass="org.jboss.cache.eviction.LRUAlgorithm" eventQueueSize="200000"> + <property name="maxNodes" value="5000"/> + <property name="timeToLive" value="1000000"/> + </default> + <region name="/org/jboss/data" algorithmClass="org.jboss.cache.eviction.FIFOAlgorithm"> + <property name="maxNodes" value="5000"/> + </region> + <region name="/test/" algorithmClass="org.jboss.cache.eviction.MRUAlgorithm"> + <property name="maxNodes" value="10000"/> + </region> + <region name="/maxAgeTest/"> + <property name="maxNodes" value="10000"/> + <property name="timeToLive" value="8000"/> + <property name="maxAge" value="10000"/> + </region> + </eviction> </jbosscache> Modified: core/branches/flat/src/test/resources/configs/mux.xml =================================================================== --- core/branches/flat/src/test/resources/configs/mux.xml 2008-11-13 18:08:44 UTC (rev 7132) +++ core/branches/flat/src/test/resources/configs/mux.xml 2008-11-13 18:15:23 UTC (rev 7133) @@ -1,9 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns="urn:jboss:jbosscache-core:config:3.0"> - - <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="10000"/> - <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/> - <stateRetrieval timeout="20000"/> - <transport clusterName="JBossCache-Cluster" multiplexerStack="tcp"/> +<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:jboss:jbosscache-core:config:3.0"> + <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/> + <clustering> + <stateRetrieval timeout="20000"/> + <jgroupsConfig multiplexerStack="tcp"/> + </clustering> </jbosscache> Modified: core/branches/flat/src/test/resources/configs/mvcc-repl-sync-br.xml =================================================================== --- core/branches/flat/src/test/resources/configs/mvcc-repl-sync-br.xml 2008-11-13 18:08:44 UTC (rev 7132) +++ core/branches/flat/src/test/resources/configs/mvcc-repl-sync-br.xml 2008-11-13 18:15:23 UTC (rev 7133) @@ -1,45 +1,43 @@ <?xml version="1.0" encoding="UTF-8"?> <jbosscache xmlns="urn:jboss:jbosscache-core:config:3.0"> - <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="10000" nodeLockingScheme="mvcc"/> - <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/> - <stateRetrieval timeout="20000" fetchInMemoryState="false"/> - <transport clusterName="JBossCache-Cluster"> - <jgroupsConfig> - <TCP discard_incompatible_packets="true" enable_bundling="false" enable_diagnostics="false" - enable_unicast_bundling="false" loopback="false" max_bundle_size="64000" max_bundle_timeout="30" - oob_thread_pool.enabled="true" oob_thread_pool.keep_alive_time="10000" oob_thread_pool.max_threads="4" - oob_thread_pool.min_threads="2" oob_thread_pool.queue_enabled="false" oob_thread_pool.queue_max_size="10" - oob_thread_pool.rejection_policy="Run" recv_buf_size="20000000" thread_naming_pattern="pl" - thread_pool.enabled="true" thread_pool.keep_alive_time="30000" thread_pool.max_threads="4" - thread_pool.min_threads="1" thread_pool.queue_enabled="true" thread_pool.queue_max_size="50000" - thread_pool.rejection_policy="discard" use_concurrent_stack="true" use_incoming_packet_handler="true" - use_send_queues="false"/> - <MPING mcast_addr="232.1.2.3" num_initial_members="3" timeout="2000"/> - <MERGE2 max_interval="30000" min_interval="10000"/> - <FD_SOCK/> - <FD max_tries="5" shun="true" timeout="10000"/> - <VERIFY_SUSPECT timeout="1500"/> - <pbcast.NAKACK discard_delivered_msgs="true" gc_lag="0" retransmit_timeout="300,600,1200,2400,4800" - use_mcast_xmit="false"/> - <pbcast.STABLE desired_avg_gossip="50000" max_bytes="400000" stability_delay="1000"/> - <pbcast.GMS join_retry_timeout="2000" join_timeout="5000" print_local_addr="true" shun="false" - view_ack_collection_timeout="5000" view_bundling="true"/> - <FC max_credits="5000000" min_threshold="0.20"/> - <FRAG2 frag_size="60000"/> - <pbcast.STREAMING_STATE_TRANSFER use_reading_thread="true"/> - <pbcast.FLUSH timeout="0"/> - </jgroupsConfig> - </transport> - <replication> - <async/> - <buddy enabled="true" poolName="myBuddyPoolReplicationGroup" communicationTimeout="2000"> - <dataGravitation auto="false" removeOnFind="true" searchBackupTrees="true"/> - <locator class="org.jboss.cache.buddyreplication.NextMemberBuddyLocator"> - <properties> - numBuddies = 1 - ignoreColocatedBuddies = true - </properties> - </locator> - </buddy> - </replication> + <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/> + <clustering> + <stateRetrieval fetchInMemoryState="false"/> + <jgroupsConfig> + <TCP discard_incompatible_packets="true" enable_bundling="false" enable_diagnostics="false" + enable_unicast_bundling="false" loopback="false" max_bundle_size="64000" max_bundle_timeout="30" + oob_thread_pool.enabled="true" oob_thread_pool.keep_alive_time="10000" oob_thread_pool.max_threads="4" + oob_thread_pool.min_threads="2" oob_thread_pool.queue_enabled="false" + oob_thread_pool.queue_max_size="10" + oob_thread_pool.rejection_policy="Run" recv_buf_size="20000000" thread_naming_pattern="pl" + thread_pool.enabled="true" thread_pool.keep_alive_time="30000" thread_pool.max_threads="4" + thread_pool.min_threads="1" thread_pool.queue_enabled="true" thread_pool.queue_max_size="50000" + thread_pool.rejection_policy="discard" use_concurrent_stack="true" use_incoming_packet_handler="true" + use_send_queues="false"/> + <MPING mcast_addr="232.1.2.3" num_initial_members="3" timeout="2000"/> + <MERGE2 max_interval="30000" min_interval="10000"/> + <FD_SOCK/> + <FD max_tries="5" shun="true" timeout="10000"/> + <VERIFY_SUSPECT timeout="1500"/> + <pbcast.NAKACK discard_delivered_msgs="true" gc_lag="0" retransmit_timeout="300,600,1200,2400,4800" + use_mcast_xmit="false"/> + <pbcast.STABLE desired_avg_gossip="50000" max_bytes="400000" stability_delay="1000"/> + <pbcast.GMS join_retry_timeout="2000" join_timeout="5000" print_local_addr="true" shun="false" + view_ack_collection_timeout="5000" view_bundling="true"/> + <FC max_credits="5000000" min_threshold="0.20"/> + <FRAG2 frag_size="60000"/> + <pbcast.STREAMING_STATE_TRANSFER use_reading_thread="true"/> + <pbcast.FLUSH timeout="0"/> + </jgroupsConfig> + <async/> + <buddy enabled="true" poolName="myBuddyPoolReplicationGroup" communicationTimeout="2000"> + <dataGravitation auto="false" removeOnFind="true" searchBackupTrees="true"/> + <locator class="org.jboss.cache.buddyreplication.NextMemberBuddyLocator"> + <properties> + numBuddies = 1 + ignoreColocatedBuddies = true + </properties> + </locator> + </buddy> + </clustering> </jbosscache> Modified: core/branches/flat/src/test/resources/configs/parser-test-async.xml =================================================================== --- core/branches/flat/src/test/resources/configs/parser-test-async.xml 2008-11-13 18:08:44 UTC (rev 7132) +++ core/branches/flat/src/test/resources/configs/parser-test-async.xml 2008-11-13 18:15:23 UTC (rev 7133) @@ -6,112 +6,107 @@ xmlns="urn:jboss:jbosscache-core:config:3.0"> - <locking isolationLevel="REPEATABLE_READ" lockParentForChildInsertRemove="true" lockAcquisitionTimeout="10234" - nodeLockingScheme="mvcc" writeSkewCheck="false" concurrencyLevel="21"/> + <locking isolationLevel="REPEATABLE_READ" lockParentForChildInsertRemove="true" lockAcquisitionTimeout="10234" + nodeLockingScheme="mvcc" writeSkewCheck="false" concurrencyLevel="21"/> - <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup" - syncRollbackPhase="true" syncCommitPhase="true"/> + <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup" + syncRollbackPhase="true" syncCommitPhase="true"/> - <!-- serialization related configuration, used for replication and cache loading --> - <serialization objectInputStreamPoolSize="12" objectOutputStreamPoolSize="14" version="1.2.4" - marshallerClass="some.Clazz" useLazyDeserialization="true" useRegionBasedMarshalling="true"/> + <jmxStatistics enabled="false"/> - <replication> - <async useReplQueue="false" serializationExecutorPoolSize="250"/> - <buddy enabled="true" poolName="myBuddyPoolReplicationGroup" communicationTimeout="2000"> - <dataGravitation auto="true" removeOnFind="true" searchBackupTrees="true"/> - <locator class="org.jboss.cache.buddyreplication.NextMemberBuddyLocator"> - <properties> - numBuddies = 1 - ignoreColocatedBuddies = true - </properties> - </locator> - </buddy> - </replication> + <startup regionsInactiveOnStartup="true"/> + <shutdown hookBehavior="REGISTER"/> + <listeners asyncPoolSize="5" asyncQueueSize="100000"/> + <invocationBatching enabled="true"/> - <stateRetrieval timeout="15124" fetchInMemoryState="true"/> - <startup regionsInactiveOnStartup="true"/> - <shutdown hookBehavior="REGISTER"/> + <!-- serialization related configuration, used for replication and cache loading --> + <serialization objectInputStreamPoolSize="12" objectOutputStreamPoolSize="14" version="1.2.4" + marshallerClass="some.Clazz" useLazyDeserialization="true" useRegionBasedMarshalling="true"/> - <transport clusterName="JBossCache-Cluster" multiplexerStack="file_name"> - <jgroupsConfig> - <PING timeout="2000" num_initial_members="3"/> - <MERGE2 max_interval="30000" min_interval="10000"/> - <FD_SOCK/> - <FD timeout="10000" max_tries="5" shun="true"/> - <VERIFY_SUSPECT timeout="1500"/> - <pbcast.NAKACK use_mcast_xmit="false" gc_lag="0" - retransmit_timeout="300,600,1200,2400,4800" - discard_delivered_msgs="true"/> - <UNICAST timeout="300,600,1200,2400,3600"/> - <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000" - max_bytes="400000"/> - <pbcast.GMS print_local_addr="true" join_timeout="5000" shun="false" - view_bundling="true" view_ack_collection_timeout="5000"/> - <FRAG2 frag_size="60000"/> - <pbcast.STREAMING_STATE_TRANSFER use_reading_thread="true"/> - <!-- <pbcast.STATE_TRANSFER/> --> - <pbcast.FLUSH timeout="0"/> - </jgroupsConfig> - </transport> + <clustering mode="replication" clusterName="JBossCache-cluster"> + <async useReplQueue="false" serializationExecutorPoolSize="250" serializationExecutorQueueSize="5000000"/> + <stateRetrieval timeout="15124" fetchInMemoryState="true"/> + <buddy enabled="true" poolName="myBuddyPoolReplicationGroup" communicationTimeout="2000"> + <dataGravitation auto="true" removeOnFind="true" searchBackupTrees="true"/> + <locator class="org.jboss.cache.buddyreplication.NextMemberBuddyLocator"> + <properties> + numBuddies = 1 + ignoreColocatedBuddies = true + </properties> + </locator> + </buddy> + <jgroupsConfig> + <PING timeout="2000" num_initial_members="3"/> + <MERGE2 max_interval="30000" min_interval="10000"/> + <FD_SOCK/> + <FD timeout="10000" max_tries="5" shun="true"/> + <VERIFY_SUSPECT timeout="1500"/> + <pbcast.NAKACK use_mcast_xmit="false" gc_lag="0" + retransmit_timeout="300,600,1200,2400,4800" + discard_delivered_msgs="true"/> + <UNICAST timeout="300,600,1200,2400,3600"/> + <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000" + max_bytes="400000"/> + <pbcast.GMS print_local_addr="true" join_timeout="5000" shun="false" + view_bundling="true" view_ack_collection_timeout="5000"/> + <FRAG2 frag_size="60000"/> + <pbcast.STREAMING_STATE_TRANSFER use_reading_thread="true"/> + <!-- <pbcast.STATE_TRANSFER/> --> + <pbcast.FLUSH timeout="0"/> + </jgroupsConfig> + </clustering> + <eviction wakeUpInterval="5"> + <default algorithmClass="org.jboss.cache.eviction.LRUAlgorithm" eventQueueSize="200000"> + <property name="maxNodes" value="5000"/> + <property name="timeToLive" value="1000"/> + </default> + <region name="/org/jboss/data"> + <property name="timeToLive" value="1002"/> + </region> + <region name="/org/jboss/xyz" algorithmClass="org.jboss.cache.eviction.MRUAlgorithm" eventQueueSize="21"> + <property name="maxNodes" value="2103"/> + <property name="minTimeToLive" value="22"/> + </region> + </eviction> - <jmxStatistics enabled="false"/> + <!-- this should be deprecated in 3.0 and should be replaced with CacheLoaderConfig--> + <loaders passivation="true" shared="true"> + <preload> + <node fqn="/a/b/c"/> + <node fqn="/f/r/s"/> + </preload> - <eviction wakeUpInterval="5"> - <default algorithmClass="org.jboss.starobrno.eviction.algorithms.lru.LRUAlgorithm" eventQueueSize="200000"> - <attribute name="maxNodes">5000</attribute> - <attribute name="timeToLive">1000</attribute> - </default> - <region name="/org/jboss/data"> - <attribute name="timeToLive">1002</attribute> - </region> - <region name="/org/jboss/xyz" algorithmClass="org.jboss.starobrno.eviction.algorithms.mru.MRUAlgorithm" eventQueueSize="21"> - <attribute name="maxNodes">2103</attribute> - <attribute name="minTimeToLive">22</attribute> - </region> - </eviction> - - <!-- this should be deprecated in 3.0 and should be replaced with CacheLoaderConfig--> - <loaders passivation="true" shared="true"> - <preload> - <node fqn="/a/b/c"/> - <node fqn="/f/r/s"/> - </preload> - - <!-- 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"> - <properties> - cache.jdbc.table.name=jbosscache - cache.jdbc.table.create=true - cache.jdbc.table.drop=true - </properties> - <singletonStore enabled="true" class="org.jboss.cache.loader.SingletonStoreCacheLoader"> + <!-- 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"> <properties> - pushStateWhenCoordinator=true - pushStateWhenCoordinatorTimeout=20000 + cache.jdbc.table.name=jbosscache + cache.jdbc.table.create=true + cache.jdbc.table.drop=true </properties> - </singletonStore> - </loader> - </loaders> + <singletonStore enabled="true" class="org.jboss.cache.loader.SingletonStoreCacheLoader"> + <properties> + pushStateWhenCoordinator=true + pushStateWhenCoordinatorTimeout=20000 + </properties> + </singletonStore> + </loader> + </loaders> - <!-- this is new behavior added within 3.x only. it support configuring custom interceptors through configurations --> - <customInterceptors> - <interceptor position="first" class="org.jboss.cache.config.parsing.custominterceptors.AaaCustomInterceptor"> - <attribute name="attrOne">value1</attribute> - <attribute name="attrTwo">value2</attribute> - <attribute name="attrThree">value3</attribute> - </interceptor> - <interceptor position="last" class="org.jboss.cache.config.parsing.custominterceptors.BbbCustomInterceptor"/> - <interceptor index="3" class="org.jboss.cache.config.parsing.custominterceptors.AaaCustomInterceptor"/> - <interceptor before="org.jboss.cache.interceptors.CallInterceptor" - class="org.jboss.cache.config.parsing.custominterceptors.BbbCustomInterceptor"/> - <interceptor after="org.jboss.cache.interceptors.CallInterceptor" - class="org.jboss.cache.config.parsing.custominterceptors.AaaCustomInterceptor"/> - </customInterceptors> + <!-- this is new behavior added within 3.x only. it support configuring custom interceptors through configurations --> + <customInterceptors> + <interceptor position="first" class="org.jboss.cache.config.parsing.custominterceptors.AaaCustomInterceptor"> + <property name="attrOne" value="value1"/> + <property name="attrTwo" value="value2"/> + </interceptor> + <interceptor position="last" class="org.jboss.cache.config.parsing.custominterceptors.BbbCustomInterceptor"/> + <interceptor index="3" class="org.jboss.cache.config.parsing.custominterceptors.AaaCustomInterceptor"/> + <interceptor before="org.jboss.cache.interceptors.CallInterceptor" + class="org.jboss.cache.config.parsing.custominterceptors.BbbCustomInterceptor"/> + <interceptor after="org.jboss.cache.interceptors.CallInterceptor" + class="org.jboss.cache.config.parsing.custominterceptors.AaaCustomInterceptor"/> + </customInterceptors> - <!-- the number of threads to use for asynchronous cache listeners - defaults to 1 --> - <listeners asyncPoolSize="5"/> - <invocationBatching enabled="true"/> + <!-- the number of threads to use for asynchronous cache listeners - defaults to 1 --> </jbosscache> Modified: core/branches/flat/src/test/resources/configs/parser-test.xml =================================================================== --- core/branches/flat/src/test/resources/configs/parser-test.xml 2008-11-13 18:08:44 UTC (rev 7132) +++ core/branches/flat/src/test/resources/configs/parser-test.xml 2008-11-13 18:15:23 UTC (rev 7133) @@ -5,113 +5,97 @@ <jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:jboss:jbosscache-core:config:3.0"> + <!-- perCache -> differrent EntryFactory--> + <locking isolationLevel="REPEATABLE_READ" lockParentForChildInsertRemove="true" lockAcquisitionTimeout="10234" + nodeLockingScheme="mvcc" writeSkewCheck="false" concurrencyLevel="21"/> - <locking isolationLevel="REPEATABLE_READ" lockParentForChildInsertRemove="true" lockAcquisitionTimeout="10234" - nodeLockingScheme="mvcc" writeSkewCheck="false" concurrencyLevel="21"/> + <!-- perCM --> + <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup" + syncRollbackPhase="true" syncCommitPhase="true"/> - <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup" - syncRollbackPhase="true" syncCommitPhase="true"/> + <jmxStatistics enabled="false"/> - <!-- serialization related configuration, used for replication and cache loading --> - <serialization objectInputStreamPoolSize="12" objectOutputStreamPoolSize="14" version="1.2.4" - marshallerClass="some.Clazz" useLazyDeserialization="true" useRegionBasedMarshalling="true"/> + <startup regionsInactiveOnStartup="true"/> + <shutdown hookBehavior="REGISTER"/> + <listeners asyncPoolSize="5"/> + <!-- perCache --> + <invocationBatching enabled="true"/> - <replication> - <sync replTimeout="15421"/> - <buddy enabled="true" poolName="myBuddyPoolReplicationGroup" communicationTimeout="2000"> - <dataGravitation auto="true" removeOnFind="true" searchBackupTrees="true"/> - <locator class="org.jboss.cache.buddyreplication.NextMemberBuddyLocator"> - <properties> - numBuddies = 1 - ignoreColocatedBuddies = true - </properties> - </locator> - </buddy> - </replication> + <!-- per CM--> + <!-- serialization related configuration, used for replication and cache loading --> + <serialization objectInputStreamPoolSize="12" objectOutputStreamPoolSize="14" version="1.2.4" + marshallerClass="some.Clazz" useLazyDeserialization="true" useRegionBasedMarshalling="true"/> - <stateRetrieval timeout="15124" fetchInMemoryState="true"/> - <startup regionsInactiveOnStartup="true"/> - <shutdown hookBehavior="REGISTER"/> + <!-- per Cache --> + <clustering mode="replication" clusterName="JBossCache-cluster"> + <stateRetrieval timeout="15124" fetchInMemoryState="true"/> + <buddy enabled="true" poolName="myBuddyPoolReplicationGroup" communicationTimeout="2000"> + <dataGravitation auto="true" removeOnFind="true" searchBackupTrees="true"/> + <locator class="org.jboss.cache.buddyreplication.NextMemberBuddyLocator"> + <properties> + numBuddies = 1 + ignoreColocatedBuddies = true + </properties> + </locator> + </buddy> + <sync replTimeout="15421"/> + <jgroupsConfig multiplexerStack="file_name"/> + </clustering> - <transport clusterName="JBossCache-Cluster" multiplexerStack="file_name"> - <jgroupsConfig> - <PING timeout="2000" num_initial_members="3"/> - <MERGE2 max_interval="30000" min_interval="10000"/> - <FD_SOCK/> - <FD timeout="10000" max_tries="5" shun="true"/> - <VERIFY_SUSPECT timeout="1500"/> - <pbcast.NAKACK use_mcast_xmit="false" gc_lag="0" - retransmit_timeout="300,600,1200,2400,4800" - discard_delivered_msgs="true"/> - <UNICAST timeout="300,600,1200,2400,3600"/> - <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000" - max_bytes="400000"/> - <pbcast.GMS print_local_addr="true" join_timeout="5000" shun="false" - view_bundling="true" view_ack_collection_timeout="5000"/> - <FRAG2 frag_size="60000"/> - <pbcast.STREAMING_STATE_TRANSFER use_reading_thread="true"/> - <!-- <pbcast.STATE_TRANSFER/> --> - <pbcast.FLUSH timeout="0"/> - </jgroupsConfig> - </transport> + <!-- per cache, 1) algo/cache 2) what/cache 3) collecting data 4) timer thread / per CM --> + <eviction wakeUpInterval="5"> + <default algorithmClass="org.jboss.cache.eviction.LRUAlgorithm" eventQueueSize="200000"> + <property name="maxNodes" value="5000"/> + <property name="timeToLive" value="1000"/> + </default> + <region name="/org/jboss/data"> + <property name="timeToLive" value="1002"/> + </region> + <region name="/org/jboss/xyz" algorithmClass="org.jboss.cache.eviction.MRUAlgorithm" eventQueueSize="21"> + <property name="maxNodes" value="2103"/> + <property name="minTimeToLive" value="22"/> + </region> + </eviction> + <!-- cacheLoaders/Cache; optimization - reusing CL through caches --> + <!-- this should be deprecated in 3.0 and should be replaced with CacheLoaderConfig--> + <loaders passivation="true" shared="true"> + <preload> + <node fqn="/a/b/c"/> + <node fqn="/f/r/s"/> + </preload> - <jmxStatistics enabled="false"/> - - <eviction wakeUpInterval="5"> - <default algorithmClass="org.jboss.starobrno.eviction.algorithms.lru.LRUAlgorithm" eventQueueSize="200000"> - <attribute name="maxNodes">5000</attribute> - <attribute name="timeToLive">1000</attribute> - </default> - <region name="/org/jboss/data"> - <attribute name="timeToLive">1002</attribute> - </region> - <region name="/org/jboss/xyz" algorithmClass="org.jboss.starobrno.eviction.algorithms.mru.MRUAlgorithm" eventQueueSize="21"> - <attribute name="maxNodes">2103</attribute> - <attribute name="minTimeToLive">22</attribute> - </region> - </eviction> - - <!-- this should be deprecated in 3.0 and should be replaced with CacheLoaderConfig--> - <loaders passivation="true" shared="true"> - <preload> - <node fqn="/a/b/c"/> - <node fqn="/f/r/s"/> - </preload> - - <!-- 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"> - <properties> - cache.jdbc.table.name=jbosscache - cache.jdbc.table.create=true - cache.jdbc.table.drop=true - </properties> - <singletonStore enabled="true" class="org.jboss.cache.loader.SingletonStoreCacheLoader"> + <!-- 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"> <properties> - pushStateWhenCoordinator=true - pushStateWhenCoordinatorTimeout=20000 + cache.jdbc.table.name=jbosscache + cache.jdbc.table.create=true + cache.jdbc.table.drop=true </properties> - </singletonStore> - </loader> - </loaders> + <singletonStore enabled="true" class="org.jboss.cache.loader.SingletonStoreCacheLoader"> + <properties> + pushStateWhenCoordinator=true + pushStateWhenCoordinatorTimeout=20000 + </properties> + </singletonStore> + </loader> + </loaders> - <!-- this is new behavior added within 3.x only. it support configuring custom interceptors through configurations --> - <customInterceptors> - <interceptor position="first" class="org.jboss.cache.config.parsing.custominterceptors.AaaCustomInterceptor"> - <attribute name="attrOne">value1</attribute> - <attribute name="attrTwo">value2</attribute> - <attribute name="attrThree">value3</attribute> - </interceptor> - <interceptor position="last" class="org.jboss.cache.config.parsing.custominterceptors.BbbCustomInterceptor"/> - <interceptor index="3" class="org.jboss.cache.config.parsing.custominterceptors.AaaCustomInterceptor"/> - <interceptor before="org.jboss.cache.interceptors.CallInterceptor" - class="org.jboss.cache.config.parsing.custominterceptors.BbbCustomInterceptor"/> - <interceptor after="org.jboss.cache.interceptors.CallInterceptor" - class="org.jboss.cache.config.parsing.custominterceptors.AaaCustomInterceptor"/> - </customInterceptors> + <!-- per CacheInstance --> + <!-- this is new behavior added within 3.x only. it support configuring custom interceptors through configurations --> + <customInterceptors> + <interceptor position="first" class="org.jboss.cache.config.parsing.custominterceptors.AaaCustomInterceptor"> + <property name="attrOne" value="value1"/> + <property name="attrTwo" value="value2"/> + </interceptor> + <interceptor position="last" class="org.jboss.cache.config.parsing.custominterceptors.BbbCustomInterceptor"/> + <interceptor index="3" class="org.jboss.cache.config.parsing.custominterceptors.AaaCustomInterceptor"/> + <interceptor before="org.jboss.cache.interceptors.CallInterceptor" + class="org.jboss.cache.config.parsing.custominterceptors.BbbCustomInterceptor"/> + <interceptor after="org.jboss.cache.interceptors.CallInterceptor" + class="org.jboss.cache.config.parsing.custominterceptors.AaaCustomInterceptor"/> + </customInterceptors> - <!-- the number of threads to use for asynchronous cache listeners - defaults to 1 --> - <listeners asyncPoolSize="5"/> - <invocationBatching enabled="true"/> + <!-- the number of threads to use for asynchronous cache listeners - defaults to 1 --> </jbosscache> Modified: core/branches/flat/src/test/resources/configs/policyPerRegion-eviction.xml =================================================================== --- core/branches/flat/src/test/resources/configs/policyPerRegion-eviction.xml 2008-11-13 18:08:44 UTC (rev 7132) +++ core/branches/flat/src/test/resources/configs/policyPerRegion-eviction.xml 2008-11-13 18:15:23 UTC (rev 7133) @@ -1,58 +1,26 @@ <?xml version="1.0" encoding="UTF-8"?> -<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns="urn:jboss:jbosscache-core:config:3.0"> - <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="15000"/> - <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/> - <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" - ucast_send_buf_size="640000" mcast_recv_buf_size="25000000" mcast_send_buf_size="640000" loopback="false" - discard_incompatible_packets="true" max_bundle_size="64000" max_bundle_timeout="30" - use_incoming_packet_handler="true" ip_ttl="2" enable_bundling="false" enable_diagnostics="true" - use_concurrent_stack="true" thread_naming_pattern="pl" thread_pool.enabled="true" - thread_pool.min_threads="1" thread_pool.max_threads="25" thread_pool.keep_alive_time="30000" - thread_pool.queue_enabled="true" thread_pool.queue_max_size="10" thread_pool.rejection_policy="Run" - oob_thread_pool.enabled="true" oob_thread_pool.min_threads="1" oob_thread_pool.max_threads="4" - oob_thread_pool.keep_alive_time="10000" oob_thread_pool.queue_enabled="true" - oob_thread_pool.queue_max_size="10" oob_thread_pool.rejection_policy="Run"/> - <PING timeout="2000" num_initial_members="3"/> - <MERGE2 max_interval="30000" min_interval="10000"/> - <FD_SOCK/> - <FD timeout="10000" max_tries="5" shun="true"/> - <VERIFY_SUSPECT timeout="1500"/> - <pbcast.NAKACK use_mcast_xmit="false" gc_lag="0" retransmit_timeout="300,600,1200,2400,4800" - discard_delivered_msgs="true"/> - <UNICAST timeout="300,600,1200,2400,3600"/> - <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000" max_bytes="400000"/> - <pbcast.GMS print_local_addr="true" join_timeout="5000" shun="false" view_bundling="true" - view_ack_collection_timeout="5000"/> - <FC max_credits="20000000" min_threshold="0.10"/> - <FRAG2 frag_size="60000"/> - <pbcast.STREAMING_STATE_TRANSFER use_reading_thread="true"/> - <pbcast.FLUSH timeout="0"/> - </jgroupsConfig> - </transport> - - <eviction wakeUpInterval="5000"> - <default algorithmClass="org.jboss.starobrno.eviction.algorithms.lru.LRUAlgorithm"> - <attribute name="maxNodes">5000</attribute> - <attribute name="timeToLive">1000000</attribute> - </default> - <region name="/org/jboss/data" algorithmClass="org.jboss.starobrno.eviction.algorithms.lfu.LFUAlgorithm"> - <attribute name="maxNodes">5000</attribute> - <attribute name="minNodes">1000</attribute> - </region> - <region name="/org/jboss/test/data" algorithmClass="org.jboss.starobrno.eviction.algorithms.fifo.FIFOAlgorithm"> - <attribute name="maxNodes">5</attribute> - </region> - <region name="/test/" algorithmClass="org.jboss.starobrno.eviction.algorithms.mru.MRUAlgorithm"> - <attribute name="maxNodes">10000</attribute> - </region> - <region name="/maxAgeTest/" algorithmClass="org.jboss.starobrno.eviction.algorithms.lru.LRUAlgorithm"> - <attribute name="maxNodes">10000</attribute> - <attribute name="timeToLive">8000</attribute> - <attribute name="maxAge">10000</attribute> - </region> - </eviction> +<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:jboss:jbosscache-core:config:3.0"> + <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/> + <clustering clusterName="JBossCache-Cluster123"/> + <eviction wakeUpInterval="5000"> + <default algorithmClass="org.jboss.cache.eviction.LRUAlgorithm"> + <property name="maxNodes" value="5000"/> + <property name="timeToLive" value="1000000"/> + </default> + <region name="/org/jboss/data" algorithmClass="org.jboss.cache.eviction.LFUAlgorithm"> + <property name="maxNodes" value="5000"/> + <property name="minNodes" value="1000"/> + </region> + <region name="/org/jboss/test/data" algorithmClass="org.jboss.cache.eviction.FIFOAlgorithm"> + <property name="maxNodes" value="5"/> + </region> + <region name="/test/" algorithmClass="org.jboss.cache.eviction.MRUAlgorithm"> + <property name="maxNodes" value="10000"/> + </region> + <region name="/maxAgeTest/" algorithmClass="org.jboss.cache.eviction.LRUAlgorithm"> + <property name="maxNodes" value="10000"/> + <property name="timeToLive" value="8000"/> + <property name="maxAge" value="10000"/> + </region> + </eviction> </jbosscache> Deleted: core/branches/flat/src/test/resources/configs/repl-with-cl.xml =================================================================== --- core/branches/flat/src/test/resources/configs/repl-with-cl.xml 2008-11-13 18:08:44 UTC (rev 7132) +++ core/branches/flat/src/test/resources/configs/repl-with-cl.xml 2008-11-13 18:15:23 UTC (rev 7133) @@ -1,83 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:jboss:jbosscache-core:config:3.0"> - - <!-- - isolationLevel : SERIALIZABLE - (not supported in mvcc) - REPEATABLE_READ (default) - READ_COMMITTED - READ_UNCOMMITTED (not supported in mvcc) - NONE - lockAcquisitionTimeout: max number of milliseconds to wait for a lock acquisition - nodeLockingScheme : mvcc (default) - optimistic - pessimistic - --> - <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="15000" nodeLockingScheme="mvcc"/> - - <!-- Configure the TransactionManager --> - <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/> - - <transport clusterName="JBossCache-Cluster"> - <jgroupsConfig> - <TCP recv_buf_size="20000000" use_send_queues="false" loopback="false" discard_incompatible_packets="true" - max_bundle_size="64000" max_bundle_timeout="30" use_incoming_packet_handler="true" enable_bundling="true" - enable_unicast_bundling="true" enable_diagnostics="true" use_concurrent_stack="true" - thread_naming_pattern="pl" thread_pool.enabled="true" thread_pool.min_threads="1" - thread_pool.max_threads="4" thread_pool.keep_alive_time="30000" thread_pool.queue_enabled="true" - thread_pool.queue_max_size="50000" thread_pool.rejection_policy="discard" oob_thread_pool.enabled="true" - oob_thread_pool.min_threads="2" oob_thread_pool.max_threads="4" oob_thread_pool.keep_alive_time="10000" - oob_thread_pool.queue_enabled="false" oob_thread_pool.queue_max_size="10" - oob_thread_pool.rejection_policy="Run"/> - <MPING mcast_addr="232.1.2.3" timeout="2000" num_initial_members="3"/> - <MERGE2 max_interval="30000" min_interval="10000"/> - <FD_SOCK/> - <FD timeout="10000" max_tries="5" shun="true"/> - <VERIFY_SUSPECT timeout="1500"/> - <pbcast.NAKACK use_mcast_xmit="false" gc_lag="0" retransmit_timeout="300,600,1200,2400,4800" - discard_delivered_msgs="true"/> - <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000" max_bytes="400000"/> - <pbcast.GMS print_local_addr="true" join_timeout="5000" join_retry_timeout="2000" shun="false" - view_bundling="true" view_ack_collection_timeout="5000"/> - <FC max_credits="5000000" min_threshold="0.20"/> - <FRAG2 frag_size="60000"/> - <pbcast.STREAMING_STATE_TRANSFER use_reading_thread="true"/> - <pbcast.FLUSH timeout="0"/> - </jgroupsConfig> - </transport> - - - <!-- Cache Passivation for Tree Cache - 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 --> - <loaders passivation="false" shared="false"> - <preload> - <node fqn="/"/> - </preload> - <!-- if passivation is true, only the first cache loader is used; the rest are ignored --> - <loader class="org.jboss.cache.loader.JDBCCacheLoader" async="false" fetchPersistentState="true" - ignoreModifications="false" purgeOnStartup="true"> - <properties> - cache.jdbc.table.name=jbosscache - cache.jdbc.table.create=true - cache.jdbc.table.drop=true - cache.jdbc.table.primarykey=jbosscache_pk - cache.jdbc.fqn.column=fqn - cache.jdbc.fqn.type=varchar(255) - cache.jdbc.node.column=node - cache.jdbc.node.type=blob - cache.jdbc.parent.column=parent - cache.jdbc.sql-concat=1 || 2 - cache.jdbc.driver = org.apache.derby.jdbc.EmbeddedDriver - cache.jdbc.url=jdbc:derby:jbossdb;create=true - cache.jdbc.user=user1 - cache.jdbc.password=user1 - </properties> - </loader> - </loaders> - <replication> - <sync replTimeout="30000"/> - </replication> - -</jbosscache> Deleted: core/branches/flat/src/test/resources/configs/repl-with-cl2.xml =================================================================== --- core/branches/flat/src/test/resources/configs/repl-with-cl2.xml 2008-11-13 18:08:44 UTC (rev 7132) +++ core/branches/flat/src/test/resources/configs/repl-with-cl2.xml 2008-11-13 18:15:23 UTC (rev 7133) @@ -1,87 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:jboss:jbosscache-core:config:3.0"> - - <!-- - isolationLevel : SERIALIZABLE - (not supported in mvcc) - REPEATABLE_READ (default) - READ_COMMITTED - READ_UNCOMMITTED (not supported in mvcc) - NONE - lockAcquisitionTimeout: max number of milliseconds to wait for a lock acquisition - nodeLockingScheme : mvcc (default) - optimistic - pessimistic - --> - <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="15000" nodeLockingScheme="mvcc"/> - - <!-- Configure the TransactionManager --> - <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/> - - <transport clusterName="JBossCache-Cluster"> - <jgroupsConfig> - <TCP recv_buf_size="20000000" use_send_queues="false" loopback="false" discard_incompatible_packets="true" - max_bundle_size="64000" max_bundle_timeout="30" use_incoming_packet_handler="true" enable_bundling="true" - enable_unicast_bundling="true" enable_diagnostics="true" use_concurrent_stack="true" - thread_naming_pattern="pl" thread_pool.enabled="true" thread_pool.min_threads="1" - thread_pool.max_threads="4" thread_pool.keep_alive_time="30000" thread_pool.queue_enabled="true" - thread_pool.queue_max_size="50000" thread_pool.rejection_policy="discard" oob_thread_pool.enabled="true" - oob_thread_pool.min_threads="2" oob_thread_pool.max_threads="4" oob_thread_pool.keep_alive_time="10000" - oob_thread_pool.queue_enabled="false" oob_thread_pool.queue_max_size="10" - oob_thread_pool.rejection_policy="Run"/> - <MPING mcast_addr="232.1.2.3" timeout="2000" num_initial_members="3"/> - <MERGE2 max_interval="30000" min_interval="10000"/> - <FD_SOCK/> - <FD timeout="10000" max_tries="5" shun="true"/> - <VERIFY_SUSPECT timeout="1500"/> - <pbcast.NAKACK use_mcast_xmit="false" gc_lag="0" retransmit_timeout="300,600,1200,2400,4800" - discard_delivered_msgs="true"/> - <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000" max_bytes="400000"/> - <pbcast.GMS print_local_addr="true" join_timeout="5000" join_retry_timeout="2000" shun="false" - view_bundling="true" view_ack_collection_timeout="5000"/> - <FC max_credits="5000000" min_threshold="0.20"/> - <FRAG2 frag_size="60000"/> - <pbcast.STREAMING_STATE_TRANSFER use_reading_thread="true"/> - <pbcast.FLUSH timeout="0"/> - </jgroupsConfig> - </transport> - - <stateRetrieval fetchInMemoryState="false" timeout="0"/> - - - <!-- Cache Passivation for Tree Cache - 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 --> - <loaders passivation="false" shared="false"> - <preload> - <node fqn="/"/> - </preload> - <!-- if passivation is true, only the first cache loader is used; the rest are ignored --> - <loader class="org.jboss.cache.loader.JDBCCacheLoader" async="false" fetchPersistentState="true" - ignoreModifications="false" purgeOnStartup="true"> - <properties> - cache.jdbc.table.name=jbosscache - cache.jdbc.table.create=true - cache.jdbc.table.drop=true - cache.jdbc.table.primarykey=jbosscache_pk - cache.jdbc.fqn.column=fqn - cache.jdbc.fqn.type=varchar(255) - cache.jdbc.node.column=node - cache.jdbc.node.type=blob - cache.jdbc.parent.column=parent - cache.jdbc.sql-concat=1 || 2 - cache.jdbc.driver = org.apache.derby.jdbc.EmbeddedDriver - cache.jdbc.url=jdbc:derby:jbossdb2;create=true - cache.jdbc.user=user1 - cache.jdbc.password=user1 - cache.jdbc.batch.enable=true - cache.jdbc.batch.size=1000 - </properties> - </loader> - </loaders> - - <replication> - <sync replTimeout="30000"/> - </replication> -</jbosscache> Modified: core/branches/flat/src/test/resources/configs/replSync.xml =================================================================== --- core/branches/flat/src/test/resources/configs/replSync.xml 2008-11-13 18:08:44 UTC (rev 7132) +++ core/branches/flat/src/test/resources/configs/replSync.xml 2008-11-13 18:15:23 UTC (rev 7133) @@ -1,40 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns="urn:jboss:jbosscache-core:config:3.0"> - <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="10000"/> - <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/> - <serialization useRegionBasedMarshalling="true"/> - <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" - ucast_send_buf_size="640000" mcast_recv_buf_size="25000000" mcast_send_buf_size="640000" loopback="false" - discard_incompatible_packets="true" max_bundle_size="64000" max_bundle_timeout="30" - use_incoming_packet_handler="true" ip_ttl="2" enable_bundling="false" enable_diagnostics="true" - use_concurrent_stack="true" thread_naming_pattern="pl" thread_pool.enabled="true" - thread_pool.min_threads="1" thread_pool.max_threads="25" thread_pool.keep_alive_time="30000" - thread_pool.queue_enabled="true" thread_pool.queue_max_size="10" thread_pool.rejection_policy="Run" - oob_thread_pool.enabled="true" oob_thread_pool.min_threads="1" oob_thread_pool.max_threads="4" - oob_thread_pool.keep_alive_time="10000" oob_thread_pool.queue_enabled="true" - oob_thread_pool.queue_max_size="10" oob_thread_pool.rejection_policy="Run"/> - <PING timeout="2000" num_initial_members="3"/> - <MERGE2 max_interval="30000" min_interval="10000"/> - <FD_SOCK/> - <FD timeout="10000" max_tries="5" shun="true"/> - <VERIFY_SUSPECT timeout="1500"/> - <pbcast.NAKACK use_mcast_xmit="false" gc_lag="0" retransmit_timeout="300,600,1200,2400,4800" - discard_delivered_msgs="true"/> - <UNICAST timeout="300,600,1200,2400,3600"/> - <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000" max_bytes="400000"/> - <pbcast.GMS print_local_addr="true" join_timeout="5000" shun="false" view_bundling="true" - view_ack_collection_timeout="5000"/> - <FRAG2 frag_size="60000"/> - <pbcast.STREAMING_STATE_TRANSFER use_reading_thread="true"/> - <pbcast.FLUSH timeout="0"/> - </jgroupsConfig> - </transport> +<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:jboss:jbosscache-core:config:3.0"> - <replication> - <sync replTimeout="15000"/> - </replication> + <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/> + <serialization useRegionBasedMarshalling="true"/> + <clustering> + <stateRetrieval fetchInMemoryState="true" timeout="15000"/> + <jgroupsConfig configFile="udp.xml"/> + <sync replTimeout="15000"/> + </clustering> </jbosscache> Modified: core/branches/flat/src/test/resources/configs/string-property-replaced.xml =================================================================== --- core/branches/flat/src/test/resources/configs/string-property-replaced.xml 2008-11-13 18:08:44 UTC (rev 7132) +++ core/branches/flat/src/test/resources/configs/string-property-replaced.xml 2008-11-13 18:15:23 UTC (rev 7133) @@ -1,44 +1,45 @@ <?xml version="1.0" encoding="UTF-8"?> -<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns="urn:jboss:jbosscache-core:config:3.0"> - <locking lockAcquisitionTimeout="${test.property.LockAcquisitionTimeout:15000}" - nodeLockingScheme="${test.property.NodeLockingScheme:OPTIMISTIC}"/> - <transaction syncCommitPhase="${test.property.SyncCommitPhase:true}" syncRollbackPhase="true"/> - <serialization useRegionBasedMarshalling="true"/> - <stateRetrieval fetchInMemoryState="false" timeout="20000"/> - <startup regionsInactiveOnStartup="true"/> - <transport clusterName="optimistic-entity" multiplexerStack="udp-sync"> - <jgroupsConfig/> - </transport> - <replication> - <sync replTimeout="20000"/> - <buddy enabled="${test.property.BuddyReplicationConfig.enabled:true}" - poolName="${test.property.BuddyReplicationConfig.buddyPoolName:default}" communicationTimeout="2000"> - <dataGravitation auto="false" removeOnFind="true" searchBackupTrees="true"/> - <locator class="org.jboss.cache.buddyreplication.NextMemberBuddyLocator"> +<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:jboss:jbosscache-core:config:3.0"> + + <locking lockAcquisitionTimeout="${test.property.LockAcquisitionTimeout:15000}" + nodeLockingScheme="${test.property.NodeLockingScheme:MVCC}"/> + + <transaction syncCommitPhase="${test.property.SyncCommitPhase:true}" syncRollbackPhase="true"/> + + <serialization useRegionBasedMarshalling="true"/> + <clustering> + <stateRetrieval fetchInMemoryState="false" timeout="20000"/> + <jgroupsConfig multiplexerStack="udp-sync"/> + <sync replTimeout="20000"/> + <buddy enabled="${test.property.BuddyReplicationConfig.enabled:true}" + poolName="${test.property.BuddyReplicationConfig.buddyPoolName:default}" communicationTimeout="2000"> + <dataGravitation auto="false" removeOnFind="true" searchBackupTrees="true"/> + <locator class="org.jboss.cache.buddyreplication.NextMemberBuddyLocator"> + <properties> + ignoreColocatedBuddies = true + numBuddies = ${test.property.BuddyReplicationConfig.numBuddies:1} + </properties> + </locator> + </buddy> + </clustering> + + <startup regionsInactiveOnStartup="true"/> + <eviction wakeUpInterval="5000"> + <default + algorithmClass="${test.property.EvictionPolicyConfig.policyClass:org.jboss.cache.eviction.LRUAlgorithm}"> + <property name="maxNodes" value="${test.property.EvictionPolicyConfig.maxNodes:5000}"/> + <property name="timeToLive" value="1000000"/> + </default> + </eviction> + <loaders passivation="true" shared="false"> + <preload> + <node fqn="/"/> + </preload> + <loader class="org.jboss.cache.loader.FileCacheLoader" async="false" fetchPersistentState="true" + ignoreModifications="false"> <properties> - ignoreColocatedBuddies = true - numBuddies = ${test.property.BuddyReplicationConfig.numBuddies:1} + location=${test.property.CacheLoaderConfiguration.location,java.io.tmpdir:/tmp} </properties> - </locator> - </buddy> - </replication> - <eviction wakeUpInterval="5000"> - <default - algorithmClass="${test.property.EvictionPolicyConfig.policyClass:org.jboss.starobrno.eviction.algorithms.lru.LRUAlgorithm}"> - <attribute name="maxNodes">${test.property.EvictionPolicyConfig.maxNodes:5000}</attribute> - <attribute name="timeToLive">1000000</attribute> - </default> - </eviction> - <loaders passivation="true" shared="false"> - <preload> - <node fqn="/"/> - </preload> - <loader class="org.jboss.cache.loader.FileCacheLoader" async="false" fetchPersistentState="true" - ignoreModifications="false"> - <properties> - location=${test.property.CacheLoaderConfiguration.location,java.io.tmpdir:/tmp} - </properties> - </loader> - </loaders> + </loader> + </loaders> </jbosscache> Deleted: core/branches/flat/src/test/resources/jbc2-registry-configs.xml =================================================================== (Binary files differ) Modified: core/branches/flat/src/test/resources/unit-test-cache-service.xml =================================================================== --- core/branches/flat/src/test/resources/unit-test-cache-service.xml 2008-11-13 18:08:44 UTC (rev 7132) +++ core/branches/flat/src/test/resources/unit-test-cache-service.xml 2008-11-13 18:15:23 UTC (rev 7133) @@ -1,316 +1,316 @@ <?xml version="1.0" encoding="UTF-8"?> <jbosscache xmlns="urn:jboss:jbosscache-core:config:3.0"> - <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="10000"/> - <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/> - <serialization useRegionBasedMarshalling="false"/> - <stateRetrieval fetchInMemoryState="true" timeout="15000"/> - <transport clusterName="JBossCache-Cluster"/> - <replication> - <sync replTimeout="15000"/> - </replication> - <eviction wakeUpInterval="2000"> - <default algorithmClass="org.jboss.starobrno.eviction.algorithms.lru.LRUAlgorithm"> - <attribute name="maxNodes">5000</attribute> - <attribute name="timeToLive">1000</attribute> - </default> - <region name="/org/jboss/data"> - <attribute name="maxNodes">5000</attribute> - <attribute name="timeToLive">1000</attribute> - </region> - <region name="/org/jboss/test/data"> - <attribute name="maxNodes">5</attribute> - <attribute name="timeToLive">4</attribute> - </region> - </eviction> - <loaders passivation="true" shared="false"> - <preload> - <node fqn="/"/> - </preload> - <loader class="org.jboss.cache.loader.FileCacheLoader" async="false" fetchPersistentState="true" - ignoreModifications="false"> - <properties/> - </loader> - </loaders> + <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="10000"/> + <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/> + <serialization useRegionBasedMarshalling="false"/> + <clustering> + <sync replTimeout="15000"/> + <stateRetrieval fetchInMemoryState="true" timeout="15000"/> + </clustering> - <protocol_stacks> - <stack name="udp" - description="Default: IP multicast based stack, with flow control and message bundling"> - <config> - <UDP mcast_addr="228.10.10.10" - mcast_port="45588" - tos="8" - ucast_recv_buf_size="20000000" - ucast_send_buf_size="640000" - mcast_recv_buf_size="25000000" - mcast_send_buf_size="640000" - loopback="false" - discard_incompatible_packets="true" - max_bundle_size="64000" - max_bundle_timeout="30" - use_incoming_packet_handler="true" - ip_ttl="2" - enable_bundling="true" - enable_diagnostics="true" + <eviction wakeUpInterval="2000"> + <default algorithmClass="org.jboss.cache.eviction.LRUAlgorithm"> + <property name="maxNodes" value="5000"/> + <property name="timeToLive" value="1000"/> + </default> + <region name="/org/jboss/data"> + <property name="maxNodes" value="5000"/> + <property name="timeToLive" value="1000"/> + </region> + <region name="/org/jboss/test/data"> + <property name="maxNodes" value="5"/> + <property name="timeToLive" value="4"/> + </region> + </eviction> + <loaders passivation="true" shared="false"> + <preload> + <node fqn="/"/> + </preload> + <loader class="org.jboss.cache.loader.FileCacheLoader" async="false" fetchPersistentState="true" + ignoreModifications="false"> + <properties/> + </loader> + </loaders> - use_concurrent_stack="true" + <protocol_stacks> + <stack name="udp" + description="Default: IP multicast based stack, with flow control and message bundling"> + <config> + <UDP mcast_addr="228.10.10.10" + mcast_port="45588" + tos="8" + ucast_recv_buf_size="20000000" + ucast_send_buf_size="640000" + mcast_recv_buf_size="25000000" + mcast_send_buf_size="640000" + loopback="false" + discard_incompatible_packets="true" + max_bundle_size="64000" + max_bundle_timeout="30" + use_incoming_packet_handler="true" + ip_ttl="2" + enable_bundling="true" + enable_diagnostics="true" - thread_naming_pattern="pl" + use_concurrent_stack="true" - thread_pool.enabled="true" - thread_pool.min_threads="1" - thread_pool.max_threads="25" - thread_pool.keep_alive_time="30000" - thread_pool.queue_enabled="false" - thread_pool.queue_max_size="10" - thread_pool.rejection_policy="Run" + thread_naming_pattern="pl" - oob_thread_pool.enabled="true" - oob_thread_pool.min_threads="1" - oob_thread_pool.max_threads="4" - oob_thread_pool.keep_alive_time="10000" - oob_thread_pool.queue_enabled="false" - oob_thread_pool.queue_max_size="10" - oob_thread_pool.rejection_policy="Run"/> + thread_pool.enabled="true" + thread_pool.min_threads="1" + thread_pool.max_threads="25" + thread_pool.keep_alive_time="30000" + thread_pool.queue_enabled="false" + thread_pool.queue_max_size="10" + thread_pool.rejection_policy="Run" - <PING timeout="2000" num_initial_members="3"/> - <MERGE2 max_interval="30000" min_interval="10000"/> - <FD_SOCK/> - <!-- - Note that this is an atypically short timeout and a small number of retries - configured this way to speed up unit testing, since we know all nodes run in the same JVM - and hence failure detections will be very quick. - --> - <FD timeout="1000" max_tries="2" shun="true"/> - <VERIFY_SUSPECT timeout="250"/> - <!-- this is a more typical configuration of FD and VERIFY_SUSPECT--> - <!--<FD timeout="10000" max_tries="5" shun="true"/>--> - <!--<VERIFY_SUSPECT timeout="1500"/>--> - <pbcast.NAKACK use_mcast_xmit="false" gc_lag="0" - retransmit_timeout="300,600" - discard_delivered_msgs="true"/> - <UNICAST timeout="300,600"/> - <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000" - max_bytes="400000"/> - <pbcast.GMS print_local_addr="false" join_timeout="1000" shun="false" - view_bundling="true" view_ack_collection_timeout="1000"/> - <FC max_credits="20000000" min_threshold="0.10"/> - <FRAG2 frag_size="60000"/> - <pbcast.STREAMING_STATE_TRANSFER/> - <!-- <pbcast.STATE_TRANSFER/> --> - <pbcast.FLUSH timeout="0"/> - </config> - </stack> + oob_thread_pool.enabled="true" + oob_thread_pool.min_threads="1" + oob_thread_pool.max_threads="4" + oob_thread_pool.keep_alive_time="10000" + oob_thread_pool.queue_enabled="false" + oob_thread_pool.queue_max_size="10" + oob_thread_pool.rejection_policy="Run"/> - <stack name="udp-sync" - description="IP multicast based stack, without flow control and without message bundling. This should be used + <PING timeout="2000" num_initial_members="3"/> + <MERGE2 max_interval="30000" min_interval="10000"/> + <FD_SOCK/> + <!-- + Note that this is an atypically short timeout and a small number of retries + configured this way to speed up unit testing, since we know all nodes run in the same JVM + and hence failure detections will be very quick. + --> + <FD timeout="1000" max_tries="2" shun="true"/> + <VERIFY_SUSPECT timeout="250"/> + <!-- this is a more typical configuration of FD and VERIFY_SUSPECT--> + <!--<FD timeout="10000" max_tries="5" shun="true"/>--> + <!--<VERIFY_SUSPECT timeout="1500"/>--> + <pbcast.NAKACK use_mcast_xmit="false" gc_lag="0" + retransmit_timeout="300,600" + discard_delivered_msgs="true"/> + <UNICAST timeout="300,600"/> + <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000" + max_bytes="400000"/> + <pbcast.GMS print_local_addr="false" join_timeout="1000" shun="false" + view_bundling="true" view_ack_collection_timeout="1000"/> + <FC max_credits="20000000" min_threshold="0.10"/> + <FRAG2 frag_size="60000"/> + <pbcast.STREAMING_STATE_TRANSFER/> + <!-- <pbcast.STATE_TRANSFER/> --> + <pbcast.FLUSH timeout="0"/> + </config> + </stack> + + <stack name="udp-sync" + description="IP multicast based stack, without flow control and without message bundling. This should be used instead of udp if (1) synchronous calls are used and (2) the message volume (rate and size) is not that large. Don't use this configuration if you send messages at a high sustained rate, or you might run out of memory"> - <config> - <UDP mcast_addr="228.10.10.10" - mcast_port="45588" - tos="8" - ucast_recv_buf_size="20000000" - ucast_send_buf_size="640000" - mcast_recv_buf_size="25000000" - mcast_send_buf_size="640000" - loopback="false" - discard_incompatible_packets="true" - max_bundle_size="64000" - max_bundle_timeout="30" - use_incoming_packet_handler="true" - ip_ttl="2" - enable_bundling="true" - enable_diagnostics="true" + <config> + <UDP mcast_addr="228.10.10.10" + mcast_port="45588" + tos="8" + ucast_recv_buf_size="20000000" + ucast_send_buf_size="640000" + mcast_recv_buf_size="25000000" + mcast_send_buf_size="640000" + loopback="false" + discard_incompatible_packets="true" + max_bundle_size="64000" + max_bundle_timeout="30" + use_incoming_packet_handler="true" + ip_ttl="2" + enable_bundling="true" + enable_diagnostics="true" - use_concurrent_stack="true" + use_concurrent_stack="true" - thread_naming_pattern="pl" + thread_naming_pattern="pl" - thread_pool.enabled="true" - thread_pool.min_threads="1" - thread_pool.max_threads="25" - thread_pool.keep_alive_time="30000" - thread_pool.queue_enabled="false" - thread_pool.queue_max_size="100" - thread_pool.rejection_policy="Run" + thread_pool.enabled="true" + thread_pool.min_threads="1" + thread_pool.max_threads="25" + thread_pool.keep_alive_time="30000" + thread_pool.queue_enabled="false" + thread_pool.queue_max_size="100" + thread_pool.rejection_policy="Run" - oob_thread_pool.enabled="true" - oob_thread_pool.min_threads="1" - oob_thread_pool.max_threads="4" - oob_thread_pool.keep_alive_time="10000" - oob_thread_pool.queue_enabled="false" - oob_thread_pool.queue_max_size="10" - oob_thread_pool.rejection_policy="Run"/> + oob_thread_pool.enabled="true" + oob_thread_pool.min_threads="1" + oob_thread_pool.max_threads="4" + oob_thread_pool.keep_alive_time="10000" + oob_thread_pool.queue_enabled="false" + oob_thread_pool.queue_max_size="10" + oob_thread_pool.rejection_policy="Run"/> - <PING timeout="2000" num_initial_members="3"/> - <MERGE2 max_interval="30000" min_interval="10000"/> - <FD_SOCK/> - <!-- - Note that this is an atypically short timeout and a small number of retries - configured this way to speed up unit testing, since we know all nodes run in the same JVM - and hence failure detections will be very quick. - --> - <FD timeout="1000" max_tries="2" shun="true"/> - <VERIFY_SUSPECT timeout="250"/> - <!-- this is a more typical configuration of FD and VERIFY_SUSPECT--> - <!--<FD timeout="10000" max_tries="5" shun="true"/>--> - <!--<VERIFY_SUSPECT timeout="1500"/>--> - <pbcast.NAKACK use_mcast_xmit="false" gc_lag="0" - retransmit_timeout="300,600,900,1200" - discard_delivered_msgs="true"/> - <UNICAST timeout="300,600,900,1200"/> - <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000" - max_bytes="400000"/> - <pbcast.GMS print_local_addr="false" join_timeout="1000" shun="false" - view_bundling="true" view_ack_collection_timeout="1000"/> - <FRAG2 frag_size="60000"/> - <pbcast.STREAMING_STATE_TRANSFER/> - <!-- <pbcast.STATE_TRANSFER/> --> - <pbcast.FLUSH timeout="0"/> - </config> - </stack> + <PING timeout="2000" num_initial_members="3"/> + <MERGE2 max_interval="30000" min_interval="10000"/> + <FD_SOCK/> + <!-- + Note that this is an atypically short timeout and a small number of retries + configured this way to speed up unit testing, since we know all nodes run in the same JVM + and hence failure detections will be very quick. + --> + <FD timeout="1000" max_tries="2" shun="true"/> + <VERIFY_SUSPECT timeout="250"/> + <!-- this is a more typical configuration of FD and VERIFY_SUSPECT--> + <!--<FD timeout="10000" max_tries="5" shun="true"/>--> + <!--<VERIFY_SUSPECT timeout="1500"/>--> + <pbcast.NAKACK use_mcast_xmit="false" gc_lag="0" + retransmit_timeout="300,600,900,1200" + discard_delivered_msgs="true"/> + <UNICAST timeout="300,600,900,1200"/> + <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000" + max_bytes="400000"/> + <pbcast.GMS print_local_addr="false" join_timeout="1000" shun="false" + view_bundling="true" view_ack_collection_timeout="1000"/> + <FRAG2 frag_size="60000"/> + <pbcast.STREAMING_STATE_TRANSFER/> + <!-- <pbcast.STATE_TRANSFER/> --> + <pbcast.FLUSH timeout="0"/> + </config> + </stack> - <stack name="tcp" - description="TCP based stack, with flow control and message bundling. This is usually used when IP + <stack name="tcp" + description="TCP based stack, with flow control and message bundling. This is usually used when IP multicasting cannot be used in a network, e.g. because it is disabled (routers discard multicast). Note that TCP.bind_addr and TCPPING.initial_hosts should be set, possibly via system properties, e.g. -Djgroups.bind_addr=192.168.5.2 and -Djgroups.tcpping.initial_hosts=192.168.5.2[7800]"> - <config> - <TCP start_port="7800" - loopback="true" - recv_buf_size="20000000" - send_buf_size="640000" - discard_incompatible_packets="true" - max_bundle_size="64000" - max_bundle_timeout="30" - use_incoming_packet_handler="true" - enable_bundling="true" - use_send_queues="false" - sock_conn_timeout="300" - skip_suspected_members="true" + <config> + <TCP start_port="7800" + loopback="true" + recv_buf_size="20000000" + send_buf_size="640000" + discard_incompatible_packets="true" + max_bundle_size="64000" + max_bundle_timeout="30" + use_incoming_packet_handler="true" + enable_bundling="true" + use_send_queues="false" + sock_conn_timeout="300" + skip_suspected_members="true" - use_concurrent_stack="true" + use_concurrent_stack="true" - thread_pool.enabled="true" - thread_pool.min_threads="1" - thread_pool.max_threads="25" - thread_pool.keep_alive_time="5000" - thread_pool.queue_enabled="false" - thread_pool.queue_max_size="100" - thread_pool.rejection_policy="run" + thread_pool.enabled="true" + thread_pool.min_threads="1" + thread_pool.max_threads="25" + thread_pool.keep_alive_time="5000" + thread_pool.queue_enabled="false" + thread_pool.queue_max_size="100" + thread_pool.rejection_policy="run" - oob_thread_pool.enabled="true" - oob_thread_pool.min_threads="1" - oob_thread_pool.max_threads="8" - oob_thread_pool.keep_alive_time="5000" - oob_thread_pool.queue_enabled="false" - oob_thread_pool.queue_max_size="100" - oob_thread_pool.rejection_policy="run"/> + oob_thread_pool.enabled="true" + oob_thread_pool.min_threads="1" + oob_thread_pool.max_threads="8" + oob_thread_pool.keep_alive_time="5000" + oob_thread_pool.queue_enabled="false" + oob_thread_pool.queue_max_size="100" + oob_thread_pool.rejection_policy="run"/> - <TCPPING timeout="3000" - initial_hosts="127.0.0.1[7800],127.0.0.1[7801]" - port_range="1" - num_initial_members="3"/> - <MERGE2 max_interval="100000" - min_interval="20000"/> - <FD_SOCK/> - <!-- - Note that this is an atypically short timeout and a small number of retries - configured this way to speed up unit testing, since we know all nodes run in the same JVM - and hence failure detections will be very quick. - --> - <FD timeout="1000" max_tries="5" shun="true"/> - <VERIFY_SUSPECT timeout="1500"/> - <BARRIER/> - <pbcast.NAKACK use_mcast_xmit="false" gc_lag="0" - retransmit_timeout="300,600,1200,2400,4800" - discard_delivered_msgs="true"/> - <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000" - max_bytes="400000"/> - <VIEW_SYNC avg_send_interval="60000"/> - <pbcast.GMS print_local_addr="false" join_timeout="3000" shun="true" - view_bundling="true"/> - <FC max_credits="2000000" - min_threshold="0.10"/> - <FRAG2 frag_size="60000"/> - <pbcast.STREAMING_STATE_TRANSFER/> - <!-- <pbcast.STATE_TRANSFER/> --> - <pbcast.FLUSH timeout="0"/> - </config> - </stack> + <TCPPING timeout="3000" + initial_hosts="127.0.0.1[7800],127.0.0.1[7801]" + port_range="1" + num_initial_members="3"/> + <MERGE2 max_interval="100000" + min_interval="20000"/> + <FD_SOCK/> + <!-- + Note that this is an atypically short timeout and a small number of retries + configured this way to speed up unit testing, since we know all nodes run in the same JVM + and hence failure detections will be very quick. + --> + <FD timeout="1000" max_tries="5" shun="true"/> + <VERIFY_SUSPECT timeout="1500"/> + <BARRIER/> + <pbcast.NAKACK use_mcast_xmit="false" gc_lag="0" + retransmit_timeout="300,600,1200,2400,4800" + discard_delivered_msgs="true"/> + <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000" + max_bytes="400000"/> + <VIEW_SYNC avg_send_interval="60000"/> + <pbcast.GMS print_local_addr="false" join_timeout="3000" shun="true" + view_bundling="true"/> + <FC max_credits="2000000" + min_threshold="0.10"/> + <FRAG2 frag_size="60000"/> + <pbcast.STREAMING_STATE_TRANSFER/> + <!-- <pbcast.STATE_TRANSFER/> --> + <pbcast.FLUSH timeout="0"/> + </config> + </stack> - <stack name="tcp-sync" - description="TCP based stack, without flow control and without message bundling. This is usually used when IP + <stack name="tcp-sync" + description="TCP based stack, without flow control and without message bundling. This is usually used when IP multicasting cannot be used in a network, e.g. because it is disabled (routers discard multicast). This configuration should be used instead of tcp when (1) synchronous calls are used and (2) the message volume (rate and size) is not that large"> - <config> - <TCP start_port="7800" - loopback="true" - recv_buf_size="20000000" - send_buf_size="640000" - discard_incompatible_packets="true" - max_bundle_size="64000" - max_bundle_timeout="30" - use_incoming_packet_handler="true" - enable_bundling="true" - use_send_queues="false" - sock_conn_timeout="300" - skip_suspected_members="true" + <config> + <TCP start_port="7800" + loopback="true" + recv_buf_size="20000000" + send_buf_size="640000" + discard_incompatible_packets="true" + max_bundle_size="64000" + max_bundle_timeout="30" + use_incoming_packet_handler="true" + enable_bundling="true" + use_send_queues="false" + sock_conn_timeout="300" + skip_suspected_members="true" - use_concurrent_stack="true" + use_concurrent_stack="true" - thread_pool.enabled="true" - thread_pool.min_threads="1" - thread_pool.max_threads="25" - thread_pool.keep_alive_time="5000" - thread_pool.queue_enabled="false" - thread_pool.queue_max_size="100" - thread_pool.rejection_policy="run" + thread_pool.enabled="true" + thread_pool.min_threads="1" + thread_pool.max_threads="25" + thread_pool.keep_alive_time="5000" + thread_pool.queue_enabled="false" + thread_pool.queue_max_size="100" + thread_pool.rejection_policy="run" - oob_thread_pool.enabled="true" - oob_thread_pool.min_threads="1" - oob_thread_pool.max_threads="8" - oob_thread_pool.keep_alive_time="5000" - oob_thread_pool.queue_enabled="false" - oob_thread_pool.queue_max_size="100" - oob_thread_pool.rejection_policy="run"/> + oob_thread_pool.enabled="true" + oob_thread_pool.min_threads="1" + oob_thread_pool.max_threads="8" + oob_thread_pool.keep_alive_time="5000" + oob_thread_pool.queue_enabled="false" + oob_thread_pool.queue_max_size="100" + oob_thread_pool.rejection_policy="run"/> - <TCPPING timeout="3000" - initial_hosts="127.0.0.1[7800],127.0.0.1[7801]" - port_range="1" - num_initial_members="3"/> - <MERGE2 max_interval="100000" - min_interval="20000"/> - <FD_SOCK/> - <!-- - Note that this is an atypically short timeout and a small number of retries - configured this way to speed up unit testing, since we know all nodes run in the same JVM - and hence failure detections will be very quick. - --> - <FD timeout="1000" max_tries="5" shun="true"/> - <VERIFY_SUSPECT timeout="1500"/> - <BARRIER/> - <pbcast.NAKACK use_mcast_xmit="false" gc_lag="0" - retransmit_timeout="300,600,1200,2400,4800" - discard_delivered_msgs="true"/> - <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000" - max_bytes="400000"/> - <VIEW_SYNC avg_send_interval="60000"/> - <pbcast.GMS print_local_addr="false" join_timeout="3000" shun="true" - view_bundling="true"/> - <FC max_credits="2000000" - min_threshold="0.10"/> - <FRAG2 frag_size="60000"/> - <pbcast.STREAMING_STATE_TRANSFER/> - <!-- <pbcast.STATE_TRANSFER/> --> - <pbcast.FLUSH timeout="0"/> - </config> - </stack> - </protocol_stacks> + <TCPPING timeout="3000" + initial_hosts="127.0.0.1[7800],127.0.0.1[7801]" + port_range="1" + num_initial_members="3"/> + <MERGE2 max_interval="100000" + min_interval="20000"/> + <FD_SOCK/> + <!-- + Note that this is an atypically short timeout and a small number of retries + configured this way to speed up unit testing, since we know all nodes run in the same JVM + and hence failure detections will be very quick. + --> + <FD timeout="1000" max_tries="5" shun="true"/> + <VERIFY_SUSPECT timeout="1500"/> + <BARRIER/> + <pbcast.NAKACK use_mcast_xmit="false" gc_lag="0" + retransmit_timeout="300,600,1200,2400,4800" + discard_delivered_msgs="true"/> + <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000" + max_bytes="400000"/> + <VIEW_SYNC avg_send_interval="60000"/> + <pbcast.GMS print_local_addr="false" join_timeout="3000" shun="true" + view_bundling="true"/> + <FC max_credits="2000000" + min_threshold="0.10"/> + <FRAG2 frag_size="60000"/> + <pbcast.STREAMING_STATE_TRANSFER/> + <!-- <pbcast.STATE_TRANSFER/> --> + <pbcast.FLUSH timeout="0"/> + </config> + </stack> + </protocol_stacks> </jbosscache>