[jboss-cvs] JBossAS SVN: r79771 - in trunk: component-matrix and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: bstansberry at jboss.com
Date: 2008-10-20 17:00:39 -0400 (Mon, 20 Oct 2008)
New Revision: 79771

Modified:
   trunk/cluster/src/resources/jgroups/jgroups-channelfactory-stacks.xml
   trunk/component-matrix/pom.xml
Log:
[JBAS-6081] Reapply r79493 commit
[JBAS-6065] [JBAS-6079] Reapply r79542 commit

Modified: trunk/cluster/src/resources/jgroups/jgroups-channelfactory-stacks.xml
===================================================================
--- trunk/cluster/src/resources/jgroups/jgroups-channelfactory-stacks.xml	2008-10-20 20:32:42 UTC (rev 79770)
+++ trunk/cluster/src/resources/jgroups/jgroups-channelfactory-stacks.xml	2008-10-20 21:00:39 UTC (rev 79771)
@@ -478,37 +478,6 @@
             <pbcast.GMS print_local_addr="true" join_timeout="3000"
                 shun="true" view_bundling="true"/>
         </config>
-    </stack>           
-    
-    
-    <stack name="tunnel"
-           description="Used with a GossipRouter">
-        <config>
-            <TUNNEL router_port="12001" router_host="127.0.0.1"/>
-            <PING timeout="2000"
-                  num_initial_members="3"
-                  gossip_refresh="10000"
-                  gossip_host="127.0.0.1"
-                  gossip_port="12001"/>
-            <MERGE2 max_interval="20000" min_interval="5000"/>
-            <FD_SOCK/>
-            <FD timeout="6000" 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="5000"
-                           max_bytes="400000"/>
-            <pbcast.GMS print_local_addr="true" join_timeout="3000"
-                        shun="true"
-                        view_bundling="true"
-                        view_ack_collection_timeout="5000"/>
-            <FC max_credits="2000000" min_threshold="0.10"/>
-            <FRAG2 frag_size="60000"/>
-            <pbcast.STATE_TRANSFER/>
-            <pbcast.FLUSH timeout="0"/>
-        </config>
     </stack>
 
 </protocol_stacks>

Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml	2008-10-20 20:32:42 UTC (rev 79770)
+++ trunk/component-matrix/pom.xml	2008-10-20 21:00:39 UTC (rev 79771)
@@ -60,7 +60,7 @@
     <version.org.jboss.microcontainer>2.0.0.CR2</version.org.jboss.microcontainer>
     <version.org.jboss.cl>2.0.0.CR3</version.org.jboss.cl>
     <version.org.jboss.deployers>2.0.0.CR2</version.org.jboss.deployers>
-    <version.org.jboss.cache.core>2.2.0.GA</version.org.jboss.cache.core>
+    <version.org.jboss.cache.core>2.2.1.CR2</version.org.jboss.cache.core>
     <version.org.jboss.cache.pojo>2.2.0.CR5</version.org.jboss.cache.pojo>
     <version.org.jboss.cluster>1.1.0.GA</version.org.jboss.cluster>
     <version.org.jboss.cluster.cache.spi>1.0.0.GA</version.org.jboss.cluster.cache.spi>
@@ -903,7 +903,7 @@
       <dependency>
         <groupId>jgroups</groupId>
         <artifactId>jgroups</artifactId>
-        <version>2.6.3.GA</version>
+        <version>2.6.5.GA</version>
       </dependency>
       
       <dependency>