ChangeLogTag: Thu May 10 20:17:48 2001 Jeff Parsons <parsons@cs.wustl.edu>

11 files changed, 5831 insertions, 861 deletions

diff --git a/TAO/orbsvcs/IFR_Service/IFR_BaseS.cpp b/TAO/orbsvcs/IFR_Service/IFR_BaseS.cpp
index 1f7724de564..04fed0ddd80 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_BaseS.cpp
+++ b/TAO/orbsvcs/IFR_Service/IFR_BaseS.cpp
@@ -529,7 +529,7 @@ CORBA::DefinitionKind _TAO_CORBA_IRObject_ThruPOA_Proxy_Impl::def_kind (
     return ACE_reinterpret_cast (
       POA_CORBA_IRObject_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_IRObject:1.0"
+          "IDL:omg.org/CORBA/IRObject:1.0"
         )
     )->def_kind (
         ACE_TRY_ENV
@@ -558,7 +558,7 @@ void _TAO_CORBA_IRObject_ThruPOA_Proxy_Impl::destroy (
     ACE_reinterpret_cast (
       POA_CORBA_IRObject_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_IRObject:1.0"
+          "IDL:omg.org/CORBA/IRObject:1.0"
         )
     )->destroy (
         ACE_TRY_ENV
@@ -832,7 +832,7 @@ CORBA::Boolean POA_CORBA_IRObject::_is_a (
   ACE_CHECK_RETURN (0);
   
   if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
     (!ACE_OS::strcmp ((char *)value, base_id)))
       return 1;
     else
@@ -843,7 +843,7 @@ void* POA_CORBA_IRObject::_downcast (
     const char* logical_type_id
   )
 {
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
     return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
     return ACE_static_cast(PortableServer::Servant, this);
@@ -857,7 +857,7 @@ void POA_CORBA_IRObject::_dispatch (TAO_ServerRequest &req, void *context, CORBA
 
 const char* POA_CORBA_IRObject::_interface_repository_id (void) const
 {
-  return "IDL:omg.org/CORBA_IRObject:1.0";
+  return "IDL:omg.org/CORBA/IRObject:1.0";
 }
 
 CORBA_IRObject*
@@ -2527,7 +2527,7 @@ char * _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::id (
     return ACE_reinterpret_cast (
       POA_CORBA_Contained_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_Contained:1.0"
+          "IDL:omg.org/CORBA/Contained:1.0"
         )
     )->id (
         ACE_TRY_ENV
@@ -2557,7 +2557,7 @@ void _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::id (
     ACE_reinterpret_cast (
       POA_CORBA_Contained_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_Contained:1.0"
+          "IDL:omg.org/CORBA/Contained:1.0"
         )
     )->id (
         id,
@@ -2590,7 +2590,7 @@ char * _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::name (
     return ACE_reinterpret_cast (
       POA_CORBA_Contained_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_Contained:1.0"
+          "IDL:omg.org/CORBA/Contained:1.0"
         )
     )->name (
         ACE_TRY_ENV
@@ -2620,7 +2620,7 @@ void _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::name (
     ACE_reinterpret_cast (
       POA_CORBA_Contained_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_Contained:1.0"
+          "IDL:omg.org/CORBA/Contained:1.0"
         )
     )->name (
         name,
@@ -2653,7 +2653,7 @@ char * _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::version (
     return ACE_reinterpret_cast (
       POA_CORBA_Contained_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_Contained:1.0"
+          "IDL:omg.org/CORBA/Contained:1.0"
         )
     )->version (
         ACE_TRY_ENV
@@ -2683,7 +2683,7 @@ void _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::version (
     ACE_reinterpret_cast (
       POA_CORBA_Contained_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_Contained:1.0"
+          "IDL:omg.org/CORBA/Contained:1.0"
         )
     )->version (
         version,
@@ -2716,7 +2716,7 @@ CORBA_Container_ptr _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::defined_in (
     return ACE_reinterpret_cast (
       POA_CORBA_Contained_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_Contained:1.0"
+          "IDL:omg.org/CORBA/Contained:1.0"
         )
     )->defined_in (
         ACE_TRY_ENV
@@ -2747,7 +2747,7 @@ char * _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::absolute_name (
     return ACE_reinterpret_cast (
       POA_CORBA_Contained_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_Contained:1.0"
+          "IDL:omg.org/CORBA/Contained:1.0"
         )
     )->absolute_name (
         ACE_TRY_ENV
@@ -2778,7 +2778,7 @@ CORBA_Repository_ptr _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::containing_reposit
     return ACE_reinterpret_cast (
       POA_CORBA_Contained_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_Contained:1.0"
+          "IDL:omg.org/CORBA/Contained:1.0"
         )
     )->containing_repository (
         ACE_TRY_ENV
@@ -2809,7 +2809,7 @@ CORBA_Contained::Description * _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::describe
     return ACE_reinterpret_cast (
       POA_CORBA_Contained_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_Contained:1.0"
+          "IDL:omg.org/CORBA/Contained:1.0"
         )
     )->describe (
         ACE_TRY_ENV
@@ -2841,7 +2841,7 @@ void _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::move (
     ACE_reinterpret_cast (
       POA_CORBA_Contained_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_Contained:1.0"
+          "IDL:omg.org/CORBA/Contained:1.0"
         )
     )->move (
         new_container,
@@ -3854,8 +3854,8 @@ CORBA::Boolean POA_CORBA_Contained::_is_a (
   ACE_CHECK_RETURN (0);
   
   if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
     (!ACE_OS::strcmp ((char *)value, base_id)))
       return 1;
     else
@@ -3866,9 +3866,9 @@ void* POA_CORBA_Contained::_downcast (
     const char* logical_type_id
   )
 {
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Contained:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Contained:1.0") == 0)
     return ACE_static_cast (POA_CORBA_Contained_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
     return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
     return ACE_static_cast(PortableServer::Servant, this);
@@ -3882,7 +3882,7 @@ void POA_CORBA_Contained::_dispatch (TAO_ServerRequest &req, void *context, CORB
 
 const char* POA_CORBA_Contained::_interface_repository_id (void) const
 {
-  return "IDL:omg.org/CORBA_Contained:1.0";
+  return "IDL:omg.org/CORBA/Contained:1.0";
 }
 
 CORBA_Contained*
@@ -6946,7 +6946,7 @@ CORBA_Contained_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::lookup (
     return ACE_reinterpret_cast (
       POA_CORBA_Container_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_Container:1.0"
+          "IDL:omg.org/CORBA/Container:1.0"
         )
     )->lookup (
         search_name,
@@ -6980,7 +6980,7 @@ CORBA_ContainedSeq * _TAO_CORBA_Container_ThruPOA_Proxy_Impl::contents (
     return ACE_reinterpret_cast (
       POA_CORBA_Container_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_Container:1.0"
+          "IDL:omg.org/CORBA/Container:1.0"
         )
     )->contents (
         limit_type,
@@ -7017,7 +7017,7 @@ CORBA_ContainedSeq * _TAO_CORBA_Container_ThruPOA_Proxy_Impl::lookup_name (
     return ACE_reinterpret_cast (
       POA_CORBA_Container_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_Container:1.0"
+          "IDL:omg.org/CORBA/Container:1.0"
         )
     )->lookup_name (
         search_name,
@@ -7055,7 +7055,7 @@ CORBA_Container::DescriptionSeq * _TAO_CORBA_Container_ThruPOA_Proxy_Impl::descr
     return ACE_reinterpret_cast (
       POA_CORBA_Container_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_Container:1.0"
+          "IDL:omg.org/CORBA/Container:1.0"
         )
     )->describe_contents (
         limit_type,
@@ -7092,7 +7092,7 @@ CORBA_ModuleDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_module (
     return ACE_reinterpret_cast (
       POA_CORBA_Container_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_Container:1.0"
+          "IDL:omg.org/CORBA/Container:1.0"
         )
     )->create_module (
         id,
@@ -7131,7 +7131,7 @@ CORBA_ConstantDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_constant (
     return ACE_reinterpret_cast (
       POA_CORBA_Container_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_Container:1.0"
+          "IDL:omg.org/CORBA/Container:1.0"
         )
     )->create_constant (
         id,
@@ -7171,7 +7171,7 @@ CORBA_StructDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_struct (
     return ACE_reinterpret_cast (
       POA_CORBA_Container_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_Container:1.0"
+          "IDL:omg.org/CORBA/Container:1.0"
         )
     )->create_struct (
         id,
@@ -7211,7 +7211,7 @@ CORBA_UnionDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_union (
     return ACE_reinterpret_cast (
       POA_CORBA_Container_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_Container:1.0"
+          "IDL:omg.org/CORBA/Container:1.0"
         )
     )->create_union (
         id,
@@ -7251,7 +7251,7 @@ CORBA_EnumDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_enum (
     return ACE_reinterpret_cast (
       POA_CORBA_Container_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_Container:1.0"
+          "IDL:omg.org/CORBA/Container:1.0"
         )
     )->create_enum (
         id,
@@ -7290,7 +7290,7 @@ CORBA_AliasDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_alias (
     return ACE_reinterpret_cast (
       POA_CORBA_Container_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_Container:1.0"
+          "IDL:omg.org/CORBA/Container:1.0"
         )
     )->create_alias (
         id,
@@ -7329,7 +7329,7 @@ CORBA_InterfaceDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_interface
     return ACE_reinterpret_cast (
       POA_CORBA_Container_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_Container:1.0"
+          "IDL:omg.org/CORBA/Container:1.0"
         )
     )->create_interface (
         id,
@@ -7374,7 +7374,7 @@ CORBA_ValueDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_value (
     return ACE_reinterpret_cast (
       POA_CORBA_Container_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_Container:1.0"
+          "IDL:omg.org/CORBA/Container:1.0"
         )
     )->create_value (
         id,
@@ -7419,7 +7419,7 @@ CORBA_ValueBoxDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_value_box
     return ACE_reinterpret_cast (
       POA_CORBA_Container_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_Container:1.0"
+          "IDL:omg.org/CORBA/Container:1.0"
         )
     )->create_value_box (
         id,
@@ -7458,7 +7458,7 @@ CORBA_ExceptionDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_exception
     return ACE_reinterpret_cast (
       POA_CORBA_Container_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_Container:1.0"
+          "IDL:omg.org/CORBA/Container:1.0"
         )
     )->create_exception (
         id,
@@ -7496,7 +7496,7 @@ CORBA_NativeDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_native (
     return ACE_reinterpret_cast (
       POA_CORBA_Container_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_Container:1.0"
+          "IDL:omg.org/CORBA/Container:1.0"
         )
     )->create_native (
         id,
@@ -7534,7 +7534,7 @@ CORBA_AbstractInterfaceDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_a
     return ACE_reinterpret_cast (
       POA_CORBA_Container_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_Container:1.0"
+          "IDL:omg.org/CORBA/Container:1.0"
         )
     )->create_abstract_interface (
         id,
@@ -7573,7 +7573,7 @@ CORBA_LocalInterfaceDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_loca
     return ACE_reinterpret_cast (
       POA_CORBA_Container_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_Container:1.0"
+          "IDL:omg.org/CORBA/Container:1.0"
         )
     )->create_local_interface (
         id,
@@ -9419,8 +9419,8 @@ CORBA::Boolean POA_CORBA_Container::_is_a (
   ACE_CHECK_RETURN (0);
   
   if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Container:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Container:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
     (!ACE_OS::strcmp ((char *)value, base_id)))
       return 1;
     else
@@ -9431,9 +9431,9 @@ void* POA_CORBA_Container::_downcast (
     const char* logical_type_id
   )
 {
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Container:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Container:1.0") == 0)
     return ACE_static_cast (POA_CORBA_Container_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
     return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
     return ACE_static_cast(PortableServer::Servant, this);
@@ -9447,7 +9447,7 @@ void POA_CORBA_Container::_dispatch (TAO_ServerRequest &req, void *context, CORB
 
 const char* POA_CORBA_Container::_interface_repository_id (void) const
 {
-  return "IDL:omg.org/CORBA_Container:1.0";
+  return "IDL:omg.org/CORBA/Container:1.0";
 }
 
 CORBA_Container*
@@ -9842,7 +9842,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_IDLType_ThruPOA_Proxy_Impl::type (
     return ACE_reinterpret_cast (
       POA_CORBA_IDLType_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_IDLType:1.0"
+          "IDL:omg.org/CORBA/IDLType:1.0"
         )
     )->type (
         ACE_TRY_ENV
@@ -10047,8 +10047,8 @@ CORBA::Boolean POA_CORBA_IDLType::_is_a (
   ACE_CHECK_RETURN (0);
   
   if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IDLType:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
     (!ACE_OS::strcmp ((char *)value, base_id)))
       return 1;
     else
@@ -10059,9 +10059,9 @@ void* POA_CORBA_IDLType::_downcast (
     const char* logical_type_id
   )
 {
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IDLType:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IDLType:1.0") == 0)
     return ACE_static_cast (POA_CORBA_IDLType_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
     return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
     return ACE_static_cast(PortableServer::Servant, this);
@@ -10075,7 +10075,7 @@ void POA_CORBA_IDLType::_dispatch (TAO_ServerRequest &req, void *context, CORBA:
 
 const char* POA_CORBA_IDLType::_interface_repository_id (void) const
 {
-  return "IDL:omg.org/CORBA_IDLType:1.0";
+  return "IDL:omg.org/CORBA/IDLType:1.0";
 }
 
 CORBA_IDLType*
@@ -10474,10 +10474,10 @@ CORBA::Boolean POA_CORBA_TypedefDef::_is_a (
   ACE_CHECK_RETURN (0);
   
   if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_TypedefDef:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IDLType:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/TypedefDef:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
     (!ACE_OS::strcmp ((char *)value, base_id)))
       return 1;
     else
@@ -10488,13 +10488,13 @@ void* POA_CORBA_TypedefDef::_downcast (
     const char* logical_type_id
   )
 {
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_TypedefDef:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/TypedefDef:1.0") == 0)
     return ACE_static_cast (POA_CORBA_TypedefDef_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Contained:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Contained:1.0") == 0)
     return ACE_static_cast (POA_CORBA_Contained_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IDLType:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IDLType:1.0") == 0)
     return ACE_static_cast (POA_CORBA_IDLType_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
     return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
     return ACE_static_cast(PortableServer::Servant, this);
@@ -10508,7 +10508,7 @@ void POA_CORBA_TypedefDef::_dispatch (TAO_ServerRequest &req, void *context, COR
 
 const char* POA_CORBA_TypedefDef::_interface_repository_id (void) const
 {
-  return "IDL:omg.org/CORBA_TypedefDef:1.0";
+  return "IDL:omg.org/CORBA/TypedefDef:1.0";
 }
 
 CORBA_TypedefDef*
diff --git a/TAO/orbsvcs/IFR_Service/IFR_BasicS.cpp b/TAO/orbsvcs/IFR_Service/IFR_BasicS.cpp
index 632826babd0..54bad62bc41 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_BasicS.cpp
+++ b/TAO/orbsvcs/IFR_Service/IFR_BasicS.cpp
@@ -1444,7 +1444,7 @@ CORBA_Contained_ptr _TAO_CORBA_Repository_ThruPOA_Proxy_Impl::lookup_id (
     return ACE_reinterpret_cast (
       POA_CORBA_Repository_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_Repository:1.0"
+          "IDL:omg.org/CORBA/Repository:1.0"
         )
     )->lookup_id (
         search_id,
@@ -1477,7 +1477,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_Repository_ThruPOA_Proxy_Impl::get_canonical_type
     return ACE_reinterpret_cast (
       POA_CORBA_Repository_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_Repository:1.0"
+          "IDL:omg.org/CORBA/Repository:1.0"
         )
     )->get_canonical_typecode (
         tc,
@@ -1510,7 +1510,7 @@ CORBA_PrimitiveDef_ptr _TAO_CORBA_Repository_ThruPOA_Proxy_Impl::get_primitive (
     return ACE_reinterpret_cast (
       POA_CORBA_Repository_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_Repository:1.0"
+          "IDL:omg.org/CORBA/Repository:1.0"
         )
     )->get_primitive (
         kind,
@@ -1543,7 +1543,7 @@ CORBA_StringDef_ptr _TAO_CORBA_Repository_ThruPOA_Proxy_Impl::create_string (
     return ACE_reinterpret_cast (
       POA_CORBA_Repository_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_Repository:1.0"
+          "IDL:omg.org/CORBA/Repository:1.0"
         )
     )->create_string (
         bound,
@@ -1576,7 +1576,7 @@ CORBA_WstringDef_ptr _TAO_CORBA_Repository_ThruPOA_Proxy_Impl::create_wstring (
     return ACE_reinterpret_cast (
       POA_CORBA_Repository_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_Repository:1.0"
+          "IDL:omg.org/CORBA/Repository:1.0"
         )
     )->create_wstring (
         bound,
@@ -1610,7 +1610,7 @@ CORBA_SequenceDef_ptr _TAO_CORBA_Repository_ThruPOA_Proxy_Impl::create_sequence
     return ACE_reinterpret_cast (
       POA_CORBA_Repository_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_Repository:1.0"
+          "IDL:omg.org/CORBA/Repository:1.0"
         )
     )->create_sequence (
         bound,
@@ -1645,7 +1645,7 @@ CORBA_ArrayDef_ptr _TAO_CORBA_Repository_ThruPOA_Proxy_Impl::create_array (
     return ACE_reinterpret_cast (
       POA_CORBA_Repository_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_Repository:1.0"
+          "IDL:omg.org/CORBA/Repository:1.0"
         )
     )->create_array (
         length,
@@ -1680,7 +1680,7 @@ CORBA_FixedDef_ptr _TAO_CORBA_Repository_ThruPOA_Proxy_Impl::create_fixed (
     return ACE_reinterpret_cast (
       POA_CORBA_Repository_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_Repository:1.0"
+          "IDL:omg.org/CORBA/Repository:1.0"
         )
     )->create_fixed (
         digits,
@@ -2532,9 +2532,9 @@ CORBA::Boolean POA_CORBA_Repository::_is_a (
   ACE_CHECK_RETURN (0);
   
   if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Repository:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Container:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Repository:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Container:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
     (!ACE_OS::strcmp ((char *)value, base_id)))
       return 1;
     else
@@ -2545,11 +2545,11 @@ void* POA_CORBA_Repository::_downcast (
     const char* logical_type_id
   )
 {
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Repository:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Repository:1.0") == 0)
     return ACE_static_cast (POA_CORBA_Repository_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Container:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Container:1.0") == 0)
     return ACE_static_cast (POA_CORBA_Container_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
     return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
     return ACE_static_cast(PortableServer::Servant, this);
@@ -2563,7 +2563,7 @@ void POA_CORBA_Repository::_dispatch (TAO_ServerRequest &req, void *context, COR
 
 const char* POA_CORBA_Repository::_interface_repository_id (void) const
 {
-  return "IDL:omg.org/CORBA_Repository:1.0";
+  return "IDL:omg.org/CORBA/Repository:1.0";
 }
 
 CORBA_Repository*
@@ -2980,10 +2980,10 @@ CORBA::Boolean POA_CORBA_ModuleDef::_is_a (
   ACE_CHECK_RETURN (0);
   
   if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_ModuleDef:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Container:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/ModuleDef:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Container:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
     (!ACE_OS::strcmp ((char *)value, base_id)))
       return 1;
     else
@@ -2994,13 +2994,13 @@ void* POA_CORBA_ModuleDef::_downcast (
     const char* logical_type_id
   )
 {
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_ModuleDef:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/ModuleDef:1.0") == 0)
     return ACE_static_cast (POA_CORBA_ModuleDef_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Container:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Container:1.0") == 0)
     return ACE_static_cast (POA_CORBA_Container_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Contained:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Contained:1.0") == 0)
     return ACE_static_cast (POA_CORBA_Contained_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
     return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
     return ACE_static_cast(PortableServer::Servant, this);
@@ -3014,7 +3014,7 @@ void POA_CORBA_ModuleDef::_dispatch (TAO_ServerRequest &req, void *context, CORB
 
 const char* POA_CORBA_ModuleDef::_interface_repository_id (void) const
 {
-  return "IDL:omg.org/CORBA_ModuleDef:1.0";
+  return "IDL:omg.org/CORBA/ModuleDef:1.0";
 }
 
 CORBA_ModuleDef*
@@ -3935,7 +3935,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_ConstantDef_ThruPOA_Proxy_Impl::type (
     return ACE_reinterpret_cast (
       POA_CORBA_ConstantDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_ConstantDef:1.0"
+          "IDL:omg.org/CORBA/ConstantDef:1.0"
         )
     )->type (
         ACE_TRY_ENV
@@ -3966,7 +3966,7 @@ CORBA_IDLType_ptr _TAO_CORBA_ConstantDef_ThruPOA_Proxy_Impl::type_def (
     return ACE_reinterpret_cast (
       POA_CORBA_ConstantDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_ConstantDef:1.0"
+          "IDL:omg.org/CORBA/ConstantDef:1.0"
         )
     )->type_def (
         ACE_TRY_ENV
@@ -3996,7 +3996,7 @@ void _TAO_CORBA_ConstantDef_ThruPOA_Proxy_Impl::type_def (
     ACE_reinterpret_cast (
       POA_CORBA_ConstantDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_ConstantDef:1.0"
+          "IDL:omg.org/CORBA/ConstantDef:1.0"
         )
     )->type_def (
         type_def,
@@ -4029,7 +4029,7 @@ CORBA::Any * _TAO_CORBA_ConstantDef_ThruPOA_Proxy_Impl::value (
     return ACE_reinterpret_cast (
       POA_CORBA_ConstantDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_ConstantDef:1.0"
+          "IDL:omg.org/CORBA/ConstantDef:1.0"
         )
     )->value (
         ACE_TRY_ENV
@@ -4059,7 +4059,7 @@ void _TAO_CORBA_ConstantDef_ThruPOA_Proxy_Impl::value (
     ACE_reinterpret_cast (
       POA_CORBA_ConstantDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_ConstantDef:1.0"
+          "IDL:omg.org/CORBA/ConstantDef:1.0"
         )
     )->value (
         value,
@@ -4585,9 +4585,9 @@ CORBA::Boolean POA_CORBA_ConstantDef::_is_a (
   ACE_CHECK_RETURN (0);
   
   if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_ConstantDef:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/ConstantDef:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
     (!ACE_OS::strcmp ((char *)value, base_id)))
       return 1;
     else
@@ -4598,11 +4598,11 @@ void* POA_CORBA_ConstantDef::_downcast (
     const char* logical_type_id
   )
 {
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_ConstantDef:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/ConstantDef:1.0") == 0)
     return ACE_static_cast (POA_CORBA_ConstantDef_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Contained:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Contained:1.0") == 0)
     return ACE_static_cast (POA_CORBA_Contained_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
     return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
     return ACE_static_cast(PortableServer::Servant, this);
@@ -4616,7 +4616,7 @@ void POA_CORBA_ConstantDef::_dispatch (TAO_ServerRequest &req, void *context, CO
 
 const char* POA_CORBA_ConstantDef::_interface_repository_id (void) const
 {
-  return "IDL:omg.org/CORBA_ConstantDef:1.0";
+  return "IDL:omg.org/CORBA/ConstantDef:1.0";
 }
 
 CORBA_ConstantDef*
@@ -5186,7 +5186,7 @@ CORBA_StructMemberSeq * _TAO_CORBA_StructDef_ThruPOA_Proxy_Impl::members (
     return ACE_reinterpret_cast (
       POA_CORBA_StructDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_StructDef:1.0"
+          "IDL:omg.org/CORBA/StructDef:1.0"
         )
     )->members (
         ACE_TRY_ENV
@@ -5216,7 +5216,7 @@ void _TAO_CORBA_StructDef_ThruPOA_Proxy_Impl::members (
     ACE_reinterpret_cast (
       POA_CORBA_StructDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_StructDef:1.0"
+          "IDL:omg.org/CORBA/StructDef:1.0"
         )
     )->members (
         members,
@@ -5506,12 +5506,12 @@ CORBA::Boolean POA_CORBA_StructDef::_is_a (
   ACE_CHECK_RETURN (0);
   
   if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_StructDef:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_TypedefDef:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Container:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IDLType:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/StructDef:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/TypedefDef:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Container:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
     (!ACE_OS::strcmp ((char *)value, base_id)))
       return 1;
     else
@@ -5522,17 +5522,17 @@ void* POA_CORBA_StructDef::_downcast (
     const char* logical_type_id
   )
 {
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_StructDef:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/StructDef:1.0") == 0)
     return ACE_static_cast (POA_CORBA_StructDef_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_TypedefDef:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/TypedefDef:1.0") == 0)
     return ACE_static_cast (POA_CORBA_TypedefDef_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Container:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Container:1.0") == 0)
     return ACE_static_cast (POA_CORBA_Container_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Contained:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Contained:1.0") == 0)
     return ACE_static_cast (POA_CORBA_Contained_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IDLType:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IDLType:1.0") == 0)
     return ACE_static_cast (POA_CORBA_IDLType_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
     return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
     return ACE_static_cast(PortableServer::Servant, this);
@@ -5546,7 +5546,7 @@ void POA_CORBA_StructDef::_dispatch (TAO_ServerRequest &req, void *context, CORB
 
 const char* POA_CORBA_StructDef::_interface_repository_id (void) const
 {
-  return "IDL:omg.org/CORBA_StructDef:1.0";
+  return "IDL:omg.org/CORBA/StructDef:1.0";
 }
 
 CORBA_StructDef*
@@ -6488,7 +6488,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_UnionDef_ThruPOA_Proxy_Impl::discriminator_type (
     return ACE_reinterpret_cast (
       POA_CORBA_UnionDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_UnionDef:1.0"
+          "IDL:omg.org/CORBA/UnionDef:1.0"
         )
     )->discriminator_type (
         ACE_TRY_ENV
@@ -6519,7 +6519,7 @@ CORBA_IDLType_ptr _TAO_CORBA_UnionDef_ThruPOA_Proxy_Impl::discriminator_type_def
     return ACE_reinterpret_cast (
       POA_CORBA_UnionDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_UnionDef:1.0"
+          "IDL:omg.org/CORBA/UnionDef:1.0"
         )
     )->discriminator_type_def (
         ACE_TRY_ENV
@@ -6549,7 +6549,7 @@ void _TAO_CORBA_UnionDef_ThruPOA_Proxy_Impl::discriminator_type_def (
     ACE_reinterpret_cast (
       POA_CORBA_UnionDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_UnionDef:1.0"
+          "IDL:omg.org/CORBA/UnionDef:1.0"
         )
     )->discriminator_type_def (
         discriminator_type_def,
@@ -6582,7 +6582,7 @@ CORBA_UnionMemberSeq * _TAO_CORBA_UnionDef_ThruPOA_Proxy_Impl::members (
     return ACE_reinterpret_cast (
       POA_CORBA_UnionDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_UnionDef:1.0"
+          "IDL:omg.org/CORBA/UnionDef:1.0"
         )
     )->members (
         ACE_TRY_ENV
@@ -6612,7 +6612,7 @@ void _TAO_CORBA_UnionDef_ThruPOA_Proxy_Impl::members (
     ACE_reinterpret_cast (
       POA_CORBA_UnionDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_UnionDef:1.0"
+          "IDL:omg.org/CORBA/UnionDef:1.0"
         )
     )->members (
         members,
@@ -7141,12 +7141,12 @@ CORBA::Boolean POA_CORBA_UnionDef::_is_a (
   ACE_CHECK_RETURN (0);
   
   if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_UnionDef:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_TypedefDef:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Container:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IDLType:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/UnionDef:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/TypedefDef:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Container:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
     (!ACE_OS::strcmp ((char *)value, base_id)))
       return 1;
     else
@@ -7157,17 +7157,17 @@ void* POA_CORBA_UnionDef::_downcast (
     const char* logical_type_id
   )
 {
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_UnionDef:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/UnionDef:1.0") == 0)
     return ACE_static_cast (POA_CORBA_UnionDef_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_TypedefDef:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/TypedefDef:1.0") == 0)
     return ACE_static_cast (POA_CORBA_TypedefDef_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Container:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Container:1.0") == 0)
     return ACE_static_cast (POA_CORBA_Container_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Contained:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Contained:1.0") == 0)
     return ACE_static_cast (POA_CORBA_Contained_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IDLType:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IDLType:1.0") == 0)
     return ACE_static_cast (POA_CORBA_IDLType_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
     return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
     return ACE_static_cast(PortableServer::Servant, this);
@@ -7181,7 +7181,7 @@ void POA_CORBA_UnionDef::_dispatch (TAO_ServerRequest &req, void *context, CORBA
 
 const char* POA_CORBA_UnionDef::_interface_repository_id (void) const
 {
-  return "IDL:omg.org/CORBA_UnionDef:1.0";
+  return "IDL:omg.org/CORBA/UnionDef:1.0";
 }
 
 CORBA_UnionDef*
@@ -7732,7 +7732,7 @@ CORBA_EnumMemberSeq * _TAO_CORBA_EnumDef_ThruPOA_Proxy_Impl::members (
     return ACE_reinterpret_cast (
       POA_CORBA_EnumDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_EnumDef:1.0"
+          "IDL:omg.org/CORBA/EnumDef:1.0"
         )
     )->members (
         ACE_TRY_ENV
@@ -7762,7 +7762,7 @@ void _TAO_CORBA_EnumDef_ThruPOA_Proxy_Impl::members (
     ACE_reinterpret_cast (
       POA_CORBA_EnumDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_EnumDef:1.0"
+          "IDL:omg.org/CORBA/EnumDef:1.0"
         )
     )->members (
         members,
@@ -8051,11 +8051,11 @@ CORBA::Boolean POA_CORBA_EnumDef::_is_a (
   ACE_CHECK_RETURN (0);
   
   if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_EnumDef:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_TypedefDef:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IDLType:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/EnumDef:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/TypedefDef:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
     (!ACE_OS::strcmp ((char *)value, base_id)))
       return 1;
     else
@@ -8066,15 +8066,15 @@ void* POA_CORBA_EnumDef::_downcast (
     const char* logical_type_id
   )
 {
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_EnumDef:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/EnumDef:1.0") == 0)
     return ACE_static_cast (POA_CORBA_EnumDef_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_TypedefDef:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/TypedefDef:1.0") == 0)
     return ACE_static_cast (POA_CORBA_TypedefDef_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Contained:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Contained:1.0") == 0)
     return ACE_static_cast (POA_CORBA_Contained_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IDLType:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IDLType:1.0") == 0)
     return ACE_static_cast (POA_CORBA_IDLType_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
     return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
     return ACE_static_cast(PortableServer::Servant, this);
@@ -8088,7 +8088,7 @@ void POA_CORBA_EnumDef::_dispatch (TAO_ServerRequest &req, void *context, CORBA:
 
 const char* POA_CORBA_EnumDef::_interface_repository_id (void) const
 {
-  return "IDL:omg.org/CORBA_EnumDef:1.0";
+  return "IDL:omg.org/CORBA/EnumDef:1.0";
 }
 
 CORBA_EnumDef*
@@ -8639,7 +8639,7 @@ CORBA_IDLType_ptr _TAO_CORBA_AliasDef_ThruPOA_Proxy_Impl::original_type_def (
     return ACE_reinterpret_cast (
       POA_CORBA_AliasDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_AliasDef:1.0"
+          "IDL:omg.org/CORBA/AliasDef:1.0"
         )
     )->original_type_def (
         ACE_TRY_ENV
@@ -8669,7 +8669,7 @@ void _TAO_CORBA_AliasDef_ThruPOA_Proxy_Impl::original_type_def (
     ACE_reinterpret_cast (
       POA_CORBA_AliasDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_AliasDef:1.0"
+          "IDL:omg.org/CORBA/AliasDef:1.0"
         )
     )->original_type_def (
         original_type_def,
@@ -8958,11 +8958,11 @@ CORBA::Boolean POA_CORBA_AliasDef::_is_a (
   ACE_CHECK_RETURN (0);
   
   if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_AliasDef:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_TypedefDef:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IDLType:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/AliasDef:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/TypedefDef:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
     (!ACE_OS::strcmp ((char *)value, base_id)))
       return 1;
     else
@@ -8973,15 +8973,15 @@ void* POA_CORBA_AliasDef::_downcast (
     const char* logical_type_id
   )
 {
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_AliasDef:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/AliasDef:1.0") == 0)
     return ACE_static_cast (POA_CORBA_AliasDef_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_TypedefDef:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/TypedefDef:1.0") == 0)
     return ACE_static_cast (POA_CORBA_TypedefDef_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Contained:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Contained:1.0") == 0)
     return ACE_static_cast (POA_CORBA_Contained_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IDLType:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IDLType:1.0") == 0)
     return ACE_static_cast (POA_CORBA_IDLType_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
     return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
     return ACE_static_cast(PortableServer::Servant, this);
@@ -8995,7 +8995,7 @@ void POA_CORBA_AliasDef::_dispatch (TAO_ServerRequest &req, void *context, CORBA
 
 const char* POA_CORBA_AliasDef::_interface_repository_id (void) const
 {
-  return "IDL:omg.org/CORBA_AliasDef:1.0";
+  return "IDL:omg.org/CORBA/AliasDef:1.0";
 }
 
 CORBA_AliasDef*
@@ -9395,11 +9395,11 @@ CORBA::Boolean POA_CORBA_NativeDef::_is_a (
   ACE_CHECK_RETURN (0);
   
   if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_NativeDef:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_TypedefDef:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IDLType:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/NativeDef:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/TypedefDef:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
     (!ACE_OS::strcmp ((char *)value, base_id)))
       return 1;
     else
@@ -9410,15 +9410,15 @@ void* POA_CORBA_NativeDef::_downcast (
     const char* logical_type_id
   )
 {
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_NativeDef:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/NativeDef:1.0") == 0)
     return ACE_static_cast (POA_CORBA_NativeDef_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_TypedefDef:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/TypedefDef:1.0") == 0)
     return ACE_static_cast (POA_CORBA_TypedefDef_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Contained:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Contained:1.0") == 0)
     return ACE_static_cast (POA_CORBA_Contained_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IDLType:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IDLType:1.0") == 0)
     return ACE_static_cast (POA_CORBA_IDLType_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
     return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
     return ACE_static_cast(PortableServer::Servant, this);
@@ -9432,7 +9432,7 @@ void POA_CORBA_NativeDef::_dispatch (TAO_ServerRequest &req, void *context, CORB
 
 const char* POA_CORBA_NativeDef::_interface_repository_id (void) const
 {
-  return "IDL:omg.org/CORBA_NativeDef:1.0";
+  return "IDL:omg.org/CORBA/NativeDef:1.0";
 }
 
 CORBA_NativeDef*
@@ -9828,7 +9828,7 @@ CORBA::PrimitiveKind _TAO_CORBA_PrimitiveDef_ThruPOA_Proxy_Impl::kind (
     return ACE_reinterpret_cast (
       POA_CORBA_PrimitiveDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_PrimitiveDef:1.0"
+          "IDL:omg.org/CORBA/PrimitiveDef:1.0"
         )
     )->kind (
         ACE_TRY_ENV
@@ -10033,9 +10033,9 @@ CORBA::Boolean POA_CORBA_PrimitiveDef::_is_a (
   ACE_CHECK_RETURN (0);
   
   if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_PrimitiveDef:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IDLType:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/PrimitiveDef:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
     (!ACE_OS::strcmp ((char *)value, base_id)))
       return 1;
     else
@@ -10046,11 +10046,11 @@ void* POA_CORBA_PrimitiveDef::_downcast (
     const char* logical_type_id
   )
 {
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_PrimitiveDef:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/PrimitiveDef:1.0") == 0)
     return ACE_static_cast (POA_CORBA_PrimitiveDef_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IDLType:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IDLType:1.0") == 0)
     return ACE_static_cast (POA_CORBA_IDLType_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
     return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
     return ACE_static_cast(PortableServer::Servant, this);
@@ -10064,7 +10064,7 @@ void POA_CORBA_PrimitiveDef::_dispatch (TAO_ServerRequest &req, void *context, C
 
 const char* POA_CORBA_PrimitiveDef::_interface_repository_id (void) const
 {
-  return "IDL:omg.org/CORBA_PrimitiveDef:1.0";
+  return "IDL:omg.org/CORBA/PrimitiveDef:1.0";
 }
 
 CORBA_PrimitiveDef*
@@ -10602,7 +10602,7 @@ CORBA::ULong _TAO_CORBA_StringDef_ThruPOA_Proxy_Impl::bound (
     return ACE_reinterpret_cast (
       POA_CORBA_StringDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_StringDef:1.0"
+          "IDL:omg.org/CORBA/StringDef:1.0"
         )
     )->bound (
         ACE_TRY_ENV
@@ -10632,7 +10632,7 @@ void _TAO_CORBA_StringDef_ThruPOA_Proxy_Impl::bound (
     ACE_reinterpret_cast (
       POA_CORBA_StringDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_StringDef:1.0"
+          "IDL:omg.org/CORBA/StringDef:1.0"
         )
     )->bound (
         bound,
@@ -10918,9 +10918,9 @@ CORBA::Boolean POA_CORBA_StringDef::_is_a (
   ACE_CHECK_RETURN (0);
   
   if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_StringDef:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IDLType:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/StringDef:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
     (!ACE_OS::strcmp ((char *)value, base_id)))
       return 1;
     else
@@ -10931,11 +10931,11 @@ void* POA_CORBA_StringDef::_downcast (
     const char* logical_type_id
   )
 {
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_StringDef:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/StringDef:1.0") == 0)
     return ACE_static_cast (POA_CORBA_StringDef_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IDLType:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IDLType:1.0") == 0)
     return ACE_static_cast (POA_CORBA_IDLType_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
     return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
     return ACE_static_cast(PortableServer::Servant, this);
@@ -10949,7 +10949,7 @@ void POA_CORBA_StringDef::_dispatch (TAO_ServerRequest &req, void *context, CORB
 
 const char* POA_CORBA_StringDef::_interface_repository_id (void) const
 {
-  return "IDL:omg.org/CORBA_StringDef:1.0";
+  return "IDL:omg.org/CORBA/StringDef:1.0";
 }
 
 CORBA_StringDef*
@@ -11487,7 +11487,7 @@ CORBA::ULong _TAO_CORBA_WstringDef_ThruPOA_Proxy_Impl::bound (
     return ACE_reinterpret_cast (
       POA_CORBA_WstringDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_WstringDef:1.0"
+          "IDL:omg.org/CORBA/WstringDef:1.0"
         )
     )->bound (
         ACE_TRY_ENV
@@ -11517,7 +11517,7 @@ void _TAO_CORBA_WstringDef_ThruPOA_Proxy_Impl::bound (
     ACE_reinterpret_cast (
       POA_CORBA_WstringDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_WstringDef:1.0"
+          "IDL:omg.org/CORBA/WstringDef:1.0"
         )
     )->bound (
         bound,
@@ -11803,9 +11803,9 @@ CORBA::Boolean POA_CORBA_WstringDef::_is_a (
   ACE_CHECK_RETURN (0);
   
   if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_WstringDef:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IDLType:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/WstringDef:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
     (!ACE_OS::strcmp ((char *)value, base_id)))
       return 1;
     else
@@ -11816,11 +11816,11 @@ void* POA_CORBA_WstringDef::_downcast (
     const char* logical_type_id
   )
 {
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_WstringDef:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/WstringDef:1.0") == 0)
     return ACE_static_cast (POA_CORBA_WstringDef_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IDLType:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IDLType:1.0") == 0)
     return ACE_static_cast (POA_CORBA_IDLType_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
     return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
     return ACE_static_cast(PortableServer::Servant, this);
@@ -11834,7 +11834,7 @@ void POA_CORBA_WstringDef::_dispatch (TAO_ServerRequest &req, void *context, COR
 
 const char* POA_CORBA_WstringDef::_interface_repository_id (void) const
 {
-  return "IDL:omg.org/CORBA_WstringDef:1.0";
+  return "IDL:omg.org/CORBA/WstringDef:1.0";
 }
 
 CORBA_WstringDef*
@@ -12741,7 +12741,7 @@ CORBA::ULong _TAO_CORBA_SequenceDef_ThruPOA_Proxy_Impl::bound (
     return ACE_reinterpret_cast (
       POA_CORBA_SequenceDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_SequenceDef:1.0"
+          "IDL:omg.org/CORBA/SequenceDef:1.0"
         )
     )->bound (
         ACE_TRY_ENV
@@ -12771,7 +12771,7 @@ void _TAO_CORBA_SequenceDef_ThruPOA_Proxy_Impl::bound (
     ACE_reinterpret_cast (
       POA_CORBA_SequenceDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_SequenceDef:1.0"
+          "IDL:omg.org/CORBA/SequenceDef:1.0"
         )
     )->bound (
         bound,
@@ -12804,7 +12804,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_SequenceDef_ThruPOA_Proxy_Impl::element_type (
     return ACE_reinterpret_cast (
       POA_CORBA_SequenceDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_SequenceDef:1.0"
+          "IDL:omg.org/CORBA/SequenceDef:1.0"
         )
     )->element_type (
         ACE_TRY_ENV
@@ -12835,7 +12835,7 @@ CORBA_IDLType_ptr _TAO_CORBA_SequenceDef_ThruPOA_Proxy_Impl::element_type_def (
     return ACE_reinterpret_cast (
       POA_CORBA_SequenceDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_SequenceDef:1.0"
+          "IDL:omg.org/CORBA/SequenceDef:1.0"
         )
     )->element_type_def (
         ACE_TRY_ENV
@@ -12865,7 +12865,7 @@ void _TAO_CORBA_SequenceDef_ThruPOA_Proxy_Impl::element_type_def (
     ACE_reinterpret_cast (
       POA_CORBA_SequenceDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_SequenceDef:1.0"
+          "IDL:omg.org/CORBA/SequenceDef:1.0"
         )
     )->element_type_def (
         element_type_def,
@@ -13390,9 +13390,9 @@ CORBA::Boolean POA_CORBA_SequenceDef::_is_a (
   ACE_CHECK_RETURN (0);
   
   if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_SequenceDef:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IDLType:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/SequenceDef:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
     (!ACE_OS::strcmp ((char *)value, base_id)))
       return 1;
     else
@@ -13403,11 +13403,11 @@ void* POA_CORBA_SequenceDef::_downcast (
     const char* logical_type_id
   )
 {
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_SequenceDef:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/SequenceDef:1.0") == 0)
     return ACE_static_cast (POA_CORBA_SequenceDef_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IDLType:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IDLType:1.0") == 0)
     return ACE_static_cast (POA_CORBA_IDLType_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
     return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
     return ACE_static_cast(PortableServer::Servant, this);
@@ -13421,7 +13421,7 @@ void POA_CORBA_SequenceDef::_dispatch (TAO_ServerRequest &req, void *context, CO
 
 const char* POA_CORBA_SequenceDef::_interface_repository_id (void) const
 {
-  return "IDL:omg.org/CORBA_SequenceDef:1.0";
+  return "IDL:omg.org/CORBA/SequenceDef:1.0";
 }
 
 CORBA_SequenceDef*
@@ -14331,7 +14331,7 @@ CORBA::ULong _TAO_CORBA_ArrayDef_ThruPOA_Proxy_Impl::length (
     return ACE_reinterpret_cast (
       POA_CORBA_ArrayDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_ArrayDef:1.0"
+          "IDL:omg.org/CORBA/ArrayDef:1.0"
         )
     )->length (
         ACE_TRY_ENV
@@ -14361,7 +14361,7 @@ void _TAO_CORBA_ArrayDef_ThruPOA_Proxy_Impl::length (
     ACE_reinterpret_cast (
       POA_CORBA_ArrayDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_ArrayDef:1.0"
+          "IDL:omg.org/CORBA/ArrayDef:1.0"
         )
     )->length (
         length,
@@ -14394,7 +14394,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_ArrayDef_ThruPOA_Proxy_Impl::element_type (
     return ACE_reinterpret_cast (
       POA_CORBA_ArrayDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_ArrayDef:1.0"
+          "IDL:omg.org/CORBA/ArrayDef:1.0"
         )
     )->element_type (
         ACE_TRY_ENV
@@ -14425,7 +14425,7 @@ CORBA_IDLType_ptr _TAO_CORBA_ArrayDef_ThruPOA_Proxy_Impl::element_type_def (
     return ACE_reinterpret_cast (
       POA_CORBA_ArrayDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_ArrayDef:1.0"
+          "IDL:omg.org/CORBA/ArrayDef:1.0"
         )
     )->element_type_def (
         ACE_TRY_ENV
@@ -14455,7 +14455,7 @@ void _TAO_CORBA_ArrayDef_ThruPOA_Proxy_Impl::element_type_def (
     ACE_reinterpret_cast (
       POA_CORBA_ArrayDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_ArrayDef:1.0"
+          "IDL:omg.org/CORBA/ArrayDef:1.0"
         )
     )->element_type_def (
         element_type_def,
@@ -14980,9 +14980,9 @@ CORBA::Boolean POA_CORBA_ArrayDef::_is_a (
   ACE_CHECK_RETURN (0);
   
   if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_ArrayDef:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IDLType:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/ArrayDef:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
     (!ACE_OS::strcmp ((char *)value, base_id)))
       return 1;
     else
@@ -14993,11 +14993,11 @@ void* POA_CORBA_ArrayDef::_downcast (
     const char* logical_type_id
   )
 {
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_ArrayDef:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/ArrayDef:1.0") == 0)
     return ACE_static_cast (POA_CORBA_ArrayDef_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IDLType:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IDLType:1.0") == 0)
     return ACE_static_cast (POA_CORBA_IDLType_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
     return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
     return ACE_static_cast(PortableServer::Servant, this);
@@ -15011,7 +15011,7 @@ void POA_CORBA_ArrayDef::_dispatch (TAO_ServerRequest &req, void *context, CORBA
 
 const char* POA_CORBA_ArrayDef::_interface_repository_id (void) const
 {
-  return "IDL:omg.org/CORBA_ArrayDef:1.0";
+  return "IDL:omg.org/CORBA/ArrayDef:1.0";
 }
 
 CORBA_ArrayDef*
@@ -15704,7 +15704,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_ExceptionDef_ThruPOA_Proxy_Impl::type (
     return ACE_reinterpret_cast (
       POA_CORBA_ExceptionDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_ExceptionDef:1.0"
+          "IDL:omg.org/CORBA/ExceptionDef:1.0"
         )
     )->type (
         ACE_TRY_ENV
@@ -15735,7 +15735,7 @@ CORBA_StructMemberSeq * _TAO_CORBA_ExceptionDef_ThruPOA_Proxy_Impl::members (
     return ACE_reinterpret_cast (
       POA_CORBA_ExceptionDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_ExceptionDef:1.0"
+          "IDL:omg.org/CORBA/ExceptionDef:1.0"
         )
     )->members (
         ACE_TRY_ENV
@@ -15765,7 +15765,7 @@ void _TAO_CORBA_ExceptionDef_ThruPOA_Proxy_Impl::members (
     ACE_reinterpret_cast (
       POA_CORBA_ExceptionDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_ExceptionDef:1.0"
+          "IDL:omg.org/CORBA/ExceptionDef:1.0"
         )
     )->members (
         members,
@@ -16133,10 +16133,10 @@ CORBA::Boolean POA_CORBA_ExceptionDef::_is_a (
   ACE_CHECK_RETURN (0);
   
   if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_ExceptionDef:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Container:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/ExceptionDef:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Container:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
     (!ACE_OS::strcmp ((char *)value, base_id)))
       return 1;
     else
@@ -16147,13 +16147,13 @@ void* POA_CORBA_ExceptionDef::_downcast (
     const char* logical_type_id
   )
 {
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_ExceptionDef:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/ExceptionDef:1.0") == 0)
     return ACE_static_cast (POA_CORBA_ExceptionDef_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Contained:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Contained:1.0") == 0)
     return ACE_static_cast (POA_CORBA_Contained_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Container:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Container:1.0") == 0)
     return ACE_static_cast (POA_CORBA_Container_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
     return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
     return ACE_static_cast(PortableServer::Servant, this);
@@ -16167,7 +16167,7 @@ void POA_CORBA_ExceptionDef::_dispatch (TAO_ServerRequest &req, void *context, C
 
 const char* POA_CORBA_ExceptionDef::_interface_repository_id (void) const
 {
-  return "IDL:omg.org/CORBA_ExceptionDef:1.0";
+  return "IDL:omg.org/CORBA/ExceptionDef:1.0";
 }
 
 CORBA_ExceptionDef*
@@ -17089,7 +17089,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_AttributeDef_ThruPOA_Proxy_Impl::type (
     return ACE_reinterpret_cast (
       POA_CORBA_AttributeDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_AttributeDef:1.0"
+          "IDL:omg.org/CORBA/AttributeDef:1.0"
         )
     )->type (
         ACE_TRY_ENV
@@ -17120,7 +17120,7 @@ CORBA_IDLType_ptr _TAO_CORBA_AttributeDef_ThruPOA_Proxy_Impl::type_def (
     return ACE_reinterpret_cast (
       POA_CORBA_AttributeDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_AttributeDef:1.0"
+          "IDL:omg.org/CORBA/AttributeDef:1.0"
         )
     )->type_def (
         ACE_TRY_ENV
@@ -17150,7 +17150,7 @@ void _TAO_CORBA_AttributeDef_ThruPOA_Proxy_Impl::type_def (
     ACE_reinterpret_cast (
       POA_CORBA_AttributeDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_AttributeDef:1.0"
+          "IDL:omg.org/CORBA/AttributeDef:1.0"
         )
     )->type_def (
         type_def,
@@ -17183,7 +17183,7 @@ CORBA::AttributeMode _TAO_CORBA_AttributeDef_ThruPOA_Proxy_Impl::mode (
     return ACE_reinterpret_cast (
       POA_CORBA_AttributeDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_AttributeDef:1.0"
+          "IDL:omg.org/CORBA/AttributeDef:1.0"
         )
     )->mode (
         ACE_TRY_ENV
@@ -17213,7 +17213,7 @@ void _TAO_CORBA_AttributeDef_ThruPOA_Proxy_Impl::mode (
     ACE_reinterpret_cast (
       POA_CORBA_AttributeDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_AttributeDef:1.0"
+          "IDL:omg.org/CORBA/AttributeDef:1.0"
         )
     )->mode (
         mode,
@@ -17738,9 +17738,9 @@ CORBA::Boolean POA_CORBA_AttributeDef::_is_a (
   ACE_CHECK_RETURN (0);
   
   if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_AttributeDef:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/AttributeDef:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
     (!ACE_OS::strcmp ((char *)value, base_id)))
       return 1;
     else
@@ -17751,11 +17751,11 @@ void* POA_CORBA_AttributeDef::_downcast (
     const char* logical_type_id
   )
 {
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_AttributeDef:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/AttributeDef:1.0") == 0)
     return ACE_static_cast (POA_CORBA_AttributeDef_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Contained:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Contained:1.0") == 0)
     return ACE_static_cast (POA_CORBA_Contained_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
     return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
     return ACE_static_cast(PortableServer::Servant, this);
@@ -17769,7 +17769,7 @@ void POA_CORBA_AttributeDef::_dispatch (TAO_ServerRequest &req, void *context, C
 
 const char* POA_CORBA_AttributeDef::_interface_repository_id (void) const
 {
-  return "IDL:omg.org/CORBA_AttributeDef:1.0";
+  return "IDL:omg.org/CORBA/AttributeDef:1.0";
 }
 
 CORBA_AttributeDef*
@@ -19486,7 +19486,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::result (
     return ACE_reinterpret_cast (
       POA_CORBA_OperationDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_OperationDef:1.0"
+          "IDL:omg.org/CORBA/OperationDef:1.0"
         )
     )->result (
         ACE_TRY_ENV
@@ -19517,7 +19517,7 @@ CORBA_IDLType_ptr _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::result_def (
     return ACE_reinterpret_cast (
       POA_CORBA_OperationDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_OperationDef:1.0"
+          "IDL:omg.org/CORBA/OperationDef:1.0"
         )
     )->result_def (
         ACE_TRY_ENV
@@ -19547,7 +19547,7 @@ void _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::result_def (
     ACE_reinterpret_cast (
       POA_CORBA_OperationDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_OperationDef:1.0"
+          "IDL:omg.org/CORBA/OperationDef:1.0"
         )
     )->result_def (
         result_def,
@@ -19580,7 +19580,7 @@ CORBA_ParDescriptionSeq * _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::params (
     return ACE_reinterpret_cast (
       POA_CORBA_OperationDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_OperationDef:1.0"
+          "IDL:omg.org/CORBA/OperationDef:1.0"
         )
     )->params (
         ACE_TRY_ENV
@@ -19610,7 +19610,7 @@ void _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::params (
     ACE_reinterpret_cast (
       POA_CORBA_OperationDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_OperationDef:1.0"
+          "IDL:omg.org/CORBA/OperationDef:1.0"
         )
     )->params (
         params,
@@ -19643,7 +19643,7 @@ CORBA::OperationMode _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::mode (
     return ACE_reinterpret_cast (
       POA_CORBA_OperationDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_OperationDef:1.0"
+          "IDL:omg.org/CORBA/OperationDef:1.0"
         )
     )->mode (
         ACE_TRY_ENV
@@ -19673,7 +19673,7 @@ void _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::mode (
     ACE_reinterpret_cast (
       POA_CORBA_OperationDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_OperationDef:1.0"
+          "IDL:omg.org/CORBA/OperationDef:1.0"
         )
     )->mode (
         mode,
@@ -19706,7 +19706,7 @@ CORBA_ContextIdSeq * _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::contexts (
     return ACE_reinterpret_cast (
       POA_CORBA_OperationDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_OperationDef:1.0"
+          "IDL:omg.org/CORBA/OperationDef:1.0"
         )
     )->contexts (
         ACE_TRY_ENV
@@ -19736,7 +19736,7 @@ void _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::contexts (
     ACE_reinterpret_cast (
       POA_CORBA_OperationDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_OperationDef:1.0"
+          "IDL:omg.org/CORBA/OperationDef:1.0"
         )
     )->contexts (
         contexts,
@@ -19769,7 +19769,7 @@ CORBA_ExceptionDefSeq * _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::exceptions (
     return ACE_reinterpret_cast (
       POA_CORBA_OperationDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_OperationDef:1.0"
+          "IDL:omg.org/CORBA/OperationDef:1.0"
         )
     )->exceptions (
         ACE_TRY_ENV
@@ -19799,7 +19799,7 @@ void _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::exceptions (
     ACE_reinterpret_cast (
       POA_CORBA_OperationDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_OperationDef:1.0"
+          "IDL:omg.org/CORBA/OperationDef:1.0"
         )
     )->exceptions (
         exceptions,
@@ -20801,9 +20801,9 @@ CORBA::Boolean POA_CORBA_OperationDef::_is_a (
   ACE_CHECK_RETURN (0);
   
   if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_OperationDef:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/OperationDef:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
     (!ACE_OS::strcmp ((char *)value, base_id)))
       return 1;
     else
@@ -20814,11 +20814,11 @@ void* POA_CORBA_OperationDef::_downcast (
     const char* logical_type_id
   )
 {
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_OperationDef:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/OperationDef:1.0") == 0)
     return ACE_static_cast (POA_CORBA_OperationDef_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Contained:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Contained:1.0") == 0)
     return ACE_static_cast (POA_CORBA_Contained_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
     return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
     return ACE_static_cast(PortableServer::Servant, this);
@@ -20832,7 +20832,7 @@ void POA_CORBA_OperationDef::_dispatch (TAO_ServerRequest &req, void *context, C
 
 const char* POA_CORBA_OperationDef::_interface_repository_id (void) const
 {
-  return "IDL:omg.org/CORBA_OperationDef:1.0";
+  return "IDL:omg.org/CORBA/OperationDef:1.0";
 }
 
 CORBA_OperationDef*
@@ -22038,7 +22038,7 @@ CORBA_InterfaceDefSeq * _TAO_CORBA_InterfaceDef_ThruPOA_Proxy_Impl::base_interfa
     return ACE_reinterpret_cast (
       POA_CORBA_InterfaceDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_InterfaceDef:1.0"
+          "IDL:omg.org/CORBA/InterfaceDef:1.0"
         )
     )->base_interfaces (
         ACE_TRY_ENV
@@ -22068,7 +22068,7 @@ void _TAO_CORBA_InterfaceDef_ThruPOA_Proxy_Impl::base_interfaces (
     ACE_reinterpret_cast (
       POA_CORBA_InterfaceDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_InterfaceDef:1.0"
+          "IDL:omg.org/CORBA/InterfaceDef:1.0"
         )
     )->base_interfaces (
         base_interfaces,
@@ -22102,7 +22102,7 @@ CORBA::Boolean _TAO_CORBA_InterfaceDef_ThruPOA_Proxy_Impl::is_a (
     return ACE_reinterpret_cast (
       POA_CORBA_InterfaceDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_InterfaceDef:1.0"
+          "IDL:omg.org/CORBA/InterfaceDef:1.0"
         )
     )->is_a (
         interface_id,
@@ -22134,7 +22134,7 @@ CORBA_InterfaceDef::FullInterfaceDescription * _TAO_CORBA_InterfaceDef_ThruPOA_P
     return ACE_reinterpret_cast (
       POA_CORBA_InterfaceDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_InterfaceDef:1.0"
+          "IDL:omg.org/CORBA/InterfaceDef:1.0"
         )
     )->describe_interface (
         ACE_TRY_ENV
@@ -22170,7 +22170,7 @@ CORBA_AttributeDef_ptr _TAO_CORBA_InterfaceDef_ThruPOA_Proxy_Impl::create_attrib
     return ACE_reinterpret_cast (
       POA_CORBA_InterfaceDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_InterfaceDef:1.0"
+          "IDL:omg.org/CORBA/InterfaceDef:1.0"
         )
     )->create_attribute (
         id,
@@ -22214,7 +22214,7 @@ CORBA_OperationDef_ptr _TAO_CORBA_InterfaceDef_ThruPOA_Proxy_Impl::create_operat
     return ACE_reinterpret_cast (
       POA_CORBA_InterfaceDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_InterfaceDef:1.0"
+          "IDL:omg.org/CORBA/InterfaceDef:1.0"
         )
     )->create_operation (
         id,
@@ -22899,11 +22899,11 @@ CORBA::Boolean POA_CORBA_InterfaceDef::_is_a (
   ACE_CHECK_RETURN (0);
   
   if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_InterfaceDef:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Container:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IDLType:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/InterfaceDef:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Container:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
     (!ACE_OS::strcmp ((char *)value, base_id)))
       return 1;
     else
@@ -22914,15 +22914,15 @@ void* POA_CORBA_InterfaceDef::_downcast (
     const char* logical_type_id
   )
 {
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_InterfaceDef:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/InterfaceDef:1.0") == 0)
     return ACE_static_cast (POA_CORBA_InterfaceDef_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Container:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Container:1.0") == 0)
     return ACE_static_cast (POA_CORBA_Container_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Contained:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Contained:1.0") == 0)
     return ACE_static_cast (POA_CORBA_Contained_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IDLType:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IDLType:1.0") == 0)
     return ACE_static_cast (POA_CORBA_IDLType_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
     return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
     return ACE_static_cast(PortableServer::Servant, this);
@@ -22936,7 +22936,7 @@ void POA_CORBA_InterfaceDef::_dispatch (TAO_ServerRequest &req, void *context, C
 
 const char* POA_CORBA_InterfaceDef::_interface_repository_id (void) const
 {
-  return "IDL:omg.org/CORBA_InterfaceDef:1.0";
+  return "IDL:omg.org/CORBA/InterfaceDef:1.0";
 }
 
 CORBA_InterfaceDef*
@@ -23363,12 +23363,12 @@ CORBA::Boolean POA_CORBA_AbstractInterfaceDef::_is_a (
   ACE_CHECK_RETURN (0);
   
   if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_AbstractInterfaceDef:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_InterfaceDef:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Container:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IDLType:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/AbstractInterfaceDef:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/InterfaceDef:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Container:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
     (!ACE_OS::strcmp ((char *)value, base_id)))
       return 1;
     else
@@ -23379,17 +23379,17 @@ void* POA_CORBA_AbstractInterfaceDef::_downcast (
     const char* logical_type_id
   )
 {
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_AbstractInterfaceDef:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/AbstractInterfaceDef:1.0") == 0)
     return ACE_static_cast (POA_CORBA_AbstractInterfaceDef_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_InterfaceDef:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/InterfaceDef:1.0") == 0)
     return ACE_static_cast (POA_CORBA_InterfaceDef_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Container:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Container:1.0") == 0)
     return ACE_static_cast (POA_CORBA_Container_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Contained:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Contained:1.0") == 0)
     return ACE_static_cast (POA_CORBA_Contained_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IDLType:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IDLType:1.0") == 0)
     return ACE_static_cast (POA_CORBA_IDLType_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
     return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
     return ACE_static_cast(PortableServer::Servant, this);
@@ -23403,7 +23403,7 @@ void POA_CORBA_AbstractInterfaceDef::_dispatch (TAO_ServerRequest &req, void *co
 
 const char* POA_CORBA_AbstractInterfaceDef::_interface_repository_id (void) const
 {
-  return "IDL:omg.org/CORBA_AbstractInterfaceDef:1.0";
+  return "IDL:omg.org/CORBA/AbstractInterfaceDef:1.0";
 }
 
 CORBA_AbstractInterfaceDef*
@@ -23830,12 +23830,12 @@ CORBA::Boolean POA_CORBA_LocalInterfaceDef::_is_a (
   ACE_CHECK_RETURN (0);
   
   if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_LocalInterfaceDef:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_InterfaceDef:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Container:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IDLType:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/LocalInterfaceDef:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/InterfaceDef:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Container:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
     (!ACE_OS::strcmp ((char *)value, base_id)))
       return 1;
     else
@@ -23846,17 +23846,17 @@ void* POA_CORBA_LocalInterfaceDef::_downcast (
     const char* logical_type_id
   )
 {
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_LocalInterfaceDef:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/LocalInterfaceDef:1.0") == 0)
     return ACE_static_cast (POA_CORBA_LocalInterfaceDef_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_InterfaceDef:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/InterfaceDef:1.0") == 0)
     return ACE_static_cast (POA_CORBA_InterfaceDef_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Container:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Container:1.0") == 0)
     return ACE_static_cast (POA_CORBA_Container_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Contained:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Contained:1.0") == 0)
     return ACE_static_cast (POA_CORBA_Contained_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IDLType:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IDLType:1.0") == 0)
     return ACE_static_cast (POA_CORBA_IDLType_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
     return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
     return ACE_static_cast(PortableServer::Servant, this);
@@ -23870,7 +23870,7 @@ void POA_CORBA_LocalInterfaceDef::_dispatch (TAO_ServerRequest &req, void *conte
 
 const char* POA_CORBA_LocalInterfaceDef::_interface_repository_id (void) const
 {
-  return "IDL:omg.org/CORBA_LocalInterfaceDef:1.0";
+  return "IDL:omg.org/CORBA/LocalInterfaceDef:1.0";
 }
 
 CORBA_LocalInterfaceDef*
diff --git a/TAO/orbsvcs/IFR_Service/IFR_ComponentsS.cpp b/TAO/orbsvcs/IFR_Service/IFR_ComponentsS.cpp
index 90cc3936416..90b37987e7b 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_ComponentsS.cpp
+++ b/TAO/orbsvcs/IFR_Service/IFR_ComponentsS.cpp
@@ -8980,7 +8980,7 @@ CORBA::Boolean POA_IR::ComponentDef::_is_a (
   
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/ComponentDef:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_InterfaceDef:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/InterfaceDef:1.0")) ||
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Container:1.0")) ||
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) ||
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) ||
@@ -8997,7 +8997,7 @@ void* POA_IR::ComponentDef::_downcast (
 {
   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/ComponentDef:1.0") == 0)
     return ACE_static_cast (POA_IR::ComponentDef_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_InterfaceDef:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/InterfaceDef:1.0") == 0)
     return ACE_static_cast (POA_CORBA_InterfaceDef_ptr, this);
   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Container:1.0") == 0)
     return ACE_static_cast (POA_CORBA_Container_ptr, this);
@@ -10399,7 +10399,7 @@ CORBA::Boolean POA_IR::FactoryDef::_is_a (
   
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/FactoryDef:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_OperationDef:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/OperationDef:1.0")) ||
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) ||
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
     (!ACE_OS::strcmp ((char *)value, base_id)))
@@ -10414,7 +10414,7 @@ void* POA_IR::FactoryDef::_downcast (
 {
   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/FactoryDef:1.0") == 0)
     return ACE_static_cast (POA_IR::FactoryDef_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_OperationDef:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/OperationDef:1.0") == 0)
     return ACE_static_cast (POA_CORBA_OperationDef_ptr, this);
   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Contained:1.0") == 0)
     return ACE_static_cast (POA_CORBA_Contained_ptr, this);
@@ -10893,7 +10893,7 @@ CORBA::Boolean POA_IR::FinderDef::_is_a (
   
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/FinderDef:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_OperationDef:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/OperationDef:1.0")) ||
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) ||
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
     (!ACE_OS::strcmp ((char *)value, base_id)))
@@ -10908,7 +10908,7 @@ void* POA_IR::FinderDef::_downcast (
 {
   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/FinderDef:1.0") == 0)
     return ACE_static_cast (POA_IR::FinderDef_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_OperationDef:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/OperationDef:1.0") == 0)
     return ACE_static_cast (POA_CORBA_OperationDef_ptr, this);
   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Contained:1.0") == 0)
     return ACE_static_cast (POA_CORBA_Contained_ptr, this);
@@ -13705,7 +13705,7 @@ CORBA::Boolean POA_IR::HomeDef::_is_a (
   
   if (
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/HomeDef:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_InterfaceDef:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/InterfaceDef:1.0")) ||
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Container:1.0")) ||
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) ||
     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) ||
@@ -13722,7 +13722,7 @@ void* POA_IR::HomeDef::_downcast (
 {
   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/HomeDef:1.0") == 0)
     return ACE_static_cast (POA_IR::HomeDef_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_InterfaceDef:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/InterfaceDef:1.0") == 0)
     return ACE_static_cast (POA_CORBA_InterfaceDef_ptr, this);
   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Container:1.0") == 0)
     return ACE_static_cast (POA_CORBA_Container_ptr, this);
diff --git a/TAO/orbsvcs/IFR_Service/IFR_ExtendedS.cpp b/TAO/orbsvcs/IFR_Service/IFR_ExtendedS.cpp
index 09e16bb5e83..9437eb22414 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_ExtendedS.cpp
+++ b/TAO/orbsvcs/IFR_Service/IFR_ExtendedS.cpp
@@ -808,7 +808,7 @@ CORBA::UShort _TAO_CORBA_FixedDef_ThruPOA_Proxy_Impl::digits (
     return ACE_reinterpret_cast (
       POA_CORBA_FixedDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_FixedDef:1.0"
+          "IDL:omg.org/CORBA/FixedDef:1.0"
         )
     )->digits (
         ACE_TRY_ENV
@@ -838,7 +838,7 @@ void _TAO_CORBA_FixedDef_ThruPOA_Proxy_Impl::digits (
     ACE_reinterpret_cast (
       POA_CORBA_FixedDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_FixedDef:1.0"
+          "IDL:omg.org/CORBA/FixedDef:1.0"
         )
     )->digits (
         digits,
@@ -871,7 +871,7 @@ CORBA::Short _TAO_CORBA_FixedDef_ThruPOA_Proxy_Impl::scale (
     return ACE_reinterpret_cast (
       POA_CORBA_FixedDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_FixedDef:1.0"
+          "IDL:omg.org/CORBA/FixedDef:1.0"
         )
     )->scale (
         ACE_TRY_ENV
@@ -901,7 +901,7 @@ void _TAO_CORBA_FixedDef_ThruPOA_Proxy_Impl::scale (
     ACE_reinterpret_cast (
       POA_CORBA_FixedDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_FixedDef:1.0"
+          "IDL:omg.org/CORBA/FixedDef:1.0"
         )
     )->scale (
         scale,
@@ -1345,9 +1345,9 @@ CORBA::Boolean POA_CORBA_FixedDef::_is_a (
   ACE_CHECK_RETURN (0);
   
   if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_FixedDef:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IDLType:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/FixedDef:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
     (!ACE_OS::strcmp ((char *)value, base_id)))
       return 1;
     else
@@ -1358,11 +1358,11 @@ void* POA_CORBA_FixedDef::_downcast (
     const char* logical_type_id
   )
 {
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_FixedDef:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/FixedDef:1.0") == 0)
     return ACE_static_cast (POA_CORBA_FixedDef_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IDLType:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IDLType:1.0") == 0)
     return ACE_static_cast (POA_CORBA_IDLType_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
     return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
     return ACE_static_cast(PortableServer::Servant, this);
@@ -1376,7 +1376,7 @@ void POA_CORBA_FixedDef::_dispatch (TAO_ServerRequest &req, void *context, CORBA
 
 const char* POA_CORBA_FixedDef::_interface_repository_id (void) const
 {
-  return "IDL:omg.org/CORBA_FixedDef:1.0";
+  return "IDL:omg.org/CORBA/FixedDef:1.0";
 }
 
 CORBA_FixedDef*
@@ -2297,7 +2297,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_ValueMemberDef_ThruPOA_Proxy_Impl::type (
     return ACE_reinterpret_cast (
       POA_CORBA_ValueMemberDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_ValueMemberDef:1.0"
+          "IDL:omg.org/CORBA/ValueMemberDef:1.0"
         )
     )->type (
         ACE_TRY_ENV
@@ -2328,7 +2328,7 @@ CORBA_IDLType_ptr _TAO_CORBA_ValueMemberDef_ThruPOA_Proxy_Impl::type_def (
     return ACE_reinterpret_cast (
       POA_CORBA_ValueMemberDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_ValueMemberDef:1.0"
+          "IDL:omg.org/CORBA/ValueMemberDef:1.0"
         )
     )->type_def (
         ACE_TRY_ENV
@@ -2358,7 +2358,7 @@ void _TAO_CORBA_ValueMemberDef_ThruPOA_Proxy_Impl::type_def (
     ACE_reinterpret_cast (
       POA_CORBA_ValueMemberDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_ValueMemberDef:1.0"
+          "IDL:omg.org/CORBA/ValueMemberDef:1.0"
         )
     )->type_def (
         type_def,
@@ -2391,7 +2391,7 @@ CORBA::Visibility _TAO_CORBA_ValueMemberDef_ThruPOA_Proxy_Impl::access (
     return ACE_reinterpret_cast (
       POA_CORBA_ValueMemberDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_ValueMemberDef:1.0"
+          "IDL:omg.org/CORBA/ValueMemberDef:1.0"
         )
     )->access (
         ACE_TRY_ENV
@@ -2421,7 +2421,7 @@ void _TAO_CORBA_ValueMemberDef_ThruPOA_Proxy_Impl::access (
     ACE_reinterpret_cast (
       POA_CORBA_ValueMemberDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_ValueMemberDef:1.0"
+          "IDL:omg.org/CORBA/ValueMemberDef:1.0"
         )
     )->access (
         access,
@@ -2946,9 +2946,9 @@ CORBA::Boolean POA_CORBA_ValueMemberDef::_is_a (
   ACE_CHECK_RETURN (0);
   
   if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_ValueMemberDef:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/ValueMemberDef:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
     (!ACE_OS::strcmp ((char *)value, base_id)))
       return 1;
     else
@@ -2959,11 +2959,11 @@ void* POA_CORBA_ValueMemberDef::_downcast (
     const char* logical_type_id
   )
 {
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_ValueMemberDef:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/ValueMemberDef:1.0") == 0)
     return ACE_static_cast (POA_CORBA_ValueMemberDef_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Contained:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Contained:1.0") == 0)
     return ACE_static_cast (POA_CORBA_Contained_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
     return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
     return ACE_static_cast(PortableServer::Servant, this);
@@ -2977,7 +2977,7 @@ void POA_CORBA_ValueMemberDef::_dispatch (TAO_ServerRequest &req, void *context,
 
 const char* POA_CORBA_ValueMemberDef::_interface_repository_id (void) const
 {
-  return "IDL:omg.org/CORBA_ValueMemberDef:1.0";
+  return "IDL:omg.org/CORBA/ValueMemberDef:1.0";
 }
 
 CORBA_ValueMemberDef*
@@ -5841,7 +5841,7 @@ CORBA_InterfaceDefSeq * _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::supported_interf
     return ACE_reinterpret_cast (
       POA_CORBA_ValueDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_ValueDef:1.0"
+          "IDL:omg.org/CORBA/ValueDef:1.0"
         )
     )->supported_interfaces (
         ACE_TRY_ENV
@@ -5871,7 +5871,7 @@ void _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::supported_interfaces (
     ACE_reinterpret_cast (
       POA_CORBA_ValueDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_ValueDef:1.0"
+          "IDL:omg.org/CORBA/ValueDef:1.0"
         )
     )->supported_interfaces (
         supported_interfaces,
@@ -5904,7 +5904,7 @@ CORBA_InitializerSeq * _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::initializers (
     return ACE_reinterpret_cast (
       POA_CORBA_ValueDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_ValueDef:1.0"
+          "IDL:omg.org/CORBA/ValueDef:1.0"
         )
     )->initializers (
         ACE_TRY_ENV
@@ -5934,7 +5934,7 @@ void _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::initializers (
     ACE_reinterpret_cast (
       POA_CORBA_ValueDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_ValueDef:1.0"
+          "IDL:omg.org/CORBA/ValueDef:1.0"
         )
     )->initializers (
         initializers,
@@ -5967,7 +5967,7 @@ CORBA_ValueDef_ptr _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::base_value (
     return ACE_reinterpret_cast (
       POA_CORBA_ValueDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_ValueDef:1.0"
+          "IDL:omg.org/CORBA/ValueDef:1.0"
         )
     )->base_value (
         ACE_TRY_ENV
@@ -5997,7 +5997,7 @@ void _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::base_value (
     ACE_reinterpret_cast (
       POA_CORBA_ValueDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_ValueDef:1.0"
+          "IDL:omg.org/CORBA/ValueDef:1.0"
         )
     )->base_value (
         base_value,
@@ -6030,7 +6030,7 @@ CORBA_ValueDefSeq * _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::abstract_base_values
     return ACE_reinterpret_cast (
       POA_CORBA_ValueDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_ValueDef:1.0"
+          "IDL:omg.org/CORBA/ValueDef:1.0"
         )
     )->abstract_base_values (
         ACE_TRY_ENV
@@ -6060,7 +6060,7 @@ void _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::abstract_base_values (
     ACE_reinterpret_cast (
       POA_CORBA_ValueDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_ValueDef:1.0"
+          "IDL:omg.org/CORBA/ValueDef:1.0"
         )
     )->abstract_base_values (
         abstract_base_values,
@@ -6093,7 +6093,7 @@ CORBA::Boolean _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::is_abstract (
     return ACE_reinterpret_cast (
       POA_CORBA_ValueDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_ValueDef:1.0"
+          "IDL:omg.org/CORBA/ValueDef:1.0"
         )
     )->is_abstract (
         ACE_TRY_ENV
@@ -6123,7 +6123,7 @@ void _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::is_abstract (
     ACE_reinterpret_cast (
       POA_CORBA_ValueDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_ValueDef:1.0"
+          "IDL:omg.org/CORBA/ValueDef:1.0"
         )
     )->is_abstract (
         is_abstract,
@@ -6156,7 +6156,7 @@ CORBA::Boolean _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::is_custom (
     return ACE_reinterpret_cast (
       POA_CORBA_ValueDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_ValueDef:1.0"
+          "IDL:omg.org/CORBA/ValueDef:1.0"
         )
     )->is_custom (
         ACE_TRY_ENV
@@ -6186,7 +6186,7 @@ void _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::is_custom (
     ACE_reinterpret_cast (
       POA_CORBA_ValueDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_ValueDef:1.0"
+          "IDL:omg.org/CORBA/ValueDef:1.0"
         )
     )->is_custom (
         is_custom,
@@ -6219,7 +6219,7 @@ CORBA::Boolean _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::is_truncatable (
     return ACE_reinterpret_cast (
       POA_CORBA_ValueDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_ValueDef:1.0"
+          "IDL:omg.org/CORBA/ValueDef:1.0"
         )
     )->is_truncatable (
         ACE_TRY_ENV
@@ -6249,7 +6249,7 @@ void _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::is_truncatable (
     ACE_reinterpret_cast (
       POA_CORBA_ValueDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_ValueDef:1.0"
+          "IDL:omg.org/CORBA/ValueDef:1.0"
         )
     )->is_truncatable (
         is_truncatable,
@@ -6283,7 +6283,7 @@ CORBA::Boolean _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::is_a (
     return ACE_reinterpret_cast (
       POA_CORBA_ValueDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_ValueDef:1.0"
+          "IDL:omg.org/CORBA/ValueDef:1.0"
         )
     )->is_a (
         id,
@@ -6315,7 +6315,7 @@ CORBA_ValueDef::FullValueDescription * _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::d
     return ACE_reinterpret_cast (
       POA_CORBA_ValueDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_ValueDef:1.0"
+          "IDL:omg.org/CORBA/ValueDef:1.0"
         )
     )->describe_value (
         ACE_TRY_ENV
@@ -6351,7 +6351,7 @@ CORBA_ValueMemberDef_ptr _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::create_value_me
     return ACE_reinterpret_cast (
       POA_CORBA_ValueDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_ValueDef:1.0"
+          "IDL:omg.org/CORBA/ValueDef:1.0"
         )
     )->create_value_member (
         id,
@@ -6392,7 +6392,7 @@ CORBA_AttributeDef_ptr _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::create_attribute
     return ACE_reinterpret_cast (
       POA_CORBA_ValueDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_ValueDef:1.0"
+          "IDL:omg.org/CORBA/ValueDef:1.0"
         )
     )->create_attribute (
         id,
@@ -6436,7 +6436,7 @@ CORBA_OperationDef_ptr _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::create_operation
     return ACE_reinterpret_cast (
       POA_CORBA_ValueDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_ValueDef:1.0"
+          "IDL:omg.org/CORBA/ValueDef:1.0"
         )
     )->create_operation (
         id,
@@ -8177,11 +8177,11 @@ CORBA::Boolean POA_CORBA_ValueDef::_is_a (
   ACE_CHECK_RETURN (0);
   
   if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_ValueDef:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Container:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IDLType:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/ValueDef:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Container:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
     (!ACE_OS::strcmp ((char *)value, base_id)))
       return 1;
     else
@@ -8192,15 +8192,15 @@ void* POA_CORBA_ValueDef::_downcast (
     const char* logical_type_id
   )
 {
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_ValueDef:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/ValueDef:1.0") == 0)
     return ACE_static_cast (POA_CORBA_ValueDef_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Container:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Container:1.0") == 0)
     return ACE_static_cast (POA_CORBA_Container_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Contained:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Contained:1.0") == 0)
     return ACE_static_cast (POA_CORBA_Contained_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IDLType:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IDLType:1.0") == 0)
     return ACE_static_cast (POA_CORBA_IDLType_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
     return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
     return ACE_static_cast(PortableServer::Servant, this);
@@ -8214,7 +8214,7 @@ void POA_CORBA_ValueDef::_dispatch (TAO_ServerRequest &req, void *context, CORBA
 
 const char* POA_CORBA_ValueDef::_interface_repository_id (void) const
 {
-  return "IDL:omg.org/CORBA_ValueDef:1.0";
+  return "IDL:omg.org/CORBA/ValueDef:1.0";
 }
 
 CORBA_ValueDef*
@@ -8765,7 +8765,7 @@ CORBA_IDLType_ptr _TAO_CORBA_ValueBoxDef_ThruPOA_Proxy_Impl::original_type_def (
     return ACE_reinterpret_cast (
       POA_CORBA_ValueBoxDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_ValueBoxDef:1.0"
+          "IDL:omg.org/CORBA/ValueBoxDef:1.0"
         )
     )->original_type_def (
         ACE_TRY_ENV
@@ -8795,7 +8795,7 @@ void _TAO_CORBA_ValueBoxDef_ThruPOA_Proxy_Impl::original_type_def (
     ACE_reinterpret_cast (
       POA_CORBA_ValueBoxDef_ptr,
       servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA_ValueBoxDef:1.0"
+          "IDL:omg.org/CORBA/ValueBoxDef:1.0"
         )
     )->original_type_def (
         original_type_def,
@@ -9084,11 +9084,11 @@ CORBA::Boolean POA_CORBA_ValueBoxDef::_is_a (
   ACE_CHECK_RETURN (0);
   
   if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_ValueBoxDef:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_TypedefDef:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IDLType:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/ValueBoxDef:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/TypedefDef:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
     (!ACE_OS::strcmp ((char *)value, base_id)))
       return 1;
     else
@@ -9099,15 +9099,15 @@ void* POA_CORBA_ValueBoxDef::_downcast (
     const char* logical_type_id
   )
 {
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_ValueBoxDef:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/ValueBoxDef:1.0") == 0)
     return ACE_static_cast (POA_CORBA_ValueBoxDef_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_TypedefDef:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/TypedefDef:1.0") == 0)
     return ACE_static_cast (POA_CORBA_TypedefDef_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Contained:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Contained:1.0") == 0)
     return ACE_static_cast (POA_CORBA_Contained_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IDLType:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IDLType:1.0") == 0)
     return ACE_static_cast (POA_CORBA_IDLType_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
     return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
     return ACE_static_cast(PortableServer::Servant, this);
@@ -9121,7 +9121,7 @@ void POA_CORBA_ValueBoxDef::_dispatch (TAO_ServerRequest &req, void *context, CO
 
 const char* POA_CORBA_ValueBoxDef::_interface_repository_id (void) const
 {
-  return "IDL:omg.org/CORBA_ValueBoxDef:1.0";
+  return "IDL:omg.org/CORBA/ValueBoxDef:1.0";
 }
 
 CORBA_ValueBoxDef*
diff --git a/TAO/orbsvcs/IFR_Service/Servant_Factory.cpp b/TAO/orbsvcs/IFR_Service/Servant_Factory.cpp
index 3c3393cd0d0..6c002c7d972 100644
--- a/TAO/orbsvcs/IFR_Service/Servant_Factory.cpp
+++ b/TAO/orbsvcs/IFR_Service/Servant_Factory.cpp
@@ -1376,108 +1376,108 @@ IFR_Servant_Factory::create_objref (CORBA::DefinitionKind def_kind,
     PortableServer::string_to_ObjectId (obj_id);
 
   // Can plug in prefix tricks here.
-  ACE_TString repo_id ("IDL:omg.org/IR/");
+  ACE_TString repo_id ("IDL:omg.org/");
 
   switch (def_kind)
   {
     case CORBA::dk_Attribute:
-      repo_id += "AttributeDef:";
+      repo_id += "CORBA/AttributeDef:";
       break;
     case CORBA::dk_Constant:
-      repo_id += "ConstantDef:";
+      repo_id += "CORBA/ConstantDef:";
       break;
     case CORBA::dk_Exception:
-      repo_id += "ExceptionDef:";
+      repo_id += "CORBA/ExceptionDef:";
       break;
     case CORBA::dk_Interface:
-      repo_id += "InterfaceDef:";
+      repo_id += "CORBA/InterfaceDef:";
       break;
     case CORBA::dk_AbstractInterface:
-      repo_id += "AbstractInterfaceDef:";
+      repo_id += "CORBA/AbstractInterfaceDef:";
       break;
     case CORBA::dk_LocalInterface:
-      repo_id += "LocalInterfaceDef:";
+      repo_id += "CORBA/LocalInterfaceDef:";
       break;
     case CORBA::dk_Module:
-      repo_id += "ModuleDef:";
+      repo_id += "CORBA/ModuleDef:";
       break;
     case CORBA::dk_Operation:
-      repo_id += "OperationDef:";
+      repo_id += "CORBA/OperationDef:";
       break;
     case CORBA::dk_Typedef:
-      repo_id += "TypedefDef:";
+      repo_id += "CORBA/TypedefDef:";
       break;
     case CORBA::dk_Alias:
-      repo_id += "AliasDef:";
+      repo_id += "CORBA/AliasDef:";
       break;
     case CORBA::dk_Struct:
-      repo_id += "StructDef:";
+      repo_id += "CORBA/StructDef:";
       break;
     case CORBA::dk_Union:
-      repo_id += "UnionDef:";
+      repo_id += "CORBA/UnionDef:";
       break;
     case CORBA::dk_Enum:
-      repo_id += "EnumDef:";
+      repo_id += "CORBA/EnumDef:";
       break;
     case CORBA::dk_Primitive:
-      repo_id += "PrimitiveDef:";
+      repo_id += "CORBA/PrimitiveDef:";
       break;
     case CORBA::dk_String:
-      repo_id += "StringDef:";
+      repo_id += "CORBA/StringDef:";
       break;
     case CORBA::dk_Sequence:
-      repo_id += "SequenceDef:";
+      repo_id += "CORBA/SequenceDef:";
       break;
     case CORBA::dk_Array:
-      repo_id += "ArrayDef:";
+      repo_id += "CORBA/ArrayDef:";
       break;
     case CORBA::dk_Wstring:
-      repo_id += "WstringDef:";
+      repo_id += "CORBA/WstringDef:";
       break;
     case CORBA::dk_Fixed:
-      repo_id += "FixedDef:";
+      repo_id += "CORBA/FixedDef:";
       break;
     case CORBA::dk_Value:
-      repo_id += "ValueDef:";
+      repo_id += "CORBA/ValueDef:";
       break;
     case CORBA::dk_ValueBox:
-      repo_id += "ValueBoxDef:";
+      repo_id += "CORBA/ValueBoxDef:";
       break;
     case CORBA::dk_ValueMember:
-      repo_id += "ValueMemberDef:";
+      repo_id += "CORBA/ValueMemberDef:";
       break;
     case CORBA::dk_Native:
-      repo_id += "NativeDef:";
+      repo_id += "CORBA/NativeDef:";
       break;
     case CORBA::dk_Component:
-      repo_id += "ComponentDef:";
+      repo_id += "IR/ComponentDef:";
       break;
     case CORBA::dk_Home:
       repo_id += "HomeDef:";
       break;
     case CORBA::dk_Factory:
-      repo_id += "FactoryDef:";
+      repo_id += "IR/FactoryDef:";
       break;
     case CORBA::dk_Finder:
-      repo_id += "FinderDef:";
+      repo_id += "IR/FinderDef:";
       break;
     case CORBA::dk_PrimaryKey:
-      repo_id += "PrimaryKeyDef:";
+      repo_id += "IR/PrimaryKeyDef:";
       break;
     case CORBA::dk_Emits:
-      repo_id += "EmitsDef:";
+      repo_id += "IR/EmitsDef:";
       break;
     case CORBA::dk_Publishes:
-      repo_id += "PublishesDef:";
+      repo_id += "IR/PublishesDef:";
       break;
     case CORBA::dk_Consumes:
-      repo_id += "ConsumesDef:";
+      repo_id += "IR/ConsumesDef:";
       break;
     case CORBA::dk_Provides:
-      repo_id += "ProvidesDef:";
+      repo_id += "IR/ProvidesDef:";
       break;
     case CORBA::dk_Uses:
-      repo_id += "UsesDef:";
+      repo_id += "IR/UsesDef:";
       break;
     default:
       ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (), 0);
diff --git a/TAO/orbsvcs/IFR_Service/diffs/IFR_BaseS.cpp.diff b/TAO/orbsvcs/IFR_Service/diffs/IFR_BaseS.cpp.diff
index e24e2b503a8..2f6b9ce3def 100644
--- a/TAO/orbsvcs/IFR_Service/diffs/IFR_BaseS.cpp.diff
+++ b/TAO/orbsvcs/IFR_Service/diffs/IFR_BaseS.cpp.diff
@@ -1,5 +1,5 @@
---- orig/IFR_BaseS.cpp	Mon Apr 23 20:55:58 2001
-+++ IFR_BaseS.cpp	Mon Apr 23 20:21:20 2001
+--- orig/IFR_BaseS.cpp	Mon Apr 30 22:22:30 2001
++++ IFR_BaseS.cpp	Fri May 11 00:03:12 2001
 @@ -1,6 +1,6 @@
  // -*- C++ -*-
  //
@@ -8,6 +8,17 @@
  
  // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
  // TAO and the TAO IDL Compiler have been developed by:
+@@ -19,8 +19,8 @@
+ // Information about TAO is available at:
+ //     http://www.cs.wustl.edu/~schmidt/TAO.html
+ 
+-#ifndef _TAO_IDL_IFR_BASES_CPP_
+-#define _TAO_IDL_IFR_BASES_CPP_
++#ifndef _TAO_IDL__________ORBSVCS_IFR_SERVICE_ORIG_IFR_BASES_CPP_
++#define _TAO_IDL__________ORBSVCS_IFR_SERVICE_ORIG_IFR_BASES_CPP_
+ 
+ #include "IFR_BaseS.h"
+ 
 @@ -36,6 +36,7 @@
  #endif  /* TAO_HAS_INTERCEPTORS == 1 */
  
@@ -20,7 +31,7 @@
  public:
   const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
  };
--/* starting time is 15:55:58 */
+-/* starting time is 17:22:29 */
 +/* starting time is 12:14:19 */
  /* C++ code produced by gperf version 2.8 (ACE version) */
  /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_IRObject_Perfect_Hash_OpTable -N lookup  */
@@ -29,16 +40,61 @@
      }
    return 0;
  }
--/* ending time is 15:55:58 */
+-/* ending time is 17:22:29 */
 +/* ending time is 12:14:19 */
  static TAO_CORBA_IRObject_Perfect_Hash_OpTable tao_CORBA_IRObject_optable;
  
  #if (TAO_HAS_INTERCEPTORS == 1)
+@@ -528,7 +529,7 @@
+     return ACE_reinterpret_cast (
+       POA_CORBA_IRObject_ptr,
+       servant_upcall.servant ()->_downcast (
+-          "IDL:omg.org/CORBA_IRObject:1.0"
++          "IDL:omg.org/CORBA/IRObject:1.0"
+         )
+     )->def_kind (
+         ACE_TRY_ENV
+@@ -557,7 +558,7 @@
+     ACE_reinterpret_cast (
+       POA_CORBA_IRObject_ptr,
+       servant_upcall.servant ()->_downcast (
+-          "IDL:omg.org/CORBA_IRObject:1.0"
++          "IDL:omg.org/CORBA/IRObject:1.0"
+         )
+     )->destroy (
+         ACE_TRY_ENV
+@@ -831,7 +832,7 @@
+   ACE_CHECK_RETURN (0);
+   
+   if (
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
+     (!ACE_OS::strcmp ((char *)value, base_id)))
+       return 1;
+     else
+@@ -842,7 +843,7 @@
+     const char* logical_type_id
+   )
+ {
+-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0)
++  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
+     return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
+   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
+     return ACE_static_cast(PortableServer::Servant, this);
+@@ -856,7 +857,7 @@
+ 
+ const char* POA_CORBA_IRObject::_interface_repository_id (void) const
+ {
+-  return "IDL:omg.org/CORBA_IRObject:1.0";
++  return "IDL:omg.org/CORBA/IRObject:1.0";
+ }
+ 
+ CORBA_IRObject*
 @@ -884,7 +885,7 @@
  public:
   const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
  };
--/* starting time is 15:55:58 */
+-/* starting time is 17:22:29 */
 +/* starting time is 12:14:19 */
  /* C++ code produced by gperf version 2.8 (ACE version) */
  /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_Contained_Perfect_Hash_OpTable -N lookup  */
@@ -47,16 +103,147 @@
      }
    return 0;
  }
--/* ending time is 15:55:58 */
+-/* ending time is 17:22:29 */
 +/* ending time is 12:14:19 */
  static TAO_CORBA_Contained_Perfect_Hash_OpTable tao_CORBA_Contained_optable;
  
  #if (TAO_HAS_INTERCEPTORS == 1)
+@@ -2526,7 +2527,7 @@
+     return ACE_reinterpret_cast (
+       POA_CORBA_Contained_ptr,
+       servant_upcall.servant ()->_downcast (
+-          "IDL:omg.org/CORBA_Contained:1.0"
++          "IDL:omg.org/CORBA/Contained:1.0"
+         )
+     )->id (
+         ACE_TRY_ENV
+@@ -2556,7 +2557,7 @@
+     ACE_reinterpret_cast (
+       POA_CORBA_Contained_ptr,
+       servant_upcall.servant ()->_downcast (
+-          "IDL:omg.org/CORBA_Contained:1.0"
++          "IDL:omg.org/CORBA/Contained:1.0"
+         )
+     )->id (
+         id,
+@@ -2589,7 +2590,7 @@
+     return ACE_reinterpret_cast (
+       POA_CORBA_Contained_ptr,
+       servant_upcall.servant ()->_downcast (
+-          "IDL:omg.org/CORBA_Contained:1.0"
++          "IDL:omg.org/CORBA/Contained:1.0"
+         )
+     )->name (
+         ACE_TRY_ENV
+@@ -2619,7 +2620,7 @@
+     ACE_reinterpret_cast (
+       POA_CORBA_Contained_ptr,
+       servant_upcall.servant ()->_downcast (
+-          "IDL:omg.org/CORBA_Contained:1.0"
++          "IDL:omg.org/CORBA/Contained:1.0"
+         )
+     )->name (
+         name,
+@@ -2652,7 +2653,7 @@
+     return ACE_reinterpret_cast (
+       POA_CORBA_Contained_ptr,
+       servant_upcall.servant ()->_downcast (
+-          "IDL:omg.org/CORBA_Contained:1.0"
++          "IDL:omg.org/CORBA/Contained:1.0"
+         )
+     )->version (
+         ACE_TRY_ENV
+@@ -2682,7 +2683,7 @@
+     ACE_reinterpret_cast (
+       POA_CORBA_Contained_ptr,
+       servant_upcall.servant ()->_downcast (
+-          "IDL:omg.org/CORBA_Contained:1.0"
++          "IDL:omg.org/CORBA/Contained:1.0"
+         )
+     )->version (
+         version,
+@@ -2715,7 +2716,7 @@
+     return ACE_reinterpret_cast (
+       POA_CORBA_Contained_ptr,
+       servant_upcall.servant ()->_downcast (
+-          "IDL:omg.org/CORBA_Contained:1.0"
++          "IDL:omg.org/CORBA/Contained:1.0"
+         )
+     )->defined_in (
+         ACE_TRY_ENV
+@@ -2746,7 +2747,7 @@
+     return ACE_reinterpret_cast (
+       POA_CORBA_Contained_ptr,
+       servant_upcall.servant ()->_downcast (
+-          "IDL:omg.org/CORBA_Contained:1.0"
++          "IDL:omg.org/CORBA/Contained:1.0"
+         )
+     )->absolute_name (
+         ACE_TRY_ENV
+@@ -2777,7 +2778,7 @@
+     return ACE_reinterpret_cast (
+       POA_CORBA_Contained_ptr,
+       servant_upcall.servant ()->_downcast (
+-          "IDL:omg.org/CORBA_Contained:1.0"
++          "IDL:omg.org/CORBA/Contained:1.0"
+         )
+     )->containing_repository (
+         ACE_TRY_ENV
+@@ -2808,7 +2809,7 @@
+     return ACE_reinterpret_cast (
+       POA_CORBA_Contained_ptr,
+       servant_upcall.servant ()->_downcast (
+-          "IDL:omg.org/CORBA_Contained:1.0"
++          "IDL:omg.org/CORBA/Contained:1.0"
+         )
+     )->describe (
+         ACE_TRY_ENV
+@@ -2840,7 +2841,7 @@
+     ACE_reinterpret_cast (
+       POA_CORBA_Contained_ptr,
+       servant_upcall.servant ()->_downcast (
+-          "IDL:omg.org/CORBA_Contained:1.0"
++          "IDL:omg.org/CORBA/Contained:1.0"
+         )
+     )->move (
+         new_container,
+@@ -3853,8 +3854,8 @@
+   ACE_CHECK_RETURN (0);
+   
+   if (
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
+     (!ACE_OS::strcmp ((char *)value, base_id)))
+       return 1;
+     else
+@@ -3865,9 +3866,9 @@
+     const char* logical_type_id
+   )
+ {
+-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Contained:1.0") == 0)
++  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Contained:1.0") == 0)
+     return ACE_static_cast (POA_CORBA_Contained_ptr, this);
+-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0)
++  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
+     return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
+   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
+     return ACE_static_cast(PortableServer::Servant, this);
+@@ -3881,7 +3882,7 @@
+ 
+ const char* POA_CORBA_Contained::_interface_repository_id (void) const
+ {
+-  return "IDL:omg.org/CORBA_Contained:1.0";
++  return "IDL:omg.org/CORBA/Contained:1.0";
+ }
+ 
+ CORBA_Contained*
 @@ -3909,7 +3910,7 @@
  public:
   const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
  };
--/* starting time is 15:55:58 */
+-/* starting time is 17:22:29 */
 +/* starting time is 12:14:19 */
  /* C++ code produced by gperf version 2.8 (ACE version) */
  /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_Container_Perfect_Hash_OpTable -N lookup  */
@@ -65,16 +252,201 @@
      }
    return 0;
  }
--/* ending time is 15:55:58 */
+-/* ending time is 17:22:29 */
 +/* ending time is 12:14:19 */
  static TAO_CORBA_Container_Perfect_Hash_OpTable tao_CORBA_Container_optable;
  
  #if (TAO_HAS_INTERCEPTORS == 1)
+@@ -6945,7 +6946,7 @@
+     return ACE_reinterpret_cast (
+       POA_CORBA_Container_ptr,
+       servant_upcall.servant ()->_downcast (
+-          "IDL:omg.org/CORBA_Container:1.0"
++          "IDL:omg.org/CORBA/Container:1.0"
+         )
+     )->lookup (
+         search_name,
+@@ -6979,7 +6980,7 @@
+     return ACE_reinterpret_cast (
+       POA_CORBA_Container_ptr,
+       servant_upcall.servant ()->_downcast (
+-          "IDL:omg.org/CORBA_Container:1.0"
++          "IDL:omg.org/CORBA/Container:1.0"
+         )
+     )->contents (
+         limit_type,
+@@ -7016,7 +7017,7 @@
+     return ACE_reinterpret_cast (
+       POA_CORBA_Container_ptr,
+       servant_upcall.servant ()->_downcast (
+-          "IDL:omg.org/CORBA_Container:1.0"
++          "IDL:omg.org/CORBA/Container:1.0"
+         )
+     )->lookup_name (
+         search_name,
+@@ -7054,7 +7055,7 @@
+     return ACE_reinterpret_cast (
+       POA_CORBA_Container_ptr,
+       servant_upcall.servant ()->_downcast (
+-          "IDL:omg.org/CORBA_Container:1.0"
++          "IDL:omg.org/CORBA/Container:1.0"
+         )
+     )->describe_contents (
+         limit_type,
+@@ -7091,7 +7092,7 @@
+     return ACE_reinterpret_cast (
+       POA_CORBA_Container_ptr,
+       servant_upcall.servant ()->_downcast (
+-          "IDL:omg.org/CORBA_Container:1.0"
++          "IDL:omg.org/CORBA/Container:1.0"
+         )
+     )->create_module (
+         id,
+@@ -7130,7 +7131,7 @@
+     return ACE_reinterpret_cast (
+       POA_CORBA_Container_ptr,
+       servant_upcall.servant ()->_downcast (
+-          "IDL:omg.org/CORBA_Container:1.0"
++          "IDL:omg.org/CORBA/Container:1.0"
+         )
+     )->create_constant (
+         id,
+@@ -7170,7 +7171,7 @@
+     return ACE_reinterpret_cast (
+       POA_CORBA_Container_ptr,
+       servant_upcall.servant ()->_downcast (
+-          "IDL:omg.org/CORBA_Container:1.0"
++          "IDL:omg.org/CORBA/Container:1.0"
+         )
+     )->create_struct (
+         id,
+@@ -7210,7 +7211,7 @@
+     return ACE_reinterpret_cast (
+       POA_CORBA_Container_ptr,
+       servant_upcall.servant ()->_downcast (
+-          "IDL:omg.org/CORBA_Container:1.0"
++          "IDL:omg.org/CORBA/Container:1.0"
+         )
+     )->create_union (
+         id,
+@@ -7250,7 +7251,7 @@
+     return ACE_reinterpret_cast (
+       POA_CORBA_Container_ptr,
+       servant_upcall.servant ()->_downcast (
+-          "IDL:omg.org/CORBA_Container:1.0"
++          "IDL:omg.org/CORBA/Container:1.0"
+         )
+     )->create_enum (
+         id,
+@@ -7289,7 +7290,7 @@
+     return ACE_reinterpret_cast (
+       POA_CORBA_Container_ptr,
+       servant_upcall.servant ()->_downcast (
+-          "IDL:omg.org/CORBA_Container:1.0"
++          "IDL:omg.org/CORBA/Container:1.0"
+         )
+     )->create_alias (
+         id,
+@@ -7328,7 +7329,7 @@
+     return ACE_reinterpret_cast (
+       POA_CORBA_Container_ptr,
+       servant_upcall.servant ()->_downcast (
+-          "IDL:omg.org/CORBA_Container:1.0"
++          "IDL:omg.org/CORBA/Container:1.0"
+         )
+     )->create_interface (
+         id,
+@@ -7373,7 +7374,7 @@
+     return ACE_reinterpret_cast (
+       POA_CORBA_Container_ptr,
+       servant_upcall.servant ()->_downcast (
+-          "IDL:omg.org/CORBA_Container:1.0"
++          "IDL:omg.org/CORBA/Container:1.0"
+         )
+     )->create_value (
+         id,
+@@ -7418,7 +7419,7 @@
+     return ACE_reinterpret_cast (
+       POA_CORBA_Container_ptr,
+       servant_upcall.servant ()->_downcast (
+-          "IDL:omg.org/CORBA_Container:1.0"
++          "IDL:omg.org/CORBA/Container:1.0"
+         )
+     )->create_value_box (
+         id,
+@@ -7457,7 +7458,7 @@
+     return ACE_reinterpret_cast (
+       POA_CORBA_Container_ptr,
+       servant_upcall.servant ()->_downcast (
+-          "IDL:omg.org/CORBA_Container:1.0"
++          "IDL:omg.org/CORBA/Container:1.0"
+         )
+     )->create_exception (
+         id,
+@@ -7495,7 +7496,7 @@
+     return ACE_reinterpret_cast (
+       POA_CORBA_Container_ptr,
+       servant_upcall.servant ()->_downcast (
+-          "IDL:omg.org/CORBA_Container:1.0"
++          "IDL:omg.org/CORBA/Container:1.0"
+         )
+     )->create_native (
+         id,
+@@ -7533,7 +7534,7 @@
+     return ACE_reinterpret_cast (
+       POA_CORBA_Container_ptr,
+       servant_upcall.servant ()->_downcast (
+-          "IDL:omg.org/CORBA_Container:1.0"
++          "IDL:omg.org/CORBA/Container:1.0"
+         )
+     )->create_abstract_interface (
+         id,
+@@ -7572,7 +7573,7 @@
+     return ACE_reinterpret_cast (
+       POA_CORBA_Container_ptr,
+       servant_upcall.servant ()->_downcast (
+-          "IDL:omg.org/CORBA_Container:1.0"
++          "IDL:omg.org/CORBA/Container:1.0"
+         )
+     )->create_local_interface (
+         id,
+@@ -9418,8 +9419,8 @@
+   ACE_CHECK_RETURN (0);
+   
+   if (
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Container:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Container:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
+     (!ACE_OS::strcmp ((char *)value, base_id)))
+       return 1;
+     else
+@@ -9430,9 +9431,9 @@
+     const char* logical_type_id
+   )
+ {
+-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Container:1.0") == 0)
++  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Container:1.0") == 0)
+     return ACE_static_cast (POA_CORBA_Container_ptr, this);
+-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0)
++  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
+     return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
+   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
+     return ACE_static_cast(PortableServer::Servant, this);
+@@ -9446,7 +9447,7 @@
+ 
+ const char* POA_CORBA_Container::_interface_repository_id (void) const
+ {
+-  return "IDL:omg.org/CORBA_Container:1.0";
++  return "IDL:omg.org/CORBA/Container:1.0";
+ }
+ 
+ CORBA_Container*
 @@ -9474,7 +9475,7 @@
  public:
   const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
  };
--/* starting time is 15:55:58 */
+-/* starting time is 17:22:30 */
 +/* starting time is 12:14:19 */
  /* C++ code produced by gperf version 2.8 (ACE version) */
  /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_IDLType_Perfect_Hash_OpTable -N lookup  */
@@ -83,16 +455,57 @@
      }
    return 0;
  }
--/* ending time is 15:55:58 */
+-/* ending time is 17:22:30 */
 +/* ending time is 12:14:19 */
  static TAO_CORBA_IDLType_Perfect_Hash_OpTable tao_CORBA_IDLType_optable;
  
  #if (TAO_HAS_INTERCEPTORS == 1)
+@@ -9841,7 +9842,7 @@
+     return ACE_reinterpret_cast (
+       POA_CORBA_IDLType_ptr,
+       servant_upcall.servant ()->_downcast (
+-          "IDL:omg.org/CORBA_IDLType:1.0"
++          "IDL:omg.org/CORBA/IDLType:1.0"
+         )
+     )->type (
+         ACE_TRY_ENV
+@@ -10046,8 +10047,8 @@
+   ACE_CHECK_RETURN (0);
+   
+   if (
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IDLType:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
+     (!ACE_OS::strcmp ((char *)value, base_id)))
+       return 1;
+     else
+@@ -10058,9 +10059,9 @@
+     const char* logical_type_id
+   )
+ {
+-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IDLType:1.0") == 0)
++  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IDLType:1.0") == 0)
+     return ACE_static_cast (POA_CORBA_IDLType_ptr, this);
+-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0)
++  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
+     return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
+   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
+     return ACE_static_cast(PortableServer::Servant, this);
+@@ -10074,7 +10075,7 @@
+ 
+ const char* POA_CORBA_IDLType::_interface_repository_id (void) const
+ {
+-  return "IDL:omg.org/CORBA_IDLType:1.0";
++  return "IDL:omg.org/CORBA/IDLType:1.0";
+ }
+ 
+ CORBA_IDLType*
 @@ -10102,7 +10103,7 @@
  public:
   const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
  };
--/* starting time is 15:55:58 */
+-/* starting time is 17:22:30 */
 +/* starting time is 12:14:19 */
  /* C++ code produced by gperf version 2.8 (ACE version) */
  /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_TypedefDef_Perfect_Hash_OpTable -N lookup  */
@@ -101,8 +514,50 @@
      }
    return 0;
  }
--/* ending time is 15:55:58 */
+-/* ending time is 17:22:30 */
 +/* ending time is 12:14:19 */
  static TAO_CORBA_TypedefDef_Perfect_Hash_OpTable tao_CORBA_TypedefDef_optable;
  
  #if (TAO_HAS_INTERCEPTORS == 1)
+@@ -10473,10 +10474,10 @@
+   ACE_CHECK_RETURN (0);
+   
+   if (
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_TypedefDef:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IDLType:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/TypedefDef:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
+     (!ACE_OS::strcmp ((char *)value, base_id)))
+       return 1;
+     else
+@@ -10487,13 +10488,13 @@
+     const char* logical_type_id
+   )
+ {
+-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_TypedefDef:1.0") == 0)
++  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/TypedefDef:1.0") == 0)
+     return ACE_static_cast (POA_CORBA_TypedefDef_ptr, this);
+-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Contained:1.0") == 0)
++  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Contained:1.0") == 0)
+     return ACE_static_cast (POA_CORBA_Contained_ptr, this);
+-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IDLType:1.0") == 0)
++  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IDLType:1.0") == 0)
+     return ACE_static_cast (POA_CORBA_IDLType_ptr, this);
+-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0)
++  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
+     return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
+   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
+     return ACE_static_cast(PortableServer::Servant, this);
+@@ -10507,7 +10508,7 @@
+ 
+ const char* POA_CORBA_TypedefDef::_interface_repository_id (void) const
+ {
+-  return "IDL:omg.org/CORBA_TypedefDef:1.0";
++  return "IDL:omg.org/CORBA/TypedefDef:1.0";
+ }
+ 
+ CORBA_TypedefDef*
diff --git a/TAO/orbsvcs/IFR_Service/diffs/IFR_BasicS.cpp.diff b/TAO/orbsvcs/IFR_Service/diffs/IFR_BasicS.cpp.diff
index 2a28fa177f5..4aaacd4d2c0 100644
--- a/TAO/orbsvcs/IFR_Service/diffs/IFR_BasicS.cpp.diff
+++ b/TAO/orbsvcs/IFR_Service/diffs/IFR_BasicS.cpp.diff
@@ -1,5 +1,5 @@
---- orig/IFR_BasicS.cpp	Mon Apr 23 20:56:03 2001
-+++ IFR_BasicS.cpp	Mon Apr 23 21:28:43 2001
+--- orig/IFR_BasicS.cpp	Mon Apr 30 22:22:33 2001
++++ IFR_BasicS.cpp	Fri May 11 00:01:55 2001
 @@ -1,6 +1,6 @@
  // -*- C++ -*-
  //
@@ -8,11 +8,22 @@
  
  // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
  // TAO and the TAO IDL Compiler have been developed by:
+@@ -19,8 +19,8 @@
+ // Information about TAO is available at:
+ //     http://www.cs.wustl.edu/~schmidt/TAO.html
+ 
+-#ifndef _TAO_IDL_IFR_BASICS_CPP_
+-#define _TAO_IDL_IFR_BASICS_CPP_
++#ifndef _TAO_IDL__________ORBSVCS_IFR_SERVICE_ORIG_IFR_BASICS_CPP_
++#define _TAO_IDL__________ORBSVCS_IFR_SERVICE_ORIG_IFR_BASICS_CPP_
+ 
+ #include "IFR_BasicS.h"
+ 
 @@ -51,7 +51,7 @@
  public:
   const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
  };
--/* starting time is 15:56:02 */
+-/* starting time is 17:22:32 */
 +/* starting time is 13:56:20 */
  /* C++ code produced by gperf version 2.8 (ACE version) */
  /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_Repository_Perfect_Hash_OpTable -N lookup  */
@@ -21,16 +32,125 @@
      }
    return 0;
  }
--/* ending time is 15:56:02 */
+-/* ending time is 17:22:32 */
 +/* ending time is 13:56:20 */
  static TAO_CORBA_Repository_Perfect_Hash_OpTable tao_CORBA_Repository_optable;
  
  #if (TAO_HAS_INTERCEPTORS == 1)
+@@ -1444,7 +1444,7 @@
+     return ACE_reinterpret_cast (
+       POA_CORBA_Repository_ptr,
+       servant_upcall.servant ()->_downcast (
+-          "IDL:omg.org/CORBA_Repository:1.0"
++          "IDL:omg.org/CORBA/Repository:1.0"
+         )
+     )->lookup_id (
+         search_id,
+@@ -1477,7 +1477,7 @@
+     return ACE_reinterpret_cast (
+       POA_CORBA_Repository_ptr,
+       servant_upcall.servant ()->_downcast (
+-          "IDL:omg.org/CORBA_Repository:1.0"
++          "IDL:omg.org/CORBA/Repository:1.0"
+         )
+     )->get_canonical_typecode (
+         tc,
+@@ -1510,7 +1510,7 @@
+     return ACE_reinterpret_cast (
+       POA_CORBA_Repository_ptr,
+       servant_upcall.servant ()->_downcast (
+-          "IDL:omg.org/CORBA_Repository:1.0"
++          "IDL:omg.org/CORBA/Repository:1.0"
+         )
+     )->get_primitive (
+         kind,
+@@ -1543,7 +1543,7 @@
+     return ACE_reinterpret_cast (
+       POA_CORBA_Repository_ptr,
+       servant_upcall.servant ()->_downcast (
+-          "IDL:omg.org/CORBA_Repository:1.0"
++          "IDL:omg.org/CORBA/Repository:1.0"
+         )
+     )->create_string (
+         bound,
+@@ -1576,7 +1576,7 @@
+     return ACE_reinterpret_cast (
+       POA_CORBA_Repository_ptr,
+       servant_upcall.servant ()->_downcast (
+-          "IDL:omg.org/CORBA_Repository:1.0"
++          "IDL:omg.org/CORBA/Repository:1.0"
+         )
+     )->create_wstring (
+         bound,
+@@ -1610,7 +1610,7 @@
+     return ACE_reinterpret_cast (
+       POA_CORBA_Repository_ptr,
+       servant_upcall.servant ()->_downcast (
+-          "IDL:omg.org/CORBA_Repository:1.0"
++          "IDL:omg.org/CORBA/Repository:1.0"
+         )
+     )->create_sequence (
+         bound,
+@@ -1645,7 +1645,7 @@
+     return ACE_reinterpret_cast (
+       POA_CORBA_Repository_ptr,
+       servant_upcall.servant ()->_downcast (
+-          "IDL:omg.org/CORBA_Repository:1.0"
++          "IDL:omg.org/CORBA/Repository:1.0"
+         )
+     )->create_array (
+         length,
+@@ -1680,7 +1680,7 @@
+     return ACE_reinterpret_cast (
+       POA_CORBA_Repository_ptr,
+       servant_upcall.servant ()->_downcast (
+-          "IDL:omg.org/CORBA_Repository:1.0"
++          "IDL:omg.org/CORBA/Repository:1.0"
+         )
+     )->create_fixed (
+         digits,
+@@ -2532,9 +2532,9 @@
+   ACE_CHECK_RETURN (0);
+   
+   if (
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Repository:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Container:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Repository:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Container:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
+     (!ACE_OS::strcmp ((char *)value, base_id)))
+       return 1;
+     else
+@@ -2545,11 +2545,11 @@
+     const char* logical_type_id
+   )
+ {
+-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Repository:1.0") == 0)
++  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Repository:1.0") == 0)
+     return ACE_static_cast (POA_CORBA_Repository_ptr, this);
+-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Container:1.0") == 0)
++  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Container:1.0") == 0)
+     return ACE_static_cast (POA_CORBA_Container_ptr, this);
+-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0)
++  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
+     return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
+   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
+     return ACE_static_cast(PortableServer::Servant, this);
+@@ -2563,7 +2563,7 @@
+ 
+ const char* POA_CORBA_Repository::_interface_repository_id (void) const
+ {
+-  return "IDL:omg.org/CORBA_Repository:1.0";
++  return "IDL:omg.org/CORBA/Repository:1.0";
+ }
+ 
+ CORBA_Repository*
 @@ -2591,7 +2591,7 @@
  public:
   const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
  };
--/* starting time is 15:56:02 */
+-/* starting time is 17:22:32 */
 +/* starting time is 13:56:21 */
  /* C++ code produced by gperf version 2.8 (ACE version) */
  /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ModuleDef_Perfect_Hash_OpTable -N lookup  */
@@ -39,16 +159,58 @@
      }
    return 0;
  }
--/* ending time is 15:56:02 */
+-/* ending time is 17:22:32 */
 +/* ending time is 13:56:21 */
  static TAO_CORBA_ModuleDef_Perfect_Hash_OpTable tao_CORBA_ModuleDef_optable;
  
  #if (TAO_HAS_INTERCEPTORS == 1)
+@@ -2980,10 +2980,10 @@
+   ACE_CHECK_RETURN (0);
+   
+   if (
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_ModuleDef:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Container:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/ModuleDef:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Container:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
+     (!ACE_OS::strcmp ((char *)value, base_id)))
+       return 1;
+     else
+@@ -2994,13 +2994,13 @@
+     const char* logical_type_id
+   )
+ {
+-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_ModuleDef:1.0") == 0)
++  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/ModuleDef:1.0") == 0)
+     return ACE_static_cast (POA_CORBA_ModuleDef_ptr, this);
+-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Container:1.0") == 0)
++  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Container:1.0") == 0)
+     return ACE_static_cast (POA_CORBA_Container_ptr, this);
+-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Contained:1.0") == 0)
++  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Contained:1.0") == 0)
+     return ACE_static_cast (POA_CORBA_Contained_ptr, this);
+-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0)
++  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
+     return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
+   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
+     return ACE_static_cast(PortableServer::Servant, this);
+@@ -3014,7 +3014,7 @@
+ 
+ const char* POA_CORBA_ModuleDef::_interface_repository_id (void) const
+ {
+-  return "IDL:omg.org/CORBA_ModuleDef:1.0";
++  return "IDL:omg.org/CORBA/ModuleDef:1.0";
+ }
+ 
+ CORBA_ModuleDef*
 @@ -3042,7 +3042,7 @@
  public:
   const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
  };
--/* starting time is 15:56:02 */
+-/* starting time is 17:22:32 */
 +/* starting time is 13:56:21 */
  /* C++ code produced by gperf version 2.8 (ACE version) */
  /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ConstantDef_Perfect_Hash_OpTable -N lookup  */
@@ -57,16 +219,98 @@
      }
    return 0;
  }
--/* ending time is 15:56:02 */
+-/* ending time is 17:22:32 */
 +/* ending time is 13:56:21 */
  static TAO_CORBA_ConstantDef_Perfect_Hash_OpTable tao_CORBA_ConstantDef_optable;
  
  #if (TAO_HAS_INTERCEPTORS == 1)
+@@ -3935,7 +3935,7 @@
+     return ACE_reinterpret_cast (
+       POA_CORBA_ConstantDef_ptr,
+       servant_upcall.servant ()->_downcast (
+-          "IDL:omg.org/CORBA_ConstantDef:1.0"
++          "IDL:omg.org/CORBA/ConstantDef:1.0"
+         )
+     )->type (
+         ACE_TRY_ENV
+@@ -3966,7 +3966,7 @@
+     return ACE_reinterpret_cast (
+       POA_CORBA_ConstantDef_ptr,
+       servant_upcall.servant ()->_downcast (
+-          "IDL:omg.org/CORBA_ConstantDef:1.0"
++          "IDL:omg.org/CORBA/ConstantDef:1.0"
+         )
+     )->type_def (
+         ACE_TRY_ENV
+@@ -3996,7 +3996,7 @@
+     ACE_reinterpret_cast (
+       POA_CORBA_ConstantDef_ptr,
+       servant_upcall.servant ()->_downcast (
+-          "IDL:omg.org/CORBA_ConstantDef:1.0"
++          "IDL:omg.org/CORBA/ConstantDef:1.0"
+         )
+     )->type_def (
+         type_def,
+@@ -4029,7 +4029,7 @@
+     return ACE_reinterpret_cast (
+       POA_CORBA_ConstantDef_ptr,
+       servant_upcall.servant ()->_downcast (
+-          "IDL:omg.org/CORBA_ConstantDef:1.0"
++          "IDL:omg.org/CORBA/ConstantDef:1.0"
+         )
+     )->value (
+         ACE_TRY_ENV
+@@ -4059,7 +4059,7 @@
+     ACE_reinterpret_cast (
+       POA_CORBA_ConstantDef_ptr,
+       servant_upcall.servant ()->_downcast (
+-          "IDL:omg.org/CORBA_ConstantDef:1.0"
++          "IDL:omg.org/CORBA/ConstantDef:1.0"
+         )
+     )->value (
+         value,
+@@ -4585,9 +4585,9 @@
+   ACE_CHECK_RETURN (0);
+   
+   if (
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_ConstantDef:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/ConstantDef:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
+     (!ACE_OS::strcmp ((char *)value, base_id)))
+       return 1;
+     else
+@@ -4598,11 +4598,11 @@
+     const char* logical_type_id
+   )
+ {
+-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_ConstantDef:1.0") == 0)
++  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/ConstantDef:1.0") == 0)
+     return ACE_static_cast (POA_CORBA_ConstantDef_ptr, this);
+-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Contained:1.0") == 0)
++  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Contained:1.0") == 0)
+     return ACE_static_cast (POA_CORBA_Contained_ptr, this);
+-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0)
++  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
+     return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
+   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
+     return ACE_static_cast(PortableServer::Servant, this);
+@@ -4616,7 +4616,7 @@
+ 
+ const char* POA_CORBA_ConstantDef::_interface_repository_id (void) const
+ {
+-  return "IDL:omg.org/CORBA_ConstantDef:1.0";
++  return "IDL:omg.org/CORBA/ConstantDef:1.0";
+ }
+ 
+ CORBA_ConstantDef*
 @@ -4644,7 +4644,7 @@
  public:
   const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
  };
--/* starting time is 15:56:02 */
+-/* starting time is 17:22:33 */
 +/* starting time is 13:56:21 */
  /* C++ code produced by gperf version 2.8 (ACE version) */
  /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_StructDef_Perfect_Hash_OpTable -N lookup  */
@@ -75,16 +319,86 @@
      }
    return 0;
  }
--/* ending time is 15:56:02 */
+-/* ending time is 17:22:33 */
 +/* ending time is 13:56:21 */
  static TAO_CORBA_StructDef_Perfect_Hash_OpTable tao_CORBA_StructDef_optable;
  
  #if (TAO_HAS_INTERCEPTORS == 1)
+@@ -5186,7 +5186,7 @@
+     return ACE_reinterpret_cast (
+       POA_CORBA_StructDef_ptr,
+       servant_upcall.servant ()->_downcast (
+-          "IDL:omg.org/CORBA_StructDef:1.0"
++          "IDL:omg.org/CORBA/StructDef:1.0"
+         )
+     )->members (
+         ACE_TRY_ENV
+@@ -5216,7 +5216,7 @@
+     ACE_reinterpret_cast (
+       POA_CORBA_StructDef_ptr,
+       servant_upcall.servant ()->_downcast (
+-          "IDL:omg.org/CORBA_StructDef:1.0"
++          "IDL:omg.org/CORBA/StructDef:1.0"
+         )
+     )->members (
+         members,
+@@ -5506,12 +5506,12 @@
+   ACE_CHECK_RETURN (0);
+   
+   if (
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_StructDef:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_TypedefDef:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Container:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IDLType:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/StructDef:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/TypedefDef:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Container:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
+     (!ACE_OS::strcmp ((char *)value, base_id)))
+       return 1;
+     else
+@@ -5522,17 +5522,17 @@
+     const char* logical_type_id
+   )
+ {
+-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_StructDef:1.0") == 0)
++  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/StructDef:1.0") == 0)
+     return ACE_static_cast (POA_CORBA_StructDef_ptr, this);
+-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_TypedefDef:1.0") == 0)
++  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/TypedefDef:1.0") == 0)
+     return ACE_static_cast (POA_CORBA_TypedefDef_ptr, this);
+-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Container:1.0") == 0)
++  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Container:1.0") == 0)
+     return ACE_static_cast (POA_CORBA_Container_ptr, this);
+-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Contained:1.0") == 0)
++  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Contained:1.0") == 0)
+     return ACE_static_cast (POA_CORBA_Contained_ptr, this);
+-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IDLType:1.0") == 0)
++  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IDLType:1.0") == 0)
+     return ACE_static_cast (POA_CORBA_IDLType_ptr, this);
+-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0)
++  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
+     return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
+   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
+     return ACE_static_cast(PortableServer::Servant, this);
+@@ -5546,7 +5546,7 @@
+ 
+ const char* POA_CORBA_StructDef::_interface_repository_id (void) const
+ {
+-  return "IDL:omg.org/CORBA_StructDef:1.0";
++  return "IDL:omg.org/CORBA/StructDef:1.0";
+ }
+ 
+ CORBA_StructDef*
 @@ -5574,7 +5574,7 @@
  public:
   const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
  };
--/* starting time is 15:56:02 */
+-/* starting time is 17:22:33 */
 +/* starting time is 13:56:21 */
  /* C++ code produced by gperf version 2.8 (ACE version) */
  /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_UnionDef_Perfect_Hash_OpTable -N lookup  */
@@ -93,16 +407,113 @@
      }
    return 0;
  }
--/* ending time is 15:56:02 */
+-/* ending time is 17:22:33 */
 +/* ending time is 13:56:21 */
  static TAO_CORBA_UnionDef_Perfect_Hash_OpTable tao_CORBA_UnionDef_optable;
  
  #if (TAO_HAS_INTERCEPTORS == 1)
+@@ -6488,7 +6488,7 @@
+     return ACE_reinterpret_cast (
+       POA_CORBA_UnionDef_ptr,
+       servant_upcall.servant ()->_downcast (
+-          "IDL:omg.org/CORBA_UnionDef:1.0"
++          "IDL:omg.org/CORBA/UnionDef:1.0"
+         )
+     )->discriminator_type (
+         ACE_TRY_ENV
+@@ -6519,7 +6519,7 @@
+     return ACE_reinterpret_cast (
+       POA_CORBA_UnionDef_ptr,
+       servant_upcall.servant ()->_downcast (
+-          "IDL:omg.org/CORBA_UnionDef:1.0"
++          "IDL:omg.org/CORBA/UnionDef:1.0"
+         )
+     )->discriminator_type_def (
+         ACE_TRY_ENV
+@@ -6549,7 +6549,7 @@
+     ACE_reinterpret_cast (
+       POA_CORBA_UnionDef_ptr,
+       servant_upcall.servant ()->_downcast (
+-          "IDL:omg.org/CORBA_UnionDef:1.0"
++          "IDL:omg.org/CORBA/UnionDef:1.0"
+         )
+     )->discriminator_type_def (
+         discriminator_type_def,
+@@ -6582,7 +6582,7 @@
+     return ACE_reinterpret_cast (
+       POA_CORBA_UnionDef_ptr,
+       servant_upcall.servant ()->_downcast (
+-          "IDL:omg.org/CORBA_UnionDef:1.0"
++          "IDL:omg.org/CORBA/UnionDef:1.0"
+         )
+     )->members (
+         ACE_TRY_ENV
+@@ -6612,7 +6612,7 @@
+     ACE_reinterpret_cast (
+       POA_CORBA_UnionDef_ptr,
+       servant_upcall.servant ()->_downcast (
+-          "IDL:omg.org/CORBA_UnionDef:1.0"
++          "IDL:omg.org/CORBA/UnionDef:1.0"
+         )
+     )->members (
+         members,
+@@ -7141,12 +7141,12 @@
+   ACE_CHECK_RETURN (0);
+   
+   if (
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_UnionDef:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_TypedefDef:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Container:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IDLType:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/UnionDef:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/TypedefDef:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Container:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
+     (!ACE_OS::strcmp ((char *)value, base_id)))
+       return 1;
+     else
+@@ -7157,17 +7157,17 @@
+     const char* logical_type_id
+   )
+ {
+-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_UnionDef:1.0") == 0)
++  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/UnionDef:1.0") == 0)
+     return ACE_static_cast (POA_CORBA_UnionDef_ptr, this);
+-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_TypedefDef:1.0") == 0)
++  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/TypedefDef:1.0") == 0)
+     return ACE_static_cast (POA_CORBA_TypedefDef_ptr, this);
+-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Container:1.0") == 0)
++  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Container:1.0") == 0)
+     return ACE_static_cast (POA_CORBA_Container_ptr, this);
+-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Contained:1.0") == 0)
++  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Contained:1.0") == 0)
+     return ACE_static_cast (POA_CORBA_Contained_ptr, this);
+-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IDLType:1.0") == 0)
++  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IDLType:1.0") == 0)
+     return ACE_static_cast (POA_CORBA_IDLType_ptr, this);
+-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0)
++  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
+     return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
+   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
+     return ACE_static_cast(PortableServer::Servant, this);
+@@ -7181,7 +7181,7 @@
+ 
+ const char* POA_CORBA_UnionDef::_interface_repository_id (void) const
+ {
+-  return "IDL:omg.org/CORBA_UnionDef:1.0";
++  return "IDL:omg.org/CORBA/UnionDef:1.0";
+ }
+ 
+ CORBA_UnionDef*
 @@ -7209,7 +7209,7 @@
  public:
   const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
  };
--/* starting time is 15:56:02 */
+-/* starting time is 17:22:33 */
 +/* starting time is 13:56:21 */
  /* C++ code produced by gperf version 2.8 (ACE version) */
  /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_EnumDef_Perfect_Hash_OpTable -N lookup  */
@@ -111,16 +522,81 @@
      }
    return 0;
  }
--/* ending time is 15:56:02 */
+-/* ending time is 17:22:33 */
 +/* ending time is 13:56:21 */
  static TAO_CORBA_EnumDef_Perfect_Hash_OpTable tao_CORBA_EnumDef_optable;
  
  #if (TAO_HAS_INTERCEPTORS == 1)
+@@ -7732,7 +7732,7 @@
+     return ACE_reinterpret_cast (
+       POA_CORBA_EnumDef_ptr,
+       servant_upcall.servant ()->_downcast (
+-          "IDL:omg.org/CORBA_EnumDef:1.0"
++          "IDL:omg.org/CORBA/EnumDef:1.0"
+         )
+     )->members (
+         ACE_TRY_ENV
+@@ -7762,7 +7762,7 @@
+     ACE_reinterpret_cast (
+       POA_CORBA_EnumDef_ptr,
+       servant_upcall.servant ()->_downcast (
+-          "IDL:omg.org/CORBA_EnumDef:1.0"
++          "IDL:omg.org/CORBA/EnumDef:1.0"
+         )
+     )->members (
+         members,
+@@ -8051,11 +8051,11 @@
+   ACE_CHECK_RETURN (0);
+   
+   if (
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_EnumDef:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_TypedefDef:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IDLType:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/EnumDef:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/TypedefDef:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
+     (!ACE_OS::strcmp ((char *)value, base_id)))
+       return 1;
+     else
+@@ -8066,15 +8066,15 @@
+     const char* logical_type_id
+   )
+ {
+-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_EnumDef:1.0") == 0)
++  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/EnumDef:1.0") == 0)
+     return ACE_static_cast (POA_CORBA_EnumDef_ptr, this);
+-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_TypedefDef:1.0") == 0)
++  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/TypedefDef:1.0") == 0)
+     return ACE_static_cast (POA_CORBA_TypedefDef_ptr, this);
+-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Contained:1.0") == 0)
++  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Contained:1.0") == 0)
+     return ACE_static_cast (POA_CORBA_Contained_ptr, this);
+-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IDLType:1.0") == 0)
++  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IDLType:1.0") == 0)
+     return ACE_static_cast (POA_CORBA_IDLType_ptr, this);
+-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0)
++  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
+     return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
+   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
+     return ACE_static_cast(PortableServer::Servant, this);
+@@ -8088,7 +8088,7 @@
+ 
+ const char* POA_CORBA_EnumDef::_interface_repository_id (void) const
+ {
+-  return "IDL:omg.org/CORBA_EnumDef:1.0";
++  return "IDL:omg.org/CORBA/EnumDef:1.0";
+ }
+ 
+ CORBA_EnumDef*
 @@ -8116,7 +8116,7 @@
  public:
   const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
  };
--/* starting time is 15:56:02 */
+-/* starting time is 17:22:33 */
 +/* starting time is 13:56:21 */
  /* C++ code produced by gperf version 2.8 (ACE version) */
  /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_AliasDef_Perfect_Hash_OpTable -N lookup  */
@@ -129,16 +605,81 @@
      }
    return 0;
  }
--/* ending time is 15:56:02 */
+-/* ending time is 17:22:33 */
 +/* ending time is 13:56:21 */
  static TAO_CORBA_AliasDef_Perfect_Hash_OpTable tao_CORBA_AliasDef_optable;
  
  #if (TAO_HAS_INTERCEPTORS == 1)
+@@ -8639,7 +8639,7 @@
+     return ACE_reinterpret_cast (
+       POA_CORBA_AliasDef_ptr,
+       servant_upcall.servant ()->_downcast (
+-          "IDL:omg.org/CORBA_AliasDef:1.0"
++          "IDL:omg.org/CORBA/AliasDef:1.0"
+         )
+     )->original_type_def (
+         ACE_TRY_ENV
+@@ -8669,7 +8669,7 @@
+     ACE_reinterpret_cast (
+       POA_CORBA_AliasDef_ptr,
+       servant_upcall.servant ()->_downcast (
+-          "IDL:omg.org/CORBA_AliasDef:1.0"
++          "IDL:omg.org/CORBA/AliasDef:1.0"
+         )
+     )->original_type_def (
+         original_type_def,
+@@ -8958,11 +8958,11 @@
+   ACE_CHECK_RETURN (0);
+   
+   if (
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_AliasDef:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_TypedefDef:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IDLType:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/AliasDef:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/TypedefDef:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
+     (!ACE_OS::strcmp ((char *)value, base_id)))
+       return 1;
+     else
+@@ -8973,15 +8973,15 @@
+     const char* logical_type_id
+   )
+ {
+-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_AliasDef:1.0") == 0)
++  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/AliasDef:1.0") == 0)
+     return ACE_static_cast (POA_CORBA_AliasDef_ptr, this);
+-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_TypedefDef:1.0") == 0)
++  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/TypedefDef:1.0") == 0)
+     return ACE_static_cast (POA_CORBA_TypedefDef_ptr, this);
+-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Contained:1.0") == 0)
++  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Contained:1.0") == 0)
+     return ACE_static_cast (POA_CORBA_Contained_ptr, this);
+-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IDLType:1.0") == 0)
++  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IDLType:1.0") == 0)
+     return ACE_static_cast (POA_CORBA_IDLType_ptr, this);
+-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0)
++  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
+     return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
+   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
+     return ACE_static_cast(PortableServer::Servant, this);
+@@ -8995,7 +8995,7 @@
+ 
+ const char* POA_CORBA_AliasDef::_interface_repository_id (void) const
+ {
+-  return "IDL:omg.org/CORBA_AliasDef:1.0";
++  return "IDL:omg.org/CORBA/AliasDef:1.0";
+ }
+ 
+ CORBA_AliasDef*
 @@ -9023,7 +9023,7 @@
  public:
   const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
  };
--/* starting time is 15:56:02 */
+-/* starting time is 17:22:33 */
 +/* starting time is 13:56:21 */
  /* C++ code produced by gperf version 2.8 (ACE version) */
  /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_NativeDef_Perfect_Hash_OpTable -N lookup  */
@@ -147,16 +688,63 @@
      }
    return 0;
  }
--/* ending time is 15:56:02 */
+-/* ending time is 17:22:33 */
 +/* ending time is 13:56:21 */
  static TAO_CORBA_NativeDef_Perfect_Hash_OpTable tao_CORBA_NativeDef_optable;
  
  #if (TAO_HAS_INTERCEPTORS == 1)
+@@ -9395,11 +9395,11 @@
+   ACE_CHECK_RETURN (0);
+   
+   if (
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_NativeDef:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_TypedefDef:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IDLType:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/NativeDef:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/TypedefDef:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
+     (!ACE_OS::strcmp ((char *)value, base_id)))
+       return 1;
+     else
+@@ -9410,15 +9410,15 @@
+     const char* logical_type_id
+   )
+ {
+-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_NativeDef:1.0") == 0)
++  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/NativeDef:1.0") == 0)
+     return ACE_static_cast (POA_CORBA_NativeDef_ptr, this);
+-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_TypedefDef:1.0") == 0)
++  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/TypedefDef:1.0") == 0)
+     return ACE_static_cast (POA_CORBA_TypedefDef_ptr, this);
+-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Contained:1.0") == 0)
++  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Contained:1.0") == 0)
+     return ACE_static_cast (POA_CORBA_Contained_ptr, this);
+-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IDLType:1.0") == 0)
++  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IDLType:1.0") == 0)
+     return ACE_static_cast (POA_CORBA_IDLType_ptr, this);
+-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0)
++  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
+     return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
+   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
+     return ACE_static_cast(PortableServer::Servant, this);
+@@ -9432,7 +9432,7 @@
+ 
+ const char* POA_CORBA_NativeDef::_interface_repository_id (void) const
+ {
+-  return "IDL:omg.org/CORBA_NativeDef:1.0";
++  return "IDL:omg.org/CORBA/NativeDef:1.0";
+ }
+ 
+ CORBA_NativeDef*
 @@ -9460,7 +9460,7 @@
  public:
   const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
  };
--/* starting time is 15:56:02 */
+-/* starting time is 17:22:33 */
 +/* starting time is 13:56:21 */
  /* C++ code produced by gperf version 2.8 (ACE version) */
  /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_PrimitiveDef_Perfect_Hash_OpTable -N lookup  */
@@ -165,16 +753,62 @@
      }
    return 0;
  }
--/* ending time is 15:56:02 */
+-/* ending time is 17:22:33 */
 +/* ending time is 13:56:21 */
  static TAO_CORBA_PrimitiveDef_Perfect_Hash_OpTable tao_CORBA_PrimitiveDef_optable;
  
  #if (TAO_HAS_INTERCEPTORS == 1)
+@@ -9828,7 +9828,7 @@
+     return ACE_reinterpret_cast (
+       POA_CORBA_PrimitiveDef_ptr,
+       servant_upcall.servant ()->_downcast (
+-          "IDL:omg.org/CORBA_PrimitiveDef:1.0"
++          "IDL:omg.org/CORBA/PrimitiveDef:1.0"
+         )
+     )->kind (
+         ACE_TRY_ENV
+@@ -10033,9 +10033,9 @@
+   ACE_CHECK_RETURN (0);
+   
+   if (
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_PrimitiveDef:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IDLType:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/PrimitiveDef:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
+     (!ACE_OS::strcmp ((char *)value, base_id)))
+       return 1;
+     else
+@@ -10046,11 +10046,11 @@
+     const char* logical_type_id
+   )
+ {
+-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_PrimitiveDef:1.0") == 0)
++  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/PrimitiveDef:1.0") == 0)
+     return ACE_static_cast (POA_CORBA_PrimitiveDef_ptr, this);
+-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IDLType:1.0") == 0)
++  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IDLType:1.0") == 0)
+     return ACE_static_cast (POA_CORBA_IDLType_ptr, this);
+-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0)
++  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
+     return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
+   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
+     return ACE_static_cast(PortableServer::Servant, this);
+@@ -10064,7 +10064,7 @@
+ 
+ const char* POA_CORBA_PrimitiveDef::_interface_repository_id (void) const
+ {
+-  return "IDL:omg.org/CORBA_PrimitiveDef:1.0";
++  return "IDL:omg.org/CORBA/PrimitiveDef:1.0";
+ }
+ 
+ CORBA_PrimitiveDef*
 @@ -10092,7 +10092,7 @@
  public:
   const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
  };
--/* starting time is 15:56:02 */
+-/* starting time is 17:22:33 */
 +/* starting time is 13:56:21 */
  /* C++ code produced by gperf version 2.8 (ACE version) */
  /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_StringDef_Perfect_Hash_OpTable -N lookup  */
@@ -183,16 +817,71 @@
      }
    return 0;
  }
--/* ending time is 15:56:02 */
+-/* ending time is 17:22:33 */
 +/* ending time is 13:56:21 */
  static TAO_CORBA_StringDef_Perfect_Hash_OpTable tao_CORBA_StringDef_optable;
  
  #if (TAO_HAS_INTERCEPTORS == 1)
+@@ -10602,7 +10602,7 @@
+     return ACE_reinterpret_cast (
+       POA_CORBA_StringDef_ptr,
+       servant_upcall.servant ()->_downcast (
+-          "IDL:omg.org/CORBA_StringDef:1.0"
++          "IDL:omg.org/CORBA/StringDef:1.0"
+         )
+     )->bound (
+         ACE_TRY_ENV
+@@ -10632,7 +10632,7 @@
+     ACE_reinterpret_cast (
+       POA_CORBA_StringDef_ptr,
+       servant_upcall.servant ()->_downcast (
+-          "IDL:omg.org/CORBA_StringDef:1.0"
++          "IDL:omg.org/CORBA/StringDef:1.0"
+         )
+     )->bound (
+         bound,
+@@ -10918,9 +10918,9 @@
+   ACE_CHECK_RETURN (0);
+   
+   if (
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_StringDef:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IDLType:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/StringDef:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
+     (!ACE_OS::strcmp ((char *)value, base_id)))
+       return 1;
+     else
+@@ -10931,11 +10931,11 @@
+     const char* logical_type_id
+   )
+ {
+-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_StringDef:1.0") == 0)
++  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/StringDef:1.0") == 0)
+     return ACE_static_cast (POA_CORBA_StringDef_ptr, this);
+-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IDLType:1.0") == 0)
++  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IDLType:1.0") == 0)
+     return ACE_static_cast (POA_CORBA_IDLType_ptr, this);
+-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0)
++  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
+     return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
+   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
+     return ACE_static_cast(PortableServer::Servant, this);
+@@ -10949,7 +10949,7 @@
+ 
+ const char* POA_CORBA_StringDef::_interface_repository_id (void) const
+ {
+-  return "IDL:omg.org/CORBA_StringDef:1.0";
++  return "IDL:omg.org/CORBA/StringDef:1.0";
+ }
+ 
+ CORBA_StringDef*
 @@ -10977,7 +10977,7 @@
  public:
   const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
  };
--/* starting time is 15:56:03 */
+-/* starting time is 17:22:33 */
 +/* starting time is 13:56:21 */
  /* C++ code produced by gperf version 2.8 (ACE version) */
  /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_WstringDef_Perfect_Hash_OpTable -N lookup  */
@@ -201,16 +890,71 @@
      }
    return 0;
  }
--/* ending time is 15:56:03 */
+-/* ending time is 17:22:33 */
 +/* ending time is 13:56:21 */
  static TAO_CORBA_WstringDef_Perfect_Hash_OpTable tao_CORBA_WstringDef_optable;
  
  #if (TAO_HAS_INTERCEPTORS == 1)
+@@ -11487,7 +11487,7 @@
+     return ACE_reinterpret_cast (
+       POA_CORBA_WstringDef_ptr,
+       servant_upcall.servant ()->_downcast (
+-          "IDL:omg.org/CORBA_WstringDef:1.0"
++          "IDL:omg.org/CORBA/WstringDef:1.0"
+         )
+     )->bound (
+         ACE_TRY_ENV
+@@ -11517,7 +11517,7 @@
+     ACE_reinterpret_cast (
+       POA_CORBA_WstringDef_ptr,
+       servant_upcall.servant ()->_downcast (
+-          "IDL:omg.org/CORBA_WstringDef:1.0"
++          "IDL:omg.org/CORBA/WstringDef:1.0"
+         )
+     )->bound (
+         bound,
+@@ -11803,9 +11803,9 @@
+   ACE_CHECK_RETURN (0);
+   
+   if (
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_WstringDef:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IDLType:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/WstringDef:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
+     (!ACE_OS::strcmp ((char *)value, base_id)))
+       return 1;
+     else
+@@ -11816,11 +11816,11 @@
+     const char* logical_type_id
+   )
+ {
+-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_WstringDef:1.0") == 0)
++  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/WstringDef:1.0") == 0)
+     return ACE_static_cast (POA_CORBA_WstringDef_ptr, this);
+-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IDLType:1.0") == 0)
++  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IDLType:1.0") == 0)
+     return ACE_static_cast (POA_CORBA_IDLType_ptr, this);
+-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0)
++  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
+     return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
+   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
+     return ACE_static_cast(PortableServer::Servant, this);
+@@ -11834,7 +11834,7 @@
+ 
+ const char* POA_CORBA_WstringDef::_interface_repository_id (void) const
+ {
+-  return "IDL:omg.org/CORBA_WstringDef:1.0";
++  return "IDL:omg.org/CORBA/WstringDef:1.0";
+ }
+ 
+ CORBA_WstringDef*
 @@ -11862,7 +11862,7 @@
  public:
   const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
  };
--/* starting time is 15:56:03 */
+-/* starting time is 17:22:33 */
 +/* starting time is 13:56:21 */
  /* C++ code produced by gperf version 2.8 (ACE version) */
  /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_SequenceDef_Perfect_Hash_OpTable -N lookup  */
@@ -349,16 +1093,98 @@
      }
    return 0;
  }
--/* ending time is 15:56:03 */
+-/* ending time is 17:22:33 */
 +/* ending time is 13:56:21 */
  static TAO_CORBA_SequenceDef_Perfect_Hash_OpTable tao_CORBA_SequenceDef_optable;
  
  #if (TAO_HAS_INTERCEPTORS == 1)
+@@ -12744,7 +12741,7 @@
+     return ACE_reinterpret_cast (
+       POA_CORBA_SequenceDef_ptr,
+       servant_upcall.servant ()->_downcast (
+-          "IDL:omg.org/CORBA_SequenceDef:1.0"
++          "IDL:omg.org/CORBA/SequenceDef:1.0"
+         )
+     )->bound (
+         ACE_TRY_ENV
+@@ -12774,7 +12771,7 @@
+     ACE_reinterpret_cast (
+       POA_CORBA_SequenceDef_ptr,
+       servant_upcall.servant ()->_downcast (
+-          "IDL:omg.org/CORBA_SequenceDef:1.0"
++          "IDL:omg.org/CORBA/SequenceDef:1.0"
+         )
+     )->bound (
+         bound,
+@@ -12807,7 +12804,7 @@
+     return ACE_reinterpret_cast (
+       POA_CORBA_SequenceDef_ptr,
+       servant_upcall.servant ()->_downcast (
+-          "IDL:omg.org/CORBA_SequenceDef:1.0"
++          "IDL:omg.org/CORBA/SequenceDef:1.0"
+         )
+     )->element_type (
+         ACE_TRY_ENV
+@@ -12838,7 +12835,7 @@
+     return ACE_reinterpret_cast (
+       POA_CORBA_SequenceDef_ptr,
+       servant_upcall.servant ()->_downcast (
+-          "IDL:omg.org/CORBA_SequenceDef:1.0"
++          "IDL:omg.org/CORBA/SequenceDef:1.0"
+         )
+     )->element_type_def (
+         ACE_TRY_ENV
+@@ -12868,7 +12865,7 @@
+     ACE_reinterpret_cast (
+       POA_CORBA_SequenceDef_ptr,
+       servant_upcall.servant ()->_downcast (
+-          "IDL:omg.org/CORBA_SequenceDef:1.0"
++          "IDL:omg.org/CORBA/SequenceDef:1.0"
+         )
+     )->element_type_def (
+         element_type_def,
+@@ -13393,9 +13390,9 @@
+   ACE_CHECK_RETURN (0);
+   
+   if (
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_SequenceDef:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IDLType:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/SequenceDef:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
+     (!ACE_OS::strcmp ((char *)value, base_id)))
+       return 1;
+     else
+@@ -13406,11 +13403,11 @@
+     const char* logical_type_id
+   )
+ {
+-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_SequenceDef:1.0") == 0)
++  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/SequenceDef:1.0") == 0)
+     return ACE_static_cast (POA_CORBA_SequenceDef_ptr, this);
+-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IDLType:1.0") == 0)
++  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IDLType:1.0") == 0)
+     return ACE_static_cast (POA_CORBA_IDLType_ptr, this);
+-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0)
++  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
+     return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
+   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
+     return ACE_static_cast(PortableServer::Servant, this);
+@@ -13424,7 +13421,7 @@
+ 
+ const char* POA_CORBA_SequenceDef::_interface_repository_id (void) const
+ {
+-  return "IDL:omg.org/CORBA_SequenceDef:1.0";
++  return "IDL:omg.org/CORBA/SequenceDef:1.0";
+ }
+ 
+ CORBA_SequenceDef*
 @@ -13452,7 +13449,7 @@
  public:
   const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
  };
--/* starting time is 15:56:03 */
+-/* starting time is 17:22:33 */
 +/* starting time is 13:56:21 */
  /* C++ code produced by gperf version 2.8 (ACE version) */
  /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ArrayDef_Perfect_Hash_OpTable -N lookup  */
@@ -367,16 +1193,98 @@
      }
    return 0;
  }
--/* ending time is 15:56:03 */
+-/* ending time is 17:22:33 */
 +/* ending time is 13:56:21 */
  static TAO_CORBA_ArrayDef_Perfect_Hash_OpTable tao_CORBA_ArrayDef_optable;
  
  #if (TAO_HAS_INTERCEPTORS == 1)
+@@ -14334,7 +14331,7 @@
+     return ACE_reinterpret_cast (
+       POA_CORBA_ArrayDef_ptr,
+       servant_upcall.servant ()->_downcast (
+-          "IDL:omg.org/CORBA_ArrayDef:1.0"
++          "IDL:omg.org/CORBA/ArrayDef:1.0"
+         )
+     )->length (
+         ACE_TRY_ENV
+@@ -14364,7 +14361,7 @@
+     ACE_reinterpret_cast (
+       POA_CORBA_ArrayDef_ptr,
+       servant_upcall.servant ()->_downcast (
+-          "IDL:omg.org/CORBA_ArrayDef:1.0"
++          "IDL:omg.org/CORBA/ArrayDef:1.0"
+         )
+     )->length (
+         length,
+@@ -14397,7 +14394,7 @@
+     return ACE_reinterpret_cast (
+       POA_CORBA_ArrayDef_ptr,
+       servant_upcall.servant ()->_downcast (
+-          "IDL:omg.org/CORBA_ArrayDef:1.0"
++          "IDL:omg.org/CORBA/ArrayDef:1.0"
+         )
+     )->element_type (
+         ACE_TRY_ENV
+@@ -14428,7 +14425,7 @@
+     return ACE_reinterpret_cast (
+       POA_CORBA_ArrayDef_ptr,
+       servant_upcall.servant ()->_downcast (
+-          "IDL:omg.org/CORBA_ArrayDef:1.0"
++          "IDL:omg.org/CORBA/ArrayDef:1.0"
+         )
+     )->element_type_def (
+         ACE_TRY_ENV
+@@ -14458,7 +14455,7 @@
+     ACE_reinterpret_cast (
+       POA_CORBA_ArrayDef_ptr,
+       servant_upcall.servant ()->_downcast (
+-          "IDL:omg.org/CORBA_ArrayDef:1.0"
++          "IDL:omg.org/CORBA/ArrayDef:1.0"
+         )
+     )->element_type_def (
+         element_type_def,
+@@ -14983,9 +14980,9 @@
+   ACE_CHECK_RETURN (0);
+   
+   if (
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_ArrayDef:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IDLType:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/ArrayDef:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
+     (!ACE_OS::strcmp ((char *)value, base_id)))
+       return 1;
+     else
+@@ -14996,11 +14993,11 @@
+     const char* logical_type_id
+   )
+ {
+-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_ArrayDef:1.0") == 0)
++  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/ArrayDef:1.0") == 0)
+     return ACE_static_cast (POA_CORBA_ArrayDef_ptr, this);
+-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IDLType:1.0") == 0)
++  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IDLType:1.0") == 0)
+     return ACE_static_cast (POA_CORBA_IDLType_ptr, this);
+-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0)
++  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
+     return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
+   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
+     return ACE_static_cast(PortableServer::Servant, this);
+@@ -15014,7 +15011,7 @@
+ 
+ const char* POA_CORBA_ArrayDef::_interface_repository_id (void) const
+ {
+-  return "IDL:omg.org/CORBA_ArrayDef:1.0";
++  return "IDL:omg.org/CORBA/ArrayDef:1.0";
+ }
+ 
+ CORBA_ArrayDef*
 @@ -15042,7 +15039,7 @@
  public:
   const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
  };
--/* starting time is 15:56:03 */
+-/* starting time is 17:22:33 */
 +/* starting time is 13:56:21 */
  /* C++ code produced by gperf version 2.8 (ACE version) */
  /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ExceptionDef_Perfect_Hash_OpTable -N lookup  */
@@ -385,16 +1293,85 @@
      }
    return 0;
  }
--/* ending time is 15:56:03 */
+-/* ending time is 17:22:33 */
 +/* ending time is 13:56:21 */
  static TAO_CORBA_ExceptionDef_Perfect_Hash_OpTable tao_CORBA_ExceptionDef_optable;
  
  #if (TAO_HAS_INTERCEPTORS == 1)
+@@ -15707,7 +15704,7 @@
+     return ACE_reinterpret_cast (
+       POA_CORBA_ExceptionDef_ptr,
+       servant_upcall.servant ()->_downcast (
+-          "IDL:omg.org/CORBA_ExceptionDef:1.0"
++          "IDL:omg.org/CORBA/ExceptionDef:1.0"
+         )
+     )->type (
+         ACE_TRY_ENV
+@@ -15738,7 +15735,7 @@
+     return ACE_reinterpret_cast (
+       POA_CORBA_ExceptionDef_ptr,
+       servant_upcall.servant ()->_downcast (
+-          "IDL:omg.org/CORBA_ExceptionDef:1.0"
++          "IDL:omg.org/CORBA/ExceptionDef:1.0"
+         )
+     )->members (
+         ACE_TRY_ENV
+@@ -15768,7 +15765,7 @@
+     ACE_reinterpret_cast (
+       POA_CORBA_ExceptionDef_ptr,
+       servant_upcall.servant ()->_downcast (
+-          "IDL:omg.org/CORBA_ExceptionDef:1.0"
++          "IDL:omg.org/CORBA/ExceptionDef:1.0"
+         )
+     )->members (
+         members,
+@@ -16136,10 +16133,10 @@
+   ACE_CHECK_RETURN (0);
+   
+   if (
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_ExceptionDef:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Container:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/ExceptionDef:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Container:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
+     (!ACE_OS::strcmp ((char *)value, base_id)))
+       return 1;
+     else
+@@ -16150,13 +16147,13 @@
+     const char* logical_type_id
+   )
+ {
+-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_ExceptionDef:1.0") == 0)
++  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/ExceptionDef:1.0") == 0)
+     return ACE_static_cast (POA_CORBA_ExceptionDef_ptr, this);
+-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Contained:1.0") == 0)
++  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Contained:1.0") == 0)
+     return ACE_static_cast (POA_CORBA_Contained_ptr, this);
+-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Container:1.0") == 0)
++  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Container:1.0") == 0)
+     return ACE_static_cast (POA_CORBA_Container_ptr, this);
+-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0)
++  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
+     return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
+   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
+     return ACE_static_cast(PortableServer::Servant, this);
+@@ -16170,7 +16167,7 @@
+ 
+ const char* POA_CORBA_ExceptionDef::_interface_repository_id (void) const
+ {
+-  return "IDL:omg.org/CORBA_ExceptionDef:1.0";
++  return "IDL:omg.org/CORBA/ExceptionDef:1.0";
+ }
+ 
+ CORBA_ExceptionDef*
 @@ -16198,7 +16195,7 @@
  public:
   const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
  };
--/* starting time is 15:56:03 */
+-/* starting time is 17:22:33 */
 +/* starting time is 13:56:21 */
  /* C++ code produced by gperf version 2.8 (ACE version) */
  /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_AttributeDef_Perfect_Hash_OpTable -N lookup  */
@@ -403,16 +1380,98 @@
      }
    return 0;
  }
--/* ending time is 15:56:03 */
+-/* ending time is 17:22:33 */
 +/* ending time is 13:56:21 */
  static TAO_CORBA_AttributeDef_Perfect_Hash_OpTable tao_CORBA_AttributeDef_optable;
  
  #if (TAO_HAS_INTERCEPTORS == 1)
+@@ -17092,7 +17089,7 @@
+     return ACE_reinterpret_cast (
+       POA_CORBA_AttributeDef_ptr,
+       servant_upcall.servant ()->_downcast (
+-          "IDL:omg.org/CORBA_AttributeDef:1.0"
++          "IDL:omg.org/CORBA/AttributeDef:1.0"
+         )
+     )->type (
+         ACE_TRY_ENV
+@@ -17123,7 +17120,7 @@
+     return ACE_reinterpret_cast (
+       POA_CORBA_AttributeDef_ptr,
+       servant_upcall.servant ()->_downcast (
+-          "IDL:omg.org/CORBA_AttributeDef:1.0"
++          "IDL:omg.org/CORBA/AttributeDef:1.0"
+         )
+     )->type_def (
+         ACE_TRY_ENV
+@@ -17153,7 +17150,7 @@
+     ACE_reinterpret_cast (
+       POA_CORBA_AttributeDef_ptr,
+       servant_upcall.servant ()->_downcast (
+-          "IDL:omg.org/CORBA_AttributeDef:1.0"
++          "IDL:omg.org/CORBA/AttributeDef:1.0"
+         )
+     )->type_def (
+         type_def,
+@@ -17186,7 +17183,7 @@
+     return ACE_reinterpret_cast (
+       POA_CORBA_AttributeDef_ptr,
+       servant_upcall.servant ()->_downcast (
+-          "IDL:omg.org/CORBA_AttributeDef:1.0"
++          "IDL:omg.org/CORBA/AttributeDef:1.0"
+         )
+     )->mode (
+         ACE_TRY_ENV
+@@ -17216,7 +17213,7 @@
+     ACE_reinterpret_cast (
+       POA_CORBA_AttributeDef_ptr,
+       servant_upcall.servant ()->_downcast (
+-          "IDL:omg.org/CORBA_AttributeDef:1.0"
++          "IDL:omg.org/CORBA/AttributeDef:1.0"
+         )
+     )->mode (
+         mode,
+@@ -17741,9 +17738,9 @@
+   ACE_CHECK_RETURN (0);
+   
+   if (
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_AttributeDef:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/AttributeDef:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
+     (!ACE_OS::strcmp ((char *)value, base_id)))
+       return 1;
+     else
+@@ -17754,11 +17751,11 @@
+     const char* logical_type_id
+   )
+ {
+-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_AttributeDef:1.0") == 0)
++  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/AttributeDef:1.0") == 0)
+     return ACE_static_cast (POA_CORBA_AttributeDef_ptr, this);
+-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Contained:1.0") == 0)
++  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Contained:1.0") == 0)
+     return ACE_static_cast (POA_CORBA_Contained_ptr, this);
+-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0)
++  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
+     return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
+   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
+     return ACE_static_cast(PortableServer::Servant, this);
+@@ -17772,7 +17769,7 @@
+ 
+ const char* POA_CORBA_AttributeDef::_interface_repository_id (void) const
+ {
+-  return "IDL:omg.org/CORBA_AttributeDef:1.0";
++  return "IDL:omg.org/CORBA/AttributeDef:1.0";
+ }
+ 
+ CORBA_AttributeDef*
 @@ -17800,7 +17797,7 @@
  public:
   const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
  };
--/* starting time is 15:56:03 */
+-/* starting time is 17:22:33 */
 +/* starting time is 13:56:21 */
  /* C++ code produced by gperf version 2.8 (ACE version) */
  /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_OperationDef_Perfect_Hash_OpTable -N lookup  */
@@ -421,16 +1480,152 @@
      }
    return 0;
  }
--/* ending time is 15:56:03 */
+-/* ending time is 17:22:33 */
 +/* ending time is 13:56:21 */
  static TAO_CORBA_OperationDef_Perfect_Hash_OpTable tao_CORBA_OperationDef_optable;
  
  #if (TAO_HAS_INTERCEPTORS == 1)
+@@ -19489,7 +19486,7 @@
+     return ACE_reinterpret_cast (
+       POA_CORBA_OperationDef_ptr,
+       servant_upcall.servant ()->_downcast (
+-          "IDL:omg.org/CORBA_OperationDef:1.0"
++          "IDL:omg.org/CORBA/OperationDef:1.0"
+         )
+     )->result (
+         ACE_TRY_ENV
+@@ -19520,7 +19517,7 @@
+     return ACE_reinterpret_cast (
+       POA_CORBA_OperationDef_ptr,
+       servant_upcall.servant ()->_downcast (
+-          "IDL:omg.org/CORBA_OperationDef:1.0"
++          "IDL:omg.org/CORBA/OperationDef:1.0"
+         )
+     )->result_def (
+         ACE_TRY_ENV
+@@ -19550,7 +19547,7 @@
+     ACE_reinterpret_cast (
+       POA_CORBA_OperationDef_ptr,
+       servant_upcall.servant ()->_downcast (
+-          "IDL:omg.org/CORBA_OperationDef:1.0"
++          "IDL:omg.org/CORBA/OperationDef:1.0"
+         )
+     )->result_def (
+         result_def,
+@@ -19583,7 +19580,7 @@
+     return ACE_reinterpret_cast (
+       POA_CORBA_OperationDef_ptr,
+       servant_upcall.servant ()->_downcast (
+-          "IDL:omg.org/CORBA_OperationDef:1.0"
++          "IDL:omg.org/CORBA/OperationDef:1.0"
+         )
+     )->params (
+         ACE_TRY_ENV
+@@ -19613,7 +19610,7 @@
+     ACE_reinterpret_cast (
+       POA_CORBA_OperationDef_ptr,
+       servant_upcall.servant ()->_downcast (
+-          "IDL:omg.org/CORBA_OperationDef:1.0"
++          "IDL:omg.org/CORBA/OperationDef:1.0"
+         )
+     )->params (
+         params,
+@@ -19646,7 +19643,7 @@
+     return ACE_reinterpret_cast (
+       POA_CORBA_OperationDef_ptr,
+       servant_upcall.servant ()->_downcast (
+-          "IDL:omg.org/CORBA_OperationDef:1.0"
++          "IDL:omg.org/CORBA/OperationDef:1.0"
+         )
+     )->mode (
+         ACE_TRY_ENV
+@@ -19676,7 +19673,7 @@
+     ACE_reinterpret_cast (
+       POA_CORBA_OperationDef_ptr,
+       servant_upcall.servant ()->_downcast (
+-          "IDL:omg.org/CORBA_OperationDef:1.0"
++          "IDL:omg.org/CORBA/OperationDef:1.0"
+         )
+     )->mode (
+         mode,
+@@ -19709,7 +19706,7 @@
+     return ACE_reinterpret_cast (
+       POA_CORBA_OperationDef_ptr,
+       servant_upcall.servant ()->_downcast (
+-          "IDL:omg.org/CORBA_OperationDef:1.0"
++          "IDL:omg.org/CORBA/OperationDef:1.0"
+         )
+     )->contexts (
+         ACE_TRY_ENV
+@@ -19739,7 +19736,7 @@
+     ACE_reinterpret_cast (
+       POA_CORBA_OperationDef_ptr,
+       servant_upcall.servant ()->_downcast (
+-          "IDL:omg.org/CORBA_OperationDef:1.0"
++          "IDL:omg.org/CORBA/OperationDef:1.0"
+         )
+     )->contexts (
+         contexts,
+@@ -19772,7 +19769,7 @@
+     return ACE_reinterpret_cast (
+       POA_CORBA_OperationDef_ptr,
+       servant_upcall.servant ()->_downcast (
+-          "IDL:omg.org/CORBA_OperationDef:1.0"
++          "IDL:omg.org/CORBA/OperationDef:1.0"
+         )
+     )->exceptions (
+         ACE_TRY_ENV
+@@ -19802,7 +19799,7 @@
+     ACE_reinterpret_cast (
+       POA_CORBA_OperationDef_ptr,
+       servant_upcall.servant ()->_downcast (
+-          "IDL:omg.org/CORBA_OperationDef:1.0"
++          "IDL:omg.org/CORBA/OperationDef:1.0"
+         )
+     )->exceptions (
+         exceptions,
+@@ -20804,9 +20801,9 @@
+   ACE_CHECK_RETURN (0);
+   
+   if (
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_OperationDef:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/OperationDef:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
+     (!ACE_OS::strcmp ((char *)value, base_id)))
+       return 1;
+     else
+@@ -20817,11 +20814,11 @@
+     const char* logical_type_id
+   )
+ {
+-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_OperationDef:1.0") == 0)
++  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/OperationDef:1.0") == 0)
+     return ACE_static_cast (POA_CORBA_OperationDef_ptr, this);
+-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Contained:1.0") == 0)
++  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Contained:1.0") == 0)
+     return ACE_static_cast (POA_CORBA_Contained_ptr, this);
+-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0)
++  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
+     return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
+   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
+     return ACE_static_cast(PortableServer::Servant, this);
+@@ -20835,7 +20832,7 @@
+ 
+ const char* POA_CORBA_OperationDef::_interface_repository_id (void) const
+ {
+-  return "IDL:omg.org/CORBA_OperationDef:1.0";
++  return "IDL:omg.org/CORBA/OperationDef:1.0";
+ }
+ 
+ CORBA_OperationDef*
 @@ -20863,7 +20860,7 @@
  public:
   const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
  };
--/* starting time is 15:56:03 */
+-/* starting time is 17:22:33 */
 +/* starting time is 13:56:21 */
  /* C++ code produced by gperf version 2.8 (ACE version) */
  /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_InterfaceDef_Perfect_Hash_OpTable -N lookup  */
@@ -439,16 +1634,117 @@
      }
    return 0;
  }
--/* ending time is 15:56:03 */
+-/* ending time is 17:22:33 */
 +/* ending time is 13:56:21 */
  static TAO_CORBA_InterfaceDef_Perfect_Hash_OpTable tao_CORBA_InterfaceDef_optable;
  
  #if (TAO_HAS_INTERCEPTORS == 1)
+@@ -22041,7 +22038,7 @@
+     return ACE_reinterpret_cast (
+       POA_CORBA_InterfaceDef_ptr,
+       servant_upcall.servant ()->_downcast (
+-          "IDL:omg.org/CORBA_InterfaceDef:1.0"
++          "IDL:omg.org/CORBA/InterfaceDef:1.0"
+         )
+     )->base_interfaces (
+         ACE_TRY_ENV
+@@ -22071,7 +22068,7 @@
+     ACE_reinterpret_cast (
+       POA_CORBA_InterfaceDef_ptr,
+       servant_upcall.servant ()->_downcast (
+-          "IDL:omg.org/CORBA_InterfaceDef:1.0"
++          "IDL:omg.org/CORBA/InterfaceDef:1.0"
+         )
+     )->base_interfaces (
+         base_interfaces,
+@@ -22105,7 +22102,7 @@
+     return ACE_reinterpret_cast (
+       POA_CORBA_InterfaceDef_ptr,
+       servant_upcall.servant ()->_downcast (
+-          "IDL:omg.org/CORBA_InterfaceDef:1.0"
++          "IDL:omg.org/CORBA/InterfaceDef:1.0"
+         )
+     )->is_a (
+         interface_id,
+@@ -22137,7 +22134,7 @@
+     return ACE_reinterpret_cast (
+       POA_CORBA_InterfaceDef_ptr,
+       servant_upcall.servant ()->_downcast (
+-          "IDL:omg.org/CORBA_InterfaceDef:1.0"
++          "IDL:omg.org/CORBA/InterfaceDef:1.0"
+         )
+     )->describe_interface (
+         ACE_TRY_ENV
+@@ -22173,7 +22170,7 @@
+     return ACE_reinterpret_cast (
+       POA_CORBA_InterfaceDef_ptr,
+       servant_upcall.servant ()->_downcast (
+-          "IDL:omg.org/CORBA_InterfaceDef:1.0"
++          "IDL:omg.org/CORBA/InterfaceDef:1.0"
+         )
+     )->create_attribute (
+         id,
+@@ -22217,7 +22214,7 @@
+     return ACE_reinterpret_cast (
+       POA_CORBA_InterfaceDef_ptr,
+       servant_upcall.servant ()->_downcast (
+-          "IDL:omg.org/CORBA_InterfaceDef:1.0"
++          "IDL:omg.org/CORBA/InterfaceDef:1.0"
+         )
+     )->create_operation (
+         id,
+@@ -22902,11 +22899,11 @@
+   ACE_CHECK_RETURN (0);
+   
+   if (
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_InterfaceDef:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Container:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IDLType:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/InterfaceDef:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Container:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
+     (!ACE_OS::strcmp ((char *)value, base_id)))
+       return 1;
+     else
+@@ -22917,15 +22914,15 @@
+     const char* logical_type_id
+   )
+ {
+-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_InterfaceDef:1.0") == 0)
++  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/InterfaceDef:1.0") == 0)
+     return ACE_static_cast (POA_CORBA_InterfaceDef_ptr, this);
+-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Container:1.0") == 0)
++  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Container:1.0") == 0)
+     return ACE_static_cast (POA_CORBA_Container_ptr, this);
+-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Contained:1.0") == 0)
++  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Contained:1.0") == 0)
+     return ACE_static_cast (POA_CORBA_Contained_ptr, this);
+-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IDLType:1.0") == 0)
++  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IDLType:1.0") == 0)
+     return ACE_static_cast (POA_CORBA_IDLType_ptr, this);
+-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0)
++  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
+     return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
+   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
+     return ACE_static_cast(PortableServer::Servant, this);
+@@ -22939,7 +22936,7 @@
+ 
+ const char* POA_CORBA_InterfaceDef::_interface_repository_id (void) const
+ {
+-  return "IDL:omg.org/CORBA_InterfaceDef:1.0";
++  return "IDL:omg.org/CORBA/InterfaceDef:1.0";
+ }
+ 
+ CORBA_InterfaceDef*
 @@ -22967,7 +22964,7 @@
  public:
   const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
  };
--/* starting time is 15:56:03 */
+-/* starting time is 17:22:33 */
 +/* starting time is 13:56:21 */
  /* C++ code produced by gperf version 2.8 (ACE version) */
  /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_AbstractInterfaceDef_Perfect_Hash_OpTable -N lookup  */
@@ -457,16 +1753,68 @@
      }
    return 0;
  }
--/* ending time is 15:56:03 */
+-/* ending time is 17:22:33 */
 +/* ending time is 13:56:21 */
  static TAO_CORBA_AbstractInterfaceDef_Perfect_Hash_OpTable tao_CORBA_AbstractInterfaceDef_optable;
  
  #if (TAO_HAS_INTERCEPTORS == 1)
+@@ -23366,12 +23363,12 @@
+   ACE_CHECK_RETURN (0);
+   
+   if (
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_AbstractInterfaceDef:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_InterfaceDef:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Container:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IDLType:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/AbstractInterfaceDef:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/InterfaceDef:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Container:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
+     (!ACE_OS::strcmp ((char *)value, base_id)))
+       return 1;
+     else
+@@ -23382,17 +23379,17 @@
+     const char* logical_type_id
+   )
+ {
+-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_AbstractInterfaceDef:1.0") == 0)
++  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/AbstractInterfaceDef:1.0") == 0)
+     return ACE_static_cast (POA_CORBA_AbstractInterfaceDef_ptr, this);
+-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_InterfaceDef:1.0") == 0)
++  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/InterfaceDef:1.0") == 0)
+     return ACE_static_cast (POA_CORBA_InterfaceDef_ptr, this);
+-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Container:1.0") == 0)
++  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Container:1.0") == 0)
+     return ACE_static_cast (POA_CORBA_Container_ptr, this);
+-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Contained:1.0") == 0)
++  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Contained:1.0") == 0)
+     return ACE_static_cast (POA_CORBA_Contained_ptr, this);
+-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IDLType:1.0") == 0)
++  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IDLType:1.0") == 0)
+     return ACE_static_cast (POA_CORBA_IDLType_ptr, this);
+-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0)
++  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
+     return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
+   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
+     return ACE_static_cast(PortableServer::Servant, this);
+@@ -23406,7 +23403,7 @@
+ 
+ const char* POA_CORBA_AbstractInterfaceDef::_interface_repository_id (void) const
+ {
+-  return "IDL:omg.org/CORBA_AbstractInterfaceDef:1.0";
++  return "IDL:omg.org/CORBA/AbstractInterfaceDef:1.0";
+ }
+ 
+ CORBA_AbstractInterfaceDef*
 @@ -23434,7 +23431,7 @@
  public:
   const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
  };
--/* starting time is 15:56:03 */
+-/* starting time is 17:22:33 */
 +/* starting time is 13:56:22 */
  /* C++ code produced by gperf version 2.8 (ACE version) */
  /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_LocalInterfaceDef_Perfect_Hash_OpTable -N lookup  */
@@ -475,8 +1823,60 @@
      }
    return 0;
  }
--/* ending time is 15:56:03 */
+-/* ending time is 17:22:33 */
 +/* ending time is 13:56:22 */
  static TAO_CORBA_LocalInterfaceDef_Perfect_Hash_OpTable tao_CORBA_LocalInterfaceDef_optable;
  
  #if (TAO_HAS_INTERCEPTORS == 1)
+@@ -23833,12 +23830,12 @@
+   ACE_CHECK_RETURN (0);
+   
+   if (
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_LocalInterfaceDef:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_InterfaceDef:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Container:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IDLType:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/LocalInterfaceDef:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/InterfaceDef:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Container:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
+     (!ACE_OS::strcmp ((char *)value, base_id)))
+       return 1;
+     else
+@@ -23849,17 +23846,17 @@
+     const char* logical_type_id
+   )
+ {
+-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_LocalInterfaceDef:1.0") == 0)
++  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/LocalInterfaceDef:1.0") == 0)
+     return ACE_static_cast (POA_CORBA_LocalInterfaceDef_ptr, this);
+-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_InterfaceDef:1.0") == 0)
++  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/InterfaceDef:1.0") == 0)
+     return ACE_static_cast (POA_CORBA_InterfaceDef_ptr, this);
+-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Container:1.0") == 0)
++  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Container:1.0") == 0)
+     return ACE_static_cast (POA_CORBA_Container_ptr, this);
+-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Contained:1.0") == 0)
++  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Contained:1.0") == 0)
+     return ACE_static_cast (POA_CORBA_Contained_ptr, this);
+-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IDLType:1.0") == 0)
++  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IDLType:1.0") == 0)
+     return ACE_static_cast (POA_CORBA_IDLType_ptr, this);
+-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0)
++  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
+     return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
+   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
+     return ACE_static_cast(PortableServer::Servant, this);
+@@ -23873,7 +23870,7 @@
+ 
+ const char* POA_CORBA_LocalInterfaceDef::_interface_repository_id (void) const
+ {
+-  return "IDL:omg.org/CORBA_LocalInterfaceDef:1.0";
++  return "IDL:omg.org/CORBA/LocalInterfaceDef:1.0";
+ }
+ 
+ CORBA_LocalInterfaceDef*
diff --git a/TAO/orbsvcs/IFR_Service/diffs/IFR_ComponentsS.cpp.diff b/TAO/orbsvcs/IFR_Service/diffs/IFR_ComponentsS.cpp.diff
index 8c64f211385..0db2951b717 100644
--- a/TAO/orbsvcs/IFR_Service/diffs/IFR_ComponentsS.cpp.diff
+++ b/TAO/orbsvcs/IFR_Service/diffs/IFR_ComponentsS.cpp.diff
@@ -1,5 +1,5 @@
 --- orig/IFR_ComponentsS.cpp	Mon Apr 30 22:22:39 2001
-+++ IFR_ComponentsS.cpp	Thu May 10 20:43:22 2001
++++ IFR_ComponentsS.cpp	Fri May 11 00:03:05 2001
 @@ -1,6 +1,6 @@
  // -*- C++ -*-
  //
@@ -329,14 +329,16 @@
  static TAO_IR_ComponentDef_Perfect_Hash_OpTable tao_IR_ComponentDef_optable;
  
  #if (TAO_HAS_INTERCEPTORS == 1)
-@@ -8981,10 +8981,10 @@
+@@ -8980,11 +8980,11 @@
+   
    if (
      (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/ComponentDef:1.0")) ||
-     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_InterfaceDef:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_InterfaceDef:1.0")) ||
 -    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Container:1.0")) ||
 -    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) ||
 -    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IDLType:1.0")) ||
 -    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/InterfaceDef:1.0")) ||
 +    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Container:1.0")) ||
 +    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) ||
 +    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) ||
@@ -344,9 +346,12 @@
      (!ACE_OS::strcmp ((char *)value, base_id)))
        return 1;
      else
-@@ -8999,13 +8999,13 @@
+@@ -8997,15 +8997,15 @@
+ {
+   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/ComponentDef:1.0") == 0)
      return ACE_static_cast (POA_IR::ComponentDef_ptr, this);
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_InterfaceDef:1.0") == 0)
+-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_InterfaceDef:1.0") == 0)
++  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/InterfaceDef:1.0") == 0)
      return ACE_static_cast (POA_CORBA_InterfaceDef_ptr, this);
 -  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Container:1.0") == 0)
 +  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Container:1.0") == 0)
@@ -421,20 +426,25 @@
  static TAO_IR_FactoryDef_Perfect_Hash_OpTable tao_IR_FactoryDef_optable;
  
  #if (TAO_HAS_INTERCEPTORS == 1)
-@@ -10400,8 +10400,8 @@
+@@ -10399,9 +10399,9 @@
+   
    if (
      (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/FactoryDef:1.0")) ||
-     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_OperationDef:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_OperationDef:1.0")) ||
 -    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) ||
 -    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/OperationDef:1.0")) ||
 +    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) ||
 +    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
      (!ACE_OS::strcmp ((char *)value, base_id)))
        return 1;
      else
-@@ -10416,9 +10416,9 @@
+@@ -10414,11 +10414,11 @@
+ {
+   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/FactoryDef:1.0") == 0)
      return ACE_static_cast (POA_IR::FactoryDef_ptr, this);
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_OperationDef:1.0") == 0)
+-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_OperationDef:1.0") == 0)
++  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/OperationDef:1.0") == 0)
      return ACE_static_cast (POA_CORBA_OperationDef_ptr, this);
 -  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Contained:1.0") == 0)
 +  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Contained:1.0") == 0)
@@ -462,20 +472,25 @@
  static TAO_IR_FinderDef_Perfect_Hash_OpTable tao_IR_FinderDef_optable;
  
  #if (TAO_HAS_INTERCEPTORS == 1)
-@@ -10894,8 +10894,8 @@
+@@ -10893,9 +10893,9 @@
+   
    if (
      (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/FinderDef:1.0")) ||
-     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_OperationDef:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_OperationDef:1.0")) ||
 -    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) ||
 -    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/OperationDef:1.0")) ||
 +    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) ||
 +    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
      (!ACE_OS::strcmp ((char *)value, base_id)))
        return 1;
      else
-@@ -10910,9 +10910,9 @@
+@@ -10908,11 +10908,11 @@
+ {
+   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/FinderDef:1.0") == 0)
      return ACE_static_cast (POA_IR::FinderDef_ptr, this);
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_OperationDef:1.0") == 0)
+-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_OperationDef:1.0") == 0)
++  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/OperationDef:1.0") == 0)
      return ACE_static_cast (POA_CORBA_OperationDef_ptr, this);
 -  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Contained:1.0") == 0)
 +  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Contained:1.0") == 0)
@@ -503,14 +518,16 @@
  static TAO_IR_HomeDef_Perfect_Hash_OpTable tao_IR_HomeDef_optable;
  
  #if (TAO_HAS_INTERCEPTORS == 1)
-@@ -13706,10 +13706,10 @@
+@@ -13705,11 +13705,11 @@
+   
    if (
      (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/HomeDef:1.0")) ||
-     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_InterfaceDef:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_InterfaceDef:1.0")) ||
 -    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Container:1.0")) ||
 -    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) ||
 -    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IDLType:1.0")) ||
 -    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/InterfaceDef:1.0")) ||
 +    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Container:1.0")) ||
 +    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) ||
 +    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) ||
@@ -518,9 +535,12 @@
      (!ACE_OS::strcmp ((char *)value, base_id)))
        return 1;
      else
-@@ -13724,13 +13724,13 @@
+@@ -13722,15 +13722,15 @@
+ {
+   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/IR/HomeDef:1.0") == 0)
      return ACE_static_cast (POA_IR::HomeDef_ptr, this);
-   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_InterfaceDef:1.0") == 0)
+-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_InterfaceDef:1.0") == 0)
++  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/InterfaceDef:1.0") == 0)
      return ACE_static_cast (POA_CORBA_InterfaceDef_ptr, this);
 -  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Container:1.0") == 0)
 +  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Container:1.0") == 0)
diff --git a/TAO/orbsvcs/IFR_Service/diffs/IFR_ExtendedS.cpp.diff b/TAO/orbsvcs/IFR_Service/diffs/IFR_ExtendedS.cpp.diff
index e6125df97ba..9efdc466dc5 100644
--- a/TAO/orbsvcs/IFR_Service/diffs/IFR_ExtendedS.cpp.diff
+++ b/TAO/orbsvcs/IFR_Service/diffs/IFR_ExtendedS.cpp.diff
@@ -1,5 +1,5 @@
---- orig/IFR_ExtendedS.cpp	Mon Apr 23 20:56:05 2001
-+++ IFR_ExtendedS.cpp	Mon Apr 23 20:30:23 2001
+--- orig/IFR_ExtendedS.cpp	Mon Apr 30 22:22:36 2001
++++ IFR_ExtendedS.cpp	Fri May 11 00:03:12 2001
 @@ -1,6 +1,6 @@
  // -*- C++ -*-
  //
@@ -8,11 +8,22 @@
  
  // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
  // TAO and the TAO IDL Compiler have been developed by:
+@@ -19,8 +19,8 @@
+ // Information about TAO is available at:
+ //     http://www.cs.wustl.edu/~schmidt/TAO.html
+ 
+-#ifndef _TAO_IDL_IFR_EXTENDEDS_CPP_
+-#define _TAO_IDL_IFR_EXTENDEDS_CPP_
++#ifndef _TAO_IDL__________ORBSVCS_IFR_SERVICE_ORIG_IFR_EXTENDEDS_CPP_
++#define _TAO_IDL__________ORBSVCS_IFR_SERVICE_ORIG_IFR_EXTENDEDS_CPP_
+ 
+ #include "IFR_ExtendedS.h"
+ 
 @@ -51,7 +51,7 @@
  public:
   const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
  };
--/* starting time is 15:56:05 */
+-/* starting time is 17:22:35 */
 +/* starting time is 13:56:24 */
  /* C++ code produced by gperf version 2.8 (ACE version) */
  /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_FixedDef_Perfect_Hash_OpTable -N lookup  */
@@ -21,16 +32,89 @@
      }
    return 0;
  }
--/* ending time is 15:56:05 */
+-/* ending time is 17:22:35 */
 +/* ending time is 13:56:24 */
  static TAO_CORBA_FixedDef_Perfect_Hash_OpTable tao_CORBA_FixedDef_optable;
  
  #if (TAO_HAS_INTERCEPTORS == 1)
+@@ -808,7 +808,7 @@
+     return ACE_reinterpret_cast (
+       POA_CORBA_FixedDef_ptr,
+       servant_upcall.servant ()->_downcast (
+-          "IDL:omg.org/CORBA_FixedDef:1.0"
++          "IDL:omg.org/CORBA/FixedDef:1.0"
+         )
+     )->digits (
+         ACE_TRY_ENV
+@@ -838,7 +838,7 @@
+     ACE_reinterpret_cast (
+       POA_CORBA_FixedDef_ptr,
+       servant_upcall.servant ()->_downcast (
+-          "IDL:omg.org/CORBA_FixedDef:1.0"
++          "IDL:omg.org/CORBA/FixedDef:1.0"
+         )
+     )->digits (
+         digits,
+@@ -871,7 +871,7 @@
+     return ACE_reinterpret_cast (
+       POA_CORBA_FixedDef_ptr,
+       servant_upcall.servant ()->_downcast (
+-          "IDL:omg.org/CORBA_FixedDef:1.0"
++          "IDL:omg.org/CORBA/FixedDef:1.0"
+         )
+     )->scale (
+         ACE_TRY_ENV
+@@ -901,7 +901,7 @@
+     ACE_reinterpret_cast (
+       POA_CORBA_FixedDef_ptr,
+       servant_upcall.servant ()->_downcast (
+-          "IDL:omg.org/CORBA_FixedDef:1.0"
++          "IDL:omg.org/CORBA/FixedDef:1.0"
+         )
+     )->scale (
+         scale,
+@@ -1345,9 +1345,9 @@
+   ACE_CHECK_RETURN (0);
+   
+   if (
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_FixedDef:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IDLType:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/FixedDef:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
+     (!ACE_OS::strcmp ((char *)value, base_id)))
+       return 1;
+     else
+@@ -1358,11 +1358,11 @@
+     const char* logical_type_id
+   )
+ {
+-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_FixedDef:1.0") == 0)
++  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/FixedDef:1.0") == 0)
+     return ACE_static_cast (POA_CORBA_FixedDef_ptr, this);
+-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IDLType:1.0") == 0)
++  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IDLType:1.0") == 0)
+     return ACE_static_cast (POA_CORBA_IDLType_ptr, this);
+-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0)
++  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
+     return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
+   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
+     return ACE_static_cast(PortableServer::Servant, this);
+@@ -1376,7 +1376,7 @@
+ 
+ const char* POA_CORBA_FixedDef::_interface_repository_id (void) const
+ {
+-  return "IDL:omg.org/CORBA_FixedDef:1.0";
++  return "IDL:omg.org/CORBA/FixedDef:1.0";
+ }
+ 
+ CORBA_FixedDef*
 @@ -1404,7 +1404,7 @@
  public:
   const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
  };
--/* starting time is 15:56:05 */
+-/* starting time is 17:22:35 */
 +/* starting time is 13:56:24 */
  /* C++ code produced by gperf version 2.8 (ACE version) */
  /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ValueMemberDef_Perfect_Hash_OpTable -N lookup  */
@@ -39,16 +123,98 @@
      }
    return 0;
  }
--/* ending time is 15:56:05 */
+-/* ending time is 17:22:35 */
 +/* ending time is 13:56:24 */
  static TAO_CORBA_ValueMemberDef_Perfect_Hash_OpTable tao_CORBA_ValueMemberDef_optable;
  
  #if (TAO_HAS_INTERCEPTORS == 1)
+@@ -2297,7 +2297,7 @@
+     return ACE_reinterpret_cast (
+       POA_CORBA_ValueMemberDef_ptr,
+       servant_upcall.servant ()->_downcast (
+-          "IDL:omg.org/CORBA_ValueMemberDef:1.0"
++          "IDL:omg.org/CORBA/ValueMemberDef:1.0"
+         )
+     )->type (
+         ACE_TRY_ENV
+@@ -2328,7 +2328,7 @@
+     return ACE_reinterpret_cast (
+       POA_CORBA_ValueMemberDef_ptr,
+       servant_upcall.servant ()->_downcast (
+-          "IDL:omg.org/CORBA_ValueMemberDef:1.0"
++          "IDL:omg.org/CORBA/ValueMemberDef:1.0"
+         )
+     )->type_def (
+         ACE_TRY_ENV
+@@ -2358,7 +2358,7 @@
+     ACE_reinterpret_cast (
+       POA_CORBA_ValueMemberDef_ptr,
+       servant_upcall.servant ()->_downcast (
+-          "IDL:omg.org/CORBA_ValueMemberDef:1.0"
++          "IDL:omg.org/CORBA/ValueMemberDef:1.0"
+         )
+     )->type_def (
+         type_def,
+@@ -2391,7 +2391,7 @@
+     return ACE_reinterpret_cast (
+       POA_CORBA_ValueMemberDef_ptr,
+       servant_upcall.servant ()->_downcast (
+-          "IDL:omg.org/CORBA_ValueMemberDef:1.0"
++          "IDL:omg.org/CORBA/ValueMemberDef:1.0"
+         )
+     )->access (
+         ACE_TRY_ENV
+@@ -2421,7 +2421,7 @@
+     ACE_reinterpret_cast (
+       POA_CORBA_ValueMemberDef_ptr,
+       servant_upcall.servant ()->_downcast (
+-          "IDL:omg.org/CORBA_ValueMemberDef:1.0"
++          "IDL:omg.org/CORBA/ValueMemberDef:1.0"
+         )
+     )->access (
+         access,
+@@ -2946,9 +2946,9 @@
+   ACE_CHECK_RETURN (0);
+   
+   if (
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_ValueMemberDef:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/ValueMemberDef:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
+     (!ACE_OS::strcmp ((char *)value, base_id)))
+       return 1;
+     else
+@@ -2959,11 +2959,11 @@
+     const char* logical_type_id
+   )
+ {
+-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_ValueMemberDef:1.0") == 0)
++  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/ValueMemberDef:1.0") == 0)
+     return ACE_static_cast (POA_CORBA_ValueMemberDef_ptr, this);
+-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Contained:1.0") == 0)
++  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Contained:1.0") == 0)
+     return ACE_static_cast (POA_CORBA_Contained_ptr, this);
+-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0)
++  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
+     return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
+   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
+     return ACE_static_cast(PortableServer::Servant, this);
+@@ -2977,7 +2977,7 @@
+ 
+ const char* POA_CORBA_ValueMemberDef::_interface_repository_id (void) const
+ {
+-  return "IDL:omg.org/CORBA_ValueMemberDef:1.0";
++  return "IDL:omg.org/CORBA/ValueMemberDef:1.0";
+ }
+ 
+ CORBA_ValueMemberDef*
 @@ -3005,7 +3005,7 @@
  public:
   const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
  };
--/* starting time is 15:56:05 */
+-/* starting time is 17:22:35 */
 +/* starting time is 13:56:24 */
  /* C++ code produced by gperf version 2.8 (ACE version) */
  /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ValueDef_Perfect_Hash_OpTable -N lookup  */
@@ -57,16 +223,234 @@
      }
    return 0;
  }
--/* ending time is 15:56:05 */
+-/* ending time is 17:22:35 */
 +/* ending time is 13:56:24 */
  static TAO_CORBA_ValueDef_Perfect_Hash_OpTable tao_CORBA_ValueDef_optable;
  
  #if (TAO_HAS_INTERCEPTORS == 1)
+@@ -5841,7 +5841,7 @@
+     return ACE_reinterpret_cast (
+       POA_CORBA_ValueDef_ptr,
+       servant_upcall.servant ()->_downcast (
+-          "IDL:omg.org/CORBA_ValueDef:1.0"
++          "IDL:omg.org/CORBA/ValueDef:1.0"
+         )
+     )->supported_interfaces (
+         ACE_TRY_ENV
+@@ -5871,7 +5871,7 @@
+     ACE_reinterpret_cast (
+       POA_CORBA_ValueDef_ptr,
+       servant_upcall.servant ()->_downcast (
+-          "IDL:omg.org/CORBA_ValueDef:1.0"
++          "IDL:omg.org/CORBA/ValueDef:1.0"
+         )
+     )->supported_interfaces (
+         supported_interfaces,
+@@ -5904,7 +5904,7 @@
+     return ACE_reinterpret_cast (
+       POA_CORBA_ValueDef_ptr,
+       servant_upcall.servant ()->_downcast (
+-          "IDL:omg.org/CORBA_ValueDef:1.0"
++          "IDL:omg.org/CORBA/ValueDef:1.0"
+         )
+     )->initializers (
+         ACE_TRY_ENV
+@@ -5934,7 +5934,7 @@
+     ACE_reinterpret_cast (
+       POA_CORBA_ValueDef_ptr,
+       servant_upcall.servant ()->_downcast (
+-          "IDL:omg.org/CORBA_ValueDef:1.0"
++          "IDL:omg.org/CORBA/ValueDef:1.0"
+         )
+     )->initializers (
+         initializers,
+@@ -5967,7 +5967,7 @@
+     return ACE_reinterpret_cast (
+       POA_CORBA_ValueDef_ptr,
+       servant_upcall.servant ()->_downcast (
+-          "IDL:omg.org/CORBA_ValueDef:1.0"
++          "IDL:omg.org/CORBA/ValueDef:1.0"
+         )
+     )->base_value (
+         ACE_TRY_ENV
+@@ -5997,7 +5997,7 @@
+     ACE_reinterpret_cast (
+       POA_CORBA_ValueDef_ptr,
+       servant_upcall.servant ()->_downcast (
+-          "IDL:omg.org/CORBA_ValueDef:1.0"
++          "IDL:omg.org/CORBA/ValueDef:1.0"
+         )
+     )->base_value (
+         base_value,
+@@ -6030,7 +6030,7 @@
+     return ACE_reinterpret_cast (
+       POA_CORBA_ValueDef_ptr,
+       servant_upcall.servant ()->_downcast (
+-          "IDL:omg.org/CORBA_ValueDef:1.0"
++          "IDL:omg.org/CORBA/ValueDef:1.0"
+         )
+     )->abstract_base_values (
+         ACE_TRY_ENV
+@@ -6060,7 +6060,7 @@
+     ACE_reinterpret_cast (
+       POA_CORBA_ValueDef_ptr,
+       servant_upcall.servant ()->_downcast (
+-          "IDL:omg.org/CORBA_ValueDef:1.0"
++          "IDL:omg.org/CORBA/ValueDef:1.0"
+         )
+     )->abstract_base_values (
+         abstract_base_values,
+@@ -6093,7 +6093,7 @@
+     return ACE_reinterpret_cast (
+       POA_CORBA_ValueDef_ptr,
+       servant_upcall.servant ()->_downcast (
+-          "IDL:omg.org/CORBA_ValueDef:1.0"
++          "IDL:omg.org/CORBA/ValueDef:1.0"
+         )
+     )->is_abstract (
+         ACE_TRY_ENV
+@@ -6123,7 +6123,7 @@
+     ACE_reinterpret_cast (
+       POA_CORBA_ValueDef_ptr,
+       servant_upcall.servant ()->_downcast (
+-          "IDL:omg.org/CORBA_ValueDef:1.0"
++          "IDL:omg.org/CORBA/ValueDef:1.0"
+         )
+     )->is_abstract (
+         is_abstract,
+@@ -6156,7 +6156,7 @@
+     return ACE_reinterpret_cast (
+       POA_CORBA_ValueDef_ptr,
+       servant_upcall.servant ()->_downcast (
+-          "IDL:omg.org/CORBA_ValueDef:1.0"
++          "IDL:omg.org/CORBA/ValueDef:1.0"
+         )
+     )->is_custom (
+         ACE_TRY_ENV
+@@ -6186,7 +6186,7 @@
+     ACE_reinterpret_cast (
+       POA_CORBA_ValueDef_ptr,
+       servant_upcall.servant ()->_downcast (
+-          "IDL:omg.org/CORBA_ValueDef:1.0"
++          "IDL:omg.org/CORBA/ValueDef:1.0"
+         )
+     )->is_custom (
+         is_custom,
+@@ -6219,7 +6219,7 @@
+     return ACE_reinterpret_cast (
+       POA_CORBA_ValueDef_ptr,
+       servant_upcall.servant ()->_downcast (
+-          "IDL:omg.org/CORBA_ValueDef:1.0"
++          "IDL:omg.org/CORBA/ValueDef:1.0"
+         )
+     )->is_truncatable (
+         ACE_TRY_ENV
+@@ -6249,7 +6249,7 @@
+     ACE_reinterpret_cast (
+       POA_CORBA_ValueDef_ptr,
+       servant_upcall.servant ()->_downcast (
+-          "IDL:omg.org/CORBA_ValueDef:1.0"
++          "IDL:omg.org/CORBA/ValueDef:1.0"
+         )
+     )->is_truncatable (
+         is_truncatable,
+@@ -6283,7 +6283,7 @@
+     return ACE_reinterpret_cast (
+       POA_CORBA_ValueDef_ptr,
+       servant_upcall.servant ()->_downcast (
+-          "IDL:omg.org/CORBA_ValueDef:1.0"
++          "IDL:omg.org/CORBA/ValueDef:1.0"
+         )
+     )->is_a (
+         id,
+@@ -6315,7 +6315,7 @@
+     return ACE_reinterpret_cast (
+       POA_CORBA_ValueDef_ptr,
+       servant_upcall.servant ()->_downcast (
+-          "IDL:omg.org/CORBA_ValueDef:1.0"
++          "IDL:omg.org/CORBA/ValueDef:1.0"
+         )
+     )->describe_value (
+         ACE_TRY_ENV
+@@ -6351,7 +6351,7 @@
+     return ACE_reinterpret_cast (
+       POA_CORBA_ValueDef_ptr,
+       servant_upcall.servant ()->_downcast (
+-          "IDL:omg.org/CORBA_ValueDef:1.0"
++          "IDL:omg.org/CORBA/ValueDef:1.0"
+         )
+     )->create_value_member (
+         id,
+@@ -6392,7 +6392,7 @@
+     return ACE_reinterpret_cast (
+       POA_CORBA_ValueDef_ptr,
+       servant_upcall.servant ()->_downcast (
+-          "IDL:omg.org/CORBA_ValueDef:1.0"
++          "IDL:omg.org/CORBA/ValueDef:1.0"
+         )
+     )->create_attribute (
+         id,
+@@ -6436,7 +6436,7 @@
+     return ACE_reinterpret_cast (
+       POA_CORBA_ValueDef_ptr,
+       servant_upcall.servant ()->_downcast (
+-          "IDL:omg.org/CORBA_ValueDef:1.0"
++          "IDL:omg.org/CORBA/ValueDef:1.0"
+         )
+     )->create_operation (
+         id,
+@@ -8177,11 +8177,11 @@
+   ACE_CHECK_RETURN (0);
+   
+   if (
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_ValueDef:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Container:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IDLType:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/ValueDef:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Container:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
+     (!ACE_OS::strcmp ((char *)value, base_id)))
+       return 1;
+     else
+@@ -8192,15 +8192,15 @@
+     const char* logical_type_id
+   )
+ {
+-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_ValueDef:1.0") == 0)
++  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/ValueDef:1.0") == 0)
+     return ACE_static_cast (POA_CORBA_ValueDef_ptr, this);
+-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Container:1.0") == 0)
++  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Container:1.0") == 0)
+     return ACE_static_cast (POA_CORBA_Container_ptr, this);
+-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Contained:1.0") == 0)
++  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Contained:1.0") == 0)
+     return ACE_static_cast (POA_CORBA_Contained_ptr, this);
+-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IDLType:1.0") == 0)
++  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IDLType:1.0") == 0)
+     return ACE_static_cast (POA_CORBA_IDLType_ptr, this);
+-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0)
++  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
+     return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
+   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
+     return ACE_static_cast(PortableServer::Servant, this);
+@@ -8214,7 +8214,7 @@
+ 
+ const char* POA_CORBA_ValueDef::_interface_repository_id (void) const
+ {
+-  return "IDL:omg.org/CORBA_ValueDef:1.0";
++  return "IDL:omg.org/CORBA/ValueDef:1.0";
+ }
+ 
+ CORBA_ValueDef*
 @@ -8242,7 +8242,7 @@
  public:
   const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
  };
--/* starting time is 15:56:05 */
+-/* starting time is 17:22:35 */
 +/* starting time is 13:56:24 */
  /* C++ code produced by gperf version 2.8 (ACE version) */
  /* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ValueBoxDef_Perfect_Hash_OpTable -N lookup  */
@@ -75,8 +459,73 @@
      }
    return 0;
  }
--/* ending time is 15:56:05 */
+-/* ending time is 17:22:35 */
 +/* ending time is 13:56:24 */
  static TAO_CORBA_ValueBoxDef_Perfect_Hash_OpTable tao_CORBA_ValueBoxDef_optable;
  
  #if (TAO_HAS_INTERCEPTORS == 1)
+@@ -8765,7 +8765,7 @@
+     return ACE_reinterpret_cast (
+       POA_CORBA_ValueBoxDef_ptr,
+       servant_upcall.servant ()->_downcast (
+-          "IDL:omg.org/CORBA_ValueBoxDef:1.0"
++          "IDL:omg.org/CORBA/ValueBoxDef:1.0"
+         )
+     )->original_type_def (
+         ACE_TRY_ENV
+@@ -8795,7 +8795,7 @@
+     ACE_reinterpret_cast (
+       POA_CORBA_ValueBoxDef_ptr,
+       servant_upcall.servant ()->_downcast (
+-          "IDL:omg.org/CORBA_ValueBoxDef:1.0"
++          "IDL:omg.org/CORBA/ValueBoxDef:1.0"
+         )
+     )->original_type_def (
+         original_type_def,
+@@ -9084,11 +9084,11 @@
+   ACE_CHECK_RETURN (0);
+   
+   if (
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_ValueBoxDef:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_TypedefDef:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IDLType:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/ValueBoxDef:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/TypedefDef:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
+     (!ACE_OS::strcmp ((char *)value, base_id)))
+       return 1;
+     else
+@@ -9099,15 +9099,15 @@
+     const char* logical_type_id
+   )
+ {
+-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_ValueBoxDef:1.0") == 0)
++  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/ValueBoxDef:1.0") == 0)
+     return ACE_static_cast (POA_CORBA_ValueBoxDef_ptr, this);
+-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_TypedefDef:1.0") == 0)
++  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/TypedefDef:1.0") == 0)
+     return ACE_static_cast (POA_CORBA_TypedefDef_ptr, this);
+-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_Contained:1.0") == 0)
++  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Contained:1.0") == 0)
+     return ACE_static_cast (POA_CORBA_Contained_ptr, this);
+-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IDLType:1.0") == 0)
++  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IDLType:1.0") == 0)
+     return ACE_static_cast (POA_CORBA_IDLType_ptr, this);
+-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA_IRObject:1.0") == 0)
++  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/IRObject:1.0") == 0)
+     return ACE_static_cast (POA_CORBA_IRObject_ptr, this);
+   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
+     return ACE_static_cast(PortableServer::Servant, this);
+@@ -9121,7 +9121,7 @@
+ 
+ const char* POA_CORBA_ValueBoxDef::_interface_repository_id (void) const
+ {
+-  return "IDL:omg.org/CORBA_ValueBoxDef:1.0";
++  return "IDL:omg.org/CORBA/ValueBoxDef:1.0";
+ }
+ 
+ CORBA_ValueBoxDef*
diff --git a/TAO/tao/IFR_Client/diffs/IFR_BasicC.cpp.diff b/TAO/tao/IFR_Client/diffs/IFR_BasicC.cpp.diff
index 6e302b771db..0814296f1e7 100644
--- a/TAO/tao/IFR_Client/diffs/IFR_BasicC.cpp.diff
+++ b/TAO/tao/IFR_Client/diffs/IFR_BasicC.cpp.diff
@@ -1,5 +1,5 @@
 --- orig/IFR_BasicC.cpp	Tue Apr 24 23:25:50 2001
-+++ IFR_BasicC.cpp	Tue Apr 24 23:02:55 2001
++++ IFR_BasicC.cpp	Fri May 11 01:22:20 2001
 @@ -1,6 +1,6 @@
  // -*- C++ -*-
  //
@@ -1218,6 +1218,19 @@
        ACE_CHECK_RETURN (CORBA_SequenceDef::_nil ());
        if (is_a == 0)
          return CORBA_SequenceDef::_nil ();
+@@ -15591,9 +14879,9 @@
+ CORBA::Boolean CORBA_SequenceDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+ {
+   if (
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_SequenceDef:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IDLType:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/SequenceDef:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
+     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
+   return 1; // success using local knowledge
+   else
 @@ -15642,7 +14930,7 @@
  
  const char* CORBA_SequenceDef::_interface_repository_id (void) const
@@ -1688,13 +1701,12 @@
  }
  
  CORBA::TypeCode_ptr CORBA_AttributeDef::type (
-@@ -21134,259 +20117,29 @@
+@@ -21134,243 +20117,13 @@
      );
  }
  
 -static const CORBA::Long _oc_CORBA_AttributeDef[] =
-+void CORBA_AttributeDescription::_tao_any_destructor (void *x)
- {
+-{
 -  TAO_ENCAP_BYTE_ORDER, // byte order
 -  35,
 -  ACE_NTOHL (0x49444c3a), 
@@ -1713,10 +1725,7 @@
 -  ACE_NTOHL (0x75746544), 
 -  ACE_NTOHL (0x65660000),  // name = CORBA_AttributeDef
 -};
-+  CORBA_AttributeDescription *tmp = ACE_static_cast (CORBA_AttributeDescription*,x);
-+  delete tmp;
-+}
- 
+-
 -static CORBA::TypeCode _tc_TAO_tc_CORBA_AttributeDef (
 -    CORBA::tk_objref,
 -    sizeof (_oc_CORBA_AttributeDef),
@@ -1724,24 +1733,12 @@
 -    0,
 -    sizeof (CORBA_AttributeDef)
 -  );
-+void CORBA_ParameterDescription::_tao_any_destructor (void *x)
-+{
-+  CORBA_ParameterDescription *tmp = ACE_static_cast (CORBA_ParameterDescription*,x);
-+  delete tmp;
-+}
- 
+-
 -CORBA::TypeCode_ptr _tc_CORBA_AttributeDef =
 -  &_tc_TAO_tc_CORBA_AttributeDef;
- 
+-
 -static const CORBA::Long _oc_CORBA_AttributeDescription[] =
-+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-+  
-+#if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_PARDESCRIPTIONSEQ_CS_)
-+#define __TAO_UNBOUNDED_SEQUENCE_CORBA_PARDESCRIPTIONSEQ_CS_
-+
-+  void
-+  _TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq::_allocate_buffer (CORBA::ULong length)
- {
+-{
 -  TAO_ENCAP_BYTE_ORDER, // byte order
 -  43,
 -  ACE_NTOHL (0x49444c3a), 
@@ -1834,12 +1831,12 @@
 -CORBA::TypeCode_ptr _tc_CORBA_AttributeDescription =
 -  &_tc_TAO_tc_CORBA_AttributeDescription;
 -
--void CORBA_AttributeDescription::_tao_any_destructor (void *x)
--{
--  CORBA_AttributeDescription *tmp = ACE_static_cast (CORBA_AttributeDescription*,x);
--  delete tmp;
--}
--
+ void CORBA_AttributeDescription::_tao_any_destructor (void *x)
+ {
+   CORBA_AttributeDescription *tmp = ACE_static_cast (CORBA_AttributeDescription*,x);
+   delete tmp;
+ }
+ 
 -static const CORBA::Long _oc_CORBA_ParameterDescription[] =
 -{
 -  TAO_ENCAP_BYTE_ORDER, // byte order
@@ -1945,27 +1942,10 @@
 -  &_tc_TAO_tc_CORBA_ParameterDescription;
 -
 -void CORBA_ParameterDescription::_tao_any_destructor (void *x)
--{
--  CORBA_ParameterDescription *tmp = ACE_static_cast (CORBA_ParameterDescription*,x);
--  delete tmp;
--}
--
--
--#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
--  
--#if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_PARDESCRIPTIONSEQ_CS_)
--#define __TAO_UNBOUNDED_SEQUENCE_CORBA_PARDESCRIPTIONSEQ_CS_
--
--  void
--  _TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq::_allocate_buffer (CORBA::ULong length)
--  {
--    CORBA_ParameterDescription* tmp = 0;
--    tmp = _TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq::allocbuf (length);
-+    CORBA_ParameterDescription* tmp = 0;
-+    tmp = _TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq::allocbuf (length);
-     
-     if (this->buffer_ != 0)
-     {
++void CORBA_ParameterDescription::_tao_any_destructor (void *x)
+ {
+   CORBA_ParameterDescription *tmp = ACE_static_cast (CORBA_ParameterDescription*,x);
+   delete tmp;
 @@ -21472,138 +20225,6 @@
  
  #endif /* end #if !defined */
@@ -2182,7 +2162,7 @@
  }
  
  CORBA::TypeCode_ptr CORBA_OperationDef::result (
-@@ -25085,472 +23667,70 @@
+@@ -25085,951 +23667,98 @@
      );
  }
  
@@ -2223,45 +2203,9 @@
 -  &_tc_TAO_tc_CORBA_OperationDef;
 +#if !defined (_CORBA_REPOSITORYIDSEQ_CS_)
 +#define _CORBA_REPOSITORYIDSEQ_CS_
-+
-+// *************************************************************
-+// CORBA_RepositoryIdSeq
-+// *************************************************************
  
 -static const CORBA::Long _oc_CORBA_OperationDescription[] =
-+CORBA_RepositoryIdSeq::CORBA_RepositoryIdSeq (void)
-+{}
-+CORBA_RepositoryIdSeq::CORBA_RepositoryIdSeq (CORBA::ULong max) // uses max size
-+  : 
-+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-+  TAO_Unbounded_String_Sequence
-+#else /* TAO_USE_SEQUENCE_TEMPLATES */
-+  TAO_Unbounded_String_Sequence
-+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-+ (max)
-+{}
-+CORBA_RepositoryIdSeq::CORBA_RepositoryIdSeq (CORBA::ULong max, CORBA::ULong length, char * *buffer, CORBA::Boolean release)
-+  : 
-+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-+  TAO_Unbounded_String_Sequence
-+#else /* TAO_USE_SEQUENCE_TEMPLATES */
-+  TAO_Unbounded_String_Sequence
-+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-+ (max, length, buffer, release)
-+{}
-+CORBA_RepositoryIdSeq::CORBA_RepositoryIdSeq (const CORBA_RepositoryIdSeq &seq) // copy ctor
-+  : 
-+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-+  TAO_Unbounded_String_Sequence
-+#else /* TAO_USE_SEQUENCE_TEMPLATES */
-+  TAO_Unbounded_String_Sequence
-+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-+ (seq)
-+{}
-+CORBA_RepositoryIdSeq::~CORBA_RepositoryIdSeq (void) // dtor
-+{}
-+void CORBA_RepositoryIdSeq::_tao_any_destructor (void *x)
- {
+-{
 -  TAO_ENCAP_BYTE_ORDER, // byte order
 -  43,
 -  ACE_NTOHL (0x49444c3a), 
@@ -2308,10 +2252,7 @@
 -  ACE_NTOHL (0x72657375), 
 -  ACE_NTOHL (0x6c740000),  // name = result
 -  CORBA::tk_TypeCode,
-+  CORBA_RepositoryIdSeq *tmp = ACE_static_cast (CORBA_RepositoryIdSeq*,x);
-+  delete tmp;
-+}
- 
+-
 -  5,
 -  ACE_NTOHL (0x6d6f6465), 
 -  ACE_NTOHL (0x0),  // name = mode
@@ -2342,7 +2283,7 @@
 -    ACE_NTOHL (0x4f505f4f), 
 -    ACE_NTOHL (0x4e455741), 
 -    ACE_NTOHL (0x59000000),  // name = OP_ONEWAY
- 
+-
 -  9,
 -  ACE_NTOHL (0x636f6e74), 
 -  ACE_NTOHL (0x65787473), 
@@ -2372,10 +2313,8 @@
 -      CORBA::tk_string, 
 -      0U, // string length
 -      0U,
-+#endif /* end #if !defined */
- 
-+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
- 
+-
+-
 -  11,
 -  ACE_NTOHL (0x70617261), 
 -  ACE_NTOHL (0x6d657465), 
@@ -2437,9 +2376,7 @@
 -        ACE_NTOHL (0x74797065), 
 -        ACE_NTOHL (0x0),  // name = type
 -        CORBA::tk_TypeCode,
-+#if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_OPDESCRIPTIONSEQ_CS_)
-+#define __TAO_UNBOUNDED_SEQUENCE_CORBA_OPDESCRIPTIONSEQ_CS_
- 
+-
 -        9,
 -        ACE_NTOHL (0x74797065), 
 -        ACE_NTOHL (0x5f646566), 
@@ -2701,18 +2638,91 @@
 -  {
 -    CORBA_OperationDescription* tmp = 0;
 -    tmp = _TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq::allocbuf (length);
-+  void
-+  _TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq::_allocate_buffer (CORBA::ULong length)
-+  {
-+    CORBA_OperationDescription* tmp = 0;
-+    tmp = _TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq::allocbuf (length);
-     
-     if (this->buffer_ != 0)
-     {
-@@ -25636,369 +23816,13 @@
- 
- #endif /* end #if !defined */
- 
+-    
+-    if (this->buffer_ != 0)
+-    {
+-      CORBA_OperationDescription *old = ACE_reinterpret_cast (CORBA_OperationDescription *,this->buffer_);
+-      
+-      for (CORBA::ULong i = 0; i < this->length_; ++i)
+-        tmp[i] = old[i];
+-      
+-      if (this->release_)
+-        _TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq::freebuf (old);
+-      
+-    }
+-    this->buffer_ = tmp;
+-  }
+-  
+-  void
+-  _TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq::_deallocate_buffer (void)
+-  {
+-    if (this->buffer_ == 0 || this->release_ == 0)
+-      return;
+-    
+-    CORBA_OperationDescription *tmp = ACE_reinterpret_cast (CORBA_OperationDescription *,this->buffer_);
+-    
+-    _TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq::freebuf (tmp);
+-    this->buffer_ = 0;
+-  } 
+-  
+-  _TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq::~_TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq (void) // Dtor.
+-  {
+-    this->_deallocate_buffer ();
+-  }
+-  
+-  
+-#endif /* end #if !defined */
+-
+-
+-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+-
+-#if !defined (_CORBA_OPDESCRIPTIONSEQ_CS_)
+-#define _CORBA_OPDESCRIPTIONSEQ_CS_
+-
+-// *************************************************************
+-// CORBA_OpDescriptionSeq
+-// *************************************************************
+-
+-CORBA_OpDescriptionSeq::CORBA_OpDescriptionSeq (void)
+-{}
+-CORBA_OpDescriptionSeq::CORBA_OpDescriptionSeq (CORBA::ULong max) // uses max size
+-  : 
+-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+-  _TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq
+-#else /* TAO_USE_SEQUENCE_TEMPLATES */
+-  TAO_Unbounded_Sequence<CORBA_OperationDescription>
+-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+- (max)
+-{}
+-CORBA_OpDescriptionSeq::CORBA_OpDescriptionSeq (CORBA::ULong max, CORBA::ULong length, CORBA_OperationDescription *buffer, CORBA::Boolean release)
+-  : 
+-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+-  _TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq
+-#else /* TAO_USE_SEQUENCE_TEMPLATES */
+-  TAO_Unbounded_Sequence<CORBA_OperationDescription>
+-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+- (max, length, buffer, release)
+-{}
+-CORBA_OpDescriptionSeq::CORBA_OpDescriptionSeq (const CORBA_OpDescriptionSeq &seq) // copy ctor
+-  : 
+-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+-  _TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq
+-#else /* TAO_USE_SEQUENCE_TEMPLATES */
+-  TAO_Unbounded_Sequence<CORBA_OperationDescription>
+-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+- (seq)
+-{}
+-CORBA_OpDescriptionSeq::~CORBA_OpDescriptionSeq (void) // dtor
+-{}
+-void CORBA_OpDescriptionSeq::_tao_any_destructor (void *x)
+-{
+-  CORBA_OpDescriptionSeq *tmp = ACE_static_cast (CORBA_OpDescriptionSeq*,x);
+-  delete tmp;
+-}
+-
+-
+-#endif /* end #if !defined */
+-
 -static const CORBA::Long _oc_CORBA_OpDescriptionSeq[] =
 -{
 -  TAO_ENCAP_BYTE_ORDER, // byte order
@@ -3056,7 +3066,10 @@
 -    0U,
 -
 -};
--
++// *************************************************************
++// CORBA_RepositoryIdSeq
++// *************************************************************
+ 
 -static CORBA::TypeCode _tc_TAO_tc_CORBA_OpDescriptionSeq (
 -    CORBA::tk_alias,
 -    sizeof (_oc_CORBA_OpDescriptionSeq),
@@ -3064,104 +3077,176 @@
 -    0,
 -    sizeof (CORBA_OpDescriptionSeq)
 -  );
--
++CORBA_RepositoryIdSeq::CORBA_RepositoryIdSeq (void)
++{}
++CORBA_RepositoryIdSeq::CORBA_RepositoryIdSeq (CORBA::ULong max) // uses max size
++  : 
++#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
++  TAO_Unbounded_String_Sequence
++#else /* TAO_USE_SEQUENCE_TEMPLATES */
++  TAO_Unbounded_String_Sequence
++#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
++ (max)
++{}
++CORBA_RepositoryIdSeq::CORBA_RepositoryIdSeq (CORBA::ULong max, CORBA::ULong length, char * *buffer, CORBA::Boolean release)
++  : 
++#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
++  TAO_Unbounded_String_Sequence
++#else /* TAO_USE_SEQUENCE_TEMPLATES */
++  TAO_Unbounded_String_Sequence
++#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
++ (max, length, buffer, release)
++{}
++CORBA_RepositoryIdSeq::CORBA_RepositoryIdSeq (const CORBA_RepositoryIdSeq &seq) // copy ctor
++  : 
++#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
++  TAO_Unbounded_String_Sequence
++#else /* TAO_USE_SEQUENCE_TEMPLATES */
++  TAO_Unbounded_String_Sequence
++#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
++ (seq)
++{}
++CORBA_RepositoryIdSeq::~CORBA_RepositoryIdSeq (void) // dtor
++{}
++void CORBA_RepositoryIdSeq::_tao_any_destructor (void *x)
++{
++  CORBA_RepositoryIdSeq *tmp = ACE_static_cast (CORBA_RepositoryIdSeq*,x);
++  delete tmp;
++}
+ 
 -CORBA::TypeCode_ptr _tc_CORBA_OpDescriptionSeq =
 -  &_tc_TAO_tc_CORBA_OpDescriptionSeq;
--
--
--#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
--  
+ 
++#endif /* end #if !defined */
+ 
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+   
 -#if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_ATTRDESCRIPTIONSEQ_CS_)
 -#define __TAO_UNBOUNDED_SEQUENCE_CORBA_ATTRDESCRIPTIONSEQ_CS_
--
--  void
++#if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_OPDESCRIPTIONSEQ_CS_)
++#define __TAO_UNBOUNDED_SEQUENCE_CORBA_OPDESCRIPTIONSEQ_CS_
+ 
+   void
 -  _TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq::_allocate_buffer (CORBA::ULong length)
-+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-+  
-+#if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_ATTRDESCRIPTIONSEQ_CS_)
-+#define __TAO_UNBOUNDED_SEQUENCE_CORBA_ATTRDESCRIPTIONSEQ_CS_
-+
-+  void
-+  _TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq::_allocate_buffer (CORBA::ULong length)
++  _TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq::_allocate_buffer (CORBA::ULong length)
    {
-     CORBA_AttributeDescription* tmp = 0;
-     tmp = _TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq::allocbuf (length);
-@@ -26017,198 +23841,75 @@
+-    CORBA_AttributeDescription* tmp = 0;
+-    tmp = _TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq::allocbuf (length);
++    CORBA_OperationDescription* tmp = 0;
++    tmp = _TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq::allocbuf (length);
+     
+     if (this->buffer_ != 0)
+     {
+-      CORBA_AttributeDescription *old = ACE_reinterpret_cast (CORBA_AttributeDescription *,this->buffer_);
++      CORBA_OperationDescription *old = ACE_reinterpret_cast (CORBA_OperationDescription *,this->buffer_);
+       
+       for (CORBA::ULong i = 0; i < this->length_; ++i)
+         tmp[i] = old[i];
+       
+       if (this->release_)
+-        _TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq::freebuf (old);
++        _TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq::freebuf (old);
+       
+     }
      this->buffer_ = tmp;
    }
    
--  void
+   void
 -  _TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq::_deallocate_buffer (void)
--  {
--    if (this->buffer_ == 0 || this->release_ == 0)
--      return;
--    
++  _TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq::_deallocate_buffer (void)
+   {
+     if (this->buffer_ == 0 || this->release_ == 0)
+       return;
+     
 -    CORBA_AttributeDescription *tmp = ACE_reinterpret_cast (CORBA_AttributeDescription *,this->buffer_);
--    
++    CORBA_OperationDescription *tmp = ACE_reinterpret_cast (CORBA_OperationDescription *,this->buffer_);
+     
 -    _TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq::freebuf (tmp);
--    this->buffer_ = 0;
--  } 
--  
++    _TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq::freebuf (tmp);
+     this->buffer_ = 0;
+   } 
+   
 -  _TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq::~_TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq (void) // Dtor.
--  {
--    this->_deallocate_buffer ();
--  }
--  
--  
--#endif /* end #if !defined */
--
--
--#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
--
++  _TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq::~_TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq (void) // Dtor.
+   {
+     this->_deallocate_buffer ();
+   }
+@@ -26040,175 +23769,147 @@
+ 
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+ 
 -#if !defined (_CORBA_ATTRDESCRIPTIONSEQ_CS_)
 -#define _CORBA_ATTRDESCRIPTIONSEQ_CS_
--
--// *************************************************************
++#if !defined (_CORBA_OPDESCRIPTIONSEQ_CS_)
++#define _CORBA_OPDESCRIPTIONSEQ_CS_
+ 
+ // *************************************************************
 -// CORBA_AttrDescriptionSeq
--// *************************************************************
--
++// CORBA_OpDescriptionSeq
+ // *************************************************************
+ 
 -CORBA_AttrDescriptionSeq::CORBA_AttrDescriptionSeq (void)
--{}
++CORBA_OpDescriptionSeq::CORBA_OpDescriptionSeq (void)
+ {}
 -CORBA_AttrDescriptionSeq::CORBA_AttrDescriptionSeq (CORBA::ULong max) // uses max size
--  : 
--#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
++CORBA_OpDescriptionSeq::CORBA_OpDescriptionSeq (CORBA::ULong max) // uses max size
+   : 
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 -  _TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq
--#else /* TAO_USE_SEQUENCE_TEMPLATES */
++  _TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq
+ #else /* TAO_USE_SEQUENCE_TEMPLATES */
 -  TAO_Unbounded_Sequence<CORBA_AttributeDescription>
--#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-- (max)
--{}
++  TAO_Unbounded_Sequence<CORBA_OperationDescription>
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+  (max)
+ {}
 -CORBA_AttrDescriptionSeq::CORBA_AttrDescriptionSeq (CORBA::ULong max, CORBA::ULong length, CORBA_AttributeDescription *buffer, CORBA::Boolean release)
--  : 
--#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
++CORBA_OpDescriptionSeq::CORBA_OpDescriptionSeq (CORBA::ULong max, CORBA::ULong length, CORBA_OperationDescription *buffer, CORBA::Boolean release)
+   : 
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 -  _TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq
--#else /* TAO_USE_SEQUENCE_TEMPLATES */
++  _TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq
+ #else /* TAO_USE_SEQUENCE_TEMPLATES */
 -  TAO_Unbounded_Sequence<CORBA_AttributeDescription>
--#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-- (max, length, buffer, release)
--{}
++  TAO_Unbounded_Sequence<CORBA_OperationDescription>
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+  (max, length, buffer, release)
+ {}
 -CORBA_AttrDescriptionSeq::CORBA_AttrDescriptionSeq (const CORBA_AttrDescriptionSeq &seq) // copy ctor
--  : 
--#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
++CORBA_OpDescriptionSeq::CORBA_OpDescriptionSeq (const CORBA_OpDescriptionSeq &seq) // copy ctor
+   : 
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
 -  _TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq
--#else /* TAO_USE_SEQUENCE_TEMPLATES */
++  _TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq
+ #else /* TAO_USE_SEQUENCE_TEMPLATES */
 -  TAO_Unbounded_Sequence<CORBA_AttributeDescription>
--#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-- (seq)
--{}
++  TAO_Unbounded_Sequence<CORBA_OperationDescription>
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+  (seq)
+ {}
 -CORBA_AttrDescriptionSeq::~CORBA_AttrDescriptionSeq (void) // dtor
--{}
++CORBA_OpDescriptionSeq::~CORBA_OpDescriptionSeq (void) // dtor
+ {}
 -void CORBA_AttrDescriptionSeq::_tao_any_destructor (void *x)
--{
++void CORBA_OpDescriptionSeq::_tao_any_destructor (void *x)
+ {
 -  CORBA_AttrDescriptionSeq *tmp = ACE_static_cast (CORBA_AttrDescriptionSeq*,x);
--  delete tmp;
--}
--
--
--#endif /* end #if !defined */
--
++  CORBA_OpDescriptionSeq *tmp = ACE_static_cast (CORBA_OpDescriptionSeq*,x);
+   delete tmp;
+ }
+ 
+ 
+ #endif /* end #if !defined */
+ 
 -static const CORBA::Long _oc_CORBA_AttrDescriptionSeq[] =
--{
++#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
++  
++#if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_ATTRDESCRIPTIONSEQ_CS_)
++#define __TAO_UNBOUNDED_SEQUENCE_CORBA_ATTRDESCRIPTIONSEQ_CS_
++
++  void
++  _TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq::_allocate_buffer (CORBA::ULong length)
+ {
 -  TAO_ENCAP_BYTE_ORDER, // byte order
 -  41,
 -  ACE_NTOHL (0x49444c3a), 
@@ -3234,7 +3319,9 @@
 -      ACE_NTOHL (0x74797065), 
 -      ACE_NTOHL (0x0),  // name = type
 -      CORBA::tk_TypeCode,
--
++    CORBA_AttributeDescription* tmp = 0;
++    tmp = _TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq::allocbuf (length);
+ 
 -      5,
 -      ACE_NTOHL (0x6d6f6465), 
 -      ACE_NTOHL (0x0),  // name = mode
@@ -3266,25 +3353,34 @@
 -        ACE_NTOHL (0x5f524541), 
 -        ACE_NTOHL (0x444f4e4c), 
 -        ACE_NTOHL (0x59000000),  // name = ATTR_READONLY
++    if (this->buffer_ != 0)
++    {
++      CORBA_AttributeDescription *old = ACE_reinterpret_cast (CORBA_AttributeDescription *,this->buffer_);
++      
++      for (CORBA::ULong i = 0; i < this->length_; ++i)
++        tmp[i] = old[i];
++      
++      if (this->release_)
++        _TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq::freebuf (old);
++      
++    }
++    this->buffer_ = tmp;
++  }
+ 
 +  void
 +  _TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq::_deallocate_buffer (void)
 +  {
 +    if (this->buffer_ == 0 || this->release_ == 0)
 +      return;
  
+-    0U,
 +    CORBA_AttributeDescription *tmp = ACE_reinterpret_cast (CORBA_AttributeDescription *,this->buffer_);
  
--    0U,
+-};
 +    _TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq::freebuf (tmp);
 +    this->buffer_ = 0;
 +  } 
  
--};
-+  _TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq::~_TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq (void) // Dtor.
-+  {
-+    this->_deallocate_buffer ();
-+  }
- 
 -static CORBA::TypeCode _tc_TAO_tc_CORBA_AttrDescriptionSeq (
 -    CORBA::tk_alias,
 -    sizeof (_oc_CORBA_AttrDescriptionSeq),
@@ -3292,9 +3388,12 @@
 -    0,
 -    sizeof (CORBA_AttrDescriptionSeq)
 -  );
- 
--CORBA::TypeCode_ptr _tc_CORBA_AttrDescriptionSeq =
--  &_tc_TAO_tc_CORBA_AttrDescriptionSeq;
++  _TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq::~_TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq (void) // Dtor.
++  {
++    this->_deallocate_buffer ();
++  }
++  
++  
 +#endif /* end #if !defined */
 +
 +
@@ -3343,7 +3442,9 @@
 +  CORBA_AttrDescriptionSeq *tmp = ACE_static_cast (CORBA_AttrDescriptionSeq*,x);
 +  delete tmp;
 +}
-+
+ 
+-CORBA::TypeCode_ptr _tc_CORBA_AttrDescriptionSeq =
+-  &_tc_TAO_tc_CORBA_AttrDescriptionSeq;
 +
 +#endif /* end #if !defined */
  
@@ -3913,17 +4014,7 @@
                43,
                ACE_NTOHL (0x49444c3a), 
                ACE_NTOHL (0x6f6d672e), 
--              ACE_NTOHL (0x6f72672f), 
--              ACE_NTOHL (0x434f5242), 
--              ACE_NTOHL (0x415f4578), 
--              ACE_NTOHL (0x63657074), 
--              ACE_NTOHL (0x696f6e44), 
--              ACE_NTOHL (0x65736372), 
--              ACE_NTOHL (0x69707469), 
--              ACE_NTOHL (0x6f6e3a31), 
--              ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA_ExceptionDescription:1.0
--              27,
-+              ACE_NTOHL (0x6f72672f), 
+               ACE_NTOHL (0x6f72672f), 
                ACE_NTOHL (0x434f5242), 
 -              ACE_NTOHL (0x415f4578), 
 +              ACE_NTOHL (0x412f4578), 
@@ -3931,8 +4022,16 @@
                ACE_NTOHL (0x696f6e44), 
                ACE_NTOHL (0x65736372), 
                ACE_NTOHL (0x69707469), 
+               ACE_NTOHL (0x6f6e3a31), 
+-              ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA_ExceptionDescription:1.0
+-              27,
+-              ACE_NTOHL (0x434f5242), 
+-              ACE_NTOHL (0x415f4578), 
+-              ACE_NTOHL (0x63657074), 
+-              ACE_NTOHL (0x696f6e44), 
+-              ACE_NTOHL (0x65736372), 
+-              ACE_NTOHL (0x69707469), 
 -              ACE_NTOHL (0x6f6e0000),  // name = CORBA_ExceptionDescription
-+              ACE_NTOHL (0x6f6e3a31), 
 +              ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ExceptionDescription:1.0
 +              21,
 +              ACE_NTOHL (0x45786365), 
@@ -4268,10 +4367,15 @@
        0U,
  
  
-@@ -29078,161 +27137,38 @@
-     );
- }
- 
+@@ -29073,166 +27132,43 @@
+       name,
+       version,
+       type,
+-      mode,
+-      ACE_TRY_ENV
+-    );
+-}
+-
 -CORBA_OperationDef_ptr CORBA_InterfaceDef::create_operation (
 -    const char * id,
 -    const char * name,
@@ -4414,7 +4518,11 @@
 -      0U, // string length
 -      0U,
 -
--
++      mode,
++      ACE_TRY_ENV
++    );
++}
+ 
 -};
 +CORBA_OperationDef_ptr CORBA_InterfaceDef::create_operation (
 +    const char * id,
diff --git a/TAO/tao/IFR_Client/diffs/IFR_ComponentsC.cpp.diff b/TAO/tao/IFR_Client/diffs/IFR_ComponentsC.cpp.diff
index 5c9a785da3a..704fc1660a1 100644
--- a/TAO/tao/IFR_Client/diffs/IFR_ComponentsC.cpp.diff
+++ b/TAO/tao/IFR_Client/diffs/IFR_ComponentsC.cpp.diff
@@ -1,5 +1,5 @@
 --- orig/IFR_ComponentsC.cpp	Tue Apr 24 23:26:05 2001
-+++ IFR_ComponentsC.cpp	Thu May 10 20:29:15 2001
++++ IFR_ComponentsC.cpp	Fri May 11 01:22:20 2001
 @@ -1,6 +1,6 @@
  // -*- C++ -*-
  //
@@ -41,7 +41,40 @@
      (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
    return 1; // success using local knowledge
    else
-@@ -5069,8 +5067,8 @@
+@@ -4124,24 +4122,23 @@
+   ACE_NTOHL (0x655f7479), 
+   ACE_NTOHL (0x70650000),  // name = interface_type
+   CORBA::tk_objref, // typecode kind
+-  68, // encapsulation length
++  64, // encapsulation length
+     TAO_ENCAP_BYTE_ORDER, // byte order
+     35,
+     ACE_NTOHL (0x49444c3a), 
+     ACE_NTOHL (0x6f6d672e), 
+     ACE_NTOHL (0x6f72672f), 
+     ACE_NTOHL (0x434f5242), 
+-    ACE_NTOHL (0x415f496e), 
++    ACE_NTOHL (0x412f496e), 
+     ACE_NTOHL (0x74657266), 
+     ACE_NTOHL (0x61636544), 
+     ACE_NTOHL (0x65663a31), 
+-    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA_InterfaceDef:1.0
+-    19,
+-    ACE_NTOHL (0x434f5242), 
+-    ACE_NTOHL (0x415f496e), 
+-    ACE_NTOHL (0x74657266), 
+-    ACE_NTOHL (0x61636544), 
+-    ACE_NTOHL (0x65660000),  // name = CORBA_InterfaceDef
++    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/InterfaceDef:1.0
++    13,
++    ACE_NTOHL (0x496e7465), 
++    ACE_NTOHL (0x72666163), 
++    ACE_NTOHL (0x65446566), 
++    ACE_NTOHL (0x0),  // name = InterfaceDef
+ 
+ };
+ 
+@@ -5069,8 +5066,8 @@
  {
    if (
      (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/UsesDef:1.0")) ||
@@ -52,7 +85,132 @@
      (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
    return 1; // success using local knowledge
    else
-@@ -6818,8 +6816,8 @@
+@@ -5300,24 +5297,23 @@
+   ACE_NTOHL (0x655f7479), 
+   ACE_NTOHL (0x70650000),  // name = interface_type
+   CORBA::tk_objref, // typecode kind
+-  68, // encapsulation length
++  64, // encapsulation length
+     TAO_ENCAP_BYTE_ORDER, // byte order
+     35,
+     ACE_NTOHL (0x49444c3a), 
+     ACE_NTOHL (0x6f6d672e), 
+     ACE_NTOHL (0x6f72672f), 
+     ACE_NTOHL (0x434f5242), 
+-    ACE_NTOHL (0x415f496e), 
++    ACE_NTOHL (0x412f496e), 
+     ACE_NTOHL (0x74657266), 
+     ACE_NTOHL (0x61636544), 
+     ACE_NTOHL (0x65663a31), 
+-    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA_InterfaceDef:1.0
+-    19,
+-    ACE_NTOHL (0x434f5242), 
+-    ACE_NTOHL (0x415f496e), 
+-    ACE_NTOHL (0x74657266), 
+-    ACE_NTOHL (0x61636544), 
+-    ACE_NTOHL (0x65660000),  // name = CORBA_InterfaceDef
++    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/InterfaceDef:1.0
++    13,
++    ACE_NTOHL (0x496e7465), 
++    ACE_NTOHL (0x72666163), 
++    ACE_NTOHL (0x65446566), 
++    ACE_NTOHL (0x0),  // name = InterfaceDef
+ 
+   12,
+   ACE_NTOHL (0x69735f6d), 
+@@ -5461,10 +5457,10 @@
+   ACE_NTOHL (0x44657363), 
+   ACE_NTOHL (0x53657100),  // name = ProvidesDescSeq
+   CORBA::tk_sequence, // typecode kind
+-  532, // encapsulation length
++  528, // encapsulation length
+     TAO_ENCAP_BYTE_ORDER, // byte order
+     CORBA::tk_struct, // typecode kind
+-    516, // encapsulation length
++    512, // encapsulation length
+       TAO_ENCAP_BYTE_ORDER, // byte order
+       39,
+       ACE_NTOHL (0x49444c3a), 
+@@ -5580,24 +5576,23 @@
+       ACE_NTOHL (0x655f7479), 
+       ACE_NTOHL (0x70650000),  // name = interface_type
+       CORBA::tk_objref, // typecode kind
+-      68, // encapsulation length
++      64, // encapsulation length
+         TAO_ENCAP_BYTE_ORDER, // byte order
+         35,
+         ACE_NTOHL (0x49444c3a), 
+         ACE_NTOHL (0x6f6d672e), 
+         ACE_NTOHL (0x6f72672f), 
+         ACE_NTOHL (0x434f5242), 
+-        ACE_NTOHL (0x415f496e), 
++        ACE_NTOHL (0x412f496e), 
+         ACE_NTOHL (0x74657266), 
+         ACE_NTOHL (0x61636544), 
+         ACE_NTOHL (0x65663a31), 
+-        ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA_InterfaceDef:1.0
+-        19,
+-        ACE_NTOHL (0x434f5242), 
+-        ACE_NTOHL (0x415f496e), 
+-        ACE_NTOHL (0x74657266), 
+-        ACE_NTOHL (0x61636544), 
+-        ACE_NTOHL (0x65660000),  // name = CORBA_InterfaceDef
++        ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/InterfaceDef:1.0
++        13,
++        ACE_NTOHL (0x496e7465), 
++        ACE_NTOHL (0x72666163), 
++        ACE_NTOHL (0x65446566), 
++        ACE_NTOHL (0x0),  // name = InterfaceDef
+ 
+ 
+     0U,
+@@ -5730,10 +5725,10 @@
+   ACE_NTOHL (0x44657363), 
+   ACE_NTOHL (0x53657100),  // name = UsesDescSeq
+   CORBA::tk_sequence, // typecode kind
+-  544, // encapsulation length
++  540, // encapsulation length
+     TAO_ENCAP_BYTE_ORDER, // byte order
+     CORBA::tk_struct, // typecode kind
+-    528, // encapsulation length
++    524, // encapsulation length
+       TAO_ENCAP_BYTE_ORDER, // byte order
+       35,
+       ACE_NTOHL (0x49444c3a), 
+@@ -5847,24 +5842,23 @@
+       ACE_NTOHL (0x655f7479), 
+       ACE_NTOHL (0x70650000),  // name = interface_type
+       CORBA::tk_objref, // typecode kind
+-      68, // encapsulation length
++      64, // encapsulation length
+         TAO_ENCAP_BYTE_ORDER, // byte order
+         35,
+         ACE_NTOHL (0x49444c3a), 
+         ACE_NTOHL (0x6f6d672e), 
+         ACE_NTOHL (0x6f72672f), 
+         ACE_NTOHL (0x434f5242), 
+-        ACE_NTOHL (0x415f496e), 
++        ACE_NTOHL (0x412f496e), 
+         ACE_NTOHL (0x74657266), 
+         ACE_NTOHL (0x61636544), 
+         ACE_NTOHL (0x65663a31), 
+-        ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA_InterfaceDef:1.0
+-        19,
+-        ACE_NTOHL (0x434f5242), 
+-        ACE_NTOHL (0x415f496e), 
+-        ACE_NTOHL (0x74657266), 
+-        ACE_NTOHL (0x61636544), 
+-        ACE_NTOHL (0x65660000),  // name = CORBA_InterfaceDef
++        ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/InterfaceDef:1.0
++        13,
++        ACE_NTOHL (0x496e7465), 
++        ACE_NTOHL (0x72666163), 
++        ACE_NTOHL (0x65446566), 
++        ACE_NTOHL (0x0),  // name = InterfaceDef
+ 
+       12,
+       ACE_NTOHL (0x69735f6d), 
+@@ -6818,8 +6812,8 @@
  {
    if (
      (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/EventDef:1.0")) ||
@@ -63,7 +221,37 @@
      (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
    return 1; // success using local knowledge
    else
-@@ -7491,8 +7489,8 @@
+@@ -7051,22 +7045,21 @@
+   ACE_NTOHL (0x76616c75), 
+   ACE_NTOHL (0x65000000),  // name = value
+   CORBA::tk_objref, // typecode kind
+-  60, // encapsulation length
++  56, // encapsulation length
+     TAO_ENCAP_BYTE_ORDER, // byte order
+     31,
+     ACE_NTOHL (0x49444c3a), 
+     ACE_NTOHL (0x6f6d672e), 
+     ACE_NTOHL (0x6f72672f), 
+     ACE_NTOHL (0x434f5242), 
+-    ACE_NTOHL (0x415f5661), 
++    ACE_NTOHL (0x412f5661), 
+     ACE_NTOHL (0x6c756544), 
+     ACE_NTOHL (0x65663a31), 
+-    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA_ValueDef:1.0
+-    15,
+-    ACE_NTOHL (0x434f5242), 
+-    ACE_NTOHL (0x415f5661), 
+-    ACE_NTOHL (0x6c756544), 
+-    ACE_NTOHL (0x65660000),  // name = CORBA_ValueDef
++    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ValueDef:1.0
++    9,
++    ACE_NTOHL (0x56616c75), 
++    ACE_NTOHL (0x65446566), 
++    ACE_NTOHL (0x0),  // name = ValueDef
+ 
+ };
+ 
+@@ -7491,8 +7484,8 @@
    if (
      (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/EmitsDef:1.0")) ||
      (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/EventDef:1.0")) ||
@@ -74,7 +262,7 @@
      (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
    return 1; // success using local knowledge
    else
-@@ -7988,8 +7986,8 @@
+@@ -7988,8 +7981,8 @@
    if (
      (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/PublishesDef:1.0")) ||
      (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/EventDef:1.0")) ||
@@ -85,7 +273,7 @@
      (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
    return 1; // success using local knowledge
    else
-@@ -8487,8 +8485,8 @@
+@@ -8487,8 +8480,8 @@
    if (
      (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/ConsumesDef:1.0")) ||
      (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/EventDef:1.0")) ||
@@ -96,14 +284,16 @@
      (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
    return 1; // success using local knowledge
    else
-@@ -12835,10 +12833,10 @@
+@@ -12834,11 +12827,11 @@
+ {
    if (
      (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/ComponentDef:1.0")) ||
-     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_InterfaceDef:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_InterfaceDef:1.0")) ||
 -    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Container:1.0")) ||
 -    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) ||
 -    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IDLType:1.0")) ||
 -    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/InterfaceDef:1.0")) ||
 +    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Container:1.0")) ||
 +    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) ||
 +    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) ||
@@ -111,62 +301,674 @@
      (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
    return 1; // success using local knowledge
    else
-@@ -13521,7 +13519,7 @@
+@@ -13521,75 +13514,146 @@
    ACE_NTOHL (0x69627574), 
    ACE_NTOHL (0x65730000),  // name = attributes
    CORBA::tk_alias, // typecode kind for typedefs
 -  416, // encapsulation length
-+  420, // encapsulation length
++  1852, // encapsulation length
      TAO_ENCAP_BYTE_ORDER, // byte order
      41,
      ACE_NTOHL (0x49444c3a), 
-@@ -13544,10 +13542,10 @@
+     ACE_NTOHL (0x6f6d672e), 
+     ACE_NTOHL (0x6f72672f), 
+     ACE_NTOHL (0x434f5242), 
+-    ACE_NTOHL (0x415f4174), 
++    ACE_NTOHL (0x412f4174), 
+     ACE_NTOHL (0x74724465), 
+     ACE_NTOHL (0x73637269), 
+     ACE_NTOHL (0x7074696f), 
      ACE_NTOHL (0x6e536571), 
-     ACE_NTOHL (0x0),  // name = CORBA_AttrDescriptionSeq
+     ACE_NTOHL (0x3a312e30), 
+-    ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA_AttrDescriptionSeq:1.0
+-    25,
+-    ACE_NTOHL (0x434f5242), 
+-    ACE_NTOHL (0x415f4174), 
+-    ACE_NTOHL (0x74724465), 
+-    ACE_NTOHL (0x73637269), 
+-    ACE_NTOHL (0x7074696f), 
+-    ACE_NTOHL (0x6e536571), 
+-    ACE_NTOHL (0x0),  // name = CORBA_AttrDescriptionSeq
++    ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/AttrDescriptionSeq:1.0
++    19,
++    ACE_NTOHL (0x41747472), 
++    ACE_NTOHL (0x44657363), 
++    ACE_NTOHL (0x72697074), 
++    ACE_NTOHL (0x696f6e53), 
++    ACE_NTOHL (0x65710000),  // name = AttrDescriptionSeq
      CORBA::tk_sequence, // typecode kind
 -    324, // encapsulation length
-+    328, // encapsulation length
++    1768, // encapsulation length
        TAO_ENCAP_BYTE_ORDER, // byte order
        CORBA::tk_struct, // typecode kind
 -      308, // encapsulation length
-+      312, // encapsulation length
++      1752, // encapsulation length
          TAO_ENCAP_BYTE_ORDER, // byte order
          43,
          ACE_NTOHL (0x49444c3a), 
-@@ -13599,23 +13597,24 @@
-         ACE_NTOHL (0x6d6f6465), 
-         ACE_NTOHL (0x0),  // name = mode
-         CORBA::tk_enum, // typecode kind
--        104, // encapsulation length
-+        108, // encapsulation length
-           TAO_ENCAP_BYTE_ORDER, // byte order
-           36,
-           ACE_NTOHL (0x49444c3a), 
-           ACE_NTOHL (0x6f6d672e), 
-           ACE_NTOHL (0x6f72672f), 
-           ACE_NTOHL (0x434f5242), 
--          ACE_NTOHL (0x412f4174), 
-+          ACE_NTOHL (0x415f4174), 
-           ACE_NTOHL (0x74726962), 
-           ACE_NTOHL (0x7574654d), 
-           ACE_NTOHL (0x6f64653a), 
--          ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/AttributeMode:1.0
--          14,
--          ACE_NTOHL (0x41747472), 
--          ACE_NTOHL (0x69627574), 
--          ACE_NTOHL (0x654d6f64), 
--          ACE_NTOHL (0x65000000),  // name = AttributeMode
-+          ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA_AttributeMode:1.0
-+          20,
+         ACE_NTOHL (0x6f6d672e), 
+         ACE_NTOHL (0x6f72672f), 
+         ACE_NTOHL (0x434f5242), 
+-        ACE_NTOHL (0x415f4174), 
++        ACE_NTOHL (0x412f4174), 
+         ACE_NTOHL (0x74726962), 
+         ACE_NTOHL (0x75746544), 
+         ACE_NTOHL (0x65736372), 
+         ACE_NTOHL (0x69707469), 
+         ACE_NTOHL (0x6f6e3a31), 
+-        ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA_AttributeDescription:1.0
+-        27,
+-        ACE_NTOHL (0x434f5242), 
+-        ACE_NTOHL (0x415f4174), 
+-        ACE_NTOHL (0x74726962), 
+-        ACE_NTOHL (0x75746544), 
+-        ACE_NTOHL (0x65736372), 
+-        ACE_NTOHL (0x69707469), 
+-        ACE_NTOHL (0x6f6e0000),  // name = CORBA_AttributeDescription
+-        6, // member count
++        ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/AttributeDescription:1.0
++        21,
++        ACE_NTOHL (0x41747472), 
++        ACE_NTOHL (0x69627574), 
++        ACE_NTOHL (0x65446573), 
++        ACE_NTOHL (0x63726970), 
++        ACE_NTOHL (0x74696f6e), 
++        ACE_NTOHL (0x0),  // name = AttributeDescription
++        8, // member count
+         5,
+         ACE_NTOHL (0x6e616d65), 
+         ACE_NTOHL (0x0),  // name = name
++        CORBA::tk_alias, // typecode kind for typedefs
++        68, // encapsulation length
++          TAO_ENCAP_BYTE_ORDER, // byte order
++          33,
++          ACE_NTOHL (0x49444c3a), 
++          ACE_NTOHL (0x6f6d672e), 
++          ACE_NTOHL (0x6f72672f), 
 +          ACE_NTOHL (0x434f5242), 
-+          ACE_NTOHL (0x415f4174), 
-+          ACE_NTOHL (0x74726962), 
-+          ACE_NTOHL (0x7574654d), 
-+          ACE_NTOHL (0x6f646500),  // name = CORBA_AttributeMode
-           2, // member count
-           12,
-           ACE_NTOHL (0x41545452), 
-@@ -14723,8 +14722,8 @@
++          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
++
+         3,
+         ACE_NTOHL (0x69640000),  // name = id
++        CORBA::tk_alias, // typecode kind for typedefs
++        72, // encapsulation length
++          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
++
+         11,
+         ACE_NTOHL (0x64656669), 
+         ACE_NTOHL (0x6e65645f), 
+         ACE_NTOHL (0x696e0000),  // name = defined_in
++        CORBA::tk_alias, // typecode kind for typedefs
++        72, // encapsulation length
++          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
++
+         8,
+         ACE_NTOHL (0x76657273), 
+         ACE_NTOHL (0x696f6e00),  // name = version
++        CORBA::tk_alias, // typecode kind for typedefs
++        68, // encapsulation length
++          TAO_ENCAP_BYTE_ORDER, // byte order
++          34,
++          ACE_NTOHL (0x49444c3a), 
++          ACE_NTOHL (0x6f6d672e), 
++          ACE_NTOHL (0x6f72672f), 
++          ACE_NTOHL (0x434f5242), 
++          ACE_NTOHL (0x412f5665), 
++          ACE_NTOHL (0x7273696f), 
++          ACE_NTOHL (0x6e537065), 
++          ACE_NTOHL (0x633a312e), 
++          ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
++          12,
++          ACE_NTOHL (0x56657273), 
++          ACE_NTOHL (0x696f6e53), 
++          ACE_NTOHL (0x70656300),  // name = VersionSpec
+         CORBA::tk_string, 
+         0U, // string length
++
+         5,
+         ACE_NTOHL (0x74797065), 
+         ACE_NTOHL (0x0),  // name = type
+@@ -13627,108 +13691,416 @@
+           ACE_NTOHL (0x444f4e4c), 
+           ACE_NTOHL (0x59000000),  // name = ATTR_READONLY
+ 
+-
+-      0U,
+-
+-
+-  13,
+-  ACE_NTOHL (0x656d6974), 
+-  ACE_NTOHL (0x735f6576), 
+-  ACE_NTOHL (0x656e7473), 
+-  ACE_NTOHL (0x0),  // name = emits_events
++        15,
++        ACE_NTOHL (0x6765745f), 
++        ACE_NTOHL (0x65786365), 
++        ACE_NTOHL (0x7074696f), 
++        ACE_NTOHL (0x6e730000),  // name = get_exceptions
+   CORBA::tk_alias, // typecode kind for typedefs
+-  132, // encapsulation length
++        556, // encapsulation length
+     TAO_ENCAP_BYTE_ORDER, // byte order
+-    31,
++          40,
+     ACE_NTOHL (0x49444c3a), 
+     ACE_NTOHL (0x6f6d672e), 
+     ACE_NTOHL (0x6f72672f), 
+-    ACE_NTOHL (0x49522f45), 
+-    ACE_NTOHL (0x6d697473), 
+-    ACE_NTOHL (0x44656653), 
+-    ACE_NTOHL (0x65713a31), 
+-    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IR/EmitsDefSeq:1.0
+-    12,
+-    ACE_NTOHL (0x456d6974), 
+-    ACE_NTOHL (0x73446566), 
+-    ACE_NTOHL (0x53657100),  // name = EmitsDefSeq
++          ACE_NTOHL (0x434f5242), 
++          ACE_NTOHL (0x412f4578), 
++          ACE_NTOHL (0x63446573), 
++          ACE_NTOHL (0x63726970), 
++          ACE_NTOHL (0x74696f6e), 
++          ACE_NTOHL (0x5365713a), 
++          ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ExcDescriptionSeq:1.0
++          18,
++          ACE_NTOHL (0x45786344), 
++          ACE_NTOHL (0x65736372), 
++          ACE_NTOHL (0x69707469), 
++          ACE_NTOHL (0x6f6e5365), 
++          ACE_NTOHL (0x71000000),  // name = ExcDescriptionSeq
+     CORBA::tk_sequence, // typecode kind
+-    68, // encapsulation length
++          476, // encapsulation length
+       TAO_ENCAP_BYTE_ORDER, // byte order
+-      CORBA::tk_objref, // typecode kind
+-      52, // encapsulation length
++            CORBA::tk_struct, // typecode kind
++            460, // encapsulation length
+         TAO_ENCAP_BYTE_ORDER, // byte order
+-        28,
++              43,
+         ACE_NTOHL (0x49444c3a), 
+         ACE_NTOHL (0x6f6d672e), 
+         ACE_NTOHL (0x6f72672f), 
+-        ACE_NTOHL (0x49522f45), 
+-        ACE_NTOHL (0x6d697473), 
+-        ACE_NTOHL (0x4465663a), 
+-        ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IR/EmitsDef:1.0
+-        9,
+-        ACE_NTOHL (0x456d6974), 
+-        ACE_NTOHL (0x73446566), 
+-        ACE_NTOHL (0x0),  // name = EmitsDef
+-
+-      0U,
+-
+-
+-  17,
+-  ACE_NTOHL (0x7075626c), 
+-  ACE_NTOHL (0x69736865), 
+-  ACE_NTOHL (0x735f6576), 
+-  ACE_NTOHL (0x656e7473), 
+-  ACE_NTOHL (0x0),  // name = publishes_events
++              ACE_NTOHL (0x434f5242), 
++              ACE_NTOHL (0x412f4578), 
++              ACE_NTOHL (0x63657074), 
++              ACE_NTOHL (0x696f6e44), 
++              ACE_NTOHL (0x65736372), 
++              ACE_NTOHL (0x69707469), 
++              ACE_NTOHL (0x6f6e3a31), 
++              ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ExceptionDescription:1.0
++              21,
++              ACE_NTOHL (0x45786365), 
++              ACE_NTOHL (0x7074696f), 
++              ACE_NTOHL (0x6e446573), 
++              ACE_NTOHL (0x63726970), 
++              ACE_NTOHL (0x74696f6e), 
++              ACE_NTOHL (0x0),  // name = ExceptionDescription
++              5, // member count
++              5,
++              ACE_NTOHL (0x6e616d65), 
++              ACE_NTOHL (0x0),  // name = name
+   CORBA::tk_alias, // typecode kind for typedefs
+-  148, // encapsulation length
++              68, // encapsulation length
+     TAO_ENCAP_BYTE_ORDER, // byte order
+-    35,
++                33,
+     ACE_NTOHL (0x49444c3a), 
+     ACE_NTOHL (0x6f6d672e), 
+     ACE_NTOHL (0x6f72672f), 
+-    ACE_NTOHL (0x49522f50), 
+-    ACE_NTOHL (0x75626c69), 
+-    ACE_NTOHL (0x73686573), 
+-    ACE_NTOHL (0x44656653), 
+-    ACE_NTOHL (0x65713a31), 
+-    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IR/PublishesDefSeq:1.0
+-    16,
+-    ACE_NTOHL (0x5075626c), 
+-    ACE_NTOHL (0x69736865), 
+-    ACE_NTOHL (0x73446566), 
+-    ACE_NTOHL (0x53657100),  // name = PublishesDefSeq
+-    CORBA::tk_sequence, // typecode kind
+-    76, // encapsulation length
+-      TAO_ENCAP_BYTE_ORDER, // byte order
+-      CORBA::tk_objref, // typecode kind
+-      60, // encapsulation length
++                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
++
++              3,
++              ACE_NTOHL (0x69640000),  // name = id
++              CORBA::tk_alias, // typecode kind for typedefs
++              72, // encapsulation length
+         TAO_ENCAP_BYTE_ORDER, // byte order
+-        32,
++                35,
+         ACE_NTOHL (0x49444c3a), 
+         ACE_NTOHL (0x6f6d672e), 
+         ACE_NTOHL (0x6f72672f), 
+-        ACE_NTOHL (0x49522f50), 
+-        ACE_NTOHL (0x75626c69), 
+-        ACE_NTOHL (0x73686573), 
+-        ACE_NTOHL (0x4465663a), 
+-        ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IR/PublishesDef:1.0
++                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 (0x5075626c), 
+-        ACE_NTOHL (0x69736865), 
+-        ACE_NTOHL (0x73446566), 
+-        ACE_NTOHL (0x0),  // name = PublishesDef
+-
+-      0U,
+-
++                ACE_NTOHL (0x5265706f), 
++                ACE_NTOHL (0x7369746f), 
++                ACE_NTOHL (0x72794964), 
++                ACE_NTOHL (0x0),  // name = RepositoryId
++                CORBA::tk_string, 
++                0U, // string length
+ 
+-  16,
+-  ACE_NTOHL (0x636f6e73), 
+-  ACE_NTOHL (0x756d6573), 
+-  ACE_NTOHL (0x5f657665), 
+-  ACE_NTOHL (0x6e747300),  // name = consumes_events
++              11,
++              ACE_NTOHL (0x64656669), 
++              ACE_NTOHL (0x6e65645f), 
++              ACE_NTOHL (0x696e0000),  // name = defined_in
+   CORBA::tk_alias, // typecode kind for typedefs
+-  144, // encapsulation length
++              72, // encapsulation length
++                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
++
++              8,
++              ACE_NTOHL (0x76657273), 
++              ACE_NTOHL (0x696f6e00),  // name = version
++              CORBA::tk_alias, // typecode kind for typedefs
++              68, // encapsulation length
++                TAO_ENCAP_BYTE_ORDER, // byte order
++                34,
++                ACE_NTOHL (0x49444c3a), 
++                ACE_NTOHL (0x6f6d672e), 
++                ACE_NTOHL (0x6f72672f), 
++                ACE_NTOHL (0x434f5242), 
++                ACE_NTOHL (0x412f5665), 
++                ACE_NTOHL (0x7273696f), 
++                ACE_NTOHL (0x6e537065), 
++                ACE_NTOHL (0x633a312e), 
++                ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
++                12,
++                ACE_NTOHL (0x56657273), 
++                ACE_NTOHL (0x696f6e53), 
++                ACE_NTOHL (0x70656300),  // name = VersionSpec
++                CORBA::tk_string, 
++                0U, // string length
++
++              5,
++              ACE_NTOHL (0x74797065), 
++              ACE_NTOHL (0x0),  // name = type
++              CORBA::tk_TypeCode,
++
++
++            0U,
++
++
++        15,
++        ACE_NTOHL (0x7075745f), 
++        ACE_NTOHL (0x65786365), 
++        ACE_NTOHL (0x7074696f), 
++        ACE_NTOHL (0x6e730000),  // name = put_exceptions
++        CORBA::tk_alias, // typecode kind for typedefs
++        556, // encapsulation length
++          TAO_ENCAP_BYTE_ORDER, // byte order
++          40,
++          ACE_NTOHL (0x49444c3a), 
++          ACE_NTOHL (0x6f6d672e), 
++          ACE_NTOHL (0x6f72672f), 
++          ACE_NTOHL (0x434f5242), 
++          ACE_NTOHL (0x412f4578), 
++          ACE_NTOHL (0x63446573), 
++          ACE_NTOHL (0x63726970), 
++          ACE_NTOHL (0x74696f6e), 
++          ACE_NTOHL (0x5365713a), 
++          ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ExcDescriptionSeq:1.0
++          18,
++          ACE_NTOHL (0x45786344), 
++          ACE_NTOHL (0x65736372), 
++          ACE_NTOHL (0x69707469), 
++          ACE_NTOHL (0x6f6e5365), 
++          ACE_NTOHL (0x71000000),  // name = ExcDescriptionSeq
++          CORBA::tk_sequence, // typecode kind
++          476, // encapsulation length
++            TAO_ENCAP_BYTE_ORDER, // byte order
++            CORBA::tk_struct, // typecode kind
++            460, // encapsulation length
++              TAO_ENCAP_BYTE_ORDER, // byte order
++              43,
++              ACE_NTOHL (0x49444c3a), 
++              ACE_NTOHL (0x6f6d672e), 
++              ACE_NTOHL (0x6f72672f), 
++              ACE_NTOHL (0x434f5242), 
++              ACE_NTOHL (0x412f4578), 
++              ACE_NTOHL (0x63657074), 
++              ACE_NTOHL (0x696f6e44), 
++              ACE_NTOHL (0x65736372), 
++              ACE_NTOHL (0x69707469), 
++              ACE_NTOHL (0x6f6e3a31), 
++              ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ExceptionDescription:1.0
++              21,
++              ACE_NTOHL (0x45786365), 
++              ACE_NTOHL (0x7074696f), 
++              ACE_NTOHL (0x6e446573), 
++              ACE_NTOHL (0x63726970), 
++              ACE_NTOHL (0x74696f6e), 
++              ACE_NTOHL (0x0),  // name = ExceptionDescription
++              5, // member count
++              5,
++              ACE_NTOHL (0x6e616d65), 
++              ACE_NTOHL (0x0),  // name = name
++              CORBA::tk_alias, // typecode kind for typedefs
++              68, // encapsulation length
++                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
++
++              3,
++              ACE_NTOHL (0x69640000),  // name = id
++              CORBA::tk_alias, // typecode kind for typedefs
++              72, // encapsulation length
++                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
++
++              11,
++              ACE_NTOHL (0x64656669), 
++              ACE_NTOHL (0x6e65645f), 
++              ACE_NTOHL (0x696e0000),  // name = defined_in
++              CORBA::tk_alias, // typecode kind for typedefs
++              72, // encapsulation length
++                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
++
++              8,
++              ACE_NTOHL (0x76657273), 
++              ACE_NTOHL (0x696f6e00),  // name = version
++              CORBA::tk_alias, // typecode kind for typedefs
++              68, // encapsulation length
++                TAO_ENCAP_BYTE_ORDER, // byte order
++                34,
++                ACE_NTOHL (0x49444c3a), 
++                ACE_NTOHL (0x6f6d672e), 
++                ACE_NTOHL (0x6f72672f), 
++                ACE_NTOHL (0x434f5242), 
++                ACE_NTOHL (0x412f5665), 
++                ACE_NTOHL (0x7273696f), 
++                ACE_NTOHL (0x6e537065), 
++                ACE_NTOHL (0x633a312e), 
++                ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
++                12,
++                ACE_NTOHL (0x56657273), 
++                ACE_NTOHL (0x696f6e53), 
++                ACE_NTOHL (0x70656300),  // name = VersionSpec
++                CORBA::tk_string, 
++                0U, // string length
++
++              5,
++              ACE_NTOHL (0x74797065), 
++              ACE_NTOHL (0x0),  // name = type
++              CORBA::tk_TypeCode,
++
++
++            0U,
++
++
++
++      0U,
++
++
++  13,
++  ACE_NTOHL (0x656d6974), 
++  ACE_NTOHL (0x735f6576), 
++  ACE_NTOHL (0x656e7473), 
++  ACE_NTOHL (0x0),  // name = emits_events
++  CORBA::tk_alias, // typecode kind for typedefs
++  132, // encapsulation length
++    TAO_ENCAP_BYTE_ORDER, // byte order
++    31,
++    ACE_NTOHL (0x49444c3a), 
++    ACE_NTOHL (0x6f6d672e), 
++    ACE_NTOHL (0x6f72672f), 
++    ACE_NTOHL (0x49522f45), 
++    ACE_NTOHL (0x6d697473), 
++    ACE_NTOHL (0x44656653), 
++    ACE_NTOHL (0x65713a31), 
++    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IR/EmitsDefSeq:1.0
++    12,
++    ACE_NTOHL (0x456d6974), 
++    ACE_NTOHL (0x73446566), 
++    ACE_NTOHL (0x53657100),  // name = EmitsDefSeq
++    CORBA::tk_sequence, // typecode kind
++    68, // encapsulation length
++      TAO_ENCAP_BYTE_ORDER, // byte order
++      CORBA::tk_objref, // typecode kind
++      52, // encapsulation length
++        TAO_ENCAP_BYTE_ORDER, // byte order
++        28,
++        ACE_NTOHL (0x49444c3a), 
++        ACE_NTOHL (0x6f6d672e), 
++        ACE_NTOHL (0x6f72672f), 
++        ACE_NTOHL (0x49522f45), 
++        ACE_NTOHL (0x6d697473), 
++        ACE_NTOHL (0x4465663a), 
++        ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IR/EmitsDef:1.0
++        9,
++        ACE_NTOHL (0x456d6974), 
++        ACE_NTOHL (0x73446566), 
++        ACE_NTOHL (0x0),  // name = EmitsDef
++
++      0U,
++
++
++  17,
++  ACE_NTOHL (0x7075626c), 
++  ACE_NTOHL (0x69736865), 
++  ACE_NTOHL (0x735f6576), 
++  ACE_NTOHL (0x656e7473), 
++  ACE_NTOHL (0x0),  // name = publishes_events
++  CORBA::tk_alias, // typecode kind for typedefs
++  148, // encapsulation length
++    TAO_ENCAP_BYTE_ORDER, // byte order
++    35,
++    ACE_NTOHL (0x49444c3a), 
++    ACE_NTOHL (0x6f6d672e), 
++    ACE_NTOHL (0x6f72672f), 
++    ACE_NTOHL (0x49522f50), 
++    ACE_NTOHL (0x75626c69), 
++    ACE_NTOHL (0x73686573), 
++    ACE_NTOHL (0x44656653), 
++    ACE_NTOHL (0x65713a31), 
++    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IR/PublishesDefSeq:1.0
++    16,
++    ACE_NTOHL (0x5075626c), 
++    ACE_NTOHL (0x69736865), 
++    ACE_NTOHL (0x73446566), 
++    ACE_NTOHL (0x53657100),  // name = PublishesDefSeq
++    CORBA::tk_sequence, // typecode kind
++    76, // encapsulation length
++      TAO_ENCAP_BYTE_ORDER, // byte order
++      CORBA::tk_objref, // typecode kind
++      60, // encapsulation length
++        TAO_ENCAP_BYTE_ORDER, // byte order
++        32,
++        ACE_NTOHL (0x49444c3a), 
++        ACE_NTOHL (0x6f6d672e), 
++        ACE_NTOHL (0x6f72672f), 
++        ACE_NTOHL (0x49522f50), 
++        ACE_NTOHL (0x75626c69), 
++        ACE_NTOHL (0x73686573), 
++        ACE_NTOHL (0x4465663a), 
++        ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IR/PublishesDef:1.0
++        13,
++        ACE_NTOHL (0x5075626c), 
++        ACE_NTOHL (0x69736865), 
++        ACE_NTOHL (0x73446566), 
++        ACE_NTOHL (0x0),  // name = PublishesDef
++
++      0U,
++
++
++  16,
++  ACE_NTOHL (0x636f6e73), 
++  ACE_NTOHL (0x756d6573), 
++  ACE_NTOHL (0x5f657665), 
++  ACE_NTOHL (0x6e747300),  // name = consumes_events
++  CORBA::tk_alias, // typecode kind for typedefs
++  144, // encapsulation length
+     TAO_ENCAP_BYTE_ORDER, // byte order
+     34,
+     ACE_NTOHL (0x49444c3a), 
+@@ -14723,8 +15095,8 @@
  {
    if (
      (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/PrimaryKeyDef:1.0")) ||
@@ -177,36 +979,72 @@
      (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
    return 1; // success using local knowledge
    else
-@@ -15403,8 +15402,8 @@
+@@ -14963,22 +15335,21 @@
+   ACE_NTOHL (0x6172795f), 
+   ACE_NTOHL (0x6b657900),  // name = primary_key
+   CORBA::tk_objref, // typecode kind
+-  60, // encapsulation length
++  56, // encapsulation length
+     TAO_ENCAP_BYTE_ORDER, // byte order
+     31,
+     ACE_NTOHL (0x49444c3a), 
+     ACE_NTOHL (0x6f6d672e), 
+     ACE_NTOHL (0x6f72672f), 
+     ACE_NTOHL (0x434f5242), 
+-    ACE_NTOHL (0x415f5661), 
++    ACE_NTOHL (0x412f5661), 
+     ACE_NTOHL (0x6c756544), 
+     ACE_NTOHL (0x65663a31), 
+-    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA_ValueDef:1.0
+-    15,
+-    ACE_NTOHL (0x434f5242), 
+-    ACE_NTOHL (0x415f5661), 
+-    ACE_NTOHL (0x6c756544), 
+-    ACE_NTOHL (0x65660000),  // name = CORBA_ValueDef
++    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ValueDef:1.0
++    9,
++    ACE_NTOHL (0x56616c75), 
++    ACE_NTOHL (0x65446566), 
++    ACE_NTOHL (0x0),  // name = ValueDef
+ 
+ };
+ 
+@@ -15402,9 +15773,9 @@
+ {
    if (
      (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/FactoryDef:1.0")) ||
-     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_OperationDef:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_OperationDef:1.0")) ||
 -    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) ||
 -    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/OperationDef:1.0")) ||
 +    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) ||
 +    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
      (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
    return 1; // success using local knowledge
    else
-@@ -15901,8 +15900,8 @@
+@@ -15900,9 +16271,9 @@
+ {
    if (
      (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/FinderDef:1.0")) ||
-     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_OperationDef:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_OperationDef:1.0")) ||
 -    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) ||
 -    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/OperationDef:1.0")) ||
 +    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) ||
 +    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
      (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
    return 1; // success using local knowledge
    else
-@@ -18882,10 +18881,10 @@
+@@ -18881,11 +19252,11 @@
+ {
    if (
      (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/HomeDef:1.0")) ||
-     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_InterfaceDef:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_InterfaceDef:1.0")) ||
 -    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Container:1.0")) ||
 -    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) ||
 -    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IDLType:1.0")) ||
 -    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/InterfaceDef:1.0")) ||
 +    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Container:1.0")) ||
 +    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) ||
 +    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) ||
@@ -214,181 +1052,1881 @@
      (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
    return 1; // success using local knowledge
    else
-@@ -19459,7 +19458,7 @@
-   ACE_NTOHL (0x6174696f), 
-   ACE_NTOHL (0x6e730000),  // name = operations
+@@ -19069,17 +19440,43 @@
+     this->the_TAO_HomeDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+   ACE_CHECK_RETURN (0);
+   
+-  return proxy.is_basic (
++  return proxy.is_basic (
++      this,
++      ACE_TRY_ENV
++    );
++}
++
++IR::PrimaryKeyDef_ptr IR::HomeDef::create_primary_key (
++    const char * id,
++    const char * name,
++    const char * version,
++    CORBA_ValueDef_ptr primary_key,
++    CORBA::Environment &ACE_TRY_ENV
++  )
++  ACE_THROW_SPEC ((
++    CORBA::SystemException
++  ))
++{
++  _TAO_HomeDef_Proxy_Impl &proxy = 
++    this->the_TAO_HomeDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
++  ACE_CHECK_RETURN (0);
++  
++  return proxy.create_primary_key (
+       this,
++      id,
++      name,
++      version,
++      primary_key,
+       ACE_TRY_ENV
+     );
+ }
+ 
+-IR::PrimaryKeyDef_ptr IR::HomeDef::create_primary_key (
++IR::FactoryDef_ptr IR::HomeDef::create_factory (
+     const char * id,
+     const char * name,
+     const char * version,
+-    CORBA_ValueDef_ptr primary_key,
++    const CORBA_ParDescriptionSeq & params,
++    const CORBA_ExceptionDefSeq & exceptions,
+     CORBA::Environment &ACE_TRY_ENV
+   )
+   ACE_THROW_SPEC ((
+@@ -19090,17 +19487,18 @@
+     this->the_TAO_HomeDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+   ACE_CHECK_RETURN (0);
+   
+-  return proxy.create_primary_key (
++  return proxy.create_factory (
+       this,
+       id,
+       name,
+       version,
+-      primary_key,
++      params,
++      exceptions,
+       ACE_TRY_ENV
+     );
+ }
+ 
+-IR::FactoryDef_ptr IR::HomeDef::create_factory (
++IR::FinderDef_ptr IR::HomeDef::create_finder (
+     const char * id,
+     const char * name,
+     const char * version,
+@@ -19116,7 +19514,7 @@
+     this->the_TAO_HomeDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+   ACE_CHECK_RETURN (0);
+   
+-  return proxy.create_factory (
++  return proxy.create_finder (
+       this,
+       id,
+       name,
+@@ -19127,96 +19525,372 @@
+     );
+ }
+ 
+-IR::FinderDef_ptr IR::HomeDef::create_finder (
+-    const char * id,
+-    const char * name,
+-    const char * version,
+-    const CORBA_ParDescriptionSeq & params,
+-    const CORBA_ExceptionDefSeq & exceptions,
+-    CORBA::Environment &ACE_TRY_ENV
+-  )
+-  ACE_THROW_SPEC ((
+-    CORBA::SystemException
+-  ))
+-{
+-  _TAO_HomeDef_Proxy_Impl &proxy = 
+-    this->the_TAO_HomeDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+-  ACE_CHECK_RETURN (0);
++static const CORBA::Long _oc_IR_HomeDef[] =
++{
++  TAO_ENCAP_BYTE_ORDER, // byte order
++  27,
++  ACE_NTOHL (0x49444c3a), 
++  ACE_NTOHL (0x6f6d672e), 
++  ACE_NTOHL (0x6f72672f), 
++  ACE_NTOHL (0x49522f48), 
++  ACE_NTOHL (0x6f6d6544), 
++  ACE_NTOHL (0x65663a31), 
++  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IR/HomeDef:1.0
++  8,
++  ACE_NTOHL (0x486f6d65), 
++  ACE_NTOHL (0x44656600),  // name = HomeDef
++};
++
++static CORBA::TypeCode _tc_TAO_tc_IR_HomeDef (
++    CORBA::tk_objref,
++    sizeof (_oc_IR_HomeDef),
++    (char *) &_oc_IR_HomeDef,
++    0,
++    sizeof (IR::HomeDef)
++  );
++
++TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
++TAO_NAMESPACE_BEGIN (IR)
++TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_HomeDef, &_tc_TAO_tc_IR_HomeDef)
++TAO_NAMESPACE_END
++
++static const CORBA::Long _oc_IR_HomeDescription[] =
++{
++  TAO_ENCAP_BYTE_ORDER, // byte order
++  35,
++  ACE_NTOHL (0x49444c3a), 
++  ACE_NTOHL (0x6f6d672e), 
++  ACE_NTOHL (0x6f72672f), 
++  ACE_NTOHL (0x49522f48), 
++  ACE_NTOHL (0x6f6d6544), 
++  ACE_NTOHL (0x65736372), 
++  ACE_NTOHL (0x69707469), 
++  ACE_NTOHL (0x6f6e3a31), 
++  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IR/HomeDescription:1.0
++  16,
++  ACE_NTOHL (0x486f6d65), 
++  ACE_NTOHL (0x44657363), 
++  ACE_NTOHL (0x72697074), 
++  ACE_NTOHL (0x696f6e00),  // name = HomeDescription
++  12, // member count
++  5,
++  ACE_NTOHL (0x6e616d65), 
++  ACE_NTOHL (0x0),  // name = name
++  CORBA::tk_alias, // typecode kind for typedefs
++  64, // encapsulation length
++    TAO_ENCAP_BYTE_ORDER, // byte order
++    30,
++    ACE_NTOHL (0x49444c3a), 
++    ACE_NTOHL (0x6f6d672e), 
++    ACE_NTOHL (0x6f72672f), 
++    ACE_NTOHL (0x49522f49), 
++    ACE_NTOHL (0x64656e74), 
++    ACE_NTOHL (0x69666965), 
++    ACE_NTOHL (0x723a312e), 
++    ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IR/Identifier:1.0
++    11,
++    ACE_NTOHL (0x4964656e), 
++    ACE_NTOHL (0x74696669), 
++    ACE_NTOHL (0x65720000),  // name = Identifier
++    CORBA::tk_string, 
++    0U, // string length
++
++  3,
++  ACE_NTOHL (0x69640000),  // name = id
++  CORBA::tk_alias, // typecode kind for typedefs
++  68, // encapsulation length
++    TAO_ENCAP_BYTE_ORDER, // byte order
++    32,
++    ACE_NTOHL (0x49444c3a), 
++    ACE_NTOHL (0x6f6d672e), 
++    ACE_NTOHL (0x6f72672f), 
++    ACE_NTOHL (0x49522f52), 
++    ACE_NTOHL (0x65706f73), 
++    ACE_NTOHL (0x69746f72), 
++    ACE_NTOHL (0x7949643a), 
++    ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IR/RepositoryId:1.0
++    13,
++    ACE_NTOHL (0x5265706f), 
++    ACE_NTOHL (0x7369746f), 
++    ACE_NTOHL (0x72794964), 
++    ACE_NTOHL (0x0),  // name = RepositoryId
++    CORBA::tk_string, 
++    0U, // string length
++
++  11,
++  ACE_NTOHL (0x64656669), 
++  ACE_NTOHL (0x6e65645f), 
++  ACE_NTOHL (0x696e0000),  // name = defined_in
++  CORBA::tk_alias, // typecode kind for typedefs
++  68, // encapsulation length
++    TAO_ENCAP_BYTE_ORDER, // byte order
++    32,
++    ACE_NTOHL (0x49444c3a), 
++    ACE_NTOHL (0x6f6d672e), 
++    ACE_NTOHL (0x6f72672f), 
++    ACE_NTOHL (0x49522f52), 
++    ACE_NTOHL (0x65706f73), 
++    ACE_NTOHL (0x69746f72), 
++    ACE_NTOHL (0x7949643a), 
++    ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IR/RepositoryId:1.0
++    13,
++    ACE_NTOHL (0x5265706f), 
++    ACE_NTOHL (0x7369746f), 
++    ACE_NTOHL (0x72794964), 
++    ACE_NTOHL (0x0),  // name = RepositoryId
++    CORBA::tk_string, 
++    0U, // string length
++
++  8,
++  ACE_NTOHL (0x76657273), 
++  ACE_NTOHL (0x696f6e00),  // name = version
++  CORBA::tk_alias, // typecode kind for typedefs
++  64, // encapsulation length
++    TAO_ENCAP_BYTE_ORDER, // byte order
++    31,
++    ACE_NTOHL (0x49444c3a), 
++    ACE_NTOHL (0x6f6d672e), 
++    ACE_NTOHL (0x6f72672f), 
++    ACE_NTOHL (0x49522f56), 
++    ACE_NTOHL (0x65727369), 
++    ACE_NTOHL (0x6f6e5370), 
++    ACE_NTOHL (0x65633a31), 
++    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IR/VersionSpec:1.0
++    12,
++    ACE_NTOHL (0x56657273), 
++    ACE_NTOHL (0x696f6e53), 
++    ACE_NTOHL (0x70656300),  // name = VersionSpec
++    CORBA::tk_string, 
++    0U, // string length
++
++  10,
++  ACE_NTOHL (0x62617365), 
++  ACE_NTOHL (0x5f686f6d), 
++  ACE_NTOHL (0x65000000),  // name = base_home
++  CORBA::tk_alias, // typecode kind for typedefs
++  68, // encapsulation length
++    TAO_ENCAP_BYTE_ORDER, // byte order
++    32,
++    ACE_NTOHL (0x49444c3a), 
++    ACE_NTOHL (0x6f6d672e), 
++    ACE_NTOHL (0x6f72672f), 
++    ACE_NTOHL (0x49522f52), 
++    ACE_NTOHL (0x65706f73), 
++    ACE_NTOHL (0x69746f72), 
++    ACE_NTOHL (0x7949643a), 
++    ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IR/RepositoryId:1.0
++    13,
++    ACE_NTOHL (0x5265706f), 
++    ACE_NTOHL (0x7369746f), 
++    ACE_NTOHL (0x72794964), 
++    ACE_NTOHL (0x0),  // name = RepositoryId
++    CORBA::tk_string, 
++    0U, // string length
++
++  18,
++  ACE_NTOHL (0x6d616e61), 
++  ACE_NTOHL (0x6765645f), 
++  ACE_NTOHL (0x636f6d70), 
++  ACE_NTOHL (0x6f6e656e), 
++  ACE_NTOHL (0x74000000),  // name = managed_component
++  CORBA::tk_alias, // typecode kind for typedefs
++  68, // encapsulation length
++    TAO_ENCAP_BYTE_ORDER, // byte order
++    32,
++    ACE_NTOHL (0x49444c3a), 
++    ACE_NTOHL (0x6f6d672e), 
++    ACE_NTOHL (0x6f72672f), 
++    ACE_NTOHL (0x49522f52), 
++    ACE_NTOHL (0x65706f73), 
++    ACE_NTOHL (0x69746f72), 
++    ACE_NTOHL (0x7949643a), 
++    ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IR/RepositoryId:1.0
++    13,
++    ACE_NTOHL (0x5265706f), 
++    ACE_NTOHL (0x7369746f), 
++    ACE_NTOHL (0x72794964), 
++    ACE_NTOHL (0x0),  // name = RepositoryId
++    CORBA::tk_string, 
++    0U, // string length
++
++  16,
++  ACE_NTOHL (0x7072696d), 
++  ACE_NTOHL (0x6172795f), 
++  ACE_NTOHL (0x6b65795f), 
++  ACE_NTOHL (0x64656600),  // name = primary_key_def
++  CORBA::tk_objref, // typecode kind
++  64, // encapsulation length
++    TAO_ENCAP_BYTE_ORDER, // byte order
++    33,
++    ACE_NTOHL (0x49444c3a), 
++    ACE_NTOHL (0x6f6d672e), 
++    ACE_NTOHL (0x6f72672f), 
++    ACE_NTOHL (0x49522f50), 
++    ACE_NTOHL (0x72696d61), 
++    ACE_NTOHL (0x72794b65), 
++    ACE_NTOHL (0x79446566), 
++    ACE_NTOHL (0x3a312e30), 
++    ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IR/PrimaryKeyDef:1.0
++    14,
++    ACE_NTOHL (0x5072696d), 
++    ACE_NTOHL (0x6172794b), 
++    ACE_NTOHL (0x65794465), 
++    ACE_NTOHL (0x66000000),  // name = PrimaryKeyDef
++
++  10,
++  ACE_NTOHL (0x66616374), 
++  ACE_NTOHL (0x6f726965), 
++  ACE_NTOHL (0x73000000),  // name = factories
++  CORBA::tk_alias, // typecode kind for typedefs
++  144, // encapsulation length
++    TAO_ENCAP_BYTE_ORDER, // byte order
++    33,
++    ACE_NTOHL (0x49444c3a), 
++    ACE_NTOHL (0x6f6d672e), 
++    ACE_NTOHL (0x6f72672f), 
++    ACE_NTOHL (0x49522f46), 
++    ACE_NTOHL (0x6163746f), 
++    ACE_NTOHL (0x72794465), 
++    ACE_NTOHL (0x66536571), 
++    ACE_NTOHL (0x3a312e30), 
++    ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IR/FactoryDefSeq:1.0
++    14,
++    ACE_NTOHL (0x46616374), 
++    ACE_NTOHL (0x6f727944), 
++    ACE_NTOHL (0x65665365), 
++    ACE_NTOHL (0x71000000),  // name = FactoryDefSeq
++    CORBA::tk_sequence, // typecode kind
++    72, // encapsulation length
++      TAO_ENCAP_BYTE_ORDER, // byte order
++      CORBA::tk_objref, // typecode kind
++      56, // encapsulation length
++        TAO_ENCAP_BYTE_ORDER, // byte order
++        30,
++        ACE_NTOHL (0x49444c3a), 
++        ACE_NTOHL (0x6f6d672e), 
++        ACE_NTOHL (0x6f72672f), 
++        ACE_NTOHL (0x49522f46), 
++        ACE_NTOHL (0x6163746f), 
++        ACE_NTOHL (0x72794465), 
++        ACE_NTOHL (0x663a312e), 
++        ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IR/FactoryDef:1.0
++        11,
++        ACE_NTOHL (0x46616374), 
++        ACE_NTOHL (0x6f727944), 
++        ACE_NTOHL (0x65660000),  // name = FactoryDef
++
++      0U,
+   
+-  return proxy.create_finder (
+-      this,
+-      id,
+-      name,
+-      version,
+-      params,
+-      exceptions,
+-      ACE_TRY_ENV
+-    );
+-}
+ 
+-static const CORBA::Long _oc_IR_HomeDef[] =
+-{
++  8,
++  ACE_NTOHL (0x66696e64), 
++  ACE_NTOHL (0x65727300),  // name = finders
++  CORBA::tk_alias, // typecode kind for typedefs
++  140, // encapsulation length
+   TAO_ENCAP_BYTE_ORDER, // byte order
+-  27,
++    32,
+   ACE_NTOHL (0x49444c3a), 
+   ACE_NTOHL (0x6f6d672e), 
+   ACE_NTOHL (0x6f72672f), 
+-  ACE_NTOHL (0x49522f48), 
+-  ACE_NTOHL (0x6f6d6544), 
+-  ACE_NTOHL (0x65663a31), 
+-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IR/HomeDef:1.0
+-  8,
+-  ACE_NTOHL (0x486f6d65), 
+-  ACE_NTOHL (0x44656600),  // name = HomeDef
+-};
++    ACE_NTOHL (0x49522f46), 
++    ACE_NTOHL (0x696e6465), 
++    ACE_NTOHL (0x72446566), 
++    ACE_NTOHL (0x5365713a), 
++    ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IR/FinderDefSeq:1.0
++    13,
++    ACE_NTOHL (0x46696e64), 
++    ACE_NTOHL (0x65724465), 
++    ACE_NTOHL (0x66536571), 
++    ACE_NTOHL (0x0),  // name = FinderDefSeq
++    CORBA::tk_sequence, // typecode kind
++    72, // encapsulation length
++      TAO_ENCAP_BYTE_ORDER, // byte order
++      CORBA::tk_objref, // typecode kind
++      56, // encapsulation length
++        TAO_ENCAP_BYTE_ORDER, // byte order
++        29,
++        ACE_NTOHL (0x49444c3a), 
++        ACE_NTOHL (0x6f6d672e), 
++        ACE_NTOHL (0x6f72672f), 
++        ACE_NTOHL (0x49522f46), 
++        ACE_NTOHL (0x696e6465), 
++        ACE_NTOHL (0x72446566), 
++        ACE_NTOHL (0x3a312e30), 
++        ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IR/FinderDef:1.0
++        10,
++        ACE_NTOHL (0x46696e64), 
++        ACE_NTOHL (0x65724465), 
++        ACE_NTOHL (0x66000000),  // name = FinderDef
+ 
+-static CORBA::TypeCode _tc_TAO_tc_IR_HomeDef (
+-    CORBA::tk_objref,
+-    sizeof (_oc_IR_HomeDef),
+-    (char *) &_oc_IR_HomeDef,
+-    0,
+-    sizeof (IR::HomeDef)
+-  );
++      0U,
+ 
+-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+-TAO_NAMESPACE_BEGIN (IR)
+-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_HomeDef, &_tc_TAO_tc_IR_HomeDef)
+-TAO_NAMESPACE_END
+ 
+-static const CORBA::Long _oc_IR_HomeDescription[] =
+-{
++  11,
++  ACE_NTOHL (0x6f706572), 
++  ACE_NTOHL (0x6174696f), 
++  ACE_NTOHL (0x6e730000),  // name = operations
++  CORBA::tk_alias, // typecode kind for typedefs
++  2036, // encapsulation length
+   TAO_ENCAP_BYTE_ORDER, // byte order
+-  35,
++    39,
+   ACE_NTOHL (0x49444c3a), 
+   ACE_NTOHL (0x6f6d672e), 
+   ACE_NTOHL (0x6f72672f), 
+-  ACE_NTOHL (0x49522f48), 
+-  ACE_NTOHL (0x6f6d6544), 
++    ACE_NTOHL (0x434f5242), 
++    ACE_NTOHL (0x412f4f70), 
++    ACE_NTOHL (0x44657363), 
++    ACE_NTOHL (0x72697074), 
++    ACE_NTOHL (0x696f6e53), 
++    ACE_NTOHL (0x65713a31), 
++    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/OpDescriptionSeq:1.0
++    17,
++    ACE_NTOHL (0x4f704465), 
++    ACE_NTOHL (0x73637269), 
++    ACE_NTOHL (0x7074696f), 
++    ACE_NTOHL (0x6e536571), 
++    ACE_NTOHL (0x0),  // name = OpDescriptionSeq
++    CORBA::tk_sequence, // typecode kind
++    1956, // encapsulation length
++      TAO_ENCAP_BYTE_ORDER, // byte order
++      CORBA::tk_struct, // typecode kind
++      1940, // encapsulation length
++        TAO_ENCAP_BYTE_ORDER, // byte order
++        43,
++        ACE_NTOHL (0x49444c3a), 
++        ACE_NTOHL (0x6f6d672e), 
++        ACE_NTOHL (0x6f72672f), 
++        ACE_NTOHL (0x434f5242), 
++        ACE_NTOHL (0x412f4f70), 
++        ACE_NTOHL (0x65726174), 
++        ACE_NTOHL (0x696f6e44), 
+   ACE_NTOHL (0x65736372), 
+   ACE_NTOHL (0x69707469), 
+   ACE_NTOHL (0x6f6e3a31), 
+-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IR/HomeDescription:1.0
+-  16,
+-  ACE_NTOHL (0x486f6d65), 
+-  ACE_NTOHL (0x44657363), 
+-  ACE_NTOHL (0x72697074), 
+-  ACE_NTOHL (0x696f6e00),  // name = HomeDescription
+-  12, // member count
++        ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/OperationDescription:1.0
++        21,
++        ACE_NTOHL (0x4f706572), 
++        ACE_NTOHL (0x6174696f), 
++        ACE_NTOHL (0x6e446573), 
++        ACE_NTOHL (0x63726970), 
++        ACE_NTOHL (0x74696f6e), 
++        ACE_NTOHL (0x0),  // name = OperationDescription
++        9, // member count
+   5,
+   ACE_NTOHL (0x6e616d65), 
+   ACE_NTOHL (0x0),  // name = name
    CORBA::tk_alias, // typecode kind for typedefs
--  1296, // encapsulation length
-+  1304, // encapsulation length
+-  64, // encapsulation length
++        68, // encapsulation length
+     TAO_ENCAP_BYTE_ORDER, // byte order
+-    30,
++          33,
+     ACE_NTOHL (0x49444c3a), 
+     ACE_NTOHL (0x6f6d672e), 
+     ACE_NTOHL (0x6f72672f), 
+-    ACE_NTOHL (0x49522f49), 
+-    ACE_NTOHL (0x64656e74), 
+-    ACE_NTOHL (0x69666965), 
+-    ACE_NTOHL (0x723a312e), 
+-    ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IR/Identifier:1.0
++          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), 
+@@ -19227,17 +19901,18 @@
+   3,
+   ACE_NTOHL (0x69640000),  // name = id
+   CORBA::tk_alias, // typecode kind for typedefs
+-  68, // encapsulation length
++        72, // encapsulation length
+     TAO_ENCAP_BYTE_ORDER, // byte order
+-    32,
++          35,
+     ACE_NTOHL (0x49444c3a), 
+     ACE_NTOHL (0x6f6d672e), 
+     ACE_NTOHL (0x6f72672f), 
+-    ACE_NTOHL (0x49522f52), 
+-    ACE_NTOHL (0x65706f73), 
+-    ACE_NTOHL (0x69746f72), 
+-    ACE_NTOHL (0x7949643a), 
+-    ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IR/RepositoryId:1.0
++          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), 
+@@ -19251,17 +19926,18 @@
+   ACE_NTOHL (0x6e65645f), 
+   ACE_NTOHL (0x696e0000),  // name = defined_in
+   CORBA::tk_alias, // typecode kind for typedefs
+-  68, // encapsulation length
++        72, // encapsulation length
+     TAO_ENCAP_BYTE_ORDER, // byte order
+-    32,
++          35,
+     ACE_NTOHL (0x49444c3a), 
+     ACE_NTOHL (0x6f6d672e), 
+     ACE_NTOHL (0x6f72672f), 
+-    ACE_NTOHL (0x49522f52), 
+-    ACE_NTOHL (0x65706f73), 
+-    ACE_NTOHL (0x69746f72), 
+-    ACE_NTOHL (0x7949643a), 
+-    ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IR/RepositoryId:1.0
++          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), 
+@@ -19274,17 +19950,18 @@
+   ACE_NTOHL (0x76657273), 
+   ACE_NTOHL (0x696f6e00),  // name = version
+   CORBA::tk_alias, // typecode kind for typedefs
+-  64, // encapsulation length
++        68, // encapsulation length
      TAO_ENCAP_BYTE_ORDER, // byte order
-     39,
+-    31,
++          34,
      ACE_NTOHL (0x49444c3a), 
-@@ -19480,10 +19479,10 @@
+     ACE_NTOHL (0x6f6d672e), 
+     ACE_NTOHL (0x6f72672f), 
+-    ACE_NTOHL (0x49522f56), 
+-    ACE_NTOHL (0x65727369), 
+-    ACE_NTOHL (0x6f6e5370), 
+-    ACE_NTOHL (0x65633a31), 
+-    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IR/VersionSpec:1.0
++          ACE_NTOHL (0x434f5242), 
++          ACE_NTOHL (0x412f5665), 
++          ACE_NTOHL (0x7273696f), 
++          ACE_NTOHL (0x6e537065), 
++          ACE_NTOHL (0x633a312e), 
++          ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
+     12,
+     ACE_NTOHL (0x56657273), 
      ACE_NTOHL (0x696f6e53), 
-     ACE_NTOHL (0x65710000),  // name = CORBA_OpDescriptionSeq
+@@ -19292,502 +19969,732 @@
+     CORBA::tk_string, 
+     0U, // string length
+ 
++        7,
++        ACE_NTOHL (0x72657375), 
++        ACE_NTOHL (0x6c740000),  // name = result
++        CORBA::tk_TypeCode,
++
++        5,
++        ACE_NTOHL (0x6d6f6465), 
++        ACE_NTOHL (0x0),  // name = mode
++        CORBA::tk_enum, // typecode kind
++        100, // encapsulation length
++          TAO_ENCAP_BYTE_ORDER, // byte order
++          36,
++          ACE_NTOHL (0x49444c3a), 
++          ACE_NTOHL (0x6f6d672e), 
++          ACE_NTOHL (0x6f72672f), 
++          ACE_NTOHL (0x434f5242), 
++          ACE_NTOHL (0x412f4f70), 
++          ACE_NTOHL (0x65726174), 
++          ACE_NTOHL (0x696f6e4d), 
++          ACE_NTOHL (0x6f64653a), 
++          ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/OperationMode:1.0
++          14,
++          ACE_NTOHL (0x4f706572), 
++          ACE_NTOHL (0x6174696f), 
++          ACE_NTOHL (0x6e4d6f64), 
++          ACE_NTOHL (0x65000000),  // name = OperationMode
++          2, // member count
+   10,
+-  ACE_NTOHL (0x62617365), 
+-  ACE_NTOHL (0x5f686f6d), 
+-  ACE_NTOHL (0x65000000),  // name = base_home
++          ACE_NTOHL (0x4f505f4e), 
++          ACE_NTOHL (0x4f524d41), 
++          ACE_NTOHL (0x4c000000),  // name = OP_NORMAL
++          10,
++          ACE_NTOHL (0x4f505f4f), 
++          ACE_NTOHL (0x4e455741), 
++          ACE_NTOHL (0x59000000),  // name = OP_ONEWAY
++
++        9,
++        ACE_NTOHL (0x636f6e74), 
++        ACE_NTOHL (0x65787473), 
++        ACE_NTOHL (0x0),  // name = contexts
++        CORBA::tk_alias, // typecode kind for typedefs
++        236, // encapsulation length
++          TAO_ENCAP_BYTE_ORDER, // byte order
++          35,
++          ACE_NTOHL (0x49444c3a), 
++          ACE_NTOHL (0x6f6d672e), 
++          ACE_NTOHL (0x6f72672f), 
++          ACE_NTOHL (0x434f5242), 
++          ACE_NTOHL (0x412f436f), 
++          ACE_NTOHL (0x6e746578), 
++          ACE_NTOHL (0x74496453), 
++          ACE_NTOHL (0x65713a31), 
++          ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ContextIdSeq:1.0
++          13,
++          ACE_NTOHL (0x436f6e74), 
++          ACE_NTOHL (0x65787449), 
++          ACE_NTOHL (0x64536571), 
++          ACE_NTOHL (0x0),  // name = ContextIdSeq
++          CORBA::tk_sequence, // typecode kind
++          164, // encapsulation length
++            TAO_ENCAP_BYTE_ORDER, // byte order
++            CORBA::tk_alias, // typecode kind for typedefs
++            148, // encapsulation length
++              TAO_ENCAP_BYTE_ORDER, // byte order
++              40,
++              ACE_NTOHL (0x49444c3a), 
++              ACE_NTOHL (0x6f6d672e), 
++              ACE_NTOHL (0x6f72672f), 
++              ACE_NTOHL (0x434f5242), 
++              ACE_NTOHL (0x412f436f), 
++              ACE_NTOHL (0x6e746578), 
++              ACE_NTOHL (0x74496465), 
++              ACE_NTOHL (0x6e746966), 
++              ACE_NTOHL (0x6965723a), 
++              ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ContextIdentifier:1.0
++              18,
++              ACE_NTOHL (0x436f6e74), 
++              ACE_NTOHL (0x65787449), 
++              ACE_NTOHL (0x64656e74), 
++              ACE_NTOHL (0x69666965), 
++              ACE_NTOHL (0x72000000),  // name = ContextIdentifier
+   CORBA::tk_alias, // typecode kind for typedefs
+   68, // encapsulation length
+     TAO_ENCAP_BYTE_ORDER, // byte order
+-    32,
++                33,
+     ACE_NTOHL (0x49444c3a), 
+     ACE_NTOHL (0x6f6d672e), 
+     ACE_NTOHL (0x6f72672f), 
+-    ACE_NTOHL (0x49522f52), 
+-    ACE_NTOHL (0x65706f73), 
+-    ACE_NTOHL (0x69746f72), 
+-    ACE_NTOHL (0x7949643a), 
+-    ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IR/RepositoryId:1.0
+-    13,
+-    ACE_NTOHL (0x5265706f), 
+-    ACE_NTOHL (0x7369746f), 
+-    ACE_NTOHL (0x72794964), 
+-    ACE_NTOHL (0x0),  // name = RepositoryId
++                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
+ 
+-  18,
+-  ACE_NTOHL (0x6d616e61), 
+-  ACE_NTOHL (0x6765645f), 
+-  ACE_NTOHL (0x636f6d70), 
+-  ACE_NTOHL (0x6f6e656e), 
+-  ACE_NTOHL (0x74000000),  // name = managed_component
++
++            0U,
++
++
++        11,
++        ACE_NTOHL (0x70617261), 
++        ACE_NTOHL (0x6d657465), 
++        ACE_NTOHL (0x72730000),  // name = parameters
+   CORBA::tk_alias, // typecode kind for typedefs
+-  68, // encapsulation length
++        496, // encapsulation length
+     TAO_ENCAP_BYTE_ORDER, // byte order
+-    32,
++          40,
+     ACE_NTOHL (0x49444c3a), 
+     ACE_NTOHL (0x6f6d672e), 
+     ACE_NTOHL (0x6f72672f), 
+-    ACE_NTOHL (0x49522f52), 
+-    ACE_NTOHL (0x65706f73), 
+-    ACE_NTOHL (0x69746f72), 
+-    ACE_NTOHL (0x7949643a), 
+-    ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IR/RepositoryId:1.0
+-    13,
+-    ACE_NTOHL (0x5265706f), 
+-    ACE_NTOHL (0x7369746f), 
+-    ACE_NTOHL (0x72794964), 
+-    ACE_NTOHL (0x0),  // name = RepositoryId
+-    CORBA::tk_string, 
+-    0U, // string length
+-
+-  16,
+-  ACE_NTOHL (0x7072696d), 
+-  ACE_NTOHL (0x6172795f), 
+-  ACE_NTOHL (0x6b65795f), 
+-  ACE_NTOHL (0x64656600),  // name = primary_key_def
+-  CORBA::tk_objref, // typecode kind
+-  64, // encapsulation length
++          ACE_NTOHL (0x434f5242), 
++          ACE_NTOHL (0x412f5061), 
++          ACE_NTOHL (0x72446573), 
++          ACE_NTOHL (0x63726970), 
++          ACE_NTOHL (0x74696f6e), 
++          ACE_NTOHL (0x5365713a), 
++          ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ParDescriptionSeq:1.0
++          18,
++          ACE_NTOHL (0x50617244), 
++          ACE_NTOHL (0x65736372), 
++          ACE_NTOHL (0x69707469), 
++          ACE_NTOHL (0x6f6e5365), 
++          ACE_NTOHL (0x71000000),  // name = ParDescriptionSeq
++          CORBA::tk_sequence, // typecode kind
++          416, // encapsulation length
+     TAO_ENCAP_BYTE_ORDER, // byte order
+-    33,
++            CORBA::tk_struct, // typecode kind
++            400, // encapsulation length
++              TAO_ENCAP_BYTE_ORDER, // byte order
++              43,
+     ACE_NTOHL (0x49444c3a), 
+     ACE_NTOHL (0x6f6d672e), 
+     ACE_NTOHL (0x6f72672f), 
+-    ACE_NTOHL (0x49522f50), 
+-    ACE_NTOHL (0x72696d61), 
+-    ACE_NTOHL (0x72794b65), 
+-    ACE_NTOHL (0x79446566), 
+-    ACE_NTOHL (0x3a312e30), 
+-    ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IR/PrimaryKeyDef:1.0
+-    14,
+-    ACE_NTOHL (0x5072696d), 
+-    ACE_NTOHL (0x6172794b), 
+-    ACE_NTOHL (0x65794465), 
+-    ACE_NTOHL (0x66000000),  // name = PrimaryKeyDef
+-
+-  10,
+-  ACE_NTOHL (0x66616374), 
+-  ACE_NTOHL (0x6f726965), 
+-  ACE_NTOHL (0x73000000),  // name = factories
++              ACE_NTOHL (0x434f5242), 
++              ACE_NTOHL (0x412f5061), 
++              ACE_NTOHL (0x72616d65), 
++              ACE_NTOHL (0x74657244), 
++              ACE_NTOHL (0x65736372), 
++              ACE_NTOHL (0x69707469), 
++              ACE_NTOHL (0x6f6e3a31), 
++              ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ParameterDescription:1.0
++              21,
++              ACE_NTOHL (0x50617261), 
++              ACE_NTOHL (0x6d657465), 
++              ACE_NTOHL (0x72446573), 
++              ACE_NTOHL (0x63726970), 
++              ACE_NTOHL (0x74696f6e), 
++              ACE_NTOHL (0x0),  // name = ParameterDescription
++              4, // member count
++              5,
++              ACE_NTOHL (0x6e616d65), 
++              ACE_NTOHL (0x0),  // name = name
+   CORBA::tk_alias, // typecode kind for typedefs
+-  144, // encapsulation length
++              68, // encapsulation length
+     TAO_ENCAP_BYTE_ORDER, // byte order
+     33,
+     ACE_NTOHL (0x49444c3a), 
+     ACE_NTOHL (0x6f6d672e), 
+     ACE_NTOHL (0x6f72672f), 
+-    ACE_NTOHL (0x49522f46), 
+-    ACE_NTOHL (0x6163746f), 
+-    ACE_NTOHL (0x72794465), 
+-    ACE_NTOHL (0x66536571), 
++                ACE_NTOHL (0x434f5242), 
++                ACE_NTOHL (0x412f4964), 
++                ACE_NTOHL (0x656e7469), 
++                ACE_NTOHL (0x66696572), 
+     ACE_NTOHL (0x3a312e30), 
+-    ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IR/FactoryDefSeq:1.0
+-    14,
+-    ACE_NTOHL (0x46616374), 
+-    ACE_NTOHL (0x6f727944), 
+-    ACE_NTOHL (0x65665365), 
+-    ACE_NTOHL (0x71000000),  // name = FactoryDefSeq
+-    CORBA::tk_sequence, // typecode kind
+-    72, // encapsulation length
+-      TAO_ENCAP_BYTE_ORDER, // byte order
+-      CORBA::tk_objref, // typecode kind
+-      56, // encapsulation length
+-        TAO_ENCAP_BYTE_ORDER, // byte order
+-        30,
+-        ACE_NTOHL (0x49444c3a), 
+-        ACE_NTOHL (0x6f6d672e), 
+-        ACE_NTOHL (0x6f72672f), 
+-        ACE_NTOHL (0x49522f46), 
+-        ACE_NTOHL (0x6163746f), 
+-        ACE_NTOHL (0x72794465), 
+-        ACE_NTOHL (0x663a312e), 
+-        ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IR/FactoryDef:1.0
++                ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
+         11,
+-        ACE_NTOHL (0x46616374), 
+-        ACE_NTOHL (0x6f727944), 
+-        ACE_NTOHL (0x65660000),  // name = FactoryDef
+-
+-      0U,
++                ACE_NTOHL (0x4964656e), 
++                ACE_NTOHL (0x74696669), 
++                ACE_NTOHL (0x65720000),  // name = Identifier
++                CORBA::tk_string, 
++                0U, // string length
+ 
++              5,
++              ACE_NTOHL (0x74797065), 
++              ACE_NTOHL (0x0),  // name = type
++              CORBA::tk_TypeCode,
+ 
+-  8,
+-  ACE_NTOHL (0x66696e64), 
+-  ACE_NTOHL (0x65727300),  // name = finders
+-  CORBA::tk_alias, // typecode kind for typedefs
+-  140, // encapsulation length
++              9,
++              ACE_NTOHL (0x74797065), 
++              ACE_NTOHL (0x5f646566), 
++              ACE_NTOHL (0x0),  // name = type_def
++              CORBA::tk_objref, // typecode kind
++              52, // encapsulation length
+     TAO_ENCAP_BYTE_ORDER, // byte order
+-    32,
++                30,
+     ACE_NTOHL (0x49444c3a), 
+     ACE_NTOHL (0x6f6d672e), 
+     ACE_NTOHL (0x6f72672f), 
+-    ACE_NTOHL (0x49522f46), 
+-    ACE_NTOHL (0x696e6465), 
+-    ACE_NTOHL (0x72446566), 
+-    ACE_NTOHL (0x5365713a), 
+-    ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IR/FinderDefSeq:1.0
+-    13,
+-    ACE_NTOHL (0x46696e64), 
+-    ACE_NTOHL (0x65724465), 
+-    ACE_NTOHL (0x66536571), 
+-    ACE_NTOHL (0x0),  // name = FinderDefSeq
+-    CORBA::tk_sequence, // typecode kind
+-    72, // encapsulation length
+-      TAO_ENCAP_BYTE_ORDER, // byte order
+-      CORBA::tk_objref, // typecode kind
+-      56, // encapsulation length
++                ACE_NTOHL (0x434f5242), 
++                ACE_NTOHL (0x412f4944), 
++                ACE_NTOHL (0x4c547970), 
++                ACE_NTOHL (0x653a312e), 
++                ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/IDLType:1.0
++                8,
++                ACE_NTOHL (0x49444c54), 
++                ACE_NTOHL (0x79706500),  // name = IDLType
++
++              5,
++              ACE_NTOHL (0x6d6f6465), 
++              ACE_NTOHL (0x0),  // name = mode
++              CORBA::tk_enum, // typecode kind
++              116, // encapsulation length
+         TAO_ENCAP_BYTE_ORDER, // byte order
+-        29,
++                36,
+         ACE_NTOHL (0x49444c3a), 
+         ACE_NTOHL (0x6f6d672e), 
+         ACE_NTOHL (0x6f72672f), 
+-        ACE_NTOHL (0x49522f46), 
+-        ACE_NTOHL (0x696e6465), 
+-        ACE_NTOHL (0x72446566), 
+-        ACE_NTOHL (0x3a312e30), 
+-        ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IR/FinderDef:1.0
++                ACE_NTOHL (0x434f5242), 
++                ACE_NTOHL (0x412f5061), 
++                ACE_NTOHL (0x72616d65), 
++                ACE_NTOHL (0x7465724d), 
++                ACE_NTOHL (0x6f64653a), 
++                ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ParameterMode:1.0
++                14,
++                ACE_NTOHL (0x50617261), 
++                ACE_NTOHL (0x6d657465), 
++                ACE_NTOHL (0x724d6f64), 
++                ACE_NTOHL (0x65000000),  // name = ParameterMode
++                3, // member count
++                9,
++                ACE_NTOHL (0x50415241), 
++                ACE_NTOHL (0x4d5f494e), 
++                ACE_NTOHL (0x0),  // name = PARAM_IN
+         10,
+-        ACE_NTOHL (0x46696e64), 
+-        ACE_NTOHL (0x65724465), 
+-        ACE_NTOHL (0x66000000),  // name = FinderDef
++                ACE_NTOHL (0x50415241), 
++                ACE_NTOHL (0x4d5f4f55), 
++                ACE_NTOHL (0x54000000),  // name = PARAM_OUT
++                12,
++                ACE_NTOHL (0x50415241), 
++                ACE_NTOHL (0x4d5f494e), 
++                ACE_NTOHL (0x4f555400),  // name = PARAM_INOUT
++
+ 
+       0U,
+ 
+ 
+   11,
+-  ACE_NTOHL (0x6f706572), 
+-  ACE_NTOHL (0x6174696f), 
+-  ACE_NTOHL (0x6e730000),  // name = operations
++        ACE_NTOHL (0x65786365), 
++        ACE_NTOHL (0x7074696f), 
++        ACE_NTOHL (0x6e730000),  // name = exceptions
+   CORBA::tk_alias, // typecode kind for typedefs
+-  1296, // encapsulation length
++        556, // encapsulation length
+     TAO_ENCAP_BYTE_ORDER, // byte order
+-    39,
++          40,
+     ACE_NTOHL (0x49444c3a), 
+     ACE_NTOHL (0x6f6d672e), 
+     ACE_NTOHL (0x6f72672f), 
+     ACE_NTOHL (0x434f5242), 
+-    ACE_NTOHL (0x415f4f70), 
+-    ACE_NTOHL (0x44657363), 
+-    ACE_NTOHL (0x72697074), 
+-    ACE_NTOHL (0x696f6e53), 
+-    ACE_NTOHL (0x65713a31), 
+-    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA_OpDescriptionSeq:1.0
+-    23,
+-    ACE_NTOHL (0x434f5242), 
+-    ACE_NTOHL (0x415f4f70), 
+-    ACE_NTOHL (0x44657363), 
+-    ACE_NTOHL (0x72697074), 
+-    ACE_NTOHL (0x696f6e53), 
+-    ACE_NTOHL (0x65710000),  // name = CORBA_OpDescriptionSeq
++          ACE_NTOHL (0x412f4578), 
++          ACE_NTOHL (0x63446573), 
++          ACE_NTOHL (0x63726970), 
++          ACE_NTOHL (0x74696f6e), 
++          ACE_NTOHL (0x5365713a), 
++          ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ExcDescriptionSeq:1.0
++          18,
++          ACE_NTOHL (0x45786344), 
++          ACE_NTOHL (0x65736372), 
++          ACE_NTOHL (0x69707469), 
++          ACE_NTOHL (0x6f6e5365), 
++          ACE_NTOHL (0x71000000),  // name = ExcDescriptionSeq
      CORBA::tk_sequence, // typecode kind
 -    1212, // encapsulation length
-+    1220, // encapsulation length
++          476, // encapsulation length
        TAO_ENCAP_BYTE_ORDER, // byte order
        CORBA::tk_struct, // typecode kind
 -      1196, // encapsulation length
-+      1204, // encapsulation length
++            460, // encapsulation length
          TAO_ENCAP_BYTE_ORDER, // byte order
          43,
          ACE_NTOHL (0x49444c3a), 
-@@ -19535,23 +19534,24 @@
-         ACE_NTOHL (0x6d6f6465), 
-         ACE_NTOHL (0x0),  // name = mode
-         CORBA::tk_enum, // typecode kind
+         ACE_NTOHL (0x6f6d672e), 
+         ACE_NTOHL (0x6f72672f), 
+         ACE_NTOHL (0x434f5242), 
+-        ACE_NTOHL (0x415f4f70), 
+-        ACE_NTOHL (0x65726174), 
++              ACE_NTOHL (0x412f4578), 
++              ACE_NTOHL (0x63657074), 
+         ACE_NTOHL (0x696f6e44), 
+         ACE_NTOHL (0x65736372), 
+         ACE_NTOHL (0x69707469), 
+         ACE_NTOHL (0x6f6e3a31), 
+-        ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA_OperationDescription:1.0
+-        27,
+-        ACE_NTOHL (0x434f5242), 
+-        ACE_NTOHL (0x415f4f70), 
+-        ACE_NTOHL (0x65726174), 
+-        ACE_NTOHL (0x696f6e44), 
+-        ACE_NTOHL (0x65736372), 
+-        ACE_NTOHL (0x69707469), 
+-        ACE_NTOHL (0x6f6e0000),  // name = CORBA_OperationDescription
+-        9, // member count
++              ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ExceptionDescription:1.0
++              21,
++              ACE_NTOHL (0x45786365), 
++              ACE_NTOHL (0x7074696f), 
++              ACE_NTOHL (0x6e446573), 
++              ACE_NTOHL (0x63726970), 
++              ACE_NTOHL (0x74696f6e), 
++              ACE_NTOHL (0x0),  // name = ExceptionDescription
++              5, // member count
+         5,
+         ACE_NTOHL (0x6e616d65), 
+         ACE_NTOHL (0x0),  // name = name
++              CORBA::tk_alias, // typecode kind for typedefs
++              68, // encapsulation length
++                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
++
+         3,
+         ACE_NTOHL (0x69640000),  // name = id
++              CORBA::tk_alias, // typecode kind for typedefs
++              72, // encapsulation length
++                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
++
+         11,
+         ACE_NTOHL (0x64656669), 
+         ACE_NTOHL (0x6e65645f), 
+         ACE_NTOHL (0x696e0000),  // name = defined_in
+-        CORBA::tk_string, 
+-        0U, // string length
+-        8,
+-        ACE_NTOHL (0x76657273), 
+-        ACE_NTOHL (0x696f6e00),  // name = version
+-        CORBA::tk_string, 
+-        0U, // string length
+-        7,
+-        ACE_NTOHL (0x72657375), 
+-        ACE_NTOHL (0x6c740000),  // name = result
+-        CORBA::tk_TypeCode,
+-
+-        5,
+-        ACE_NTOHL (0x6d6f6465), 
+-        ACE_NTOHL (0x0),  // name = mode
+-        CORBA::tk_enum, // typecode kind
 -        100, // encapsulation length
-+        104, // encapsulation length
++              CORBA::tk_alias, // typecode kind for typedefs
++              72, // encapsulation length
            TAO_ENCAP_BYTE_ORDER, // byte order
-           36,
+-          36,
++                35,
            ACE_NTOHL (0x49444c3a), 
            ACE_NTOHL (0x6f6d672e), 
            ACE_NTOHL (0x6f72672f), 
            ACE_NTOHL (0x434f5242), 
 -          ACE_NTOHL (0x412f4f70), 
-+          ACE_NTOHL (0x415f4f70), 
-           ACE_NTOHL (0x65726174), 
-           ACE_NTOHL (0x696f6e4d), 
-           ACE_NTOHL (0x6f64653a), 
+-          ACE_NTOHL (0x65726174), 
+-          ACE_NTOHL (0x696f6e4d), 
+-          ACE_NTOHL (0x6f64653a), 
 -          ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/OperationMode:1.0
 -          14,
 -          ACE_NTOHL (0x4f706572), 
 -          ACE_NTOHL (0x6174696f), 
 -          ACE_NTOHL (0x6e4d6f64), 
 -          ACE_NTOHL (0x65000000),  // name = OperationMode
-+          ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA_OperationMode:1.0
-+          20,
-+          ACE_NTOHL (0x434f5242), 
-+          ACE_NTOHL (0x415f4f70), 
-+          ACE_NTOHL (0x65726174), 
-+          ACE_NTOHL (0x696f6e4d), 
-+          ACE_NTOHL (0x6f646500),  // name = CORBA_OperationMode
-           2, // member count
-           10,
-           ACE_NTOHL (0x4f505f4e), 
-@@ -19598,7 +19598,7 @@
-         ACE_NTOHL (0x6d657465), 
-         ACE_NTOHL (0x72730000),  // name = parameters
+-          2, // member count
+-          10,
+-          ACE_NTOHL (0x4f505f4e), 
+-          ACE_NTOHL (0x4f524d41), 
+-          ACE_NTOHL (0x4c000000),  // name = OP_NORMAL
+-          10,
+-          ACE_NTOHL (0x4f505f4f), 
+-          ACE_NTOHL (0x4e455741), 
+-          ACE_NTOHL (0x59000000),  // name = OP_ONEWAY
++                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
+ 
+-        9,
+-        ACE_NTOHL (0x636f6e74), 
+-        ACE_NTOHL (0x65787473), 
+-        ACE_NTOHL (0x0),  // name = contexts
++              8,
++              ACE_NTOHL (0x76657273), 
++              ACE_NTOHL (0x696f6e00),  // name = version
+         CORBA::tk_alias, // typecode kind for typedefs
+-        92, // encapsulation length
++              68, // encapsulation length
+           TAO_ENCAP_BYTE_ORDER, // byte order
+-          35,
++                34,
+           ACE_NTOHL (0x49444c3a), 
+           ACE_NTOHL (0x6f6d672e), 
+           ACE_NTOHL (0x6f72672f), 
+           ACE_NTOHL (0x434f5242), 
+-          ACE_NTOHL (0x415f436f), 
+-          ACE_NTOHL (0x6e746578), 
+-          ACE_NTOHL (0x74496453), 
+-          ACE_NTOHL (0x65713a31), 
+-          ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA_ContextIdSeq:1.0
+-          19,
+-          ACE_NTOHL (0x434f5242), 
+-          ACE_NTOHL (0x415f436f), 
+-          ACE_NTOHL (0x6e746578), 
+-          ACE_NTOHL (0x74496453), 
+-          ACE_NTOHL (0x65710000),  // name = CORBA_ContextIdSeq
+-          CORBA::tk_sequence, // typecode kind
+-          16, // encapsulation length
+-            TAO_ENCAP_BYTE_ORDER, // byte order
++                ACE_NTOHL (0x412f5665), 
++                ACE_NTOHL (0x7273696f), 
++                ACE_NTOHL (0x6e537065), 
++                ACE_NTOHL (0x633a312e), 
++                ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
++                12,
++                ACE_NTOHL (0x56657273), 
++                ACE_NTOHL (0x696f6e53), 
++                ACE_NTOHL (0x70656300),  // name = VersionSpec
+             CORBA::tk_string, 
+             0U, // string length
++
++              5,
++              ACE_NTOHL (0x74797065), 
++              ACE_NTOHL (0x0),  // name = type
++              CORBA::tk_TypeCode,
++
++
++            0U,
++
++
++
+             0U,
+ 
+ 
+         11,
+-        ACE_NTOHL (0x70617261), 
+-        ACE_NTOHL (0x6d657465), 
+-        ACE_NTOHL (0x72730000),  // name = parameters
++  ACE_NTOHL (0x61747472), 
++  ACE_NTOHL (0x69627574), 
++  ACE_NTOHL (0x65730000),  // name = attributes
          CORBA::tk_alias, // typecode kind for typedefs
 -        444, // encapsulation length
-+        448, // encapsulation length
++  1852, // encapsulation length
            TAO_ENCAP_BYTE_ORDER, // byte order
-           40,
+-          40,
++    41,
            ACE_NTOHL (0x49444c3a), 
-@@ -19619,10 +19619,10 @@
-           ACE_NTOHL (0x74696f6e), 
-           ACE_NTOHL (0x53657100),  // name = CORBA_ParDescriptionSeq
+           ACE_NTOHL (0x6f6d672e), 
+           ACE_NTOHL (0x6f72672f), 
+           ACE_NTOHL (0x434f5242), 
+-          ACE_NTOHL (0x415f5061), 
+-          ACE_NTOHL (0x72446573), 
+-          ACE_NTOHL (0x63726970), 
+-          ACE_NTOHL (0x74696f6e), 
+-          ACE_NTOHL (0x5365713a), 
+-          ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA_ParDescriptionSeq:1.0
+-          24,
+-          ACE_NTOHL (0x434f5242), 
+-          ACE_NTOHL (0x415f5061), 
+-          ACE_NTOHL (0x72446573), 
+-          ACE_NTOHL (0x63726970), 
+-          ACE_NTOHL (0x74696f6e), 
+-          ACE_NTOHL (0x53657100),  // name = CORBA_ParDescriptionSeq
++    ACE_NTOHL (0x412f4174), 
++    ACE_NTOHL (0x74724465), 
++    ACE_NTOHL (0x73637269), 
++    ACE_NTOHL (0x7074696f), 
++    ACE_NTOHL (0x6e536571), 
++    ACE_NTOHL (0x3a312e30), 
++    ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/AttrDescriptionSeq:1.0
++    19,
++    ACE_NTOHL (0x41747472), 
++    ACE_NTOHL (0x44657363), 
++    ACE_NTOHL (0x72697074), 
++    ACE_NTOHL (0x696f6e53), 
++    ACE_NTOHL (0x65710000),  // name = AttrDescriptionSeq
            CORBA::tk_sequence, // typecode kind
 -          360, // encapsulation length
-+          364, // encapsulation length
++    1768, // encapsulation length
              TAO_ENCAP_BYTE_ORDER, // byte order
              CORBA::tk_struct, // typecode kind
 -            344, // encapsulation length
-+            348, // encapsulation length
++      1752, // encapsulation length
                TAO_ENCAP_BYTE_ORDER, // byte order
                43,
                ACE_NTOHL (0x49444c3a), 
-@@ -19670,7 +19670,7 @@
-                 ACE_NTOHL (0x415f4944), 
-                 ACE_NTOHL (0x4c547970), 
-                 ACE_NTOHL (0x653a312e), 
+               ACE_NTOHL (0x6f6d672e), 
+               ACE_NTOHL (0x6f72672f), 
+               ACE_NTOHL (0x434f5242), 
+-              ACE_NTOHL (0x415f5061), 
+-              ACE_NTOHL (0x72616d65), 
+-              ACE_NTOHL (0x74657244), 
++        ACE_NTOHL (0x412f4174), 
++        ACE_NTOHL (0x74726962), 
++        ACE_NTOHL (0x75746544), 
+               ACE_NTOHL (0x65736372), 
+               ACE_NTOHL (0x69707469), 
+               ACE_NTOHL (0x6f6e3a31), 
+-              ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA_ParameterDescription:1.0
+-              27,
+-              ACE_NTOHL (0x434f5242), 
+-              ACE_NTOHL (0x415f5061), 
+-              ACE_NTOHL (0x72616d65), 
+-              ACE_NTOHL (0x74657244), 
+-              ACE_NTOHL (0x65736372), 
+-              ACE_NTOHL (0x69707469), 
+-              ACE_NTOHL (0x6f6e0000),  // name = CORBA_ParameterDescription
+-              4, // member count
++        ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/AttributeDescription:1.0
++        21,
++        ACE_NTOHL (0x41747472), 
++        ACE_NTOHL (0x69627574), 
++        ACE_NTOHL (0x65446573), 
++        ACE_NTOHL (0x63726970), 
++        ACE_NTOHL (0x74696f6e), 
++        ACE_NTOHL (0x0),  // name = AttributeDescription
++        8, // member count
+               5,
+               ACE_NTOHL (0x6e616d65), 
+               ACE_NTOHL (0x0),  // name = name
++        CORBA::tk_alias, // typecode kind for typedefs
++        68, // encapsulation length
++          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
+-              5,
+-              ACE_NTOHL (0x74797065), 
+-              ACE_NTOHL (0x0),  // name = type
+-              CORBA::tk_TypeCode,
+ 
+-              9,
+-              ACE_NTOHL (0x74797065), 
+-              ACE_NTOHL (0x5f646566), 
+-              ACE_NTOHL (0x0),  // name = type_def
+-              CORBA::tk_objref, // typecode kind
+-              60, // encapsulation length
++        3,
++        ACE_NTOHL (0x69640000),  // name = id
++        CORBA::tk_alias, // typecode kind for typedefs
++        72, // encapsulation length
+                 TAO_ENCAP_BYTE_ORDER, // byte order
+-                30,
++          35,
+                 ACE_NTOHL (0x49444c3a), 
+                 ACE_NTOHL (0x6f6d672e), 
+                 ACE_NTOHL (0x6f72672f), 
+                 ACE_NTOHL (0x434f5242), 
+-                ACE_NTOHL (0x415f4944), 
+-                ACE_NTOHL (0x4c547970), 
+-                ACE_NTOHL (0x653a312e), 
 -                ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA_IDLType:1.0
-+                ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/IDLType:1.0
-                 14,
+-                14,
++          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
++
++        11,
++        ACE_NTOHL (0x64656669), 
++        ACE_NTOHL (0x6e65645f), 
++        ACE_NTOHL (0x696e0000),  // name = defined_in
++        CORBA::tk_alias, // typecode kind for typedefs
++        72, // encapsulation length
++          TAO_ENCAP_BYTE_ORDER, // byte order
++          35,
++          ACE_NTOHL (0x49444c3a), 
++          ACE_NTOHL (0x6f6d672e), 
++          ACE_NTOHL (0x6f72672f), 
                  ACE_NTOHL (0x434f5242), 
-                 ACE_NTOHL (0x415f4944), 
-@@ -19681,23 +19681,24 @@
-               ACE_NTOHL (0x6d6f6465), 
-               ACE_NTOHL (0x0),  // name = mode
-               CORBA::tk_enum, // typecode kind
+-                ACE_NTOHL (0x415f4944), 
+-                ACE_NTOHL (0x4c547970), 
+-                ACE_NTOHL (0x65000000),  // name = CORBA_IDLType
++          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
+ 
+-              5,
+-              ACE_NTOHL (0x6d6f6465), 
+-              ACE_NTOHL (0x0),  // name = mode
+-              CORBA::tk_enum, // typecode kind
 -              116, // encapsulation length
-+              120, // encapsulation length
++        8,
++        ACE_NTOHL (0x76657273), 
++        ACE_NTOHL (0x696f6e00),  // name = version
++        CORBA::tk_alias, // typecode kind for typedefs
++        68, // encapsulation length
                  TAO_ENCAP_BYTE_ORDER, // byte order
-                 36,
+-                36,
++          34,
                  ACE_NTOHL (0x49444c3a), 
                  ACE_NTOHL (0x6f6d672e), 
                  ACE_NTOHL (0x6f72672f), 
                  ACE_NTOHL (0x434f5242), 
 -                ACE_NTOHL (0x412f5061), 
-+                ACE_NTOHL (0x415f5061), 
-                 ACE_NTOHL (0x72616d65), 
-                 ACE_NTOHL (0x7465724d), 
-                 ACE_NTOHL (0x6f64653a), 
+-                ACE_NTOHL (0x72616d65), 
+-                ACE_NTOHL (0x7465724d), 
+-                ACE_NTOHL (0x6f64653a), 
 -                ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ParameterMode:1.0
 -                14,
 -                ACE_NTOHL (0x50617261), 
 -                ACE_NTOHL (0x6d657465), 
 -                ACE_NTOHL (0x724d6f64), 
 -                ACE_NTOHL (0x65000000),  // name = ParameterMode
-+                ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA_ParameterMode:1.0
-+                20,
+-                3, // member count
+-                9,
+-                ACE_NTOHL (0x50415241), 
+-                ACE_NTOHL (0x4d5f494e), 
+-                ACE_NTOHL (0x0),  // name = PARAM_IN
+-                10,
+-                ACE_NTOHL (0x50415241), 
+-                ACE_NTOHL (0x4d5f4f55), 
+-                ACE_NTOHL (0x54000000),  // name = PARAM_OUT
++          ACE_NTOHL (0x412f5665), 
++          ACE_NTOHL (0x7273696f), 
++          ACE_NTOHL (0x6e537065), 
++          ACE_NTOHL (0x633a312e), 
++          ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
+                 12,
+-                ACE_NTOHL (0x50415241), 
+-                ACE_NTOHL (0x4d5f494e), 
+-                ACE_NTOHL (0x4f555400),  // name = PARAM_INOUT
+-
++          ACE_NTOHL (0x56657273), 
++          ACE_NTOHL (0x696f6e53), 
++          ACE_NTOHL (0x70656300),  // name = VersionSpec
++          CORBA::tk_string, 
++          0U, // string length
+ 
+-            0U,
++        5,
++        ACE_NTOHL (0x74797065), 
++        ACE_NTOHL (0x0),  // name = type
++        CORBA::tk_TypeCode,
+ 
++        5,
++        ACE_NTOHL (0x6d6f6465), 
++        ACE_NTOHL (0x0),  // name = mode
++        CORBA::tk_enum, // typecode kind
++        104, // encapsulation length
++          TAO_ENCAP_BYTE_ORDER, // byte order
++          36,
++          ACE_NTOHL (0x49444c3a), 
++          ACE_NTOHL (0x6f6d672e), 
++          ACE_NTOHL (0x6f72672f), 
++          ACE_NTOHL (0x434f5242), 
++          ACE_NTOHL (0x412f4174), 
++          ACE_NTOHL (0x74726962), 
++          ACE_NTOHL (0x7574654d), 
++          ACE_NTOHL (0x6f64653a), 
++          ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/AttributeMode:1.0
++          14,
++          ACE_NTOHL (0x41747472), 
++          ACE_NTOHL (0x69627574), 
++          ACE_NTOHL (0x654d6f64), 
++          ACE_NTOHL (0x65000000),  // name = AttributeMode
++          2, // member count
++          12,
++          ACE_NTOHL (0x41545452), 
++          ACE_NTOHL (0x5f4e4f52), 
++          ACE_NTOHL (0x4d414c00),  // name = ATTR_NORMAL
++          14,
++          ACE_NTOHL (0x41545452), 
++          ACE_NTOHL (0x5f524541), 
++          ACE_NTOHL (0x444f4e4c), 
++          ACE_NTOHL (0x59000000),  // name = ATTR_READONLY
+ 
+-        11,
++        15,
++        ACE_NTOHL (0x6765745f), 
+         ACE_NTOHL (0x65786365), 
+         ACE_NTOHL (0x7074696f), 
+-        ACE_NTOHL (0x6e730000),  // name = exceptions
++        ACE_NTOHL (0x6e730000),  // name = get_exceptions
+         CORBA::tk_alias, // typecode kind for typedefs
+-        284, // encapsulation length
++        556, // encapsulation length
+           TAO_ENCAP_BYTE_ORDER, // byte order
+           40,
+           ACE_NTOHL (0x49444c3a), 
+           ACE_NTOHL (0x6f6d672e), 
+           ACE_NTOHL (0x6f72672f), 
+           ACE_NTOHL (0x434f5242), 
+-          ACE_NTOHL (0x415f4578), 
++          ACE_NTOHL (0x412f4578), 
+           ACE_NTOHL (0x63446573), 
+           ACE_NTOHL (0x63726970), 
+           ACE_NTOHL (0x74696f6e), 
+           ACE_NTOHL (0x5365713a), 
+-          ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA_ExcDescriptionSeq:1.0
+-          24,
+-          ACE_NTOHL (0x434f5242), 
+-          ACE_NTOHL (0x415f4578), 
+-          ACE_NTOHL (0x63446573), 
+-          ACE_NTOHL (0x63726970), 
+-          ACE_NTOHL (0x74696f6e), 
+-          ACE_NTOHL (0x53657100),  // name = CORBA_ExcDescriptionSeq
++          ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ExcDescriptionSeq:1.0
++          18,
++          ACE_NTOHL (0x45786344), 
++          ACE_NTOHL (0x65736372), 
++          ACE_NTOHL (0x69707469), 
++          ACE_NTOHL (0x6f6e5365), 
++          ACE_NTOHL (0x71000000),  // name = ExcDescriptionSeq
+           CORBA::tk_sequence, // typecode kind
+-          200, // encapsulation length
++          476, // encapsulation length
+             TAO_ENCAP_BYTE_ORDER, // byte order
+             CORBA::tk_struct, // typecode kind
+-            184, // encapsulation length
++            460, // encapsulation length
+               TAO_ENCAP_BYTE_ORDER, // byte order
+               43,
+               ACE_NTOHL (0x49444c3a), 
+               ACE_NTOHL (0x6f6d672e), 
+               ACE_NTOHL (0x6f72672f), 
+               ACE_NTOHL (0x434f5242), 
+-              ACE_NTOHL (0x415f4578), 
++              ACE_NTOHL (0x412f4578), 
+               ACE_NTOHL (0x63657074), 
+               ACE_NTOHL (0x696f6e44), 
+               ACE_NTOHL (0x65736372), 
+               ACE_NTOHL (0x69707469), 
+               ACE_NTOHL (0x6f6e3a31), 
+-              ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA_ExceptionDescription:1.0
+-              27,
+-              ACE_NTOHL (0x434f5242), 
+-              ACE_NTOHL (0x415f4578), 
+-              ACE_NTOHL (0x63657074), 
+-              ACE_NTOHL (0x696f6e44), 
+-              ACE_NTOHL (0x65736372), 
+-              ACE_NTOHL (0x69707469), 
+-              ACE_NTOHL (0x6f6e0000),  // name = CORBA_ExceptionDescription
++              ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ExceptionDescription:1.0
++              21,
++              ACE_NTOHL (0x45786365), 
++              ACE_NTOHL (0x7074696f), 
++              ACE_NTOHL (0x6e446573), 
++              ACE_NTOHL (0x63726970), 
++              ACE_NTOHL (0x74696f6e), 
++              ACE_NTOHL (0x0),  // name = ExceptionDescription
+               5, // member count
+               5,
+               ACE_NTOHL (0x6e616d65), 
+               ACE_NTOHL (0x0),  // name = name
++              CORBA::tk_alias, // typecode kind for typedefs
++              68, // encapsulation length
++                TAO_ENCAP_BYTE_ORDER, // byte order
++                33,
++                ACE_NTOHL (0x49444c3a), 
++                ACE_NTOHL (0x6f6d672e), 
++                ACE_NTOHL (0x6f72672f), 
 +                ACE_NTOHL (0x434f5242), 
-+                ACE_NTOHL (0x415f5061), 
-+                ACE_NTOHL (0x72616d65), 
-+                ACE_NTOHL (0x7465724d), 
-+                ACE_NTOHL (0x6f646500),  // name = CORBA_ParameterMode
-                 3, // member count
-                 9,
-                 ACE_NTOHL (0x50415241), 
-@@ -19806,7 +19807,7 @@
-   ACE_NTOHL (0x69627574), 
-   ACE_NTOHL (0x65730000),  // name = attributes
++                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
++
+               3,
+               ACE_NTOHL (0x69640000),  // name = id
++              CORBA::tk_alias, // typecode kind for typedefs
++              72, // encapsulation length
++                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
++
+               11,
+               ACE_NTOHL (0x64656669), 
+               ACE_NTOHL (0x6e65645f), 
+               ACE_NTOHL (0x696e0000),  // name = defined_in
++              CORBA::tk_alias, // typecode kind for typedefs
++              72, // encapsulation length
++                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
++
+               8,
+               ACE_NTOHL (0x76657273), 
+               ACE_NTOHL (0x696f6e00),  // name = version
++              CORBA::tk_alias, // typecode kind for typedefs
++              68, // encapsulation length
++                TAO_ENCAP_BYTE_ORDER, // byte order
++                34,
++                ACE_NTOHL (0x49444c3a), 
++                ACE_NTOHL (0x6f6d672e), 
++                ACE_NTOHL (0x6f72672f), 
++                ACE_NTOHL (0x434f5242), 
++                ACE_NTOHL (0x412f5665), 
++                ACE_NTOHL (0x7273696f), 
++                ACE_NTOHL (0x6e537065), 
++                ACE_NTOHL (0x633a312e), 
++                ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
++                12,
++                ACE_NTOHL (0x56657273), 
++                ACE_NTOHL (0x696f6e53), 
++                ACE_NTOHL (0x70656300),  // name = VersionSpec
+               CORBA::tk_string, 
+               0U, // string length
++
+               5,
+               ACE_NTOHL (0x74797065), 
+               ACE_NTOHL (0x0),  // name = type
+@@ -19797,120 +20704,159 @@
+             0U,
+ 
+ 
+-
+-      0U,
+-
+-
+-  11,
+-  ACE_NTOHL (0x61747472), 
+-  ACE_NTOHL (0x69627574), 
+-  ACE_NTOHL (0x65730000),  // name = attributes
++        15,
++        ACE_NTOHL (0x7075745f), 
++        ACE_NTOHL (0x65786365), 
++        ACE_NTOHL (0x7074696f), 
++        ACE_NTOHL (0x6e730000),  // name = put_exceptions
    CORBA::tk_alias, // typecode kind for typedefs
 -  416, // encapsulation length
-+  420, // encapsulation length
++        556, // encapsulation length
      TAO_ENCAP_BYTE_ORDER, // byte order
-     41,
+-    41,
++          40,
      ACE_NTOHL (0x49444c3a), 
-@@ -19829,10 +19830,10 @@
-     ACE_NTOHL (0x6e536571), 
-     ACE_NTOHL (0x0),  // name = CORBA_AttrDescriptionSeq
+     ACE_NTOHL (0x6f6d672e), 
+     ACE_NTOHL (0x6f72672f), 
+     ACE_NTOHL (0x434f5242), 
+-    ACE_NTOHL (0x415f4174), 
+-    ACE_NTOHL (0x74724465), 
+-    ACE_NTOHL (0x73637269), 
+-    ACE_NTOHL (0x7074696f), 
+-    ACE_NTOHL (0x6e536571), 
+-    ACE_NTOHL (0x3a312e30), 
+-    ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA_AttrDescriptionSeq:1.0
+-    25,
+-    ACE_NTOHL (0x434f5242), 
+-    ACE_NTOHL (0x415f4174), 
+-    ACE_NTOHL (0x74724465), 
+-    ACE_NTOHL (0x73637269), 
+-    ACE_NTOHL (0x7074696f), 
+-    ACE_NTOHL (0x6e536571), 
+-    ACE_NTOHL (0x0),  // name = CORBA_AttrDescriptionSeq
++          ACE_NTOHL (0x412f4578), 
++          ACE_NTOHL (0x63446573), 
++          ACE_NTOHL (0x63726970), 
++          ACE_NTOHL (0x74696f6e), 
++          ACE_NTOHL (0x5365713a), 
++          ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ExcDescriptionSeq:1.0
++          18,
++          ACE_NTOHL (0x45786344), 
++          ACE_NTOHL (0x65736372), 
++          ACE_NTOHL (0x69707469), 
++          ACE_NTOHL (0x6f6e5365), 
++          ACE_NTOHL (0x71000000),  // name = ExcDescriptionSeq
      CORBA::tk_sequence, // typecode kind
 -    324, // encapsulation length
-+    328, // encapsulation length
++          476, // encapsulation length
        TAO_ENCAP_BYTE_ORDER, // byte order
        CORBA::tk_struct, // typecode kind
 -      308, // encapsulation length
-+      312, // encapsulation length
++            460, // encapsulation length
          TAO_ENCAP_BYTE_ORDER, // byte order
          43,
          ACE_NTOHL (0x49444c3a), 
-@@ -19884,23 +19885,24 @@
-         ACE_NTOHL (0x6d6f6465), 
-         ACE_NTOHL (0x0),  // name = mode
-         CORBA::tk_enum, // typecode kind
+         ACE_NTOHL (0x6f6d672e), 
+         ACE_NTOHL (0x6f72672f), 
+         ACE_NTOHL (0x434f5242), 
+-        ACE_NTOHL (0x415f4174), 
+-        ACE_NTOHL (0x74726962), 
+-        ACE_NTOHL (0x75746544), 
++              ACE_NTOHL (0x412f4578), 
++              ACE_NTOHL (0x63657074), 
++              ACE_NTOHL (0x696f6e44), 
+         ACE_NTOHL (0x65736372), 
+         ACE_NTOHL (0x69707469), 
+         ACE_NTOHL (0x6f6e3a31), 
+-        ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA_AttributeDescription:1.0
+-        27,
+-        ACE_NTOHL (0x434f5242), 
+-        ACE_NTOHL (0x415f4174), 
+-        ACE_NTOHL (0x74726962), 
+-        ACE_NTOHL (0x75746544), 
+-        ACE_NTOHL (0x65736372), 
+-        ACE_NTOHL (0x69707469), 
+-        ACE_NTOHL (0x6f6e0000),  // name = CORBA_AttributeDescription
+-        6, // member count
++              ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ExceptionDescription:1.0
++              21,
++              ACE_NTOHL (0x45786365), 
++              ACE_NTOHL (0x7074696f), 
++              ACE_NTOHL (0x6e446573), 
++              ACE_NTOHL (0x63726970), 
++              ACE_NTOHL (0x74696f6e), 
++              ACE_NTOHL (0x0),  // name = ExceptionDescription
++              5, // member count
+         5,
+         ACE_NTOHL (0x6e616d65), 
+         ACE_NTOHL (0x0),  // name = name
++              CORBA::tk_alias, // typecode kind for typedefs
++              68, // encapsulation length
++                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
++
+         3,
+         ACE_NTOHL (0x69640000),  // name = id
++              CORBA::tk_alias, // typecode kind for typedefs
++              72, // encapsulation length
++                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
++
+         11,
+         ACE_NTOHL (0x64656669), 
+         ACE_NTOHL (0x6e65645f), 
+         ACE_NTOHL (0x696e0000),  // name = defined_in
++              CORBA::tk_alias, // typecode kind for typedefs
++              72, // encapsulation length
++                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
++
+         8,
+         ACE_NTOHL (0x76657273), 
+         ACE_NTOHL (0x696f6e00),  // name = version
++              CORBA::tk_alias, // typecode kind for typedefs
++              68, // encapsulation length
++                TAO_ENCAP_BYTE_ORDER, // byte order
++                34,
++                ACE_NTOHL (0x49444c3a), 
++                ACE_NTOHL (0x6f6d672e), 
++                ACE_NTOHL (0x6f72672f), 
++                ACE_NTOHL (0x434f5242), 
++                ACE_NTOHL (0x412f5665), 
++                ACE_NTOHL (0x7273696f), 
++                ACE_NTOHL (0x6e537065), 
++                ACE_NTOHL (0x633a312e), 
++                ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
++                12,
++                ACE_NTOHL (0x56657273), 
++                ACE_NTOHL (0x696f6e53), 
++                ACE_NTOHL (0x70656300),  // name = VersionSpec
+         CORBA::tk_string, 
+         0U, // string length
++
+         5,
+         ACE_NTOHL (0x74797065), 
+         ACE_NTOHL (0x0),  // name = type
+         CORBA::tk_TypeCode,
+ 
+-        5,
+-        ACE_NTOHL (0x6d6f6465), 
+-        ACE_NTOHL (0x0),  // name = mode
+-        CORBA::tk_enum, // typecode kind
 -        104, // encapsulation length
-+        108, // encapsulation length
-           TAO_ENCAP_BYTE_ORDER, // byte order
-           36,
-           ACE_NTOHL (0x49444c3a), 
-           ACE_NTOHL (0x6f6d672e), 
-           ACE_NTOHL (0x6f72672f), 
-           ACE_NTOHL (0x434f5242), 
+-          TAO_ENCAP_BYTE_ORDER, // byte order
+-          36,
+-          ACE_NTOHL (0x49444c3a), 
+-          ACE_NTOHL (0x6f6d672e), 
+-          ACE_NTOHL (0x6f72672f), 
+-          ACE_NTOHL (0x434f5242), 
 -          ACE_NTOHL (0x412f4174), 
-+          ACE_NTOHL (0x415f4174), 
-           ACE_NTOHL (0x74726962), 
-           ACE_NTOHL (0x7574654d), 
-           ACE_NTOHL (0x6f64653a), 
+-          ACE_NTOHL (0x74726962), 
+-          ACE_NTOHL (0x7574654d), 
+-          ACE_NTOHL (0x6f64653a), 
 -          ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/AttributeMode:1.0
 -          14,
 -          ACE_NTOHL (0x41747472), 
 -          ACE_NTOHL (0x69627574), 
 -          ACE_NTOHL (0x654d6f64), 
 -          ACE_NTOHL (0x65000000),  // name = AttributeMode
-+          ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA_AttributeMode:1.0
-+          20,
-+          ACE_NTOHL (0x434f5242), 
-+          ACE_NTOHL (0x415f4174), 
-+          ACE_NTOHL (0x74726962), 
-+          ACE_NTOHL (0x7574654d), 
-+          ACE_NTOHL (0x6f646500),  // name = CORBA_AttributeMode
-           2, // member count
-           12,
-           ACE_NTOHL (0x41545452), 
-@@ -22296,11 +22298,6 @@
+-          2, // member count
+-          12,
+-          ACE_NTOHL (0x41545452), 
+-          ACE_NTOHL (0x5f4e4f52), 
+-          ACE_NTOHL (0x4d414c00),  // name = ATTR_NORMAL
+-          14,
+-          ACE_NTOHL (0x41545452), 
+-          ACE_NTOHL (0x5f524541), 
+-          ACE_NTOHL (0x444f4e4c), 
+-          ACE_NTOHL (0x59000000),  // name = ATTR_READONLY
++
++            0U,
++
+ 
+ 
+       0U,
+@@ -22296,11 +23242,6 @@
      // If length is 0 we return true.
      if (0 >= _tao_seq_len) 
        return 1;
@@ -400,7 +2938,7 @@
      // retrieve all the elements
      CORBA::Boolean _tao_marshal_flag = 1;
      for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
-@@ -22343,11 +22340,6 @@
+@@ -22343,11 +23284,6 @@
      // If length is 0 we return true.
      if (0 >= _tao_seq_len) 
        return 1;
@@ -412,7 +2950,7 @@
      // retrieve all the elements
      CORBA::Boolean _tao_marshal_flag = 1;
      for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
-@@ -22390,11 +22382,6 @@
+@@ -22390,11 +23326,6 @@
      // If length is 0 we return true.
      if (0 >= _tao_seq_len) 
        return 1;
@@ -424,7 +2962,7 @@
      // retrieve all the elements
      CORBA::Boolean _tao_marshal_flag = 1;
      for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
-@@ -22437,11 +22424,6 @@
+@@ -22437,11 +23368,6 @@
      // If length is 0 we return true.
      if (0 >= _tao_seq_len) 
        return 1;
@@ -436,7 +2974,7 @@
      // retrieve all the elements
      CORBA::Boolean _tao_marshal_flag = 1;
      for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
-@@ -22484,11 +22466,6 @@
+@@ -22484,11 +23410,6 @@
      // If length is 0 we return true.
      if (0 >= _tao_seq_len) 
        return 1;
@@ -448,7 +2986,7 @@
      // retrieve all the elements
      CORBA::Boolean _tao_marshal_flag = 1;
      for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
-@@ -22531,11 +22508,6 @@
+@@ -22531,11 +23452,6 @@
      // If length is 0 we return true.
      if (0 >= _tao_seq_len) 
        return 1;
@@ -460,7 +2998,7 @@
      // retrieve all the elements
      CORBA::Boolean _tao_marshal_flag = 1;
      for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
-@@ -22578,11 +22550,6 @@
+@@ -22578,11 +23494,6 @@
      // If length is 0 we return true.
      if (0 >= _tao_seq_len) 
        return 1;
@@ -472,7 +3010,7 @@
      // retrieve all the elements
      CORBA::Boolean _tao_marshal_flag = 1;
      for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
-@@ -22625,11 +22592,6 @@
+@@ -22625,11 +23536,6 @@
      // If length is 0 we return true.
      if (0 >= _tao_seq_len) 
        return 1;
@@ -484,7 +3022,7 @@
      // retrieve all the elements
      CORBA::Boolean _tao_marshal_flag = 1;
      for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
-@@ -22672,11 +22634,6 @@
+@@ -22672,11 +23578,6 @@
      // If length is 0 we return true.
      if (0 >= _tao_seq_len) 
        return 1;
@@ -496,7 +3034,7 @@
      // retrieve all the elements
      CORBA::Boolean _tao_marshal_flag = 1;
      for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
-@@ -22719,11 +22676,6 @@
+@@ -22719,11 +23620,6 @@
      // If length is 0 we return true.
      if (0 >= _tao_seq_len) 
        return 1;
@@ -508,7 +3046,7 @@
      // retrieve all the elements
      CORBA::Boolean _tao_marshal_flag = 1;
      for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
-@@ -22874,11 +22826,6 @@
+@@ -22874,11 +23770,6 @@
      // If length is 0 we return true.
      if (0 >= _tao_seq_len) 
        return 1;
@@ -520,7 +3058,7 @@
      // retrieve all the elements
      CORBA::Boolean _tao_marshal_flag = 1;
      for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
-@@ -22921,11 +22868,6 @@
+@@ -22921,11 +23812,6 @@
      // If length is 0 we return true.
      if (0 >= _tao_seq_len) 
        return 1;