Changed tcp-nak.xml -> tcp-new.xml

Author: belaban

build.xml

@@ -523,7 +523,7 @@
             <antcall target="udp"/>
             <antcall target="udp-new"/>
             <antcall target="tcp"/>
-            <antcall target="tcp-nak"/>
+            <antcall target="tcp-new"/>
             <antcall target="tcp-nio"/>
             <antcall target="tcp-nio-nak"/>
             <antcall target="stack-independent"/>
@@ -541,7 +541,7 @@
             </sequential>
             <sequential>
                 <antcall target="tcp"/>
-                <antcall target="tcp-nak"/>
+                <antcall target="tcp-new"/>
                 <antcall target="tcp-nio"/>
                 <antcall target="tcp-nio-nak"/>
             </sequential>
@@ -653,21 +653,21 @@
                 />
     </target>
 
-    <target name="tcp-nak" depends="postcompile,define-testng-task" description="Runs TCP tests">
+    <target name="tcp-new" depends="postcompile,define-testng-task" description="Runs TCP tests">
         <!-- Needed to force reading of properties. Otherwise tcp tests will fail -->
         <property name="build.properties.file" value="build.properties"/>
         <property file="${build.properties.file}"/>
 
-        <mkdir dir="${tmp.dir}/test-results/xml/tcp-nak"/>
-        <runtest suitename="tcp-nak"
+        <mkdir dir="${tmp.dir}/test-results/xml/tcp-new"/>
+        <runtest suitename="tcp-new"
                  groups="base,stack-dependent"
                  excludedgroups="stack-independent,broken"
                  parallel="${parallel.classes}"
                  threadcount="20"
                  initial.mcast.addr="${jgroups.udp.mcast_addr}"
                  initial.mcast.port="28000"
                  initial.tcp.port="28000"
-                 jvmarg1="-Dchannel.conf=tcp-nak.xml"
+                 jvmarg1="-Dchannel.conf=tcp-new.xml"
         />
     </target>
 

conf/tcp-nak.xml renamed to conf/tcp-new.xml

@@ -1,5 +1,5 @@
 <!--
-    TCP based stack, with flow control and message bundling. This is usually used when IP
+    TCP based stack, with NAKACK4 and UNICAST4 -STABLE - flow control protocols. 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]
@@ -28,10 +28,8 @@
     <VERIFY_SUSPECT2 timeout="1.5s"  />
     <BARRIER />
     <NAKACK4 use_mcast_xmit="false" capacity="8192" />
-    <UNICAST3 />
+    <UNICAST4 />
     <pbcast.GMS print_local_addr="true" join_timeout="1s"/>
-    <UFC max_credits="10M"
-             min_threshold="0.4"/>
     <FRAG2 frag_size="60K"  />
     <!--RSVP resend_interval="2s" timeout="10s"/-->
     <pbcast.STATE_TRANSFER/>