[jbosscache-commits] JBoss Cache SVN: r7594 - in core/branches/flat/src: test/resources and 1 other directories.

jbosscache-commits at lists.jboss.org jbosscache-commits at lists.jboss.org
Mon Jan 26 05:24:59 EST 2009


Author: manik.surtani at jboss.com
Date: 2009-01-26 05:24:58 -0500 (Mon, 26 Jan 2009)
New Revision: 7594

Removed:
   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/external-jgroups-file.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/string-property-replaced.xml
   core/branches/flat/src/main/resources/config-samples/total-replication.xml
   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/policyPerRegion-eviction.xml
   core/branches/flat/src/test/resources/configs/replSync.xml
   core/branches/flat/src/test/resources/jbc3-registry-configs.xml
   core/branches/flat/src/test/resources/unit-test-cache-service.xml
Modified:
   core/branches/flat/src/test/resources/cache-jdbc.properties
Log:
Removed unnecessary cfg files

Deleted: core/branches/flat/src/main/resources/config-samples/buddy-replication.xml
===================================================================
--- core/branches/flat/src/main/resources/config-samples/buddy-replication.xml	2009-01-23 18:34:40 UTC (rev 7593)
+++ core/branches/flat/src/main/resources/config-samples/buddy-replication.xml	2009-01-26 10:24:58 UTC (rev 7594)
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:jboss:starobrno-core:config:1.0">
-
-    <transaction transactionManagerLookupClass="org.horizon.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"/>
-
-
-        <!-- 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>
-
-
-        <!-- 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">
-
-            <!--
-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>
-    </clustering>
-</jbosscache>

Deleted: core/branches/flat/src/main/resources/config-samples/cacheloader-enabled.xml
===================================================================
--- core/branches/flat/src/main/resources/config-samples/cacheloader-enabled.xml	2009-01-23 18:34:40 UTC (rev 7593)
+++ core/branches/flat/src/main/resources/config-samples/cacheloader-enabled.xml	2009-01-26 10:24:58 UTC (rev 7594)
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:jboss:starobrno-core:config:1.0">
-
-    <!-- Configure the TransactionManager -->
-    <transaction transactionManagerLookupClass="org.horizon.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>
-
-    <!-- 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>

Deleted: core/branches/flat/src/main/resources/config-samples/eviction-enabled.xml
===================================================================
--- core/branches/flat/src/main/resources/config-samples/eviction-enabled.xml	2009-01-23 18:34:40 UTC (rev 7593)
+++ core/branches/flat/src/main/resources/config-samples/eviction-enabled.xml	2009-01-26 10:24:58 UTC (rev 7594)
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:jboss:starobrno-core:config:1.0">
-
-    <!-- Configure the TransactionManager -->
-    <transaction transactionManagerLookupClass="org.horizon.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>
-
-        <!-- 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>

Deleted: core/branches/flat/src/main/resources/config-samples/external-jgroups-file.xml
===================================================================
--- core/branches/flat/src/main/resources/config-samples/external-jgroups-file.xml	2009-01-23 18:34:40 UTC (rev 7593)
+++ core/branches/flat/src/main/resources/config-samples/external-jgroups-file.xml	2009-01-26 10:24:58 UTC (rev 7594)
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:jboss:starobrno-core:config:1.0">
-
-    <!-- Configure the TransactionManager -->
-    <transaction transactionManagerLookupClass="org.horizon.transaction.GenericTransactionManagerLookup"/>
-
-    <clustering>
-        <async/>
-        <!--
-           Here we specify a path to an external JGroups configuration file.  First the classpath is scanned, and then
-           the filesystem for the file.  In this case, "udp.xml" ships with jgroups.jar and will be picked up by the
-           classloader.
-        -->
-        <jgroupsConfig configFile="udp.xml"/>
-    </clustering>
-</jbosscache>

Deleted: core/branches/flat/src/main/resources/config-samples/invalidation-async.xml
===================================================================
--- core/branches/flat/src/main/resources/config-samples/invalidation-async.xml	2009-01-23 18:34:40 UTC (rev 7593)
+++ core/branches/flat/src/main/resources/config-samples/invalidation-async.xml	2009-01-26 10:24:58 UTC (rev 7594)
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:jboss:starobrno-core:config:1.0">
-
-    <!-- Configure the TransactionManager -->
-    <transaction transactionManagerLookupClass="org.horizon.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"/>
-
-        <!-- 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>
-
-        <async/>
-        <!-- Alternatively, to use sync replication, comment out the element above and uncomment the element below.  -->
-        <!-- <sync /> -->
-
-    </clustering>
-</jbosscache>

