*** empty log message ***

60 files changed, 3962 insertions, 1410 deletions

diff --git a/TAO/tao/Acceptor_Impl.cpp b/TAO/tao/Acceptor_Impl.cpp
index 026ada238eb..be3f177f38f 100644
--- a/TAO/tao/Acceptor_Impl.cpp
+++ b/TAO/tao/Acceptor_Impl.cpp
@@ -39,8 +39,10 @@ ACE_RCSID(tao, Acceptor_Impl, "$Id$")
 ////////////////////////////////////////////////////////////////////////////////
 
 template <class SVC_HANDLER>
-TAO_Creation_Strategy<SVC_HANDLER>::TAO_Creation_Strategy (TAO_ORB_Core *orb_core)
-  : orb_core_ (orb_core)
+TAO_Creation_Strategy<SVC_HANDLER>::TAO_Creation_Strategy (TAO_ORB_Core *orb_core,
+                                                           CORBA::Boolean flag)
+  : orb_core_ (orb_core),
+    lite_flag_ (flag)
 {
 }
 
@@ -49,7 +51,8 @@ TAO_Creation_Strategy<SVC_HANDLER>::make_svc_handler (SVC_HANDLER *&sh)
 {
   if (sh == 0)
     ACE_NEW_RETURN (sh,
-                    SVC_HANDLER (this->orb_core_),
+                    SVC_HANDLER (this->orb_core_,
+                                 this->lite_flag_),
                     -1);
 
   return 0;
diff --git a/TAO/tao/Acceptor_Impl.h b/TAO/tao/Acceptor_Impl.h
index 7f669fdf39b..ca2c43826ac 100644
--- a/TAO/tao/Acceptor_Impl.h
+++ b/TAO/tao/Acceptor_Impl.h
@@ -30,7 +30,8 @@ class TAO_Creation_Strategy : public ACE_Creation_Strategy<SVC_HANDLER>
   // = TITLE
   //     Creates a Svc_Handler and set the ORB_Core pointer on it.
 public:
-  TAO_Creation_Strategy (TAO_ORB_Core *orb_core);
+  TAO_Creation_Strategy (TAO_ORB_Core *orb_core,
+                         CORBA::Boolean flag = 0);
   // Constructor.
 
   int make_svc_handler (SVC_HANDLER *&sh);
@@ -39,6 +40,9 @@ public:
 protected:
   TAO_ORB_Core *orb_core_;
   // Pointer to the ORB Core.
+  
+  CORBA::Boolean lite_flag_;
+  // Should we use the Lite version for any protocol?
 };
 
 template <class SVC_HANDLER>
diff --git a/TAO/tao/Any.cpp b/TAO/tao/Any.cpp
index f9a75265904..9f8eeb5c8fa 100644
--- a/TAO/tao/Any.cpp
+++ b/TAO/tao/Any.cpp
@@ -1,40 +1,16 @@
-// @ (#) $Id$
+// $Id$
 
+// Portions of this file are:
 // Copyright 1994-1995 by Sun Microsystems Inc.
 // All Rights Reserved
 //
-// ORB:         Implementation of CORBA_Any
-//
-// This includes three constructors, a destructor, and a "replace"
-// method for the "Any" data type.  "Any" values pair a pointer to a
-// data structure in the native binary representation (e.g. C struct)
-// with a TypeCode that describes that data structure.
-//
-// The copy constructor and the destructor each use the TypeCode
-// interpreter with specialized "visit" callback routines.  The
-// "visit" routines are used respectively to make "deep copies" and
-// perform "deep frees" of the aritrary values as described by the
-// "Any" value's typecode.
-//
-// Note that these "visit" routines are called directly, and they
-// choose whether or not to use the TypeCode interpreter to examine
-// constituents.  In the simple cases, the "visit" routines can do
-// their work without any further calls; only for constructed types is
-// the interpreter's knowledge really required.
-//
-// THREADING NOTE: "Any" is a data structure which must be protected
-// by external critical sections.  Like simpler numeric types, "Any"
-// instances are accessed and modified atomically.  This
-// implementation is reentrant, so that independent "Any" values may
-// be manipulated concurrently when the underlying programming
-// environment is itself reentrant.
-//
 
 #include "tao/Any.h"
 #include "tao/Typecode.h"
 #include "tao/Marshal.h"
 #include "tao/ORB_Core.h"
 #include "tao/Object.h"
+#include "tao/singletons.h"
 
 #if !defined (__ACE_INLINE__)
 # include "tao/Any.i"
@@ -89,6 +65,7 @@ CORBA_Any::value (void) const
 CORBA_Any::CORBA_Any (void)
   : type_ (CORBA::TypeCode::_duplicate (CORBA::_tc_null)),
     value_ (0),
+    byte_order_ (TAO_ENCAP_BYTE_ORDER),
     cdr_ (0),
     any_owns_data_ (0)
 {
@@ -103,6 +80,7 @@ CORBA_Any::CORBA_Any (CORBA::TypeCode_ptr tc,
                       CORBA::Boolean any_owns_data)
   : type_ (CORBA::TypeCode::_duplicate (tc)),
     value_ (value),
+    byte_order_ (TAO_ENCAP_BYTE_ORDER),
     cdr_ (0),
     any_owns_data_ (any_owns_data)
 {
@@ -122,6 +100,7 @@ CORBA_Any::CORBA_Any (CORBA::TypeCode_ptr tc,
           ACE_TRY_CHECK;
 
           // Retrieve the start of the message block chain and save it.
+          this->byte_order_ = TAO_ENCAP_BYTE_ORDER;
           this->cdr_ = stream.begin ()->clone ();
         }
     }
@@ -136,9 +115,11 @@ CORBA_Any::CORBA_Any (CORBA::TypeCode_ptr tc,
 // Constructor using a message block.
 CORBA_Any::CORBA_Any (CORBA::TypeCode_ptr type,
                       CORBA::UShort,
+                      int byte_order,
                       const ACE_Message_Block* mb)
   : type_ (CORBA::TypeCode::_duplicate (type)),
     value_ (0),
+    byte_order_ (byte_order),
     cdr_ (ACE_Message_Block::duplicate (mb)),
     any_owns_data_ (0)
 {
@@ -159,6 +140,7 @@ CORBA_Any::CORBA_Any (const CORBA_Any &src)
 
   // CDR stream always contains encoded object, if any holds anything
   // at all.
+  this->byte_order_ = src.byte_order_;
   this->cdr_ = ACE_Message_Block::duplicate (src.cdr_);
 
   // No need to copy src's value_.  We can always get that from cdr.
@@ -208,6 +190,7 @@ CORBA_Any::operator= (const CORBA_Any &src)
 
       this->any_owns_data_ = 0;
 
+      this->byte_order_ = src.byte_order_;
       this->cdr_ = ACE_Message_Block::duplicate (src.cdr_);
       // Simply duplicate the cdr string here.  We can save the decode
       // operation if there's no need to extract the object.
@@ -292,12 +275,14 @@ CORBA_Any::replace (CORBA::TypeCode_ptr tc,
       ACE_CHECK;
 
       // Retrieve the start of the message block chain and duplicate it.
+      this->byte_order_ = TAO_ENCAP_BYTE_ORDER;
       this->cdr_ = ACE_Message_Block::duplicate (stream.begin ());
     }
 }
 
 void
 CORBA_Any::_tao_replace (CORBA::TypeCode_ptr tc,
+                         int byte_order,
                          const ACE_Message_Block *mb,
                          CORBA::Environment &ACE_TRY_ENV)
 {
@@ -318,6 +303,7 @@ CORBA_Any::_tao_replace (CORBA::TypeCode_ptr tc,
 
   this->any_owns_data_ = 0;
 
+  this->byte_order_ = byte_order;
   this->cdr_ = ACE_Message_Block::duplicate (mb);
   // We can save the decode operation if there's no need to extract
   // the object.
@@ -325,6 +311,7 @@ CORBA_Any::_tao_replace (CORBA::TypeCode_ptr tc,
 
 void
 CORBA_Any::_tao_replace (CORBA::TypeCode_ptr tc,
+                         int byte_order,
                          const ACE_Message_Block *mb,
                          CORBA::Boolean any_owns_data,
                          void* value,
@@ -349,6 +336,7 @@ CORBA_Any::_tao_replace (CORBA::TypeCode_ptr tc,
 
   this->any_owns_data_ = any_owns_data;
 
+  this->byte_order_ = byte_order;
   this->cdr_ = ACE_Message_Block::duplicate (mb);
   // We can save the decode operation if there's no need to extract
   // the object.
@@ -405,7 +393,7 @@ CORBA_Any::_tao_encode (TAO_OutputCDR &cdr,
     }
 
   TAO_InputCDR in (this->cdr_,
-                   TAO_ENCAP_BYTE_ORDER,
+                   this->byte_order_,
                    orb_core);
   cdr.append (this->type_,
               &in,
@@ -457,6 +445,7 @@ CORBA_Any::_tao_decode (TAO_InputCDR &cdr,
 
   // Stick it into the Any. It gets duplicated there.
   this->_tao_replace (this->type_,
+                      cdr.byte_order (),
                       &mb,
                       ACE_TRY_ENV);
   ACE_CHECK;
@@ -843,6 +832,7 @@ CORBA_Any::operator<<= (const CORBA_Exception &exception)
       ACE_TRY_CHECK;
 
       this->_tao_replace (exception._type (),
+                          TAO_ENCAP_BYTE_ORDER,
                           stream.begin (),
                           ACE_TRY_ENV);
       ACE_TRY_CHECK;
@@ -1048,7 +1038,8 @@ CORBA_Any::operator>>= (CORBA::Short &s) const
             }
           else
             {
-              TAO_InputCDR stream (this->cdr_);
+              TAO_InputCDR stream (this->cdr_,
+                                   this->byte_order_);
               return stream.read_short (s);
             }
         }
@@ -1088,7 +1079,8 @@ CORBA_Any::operator>>= (CORBA::UShort &s) const
             }
           else
             {
-              TAO_InputCDR stream (this->cdr_);
+              TAO_InputCDR stream (this->cdr_,
+                                   this->byte_order_);
               return stream.read_ushort (s);
             }
         }
@@ -1128,7 +1120,8 @@ CORBA_Any::operator>>= (CORBA::Long &l) const
             }
           else
             {
-              TAO_InputCDR stream (this->cdr_);
+              TAO_InputCDR stream (this->cdr_,
+                                   this->byte_order_);
               return stream.read_long (l);
             }
         }
@@ -1168,7 +1161,8 @@ CORBA_Any::operator>>= (CORBA::ULong &l) const
             }
           else
             {
-              TAO_InputCDR stream (this->cdr_);
+              TAO_InputCDR stream (this->cdr_,
+                                   this->byte_order_);
               return stream.read_ulong (l);
             }
         }
@@ -1208,7 +1202,8 @@ CORBA_Any::operator>>= (CORBA::LongLong &l) const
             }
           else
             {
-              TAO_InputCDR stream (this->cdr_);
+              TAO_InputCDR stream (this->cdr_,
+                                   this->byte_order_);
               return stream.read_longlong (l);
             }
         }
@@ -1248,7 +1243,8 @@ CORBA_Any::operator>>= (CORBA::ULongLong &l) const
             }
           else
             {
-              TAO_InputCDR stream (this->cdr_);
+              TAO_InputCDR stream (this->cdr_,
+                                   this->byte_order_);
               return stream.read_ulonglong (l);
             }
         }
@@ -1288,7 +1284,8 @@ CORBA_Any::operator>>= (CORBA::Float &f) const
             }
           else
             {
-              TAO_InputCDR stream (this->cdr_);
+              TAO_InputCDR stream (this->cdr_,
+                                   this->byte_order_);
               return stream.read_float (f);
             }
         }
@@ -1328,7 +1325,8 @@ CORBA_Any::operator>>= (CORBA::Double &d) const
             }
           else
             {
-              TAO_InputCDR stream (this->cdr_);
+              TAO_InputCDR stream (this->cdr_,
+                                   this->byte_order_);
               return stream.read_double (d);
             }
         }
@@ -1368,7 +1366,8 @@ CORBA_Any::operator>>= (CORBA::Any &a) const
             }
           else
             {
-              TAO_InputCDR stream (this->cdr_);
+              TAO_InputCDR stream (this->cdr_,
+                                   this->byte_order_);
               // decode the CDR
               CORBA::TypeCode::traverse_status retval =
                 stream.decode (CORBA::_tc_any,
@@ -1421,7 +1420,8 @@ CORBA_Any::operator>>= (const CORBA::Any *&a) const
               ACE_NEW_RETURN (a,
                               CORBA::Any,
                               0);
-              TAO_InputCDR stream (this->cdr_);
+              TAO_InputCDR stream (this->cdr_,
+                                   this->byte_order_);
               // decode the CDR
               CORBA::TypeCode::traverse_status retval =
                 stream.decode (CORBA::_tc_any,
@@ -1439,7 +1439,7 @@ CORBA_Any::operator>>= (const CORBA::Any *&a) const
                   delete ACE_const_cast (CORBA::Any *&, a);
                   a = 0;
                   return 0;
-                }                                      
+                }
             }
         }
       else
@@ -1480,7 +1480,8 @@ CORBA_Any::operator>>= (char *&s) const
             }
           else
             {
-              TAO_InputCDR stream (this->cdr_);
+              TAO_InputCDR stream (this->cdr_,
+                                   this->byte_order_);
               if (stream.read_string (s))
                 {
                   ACE_const_cast (CORBA_Any *,
@@ -1544,7 +1545,8 @@ CORBA_Any::operator>>= (const char *&s) const
             }
           else
             {
-              TAO_InputCDR stream (this->cdr_);
+              TAO_InputCDR stream (this->cdr_,
+                                   this->byte_order_);
               if (stream.read_string ((char *&)s))
                 {
                   ACE_const_cast (CORBA_Any *,
@@ -1608,7 +1610,8 @@ CORBA_Any::operator>>= (CORBA::WChar *&ws) const
             }
           else
             {
-              TAO_InputCDR stream (this->cdr_);
+              TAO_InputCDR stream (this->cdr_,
+                                   this->byte_order_);
               if (stream.read_wstring (ws))
                 {
                   ACE_const_cast (CORBA_Any *,
@@ -1672,7 +1675,8 @@ CORBA_Any::operator>>= (const CORBA::WChar *&ws) const
             }
           else
             {
-              TAO_InputCDR stream (this->cdr_);
+              TAO_InputCDR stream (this->cdr_,
+                                   this->byte_order_);
               if (stream.read_wstring ((CORBA::WChar *&)ws))
                 {
                   ACE_const_cast (CORBA_Any *,
@@ -1736,7 +1740,8 @@ CORBA_Any::operator>>= (CORBA::TypeCode_ptr &tc) const
             }
           else
             {
-              TAO_InputCDR stream ((ACE_Message_Block *) this->cdr_);
+              TAO_InputCDR stream ((ACE_Message_Block *) this->cdr_,
+                                   this->byte_order_);
               CORBA::TypeCode::traverse_status retval =
                 stream.decode (CORBA::_tc_TypeCode,
                                &tc,
@@ -1786,7 +1791,8 @@ CORBA_Any::operator>>= (to_boolean b) const
             }
           else
             {
-              TAO_InputCDR stream ((ACE_Message_Block *) this->cdr_);
+              TAO_InputCDR stream ((ACE_Message_Block *) this->cdr_,
+                                   this->byte_order_);
               return stream.read_boolean (b.ref_);
             }
         }
@@ -1826,7 +1832,8 @@ CORBA_Any::operator>>= (to_octet o) const
             }
           else
             {
-              TAO_InputCDR stream ((ACE_Message_Block *) this->cdr_);
+              TAO_InputCDR stream ((ACE_Message_Block *) this->cdr_,
+                                   this->byte_order_);
               return stream.read_octet (o.ref_);
             }
         }
@@ -1866,7 +1873,8 @@ CORBA_Any::operator>>= (to_char c) const
             }
           else
             {
-              TAO_InputCDR stream ((ACE_Message_Block *) this->cdr_);
+              TAO_InputCDR stream ((ACE_Message_Block *) this->cdr_,
+                                   this->byte_order_);
               return stream.read_char (c.ref_);
             }
         }
@@ -1906,7 +1914,8 @@ CORBA_Any::operator>>= (to_wchar wc) const
             }
           else
             {
-              TAO_InputCDR stream ((ACE_Message_Block *) this->cdr_);
+              TAO_InputCDR stream ((ACE_Message_Block *) this->cdr_,
+                                   this->byte_order_);
               return stream.read_wchar (wc.ref_);
             }
         }
@@ -1950,7 +1959,8 @@ CORBA_Any::operator>>= (to_string s) const
                 }
               else
                 {
-                  TAO_InputCDR stream ((ACE_Message_Block *) this->cdr_);
+                  TAO_InputCDR stream ((ACE_Message_Block *) this->cdr_,
+                                   this->byte_order_);
                   if (stream.read_string (s.val_))
                     {
                       ACE_const_cast (CORBA_Any *,
@@ -2008,7 +2018,8 @@ CORBA_Any::operator>>= (to_wstring ws) const
                 }
               else
                 {
-                  TAO_InputCDR stream ((ACE_Message_Block *) this->cdr_);
+                  TAO_InputCDR stream ((ACE_Message_Block *) this->cdr_,
+                                   this->byte_order_);
                   if (stream.read_wstring (ws.val_))
                     {
                       ACE_const_cast (CORBA_Any *,
@@ -2069,21 +2080,12 @@ CORBA_Any::operator>>= (to_object obj) const
               // demarshal objects (to create the right profiles for that
               // object), but the Any does not belong to any ORB.
               TAO_InputCDR stream (this->cdr_,
-                                   ACE_CDR_BYTE_ORDER,
+                                   this->byte_order_,
                                    TAO_ORB_Core_instance ());
 
-              CORBA::TypeCode::traverse_status status =
-                stream.decode (this->type_,
-                               &obj.ref_,
-                               0,
-                               ACE_TRY_ENV);
-              ACE_TRY_CHECK;
+              int result = stream >> obj.ref_;
 
-              // Because of the CORBA 2.3 change mentioned above, there is no
-              // need to assign to this->value_.
-              return (CORBA::Boolean) ((status == CORBA::TypeCode::TRAVERSE_CONTINUE)
-                                       ? 1
-                                       : 0);
+              return !result;
             }
         }
       else
@@ -2159,9 +2161,61 @@ CORBA_Any::operator<<= (const CORBA::WChar* s)
   ACE_CHECK;
 }
 
-// ----------------------------------------------------------------------
-// Any_var type
-// ----------------------------------------------------------------------
+CORBA::Boolean
+operator<< (TAO_OutputCDR& cdr,
+            const CORBA::Any &x)
+{
+  // @@ This function should *not* use the interpreter, there must be
+  // a way to do this with just CDR operations!!!!
+  ACE_TRY_NEW_ENV
+    {
+      CORBA::TypeCode::traverse_status status =
+        TAO_MARSHAL_ANY::instance ()->encode (0,
+                                              &x,
+                                              0,
+                                              &cdr,
+                                              ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      if (status== CORBA::TypeCode::TRAVERSE_CONTINUE)
+        return 1;
+      // else return 0 at the end of the function
+    }
+  ACE_CATCH (CORBA_Exception, ex)
+    {
+      return 0;
+    }
+  ACE_ENDTRY;
+  return 0;
+}
+
+CORBA::Boolean
+operator>> (TAO_InputCDR &cdr,
+            CORBA::Any &x)
+{
+  ACE_TRY_NEW_ENV
+    {
+      CORBA::TypeCode::traverse_status status =
+        TAO_MARSHAL_ANY::instance ()->decode (0,
+                                              &x,
+                                              0,
+                                              &cdr,
+                                              ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      if (status != CORBA::TypeCode::TRAVERSE_CONTINUE)
+        return 0;
+    }
+  ACE_CATCH (CORBA_Exception, ex)
+    {
+      return 0;
+    }
+  ACE_ENDTRY;
+
+  return 1;
+}
+
+// ****************************************************************
 
 CORBA::Any_var &
 CORBA_Any_var::operator= (CORBA::Any *p)
@@ -2192,123 +2246,3 @@ CORBA_Any_var::operator= (const CORBA::Any_var& r)
 
   return *this;
 }
-
-// = Debugging method.
-
-// Prints the type and the value of the any value. Dumping is
-// supported only for standard data types.
-
-void
-CORBA_Any::dump (const CORBA::Any &any_value)
-{
-  // Get the typecode kind.
-  CORBA::TypeCode_var type = any_value.type ();
-  CORBA::TCKind kind = type->kind ();
-
-  switch (kind)
-    {
-      case CORBA::tk_null:
-        ACE_DEBUG ((LM_DEBUG,
-                    ASYS_TEXT ("Null\n")));
-        break;
-      case CORBA::tk_void:
-        ACE_DEBUG ((LM_DEBUG,
-                    ASYS_TEXT ("Void\n")));
-        break;
-      case CORBA::tk_short:
-        {
-          CORBA::Short s;
-          any_value >>= s;
-          ACE_DEBUG ((LM_DEBUG,
-                      ASYS_TEXT ("Short %d\n"),
-                     s));
-          break;
-        }
-      case CORBA::tk_long:
-        {
-          CORBA::Long l;
-          any_value >>= l;
-          ACE_DEBUG ((LM_DEBUG,
-                      ASYS_TEXT ("Long %d\n"),
-                      l));
-          break;
-        }
-      case CORBA::tk_ushort:
-        {
-          CORBA::UShort s;
-          any_value >>= s;
-          ACE_DEBUG ((LM_DEBUG,
-                      ASYS_TEXT ("UShort %d\n"),
-                      s));
-          break;
-        }
-      case CORBA::tk_ulong:
-        {
-          CORBA::ULong l;
-          any_value >>= l;
-          ACE_DEBUG ((LM_DEBUG,
-                      ASYS_TEXT ("ULong %d\n"),
-                      l));
-          break;
-        }
-      case CORBA::tk_float:
-        {
-          CORBA::Float f;
-          any_value >>= f;
-          ACE_DEBUG ((LM_DEBUG,
-                      ASYS_TEXT ("Float %f\n"),
-                      f));
-          break;
-        }
-      case CORBA::tk_double:
-        {
-          CORBA::Double d;
-          any_value >>= d;
-          ACE_DEBUG ((LM_DEBUG,
-                      ASYS_TEXT ("Double %f\n"),
-                      d));
-          break;
-        }
-      case CORBA::tk_boolean:
-        {
-          CORBA::Boolean b;
-          to_boolean tb (b);
-          any_value >>= tb;
-          if (b == 1)
-            {
-              ACE_DEBUG ((LM_DEBUG,
-                          ASYS_TEXT ("Boolean TRUE\n")));
-            }
-          else
-            {
-              ACE_DEBUG ((LM_DEBUG,
-                          ASYS_TEXT ("Boolean FALSE\n")));
-            }
-          break;
-        }
-      case CORBA::tk_char:
-        {
-          CORBA::Char ch;
-          to_char tch (ch);
-          any_value >>= tch;
-          ACE_DEBUG ((LM_DEBUG,
-                      ASYS_TEXT ("Char %c\n"),
-                      ch));
-          break;
-        }
-      case CORBA::tk_string:
-        {
-          char* str;
-          any_value >>= str;
-          ACE_DEBUG ((LM_DEBUG,
-                      ASYS_TEXT ("String %s\n"),
-                      str));
-          break;
-        }
-      default:
-        ACE_DEBUG ((LM_DEBUG,
-                    ASYS_TEXT ("TCKind %d\n"),
-                    kind));
-        break;
-    }
-}
diff --git a/TAO/tao/Any.h b/TAO/tao/Any.h
index 01c672e1181..20f09d06655 100644
--- a/TAO/tao/Any.h
+++ b/TAO/tao/Any.h
@@ -81,6 +81,7 @@ public:
   // = TAO extension
   CORBA_Any (CORBA::TypeCode_ptr type,
              CORBA::UShort dummy,
+             int byte_order,
              const ACE_Message_Block* mb);
   // Constructor. Used by DynAny and others to optimize Any activities
   // by using CDR. The dummy arg is to keep calls like CORBA_Any foo
@@ -301,12 +302,6 @@ public:
   // otherwise. TAO does *not* guarantee that this value may be casted
   // to the contained type safely.
 
-  // = Debugging method.
-
-  static void dump (const CORBA::Any &any_value);
-  // Prints the type and the value of the any value. Dumping is
-  // supported only for standard data types.
-
   // = TAO extensions
   CORBA::Boolean any_owns_data (void) const;
   // Reports whether the Any own the data or not. This is used by the
@@ -317,37 +312,36 @@ public:
 
   ACE_Message_Block* _tao_get_cdr (void) const;
   // Message block accessor.
+  int _tao_byte_order (void) const;
+  // Get the byte order inside the CDR stream.
 
   void _tao_replace (CORBA::TypeCode_ptr,
+                     int byte_order,
                      const ACE_Message_Block *mb,
-                     CORBA::Environment &ACE_TRY_ENV =
-                       TAO_default_environment ());
+                     CORBA::Environment &ACE_TRY_ENV);
   // Replace via message block instead of <value_>.
 
   void _tao_replace (CORBA::TypeCode_ptr type,
+                     int byte_order,
                      const ACE_Message_Block *mb,
                      CORBA::Boolean any_owns_data,
                      void* value,
-                     CORBA::Environment &ACE_TRY_ENV =
-                       TAO_default_environment ());
+                     CORBA::Environment &ACE_TRY_EN);
   // Replace all the contents of the any, used in the <<= operators.
 
   void _tao_replace (CORBA::TypeCode_ptr type,
                      CORBA::Boolean any_owns_data,
                      void* value,
-                     CORBA::Environment &ACE_TRY_ENV =
-                       TAO_default_environment ());
+                     CORBA::Environment &ACE_TRY_ENV);
   // Replace the value of the Any, used in the >>= operators.
 
   void _tao_encode (TAO_OutputCDR &cdr,
                     TAO_ORB_Core *orb_core,
-                    CORBA::Environment &ACE_TRY_ENV =
-                       TAO_default_environment ());
+                    CORBA::Environment &ACE_TRY_ENV);
   // Encode the contents of the Any into <cdr>
 
   void _tao_decode (TAO_InputCDR &cdr,
-                    CORBA::Environment &ACE_TRY_ENV =
-                       TAO_default_environment ());
+                    CORBA::Environment &ACE_TRY_ENV);
   // Decode the <cdr> using the typecode in the Any object.
 
 #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
@@ -367,6 +361,7 @@ private:
   void *value_;
   // Value for the <Any>.
 
+  int byte_order_;
   ACE_Message_Block *cdr_;
   // encoded value.
 
@@ -479,6 +474,12 @@ private:
   // assignment from _var disallowed
 };
 
+// These operators are too complex to be inline....
+TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR& cdr,
+                                      const CORBA::Any &x);
+TAO_Export CORBA::Boolean operator>> (TAO_InputCDR& cdr,
+                                      CORBA::Any &x);
+
 #if defined (__ACE_INLINE__)
 # include "tao/Any.i"
 #else
diff --git a/TAO/tao/Any.i b/TAO/tao/Any.i
index fc8a58a8f91..545d277948a 100644
--- a/TAO/tao/Any.i
+++ b/TAO/tao/Any.i
@@ -37,6 +37,11 @@ CORBA_Any::to_object::to_object (CORBA_Object_out obj)
 {
 }
 
+ACE_INLINE int
+CORBA_Any::_tao_byte_order (void) const
+{
+  return this->byte_order_;
+}
 // *************************************************************
 // Inline operations for class CORBA_Any_var
 // *************************************************************
diff --git a/TAO/tao/BoundsC.cpp b/TAO/tao/BoundsC.cpp
index 8500557bba4..511f6ad2ea0 100644
--- a/TAO/tao/BoundsC.cpp
+++ b/TAO/tao/BoundsC.cpp
@@ -113,7 +113,8 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::Bounds *&_tao_ele
     else
     {
       ACE_NEW_RETURN (_tao_elem, CORBA::Bounds, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
+      TAO_InputCDR stream (_tao_any._tao_get_cdr (),
+                           _tao_any._tao_byte_order ());
       if (stream.decode (CORBA::_tc_Bounds, _tao_elem, 0, ACE_TRY_ENV)
         == CORBA::TypeCode::TRAVERSE_CONTINUE)
       {
diff --git a/TAO/tao/CDR.cpp b/TAO/tao/CDR.cpp
index 71b2fb542bb..3755ec6ffe6 100644
--- a/TAO/tao/CDR.cpp
+++ b/TAO/tao/CDR.cpp
@@ -144,61 +144,6 @@ TAO_OutputCDR::encode (CORBA::TypeCode_ptr tc,
                        ACE_TRY_ENV);
 }
 
-CORBA::Boolean
-operator<< (TAO_OutputCDR& cdr,
-            const CORBA::Any &x)
-{
-  // @@ This function should *not* use the interpreter, there must be
-  // a way to do this with just CDR operations!!!!
-  ACE_TRY_NEW_ENV
-    {
-      CORBA::TypeCode::traverse_status status =
-        TAO_MARSHAL_ANY::instance ()->encode (0,
-                                              &x,
-                                              0,
-                                              &cdr,
-                                              ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      if (status== CORBA::TypeCode::TRAVERSE_CONTINUE)
-        return 1;
-      // else return 0 at the end of the function
-    }
-  ACE_CATCH (CORBA_Exception, ex)
-    {
-      return 0;
-    }
-  ACE_ENDTRY;
-  return 0;
-}
-
-CORBA::Boolean
-operator<< (TAO_OutputCDR& cdr, const CORBA::TypeCode *x)
-{
-  ACE_TRY_NEW_ENV
-    {
-      // @@ This function should *not* use the interpreter, there must
-      // be a way to do this with just CDR operations!!!!
-      CORBA::TypeCode::traverse_status status =
-        TAO_MARSHAL_TYPECODE::instance ()->encode (0,
-                                                   &x,
-                                                   0,
-                                                   &cdr,
-                                                   ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      if (status == CORBA::TypeCode::TRAVERSE_CONTINUE)
-        return 1;
-      // else return 0 at the end of the function
-    }
-  ACE_CATCH (CORBA_Exception, ex)
-    {
-      return 0;
-    }
-  ACE_ENDTRY;
-  return 0;
-}
-
 CORBA::TypeCode::traverse_status
 TAO_OutputCDR::append (CORBA::TypeCode_ptr tc,
                        TAO_InputCDR *src,
@@ -282,54 +227,3 @@ TAO_InputCDR::skip (CORBA::TypeCode_ptr tc,
                      this,
                      ACE_TRY_ENV);
 }
-
-CORBA::Boolean
-operator>> (TAO_InputCDR &cdr,
-            CORBA::Any &x)
-{
-  ACE_TRY_NEW_ENV
-    {
-      CORBA::TypeCode::traverse_status status =
-        TAO_MARSHAL_ANY::instance ()->decode (0,
-                                              &x,
-                                              0,
-                                              &cdr,
-                                              ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      if (status != CORBA::TypeCode::TRAVERSE_CONTINUE)
-        return 0;
-    }
-  ACE_CATCH (CORBA_Exception, ex)
-    {
-      return 0;
-    }
-  ACE_ENDTRY;
-
-  return 1;
-}
-
-CORBA::Boolean
-operator>> (TAO_InputCDR& cdr, CORBA::TypeCode *&x)
-{
-  ACE_TRY_NEW_ENV
-    {
-      CORBA::TypeCode::traverse_status status =
-        TAO_MARSHAL_TYPECODE::instance ()->decode (0,
-                                                   &x,
-                                                   0,
-                                                   &cdr,
-                                                   ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      if (status != CORBA::TypeCode::TRAVERSE_CONTINUE)
-        return 0;
-    }
-  ACE_CATCH (CORBA_Exception, ex)
-    {
-      return 0;
-    }
-  ACE_ENDTRY;
-
-  return 1;
-}
diff --git a/TAO/tao/CDR.h b/TAO/tao/CDR.h
index 12b47fcd189..45f7ab8c271 100644
--- a/TAO/tao/CDR.h
+++ b/TAO/tao/CDR.h
@@ -1,7 +1,6 @@
 // This may look like C, but it's really -*- C++ -*-
 // $Id$
 
-
 // ============================================================================
 //
 // = LIBRARY
@@ -251,17 +250,6 @@ private:
   // The ORB_Core, required to extract object references.
 };
 
-// This operators are too complex to be inline....
-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR& cdr,
-                                      const CORBA::Any &x);
-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR& cdr,
-                                      const CORBA::TypeCode *x);
-
-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR& cdr,
-                                      CORBA::Any &x);
-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR& cdr,
-                                      CORBA::TypeCode *&x);
-
 #if defined(__ACE_INLINE__)
 # include "tao/CDR.i"
 #else
diff --git a/TAO/tao/CONV_FRAMEC.cpp b/TAO/tao/CONV_FRAMEC.cpp
index 384e24cc16d..a20f0f0c2e9 100644
--- a/TAO/tao/CONV_FRAMEC.cpp
+++ b/TAO/tao/CONV_FRAMEC.cpp
@@ -309,7 +309,8 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CONV_FRAME::CodeSetCompo
     else
     {
       ACE_NEW_RETURN (_tao_elem, CONV_FRAME::CodeSetComponent, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
+      TAO_InputCDR stream (_tao_any._tao_get_cdr (),
+                           _tao_any._tao_byte_order ());
       if (stream.decode (CONV_FRAME::_tc_CodeSetComponent, _tao_elem, 0, ACE_TRY_ENV)
         == CORBA::TypeCode::TRAVERSE_CONTINUE)
       {
@@ -375,7 +376,8 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CONV_FRAME::CodeSetCompo
     else
     {
       ACE_NEW_RETURN (_tao_elem, CONV_FRAME::CodeSetComponentInfo, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
+      TAO_InputCDR stream (_tao_any._tao_get_cdr (),
+                           _tao_any._tao_byte_order ());
       if (stream.decode (CONV_FRAME::_tc_CodeSetComponentInfo, _tao_elem, 0, ACE_TRY_ENV)
         == CORBA::TypeCode::TRAVERSE_CONTINUE)
       {
@@ -441,7 +443,8 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CONV_FRAME::CodeSetConte
     else
     {
       ACE_NEW_RETURN (_tao_elem, CONV_FRAME::CodeSetContext, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
+      TAO_InputCDR stream (_tao_any._tao_get_cdr (),
+                           _tao_any._tao_byte_order ());
       if (stream.decode (CONV_FRAME::_tc_CodeSetContext, _tao_elem, 0, ACE_TRY_ENV)
         == CORBA::TypeCode::TRAVERSE_CONTINUE)
       {
diff --git a/TAO/tao/CurrentC.cpp b/TAO/tao/CurrentC.cpp
index edc4f93b848..009f75238ff 100644
--- a/TAO/tao/CurrentC.cpp
+++ b/TAO/tao/CurrentC.cpp
@@ -51,7 +51,7 @@ CORBA_Current_ptr CORBA_Current::_narrow (
   ACE_NEW_RETURN (
       retval,
       POA_CORBA::_tao_collocated_Current (
-          ACE_reinterpret_cast (POA_CORBA::Current_ptr, 
+          ACE_reinterpret_cast (POA_CORBA::Current_ptr,
                                 servant),
           0
         ),
@@ -102,7 +102,8 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_Current_ptr &_tao_
       if (eq == 0)
         return 0;
 
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
+      TAO_InputCDR stream (_tao_any._tao_get_cdr (),
+                           _tao_any._tao_byte_order ());
       CORBA::Object_ptr *_tao_obj_ptr;
       ACE_NEW_RETURN (_tao_obj_ptr, CORBA::Object_ptr, 0);
       if (stream.decode (CORBA::_tc_Current, _tao_obj_ptr, 0, ACE_TRY_ENV)
diff --git a/TAO/tao/DomainC.cpp b/TAO/tao/DomainC.cpp
index 90e44490f94..5082b2d43b6 100644
--- a/TAO/tao/DomainC.cpp
+++ b/TAO/tao/DomainC.cpp
@@ -362,7 +362,8 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_DomainManager_ptr
     CORBA::TypeCode_var type = _tao_any.type ();
     if (!type->equal (CORBA::_tc_DomainManager, ACE_TRY_ENV)) return 0; // not equal
     ACE_TRY_CHECK;
-    TAO_InputCDR stream (_tao_any._tao_get_cdr ());
+    TAO_InputCDR stream (_tao_any._tao_get_cdr (),
+                           _tao_any._tao_byte_order ());
     CORBA::Object_var _tao_obj_var;
     ACE_NEW_RETURN (tmp, CORBA::Object_ptr, 0);
     if (stream.decode (CORBA::_tc_DomainManager, &_tao_obj_var.out (), 0, ACE_TRY_ENV)
@@ -424,7 +425,8 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_ConstructionPolicy
     CORBA::TypeCode_var type = _tao_any.type ();
     if (!type->equal (CORBA::_tc_ConstructionPolicy, ACE_TRY_ENV)) return 0; // not equal
     ACE_TRY_CHECK;
-    TAO_InputCDR stream (_tao_any._tao_get_cdr ());
+    TAO_InputCDR stream (_tao_any._tao_get_cdr (),
+                           _tao_any._tao_byte_order ());
     CORBA::Object_var _tao_obj_var;
     ACE_NEW_RETURN (tmp, CORBA::Object_ptr, 0);
     if (stream.decode (CORBA::_tc_ConstructionPolicy, &_tao_obj_var.out (), 0, ACE_TRY_ENV)
@@ -503,7 +505,8 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_DomainManagerList
     else
     {
       ACE_NEW_RETURN (_tao_elem, CORBA_DomainManagerList, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
+      TAO_InputCDR stream (_tao_any._tao_get_cdr (),
+                           _tao_any._tao_byte_order ());
       if (stream.decode (CORBA::_tc_DomainManagerList, _tao_elem, 0, ACE_TRY_ENV)
         == CORBA::TypeCode::TRAVERSE_CONTINUE)
       {
diff --git a/TAO/tao/DynArray_i.cpp b/TAO/tao/DynArray_i.cpp
index 337c9503b34..a2c7db9d9e5 100644
--- a/TAO/tao/DynArray_i.cpp
+++ b/TAO/tao/DynArray_i.cpp
@@ -51,7 +51,8 @@ TAO_DynArray_i::TAO_DynArray_i (const CORBA_Any& any)
           // Get the CDR stream of the argument.
           ACE_Message_Block* mb = any._tao_get_cdr ();
 
-          TAO_InputCDR cdr (mb);
+          TAO_InputCDR cdr (mb,
+                            any._tao_byte_order ());
 
           CORBA::TypeCode_var field_tc =
             this->get_element_type (ACE_TRY_ENV);
@@ -62,6 +63,7 @@ TAO_DynArray_i::TAO_DynArray_i (const CORBA_Any& any)
               // This Any constructor is a TAO extension.
               CORBA_Any field_any (field_tc.in (),
                                    0,
+                                   cdr.byte_order (),
                                    cdr.start ());
 
               // This recursive step will call the correct constructor
@@ -275,7 +277,8 @@ TAO_DynArray_i::from_any (const CORBA_Any& any,
     {
       // Get the CDR stream of the argument.
       ACE_Message_Block* mb = any._tao_get_cdr ();
-      TAO_InputCDR cdr (mb);
+      TAO_InputCDR cdr (mb,
+                        any._tao_byte_order ());
 
       CORBA::ULong length = this->da_members_.size ();
       CORBA::ULong arg_length = this->get_arg_length (any.type (),
@@ -295,6 +298,7 @@ TAO_DynArray_i::from_any (const CORBA_Any& any,
           // This Any constructor is a TAO extension.
           CORBA_Any field_any (field_tc.in (),
                                0,
+                               cdr.byte_order (),
                                cdr.start ());
 
           if (!CORBA::is_nil (this->da_members_[i].in ()))
@@ -343,7 +347,8 @@ TAO_DynArray_i::to_any (CORBA::Environment& ACE_TRY_ENV)
 
       ACE_Message_Block* field_mb = field_any->_tao_get_cdr ();
 
-      TAO_InputCDR field_cdr (field_mb);
+      TAO_InputCDR field_cdr (field_mb,
+                              field_any->_tao_byte_order ());
 
       out_cdr.append (field_tc.in (),
                       &field_cdr,
@@ -361,6 +366,7 @@ TAO_DynArray_i::to_any (CORBA::Environment& ACE_TRY_ENV)
   ACE_NEW_THROW_EX (retval,
                     CORBA_Any (my_tc,
                                0,
+                               in_cdr.byte_order (),
                                in_cdr.start ()),
                     CORBA::NO_MEMORY ());
   ACE_CHECK_RETURN (0);
@@ -1432,7 +1438,7 @@ TAO_DynArray_i::get_any (CORBA::Environment &ACE_TRY_ENV)
 CORBA::TypeCode_ptr
 TAO_DynArray_i::get_element_type (CORBA::Environment& ACE_TRY_ENV)
 {
-  CORBA::TypeCode_var element_type = 
+  CORBA::TypeCode_var element_type =
     CORBA_TypeCode::_duplicate (this->type_.in ());
 
   // Strip away aliases (if any) on top of the outer type
diff --git a/TAO/tao/DynEnum_i.cpp b/TAO/tao/DynEnum_i.cpp
index ef3a0c50acc..927314ffb1d 100644
--- a/TAO/tao/DynEnum_i.cpp
+++ b/TAO/tao/DynEnum_i.cpp
@@ -42,7 +42,8 @@ TAO_DynEnum_i::TAO_DynEnum_i (const CORBA_Any &any)
           // Get the CDR stream of the argument.
           ACE_Message_Block* mb = any._tao_get_cdr ();
 
-          TAO_InputCDR cdr (mb);
+          TAO_InputCDR cdr (mb,
+                            any._tao_byte_order ());
 
           cdr.read_ulong (this->value_);
         }
@@ -216,7 +217,8 @@ TAO_DynEnum_i::from_any (const CORBA_Any& any,
       // Get the CDR stream of the argument.
       ACE_Message_Block* mb = any._tao_get_cdr ();
 
-      TAO_InputCDR cdr (mb);
+      TAO_InputCDR cdr (mb,
+                        any._tao_byte_order ());
 
       cdr.read_ulong (this->value_);
     }
@@ -237,6 +239,7 @@ TAO_DynEnum_i::to_any (CORBA::Environment& ACE_TRY_ENV)
   ACE_NEW_THROW_EX (retval,
                     CORBA_Any (this->type_.in (),
                                0,
+                               TAO_ENCAP_BYTE_ORDER,
                                out_cdr.begin ()),
                     CORBA::NO_MEMORY ());
   ACE_CHECK_RETURN (0);
diff --git a/TAO/tao/DynSequence_i.cpp b/TAO/tao/DynSequence_i.cpp
index 14f940bf548..a8e1a120baa 100644
--- a/TAO/tao/DynSequence_i.cpp
+++ b/TAO/tao/DynSequence_i.cpp
@@ -45,7 +45,8 @@ TAO_DynSequence_i::TAO_DynSequence_i (const CORBA_Any& any)
           // Get the CDR stream of the argument.
           ACE_Message_Block *mb = any._tao_get_cdr ();
 
-          TAO_InputCDR cdr (mb);
+          TAO_InputCDR cdr (mb,
+                            any._tao_byte_order ());
 
           CORBA::ULong length;
 
@@ -66,6 +67,7 @@ TAO_DynSequence_i::TAO_DynSequence_i (const CORBA_Any& any)
               // This Any constructor is a TAO extension.
               CORBA_Any field_any (field_tc.in (),
                                    0,
+                                   cdr.byte_order (),
                                    cdr.start ());
 
               // This recursive step will call the correct constructor
@@ -285,7 +287,8 @@ TAO_DynSequence_i::from_any (const CORBA_Any& any,
       // Get the CDR stream of the argument.
       ACE_Message_Block *mb = any._tao_get_cdr ();
 
-      TAO_InputCDR cdr (mb);
+      TAO_InputCDR cdr (mb,
+                        any._tao_byte_order ());
 
       CORBA::ULong arg_length;
 
@@ -316,6 +319,7 @@ TAO_DynSequence_i::from_any (const CORBA_Any& any,
           // This Any constructor is a TAO extension.
           CORBA_Any field_any (field_tc.in (),
                                0,
+                               cdr.byte_order (),
                                cdr.start ());
 
           if (!CORBA::is_nil (this->da_members_[i].in ()))
@@ -366,7 +370,8 @@ TAO_DynSequence_i::to_any (CORBA::Environment& ACE_TRY_ENV)
       ACE_Message_Block *field_mb =
         field_any->_tao_get_cdr ();
 
-      TAO_InputCDR field_cdr (field_mb);
+      TAO_InputCDR field_cdr (field_mb,
+                              field_any->_tao_byte_order ());
 
       out_cdr.append (field_tc.in (),
                       &field_cdr,
@@ -384,6 +389,7 @@ TAO_DynSequence_i::to_any (CORBA::Environment& ACE_TRY_ENV)
   ACE_NEW_THROW_EX (retval,
                     CORBA_Any (tc,
                                0,
+                               in_cdr.byte_order (),
                                in_cdr.start ()),
                     CORBA::NO_MEMORY ());
   ACE_CHECK_RETURN (0);
diff --git a/TAO/tao/DynStruct_i.cpp b/TAO/tao/DynStruct_i.cpp
index 7814fe30020..318ba8a45ad 100644
--- a/TAO/tao/DynStruct_i.cpp
+++ b/TAO/tao/DynStruct_i.cpp
@@ -51,7 +51,8 @@ TAO_DynStruct_i::TAO_DynStruct_i (const CORBA_Any& any)
           // Get the CDR stream of the argument.
           ACE_Message_Block *mb = any._tao_get_cdr ();
 
-          TAO_InputCDR cdr (mb);
+          TAO_InputCDR cdr (mb,
+                            any._tao_byte_order ());
 
           for (CORBA::ULong i = 0; i < numfields; i++)
             {
@@ -62,8 +63,9 @@ TAO_DynStruct_i::TAO_DynStruct_i (const CORBA_Any& any)
 
               // This Any constructor is a TAO extension.
               CORBA_Any field_any (field_tc.in (),
-                                  0,
-                                  cdr.start ());
+                                   0,
+                                   cdr.byte_order (),
+                                   cdr.start ());
 
               // This recursive step will call the correct constructor
               // based on the type of field_any.
@@ -300,18 +302,19 @@ TAO_DynStruct_i::from_any (const CORBA_Any& any,
     {
       // Get the CDR stream of the argument.
       ACE_Message_Block* mb = any._tao_get_cdr ();
-      TAO_InputCDR cdr (mb);
+      TAO_InputCDR cdr (mb,
+                        any._tao_byte_order ());
 
       // If we have an exception type, unmarshal the repository ID.
-	    CORBA::TCKind kind = TAO_DynAny_i::unalias (this->type_.in (),
+      CORBA::TCKind kind = TAO_DynAny_i::unalias (this->type_.in (),
                                                   ACE_TRY_ENV);
-	    ACE_CHECK;
+      ACE_CHECK;
 
-	    if (kind == CORBA::tk_except) 
+      if (kind == CORBA::tk_except)
         {
-	        CORBA::String_var str;
-	        cdr >> str.out();
-	      }
+          CORBA::String_var str;
+          cdr >> str.out();
+        }
 
       for (CORBA::ULong i = 0;
            i < this->da_members_.size ();
@@ -325,6 +328,7 @@ TAO_DynStruct_i::from_any (const CORBA_Any& any,
           // This Any constructor is a TAO extension.
           CORBA_Any field_any (field_tc.in (),
                                0,
+                               cdr.byte_order (),
                                cdr.start ());
 
           if (!CORBA::is_nil (this->da_members_[i].in ()))
@@ -358,7 +362,7 @@ TAO_DynStruct_i::to_any (CORBA::Environment& ACE_TRY_ENV)
                                               ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
 
-  if (kind == CORBA::tk_except) 
+  if (kind == CORBA::tk_except)
     {
       out_cdr << this->type_->id ();
     }
@@ -385,7 +389,8 @@ TAO_DynStruct_i::to_any (CORBA::Environment& ACE_TRY_ENV)
 
       ACE_Message_Block *field_mb = field_any->_tao_get_cdr ();
 
-      TAO_InputCDR field_cdr (field_mb);
+      TAO_InputCDR field_cdr (field_mb,
+                              field_any->_tao_byte_order ());
 
       out_cdr.append (field_tc,
                       &field_cdr,
@@ -403,6 +408,7 @@ TAO_DynStruct_i::to_any (CORBA::Environment& ACE_TRY_ENV)
   ACE_NEW_THROW_EX (retval,
                     CORBA_Any (tc,
                                0,
+                               in_cdr.byte_order (),
                                in_cdr.start ()),
                     CORBA::NO_MEMORY ());
   ACE_CHECK_RETURN (0);
@@ -536,7 +542,7 @@ void
 TAO_DynStruct_i::insert_char (CORBA::Char value,
                               CORBA::Environment &ACE_TRY_ENV)
 {
-  
+
   CORBA::TypeCode_var tc = this->type_.in ()->member_type (this->current_index_);
   CORBA::TCKind kind =
     TAO_DynAny_i::unalias (tc.in (), ACE_TRY_ENV);
diff --git a/TAO/tao/DynUnion_i.cpp b/TAO/tao/DynUnion_i.cpp
index 8b84053d4c2..35021bfccc5 100644
--- a/TAO/tao/DynUnion_i.cpp
+++ b/TAO/tao/DynUnion_i.cpp
@@ -340,7 +340,8 @@ TAO_DynUnion_i::to_any (CORBA::Environment& ACE_TRY_ENV)
   ACE_Message_Block *disc_mb =
     disc_any->_tao_get_cdr ();
 
-  TAO_InputCDR disc_cdr (disc_mb);
+  TAO_InputCDR disc_cdr (disc_mb,
+                         disc_any->_tao_byte_order ());
 
   out_cdr.append (disc_tc,
                   &disc_cdr,
@@ -360,7 +361,8 @@ TAO_DynUnion_i::to_any (CORBA::Environment& ACE_TRY_ENV)
   ACE_Message_Block *member_mb =
     member_any->_tao_get_cdr ();
 
-  TAO_InputCDR member_cdr (member_mb);
+  TAO_InputCDR member_cdr (member_mb,
+                           member_any->_tao_byte_order ());
 
   out_cdr.append (member_tc,
                   &member_cdr,
@@ -377,6 +379,7 @@ TAO_DynUnion_i::to_any (CORBA::Environment& ACE_TRY_ENV)
   ACE_NEW_THROW_EX (retval,
                     CORBA_Any (tc,
                                0,
+                               in_cdr.byte_order (),
                                in_cdr.start ()),
                     CORBA::NO_MEMORY ());
   ACE_CHECK_RETURN (0);
@@ -2004,14 +2007,16 @@ TAO_DynUnion_i::Enum_extractor::check_match (const CORBA_Any &inside_any,
   // Get the CDR stream of one argument...
   ACE_Message_Block *mb = inside_any._tao_get_cdr ();
 
-  TAO_InputCDR inside_cdr (mb);
+  TAO_InputCDR inside_cdr (mb,
+                           inside_any._tao_byte_order ());
 
   inside_cdr.read_ulong (this->member_index_);
 
   // And of the other...
   mb = outside_any._tao_get_cdr ();
 
-  TAO_InputCDR outside_cdr (mb);
+  TAO_InputCDR outside_cdr (mb,
+                            outside_any._tao_byte_order ());
 
   outside_cdr.read_ulong (this->arg_index_);
 
@@ -2107,7 +2112,8 @@ TAO_DynUnion_i::set_from_any (const CORBA_Any& any,
   // Get the CDR stream of the argument.
   ACE_Message_Block* mb = any._tao_get_cdr ();
 
-  TAO_InputCDR cdr (mb);
+  TAO_InputCDR cdr (mb,
+                    any._tao_byte_order ());
 
   CORBA_TypeCode_ptr disc_tc =
     any.type ()->discriminator_type (ACE_TRY_ENV);
@@ -2115,6 +2121,7 @@ TAO_DynUnion_i::set_from_any (const CORBA_Any& any,
 
   CORBA_Any disc_any (disc_tc,
                       0,
+                      cdr.byte_order (),
                       cdr.start ());
 
   if (!CORBA::is_nil (this->discriminator_.in ()))
@@ -2190,6 +2197,7 @@ TAO_DynUnion_i::set_from_any (const CORBA_Any& any,
 
       CORBA_Any member_any (member_tc.in (),
                             0,
+                            cdr.byte_order (),
                             cdr.start ());
 
       if (!CORBA::is_nil (this->member_.in ()))
diff --git a/TAO/tao/GIOPC.cpp b/TAO/tao/GIOPC.cpp
index 2e950c43030..f4ed08e58b8 100644
--- a/TAO/tao/GIOPC.cpp
+++ b/TAO/tao/GIOPC.cpp
@@ -425,6 +425,7 @@ void operator<<= (
     stream << *_any_val;
     _tao_any._tao_replace (
         GIOP::_tc_TargetAddress,
+        TAO_ENCAP_BYTE_ORDER,
         stream.begin (),
         1,
         _any_val,
@@ -450,6 +451,7 @@ void operator<<= (
     stream << *_tao_elem;
     _tao_any._tao_replace (
         GIOP::_tc_TargetAddress,
+        TAO_ENCAP_BYTE_ORDER,
         stream.begin (),
         1,
         _tao_elem,
diff --git a/TAO/tao/GIOP_Message_Acceptors.cpp b/TAO/tao/GIOP_Message_Acceptors.cpp
index c900a6826f7..d379cd6e184 100644
--- a/TAO/tao/GIOP_Message_Acceptors.cpp
+++ b/TAO/tao/GIOP_Message_Acceptors.cpp
@@ -584,7 +584,7 @@ TAO_GIOP_Message_Acceptors::
 
       // write the reply_status
       output.write_ulong
-        (TAO_GIOP_Message_Acceptors::convert_CORBA_to_GIOP_exception (extype));  
+        (TAO_GIOP_Utils::convert_CORBA_to_GIOP_exception (extype));  
 
       // @@ Any way to implement this without interpretive
       //    marshaling???
@@ -671,26 +671,6 @@ set_state (CORBA::Octet def_major,
     }
 }
 
-TAO_GIOP_Reply_Status_Type
-TAO_GIOP_Message_Acceptors::
-  convert_CORBA_to_GIOP_exception (CORBA::exception_type corba_type)  
-{
-  switch (corba_type)
-    {
-    case CORBA::NO_EXCEPTION:
-      return TAO_GIOP_NO_EXCEPTION;
-
-    case CORBA::SYSTEM_EXCEPTION:
-      return TAO_GIOP_SYSTEM_EXCEPTION;
-
-    case CORBA::USER_EXCEPTION:
-      return TAO_GIOP_USER_EXCEPTION;
-
-    default:
-      // Don't know what to do here??
-      return TAO_GIOP_SYSTEM_EXCEPTION;
-    }
-}
 
 ////////////////////////////////////////////////////////////
 // Methods that should not be called from the acceptor side 
diff --git a/TAO/tao/GIOP_Message_Acceptors.h b/TAO/tao/GIOP_Message_Acceptors.h
index c530bce8714..afdf71a8baf 100644
--- a/TAO/tao/GIOP_Message_Acceptors.h
+++ b/TAO/tao/GIOP_Message_Acceptors.h
@@ -33,7 +33,11 @@ class TAO_Export TAO_GIOP_Message_Acceptors:
   //   server side of the GIOP classes. 
   
 public:
-  
+
+  TAO_GIOP_Message_Acceptors (void)
+    {
+      cout << "Thaye parameshi "<<endl;
+    }
   int process_connector_messages (TAO_Transport *transport,
                                   TAO_ORB_Core *orb_core,
                                   TAO_InputCDR &input,
@@ -102,9 +106,7 @@ private:
   
   TAO_GIOP_Message_Accept_Impl implementations_;
   
-  static TAO_GIOP_Reply_Status_Type 
-  convert_CORBA_to_GIOP_exception (CORBA::exception_type corba_type);
-  // Convert the exception type from CORBA to GIOP
+
 
   ////////////////////////////////////////////////////
   // Inherited methods. Should not be here in the first place? 
diff --git a/TAO/tao/GIOP_Message_Base.cpp b/TAO/tao/GIOP_Message_Base.cpp
index c2dcb7f17c5..5ec608b8ca7 100644
--- a/TAO/tao/GIOP_Message_Base.cpp
+++ b/TAO/tao/GIOP_Message_Base.cpp
@@ -26,7 +26,8 @@ TAO_GIOP_Message_Base::
 {
   // Reset the message type
   msg.reset ();
-  
+
+  cout << "Thaye parameshi "<<endl;
   TAO_GIOP_Message_Type type = TAO_GIOP_MESSAGERROR;
   
   // First convert the Pluggable type to the GIOP specific type. 
@@ -100,18 +101,18 @@ TAO_GIOP_Message_Base::
   switch (header_type)
     {
     case TAO_PLUGGABLE_MESSAGE_REQUEST_HEADER:
-      this->write_request_header (params.svc_ctx,
-                                  params.request_id,
-                                  params.response_flags,
-                                  spec,
-                                  params.operation_name,
-                                  cdr);
-      break;
-    case TAO_PLUGGABLE_MESSAGE_LOCATE_REQUEST_HEADER:
-      this->write_locate_request_header (params.request_id,
+      return this->write_request_header (params.svc_ctx,
+                                         params.request_id,
+                                         params.response_flags,
                                          spec,
+                                         params.operation_name,
                                          cdr);
       break;
+    case TAO_PLUGGABLE_MESSAGE_LOCATE_REQUEST_HEADER:
+      return this->write_locate_request_header (params.request_id,
+                                                spec,
+                                                cdr);
+      break;
     default:
       if (TAO_debug_level > 0)
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -173,35 +174,11 @@ TAO_GIOP_Message_Base::send_message (TAO_Transport *transport,
                                         buf),
                   stream.length ());
   
-  // This guarantees to send all data (bytes) or return an error.
-  ssize_t n = transport->send (stub,
-                               two_way,
-                               stream.begin (),
-                               max_wait_time);
- 
-  if (n == -1)
-    {
-      if (TAO_orbdebug)
-        ACE_DEBUG ((LM_DEBUG,
-                    ASYS_TEXT ("TAO: (%P|%t|%N|%l) closing conn %d after fault %p\n"),
-                    transport->handle (),
-                    ASYS_TEXT ("GIOP_Message_Base::send_message ()")));
-
-      return -1;
-    }
-
-  // EOF.
-  if (n == 0)
-    {
-      if (TAO_orbdebug)
-        ACE_DEBUG ((LM_DEBUG,
-                    ASYS_TEXT ("TAO: (%P|%t|%N|%l) send_message () ")
-                    ASYS_TEXT ("EOF, closing conn %d\n"),
-                    transport->handle()));
-      return -1;
-    }
-
-  return 1;
+  return this->transport_message (transport,
+                                  stream,
+                                  two_way,
+                                  stub,
+                                  max_wait_time);
 }
 
 int
@@ -217,10 +194,11 @@ TAO_GIOP_Message_Base::
   
   if (state->header_received () == 0)
     {
-      int retval = this->read_bytes_input (transport,
-                                           state->cdr,
-                                           this->header_len (),
-                                           max_wait_time);
+      int retval = 
+        TAO_GIOP_Utils::read_bytes_input (transport,
+                                          state->cdr,
+                                          this->header_len (),
+                                          max_wait_time);
       if (retval == -1 && TAO_debug_level > 0)
         {
           ACE_DEBUG ((LM_DEBUG,
@@ -270,10 +248,10 @@ TAO_GIOP_Message_Base::
     state->message_size - state->current_offset;
     
   ssize_t n =
-    this->read_buffer (transport,
-                       state->cdr.rd_ptr () + state->current_offset,
-                       missing_data,
-                       max_wait_time);
+    TAO_GIOP_Utils::read_buffer (transport,
+                                 state->cdr.rd_ptr () + state->current_offset,
+                                 missing_data,
+                                 max_wait_time);
 
    if (n == -1)
     {
@@ -374,40 +352,6 @@ TAO_GIOP_Message_Base::dump_msg (const char *label,
 }
 
 int
-TAO_GIOP_Message_Base::read_bytes_input (TAO_Transport *transport,
-                                         TAO_InputCDR &input,
-                                         CORBA::ULong read_size,
-                                         ACE_Time_Value *time) 
-{
-  // Grow the size of CDR stream
-  if (input.grow (read_size) == -1)
-    return -1;
-  
-  // Read until all the header is received.  There should be no
-  // problems with locking, the header is only a few bytes so they
-  // should all be available on the socket, otherwise there is a
-  // problem with the underlying transport, in which case we have more
-  // problems than just this small loop.
-  char *buf = input.rd_ptr ();
-  ssize_t n = 0;
-  
-  for (int t = read_size;
-       t != 0;
-       t -= n)
-    {
-      n = transport->recv (buf, t, time);
-      if (n == -1)
-        return -1;
-      else if (n == 0) // @@ TODO && errno != EWOULDBLOCK)
-        return -1;
-      buf += n;
-    }
-
-  return 1;
-}
-
-
-int
 TAO_GIOP_Message_Base::parse_magic_bytes (TAO_GIOP_Message_State *state)
 {
   // Grab the read pointer
@@ -494,6 +438,7 @@ TAO_GIOP_Message_Base::parse_header (TAO_GIOP_Message_State *state)
   state->cdr.skip_bytes (this->message_size_offset ());
   state->cdr.read_ulong (state->message_size);
 
+  cout << "Message size "<< state->message_size <<endl;
   if (TAO_debug_level > 2)
     {
       ACE_DEBUG ((LM_DEBUG,
@@ -508,38 +453,7 @@ TAO_GIOP_Message_Base::parse_header (TAO_GIOP_Message_State *state)
   return 1;
 }
 
-ssize_t
-TAO_GIOP_Message_Base::read_buffer (TAO_Transport *transport,
-                                    char *buf,
-                                    size_t len,
-                                    ACE_Time_Value *max_wait_time)
-{
-  ssize_t bytes_read = transport->recv (buf, len, max_wait_time);
-
-  if (bytes_read <= 0 && TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG,
-                ASYS_TEXT ("TAO (%P|%t|%N|%l) - %p,\n")
-                ASYS_TEXT ("              transport = %d, ")
-                ASYS_TEXT ("bytes = %d, len = %d\n"),
-                ASYS_TEXT ("read_buffer"),
-                transport->handle (),
-                bytes_read,
-                len));
-
-  if (bytes_read == -1 && errno == ECONNRESET)
-    {
-      // @@ Is this OK??
-
-      // We got a connection reset (TCP RSET) from the other side,
-      // i.e., they didn't initiate a proper shutdown.
-      //
-      // Make it look like things are OK to the upper layer.
-      bytes_read = 0;
-      errno = 0;
-    }
 
-  return bytes_read;
-}
 
 // Send an "I can't understand you" message -- again, the message is
 // prefabricated for simplicity.  This implies abortive disconnect (at
diff --git a/TAO/tao/GIOP_Message_Base.h b/TAO/tao/GIOP_Message_Base.h
index 9df4a5e1c28..e41e9447775 100644
--- a/TAO/tao/GIOP_Message_Base.h
+++ b/TAO/tao/GIOP_Message_Base.h
@@ -133,13 +133,6 @@ private:
                                TAO_OutputCDR &msg) = 0;
   // Write the GIOP locate request header in to <msg>
   
-  int read_bytes_input (TAO_Transport *transport,
-                        TAO_InputCDR &input,
-                        CORBA::ULong read_size,
-                        ACE_Time_Value *max_wait_time);
-  // This a helper that would read the <reade_size> bytes from
-  // <transport> in to the <inout> stream.
-
   virtual int validate_version (TAO_GIOP_Message_State *state) = 0;
   // This will do a validation of the versions that arrive in the transport.
 
@@ -149,14 +142,6 @@ private:
   virtual int parse_magic_bytes (TAO_GIOP_Message_State *state);
   // validates the first 4 bytes that contain the magic word "GIOP"
 
-  ssize_t read_buffer (TAO_Transport *transport,
-                       char *buf,
-                       size_t len,
-                       ACE_Time_Value *max_wait_time);
-  // The above method seems to be redundant with read_input_bytes. I
-  // will trim it down in the next iteration... @@Bala
-
-
   void send_close_connection (const TAO_GIOP_Version &version,
                               TAO_Transport *transport,
                               void *ctx);
diff --git a/TAO/tao/GIOP_Message_Connectors.cpp b/TAO/tao/GIOP_Message_Connectors.cpp
index f0700550e44..e564350809b 100644
--- a/TAO/tao/GIOP_Message_Connectors.cpp
+++ b/TAO/tao/GIOP_Message_Connectors.cpp
@@ -32,10 +32,10 @@ TAO_GIOP_Message_Connectors::
 
   // Second the response flags
   // Sync scope - ignored by server if request is not oneway.
-  if (response_flags == CORBA::Octet (TAO::SYNC_WITH_TRANSPORT) ||
-      response_flags == CORBA::Octet (TAO::SYNC_NONE) ||
-      response_flags == CORBA::Octet (TAO::SYNC_EAGER_BUFFERING) ||
-      response_flags == CORBA::Octet (TAO::SYNC_DELAYED_BUFFERING))
+  else if (response_flags == CORBA::Octet (TAO::SYNC_WITH_TRANSPORT) ||
+           response_flags == CORBA::Octet (TAO::SYNC_NONE) ||
+           response_flags == CORBA::Octet (TAO::SYNC_EAGER_BUFFERING) ||
+           response_flags == CORBA::Octet (TAO::SYNC_DELAYED_BUFFERING))
     // No response required.
     msg << CORBA::Any::from_octet (0);
   
diff --git a/TAO/tao/GIOP_Message_Lite.cpp b/TAO/tao/GIOP_Message_Lite.cpp
new file mode 100644
index 00000000000..de8277f4169
--- /dev/null
+++ b/TAO/tao/GIOP_Message_Lite.cpp
@@ -0,0 +1,1270 @@
+//$Id$
+
+#include "tao/GIOP_Message_Lite.h"
+#include "debug.h"
+#include "tao/TAOC.h"
+#include "tao/ORB_Core.h"
+#include "tao/POA.h"
+#include "tao/GIOP_Utils.h"
+
+#if !defined (__ACE_INLINE__)
+# include "tao/GIOP_Message_Lite.i"
+#endif /* __ACE_INLINE__ */
+
+TAO_GIOP_Message_Lite::TAO_GIOP_Message_Lite (void)
+{
+  //no-op
+}
+
+TAO_GIOP_Message_Lite::~TAO_GIOP_Message_Lite (void)
+{
+  //no-op
+}
+
+CORBA::Boolean
+TAO_GIOP_Message_Lite::
+  write_protocol_header (TAO_Pluggable_Message_Type t,
+                         TAO_OutputCDR &msg)
+{
+  // Reset the message type
+  msg.reset ();
+  
+  // Write a dummy <size> later it is set to the right value...  @@
+  // TODO Maybe we should store the OutputCDR status in
+  CORBA::ULong size = 0;
+  msg.write_ulong (size);
+  
+  TAO_GIOP_Message_Type type = TAO_GIOP_MESSAGERROR;
+  
+  // First convert the Pluggable type to the GIOP specific type. 
+  switch (t)
+    {
+    case (TAO_PLUGGABLE_MESSAGE_REQUEST):
+      type = TAO_GIOP_REQUEST;
+      break;
+    case (TAO_PLUGGABLE_MESSAGE_REPLY):
+      type = TAO_GIOP_REPLY;
+      break;
+    case (TAO_PLUGGABLE_MESSAGE_CANCELREQUEST):
+      type = TAO_GIOP_CANCELREQUEST;
+      break;
+    case (TAO_PLUGGABLE_MESSAGE_LOCATEREQUEST):
+      type = TAO_GIOP_LOCATEREQUEST;
+      break;
+    case (TAO_PLUGGABLE_MESSAGE_LOCATEREPLY):
+      type = TAO_GIOP_LOCATEREPLY;
+      break;
+    case (TAO_PLUGGABLE_MESSAGE_CLOSECONNECTION):
+      type = TAO_GIOP_CLOSECONNECTION;
+      break;
+    case (TAO_PLUGGABLE_MESSAGE_MESSAGERROR):
+      type = TAO_GIOP_MESSAGERROR;
+      break;
+    case (TAO_PLUGGABLE_MESSAGE_FRAGMENT):
+      type = TAO_GIOP_FRAGMENT;
+      break;
+    }
+
+  // Write the message type
+  msg.write_octet ((CORBA::Octet) type);
+  return 1;
+}
+
+
+int
+TAO_GIOP_Message_Lite::
+  handle_input (TAO_Transport *transport,
+                TAO_ORB_Core * /*orb_core*/,
+                TAO_Message_State_Factory &mesg_state,
+                ACE_Time_Value *max_wait_time)
+{
+  TAO_GIOP_Message_State *state =
+    ACE_dynamic_cast (TAO_GIOP_Message_State *,
+                      &mesg_state);
+  
+  if (state->header_received () == 0)
+    {
+      int retval = 
+        TAO_GIOP_Utils::read_bytes_input (transport,
+                                          state->cdr,
+                                          TAO_GIOP_LITE_HEADER_LEN,
+                                          max_wait_time); 
+      if (retval == -1 && TAO_debug_level > 0)
+        {
+          ACE_DEBUG ((LM_DEBUG,
+                      ASYS_TEXT ("TAO (%P|%t) - %p\n")
+                      ASYS_TEXT ("TAO_GIOP_Message_Lite::handle_input")));
+          return -1;
+        }
+      
+      // After we read, we assume that everything is fine. We dont do
+      // any sanity check of the incoming header.
+      
+      // Read the rest of the stuff. That should be read by the
+      // corresponding states
+      if (this->parse_header (state) == -1)
+        {
+          if (TAO_debug_level > 0)
+            ACE_DEBUG ((LM_DEBUG,
+                        "TAO (%P|%t|%N%l) - %p\n"
+                          "TAO_GIOP_Message_Lite::handle_input"));
+          return -1;
+        }
+      
+      if (state->cdr.grow (TAO_GIOP_LITE_HEADER_LEN +
+                           state->message_size) == -1)
+        {
+          if (TAO_debug_level > 0)
+            ACE_DEBUG ((LM_DEBUG,
+                        ASYS_TEXT ("TAO (%P|%t|%N|%l) - %p\n"),
+                        ASYS_TEXT ("ACE_CDR::grow")));
+          return -1;
+        }
+      
+      // Growing the buffer may have reset the rd_ptr(), but we want
+      // to leave it just after the GIOP header (that was parsed
+      // already);
+      state->cdr.skip_bytes (TAO_GIOP_LITE_HEADER_LEN);
+    }
+
+  size_t missing_data =
+    state->message_size - state->current_offset;
+    
+  ssize_t n =
+    TAO_GIOP_Utils::read_buffer (transport,
+                                 state->cdr.rd_ptr () + state->current_offset,
+                                 missing_data,
+                                 max_wait_time);
+  if (n == -1)
+    {
+      if (TAO_debug_level > 0)
+        ACE_DEBUG ((LM_DEBUG,
+                    ASYS_TEXT ("TAO (%P|%t) - %p\n"),
+                    ASYS_TEXT ("TAO_GIOP_Message_Lite::handle_input, read_buffer[1]"))); 
+      return -1;
+    }
+  else if (n == 0)
+    {
+      if (errno == EWOULDBLOCK)
+        return 0;
+      if (TAO_debug_level > 0)
+        ACE_DEBUG ((LM_DEBUG,
+                    ASYS_TEXT ("TAO (%P|%t) - %p\n"),
+                    ASYS_TEXT ("TAO_GIOP_Message_Lite::handle_input, read_buffer[2]")));
+      return -1;
+    }
+
+  
+  state->current_offset += n;
+  
+  if (state->current_offset == state->message_size)
+    {
+      if (TAO_debug_level >= 4)
+        {
+
+          size_t header_len = TAO_GIOP_LITE_HEADER_LEN;
+
+          // Need to include GIOPlite too.
+          char *buf = state->cdr.rd_ptr ();
+          buf -= header_len;
+          size_t msg_len = state->cdr.length () + header_len;
+          this->dump_msg ("recv",
+                          ACE_reinterpret_cast (u_char *,
+                                                buf),
+                          msg_len);
+        }
+    }
+  return state->is_complete ();
+}
+
+CORBA::Boolean
+TAO_GIOP_Message_Lite::
+  write_message_header (const TAO_Pluggable_Connector_Params &params, 
+                        TAO_Pluggable_Header_Type header_type,
+                        TAO_Target_Specification &spec,
+                        TAO_OutputCDR &cdr)
+{
+  switch (header_type)
+    {
+    case TAO_PLUGGABLE_MESSAGE_REQUEST_HEADER:
+      return this->write_request_header (params.svc_ctx,
+                                         params.request_id,
+                                         params.response_flags,
+                                         spec,
+                                         params.operation_name,
+                                         cdr);
+      break;
+    case TAO_PLUGGABLE_MESSAGE_LOCATE_REQUEST_HEADER:
+      return this->write_locate_request_header (params.request_id,
+                                                spec,
+                                                cdr);
+      break;
+    default:
+      if (TAO_debug_level > 0)
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           ASYS_TEXT ("(%P|%t|%N|%l) Wrong header type \n")),
+                          0);
+      
+    }
+  
+  return 1;
+}
+
+int
+TAO_GIOP_Message_Lite::
+  send_message (TAO_Transport *transport,
+                TAO_OutputCDR &stream,
+                ACE_Time_Value *max_wait_time = 0,
+                TAO_Stub *stub = 0,
+                int two_way = 1)
+{
+  // Get the header length
+  const size_t header_len = TAO_GIOP_LITE_HEADER_LEN;
+
+  // Get the message size offset
+  const size_t offset = TAO_GIOP_LITE_MESSAGE_SIZE_OFFSET;
+
+  // Ptr to first buffer.
+  char *buf = (char *) stream.buffer ();
+
+  // Length of all buffers.
+  size_t total_len =
+    stream.total_length ();
+
+  // NOTE: Here would also be a fine place to calculate a digital
+  // signature for the message and place it into a preallocated slot
+  // in the "ServiceContext".  Similarly, this is a good spot to
+  // encrypt messages (or just the message bodies) if that's needed in
+  // this particular environment and that isn't handled by the
+  // networking infrastructure (e.g., IPSEC).
+
+  CORBA::ULong bodylen = total_len - header_len;
+
+#if !defined (ACE_ENABLE_SWAP_ON_WRITE)
+  *ACE_reinterpret_cast (CORBA::ULong *, buf + offset) = bodylen;
+#else
+  if (!stream->do_byte_swap ())
+    *ACE_reinterpret_cast (CORBA::ULong *,
+                           buf + offset) = bodylen;
+  else
+    ACE_CDR::swap_4 (ACE_reinterpret_cast (char *,
+                                           &bodylen),
+                     buf + offset);
+#endif /* ACE_ENABLE_SWAP_ON_WRITE */
+  
+  this->dump_msg ("send",
+                  ACE_reinterpret_cast (u_char *,
+                                        buf),
+                  stream.length ());
+  
+  return this->transport_message (transport,
+                                  stream,
+                                  two_way,
+                                  stub,
+                                  max_wait_time); 
+}
+
+
+int
+TAO_GIOP_Message_Lite::
+  parse_reply (TAO_Message_State_Factory &mesg_state,
+               TAO_Pluggable_Connector_Params &params,
+               CORBA::ULong &reply_status)
+{
+  // Cast to the GIOP Message state
+  TAO_GIOP_Message_State *state = 
+    ACE_dynamic_cast (TAO_GIOP_Message_State *,
+                      &mesg_state);
+  
+  switch (state->message_type)
+    {
+    case TAO_GIOP_REQUEST:
+      // In GIOP 1.0 and GIOP 1.1 this is an error,
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         ASYS_TEXT ("TAO (%P|%t) %N:%l TAO_GIOP_Message_Lite::parse_reply: ")  
+                         ASYS_TEXT ("request.\n")),
+                        -1);
+
+    case TAO_GIOP_CANCELREQUEST:
+    case TAO_GIOP_LOCATEREQUEST:
+      // Errors
+    case TAO_GIOP_CLOSECONNECTION:
+      default:
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           ASYS_TEXT ("TAO (%P|%t) %N:%l parse_reply: ")
+                           ASYS_TEXT ("wrong message.\n")),
+                          -1);
+        break;
+    case TAO_GIOP_LOCATEREPLY:
+      // Handle after the switch
+      break;
+    case TAO_GIOP_REPLY:
+      if ((state->cdr >> params.svc_ctx) == 0)
+        {
+          if (TAO_debug_level > 0)
+            ACE_DEBUG ((LM_DEBUG,
+                        ASYS_TEXT ("TAO (%P|%t) parse_reply, ")
+                        ASYS_TEXT ("extracting context\n")));
+          return -1;
+        }
+      // Rest of the stuff after the switch
+      break;
+    case TAO_GIOP_FRAGMENT:
+      // Never happens: why??
+      break;
+    }
+  
+  // Read the request id
+  if (!state->cdr.read_ulong (params.request_id))
+    {
+      if (TAO_debug_level > 0)
+        ACE_DEBUG ((LM_DEBUG,
+                    ASYS_TEXT ("TAO (%P|%t|%N|%l) : TAO_GIOP_Message_Lite::parse_reply, ")
+                    ASYS_TEXT ("extracting request id")));
+      return -1;
+    }
+
+  // and the reply status type.  status can be NO_EXCEPTION,
+  // SYSTEM_EXCEPTION, USER_EXCEPTION, LOCATION_FORWARD
+  // CAnnot handle LOCATION_FORWARD_PERM here
+  if (!state->cdr.read_ulong (reply_status))
+    {
+      if (TAO_debug_level > 0)
+        ACE_DEBUG ((LM_DEBUG,
+                    ASYS_TEXT ("TAO (%P|%t|%N|%l) : TAO_GIOP_Message_Lite::parse_reply, ")
+                    ASYS_TEXT ("extracting reply status\n")));
+      return -1;
+    }
+
+  return 0;
+}
+
+
+int
+TAO_GIOP_Message_Lite::
+  process_connector_messages (TAO_Transport *transport,
+                              TAO_ORB_Core *orb_core,
+                              TAO_InputCDR &input,
+                              CORBA::Octet message_type)
+{
+  char repbuf[ACE_CDR::DEFAULT_BUFSIZE];
+
+#if defined(ACE_HAS_PURIFY)
+  (void) ACE_OS::memset (repbuf,
+                         '\0',
+                         sizeof repbuf);
+#endif /* ACE_HAS_PURIFY */
+  TAO_OutputCDR output (repbuf,
+                        sizeof repbuf,
+                        TAO_ENCAP_BYTE_ORDER,
+                        orb_core->output_cdr_buffer_allocator (),
+                        orb_core->output_cdr_dblock_allocator (),
+                        orb_core->orb_params ()->cdr_memcpy_tradeoff (),
+                        orb_core->to_iso8859 (),
+                        orb_core->to_unicode ());
+
+  switch (message_type)
+    {
+    case TAO_GIOP_REQUEST:
+      // Should be taken care by the state specific invocations. They
+      // could raise an exception or write things in the output CDR
+      // stream
+      this->process_connector_request (transport,
+                                       orb_core,
+                                       input,
+                                       output);
+      break;
+    case TAO_GIOP_LOCATEREQUEST:
+      this->process_connector_locate (transport,
+                                      orb_core,
+                                      input,
+                                      output);
+      break;
+    case TAO_GIOP_MESSAGERROR:
+    case TAO_GIOP_REPLY:
+    case TAO_GIOP_LOCATEREPLY:
+    case TAO_GIOP_CLOSECONNECTION:
+    default:
+      if (TAO_debug_level > 0)
+        ACE_DEBUG ((LM_DEBUG,
+                    ASYS_TEXT ("TAO (%P|%t) Illegal message received by server\n")));
+      return this->send_error (transport);
+      break;
+    }
+
+  return 0;
+}
+
+
+CORBA::Boolean
+TAO_GIOP_Message_Lite::
+  write_request_header (const IOP::ServiceContextList& /*svc_ctx*/,
+                        CORBA::ULong request_id,
+                        CORBA::Octet response_flags,
+                        TAO_Target_Specification & spec,
+                        const char * opname,
+                        TAO_OutputCDR &out_stream)
+{
+  out_stream << request_id;
+
+  // @@ (JP) Temporary hack until all of GIOP 1.2 is implemented.
+  if (response_flags == 131)
+    out_stream << CORBA::Any::from_octet (1);
+
+  // Sync scope - ignored by server if request is not oneway.
+  else if (response_flags == CORBA::Octet (TAO::SYNC_WITH_TRANSPORT) ||
+           response_flags == CORBA::Octet (TAO::SYNC_NONE) ||
+           response_flags == CORBA::Octet (TAO::SYNC_EAGER_BUFFERING) ||
+           response_flags == CORBA::Octet (TAO::SYNC_DELAYED_BUFFERING))
+    // No response required.
+    out_stream << CORBA::Any::from_octet (0);
+
+  else if (response_flags == CORBA::Octet (TAO::SYNC_WITH_SERVER))
+    // Return before dispatching servant.  We're also setting the high
+    // bit here. This is a temporary fix until the rest of GIOP 1.2 is
+    // implemented in TAO.
+    out_stream << CORBA::Any::from_octet (129);
+
+  else if (response_flags == CORBA::Octet (TAO::SYNC_WITH_TARGET))
+    // Return after dispatching servant.
+    out_stream << CORBA::Any::from_octet (3);
+
+  else
+    // Until more flags are defined by the OMG.
+    return 0;
+
+  // In this case we cannot recognise anything other than the Object
+  // key as the address disposition variable. But we do a sanity check
+  // anyway.
+  const TAO_ObjectKey *key = spec.object_key ();
+  
+  if (key)
+    {
+      // Put in the object key
+      out_stream << *key;
+    }
+    else
+    {
+      if (TAO_debug_level)
+        ACE_DEBUG ((LM_DEBUG,
+                    ASYS_TEXT ("(%N |%l) Unable to handle this request \n")));
+      return 0;
+    }
+  
+  out_stream << opname;
+
+  return 1;
+}                        
+
+
+CORBA::Boolean
+TAO_GIOP_Message_Lite::
+  write_locate_request_header (CORBA::ULong request_id,
+                               TAO_Target_Specification &spec,
+                               TAO_OutputCDR &msg)
+{
+  msg << request_id;
+
+  // In this case we cannot recognise anything other than the Object
+  // key as the address disposition variable. But we do a sanity check
+  // anyway.
+  const TAO_ObjectKey *key = spec.object_key ();
+  if (key)
+    {
+      // Put in the object key
+      msg << *key;
+    }
+    else
+    {
+      if (TAO_debug_level)
+        ACE_DEBUG ((LM_DEBUG,
+                    ASYS_TEXT ("(%N |%l) Unable to handle this request \n")));
+      return 0;
+    }
+
+
+  return 1;
+}
+
+
+int
+TAO_GIOP_Message_Lite::parse_header (TAO_GIOP_Message_State *state)
+{
+  // Get the read pointer
+  char *buf = state->cdr.rd_ptr ();
+  
+  state->byte_order = TAO_ENCAP_BYTE_ORDER;
+  state->giop_version.major = TAO_DEF_GIOP_MAJOR;
+  state->giop_version.minor = TAO_DEF_GIOP_MINOR;
+  state->message_type = buf[TAO_GIOP_LITE_MESSAGE_TYPE_OFFSET];
+  
+  state->cdr.reset_byte_order (state->byte_order);
+  state->cdr.read_ulong (state->message_size);
+
+  return 0;
+}
+
+int
+TAO_GIOP_Message_Lite::
+  process_connector_request (TAO_Transport *transport, 
+                             TAO_ORB_Core* orb_core,
+                             TAO_InputCDR &input,
+                             TAO_OutputCDR &output)
+{
+   // Get the revision info
+  TAO_GIOP_Version version (TAO_DEF_GIOP_MAJOR,
+                            TAO_DEF_GIOP_MINOR);
+                           
+  // This will extract the request header, set <response_required>
+  // and <sync_with_server> as appropriate.
+  TAO_GIOP_ServerRequest request (this,
+                                  input,
+                                  output,
+                                  orb_core,
+                                  version);
+  
+  CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ();
+  
+  CORBA::ULong request_id = 0;
+  CORBA::Boolean response_required = 0;
+  CORBA::Boolean sync_with_server = 0;
+  CORBA::Boolean location_forward = 0;
+  int parse_error = 0;
+  
+  ACE_TRY
+    {
+      parse_error = 
+        this->parse_request_header (request);
+
+      // Throw an exception if the 
+      if (parse_error != 0)
+        ACE_TRY_THROW (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE,
+                                       CORBA::COMPLETED_NO));
+      request_id = request.request_id ();
+
+      response_required = request.response_expected ();
+      sync_with_server = request.sync_with_server ();
+      
+#if !defined (TAO_NO_IOR_TABLE)
+      const CORBA::Octet *object_key =
+        request.object_key ().get_buffer ();
+      
+      if (ACE_OS::memcmp (object_key,
+                          &TAO_POA::objectkey_prefix[0],
+                          TAO_POA::TAO_OBJECTKEY_PREFIX_SIZE) != 0)
+        {
+          ACE_CString object_id (ACE_reinterpret_cast (const char *,
+                                                       object_key),
+                                 request.object_key ().length (),
+                                 0,
+                                 0);
+          
+          // @@ This debugging output should *NOT* be used since the
+          //    object key string is not null terminated, nor can it
+          //    be null terminated without copying.  No copying should
+          //    be done since performance is somewhat important here.
+          //    So, just remove the debugging output entirely.
+          //
+          //           if (TAO_debug_level > 0)
+          //             ACE_DEBUG ((LM_DEBUG,
+          //                         "Simple Object key %s. "
+          //                         "Doing the Table Lookup ...\n",
+          //                         object_id.c_str ()));
+
+          CORBA::Object_ptr object_reference =
+            CORBA::Object::_nil ();
+
+          // Do the Table Lookup.
+          int status =
+            orb_core->orb ()->_tao_find_in_IOR_table (object_id,
+                                                      object_reference);
+
+          // If ObjectID not in table or reference is nil raise
+          // OBJECT_NOT_EXIST.
+          
+          if (status == -1 || CORBA::is_nil (object_reference))
+            ACE_TRY_THROW (CORBA::OBJECT_NOT_EXIST ());
+          
+          // ObjectID present in the table with an associated NON-NULL
+          // reference.  Throw a forward request exception.
+
+          CORBA::Object_ptr dup =
+            CORBA::Object::_duplicate (object_reference);
+          
+          // @@ We could simply write the response at this point...
+          ACE_TRY_THROW (PortableServer::ForwardRequest (dup));
+        }
+#endif /* TAO_NO_IOR_TABLE */
+  
+      // Do this before the reply is sent.
+      orb_core->object_adapter ()->dispatch_servant (
+                                                     request.object_key (),
+                                                     request,
+                                                     transport,
+                                                     0,
+                                                     ACE_TRY_ENV
+                                                     );
+      ACE_TRY_CHECK;
+    }
+#if !defined (TAO_HAS_MINIMUM_CORBA)
+  ACE_CATCH (PortableServer::ForwardRequest, forward_request)
+    {
+      // Make the GIOP header and Reply header
+      this->make_reply (request_id,
+                        output);
+      
+      output.write_ulong (TAO_GIOP_LOCATION_FORWARD);
+
+      CORBA::Object_ptr object_ptr =
+        forward_request.forward_reference.in();
+
+      output << object_ptr;
+
+      // Flag for code below catch blocks.
+      location_forward = 1;
+    }
+#else
+  ACE_UNUSED_ARG (request_id);
+#endif /* TAO_HAS_MINIMUM_CORBA */
+  // Only CORBA exceptions are caught here.
+   ACE_CATCHANY
+    {
+      int result = 0;
+      if (response_required)
+        {
+          result = this->send_reply_exception (transport,
+                                               orb_core,
+                                               request_id,
+                                               &ACE_ANY_EXCEPTION);
+          if (result == -1)
+            {
+              if (TAO_debug_level > 0)
+                ACE_ERROR ((LM_ERROR,
+                            ASYS_TEXT ("TAO: (%P|%t|%N|%l) %p: cannot send exception\n"),
+                            ASYS_TEXT ("process_connector_request ()")));
+              ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+                                   "TAO: ");
+            }
+
+        }
+      else if (TAO_debug_level > 0)
+        {
+          // It is unfotunate that an exception (probably a system
+          // exception) was thrown by the upcall code (even by the
+          // user) when the client was not expecting a response.
+          // However, in this case, we cannot close the connection
+          // down, since it really isn't the client's fault.
+
+          ACE_ERROR ((LM_ERROR,
+                      ASYS_TEXT ("(%P|%t) exception thrown ")
+                      ASYS_TEXT ("but client is not waiting a response\n")));
+          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+                               "TAO: ");
+        }
+
+      return result;
+    }
+#if defined (TAO_HAS_EXCEPTIONS)
+  ACE_CATCHALL
+    {
+      // @@ TODO some c++ exception or another, but what do we do with
+      //    it?
+      // We are supposed to map it into a CORBA::UNKNOWN exception.
+      // BTW, this cannot be detected if using the <env> mapping.  If
+      // we have native exceptions but no support for them in the ORB
+      // we should still be able to catch it.  If we don't have native
+      // exceptions it couldn't have been raised in the first place!
+      int result = 0;
+      if (response_required)
+        {
+          CORBA::UNKNOWN exception
+            (CORBA::SystemException::_tao_minor_code
+             (TAO_UNHANDLED_SERVER_CXX_EXCEPTION, 0),
+             CORBA::COMPLETED_MAYBE);
+
+          result = this->send_reply_exception (transport,
+                                               orb_core,
+                                               request_id,
+                                               &exception);
+          if (result == -1)
+            {
+              if (TAO_debug_level > 0)
+                ACE_ERROR ((LM_ERROR,
+                            ASYS_TEXT ("TAO: (%P|%t|%N|%l) %p: cannot send exception\n"),
+                            ASYS_TEXT ("process_connector_request ()")));
+              ACE_PRINT_EXCEPTION (exception, "TAO: ");
+            }
+        }
+      else if (TAO_debug_level > 0)
+        {
+          // It is unfotunate that an exception (probably a system
+          // exception) was thrown by the upcall code (even by the
+          // user) when the client was not expecting a response.
+          // However, in this case, we cannot close the connection
+          // down, since it really isn't the client's fault.
+          ACE_ERROR ((LM_ERROR,
+                      ASYS_TEXT ("(%P|%t|%N|%l) exception thrown ")
+                      ASYS_TEXT ("but client is not waiting a response\n")));
+        }
+
+      return result;
+    }
+#endif /* TAO_HAS_EXCEPTIONS */
+  ACE_ENDTRY;
+
+  int result = 0;
+
+  // Do we have a twoway request, a oneway SYNC_WITH_TARGET,
+  // or a oneway SYNC_WITH_SERVER with a location forward reply?
+  if ((response_required && !sync_with_server)
+      || (sync_with_server && location_forward))
+    {
+      result = this->send_message (transport,
+                                   output);
+                                   
+      if (result == -1)
+        {
+          if (TAO_debug_level > 0)
+            {
+              // No exception but some kind of error, yet a response
+              // is required.
+              ACE_ERROR ((LM_ERROR,
+                          ASYS_TEXT ("TAO: (%P|%t|%N|%l) %p: cannot send reply\n"),
+                          ASYS_TEXT ("TAO_GIOP::process_server_message")));
+            }
+        }
+    }
+
+  return result;   
+   
+}
+
+int
+TAO_GIOP_Message_Lite::
+  process_connector_locate (TAO_Transport *transport,
+                            TAO_ORB_Core* orb_core,
+                            TAO_InputCDR &input,
+                            TAO_OutputCDR &output)
+{
+  // Get the revision info
+  TAO_GIOP_Version version (TAO_DEF_GIOP_MAJOR,
+                            TAO_DEF_GIOP_MINOR);
+  
+  // This will extract the request header, set <response_required> as
+  // appropriate.
+  TAO_GIOP_Locate_Request_Header locate_request (input);
+
+  TAO_GIOP_Locate_Status_Msg status_info;
+
+  // Defaulting
+  status_info.status = TAO_GIOP_UNKNOWN_OBJECT;
+
+  CORBA::Boolean response_required = 1;
+
+  ACE_DECLARE_NEW_CORBA_ENV;
+  ACE_TRY
+    {
+      int parse_error = 
+        this->parse_locate_header (locate_request);
+      if (parse_error != 0)
+        ACE_TRY_THROW (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE,
+                                       CORBA::COMPLETED_NO));
+#if !defined (TAO_NO_IOR_TABLE)
+
+      const CORBA::Octet *object_key =
+        locate_request.target_address ().object_key ().get_buffer ();
+      
+      if (ACE_OS::memcmp (object_key,
+                          &TAO_POA::objectkey_prefix[0],
+                          TAO_POA::TAO_OBJECTKEY_PREFIX_SIZE) != 0)
+        {
+          CORBA::ULong len = 
+            locate_request.target_address ().object_key ().length ();
+          
+          ACE_CString object_id (ACE_reinterpret_cast (const char *,
+                                                       object_key),
+                                 len,
+                                 0,
+                                 0);
+
+          if (TAO_debug_level > 0)
+            ACE_DEBUG ((LM_DEBUG,
+                        ASYS_TEXT ("Simple Object key %s. Doing the Table Lookup ...\n"), 
+                        object_id.c_str ()));
+
+          CORBA::Object_ptr object_reference;
+
+          // Do the Table Lookup.
+          int find_status =
+            orb_core->orb ()->_tao_find_in_IOR_table (object_id,
+                                                      object_reference);
+
+          // If ObjectID not in table or reference is nil raise
+          // OBJECT_NOT_EXIST.
+
+          if (CORBA::is_nil (object_reference)
+              || find_status == -1)
+            ACE_TRY_THROW (CORBA::OBJECT_NOT_EXIST ());
+
+          // ObjectID present in the table with an associated NON-NULL
+          // reference.  Throw a forward request exception.
+
+          CORBA::Object_ptr dup =
+            CORBA::Object::_duplicate (object_reference);
+
+          // @@ We could simply write the response at this point...
+          ACE_TRY_THROW (PortableServer::ForwardRequest (dup));
+        }
+#endif /* TAO_NO_IOR_TABLE */
+
+      // Execute a fake request to find out if the object is there or
+      // if the POA can activate it on demand...
+      char repbuf[ACE_CDR::DEFAULT_BUFSIZE];
+      TAO_OutputCDR dummy_output (repbuf,
+                                  sizeof repbuf);
+      // This output CDR is not used!
+
+      // This could be tricky if the target_address does not have the
+      // object key. Till then .. Bala
+      TAO_ObjectKey tmp_key (locate_request.target_address ().object_key ().length (),
+                             locate_request.target_address ().object_key ().length (),
+                             locate_request.target_address ().object_key ().get_buffer (),
+                             0);
+
+      // Set it to an error state
+      parse_error = 1;
+      CORBA::ULong req_id = locate_request.request_id ();
+      
+      TAO_GIOP_ServerRequest server_request (this,
+                                             req_id,
+                                             response_required,
+                                             tmp_key,
+                                             "_non_existent",
+                                             dummy_output,
+                                             orb_core,
+                                             version,
+                                             parse_error);
+      if (parse_error != 0)
+        ACE_TRY_THROW (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE,
+                                       CORBA::COMPLETED_NO));
+      
+      orb_core->object_adapter ()->dispatch_servant
+        (server_request.object_key (), 
+         server_request,
+         transport,
+         0,
+         ACE_TRY_ENV);
+      
+      ACE_TRY_CHECK;
+
+      if (server_request.exception_type () == TAO_GIOP_NO_EXCEPTION)
+        {
+          // We got no exception, so the object is here.
+          status_info.status = TAO_GIOP_OBJECT_HERE;
+          if (TAO_debug_level > 0)
+            ACE_DEBUG ((LM_DEBUG,
+                        ASYS_TEXT ("TAO: (%P|%t) handle_locate() : found\n")));
+        }
+      else if (server_request.exception_type () != TAO_GIOP_NO_EXCEPTION)
+        {
+          status_info.forward_location_var = server_request.forward_location ();
+          if (!CORBA::is_nil (status_info.forward_location_var.in ()))
+            {
+              status_info.status = TAO_GIOP_OBJECT_FORWARD;
+              ACE_DEBUG ((LM_DEBUG,
+                          ASYS_TEXT ("handle_locate has been called: forwarding\n")));
+            }
+          else
+            {
+              // Normal exception, so the object is not here
+              status_info.status = TAO_GIOP_UNKNOWN_OBJECT;
+              ACE_DEBUG ((LM_DEBUG,
+                          ASYS_TEXT ("handle_locate has been called: not here\n")));
+            }
+        }
+
+    }
+
+#if !defined (TAO_HAS_MINIMUM_CORBA)
+  ACE_CATCH (PortableServer::ForwardRequest, forward_request)
+    {
+      status_info.status = TAO_GIOP_OBJECT_FORWARD;
+      status_info.forward_location_var =
+        forward_request.forward_reference;
+      ACE_DEBUG ((LM_DEBUG,
+                  ASYS_TEXT ("handle_locate has been called: forwarding\n")));
+    }
+#endif /* TAO_HAS_MINIMUM_CORBA */
+  ACE_CATCHANY
+    {
+      // Normal exception, so the object is not here
+      status_info.status = TAO_GIOP_UNKNOWN_OBJECT;
+      if (TAO_debug_level > 0)
+        ACE_DEBUG ((LM_DEBUG,
+                    ASYS_TEXT ("TAO (%P|%t) TAO_GIOP::process_server_locate - ")
+                    ASYS_TEXT ("CORBA exception raised\n")));
+    }
+#if defined (TAO_HAS_EXCEPTIONS)
+  ACE_CATCHALL
+    {
+      // Normal exception, so the object is not here
+      status_info.status = TAO_GIOP_UNKNOWN_OBJECT;
+      if (TAO_debug_level > 0)
+        ACE_DEBUG ((LM_DEBUG,
+                    ASYS_TEXT ("TAO (%P|%t) TAO_GIOP::process_server_locate - ")
+                    ASYS_TEXT ("C++ exception raised\n")));
+    }
+#endif /* TAO_HAS_EXCEPTIONS */
+  ACE_ENDTRY;
+
+
+  return this->make_locate_reply (transport,
+                                  output,
+                                  locate_request,
+                                  status_info);
+}
+
+
+
+
+int
+TAO_GIOP_Message_Lite::
+  parse_request_header (TAO_GIOP_ServerRequest &request)
+{
+  // Get the input CDR in the request class
+  TAO_InputCDR& input = request.incoming ();
+  
+  CORBA::Boolean hdr_status = (CORBA::Boolean) input.good_bit ();
+
+  CORBA::ULong req_id; 
+  
+  // Get the rest of the request header ...
+  hdr_status = hdr_status && input.read_ulong (req_id);
+
+  request.request_id (req_id);
+  
+   CORBA::Octet response_flags;
+  hdr_status = hdr_status && input.read_octet (response_flags);
+  request.response_expected ((response_flags != 0));
+
+   // The high bit of the octet has been set if the SyncScope policy
+  // value is SYNC_WITH_SERVER. This is a temporary hack until all
+  // of GIOP 1.2 is in place. Then we can check the version in the
+  // message header instead.
+  request.sync_with_server ((response_flags == 129));
+  
+    // We use ad-hoc demarshalling here: there is no need to increase
+  // the reference count on the CDR message block, because this key
+  // will not outlive the request (or the message block).
+  CORBA::Long key_length = 0;
+  hdr_status = hdr_status && input.read_long (key_length);
+  if (hdr_status)
+    {
+      request.object_key ().replace (key_length, key_length,
+                                     (CORBA::Octet*)input.rd_ptr (),
+                                     0);
+      input.skip_bytes (key_length);
+    }
+   ACE_CString operation_name;
+  if (input.char_translator () == 0)
+    {
+      CORBA::ULong length = 0;
+      hdr_status = hdr_status && input.read_ulong (length);
+      if (hdr_status)
+        {
+          // Do not include NULL character at the end.
+          // @@ This is not getting demarshaled using the codeset
+          //    translators!
+          operation_name.set (input.rd_ptr (),
+                              length - 1,
+                              0);
+          request.operation (operation_name);
+          hdr_status = input.skip_bytes (length);
+        }
+    }
+  else
+    {
+      // @@ We could optimize for this case too, i.e. do in-place
+      //    demarshaling of the string... But there is an issue
+      //    pending on the OMG as to whether the operation should be
+      //    sent in the connection negotiated codeset or always in
+      //    ISO8859-1.
+      CORBA::String_var tmp;
+      hdr_status = hdr_status && input.read_string (tmp.inout ());
+      operation_name.set (tmp._retn (), 1);
+      request.operation (operation_name);
+    }
+  return hdr_status ? 0 : -1;
+
+}
+
+int 
+TAO_GIOP_Message_Lite::
+  parse_locate_header (TAO_GIOP_Locate_Request_Header &request)
+{
+  // Get the stream 
+  TAO_InputCDR &msg = request.incoming_stream ();
+
+  CORBA::Boolean hdr_status = 1;
+  
+  // Get the request id
+  CORBA::ULong req_id = 0;
+  hdr_status = msg.read_ulong (req_id);
+  
+  // Store it in the Locate request classes
+  request.request_id (req_id);
+
+  TAO_ObjectKey object_key;
+  
+  // Note that here there are no unions and so no problems
+  hdr_status = hdr_status && (msg >> object_key);
+  
+  // Get the underlying TargetAddress from the request class
+  GIOP::TargetAddress &target = request.target_address ();
+
+  // Put this object key in the target_adderss
+  target.object_key (object_key);
+
+  return hdr_status ? 0 : -1;
+}
+
+CORBA::Boolean
+TAO_GIOP_Message_Lite::
+  make_reply (CORBA::ULong request_id,
+              TAO_OutputCDR &output)
+{
+  // Write the GIOP header first
+  this->write_protocol_header (TAO_PLUGGABLE_MESSAGE_REPLY,
+                               output);
+  
+  // create and write a dummy context
+  IOP::ServiceContextList resp_ctx;
+  resp_ctx.length (0);
+  output << resp_ctx;
+
+  // Write the request ID
+  output.write_ulong (request_id);
+  
+  return 0;
+}
+
+int
+TAO_GIOP_Message_Lite::
+  send_reply_exception (TAO_Transport *transport,
+                        TAO_ORB_Core* orb_core,
+                        CORBA::ULong request_id,
+                        CORBA::Exception *x)
+{
+  // Create a new output CDR stream
+  char repbuf[ACE_CDR::DEFAULT_BUFSIZE];
+
+#if defined(ACE_HAS_PURIFY)
+  (void) ACE_OS::memset (repbuf,
+                         '\0',
+                         sizeof repbuf);
+#endif /* ACE_HAS_PURIFY */
+  TAO_OutputCDR output (repbuf,
+                        sizeof repbuf,
+                        TAO_ENCAP_BYTE_ORDER,
+                        orb_core->output_cdr_buffer_allocator (),
+                        orb_core->output_cdr_dblock_allocator (),
+                        orb_core->orb_params ()->cdr_memcpy_tradeoff (),
+                        orb_core->to_iso8859 (),
+                        orb_core->to_unicode ());
+
+  // Make the GIOP & reply header. They are version specific.
+  this->make_reply (request_id,
+                    output);
+  
+  // A new try/catch block, but if something goes wrong now we have no
+  // hope, just abort.
+  ACE_DECLARE_NEW_CORBA_ENV;
+  
+  ACE_TRY
+    {
+      // Write the exception
+      CORBA::TypeCode_ptr except_tc = x->_type ();
+
+      CORBA::exception_type extype =
+        CORBA::USER_EXCEPTION;
+
+      if (CORBA::SystemException::_narrow (x) != 0)
+        extype = CORBA::SYSTEM_EXCEPTION;
+
+      // write the reply_status
+      output.write_ulong
+        (TAO_GIOP_Utils::convert_CORBA_to_GIOP_exception (extype));  
+
+      // @@ Any way to implement this without interpretive
+      //    marshaling???
+      output.encode (except_tc,
+                     x,
+                     0,
+                     ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+    }
+  ACE_CATCH (CORBA_Exception, ex)
+    {
+      // Now we know that while handling the error an other error
+      // happened -> no hope, close connection.
+
+      // Close the handle.
+      ACE_DEBUG ((LM_DEBUG,
+                  ASYS_TEXT ("(%P|%t|%N|%l) cannot marshal exception, handle = %d: %p\n"),
+                  transport->handle (),
+                  ASYS_TEXT ("send_reply_exception ()")));
+      return -1;
+    }
+  ACE_ENDTRY;
+
+  return this->send_message (transport,
+                             output);
+}
+
+
+int
+TAO_GIOP_Message_Lite::
+  make_locate_reply (TAO_Transport *transport,
+                     TAO_OutputCDR & output,
+                     TAO_GIOP_Locate_Request_Header &request,
+                     TAO_GIOP_Locate_Status_Msg &status_info)
+{
+  // Note here we are making the Locate reply header which is *QUITE*
+  // different from the reply header made by the make_reply () call..
+
+  // Make the GIOP message header
+  this->write_protocol_header (TAO_PLUGGABLE_MESSAGE_LOCATEREPLY,
+                               output);
+
+  // Make the header for the locate request
+  output.write_ulong (request.request_id ());
+  output.write_ulong (status_info.status);
+  
+  if (status_info.status == TAO_GIOP_OBJECT_FORWARD)
+    {
+      CORBA::Object_ptr object_ptr = status_info.forward_location_var.in ();
+      if ((output << object_ptr) == 0)
+        {
+          if (TAO_debug_level > 0)
+            ACE_DEBUG ((LM_DEBUG,
+                        ASYS_TEXT ("TAO (%P|%t|%N|%l) make_locate_reply-")
+                        ASYS_TEXT ("cannot marshal object reference\n")));
+        }
+    }
+
+
+
+  // Send the message
+  int result = this->send_message (transport,
+                                   output);
+
+  // Print out message if there is an error
+  if (result == -1)
+    {
+      if (TAO_debug_level > 0)
+        {
+          ACE_ERROR ((LM_ERROR,
+                      ASYS_TEXT ("TAO: (%P|%t) %p: cannot send reply\n"),
+                      ASYS_TEXT ("TAO_GIOP::process_server_message")));
+        }
+    }
+
+  return result;
+}
+
+// Send an "I can't understand you" message -- again, the message is
+// prefabricated for simplicity.  This implies abortive disconnect (at
+// the application level, if not at the level of TCP).
+//
+// NOTE that IIOPLite will still benefit from TCP's orderly disconnect.
+int
+TAO_GIOP_Message_Lite::send_error (TAO_Transport *transport)
+{
+  const char
+    error_message [TAO_GIOP_LITE_HEADER_LEN] =
+  {
+    // The following works on non-ASCII platforms, such as MVS (which
+    // uses EBCDIC).
+    TAO_GIOP_MESSAGERROR,
+    0, 0, 0, 0
+  };
+  
+  this->dump_msg ("send_error",
+                  (const u_char *) error_message,
+                  TAO_GIOP_LITE_HEADER_LEN);
+ 
+  ACE_HANDLE which = transport->handle ();
+
+  int result = transport->send ((const u_char *)error_message,
+                                TAO_GIOP_LITE_HEADER_LEN);
+  if (result == -1)
+    {
+      if (TAO_debug_level > 0)
+        ACE_DEBUG ((LM_DEBUG,
+                    ASYS_TEXT ("TAO (%N|%l|%P|%t) error sending error to %d\n"),
+                    which));
+    }
+ 
+  return result;
+}
+
+void
+TAO_GIOP_Message_Lite::dump_msg (const char *label,
+                                 const u_char *ptr,
+                                 size_t len)
+{
+  static const char *names [] =
+  {
+    "Request",
+    "Reply",
+    "CancelRequest",
+    "LocateRequest",
+    "LocateReply",
+    "CloseConnection",
+    "MessageError"
+    "Fragment"
+  };
+  
+  if (TAO_debug_level >= 5)
+    {
+      // Message name.
+      const char *message_name = "UNKNOWN MESSAGE";
+      u_long slot = ptr[TAO_GIOP_LITE_MESSAGE_TYPE_OFFSET];
+      if (slot < sizeof (names)/sizeof(names[0]))
+        message_name = names [slot];
+      
+      ACE_DEBUG ((LM_DEBUG,
+                  "(%N|%l) \n"));
+      // Byte order.
+      int byte_order = TAO_ENCAP_BYTE_ORDER;
+
+      // request/reply id.
+      CORBA::ULong tmp = 0;
+      CORBA::ULong *id = &tmp;
+      
+      if (ptr[TAO_GIOP_LITE_MESSAGE_TYPE_OFFSET] == TAO_GIOP_REQUEST ||
+          ptr[TAO_GIOP_LITE_MESSAGE_TYPE_OFFSET] == TAO_GIOP_REPLY)
+        {
+          ACE_DEBUG ((LM_DEBUG,
+                      "(%N|%l) \n"));
+          // @@ Only works if ServiceContextList is empty....
+          id = ACE_reinterpret_cast (CORBA::ULong *,
+                                     (char * ) (ptr));
+                               
+          ACE_DEBUG ((LM_DEBUG,
+                      "(%N|%l) \n"));
+        }
+
+      // Print.
+      ACE_DEBUG ((LM_DEBUG,
+                  ASYS_TEXT ("(%P | %t):%s GIOP lite msg, ")
+                  ASYS_TEXT ("%d data bytes, %s endian, <%s = %d> \n"),
+                  label,
+                  len - TAO_GIOP_LITE_HEADER_LEN,
+                  (byte_order == TAO_ENCAP_BYTE_ORDER) ? "my" : "other",
+                  message_name,
+                  *id));
+    }
+}
+
+
diff --git a/TAO/tao/GIOP_Message_Lite.h b/TAO/tao/GIOP_Message_Lite.h
new file mode 100644
index 00000000000..7760f9f2fe9
--- /dev/null
+++ b/TAO/tao/GIOP_Message_Lite.h
@@ -0,0 +1,168 @@
+// -*- C++ -*-
+// $Id$
+
+// ============================================================================
+//
+// = LIBRARY
+//     TAO
+//
+// = FILENAME
+//     GIOP_Message_Lite.h
+//
+// = DESCRIPTION
+//     Interface for the GIOP Lite messaging protocol
+//
+// = AUTHOR
+//     Balachandran Natarajan <bala@cs.wustl.edu>
+//
+// ============================================================================
+#ifndef _TAO_GIOP_MESSAGE_LITE_H_
+#define _TAO_GIOP_MESSAGE_LITE_H_
+
+#include "tao/GIOP_Message_Base.h"
+#include "tao/GIOP_Server_Request.h"
+#include "tao/GIOP_Assorted_Headers.h"
+
+class TAO_Export TAO_GIOP_Message_Lite :
+  public TAO_Pluggable_Messaging_Interface
+{
+  // = TITLE
+  //   Definitions got the GIOP lite
+  //
+  // = DESCRIPTION
+  //   The interface is quite a replica of the GIOP Base
+  //   interface. Implmenetation may not vary much too. But we are
+  //   having a seperate interface to have seperation of concerns.
+public:  
+  TAO_GIOP_Message_Lite (void);
+  //Ctor
+
+  virtual ~TAO_GIOP_Message_Lite (void);
+  // Dtor
+
+  virtual CORBA::Boolean write_protocol_header (TAO_Pluggable_Message_Type t,
+                                                TAO_OutputCDR &msg);
+  // Writes the GIOPLite header in to <msg>
+
+  int handle_input (TAO_Transport *transport,
+                    TAO_ORB_Core *orb_core,
+                    TAO_Message_State_Factory &mesg_state,
+                    ACE_Time_Value *max_time_value = 0);
+  // Reads input from the transport layer to the cdr stream in <mesg_state>
+  
+  virtual CORBA::Boolean 
+  write_message_header (const TAO_Pluggable_Connector_Params &params,
+                        TAO_Pluggable_Header_Type header_type,
+                        TAO_Target_Specification &spec,
+                        TAO_OutputCDR &msg);
+  // Write the  header defined by <header_type> in to <msg>
+
+  int send_message (TAO_Transport *transport,
+                    TAO_OutputCDR &stream,
+                    ACE_Time_Value *max_wait_time = 0,
+                    TAO_Stub *stub = 0,
+                    int two_way = 1);
+  // Sends the encapsulated stream in <stream> on to the transport 
+  
+  int parse_reply (TAO_Message_State_Factory &mesg_state,
+                   TAO_Pluggable_Connector_Params &params,
+                   CORBA::ULong &reply_status);
+  // Parse the reply message from the server
+  
+  int process_connector_messages (TAO_Transport *transport,
+                                  TAO_ORB_Core *orb_core,
+                                  TAO_InputCDR &input,
+                                  CORBA::Octet message_type);
+  // Processes the messages from the connectors so that they can be
+  // passed on to the appropriate states.
+private:
+  CORBA::Boolean 
+  write_request_header (const IOP::ServiceContextList& svc_ctx,
+                        CORBA::ULong request_id,
+                        CORBA::Octet response_flags,
+                        TAO_Target_Specification &spec,
+                        const char* opname,
+                        TAO_OutputCDR &msg);
+  // Write the GIOP lite request header in to <msg>
+  
+  CORBA::Boolean 
+  write_locate_request_header (CORBA::ULong request_id,
+                               TAO_Target_Specification &spec,
+                               TAO_OutputCDR &msg);
+  // Write the GIOP lite locate request header in to <msg>
+  
+  int parse_header (TAO_GIOP_Message_State *state);
+  // Parse the header
+
+  
+  int process_connector_request (TAO_Transport *transport,
+                                 TAO_ORB_Core* orb_core,
+                                 TAO_InputCDR &input,
+                                 TAO_OutputCDR &output);
+  // A request was received on the server side. <transport> is the
+  // source of the message (and thus where the  replies should be
+  // sent). <orb_core> is the ORB that received the message <input>
+  // contains the message <output> can be used to store any responses
+  // <request_id> and <response_required> are set as part of the
+  // message processing.
+
+
+  int process_connector_locate (TAO_Transport *transport,
+                                TAO_ORB_Core* orb_core,
+                                TAO_InputCDR &input,
+                                TAO_OutputCDR &output);
+  // A LocateRequest was received on the server side. <transport> is
+  // the source of the message (and thus where the replies should be
+  // sent). <orb_core> is the ORB that received the message <input>
+  // contains the message <output> can be used to store any responses
+  // <request_id> and <response_required> are set as part of the
+  // message processing.
+
+  int parse_request_header (TAO_GIOP_ServerRequest &request);
+  // Parse the Request Message header 
+
+  int parse_locate_header (TAO_GIOP_Locate_Request_Header &request);
+  // Parse the Locate Request header
+  
+  CORBA::Boolean make_reply (CORBA::ULong request_id,
+                             TAO_OutputCDR &output);
+  // Make a reply message including the protocol header
+
+  int send_reply_exception (TAO_Transport *transport,
+                            TAO_ORB_Core* orb_core,
+                            CORBA::ULong request_id,
+                            CORBA::Exception *x);
+  // We must send a LocateReply through <transport>, this request
+  // resulted in some kind of exception.
+
+  int make_locate_reply (TAO_Transport *transport,
+                         TAO_OutputCDR & output,
+                         TAO_GIOP_Locate_Request_Header &request,
+                         TAO_GIOP_Locate_Status_Msg &status_info);
+  // Making replies for LocateRequest messages.
+  
+  int  send_error (TAO_Transport *transport);
+  // Send error messages
+  
+  void dump_msg (const char *label,
+                 const u_char *ptr,
+                 size_t len);
+  // Print out the contents of the buffer.
+  
+
+};
+
+
+// The IIOP Lite header length and the offset of the message size
+// field in it.
+const size_t TAO_GIOP_LITE_HEADER_LEN = 5;
+const size_t TAO_GIOP_LITE_MESSAGE_SIZE_OFFSET = 0;
+const size_t TAO_GIOP_LITE_MESSAGE_TYPE_OFFSET = 4;
+
+
+
+#if defined (__ACE_INLINE__)
+# include "tao/GIOP_Message_Lite.i"
+#endif /* __ACE_INLINE__ */
+
+#endif /*_TAO_GIOP_MESSAGE_LITE_H_*/
diff --git a/TAO/tao/GIOP_Message_Lite.i b/TAO/tao/GIOP_Message_Lite.i
new file mode 100644
index 00000000000..4a0148c8e46
--- /dev/null
+++ b/TAO/tao/GIOP_Message_Lite.i
@@ -0,0 +1,2 @@
+//$Id$
+
diff --git a/TAO/tao/GIOP_Server_Request.cpp b/TAO/tao/GIOP_Server_Request.cpp
index 457c0a5c418..871e17793c5 100644
--- a/TAO/tao/GIOP_Server_Request.cpp
+++ b/TAO/tao/GIOP_Server_Request.cpp
@@ -44,7 +44,7 @@ ACE_TIMEPROBE_EVENT_DESCRIPTIONS (TAO_Server_Request_Timeprobe_Description,
 #endif /* ACE_ENABLE_TIMEPROBES */
 
 TAO_GIOP_ServerRequest::
-    TAO_GIOP_ServerRequest (TAO_GIOP_Message_Base *mesg_base,
+    TAO_GIOP_ServerRequest (TAO_Pluggable_Messaging_Interface *mesg_base,
                             TAO_InputCDR &input,
                             TAO_OutputCDR &output,
                             TAO_ORB_Core *orb_core,
@@ -79,7 +79,7 @@ TAO_GIOP_ServerRequest::
 // This constructor is used, by the locate request code
 
 TAO_GIOP_ServerRequest::
-    TAO_GIOP_ServerRequest (TAO_GIOP_Message_Base *mesg_base,
+    TAO_GIOP_ServerRequest (TAO_Pluggable_Messaging_Interface *mesg_base,
                             CORBA::ULong &request_id,
                             CORBA::Boolean &response_expected,
                             TAO_ObjectKey &object_key,
diff --git a/TAO/tao/GIOP_Server_Request.h b/TAO/tao/GIOP_Server_Request.h
index f334d4b0f0d..50337e61a52 100644
--- a/TAO/tao/GIOP_Server_Request.h
+++ b/TAO/tao/GIOP_Server_Request.h
@@ -39,14 +39,14 @@ class TAO_Export TAO_GIOP_ServerRequest : public CORBA_ServerRequest
   //    Class representing an GIOP ServerRequest object.
 public:
   // = Initialization and termination methods.
-  TAO_GIOP_ServerRequest (TAO_GIOP_Message_Base *mesg_base,
+  TAO_GIOP_ServerRequest (TAO_Pluggable_Messaging_Interface *mesg_base,
                           TAO_InputCDR &input,
                           TAO_OutputCDR &output,
                           TAO_ORB_Core *orb_core,
                           const TAO_GIOP_Version &version);
                           
   // Constructor
-  TAO_GIOP_ServerRequest (TAO_GIOP_Message_Base *mesg_base,
+  TAO_GIOP_ServerRequest (TAO_Pluggable_Messaging_Interface *mesg_base,
                           CORBA::ULong &request_id,
                           CORBA::Boolean &response_expected,
                           TAO_ObjectKey &object_key,
@@ -190,7 +190,7 @@ public:
   void message_size_offset (size_t len);
 
 private:
-  TAO_GIOP_Message_Base *mesg_base_;
+  TAO_Pluggable_Messaging_Interface *mesg_base_;
   
   ACE_CString operation_;
   // Operation name.
diff --git a/TAO/tao/GIOP_Utils.cpp b/TAO/tao/GIOP_Utils.cpp
index 7e8516e98e0..d97d5d2e3b3 100644
--- a/TAO/tao/GIOP_Utils.cpp
+++ b/TAO/tao/GIOP_Utils.cpp
@@ -110,4 +110,92 @@ TAO_GIOP_Message_State::append_fragment (ACE_Message_Block* current)
 }
 
 
+int
+TAO_GIOP_Utils::
+  read_bytes_input (TAO_Transport *transport,
+                    TAO_InputCDR &input,
+                    CORBA::ULong read_size,
+                    ACE_Time_Value *value)
+{
+  // Grow the size of CDR stream
+  if (input.grow (read_size) == -1)
+    return -1;
+  
+  // Read until all the header is received.  There should be no
+  // problems with locking, the header is only a few bytes so they
+  // should all be available on the socket, otherwise there is a
+  // problem with the underlying transport, in which case we have more
+  // problems than just this small loop.
+  char *buf = input.rd_ptr ();
+  ssize_t n = 0;
+  
+  for (int t = read_size;
+       t != 0;
+       t -= n)
+    {
+      n = transport->recv (buf, t, value);
+      if (n == -1)
+        return -1;
+      else if (n == 0) // @@ TODO && errno != EWOULDBLOCK)
+        return -1;
+      buf += n;
+    }
+
+  return 1;
+}
+
+
+ssize_t
+TAO_GIOP_Utils::read_buffer (TAO_Transport *transport,
+                             char *buf,
+                             size_t len,
+                             ACE_Time_Value *max_wait_time)
+{
+  ssize_t bytes_read = transport->recv (buf, len, max_wait_time);
+
+  if (bytes_read <= 0 && TAO_debug_level > 0)
+    ACE_DEBUG ((LM_DEBUG,
+                ASYS_TEXT ("TAO (%P|%t|%N|%l) - %p,\n")
+                ASYS_TEXT ("              transport = %d, ")
+                ASYS_TEXT ("bytes = %d, len = %d\n"),
+                ASYS_TEXT ("read_buffer"),
+                transport->handle (),
+                bytes_read,
+                len));
+
+  if (bytes_read == -1 && errno == ECONNRESET)
+    {
+      // @@ Is this OK??
+
+      // We got a connection reset (TCP RSET) from the other side,
+      // i.e., they didn't initiate a proper shutdown.
+      //
+      // Make it look like things are OK to the upper layer.
+      bytes_read = 0;
+      errno = 0;
+    }
+
+  return bytes_read;
+}
+
+
+TAO_GIOP_Reply_Status_Type
+TAO_GIOP_Utils::
+  convert_CORBA_to_GIOP_exception (CORBA::exception_type corba_type)  
+{
+  switch (corba_type)
+    {
+    case CORBA::NO_EXCEPTION:
+      return TAO_GIOP_NO_EXCEPTION;
+
+    case CORBA::SYSTEM_EXCEPTION:
+      return TAO_GIOP_SYSTEM_EXCEPTION;
 
+    case CORBA::USER_EXCEPTION:
+      return TAO_GIOP_USER_EXCEPTION;
+
+    default:
+      // Don't know what to do here??
+      return TAO_GIOP_SYSTEM_EXCEPTION;
+    }
+}
diff --git a/TAO/tao/GIOP_Utils.h b/TAO/tao/GIOP_Utils.h
index 8390a59419d..f3ac2a7e61d 100644
--- a/TAO/tao/GIOP_Utils.h
+++ b/TAO/tao/GIOP_Utils.h
@@ -235,7 +235,28 @@ private:
 
 };
 
-
+class TAO_Export TAO_GIOP_Utils
+{
+  // = TITLE
+  //   Utility class that has some commonly used methods for both GIOP
+  //   Base  & GIOP lite
+  
+  // = DESCRIPTION
+public:
+  static int read_bytes_input (TAO_Transport *transport,
+                               TAO_InputCDR &cdr,
+                               CORBA::ULong buf_size,
+                               ACE_Time_Value *value = 0);
+  
+  static ssize_t read_buffer (TAO_Transport *transport,
+                              char *buf,
+                              size_t len,
+                              ACE_Time_Value *max_wait_time = 0);
+  
+  static TAO_GIOP_Reply_Status_Type 
+  convert_CORBA_to_GIOP_exception (CORBA::exception_type corba_type);
+  // Convert the exception type from CORBA to GIOP
+};
 
 #if defined (__ACE_INLINE__)
 # include "tao/GIOP_Utils.i"
diff --git a/TAO/tao/IIOP_Acceptor.cpp b/TAO/tao/IIOP_Acceptor.cpp
index 628022152bf..c858f5a205c 100644
--- a/TAO/tao/IIOP_Acceptor.cpp
+++ b/TAO/tao/IIOP_Acceptor.cpp
@@ -43,14 +43,15 @@ template class TAO_Accept_Strategy<TAO_IIOP_Server_Connection_Handler, ACE_SOCK_
 
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-TAO_IIOP_Acceptor::TAO_IIOP_Acceptor (void)
+TAO_IIOP_Acceptor::TAO_IIOP_Acceptor (CORBA::Boolean flag)
   : TAO_Acceptor (TAO_TAG_IIOP_PROFILE),
     version_ (TAO_DEF_GIOP_MAJOR, TAO_DEF_GIOP_MINOR),
     orb_core_ (0),
     base_acceptor_ (),
     creation_strategy_ (0),
     concurrency_strategy_ (0),
-    accept_strategy_ (0)
+    accept_strategy_ (0),
+    lite_flag_ (flag)
 {
 }
 
@@ -219,7 +220,8 @@ TAO_IIOP_Acceptor::open_i (TAO_ORB_Core* orb_core,
   this->orb_core_ = orb_core;
 
   ACE_NEW_RETURN (this->creation_strategy_,
-                  TAO_IIOP_CREATION_STRATEGY (this->orb_core_),
+                  TAO_IIOP_CREATION_STRATEGY (this->orb_core_,
+                                              this->lite_flag_),
                   -1);
 
   ACE_NEW_RETURN (this->concurrency_strategy_,
diff --git a/TAO/tao/IIOP_Acceptor.h b/TAO/tao/IIOP_Acceptor.h
index 82139d5a746..db8763aa90e 100644
--- a/TAO/tao/IIOP_Acceptor.h
+++ b/TAO/tao/IIOP_Acceptor.h
@@ -43,7 +43,7 @@ class TAO_Export TAO_IIOP_Acceptor : public TAO_Acceptor
   //   The IIOP-specific bridge class for the concrete acceptor.
   //
 public:
-  TAO_IIOP_Acceptor (void);
+  TAO_IIOP_Acceptor (CORBA::Boolean flag);
   // Constructor.
 
   ~TAO_IIOP_Acceptor (void);
@@ -105,6 +105,9 @@ private:
   TAO_IIOP_CONCURRENCY_STRATEGY *concurrency_strategy_;
   TAO_IIOP_ACCEPT_STRATEGY *accept_strategy_;
   // Acceptor strategies.
+  
+  CORBA::Boolean lite_flag_;
+  // Should we use GIOP lite??
 
 };
 
diff --git a/TAO/tao/IIOP_Connect.cpp b/TAO/tao/IIOP_Connect.cpp
index a40f5251cce..b01ff054a58 100644
--- a/TAO/tao/IIOP_Connect.cpp
+++ b/TAO/tao/IIOP_Connect.cpp
@@ -8,7 +8,9 @@
 #include "tao/ORB.h"
 #include "tao/CDR.h"
 #include "tao/Messaging_Policy_i.h"
-
+#include "tao/GIOP_Message_Lite.h"
+#include "tao/GIOP_Message_Acceptors.h"
+#include "tao/GIOP_Message_Connectors.h"
 
 #if !defined (__ACE_INLINE__)
 # include "tao/IIOP_Connect.i"
@@ -69,8 +71,8 @@ TAO_IIOP_Server_Connection_Handler::TAO_IIOP_Server_Connection_Handler (ACE_Thre
     transport_ (this, 0),
     orb_core_ (0),
     tss_resources_ (0),
-    refcount_ (1)
-
+    refcount_ (1),
+    lite_flag_ (0)
 {
   // This constructor should *never* get called, it is just here to
   // make the compiler happy: the default implementation of the
@@ -80,23 +82,37 @@ TAO_IIOP_Server_Connection_Handler::TAO_IIOP_Server_Connection_Handler (ACE_Thre
   ACE_ASSERT (this->orb_core_ != 0);
 }
 
-TAO_IIOP_Server_Connection_Handler::TAO_IIOP_Server_Connection_Handler (TAO_ORB_Core *orb_core)
+TAO_IIOP_Server_Connection_Handler::TAO_IIOP_Server_Connection_Handler (TAO_ORB_Core *orb_core,
+                                                                        CORBA::Boolean flag)
   : TAO_IIOP_Handler_Base (orb_core),
     transport_ (this, orb_core),
     orb_core_ (orb_core),
     tss_resources_ (orb_core->get_tss_resources ()),
-    refcount_ (1)
+    refcount_ (1),
+    lite_flag_ (flag)
 {
+  if (lite_flag_)
+    {
+      ACE_NEW (this->acceptor_factory_,
+               TAO_GIOP_Message_Lite);
+    }
+  else
+    {
+      ACE_NEW (this->acceptor_factory_,
+               TAO_GIOP_Message_Acceptors);
+    }
+        
   // OK, Here is a small twist. By now the all the objecs cached in
   // this class would have been constructed. But we would like to make
   // the one of the objects, precisely the transport object a pointer
   // to the Messaging object. So, we set this up properly by calling
   // the messaging_init method on the transport. 
-  this->transport_.messaging_init (& this->acceptor_factory_);
+  this->transport_.messaging_init (this->acceptor_factory_);
 }
 
 TAO_IIOP_Server_Connection_Handler::~TAO_IIOP_Server_Connection_Handler (void)
 {
+  delete this->acceptor_factory_;
 }
 
 int
@@ -270,11 +286,11 @@ TAO_IIOP_Server_Connection_Handler::handle_input_i (ACE_HANDLE,
 {
   this->refcount_++;
 
-  int result = this->acceptor_factory_.handle_input (this->transport (),
-                                                     this->orb_core_,
-                                                     this->transport_.message_state_,
-                                                     max_wait_time);
-
+  int result = this->acceptor_factory_->handle_input (this->transport (),
+                                                      this->orb_core_,
+                                                      this->transport_.message_state_,
+                                                      max_wait_time);
+  
   if (result == -1 && TAO_debug_level > 0)
     {
       ACE_DEBUG ((LM_DEBUG,
@@ -313,13 +329,12 @@ TAO_IIOP_Server_Connection_Handler::handle_input_i (ACE_HANDLE,
 
   // Reset the message state.
   this->transport_.message_state_.reset (0);
-
   result = 
-    this->acceptor_factory_.process_connector_messages (this->transport (),
-                                                        this->orb_core_,
-                                                        input_cdr,
-                                                        message_type);
-  
+    this->acceptor_factory_->process_connector_messages (this->transport (),
+                                                         this->orb_core_,
+                                                         input_cdr,
+                                                         message_type);
+
   if (result != -1)
     result = 0;
 
@@ -541,25 +556,44 @@ TAO_IIOP_Client_Connection_Handler::
   init_mesg_protocol (CORBA::Octet major, 
                       CORBA::Octet minor) 
 {
-  if (minor > TAO_DEF_GIOP_MINOR)
-    minor = TAO_DEF_GIOP_MINOR;
-  switch (minor)
+  if (major == TAO_DEF_GIOP_LITE_MAJOR &&
+      minor == TAO_DEF_GIOP_LITE_MINOR)
     {
-    case 0:
-      ACE_NEW_RETURN  (this->mesg_factory_,
-                       TAO_GIOP_Message_Connector_10,
-                       0);
-      break;
-    case 1:
       ACE_NEW_RETURN  (this->mesg_factory_,
-                       TAO_GIOP_Message_Connector_11,
-                       0);
-      break;
-    default:
+                       TAO_GIOP_Message_Lite,
+                       -1);
+    }
+  else if (major == TAO_DEF_GIOP_MAJOR)
+    {
+      if (minor > TAO_DEF_GIOP_MINOR)
+        minor = TAO_DEF_GIOP_MINOR;
+      switch (minor)
+        {
+        case 0:
+          ACE_NEW_RETURN  (this->mesg_factory_,
+                           TAO_GIOP_Message_Connector_10,
+                           0);
+          break;
+        case 1:
+          ACE_NEW_RETURN  (this->mesg_factory_,
+                           TAO_GIOP_Message_Connector_11,
+                           0);
+          break;
+        default:
+          if (TAO_debug_level > 0)
+            {
+              ACE_ERROR_RETURN ((LM_ERROR,
+                                 ASYS_TEXT ("(%N|%l|%p|%t) No matching minor version number \n")),
+                                0);
+            }
+        }
+    }
+  else
+    {
       if (TAO_debug_level > 0)
         {
           ACE_ERROR_RETURN ((LM_ERROR,
-                             ASYS_TEXT ("(%N|%l|%p|%t) No matching minor version number \n")),
+                             ASYS_TEXT ("(%N|%l|%p|%t) No matching major version number \n")), 
                             0);
         }
     }
diff --git a/TAO/tao/IIOP_Connect.h b/TAO/tao/IIOP_Connect.h
index c15655c7d79..00c85cc3f0e 100644
--- a/TAO/tao/IIOP_Connect.h
+++ b/TAO/tao/IIOP_Connect.h
@@ -32,9 +32,9 @@
 #include "tao/Wait_Strategy.h"
 
 #include "tao/IIOP_Transport.h"
+#include "tao/Pluggable_Messaging.h"
+
 
-#include "tao/GIOP_Message_Acceptors.h"
-#include "tao/GIOP_Message_Connectors.h"
 
 
 
@@ -110,7 +110,7 @@ protected:
   TAO_ORB_Core *orb_core_;
   // Cached ORB Core.
 
-  TAO_GIOP_Message_Connectors *mesg_factory_;
+  TAO_Pluggable_Messaging_Interface *mesg_factory_;
   // The Connector messaging factory
 };
 
@@ -123,7 +123,8 @@ class TAO_Export TAO_IIOP_Server_Connection_Handler : public TAO_IIOP_Handler_Ba
 
 public:
   TAO_IIOP_Server_Connection_Handler (ACE_Thread_Manager* t = 0);
-  TAO_IIOP_Server_Connection_Handler (TAO_ORB_Core *orb_core);
+  TAO_IIOP_Server_Connection_Handler (TAO_ORB_Core *orb_core,
+                                      CORBA::Boolean flag);
   ~TAO_IIOP_Server_Connection_Handler (void);
   // Constructor.
 
@@ -172,7 +173,7 @@ protected:
   TAO_IIOP_Server_Transport transport_;
   // @@ New transport object reference.
 
-  TAO_GIOP_Message_Acceptors acceptor_factory_;
+  TAO_Pluggable_Messaging_Interface *acceptor_factory_;
   // Messaging acceptor factory
 
   TAO_ORB_Core *orb_core_;
@@ -183,6 +184,9 @@ protected:
 
   u_long refcount_;
   // Reference count, to avoid early deletes...
+  
+  CORBA::Boolean lite_flag_;
+  // Should we use GIOP or GIOPlite
 };
 
 #if defined (__ACE_INLINE__)
diff --git a/TAO/tao/IIOP_Connector.cpp b/TAO/tao/IIOP_Connector.cpp
index ed67ddf3f65..4e3f8b5d170 100644
--- a/TAO/tao/IIOP_Connector.cpp
+++ b/TAO/tao/IIOP_Connector.cpp
@@ -339,10 +339,11 @@ typedef ACE_Cached_Connect_Strategy<TAO_IIOP_Client_Connection_Handler,
         TAO_CACHED_CONNECT_STRATEGY;
 #endif /* ! TAO_USES_ROBUST_CONNECTION_MGMT */
 
-TAO_IIOP_Connector::TAO_IIOP_Connector (void)
+TAO_IIOP_Connector::TAO_IIOP_Connector (CORBA::Boolean flag)
   : TAO_Connector (TAO_TAG_IIOP_PROFILE),
     orb_core_ (0),
-    base_connector_ ()
+    base_connector_ (),
+    lite_flag_ (flag)
 #if defined (TAO_USES_ROBUST_CONNECTION_MGMT)
     ,
     cached_connect_strategy_ (0),
@@ -491,12 +492,23 @@ TAO_IIOP_Connector::connect (TAO_Profile *profile,
       return -1;
     }
 
-  // Now that we have the client connection handler object we need to
-  // set the right messaging protocol for the connection handler.
-  const TAO_GIOP_Version& version = iiop_profile->version ();
+  transport = result->transport ();
+  int ret_val = 0;
+  if (lite_flag_)
+    {
+      ret_val = result->init_mesg_protocol (TAO_DEF_GIOP_LITE_MAJOR,
+                                            TAO_DEF_GIOP_LITE_MINOR); 
+    }
+  else
+    {
+      // Now that we have the client connection handler object we need to
+      // set the right messaging protocol for the connection handler.
+      const TAO_GIOP_Version& version = iiop_profile->version ();
+      ret_val = result->init_mesg_protocol (version.major,
+                                            version.minor);
   
-  if (result->init_mesg_protocol (version.major,
-                                  version.minor) == 0)
+    }
+  if (ret_val == -1)
     {
       if (TAO_debug_level > 0)
         {
@@ -506,7 +518,6 @@ TAO_IIOP_Connector::connect (TAO_Profile *profile,
       return -1;
     }
   
-  transport = result->transport ();
   return 0;
 }
 
diff --git a/TAO/tao/IIOP_Connector.h b/TAO/tao/IIOP_Connector.h
index 830f3aab592..944c618830b 100644
--- a/TAO/tao/IIOP_Connector.h
+++ b/TAO/tao/IIOP_Connector.h
@@ -81,7 +81,7 @@ class TAO_Export TAO_IIOP_Connector : public TAO_Connector
   //
 public:
   // = Initialization and termination methods.
-  TAO_IIOP_Connector (void);
+  TAO_IIOP_Connector (CORBA::Boolean flag);
   // Constructor.
 
   // = The TAO_Connector methods, please check the documentation on
@@ -191,7 +191,8 @@ private:
   TAO_IIOP_BASE_CONNECTOR base_connector_;
   // The connector initiating connection requests for IIOP.
 
-
+  CORBA::Boolean lite_flag_;
+  // Do we need to use a GIOP_Lite for sending messages?
 
 #if defined (TAO_USES_ROBUST_CONNECTION_MGMT)
   TAO_CACHED_CONNECT_STRATEGY *cached_connect_strategy_;
@@ -202,6 +203,7 @@ private:
   // from the connection cache.
 #endif /* TAO_USES_ROBUST_CONNECTION_MGMT */
 
+
 };
 
 #endif  /* TAO_IIOP_CONNECTOR_H */
diff --git a/TAO/tao/IIOP_Factory.cpp b/TAO/tao/IIOP_Factory.cpp
index 8547d9348dd..2091337db6e 100644
--- a/TAO/tao/IIOP_Factory.cpp
+++ b/TAO/tao/IIOP_Factory.cpp
@@ -1,9 +1,9 @@
 // $Id$
-
 #include "tao/IIOP_Factory.h"
 #include "tao/IIOP_Acceptor.h"
 #include "tao/IIOP_Connector.h"
 #include "ace/Dynamic_Service.h"
+#include "ace/Get_Opt.h"
 
 ACE_RCSID(tao, IIOP_Factory, "$Id$")
 
@@ -11,12 +11,14 @@ static const char prefix_[] = "iiop";
 
 TAO_IIOP_Protocol_Factory::TAO_IIOP_Protocol_Factory (void)
   :  major_ (TAO_DEF_GIOP_MAJOR),
-     minor_ (TAO_DEF_GIOP_MINOR)
+     minor_ (TAO_DEF_GIOP_MINOR),
+     lite_flag_ (0)
 {
 }
 
 TAO_IIOP_Protocol_Factory::~TAO_IIOP_Protocol_Factory (void)
 {
+  
 }
 
 int
@@ -44,16 +46,29 @@ TAO_IIOP_Protocol_Factory::make_acceptor (void)
   TAO_Acceptor *acceptor = 0;
 
   ACE_NEW_RETURN (acceptor,
-                  TAO_IIOP_Acceptor,
+                  TAO_IIOP_Acceptor (this->lite_flag_),
                   0);
 
   return acceptor;
 }
 
 int
-TAO_IIOP_Protocol_Factory::init (int /* argc */,
-                                 char* /* argv */ [])
+TAO_IIOP_Protocol_Factory::init (int argc,
+                                 char* argv[])
 {
+  if (argc > 0)
+     {
+       if (ACE_OS::strcmp (argv[0],
+                           "GIOP_Lite") == 0)
+         {
+           this->lite_flag_ = 1;
+         }
+       else
+         ACE_ERROR_RETURN ((LM_ERROR,
+                            ASYS_TEXT ("(%N|%l)Wrong protocol type \n")),
+                           -1);
+
+     }
   return 0;
 }
 
@@ -63,7 +78,7 @@ TAO_IIOP_Protocol_Factory::make_connector (void)
   TAO_Connector *connector = 0;
 
   ACE_NEW_RETURN (connector,
-                  TAO_IIOP_Connector,
+                  TAO_IIOP_Connector (this->lite_flag_),
                   0);
   return connector;
 }
diff --git a/TAO/tao/IIOP_Factory.h b/TAO/tao/IIOP_Factory.h
index c63f4e4a7c1..fd87c3762e5 100644
--- a/TAO/tao/IIOP_Factory.h
+++ b/TAO/tao/IIOP_Factory.h
@@ -57,6 +57,9 @@ private:
   int minor_;
   // Changing the version number can be used to provide backwards
   // compatibility with old clients.
+  
+  CORBA::Boolean lite_flag_;
+  // Flag for the above. A value of zero represent
 };
 
 ACE_STATIC_SVC_DECLARE (TAO_IIOP_Protocol_Factory)
diff --git a/TAO/tao/IIOP_Transport.cpp b/TAO/tao/IIOP_Transport.cpp
index 2b25dfa60d6..56208e237c6 100644
--- a/TAO/tao/IIOP_Transport.cpp
+++ b/TAO/tao/IIOP_Transport.cpp
@@ -242,6 +242,7 @@ TAO_IIOP_Client_Transport::handle_client_input (int /* block */,
       return -1;
     }
 
+
   int result = this->client_mesg_factory_->handle_input (this,
                                                          this->orb_core_,
                                                          *message_state,
diff --git a/TAO/tao/IOPC.cpp b/TAO/tao/IOPC.cpp
index e6074797507..821dd36b645 100644
--- a/TAO/tao/IOPC.cpp
+++ b/TAO/tao/IOPC.cpp
@@ -578,7 +578,8 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IOP::TaggedProfile *&_ta
     else
     {
       ACE_NEW_RETURN (_tao_elem, IOP::TaggedProfile, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
+      TAO_InputCDR stream (_tao_any._tao_get_cdr (),
+                           _tao_any._tao_byte_order ());
       if (stream.decode (IOP::_tc_TaggedProfile, _tao_elem, 0, ACE_TRY_ENV)
         == CORBA::TypeCode::TRAVERSE_CONTINUE)
       {
@@ -644,7 +645,8 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IOP::IOR *&_tao_elem)
     else
     {
       ACE_NEW_RETURN (_tao_elem, IOP::IOR, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
+      TAO_InputCDR stream (_tao_any._tao_get_cdr (),
+                           _tao_any._tao_byte_order ());
       if (stream.decode (IOP::_tc_IOR, _tao_elem, 0, ACE_TRY_ENV)
         == CORBA::TypeCode::TRAVERSE_CONTINUE)
       {
@@ -710,7 +712,8 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IOP::TaggedComponent *&_
     else
     {
       ACE_NEW_RETURN (_tao_elem, IOP::TaggedComponent, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
+      TAO_InputCDR stream (_tao_any._tao_get_cdr (),
+                           _tao_any._tao_byte_order ());
       if (stream.decode (IOP::_tc_TaggedComponent, _tao_elem, 0, ACE_TRY_ENV)
         == CORBA::TypeCode::TRAVERSE_CONTINUE)
       {
@@ -779,7 +782,8 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IOP::MultipleComponentPr
     else
     {
       ACE_NEW_RETURN (_tao_elem, IOP::MultipleComponentProfile, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
+      TAO_InputCDR stream (_tao_any._tao_get_cdr (),
+                           _tao_any._tao_byte_order ());
       if (stream.decode (IOP::_tc_MultipleComponentProfile, _tao_elem, 0, ACE_TRY_ENV)
         == CORBA::TypeCode::TRAVERSE_CONTINUE)
       {
@@ -845,7 +849,8 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IOP::ServiceContext *&_t
     else
     {
       ACE_NEW_RETURN (_tao_elem, IOP::ServiceContext, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
+      TAO_InputCDR stream (_tao_any._tao_get_cdr (),
+                           _tao_any._tao_byte_order ());
       if (stream.decode (IOP::_tc_ServiceContext, _tao_elem, 0, ACE_TRY_ENV)
         == CORBA::TypeCode::TRAVERSE_CONTINUE)
       {
@@ -914,7 +919,8 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IOP::ServiceContextList
     else
     {
       ACE_NEW_RETURN (_tao_elem, IOP::ServiceContextList, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
+      TAO_InputCDR stream (_tao_any._tao_get_cdr (),
+                           _tao_any._tao_byte_order ());
       if (stream.decode (IOP::_tc_ServiceContextList, _tao_elem, 0, ACE_TRY_ENV)
         == CORBA::TypeCode::TRAVERSE_CONTINUE)
       {
diff --git a/TAO/tao/IORC.cpp b/TAO/tao/IORC.cpp
index 741bd640d66..f0e4083fe78 100644
--- a/TAO/tao/IORC.cpp
+++ b/TAO/tao/IORC.cpp
@@ -419,7 +419,8 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, TAO_IOP::TAO_IOR_Manipul
     CORBA::TypeCode_var type = _tao_any.type ();
     if (!type->equal (TAO_IOP::_tc_TAO_IOR_Manipulation, ACE_TRY_ENV)) return 0; // not equal
     ACE_TRY_CHECK;
-    TAO_InputCDR stream (_tao_any._tao_get_cdr ());
+    TAO_InputCDR stream (_tao_any._tao_get_cdr (),
+                         _tao_any._tao_byte_order ());
     CORBA::Object_var _tao_obj_var;
     ACE_NEW_RETURN (tmp, CORBA::Object_ptr, 0);
     if (stream.decode (TAO_IOP::_tc_TAO_IOR_Manipulation, &_tao_obj_var.out (), 0, ACE_TRY_ENV)
@@ -493,7 +494,8 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, TAO_IOP::TAO_IOR_Manipul
     else
     {
       ACE_NEW_RETURN (_tao_elem, TAO_IOP::TAO_IOR_Manipulation::EmptyProfileList, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
+      TAO_InputCDR stream (_tao_any._tao_get_cdr (),
+                           _tao_any._tao_byte_order ());
       if (stream.decode (TAO_IOP::TAO_IOR_Manipulation::_tc_EmptyProfileList, _tao_elem, 0, ACE_TRY_ENV)
         == CORBA::TypeCode::TRAVERSE_CONTINUE)
       {
@@ -558,7 +560,8 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, TAO_IOP::TAO_IOR_Manipul
     else
     {
       ACE_NEW_RETURN (_tao_elem, TAO_IOP::TAO_IOR_Manipulation::NotFound, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
+      TAO_InputCDR stream (_tao_any._tao_get_cdr (),
+                           _tao_any._tao_byte_order ());
       if (stream.decode (TAO_IOP::TAO_IOR_Manipulation::_tc_NotFound, _tao_elem, 0, ACE_TRY_ENV)
         == CORBA::TypeCode::TRAVERSE_CONTINUE)
       {
@@ -623,7 +626,8 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, TAO_IOP::TAO_IOR_Manipul
     else
     {
       ACE_NEW_RETURN (_tao_elem, TAO_IOP::TAO_IOR_Manipulation::Duplicate, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
+      TAO_InputCDR stream (_tao_any._tao_get_cdr (),
+                           _tao_any._tao_byte_order ());
       if (stream.decode (TAO_IOP::TAO_IOR_Manipulation::_tc_Duplicate, _tao_elem, 0, ACE_TRY_ENV)
         == CORBA::TypeCode::TRAVERSE_CONTINUE)
       {
@@ -688,7 +692,8 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, TAO_IOP::TAO_IOR_Manipul
     else
     {
       ACE_NEW_RETURN (_tao_elem, TAO_IOP::TAO_IOR_Manipulation::Invalid_IOR, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
+      TAO_InputCDR stream (_tao_any._tao_get_cdr (),
+                           _tao_any._tao_byte_order ());
       if (stream.decode (TAO_IOP::TAO_IOR_Manipulation::_tc_Invalid_IOR, _tao_elem, 0, ACE_TRY_ENV)
         == CORBA::TypeCode::TRAVERSE_CONTINUE)
       {
@@ -757,7 +762,8 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, TAO_IOP::TAO_IOR_Manipul
     else
     {
       ACE_NEW_RETURN (_tao_elem, TAO_IOP::TAO_IOR_Manipulation::IORList, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
+      TAO_InputCDR stream (_tao_any._tao_get_cdr (),
+                           _tao_any._tao_byte_order ());
       if (stream.decode (TAO_IOP::TAO_IOR_Manipulation::_tc_IORList, _tao_elem, 0, ACE_TRY_ENV)
         == CORBA::TypeCode::TRAVERSE_CONTINUE)
       {
diff --git a/TAO/tao/ImplRepoC.cpp b/TAO/tao/ImplRepoC.cpp
index 7e15c2ed3c0..3419c7825af 100644
--- a/TAO/tao/ImplRepoC.cpp
+++ b/TAO/tao/ImplRepoC.cpp
@@ -46,7 +46,7 @@ ImplementationRepository::ServerObject_ptr ImplementationRepository::ServerObjec
   return TAO_ImplementationRepository_ServerObject_PROXY_FACTORY_ADAPTER::instance ()->create_proxy (default_proxy);
 }
 
-ImplementationRepository::ServerObject_ptr 
+ImplementationRepository::ServerObject_ptr
 ImplementationRepository::ServerObject::_duplicate (ImplementationRepository::ServerObject_ptr obj)
 {
   if (!CORBA::is_nil (obj))
@@ -61,15 +61,15 @@ void ImplementationRepository::ServerObject::ping (
     CORBA::SystemException
   ))
 {
-  
 
-  
-  
+
+
+
   TAO_Stub *istub = this->_stubobj ();
   if (istub == 0)
     ACE_THROW (CORBA::INTERNAL ());
 
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "ping",
@@ -124,7 +124,7 @@ void ImplementationRepository::ServerObject::ping (
         {
           TAO_INTERCEPTOR_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES));
         }
-        
+
         TAO_INTERCEPTOR (
             _tao_vfr.postinvoke (
                 _tao_call.request_id (),
@@ -139,10 +139,10 @@ void ImplementationRepository::ServerObject::ping (
           );
         TAO_INTERCEPTOR_CHECK;
         break;
-        
+
       }
 #if defined (TAO_HAS_INTERCEPTORS)
-      
+
     }
   ACE_CATCHANY
     {
@@ -169,15 +169,15 @@ void ImplementationRepository::ServerObject::shutdown (
     CORBA::SystemException
   ))
 {
-  
 
-  
-  
+
+
+
   TAO_Stub *istub = this->_stubobj ();
   if (istub == 0)
     ACE_THROW (CORBA::INTERNAL ());
 
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "shutdown",
@@ -232,7 +232,7 @@ void ImplementationRepository::ServerObject::shutdown (
         {
           TAO_INTERCEPTOR_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES));
         }
-        
+
         TAO_INTERCEPTOR (
             _tao_vfr.postinvoke (
                 _tao_call.request_id (),
@@ -247,10 +247,10 @@ void ImplementationRepository::ServerObject::shutdown (
           );
         TAO_INTERCEPTOR_CHECK;
         break;
-        
+
       }
 #if defined (TAO_HAS_INTERCEPTORS)
-      
+
     }
   ACE_CATCHANY
     {
@@ -344,7 +344,7 @@ ImplementationRepository::TAO_ImplementationRepository_ServerObject_Proxy_Factor
   if (this->delete_proxy_factory_ == 0 && this->proxy_factory_ != 0)
     {
       // Its necessary to set <delete_proxy_factory_> to 1 to make sure that it
-      // doesnt get into an infinite loop in <unregister_proxy_factory> as it is 
+      // doesnt get into an infinite loop in <unregister_proxy_factory> as it is
       // invoked in the destructor of the class too.
       this->delete_proxy_factory_ = 1;
       delete this->proxy_factory_;
@@ -364,10 +364,10 @@ ImplementationRepository::TAO_ImplementationRepository_ServerObject_Proxy_Factor
   // Verify that an <proxy_factory_> is available else make one.
   if (this->proxy_factory_ == 0)
     ACE_NEW_RETURN (this->proxy_factory_,
-        TAO_ImplementationRepository_ServerObject_Default_Proxy_Factory (1), 
+        TAO_ImplementationRepository_ServerObject_Default_Proxy_Factory (1),
          0);
-      
-    
+
+
   return this->proxy_factory_->create_proxy (proxy);
 }
 
@@ -431,10 +431,10 @@ static const CORBA::Long _oc_ImplementationRepository_EnvironmentVariable[] =
   20, ACE_NTOHL (0x456e7669), ACE_NTOHL (0x726f6e6d), ACE_NTOHL (0x656e7456), ACE_NTOHL (0x61726961), ACE_NTOHL (0x626c6500),  // name = EnvironmentVariable
   2, // member count
   5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0),  // name = name
-  CORBA::tk_string, 
+  CORBA::tk_string,
   0U, // string length
   6, ACE_NTOHL (0x76616c75), ACE_NTOHL (0x65000000),  // name = value
-  CORBA::tk_string, 
+  CORBA::tk_string,
   0U, // string length
 };
 static CORBA::TypeCode _tc_TAO_tc_ImplementationRepository_EnvironmentVariable (CORBA::tk_struct, sizeof (_oc_ImplementationRepository_EnvironmentVariable), (char *) &_oc_ImplementationRepository_EnvironmentVariable, 0, sizeof (ImplementationRepository::EnvironmentVariable));
@@ -447,7 +447,7 @@ static const CORBA::Long _oc_ImplementationRepository_Address[] =
   TAO_ENCAP_BYTE_ORDER, // byte order
   41, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x496d706c), ACE_NTOHL (0x656d656e), ACE_NTOHL (0x74617469), ACE_NTOHL (0x6f6e5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x2f416464), ACE_NTOHL (0x72657373), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:ImplementationRepository/Address:1.0
   8, ACE_NTOHL (0x41646472), ACE_NTOHL (0x65737300),  // name = Address
-  CORBA::tk_string, 
+  CORBA::tk_string,
   0U, // string length
 };
 static CORBA::TypeCode _tc_TAO_tc_ImplementationRepository_Address (CORBA::tk_alias, sizeof (_oc_ImplementationRepository_Address), (char *) &_oc_ImplementationRepository_Address, 0, sizeof (ImplementationRepository::Address));
@@ -457,7 +457,7 @@ TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_Address, &_tc_TAO_tc_Implementati
 TAO_NAMESPACE_END
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_SEQUENCE_IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST_CS_)
 #define __TAO_UNBOUNDED_SEQUENCE_IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST_CS_
 
@@ -466,43 +466,43 @@ TAO_NAMESPACE_END
   {
     ImplementationRepository::EnvironmentVariable* tmp = 0;
     tmp = ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::allocbuf (length);
-    
+
     if (this->buffer_ != 0)
     {
       ImplementationRepository::EnvironmentVariable *old = ACE_reinterpret_cast (ImplementationRepository::EnvironmentVariable *,this->buffer_);
-      
+
       for (CORBA::ULong i = 0; i < this->length_; ++i)
         tmp[i] = old[i];
-      
+
       if (this->release_)
         ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::freebuf (old);
-      
+
     }
     this->buffer_ = tmp;
   }
-  
+
   void
   ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::_deallocate_buffer (void)
   {
     if (this->buffer_ == 0 || this->release_ == 0)
       return;
-    
+
     ImplementationRepository::EnvironmentVariable *tmp = ACE_reinterpret_cast (ImplementationRepository::EnvironmentVariable *,this->buffer_);
-    
+
     ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::freebuf (tmp);
     this->buffer_ = 0;
-  } 
-  
+  }
+
   ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList::~_TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList (void) // Dtor.
   {
     this->_deallocate_buffer ();
   }
-  
-  
+
+
 #endif /* end #if !defined */
 
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST_CS_)
 #define _IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST_CS_
@@ -514,30 +514,30 @@ TAO_NAMESPACE_END
 ImplementationRepository::EnvironmentList::EnvironmentList (void)
 {}
 ImplementationRepository::EnvironmentList::EnvironmentList (CORBA::ULong max) // uses max size
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Sequence<ImplementationRepository::EnvironmentVariable>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (max)
 {}
 ImplementationRepository::EnvironmentList::EnvironmentList (CORBA::ULong max, CORBA::ULong length, ImplementationRepository::EnvironmentVariable *buffer, CORBA::Boolean release)
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Sequence<ImplementationRepository::EnvironmentVariable>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (max, length, buffer, release)
 {}
 ImplementationRepository::EnvironmentList::EnvironmentList (const EnvironmentList &seq) // copy ctor
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Sequence_ImplementationRepository_EnvironmentList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Sequence<ImplementationRepository::EnvironmentVariable>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (seq)
 {}
 ImplementationRepository::EnvironmentList::~EnvironmentList (void) // dtor
@@ -561,10 +561,10 @@ static const CORBA::Long _oc_ImplementationRepository_EnvironmentList[] =
       20, ACE_NTOHL (0x456e7669), ACE_NTOHL (0x726f6e6d), ACE_NTOHL (0x656e7456), ACE_NTOHL (0x61726961), ACE_NTOHL (0x626c6500),  // name = EnvironmentVariable
       2, // member count
       5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0),  // name = name
-      CORBA::tk_string, 
+      CORBA::tk_string,
       0U, // string length
       6, ACE_NTOHL (0x76616c75), ACE_NTOHL (0x65000000),  // name = value
-      CORBA::tk_string, 
+      CORBA::tk_string,
       0U, // string length
 
     0U,
@@ -598,7 +598,7 @@ static const CORBA::Long _oc_ImplementationRepository_StartupOptions[] =
   15, ACE_NTOHL (0x53746172), ACE_NTOHL (0x7475704f), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e730000),  // name = StartupOptions
   4, // member count
   13, ACE_NTOHL (0x636f6d6d), ACE_NTOHL (0x616e645f), ACE_NTOHL (0x6c696e65), ACE_NTOHL (0x0),  // name = command_line
-  CORBA::tk_string, 
+  CORBA::tk_string,
   0U, // string length
   12, ACE_NTOHL (0x656e7669), ACE_NTOHL (0x726f6e6d), ACE_NTOHL (0x656e7400),  // name = environment
   CORBA::tk_alias, // typecode kind for typedefs
@@ -616,17 +616,17 @@ static const CORBA::Long _oc_ImplementationRepository_StartupOptions[] =
         20, ACE_NTOHL (0x456e7669), ACE_NTOHL (0x726f6e6d), ACE_NTOHL (0x656e7456), ACE_NTOHL (0x61726961), ACE_NTOHL (0x626c6500),  // name = EnvironmentVariable
         2, // member count
         5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0),  // name = name
-        CORBA::tk_string, 
+        CORBA::tk_string,
         0U, // string length
         6, ACE_NTOHL (0x76616c75), ACE_NTOHL (0x65000000),  // name = value
-        CORBA::tk_string, 
+        CORBA::tk_string,
         0U, // string length
 
       0U,
 
 
   18, ACE_NTOHL (0x776f726b), ACE_NTOHL (0x696e675f), ACE_NTOHL (0x64697265), ACE_NTOHL (0x63746f72), ACE_NTOHL (0x79000000),  // name = working_directory
-  CORBA::tk_string, 
+  CORBA::tk_string,
   0U, // string length
   11, ACE_NTOHL (0x61637469), ACE_NTOHL (0x76617469), ACE_NTOHL (0x6f6e0000),  // name = activation
   CORBA::tk_enum, // typecode kind
@@ -653,10 +653,10 @@ static const CORBA::Long _oc_ImplementationRepository_ServerInformation[] =
   18, ACE_NTOHL (0x53657276), ACE_NTOHL (0x6572496e), ACE_NTOHL (0x666f726d), ACE_NTOHL (0x6174696f), ACE_NTOHL (0x6e000000),  // name = ServerInformation
   4, // member count
   15, ACE_NTOHL (0x6c6f6769), ACE_NTOHL (0x63616c5f), ACE_NTOHL (0x73657276), ACE_NTOHL (0x65720000),  // name = logical_server
-  CORBA::tk_string, 
+  CORBA::tk_string,
   0U, // string length
   7, ACE_NTOHL (0x73657276), ACE_NTOHL (0x65720000),  // name = server
-  CORBA::tk_string, 
+  CORBA::tk_string,
   0U, // string length
   8, ACE_NTOHL (0x73746172), ACE_NTOHL (0x74757000),  // name = startup
   CORBA::tk_struct, // typecode kind
@@ -666,7 +666,7 @@ static const CORBA::Long _oc_ImplementationRepository_ServerInformation[] =
     15, ACE_NTOHL (0x53746172), ACE_NTOHL (0x7475704f), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e730000),  // name = StartupOptions
     4, // member count
     13, ACE_NTOHL (0x636f6d6d), ACE_NTOHL (0x616e645f), ACE_NTOHL (0x6c696e65), ACE_NTOHL (0x0),  // name = command_line
-    CORBA::tk_string, 
+    CORBA::tk_string,
     0U, // string length
     12, ACE_NTOHL (0x656e7669), ACE_NTOHL (0x726f6e6d), ACE_NTOHL (0x656e7400),  // name = environment
     CORBA::tk_alias, // typecode kind for typedefs
@@ -684,17 +684,17 @@ static const CORBA::Long _oc_ImplementationRepository_ServerInformation[] =
           20, ACE_NTOHL (0x456e7669), ACE_NTOHL (0x726f6e6d), ACE_NTOHL (0x656e7456), ACE_NTOHL (0x61726961), ACE_NTOHL (0x626c6500),  // name = EnvironmentVariable
           2, // member count
           5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0),  // name = name
-          CORBA::tk_string, 
+          CORBA::tk_string,
           0U, // string length
           6, ACE_NTOHL (0x76616c75), ACE_NTOHL (0x65000000),  // name = value
-          CORBA::tk_string, 
+          CORBA::tk_string,
           0U, // string length
 
         0U,
 
 
     18, ACE_NTOHL (0x776f726b), ACE_NTOHL (0x696e675f), ACE_NTOHL (0x64697265), ACE_NTOHL (0x63746f72), ACE_NTOHL (0x79000000),  // name = working_directory
-    CORBA::tk_string, 
+    CORBA::tk_string,
     0U, // string length
     11, ACE_NTOHL (0x61637469), ACE_NTOHL (0x76617469), ACE_NTOHL (0x6f6e0000),  // name = activation
     CORBA::tk_enum, // typecode kind
@@ -715,7 +715,7 @@ static const CORBA::Long _oc_ImplementationRepository_ServerInformation[] =
     TAO_ENCAP_BYTE_ORDER, // byte order
     41, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x496d706c), ACE_NTOHL (0x656d656e), ACE_NTOHL (0x74617469), ACE_NTOHL (0x6f6e5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x2f416464), ACE_NTOHL (0x72657373), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:ImplementationRepository/Address:1.0
     8, ACE_NTOHL (0x41646472), ACE_NTOHL (0x65737300),  // name = Address
-    CORBA::tk_string, 
+    CORBA::tk_string,
     0U, // string length
 
 };
@@ -726,7 +726,7 @@ TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ServerInformation, &_tc_TAO_tc_Im
 TAO_NAMESPACE_END
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
+
 #if !defined (__TAO_UNBOUNDED_SEQUENCE_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST_CS_)
 #define __TAO_UNBOUNDED_SEQUENCE_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST_CS_
 
@@ -735,43 +735,43 @@ TAO_NAMESPACE_END
   {
     ImplementationRepository::ServerInformation* tmp = 0;
     tmp = ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::allocbuf (length);
-    
+
     if (this->buffer_ != 0)
     {
       ImplementationRepository::ServerInformation *old = ACE_reinterpret_cast (ImplementationRepository::ServerInformation *,this->buffer_);
-      
+
       for (CORBA::ULong i = 0; i < this->length_; ++i)
         tmp[i] = old[i];
-      
+
       if (this->release_)
         ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::freebuf (old);
-      
+
     }
     this->buffer_ = tmp;
   }
-  
+
   void
   ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::_deallocate_buffer (void)
   {
     if (this->buffer_ == 0 || this->release_ == 0)
       return;
-    
+
     ImplementationRepository::ServerInformation *tmp = ACE_reinterpret_cast (ImplementationRepository::ServerInformation *,this->buffer_);
-    
+
     ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::freebuf (tmp);
     this->buffer_ = 0;
-  } 
-  
+  }
+
   ImplementationRepository::_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList::~_TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList (void) // Dtor.
   {
     this->_deallocate_buffer ();
   }
-  
-  
+
+
 #endif /* end #if !defined */
 
 
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST_CS_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST_CS_
@@ -783,30 +783,30 @@ TAO_NAMESPACE_END
 ImplementationRepository::ServerInformationList::ServerInformationList (void)
 {}
 ImplementationRepository::ServerInformationList::ServerInformationList (CORBA::ULong max) // uses max size
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Sequence<ImplementationRepository::ServerInformation>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (max)
 {}
 ImplementationRepository::ServerInformationList::ServerInformationList (CORBA::ULong max, CORBA::ULong length, ImplementationRepository::ServerInformation *buffer, CORBA::Boolean release)
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Sequence<ImplementationRepository::ServerInformation>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (max, length, buffer, release)
 {}
 ImplementationRepository::ServerInformationList::ServerInformationList (const ServerInformationList &seq) // copy ctor
-  : 
+  :
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Sequence_ImplementationRepository_ServerInformationList
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
   TAO_Unbounded_Sequence<ImplementationRepository::ServerInformation>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
  (seq)
 {}
 ImplementationRepository::ServerInformationList::~ServerInformationList (void) // dtor
@@ -830,10 +830,10 @@ static const CORBA::Long _oc_ImplementationRepository_ServerInformationList[] =
       18, ACE_NTOHL (0x53657276), ACE_NTOHL (0x6572496e), ACE_NTOHL (0x666f726d), ACE_NTOHL (0x6174696f), ACE_NTOHL (0x6e000000),  // name = ServerInformation
       4, // member count
       15, ACE_NTOHL (0x6c6f6769), ACE_NTOHL (0x63616c5f), ACE_NTOHL (0x73657276), ACE_NTOHL (0x65720000),  // name = logical_server
-      CORBA::tk_string, 
+      CORBA::tk_string,
       0U, // string length
       7, ACE_NTOHL (0x73657276), ACE_NTOHL (0x65720000),  // name = server
-      CORBA::tk_string, 
+      CORBA::tk_string,
       0U, // string length
       8, ACE_NTOHL (0x73746172), ACE_NTOHL (0x74757000),  // name = startup
       CORBA::tk_struct, // typecode kind
@@ -843,7 +843,7 @@ static const CORBA::Long _oc_ImplementationRepository_ServerInformationList[] =
         15, ACE_NTOHL (0x53746172), ACE_NTOHL (0x7475704f), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e730000),  // name = StartupOptions
         4, // member count
         13, ACE_NTOHL (0x636f6d6d), ACE_NTOHL (0x616e645f), ACE_NTOHL (0x6c696e65), ACE_NTOHL (0x0),  // name = command_line
-        CORBA::tk_string, 
+        CORBA::tk_string,
         0U, // string length
         12, ACE_NTOHL (0x656e7669), ACE_NTOHL (0x726f6e6d), ACE_NTOHL (0x656e7400),  // name = environment
         CORBA::tk_alias, // typecode kind for typedefs
@@ -861,17 +861,17 @@ static const CORBA::Long _oc_ImplementationRepository_ServerInformationList[] =
               20, ACE_NTOHL (0x456e7669), ACE_NTOHL (0x726f6e6d), ACE_NTOHL (0x656e7456), ACE_NTOHL (0x61726961), ACE_NTOHL (0x626c6500),  // name = EnvironmentVariable
               2, // member count
               5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0),  // name = name
-              CORBA::tk_string, 
+              CORBA::tk_string,
               0U, // string length
               6, ACE_NTOHL (0x76616c75), ACE_NTOHL (0x65000000),  // name = value
-              CORBA::tk_string, 
+              CORBA::tk_string,
               0U, // string length
 
             0U,
 
 
         18, ACE_NTOHL (0x776f726b), ACE_NTOHL (0x696e675f), ACE_NTOHL (0x64697265), ACE_NTOHL (0x63746f72), ACE_NTOHL (0x79000000),  // name = working_directory
-        CORBA::tk_string, 
+        CORBA::tk_string,
         0U, // string length
         11, ACE_NTOHL (0x61637469), ACE_NTOHL (0x76617469), ACE_NTOHL (0x6f6e0000),  // name = activation
         CORBA::tk_enum, // typecode kind
@@ -892,7 +892,7 @@ static const CORBA::Long _oc_ImplementationRepository_ServerInformationList[] =
         TAO_ENCAP_BYTE_ORDER, // byte order
         41, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x496d706c), ACE_NTOHL (0x656d656e), ACE_NTOHL (0x74617469), ACE_NTOHL (0x6f6e5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x2f416464), ACE_NTOHL (0x72657373), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:ImplementationRepository/Address:1.0
         8, ACE_NTOHL (0x41646472), ACE_NTOHL (0x65737300),  // name = Address
-        CORBA::tk_string, 
+        CORBA::tk_string,
         0U, // string length
 
 
@@ -937,7 +937,7 @@ ImplementationRepository::Administration_ptr ImplementationRepository::Administr
   return TAO_ImplementationRepository_Administration_PROXY_FACTORY_ADAPTER::instance ()->create_proxy (default_proxy);
 }
 
-ImplementationRepository::Administration_ptr 
+ImplementationRepository::Administration_ptr
 ImplementationRepository::Administration::_duplicate (ImplementationRepository::Administration_ptr obj)
 {
   if (!CORBA::is_nil (obj))
@@ -972,7 +972,7 @@ ImplementationRepository::Administration::AlreadyRegistered::operator= (const Im
 }
 
 // narrow
-ImplementationRepository::Administration::AlreadyRegistered_ptr 
+ImplementationRepository::Administration::AlreadyRegistered_ptr
 ImplementationRepository::Administration::AlreadyRegistered::_narrow (CORBA::Exception *exc)
 {
   if (!ACE_OS::strcmp ("IDL:ImplementationRepository/Administration/AlreadyRegistered:1.0", exc->_id ())) // same type
@@ -1034,7 +1034,7 @@ ImplementationRepository::Administration::CannotActivate::operator= (const Imple
 }
 
 // narrow
-ImplementationRepository::Administration::CannotActivate_ptr 
+ImplementationRepository::Administration::CannotActivate_ptr
 ImplementationRepository::Administration::CannotActivate::_narrow (CORBA::Exception *exc)
 {
   if (!ACE_OS::strcmp ("IDL:ImplementationRepository/Administration/CannotActivate:1.0", exc->_id ())) // same type
@@ -1072,7 +1072,7 @@ static const CORBA::Long _oc_ImplementationRepository_Administration_CannotActiv
   15, ACE_NTOHL (0x43616e6e), ACE_NTOHL (0x6f744163), ACE_NTOHL (0x74697661), ACE_NTOHL (0x74650000),  // name = CannotActivate
   1, // member count
   7, ACE_NTOHL (0x72656173), ACE_NTOHL (0x6f6e0000),  // name = reason
-  CORBA::tk_string, 
+  CORBA::tk_string,
   0U, // string length
 };
 static CORBA::TypeCode _tc_TAO_tc_ImplementationRepository_Administration_CannotActivate (CORBA::tk_except, sizeof (_oc_ImplementationRepository_Administration_CannotActivate), (char *) &_oc_ImplementationRepository_Administration_CannotActivate, 0, sizeof (ImplementationRepository::Administration::CannotActivate));
@@ -1105,7 +1105,7 @@ ImplementationRepository::Administration::NotFound::operator= (const Implementat
 }
 
 // narrow
-ImplementationRepository::Administration::NotFound_ptr 
+ImplementationRepository::Administration::NotFound_ptr
 ImplementationRepository::Administration::NotFound::_narrow (CORBA::Exception *exc)
 {
   if (!ACE_OS::strcmp ("IDL:ImplementationRepository/Administration/NotFound:1.0", exc->_id ())) // same type
@@ -1148,21 +1148,21 @@ void ImplementationRepository::Administration::activate_server (
     ImplementationRepository::Administration::CannotActivate
   ))
 {
-  
-  static TAO_Exception_Data _tao_ImplementationRepository_Administration_activate_server_exceptiondata [] = 
+
+  static TAO_Exception_Data _tao_ImplementationRepository_Administration_activate_server_exceptiondata [] =
   {
     {ImplementationRepository::Administration::_tc_NotFound, ImplementationRepository::Administration::NotFound::_alloc},
     {ImplementationRepository::Administration::_tc_CannotActivate, ImplementationRepository::Administration::CannotActivate::_alloc}
   };
 
 
-  
-  
+
+
   TAO_Stub *istub = this->_stubobj ();
   if (istub == 0)
     ACE_THROW (CORBA::INTERNAL ());
 
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "activate_server",
@@ -1222,7 +1222,7 @@ void ImplementationRepository::Administration::activate_server (
         {
           TAO_INTERCEPTOR_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES));
         }
-        
+
         TAO_INTERCEPTOR (
             _tao_vfr.postinvoke (
                 _tao_call.request_id (),
@@ -1237,10 +1237,10 @@ void ImplementationRepository::Administration::activate_server (
           );
         TAO_INTERCEPTOR_CHECK;
         break;
-        
+
       }
 #if defined (TAO_HAS_INTERCEPTORS)
-      
+
     }
   ACE_CATCHANY
     {
@@ -1270,20 +1270,20 @@ void ImplementationRepository::Administration::register_server (
     ImplementationRepository::Administration::AlreadyRegistered
   ))
 {
-  
-  static TAO_Exception_Data _tao_ImplementationRepository_Administration_register_server_exceptiondata [] = 
+
+  static TAO_Exception_Data _tao_ImplementationRepository_Administration_register_server_exceptiondata [] =
   {
     {ImplementationRepository::Administration::_tc_AlreadyRegistered, ImplementationRepository::Administration::AlreadyRegistered::_alloc}
   };
 
 
-  
-  
+
+
   TAO_Stub *istub = this->_stubobj ();
   if (istub == 0)
     ACE_THROW (CORBA::INTERNAL ());
 
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "register_server",
@@ -1344,7 +1344,7 @@ void ImplementationRepository::Administration::register_server (
         {
           TAO_INTERCEPTOR_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES));
         }
-        
+
         TAO_INTERCEPTOR (
             _tao_vfr.postinvoke (
                 _tao_call.request_id (),
@@ -1359,10 +1359,10 @@ void ImplementationRepository::Administration::register_server (
           );
         TAO_INTERCEPTOR_CHECK;
         break;
-        
+
       }
 #if defined (TAO_HAS_INTERCEPTORS)
-      
+
     }
   ACE_CATCHANY
     {
@@ -1391,15 +1391,15 @@ void ImplementationRepository::Administration::reregister_server (
     CORBA::SystemException
   ))
 {
-  
 
-  
-  
+
+
+
   TAO_Stub *istub = this->_stubobj ();
   if (istub == 0)
     ACE_THROW (CORBA::INTERNAL ());
 
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "reregister_server",
@@ -1460,7 +1460,7 @@ void ImplementationRepository::Administration::reregister_server (
         {
           TAO_INTERCEPTOR_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES));
         }
-        
+
         TAO_INTERCEPTOR (
             _tao_vfr.postinvoke (
                 _tao_call.request_id (),
@@ -1475,10 +1475,10 @@ void ImplementationRepository::Administration::reregister_server (
           );
         TAO_INTERCEPTOR_CHECK;
         break;
-        
+
       }
 #if defined (TAO_HAS_INTERCEPTORS)
-      
+
     }
   ACE_CATCHANY
     {
@@ -1507,20 +1507,20 @@ void ImplementationRepository::Administration::remove_server (
     ImplementationRepository::Administration::NotFound
   ))
 {
-  
-  static TAO_Exception_Data _tao_ImplementationRepository_Administration_remove_server_exceptiondata [] = 
+
+  static TAO_Exception_Data _tao_ImplementationRepository_Administration_remove_server_exceptiondata [] =
   {
     {ImplementationRepository::Administration::_tc_NotFound, ImplementationRepository::Administration::NotFound::_alloc}
   };
 
 
-  
-  
+
+
   TAO_Stub *istub = this->_stubobj ();
   if (istub == 0)
     ACE_THROW (CORBA::INTERNAL ());
 
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "remove_server",
@@ -1580,7 +1580,7 @@ void ImplementationRepository::Administration::remove_server (
         {
           TAO_INTERCEPTOR_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES));
         }
-        
+
         TAO_INTERCEPTOR (
             _tao_vfr.postinvoke (
                 _tao_call.request_id (),
@@ -1595,10 +1595,10 @@ void ImplementationRepository::Administration::remove_server (
           );
         TAO_INTERCEPTOR_CHECK;
         break;
-        
+
       }
 #if defined (TAO_HAS_INTERCEPTORS)
-      
+
     }
   ACE_CATCHANY
     {
@@ -1627,20 +1627,20 @@ void ImplementationRepository::Administration::shutdown_server (
     ImplementationRepository::Administration::NotFound
   ))
 {
-  
-  static TAO_Exception_Data _tao_ImplementationRepository_Administration_shutdown_server_exceptiondata [] = 
+
+  static TAO_Exception_Data _tao_ImplementationRepository_Administration_shutdown_server_exceptiondata [] =
   {
     {ImplementationRepository::Administration::_tc_NotFound, ImplementationRepository::Administration::NotFound::_alloc}
   };
 
 
-  
-  
+
+
   TAO_Stub *istub = this->_stubobj ();
   if (istub == 0)
     ACE_THROW (CORBA::INTERNAL ());
 
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "shutdown_server",
@@ -1700,7 +1700,7 @@ void ImplementationRepository::Administration::shutdown_server (
         {
           TAO_INTERCEPTOR_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES));
         }
-        
+
         TAO_INTERCEPTOR (
             _tao_vfr.postinvoke (
                 _tao_call.request_id (),
@@ -1715,10 +1715,10 @@ void ImplementationRepository::Administration::shutdown_server (
           );
         TAO_INTERCEPTOR_CHECK;
         break;
-        
+
       }
 #if defined (TAO_HAS_INTERCEPTORS)
-      
+
     }
   ACE_CATCHANY
     {
@@ -1749,20 +1749,20 @@ char * ImplementationRepository::Administration::server_is_running (
     ImplementationRepository::Administration::NotFound
   ))
 {
-  
-  static TAO_Exception_Data _tao_ImplementationRepository_Administration_server_is_running_exceptiondata [] = 
+
+  static TAO_Exception_Data _tao_ImplementationRepository_Administration_server_is_running_exceptiondata [] =
   {
     {ImplementationRepository::Administration::_tc_NotFound, ImplementationRepository::Administration::NotFound::_alloc}
   };
 
   CORBA::String_var _tao_safe_retval;
-  
-  
+
+
   TAO_Stub *istub = this->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "server_is_running",
@@ -1846,10 +1846,10 @@ char * ImplementationRepository::Administration::server_is_running (
           );
         TAO_INTERCEPTOR_CHECK_RETURN (0);
         break;
-        
+
       }
 #if defined (TAO_HAS_INTERCEPTORS)
-      
+
     }
   ACE_CATCHANY
     {
@@ -1878,20 +1878,20 @@ void ImplementationRepository::Administration::server_is_shutting_down (
     ImplementationRepository::Administration::NotFound
   ))
 {
-  
-  static TAO_Exception_Data _tao_ImplementationRepository_Administration_server_is_shutting_down_exceptiondata [] = 
+
+  static TAO_Exception_Data _tao_ImplementationRepository_Administration_server_is_shutting_down_exceptiondata [] =
   {
     {ImplementationRepository::Administration::_tc_NotFound, ImplementationRepository::Administration::NotFound::_alloc}
   };
 
 
-  
-  
+
+
   TAO_Stub *istub = this->_stubobj ();
   if (istub == 0)
     ACE_THROW (CORBA::INTERNAL ());
 
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "server_is_shutting_down",
@@ -1951,7 +1951,7 @@ void ImplementationRepository::Administration::server_is_shutting_down (
         {
           TAO_INTERCEPTOR_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES));
         }
-        
+
         TAO_INTERCEPTOR (
             _tao_vfr.postinvoke (
                 _tao_call.request_id (),
@@ -1966,10 +1966,10 @@ void ImplementationRepository::Administration::server_is_shutting_down (
           );
         TAO_INTERCEPTOR_CHECK;
         break;
-        
+
       }
 #if defined (TAO_HAS_INTERCEPTORS)
-      
+
     }
   ACE_CATCHANY
     {
@@ -1999,20 +1999,20 @@ void ImplementationRepository::Administration::find (
     ImplementationRepository::Administration::NotFound
   ))
 {
-  
-  static TAO_Exception_Data _tao_ImplementationRepository_Administration_find_exceptiondata [] = 
+
+  static TAO_Exception_Data _tao_ImplementationRepository_Administration_find_exceptiondata [] =
   {
     {ImplementationRepository::Administration::_tc_NotFound, ImplementationRepository::Administration::NotFound::_alloc}
   };
 
 
-  
-  
+
+
   TAO_Stub *istub = this->_stubobj ();
   if (istub == 0)
     ACE_THROW (CORBA::INTERNAL ());
 
-  
+
   ACE_NEW (info.ptr (), ImplementationRepository::ServerInformation);
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
@@ -2060,7 +2060,7 @@ void ImplementationRepository::Administration::find (
 
         TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
         if (!(
-              (_tao_out << server)              
+              (_tao_out << server)
           ))
           TAO_INTERCEPTOR_THROW (CORBA::MARSHAL ());
         int _invoke_status =
@@ -2092,10 +2092,10 @@ void ImplementationRepository::Administration::find (
           );
         TAO_INTERCEPTOR_CHECK;
         break;
-        
+
       }
 #if defined (TAO_HAS_INTERCEPTORS)
-      
+
     }
   ACE_CATCHANY
     {
@@ -2125,15 +2125,15 @@ void ImplementationRepository::Administration::list (
     CORBA::SystemException
   ))
 {
-  
 
-  
-  
+
+
+
   TAO_Stub *istub = this->_stubobj ();
   if (istub == 0)
     ACE_THROW (CORBA::INTERNAL ());
 
-  
+
   ACE_NEW (server_list.ptr (), ImplementationRepository::ServerInformationList);
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
@@ -2181,7 +2181,7 @@ void ImplementationRepository::Administration::list (
 
         TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
         if (!(
-              (_tao_out << how_many)                            
+              (_tao_out << how_many)
           ))
           TAO_INTERCEPTOR_THROW (CORBA::MARSHAL ());
         int _invoke_status =
@@ -2214,10 +2214,10 @@ void ImplementationRepository::Administration::list (
           );
         TAO_INTERCEPTOR_CHECK;
         break;
-        
+
       }
 #if defined (TAO_HAS_INTERCEPTORS)
-      
+
     }
   ACE_CATCHANY
     {
@@ -2311,7 +2311,7 @@ ImplementationRepository::TAO_ImplementationRepository_Administration_Proxy_Fact
   if (this->delete_proxy_factory_ == 0 && this->proxy_factory_ != 0)
     {
       // Its necessary to set <delete_proxy_factory_> to 1 to make sure that it
-      // doesnt get into an infinite loop in <unregister_proxy_factory> as it is 
+      // doesnt get into an infinite loop in <unregister_proxy_factory> as it is
       // invoked in the destructor of the class too.
       this->delete_proxy_factory_ = 1;
       delete this->proxy_factory_;
@@ -2331,10 +2331,10 @@ ImplementationRepository::TAO_ImplementationRepository_Administration_Proxy_Fact
   // Verify that an <proxy_factory_> is available else make one.
   if (this->proxy_factory_ == 0)
     ACE_NEW_RETURN (this->proxy_factory_,
-        TAO_ImplementationRepository_Administration_Default_Proxy_Factory (1), 
+        TAO_ImplementationRepository_Administration_Default_Proxy_Factory (1),
          0);
-      
-    
+
+
   return this->proxy_factory_->create_proxy (proxy);
 }
 
@@ -2555,7 +2555,7 @@ ImplementationRepository::ServerInformationIterator_ptr ImplementationRepository
   return TAO_ImplementationRepository_ServerInformationIterator_PROXY_FACTORY_ADAPTER::instance ()->create_proxy (default_proxy);
 }
 
-ImplementationRepository::ServerInformationIterator_ptr 
+ImplementationRepository::ServerInformationIterator_ptr
 ImplementationRepository::ServerInformationIterator::_duplicate (ImplementationRepository::ServerInformationIterator_ptr obj)
 {
   if (!CORBA::is_nil (obj))
@@ -2572,15 +2572,15 @@ CORBA::Boolean ImplementationRepository::ServerInformationIterator::next_n (
     CORBA::SystemException
   ))
 {
-  
+
   CORBA::Boolean _tao_retval = 0;
-  
-  
+
+
   TAO_Stub *istub = this->_stubobj ();
   if (istub == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
 
-  
+
   ACE_NEW_RETURN (server_list.ptr (), ImplementationRepository::ServerInformationList, _tao_retval);
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
@@ -2628,7 +2628,7 @@ CORBA::Boolean ImplementationRepository::ServerInformationIterator::next_n (
 
         TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
         if (!(
-              (_tao_out << how_many)              
+              (_tao_out << how_many)
           ))
           TAO_INTERCEPTOR_THROW_RETURN (CORBA::MARSHAL (), _tao_retval);
 
@@ -2664,10 +2664,10 @@ CORBA::Boolean ImplementationRepository::ServerInformationIterator::next_n (
           );
         TAO_INTERCEPTOR_CHECK_RETURN  (_tao_retval);
         break;
-        
+
       }
 #if defined (TAO_HAS_INTERCEPTORS)
-      
+
     }
   ACE_CATCHANY
     {
@@ -2694,15 +2694,15 @@ void ImplementationRepository::ServerInformationIterator::destroy (
     CORBA::SystemException
   ))
 {
-  
 
-  
-  
+
+
+
   TAO_Stub *istub = this->_stubobj ();
   if (istub == 0)
     ACE_THROW (CORBA::INTERNAL ());
 
-  
+
   TAO_GIOP_Twoway_Invocation _tao_call (
       istub,
       "destroy",
@@ -2757,7 +2757,7 @@ void ImplementationRepository::ServerInformationIterator::destroy (
         {
           TAO_INTERCEPTOR_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES));
         }
-        
+
         TAO_INTERCEPTOR (
             _tao_vfr.postinvoke (
                 _tao_call.request_id (),
@@ -2772,10 +2772,10 @@ void ImplementationRepository::ServerInformationIterator::destroy (
           );
         TAO_INTERCEPTOR_CHECK;
         break;
-        
+
       }
 #if defined (TAO_HAS_INTERCEPTORS)
-      
+
     }
   ACE_CATCHANY
     {
@@ -2869,7 +2869,7 @@ ImplementationRepository::TAO_ImplementationRepository_ServerInformationIterator
   if (this->delete_proxy_factory_ == 0 && this->proxy_factory_ != 0)
     {
       // Its necessary to set <delete_proxy_factory_> to 1 to make sure that it
-      // doesnt get into an infinite loop in <unregister_proxy_factory> as it is 
+      // doesnt get into an infinite loop in <unregister_proxy_factory> as it is
       // invoked in the destructor of the class too.
       this->delete_proxy_factory_ = 1;
       delete this->proxy_factory_;
@@ -2889,10 +2889,10 @@ ImplementationRepository::TAO_ImplementationRepository_ServerInformationIterator
   // Verify that an <proxy_factory_> is available else make one.
   if (this->proxy_factory_ == 0)
     ACE_NEW_RETURN (this->proxy_factory_,
-        TAO_ImplementationRepository_ServerInformationIterator_Default_Proxy_Factory (1), 
+        TAO_ImplementationRepository_ServerInformationIterator_Default_Proxy_Factory (1),
          0);
-      
-    
+
+
   return this->proxy_factory_->create_proxy (proxy);
 }
 
@@ -2982,7 +2982,8 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, ImplementationRepository
     CORBA::TypeCode_var type = _tao_any.type ();
     if (!type->equivalent (ImplementationRepository::_tc_ServerObject, ACE_TRY_ENV)) return 0; // not equal
     ACE_TRY_CHECK;
-    TAO_InputCDR stream (_tao_any._tao_get_cdr ());
+    TAO_InputCDR stream (_tao_any._tao_get_cdr (),
+                         _tao_any._tao_byte_order ());
     CORBA::Object_var _tao_obj_var;
     ACE_NEW_RETURN (tmp, CORBA::Object_ptr, 0);
     if (stream.decode (ImplementationRepository::_tc_ServerObject, &_tao_obj_var.out (), 0, ACE_TRY_ENV)
@@ -3058,7 +3059,8 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, ImplementationRepository
     else
     {
       ACE_NEW_RETURN (_tao_elem, ImplementationRepository::EnvironmentVariable, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
+      TAO_InputCDR stream (_tao_any._tao_get_cdr (),
+                           _tao_any._tao_byte_order ());
       if (stream.decode (ImplementationRepository::_tc_EnvironmentVariable, _tao_elem, 0, ACE_TRY_ENV)
         == CORBA::TypeCode::TRAVERSE_CONTINUE)
       {
@@ -3075,7 +3077,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, ImplementationRepository
   ACE_CATCHANY
   {
     delete _tao_elem;
-    return 0; 
+    return 0;
   }
   ACE_ENDTRY;
   return 0;
@@ -3092,7 +3094,7 @@ void operator<<= (
   ACE_TRY_NEW_ENV
   {
     _tao_any.replace (ImplementationRepository::_tc_EnvironmentList, _tao_any_val, 1, ACE_TRY_ENV); // copy the value
-    ACE_TRY_CHECK; 
+    ACE_TRY_CHECK;
   }
   ACE_CATCHANY
   {
@@ -3127,7 +3129,8 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, ImplementationRepository
     else
     {
       ACE_NEW_RETURN (_tao_elem, ImplementationRepository::EnvironmentList, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
+      TAO_InputCDR stream (_tao_any._tao_get_cdr (),
+                           _tao_any._tao_byte_order ());
       if (stream.decode (ImplementationRepository::_tc_EnvironmentList, _tao_elem, 0, ACE_TRY_ENV)
         == CORBA::TypeCode::TRAVERSE_CONTINUE)
       {
@@ -3175,7 +3178,8 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, ImplementationRepository
     CORBA::TypeCode_var type = _tao_any.type ();
     if (!type->equivalent (ImplementationRepository::_tc_ActivationMode, ACE_TRY_ENV)) return 0; // not equal
     ACE_TRY_CHECK;
-    TAO_InputCDR stream (_tao_any._tao_get_cdr ());
+    TAO_InputCDR stream (_tao_any._tao_get_cdr (),
+                           _tao_any._tao_byte_order ());
     if (stream.decode (ImplementationRepository::_tc_ActivationMode, &_tao_elem, 0, ACE_TRY_ENV)
       == CORBA::TypeCode::TRAVERSE_CONTINUE)
       return 1;
@@ -3232,7 +3236,8 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, ImplementationRepository
     else
     {
       ACE_NEW_RETURN (_tao_elem, ImplementationRepository::StartupOptions, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
+      TAO_InputCDR stream (_tao_any._tao_get_cdr (),
+                           _tao_any._tao_byte_order ());
       if (stream.decode (ImplementationRepository::_tc_StartupOptions, _tao_elem, 0, ACE_TRY_ENV)
         == CORBA::TypeCode::TRAVERSE_CONTINUE)
       {
@@ -3249,7 +3254,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, ImplementationRepository
   ACE_CATCHANY
   {
     delete _tao_elem;
-    return 0; 
+    return 0;
   }
   ACE_ENDTRY;
   return 0;
@@ -3298,7 +3303,8 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, ImplementationRepository
     else
     {
       ACE_NEW_RETURN (_tao_elem, ImplementationRepository::ServerInformation, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
+      TAO_InputCDR stream (_tao_any._tao_get_cdr (),
+                           _tao_any._tao_byte_order ());
       if (stream.decode (ImplementationRepository::_tc_ServerInformation, _tao_elem, 0, ACE_TRY_ENV)
         == CORBA::TypeCode::TRAVERSE_CONTINUE)
       {
@@ -3315,7 +3321,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, ImplementationRepository
   ACE_CATCHANY
   {
     delete _tao_elem;
-    return 0; 
+    return 0;
   }
   ACE_ENDTRY;
   return 0;
@@ -3332,7 +3338,7 @@ void operator<<= (
   ACE_TRY_NEW_ENV
   {
     _tao_any.replace (ImplementationRepository::_tc_ServerInformationList, _tao_any_val, 1, ACE_TRY_ENV); // copy the value
-    ACE_TRY_CHECK; 
+    ACE_TRY_CHECK;
   }
   ACE_CATCHANY
   {
@@ -3367,7 +3373,8 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, ImplementationRepository
     else
     {
       ACE_NEW_RETURN (_tao_elem, ImplementationRepository::ServerInformationList, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
+      TAO_InputCDR stream (_tao_any._tao_get_cdr (),
+                           _tao_any._tao_byte_order ());
       if (stream.decode (ImplementationRepository::_tc_ServerInformationList, _tao_elem, 0, ACE_TRY_ENV)
         == CORBA::TypeCode::TRAVERSE_CONTINUE)
       {
@@ -3419,7 +3426,8 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, ImplementationRepository
     CORBA::TypeCode_var type = _tao_any.type ();
     if (!type->equivalent (ImplementationRepository::_tc_Administration, ACE_TRY_ENV)) return 0; // not equal
     ACE_TRY_CHECK;
-    TAO_InputCDR stream (_tao_any._tao_get_cdr ());
+    TAO_InputCDR stream (_tao_any._tao_get_cdr (),
+                           _tao_any._tao_byte_order ());
     CORBA::Object_var _tao_obj_var;
     ACE_NEW_RETURN (tmp, CORBA::Object_ptr, 0);
     if (stream.decode (ImplementationRepository::_tc_Administration, &_tao_obj_var.out (), 0, ACE_TRY_ENV)
@@ -3461,7 +3469,7 @@ void operator<<= (CORBA::Any &_tao_any, const ImplementationRepository::Administ
     _tao_any.replace (ImplementationRepository::Administration::_tc_AlreadyRegistered, _tao_any_val, 1, ACE_TRY_ENV);
     ACE_TRY_CHECK;
   }
-  ACE_CATCHANY 
+  ACE_CATCHANY
   {
     delete _tao_any_val;
   }
@@ -3494,7 +3502,8 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, ImplementationRepository
     else
     {
       ACE_NEW_RETURN (_tao_elem, ImplementationRepository::Administration::AlreadyRegistered, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
+      TAO_InputCDR stream (_tao_any._tao_get_cdr (),
+                           _tao_any._tao_byte_order ());
       if (stream.decode (ImplementationRepository::Administration::_tc_AlreadyRegistered, _tao_elem, 0, ACE_TRY_ENV)
         == CORBA::TypeCode::TRAVERSE_CONTINUE)
       {
@@ -3526,7 +3535,7 @@ void operator<<= (CORBA::Any &_tao_any, const ImplementationRepository::Administ
     _tao_any.replace (ImplementationRepository::Administration::_tc_CannotActivate, _tao_any_val, 1, ACE_TRY_ENV);
     ACE_TRY_CHECK;
   }
-  ACE_CATCHANY 
+  ACE_CATCHANY
   {
     delete _tao_any_val;
   }
@@ -3559,7 +3568,8 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, ImplementationRepository
     else
     {
       ACE_NEW_RETURN (_tao_elem, ImplementationRepository::Administration::CannotActivate, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
+      TAO_InputCDR stream (_tao_any._tao_get_cdr (),
+                           _tao_any._tao_byte_order ());
       if (stream.decode (ImplementationRepository::Administration::_tc_CannotActivate, _tao_elem, 0, ACE_TRY_ENV)
         == CORBA::TypeCode::TRAVERSE_CONTINUE)
       {
@@ -3591,7 +3601,7 @@ void operator<<= (CORBA::Any &_tao_any, const ImplementationRepository::Administ
     _tao_any.replace (ImplementationRepository::Administration::_tc_NotFound, _tao_any_val, 1, ACE_TRY_ENV);
     ACE_TRY_CHECK;
   }
-  ACE_CATCHANY 
+  ACE_CATCHANY
   {
     delete _tao_any_val;
   }
@@ -3624,7 +3634,8 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, ImplementationRepository
     else
     {
       ACE_NEW_RETURN (_tao_elem, ImplementationRepository::Administration::NotFound, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
+      TAO_InputCDR stream (_tao_any._tao_get_cdr (),
+                           _tao_any._tao_byte_order ());
       if (stream.decode (ImplementationRepository::Administration::_tc_NotFound, _tao_elem, 0, ACE_TRY_ENV)
         == CORBA::TypeCode::TRAVERSE_CONTINUE)
       {
@@ -3676,7 +3687,8 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, ImplementationRepository
     CORBA::TypeCode_var type = _tao_any.type ();
     if (!type->equivalent (ImplementationRepository::_tc_ServerInformationIterator, ACE_TRY_ENV)) return 0; // not equal
     ACE_TRY_CHECK;
-    TAO_InputCDR stream (_tao_any._tao_get_cdr ());
+    TAO_InputCDR stream (_tao_any._tao_get_cdr (),
+                           _tao_any._tao_byte_order ());
     CORBA::Object_var _tao_obj_var;
     ACE_NEW_RETURN (tmp, CORBA::Object_ptr, 0);
     if (stream.decode (ImplementationRepository::_tc_ServerInformationIterator, &_tao_obj_var.out (), 0, ACE_TRY_ENV)
@@ -3786,4 +3798,3 @@ CORBA::Boolean operator>> (
   }
   return 0; // error
 }
-
diff --git a/TAO/tao/InterceptorC.cpp b/TAO/tao/InterceptorC.cpp
index b94c259ca11..c10168780fc 100644
--- a/TAO/tao/InterceptorC.cpp
+++ b/TAO/tao/InterceptorC.cpp
@@ -462,7 +462,8 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableInterceptor::Coo
     CORBA::TypeCode_var type = _tao_any.type ();
     if (!type->equal (PortableInterceptor::_tc_Cookie, ACE_TRY_ENV)) return 0; // not equal
     ACE_TRY_CHECK;
-    TAO_InputCDR stream (_tao_any._tao_get_cdr ());
+    TAO_InputCDR stream (_tao_any._tao_get_cdr (),
+                           _tao_any._tao_byte_order ());
     CORBA::Object_var _tao_obj_var;
     ACE_NEW_RETURN (tmp, CORBA::Object_ptr, 0);
     if (stream.decode (PortableInterceptor::_tc_Cookie, &_tao_obj_var.out (), 0, ACE_TRY_ENV)
@@ -540,7 +541,8 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableInterceptor::Coo
     else
     {
       ACE_NEW_RETURN (_tao_elem, PortableInterceptor::Cookies, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
+      TAO_InputCDR stream (_tao_any._tao_get_cdr (),
+                           _tao_any._tao_byte_order ());
       if (stream.decode (PortableInterceptor::_tc_Cookies, _tao_elem, 0, ACE_TRY_ENV)
         == CORBA::TypeCode::TRAVERSE_CONTINUE)
       {
@@ -589,7 +591,8 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableInterceptor::Int
     CORBA::TypeCode_var type = _tao_any.type ();
     if (!type->equal (PortableInterceptor::_tc_Interceptor, ACE_TRY_ENV)) return 0; // not equal
     ACE_TRY_CHECK;
-    TAO_InputCDR stream (_tao_any._tao_get_cdr ());
+    TAO_InputCDR stream (_tao_any._tao_get_cdr (),
+                           _tao_any._tao_byte_order ());
     CORBA::Object_var _tao_obj_var;
     ACE_NEW_RETURN (tmp, CORBA::Object_ptr, 0);
     if (stream.decode (PortableInterceptor::_tc_Interceptor, &_tao_obj_var.out (), 0, ACE_TRY_ENV)
@@ -647,7 +650,8 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableInterceptor::Ser
     CORBA::TypeCode_var type = _tao_any.type ();
     if (!type->equal (PortableInterceptor::_tc_ServerRequestInterceptor, ACE_TRY_ENV)) return 0; // not equal
     ACE_TRY_CHECK;
-    TAO_InputCDR stream (_tao_any._tao_get_cdr ());
+    TAO_InputCDR stream (_tao_any._tao_get_cdr (),
+                           _tao_any._tao_byte_order ());
     CORBA::Object_var _tao_obj_var;
     ACE_NEW_RETURN (tmp, CORBA::Object_ptr, 0);
     if (stream.decode (PortableInterceptor::_tc_ServerRequestInterceptor, &_tao_obj_var.out (), 0, ACE_TRY_ENV)
@@ -705,7 +709,8 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableInterceptor::Cli
     CORBA::TypeCode_var type = _tao_any.type ();
     if (!type->equal (PortableInterceptor::_tc_ClientRequestInterceptor, ACE_TRY_ENV)) return 0; // not equal
     ACE_TRY_CHECK;
-    TAO_InputCDR stream (_tao_any._tao_get_cdr ());
+    TAO_InputCDR stream (_tao_any._tao_get_cdr (),
+                           _tao_any._tao_byte_order ());
     CORBA::Object_var _tao_obj_var;
     ACE_NEW_RETURN (tmp, CORBA::Object_ptr, 0);
     if (stream.decode (PortableInterceptor::_tc_ClientRequestInterceptor, &_tao_obj_var.out (), 0, ACE_TRY_ENV)
diff --git a/TAO/tao/InterfaceC.cpp b/TAO/tao/InterfaceC.cpp
index d415f783852..1849ed31dae 100644
--- a/TAO/tao/InterfaceC.cpp
+++ b/TAO/tao/InterfaceC.cpp
@@ -13693,7 +13693,8 @@ CORBA::Boolean operator>>= (const CORBA_Any &_tao_any, CORBA::DefinitionKind &_t
     CORBA::TypeCode_var type = _tao_any.type ();
     if (!type->equal (CORBA::_tc_DefinitionKind, ACE_TRY_ENV)) return 0; // not equal
     ACE_TRY_CHECK;
-    TAO_InputCDR stream (_tao_any._tao_get_cdr ());
+    TAO_InputCDR stream (_tao_any._tao_get_cdr (),
+                         _tao_any._tao_byte_order ());
     if (stream.decode (CORBA::_tc_DefinitionKind, &_tao_elem, 0, ACE_TRY_ENV)
       == CORBA::TypeCode::TRAVERSE_CONTINUE)
       return 1;
@@ -13736,7 +13737,8 @@ CORBA::Boolean operator>>= (const CORBA_Any &_tao_any, CORBA_IRObject_ptr &_tao_
     CORBA::TypeCode_var type = _tao_any.type ();
     if (!type->equal (CORBA::_tc_IRObject, ACE_TRY_ENV)) return 0; // not equal
     ACE_TRY_CHECK;
-    TAO_InputCDR stream (_tao_any._tao_get_cdr ());
+    TAO_InputCDR stream (_tao_any._tao_get_cdr (),
+                         _tao_any._tao_byte_order ());
     CORBA_Object_var _tao_obj_var;
     ACE_NEW_RETURN (tmp, CORBA_Object_ptr, 0);
     if (stream.decode (CORBA::_tc_IRObject, &_tao_obj_var.out (), 0, ACE_TRY_ENV)
@@ -13797,7 +13799,8 @@ CORBA::Boolean operator>>= (const CORBA_Any &_tao_any, CORBA_Contained_ptr &_tao
     CORBA::TypeCode_var type = _tao_any.type ();
     if (!type->equal (CORBA::_tc_Contained, ACE_TRY_ENV)) return 0; // not equal
     ACE_TRY_CHECK;
-    TAO_InputCDR stream (_tao_any._tao_get_cdr ());
+    TAO_InputCDR stream (_tao_any._tao_get_cdr (),
+                         _tao_any._tao_byte_order ());
     CORBA_Object_var _tao_obj_var;
     ACE_NEW_RETURN (tmp, CORBA_Object_ptr, 0);
     if (stream.decode (CORBA::_tc_Contained, &_tao_obj_var.out (), 0, ACE_TRY_ENV)
@@ -13872,7 +13875,8 @@ CORBA::Boolean operator>>= (const CORBA_Any &_tao_any, CORBA_Contained::Descript
     else
     {
       ACE_NEW_RETURN (_tao_elem, CORBA_Contained::Description, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
+      TAO_InputCDR stream (_tao_any._tao_get_cdr (),
+                           _tao_any._tao_byte_order ());
       if (stream.decode (CORBA_Contained::_tc_Description, _tao_elem, 0, ACE_TRY_ENV)
         == CORBA::TypeCode::TRAVERSE_CONTINUE)
       {
@@ -13941,7 +13945,8 @@ CORBA::Boolean operator>>= (const CORBA_Any &_tao_any, CORBA_InterfaceDefSeq *&_
     else
     {
       ACE_NEW_RETURN (_tao_elem, CORBA_InterfaceDefSeq, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
+      TAO_InputCDR stream (_tao_any._tao_get_cdr (),
+                           _tao_any._tao_byte_order ());
       if (stream.decode (CORBA::_tc_InterfaceDefSeq, _tao_elem, 0, ACE_TRY_ENV)
         == CORBA::TypeCode::TRAVERSE_CONTINUE)
       {
@@ -14010,7 +14015,8 @@ CORBA::Boolean operator>>= (const CORBA_Any &_tao_any, CORBA_ValueDefSeq *&_tao_
     else
     {
       ACE_NEW_RETURN (_tao_elem, CORBA_ValueDefSeq, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
+      TAO_InputCDR stream (_tao_any._tao_get_cdr (),
+                           _tao_any._tao_byte_order ());
       if (stream.decode (CORBA::_tc_ValueDefSeq, _tao_elem, 0, ACE_TRY_ENV)
         == CORBA::TypeCode::TRAVERSE_CONTINUE)
       {
@@ -14079,7 +14085,8 @@ CORBA::Boolean operator>>= (const CORBA_Any &_tao_any, CORBA_ContainedSeq *&_tao
     else
     {
       ACE_NEW_RETURN (_tao_elem, CORBA_ContainedSeq, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
+      TAO_InputCDR stream (_tao_any._tao_get_cdr (),
+                           _tao_any._tao_byte_order ());
       if (stream.decode (CORBA::_tc_ContainedSeq, _tao_elem, 0, ACE_TRY_ENV)
         == CORBA::TypeCode::TRAVERSE_CONTINUE)
       {
@@ -14145,7 +14152,8 @@ CORBA::Boolean operator>>= (const CORBA_Any &_tao_any, CORBA_StructMember *&_tao
     else
     {
       ACE_NEW_RETURN (_tao_elem, CORBA_StructMember, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
+      TAO_InputCDR stream (_tao_any._tao_get_cdr (),
+                           _tao_any._tao_byte_order ());
       if (stream.decode (CORBA::_tc_StructMember, _tao_elem, 0, ACE_TRY_ENV)
         == CORBA::TypeCode::TRAVERSE_CONTINUE)
       {
@@ -14214,7 +14222,8 @@ CORBA::Boolean operator>>= (const CORBA_Any &_tao_any, CORBA_StructMemberSeq *&_
     else
     {
       ACE_NEW_RETURN (_tao_elem, CORBA_StructMemberSeq, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
+      TAO_InputCDR stream (_tao_any._tao_get_cdr (),
+                           _tao_any._tao_byte_order ());
       if (stream.decode (CORBA::_tc_StructMemberSeq, _tao_elem, 0, ACE_TRY_ENV)
         == CORBA::TypeCode::TRAVERSE_CONTINUE)
       {
@@ -14280,7 +14289,8 @@ CORBA::Boolean operator>>= (const CORBA_Any &_tao_any, CORBA_Initializer *&_tao_
     else
     {
       ACE_NEW_RETURN (_tao_elem, CORBA_Initializer, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
+      TAO_InputCDR stream (_tao_any._tao_get_cdr (),
+                           _tao_any._tao_byte_order ());
       if (stream.decode (CORBA::_tc_Initializer, _tao_elem, 0, ACE_TRY_ENV)
         == CORBA::TypeCode::TRAVERSE_CONTINUE)
       {
@@ -14349,7 +14359,8 @@ CORBA::Boolean operator>>= (const CORBA_Any &_tao_any, CORBA_InitializerSeq *&_t
     else
     {
       ACE_NEW_RETURN (_tao_elem, CORBA_InitializerSeq, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
+      TAO_InputCDR stream (_tao_any._tao_get_cdr (),
+                           _tao_any._tao_byte_order ());
       if (stream.decode (CORBA::_tc_InitializerSeq, _tao_elem, 0, ACE_TRY_ENV)
         == CORBA::TypeCode::TRAVERSE_CONTINUE)
       {
@@ -14415,7 +14426,8 @@ CORBA::Boolean operator>>= (const CORBA_Any &_tao_any, CORBA_UnionMember *&_tao_
     else
     {
       ACE_NEW_RETURN (_tao_elem, CORBA_UnionMember, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
+      TAO_InputCDR stream (_tao_any._tao_get_cdr (),
+                           _tao_any._tao_byte_order ());
       if (stream.decode (CORBA::_tc_UnionMember, _tao_elem, 0, ACE_TRY_ENV)
         == CORBA::TypeCode::TRAVERSE_CONTINUE)
       {
@@ -14484,7 +14496,8 @@ CORBA::Boolean operator>>= (const CORBA_Any &_tao_any, CORBA_UnionMemberSeq *&_t
     else
     {
       ACE_NEW_RETURN (_tao_elem, CORBA_UnionMemberSeq, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
+      TAO_InputCDR stream (_tao_any._tao_get_cdr (),
+                           _tao_any._tao_byte_order ());
       if (stream.decode (CORBA::_tc_UnionMemberSeq, _tao_elem, 0, ACE_TRY_ENV)
         == CORBA::TypeCode::TRAVERSE_CONTINUE)
       {
@@ -14553,7 +14566,8 @@ CORBA::Boolean operator>>= (const CORBA_Any &_tao_any, CORBA_EnumMemberSeq *&_ta
     else
     {
       ACE_NEW_RETURN (_tao_elem, CORBA_EnumMemberSeq, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
+      TAO_InputCDR stream (_tao_any._tao_get_cdr (),
+                           _tao_any._tao_byte_order ());
       if (stream.decode (CORBA::_tc_EnumMemberSeq, _tao_elem, 0, ACE_TRY_ENV)
         == CORBA::TypeCode::TRAVERSE_CONTINUE)
       {
@@ -14605,7 +14619,8 @@ CORBA::Boolean operator>>= (const CORBA_Any &_tao_any, CORBA_Container_ptr &_tao
     CORBA::TypeCode_var type = _tao_any.type ();
     if (!type->equal (CORBA::_tc_Container, ACE_TRY_ENV)) return 0; // not equal
     ACE_TRY_CHECK;
-    TAO_InputCDR stream (_tao_any._tao_get_cdr ());
+    TAO_InputCDR stream (_tao_any._tao_get_cdr (),
+                         _tao_any._tao_byte_order ());
     CORBA_Object_var _tao_obj_var;
     ACE_NEW_RETURN (tmp, CORBA_Object_ptr, 0);
     if (stream.decode (CORBA::_tc_Container, &_tao_obj_var.out (), 0, ACE_TRY_ENV)
@@ -14680,7 +14695,8 @@ CORBA::Boolean operator>>= (const CORBA_Any &_tao_any, CORBA_Container::Descript
     else
     {
       ACE_NEW_RETURN (_tao_elem, CORBA_Container::Description, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
+      TAO_InputCDR stream (_tao_any._tao_get_cdr (),
+                           _tao_any._tao_byte_order ());
       if (stream.decode (CORBA_Container::_tc_Description, _tao_elem, 0, ACE_TRY_ENV)
         == CORBA::TypeCode::TRAVERSE_CONTINUE)
       {
@@ -14749,7 +14765,8 @@ CORBA::Boolean operator>>= (const CORBA_Any &_tao_any, CORBA_Container::Descript
     else
     {
       ACE_NEW_RETURN (_tao_elem, CORBA_Container::DescriptionSeq, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
+      TAO_InputCDR stream (_tao_any._tao_get_cdr (),
+                           _tao_any._tao_byte_order ());
       if (stream.decode (CORBA_Container::_tc_DescriptionSeq, _tao_elem, 0, ACE_TRY_ENV)
         == CORBA::TypeCode::TRAVERSE_CONTINUE)
       {
@@ -14801,7 +14818,8 @@ CORBA::Boolean operator>>= (const CORBA_Any &_tao_any, CORBA_IDLType_ptr &_tao_e
     CORBA::TypeCode_var type = _tao_any.type ();
     if (!type->equal (CORBA::_tc_IDLType, ACE_TRY_ENV)) return 0; // not equal
     ACE_TRY_CHECK;
-    TAO_InputCDR stream (_tao_any._tao_get_cdr ());
+    TAO_InputCDR stream (_tao_any._tao_get_cdr (),
+                         _tao_any._tao_byte_order ());
     CORBA_Object_var _tao_obj_var;
     ACE_NEW_RETURN (tmp, CORBA_Object_ptr, 0);
     if (stream.decode (CORBA::_tc_IDLType, &_tao_obj_var.out (), 0, ACE_TRY_ENV)
@@ -14858,7 +14876,8 @@ CORBA::Boolean operator>>= (const CORBA_Any &_tao_any, CORBA::PrimitiveKind &_ta
     CORBA::TypeCode_var type = _tao_any.type ();
     if (!type->equal (CORBA::_tc_PrimitiveKind, ACE_TRY_ENV)) return 0; // not equal
     ACE_TRY_CHECK;
-    TAO_InputCDR stream (_tao_any._tao_get_cdr ());
+    TAO_InputCDR stream (_tao_any._tao_get_cdr (),
+                         _tao_any._tao_byte_order ());
     if (stream.decode (CORBA::_tc_PrimitiveKind, &_tao_elem, 0, ACE_TRY_ENV)
       == CORBA::TypeCode::TRAVERSE_CONTINUE)
       return 1;
@@ -14901,7 +14920,8 @@ CORBA::Boolean operator>>= (const CORBA_Any &_tao_any, CORBA_Repository_ptr &_ta
     CORBA::TypeCode_var type = _tao_any.type ();
     if (!type->equal (CORBA::_tc_Repository, ACE_TRY_ENV)) return 0; // not equal
     ACE_TRY_CHECK;
-    TAO_InputCDR stream (_tao_any._tao_get_cdr ());
+    TAO_InputCDR stream (_tao_any._tao_get_cdr (),
+                         _tao_any._tao_byte_order ());
     CORBA_Object_var _tao_obj_var;
     ACE_NEW_RETURN (tmp, CORBA_Object_ptr, 0);
     if (stream.decode (CORBA::_tc_Repository, &_tao_obj_var.out (), 0, ACE_TRY_ENV)
@@ -14962,7 +14982,8 @@ CORBA::Boolean operator>>= (const CORBA_Any &_tao_any, CORBA_ModuleDef_ptr &_tao
     CORBA::TypeCode_var type = _tao_any.type ();
     if (!type->equal (CORBA::_tc_ModuleDef, ACE_TRY_ENV)) return 0; // not equal
     ACE_TRY_CHECK;
-    TAO_InputCDR stream (_tao_any._tao_get_cdr ());
+    TAO_InputCDR stream (_tao_any._tao_get_cdr (),
+                         _tao_any._tao_byte_order ());
     CORBA_Object_var _tao_obj_var;
     ACE_NEW_RETURN (tmp, CORBA_Object_ptr, 0);
     if (stream.decode (CORBA::_tc_ModuleDef, &_tao_obj_var.out (), 0, ACE_TRY_ENV)
@@ -15037,7 +15058,8 @@ CORBA::Boolean operator>>= (const CORBA_Any &_tao_any, CORBA_ModuleDescription *
     else
     {
       ACE_NEW_RETURN (_tao_elem, CORBA_ModuleDescription, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
+      TAO_InputCDR stream (_tao_any._tao_get_cdr (),
+                           _tao_any._tao_byte_order ());
       if (stream.decode (CORBA::_tc_ModuleDescription, _tao_elem, 0, ACE_TRY_ENV)
         == CORBA::TypeCode::TRAVERSE_CONTINUE)
       {
@@ -15089,7 +15111,8 @@ CORBA::Boolean operator>>= (const CORBA_Any &_tao_any, CORBA_ConstantDef_ptr &_t
     CORBA::TypeCode_var type = _tao_any.type ();
     if (!type->equal (CORBA::_tc_ConstantDef, ACE_TRY_ENV)) return 0; // not equal
     ACE_TRY_CHECK;
-    TAO_InputCDR stream (_tao_any._tao_get_cdr ());
+    TAO_InputCDR stream (_tao_any._tao_get_cdr (),
+                         _tao_any._tao_byte_order ());
     CORBA_Object_var _tao_obj_var;
     ACE_NEW_RETURN (tmp, CORBA_Object_ptr, 0);
     if (stream.decode (CORBA::_tc_ConstantDef, &_tao_obj_var.out (), 0, ACE_TRY_ENV)
@@ -15164,7 +15187,8 @@ CORBA::Boolean operator>>= (const CORBA_Any &_tao_any, CORBA_ConstantDescription
     else
     {
       ACE_NEW_RETURN (_tao_elem, CORBA_ConstantDescription, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
+      TAO_InputCDR stream (_tao_any._tao_get_cdr (),
+                           _tao_any._tao_byte_order ());
       if (stream.decode (CORBA::_tc_ConstantDescription, _tao_elem, 0, ACE_TRY_ENV)
         == CORBA::TypeCode::TRAVERSE_CONTINUE)
       {
@@ -15216,7 +15240,8 @@ CORBA::Boolean operator>>= (const CORBA_Any &_tao_any, CORBA_TypedefDef_ptr &_ta
     CORBA::TypeCode_var type = _tao_any.type ();
     if (!type->equal (CORBA::_tc_TypedefDef, ACE_TRY_ENV)) return 0; // not equal
     ACE_TRY_CHECK;
-    TAO_InputCDR stream (_tao_any._tao_get_cdr ());
+    TAO_InputCDR stream (_tao_any._tao_get_cdr (),
+                         _tao_any._tao_byte_order ());
     CORBA_Object_var _tao_obj_var;
     ACE_NEW_RETURN (tmp, CORBA_Object_ptr, 0);
     if (stream.decode (CORBA::_tc_TypedefDef, &_tao_obj_var.out (), 0, ACE_TRY_ENV)
@@ -15291,7 +15316,8 @@ CORBA::Boolean operator>>= (const CORBA_Any &_tao_any, CORBA_TypeDescription *&_
     else
     {
       ACE_NEW_RETURN (_tao_elem, CORBA_TypeDescription, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
+      TAO_InputCDR stream (_tao_any._tao_get_cdr (),
+                           _tao_any._tao_byte_order ());
       if (stream.decode (CORBA::_tc_TypeDescription, _tao_elem, 0, ACE_TRY_ENV)
         == CORBA::TypeCode::TRAVERSE_CONTINUE)
       {
@@ -15343,7 +15369,8 @@ CORBA::Boolean operator>>= (const CORBA_Any &_tao_any, CORBA_StructDef_ptr &_tao
     CORBA::TypeCode_var type = _tao_any.type ();
     if (!type->equal (CORBA::_tc_StructDef, ACE_TRY_ENV)) return 0; // not equal
     ACE_TRY_CHECK;
-    TAO_InputCDR stream (_tao_any._tao_get_cdr ());
+    TAO_InputCDR stream (_tao_any._tao_get_cdr (),
+                         _tao_any._tao_byte_order ());
     CORBA_Object_var _tao_obj_var;
     ACE_NEW_RETURN (tmp, CORBA_Object_ptr, 0);
     if (stream.decode (CORBA::_tc_StructDef, &_tao_obj_var.out (), 0, ACE_TRY_ENV)
@@ -15404,7 +15431,8 @@ CORBA::Boolean operator>>= (const CORBA_Any &_tao_any, CORBA_UnionDef_ptr &_tao_
     CORBA::TypeCode_var type = _tao_any.type ();
     if (!type->equal (CORBA::_tc_UnionDef, ACE_TRY_ENV)) return 0; // not equal
     ACE_TRY_CHECK;
-    TAO_InputCDR stream (_tao_any._tao_get_cdr ());
+    TAO_InputCDR stream (_tao_any._tao_get_cdr (),
+                         _tao_any._tao_byte_order ());
     CORBA_Object_var _tao_obj_var;
     ACE_NEW_RETURN (tmp, CORBA_Object_ptr, 0);
     if (stream.decode (CORBA::_tc_UnionDef, &_tao_obj_var.out (), 0, ACE_TRY_ENV)
@@ -15465,7 +15493,8 @@ CORBA::Boolean operator>>= (const CORBA_Any &_tao_any, CORBA_EnumDef_ptr &_tao_e
     CORBA::TypeCode_var type = _tao_any.type ();
     if (!type->equal (CORBA::_tc_EnumDef, ACE_TRY_ENV)) return 0; // not equal
     ACE_TRY_CHECK;
-    TAO_InputCDR stream (_tao_any._tao_get_cdr ());
+    TAO_InputCDR stream (_tao_any._tao_get_cdr (),
+                         _tao_any._tao_byte_order ());
     CORBA_Object_var _tao_obj_var;
     ACE_NEW_RETURN (tmp, CORBA_Object_ptr, 0);
     if (stream.decode (CORBA::_tc_EnumDef, &_tao_obj_var.out (), 0, ACE_TRY_ENV)
@@ -15526,7 +15555,8 @@ CORBA::Boolean operator>>= (const CORBA_Any &_tao_any, CORBA_AliasDef_ptr &_tao_
     CORBA::TypeCode_var type = _tao_any.type ();
     if (!type->equal (CORBA::_tc_AliasDef, ACE_TRY_ENV)) return 0; // not equal
     ACE_TRY_CHECK;
-    TAO_InputCDR stream (_tao_any._tao_get_cdr ());
+    TAO_InputCDR stream (_tao_any._tao_get_cdr (),
+                         _tao_any._tao_byte_order ());
     CORBA_Object_var _tao_obj_var;
     ACE_NEW_RETURN (tmp, CORBA_Object_ptr, 0);
     if (stream.decode (CORBA::_tc_AliasDef, &_tao_obj_var.out (), 0, ACE_TRY_ENV)
@@ -15587,7 +15617,8 @@ CORBA::Boolean operator>>= (const CORBA_Any &_tao_any, CORBA_PrimitiveDef_ptr &_
     CORBA::TypeCode_var type = _tao_any.type ();
     if (!type->equal (CORBA::_tc_PrimitiveDef, ACE_TRY_ENV)) return 0; // not equal
     ACE_TRY_CHECK;
-    TAO_InputCDR stream (_tao_any._tao_get_cdr ());
+    TAO_InputCDR stream (_tao_any._tao_get_cdr (),
+                         _tao_any._tao_byte_order ());
     CORBA_Object_var _tao_obj_var;
     ACE_NEW_RETURN (tmp, CORBA_Object_ptr, 0);
     if (stream.decode (CORBA::_tc_PrimitiveDef, &_tao_obj_var.out (), 0, ACE_TRY_ENV)
@@ -15648,7 +15679,8 @@ CORBA::Boolean operator>>= (const CORBA_Any &_tao_any, CORBA_StringDef_ptr &_tao
     CORBA::TypeCode_var type = _tao_any.type ();
     if (!type->equal (CORBA::_tc_StringDef, ACE_TRY_ENV)) return 0; // not equal
     ACE_TRY_CHECK;
-    TAO_InputCDR stream (_tao_any._tao_get_cdr ());
+    TAO_InputCDR stream (_tao_any._tao_get_cdr (),
+                         _tao_any._tao_byte_order ());
     CORBA_Object_var _tao_obj_var;
     ACE_NEW_RETURN (tmp, CORBA_Object_ptr, 0);
     if (stream.decode (CORBA::_tc_StringDef, &_tao_obj_var.out (), 0, ACE_TRY_ENV)
@@ -15709,7 +15741,8 @@ CORBA::Boolean operator>>= (const CORBA_Any &_tao_any, CORBA_WstringDef_ptr &_ta
     CORBA::TypeCode_var type = _tao_any.type ();
     if (!type->equal (CORBA::_tc_WstringDef, ACE_TRY_ENV)) return 0; // not equal
     ACE_TRY_CHECK;
-    TAO_InputCDR stream (_tao_any._tao_get_cdr ());
+    TAO_InputCDR stream (_tao_any._tao_get_cdr (),
+                         _tao_any._tao_byte_order ());
     CORBA_Object_var _tao_obj_var;
     ACE_NEW_RETURN (tmp, CORBA_Object_ptr, 0);
     if (stream.decode (CORBA::_tc_WstringDef, &_tao_obj_var.out (), 0, ACE_TRY_ENV)
@@ -15770,7 +15803,8 @@ CORBA::Boolean operator>>= (const CORBA_Any &_tao_any, CORBA_FixedDef_ptr &_tao_
     CORBA::TypeCode_var type = _tao_any.type ();
     if (!type->equal (CORBA::_tc_FixedDef, ACE_TRY_ENV)) return 0; // not equal
     ACE_TRY_CHECK;
-    TAO_InputCDR stream (_tao_any._tao_get_cdr ());
+    TAO_InputCDR stream (_tao_any._tao_get_cdr (),
+                         _tao_any._tao_byte_order ());
     CORBA_Object_var _tao_obj_var;
     ACE_NEW_RETURN (tmp, CORBA_Object_ptr, 0);
     if (stream.decode (CORBA::_tc_FixedDef, &_tao_obj_var.out (), 0, ACE_TRY_ENV)
@@ -15831,7 +15865,8 @@ CORBA::Boolean operator>>= (const CORBA_Any &_tao_any, CORBA_SequenceDef_ptr &_t
     CORBA::TypeCode_var type = _tao_any.type ();
     if (!type->equal (CORBA::_tc_SequenceDef, ACE_TRY_ENV)) return 0; // not equal
     ACE_TRY_CHECK;
-    TAO_InputCDR stream (_tao_any._tao_get_cdr ());
+    TAO_InputCDR stream (_tao_any._tao_get_cdr (),
+                         _tao_any._tao_byte_order ());
     CORBA_Object_var _tao_obj_var;
     ACE_NEW_RETURN (tmp, CORBA_Object_ptr, 0);
     if (stream.decode (CORBA::_tc_SequenceDef, &_tao_obj_var.out (), 0, ACE_TRY_ENV)
@@ -15892,7 +15927,8 @@ CORBA::Boolean operator>>= (const CORBA_Any &_tao_any, CORBA_ArrayDef_ptr &_tao_
     CORBA::TypeCode_var type = _tao_any.type ();
     if (!type->equal (CORBA::_tc_ArrayDef, ACE_TRY_ENV)) return 0; // not equal
     ACE_TRY_CHECK;
-    TAO_InputCDR stream (_tao_any._tao_get_cdr ());
+    TAO_InputCDR stream (_tao_any._tao_get_cdr (),
+                         _tao_any._tao_byte_order ());
     CORBA_Object_var _tao_obj_var;
     ACE_NEW_RETURN (tmp, CORBA_Object_ptr, 0);
     if (stream.decode (CORBA::_tc_ArrayDef, &_tao_obj_var.out (), 0, ACE_TRY_ENV)
@@ -15953,7 +15989,8 @@ CORBA::Boolean operator>>= (const CORBA_Any &_tao_any, CORBA_ExceptionDef_ptr &_
     CORBA::TypeCode_var type = _tao_any.type ();
     if (!type->equal (CORBA::_tc_ExceptionDef, ACE_TRY_ENV)) return 0; // not equal
     ACE_TRY_CHECK;
-    TAO_InputCDR stream (_tao_any._tao_get_cdr ());
+    TAO_InputCDR stream (_tao_any._tao_get_cdr (),
+                         _tao_any._tao_byte_order ());
     CORBA_Object_var _tao_obj_var;
     ACE_NEW_RETURN (tmp, CORBA_Object_ptr, 0);
     if (stream.decode (CORBA::_tc_ExceptionDef, &_tao_obj_var.out (), 0, ACE_TRY_ENV)
@@ -16028,7 +16065,8 @@ CORBA::Boolean operator>>= (const CORBA_Any &_tao_any, CORBA_ExceptionDescriptio
     else
     {
       ACE_NEW_RETURN (_tao_elem, CORBA_ExceptionDescription, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
+      TAO_InputCDR stream (_tao_any._tao_get_cdr (),
+                           _tao_any._tao_byte_order ());
       if (stream.decode (CORBA::_tc_ExceptionDescription, _tao_elem, 0, ACE_TRY_ENV)
         == CORBA::TypeCode::TRAVERSE_CONTINUE)
       {
@@ -16076,7 +16114,8 @@ CORBA::Boolean operator>>= (const CORBA_Any &_tao_any, CORBA::AttributeMode &_ta
     CORBA::TypeCode_var type = _tao_any.type ();
     if (!type->equal (CORBA::_tc_AttributeMode, ACE_TRY_ENV)) return 0; // not equal
     ACE_TRY_CHECK;
-    TAO_InputCDR stream (_tao_any._tao_get_cdr ());
+    TAO_InputCDR stream (_tao_any._tao_get_cdr (),
+                         _tao_any._tao_byte_order ());
     if (stream.decode (CORBA::_tc_AttributeMode, &_tao_elem, 0, ACE_TRY_ENV)
       == CORBA::TypeCode::TRAVERSE_CONTINUE)
       return 1;
@@ -16119,7 +16158,8 @@ CORBA::Boolean operator>>= (const CORBA_Any &_tao_any, CORBA_AttributeDef_ptr &_
     CORBA::TypeCode_var type = _tao_any.type ();
     if (!type->equal (CORBA::_tc_AttributeDef, ACE_TRY_ENV)) return 0; // not equal
     ACE_TRY_CHECK;
-    TAO_InputCDR stream (_tao_any._tao_get_cdr ());
+    TAO_InputCDR stream (_tao_any._tao_get_cdr (),
+                         _tao_any._tao_byte_order ());
     CORBA_Object_var _tao_obj_var;
     ACE_NEW_RETURN (tmp, CORBA_Object_ptr, 0);
     if (stream.decode (CORBA::_tc_AttributeDef, &_tao_obj_var.out (), 0, ACE_TRY_ENV)
@@ -16194,7 +16234,8 @@ CORBA::Boolean operator>>= (const CORBA_Any &_tao_any, CORBA_AttributeDescriptio
     else
     {
       ACE_NEW_RETURN (_tao_elem, CORBA_AttributeDescription, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
+      TAO_InputCDR stream (_tao_any._tao_get_cdr (),
+                           _tao_any._tao_byte_order ());
       if (stream.decode (CORBA::_tc_AttributeDescription, _tao_elem, 0, ACE_TRY_ENV)
         == CORBA::TypeCode::TRAVERSE_CONTINUE)
       {
@@ -16242,7 +16283,8 @@ CORBA::Boolean operator>>= (const CORBA_Any &_tao_any, CORBA::OperationMode &_ta
     CORBA::TypeCode_var type = _tao_any.type ();
     if (!type->equal (CORBA::_tc_OperationMode, ACE_TRY_ENV)) return 0; // not equal
     ACE_TRY_CHECK;
-    TAO_InputCDR stream (_tao_any._tao_get_cdr ());
+    TAO_InputCDR stream (_tao_any._tao_get_cdr (),
+                         _tao_any._tao_byte_order ());
     if (stream.decode (CORBA::_tc_OperationMode, &_tao_elem, 0, ACE_TRY_ENV)
       == CORBA::TypeCode::TRAVERSE_CONTINUE)
       return 1;
@@ -16281,7 +16323,8 @@ CORBA::Boolean operator>>= (const CORBA_Any &_tao_any, CORBA::ParameterMode &_ta
     CORBA::TypeCode_var type = _tao_any.type ();
     if (!type->equal (CORBA::_tc_ParameterMode, ACE_TRY_ENV)) return 0; // not equal
     ACE_TRY_CHECK;
-    TAO_InputCDR stream (_tao_any._tao_get_cdr ());
+    TAO_InputCDR stream (_tao_any._tao_get_cdr (),
+                         _tao_any._tao_byte_order ());
     if (stream.decode (CORBA::_tc_ParameterMode, &_tao_elem, 0, ACE_TRY_ENV)
       == CORBA::TypeCode::TRAVERSE_CONTINUE)
       return 1;
@@ -16338,7 +16381,8 @@ CORBA::Boolean operator>>= (const CORBA_Any &_tao_any, CORBA_ParameterDescriptio
     else
     {
       ACE_NEW_RETURN (_tao_elem, CORBA_ParameterDescription, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
+      TAO_InputCDR stream (_tao_any._tao_get_cdr (),
+                           _tao_any._tao_byte_order ());
       if (stream.decode (CORBA::_tc_ParameterDescription, _tao_elem, 0, ACE_TRY_ENV)
         == CORBA::TypeCode::TRAVERSE_CONTINUE)
       {
@@ -16407,7 +16451,8 @@ CORBA::Boolean operator>>= (const CORBA_Any &_tao_any, CORBA_ParDescriptionSeq *
     else
     {
       ACE_NEW_RETURN (_tao_elem, CORBA_ParDescriptionSeq, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
+      TAO_InputCDR stream (_tao_any._tao_get_cdr (),
+                           _tao_any._tao_byte_order ());
       if (stream.decode (CORBA::_tc_ParDescriptionSeq, _tao_elem, 0, ACE_TRY_ENV)
         == CORBA::TypeCode::TRAVERSE_CONTINUE)
       {
@@ -16476,7 +16521,8 @@ CORBA::Boolean operator>>= (const CORBA_Any &_tao_any, CORBA_ContextIdSeq *&_tao
     else
     {
       ACE_NEW_RETURN (_tao_elem, CORBA_ContextIdSeq, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
+      TAO_InputCDR stream (_tao_any._tao_get_cdr (),
+                           _tao_any._tao_byte_order ());
       if (stream.decode (CORBA::_tc_ContextIdSeq, _tao_elem, 0, ACE_TRY_ENV)
         == CORBA::TypeCode::TRAVERSE_CONTINUE)
       {
@@ -16545,7 +16591,8 @@ CORBA::Boolean operator>>= (const CORBA_Any &_tao_any, CORBA_ExceptionDefSeq *&_
     else
     {
       ACE_NEW_RETURN (_tao_elem, CORBA_ExceptionDefSeq, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
+      TAO_InputCDR stream (_tao_any._tao_get_cdr (),
+                           _tao_any._tao_byte_order ());
       if (stream.decode (CORBA::_tc_ExceptionDefSeq, _tao_elem, 0, ACE_TRY_ENV)
         == CORBA::TypeCode::TRAVERSE_CONTINUE)
       {
@@ -16614,7 +16661,8 @@ CORBA::Boolean operator>>= (const CORBA_Any &_tao_any, CORBA_ExcDescriptionSeq *
     else
     {
       ACE_NEW_RETURN (_tao_elem, CORBA_ExcDescriptionSeq, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
+      TAO_InputCDR stream (_tao_any._tao_get_cdr (),
+                           _tao_any._tao_byte_order ());
       if (stream.decode (CORBA::_tc_ExcDescriptionSeq, _tao_elem, 0, ACE_TRY_ENV)
         == CORBA::TypeCode::TRAVERSE_CONTINUE)
       {
@@ -16666,7 +16714,8 @@ CORBA::Boolean operator>>= (const CORBA_Any &_tao_any, CORBA_OperationDef_ptr &_
     CORBA::TypeCode_var type = _tao_any.type ();
     if (!type->equal (CORBA::_tc_OperationDef, ACE_TRY_ENV)) return 0; // not equal
     ACE_TRY_CHECK;
-    TAO_InputCDR stream (_tao_any._tao_get_cdr ());
+    TAO_InputCDR stream (_tao_any._tao_get_cdr (),
+                         _tao_any._tao_byte_order ());
     CORBA_Object_var _tao_obj_var;
     ACE_NEW_RETURN (tmp, CORBA_Object_ptr, 0);
     if (stream.decode (CORBA::_tc_OperationDef, &_tao_obj_var.out (), 0, ACE_TRY_ENV)
@@ -16741,7 +16790,8 @@ CORBA::Boolean operator>>= (const CORBA_Any &_tao_any, CORBA_OperationDescriptio
     else
     {
       ACE_NEW_RETURN (_tao_elem, CORBA_OperationDescription, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
+      TAO_InputCDR stream (_tao_any._tao_get_cdr (),
+                           _tao_any._tao_byte_order ());
       if (stream.decode (CORBA::_tc_OperationDescription, _tao_elem, 0, ACE_TRY_ENV)
         == CORBA::TypeCode::TRAVERSE_CONTINUE)
       {
@@ -16810,7 +16860,8 @@ CORBA::Boolean operator>>= (const CORBA_Any &_tao_any, CORBA_RepositoryIdSeq *&_
     else
     {
       ACE_NEW_RETURN (_tao_elem, CORBA_RepositoryIdSeq, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
+      TAO_InputCDR stream (_tao_any._tao_get_cdr (),
+                           _tao_any._tao_byte_order ());
       if (stream.decode (CORBA::_tc_RepositoryIdSeq, _tao_elem, 0, ACE_TRY_ENV)
         == CORBA::TypeCode::TRAVERSE_CONTINUE)
       {
@@ -16879,7 +16930,8 @@ CORBA::Boolean operator>>= (const CORBA_Any &_tao_any, CORBA_OpDescriptionSeq *&
     else
     {
       ACE_NEW_RETURN (_tao_elem, CORBA_OpDescriptionSeq, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
+      TAO_InputCDR stream (_tao_any._tao_get_cdr (),
+                           _tao_any._tao_byte_order ());
       if (stream.decode (CORBA::_tc_OpDescriptionSeq, _tao_elem, 0, ACE_TRY_ENV)
         == CORBA::TypeCode::TRAVERSE_CONTINUE)
       {
@@ -16948,7 +17000,8 @@ CORBA::Boolean operator>>= (const CORBA_Any &_tao_any, CORBA_AttrDescriptionSeq
     else
     {
       ACE_NEW_RETURN (_tao_elem, CORBA_AttrDescriptionSeq, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
+      TAO_InputCDR stream (_tao_any._tao_get_cdr (),
+                           _tao_any._tao_byte_order ());
       if (stream.decode (CORBA::_tc_AttrDescriptionSeq, _tao_elem, 0, ACE_TRY_ENV)
         == CORBA::TypeCode::TRAVERSE_CONTINUE)
       {
@@ -17000,7 +17053,8 @@ CORBA::Boolean operator>>= (const CORBA_Any &_tao_any, CORBA_InterfaceDef_ptr &_
     CORBA::TypeCode_var type = _tao_any.type ();
     if (!type->equal (CORBA::_tc_InterfaceDef, ACE_TRY_ENV)) return 0; // not equal
     ACE_TRY_CHECK;
-    TAO_InputCDR stream (_tao_any._tao_get_cdr ());
+    TAO_InputCDR stream (_tao_any._tao_get_cdr (),
+                         _tao_any._tao_byte_order ());
     CORBA_Object_var _tao_obj_var;
     ACE_NEW_RETURN (tmp, CORBA_Object_ptr, 0);
     if (stream.decode (CORBA::_tc_InterfaceDef, &_tao_obj_var.out (), 0, ACE_TRY_ENV)
@@ -17075,7 +17129,8 @@ CORBA::Boolean operator>>= (const CORBA_Any &_tao_any, CORBA_InterfaceDef::FullI
     else
     {
       ACE_NEW_RETURN (_tao_elem, CORBA_InterfaceDef::FullInterfaceDescription, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
+      TAO_InputCDR stream (_tao_any._tao_get_cdr (),
+                           _tao_any._tao_byte_order ());
       if (stream.decode (CORBA_InterfaceDef::_tc_FullInterfaceDescription, _tao_elem, 0, ACE_TRY_ENV)
         == CORBA::TypeCode::TRAVERSE_CONTINUE)
       {
@@ -17141,7 +17196,8 @@ CORBA::Boolean operator>>= (const CORBA_Any &_tao_any, CORBA_InterfaceDescriptio
     else
     {
       ACE_NEW_RETURN (_tao_elem, CORBA_InterfaceDescription, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
+      TAO_InputCDR stream (_tao_any._tao_get_cdr (),
+                           _tao_any._tao_byte_order ());
       if (stream.decode (CORBA::_tc_InterfaceDescription, _tao_elem, 0, ACE_TRY_ENV)
         == CORBA::TypeCode::TRAVERSE_CONTINUE)
       {
@@ -17207,7 +17263,8 @@ CORBA::Boolean operator>>= (const CORBA_Any &_tao_any, CORBA_ValueMember *&_tao_
     else
     {
       ACE_NEW_RETURN (_tao_elem, CORBA_ValueMember, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
+      TAO_InputCDR stream (_tao_any._tao_get_cdr (),
+                           _tao_any._tao_byte_order ());
       if (stream.decode (CORBA::_tc_ValueMember, _tao_elem, 0, ACE_TRY_ENV)
         == CORBA::TypeCode::TRAVERSE_CONTINUE)
       {
@@ -17276,7 +17333,8 @@ CORBA::Boolean operator>>= (const CORBA_Any &_tao_any, CORBA_ValueMemberSeq *&_t
     else
     {
       ACE_NEW_RETURN (_tao_elem, CORBA_ValueMemberSeq, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
+      TAO_InputCDR stream (_tao_any._tao_get_cdr (),
+                           _tao_any._tao_byte_order ());
       if (stream.decode (CORBA::_tc_ValueMemberSeq, _tao_elem, 0, ACE_TRY_ENV)
         == CORBA::TypeCode::TRAVERSE_CONTINUE)
       {
@@ -17328,7 +17386,8 @@ CORBA::Boolean operator>>= (const CORBA_Any &_tao_any, CORBA_ValueMemberDef_ptr
     CORBA::TypeCode_var type = _tao_any.type ();
     if (!type->equal (CORBA::_tc_ValueMemberDef, ACE_TRY_ENV)) return 0; // not equal
     ACE_TRY_CHECK;
-    TAO_InputCDR stream (_tao_any._tao_get_cdr ());
+    TAO_InputCDR stream (_tao_any._tao_get_cdr (),
+                         _tao_any._tao_byte_order ());
     CORBA_Object_var _tao_obj_var;
     ACE_NEW_RETURN (tmp, CORBA_Object_ptr, 0);
     if (stream.decode (CORBA::_tc_ValueMemberDef, &_tao_obj_var.out (), 0, ACE_TRY_ENV)
@@ -17389,7 +17448,8 @@ CORBA::Boolean operator>>= (const CORBA_Any &_tao_any, CORBA_ValueDef_ptr &_tao_
     CORBA::TypeCode_var type = _tao_any.type ();
     if (!type->equal (CORBA::_tc_ValueDef, ACE_TRY_ENV)) return 0; // not equal
     ACE_TRY_CHECK;
-    TAO_InputCDR stream (_tao_any._tao_get_cdr ());
+    TAO_InputCDR stream (_tao_any._tao_get_cdr (),
+                         _tao_any._tao_byte_order ());
     CORBA_Object_var _tao_obj_var;
     ACE_NEW_RETURN (tmp, CORBA_Object_ptr, 0);
     if (stream.decode (CORBA::_tc_ValueDef, &_tao_obj_var.out (), 0, ACE_TRY_ENV)
@@ -17464,7 +17524,8 @@ CORBA::Boolean operator>>= (const CORBA_Any &_tao_any, CORBA_ValueDef::FullValue
     else
     {
       ACE_NEW_RETURN (_tao_elem, CORBA_ValueDef::FullValueDescription, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
+      TAO_InputCDR stream (_tao_any._tao_get_cdr (),
+                           _tao_any._tao_byte_order ());
       if (stream.decode (CORBA_ValueDef::_tc_FullValueDescription, _tao_elem, 0, ACE_TRY_ENV)
         == CORBA::TypeCode::TRAVERSE_CONTINUE)
       {
@@ -17530,7 +17591,8 @@ CORBA::Boolean operator>>= (const CORBA_Any &_tao_any, CORBA_ValueDescription *&
     else
     {
       ACE_NEW_RETURN (_tao_elem, CORBA_ValueDescription, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
+      TAO_InputCDR stream (_tao_any._tao_get_cdr (),
+                           _tao_any._tao_byte_order ());
       if (stream.decode (CORBA::_tc_ValueDescription, _tao_elem, 0, ACE_TRY_ENV)
         == CORBA::TypeCode::TRAVERSE_CONTINUE)
       {
@@ -17582,7 +17644,8 @@ CORBA::Boolean operator>>= (const CORBA_Any &_tao_any, CORBA_ValueBoxDef_ptr &_t
     CORBA::TypeCode_var type = _tao_any.type ();
     if (!type->equal (CORBA::_tc_ValueBoxDef, ACE_TRY_ENV)) return 0; // not equal
     ACE_TRY_CHECK;
-    TAO_InputCDR stream (_tao_any._tao_get_cdr ());
+    TAO_InputCDR stream (_tao_any._tao_get_cdr (),
+                         _tao_any._tao_byte_order ());
     CORBA_Object_var _tao_obj_var;
     ACE_NEW_RETURN (tmp, CORBA_Object_ptr, 0);
     if (stream.decode (CORBA::_tc_ValueBoxDef, &_tao_obj_var.out (), 0, ACE_TRY_ENV)
diff --git a/TAO/tao/Invocation.cpp b/TAO/tao/Invocation.cpp
index 2a50a763c95..5f762aecbce 100644
--- a/TAO/tao/Invocation.cpp
+++ b/TAO/tao/Invocation.cpp
@@ -604,7 +604,9 @@ TAO_GIOP_Twoway_Invocation::invoke (CORBA::ExceptionList &exceptions,
 
           const ACE_Message_Block* cdr =
             this->inp_stream ().start ();
-          CORBA_Any any (tcp, 0, cdr);
+          CORBA_Any any (tcp, 0, 
+                         this->inp_stream ().byte_order (),
+                         cdr);
           CORBA_Exception *exception;
 
           ACE_NEW_THROW_EX (exception,
diff --git a/TAO/tao/Makefile b/TAO/tao/Makefile
index 970f2aa0938..c44f1d6a549 100644
--- a/TAO/tao/Makefile
+++ b/TAO/tao/Makefile
@@ -75,7 +75,7 @@ PLUGGABLE_PROTOCOLS_FILES = \
   UIOP_Connect \
   IORC \
   IORS \
-  IORManipulation
+  IORManipulation 
 
 PLUGGABLE_MESSAGING_FILES = \
 Pluggable_Messaging \
@@ -86,7 +86,8 @@ GIOP_Message_Accept_State \
 GIOP_Utils \
 GIOP_Assorted_Headers \
 target_identifier \
-GIOP_Server_Request 
+GIOP_Server_Request \
+GIOP_Message_Lite 
 
 DEFAULT_RESOURCES_FILES = \
   default_client \
@@ -388,6 +389,7 @@ realclean:
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config-sunos5.6.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -547,28 +549,9 @@ realclean:
  $(TAO_ROOT)/tao/Object_KeyC.i \
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/POA.i \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/IOR_LookupTable.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/IORS.i \
- $(TAO_ROOT)/tao/Interceptor.h \
- $(TAO_ROOT)/tao/InterceptorS.h \
- $(TAO_ROOT)/tao/InterceptorC.h \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/InterceptorC.i \
- $(TAO_ROOT)/tao/Interceptor.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Policy_Manager.i \
- $(TAO_ROOT)/tao/Resource_Factory.h \
+ $(TAO_ROOT)/tao/ImplRepoC.h \
+ $(TAO_ROOT)/tao/Operation_Table.h \
+ $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
  $(ACE_ROOT)/ace/Message_Queue.h \
  $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
@@ -591,7 +574,37 @@ realclean:
  $(ACE_ROOT)/ace/WFMO_Reactor.i \
  $(ACE_ROOT)/ace/Strategies.i \
  $(ACE_ROOT)/ace/Message_Queue.i \
+ $(TAO_ROOT)/tao/IOPC.h \
+ $(TAO_ROOT)/tao/IOPC.i \
  $(TAO_ROOT)/tao/Pluggable.i \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/Profile.h \
+ $(TAO_ROOT)/tao/Tagged_Components.h \
+ $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+ $(TAO_ROOT)/tao/CONV_FRAMEC.i \
+ $(TAO_ROOT)/tao/Tagged_Components.i \
+ $(TAO_ROOT)/tao/Profile.i \
+ $(TAO_ROOT)/tao/MProfile.i \
+ $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/IOR_LookupTable.h \
+ $(TAO_ROOT)/tao/Services.h \
+ $(TAO_ROOT)/tao/Services.i \
+ $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/IORS.h \
+ $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/IORC.i \
+ $(TAO_ROOT)/tao/IORS.i \
+ $(TAO_ROOT)/tao/Interceptor.h \
+ $(TAO_ROOT)/tao/InterceptorS.h \
+ $(TAO_ROOT)/tao/InterceptorC.h \
+ $(TAO_ROOT)/tao/InterceptorC.i \
+ $(TAO_ROOT)/tao/Interceptor.i \
+ $(TAO_ROOT)/tao/ORB.i \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/ORB_Core.h \
+ $(TAO_ROOT)/tao/Policy_Manager.h \
+ $(TAO_ROOT)/tao/Policy_Manager.i \
+ $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/Protocol_Factory.h \
  $(TAO_ROOT)/tao/params.h \
  $(TAO_ROOT)/tao/params.i \
@@ -600,6 +613,32 @@ realclean:
  $(ACE_ROOT)/ace/Dynamic_Service.cpp \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Server_Request.i \
+ $(TAO_ROOT)/tao/NVList.h \
+ $(TAO_ROOT)/tao/NVList.i \
+ $(TAO_ROOT)/tao/Invocation.h \
+ $(TAO_ROOT)/tao/Reply_Dispatcher.h \
+ $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
+ $(TAO_ROOT)/tao/MessagingC.h \
+ $(TAO_ROOT)/tao/TimeBaseC.h \
+ $(TAO_ROOT)/tao/TimeBaseC.i \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/MessagingC.i \
+ $(TAO_ROOT)/tao/Request.i \
+ $(TAO_ROOT)/tao/GIOP_Utils.h \
+ $(TAO_ROOT)/tao/Pluggable_Messaging.h \
+ $(TAO_ROOT)/tao/target_identifier.h \
+ $(TAO_ROOT)/tao/target_identifier.i \
+ $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \
+ $(TAO_ROOT)/tao/Pluggable_Messaging.i \
+ $(TAO_ROOT)/tao/GIOP_Utils.i \
+ $(TAO_ROOT)/tao/Reply_Dispatcher.i \
+ $(TAO_ROOT)/tao/TAOC.h \
+ $(TAO_ROOT)/tao/TAOC.i \
+ $(TAO_ROOT)/tao/Invocation.i \
+ $(TAO_ROOT)/tao/ImplRepoC.i \
+ $(TAO_ROOT)/tao/POA.i \
  $(ACE_ROOT)/ace/Auto_Ptr.h \
  $(ACE_ROOT)/ace/Auto_Ptr.i \
  $(ACE_ROOT)/ace/Auto_Ptr.cpp \
@@ -616,6 +655,7 @@ realclean:
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config-sunos5.6.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -761,6 +801,7 @@ realclean:
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config-sunos5.6.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -927,28 +968,9 @@ realclean:
  $(TAO_ROOT)/tao/Object_KeyC.i \
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/POA.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/IOR_LookupTable.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/IORS.i \
- $(TAO_ROOT)/tao/Interceptor.h \
- $(TAO_ROOT)/tao/InterceptorS.h \
- $(TAO_ROOT)/tao/InterceptorC.h \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/InterceptorC.i \
- $(TAO_ROOT)/tao/Interceptor.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Policy_Manager.i \
- $(TAO_ROOT)/tao/Resource_Factory.h \
+ $(TAO_ROOT)/tao/ImplRepoC.h \
+ $(TAO_ROOT)/tao/Operation_Table.h \
+ $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
  $(ACE_ROOT)/ace/Message_Queue.h \
  $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
@@ -971,14 +993,79 @@ realclean:
  $(ACE_ROOT)/ace/WFMO_Reactor.i \
  $(ACE_ROOT)/ace/Strategies.i \
  $(ACE_ROOT)/ace/Message_Queue.i \
+ $(TAO_ROOT)/tao/IOPC.h \
+ $(TAO_ROOT)/tao/IOPC.i \
  $(TAO_ROOT)/tao/Pluggable.i \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/Profile.h \
+ $(TAO_ROOT)/tao/Tagged_Components.h \
+ $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+ $(TAO_ROOT)/tao/CONV_FRAMEC.i \
+ $(TAO_ROOT)/tao/Tagged_Components.i \
+ $(TAO_ROOT)/tao/Profile.i \
+ $(TAO_ROOT)/tao/MProfile.i \
+ $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/IOR_LookupTable.h \
+ $(TAO_ROOT)/tao/Services.h \
+ $(TAO_ROOT)/tao/Services.i \
+ $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/IORS.h \
+ $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/IORC.i \
+ $(TAO_ROOT)/tao/IORS.i \
+ $(TAO_ROOT)/tao/Interceptor.h \
+ $(TAO_ROOT)/tao/InterceptorS.h \
+ $(TAO_ROOT)/tao/InterceptorC.h \
+ $(TAO_ROOT)/tao/InterceptorC.i \
+ $(TAO_ROOT)/tao/Interceptor.i \
+ $(TAO_ROOT)/tao/ORB.i \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/ORB_Core.h \
+ $(TAO_ROOT)/tao/Policy_Manager.h \
+ $(TAO_ROOT)/tao/Policy_Manager.i \
+ $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/Protocol_Factory.h \
  $(TAO_ROOT)/tao/params.h \
  $(TAO_ROOT)/tao/params.i \
  $(TAO_ROOT)/tao/ORB_Core.i \
  $(ACE_ROOT)/ace/Dynamic_Service.h \
  $(ACE_ROOT)/ace/Dynamic_Service.cpp \
+ $(TAO_ROOT)/tao/Server_Request.h \
+ $(TAO_ROOT)/tao/Server_Request.i \
+ $(TAO_ROOT)/tao/NVList.h \
+ $(TAO_ROOT)/tao/NVList.i \
+ $(TAO_ROOT)/tao/Invocation.h \
+ $(TAO_ROOT)/tao/Reply_Dispatcher.h \
+ $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
+ $(TAO_ROOT)/tao/MessagingC.h \
+ $(TAO_ROOT)/tao/TimeBaseC.h \
+ $(TAO_ROOT)/tao/TimeBaseC.i \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/MessagingC.i \
+ $(TAO_ROOT)/tao/Request.i \
+ $(TAO_ROOT)/tao/GIOP_Utils.h \
+ $(TAO_ROOT)/tao/Pluggable_Messaging.h \
+ $(TAO_ROOT)/tao/target_identifier.h \
+ $(TAO_ROOT)/tao/target_identifier.i \
+ $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \
+ $(TAO_ROOT)/tao/Pluggable_Messaging.i \
+ $(TAO_ROOT)/tao/GIOP_Utils.i \
+ $(TAO_ROOT)/tao/Reply_Dispatcher.i \
+ $(TAO_ROOT)/tao/TAOC.h \
+ $(TAO_ROOT)/tao/TAOC.i \
+ $(TAO_ROOT)/tao/Invocation.i \
+ $(TAO_ROOT)/tao/ImplRepoC.i \
+ $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/debug.h \
+ $(TAO_ROOT)/tao/ImplRepoS.h \
+ $(TAO_ROOT)/tao/ImplRepoS_T.h \
+ $(TAO_ROOT)/tao/ImplRepoS_T.i \
+ $(TAO_ROOT)/tao/ImplRepoS_T.cpp \
+ $(TAO_ROOT)/tao/ImplRepoS.i \
+ $(TAO_ROOT)/tao/Acceptor_Registry.h \
+ $(TAO_ROOT)/tao/Acceptor_Registry.i \
  $(TAO_ROOT)/tao/Forwarding_Servant.h
 
 .obj/POAC.o .obj/POAC.so .shobj/POAC.o .shobj/POAC.so: POAC.cpp $(TAO_ROOT)/tao/POAC.h \
@@ -993,6 +1080,7 @@ realclean:
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config-sunos5.6.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -1150,29 +1238,9 @@ realclean:
  $(TAO_ROOT)/tao/Object_KeyC.i \
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/POA.i \
- $(TAO_ROOT)/tao/Invocation.h \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/IOR_LookupTable.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/IORS.i \
- $(TAO_ROOT)/tao/Interceptor.h \
- $(TAO_ROOT)/tao/InterceptorS.h \
- $(TAO_ROOT)/tao/InterceptorC.h \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/InterceptorC.i \
- $(TAO_ROOT)/tao/Interceptor.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Policy_Manager.i \
- $(TAO_ROOT)/tao/Resource_Factory.h \
+ $(TAO_ROOT)/tao/ImplRepoC.h \
+ $(TAO_ROOT)/tao/Operation_Table.h \
+ $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
  $(ACE_ROOT)/ace/Message_Queue.h \
  $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
@@ -1195,17 +1263,50 @@ realclean:
  $(ACE_ROOT)/ace/WFMO_Reactor.i \
  $(ACE_ROOT)/ace/Strategies.i \
  $(ACE_ROOT)/ace/Message_Queue.i \
+ $(TAO_ROOT)/tao/IOPC.h \
+ $(TAO_ROOT)/tao/IOPC.i \
  $(TAO_ROOT)/tao/Pluggable.i \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/Profile.h \
+ $(TAO_ROOT)/tao/Tagged_Components.h \
+ $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+ $(TAO_ROOT)/tao/CONV_FRAMEC.i \
+ $(TAO_ROOT)/tao/Tagged_Components.i \
+ $(TAO_ROOT)/tao/Profile.i \
+ $(TAO_ROOT)/tao/MProfile.i \
+ $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/IOR_LookupTable.h \
+ $(TAO_ROOT)/tao/Services.h \
+ $(TAO_ROOT)/tao/Services.i \
+ $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/IORS.h \
+ $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/IORC.i \
+ $(TAO_ROOT)/tao/IORS.i \
+ $(TAO_ROOT)/tao/Interceptor.h \
+ $(TAO_ROOT)/tao/InterceptorS.h \
+ $(TAO_ROOT)/tao/InterceptorC.h \
+ $(TAO_ROOT)/tao/InterceptorC.i \
+ $(TAO_ROOT)/tao/Interceptor.i \
+ $(TAO_ROOT)/tao/ORB.i \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/ORB_Core.h \
+ $(TAO_ROOT)/tao/Policy_Manager.h \
+ $(TAO_ROOT)/tao/Policy_Manager.i \
+ $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/Protocol_Factory.h \
  $(TAO_ROOT)/tao/params.h \
  $(TAO_ROOT)/tao/params.i \
  $(TAO_ROOT)/tao/ORB_Core.i \
  $(ACE_ROOT)/ace/Dynamic_Service.h \
  $(ACE_ROOT)/ace/Dynamic_Service.cpp \
- $(TAO_ROOT)/tao/Reply_Dispatcher.h \
- $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Server_Request.h \
+ $(TAO_ROOT)/tao/Server_Request.i \
  $(TAO_ROOT)/tao/NVList.h \
  $(TAO_ROOT)/tao/NVList.i \
+ $(TAO_ROOT)/tao/Invocation.h \
+ $(TAO_ROOT)/tao/Reply_Dispatcher.h \
+ $(TAO_ROOT)/tao/Request.h \
  $(TAO_ROOT)/tao/Context.h \
  $(TAO_ROOT)/tao/Context.i \
  $(TAO_ROOT)/tao/MessagingC.h \
@@ -1225,16 +1326,8 @@ realclean:
  $(TAO_ROOT)/tao/TAOC.h \
  $(TAO_ROOT)/tao/TAOC.i \
  $(TAO_ROOT)/tao/Invocation.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/MProfile.h \
- $(TAO_ROOT)/tao/Profile.h \
- $(TAO_ROOT)/tao/Tagged_Components.h \
- $(TAO_ROOT)/tao/CONV_FRAMEC.h \
- $(TAO_ROOT)/tao/CONV_FRAMEC.i \
- $(TAO_ROOT)/tao/Tagged_Components.i \
- $(TAO_ROOT)/tao/Profile.i \
- $(TAO_ROOT)/tao/MProfile.i \
- $(TAO_ROOT)/tao/Stub.i
+ $(TAO_ROOT)/tao/ImplRepoC.i \
+ $(TAO_ROOT)/tao/POA.i
 
 .obj/POAS.o .obj/POAS.so .shobj/POAS.o .shobj/POAS.so: POAS.cpp $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POAC.h \
@@ -1249,6 +1342,7 @@ realclean:
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config-sunos5.6.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -1448,6 +1542,7 @@ realclean:
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config-sunos5.6.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -1603,6 +1698,95 @@ realclean:
  $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/Object_KeyC.h \
  $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/ImplRepoC.h \
+ $(TAO_ROOT)/tao/Operation_Table.h \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(ACE_ROOT)/ace/Message_Queue.h \
+ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.i \
+ $(ACE_ROOT)/ace/Message_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Strategies.h \
+ $(ACE_ROOT)/ace/Strategies_T.h \
+ $(ACE_ROOT)/ace/Synch_Options.h \
+ $(ACE_ROOT)/ace/Synch_Options.i \
+ $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Manager.i \
+ $(ACE_ROOT)/ace/Strategies_T.i \
+ $(ACE_ROOT)/ace/Strategies_T.cpp \
+ $(ACE_ROOT)/ace/Service_Repository.h \
+ $(ACE_ROOT)/ace/Service_Types.h \
+ $(ACE_ROOT)/ace/Service_Types.i \
+ $(ACE_ROOT)/ace/Service_Repository.i \
+ $(ACE_ROOT)/ace/WFMO_Reactor.h \
+ $(ACE_ROOT)/ace/WFMO_Reactor.i \
+ $(ACE_ROOT)/ace/Strategies.i \
+ $(ACE_ROOT)/ace/Message_Queue.i \
+ $(TAO_ROOT)/tao/IOPC.h \
+ $(TAO_ROOT)/tao/IOPC.i \
+ $(TAO_ROOT)/tao/Pluggable.i \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/Profile.h \
+ $(TAO_ROOT)/tao/Tagged_Components.h \
+ $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+ $(TAO_ROOT)/tao/CONV_FRAMEC.i \
+ $(TAO_ROOT)/tao/Tagged_Components.i \
+ $(TAO_ROOT)/tao/Profile.i \
+ $(TAO_ROOT)/tao/MProfile.i \
+ $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/IOR_LookupTable.h \
+ $(TAO_ROOT)/tao/Services.h \
+ $(TAO_ROOT)/tao/Services.i \
+ $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/IORS.h \
+ $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/IORC.i \
+ $(TAO_ROOT)/tao/IORS.i \
+ $(TAO_ROOT)/tao/Interceptor.h \
+ $(TAO_ROOT)/tao/InterceptorS.h \
+ $(TAO_ROOT)/tao/InterceptorC.h \
+ $(TAO_ROOT)/tao/InterceptorC.i \
+ $(TAO_ROOT)/tao/Interceptor.i \
+ $(TAO_ROOT)/tao/ORB.i \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/ORB_Core.h \
+ $(TAO_ROOT)/tao/Policy_Manager.h \
+ $(TAO_ROOT)/tao/Policy_Manager.i \
+ $(TAO_ROOT)/tao/Resource_Factory.h \
+ $(TAO_ROOT)/tao/Protocol_Factory.h \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/ORB_Core.i \
+ $(ACE_ROOT)/ace/Dynamic_Service.h \
+ $(ACE_ROOT)/ace/Dynamic_Service.cpp \
+ $(TAO_ROOT)/tao/Server_Request.h \
+ $(TAO_ROOT)/tao/Server_Request.i \
+ $(TAO_ROOT)/tao/NVList.h \
+ $(TAO_ROOT)/tao/NVList.i \
+ $(TAO_ROOT)/tao/Invocation.h \
+ $(TAO_ROOT)/tao/Reply_Dispatcher.h \
+ $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
+ $(TAO_ROOT)/tao/MessagingC.h \
+ $(TAO_ROOT)/tao/TimeBaseC.h \
+ $(TAO_ROOT)/tao/TimeBaseC.i \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/MessagingC.i \
+ $(TAO_ROOT)/tao/Request.i \
+ $(TAO_ROOT)/tao/GIOP_Utils.h \
+ $(TAO_ROOT)/tao/Pluggable_Messaging.h \
+ $(TAO_ROOT)/tao/target_identifier.h \
+ $(TAO_ROOT)/tao/target_identifier.i \
+ $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \
+ $(TAO_ROOT)/tao/Pluggable_Messaging.i \
+ $(TAO_ROOT)/tao/GIOP_Utils.i \
+ $(TAO_ROOT)/tao/Reply_Dispatcher.i \
+ $(TAO_ROOT)/tao/TAOC.h \
+ $(TAO_ROOT)/tao/TAOC.i \
+ $(TAO_ROOT)/tao/Invocation.i \
+ $(TAO_ROOT)/tao/ImplRepoC.i \
  $(TAO_ROOT)/tao/POA.i
 
 .obj/Active_Object_Map.o .obj/Active_Object_Map.so .shobj/Active_Object_Map.o .shobj/Active_Object_Map.so: Active_Object_Map.cpp \
@@ -1616,6 +1800,7 @@ realclean:
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config-sunos5.6.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -1772,6 +1957,7 @@ realclean:
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config-sunos5.6.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -1985,7 +2171,7 @@ realclean:
  $(TAO_ROOT)/tao/Object_KeyC.i \
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/ImplRepoC.h \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/Profile.h \
@@ -1997,7 +2183,33 @@ realclean:
  $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/Server_Request.h \
- $(TAO_ROOT)/tao/Server_Request.i
+ $(TAO_ROOT)/tao/Server_Request.i \
+ $(TAO_ROOT)/tao/NVList.h \
+ $(TAO_ROOT)/tao/NVList.i \
+ $(TAO_ROOT)/tao/Invocation.h \
+ $(TAO_ROOT)/tao/Reply_Dispatcher.h \
+ $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
+ $(TAO_ROOT)/tao/MessagingC.h \
+ $(TAO_ROOT)/tao/TimeBaseC.h \
+ $(TAO_ROOT)/tao/TimeBaseC.i \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/MessagingC.i \
+ $(TAO_ROOT)/tao/Request.i \
+ $(TAO_ROOT)/tao/GIOP_Utils.h \
+ $(TAO_ROOT)/tao/Pluggable_Messaging.h \
+ $(TAO_ROOT)/tao/target_identifier.h \
+ $(TAO_ROOT)/tao/target_identifier.i \
+ $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \
+ $(TAO_ROOT)/tao/Pluggable_Messaging.i \
+ $(TAO_ROOT)/tao/GIOP_Utils.i \
+ $(TAO_ROOT)/tao/Reply_Dispatcher.i \
+ $(TAO_ROOT)/tao/TAOC.h \
+ $(TAO_ROOT)/tao/TAOC.i \
+ $(TAO_ROOT)/tao/Invocation.i \
+ $(TAO_ROOT)/tao/ImplRepoC.i \
+ $(TAO_ROOT)/tao/POA.i
 
 .obj/Forwarding_Servant.o .obj/Forwarding_Servant.so .shobj/Forwarding_Servant.o .shobj/Forwarding_Servant.so: Forwarding_Servant.cpp \
  $(TAO_ROOT)/tao/Forwarding_Servant.h \
@@ -2006,6 +2218,7 @@ realclean:
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config-sunos5.6.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -2154,6 +2367,521 @@ realclean:
  $(TAO_ROOT)/tao/Object_KeyC.i \
  $(TAO_ROOT)/tao/Server_Request.i
 
+.obj/ImplRepoC.o .obj/ImplRepoC.so .shobj/ImplRepoC.o .shobj/ImplRepoC.so: ImplRepoC.cpp ImplRepoC.h \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/corbafwd.h \
+ $(ACE_ROOT)/ace/CDR_Stream.h \
+ $(ACE_ROOT)/ace/Message_Block.h \
+ $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.i \
+ $(ACE_ROOT)/ace/Trace.h \
+ $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Based_Pointer_T.h \
+ $(ACE_ROOT)/ace/Based_Pointer_T.i \
+ $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
+ $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Synch.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+ $(ACE_ROOT)/ace/Synch.i \
+ $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.i \
+ $(ACE_ROOT)/ace/Synch_T.i \
+ $(ACE_ROOT)/ace/Thread.h \
+ $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Atomic_Op.i \
+ $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
+ $(ACE_ROOT)/ace/Free_List.h \
+ $(ACE_ROOT)/ace/Free_List.i \
+ $(ACE_ROOT)/ace/Free_List.cpp \
+ $(ACE_ROOT)/ace/Malloc_T.i \
+ $(ACE_ROOT)/ace/Malloc_T.cpp \
+ $(ACE_ROOT)/ace/Memory_Pool.h \
+ $(ACE_ROOT)/ace/Signal.h \
+ $(ACE_ROOT)/ace/Containers.h \
+ $(ACE_ROOT)/ace/Containers.i \
+ $(ACE_ROOT)/ace/Containers_T.h \
+ $(ACE_ROOT)/ace/Containers_T.i \
+ $(ACE_ROOT)/ace/Containers_T.cpp \
+ $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Mem_Map.h \
+ $(ACE_ROOT)/ace/Mem_Map.i \
+ $(ACE_ROOT)/ace/Memory_Pool.i \
+ $(ACE_ROOT)/ace/Message_Block.i \
+ $(ACE_ROOT)/ace/Message_Block_T.h \
+ $(ACE_ROOT)/ace/Message_Block_T.i \
+ $(ACE_ROOT)/ace/Message_Block_T.cpp \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/CDR_Stream.i \
+ $(TAO_ROOT)/tao/try_macros.h \
+ $(TAO_ROOT)/tao/orbconf.h \
+ $(ACE_ROOT)/ace/CORBA_macros.h \
+ $(TAO_ROOT)/tao/corbafwd.i \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/Managed_Types.h \
+ $(TAO_ROOT)/tao/Managed_Types.i \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/Sequence.h \
+ $(TAO_ROOT)/tao/Sequence.i \
+ $(TAO_ROOT)/tao/Sequence_T.h \
+ $(TAO_ROOT)/tao/Sequence_T.i \
+ $(TAO_ROOT)/tao/Sequence_T.cpp \
+ $(TAO_ROOT)/tao/varout.h \
+ $(TAO_ROOT)/tao/varout.i \
+ $(TAO_ROOT)/tao/varout.cpp \
+ $(TAO_ROOT)/tao/PolicyC.i \
+ $(TAO_ROOT)/tao/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
+ $(TAO_ROOT)/tao/Operation_Table.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+ $(ACE_ROOT)/ace/Functor.h \
+ $(ACE_ROOT)/ace/Functor.i \
+ $(ACE_ROOT)/ace/Functor_T.h \
+ $(ACE_ROOT)/ace/Functor_T.i \
+ $(ACE_ROOT)/ace/Functor_T.cpp \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Service_Config.h \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ $(ACE_ROOT)/ace/Service_Config.i \
+ $(ACE_ROOT)/ace/Reactor.h \
+ $(ACE_ROOT)/ace/Handle_Set.h \
+ $(ACE_ROOT)/ace/Handle_Set.i \
+ $(ACE_ROOT)/ace/Timer_Queue.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.i \
+ $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Reactor.i \
+ $(ACE_ROOT)/ace/Reactor_Impl.h \
+ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(ACE_ROOT)/ace/Message_Queue.h \
+ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.i \
+ $(ACE_ROOT)/ace/Message_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Strategies.h \
+ $(ACE_ROOT)/ace/Strategies_T.h \
+ $(ACE_ROOT)/ace/Synch_Options.h \
+ $(ACE_ROOT)/ace/Synch_Options.i \
+ $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Manager.i \
+ $(ACE_ROOT)/ace/Strategies_T.i \
+ $(ACE_ROOT)/ace/Strategies_T.cpp \
+ $(ACE_ROOT)/ace/Service_Repository.h \
+ $(ACE_ROOT)/ace/Service_Types.h \
+ $(ACE_ROOT)/ace/Service_Types.i \
+ $(ACE_ROOT)/ace/Service_Repository.i \
+ $(ACE_ROOT)/ace/WFMO_Reactor.h \
+ $(ACE_ROOT)/ace/WFMO_Reactor.i \
+ $(ACE_ROOT)/ace/Strategies.i \
+ $(ACE_ROOT)/ace/Message_Queue.i \
+ $(TAO_ROOT)/tao/IOPC.h \
+ $(TAO_ROOT)/tao/IOPC.i \
+ $(TAO_ROOT)/tao/Pluggable.i \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/Profile.h \
+ $(TAO_ROOT)/tao/Tagged_Components.h \
+ $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+ $(TAO_ROOT)/tao/CONV_FRAMEC.i \
+ $(TAO_ROOT)/tao/Tagged_Components.i \
+ $(TAO_ROOT)/tao/Profile.i \
+ $(TAO_ROOT)/tao/MProfile.i \
+ $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/IOR_LookupTable.h \
+ $(TAO_ROOT)/tao/Services.h \
+ $(TAO_ROOT)/tao/Services.i \
+ $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/IORS.h \
+ $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/IORC.i \
+ $(TAO_ROOT)/tao/IORS.i \
+ $(TAO_ROOT)/tao/Interceptor.h \
+ $(TAO_ROOT)/tao/InterceptorS.h \
+ $(TAO_ROOT)/tao/InterceptorC.h \
+ $(TAO_ROOT)/tao/Any.h \
+ $(TAO_ROOT)/tao/Any.i \
+ $(TAO_ROOT)/tao/InterceptorC.i \
+ $(TAO_ROOT)/tao/Interceptor.i \
+ $(TAO_ROOT)/tao/ORB.i \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/ORB_Core.h \
+ $(TAO_ROOT)/tao/Policy_Manager.h \
+ $(TAO_ROOT)/tao/POA_CORBA.h \
+ $(TAO_ROOT)/tao/DynAnyC.h \
+ $(TAO_ROOT)/tao/DynAnyC.i \
+ $(TAO_ROOT)/tao/DomainC.h \
+ $(TAO_ROOT)/tao/DomainC.i \
+ $(TAO_ROOT)/tao/Policy_Manager.i \
+ $(TAO_ROOT)/tao/Resource_Factory.h \
+ $(TAO_ROOT)/tao/Protocol_Factory.h \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
+ $(ACE_ROOT)/ace/Map_Manager.h \
+ $(ACE_ROOT)/ace/Map_Manager.i \
+ $(ACE_ROOT)/ace/Map_Manager.cpp \
+ $(TAO_ROOT)/tao/ORB_Core.i \
+ $(ACE_ROOT)/ace/Dynamic_Service.h \
+ $(ACE_ROOT)/ace/Dynamic_Service.cpp \
+ $(TAO_ROOT)/tao/Server_Request.h \
+ $(TAO_ROOT)/tao/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/Server_Request.i \
+ $(TAO_ROOT)/tao/NVList.h \
+ $(TAO_ROOT)/tao/NVList.i \
+ $(TAO_ROOT)/tao/Object_Adapter.h \
+ $(TAO_ROOT)/tao/Key_Adapters.h \
+ $(ACE_ROOT)/ace/Map.h \
+ $(ACE_ROOT)/ace/Map.i \
+ $(ACE_ROOT)/ace/Map_T.h \
+ $(ACE_ROOT)/ace/Pair.h \
+ $(ACE_ROOT)/ace/Pair.i \
+ $(ACE_ROOT)/ace/Pair_T.h \
+ $(ACE_ROOT)/ace/Pair_T.i \
+ $(ACE_ROOT)/ace/Pair_T.cpp \
+ $(ACE_ROOT)/ace/Active_Map_Manager.h \
+ $(ACE_ROOT)/ace/Active_Map_Manager.i \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Map_T.i \
+ $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/Key_Adapters.i \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/POAS.h \
+ $(TAO_ROOT)/tao/POAS.i \
+ $(TAO_ROOT)/tao/Active_Object_Map.h \
+ $(TAO_ROOT)/tao/Active_Object_Map.i \
+ $(TAO_ROOT)/tao/Object_Adapter.i \
+ $(TAO_ROOT)/tao/Invocation.h \
+ $(TAO_ROOT)/tao/Reply_Dispatcher.h \
+ $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
+ $(TAO_ROOT)/tao/MessagingC.h \
+ $(TAO_ROOT)/tao/TimeBaseC.h \
+ $(TAO_ROOT)/tao/TimeBaseC.i \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/MessagingC.i \
+ $(TAO_ROOT)/tao/Request.i \
+ $(TAO_ROOT)/tao/GIOP_Utils.h \
+ $(TAO_ROOT)/tao/Pluggable_Messaging.h \
+ $(TAO_ROOT)/tao/target_identifier.h \
+ $(TAO_ROOT)/tao/target_identifier.i \
+ $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \
+ $(TAO_ROOT)/tao/Pluggable_Messaging.i \
+ $(TAO_ROOT)/tao/GIOP_Utils.i \
+ $(TAO_ROOT)/tao/Reply_Dispatcher.i \
+ $(TAO_ROOT)/tao/TAOC.h \
+ $(TAO_ROOT)/tao/TAOC.i \
+ $(TAO_ROOT)/tao/Invocation.i ImplRepoC.i
+
+.obj/ImplRepoS.o .obj/ImplRepoS.so .shobj/ImplRepoS.o .shobj/ImplRepoS.so: ImplRepoS.cpp ImplRepoS.h \
+ $(TAO_ROOT)/tao/ImplRepoC.h \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/corbafwd.h \
+ $(ACE_ROOT)/ace/CDR_Stream.h \
+ $(ACE_ROOT)/ace/Message_Block.h \
+ $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.i \
+ $(ACE_ROOT)/ace/Trace.h \
+ $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Based_Pointer_T.h \
+ $(ACE_ROOT)/ace/Based_Pointer_T.i \
+ $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
+ $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Synch.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+ $(ACE_ROOT)/ace/Synch.i \
+ $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.i \
+ $(ACE_ROOT)/ace/Synch_T.i \
+ $(ACE_ROOT)/ace/Thread.h \
+ $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Atomic_Op.i \
+ $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
+ $(ACE_ROOT)/ace/Free_List.h \
+ $(ACE_ROOT)/ace/Free_List.i \
+ $(ACE_ROOT)/ace/Free_List.cpp \
+ $(ACE_ROOT)/ace/Malloc_T.i \
+ $(ACE_ROOT)/ace/Malloc_T.cpp \
+ $(ACE_ROOT)/ace/Memory_Pool.h \
+ $(ACE_ROOT)/ace/Signal.h \
+ $(ACE_ROOT)/ace/Containers.h \
+ $(ACE_ROOT)/ace/Containers.i \
+ $(ACE_ROOT)/ace/Containers_T.h \
+ $(ACE_ROOT)/ace/Containers_T.i \
+ $(ACE_ROOT)/ace/Containers_T.cpp \
+ $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Mem_Map.h \
+ $(ACE_ROOT)/ace/Mem_Map.i \
+ $(ACE_ROOT)/ace/Memory_Pool.i \
+ $(ACE_ROOT)/ace/Message_Block.i \
+ $(ACE_ROOT)/ace/Message_Block_T.h \
+ $(ACE_ROOT)/ace/Message_Block_T.i \
+ $(ACE_ROOT)/ace/Message_Block_T.cpp \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/CDR_Stream.i \
+ $(TAO_ROOT)/tao/try_macros.h \
+ $(TAO_ROOT)/tao/orbconf.h \
+ $(ACE_ROOT)/ace/CORBA_macros.h \
+ $(TAO_ROOT)/tao/corbafwd.i \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/Managed_Types.h \
+ $(TAO_ROOT)/tao/Managed_Types.i \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/Sequence.h \
+ $(TAO_ROOT)/tao/Sequence.i \
+ $(TAO_ROOT)/tao/Sequence_T.h \
+ $(TAO_ROOT)/tao/Sequence_T.i \
+ $(TAO_ROOT)/tao/Sequence_T.cpp \
+ $(TAO_ROOT)/tao/varout.h \
+ $(TAO_ROOT)/tao/varout.i \
+ $(TAO_ROOT)/tao/varout.cpp \
+ $(TAO_ROOT)/tao/PolicyC.i \
+ $(TAO_ROOT)/tao/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
+ $(TAO_ROOT)/tao/Operation_Table.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+ $(ACE_ROOT)/ace/Functor.h \
+ $(ACE_ROOT)/ace/Functor.i \
+ $(ACE_ROOT)/ace/Functor_T.h \
+ $(ACE_ROOT)/ace/Functor_T.i \
+ $(ACE_ROOT)/ace/Functor_T.cpp \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Service_Config.h \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ $(ACE_ROOT)/ace/Service_Config.i \
+ $(ACE_ROOT)/ace/Reactor.h \
+ $(ACE_ROOT)/ace/Handle_Set.h \
+ $(ACE_ROOT)/ace/Handle_Set.i \
+ $(ACE_ROOT)/ace/Timer_Queue.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.i \
+ $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Reactor.i \
+ $(ACE_ROOT)/ace/Reactor_Impl.h \
+ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(ACE_ROOT)/ace/Message_Queue.h \
+ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.i \
+ $(ACE_ROOT)/ace/Message_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Strategies.h \
+ $(ACE_ROOT)/ace/Strategies_T.h \
+ $(ACE_ROOT)/ace/Synch_Options.h \
+ $(ACE_ROOT)/ace/Synch_Options.i \
+ $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Manager.i \
+ $(ACE_ROOT)/ace/Strategies_T.i \
+ $(ACE_ROOT)/ace/Strategies_T.cpp \
+ $(ACE_ROOT)/ace/Service_Repository.h \
+ $(ACE_ROOT)/ace/Service_Types.h \
+ $(ACE_ROOT)/ace/Service_Types.i \
+ $(ACE_ROOT)/ace/Service_Repository.i \
+ $(ACE_ROOT)/ace/WFMO_Reactor.h \
+ $(ACE_ROOT)/ace/WFMO_Reactor.i \
+ $(ACE_ROOT)/ace/Strategies.i \
+ $(ACE_ROOT)/ace/Message_Queue.i \
+ $(TAO_ROOT)/tao/IOPC.h \
+ $(TAO_ROOT)/tao/IOPC.i \
+ $(TAO_ROOT)/tao/Pluggable.i \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/Profile.h \
+ $(TAO_ROOT)/tao/Tagged_Components.h \
+ $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+ $(TAO_ROOT)/tao/CONV_FRAMEC.i \
+ $(TAO_ROOT)/tao/Tagged_Components.i \
+ $(TAO_ROOT)/tao/Profile.i \
+ $(TAO_ROOT)/tao/MProfile.i \
+ $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/IOR_LookupTable.h \
+ $(TAO_ROOT)/tao/Services.h \
+ $(TAO_ROOT)/tao/Services.i \
+ $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/IORS.h \
+ $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/IORC.i \
+ $(TAO_ROOT)/tao/IORS.i \
+ $(TAO_ROOT)/tao/Interceptor.h \
+ $(TAO_ROOT)/tao/InterceptorS.h \
+ $(TAO_ROOT)/tao/InterceptorC.h \
+ $(TAO_ROOT)/tao/Any.h \
+ $(TAO_ROOT)/tao/Any.i \
+ $(TAO_ROOT)/tao/InterceptorC.i \
+ $(TAO_ROOT)/tao/Interceptor.i \
+ $(TAO_ROOT)/tao/ORB.i \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/ORB_Core.h \
+ $(TAO_ROOT)/tao/Policy_Manager.h \
+ $(TAO_ROOT)/tao/POA_CORBA.h \
+ $(TAO_ROOT)/tao/DynAnyC.h \
+ $(TAO_ROOT)/tao/DynAnyC.i \
+ $(TAO_ROOT)/tao/DomainC.h \
+ $(TAO_ROOT)/tao/DomainC.i \
+ $(TAO_ROOT)/tao/Policy_Manager.i \
+ $(TAO_ROOT)/tao/Resource_Factory.h \
+ $(TAO_ROOT)/tao/Protocol_Factory.h \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
+ $(ACE_ROOT)/ace/Map_Manager.h \
+ $(ACE_ROOT)/ace/Map_Manager.i \
+ $(ACE_ROOT)/ace/Map_Manager.cpp \
+ $(TAO_ROOT)/tao/ORB_Core.i \
+ $(ACE_ROOT)/ace/Dynamic_Service.h \
+ $(ACE_ROOT)/ace/Dynamic_Service.cpp \
+ $(TAO_ROOT)/tao/Server_Request.h \
+ $(TAO_ROOT)/tao/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/Server_Request.i \
+ $(TAO_ROOT)/tao/NVList.h \
+ $(TAO_ROOT)/tao/NVList.i \
+ $(TAO_ROOT)/tao/Object_Adapter.h \
+ $(TAO_ROOT)/tao/Key_Adapters.h \
+ $(ACE_ROOT)/ace/Map.h \
+ $(ACE_ROOT)/ace/Map.i \
+ $(ACE_ROOT)/ace/Map_T.h \
+ $(ACE_ROOT)/ace/Pair.h \
+ $(ACE_ROOT)/ace/Pair.i \
+ $(ACE_ROOT)/ace/Pair_T.h \
+ $(ACE_ROOT)/ace/Pair_T.i \
+ $(ACE_ROOT)/ace/Pair_T.cpp \
+ $(ACE_ROOT)/ace/Active_Map_Manager.h \
+ $(ACE_ROOT)/ace/Active_Map_Manager.i \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Map_T.i \
+ $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/Key_Adapters.i \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/POAS.h \
+ $(TAO_ROOT)/tao/POAS.i \
+ $(TAO_ROOT)/tao/Active_Object_Map.h \
+ $(TAO_ROOT)/tao/Active_Object_Map.i \
+ $(TAO_ROOT)/tao/Object_Adapter.i \
+ $(TAO_ROOT)/tao/Invocation.h \
+ $(TAO_ROOT)/tao/Reply_Dispatcher.h \
+ $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
+ $(TAO_ROOT)/tao/MessagingC.h \
+ $(TAO_ROOT)/tao/TimeBaseC.h \
+ $(TAO_ROOT)/tao/TimeBaseC.i \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/MessagingC.i \
+ $(TAO_ROOT)/tao/Request.i \
+ $(TAO_ROOT)/tao/GIOP_Utils.h \
+ $(TAO_ROOT)/tao/Pluggable_Messaging.h \
+ $(TAO_ROOT)/tao/target_identifier.h \
+ $(TAO_ROOT)/tao/target_identifier.i \
+ $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \
+ $(TAO_ROOT)/tao/Pluggable_Messaging.i \
+ $(TAO_ROOT)/tao/GIOP_Utils.i \
+ $(TAO_ROOT)/tao/Reply_Dispatcher.i \
+ $(TAO_ROOT)/tao/TAOC.h \
+ $(TAO_ROOT)/tao/TAOC.i \
+ $(TAO_ROOT)/tao/Invocation.i \
+ $(TAO_ROOT)/tao/ImplRepoC.i ImplRepoS_T.h \
+ ImplRepoS_T.i ImplRepoS_T.cpp ImplRepoS.i
+
 .obj/Pluggable.o .obj/Pluggable.so .shobj/Pluggable.o .shobj/Pluggable.so: Pluggable.cpp \
  $(TAO_ROOT)/tao/Pluggable.h \
  $(TAO_ROOT)/tao/corbafwd.h \
@@ -2164,6 +2892,7 @@ realclean:
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config-sunos5.6.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -2391,6 +3120,7 @@ realclean:
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config-sunos5.6.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -2496,6 +3226,7 @@ realclean:
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config-sunos5.6.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -2697,6 +3428,7 @@ realclean:
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config-sunos5.6.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -2900,6 +3632,7 @@ realclean:
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config-sunos5.6.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -3050,6 +3783,7 @@ realclean:
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config-sunos5.6.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -3235,13 +3969,11 @@ realclean:
  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \
  $(TAO_ROOT)/tao/Pluggable_Messaging.i \
  $(TAO_ROOT)/tao/GIOP_Utils.i \
- $(TAO_ROOT)/tao/GIOP_Message_Acceptors.h \
- $(TAO_ROOT)/tao/GIOP_Message_Base.h \
- $(TAO_ROOT)/tao/GIOP_Message_Base.i \
- $(TAO_ROOT)/tao/GIOP_Message_Accept_State.h \
- $(TAO_ROOT)/tao/GIOP_Server_Request.h \
- $(TAO_ROOT)/tao/Server_Request.h \
- $(TAO_ROOT)/tao/Server_Request.i \
+ $(TAO_ROOT)/tao/IIOP_Connect.i \
+ $(TAO_ROOT)/tao/Acceptor_Impl.h \
+ $(TAO_ROOT)/tao/Acceptor_Impl.i \
+ $(TAO_ROOT)/tao/Acceptor_Impl.cpp \
+ $(TAO_ROOT)/tao/ORB_Core.h \
  $(TAO_ROOT)/tao/ORB.h \
  $(TAO_ROOT)/tao/IOR_LookupTable.h \
  $(TAO_ROOT)/tao/Services.h \
@@ -3269,23 +4001,6 @@ realclean:
  $(TAO_ROOT)/tao/InterceptorC.i \
  $(TAO_ROOT)/tao/Interceptor.i \
  $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/Principal.i \
- $(TAO_ROOT)/tao/GIOP_Server_Request.i \
- $(TAO_ROOT)/tao/GIOP_Assorted_Headers.h \
- $(TAO_ROOT)/tao/GIOPC.h \
- $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/GIOPC.i \
- $(TAO_ROOT)/tao/GIOP_Assorted_Headers.i \
- $(TAO_ROOT)/tao/GIOP_Message_Accept_State.i \
- $(TAO_ROOT)/tao/GIOP_Message_Acceptors.i \
- $(TAO_ROOT)/tao/GIOP_Message_Connectors.h \
- $(TAO_ROOT)/tao/GIOP_Message_Connectors.i \
- $(TAO_ROOT)/tao/IIOP_Connect.i \
- $(TAO_ROOT)/tao/Acceptor_Impl.h \
- $(TAO_ROOT)/tao/Acceptor_Impl.i \
- $(TAO_ROOT)/tao/Acceptor_Impl.cpp \
- $(TAO_ROOT)/tao/ORB_Core.h \
  $(TAO_ROOT)/tao/Policy_Manager.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -3335,7 +4050,9 @@ realclean:
  $(ACE_ROOT)/ace/Caching_Strategies_T.i \
  $(ACE_ROOT)/ace/Caching_Strategies_T.cpp \
  $(ACE_ROOT)/ace/Cached_Connect_Strategy_T.i \
- $(ACE_ROOT)/ace/Cached_Connect_Strategy_T.cpp
+ $(ACE_ROOT)/ace/Cached_Connect_Strategy_T.cpp \
+ $(ACE_ROOT)/ace/Get_Opt.h \
+ $(ACE_ROOT)/ace/Get_Opt.i
 
 .obj/IIOP_Profile.o .obj/IIOP_Profile.so .shobj/IIOP_Profile.o .shobj/IIOP_Profile.so: IIOP_Profile.cpp \
  $(TAO_ROOT)/tao/IIOP_Profile.h \
@@ -3348,6 +4065,7 @@ realclean:
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config-sunos5.6.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -3564,25 +4282,6 @@ realclean:
  $(ACE_ROOT)/ace/SOCK_Acceptor.i \
  $(TAO_ROOT)/tao/Wait_Strategy.h \
  $(TAO_ROOT)/tao/IIOP_Transport.h \
- $(TAO_ROOT)/tao/GIOP_Message_Acceptors.h \
- $(TAO_ROOT)/tao/GIOP_Message_Base.h \
- $(TAO_ROOT)/tao/GIOP_Message_Base.i \
- $(TAO_ROOT)/tao/GIOP_Message_Accept_State.h \
- $(TAO_ROOT)/tao/GIOP_Server_Request.h \
- $(TAO_ROOT)/tao/Server_Request.h \
- $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/Principal.i \
- $(TAO_ROOT)/tao/GIOP_Server_Request.i \
- $(TAO_ROOT)/tao/GIOP_Assorted_Headers.h \
- $(TAO_ROOT)/tao/GIOPC.h \
- $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/GIOPC.i \
- $(TAO_ROOT)/tao/GIOP_Assorted_Headers.i \
- $(TAO_ROOT)/tao/GIOP_Message_Accept_State.i \
- $(TAO_ROOT)/tao/GIOP_Message_Acceptors.i \
- $(TAO_ROOT)/tao/GIOP_Message_Connectors.h \
- $(TAO_ROOT)/tao/GIOP_Message_Connectors.i \
  $(TAO_ROOT)/tao/IIOP_Connect.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
  $(TAO_ROOT)/tao/Policy_Manager.h \
@@ -3630,6 +4329,32 @@ realclean:
  $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/POAManager.i \
+ $(TAO_ROOT)/tao/ImplRepoC.h \
+ $(TAO_ROOT)/tao/Operation_Table.h \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/MProfile.i \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/Server_Request.h \
+ $(TAO_ROOT)/tao/Server_Request.i \
+ $(TAO_ROOT)/tao/NVList.h \
+ $(TAO_ROOT)/tao/NVList.i \
+ $(TAO_ROOT)/tao/Invocation.h \
+ $(TAO_ROOT)/tao/Reply_Dispatcher.h \
+ $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
+ $(TAO_ROOT)/tao/MessagingC.h \
+ $(TAO_ROOT)/tao/TimeBaseC.h \
+ $(TAO_ROOT)/tao/TimeBaseC.i \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/MessagingC.i \
+ $(TAO_ROOT)/tao/Request.i \
+ $(TAO_ROOT)/tao/Reply_Dispatcher.i \
+ $(TAO_ROOT)/tao/TAOC.h \
+ $(TAO_ROOT)/tao/TAOC.i \
+ $(TAO_ROOT)/tao/Invocation.i \
+ $(TAO_ROOT)/tao/ImplRepoC.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/debug.h
 
@@ -3644,6 +4369,7 @@ realclean:
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config-sunos5.6.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -3825,13 +4551,14 @@ realclean:
  $(ACE_ROOT)/ace/Time_Value.h \
  $(ACE_ROOT)/ace/SOCK_Acceptor.i \
  $(TAO_ROOT)/tao/Wait_Strategy.h \
- $(TAO_ROOT)/tao/GIOP_Message_Acceptors.h \
- $(TAO_ROOT)/tao/GIOP_Message_Base.h \
- $(TAO_ROOT)/tao/GIOP_Message_Base.i \
- $(TAO_ROOT)/tao/GIOP_Message_Accept_State.h \
- $(TAO_ROOT)/tao/GIOP_Server_Request.h \
- $(TAO_ROOT)/tao/Server_Request.h \
- $(TAO_ROOT)/tao/Server_Request.i \
+ $(TAO_ROOT)/tao/IIOP_Connect.i \
+ $(TAO_ROOT)/tao/IIOP_Profile.h \
+ $(TAO_ROOT)/tao/Profile.h \
+ $(TAO_ROOT)/tao/Tagged_Components.h \
+ $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+ $(TAO_ROOT)/tao/CONV_FRAMEC.i \
+ $(TAO_ROOT)/tao/Tagged_Components.i \
+ $(TAO_ROOT)/tao/Profile.i \
  $(TAO_ROOT)/tao/ORB.h \
  $(TAO_ROOT)/tao/IOR_LookupTable.h \
  $(TAO_ROOT)/tao/Services.h \
@@ -3859,26 +4586,6 @@ realclean:
  $(TAO_ROOT)/tao/InterceptorC.i \
  $(TAO_ROOT)/tao/Interceptor.i \
  $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/Principal.i \
- $(TAO_ROOT)/tao/GIOP_Server_Request.i \
- $(TAO_ROOT)/tao/GIOP_Assorted_Headers.h \
- $(TAO_ROOT)/tao/GIOPC.h \
- $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/GIOPC.i \
- $(TAO_ROOT)/tao/GIOP_Assorted_Headers.i \
- $(TAO_ROOT)/tao/GIOP_Message_Accept_State.i \
- $(TAO_ROOT)/tao/GIOP_Message_Acceptors.i \
- $(TAO_ROOT)/tao/GIOP_Message_Connectors.h \
- $(TAO_ROOT)/tao/GIOP_Message_Connectors.i \
- $(TAO_ROOT)/tao/IIOP_Connect.i \
- $(TAO_ROOT)/tao/IIOP_Profile.h \
- $(TAO_ROOT)/tao/Profile.h \
- $(TAO_ROOT)/tao/Tagged_Components.h \
- $(TAO_ROOT)/tao/CONV_FRAMEC.h \
- $(TAO_ROOT)/tao/CONV_FRAMEC.i \
- $(TAO_ROOT)/tao/Tagged_Components.i \
- $(TAO_ROOT)/tao/Profile.i \
  $(TAO_ROOT)/tao/IIOP_Profile.i \
  $(TAO_ROOT)/tao/Timeprobe.h \
  $(ACE_ROOT)/ace/Timeprobe.h \
@@ -3924,6 +4631,7 @@ realclean:
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config-sunos5.6.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -4114,52 +4822,6 @@ realclean:
  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \
  $(TAO_ROOT)/tao/Pluggable_Messaging.i \
  $(TAO_ROOT)/tao/GIOP_Utils.i \
- $(TAO_ROOT)/tao/GIOP_Message_Acceptors.h \
- $(TAO_ROOT)/tao/GIOP_Message_Base.h \
- $(TAO_ROOT)/tao/GIOP_Message_Base.i \
- $(TAO_ROOT)/tao/GIOP_Message_Accept_State.h \
- $(TAO_ROOT)/tao/GIOP_Server_Request.h \
- $(TAO_ROOT)/tao/Server_Request.h \
- $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/IOR_LookupTable.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/IORS.i \
- $(TAO_ROOT)/tao/Interceptor.h \
- $(TAO_ROOT)/tao/InterceptorS.h \
- $(TAO_ROOT)/tao/InterceptorC.h \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/InterceptorC.i \
- $(TAO_ROOT)/tao/Interceptor.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/Principal.i \
- $(TAO_ROOT)/tao/GIOP_Server_Request.i \
- $(TAO_ROOT)/tao/GIOP_Assorted_Headers.h \
- $(TAO_ROOT)/tao/GIOPC.h \
- $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/GIOPC.i \
- $(TAO_ROOT)/tao/GIOP_Assorted_Headers.i \
- $(TAO_ROOT)/tao/GIOP_Message_Accept_State.i \
- $(TAO_ROOT)/tao/GIOP_Message_Acceptors.i \
- $(TAO_ROOT)/tao/GIOP_Message_Connectors.h \
- $(TAO_ROOT)/tao/GIOP_Message_Connectors.i \
  $(TAO_ROOT)/tao/IIOP_Connect.i \
  $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/Protocol_Factory.h \
@@ -4193,6 +4855,33 @@ realclean:
  $(TAO_ROOT)/tao/CONV_FRAMEC.i \
  $(TAO_ROOT)/tao/Tagged_Components.i \
  $(TAO_ROOT)/tao/Profile.i \
+ $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/IOR_LookupTable.h \
+ $(TAO_ROOT)/tao/Services.h \
+ $(TAO_ROOT)/tao/Services.i \
+ $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/IORS.h \
+ $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/IORC.i \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/PolicyC.i \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(TAO_ROOT)/tao/Servant_Base.i \
+ $(TAO_ROOT)/tao/IORS.i \
+ $(TAO_ROOT)/tao/Interceptor.h \
+ $(TAO_ROOT)/tao/InterceptorS.h \
+ $(TAO_ROOT)/tao/InterceptorC.h \
+ $(TAO_ROOT)/tao/Any.h \
+ $(TAO_ROOT)/tao/Any.i \
+ $(TAO_ROOT)/tao/InterceptorC.i \
+ $(TAO_ROOT)/tao/Interceptor.i \
+ $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/IIOP_Profile.i \
  $(TAO_ROOT)/tao/debug.h \
  $(TAO_ROOT)/tao/ORB_Core.h \
@@ -4224,6 +4913,7 @@ realclean:
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config-sunos5.6.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -4406,13 +5096,11 @@ realclean:
  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \
  $(TAO_ROOT)/tao/Pluggable_Messaging.i \
  $(TAO_ROOT)/tao/GIOP_Utils.i \
- $(TAO_ROOT)/tao/GIOP_Message_Acceptors.h \
- $(TAO_ROOT)/tao/GIOP_Message_Base.h \
- $(TAO_ROOT)/tao/GIOP_Message_Base.i \
- $(TAO_ROOT)/tao/GIOP_Message_Accept_State.h \
- $(TAO_ROOT)/tao/GIOP_Server_Request.h \
- $(TAO_ROOT)/tao/Server_Request.h \
- $(TAO_ROOT)/tao/Server_Request.i \
+ $(TAO_ROOT)/tao/IIOP_Connect.i \
+ $(TAO_ROOT)/tao/Acceptor_Impl.h \
+ $(TAO_ROOT)/tao/Acceptor_Impl.i \
+ $(TAO_ROOT)/tao/Acceptor_Impl.cpp \
+ $(TAO_ROOT)/tao/ORB_Core.h \
  $(TAO_ROOT)/tao/ORB.h \
  $(TAO_ROOT)/tao/IOR_LookupTable.h \
  $(TAO_ROOT)/tao/Services.h \
@@ -4440,23 +5128,6 @@ realclean:
  $(TAO_ROOT)/tao/InterceptorC.i \
  $(TAO_ROOT)/tao/Interceptor.i \
  $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/Principal.i \
- $(TAO_ROOT)/tao/GIOP_Server_Request.i \
- $(TAO_ROOT)/tao/GIOP_Assorted_Headers.h \
- $(TAO_ROOT)/tao/GIOPC.h \
- $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/GIOPC.i \
- $(TAO_ROOT)/tao/GIOP_Assorted_Headers.i \
- $(TAO_ROOT)/tao/GIOP_Message_Accept_State.i \
- $(TAO_ROOT)/tao/GIOP_Message_Acceptors.i \
- $(TAO_ROOT)/tao/GIOP_Message_Connectors.h \
- $(TAO_ROOT)/tao/GIOP_Message_Connectors.i \
- $(TAO_ROOT)/tao/IIOP_Connect.i \
- $(TAO_ROOT)/tao/Acceptor_Impl.h \
- $(TAO_ROOT)/tao/Acceptor_Impl.i \
- $(TAO_ROOT)/tao/Acceptor_Impl.cpp \
- $(TAO_ROOT)/tao/ORB_Core.h \
  $(TAO_ROOT)/tao/Policy_Manager.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -4499,6 +5170,7 @@ realclean:
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config-sunos5.6.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -4682,13 +5354,11 @@ realclean:
  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \
  $(TAO_ROOT)/tao/Pluggable_Messaging.i \
  $(TAO_ROOT)/tao/GIOP_Utils.i \
- $(TAO_ROOT)/tao/GIOP_Message_Acceptors.h \
- $(TAO_ROOT)/tao/GIOP_Message_Base.h \
- $(TAO_ROOT)/tao/GIOP_Message_Base.i \
- $(TAO_ROOT)/tao/GIOP_Message_Accept_State.h \
- $(TAO_ROOT)/tao/GIOP_Server_Request.h \
- $(TAO_ROOT)/tao/Server_Request.h \
- $(TAO_ROOT)/tao/Server_Request.i \
+ $(TAO_ROOT)/tao/IIOP_Connect.i \
+ $(TAO_ROOT)/tao/Timeprobe.h \
+ $(ACE_ROOT)/ace/Timeprobe.h \
+ $(TAO_ROOT)/tao/debug.h \
+ $(TAO_ROOT)/tao/ORB_Core.h \
  $(TAO_ROOT)/tao/ORB.h \
  $(TAO_ROOT)/tao/IOR_LookupTable.h \
  $(TAO_ROOT)/tao/Services.h \
@@ -4716,23 +5386,6 @@ realclean:
  $(TAO_ROOT)/tao/InterceptorC.i \
  $(TAO_ROOT)/tao/Interceptor.i \
  $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/Principal.i \
- $(TAO_ROOT)/tao/GIOP_Server_Request.i \
- $(TAO_ROOT)/tao/GIOP_Assorted_Headers.h \
- $(TAO_ROOT)/tao/GIOPC.h \
- $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/GIOPC.i \
- $(TAO_ROOT)/tao/GIOP_Assorted_Headers.i \
- $(TAO_ROOT)/tao/GIOP_Message_Accept_State.i \
- $(TAO_ROOT)/tao/GIOP_Message_Acceptors.i \
- $(TAO_ROOT)/tao/GIOP_Message_Connectors.h \
- $(TAO_ROOT)/tao/GIOP_Message_Connectors.i \
- $(TAO_ROOT)/tao/IIOP_Connect.i \
- $(TAO_ROOT)/tao/Timeprobe.h \
- $(ACE_ROOT)/ace/Timeprobe.h \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/ORB_Core.h \
  $(TAO_ROOT)/tao/Policy_Manager.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
@@ -4763,7 +5416,28 @@ realclean:
  $(TAO_ROOT)/tao/PollableC.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/MessagingS.i \
- $(TAO_ROOT)/tao/Messaging_Policy_i.i
+ $(TAO_ROOT)/tao/Messaging_Policy_i.i \
+ $(TAO_ROOT)/tao/GIOP_Message_Lite.h \
+ $(TAO_ROOT)/tao/GIOP_Message_Base.h \
+ $(TAO_ROOT)/tao/GIOP_Message_Base.i \
+ $(TAO_ROOT)/tao/GIOP_Server_Request.h \
+ $(TAO_ROOT)/tao/Server_Request.h \
+ $(TAO_ROOT)/tao/Server_Request.i \
+ $(TAO_ROOT)/tao/Principal.h \
+ $(TAO_ROOT)/tao/Principal.i \
+ $(TAO_ROOT)/tao/GIOP_Server_Request.i \
+ $(TAO_ROOT)/tao/GIOP_Assorted_Headers.h \
+ $(TAO_ROOT)/tao/GIOPC.h \
+ $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/GIOPC.i \
+ $(TAO_ROOT)/tao/GIOP_Assorted_Headers.i \
+ $(TAO_ROOT)/tao/GIOP_Message_Lite.i \
+ $(TAO_ROOT)/tao/GIOP_Message_Acceptors.h \
+ $(TAO_ROOT)/tao/GIOP_Message_Accept_State.h \
+ $(TAO_ROOT)/tao/GIOP_Message_Accept_State.i \
+ $(TAO_ROOT)/tao/GIOP_Message_Acceptors.i \
+ $(TAO_ROOT)/tao/GIOP_Message_Connectors.h \
+ $(TAO_ROOT)/tao/GIOP_Message_Connectors.i
 
 .obj/UIOP_Factory.o .obj/UIOP_Factory.so .shobj/UIOP_Factory.o .shobj/UIOP_Factory.so: UIOP_Factory.cpp \
  $(TAO_ROOT)/tao/UIOP_Factory.h \
@@ -4775,6 +5449,7 @@ realclean:
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config-sunos5.6.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -5082,6 +5757,7 @@ realclean:
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config-sunos5.6.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -5372,6 +6048,30 @@ realclean:
  $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/POAManager.i \
+ $(TAO_ROOT)/tao/ImplRepoC.h \
+ $(TAO_ROOT)/tao/Operation_Table.h \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/MProfile.i \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/NVList.h \
+ $(TAO_ROOT)/tao/NVList.i \
+ $(TAO_ROOT)/tao/Invocation.h \
+ $(TAO_ROOT)/tao/Reply_Dispatcher.h \
+ $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
+ $(TAO_ROOT)/tao/MessagingC.h \
+ $(TAO_ROOT)/tao/TimeBaseC.h \
+ $(TAO_ROOT)/tao/TimeBaseC.i \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/MessagingC.i \
+ $(TAO_ROOT)/tao/Request.i \
+ $(TAO_ROOT)/tao/Reply_Dispatcher.i \
+ $(TAO_ROOT)/tao/TAOC.h \
+ $(TAO_ROOT)/tao/TAOC.i \
+ $(TAO_ROOT)/tao/Invocation.i \
+ $(TAO_ROOT)/tao/ImplRepoC.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/debug.h
 
@@ -5386,6 +6086,7 @@ realclean:
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config-sunos5.6.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -5674,6 +6375,7 @@ realclean:
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config-sunos5.6.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -5983,6 +6685,7 @@ realclean:
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config-sunos5.6.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -6268,6 +6971,7 @@ realclean:
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config-sunos5.6.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -6544,6 +7248,7 @@ realclean:
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config-sunos5.6.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -6771,6 +7476,7 @@ realclean:
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config-sunos5.6.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -6884,6 +7590,7 @@ realclean:
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config-sunos5.6.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -7069,6 +7776,7 @@ realclean:
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config-sunos5.6.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -7275,6 +7983,7 @@ realclean:
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config-sunos5.6.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -7468,6 +8177,7 @@ realclean:
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config-sunos5.6.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -7706,6 +8416,7 @@ realclean:
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config-sunos5.6.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -7873,6 +8584,7 @@ realclean:
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config-sunos5.6.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -8023,6 +8735,7 @@ realclean:
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config-sunos5.6.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -8178,6 +8891,7 @@ realclean:
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config-sunos5.6.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -8385,6 +9099,7 @@ realclean:
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config-sunos5.6.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -8574,6 +9289,7 @@ realclean:
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config-sunos5.6.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -8763,6 +9479,7 @@ realclean:
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config-sunos5.6.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -8864,6 +9581,7 @@ realclean:
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config-sunos5.6.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -9018,6 +9736,7 @@ realclean:
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config-sunos5.6.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -9173,6 +9892,7 @@ realclean:
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config-sunos5.6.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -9322,6 +10042,7 @@ realclean:
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config-sunos5.6.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -9397,6 +10118,7 @@ realclean:
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config-sunos5.6.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -9553,6 +10275,7 @@ realclean:
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config-sunos5.6.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -9748,6 +10471,7 @@ realclean:
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config-sunos5.6.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -9936,6 +10660,7 @@ realclean:
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config-sunos5.6.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -10081,6 +10806,7 @@ realclean:
  $(ACE_ROOT)/ace/Message_Block.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Trace.h \
@@ -10166,6 +10892,7 @@ realclean:
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config-sunos5.6.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -10249,6 +10976,7 @@ realclean:
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config-sunos5.6.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -10440,6 +11168,7 @@ realclean:
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config-sunos5.6.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -10698,6 +11427,7 @@ realclean:
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config-sunos5.6.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -10849,6 +11579,7 @@ realclean:
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config-sunos5.6.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -11109,7 +11840,12 @@ realclean:
  $(TAO_ROOT)/tao/Object_KeyC.i \
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/ImplRepoC.h \
+ $(TAO_ROOT)/tao/Operation_Table.h \
+ $(TAO_ROOT)/tao/Server_Request.h \
+ $(TAO_ROOT)/tao/Server_Request.i \
+ $(TAO_ROOT)/tao/Invocation.h \
+ $(TAO_ROOT)/tao/Reply_Dispatcher.h \
  $(TAO_ROOT)/tao/Request.h \
  $(TAO_ROOT)/tao/Context.h \
  $(TAO_ROOT)/tao/Context.i \
@@ -11119,6 +11855,19 @@ realclean:
  $(TAO_ROOT)/tao/PollableC.h \
  $(TAO_ROOT)/tao/MessagingC.i \
  $(TAO_ROOT)/tao/Request.i \
+ $(TAO_ROOT)/tao/GIOP_Utils.h \
+ $(TAO_ROOT)/tao/Pluggable_Messaging.h \
+ $(TAO_ROOT)/tao/target_identifier.h \
+ $(TAO_ROOT)/tao/target_identifier.i \
+ $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \
+ $(TAO_ROOT)/tao/Pluggable_Messaging.i \
+ $(TAO_ROOT)/tao/GIOP_Utils.i \
+ $(TAO_ROOT)/tao/Reply_Dispatcher.i \
+ $(TAO_ROOT)/tao/TAOC.h \
+ $(TAO_ROOT)/tao/TAOC.i \
+ $(TAO_ROOT)/tao/Invocation.i \
+ $(TAO_ROOT)/tao/ImplRepoC.i \
+ $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/ValueFactory_Map.h \
  $(TAO_ROOT)/tao/ValueFactory_Map.i \
  $(TAO_ROOT)/tao/Messaging_Policy_i.h \
@@ -11132,8 +11881,6 @@ realclean:
  $(TAO_ROOT)/tao/Messaging_Policy_i.i \
  $(TAO_ROOT)/tao/Client_Priority_Policy.h \
  $(TAO_ROOT)/tao/TAOS.h \
- $(TAO_ROOT)/tao/TAOC.h \
- $(TAO_ROOT)/tao/TAOC.i \
  $(TAO_ROOT)/tao/TAOS_T.h \
  $(TAO_ROOT)/tao/TAOS_T.i \
  $(TAO_ROOT)/tao/TAOS_T.cpp \
@@ -11151,6 +11898,7 @@ realclean:
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config-sunos5.6.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -11231,6 +11979,7 @@ realclean:
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config-sunos5.6.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -11458,6 +12207,7 @@ realclean:
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config-sunos5.6.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -11616,6 +12366,7 @@ realclean:
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config-sunos5.6.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -11842,6 +12593,7 @@ realclean:
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config-sunos5.6.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -12005,6 +12757,7 @@ realclean:
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config-sunos5.6.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -12102,6 +12855,7 @@ realclean:
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config-sunos5.6.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -12195,6 +12949,7 @@ realclean:
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config-sunos5.6.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -12292,6 +13047,7 @@ realclean:
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config-sunos5.6.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -12381,6 +13137,7 @@ realclean:
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config-sunos5.6.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -12582,6 +13339,7 @@ realclean:
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config-sunos5.6.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -12738,6 +13496,7 @@ realclean:
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config-sunos5.6.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -12991,6 +13750,7 @@ realclean:
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config-sunos5.6.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -13096,6 +13856,7 @@ realclean:
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config-sunos5.6.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -13289,6 +14050,7 @@ realclean:
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config-sunos5.6.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -13365,6 +14127,7 @@ realclean:
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config-sunos5.6.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -13518,6 +14281,7 @@ realclean:
  $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/Timeprobe.h \
  $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -13718,6 +14482,7 @@ realclean:
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config-sunos5.6.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -13800,6 +14565,7 @@ realclean:
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config-sunos5.6.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -13878,6 +14644,7 @@ realclean:
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config-sunos5.6.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -13974,6 +14741,7 @@ realclean:
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config-sunos5.6.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -14224,6 +14992,7 @@ realclean:
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config-sunos5.6.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -14337,6 +15106,7 @@ realclean:
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config-sunos5.6.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -14449,6 +15219,7 @@ realclean:
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config-sunos5.6.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -14565,6 +15336,7 @@ realclean:
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config-sunos5.6.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -14798,6 +15570,7 @@ realclean:
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config-sunos5.6.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -15042,6 +15815,35 @@ realclean:
  $(TAO_ROOT)/tao/Object_KeyC.i \
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/POAManager.i \
+ $(TAO_ROOT)/tao/ImplRepoC.h \
+ $(TAO_ROOT)/tao/Operation_Table.h \
+ $(TAO_ROOT)/tao/Server_Request.h \
+ $(TAO_ROOT)/tao/Server_Request.i \
+ $(TAO_ROOT)/tao/NVList.h \
+ $(TAO_ROOT)/tao/NVList.i \
+ $(TAO_ROOT)/tao/Invocation.h \
+ $(TAO_ROOT)/tao/Reply_Dispatcher.h \
+ $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
+ $(TAO_ROOT)/tao/MessagingC.h \
+ $(TAO_ROOT)/tao/TimeBaseC.h \
+ $(TAO_ROOT)/tao/TimeBaseC.i \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/MessagingC.i \
+ $(TAO_ROOT)/tao/Request.i \
+ $(TAO_ROOT)/tao/GIOP_Utils.h \
+ $(TAO_ROOT)/tao/Pluggable_Messaging.h \
+ $(TAO_ROOT)/tao/target_identifier.h \
+ $(TAO_ROOT)/tao/target_identifier.i \
+ $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \
+ $(TAO_ROOT)/tao/Pluggable_Messaging.i \
+ $(TAO_ROOT)/tao/GIOP_Utils.i \
+ $(TAO_ROOT)/tao/Reply_Dispatcher.i \
+ $(TAO_ROOT)/tao/TAOC.h \
+ $(TAO_ROOT)/tao/TAOC.i \
+ $(TAO_ROOT)/tao/Invocation.i \
+ $(TAO_ROOT)/tao/ImplRepoC.i \
  $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/Priority_Mapping.h \
  $(TAO_ROOT)/tao/rtcorbafwd.h \
@@ -15052,10 +15854,6 @@ realclean:
  $(ACE_ROOT)/ace/Addr.i \
  $(ACE_ROOT)/ace/INET_Addr.i \
  $(TAO_ROOT)/tao/Sync_Strategies.h \
- $(TAO_ROOT)/tao/TAOC.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/tao/TAOC.i \
  $(TAO_ROOT)/tao/Sync_Strategies.i
 
 .obj/Leader_Follower.o .obj/Leader_Follower.so .shobj/Leader_Follower.o .shobj/Leader_Follower.so: Leader_Follower.cpp \
@@ -15069,6 +15867,7 @@ realclean:
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config-sunos5.6.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -15261,6 +16060,7 @@ realclean:
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config-sunos5.6.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -15341,6 +16141,7 @@ realclean:
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config-sunos5.6.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -15538,6 +16339,7 @@ realclean:
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config-sunos5.6.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -15735,6 +16537,7 @@ realclean:
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config-sunos5.6.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -15838,6 +16641,7 @@ realclean:
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config-sunos5.6.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -16036,6 +16840,7 @@ realclean:
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config-sunos5.6.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -16118,6 +16923,7 @@ realclean:
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config-sunos5.6.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -16332,6 +17138,7 @@ realclean:
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config-sunos5.6.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -16489,6 +17296,7 @@ realclean:
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config-sunos5.6.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -16652,6 +17460,7 @@ realclean:
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config-sunos5.6.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -16775,6 +17584,7 @@ realclean:
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config-sunos5.6.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -16926,6 +17736,7 @@ realclean:
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config-sunos5.6.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -17123,6 +17934,7 @@ realclean:
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config-sunos5.6.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -17316,6 +18128,7 @@ realclean:
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config-sunos5.6.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -17534,6 +18347,7 @@ realclean:
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config-sunos5.6.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -17635,6 +18449,7 @@ realclean:
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config-sunos5.6.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -17735,6 +18550,7 @@ realclean:
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config-sunos5.6.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -17801,156 +18617,7 @@ realclean:
  $(TAO_ROOT)/tao/try_macros.h \
  $(TAO_ROOT)/tao/orbconf.h \
  $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/POA_CORBA.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/DynAnyC.h \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue_T.h \
- $(ACE_ROOT)/ace/Message_Queue_T.i \
- $(ACE_ROOT)/ace/Message_Queue_T.cpp \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Strategies_T.i \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(ACE_ROOT)/ace/Strategies.i \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/MProfile.h \
- $(TAO_ROOT)/tao/Profile.h \
- $(TAO_ROOT)/tao/Tagged_Components.h \
- $(TAO_ROOT)/tao/CONV_FRAMEC.h \
- $(TAO_ROOT)/tao/CONV_FRAMEC.i \
- $(TAO_ROOT)/tao/Tagged_Components.i \
- $(TAO_ROOT)/tao/Profile.i \
- $(TAO_ROOT)/tao/MProfile.i \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/IOR_LookupTable.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/IORManipulation.h \
- $(TAO_ROOT)/tao/IORS.h \
- $(TAO_ROOT)/tao/IORC.h \
- $(TAO_ROOT)/tao/IORC.i \
- $(TAO_ROOT)/tao/IORS.i \
- $(TAO_ROOT)/tao/Interceptor.h \
- $(TAO_ROOT)/tao/InterceptorS.h \
- $(TAO_ROOT)/tao/InterceptorC.h \
- $(TAO_ROOT)/tao/InterceptorC.i \
- $(TAO_ROOT)/tao/Interceptor.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/Invocation.h \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Policy_Manager.i \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/Protocol_Factory.h \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(ACE_ROOT)/ace/Dynamic_Service.cpp \
- $(TAO_ROOT)/tao/Reply_Dispatcher.h \
- $(TAO_ROOT)/tao/Request.h \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
- $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/Request.i \
- $(TAO_ROOT)/tao/GIOP_Utils.h \
- $(TAO_ROOT)/tao/Pluggable_Messaging.h \
- $(TAO_ROOT)/tao/target_identifier.h \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/target_identifier.i \
- $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \
- $(TAO_ROOT)/tao/Pluggable_Messaging.i \
- $(TAO_ROOT)/tao/GIOP_Utils.i \
- $(TAO_ROOT)/tao/Reply_Dispatcher.i \
- $(TAO_ROOT)/tao/TAOC.h \
- $(TAO_ROOT)/tao/TAOC.i \
- $(TAO_ROOT)/tao/Invocation.i
+ $(TAO_ROOT)/tao/corbafwd.i
 
 .obj/PollableS.o .obj/PollableS.so .shobj/PollableS.o .shobj/PollableS.so: PollableS.cpp \
  $(TAO_ROOT)/tao/PollableS.h \
@@ -17963,6 +18630,7 @@ realclean:
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config-sunos5.6.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -18029,76 +18697,7 @@ realclean:
  $(TAO_ROOT)/tao/try_macros.h \
  $(TAO_ROOT)/tao/orbconf.h \
  $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/POA_CORBA.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/DynAnyC.h \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/PollableS.i \
- $(TAO_ROOT)/tao/Operation_Table.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(TAO_ROOT)/tao/Server_Request.h \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/Server_Request.i
+ $(TAO_ROOT)/tao/corbafwd.i
 
 .obj/CONV_FRAMEC.o .obj/CONV_FRAMEC.so .shobj/CONV_FRAMEC.o .shobj/CONV_FRAMEC.so: CONV_FRAMEC.cpp \
  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
@@ -18111,6 +18710,7 @@ realclean:
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config-sunos5.6.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -18213,6 +18813,7 @@ realclean:
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config-sunos5.6.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -18315,6 +18916,7 @@ realclean:
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config-sunos5.6.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -18413,6 +19015,7 @@ realclean:
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config-sunos5.6.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -18519,6 +19122,7 @@ realclean:
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config-sunos5.6.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -18670,6 +19274,7 @@ realclean:
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config-sunos5.6.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -18877,6 +19482,7 @@ realclean:
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config-sunos5.6.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -18974,6 +19580,7 @@ realclean:
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config-sunos5.6.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -19130,6 +19737,7 @@ realclean:
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config-sunos5.6.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -19363,6 +19971,7 @@ realclean:
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config-sunos5.6.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -19607,6 +20216,7 @@ realclean:
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config-sunos5.6.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -19823,6 +20433,7 @@ realclean:
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config-sunos5.6.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -19951,6 +20562,7 @@ realclean:
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config-sunos5.6.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -20072,6 +20684,7 @@ realclean:
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config-sunos5.6.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -20192,6 +20805,7 @@ realclean:
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config-sunos5.6.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -20315,6 +20929,7 @@ realclean:
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config-sunos5.6.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -20441,6 +21056,7 @@ realclean:
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config-sunos5.6.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -20516,6 +21132,7 @@ realclean:
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config-sunos5.6.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -20597,6 +21214,7 @@ realclean:
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config-sunos5.6.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -20683,6 +21301,7 @@ realclean:
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config-sunos5.6.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -20774,6 +21393,7 @@ realclean:
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config-sunos5.6.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -20980,6 +21600,7 @@ realclean:
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config-sunos5.6.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -21190,6 +21811,7 @@ realclean:
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config-sunos5.6.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -21378,6 +22000,7 @@ realclean:
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config-sunos5.6.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -21490,6 +22113,7 @@ realclean:
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config-sunos5.6.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -21614,6 +22238,7 @@ realclean:
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config-sunos5.6.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -21729,6 +22354,7 @@ realclean:
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config-sunos5.6.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -21844,6 +22470,7 @@ realclean:
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config-sunos5.6.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -21959,6 +22586,7 @@ realclean:
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config-sunos5.6.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -22117,6 +22745,7 @@ realclean:
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config-sunos5.6.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -22234,6 +22863,7 @@ realclean:
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config-sunos5.6.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -22388,6 +23018,7 @@ realclean:
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config-sunos5.6.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -22606,7 +23237,8 @@ realclean:
  $(TAO_ROOT)/tao/TAOC.i \
  $(TAO_ROOT)/tao/Invocation.i
 
-.obj/Pluggable_Messaging.o .obj/Pluggable_Messaging.so .shobj/Pluggable_Messaging.o .shobj/Pluggable_Messaging.so: Pluggable_Messaging.cpp Pluggable_Messaging.h \
+.obj/Pluggable_Messaging.o .obj/Pluggable_Messaging.so .shobj/Pluggable_Messaging.o .shobj/Pluggable_Messaging.so: Pluggable_Messaging.cpp \
+ $(TAO_ROOT)/tao/Pluggable_Messaging.h \
  $(TAO_ROOT)/tao/corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/Message_Block.h \
@@ -22615,6 +23247,7 @@ realclean:
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config-sunos5.6.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -22756,7 +23389,8 @@ realclean:
  $(TAO_ROOT)/tao/Object_KeyC.i \
  $(TAO_ROOT)/tao/target_identifier.i \
  $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \
- $(TAO_ROOT)/tao/Pluggable_Messaging.i
+ $(TAO_ROOT)/tao/Pluggable_Messaging.i \
+ $(TAO_ROOT)/tao/debug.h
 
 .obj/GIOP_Message_Base.o .obj/GIOP_Message_Base.so .shobj/GIOP_Message_Base.o .shobj/GIOP_Message_Base.so: GIOP_Message_Base.cpp \
  $(TAO_ROOT)/tao/GIOP_Message_Base.h \
@@ -22769,6 +23403,7 @@ realclean:
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config-sunos5.6.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -22927,6 +23562,7 @@ realclean:
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config-sunos5.6.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -23079,7 +23715,15 @@ realclean:
  $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/debug.h \
  $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/Principal.i
+ $(TAO_ROOT)/tao/Principal.i \
+ $(TAO_ROOT)/tao/TAOC.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/PolicyC.i \
+ $(TAO_ROOT)/tao/TimeBaseC.h \
+ $(TAO_ROOT)/tao/TimeBaseC.i \
+ $(TAO_ROOT)/tao/TAOC.i
 
 .obj/GIOP_Message_Acceptors.o .obj/GIOP_Message_Acceptors.so .shobj/GIOP_Message_Acceptors.o .shobj/GIOP_Message_Acceptors.so: GIOP_Message_Acceptors.cpp \
  $(TAO_ROOT)/tao/GIOP_Message_Acceptors.h \
@@ -23093,6 +23737,7 @@ realclean:
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config-sunos5.6.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -23326,6 +23971,36 @@ realclean:
  $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POAManager.h \
  $(TAO_ROOT)/tao/POAManager.i \
+ $(TAO_ROOT)/tao/ImplRepoC.h \
+ $(TAO_ROOT)/tao/Operation_Table.h \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/Profile.h \
+ $(TAO_ROOT)/tao/Tagged_Components.h \
+ $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+ $(TAO_ROOT)/tao/CONV_FRAMEC.i \
+ $(TAO_ROOT)/tao/Tagged_Components.i \
+ $(TAO_ROOT)/tao/Profile.i \
+ $(TAO_ROOT)/tao/MProfile.i \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/NVList.h \
+ $(TAO_ROOT)/tao/NVList.i \
+ $(TAO_ROOT)/tao/Invocation.h \
+ $(TAO_ROOT)/tao/Reply_Dispatcher.h \
+ $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
+ $(TAO_ROOT)/tao/MessagingC.h \
+ $(TAO_ROOT)/tao/TimeBaseC.h \
+ $(TAO_ROOT)/tao/TimeBaseC.i \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/MessagingC.i \
+ $(TAO_ROOT)/tao/Request.i \
+ $(TAO_ROOT)/tao/Reply_Dispatcher.i \
+ $(TAO_ROOT)/tao/TAOC.h \
+ $(TAO_ROOT)/tao/TAOC.i \
+ $(TAO_ROOT)/tao/Invocation.i \
+ $(TAO_ROOT)/tao/ImplRepoC.i \
  $(TAO_ROOT)/tao/POA.i
 
 .obj/GIOP_Message_Accept_State.o .obj/GIOP_Message_Accept_State.so .shobj/GIOP_Message_Accept_State.o .shobj/GIOP_Message_Accept_State.so: GIOP_Message_Accept_State.cpp \
@@ -23339,6 +24014,7 @@ realclean:
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config-sunos5.6.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -23536,6 +24212,7 @@ realclean:
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config-sunos5.6.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -23738,6 +24415,7 @@ realclean:
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config-sunos5.6.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -23842,6 +24520,7 @@ realclean:
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config-sunos5.6.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -23942,6 +24621,7 @@ realclean:
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config-sunos5.6.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -24145,4 +24825,279 @@ realclean:
  $(ACE_ROOT)/ace/Timeprobe.h \
  $(TAO_ROOT)/tao/debug.h
 
+.obj/GIOP_Message_Lite.o .obj/GIOP_Message_Lite.so .shobj/GIOP_Message_Lite.o .shobj/GIOP_Message_Lite.so: GIOP_Message_Lite.cpp \
+ $(TAO_ROOT)/tao/GIOP_Message_Lite.h \
+ $(TAO_ROOT)/tao/GIOP_Message_Base.h \
+ $(TAO_ROOT)/tao/Pluggable_Messaging.h \
+ $(TAO_ROOT)/tao/corbafwd.h \
+ $(ACE_ROOT)/ace/CDR_Stream.h \
+ $(ACE_ROOT)/ace/Message_Block.h \
+ $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/Min_Max.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.i \
+ $(ACE_ROOT)/ace/Trace.h \
+ $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Log_Msg.h \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Based_Pointer_T.h \
+ $(ACE_ROOT)/ace/Based_Pointer_T.i \
+ $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
+ $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Synch.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
+ $(ACE_ROOT)/ace/Synch.i \
+ $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.i \
+ $(ACE_ROOT)/ace/Synch_T.i \
+ $(ACE_ROOT)/ace/Thread.h \
+ $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Atomic_Op.i \
+ $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(ACE_ROOT)/ace/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
+ $(ACE_ROOT)/ace/Free_List.h \
+ $(ACE_ROOT)/ace/Free_List.i \
+ $(ACE_ROOT)/ace/Free_List.cpp \
+ $(ACE_ROOT)/ace/Malloc_T.i \
+ $(ACE_ROOT)/ace/Malloc_T.cpp \
+ $(ACE_ROOT)/ace/Memory_Pool.h \
+ $(ACE_ROOT)/ace/Signal.h \
+ $(ACE_ROOT)/ace/Containers.h \
+ $(ACE_ROOT)/ace/Containers.i \
+ $(ACE_ROOT)/ace/Containers_T.h \
+ $(ACE_ROOT)/ace/Containers_T.i \
+ $(ACE_ROOT)/ace/Containers_T.cpp \
+ $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Mem_Map.h \
+ $(ACE_ROOT)/ace/Mem_Map.i \
+ $(ACE_ROOT)/ace/Memory_Pool.i \
+ $(ACE_ROOT)/ace/Message_Block.i \
+ $(ACE_ROOT)/ace/Message_Block_T.h \
+ $(ACE_ROOT)/ace/Message_Block_T.i \
+ $(ACE_ROOT)/ace/Message_Block_T.cpp \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/CDR_Stream.i \
+ $(TAO_ROOT)/tao/try_macros.h \
+ $(TAO_ROOT)/tao/orbconf.h \
+ $(ACE_ROOT)/ace/CORBA_macros.h \
+ $(TAO_ROOT)/tao/corbafwd.i \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(ACE_ROOT)/ace/Message_Queue.h \
+ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.h \
+ $(ACE_ROOT)/ace/Message_Queue_T.i \
+ $(ACE_ROOT)/ace/Message_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Strategies.h \
+ $(ACE_ROOT)/ace/Strategies_T.h \
+ $(ACE_ROOT)/ace/Service_Config.h \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ $(ACE_ROOT)/ace/Service_Config.i \
+ $(ACE_ROOT)/ace/Reactor.h \
+ $(ACE_ROOT)/ace/Handle_Set.h \
+ $(ACE_ROOT)/ace/Handle_Set.i \
+ $(ACE_ROOT)/ace/Timer_Queue.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.i \
+ $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Reactor.i \
+ $(ACE_ROOT)/ace/Reactor_Impl.h \
+ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+ $(ACE_ROOT)/ace/Synch_Options.h \
+ $(ACE_ROOT)/ace/Synch_Options.i \
+ $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Manager.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+ $(ACE_ROOT)/ace/Functor.h \
+ $(ACE_ROOT)/ace/Functor.i \
+ $(ACE_ROOT)/ace/Functor_T.h \
+ $(ACE_ROOT)/ace/Functor_T.i \
+ $(ACE_ROOT)/ace/Functor_T.cpp \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Strategies_T.i \
+ $(ACE_ROOT)/ace/Strategies_T.cpp \
+ $(ACE_ROOT)/ace/Service_Repository.h \
+ $(ACE_ROOT)/ace/Service_Types.h \
+ $(ACE_ROOT)/ace/Service_Types.i \
+ $(ACE_ROOT)/ace/Service_Repository.i \
+ $(ACE_ROOT)/ace/WFMO_Reactor.h \
+ $(ACE_ROOT)/ace/WFMO_Reactor.i \
+ $(ACE_ROOT)/ace/Strategies.i \
+ $(ACE_ROOT)/ace/Message_Queue.i \
+ $(TAO_ROOT)/tao/Sequence.h \
+ $(TAO_ROOT)/tao/Managed_Types.h \
+ $(TAO_ROOT)/tao/Managed_Types.i \
+ $(TAO_ROOT)/tao/Sequence.i \
+ $(TAO_ROOT)/tao/Sequence_T.h \
+ $(TAO_ROOT)/tao/Sequence_T.i \
+ $(TAO_ROOT)/tao/Sequence_T.cpp \
+ $(TAO_ROOT)/tao/varout.h \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/varout.i \
+ $(TAO_ROOT)/tao/varout.cpp \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/IOPC.h \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/IOPC.i \
+ $(TAO_ROOT)/tao/Pluggable.i \
+ $(TAO_ROOT)/tao/target_identifier.h \
+ $(TAO_ROOT)/tao/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/target_identifier.i \
+ $(TAO_ROOT)/tao/Pluggable_Messaging_Utils.h \
+ $(TAO_ROOT)/tao/Pluggable_Messaging.i \
+ $(TAO_ROOT)/tao/GIOP_Utils.h \
+ $(TAO_ROOT)/tao/GIOP_Utils.i \
+ $(TAO_ROOT)/tao/GIOP_Message_Base.i \
+ $(TAO_ROOT)/tao/GIOP_Server_Request.h \
+ $(TAO_ROOT)/tao/Server_Request.h \
+ $(TAO_ROOT)/tao/Server_Request.i \
+ $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/IOR_LookupTable.h \
+ $(TAO_ROOT)/tao/Services.h \
+ $(TAO_ROOT)/tao/Services.i \
+ $(TAO_ROOT)/tao/IORManipulation.h \
+ $(TAO_ROOT)/tao/IORS.h \
+ $(TAO_ROOT)/tao/IORC.h \
+ $(TAO_ROOT)/tao/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/IORC.i \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/PolicyC.i \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(TAO_ROOT)/tao/Servant_Base.i \
+ $(TAO_ROOT)/tao/IORS.i \
+ $(TAO_ROOT)/tao/Interceptor.h \
+ $(TAO_ROOT)/tao/InterceptorS.h \
+ $(TAO_ROOT)/tao/InterceptorC.h \
+ $(TAO_ROOT)/tao/Any.h \
+ $(TAO_ROOT)/tao/Any.i \
+ $(TAO_ROOT)/tao/InterceptorC.i \
+ $(TAO_ROOT)/tao/Interceptor.i \
+ $(TAO_ROOT)/tao/ORB.i \
+ $(TAO_ROOT)/tao/Principal.h \
+ $(TAO_ROOT)/tao/Principal.i \
+ $(TAO_ROOT)/tao/GIOP_Server_Request.i \
+ $(TAO_ROOT)/tao/GIOP_Assorted_Headers.h \
+ $(TAO_ROOT)/tao/GIOPC.h \
+ $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/GIOPC.i \
+ $(TAO_ROOT)/tao/GIOP_Assorted_Headers.i \
+ $(TAO_ROOT)/tao/GIOP_Message_Lite.i debug.h \
+ $(TAO_ROOT)/tao/TAOC.h \
+ $(TAO_ROOT)/tao/TimeBaseC.h \
+ $(TAO_ROOT)/tao/TimeBaseC.i \
+ $(TAO_ROOT)/tao/TAOC.i \
+ $(TAO_ROOT)/tao/ORB_Core.h \
+ $(TAO_ROOT)/tao/Policy_Manager.h \
+ $(TAO_ROOT)/tao/POA_CORBA.h \
+ $(TAO_ROOT)/tao/DynAnyC.h \
+ $(TAO_ROOT)/tao/DynAnyC.i \
+ $(TAO_ROOT)/tao/DomainC.h \
+ $(TAO_ROOT)/tao/DomainC.i \
+ $(TAO_ROOT)/tao/Policy_Manager.i \
+ $(TAO_ROOT)/tao/Resource_Factory.h \
+ $(TAO_ROOT)/tao/Protocol_Factory.h \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
+ $(ACE_ROOT)/ace/Map_Manager.h \
+ $(ACE_ROOT)/ace/Map_Manager.i \
+ $(ACE_ROOT)/ace/Map_Manager.cpp \
+ $(TAO_ROOT)/tao/ORB_Core.i \
+ $(ACE_ROOT)/ace/Dynamic_Service.h \
+ $(ACE_ROOT)/ace/Dynamic_Service.cpp \
+ $(TAO_ROOT)/tao/POA.h \
+ $(TAO_ROOT)/tao/Object_Adapter.h \
+ $(TAO_ROOT)/tao/Key_Adapters.h \
+ $(ACE_ROOT)/ace/Map.h \
+ $(ACE_ROOT)/ace/Map.i \
+ $(ACE_ROOT)/ace/Map_T.h \
+ $(ACE_ROOT)/ace/Pair.h \
+ $(ACE_ROOT)/ace/Pair.i \
+ $(ACE_ROOT)/ace/Pair_T.h \
+ $(ACE_ROOT)/ace/Pair_T.i \
+ $(ACE_ROOT)/ace/Pair_T.cpp \
+ $(ACE_ROOT)/ace/Active_Map_Manager.h \
+ $(ACE_ROOT)/ace/Active_Map_Manager.i \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Map_T.i \
+ $(ACE_ROOT)/ace/Map_T.cpp \
+ $(TAO_ROOT)/tao/Key_Adapters.i \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/POAS.h \
+ $(TAO_ROOT)/tao/POAS.i \
+ $(TAO_ROOT)/tao/Active_Object_Map.h \
+ $(TAO_ROOT)/tao/Active_Object_Map.i \
+ $(TAO_ROOT)/tao/Object_Adapter.i \
+ $(TAO_ROOT)/tao/POAManager.h \
+ $(TAO_ROOT)/tao/POAManager.i \
+ $(TAO_ROOT)/tao/ImplRepoC.h \
+ $(TAO_ROOT)/tao/Operation_Table.h \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/Profile.h \
+ $(TAO_ROOT)/tao/Tagged_Components.h \
+ $(TAO_ROOT)/tao/CONV_FRAMEC.h \
+ $(TAO_ROOT)/tao/CONV_FRAMEC.i \
+ $(TAO_ROOT)/tao/Tagged_Components.i \
+ $(TAO_ROOT)/tao/Profile.i \
+ $(TAO_ROOT)/tao/MProfile.i \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/NVList.h \
+ $(TAO_ROOT)/tao/NVList.i \
+ $(TAO_ROOT)/tao/Invocation.h \
+ $(TAO_ROOT)/tao/Reply_Dispatcher.h \
+ $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/Context.i \
+ $(TAO_ROOT)/tao/MessagingC.h \
+ $(TAO_ROOT)/tao/PollableC.h \
+ $(TAO_ROOT)/tao/MessagingC.i \
+ $(TAO_ROOT)/tao/Request.i \
+ $(TAO_ROOT)/tao/Reply_Dispatcher.i \
+ $(TAO_ROOT)/tao/Invocation.i \
+ $(TAO_ROOT)/tao/ImplRepoC.i \
+ $(TAO_ROOT)/tao/POA.i
+
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/tao/MessagingC.cpp b/TAO/tao/MessagingC.cpp
index 735a8ebd26c..5bf8c2c8604 100644
--- a/TAO/tao/MessagingC.cpp
+++ b/TAO/tao/MessagingC.cpp
@@ -1,7 +1,6 @@
 /* -*- C++ -*- */
 // $Id$
 
-
 // ******  Code generated by the The ACE ORB (TAO) IDL Compiler *******
 // TAO and the TAO IDL Compiler have been developed by the Center for
 // Distributed Object Computing at Washington University, St. Louis.
@@ -24,7 +23,6 @@
 
 ACE_RCSID(tao, MessagingC, "$Id$")
 
-
 static const CORBA::Long _oc_Messaging_RebindMode[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
@@ -87,7 +85,6 @@ TAO_NAMESPACE_TYPE (const CORBA::Short)
 TAO_NAMESPACE_BEGIN (Messaging)
 TAO_NAMESPACE_DEFINE (const CORBA::Short, SYNC_DELAYED_BUFFERING, -1)
 TAO_NAMESPACE_END
-
 static const CORBA::Long _oc_Messaging_RoutingType[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
@@ -2112,7 +2109,8 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, Messaging::PriorityRange
     else
     {
       ACE_NEW_RETURN (_tao_elem, Messaging::PriorityRange, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
+      TAO_InputCDR stream (_tao_any._tao_get_cdr (),
+                           _tao_any._tao_byte_order ());
       if (stream.decode (Messaging::_tc_PriorityRange, _tao_elem, 0, ACE_TRY_ENV)
         == CORBA::TypeCode::TRAVERSE_CONTINUE)
       {
@@ -2180,7 +2178,8 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, Messaging::RoutingTypeRa
     else
     {
       ACE_NEW_RETURN (_tao_elem, Messaging::RoutingTypeRange, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
+      TAO_InputCDR stream (_tao_any._tao_get_cdr (),
+                           _tao_any._tao_byte_order ());
       if (stream.decode (Messaging::_tc_RoutingTypeRange, _tao_elem, 0, ACE_TRY_ENV)
         == CORBA::TypeCode::TRAVERSE_CONTINUE)
       {
@@ -2248,7 +2247,8 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, Messaging::PolicyValue *
     else
     {
       ACE_NEW_RETURN (_tao_elem, Messaging::PolicyValue, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
+      TAO_InputCDR stream (_tao_any._tao_get_cdr (),
+                           _tao_any._tao_byte_order ());
       if (stream.decode (Messaging::_tc_PolicyValue, _tao_elem, 0, ACE_TRY_ENV)
         == CORBA::TypeCode::TRAVERSE_CONTINUE)
       {
@@ -2319,7 +2319,8 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, Messaging::PolicyValueSe
     else
     {
       ACE_NEW_RETURN (_tao_elem, Messaging::PolicyValueSeq, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
+      TAO_InputCDR stream (_tao_any._tao_get_cdr (),
+                           _tao_any._tao_byte_order ());
       if (stream.decode (Messaging::_tc_PolicyValueSeq, _tao_elem, 0, ACE_TRY_ENV)
         == CORBA::TypeCode::TRAVERSE_CONTINUE)
       {
@@ -2376,7 +2377,8 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, Messaging::ReplyHandler_
     CORBA::TypeCode_var type = _tao_any.type ();
     if (!type->equal (Messaging::_tc_ReplyHandler, ACE_TRY_ENV)) return 0; // not equal
     ACE_TRY_CHECK;
-    TAO_InputCDR stream (_tao_any._tao_get_cdr ());
+    TAO_InputCDR stream (_tao_any._tao_get_cdr (),
+                         _tao_any._tao_byte_order ());
     CORBA::Object_var _tao_obj_var;
     ACE_NEW_RETURN (tmp, CORBA::Object_ptr, 0);
     if (stream.decode (Messaging::_tc_ReplyHandler, &_tao_obj_var.out (), 0, ACE_TRY_ENV)
@@ -2432,7 +2434,8 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, Messaging::Poller_ptr &_
     CORBA::TypeCode_var type = _tao_any.type ();
     if (!type->equal (Messaging::_tc_Poller, ACE_TRY_ENV)) return 0; // not equal
     ACE_TRY_CHECK;
-    TAO_InputCDR stream (_tao_any._tao_get_cdr ());
+    TAO_InputCDR stream (_tao_any._tao_get_cdr (),
+                         _tao_any._tao_byte_order ());
     CORBA::Object_var _tao_obj_var;
     ACE_NEW_RETURN (tmp, CORBA::Object_ptr, 0);
     if (stream.decode (Messaging::_tc_Poller, &_tao_obj_var.out (), 0, ACE_TRY_ENV)
diff --git a/TAO/tao/NVList.cpp b/TAO/tao/NVList.cpp
index 8e266bf50b7..90baedd7f5b 100644
--- a/TAO/tao/NVList.cpp
+++ b/TAO/tao/NVList.cpp
@@ -158,6 +158,7 @@ CORBA_NVList::add_value (const char *name,
           else
             {
               nv->any_._tao_replace (value.type_,
+                                     value.byte_order_,
                                      value.cdr_,
                                      ACE_TRY_ENV);
             }
diff --git a/TAO/tao/ObjectIDList.cpp b/TAO/tao/ObjectIDList.cpp
index a1d777074a1..4432a72ec46 100644
--- a/TAO/tao/ObjectIDList.cpp
+++ b/TAO/tao/ObjectIDList.cpp
@@ -161,7 +161,8 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_ORB_ObjectIdList *
     else
     {
       ACE_NEW_RETURN (_tao_elem, CORBA_ORB_ObjectIdList, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
+      TAO_InputCDR stream (_tao_any._tao_get_cdr (),
+                           _tao_any._tao_byte_order ());
       if (stream.decode (CORBA::ORB::_tc_ObjectIdList, _tao_elem, 0, ACE_TRY_ENV)
         == CORBA::TypeCode::TRAVERSE_CONTINUE)
       {
diff --git a/TAO/tao/Pluggable_Messaging.cpp b/TAO/tao/Pluggable_Messaging.cpp
index 51d58ceb622..68dba64c85a 100644
--- a/TAO/tao/Pluggable_Messaging.cpp
+++ b/TAO/tao/Pluggable_Messaging.cpp
@@ -1,6 +1,7 @@
 //$Id$
 
-#include "Pluggable_Messaging.h"
+#include "tao/Pluggable_Messaging.h"
+#include "tao/debug.h"
 
 #if !defined (__ACE_INLINE__)
 # include "tao/Pluggable_Messaging.i"
@@ -17,6 +18,49 @@ TAO_Pluggable_Messaging_Interface::~TAO_Pluggable_Messaging_Interface (void)
   //no-op
 }
 
+int
+TAO_Pluggable_Messaging_Interface::
+  transport_message (TAO_Transport *transport,
+                     TAO_OutputCDR &stream,
+                     int two_way,
+                     TAO_Stub *stub,
+                     ACE_Time_Value *max_wait_time)
+{
+  // Strictly speaking, should not need to loop here because the
+  // socket never gets set to a nonblocking mode ... some Linux
+  // versions seem to need it though.  Leaving it costs little.
+
+  // This guarantees to send all data (bytes) or return an error.
+  ssize_t n = transport->send (stub,
+                               two_way,
+                               stream.begin (),
+                               max_wait_time);
+
+  if (n == -1)
+    {
+      if (TAO_orbdebug)
+        ACE_DEBUG ((LM_DEBUG,
+                    ASYS_TEXT ("TAO: (%P|%t|%N|%l) closing conn %d after fault %p\n"),
+                    transport->handle (),
+                    ASYS_TEXT ("GIOP_Message_Base::send_message ()")));
+
+      return -1;
+    }
+  
+  // EOF.
+  if (n == 0)
+    {
+      if (TAO_orbdebug)
+        ACE_DEBUG ((LM_DEBUG,
+                    ASYS_TEXT ("TAO: (%P|%t|%N|%l) send_message () ")
+                    ASYS_TEXT ("EOF, closing conn %d\n"),
+                    transport->handle()));
+      return -1;
+    }
+
+  return 1;
+}
+
 TAO_Message_State_Factory::~TAO_Message_State_Factory (void)
 {
   //no-op
diff --git a/TAO/tao/Pluggable_Messaging.h b/TAO/tao/Pluggable_Messaging.h
index b6c29df989b..fe85826ca0f 100644
--- a/TAO/tao/Pluggable_Messaging.h
+++ b/TAO/tao/Pluggable_Messaging.h
@@ -87,6 +87,18 @@ public:
                                           CORBA::Octet message_type) = 0;
   // Process messages from the connectors. This is the hert of the
   // server side processing 
+
+protected:
+  int transport_message (TAO_Transport *transport,
+                         TAO_OutputCDR &stream,
+                         int two_way = 1,
+                         TAO_Stub *stub = 0,
+                         ACE_Time_Value *max_wait_time = 0);
+  // This method uses the Transport <transport> objects send () method
+  // to send the contents in <stream>. Most of the derived classes, at
+  // one stage or other would tend to send the data to the socket. So,
+  // it is better if we have the method that does the sending and
+  // error checking in a seperate place for ease of maintenance.
 };
 
 
diff --git a/TAO/tao/PollableC.cpp b/TAO/tao/PollableC.cpp
index 48680e0cf0b..2d8af8c59ff 100644
--- a/TAO/tao/PollableC.cpp
+++ b/TAO/tao/PollableC.cpp
@@ -32,7 +32,6 @@
 
 ACE_RCSID(tao, PollableC, "$Id$")
 
-
 CORBA_Pollable_ptr CORBA_Pollable::_narrow (
     CORBA::Object_ptr obj,
     CORBA::Environment &ACE_TRY_ENV
diff --git a/TAO/tao/TAOC.cpp b/TAO/tao/TAOC.cpp
index c1bd4f02bf0..5481a52e65a 100644
--- a/TAO/tao/TAOC.cpp
+++ b/TAO/tao/TAOC.cpp
@@ -1,6 +1,5 @@
 /* -*- C++ -*- $Id$ */
 
-
 // ******  Code generated by the The ACE ORB (TAO) IDL Compiler *******
 // TAO and the TAO IDL Compiler have been developed by the Center for
 // Distributed Object Computing at Washington University, St. Louis.
diff --git a/TAO/tao/Typecode.cpp b/TAO/tao/Typecode.cpp
index e62bace6906..ee99cd97eb2 100644
--- a/TAO/tao/Typecode.cpp
+++ b/TAO/tao/Typecode.cpp
@@ -18,6 +18,7 @@
 #include "tao/Exception.h"
 #include "tao/CDR_Interpreter.h"
 #include "tao/Principal.h"
+#include "tao/singletons.h"
 #include "tao/debug.h"
 
 #if !defined (__ACE_INLINE__)
@@ -649,7 +650,7 @@ TC_Private_State::~TC_Private_State (void)
 }
 
 // Point of recursion for equal() and equivalent().
-CORBA::Boolean 
+CORBA::Boolean
 CORBA_TypeCode::equ_common (CORBA::TypeCode_ptr tc,
                             CORBA::Boolean equiv_only,
                             CORBA::Environment &ACE_TRY_ENV) const
@@ -660,8 +661,8 @@ CORBA_TypeCode::equ_common (CORBA::TypeCode_ptr tc,
 
   if (equiv_only)
     {
-      CORBA::TypeCode_var rcvr = 
-        CORBA::TypeCode::_duplicate (ACE_const_cast (CORBA_TypeCode *, 
+      CORBA::TypeCode_var rcvr =
+        CORBA::TypeCode::_duplicate (ACE_const_cast (CORBA_TypeCode *,
                                                      this));
 
       CORBA::Boolean status = (this->kind_ == CORBA::tk_alias);
@@ -680,8 +681,8 @@ CORBA_TypeCode::equ_common (CORBA::TypeCode_ptr tc,
 
       // Added by Bala to check for leaks as content_type duplicates the
       // pointers
-      CORBA::TypeCode_var tcvar = 
-        CORBA::TypeCode::_duplicate (ACE_const_cast (CORBA_TypeCode *, 
+      CORBA::TypeCode_var tcvar =
+        CORBA::TypeCode::_duplicate (ACE_const_cast (CORBA_TypeCode *,
                                                      tc));
 
       while (status)
@@ -709,9 +710,9 @@ CORBA_TypeCode::equ_common (CORBA::TypeCode_ptr tc,
         return 0;
       else
         // typecode kinds are same
-        return this->private_equal (tc, 
+        return this->private_equal (tc,
                                     equiv_only,
-				                            ACE_TRY_ENV);
+                                                            ACE_TRY_ENV);
     }
 }
 
@@ -749,44 +750,44 @@ CORBA_TypeCode::private_equal (CORBA::TypeCode_ptr tc,
       // the kind_ field
       return 1;
     case CORBA::tk_objref:
-      return this->private_equal_objref (tc, 
-                                         equiv_only, 
+      return this->private_equal_objref (tc,
+                                         equiv_only,
                                          ACE_TRY_ENV);
     case CORBA::tk_struct:
-      return this->private_equal_struct (tc, 
-                                         equiv_only, 
+      return this->private_equal_struct (tc,
+                                         equiv_only,
                                          ACE_TRY_ENV);
     case CORBA::tk_union:
-      return this->private_equal_union (tc, 
-                                        equiv_only, 
+      return this->private_equal_union (tc,
+                                        equiv_only,
                                         ACE_TRY_ENV);
     case CORBA::tk_enum:
-      return this->private_equal_enum (tc, 
-                                       equiv_only, 
+      return this->private_equal_enum (tc,
+                                       equiv_only,
                                        ACE_TRY_ENV);
     case CORBA::tk_string:
-      return this->private_equal_string (tc, 
-                                         equiv_only, 
+      return this->private_equal_string (tc,
+                                         equiv_only,
                                          ACE_TRY_ENV);
     case CORBA::tk_wstring:
-      return this->private_equal_wstring (tc, 
-                                          equiv_only, 
+      return this->private_equal_wstring (tc,
+                                          equiv_only,
                                           ACE_TRY_ENV);
     case CORBA::tk_sequence:
-      return this->private_equal_sequence (tc, 
-                                           equiv_only, 
+      return this->private_equal_sequence (tc,
+                                           equiv_only,
                                            ACE_TRY_ENV);
     case CORBA::tk_array:
-      return this->private_equal_array (tc, 
-                                        equiv_only, 
+      return this->private_equal_array (tc,
+                                        equiv_only,
                                         ACE_TRY_ENV);
     case CORBA::tk_alias:
-      return this->private_equal_alias (tc, 
-                                        equiv_only, 
+      return this->private_equal_alias (tc,
+                                        equiv_only,
                                         ACE_TRY_ENV);
     case CORBA::tk_except:
-      return this->private_equal_except (tc, 
-                                         equiv_only, 
+      return this->private_equal_except (tc,
+                                         equiv_only,
                                          ACE_TRY_ENV);
     case ~0u: // indirection
       {
@@ -933,17 +934,17 @@ CORBA_TypeCode::private_equal_struct (CORBA::TypeCode_ptr tc,
 
           if (ACE_OS::strlen (my_member_name) > 1
               && ACE_OS::strlen (tc_member_name) > 1
-              && ACE_OS::strcmp (my_member_name, 
+              && ACE_OS::strcmp (my_member_name,
                                  tc_member_name)) // not same
             return 0;
         }
 
       // now compare the typecodes of the members
-      CORBA::TypeCode_var my_member_tc = this->member_type (i, 
+      CORBA::TypeCode_var my_member_tc = this->member_type (i,
                                                             ACE_TRY_ENV);
       ACE_CHECK_RETURN (0);
 
-      CORBA::TypeCode_var tc_member_tc = tc->member_type (i, 
+      CORBA::TypeCode_var tc_member_tc = tc->member_type (i,
                                                           ACE_TRY_ENV);
       ACE_CHECK_RETURN (0);
 
@@ -955,7 +956,7 @@ CORBA_TypeCode::private_equal_struct (CORBA::TypeCode_ptr tc,
         continue;
 
       CORBA::Boolean flag =
-        my_member_tc->equ_common (tc_member_tc.in (), 
+        my_member_tc->equ_common (tc_member_tc.in (),
                                   equiv_only,
                                   ACE_TRY_ENV);
       ACE_CHECK_RETURN (0);
@@ -1007,7 +1008,7 @@ CORBA_TypeCode::private_equal_union (CORBA::TypeCode_ptr tc,
       // Compare names if they exist.
       if (ACE_OS::strlen (my_name) > 1
           && ACE_OS::strlen (tc_name) > 1
-          && ACE_OS::strcmp (my_name, 
+          && ACE_OS::strcmp (my_name,
                              tc_name)) // not same
         return 0;
     }
@@ -1019,7 +1020,7 @@ CORBA_TypeCode::private_equal_union (CORBA::TypeCode_ptr tc,
   CORBA::TypeCode_var tc_discrim = tc->discriminator_type (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
 
-  CORBA::Boolean status = my_discrim->equ_common (tc_discrim.in (), 
+  CORBA::Boolean status = my_discrim->equ_common (tc_discrim.in (),
                                                   equiv_only,
                                                   ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
@@ -1074,27 +1075,27 @@ CORBA_TypeCode::private_equal_union (CORBA::TypeCode_ptr tc,
       // Check if member names are same - skipped by equivalent().
       if (!equiv_only)
         {
-          const char *my_member_name = this->member_name (i, 
+          const char *my_member_name = this->member_name (i,
                                                           ACE_TRY_ENV);
           ACE_CHECK_RETURN (0);
 
-          const char *tc_member_name = tc->member_name (i, 
+          const char *tc_member_name = tc->member_name (i,
                                                         ACE_TRY_ENV);
           ACE_CHECK_RETURN (0);
 
-          if (ACE_OS::strlen (my_member_name) > 1 
+          if (ACE_OS::strlen (my_member_name) > 1
               && ACE_OS::strlen (tc_member_name) > 1
-              && ACE_OS::strcmp (my_member_name, 
+              && ACE_OS::strcmp (my_member_name,
                                  tc_member_name)) // not same
             return 0;
         }
 
       // now compare the typecodes of the members
-      CORBA::TypeCode_var my_member_tc = this->member_type (i, 
+      CORBA::TypeCode_var my_member_tc = this->member_type (i,
                                                             ACE_TRY_ENV);
       ACE_CHECK_RETURN (0);
 
-      CORBA::TypeCode_var tc_member_tc = tc->member_type (i, 
+      CORBA::TypeCode_var tc_member_tc = tc->member_type (i,
                                                           ACE_TRY_ENV);
       ACE_CHECK_RETURN (0);
 
@@ -1105,7 +1106,7 @@ CORBA_TypeCode::private_equal_union (CORBA::TypeCode_ptr tc,
           && my_member_tc->root_tc_base_ == tc_member_tc->root_tc_base_)
         continue;
 
-      CORBA::Boolean flag = my_member_tc->equ_common (tc_member_tc.in (), 
+      CORBA::Boolean flag = my_member_tc->equ_common (tc_member_tc.in (),
                                                       equiv_only,
                                                       ACE_TRY_ENV);
       ACE_CHECK_RETURN (0);
@@ -1157,7 +1158,7 @@ CORBA_TypeCode::private_equal_enum (CORBA::TypeCode_ptr tc,
       // Compare names if they exist.
       if (ACE_OS::strlen (my_name) > 1
           && ACE_OS::strlen (tc_name) > 1
-          && ACE_OS::strcmp (my_name, 
+          && ACE_OS::strcmp (my_name,
                              tc_name)) // not same
         return 0;
     }
@@ -1177,17 +1178,17 @@ CORBA_TypeCode::private_equal_enum (CORBA::TypeCode_ptr tc,
       // Check if member names are same - skipped by equivalent().
       if (!equiv_only)
         {
-          const char *my_member_name = this->member_name (i, 
+          const char *my_member_name = this->member_name (i,
                                                           ACE_TRY_ENV);
           ACE_CHECK_RETURN (0);
 
-          const char *tc_member_name = tc->member_name (i, 
+          const char *tc_member_name = tc->member_name (i,
                                                         ACE_TRY_ENV);
           ACE_CHECK_RETURN (0);
 
-          if (ACE_OS::strlen (my_member_name) > 1 
+          if (ACE_OS::strlen (my_member_name) > 1
               && ACE_OS::strlen (tc_member_name) > 1
-              && ACE_OS::strcmp (my_member_name, 
+              && ACE_OS::strcmp (my_member_name,
                                  tc_member_name)) // not same
             return 0;
         }
@@ -1239,7 +1240,7 @@ CORBA_TypeCode::private_equal_sequence (CORBA::TypeCode_ptr tc,
   CORBA::TypeCode_var tc_elem = tc->content_type (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
 
-  CORBA::Boolean status = my_elem->equ_common (tc_elem.in (), 
+  CORBA::Boolean status = my_elem->equ_common (tc_elem.in (),
                                                equiv_only,
                                                ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
@@ -1263,7 +1264,7 @@ CORBA_TypeCode::private_equal_array (CORBA::TypeCode_ptr tc,
                                      CORBA::Environment &ACE_TRY_ENV) const
 {
   // exactly like sequence
-  return this->private_equal_sequence (tc, 
+  return this->private_equal_sequence (tc,
                                        equiv_only,
                                        ACE_TRY_ENV);
 }
@@ -1304,7 +1305,7 @@ CORBA_TypeCode::private_equal_alias (CORBA::TypeCode_ptr tc,
   CORBA::TypeCode_var tc_elem = tc->content_type (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
 
-  return my_elem->equ_common (tc_elem.in (), 
+  return my_elem->equ_common (tc_elem.in (),
                               equiv_only,
                               ACE_TRY_ENV);
 }
@@ -1345,7 +1346,7 @@ CORBA_TypeCode::private_equal_except (CORBA::TypeCode_ptr tc,
       // Compare names if they exist.
       if (ACE_OS::strlen (my_name) > 1
           && ACE_OS::strlen (tc_name) > 1
-          && ACE_OS::strcmp (my_name, 
+          && ACE_OS::strcmp (my_name,
                              tc_name)) // not same
         return 0;
     }
@@ -1365,17 +1366,17 @@ CORBA_TypeCode::private_equal_except (CORBA::TypeCode_ptr tc,
       // Check if member names are same - skipped by equivalent().
       if (!equiv_only)
         {
-          const char *my_member_name = this->member_name (i, 
+          const char *my_member_name = this->member_name (i,
                                                           ACE_TRY_ENV);
           ACE_CHECK_RETURN (0);
 
-          const char *tc_member_name = tc->member_name (i, 
+          const char *tc_member_name = tc->member_name (i,
                                                         ACE_TRY_ENV);
           ACE_CHECK_RETURN (0);
 
-          if (ACE_OS::strlen (my_member_name) > 1 
+          if (ACE_OS::strlen (my_member_name) > 1
               && ACE_OS::strlen (tc_member_name) > 1
-              && ACE_OS::strcmp (my_member_name, 
+              && ACE_OS::strcmp (my_member_name,
                                  tc_member_name)) // not same
             return 0;
         }
@@ -1387,7 +1388,7 @@ CORBA_TypeCode::private_equal_except (CORBA::TypeCode_ptr tc,
       CORBA::TypeCode_var tc_member_tc = tc->member_type (i, ACE_TRY_ENV);
       ACE_CHECK_RETURN (0);
 
-      CORBA::Boolean flag = my_member_tc->equ_common (tc_member_tc.in (), 
+      CORBA::Boolean flag = my_member_tc->equ_common (tc_member_tc.in (),
                                                       equiv_only,
                                                       ACE_TRY_ENV);
       ACE_CHECK_RETURN (0);
@@ -2009,7 +2010,10 @@ CORBA_TypeCode::private_member_label (CORBA::ULong n,
         return 0;
 
       ACE_NEW_THROW_EX (label_list[i],
-                        CORBA::Any (tc.in (), 0, out.begin ()),
+                        CORBA::Any (tc.in (),
+                                    0,
+                                    ACE_CDR_BYTE_ORDER,
+                                    out.begin ()),
                         CORBA::NO_MEMORY ());
       ACE_CHECK_RETURN (0);
 
@@ -2394,6 +2398,60 @@ CORBA::TypeCode::private_alignment (CORBA::Environment &ACE_TRY_ENV)
   return alignment;
 }
 
+// ****************************************************************
+
+CORBA::Boolean
+operator<< (TAO_OutputCDR& cdr, const CORBA::TypeCode *x)
+{
+  ACE_TRY_NEW_ENV
+    {
+      // @@ This function should *not* use the interpreter, there must
+      // be a way to do this with just CDR operations!!!!
+      CORBA::TypeCode::traverse_status status =
+        TAO_MARSHAL_TYPECODE::instance ()->encode (0,
+                                                   &x,
+                                                   0,
+                                                   &cdr,
+                                                   ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      if (status == CORBA::TypeCode::TRAVERSE_CONTINUE)
+        return 1;
+      // else return 0 at the end of the function
+    }
+  ACE_CATCH (CORBA_Exception, ex)
+    {
+      return 0;
+    }
+  ACE_ENDTRY;
+  return 0;
+}
+
+CORBA::Boolean
+operator>> (TAO_InputCDR& cdr, CORBA::TypeCode *&x)
+{
+  ACE_TRY_NEW_ENV
+    {
+      CORBA::TypeCode::traverse_status status =
+        TAO_MARSHAL_TYPECODE::instance ()->decode (0,
+                                                   &x,
+                                                   0,
+                                                   &cdr,
+                                                   ACE_TRY_ENV);
+      ACE_TRY_CHECK;
+
+      if (status != CORBA::TypeCode::TRAVERSE_CONTINUE)
+        return 0;
+    }
+  ACE_CATCH (CORBA_Exception, ex)
+    {
+      return 0;
+    }
+  ACE_ENDTRY;
+
+  return 1;
+}
+
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
 template class TAO_Pseudo_Object_Manager<CORBA_TypeCode,CORBA_TypeCode_var>;
diff --git a/TAO/tao/UIOP_Connect.cpp b/TAO/tao/UIOP_Connect.cpp
index ea6aaf3e046..50f671903ed 100644
--- a/TAO/tao/UIOP_Connect.cpp
+++ b/TAO/tao/UIOP_Connect.cpp
@@ -85,7 +85,8 @@ TAO_UIOP_Server_Connection_Handler::TAO_UIOP_Server_Connection_Handler (ACE_Thre
   ACE_ASSERT (this->orb_core_ != 0);
 }
 
-TAO_UIOP_Server_Connection_Handler::TAO_UIOP_Server_Connection_Handler (TAO_ORB_Core *orb_core)
+TAO_UIOP_Server_Connection_Handler::TAO_UIOP_Server_Connection_Handler (TAO_ORB_Core *orb_core,
+                                                                        CORBA::Boolean flag)
   : TAO_UIOP_Handler_Base (orb_core),
     transport_ (this, orb_core),
     orb_core_ (orb_core),
diff --git a/TAO/tao/UIOP_Connect.h b/TAO/tao/UIOP_Connect.h
index ded4083ae74..8b1ff118a54 100644
--- a/TAO/tao/UIOP_Connect.h
+++ b/TAO/tao/UIOP_Connect.h
@@ -122,7 +122,8 @@ class TAO_Export TAO_UIOP_Server_Connection_Handler : public TAO_UIOP_Handler_Ba
 
 public:
   TAO_UIOP_Server_Connection_Handler (ACE_Thread_Manager* t = 0);
-  TAO_UIOP_Server_Connection_Handler (TAO_ORB_Core *orb_core);
+  TAO_UIOP_Server_Connection_Handler (TAO_ORB_Core *orb_core,
+                                      CORBA::Boolean flag = 0);
   // Constructor.
 
   ~TAO_UIOP_Server_Connection_Handler (void);
diff --git a/TAO/tao/UIOP_Factory.h b/TAO/tao/UIOP_Factory.h
index aa79e57a1af..2c6f33d986c 100644
--- a/TAO/tao/UIOP_Factory.h
+++ b/TAO/tao/UIOP_Factory.h
@@ -59,6 +59,13 @@ private:
   int minor_;
   // Changing the version number can be used to provide backwards
   // compatibility with old clients.
+  
+  char *lite_;
+  // Command line arguments that would indicate whether we have to use
+  // GIOP lite or not. 
+  
+  CORBA::Boolean lite_flag_;
+  // Flag for the above. A value of zero represent
 };
 
 ACE_STATIC_SVC_DECLARE (TAO_UIOP_Protocol_Factory)
diff --git a/TAO/tao/append.cpp b/TAO/tao/append.cpp
index 77803d46ee2..b1c39f1f7a0 100644
--- a/TAO/tao/append.cpp
+++ b/TAO/tao/append.cpp
@@ -1,4 +1,5 @@
 // $Id$
+
 // ============================================================================
 //
 // = LIBRARY
@@ -26,7 +27,6 @@
 
 ACE_RCSID(tao, append, "$Id$")
 
-
 // Encode instances of arbitrary data types based only on typecode.
 // "data" points to the data type; if it's not a primitve data type,
 // the TypeCode interpreter is used to recursively encode its
diff --git a/TAO/tao/decode.cpp b/TAO/tao/decode.cpp
index 0a425cea0f8..1c24595b7f5 100644
--- a/TAO/tao/decode.cpp
+++ b/TAO/tao/decode.cpp
@@ -1,7 +1,5 @@
 // $Id$
 
-
-
 // ============================================================================
 //
 // = LIBRARY
diff --git a/TAO/tao/orbconf.h b/TAO/tao/orbconf.h
index 05bfbb31b1d..e4731cc1bc7 100644
--- a/TAO/tao/orbconf.h
+++ b/TAO/tao/orbconf.h
@@ -578,6 +578,15 @@ and should not be set by the user. Please use TAO_HAS_REMOTE_POLICIES instead.
 #define TAO_DEF_GIOP_MINOR 1
 #endif /* TAO_DEF_GIOP_MINOR */
 
+// This is just a #define for the GIOP Lite
+#if !defined (TAO_DEF_GIOP_LITE_MAJOR)
+#define TAO_DEF_GIOP_LITE_MAJOR 100
+#endif /* TAO_DEF_GIOP_LITE_MAJOR */
+#if !defined (TAO_DEF_GIOP_LITE_MINOR)
+#define TAO_DEF_GIOP_LITE_MINOR 100
+#endif /* TAO_DEF_GIOP_LITE_MINOR */
+
+
 // By default TAO generate the OMG standard profile components
 // (ORB_TYPE and CODE_SETS)
 #define TAO_STD_PROFILE_COMPONENTS
diff --git a/TAO/tao/skip.cpp b/TAO/tao/skip.cpp
index 1d7413562ca..bdcabc99e1b 100644
--- a/TAO/tao/skip.cpp
+++ b/TAO/tao/skip.cpp
@@ -25,10 +25,8 @@
 #include "tao/Environment.h"
 #include "tao/debug.h"
 
-
 ACE_RCSID(tao, skip, "$Id$")
 
-
 CORBA::TypeCode::traverse_status
 TAO_Marshal_Primitive::skip (CORBA::TypeCode_ptr  tc,
                              void *context,