ChangeLogTag: Thu Jan 6 15:25:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>

20 files changed, 1117 insertions, 192 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 4ab63031a2e..efc64e97889 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,41 @@
+Thu Jan  6 15:25:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/orb.idl:
+        * tao/Typecode_types.pidl:
+        * tao/orb_types.pidl:
+          Moved typecode stuff to Typecode_types.pidl and simple typedefs to
+          orb_types.pidl and include both new files again in orb.idl. Other
+          idl/pidl files which just need the typedefs or typecode stuff just
+          can then include the specific pidl file instead of orb.idl which
+          pulls in a lot more then really needed
+
+        * tao/ORB.h:
+          Removed typedefs that now are in orb_types.pidl, added a needed
+          forward declaration and removed some commented out code
+
+        * tao/orb_typesA.cpp:
+        * tao/orb_typesC.{h,cpp,inl}:
+        * tao/orb_typesS.h:
+        * tao/Typecode_typesC.{h,cpp,inl}:
+        * tao/Typecode_typesS.h:
+          Added new generated files
+
+        * tao/tao.mpc:
+          Added new fils
+
+        * tao/Makefile.am:
+          Added new files
+
+        * tao/Typecode.{h,cpp}:
+          Removed things that are now in Typecode.pidl and included
+          the TypecodeC.h file instead.
+
+        * tao/diffs/Typecode_types.diff:
+          New diff file
+
+        * tao/Typecode_Constants.cpp:
+          Removed typecode for ORBid, it is now in orb_types
+
 Thu Jan  6 08:24:39 2005  Carlos O'Ryan  <coryan@atdesk.com>
 
 	* orbsvcs/orbsvcs/ESF/ESF_Proxy_List.h:
diff --git a/TAO/tao/Makefile.am b/TAO/tao/Makefile.am
index c3ac71bc0f2..4683a855548 100644
--- a/TAO/tao/Makefile.am
+++ b/TAO/tao/Makefile.am
@@ -16,6 +16,8 @@ lib_LTLIBRARIES =
 ORB_Core = \
   Abstract_Servant_Base.cpp \
   Adapter.cpp \
+  Adapter_Factory.cpp \
+  Adapter_Registry.cpp \
   Any.cpp \
   AnySeqA.cpp \
   AnySeqC.cpp \
@@ -132,6 +134,8 @@ ORB_Core = \
   Muxed_TMS.cpp \
   NVList.cpp \
   ORB.cpp \
+  orb_typesC.cpp \
+  orb_typesA.cpp \
   ORBInitInfo.cpp \
   ORBInitializer_Registry.cpp \
   ORB_Core.cpp \
@@ -215,6 +219,7 @@ ORB_Core = \
   Transport_Timer.cpp \
   TypeCodeFactory_Adapter.cpp \
   Typecode.cpp \
+  Typecode_typesC.cpp \
   Typecode_Constants.cpp \
   ULongLongSeqA.cpp \
   ULongLongSeqC.cpp \
@@ -329,6 +334,8 @@ nobase_include_HEADERS += \
   Acceptor_Impl.h \
   Acceptor_Registry.h \
   Adapter.h \
+  Adapter_Factory.h \
+  Adapter_Registry.h \
   Allocator.h \
   Any.h \
   AnySeqC.h \
@@ -505,6 +512,8 @@ nobase_include_HEADERS += \
   ORB_Core.h \
   ORB_Core_Auto_Ptr.h \
   ORB_Table.h \
+  orb_typesC.h \
+  orb_typesS.h \
   Object.h \
   ObjectIdListC.h \
   ObjectKey_Table.h \
@@ -613,6 +622,8 @@ nobase_include_HEADERS += \
   Transport_Timer.h \
   TypeCodeFactory_Adapter.h \
   Typecode.h \
+  Typecode_typesS.h \
+  Typecode_typesC.h \
   Typecode_Constants.h \
   UB_String_Argument_T.h \
   UB_String_Arguments.h \
@@ -752,6 +763,7 @@ nobase_include_HEADERS += \
   Messaging_SyncScopeC.inl \
   NVList.i \
   ORB.i \
+  orb_typesC.inl \
   ORBInitInfo.inl \
   ORB_Core.i \
   ORB_Core_Auto_Ptr.inl \
@@ -816,6 +828,7 @@ nobase_include_HEADERS += \
   Transport_Connector.inl \
   Transport_Descriptor_Interface.inl \
   Typecode.i \
+  Typecode_typesC.inl \
   UB_String_Argument_T.inl \
   UB_String_SArgument_T.inl \
   ULongLongSeqC.inl \
@@ -881,6 +894,8 @@ nobase_include_HEADERS += \
   Var_Size_Argument_T.cpp \
   Var_Size_SArgument_T.cpp \
   orb.idl \
+  orb_types.pidl \
+  Typecode_types.pidl \
   AnySeq.pidl \
   BooleanSeq.pidl \
   Bounds.pidl \
diff --git a/TAO/tao/ORB.h b/TAO/tao/ORB.h
index 325afa29502..b859571e6d1 100644
--- a/TAO/tao/ORB.h
+++ b/TAO/tao/ORB.h
@@ -24,6 +24,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "orb_typesC.h"
 #include "objectid.h"
 #include "Policy_ForwardC.h"
 #include "OBV_Constants.h"
@@ -52,6 +53,7 @@ class TAO_OutputCDR;
 class TAO_Stub;
 class TAO_Valuetype_Adapter;
 class TAO_Acceptor_Filter;
+class TAO_SeqElem_String_Manager;
 
 // ****************************************************************
 
@@ -72,20 +74,7 @@ namespace CORBA
   class Context;
   typedef Context * Context_ptr;
 
-  // Used at present only in Typecode_Constants.cpp, to make _tc_ORBid.
   // TODO - implement OMG's 'ORBid CORBA::ORB::id (void)'.