Deleted: core/branches/flat/src/main/resources/config-samples/local.xml
===================================================================
--- core/branches/flat/src/main/resources/config-samples/local.xml	2009-01-23 18:34:40 UTC (rev 7593)
+++ core/branches/flat/src/main/resources/config-samples/local.xml	2009-01-26 10:24:58 UTC (rev 7594)
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:jboss:starobrno-core:config:1.0">
-
-    <!-- By not specifying the 'clustering' element, the cache runs in LOCAL mode. -->
-    <!-- Configure the TransactionManager -->
-    <transaction transactionManagerLookupClass="org.horizon.transaction.GenericTransactionManagerLookup"/>
-</jbosscache>

Deleted: core/branches/flat/src/main/resources/config-samples/multiplexer-enabled.xml
===================================================================
--- core/branches/flat/src/main/resources/config-samples/multiplexer-enabled.xml	2009-01-23 18:34:40 UTC (rev 7593)
+++ core/branches/flat/src/main/resources/config-samples/multiplexer-enabled.xml	2009-01-26 10:24:58 UTC (rev 7594)
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:jboss:starobrno-core:config:1.0">
-
-    <!-- Configure the TransactionManager -->
-    <transaction transactionManagerLookupClass="org.horizon.transaction.GenericTransactionManagerLookup"/>
-
-    <clustering>
-        <sync/>
-        <!-- Here is where we specify the multiplexer stack to use. -->
-        <jgroupsConfig multiplexerStack="fc-fast-minimalthreads"/>
-    </clustering>
-</jbosscache>

Deleted: core/branches/flat/src/main/resources/config-samples/string-property-replaced.xml
===================================================================
--- core/branches/flat/src/main/resources/config-samples/string-property-replaced.xml	2009-01-23 18:34:40 UTC (rev 7593)
+++ core/branches/flat/src/main/resources/config-samples/string-property-replaced.xml	2009-01-26 10:24:58 UTC (rev 7594)
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:jboss:starobrno-core:config:1.0">
-
-    <locking lockAcquisitionTimeout="${test.property.LockAcquisitionTimeout:15000}"/>
-
-    <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>
-                location=${test.property.CacheLoaderConfiguration.location,java.io.tmpdir:/tmp}
-            </properties>
-        </loader>
-    </loaders>
-</jbosscache>

Deleted: core/branches/flat/src/main/resources/config-samples/total-replication.xml
===================================================================
--- core/branches/flat/src/main/resources/config-samples/total-replication.xml	2009-01-23 18:34:40 UTC (rev 7593)
+++ core/branches/flat/src/main/resources/config-samples/total-replication.xml	2009-01-26 10:24:58 UTC (rev 7594)
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:jboss:starobrno-core:config:1.0">
-
-    <!-- Configure the TransactionManager -->
-    <transaction transactionManagerLookupClass="org.horizon.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"/>
-
-        </jgroupsConfig>
-
-        <sync/>
-        <!-- Alternatively, to use async replication, comment out the element above and uncomment the element below.  -->
-        <!-- <async /> -->
-
-    </clustering>
-</jbosscache>

Modified: core/branches/flat/src/test/resources/cache-jdbc.properties
===================================================================
--- core/branches/flat/src/test/resources/cache-jdbc.properties	2009-01-23 18:34:40 UTC (rev 7593)
+++ core/branches/flat/src/test/resources/cache-jdbc.properties	2009-01-26 10:24:58 UTC (rev 7594)
@@ -13,10 +13,6 @@
 cache.jdbc.node.column=node
 cache.jdbc.node.type=blob
 cache.jdbc.parent.column=parent
-# Specify your DBMS's string concatenation function syntax in the following manner: concat(1 , 2) -> '12'.
-# This syntax should work an most popular DBMS like oracle, db2, mssql, mysql, PostgreSQL. Derby - on which 
-#the tests are run does not support 'concat', but '1 || 2' . If no value is sepcified then concat(1 , 2) is used by default.
-cache.jdbc.sql-concat=1 || 2
 
 # JBoss Cache Table properties for Hypersonic, just overrides
 #cache.jdbc.node.type=OBJECT

