Author: manik.surtani(a)jboss.com Date: 2007-12-27 15:19:38 -0500 (Thu, 27 Dec 2007) New Revision: 4918 Modified: core/trunk/src/examples/resources/META-INF/replSync-service.xml core/trunk/src/main/docbook/userguide/en/modules/configuration_reference.xml core/trunk/src/main/resources/META-INF/buddyreplication-service.xml core/trunk/src/main/resources/META-INF/clonable-config-service.xml core/trunk/src/main/resources/META-INF/hibernate-recommended-config.xml core/trunk/src/main/resources/META-INF/jdbcCacheLoader-service.xml core/trunk/src/main/resources/META-INF/mixedPolicy-eviction-service.xml core/trunk/src/main/resources/META-INF/pojocache-passivation-service.xml core/trunk/src/main/resources/META-INF/pojocache-passivation-service2.xml core/trunk/src/main/resources/META-INF/policyPerRegion-eviction-service.xml core/trunk/src/main/resources/META-INF/replAsync-service.xml core/trunk/src/main/resources/META-INF/replSync-passivation-service.xml core/trunk/src/main/resources/META-INF/replSync-service-test.xml core/trunk/src/main/resources/META-INF/replSync-service.xml core/trunk/src/main/resources/META-INF/tree-service.xml core/trunk/src/test-scripts/resources/bench.xml Log: Removed deprecated JGroups element Modified: core/trunk/src/examples/resources/META-INF/replSync-service.xml =================================================================== --- core/trunk/src/examples/resources/META-INF/replSync-service.xml 2007-12-23 13:16:29 UTC (rev 4917) +++ core/trunk/src/examples/resources/META-INF/replSync-service.xml 2007-12-27 20:19:38 UTC (rev 4918) @@ -124,8 +124,7 @@ <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" - join_retry_timeout="2000" shun="false" + <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"/> Modified: core/trunk/src/main/docbook/userguide/en/modules/configuration_reference.xml =================================================================== --- core/trunk/src/main/docbook/userguide/en/modules/configuration_reference.xml 2007-12-23 13:16:29 UTC (rev 4917) +++ core/trunk/src/main/docbook/userguide/en/modules/configuration_reference.xml 2007-12-27 20:19:38 UTC (rev 4918) @@ -95,8 +95,7 @@ <pbcast.STABLE desired_avg_gossip="400000"/> <FC max_credits="2000000" min_threshold="0.10"/> <FRAG2 frag_size="8192"/> - <pbcast.GMS join_timeout="5000" join_retry_timeout="2000" - shun="true" print_local_addr="true"/> + <pbcast.GMS join_timeout="5000" shun="true" print_local_addr="true"/> <pbcast.STATE_TRANSFER/> </config> </attribute> Modified: core/trunk/src/main/resources/META-INF/buddyreplication-service.xml =================================================================== --- core/trunk/src/main/resources/META-INF/buddyreplication-service.xml 2007-12-23 13:16:29 UTC (rev 4917) +++ core/trunk/src/main/resources/META-INF/buddyreplication-service.xml 2007-12-27 20:19:38 UTC (rev 4918) @@ -113,8 +113,7 @@ <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" - join_retry_timeout="2000" shun="false" + <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"/> Modified: core/trunk/src/main/resources/META-INF/clonable-config-service.xml =================================================================== --- core/trunk/src/main/resources/META-INF/clonable-config-service.xml 2007-12-23 13:16:29 UTC (rev 4917) +++ core/trunk/src/main/resources/META-INF/clonable-config-service.xml 2007-12-27 20:19:38 UTC (rev 4918) @@ -74,8 +74,7 @@ <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" - join_retry_timeout="2000" shun="false" + <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"/> Modified: core/trunk/src/main/resources/META-INF/hibernate-recommended-config.xml =================================================================== --- core/trunk/src/main/resources/META-INF/hibernate-recommended-config.xml 2007-12-23 13:16:29 UTC (rev 4917) +++ core/trunk/src/main/resources/META-INF/hibernate-recommended-config.xml 2007-12-27 20:19:38 UTC (rev 4918) @@ -108,7 +108,7 @@ <UNICAST timeout="600,1200,2400"/> <pbcast.STABLE desired_avg_gossip="20000"/> <FRAG frag_size="8192"/> - <pbcast.GMS join_timeout="5000" join_retry_timeout="2000" + <pbcast.GMS join_timeout="5000" shun="true" print_local_addr="true"/> <pbcast.STATE_TRANSFER/> </config> Modified: core/trunk/src/main/resources/META-INF/jdbcCacheLoader-service.xml =================================================================== --- core/trunk/src/main/resources/META-INF/jdbcCacheLoader-service.xml 2007-12-23 13:16:29 UTC (rev 4917) +++ core/trunk/src/main/resources/META-INF/jdbcCacheLoader-service.xml 2007-12-27 20:19:38 UTC (rev 4918) @@ -94,7 +94,7 @@ <UNICAST timeout="600,1200,2400" window_size="100" min_threshold="10"/> <pbcast.STABLE desired_avg_gossip="20000"/> <FRAG frag_size="8192"/> - <pbcast.GMS join_timeout="5000" join_retry_timeout="2000" + <pbcast.GMS join_timeout="5000" shun="true" print_local_addr="true"/> <pbcast.STATE_TRANSFER/> </config> Modified: core/trunk/src/main/resources/META-INF/mixedPolicy-eviction-service.xml =================================================================== --- core/trunk/src/main/resources/META-INF/mixedPolicy-eviction-service.xml 2007-12-23 13:16:29 UTC (rev 4917) +++ core/trunk/src/main/resources/META-INF/mixedPolicy-eviction-service.xml 2007-12-27 20:19:38 UTC (rev 4918) @@ -108,8 +108,7 @@ <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" - join_retry_timeout="2000" shun="false" + <pbcast.GMS print_local_addr="true" join_timeout="5000" shun="false" view_bundling="true" view_ack_collection_timeout="5000"/> <FC max_credits="20000000" min_threshold="0.10"/> <FRAG2 frag_size="60000"/> Modified: core/trunk/src/main/resources/META-INF/pojocache-passivation-service.xml =================================================================== --- core/trunk/src/main/resources/META-INF/pojocache-passivation-service.xml 2007-12-23 13:16:29 UTC (rev 4917) +++ core/trunk/src/main/resources/META-INF/pojocache-passivation-service.xml 2007-12-27 20:19:38 UTC (rev 4918) @@ -107,8 +107,7 @@ <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" - join_retry_timeout="2000" shun="false" + <pbcast.GMS print_local_addr="true" join_timeout="5000" shun="false" view_bundling="true" view_ack_collection_timeout="5000"/> <FC max_credits="20000000" min_threshold="0.10"/> <FRAG2 frag_size="60000"/> Modified: core/trunk/src/main/resources/META-INF/pojocache-passivation-service2.xml =================================================================== --- core/trunk/src/main/resources/META-INF/pojocache-passivation-service2.xml 2007-12-23 13:16:29 UTC (rev 4917) +++ core/trunk/src/main/resources/META-INF/pojocache-passivation-service2.xml 2007-12-27 20:19:38 UTC (rev 4918) @@ -107,8 +107,7 @@ <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" - join_retry_timeout="2000" shun="false" + <pbcast.GMS print_local_addr="true" join_timeout="5000" shun="false" view_bundling="true" view_ack_collection_timeout="5000"/> <FC max_credits="20000000" min_threshold="0.10"/> <FRAG2 frag_size="60000"/> Modified: core/trunk/src/main/resources/META-INF/policyPerRegion-eviction-service.xml =================================================================== --- core/trunk/src/main/resources/META-INF/policyPerRegion-eviction-service.xml 2007-12-23 13:16:29 UTC (rev 4917) +++ core/trunk/src/main/resources/META-INF/policyPerRegion-eviction-service.xml 2007-12-27 20:19:38 UTC (rev 4918) @@ -107,8 +107,7 @@ <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" - join_retry_timeout="2000" shun="false" + <pbcast.GMS print_local_addr="true" join_timeout="5000" shun="false" view_bundling="true" view_ack_collection_timeout="5000"/> <FC max_credits="20000000" min_threshold="0.10"/> <FRAG2 frag_size="60000"/> Modified: core/trunk/src/main/resources/META-INF/replAsync-service.xml =================================================================== --- core/trunk/src/main/resources/META-INF/replAsync-service.xml 2007-12-23 13:16:29 UTC (rev 4917) +++ core/trunk/src/main/resources/META-INF/replAsync-service.xml 2007-12-27 20:19:38 UTC (rev 4918) @@ -123,8 +123,7 @@ <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" - join_retry_timeout="2000" shun="false" + <pbcast.GMS print_local_addr="true" join_timeout="5000" shun="false" view_bundling="true" view_ack_collection_timeout="5000"/> <FC max_credits="20000000" min_threshold="0.10"/> <FRAG2 frag_size="60000"/> Modified: core/trunk/src/main/resources/META-INF/replSync-passivation-service.xml =================================================================== --- core/trunk/src/main/resources/META-INF/replSync-passivation-service.xml 2007-12-23 13:16:29 UTC (rev 4917) +++ core/trunk/src/main/resources/META-INF/replSync-passivation-service.xml 2007-12-27 20:19:38 UTC (rev 4918) @@ -107,8 +107,7 @@ <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" - join_retry_timeout="2000" shun="false" + <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"/> Modified: core/trunk/src/main/resources/META-INF/replSync-service-test.xml =================================================================== --- core/trunk/src/main/resources/META-INF/replSync-service-test.xml 2007-12-23 13:16:29 UTC (rev 4917) +++ core/trunk/src/main/resources/META-INF/replSync-service-test.xml 2007-12-27 20:19:38 UTC (rev 4918) @@ -123,8 +123,7 @@ <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" - join_retry_timeout="2000" shun="false" + <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"/> Modified: core/trunk/src/main/resources/META-INF/replSync-service.xml =================================================================== --- core/trunk/src/main/resources/META-INF/replSync-service.xml 2007-12-23 13:16:29 UTC (rev 4917) +++ core/trunk/src/main/resources/META-INF/replSync-service.xml 2007-12-27 20:19:38 UTC (rev 4918) @@ -123,8 +123,7 @@ <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" - join_retry_timeout="2000" shun="false" + <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"/> Modified: core/trunk/src/main/resources/META-INF/tree-service.xml =================================================================== --- core/trunk/src/main/resources/META-INF/tree-service.xml 2007-12-23 13:16:29 UTC (rev 4917) +++ core/trunk/src/main/resources/META-INF/tree-service.xml 2007-12-27 20:19:38 UTC (rev 4918) @@ -107,7 +107,7 @@ <UNICAST timeout="600,1200,2400" window_size="100" min_threshold="10"/> <pbcast.STABLE desired_avg_gossip="20000"/> <FRAG frag_size="8192"/> - <pbcast.GMS join_timeout="5000" join_retry_timeout="2000" + <pbcast.GMS join_timeout="5000" shun="true" print_local_addr="true"/> <pbcast.STATE_TRANSFER/> </config> Modified: core/trunk/src/test-scripts/resources/bench.xml =================================================================== --- core/trunk/src/test-scripts/resources/bench.xml 2007-12-23 13:16:29 UTC (rev 4917) +++ core/trunk/src/test-scripts/resources/bench.xml 2007-12-27 20:19:38 UTC (rev 4918) @@ -75,8 +75,7 @@ <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="3000" - join_retry_timeout="2000" shun="true"/> + <pbcast.GMS print_local_addr="true" join_timeout="3000" shun="true"/> <!-- Comment it out when we use repl_sync. We don't need fc when it is sync mode. --> <!--FC max_credits="2000000" min_threshold="0.20" max_block_time="5000"/-->