-  typedef char * ORBid;
-  typedef String_var ORBid_var;
-  typedef String_out ORBid_out;
-  extern TAO_Export TypeCode_ptr _tc_ORBid;
-
-  // A couple of string typedefs used by various libs and services.
-  typedef char * Identifier;
-  typedef String_var Identifier_var;
-  typedef String_out Identifier_out;
-  typedef char * RepositoryId;
-  typedef String_var RepositoryId_var;
-  typedef String_out RepositoryId_out;
 
   typedef
     TAO_MngSeq_Var_T<
@@ -665,12 +654,6 @@ namespace CORBA
     /// The ORB_Core that created us....
     TAO_ORB_Core *orb_core_;
 
-    /// @note No freaking clue why this is in the ORB??
-#if 0
-    /// If non-0 then this is the Factory for OBV unmarshaling
-    TAO_ValueFactory_Map *valuetype_factory_map_;
-#endif /**/
-
     /// Decides whether to use the URL notation or to use IOR notation.
     CORBA::Boolean use_omg_ior_format_;
 
diff --git a/TAO/tao/Typecode.cpp b/TAO/tao/Typecode.cpp
index c68f7847c90..a0a6764916c 100644
--- a/TAO/tao/Typecode.cpp
+++ b/TAO/tao/Typecode.cpp
@@ -21,6 +21,7 @@
 #include "Any_Unknown_IDL_Type.h"
 #include "ORB_Constants.h"
 #include "SystemException.h"
+#include "orb_typesC.h"
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) \
     || defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
@@ -3796,27 +3797,6 @@ operator>> (TAO_InputCDR& cdr, CORBA::TypeCode *&x)
   return 1;
 }
 
-CORBA::Boolean
-operator<< (TAO_OutputCDR &strm, const CORBA::TCKind &_tao_enumval)
-{
-  CORBA::ULong _tao_temp = _tao_enumval;
-  return strm << _tao_temp;
-}
-
-CORBA::Boolean
-operator>> (TAO_InputCDR &strm, CORBA::TCKind &_tao_enumval)
-{
-  CORBA::ULong _tao_temp = 0;
-  CORBA::Boolean _tao_result = strm >> _tao_temp;
-
-  if (_tao_result == 1)
-    {
-      _tao_enumval = ACE_static_cast (CORBA::TCKind, _tao_temp);
-    }
-
-  return _tao_result;
-}
-
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
 template class ACE_Hash_Map_Entry<const char *,
diff --git a/TAO/tao/Typecode.h b/TAO/tao/Typecode.h
index bb455335f06..6a639b38ccb 100644
--- a/TAO/tao/Typecode.h
+++ b/TAO/tao/Typecode.h
@@ -37,6 +37,8 @@
 #include "tao/OBV_Constants.h"
 #include "tao/CORBA_methods.h"
 #include "tao/Sequence_T.h"
+#include "tao/Typecode_typesC.h"
+#include "tao/TAO_Export.h"
 
 // Forward declarations.
 class TAO_InputCDR;
@@ -49,70 +51,11 @@ namespace TAO
 
 namespace CORBA
 {
-  class TypeCode;
-  typedef TypeCode *TypeCode_ptr;
+   class TypeCode;
+   typedef TypeCode *TypeCode_ptr;
 
-  typedef TAO_Pseudo_Var_T<TypeCode> TypeCode_var;
-  typedef TAO_Pseudo_Out_T<TypeCode, TypeCode_var> TypeCode_out;
-
-  enum TCKind
-  {
-    // = Kinds of typecodes.
-
-    // Do not change these enum values, or duplicate them if you need
-    // to add values.  They are used to index tables, and if you
-    // change the values you'll need to find and update all of those
-    // tables.  The values are also part of the Common Data
-    // Representation, and hence are part of IIOP and other ORB
-    // protocols.
-
-    tk_null               = 0,
-    tk_void               = 1,
-    tk_short              = 2,
-    tk_long               = 3,
-    tk_ushort             = 4,
-    tk_ulong              = 5,
-    tk_float              = 6,
-    tk_double             = 7,
-    tk_boolean            = 8,
-    tk_char               = 9,
-    tk_octet              = 10,
-    tk_any                = 11,
-    tk_TypeCode           = 12,
-    tk_Principal          = 13,
-    tk_objref             = 14,
-    tk_struct             = 15,
-    tk_union              = 16,
-    tk_enum               = 17,
-    tk_string             = 18,
-    tk_sequence           = 19,
-    tk_array              = 20,
-    tk_alias              = 21,
-    tk_except             = 22,
-
-    tk_longlong           = 23,
-    tk_ulonglong          = 24,
-    tk_longdouble         = 25,
-    tk_wchar              = 26,
-    tk_wstring            = 27,
-    tk_fixed              = 28,
-    tk_value              = 29,
-    tk_value_box          = 30,
-    tk_native             = 31,
-    tk_abstract_interface = 32,
-    tk_local_interface    = 33,
-    tk_component          = 34,
-    tk_home               = 35,
-    tk_event              = 36,
-
-    // This symbol is not defined by CORBA 3.0.  It's used to speed up
-    // dispatch based on TCKind values, and lets many important ones
-    // just be table lookups.  It must always be the last enum value!!
-
-    TC_KIND_COUNT
-  };
-
-  typedef TCKind &TCKind_out;
+   typedef TAO_Pseudo_Var_T<TypeCode> TypeCode_var;
+   typedef TAO_Pseudo_Out_T<TypeCode, TypeCode_var> TypeCode_out;
 
   /**
    * @class TypeCode
@@ -621,13 +564,19 @@ namespace TAO
   };
 
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_Export Objref_Traits<CORBA::TypeCode>
+  struct TAO_Export Objref_Traits< ::CORBA::TypeCode>
   {
-    static CORBA::TypeCode_ptr duplicate (CORBA::TypeCode_ptr);
-    static void release (CORBA::TypeCode_ptr);
-    static CORBA::TypeCode_ptr nil (void);
-    static CORBA::Boolean marshal (CORBA::TypeCode_ptr p,
-                                   TAO_OutputCDR & cdr);
+    static ::CORBA::TypeCode_ptr duplicate (
+        ::CORBA::TypeCode_ptr
+      );
+    static void release (
+        ::CORBA::TypeCode_ptr
+      );
+    static ::CORBA::TypeCode_ptr nil (void);
+    static CORBA::Boolean marshal (
+        ::CORBA::TypeCode_ptr p,
+        TAO_OutputCDR & cdr
+      );
   };
 
   /**
@@ -687,8 +636,6 @@ namespace TAO
   };
 }  // End TAO namespace
 
-// --------------------------------------------------------------
-
 // Workaround for a Visual Studio .NET bug where this class is not
 // properly imported by an application if typedef'd or subclassed,
 // resulting in 'multiply defined' link errors. The export macro
@@ -698,17 +645,13 @@ namespace TAO
   template class TAO_Export TAO_Unbounded_Pseudo_Sequence<CORBA::TypeCode>;
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT */
 
+// --------------------------------------------------------------
+
 TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR& cdr,
                                       const CORBA::TypeCode *x);
 TAO_Export CORBA::Boolean operator>> (TAO_InputCDR& cdr,
                                       CORBA::TypeCode *&x);
 
