- Removed shared transport (https://issues.jboss.org/browse/JGRP-1844)

- Removed deprecated classes, methods and fields (https://issues.jboss.org/browse/JGRP-2006) - ant jar works now - Updated manual on buffer reuse when sending - JUnitXmlReporter now prints method name correctly
belaban · Jan 25, 2016 · 041c01b · 041c01b
1 parent 1fbf52e
commit 041c01b
Show file tree

Hide file tree

Showing 141 changed files with 358 additions and 17,788 deletions.
diff --git a/build.xml b/build.xml
@@ -329,7 +329,7 @@
 
     <target name="jgroups.jar"
             description="Creates the jgroups.jar (includes everything)"
-            depends="clean,compile-no-unittests,compile-essential-unittests,create-schema">
+            depends="clean,compile-no-unittests,compile-essential-unittests,make-schema,make-keystore">
         <mkdir dir="${dist.dir}"/>
         <xmlproperty file="${ant.file}" collapseAttributes="true" prefix="bnd"/>
         <property name="bndclasspath" refid="jg.classpath"/>
@@ -371,7 +371,7 @@
         <property name="-output" value="${conf.dir}"/>
         <taskdef resource="aQute/bnd/ant/taskdef.properties" classpathref="jg.classpath"/>
         <bnd
-              classpath=""
+              classpath="${bndclasspath}"
               eclipse="false"
               failok="false"
               exceptions="true"
@@ -502,27 +502,24 @@
         </copy>
     </target-->
 
-    <target name="make-schema" description="Creates XML schema for this version of JGroups"
+	<target name="make-schema" description="Creates XML schema for this version of JGroups">
-            depends="create-schema">
-    </target>
-
-	<target name="create-schema" description="Creates XML schema for this version of JGroups">
 		<delete dir="${compile.dir}/schema" failonerror="false"/>
 		<mkdir dir="${compile.dir}/schema"/>
-		<java classname="org.jgroups.util.XMLSchemaGenerator" classpathref="jg.classpath">
+		<java classname="org.jgroups.util.XMLSchemaGenerator" classpathref="jg.classpath" fork="true">
 			<arg line="-o ${compile.dir}/schema"/>
 		</java>
         <copy todir="${compile.dir}/schema">
             <fileset dir="${conf.dir}">
                 <include name="*.xsd"/>
             </fileset>
         </copy>
-        <copy todir="${compile.dir}/schema">
+        <!-- Leave a schema named jgrous-4.x.xsd -->
+       <!-- <copy todir="${compile.dir}/schema">
             <fileset dir="${compile.dir}/schema">
                 <include name="jgroups*.xsd"/>
             </fileset>
             <globmapper from="jgroups*.xsd" to="jgroups.xsd"/>
-        </copy>
+        </copy>-->
     </target>
 
 
@@ -573,7 +570,7 @@
     </target>
 
 
-    <target name="makeKeystore" unless="isKeyStoreGenerated"
+    <target name="make-keystore" unless="isKeyStoreGenerated"
             depends="keyStoreGenerated, compile"
             description="Generates a temp keystore in ./keystore (for unit tests)">
         <mkdir dir="${keystore.dir}"/>
@@ -598,7 +595,7 @@
 	    </condition>
 	</target>
 
-	<target name="postcompile" depends="makeKeystore">
+	<target name="postcompile" depends="make-keystore">
 	</target>
 
     <!--

diff --git a/conf/fast.xml b/conf/fast.xml
@@ -19,7 +19,6 @@
          mcast_recv_buf_size="5M"
          mcast_send_buf_size="5M"
          max_bundle_size="64K"
-         max_bundle_timeout="30"
          enable_diagnostics="true"
          thread_naming_pattern="cl"
 
@@ -29,15 +28,13 @@
          timer.keep_alive_time="3000"
          timer.queue_max_size="500"
 
-         thread_pool.enabled="true"
          thread_pool.min_threads="2"
          thread_pool.max_threads="8"
          thread_pool.keep_alive_time="5000"
          thread_pool.queue_enabled="true"
          thread_pool.queue_max_size="100000"
          thread_pool.rejection_policy="discard"
 
-         oob_thread_pool.enabled="true"
          oob_thread_pool.min_threads="1"
          oob_thread_pool.max_threads="8"
          oob_thread_pool.keep_alive_time="5000"

diff --git a/conf/flush-tcp.xml b/conf/flush-tcp.xml
diff --git a/conf/jg-magic-map.xml b/conf/jg-magic-map.xml
@@ -6,10 +6,8 @@
     <class id="6"   name="org.jgroups.protocols.FD_SOCK$FdHeader"/>
     <class id="7"   name="org.jgroups.protocols.FragHeader"/>
     <class id="13"  name="org.jgroups.protocols.PingHeader"/>
-    <class id="21"  name="org.jgroups.protocols.UNICAST$UnicastHeader"/>
     <class id="22"  name="org.jgroups.protocols.VERIFY_SUSPECT$VerifyHeader"/>
     <class id="24"  name="org.jgroups.protocols.pbcast.GMS$GmsHeader"/>
-    <class id="25"  name="org.jgroups.protocols.pbcast.NakAckHeader"/>
     <class id="27"  name="org.jgroups.protocols.pbcast.STABLE$StableHeader"/>
     <class id="28"  name="org.jgroups.protocols.pbcast.STATE_TRANSFER$StateHeader"/>
     <class id="30"  name="org.jgroups.Message"/>
@@ -34,17 +32,12 @@
     <class id="68"  name="org.jgroups.util.UUID"/>
     <class id="71"  name="org.jgroups.blocks.RequestCorrelator$Header"/>
     <class id="72"  name="org.jgroups.blocks.RequestCorrelator$MultiDestinationHeader"/>
-    <class id="73"  name="org.jgroups.protocols.UNICAST2$Unicast2Header"/>
-    <class id="74"  name="org.jgroups.protocols.SCOPE$ScopeHeader"/>
     <class id="75"  name="org.jgroups.blocks.mux.MuxHeader"/>
     <class id="76"  name="org.jgroups.protocols.DAISYCHAIN$DaisyHeader"/>
     <class id="77"  name="org.jgroups.protocols.RELAY$RelayHeader"/>
     <class id="78"  name="org.jgroups.protocols.STOMP$StompHeader"/>
     <class id="80"  name="org.jgroups.protocols.PrioHeader"/>
     <class id="81"  name="org.jgroups.protocols.Locking$LockingHeader"/>
-    <class id="82"  name="org.jgroups.util.PayloadUUID"/>
-    <class id="83"  name="org.jgroups.util.AdditionalDataUUID"/>
-    <class id="84"  name="org.jgroups.util.TopologyUUID"/>
     <class id="85"  name="org.jgroups.protocols.Executing$ExecutorHeader"/>
     <class id="86"  name="org.jgroups.protocols.Executing$Request"/>
     <class id="87"  name="org.jgroups.blocks.executor.ExecutionService$RunnableAdapter"/>
@@ -61,8 +54,6 @@
     <class id="98"  name="org.jgroups.protocols.relay.SiteMaster"/>
     <class id="99"  name="org.jgroups.protocols.relay.RELAY2$Relay2Header"/>
     <class id="100" name="org.jgroups.protocols.FORWARD_TO_COORD$ForwardHeader"/>
-    <class id="101" name="org.jgroups.protocols.relay.CanBeSiteMaster"/>
-    <class id="102" name="org.jgroups.protocols.relay.CanBeSiteMasterTopology"/>
     <class id="103" name="org.jgroups.auth.SimpleToken"/>
     <class id="104" name="org.jgroups.auth.FixedMembershipToken"/>
     <class id="105" name="org.jgroups.auth.MD5Token"/>
@@ -74,7 +65,6 @@
     <class id="111" name="org.jgroups.util.ExtendedUUID"/>
     <class id="112" name="org.jgroups.protocols.SaslHeader"/>
     <class id="113" name="org.jgroups.protocols.SEQUENCER2$SequencerHeader"/>
-    <class id="114" name="org.jgroups.protocols.MERGE2$MergeHeader"/>
     <class id="115" name="org.jgroups.protocols.ABP$ABPHeader"/>
 </magic-number-class-mapping>
 
diff --git a/conf/jg-protocol-ids.xml b/conf/jg-protocol-ids.xml
@@ -12,17 +12,13 @@
     <class id="9" name="org.jgroups.protocols.FILE_PING"/>
     <class id="10" name="org.jgroups.protocols.TCPPING"/>
     <class id="11" name="org.jgroups.protocols.TCPGOSSIP"/>
-    <class id="12" name="org.jgroups.protocols.UNICAST"/>
     <class id="13" name="org.jgroups.protocols.VERIFY_SUSPECT"/>
     <class id="14" name="org.jgroups.protocols.pbcast.GMS"/>
-    <class id="15" name="org.jgroups.protocols.pbcast.NAKACK"/>
     <class id="16" name="org.jgroups.protocols.pbcast.STABLE"/>
     <class id="17" name="org.jgroups.protocols.pbcast.STATE_TRANSFER"/>
     <class id="19" name="org.jgroups.protocols.COMPRESS"/>
-    <class id="20" name="org.jgroups.protocols.FC"/>
     <class id="21" name="org.jgroups.protocols.UDP"/>
     <class id="22" name="org.jgroups.protocols.TCP"/>
-    <class id="23" name="org.jgroups.protocols.TCP_NIO"/>
     <class id="24" name="org.jgroups.protocols.TUNNEL"/>
     <class id="25" name="org.jgroups.protocols.ENCRYPT"/>
     <class id="26" name="org.jgroups.protocols.SEQUENCER"/>
@@ -34,8 +30,6 @@
     <class id="35" name="org.jgroups.protocols.pbcast.STATE_SOCK"/>
     <class id="37" name="org.jgroups.protocols.DISCARD"/>
     <class id="39" name="org.jgroups.protocols.SHARED_LOOPBACK"/>
-    <class id="40" name="org.jgroups.protocols.UNICAST2"/>
-    <class id="41" name="org.jgroups.protocols.SCOPE"/>
     <class id="42" name="org.jgroups.protocols.DAISYCHAIN"/>
     <class id="43" name="org.jgroups.protocols.RELAY"/>
     <class id="44" name="org.jgroups.protocols.MFC"/>
@@ -45,7 +39,6 @@
     <class id="48" name="org.jgroups.protocols.PRIO"/>
     <class id="49" name="org.jgroups.protocols.BPING"/>
     <class id="50" name="org.jgroups.protocols.CENTRAL_LOCK"/>
-    <class id="51" name="org.jgroups.protocols.PEER_LOCK"/>
     <class id="52" name="org.jgroups.protocols.CENTRAL_EXECUTOR"/>
     <class id="53" name="org.jgroups.protocols.COUNTER"/>
     <class id="54" name="org.jgroups.protocols.MERGE3"/>
@@ -64,7 +57,6 @@
     <class id="68" name="org.jgroups.protocols.SASL"/>
     <class id="69" name="org.jgroups.protocols.GOOGLE_PING"/>
     <class id="70" name="org.jgroups.protocols.SEQUENCER2"/>
-    <class id="71" name="org.jgroups.protocols.MERGE2"/>
     <class id="72" name="org.jgroups.protocols.FD_HOST"/>
     <class id="73" name="org.jgroups.protocols.ABP"/>
     <class id="74" name="org.jgroups.protocols.TCP_NIO2"/>

diff --git a/conf/tcp-nio.xml b/conf/tcp-nio.xml
@@ -12,7 +12,6 @@
          recv_buf_size="${tcp.recv_buf_size:5M}"
          send_buf_size="${tcp.send_buf_size:5M}"
          max_bundle_size="64K"
-         max_bundle_timeout="30"
          sock_conn_timeout="300"
 
          timer_type="new3"
@@ -21,15 +20,13 @@
          timer.keep_alive_time="3000"
          timer.queue_max_size="500"
 
-         thread_pool.enabled="true"
          thread_pool.min_threads="2"
          thread_pool.max_threads="8"
          thread_pool.keep_alive_time="5000"
          thread_pool.queue_enabled="true"
          thread_pool.queue_max_size="10000"
          thread_pool.rejection_policy="discard"
 
-         oob_thread_pool.enabled="true"
          oob_thread_pool.min_threads="1"
          oob_thread_pool.max_threads="8"
          oob_thread_pool.keep_alive_time="5000"

diff --git a/conf/tcp.xml b/conf/tcp.xml
@@ -12,8 +12,6 @@
          recv_buf_size="${tcp.recv_buf_size:5M}"
          send_buf_size="${tcp.send_buf_size:5M}"
          max_bundle_size="64K"
-         max_bundle_timeout="30"
-         use_send_queues="true"
          sock_conn_timeout="300"
 
          timer_type="new3"
@@ -22,15 +20,13 @@
          timer.keep_alive_time="3000"
          timer.queue_max_size="500"
 
-         thread_pool.enabled="true"
          thread_pool.min_threads="2"
          thread_pool.max_threads="8"
          thread_pool.keep_alive_time="5000"
          thread_pool.queue_enabled="true"
          thread_pool.queue_max_size="10000"
          thread_pool.rejection_policy="discard"
 
-         oob_thread_pool.enabled="true"
          oob_thread_pool.min_threads="1"
          oob_thread_pool.max_threads="8"
          oob_thread_pool.keep_alive_time="5000"

diff --git a/conf/tcpgossip.xml b/conf/tcpgossip.xml
@@ -10,8 +10,7 @@
         xmlns="urn:org:jgroups"
         xsi:schemaLocation="urn:org:jgroups http://www.jgroups.org/schema/jgroups.xsd">
 	<TCP bind_port="7800"
-		use_send_queues="true"
+         sock_conn_timeout="300"/>
-		sock_conn_timeout="300"/>
     <TCPGOSSIP initial_hosts="${jgroups.tunnel.gossip_router_hosts:localhost[12001]}"/>
     <MERGE3/>
     <FD/>

diff --git a/conf/udp-largecluster.xml b/conf/udp-largecluster.xml
@@ -17,7 +17,6 @@
          mcast_recv_buf_size="5M"
          mcast_send_buf_size="5M"
          max_bundle_size="64K"
-         max_bundle_timeout="30"
          enable_diagnostics="true"
          thread_naming_pattern="cl"
          logical_addr_cache_max_size="1000"
@@ -29,15 +28,13 @@
          timer.queue_max_size="500"
          timer.rejection_policy="abort"
 
-         thread_pool.enabled="true"
          thread_pool.min_threads="10"
          thread_pool.max_threads="100"
          thread_pool.keep_alive_time="5000"
          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="5"
          oob_thread_pool.max_threads="100"
          oob_thread_pool.keep_alive_time="5000"

diff --git a/conf/udp.xml b/conf/udp.xml
@@ -17,7 +17,6 @@
          mcast_recv_buf_size="5M"
          mcast_send_buf_size="5M"
          max_bundle_size="64K"
-         max_bundle_timeout="30"
          enable_diagnostics="true"
          thread_naming_pattern="cl"
 
@@ -27,15 +26,13 @@
          timer.keep_alive_time="3000"
          timer.queue_max_size="500"
 
-         thread_pool.enabled="true"
          thread_pool.min_threads="2"
          thread_pool.max_threads="8"
          thread_pool.keep_alive_time="5000"
          thread_pool.queue_enabled="true"
          thread_pool.queue_max_size="10000"
          thread_pool.rejection_policy="discard"
 
-         oob_thread_pool.enabled="true"
          oob_thread_pool.min_threads="1"
          oob_thread_pool.max_threads="8"
          oob_thread_pool.keep_alive_time="5000"

diff --git a/doc/manual/api.adoc b/doc/manual/api.adoc
@@ -780,7 +780,30 @@ channel.send(receiver, "hello world");
 ----
 
 The sample code determines the coordinator (first member of the view) and sends it a "hello world" message.
-
+
+
+===== A note about buffer reuse
+The following code is wrong:
+
+[source,java]
+----
+protected void sendFile() throws Exception {
+    FileInputStream in=new FileInputStream(filename);
+    byte[] buf=new byte[8096];
+    for(;;) {
+        int bytes=in.read(buf);
+        if(bytes == -1)
+            break;
+        channel.send(new Message(null, buf, 0, bytes));
+    }
+}
+----
+
+* Buffer `buf` is reused and can get overwritten with new data while JGroups
+** queues the message in a bundler and sends multiple messages as a message batch
+** possibly retransmits the message if not received by the receiver(s); retransmitting the changed buffer
+* Correct: move `buf` into the for loop
+
 
 [[DiscardingOwnMessages]]
 ===== Discarding one's own messages

diff --git a/ivy.xml b/ivy.xml
@@ -11,7 +11,7 @@
     </publications>
 
     <dependencies>
-        <dependency org="biz.aQute"                name="bnd"                     rev="2.4+"/>
+        <dependency org="biz.aQute.bnd"            name="bnd"                     rev="2.4+"/>
         <dependency org="org.bouncycastle"         name="bcprov-jdk16"            rev="1.4+"/>
         <dependency org="org.jboss.byteman"        name="byteman"                 rev="3.+"/>
         <dependency org="org.jboss.byteman"        name="byteman-bmunit"          rev="3.+"/>

diff --git a/ivysettings.xml b/ivysettings.xml
@@ -6,6 +6,9 @@
     <property name="nexus-public"
               value="https://repository.jboss.org/nexus/service/local/staging/deploy/maven2"/>
 
+    <property name="nexus-public-and-snapshots"
+              value="https://repository.jboss.org/nexus/content/groups/public-jboss"/>
+
     <property
             name="m2-location"
             value="${user.home}/.m2/jboss-repository"
@@ -36,11 +39,14 @@
 
         <ibiblio name="nexus"  m2compatible="true" root="${nexus-public}"/>
 
+        <ibiblio name="snapshots"  m2compatible="true" root="${nexus-public-and-snapshots}"/>
+
         <!-- Tries to find an artifact in the local maven repo first -->
         <chain name="default">
             <resolver ref="local-ivy"/>
             <resolver ref="local-maven2"/>
             <resolver ref="public"/>
+            <resolver ref="snapshots"/>
         </chain>
     </resolvers>