Author: skabashnyuk Date: 2009-12-08 08:49:58 -0500 (Tue, 08 Dec 2009) New Revision: 946 Modified: jcr/branches/1.12.0-JBC/component/core/src/test/resources/conf/standalone/test-jbosscache-config-exoloader_db1_ws.xml jcr/branches/1.12.0-JBC/component/core/src/test/resources/conf/standalone/test-jbosscache-config-exoloader_db1_ws1.xml jcr/branches/1.12.0-JBC/component/core/src/test/resources/conf/standalone/test-jbosscache-config-exoloader_db1_ws2.xml jcr/branches/1.12.0-JBC/component/core/src/test/resources/conf/standalone/test-jbosscache-config-exoloader_db1_ws3.xml jcr/branches/1.12.0-JBC/component/core/src/test/resources/conf/standalone/test-jbosscache-config-exoloader_db1tck_ws.xml jcr/branches/1.12.0-JBC/component/core/src/test/resources/conf/standalone/test-jbosscache-config-exoloader_db1tck_ws1.xml jcr/branches/1.12.0-JBC/component/core/src/test/resources/conf/standalone/test-jbosscache-config-exoloader_db1tck_ws2.xml Log: EXOJCR-199: updated config for cluster Modified: jcr/branches/1.12.0-JBC/component/core/src/test/resources/conf/standalone/test-jbosscache-config-exoloader_db1_ws.xml =================================================================== --- jcr/branches/1.12.0-JBC/component/core/src/test/resources/conf/standalone/test-jbosscache-config-exoloader_db1_ws.xml 2009-12-08 13:32:32 UTC (rev 945) +++ jcr/branches/1.12.0-JBC/component/core/src/test/resources/conf/standalone/test-jbosscache-config-exoloader_db1_ws.xml 2009-12-08 13:49:58 UTC (rev 946) @@ -7,7 +7,7 @@ transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup" /> <clustering mode="replication" clusterName="JBoss-Cache-Cluster_db1_ws"> - + <stateRetrieval timeout="20000" fetchInMemoryState="false" /> <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" @@ -28,7 +28,7 @@ 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" /> - <MPING timeout="2000" num_initial_members="3" mcast_port="34521" bind_addr="127.0.0.1" mcast_addr="224.0.0.1" /> + <MPING timeout="2000" num_initial_members="2" mcast_port="34521" bind_addr="127.0.0.1" mcast_addr="224.0.0.1" /> <MERGE2 max_interval="30000" min_interval="10000"/> @@ -48,11 +48,12 @@ </jgroupsConfig> <sync /> + <!-- Alternatively, to use async replication, comment out the element above and uncomment the element below. --> <!-- <async /> --> </clustering> - <loaders passivation="false" shared="false"> + <loaders passivation="false" shared="true"> <!-- loader class="org.jboss.cache.loader.FileCacheLoader" async="false" fetchPersistentState="true" ignoreModifications="false" purgeOnStartup="false"> @@ -62,7 +63,7 @@ </loader --> <loader class="org.exoplatform.services.jcr.impl.storage.jbosscache.JDBCCacheLoader" - async="false" fetchPersistentState="true" ignoreModifications="false" purgeOnStartup="false"> + async="false" fetchPersistentState="false" ignoreModifications="false" purgeOnStartup="false"> <properties> </properties> </loader> Modified: jcr/branches/1.12.0-JBC/component/core/src/test/resources/conf/standalone/test-jbosscache-config-exoloader_db1_ws1.xml =================================================================== --- jcr/branches/1.12.0-JBC/component/core/src/test/resources/conf/standalone/test-jbosscache-config-exoloader_db1_ws1.xml 2009-12-08 13:32:32 UTC (rev 945) +++ jcr/branches/1.12.0-JBC/component/core/src/test/resources/conf/standalone/test-jbosscache-config-exoloader_db1_ws1.xml 2009-12-08 13:49:58 UTC (rev 946) @@ -7,6 +7,7 @@ transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup" /> <clustering mode="replication" clusterName="JBoss-Cache-Cluster_db1_ws1"> + <stateRetrieval timeout="20000" fetchInMemoryState="false" /> <jgroupsConfig> <!--UDP discard_incompatible_packets="true" enable_bundling="false" enable_diagnostics="false" ip_ttl="2" @@ -28,7 +29,7 @@ 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" /> - <MPING timeout="2000" num_initial_members="3" mcast_port="34522" bind_addr="127.0.0.1" mcast_addr="224.0.0.1" /> + <MPING timeout="2000" num_initial_members="2" mcast_port="34522" bind_addr="127.0.0.1" mcast_addr="224.0.0.1" /> <MERGE2 max_interval="30000" min_interval="10000"/> @@ -48,13 +49,14 @@ </jgroupsConfig> <sync /> + <!-- Alternatively, to use async replication, comment out the element above and uncomment the element below. --> <!-- <async /> --> </clustering> - <loaders passivation="false" shared="false"> + <loaders passivation="false" shared="true"> <!-- loader class="org.jboss.cache.loader.FileCacheLoader" async="false" - fetchPersistentState="true" ignoreModifications="false" + fetchPersistentState="false" ignoreModifications="false" purgeOnStartup="false"> <properties> location=/tmp/test-jboss-cache/proxy @@ -62,7 +64,7 @@ </loader --> <loader class="org.exoplatform.services.jcr.impl.storage.jbosscache.JDBCCacheLoader" - async="false" fetchPersistentState="true" ignoreModifications="false" purgeOnStartup="false"> + async="false" fetchPersistentState="false" ignoreModifications="false" purgeOnStartup="false"> <properties> </properties> </loader> Modified: jcr/branches/1.12.0-JBC/component/core/src/test/resources/conf/standalone/test-jbosscache-config-exoloader_db1_ws2.xml =================================================================== --- jcr/branches/1.12.0-JBC/component/core/src/test/resources/conf/standalone/test-jbosscache-config-exoloader_db1_ws2.xml 2009-12-08 13:32:32 UTC (rev 945) +++ jcr/branches/1.12.0-JBC/component/core/src/test/resources/conf/standalone/test-jbosscache-config-exoloader_db1_ws2.xml 2009-12-08 13:49:58 UTC (rev 946) @@ -7,6 +7,7 @@ transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup" /> <clustering mode="replication" clusterName="JBoss-Cache-Cluster_db1_ws2"> + <stateRetrieval timeout="20000" fetchInMemoryState="false" /> <jgroupsConfig> <!--UDP discard_incompatible_packets="true" enable_bundling="false" enable_diagnostics="false" ip_ttl="2" @@ -28,7 +29,7 @@ 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" /> - <MPING timeout="2000" num_initial_members="3" mcast_port="34523" bind_addr="127.0.0.1" mcast_addr="224.0.0.1" /> + <MPING timeout="2000" num_initial_members="2" mcast_port="34523" bind_addr="127.0.0.1" mcast_addr="224.0.0.1" /> <MERGE2 max_interval="30000" min_interval="10000"/> @@ -48,13 +49,14 @@ </jgroupsConfig> <sync /> + <!-- Alternatively, to use async replication, comment out the element above and uncomment the element below. --> <!-- <async /> --> </clustering> - <loaders passivation="false" shared="false"> + <loaders passivation="false" shared="true"> <!-- loader class="org.jboss.cache.loader.FileCacheLoader" async="false" - fetchPersistentState="true" ignoreModifications="false" + fetchPersistentState="false" ignoreModifications="false" purgeOnStartup="false"> <properties> location=/tmp/test-jboss-cache/proxy @@ -62,7 +64,7 @@ </loader --> <loader class="org.exoplatform.services.jcr.impl.storage.jbosscache.JDBCCacheLoader" - async="false" fetchPersistentState="true" ignoreModifications="false" purgeOnStartup="false"> + async="false" fetchPersistentState="false" ignoreModifications="false" purgeOnStartup="false"> <properties> </properties> </loader> Modified: jcr/branches/1.12.0-JBC/component/core/src/test/resources/conf/standalone/test-jbosscache-config-exoloader_db1_ws3.xml =================================================================== --- jcr/branches/1.12.0-JBC/component/core/src/test/resources/conf/standalone/test-jbosscache-config-exoloader_db1_ws3.xml 2009-12-08 13:32:32 UTC (rev 945) +++ jcr/branches/1.12.0-JBC/component/core/src/test/resources/conf/standalone/test-jbosscache-config-exoloader_db1_ws3.xml 2009-12-08 13:49:58 UTC (rev 946) @@ -7,6 +7,7 @@ transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup" /> <clustering mode="replication" clusterName="JBoss-Cache-Cluster_db1_ws3"> + <stateRetrieval timeout="20000" fetchInMemoryState="false" /> <jgroupsConfig> <!--UDP discard_incompatible_packets="true" enable_bundling="false" enable_diagnostics="false" ip_ttl="2" @@ -28,7 +29,7 @@ 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" /> - <MPING timeout="2000" num_initial_members="3" mcast_port="34524" bind_addr="127.0.0.1" mcast_addr="224.0.0.1" /> + <MPING timeout="2000" num_initial_members="2" mcast_port="34524" bind_addr="127.0.0.1" mcast_addr="224.0.0.1" /> <MERGE2 max_interval="30000" min_interval="10000"/> @@ -48,13 +49,15 @@ </jgroupsConfig> <sync /> + + <!-- Alternatively, to use async replication, comment out the element above and uncomment the element below. --> <!-- <async /> --> </clustering> - <loaders passivation="false" shared="false"> + <loaders passivation="false" shared="true"> <!-- loader class="org.jboss.cache.loader.FileCacheLoader" async="false" - fetchPersistentState="true" ignoreModifications="false" + fetchPersistentState="false" ignoreModifications="false" purgeOnStartup="false"> <properties> location=/tmp/test-jboss-cache/proxy @@ -62,7 +65,7 @@ </loader --> <loader class="org.exoplatform.services.jcr.impl.storage.jbosscache.JDBCCacheLoader" - async="false" fetchPersistentState="true" ignoreModifications="false" purgeOnStartup="false"> + async="false" fetchPersistentState="false" ignoreModifications="false" purgeOnStartup="false"> <properties> </properties> </loader> Modified: jcr/branches/1.12.0-JBC/component/core/src/test/resources/conf/standalone/test-jbosscache-config-exoloader_db1tck_ws.xml =================================================================== --- jcr/branches/1.12.0-JBC/component/core/src/test/resources/conf/standalone/test-jbosscache-config-exoloader_db1tck_ws.xml 2009-12-08 13:32:32 UTC (rev 945) +++ jcr/branches/1.12.0-JBC/component/core/src/test/resources/conf/standalone/test-jbosscache-config-exoloader_db1tck_ws.xml 2009-12-08 13:49:58 UTC (rev 946) @@ -7,6 +7,7 @@ transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup" /> <clustering mode="replication" clusterName="JBoss-Cache-Cluster_db1tck_ws"> + <stateRetrieval timeout="20000" fetchInMemoryState="false" /> <jgroupsConfig> <!-- UDP discard_incompatible_packets="true" enable_bundling="false" enable_diagnostics="false" ip_ttl="2" @@ -28,7 +29,7 @@ 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" /> - <MPING timeout="2000" num_initial_members="3" mcast_port="34531" bind_addr="127.0.0.1" mcast_addr="224.0.0.1" /> + <MPING timeout="2000" num_initial_members="2" mcast_port="34531" bind_addr="127.0.0.1" mcast_addr="224.0.0.1" /> <MERGE2 max_interval="30000" min_interval="10000"/> <FD_SOCK/> @@ -47,13 +48,14 @@ </jgroupsConfig> <sync /> + <!-- Alternatively, to use async replication, comment out the element above and uncomment the element below. --> <!-- <async /> --> </clustering> - <loaders passivation="false" shared="false"> + <loaders passivation="false" shared="true"> <!-- loader class="org.jboss.cache.loader.FileCacheLoader" async="false" - fetchPersistentState="true" ignoreModifications="false" + fetchPersistentState="false" ignoreModifications="false" purgeOnStartup="false"> <properties> location=/tmp/test-jboss-cache/proxy @@ -61,7 +63,7 @@ </loader --> <loader class="org.exoplatform.services.jcr.impl.storage.jbosscache.JDBCCacheLoader" - async="false" fetchPersistentState="true" ignoreModifications="false" purgeOnStartup="false"> + async="false" fetchPersistentState="false" ignoreModifications="false" purgeOnStartup="false"> <properties> </properties> </loader> Modified: jcr/branches/1.12.0-JBC/component/core/src/test/resources/conf/standalone/test-jbosscache-config-exoloader_db1tck_ws1.xml =================================================================== --- jcr/branches/1.12.0-JBC/component/core/src/test/resources/conf/standalone/test-jbosscache-config-exoloader_db1tck_ws1.xml 2009-12-08 13:32:32 UTC (rev 945) +++ jcr/branches/1.12.0-JBC/component/core/src/test/resources/conf/standalone/test-jbosscache-config-exoloader_db1tck_ws1.xml 2009-12-08 13:49:58 UTC (rev 946) @@ -7,7 +7,9 @@ transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup" /> <clustering mode="replication" clusterName="JBoss-Cache-Cluster_db1tck_ws1"> + <stateRetrieval timeout="20000" fetchInMemoryState="false" /> + <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" @@ -28,7 +30,7 @@ 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" /> - <MPING timeout="2000" num_initial_members="3" mcast_port="34532" bind_addr="127.0.0.1" mcast_addr="224.0.0.1" /> + <MPING timeout="2000" num_initial_members="2" mcast_port="34532" bind_addr="127.0.0.1" mcast_addr="224.0.0.1" /> <MERGE2 max_interval="30000" min_interval="10000"/> <FD_SOCK/> @@ -47,13 +49,14 @@ </jgroupsConfig> <sync /> + <!-- Alternatively, to use async replication, comment out the element above and uncomment the element below. --> <!-- <async /> --> </clustering> - <loaders passivation="false" shared="false"> + <loaders passivation="false" shared="true"> <!-- loader class="org.jboss.cache.loader.FileCacheLoader" async="false" - fetchPersistentState="true" ignoreModifications="false" + fetchPersistentState="false" ignoreModifications="false" purgeOnStartup="false"> <properties> location=/tmp/test-jboss-cache/proxy @@ -61,7 +64,7 @@ </loader --> <loader class="org.exoplatform.services.jcr.impl.storage.jbosscache.JDBCCacheLoader" - async="false" fetchPersistentState="true" ignoreModifications="false" purgeOnStartup="false"> + async="false" fetchPersistentState="false" ignoreModifications="false" purgeOnStartup="false"> <properties> </properties> </loader> Modified: jcr/branches/1.12.0-JBC/component/core/src/test/resources/conf/standalone/test-jbosscache-config-exoloader_db1tck_ws2.xml =================================================================== --- jcr/branches/1.12.0-JBC/component/core/src/test/resources/conf/standalone/test-jbosscache-config-exoloader_db1tck_ws2.xml 2009-12-08 13:32:32 UTC (rev 945) +++ jcr/branches/1.12.0-JBC/component/core/src/test/resources/conf/standalone/test-jbosscache-config-exoloader_db1tck_ws2.xml 2009-12-08 13:49:58 UTC (rev 946) @@ -7,6 +7,7 @@ transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup" /> <clustering mode="replication" clusterName="JBoss-Cache-Cluster_db1tck_ws2"> + <stateRetrieval timeout="20000" fetchInMemoryState="false" /> <jgroupsConfig> <!-- UDP discard_incompatible_packets="true" enable_bundling="false" enable_diagnostics="false" ip_ttl="2" @@ -28,7 +29,7 @@ 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" /> - <MPING timeout="2000" num_initial_members="3" mcast_port="34533" bind_addr="127.0.0.1" mcast_addr="224.0.0.1" /> + <MPING timeout="2000" num_initial_members="2" mcast_port="34533" bind_addr="127.0.0.1" mcast_addr="224.0.0.1" /> <MERGE2 max_interval="30000" min_interval="10000"/> <FD_SOCK/> @@ -41,19 +42,20 @@ <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.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> - <loaders passivation="false" shared="false"> + <loaders passivation="false" shared="true"> <!-- loader class="org.jboss.cache.loader.FileCacheLoader" async="false" - fetchPersistentState="true" ignoreModifications="false" + fetchPersistentState="false" ignoreModifications="false" purgeOnStartup="false"> <properties> location=/tmp/test-jboss-cache/proxy @@ -61,7 +63,7 @@ </loader --> <loader class="org.exoplatform.services.jcr.impl.storage.jbosscache.JDBCCacheLoader" - async="false" fetchPersistentState="true" ignoreModifications="false" purgeOnStartup="false"> + async="false" fetchPersistentState="false" ignoreModifications="false" purgeOnStartup="false"> <properties> </properties> </loader>