Deleted: core/branches/flat/src/test/resources/configs/buddy-replication-cache.xml
===================================================================
--- core/branches/flat/src/test/resources/configs/buddy-replication-cache.xml	2009-01-23 18:34:40 UTC (rev 7593)
+++ core/branches/flat/src/test/resources/configs/buddy-replication-cache.xml	2009-01-26 10:24:58 UTC (rev 7594)
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xmlns="urn:jboss:starobrno-core:config:1.0">
-    <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="10000"/>
-    <transaction transactionManagerLookupClass="org.horizon.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>

Deleted: core/branches/flat/src/test/resources/configs/clonable-config.xml
===================================================================
--- core/branches/flat/src/test/resources/configs/clonable-config.xml	2009-01-23 18:34:40 UTC (rev 7593)
+++ core/branches/flat/src/test/resources/configs/clonable-config.xml	2009-01-26 10:24:58 UTC (rev 7594)
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xmlns="urn:jboss:starobrno-core:config:1.0">
-    <locking isolationLevel="SERIALIZABLE" lockAcquisitionTimeout="1"/>
-    <transaction transactionManagerLookupClass="org.horizon.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>
-                location=/tmp/FileCacheLoader
-            </properties>
-            <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>
-                location=/tmp/BdbjeCacheLoader
-            </properties>
-            <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>
-                location=/tmp/JdbmCacheLoader
-            </properties>
-            <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>
-                cache.jdbc.driver=com.foo.jdbc.Driver
-                cache.jdbc.url=foo://driver
-                cache.jdbc.user=sa
-                cache.jdbc.password=secret
-            </properties>
-            <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>
-                host=127.0.0.1\nport=12121
-            </properties>
-            <singletonStore enabled="false">
-                <properties>
-                    pushStateWhenCoordinator=true
-                    pushStateWhenCoordinatorTimeout=5000
-                </properties>
-            </singletonStore>
-        </loader>
-        <loader class="org.horizon.loader.ClusteredCacheLoader" async="false" fetchPersistentState="false"
-                ignoreModifications="false">
-            <properties>
-                timeout=500
-            </properties>
-            <singletonStore enabled="false">
-                <properties>
-                    pushStateWhenCoordinator=true
-                    pushStateWhenCoordinatorTimeout=5000
-                </properties>
-            </singletonStore>
-        </loader>
-    </loaders>
-</jbosscache>

Deleted: core/branches/flat/src/test/resources/configs/local-lru-eviction.xml
===================================================================
--- core/branches/flat/src/test/resources/configs/local-lru-eviction.xml	2009-01-23 18:34:40 UTC (rev 7593)
+++ core/branches/flat/src/test/resources/configs/local-lru-eviction.xml	2009-01-26 10:24:58 UTC (rev 7594)
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xmlns="urn:jboss:starobrno-core:config:1.0">
-
-    <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="15000"/>
-    <transaction transactionManagerLookupClass="org.horizon.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>

Deleted: core/branches/flat/src/test/resources/configs/local-passivation.xml
===================================================================
--- core/branches/flat/src/test/resources/configs/local-passivation.xml	2009-01-23 18:34:40 UTC (rev 7593)
+++ core/branches/flat/src/test/resources/configs/local-passivation.xml	2009-01-26 10:24:58 UTC (rev 7594)
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xmlns="urn:jboss:starobrno-core:config:1.0">
-
-    <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="15000"/>
-    <transaction transactionManagerLookupClass="org.horizon.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>

Deleted: core/branches/flat/src/test/resources/configs/local-tx.xml
===================================================================
--- core/branches/flat/src/test/resources/configs/local-tx.xml	2009-01-23 18:34:40 UTC (rev 7593)
+++ core/branches/flat/src/test/resources/configs/local-tx.xml	2009-01-26 10:24:58 UTC (rev 7594)
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xmlns="urn:jboss:starobrno-core:config:1.0">
-
-    <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="15000"/>
-    <transaction transactionManagerLookupClass="org.horizon.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>

Deleted: core/branches/flat/src/test/resources/configs/mixedPolicy-eviction.xml
===================================================================
--- core/branches/flat/src/test/resources/configs/mixedPolicy-eviction.xml	2009-01-23 18:34:40 UTC (rev 7593)
+++ core/branches/flat/src/test/resources/configs/mixedPolicy-eviction.xml	2009-01-26 10:24:58 UTC (rev 7594)
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xmlns="urn:jboss:starobrno-core:config:1.0">
-
-    <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="15000"/>
-    <transaction transactionManagerLookupClass="org.horizon.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>