-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &,
-                                      const CORBA::TCKind &);
-
-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &,
-                                      CORBA::TCKind &);
-
 #if defined (__ACE_INLINE__)
 # include "tao/Typecode.i"
 #endif /* __ACE_INLINE__ */
diff --git a/TAO/tao/Typecode_Constants.cpp b/TAO/tao/Typecode_Constants.cpp
index d842c153221..021f2815601 100644
--- a/TAO/tao/Typecode_Constants.cpp
+++ b/TAO/tao/Typecode_Constants.cpp
@@ -96,7 +96,6 @@ namespace CORBA
   // Some more typecodes in the CORBA namespace. We keep adding
   // to this list as we find more and more things being introduced
   // to the CORBA namespace.
-  TypeCode_ptr  _tc_ORBid = 0;
 
 #if (TAO_HAS_MINIMUM_CORBA == 0)
      TypeCode_ptr  _tc_NamedValue = 0;
@@ -311,30 +310,6 @@ namespace TAO
                               1,
                               sizeof (CORBA::TypeCode::BadKind)));
 
-    static const CORBA::Long _oc_CORBA_ORBid[] =
-    {
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      28, ACE_NTOHL (0x49444c3a),
-      ACE_NTOHL (0x6f6d672e),
-      ACE_NTOHL (0x6f72672f),
-      ACE_NTOHL (0x434f5242),
-      ACE_NTOHL (0x412f4f52),
-      ACE_NTOHL (0x4269643a),
-      ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ORBid:1.0
-      6,
-      ACE_NTOHL (0x4f524269),
-      ACE_NTOHL (0x64000000),  // name = ORBid
-      CORBA::tk_string,
-      0, // string length
-    };
-
-    ACE_NEW (CORBA::_tc_ORBid,
-             CORBA::TypeCode (CORBA::tk_alias,
-                              sizeof (_oc_CORBA_ORBid),
-                              (char *) &_oc_CORBA_ORBid,
-                              0,
-                              sizeof (CORBA::ORBid)));
-
   #if (TAO_HAS_MINIMUM_CORBA == 0)
 
     static const CORBA::Long _oc_corba_NamedValue[] =
@@ -495,8 +470,6 @@ namespace TAO
 
     CORBA::release (CORBA::TypeCode::_tc_BadKind);
 
-    CORBA::release (CORBA::_tc_ORBid);
-
   #if (TAO_HAS_MINIMUM_CORBA == 0)
 
     CORBA::release (CORBA::_tc_NamedValue);
