ChangeLogTag:Wed Dec 10 13:16:03 2003 Ossama Othman <ossama@dre.vanderbilt.edu>

5 files changed, 394 insertions, 393 deletions

diff --git a/TAO/CIAO/examples/Hello/Hello_Base/Hello_Base.idl b/TAO/CIAO/examples/Hello/Hello_Base/Hello_Base.idl
index 6df28c1433b..0ac19ea2276 100644
--- a/TAO/CIAO/examples/Hello/Hello_Base/Hello_Base.idl
+++ b/TAO/CIAO/examples/Hello/Hello_Base/Hello_Base.idl
@@ -11,7 +11,6 @@
 
 #include <Components.idl>
 
-
 module Hello
 {
   interface message
diff --git a/TAO/CIAO/examples/Hello/README b/TAO/CIAO/examples/Hello/README
index 73ee3c64cee..86651de4344 100644
--- a/TAO/CIAO/examples/Hello/README
+++ b/TAO/CIAO/examples/Hello/README
@@ -1,7 +1,7 @@
 //Step-By-Step example
 
-This Hello example is meant to be a step-by-step example of building
-A CIAO based application.
-The step-by-step tes\xt is at (www.dre.vanderbilt.edu/~lu/ciao).
+This Hello example is meant to be a step-by-step example of building a
+CIAO-based application.  The step-by-step text is at
+(www.dre.vanderbilt.edu/~lu/ciao).
 
 For more information about CIAO please refer to http://www.dre.vanderbilt.edu/CIAO
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 687635a1f78..d226057a353 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -27,13 +27,11 @@ Wed Dec 10 13:58:41 2003  Chris Cleeland  <cleeland_c@ociweb.com>
 	* tao/Strategies/SHMIOP_Transport.cpp
 	* tao/Strategies/SHMIOP_Transport.h
 	
-
-	  Integrated aggregate fix to infamous Parse Magic Bytes problem.
-	  The fix was originally developed in OCI's repository and
-	  migrated here.  An overall description of the problem and
-	  solution follow, and a detailed changelog that follows the
-	  development of this solution is found in
-	  ChangeLogs/PMBChangeLog.
+	  Integrated aggregate fix to infamous Parse Magic Bytes (PMB)
+ 	  problem.  The fix was originally developed in OCI's repository
+ 	  and migrated here.  An overall description of the problem and
+ 	  solution follow, and a detailed changelog that follows the
+ 	  development of this solution follows this entry.
 
 	  The old way of handling input naively assumed that a header would
 	  never be broken across multiple read()s from the socket.  Back in
@@ -79,6 +77,391 @@ Wed Dec 10 13:58:41 2003  Chris Cleeland  <cleeland_c@ociweb.com>
 	  bytes across all GIOP fragments until the final fragment is
 	  received.
 
+----------------------------------------
+Thu Mar 20 12:34:24 2003  Chris Cleeland  <cleeland_c@ociweb.com>
+
+	* all: First merge back to OCI.
+
+Thu Mar 20 12:17:23 2003  Chris Cleeland  <cleeland_c@ociweb.com>
+
+	* tao/Strategies/DIOP_Transport.cpp (handle_input_i):
+	* orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.cpp
+	  (handle_input_i):
+
+	  Update to use new parsing and message processing methods
+	  consistent with PMB changes.
+
+	* tao/Transport.cpp (process_queue_head): Corrected a possible memory
+	  leak where, if process_parsed_messages returned with an error,
+	  the TAO_Queued_Data instance wouldn't be released.
+
+Tue Mar 18 14:57:07 2003  Chris Cleeland  <cleeland_c@ociweb.com>
+
+	* VERSION:
+	* ChangeLog:
+	* tao/tao.mpc:
+	* tao/Version.h:
+	* tao/IIOP_Transport.cpp:
+	* tao/MCAST_Parser.cpp:
+	* tao/RTCORBA/Linear_Priority_Mapping.cpp:
+	* tao/RTCORBA/RT_ORBInitializer.cpp:
+	* tao/RTCORBA/RT_ORBInitializer.h:
+	* tao/RTCORBA/RT_ORB_Loader.cpp:
+	* tao/RTCORBA/RT_Protocols_Hooks.cpp:
+	
+	  Merged in changes from TAO 1.3.1.  The actual tag for the merge
+	  was pmb_branch_mainline_mergeout_1.  The command was
+
+	  $ cvs update -jpmb_branch_start -jpmb_branch_mainline_mergeout_1
+
+	  after manually determining which files needed updates.
+
+Mon Mar 17 11:09:00 2003  Chris Cleeland  <cleeland_c@ociweb.com>
+
+	* tao/GIOP_Message_Base.cpp (check_for_valid_header): Optimized
+	  implementation.
+
+	* tao/GIOP_Message_Base.* (header_length): Moved to inline for
+	  optimization.
+
+	* tao/GIOP_Message_State.cpp (TAO_Debug_Msg_Emitter_Guard):
+	  Improved implementation so it didn't make copies of the message
+	  even when it was never going to output anything due to debug
+	  level being lower than the value that would cause debug output.
+
+	* tao/GIOP_Message_State.cpp (take_values_from_message_block):
+	* tao/GIOP_Message_State.cpp (set_version_info_from_buffer):
+	* tao/GIOP_Message_State.cpp (set_byte_order_info_from_buffer):
+	* tao/GIOP_Message_State.cpp (set_payload_size_from_buffer):
+
+	  Removed use of TAO_Debug_Msg_Emitter_Guard.
+
+	* tao/GIOP_Message_State.inl (set_payload_size_from_buffer):
+
+	  Moved to inline file.
+
+	* tao/Incoming_Message_Queue.h (TAO_Incoming_Message_Queue):
+	  Changed name of member 'queued_data_' to 'last_added_' to be
+	  more clear about what the pointer actually points to.
+
+	  Added documentation that describes the structure of the linked
+	  list so that hopefully future maintainers don't have to go
+	  through the same learning curve I did.
+
+	* tao/Incoming_Message_Queue.*: Updates to reflect last_added_
+	  member name change.
+
+	* tao/Incoming_Message_Queue.cpp (dequeue_head): Add check to not
+	  allow dequeuing when size is zero, plus we now zero-out the
+	  last_added_ pointer after we've dequeued the last item in the
+	  list.
+
+	* tao/Incoming_Message_Queue.cpp (clone_mb_nocopy_size): Fix
+	  setting and copying of flags on the message and data blocks so
+	  that the DONT_DELETE flag specifically doesn't get copied.  This
+	  cured a HUGE memory leak that was causing substantial
+	  performance problems.
+
+	* tao/Incoming_Message_Queue.cpp (make_uncompleted_message):
+	* tao/Incoming_Message_Queue.cpp (make_completed_message):
+
+	  Cache values used over and over again within these methods such
+	  as header and message block lengths
+
+	* tao/Transport.cpp (handle_input_i):
+
+	  Added flag noting that we enqueued a message.
+
+	  Changed how re-reading is performed; see entry for
+	  try_to_complete for information.
+
+	  Used ACE_CDR::grow to grow the uncompleted_message message block
+	  once the payload size is known.  This insures that the growth
+	  happens with proper alignment constraints.
+
+	* tao/Transport.* (try_to_complete): Added this method which
+	  tries to complete whatever partial message is held in
+	  uncompleted_message_.  The difference between doing this and
+	  simply revisiting the top of handle_input_i is that this will
+	  only try to read enough to complete the message rather than also
+	  read another partial.
+
+	* tao/Transport.cpp (process_queue_head): Added check to insure
+	  that we don't try to do any processing when there's nothing in
+	  the queue.  Also, removed old code leftover from when the
+	  incoming queue could have partial GIOP messages in it.  Finally,
+	  insured that the return value matched previous requirements.
+	  
+
+Thu Mar  6 15:27:14 2003  Chris Cleeland  <cleeland_c@ociweb.com>
+
+	* tao/Incoming_Message_Queue.cpp: Removed Shattering Encapsulation
+	  hack around ace/Message_Block.h inclusion to make this link
+	  properly on VC6.
+
+	* tao/GIOP_Message_State.cpp: Moved initialization of
+	  TAO_Debug_Msg_Emitter_Guard::MAGIC_LENGTH outside the class
+	  declaration.
+
+Wed Mar  5 13:08:37 2003  Chris Cleeland  <cleeland_c@ociweb.com>
+
+	* tao/GIOP_Message_Generator_Parser_Impl.inl (check_revision):
+	  Modified to only explicitly allow versions of GIOP that TAO
+	  supports, and no others.  Note that this change means that
+	  whenever a new version of GIOP gets added to TAO, this function
+	  must be updated, too.  Hopefully that won't happen so often that
+	  this becomes horribly burdensome.  Thanks to Chad Elliott and
+	  Paul Calabrese for ideas in getting this right.
+
+	* tao/Incoming_Message_Queue.* (make_uncompleted_message):
+
+	  This now behaves similar to make_completed_message, i.e., it
+	  allocates the message block held in TAO_Queued_Data and advnaced
+	  the rd_ptr past the bytes it consumes.
+
+	* tao/Incoming_Message_Queue.cpp: Eliminated hacks on
+	  ACE_Message_Block and replaced with functions
+	  clone_mb_nocopy_size() and copy_mb_span() that utilize ONLY the
+	  public API.  make_completed_message() and
+	  make_uncompleted_message() now use these.
+
+	* tao/Transport.cpp (handle_input_i): Enlarged the buffer size and
+	  replaced the magic number for the maximum number of re-read
+	  attempts with the manifest constant
+	  TAO_MAX_TRANSPORT_REREAD_ATTEMPTS, now defined in orbconf.h.
+
+	  Changed uses of make_uncompleted_message() to be consistent with
+	  changes outlined above.
+
+	  Corrected a bug where, upon re-reading after completely emptying
+	  the stack-allocated message block, I forgot to reset the
+	  rd_ptr/wr_ptr in the message block.
+
+	* tao/orbconf.h: Added new manifest constant
+	  TAO_MAX_TRANSPORT_REREAD_ATTEMPTS.  Documentation is in the file.
+
+Wed Feb 26 21:44:34 2003  Chris Cleeland  <cleeland_c@ociweb.com>
+
+	* TAO/tao/GIOP_Message_Base.cpp:
+
+	  Eliminate parse_incoming_messages(), missing_data(),
+	  extract_next_message(), consolidate_node(),
+	  consolidate_fragments(), get_message_data(), make_queued_data().
+
+	  Add new methods set_queued_data_from_message_header() and
+	  check_for_valid_header().
+
+	* TAO/tao/GIOP_Message_Base.h:
+
+	  Eliminate #if0 parse_incoming_messages(), missing_data(),
+	  extract_next_message(), consolidate_node(),
+	  consolidate_fragments(), get_message_data(), and
+	  make_queued_data() declarations.
+
+	  Add declarations for set_queued_data_from_message_header() and
+	  check_for_valid_header().
+
+	  Make message_type() static.
+
+	* TAO/tao/GIOP_Message_Generator_Parser_Impl.inl:
+	
+	  Reimplement check_revision() to be exact about which GIOP
+	  revisions are okay.  This is different from before where it
+	  loosely assumed that everything was valid unless it want higher
+	  than a particular range.
+
+	* TAO/tao/GIOP_Message_Lite.cpp:
+
+          Remove parse_incoming_messages() thru consolidate_fragments();
+          remove make_queued_data().
+
+          Add set_queued_data_from_message_header() and
+          check_for_valid_header().
+
+	* TAO/tao/GIOP_Message_Lite.h:
+
+          Remove declarations for parse_incoming_messages() thru
+          consolidate_fragments(); remove make_queued_data().
+
+          Add declarations for set_queued_data_from_message_header() and
+          check_for_valid_header().
+
+	* TAO/tao/GIOP_Message_State.cpp:
+
+          Add TAO_Debug_Message_Emitter_Guard class within the compilation
+          unit.
+
+          Change CTOR not to use the 2nd argument.
+
+          Change CTOR not to initialize this->base_with the 2nd arg.
+
+          Add take_values_from_message_block().
+
+          Remove parse_magic_bytes(), parse_message_header_i(),
+          parse_message_header().
+
+          Rename get_version_info() to set_version_info_from_buffer();
+          change argument type to 'const char*'.
+
+          Rename get_byte_order_info() to set_byte_order_info_from_buffer();
+          change argument type to 'const char*'.
+
+          Rename get_payload_size() to set_payload_size_from_buffer();
+          change argument type to 'const char*'.
+
+          Change argument type for read_ulong() to 'const char*'.
+
+	* TAO/tao/GIOP_Message_State.h:
+
+          Add default value for CTOR arguments so we don't have to pass
+          them.
+
+          Add declaration for take_values_from_message_block().
+
+          #if0 parse_message_header() declaration.
+
+          Add documentation for byte_order().
+
+          Add new GIOP information accessors: giop_version(),
+          more_fragments(), and message_type().
+
+          #if0 declaration for parse_message_header_i() and
+          parse_magic_bytes().
+
+          Rename delcarations for get_version_info(), get_byte_order_info(),
+          and get_payload_size().
+
+          #if0 base_ member variable.
+
+	* TAO/tao/GIOP_Message_State.inl:
+
+          Add definitions for giop_version(), more_fragments(), and
+          message_type().
+
+	* TAO/tao/Incoming_Message_Queue.cpp:
+
+          Add #include for ace/Message_Block.h, but shatter encapsulation
+          and effectively extend its interface so that we can clone spans of
+          message blocks.
+
+          Modify copy_tail() to use new TAO_Queued_Data member names.
+
+	* TAO/tao/Incoming_Message_Queue.cpp (class TAO_Queued_Data):
+
+          Update CTORs to initialize new this->current_state_ data member.
+
+          Add new make_uncompleted_message(), ACE_Message_Block hack
+          "extensions", make_completed_message().
+
+          Rename get_queued_data() to make_queued_data().
+
+	* TAO/tao/Incoming_Message_Queue.h:
+
+          Changed #include <Pluggable_Messaging_Utils.h> to #include
+          <Pluggable_Messaging.h>
+
+          Documentation for is_tail_complete() and is_head_complete() and
+          is_tail_fragmented().
+
+          #if0 get_node().
+
+	* TAO/tao/Incoming_Message_Queue.h (class TAO_Queued_Data):
+
+          Make CTORs protected so creation can only go through new factory
+          methods, i.e., make_completed_message() and
+          make_uncompleted_message().
+
+          Add new factory methods make_completed_message() and
+          make_uncompleted_message().
+
+          Add release() method [in addition to static of same name].
+
+          Add explicit definition of various states and a member to hold the
+          current state (this->current_state_).
+
+          Rename this->missing_data_ flag/value with
+          this->missing_data_bytes_ count.
+
+          Documentation for this->byte_order_.
+
+	* TAO/tao/Incoming_Message_Queue.inl:
+
+          Replace uses of this->missing_data_ with
+          this->missing_data_bytes_.
+
+          #if0 get_node().
+
+          Add release() method.
+
+	* TAO/tao/Pluggable_Messaging.h:
+
+          #if0 parse_incoming_messages() through consolidate_fragments().
+
+          Add declarations for check_for_valid_header() and
+          set_queued_data_from_message_header().
+
+	* TAO/tao/Transport.cpp:
+
+          Add #include <ace/Min_Max.h>
+
+          Add uncompleted_message_ to initialization list.
+
+          Modify what happens when reading in handle_input_i():
+
+          - number_of_read_attempts is how many times we'll try to read
+          again to complete a message before we give up.
+
+          - read_from_the_connection label added
+
+          - correct 1st argument to this->recv() to be wr_ptr() rather than
+          rd_ptr().
+
+          - lots of changes that are substantially documented in the code.
+
+          #if0 parse_consolidate_messages(), parse_incoming_messages(),
+          missing_data(), consolidate_message(), consolidate_fragments(),
+          consolidate_message_queue(), consolidate_extra_messages(), and
+          make_queued_data().
+
+	* TAO/tao/Transport.h:
+
+          #if0 declarations for parse_consolidate_messages(), parse_incoming_messages(),
+          missing_data(), consolidate_message(), consolidate_fragments(),
+          consolidate_message_queue(), consolidate_extra_messages(), and
+          make_queued_data().
+
+          Add this->uncompleted_message_ data member.
+
+	* TAO/tao/Strategies/DIOP_Transport.cpp:
+
+          Change 1st arg of this->recv() in handle_input_i() to wr_ptr()
+          from rd_ptr().
+
+	* TAO/tao/Strategies/SHMIOP_Transport.cpp:
+
+          #if0 consolidate_message().
+
+	* TAO/tao/Strategies/SHMIOP_Transport.h:
+
+          #if0 declaration for consolidate_message().
+
+	* TAO/tests/AMI/run_test.pl:
+
+          Increase default number of iterations from 1 to 10000.  Earlier
+          versions of the PMB changes succeeded just fine with low numbers
+          of iterations, but began to fail miserably when the number of
+          iterations climbed.
+
+	* TAO/tests/BiDirectional/run_test.pl:
+
+          Added level 10 debug.
+
+	* TAO/tests/InterOp-Naming/INS_test_client.cpp:
+
+          Changes that don't appear to be related in any way to PMB...
+  
+----------------------------------------  
+    
 Wed Dec 10 15:12:34 UTC 2003  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.cpp:
diff --git a/TAO/ChangeLogs/PMBChangeLog b/TAO/ChangeLogs/PMBChangeLog
deleted file mode 100644
index d93c29dae06..00000000000
--- a/TAO/ChangeLogs/PMBChangeLog
+++ /dev/null
@@ -1,381 +0,0 @@
-Thu Mar 20 12:34:24 2003  Chris Cleeland  <cleeland_c@ociweb.com>
-
-	* all: First merge back to OCI.
-
-Thu Mar 20 12:17:23 2003  Chris Cleeland  <cleeland_c@ociweb.com>
-
-	* tao/Strategies/DIOP_Transport.cpp (handle_input_i):
-	* orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.cpp
-	  (handle_input_i):
-
-	  Update to use new parsing and message processing methods
-	  consistent with PMB changes.
-
-	* tao/Transport.cpp (process_queue_head): Corrected a possible memory
-	  leak where, if process_parsed_messages returned with an error,
-	  the TAO_Queued_Data instance wouldn't be released.
-
-Tue Mar 18 14:57:07 2003  Chris Cleeland  <cleeland_c@ociweb.com>
-
-	* VERSION:
-	* ChangeLog:
-	* tao/tao.mpc:
-	* tao/Version.h:
-	* tao/IIOP_Transport.cpp:
-	* tao/MCAST_Parser.cpp:
-	* tao/RTCORBA/Linear_Priority_Mapping.cpp:
-	* tao/RTCORBA/RT_ORBInitializer.cpp:
-	* tao/RTCORBA/RT_ORBInitializer.h:
-	* tao/RTCORBA/RT_ORB_Loader.cpp:
-	* tao/RTCORBA/RT_Protocols_Hooks.cpp:
-	
-	  Merged in changes from TAO 1.3.1.  The actual tag for the merge
-	  was pmb_branch_mainline_mergeout_1.  The command was
-
-	  $ cvs update -jpmb_branch_start -jpmb_branch_mainline_mergeout_1
-
-	  after manually determining which files needed updates.
-
-Mon Mar 17 11:09:00 2003  Chris Cleeland  <cleeland_c@ociweb.com>
-
-	* tao/GIOP_Message_Base.cpp (check_for_valid_header): Optimized
-	  implementation.
-
-	* tao/GIOP_Message_Base.* (header_length): Moved to inline for
-	  optimization.
-
-	* tao/GIOP_Message_State.cpp (TAO_Debug_Msg_Emitter_Guard):
-	  Improved implementation so it didn't make copies of the message
-	  even when it was never going to output anything due to debug
-	  level being lower than the value that would cause debug output.
-
-	* tao/GIOP_Message_State.cpp (take_values_from_message_block):
-	* tao/GIOP_Message_State.cpp (set_version_info_from_buffer):
-	* tao/GIOP_Message_State.cpp (set_byte_order_info_from_buffer):
-	* tao/GIOP_Message_State.cpp (set_payload_size_from_buffer):
-
-	  Removed use of TAO_Debug_Msg_Emitter_Guard.
-
-	* tao/GIOP_Message_State.inl (set_payload_size_from_buffer):
-
-	  Moved to inline file.
-
-	* tao/Incoming_Message_Queue.h (TAO_Incoming_Message_Queue):
-	  Changed name of member 'queued_data_' to 'last_added_' to be
-	  more clear about what the pointer actually points to.
-
-	  Added documentation that describes the structure of the linked
-	  list so that hopefully future maintainers don't have to go
-	  through the same learning curve I did.
-
-	* tao/Incoming_Message_Queue.*: Updates to reflect last_added_
-	  member name change.
-
-	* tao/Incoming_Message_Queue.cpp (dequeue_head): Add check to not
-	  allow dequeuing when size is zero, plus we now zero-out the
-	  last_added_ pointer after we've dequeued the last item in the
-	  list.
-
-	* tao/Incoming_Message_Queue.cpp (clone_mb_nocopy_size): Fix
-	  setting and copying of flags on the message and data blocks so
-	  that the DONT_DELETE flag specifically doesn't get copied.  This
-	  cured a HUGE memory leak that was causing substantial
-	  performance problems.
-
-	* tao/Incoming_Message_Queue.cpp (make_uncompleted_message):
-	* tao/Incoming_Message_Queue.cpp (make_completed_message):
-
-	  Cache values used over and over again within these methods such
-	  as header and message block lengths
-
-	* tao/Transport.cpp (handle_input_i):
-
-	  Added flag noting that we enqueued a message.
-
-	  Changed how re-reading is performed; see entry for
-	  try_to_complete for information.
-
-	  Used ACE_CDR::grow to grow the uncompleted_message message block
-	  once the payload size is known.  This insures that the growth
-	  happens with proper alignment constraints.
-
-	* tao/Transport.* (try_to_complete): Added this method which
-	  tries to complete whatever partial message is held in
-	  uncompleted_message_.  The difference between doing this and
-	  simply revisiting the top of handle_input_i is that this will
-	  only try to read enough to complete the message rather than also
-	  read another partial.
-
-	* tao/Transport.cpp (process_queue_head): Added check to insure
-	  that we don't try to do any processing when there's nothing in
-	  the queue.  Also, removed old code leftover from when the
-	  incoming queue could have partial GIOP messages in it.  Finally,
-	  insured that the return value matched previous requirements.
-	  
-
-Thu Mar  6 15:27:14 2003  Chris Cleeland  <cleeland_c@ociweb.com>
-
-	* tao/Incoming_Message_Queue.cpp: Removed Shattering Encapsulation
-	  hack around ace/Message_Block.h inclusion to make this link
-	  properly on VC6.
-
-	* tao/GIOP_Message_State.cpp: Moved initialization of
-	  TAO_Debug_Msg_Emitter_Guard::MAGIC_LENGTH outside the class
-	  declaration.
-
-Wed Mar  5 13:08:37 2003  Chris Cleeland  <cleeland_c@ociweb.com>
-
-	* tao/GIOP_Message_Generator_Parser_Impl.inl (check_revision):
-	  Modified to only explicitly allow versions of GIOP that TAO
-	  supports, and no others.  Note that this change means that
-	  whenever a new version of GIOP gets added to TAO, this function
-	  must be updated, too.  Hopefully that won't happen so often that
-	  this becomes horribly burdensome.  Thanks to Chad Elliott and
-	  Paul Calabrese for ideas in getting this right.
-
-	* tao/Incoming_Message_Queue.* (make_uncompleted_message):
-
-	  This now behaves similar to make_completed_message, i.e., it
-	  allocates the message block held in TAO_Queued_Data and advnaced
-	  the rd_ptr past the bytes it consumes.
-
-	* tao/Incoming_Message_Queue.cpp: Eliminated hacks on
-	  ACE_Message_Block and replaced with functions
-	  clone_mb_nocopy_size() and copy_mb_span() that utilize ONLY the
-	  public API.  make_completed_message() and
-	  make_uncompleted_message() now use these.
-
-	* tao/Transport.cpp (handle_input_i): Enlarged the buffer size and
-	  replaced the magic number for the maximum number of re-read
-	  attempts with the manifest constant
-	  TAO_MAX_TRANSPORT_REREAD_ATTEMPTS, now defined in orbconf.h.
-
-	  Changed uses of make_uncompleted_message() to be consistent with
-	  changes outlined above.
-
-	  Corrected a bug where, upon re-reading after completely emptying
-	  the stack-allocated message block, I forgot to reset the
-	  rd_ptr/wr_ptr in the message block.
-
-	* tao/orbconf.h: Added new manifest constant
-	  TAO_MAX_TRANSPORT_REREAD_ATTEMPTS.  Documentation is in the file.
-
-Wed Feb 26 21:44:34 2003  Chris Cleeland  <cleeland_c@ociweb.com>
-
-	* TAO/tao/GIOP_Message_Base.cpp:
-
-	  Eliminate parse_incoming_messages(), missing_data(),
-	  extract_next_message(), consolidate_node(),
-	  consolidate_fragments(), get_message_data(), make_queued_data().
-
-	  Add new methods set_queued_data_from_message_header() and
-	  check_for_valid_header().
-
-	* TAO/tao/GIOP_Message_Base.h:
-
-	  Eliminate #if0 parse_incoming_messages(), missing_data(),
-	  extract_next_message(), consolidate_node(),
-	  consolidate_fragments(), get_message_data(), and
-	  make_queued_data() declarations.
-
-	  Add declarations for set_queued_data_from_message_header() and
-	  check_for_valid_header().
-
-	  Make message_type() static.
-
-	* TAO/tao/GIOP_Message_Generator_Parser_Impl.inl:
-	
-	  Reimplement check_revision() to be exact about which GIOP
-	  revisions are okay.  This is different from before where it
-	  loosely assumed that everything was valid unless it want higher
-	  than a particular range.
-
-	* TAO/tao/GIOP_Message_Lite.cpp:
-
-          Remove parse_incoming_messages() thru consolidate_fragments();
-          remove make_queued_data().
-
-          Add set_queued_data_from_message_header() and
-          check_for_valid_header().
-
-	* TAO/tao/GIOP_Message_Lite.h:
-
-          Remove declarations for parse_incoming_messages() thru
-          consolidate_fragments(); remove make_queued_data().
-
-          Add declarations for set_queued_data_from_message_header() and
-          check_for_valid_header().
-
-	* TAO/tao/GIOP_Message_State.cpp:
-
-          Add TAO_Debug_Message_Emitter_Guard class within the compilation
-          unit.
-
-          Change CTOR not to use the 2nd argument.
-
-          Change CTOR not to initialize this->base_with the 2nd arg.
-
-          Add take_values_from_message_block().
-
-          Remove parse_magic_bytes(), parse_message_header_i(),
-          parse_message_header().
-
-          Rename get_version_info() to set_version_info_from_buffer();
-          change argument type to 'const char*'.
-
-          Rename get_byte_order_info() to set_byte_order_info_from_buffer();
-          change argument type to 'const char*'.
-
-          Rename get_payload_size() to set_payload_size_from_buffer();
-          change argument type to 'const char*'.
-
-          Change argument type for read_ulong() to 'const char*'.
-
-	* TAO/tao/GIOP_Message_State.h:
-
-          Add default value for CTOR arguments so we don't have to pass
-          them.
-
-          Add declaration for take_values_from_message_block().
-
-          #if0 parse_message_header() declaration.
-
-          Add documentation for byte_order().
-
-          Add new GIOP information accessors: giop_version(),
-          more_fragments(), and message_type().
-
-          #if0 declaration for parse_message_header_i() and
-          parse_magic_bytes().
-
-          Rename delcarations for get_version_info(), get_byte_order_info(),
-          and get_payload_size().
-
-          #if0 base_ member variable.
-
-	* TAO/tao/GIOP_Message_State.inl:
-
-          Add definitions for giop_version(), more_fragments(), and
-          message_type().
-
-	* TAO/tao/Incoming_Message_Queue.cpp:
-
-          Add #include for ace/Message_Block.h, but shatter encapsulation
-          and effectively extend its interface so that we can clone spans of
-          message blocks.
-
-          Modify copy_tail() to use new TAO_Queued_Data member names.
-
-	* TAO/tao/Incoming_Message_Queue.cpp (class TAO_Queued_Data):
-
-          Update CTORs to initialize new this->current_state_ data member.
-
-          Add new make_uncompleted_message(), ACE_Message_Block hack
-          "extensions", make_completed_message().
-
-          Rename get_queued_data() to make_queued_data().
-
-	* TAO/tao/Incoming_Message_Queue.h:
-
-          Changed #include <Pluggable_Messaging_Utils.h> to #include
-          <Pluggable_Messaging.h>
-
-          Documentation for is_tail_complete() and is_head_complete() and
-          is_tail_fragmented().
-
-          #if0 get_node().
-
-	* TAO/tao/Incoming_Message_Queue.h (class TAO_Queued_Data):
-
-          Make CTORs protected so creation can only go through new factory
-          methods, i.e., make_completed_message() and
-          make_uncompleted_message().
-
-          Add new factory methods make_completed_message() and
-          make_uncompleted_message().
-
-          Add release() method [in addition to static of same name].
-
-          Add explicit definition of various states and a member to hold the
-          current state (this->current_state_).
-
-          Rename this->missing_data_ flag/value with
-          this->missing_data_bytes_ count.
-
-          Documentation for this->byte_order_.
-
-	* TAO/tao/Incoming_Message_Queue.inl:
-
-          Replace uses of this->missing_data_ with
-          this->missing_data_bytes_.
-
-          #if0 get_node().
-
-          Add release() method.
-
-	* TAO/tao/Pluggable_Messaging.h:
-
-          #if0 parse_incoming_messages() through consolidate_fragments().
-
-          Add declarations for check_for_valid_header() and
-          set_queued_data_from_message_header().
-
-	* TAO/tao/Transport.cpp:
-
-          Add #include <ace/Min_Max.h>
-
-          Add uncompleted_message_ to initialization list.
-
-          Modify what happens when reading in handle_input_i():
-
-          - number_of_read_attempts is how many times we'll try to read
-          again to complete a message before we give up.
-
-          - read_from_the_connection label added
-
-          - correct 1st argument to this->recv() to be wr_ptr() rather than
-          rd_ptr().
-
-          - lots of changes that are substantially documented in the code.
-
-          #if0 parse_consolidate_messages(), parse_incoming_messages(),
-          missing_data(), consolidate_message(), consolidate_fragments(),
-          consolidate_message_queue(), consolidate_extra_messages(), and
-          make_queued_data().
-
-	* TAO/tao/Transport.h:
-
-          #if0 declarations for parse_consolidate_messages(), parse_incoming_messages(),
-          missing_data(), consolidate_message(), consolidate_fragments(),
-          consolidate_message_queue(), consolidate_extra_messages(), and
-          make_queued_data().
-
-          Add this->uncompleted_message_ data member.
-
-	* TAO/tao/Strategies/DIOP_Transport.cpp:
-
-          Change 1st arg of this->recv() in handle_input_i() to wr_ptr()
-          from rd_ptr().
-
-	* TAO/tao/Strategies/SHMIOP_Transport.cpp:
-
-          #if0 consolidate_message().
-
-	* TAO/tao/Strategies/SHMIOP_Transport.h:
-
-          #if0 declaration for consolidate_message().
-
-	* TAO/tests/AMI/run_test.pl:
-
-          Increase default number of iterations from 1 to 10000.  Earlier
-          versions of the PMB changes succeeded just fine with low numbers
-          of iterations, but began to fail miserably when the number of
-          iterations climbed.
-
-	* TAO/tests/BiDirectional/run_test.pl:
-
-          Added level 10 debug.
-
-	* TAO/tests/InterOp-Naming/INS_test_client.cpp:
-
-          Changes that don't appear to be related in any way to PMB...
diff --git a/THANKS b/THANKS
index 712d12bbab5..b5dfa0396d3 100644
--- a/THANKS
+++ b/THANKS
@@ -1784,7 +1784,7 @@ UV Wildner <djuv@gmx.net>
 Alan l Batongbacal <alanlb@vt.edu>
 Gary Maxey <gary.maxey@hp.com>
 Yoav Borer <yoav.borer@data-pod.com>
-A. Kleibeuker <kleibeuk@natlab.research.philips.com>
+Andre Kleibeuker <kleibeuk@natlab.research.philips.com>
 Andy Bellafaire <Andy_M_Bellafaire@raytheon.com>
 
 I would particularly like to thank Paul Stephenson, who worked with me