Deleted: core/branches/flat/src/test/resources/configs/mux.xml
===================================================================
--- core/branches/flat/src/test/resources/configs/mux.xml	2009-01-23 18:34:40 UTC (rev 7593)
+++ core/branches/flat/src/test/resources/configs/mux.xml	2009-01-26 10:24:58 UTC (rev 7594)
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:jboss:starobrno-core:config:1.0">
-    <transaction transactionManagerLookupClass="org.horizon.transaction.GenericTransactionManagerLookup"/>
-    <clustering>
-        <stateRetrieval timeout="20000"/>
-        <jgroupsConfig multiplexerStack="tcp"/>
-    </clustering>
-</jbosscache>

Deleted: core/branches/flat/src/test/resources/configs/mvcc-repl-sync-br.xml
===================================================================
--- core/branches/flat/src/test/resources/configs/mvcc-repl-sync-br.xml	2009-01-23 18:34:40 UTC (rev 7593)
+++ core/branches/flat/src/test/resources/configs/mvcc-repl-sync-br.xml	2009-01-26 10:24:58 UTC (rev 7594)
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<jbosscache xmlns="urn:jboss:starobrno-core:config:1.0">
-    <transaction transactionManagerLookupClass="org.horizon.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>

Deleted: core/branches/flat/src/test/resources/configs/policyPerRegion-eviction.xml
===================================================================
--- core/branches/flat/src/test/resources/configs/policyPerRegion-eviction.xml	2009-01-23 18:34:40 UTC (rev 7593)
+++ core/branches/flat/src/test/resources/configs/policyPerRegion-eviction.xml	2009-01-26 10:24:58 UTC (rev 7594)
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:jboss:starobrno-core:config:1.0">
-    <transaction transactionManagerLookupClass="org.horizon.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/replSync.xml
===================================================================
--- core/branches/flat/src/test/resources/configs/replSync.xml	2009-01-23 18:34:40 UTC (rev 7593)
+++ core/branches/flat/src/test/resources/configs/replSync.xml	2009-01-26 10:24:58 UTC (rev 7594)
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:jboss:starobrno-core:config:1.0">
-
-    <transaction transactionManagerLookupClass="org.horizon.transaction.GenericTransactionManagerLookup"/>
-    <serialization useRegionBasedMarshalling="true"/>
-    <clustering>
-        <stateRetrieval fetchInMemoryState="true" timeout="15000"/>
-        <jgroupsConfig configFile="udp.xml"/>
-        <sync replTimeout="15000"/>
-    </clustering>
-</jbosscache>