diff --git a/TAO/tao/Typecode_types.pidl b/TAO/tao/Typecode_types.pidl
new file mode 100644
index 00000000000..af1802d6d9d
--- /dev/null
+++ b/TAO/tao/Typecode_types.pidl
@@ -0,0 +1,58 @@
+// -*- IDL -*-
+
+// $Id$
+
+// Typecode stuff, originall in orb.idl
+
+#ifndef TAO_TYPECODE_TYPES_IDL
+#define TAO_TYPECODE_TYPES_IDL
+
+#pragma prefix "omg.org"
+
+module CORBA
+{
+  interface TypeCode;
+
+  enum TCKind
+  {
+    tk_null,
+    tk_void,
+    tk_short,
+    tk_long,
+    tk_ushort,
+    tk_ulong,
+    tk_float,
+    tk_double,
+    tk_boolean,
+    tk_char,
+    tk_octet,
+    tk_any,
+    tk_TypeCode,
+    tk_Principal,
+    tk_objref,
+    tk_struct,
+    tk_union,
+    tk_enum,
+    tk_string,
+    tk_sequence,
+    tk_array,
+    tk_alias,
+    tk_except,
+    tk_longlong,
+    tk_ulonglong,
+    tk_longdouble,
+    tk_wchar,
+    tk_wstring,
+    tk_fixed,
+    tk_value,
+    tk_value_box,
+    tk_native,
+    tk_abstract_interface,
+    tk_local_interface,
+    tk_component,
+    tk_home,
+    tk_event
+  };
+};
+
+#endif /* TAO_TYPECODE_TYPES_IDL */
diff --git a/TAO/tao/Typecode_typesC.cpp b/TAO/tao/Typecode_typesC.cpp
new file mode 100644
index 00000000000..4b24fdc68a2
--- /dev/null
+++ b/TAO/tao/Typecode_typesC.cpp
@@ -0,0 +1,72 @@
+// -*- C++ -*-
+//
+// $Id$
+
+// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+// TAO and the TAO IDL Compiler have been developed by:
+//       Center for Distributed Object Computing
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       Irvine, CA
+//       USA
+//       http://doc.ece.uci.edu/
+// and
+//       Institute for Software Integrated Systems
+//       Vanderbilt University
+//       Nashville, TN
+//       USA
+//       http://www.isis.vanderbilt.edu/
+//
+// Information about TAO is available at:
+//     http://www.cs.wustl.edu/~schmidt/TAO.html
+
+// TAO_IDL - Generated from
+// be\be_codegen.cpp:301
+
+
+#include "Typecode_typesC.h"
+#include "tao/CDR.h"
+
+#if defined (__BORLANDC__)
+#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
+#endif /* __BORLANDC__ */
+
+#if !defined (__ACE_INLINE__)
+#include "Typecode_typesC.inl"
+#endif /* !defined INLINE */
+
+// TAO_IDL - Generated from
+// be\be_visitor_arg_traits.cpp:64
+
+// Arg traits specializations.
+namespace TAO
+{
+}
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_enum/cdr_op_cs.cpp:51
+
+CORBA::Boolean operator<< (TAO_OutputCDR &strm, const CORBA::TCKind &_tao_enumval)
+{
+  CORBA::ULong _tao_temp = _tao_enumval;
+  return strm << _tao_temp;
+}
+
+CORBA::Boolean operator>> (TAO_InputCDR &strm, CORBA::TCKind &_tao_enumval)
+{
+  CORBA::ULong _tao_temp = 0;
+  CORBA::Boolean _tao_result = strm >> _tao_temp;
+  
+  if (_tao_result == 1)
+    {
+      _tao_enumval = static_cast<CORBA::TCKind> (_tao_temp);
+    }
+  
+  return _tao_result;
+}
diff --git a/TAO/tao/Typecode_typesC.h b/TAO/tao/Typecode_typesC.h
new file mode 100644
index 00000000000..41d16a38444
--- /dev/null
+++ b/TAO/tao/Typecode_typesC.h
@@ -0,0 +1,163 @@
+// -*- C++ -*-
+//
+// $Id$
+
+// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+// TAO and the TAO IDL Compiler have been developed by:
+//       Center for Distributed Object Computing
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       Irvine, CA
+//       USA
+//       http://doc.ece.uci.edu/
+// and
+//       Institute for Software Integrated Systems
+//       Vanderbilt University
+//       Nashville, TN
+//       USA
+//       http://www.isis.vanderbilt.edu/
+//
+// Information about TAO is available at:
+//     http://www.cs.wustl.edu/~schmidt/TAO.html
+
+// TAO_IDL - Generated from
+// be\be_codegen.cpp:153
+
+#ifndef _TAO_IDL_ORIG_TYPECODE_TYPESC_H_
+#define _TAO_IDL_ORIG_TYPECODE_TYPESC_H_
+
+#include /**/ "ace/pre.h"
+
+
+#include "ace/config-all.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "tao/TAO_Export.h"
+#include "tao/ORB.h"
+#include "tao/Environment.h"
+#include "tao/Objref_VarOut_T.h"
+
+#if defined (TAO_EXPORT_MACRO)
+#undef TAO_EXPORT_MACRO
+#endif
+#define TAO_EXPORT_MACRO TAO_Export
+
+#if defined (TAO_EXPORT_NESTED_CLASSES)
+#  if defined (TAO_EXPORT_NESTED_MACRO)
+#    undef TAO_EXPORT_NESTED_MACRO
+#  endif /* defined (TAO_EXPORT_NESTED_MACRO) */
+#  define TAO_EXPORT_NESTED_MACRO TAO_Export
+#endif /* TAO_EXPORT_NESTED_CLASSES */
+
+#if defined(_MSC_VER)
+#pragma warning(push)
+#pragma warning(disable:4250)
+#endif /* _MSC_VER */
+
+#if defined (__BORLANDC__)
+#pragma option push -w-rvl -w-rch -w-ccc -w-inl
+#endif /* __BORLANDC__ */
+
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_ch.cpp:48
+
+namespace CORBA
+{
+  // TAO_IDL - Generated from
+  // be\be_visitor_enum/enum_ch.cpp:57
+
+  enum TCKind
+  {
+    tk_null,
+    tk_void,
+    tk_short,
+    tk_long,
+    tk_ushort,
+    tk_ulong,
+    tk_float,
+    tk_double,
+    tk_boolean,
+    tk_char,
+    tk_octet,
+    tk_any,
+    tk_TypeCode,
+    tk_Principal,
+    tk_objref,
+    tk_struct,
+    tk_union,
+    tk_enum,
+    tk_string,
+    tk_sequence,
+    tk_array,
+    tk_alias,
+    tk_except,
+    tk_longlong,
+    tk_ulonglong,
+    tk_longdouble,
+    tk_wchar,
+    tk_wstring,
+    tk_fixed,
+    tk_value,
+    tk_value_box,
+    tk_native,
+    tk_abstract_interface,
+    tk_local_interface,
+    tk_component,
+    tk_home,
+    tk_event
+
+    // This symbol is not defined by CORBA 3.0.  It's used to speed up
+    // dispatch based on TCKind values, and lets many important ones
+    // just be table lookups.  It must always be the last enum value!!
+    , TC_KIND_COUNT
+  };
+
+  typedef TCKind &TCKind_out;
+
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_ch.cpp:66
+
+} // module CORBA
+
+// TAO_IDL - Generated from
+// be\be_visitor_traits.cpp:59
+
+// Traits specializations.
+namespace TAO
+{
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_enum/cdr_op_ch.cpp:50
+
+TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::TCKind &);
+TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::TCKind &);
+
+// TAO_IDL - Generated from
+// be\be_codegen.cpp:958
+
+#if defined (__ACE_INLINE__)
+#include "Typecode_typesC.inl"
+#endif /* defined INLINE */
+
+#if defined(_MSC_VER)
+#pragma warning(pop)
+#endif /* _MSC_VER */
+
+#if defined (__BORLANDC__)
+#pragma option pop
+#endif /* __BORLANDC__ */
+
+#include /**/ "ace/post.h"
+
+#endif /* ifndef */
+
+
diff --git a/TAO/tao/Typecode_typesC.inl b/TAO/tao/Typecode_typesC.inl
new file mode 100644
index 00000000000..c944d806c1f
--- /dev/null
+++ b/TAO/tao/Typecode_typesC.inl
@@ -0,0 +1,27 @@
+// -*- C++ -*-
+//
+// $Id$
+
+// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+// TAO and the TAO IDL Compiler have been developed by:
+//       Center for Distributed Object Computing
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       Irvine, CA
+//       USA
+//       http://doc.ece.uci.edu/
+// and
+//       Institute for Software Integrated Systems
+//       Vanderbilt University
+//       Nashville, TN
+//       USA
+//       http://www.isis.vanderbilt.edu/
+//
+// Information about TAO is available at:
+//     http://www.cs.wustl.edu/~schmidt/TAO.html
+
diff --git a/TAO/tao/Typecode_typesS.h b/TAO/tao/Typecode_typesS.h
new file mode 100644
index 00000000000..d86cfb7c4ee
--- /dev/null
+++ b/TAO/tao/Typecode_typesS.h
@@ -0,0 +1,77 @@
+// -*- C++ -*-
+//
+// $Id$
+
+// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+// TAO and the TAO IDL Compiler have been developed by:
+//       Center for Distributed Object Computing
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       Irvine, CA
+//       USA
+//       http://doc.ece.uci.edu/
+// and
+//       Institute for Software Integrated Systems
+//       Vanderbilt University
+//       Nashville, TN
+//       USA
+//       http://www.isis.vanderbilt.edu/
+//
+// Information about TAO is available at:
+//     http://www.cs.wustl.edu/~schmidt/TAO.html
+
+// TAO_IDL - Generated from
+// be\be_codegen.cpp:389
+
+#ifndef _TAO_IDL_ORIG_TYPECODE_TYPESS_H_
+#define _TAO_IDL_ORIG_TYPECODE_TYPESS_H_
+
+#include /**/ "ace/pre.h"
+
+#include "Typecode_typesC.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#if defined(_MSC_VER)
+#pragma warning(push)
+#pragma warning(disable:4250)
+#endif /* _MSC_VER */
+
+#if defined (__BORLANDC__)
+#pragma option push -w-rvl -w-rch -w-ccc -w-inl
+#endif /* __BORLANDC__ */
+
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_sh.cpp:49
+
+namespace POA_CORBA
+{
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_sh.cpp:80
+
+} // module CORBA
+
+// TAO_IDL - Generated from
+// be\be_codegen.cpp:994
+
+
+#if defined(_MSC_VER)
+#pragma warning(pop)
+#endif /* _MSC_VER */
+
+#if defined (__BORLANDC__)
+#pragma option pop
+#endif /* __BORLANDC__ */
+
+#include /**/ "ace/post.h"
+#endif /* ifndef */
+
diff --git a/TAO/tao/diffs/Typecode_types.diff b/TAO/tao/diffs/Typecode_types.diff
new file mode 100644
index 00000000000..6579f8485a1
--- /dev/null
+++ b/TAO/tao/diffs/Typecode_types.diff
@@ -0,0 +1,67 @@
+--- orig/Typecode_typesC.h	2004-11-17 09:35:41.096556800 +0100
++++ Typecode_typesC.h	2004-11-24 13:44:21.270441600 +0100
+@@ -1,6 +1,6 @@
+ // -*- C++ -*-
+ //
+-// $Id$
++// $Id$
+ 
+ // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+ // TAO and the TAO IDL Compiler have been developed by:
+@@ -71,30 +71,6 @@
+ 
+ namespace CORBA
+ {
+-  
+-  // TAO_IDL - Generated from
+-  // be\be_interface.cpp:603
+-
+-#if !defined (_CORBA_TYPECODE__VAR_OUT_CH_)
+-#define _CORBA_TYPECODE__VAR_OUT_CH_
+-  
+-  class TypeCode;
+-  typedef TypeCode *TypeCode_ptr;
+-  
+-  typedef
+-    TAO_Objref_Var_T<
+-        TypeCode
+-      >
+-    TypeCode_var;
+-  
+-  typedef
+-    TAO_Objref_Out_T<
+-        TypeCode
+-      >
+-    TypeCode_out;
+-
+-#endif /* end #if !defined */
+-  
+   // TAO_IDL - Generated from
+   // be\be_visitor_enum/enum_ch.cpp:57
+   
+@@ -137,6 +113,11 @@
+     tk_component,
+     tk_home,
+     tk_event
++
++    // This symbol is not defined by CORBA 3.0.  It's used to speed up
++    // dispatch based on TCKind values, and lets many important ones
++    // just be table lookups.  It must always be the last enum value!!
++    , TC_KIND_COUNT
+   };
+   
+   typedef TCKind &TCKind_out;
+@@ -155,13 +136,6 @@
+ }
+ 
+ // TAO_IDL - Generated from
+-// be\be_visitor_interface_fwd/cdr_op_ch.cpp:66
+-
+-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::TypeCode_ptr );
+-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::TypeCode_ptr &);
+-
+-
+-// TAO_IDL - Generated from
+ // be\be_visitor_enum/cdr_op_ch.cpp:50
+ 
+ TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::TCKind &);
diff --git a/TAO/tao/orb.idl b/TAO/tao/orb.idl
index faf7744418a..2b70c964f7c 100644
--- a/TAO/tao/orb.idl
+++ b/TAO/tao/orb.idl
@@ -34,58 +34,13 @@
 #include <tao/Policy.pidl>
 #include <tao/Services.pidl>
 #include <tao/ParameterMode.pidl>
+#include <tao/orb_types.pidl>
+#include <tao/Typecode_types.pidl>
 
 #pragma prefix "omg.org"
 
 module CORBA
 {
-  interface TypeCode;
-
-  enum TCKind
-  {
-    tk_null,
-    tk_void,
-    tk_short,
-    tk_long,
-    tk_ushort,
-    tk_ulong,
-    tk_float,
-    tk_double,
-    tk_boolean,
-    tk_char,
-    tk_octet,
-    tk_any,
-    tk_TypeCode,
-    tk_Principal,
-    tk_objref,
-    tk_struct,
-    tk_union,
-    tk_enum,
-    tk_string,
-    tk_sequence,
-    tk_array,
-    tk_alias,
-    tk_except,
-    tk_longlong,
-    tk_ulonglong,
-    tk_longdouble,
-    tk_wchar,
-    tk_wstring,
-    tk_fixed,
-    tk_value,
-    tk_value_box,
-    tk_native,
-    tk_abstract_interface,
-    tk_local_interface,
-    tk_component,
-    tk_home
-  };
-
-  typedef string  ORBid;
-  typedef unsigned long Flags;
-  typedef string Identifier;
-  typedef string RepositoryId;
-
   struct NamedValue
   {
     Identifier name;
@@ -111,7 +66,6 @@ module CORBA
   const Visibility PRIVATE_MEMBER = 0;
   const Visibility PUBLIC_MEMBER = 1;
 
-  typedef string ObjectId;
   typedef sequence <ObjectId> ObjectIdList;
 };
 
diff --git a/TAO/tao/orb_types.pidl b/TAO/tao/orb_types.pidl
new file mode 100644
index 00000000000..865a35dd434
--- /dev/null
+++ b/TAO/tao/orb_types.pidl
@@ -0,0 +1,21 @@
+// -*- IDL -*-
+
+// $Id$
+
+// Basic types
+
+#ifndef TAO_ORB_TYPES_IDL
+#define TAO_ORB_TYPES_IDL
+
+#pragma prefix "omg.org"
+
+module CORBA
+{
+  typedef string ORBid;
+  typedef unsigned long Flags;
+  typedef string Identifier;
+  typedef string RepositoryId;
+  typedef string ObjectId;
+};
+
+#endif /* TAO_ORB_TYPES_IDL */
diff --git a/TAO/tao/orb_typesA.cpp b/TAO/tao/orb_typesA.cpp
new file mode 100644
index 00000000000..e737392e18f
--- /dev/null
+++ b/TAO/tao/orb_typesA.cpp
@@ -0,0 +1,219 @@
+// -*- C++ -*-
+//
+// $Id$
+
+// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+// TAO and the TAO IDL Compiler have been developed by:
+//       Center for Distributed Object Computing
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       Irvine, CA
+//       USA
+//       http://doc.ece.uci.edu/
+// and
+//       Institute for Software Integrated Systems
+//       Vanderbilt University
+//       Nashville, TN
+//       USA
+//       http://www.isis.vanderbilt.edu/
+//
+// Information about TAO is available at:
+//     http://www.cs.wustl.edu/~schmidt/TAO.html
+
+#include "orb_typesC.h"
+#include "tao/Typecode.h"
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:290
+
+static const CORBA::Long _oc_CORBA_ORBid[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  28,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f4f52), 
+  ACE_NTOHL (0x4269643a), 
+  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ORBid:1.0
+    6,
+  ACE_NTOHL (0x4f524269), 
+  ACE_NTOHL (0x64000000),  // name = ORBid
+    CORBA::tk_string, 
+  0U, // string length
+};
+
+static CORBA::TypeCode _tc_TAO_tc_CORBA_ORBid (
+    CORBA::tk_alias,
+    sizeof (_oc_CORBA_ORBid),
+    (char *) &_oc_CORBA_ORBid,
+    0,
+    sizeof (CORBA::ORBid)
+  );
+
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr _tc_ORBid =
+    &_tc_TAO_tc_CORBA_ORBid;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:290
+
+static const CORBA::Long _oc_CORBA_Flags[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  28,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f466c), 
+  ACE_NTOHL (0x6167733a), 
+  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/Flags:1.0
+    6,
+  ACE_NTOHL (0x466c6167), 
+  ACE_NTOHL (0x73000000),  // name = Flags
+    CORBA::tk_ulong,
+
+};
+
+static CORBA::TypeCode _tc_TAO_tc_CORBA_Flags (
+    CORBA::tk_alias,
+    sizeof (_oc_CORBA_Flags),
+    (char *) &_oc_CORBA_Flags,
+    0,
+    sizeof (CORBA::Flags)
+  );
+
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr _tc_Flags =
+    &_tc_TAO_tc_CORBA_Flags;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:290
+
+static const CORBA::Long _oc_CORBA_Identifier[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  33,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f4964), 
+  ACE_NTOHL (0x656e7469), 
+  ACE_NTOHL (0x66696572), 
+  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
+    11,
+  ACE_NTOHL (0x4964656e), 
+  ACE_NTOHL (0x74696669), 
+  ACE_NTOHL (0x65720000),  // name = Identifier
+    CORBA::tk_string, 
+  0U, // string length
+};
+
+static CORBA::TypeCode _tc_TAO_tc_CORBA_Identifier (
+    CORBA::tk_alias,
+    sizeof (_oc_CORBA_Identifier),
+    (char *) &_oc_CORBA_Identifier,
+    0,
+    sizeof (CORBA::Identifier)
+  );
+
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr _tc_Identifier =
+    &_tc_TAO_tc_CORBA_Identifier;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:290
+
+static const CORBA::Long _oc_CORBA_RepositoryId[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  35,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f5265), 
+  ACE_NTOHL (0x706f7369), 
+  ACE_NTOHL (0x746f7279), 
+  ACE_NTOHL (0x49643a31), 
+  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
+    13,
+  ACE_NTOHL (0x5265706f), 
+  ACE_NTOHL (0x7369746f), 
+  ACE_NTOHL (0x72794964), 
+  ACE_NTOHL (0x0),  // name = RepositoryId
+    CORBA::tk_string, 
+  0U, // string length
+};
+
+static CORBA::TypeCode _tc_TAO_tc_CORBA_RepositoryId (
+    CORBA::tk_alias,
+    sizeof (_oc_CORBA_RepositoryId),
+    (char *) &_oc_CORBA_RepositoryId,
+    0,
+    sizeof (CORBA::RepositoryId)
+  );
+
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr _tc_RepositoryId =
+    &_tc_TAO_tc_CORBA_RepositoryId;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:290
+
+static const CORBA::Long _oc_CORBA_ObjectId[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  31,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f4f62), 
+  ACE_NTOHL (0x6a656374), 
+  ACE_NTOHL (0x49643a31), 
+  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ObjectId:1.0
+    9,
+  ACE_NTOHL (0x4f626a65), 
+  ACE_NTOHL (0x63744964), 
+  ACE_NTOHL (0x0),  // name = ObjectId
+    CORBA::tk_string, 
+  0U, // string length
+};
+
+static CORBA::TypeCode _tc_TAO_tc_CORBA_ObjectId (
+    CORBA::tk_alias,
+    sizeof (_oc_CORBA_ObjectId),
+    (char *) &_oc_CORBA_ObjectId,
+    0,
+    sizeof (CORBA::ObjectId)
+  );
+
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr _tc_ObjectId =
+    &_tc_TAO_tc_CORBA_ObjectId;
+}
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
diff --git a/TAO/tao/orb_typesC.cpp b/TAO/tao/orb_typesC.cpp
new file mode 100644
index 00000000000..6ed61175f1f
--- /dev/null
+++ b/TAO/tao/orb_typesC.cpp
@@ -0,0 +1,60 @@
+// -*- C++ -*-
+//
+// $Id$
+
+// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+// TAO and the TAO IDL Compiler have been developed by:
+//       Center for Distributed Object Computing
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       Irvine, CA
+//       USA
+//       http://doc.ece.uci.edu/
+// and
+//       Institute for Software Integrated Systems
+//       Vanderbilt University
+//       Nashville, TN
+//       USA
+//       http://www.isis.vanderbilt.edu/
+//
+// Information about TAO is available at:
+//     http://www.cs.wustl.edu/~schmidt/TAO.html
+
+// TAO_IDL - Generated from
+// be\be_codegen.cpp:303
+
+
+#include "orb_typesC.h"
+#include "tao/CDR.h"
+#include "tao/Typecode.h"
+
+#if defined (__BORLANDC__)
+#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
+#endif /* __BORLANDC__ */
+
+#if !defined (__ACE_INLINE__)
+#include "orb_typesC.inl"
+#endif /* !defined INLINE */
+
+// TAO_IDL - Generated from
+// be\be_visitor_arg_traits.cpp:64
+
+// Arg traits specializations.
+namespace TAO
+{
+}
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_root/root.cpp:1629
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
diff --git a/TAO/tao/orb_typesC.h b/TAO/tao/orb_typesC.h
new file mode 100644
index 00000000000..7736ce47d97
--- /dev/null
+++ b/TAO/tao/orb_typesC.h
@@ -0,0 +1,166 @@
+// -*- C++ -*-
+//
+// $Id$
+
+// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+// TAO and the TAO IDL Compiler have been developed by:
+//       Center for Distributed Object Computing
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       Irvine, CA
+//       USA
+//       http://doc.ece.uci.edu/
+// and
+//       Institute for Software Integrated Systems
+//       Vanderbilt University
+//       Nashville, TN
+//       USA
+//       http://www.isis.vanderbilt.edu/
+//
+// Information about TAO is available at:
+//     http://www.cs.wustl.edu/~schmidt/TAO.html
+
+// TAO_IDL - Generated from
+// be\be_codegen.cpp:153
+
+#ifndef _TAO_IDL_ORIG_ORB_TYPESC_H_
+#define _TAO_IDL_ORIG_ORB_TYPESC_H_
+
+#include /**/ "ace/pre.h"
+
+
+#include "ace/config-all.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "tao/ORB.h"
+#include "tao/Environment.h"
+
+#if defined (TAO_EXPORT_MACRO)
+#undef TAO_EXPORT_MACRO
+#endif
+#define TAO_EXPORT_MACRO TAO_Export
+
+#if defined (TAO_EXPORT_NESTED_CLASSES)
+#  if defined (TAO_EXPORT_NESTED_MACRO)
+#    undef TAO_EXPORT_NESTED_MACRO
+#  endif /* defined (TAO_EXPORT_NESTED_MACRO) */
+#  define TAO_EXPORT_NESTED_MACRO TAO_Export
+#endif /* TAO_EXPORT_NESTED_CLASSES */
+
+#if defined(_MSC_VER)
+#if (_MSC_VER >= 1200)
+#pragma warning(push)
+#endif /* _MSC_VER >= 1200 */
+#pragma warning(disable:4250)
+#endif /* _MSC_VER */
+
+#if defined (__BORLANDC__)
+#pragma option push -w-rvl -w-rch -w-ccc -w-inl
+#endif /* __BORLANDC__ */
+
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_ch.cpp:48
+
+namespace CORBA
+{
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_typedef/typedef_ch.cpp:376
+  
+  typedef char * ORBid;
+  typedef CORBA::String_var ORBid_var;
+  typedef CORBA::String_out ORBid_out;
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_typecode/typecode_decl.cpp:44
+  
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ORBid;
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_typedef/typedef_ch.cpp:342
+  
+  typedef CORBA::ULong Flags;
+  typedef CORBA::ULong_out Flags_out;
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_typecode/typecode_decl.cpp:44
+  
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Flags;
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_typedef/typedef_ch.cpp:376
+  
+  typedef char * Identifier;
+  typedef CORBA::String_var Identifier_var;
+  typedef CORBA::String_out Identifier_out;
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_typecode/typecode_decl.cpp:44
+  
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Identifier;
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_typedef/typedef_ch.cpp:376
+  
+  typedef char * RepositoryId;
+  typedef CORBA::String_var RepositoryId_var;
+  typedef CORBA::String_out RepositoryId_out;
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_typecode/typecode_decl.cpp:44
+  
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_RepositoryId;
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_typedef/typedef_ch.cpp:376
+  
+  typedef char * ObjectId;
+  typedef CORBA::String_var ObjectId_var;
+  typedef CORBA::String_out ObjectId_out;
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_typecode/typecode_decl.cpp:44
+  
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ObjectId;
+
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_ch.cpp:66
+
+} // module CORBA
+
+// TAO_IDL - Generated from
+// be\be_visitor_traits.cpp:59
+
+// Traits specializations.
+namespace TAO
+{
+}
+
+// TAO_IDL - Generated from
+// be\be_codegen.cpp:964
+
+#if defined (__ACE_INLINE__)
+#include "orb_typesC.inl"
+#endif /* defined INLINE */
+
+#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#pragma warning(pop)
+#endif /* _MSC_VER */
+
+#if defined (__BORLANDC__)
+#pragma option pop
+#endif /* __BORLANDC__ */
+
+#include /**/ "ace/post.h"
+
+#endif /* ifndef */
+
+
diff --git a/TAO/tao/orb_typesC.inl b/TAO/tao/orb_typesC.inl
new file mode 100644
index 00000000000..c944d806c1f
--- /dev/null
+++ b/TAO/tao/orb_typesC.inl
@@ -0,0 +1,27 @@
+// -*- C++ -*-
+//
+// $Id$
+
+// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+// TAO and the TAO IDL Compiler have been developed by:
+//       Center for Distributed Object Computing
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       Irvine, CA
+//       USA
+//       http://doc.ece.uci.edu/
+// and
+//       Institute for Software Integrated Systems
+//       Vanderbilt University
+//       Nashville, TN
+//       USA
+//       http://www.isis.vanderbilt.edu/
+//
+// Information about TAO is available at:
+//     http://www.cs.wustl.edu/~schmidt/TAO.html
+
diff --git a/TAO/tao/orb_typesS.h b/TAO/tao/orb_typesS.h
new file mode 100644
index 00000000000..046965b76e8
--- /dev/null
+++ b/TAO/tao/orb_typesS.h
@@ -0,0 +1,79 @@
+// -*- C++ -*-
+//
+// $Id$
+
+// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+// TAO and the TAO IDL Compiler have been developed by:
+//       Center for Distributed Object Computing
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       Irvine, CA
+//       USA
+//       http://doc.ece.uci.edu/
+// and
+//       Institute for Software Integrated Systems
+//       Vanderbilt University
+//       Nashville, TN
+//       USA
+//       http://www.isis.vanderbilt.edu/
+//
+// Information about TAO is available at:
+//     http://www.cs.wustl.edu/~schmidt/TAO.html
+
+// TAO_IDL - Generated from
+// be\be_codegen.cpp:391
+
+#ifndef _TAO_IDL_ORIG_ORB_TYPESS_H_
+#define _TAO_IDL_ORIG_ORB_TYPESS_H_
+
+#include /**/ "ace/pre.h"
+
+#include "orb_typesC.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "tao/Collocation_Proxy_Broker.h"
+#include "tao/PortableServer/PortableServer.h"
+#include "tao/PortableServer/Servant_Base.h"
+
+#if defined(_MSC_VER)
+#if (_MSC_VER >= 1200)
+#pragma warning(push)
+#endif /* _MSC_VER >= 1200 */
+#pragma warning(disable:4250)
+#endif /* _MSC_VER */
+
+#if defined (__BORLANDC__)
+#pragma option push -w-rvl -w-rch -w-ccc -w-inl
+#endif /* __BORLANDC__ */
+
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_sh.cpp:49
+
+namespace POA_CORBA
+{
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_sh.cpp:80
+
+} // module CORBA
+
+#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#pragma warning(pop)
+#endif /* _MSC_VER */
+
+#if defined (__BORLANDC__)
+#pragma option pop
+#endif /* __BORLANDC__ */
+
+#include /**/ "ace/post.h"
+#endif /* ifndef */
+
diff --git a/TAO/tao/tao.mpc b/TAO/tao/tao.mpc
index 3cf986a94ac..be49f1c928a 100644
--- a/TAO/tao/tao.mpc
+++ b/TAO/tao/tao.mpc
@@ -171,6 +171,8 @@ project(TAO) : acelib, taoversion, core, tao_output, taodefaults, pidl, extra_co
     OctetSeqC.cpp
     operation_details.cpp
     ORB.cpp
+    ORB_typesA.cpp
+    ORB_typesC.cpp
     ORB_Core.cpp
     ORB_Core_Auto_Ptr.cpp
     ORB_Table.cpp
@@ -254,6 +256,7 @@ project(TAO) : acelib, taoversion, core, tao_output, taodefaults, pidl, extra_co
     Transport_Timer.cpp
     TSS_Resources.cpp
     Typecode.cpp
+    Typecode_typesC.cpp
     Typecode_Constants.cpp
     TypeCodeFactory_Adapter.cpp
     ULongLongSeqA.cpp