Deleted: core/branches/flat/src/test/resources/jbc3-registry-configs.xml
===================================================================
--- core/branches/flat/src/test/resources/jbc3-registry-configs.xml	2009-01-23 18:34:40 UTC (rev 7593)
+++ core/branches/flat/src/test/resources/jbc3-registry-configs.xml	2009-01-26 10:24:58 UTC (rev 7594)
@@ -1,185 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<registry:cache-configs xmlns="urn:jboss:jbosscache-core:config:3.0"
-                        xmlns:registry="urn:jboss:jbosscache-core:cache-repo:3.0">
-
-    <!--
-     Various JBoss Cache configurations, suitable for different caching
-     uses (e.g. entities vs. queries).
-
-     In all cases, TransactionManager configuration not required.
-     Hibernate will plug in its own transaction manager integration.
-    -->
-
-
-    <!-- A config appropriate for entity/collection caching. -->
-    <registry:cache-config name="optimistic-entity">
-        <locking lockAcquisitionTimeout="15000" nodeLockingScheme="optimistic"/>
-        <transaction syncCommitPhase="true" syncRollbackPhase="true"
-                     transactionManagerLookupClass="org.horizon.transaction.GenericTransactionManagerLookup"/>
-        <serialization useRegionBasedMarshalling="true"/>
-        <startup regionsInactiveOnStartup="true"/>
-        <stateRetrieval fetchInMemoryState="false" timeout="20000"/>
-        <transport clusterName="optimistic-entity" multiplexerStack="udp-sync"/>
-        <invalidation>
-            <sync replTimeout="20000"/>
-        </invalidation>
-        <eviction wakeUpInterval="5000">
-            <default algorithmClass="org.horizon.eviction.algorithms.lru.LRUAlgorithm">
-                <attribute name="maxNodes">5000</attribute>
-                <attribute name="timeToLive">1000</attribute>
-            </default>
-            <region name="/TS">
-                <attribute name="maxNodes">0</attribute>
-                <attribute name="timeToLive">0</attribute>
-            </region>
-        </eviction>
-    </registry:cache-config>
-
-    <!-- A config appropriate for entity/collection caching that
- uses pessimistic locking -->
-    <registry:cache-config name="pessimistic-entity">
-        <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="15000" nodeLockingScheme="pessimistic"/>
-        <serialization useRegionBasedMarshalling="true"/>
-        <startup regionsInactiveOnStartup="true"/>
-        <stateRetrieval fetchInMemoryState="false" timeout="20000"/>
-        <transport clusterName="pessimistic-entity" multiplexerStack="udp-sync"/>
-        <invalidation>
-            <sync replTimeout="20000"/>
-        </invalidation>
-        <eviction wakeUpInterval="5000">
-            <default algorithmClass="org.horizon.eviction.algorithms.lru.LRUAlgorithm">
-                <attribute name="maxNodes">5000</attribute>
-                <attribute name="timeToLive">1000</attribute>
-            </default>
-            <region name="/TS">
-                <attribute name="maxNodes">0</attribute>
-                <attribute name="timeToLive">0</attribute>
-            </region>
-        </eviction>
-    </registry:cache-config>
-
-    <!-- A config appropriate for query caching. Does not replicate
-         queries. DO NOT STORE TIMESTAMPS IN THIS CACHE.
-    -->
-    <registry:cache-config name="local-query">
-        <locking lockAcquisitionTimeout="15000" nodeLockingScheme="optimistic"/>
-        <transaction transactionManagerLookupClass="org.horizon.transaction.GenericTransactionManagerLookup"/>
-        <eviction wakeUpInterval="5000">
-            <default algorithmClass="org.horizon.eviction.algorithms.lru.LRUAlgorithm">
-                <attribute name="maxNodes">5000</attribute>
-                <attribute name="timeToLive">1000</attribute>
-            </default>
-            <region name="/TS">
-                <attribute name="maxNodes">0</attribute>
-                <attribute name="timeToLive">0</attribute>
-            </region>
-        </eviction>
-    </registry:cache-config>
-
-    <!-- A query cache that replicates queries. Replication is asynchronous.
-          DO NOT STORE TIMESTAMPS IN THIS CACHE.
-    -->
-    <registry:cache-config name="replicated-query">
-        <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="15000" nodeLockingScheme="optimistic"/>
-        <transaction transactionManagerLookupClass="org.horizon.transaction.GenericTransactionManagerLookup"/>
-        <serialization useRegionBasedMarshalling="false"/>
-        <startup regionsInactiveOnStartup="false"/>
-        <stateRetrieval fetchInMemoryState="false" timeout="20000"/>
-        <transport clusterName="replicated-query" multiplexerStack="udp"/>
-        <replication>
-            <async/>
-        </replication>
-        <eviction wakeUpInterval="5000">
-            <default algorithmClass="org.horizon.eviction.algorithms.lru.LRUAlgorithm">
-                <attribute name="maxNodes">5000</attribute>
-                <attribute name="timeToLive">1000</attribute>
-            </default>
-            <region name="/TS">
-                <attribute name="maxNodes">0</attribute>
-                <attribute name="timeToLive">0</attribute>
-            </region>
-        </eviction>
-    </registry:cache-config>
-
-    <!-- Optimized for timestamp caching. A clustered timestamp cache
-         is required if query caching is used, even if the query cache
-         itself is configured with CacheMode=LOCAL.
-    -->
-    <registry:cache-config name="timestamps-cache">
-        <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="15000" nodeLockingScheme="pessimistic"/>
-        <serialization useRegionBasedMarshalling="true"/>
-        <startup regionsInactiveOnStartup="true"/>
-        <stateRetrieval fetchInMemoryState="true" timeout="20000"/>
-        <transport clusterName="timestamps-cache" multiplexerStack="udp"/>
-        <replication>
-            <async/>
-        </replication>
-        <eviction wakeUpInterval="5000">
-            <default algorithmClass="org.horizon.eviction.algorithms.lru.LRUAlgorithm">
-                <attribute name="maxNodes">5000</attribute>
-                <attribute name="timeToLive">1000</attribute>
-            </default>
-            <region name="/TS">
-                <attribute name="maxNodes">0</attribute>
-                <attribute name="timeToLive">0</attribute>
-            </region>
-        </eviction>
-    </registry:cache-config>
-
-    <!-- A config appropriate for a cache that's shared for
-entity, collection, query and timestamp caching. Not an advised
-configuration, since it requires cache mode REPL_SYNC, which is the
-least efficient mode. Also requires a full state transfer at startup,
-which can be expensive. Uses optimistic locking. -->
-    <registry:cache-config name="optimistic-shared">
-        <locking lockAcquisitionTimeout="15000" nodeLockingScheme="optimistic"/>
-        <transaction syncCommitPhase="true" syncRollbackPhase="true"
-                     transactionManagerLookupClass="org.horizon.transaction.GenericTransactionManagerLookup"/>
-        <serialization useRegionBasedMarshalling="true"/>
-        <startup regionsInactiveOnStartup="true"/>
-        <stateRetrieval fetchInMemoryState="true" timeout="20000"/>
-        <transport clusterName="optimistic-shared" multiplexerStack="udp"/>
-        <replication>
-            <sync replTimeout="20000"/>
-        </replication>
-        <eviction wakeUpInterval="5000">
-            <default algorithmClass="org.horizon.eviction.algorithms.lru.LRUAlgorithm">
-                <attribute name="maxNodes">5000</attribute>
-                <attribute name="timeToLive">1000</attribute>
-            </default>
-            <region name="/TS">
-                <attribute name="maxNodes">0</attribute>
-                <attribute name="timeToLive">0</attribute>
-            </region>
-        </eviction>
-    </registry:cache-config>
-
-
-    <!-- A config appropriate for a cache that's shared for
-         entity, collection, query and timestamp caching. Not an advised
-         configuration, since it requires cache mode REPL_SYNC, which is the
-         least efficient mode. Also requires a full state transfer at startup,
-         which can be expensive. Uses pessmistic locking.
-    -->
-    <registry:cache-config name="pessimistic-shared">
-
-        <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="15000" nodeLockingScheme="pessimistic"/>
-        <serialization useRegionBasedMarshalling="true"/>
-        <startup regionsInactiveOnStartup="true"/>
-        <stateRetrieval fetchInMemoryState="true" timeout="20000"/>
-        <transport clusterName="pessimistic-shared" multiplexerStack="udp"/>
-        <replication>
-            <sync replTimeout="20000"/>
-        </replication>
-        <eviction wakeUpInterval="5000">
-            <default algorithmClass="org.horizon.eviction.algorithms.lru.LRUAlgorithm">
-                <attribute name="maxNodes">5000</attribute>
-                <attribute name="timeToLive">1000</attribute>
-            </default>
-            <region name="/TS">
-                <attribute name="maxNodes">0</attribute>
-                <attribute name="timeToLive">0</attribute>
-            </region>
-        </eviction>
-    </registry:cache-config>
-</registry:cache-configs>

Deleted: core/branches/flat/src/test/resources/unit-test-cache-service.xml
===================================================================
--- core/branches/flat/src/test/resources/unit-test-cache-service.xml	2009-01-23 18:34:40 UTC (rev 7593)
+++ core/branches/flat/src/test/resources/unit-test-cache-service.xml	2009-01-26 10:24:58 UTC (rev 7594)
@@ -1,316 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<jbosscache xmlns="urn:jboss:starobrno-core:config:1.0">
-    <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="10000"/>
-    <transaction transactionManagerLookupClass="org.horizon.transaction.GenericTransactionManagerLookup"/>
-    <serialization useRegionBasedMarshalling="false"/>
-    <clustering>
-        <sync replTimeout="15000"/>
-        <stateRetrieval fetchInMemoryState="true" timeout="15000"/>
-    </clustering>
-
-    <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>
-
-    <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"
-
-                     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="false"
-                     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="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"
-                               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"
-
-                     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="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"/>
-
-                <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
-             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"
-
-                     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"
-
-                     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>
-
-
-        <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"
-
-                     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"
-
-                     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>
-
-</jbosscache>




More information about the jbosscache-commits mailing list