ChangeLogTag: Wed Aug 24 08:51:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>

23 files changed, 3474 insertions, 3196 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 7b7824e687f..2b3dad7c42d 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,48 @@
+Wed Aug 24 09:13:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        On the client side we passed the typecode of the user exceptions to the
+        invocation adapter, but this is only needed when interceptors are being
+        used.
+
+        * TAO_IDL/be/be_visitor_operation/ami_exception_holder_operation_cs.cpp:
+        * TAO_IDL/be/be_visitor_operation/exceptlist_cs.cpp:
+          Generate a TAO_HAS_INTERCEPTORS==1 around the passing of the typecode
+          of the user exception
+
+        * TAO_IDL/be/be_visitor_operation/operation.cpp:
+          Removed generation of an environment variable in the client side
+          code which was not needed
+
+        * tao/Exception_Data.h
+        * tao/PI/ClientRequestInfo.cpp
+          Only store and use the typecode of an user exception when
+          interceptors are enabled
+
+        * TAO/tao/ImR_Client/ImplRepo.pidl:
+        * TAO/tao/ImR_Client/ServerObject.pidl:
+          Updated regeneration instructions to not use -GA
+
+        * tao/ImR_Client/ImplRepoA.h
+        * tao/ImR_Client/ImplRepoC.cpp
+        * tao/ImR_Client/ImplRepoC.h
+        * tao/ImR_Client/ImplRepoC.inl
+        * tao/ImR_Client/ImplRepoS.cpp
+        * tao/ImR_Client/ImplRepoS.h
+        * tao/ImR_Client/ServerObjectA.h
+        * tao/ImR_Client/ServerObjectC.cpp
+        * tao/ImR_Client/ServerObjectC.h
+        * tao/ImR_Client/ServerObjectC.inl
+        * tao/ImR_Client/ServerObjectS.cpp
+        * tao/ImR_Client/ServerObjectS.h
+          Regenerated
+
+        * TAO/tao/ImR_Client/ImplRepoA.cpp
+        * TAO/tao/ImR_Client/ServerObjectA.cpp
+          Removed
+
+        * tao/Makefile.am:
+          Updated
+
 Tue Aug 23 18:09:07 2005  J.T. Conklin  <jtc@acorntoolworks.com>
 
 	* orbsvcs/tests/Bug_1395_Regression/Makefile.am:
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/ami_exception_holder_operation_cs.cpp b/TAO/TAO_IDL/be/be_visitor_operation/ami_exception_holder_operation_cs.cpp
index 4bb2b636776..f84e4540c05 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/ami_exception_holder_operation_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/ami_exception_holder_operation_cs.cpp
@@ -163,8 +163,10 @@ be_visitor_operation_ami_exception_holder_operation_cs::visit_operation (
           *os << "{" << be_idt_nl
               << "\"" << ex->repoID () << "\"," << be_nl;
           // Allocator method.
-          *os << ex->name () << "::_alloc," << be_nl
-              << ex->tc_name () << be_uidt_nl
+          *os << ex->name () << "::_alloc,"
+              << "\n#if TAO_HAS_INTERCEPTORS == 1" << be_nl
+              << ", " << ex->tc_name ()
+              << "\n#endif /* TAO_HAS_INTERCEPTORS */" << be_uidt_nl
               << "}";
 
           ++excep_count;
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/exceptlist_cs.cpp b/TAO/TAO_IDL/be/be_visitor_operation/exceptlist_cs.cpp
index 44049b7f684..ee498ff4222 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/exceptlist_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/exceptlist_cs.cpp
@@ -64,8 +64,11 @@ be_visitor_operation_exceptlist_cs::visit_operation (be_operation *node)
 
           *os << "{" << be_idt_nl
               << "\"" << ex->repoID () << "\"," << be_nl
-              << ex->name () << "::_alloc," << be_nl
-              << ex->tc_name () << be_uidt_nl
+              << ex->name () << "::_alloc"
+              << "\n#if TAO_HAS_INTERCEPTORS == 1" << be_nl
+              << ", " << ex->tc_name ()
+              << "\n#endif /* TAO_HAS_INTERCEPTORS */" << be_uidt_nl
+
               << "}";
 
           ei.next ();
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/operation.cpp b/TAO/TAO_IDL/be/be_visitor_operation/operation.cpp
index dd53e6dde2a..aaac17caba7 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/operation.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/operation.cpp
@@ -434,15 +434,7 @@ be_visitor_operation::gen_stub_operation_body (
           << "}" << be_uidt_nl << be_nl;
     }
 
-  const char *env = this->gen_environment_var ();
-
-  if (ACE_OS::strcmp ("", env) != 0)
-    {
-      *os << env << be_nl;
-    }
-
   // Declare return type helper class.
-
   *os << "TAO::Arg_Traits< ";
 
   this->gen_arg_template_param_name (node,
diff --git a/TAO/tao/Exception_Data.h b/TAO/tao/Exception_Data.h
index 868ec5ce961..fc8a8a7328d 100644
--- a/TAO/tao/Exception_Data.h
+++ b/TAO/tao/Exception_Data.h
@@ -13,13 +13,14 @@
 #ifndef TAO_EXCEPTION_DATA_H
 #define TAO_EXCEPTION_DATA_H
 #include /**/ "ace/pre.h"
-#include "ace/config-all.h"
 
+#include "ace/config-all.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/orbconf.h"
 
 namespace TAO
 {
@@ -46,8 +47,10 @@ namespace TAO
     /// The allocator for this exception.
     TAO_Exception_Alloc alloc;
 
+#if TAO_HAS_INTERCEPTORS == 1
     /// The typecode pointer for this exception.
     CORBA::TypeCode_ptr tc_ptr;
+#endif /* TAO_HAS_INTERCEPTORS */
   };
 }
 
diff --git a/TAO/tao/ImR_Client/ImplRepo.pidl b/TAO/tao/ImR_Client/ImplRepo.pidl
index 8bc8366f28e..e1eca929b2c 100644
--- a/TAO/tao/ImR_Client/ImplRepo.pidl
+++ b/TAO/tao/ImR_Client/ImplRepo.pidl
@@ -10,7 +10,7 @@
  *
  * The command used to generate code from this file is:
  *
- *   tao_idl -GA -Ssi -Gp -Gd -Ge 1 -I$(TAO_ROOT) -Sc -Wb,export_macro=TAO_IMR_Client_Export -Wb,export_include=imr_client_export.h -Wb,pre_include="ace/pre.h" -Wb,post_include="ace/post.h" ImplRepo.pidl
+ *   tao_idl -Ssi -Gp -Gd -Ge 1 -I$(TAO_ROOT) -Sc -Wb,export_macro=TAO_IMR_Client_Export -Wb,export_include=imr_client_export.h -Wb,pre_include="ace/pre.h" -Wb,post_include="ace/post.h" ImplRepo.pidl
  *
  */
 //=============================================================================
diff --git a/TAO/tao/ImR_Client/ImplRepoA.cpp b/TAO/tao/ImR_Client/ImplRepoA.cpp
deleted file mode 100644
index f1be0159fb9..00000000000
--- a/TAO/tao/ImR_Client/ImplRepoA.cpp
+++ /dev/null
@@ -1,1071 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "tao/AnyTypeCode/Null_RefCount_Policy.h"
-#include "tao/AnyTypeCode/TypeCode_Constants.h"
-#include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
-#include "tao/AnyTypeCode/Enum_TypeCode_Static.h"
-#include "tao/AnyTypeCode/Objref_TypeCode_Static.h"
-#include "tao/AnyTypeCode/Sequence_TypeCode_Static.h"
-#include "tao/AnyTypeCode/String_TypeCode_Static.h"
-#include "tao/AnyTypeCode/Struct_TypeCode_Static.h"
-#include "tao/AnyTypeCode/TypeCode_Struct_Field.h"
-#include "tao/AnyTypeCode/Recursive_Type_TypeCode.h"
-#include "ImplRepoC.h"
-#include "tao/CDR.h"
-#include "tao/AnyTypeCode/Any.h"
-#include "tao/AnyTypeCode/Any_Impl_T.h"
-#include "tao/AnyTypeCode/Any_Dual_Impl_T.h"
-#include "tao/AnyTypeCode/Any_Basic_Impl_T.h"
-
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/struct_typecode.cpp:87
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const * const _tao_fields_ImplementationRepository_AlreadyRegistered = 0;
-static TAO::TypeCode::Struct<char const *,
-                      CORBA::TypeCode_ptr const *,
-                      TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *,
-                      TAO::Null_RefCount_Policy>
-  _tao_tc_ImplementationRepository_AlreadyRegistered (
-    CORBA::tk_except,
-    "IDL:ImplementationRepository/AlreadyRegistered:1.0",
-    "AlreadyRegistered",
-    _tao_fields_ImplementationRepository_AlreadyRegistered,
-    0);
-
-namespace ImplementationRepository
-{
-  ::CORBA::TypeCode_ptr const _tc_AlreadyRegistered =
-    &_tao_tc_ImplementationRepository_AlreadyRegistered;
-}
-
-
-
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/struct_typecode.cpp:87
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_ImplementationRepository_CannotActivate[] =
-  {
-    { "reason", &CORBA::_tc_string }
-
-  };
-static TAO::TypeCode::Struct<char const *,
-                      CORBA::TypeCode_ptr const *,
-                      TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *,
-                      TAO::Null_RefCount_Policy>
-  _tao_tc_ImplementationRepository_CannotActivate (
-    CORBA::tk_except,
-    "IDL:ImplementationRepository/CannotActivate:1.0",
-    "CannotActivate",
-    _tao_fields_ImplementationRepository_CannotActivate,
-    1);
-
-namespace ImplementationRepository
-{
-  ::CORBA::TypeCode_ptr const _tc_CannotActivate =
-    &_tao_tc_ImplementationRepository_CannotActivate;
-}
-
-
-
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/struct_typecode.cpp:87
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const * const _tao_fields_ImplementationRepository_NotFound = 0;
-static TAO::TypeCode::Struct<char const *,
-                      CORBA::TypeCode_ptr const *,
-                      TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *,
-                      TAO::Null_RefCount_Policy>
-  _tao_tc_ImplementationRepository_NotFound (
-    CORBA::tk_except,
-    "IDL:ImplementationRepository/NotFound:1.0",
-    "NotFound",
-    _tao_fields_ImplementationRepository_NotFound,
-    0);
-
-namespace ImplementationRepository
-{
-  ::CORBA::TypeCode_ptr const _tc_NotFound =
-    &_tao_tc_ImplementationRepository_NotFound;
-}
-
-
-
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/struct_typecode.cpp:87
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_ImplementationRepository_EnvironmentVariable[] =
-  {
-    { "name", &CORBA::_tc_string },
-    { "value", &CORBA::_tc_string }
-
-  };
-static TAO::TypeCode::Struct<char const *,
-                      CORBA::TypeCode_ptr const *,
-                      TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *,
-                      TAO::Null_RefCount_Policy>
-  _tao_tc_ImplementationRepository_EnvironmentVariable (
-    CORBA::tk_struct,
-    "IDL:ImplementationRepository/EnvironmentVariable:1.0",
-    "EnvironmentVariable",
-    _tao_fields_ImplementationRepository_EnvironmentVariable,
-    2);
-
-namespace ImplementationRepository
-{
-  ::CORBA::TypeCode_ptr const _tc_EnvironmentVariable =
-    &_tao_tc_ImplementationRepository_EnvironmentVariable;
-}
-
-
-
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/alias_typecode.cpp:31
-
-
-
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/typecode_defn.cpp:937
-
-
-#ifndef _TAO_TYPECODE_ImplementationRepository_EnvironmentList_GUARD
-#define _TAO_TYPECODE_ImplementationRepository_EnvironmentList_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      ImplementationRepository_EnvironmentList_0 (
-        CORBA::tk_sequence,
-        &ImplementationRepository::_tc_EnvironmentVariable,
-        0U);
-
-    ::CORBA::TypeCode_ptr const tc_ImplementationRepository_EnvironmentList_0 =
-      &ImplementationRepository_EnvironmentList_0;
-
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_ImplementationRepository_EnvironmentList_GUARD */
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_ImplementationRepository_EnvironmentList (
-    CORBA::tk_alias,
-    "IDL:ImplementationRepository/EnvironmentList:1.0",
-    "EnvironmentList",
-    &TAO::TypeCode::tc_ImplementationRepository_EnvironmentList_0);
-
-namespace ImplementationRepository
-{
-  ::CORBA::TypeCode_ptr const _tc_EnvironmentList =
-    &_tao_tc_ImplementationRepository_EnvironmentList;
-}
-
-
-
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/enum_typecode.cpp:34
-
-static char const * const _tao_enumerators_ImplementationRepository_ActivationMode[] =
-  {
-    "NORMAL",
-    "MANUAL",
-    "PER_CLIENT",
-    "AUTO_START"
-
-  };
-
-static TAO::TypeCode::Enum<char const *,
-                           char const * const *,
-                           TAO::Null_RefCount_Policy>
-  _tao_tc_ImplementationRepository_ActivationMode (
-    "IDL:ImplementationRepository/ActivationMode:1.0",
-    "ActivationMode",
-    _tao_enumerators_ImplementationRepository_ActivationMode,
-    4);
-
-namespace ImplementationRepository
-{
-  ::CORBA::TypeCode_ptr const _tc_ActivationMode =
-    &_tao_tc_ImplementationRepository_ActivationMode;
-}
-
-
-
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/struct_typecode.cpp:87
-
-
-
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/typecode_defn.cpp:937
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_ImplementationRepository_StartupOptions[] =
-  {
-    { "command_line", &CORBA::_tc_string },
-    { "environment", &ImplementationRepository::_tc_EnvironmentList },
-    { "working_directory", &CORBA::_tc_string },
-    { "activation", &ImplementationRepository::_tc_ActivationMode },
-    { "activator", &CORBA::_tc_string },
-    { "start_limit", &CORBA::_tc_long }
-
-  };
-static TAO::TypeCode::Struct<char const *,
-                      CORBA::TypeCode_ptr const *,
-                      TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *,
-                      TAO::Null_RefCount_Policy>
-  _tao_tc_ImplementationRepository_StartupOptions (
-    CORBA::tk_struct,
-    "IDL:ImplementationRepository/StartupOptions:1.0",
-    "StartupOptions",
-    _tao_fields_ImplementationRepository_StartupOptions,
-    6);
-
-namespace ImplementationRepository
-{
-  ::CORBA::TypeCode_ptr const _tc_StartupOptions =
-    &_tao_tc_ImplementationRepository_StartupOptions;
-}
-
-
-
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/struct_typecode.cpp:87
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_ImplementationRepository_ServerInformation[] =
-  {
-    { "server", &CORBA::_tc_string },
-    { "startup", &ImplementationRepository::_tc_StartupOptions },
-    { "partial_ior", &CORBA::_tc_string }
-
-  };
-static TAO::TypeCode::Struct<char const *,
-                      CORBA::TypeCode_ptr const *,
-                      TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *,
-                      TAO::Null_RefCount_Policy>
-  _tao_tc_ImplementationRepository_ServerInformation (
-    CORBA::tk_struct,
-    "IDL:ImplementationRepository/ServerInformation:1.0",
-    "ServerInformation",
-    _tao_fields_ImplementationRepository_ServerInformation,
-    3);
-
-namespace ImplementationRepository
-{
-  ::CORBA::TypeCode_ptr const _tc_ServerInformation =
-    &_tao_tc_ImplementationRepository_ServerInformation;
-}
-
-
-
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/alias_typecode.cpp:31
-
-
-
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/typecode_defn.cpp:937
-
-
-#ifndef _TAO_TYPECODE_ImplementationRepository_ServerInformationList_GUARD
-#define _TAO_TYPECODE_ImplementationRepository_ServerInformationList_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      ImplementationRepository_ServerInformationList_0 (
-        CORBA::tk_sequence,
-        &ImplementationRepository::_tc_ServerInformation,
-        0U);
-
-    ::CORBA::TypeCode_ptr const tc_ImplementationRepository_ServerInformationList_0 =
-      &ImplementationRepository_ServerInformationList_0;
-
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_ImplementationRepository_ServerInformationList_GUARD */
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_ImplementationRepository_ServerInformationList (
-    CORBA::tk_alias,
-    "IDL:ImplementationRepository/ServerInformationList:1.0",
-    "ServerInformationList",
-    &TAO::TypeCode::tc_ImplementationRepository_ServerInformationList_0);
-
-namespace ImplementationRepository
-{
-  ::CORBA::TypeCode_ptr const _tc_ServerInformationList =
-    &_tao_tc_ImplementationRepository_ServerInformationList;
-}
-
-
-
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_ImplementationRepository_ServerInformationIterator (
-    CORBA::tk_objref,
-    "IDL:ImplementationRepository/ServerInformationIterator:1.0",
-    "ServerInformationIterator");
-
-namespace ImplementationRepository
-{
-  ::CORBA::TypeCode_ptr const _tc_ServerInformationIterator =
-    &_tao_tc_ImplementationRepository_ServerInformationIterator;
-}
-
-
-
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_ImplementationRepository_Administration (
-    CORBA::tk_objref,
-    "IDL:ImplementationRepository/Administration:1.0",
-    "Administration");
-
-namespace ImplementationRepository
-{
-  ::CORBA::TypeCode_ptr const _tc_Administration =
-    &_tao_tc_ImplementationRepository_Administration;
-}
-
-
-
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_exception/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Dual_Impl_T<ImplementationRepository::AlreadyRegistered>::demarshal_value (
-      TAO_InputCDR & cdr
-    )
-  {
-    CORBA::String_var id;
-
-    if (!(cdr >> id.out ()))
-      {
-        return false;
-      }
-
-    ACE_TRY_NEW_ENV
-      {
-        this->value_->_tao_decode (cdr ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
-      }
-    ACE_CATCHANY
-      {
-        return false;
-      }
-    ACE_ENDTRY;
-
-    return true;
-  }
-}
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const ImplementationRepository::AlreadyRegistered &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<ImplementationRepository::AlreadyRegistered>::insert_copy (
-      _tao_any,
-      ImplementationRepository::AlreadyRegistered::_tao_any_destructor,
-      ImplementationRepository::_tc_AlreadyRegistered,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    ImplementationRepository::AlreadyRegistered *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<ImplementationRepository::AlreadyRegistered>::insert (
-      _tao_any,
-      ImplementationRepository::AlreadyRegistered::_tao_any_destructor,
-      ImplementationRepository::_tc_AlreadyRegistered,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    ImplementationRepository::AlreadyRegistered *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const ImplementationRepository::AlreadyRegistered *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const ImplementationRepository::AlreadyRegistered *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<ImplementationRepository::AlreadyRegistered>::extract (
-        _tao_any,
-        ImplementationRepository::AlreadyRegistered::_tao_any_destructor,
-        ImplementationRepository::_tc_AlreadyRegistered,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_exception/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Dual_Impl_T<ImplementationRepository::CannotActivate>::demarshal_value (
-      TAO_InputCDR & cdr
-    )
-  {
-    CORBA::String_var id;
-
-    if (!(cdr >> id.out ()))
-      {
-        return false;
-      }
-
-    ACE_TRY_NEW_ENV
-      {
-        this->value_->_tao_decode (cdr ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
-      }
-    ACE_CATCHANY
-      {
-        return false;
-      }
-    ACE_ENDTRY;
-
-    return true;
-  }
-}
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const ImplementationRepository::CannotActivate &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<ImplementationRepository::CannotActivate>::insert_copy (
-      _tao_any,
-      ImplementationRepository::CannotActivate::_tao_any_destructor,
-      ImplementationRepository::_tc_CannotActivate,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    ImplementationRepository::CannotActivate *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<ImplementationRepository::CannotActivate>::insert (
-      _tao_any,
-      ImplementationRepository::CannotActivate::_tao_any_destructor,
-      ImplementationRepository::_tc_CannotActivate,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    ImplementationRepository::CannotActivate *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const ImplementationRepository::CannotActivate *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const ImplementationRepository::CannotActivate *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<ImplementationRepository::CannotActivate>::extract (
-        _tao_any,
-        ImplementationRepository::CannotActivate::_tao_any_destructor,
-        ImplementationRepository::_tc_CannotActivate,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_exception/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Dual_Impl_T<ImplementationRepository::NotFound>::demarshal_value (
-      TAO_InputCDR & cdr
-    )
-  {
-    CORBA::String_var id;
-
-    if (!(cdr >> id.out ()))
-      {
-        return false;
-      }
-
-    ACE_TRY_NEW_ENV
-      {
-        this->value_->_tao_decode (cdr ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
-      }
-    ACE_CATCHANY
-      {
-        return false;
-      }
-    ACE_ENDTRY;
-
-    return true;
-  }
-}
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const ImplementationRepository::NotFound &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<ImplementationRepository::NotFound>::insert_copy (
-      _tao_any,
-      ImplementationRepository::NotFound::_tao_any_destructor,
-      ImplementationRepository::_tc_NotFound,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    ImplementationRepository::NotFound *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<ImplementationRepository::NotFound>::insert (
-      _tao_any,
-      ImplementationRepository::NotFound::_tao_any_destructor,
-      ImplementationRepository::_tc_NotFound,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    ImplementationRepository::NotFound *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const ImplementationRepository::NotFound *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const ImplementationRepository::NotFound *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<ImplementationRepository::NotFound>::extract (
-        _tao_any,
-        ImplementationRepository::NotFound::_tao_any_destructor,
-        ImplementationRepository::_tc_NotFound,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_structure/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const ImplementationRepository::EnvironmentVariable &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<ImplementationRepository::EnvironmentVariable>::insert_copy (
-      _tao_any,
-      ImplementationRepository::EnvironmentVariable::_tao_any_destructor,
-      ImplementationRepository::_tc_EnvironmentVariable,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    ImplementationRepository::EnvironmentVariable *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<ImplementationRepository::EnvironmentVariable>::insert (
-      _tao_any,
-      ImplementationRepository::EnvironmentVariable::_tao_any_destructor,
-      ImplementationRepository::_tc_EnvironmentVariable,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    ImplementationRepository::EnvironmentVariable *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const ImplementationRepository::EnvironmentVariable *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const ImplementationRepository::EnvironmentVariable *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<ImplementationRepository::EnvironmentVariable>::extract (
-        _tao_any,
-        ImplementationRepository::EnvironmentVariable::_tao_any_destructor,
-        ImplementationRepository::_tc_EnvironmentVariable,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_sequence/any_op_cs.cpp:54
-
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const ImplementationRepository::EnvironmentList &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<ImplementationRepository::EnvironmentList>::insert_copy (
-      _tao_any,
-      ImplementationRepository::EnvironmentList::_tao_any_destructor,
-      TAO::TypeCode::tc_ImplementationRepository_EnvironmentList_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    ImplementationRepository::EnvironmentList *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<ImplementationRepository::EnvironmentList>::insert (
-      _tao_any,
-      ImplementationRepository::EnvironmentList::_tao_any_destructor,
-      TAO::TypeCode::tc_ImplementationRepository_EnvironmentList_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    ImplementationRepository::EnvironmentList *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const ImplementationRepository::EnvironmentList *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const ImplementationRepository::EnvironmentList *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<ImplementationRepository::EnvironmentList>::extract (
-        _tao_any,
-        ImplementationRepository::EnvironmentList::_tao_any_destructor,
-        TAO::TypeCode::tc_ImplementationRepository_EnvironmentList_0,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_enum/any_op_cs.cpp:52
-
-void operator<<= (
-    CORBA::Any &_tao_any,
-    ImplementationRepository::ActivationMode _tao_elem
-  )
-{
-  TAO::Any_Basic_Impl_T<ImplementationRepository::ActivationMode>::insert (
-      _tao_any,
-      ImplementationRepository::_tc_ActivationMode,
-      _tao_elem
-    );
-}
-
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    ImplementationRepository::ActivationMode &_tao_elem
-  )
-{
-  return
-    TAO::Any_Basic_Impl_T<ImplementationRepository::ActivationMode>::extract (
-        _tao_any,
-        ImplementationRepository::_tc_ActivationMode,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_structure/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const ImplementationRepository::StartupOptions &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<ImplementationRepository::StartupOptions>::insert_copy (
-      _tao_any,
-      ImplementationRepository::StartupOptions::_tao_any_destructor,
-      ImplementationRepository::_tc_StartupOptions,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    ImplementationRepository::StartupOptions *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<ImplementationRepository::StartupOptions>::insert (
-      _tao_any,
-      ImplementationRepository::StartupOptions::_tao_any_destructor,
-      ImplementationRepository::_tc_StartupOptions,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    ImplementationRepository::StartupOptions *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const ImplementationRepository::StartupOptions *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const ImplementationRepository::StartupOptions *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<ImplementationRepository::StartupOptions>::extract (
-        _tao_any,
-        ImplementationRepository::StartupOptions::_tao_any_destructor,
-        ImplementationRepository::_tc_StartupOptions,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_structure/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const ImplementationRepository::ServerInformation &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<ImplementationRepository::ServerInformation>::insert_copy (
-      _tao_any,
-      ImplementationRepository::ServerInformation::_tao_any_destructor,
-      ImplementationRepository::_tc_ServerInformation,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    ImplementationRepository::ServerInformation *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<ImplementationRepository::ServerInformation>::insert (
-      _tao_any,
-      ImplementationRepository::ServerInformation::_tao_any_destructor,
-      ImplementationRepository::_tc_ServerInformation,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    ImplementationRepository::ServerInformation *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const ImplementationRepository::ServerInformation *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const ImplementationRepository::ServerInformation *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<ImplementationRepository::ServerInformation>::extract (
-        _tao_any,
-        ImplementationRepository::ServerInformation::_tao_any_destructor,
-        ImplementationRepository::_tc_ServerInformation,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_sequence/any_op_cs.cpp:54
-
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const ImplementationRepository::ServerInformationList &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<ImplementationRepository::ServerInformationList>::insert_copy (
-      _tao_any,
-      ImplementationRepository::ServerInformationList::_tao_any_destructor,
-      TAO::TypeCode::tc_ImplementationRepository_ServerInformationList_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    ImplementationRepository::ServerInformationList *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<ImplementationRepository::ServerInformationList>::insert (
-      _tao_any,
-      ImplementationRepository::ServerInformationList::_tao_any_destructor,
-      TAO::TypeCode::tc_ImplementationRepository_ServerInformationList_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    ImplementationRepository::ServerInformationList *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const ImplementationRepository::ServerInformationList *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const ImplementationRepository::ServerInformationList *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<ImplementationRepository::ServerInformationList>::extract (
-        _tao_any,
-        ImplementationRepository::ServerInformationList::_tao_any_destructor,
-        TAO::TypeCode::tc_ImplementationRepository_ServerInformationList_0,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<ImplementationRepository::ServerInformationIterator>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    ImplementationRepository::ServerInformationIterator_ptr _tao_elem
-  )
-{
-  ImplementationRepository::ServerInformationIterator_ptr _tao_objptr =
-    ImplementationRepository::ServerInformationIterator::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    ImplementationRepository::ServerInformationIterator_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<ImplementationRepository::ServerInformationIterator>::insert (
-      _tao_any,
-      ImplementationRepository::ServerInformationIterator::_tao_any_destructor,
-      ImplementationRepository::_tc_ServerInformationIterator,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    ImplementationRepository::ServerInformationIterator_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<ImplementationRepository::ServerInformationIterator>::extract (
-        _tao_any,
-        ImplementationRepository::ServerInformationIterator::_tao_any_destructor,
-        ImplementationRepository::_tc_ServerInformationIterator,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<ImplementationRepository::Administration>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    ImplementationRepository::Administration_ptr _tao_elem
-  )
-{
-  ImplementationRepository::Administration_ptr _tao_objptr =
-    ImplementationRepository::Administration::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    ImplementationRepository::Administration_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<ImplementationRepository::Administration>::insert (
-      _tao_any,
-      ImplementationRepository::Administration::_tao_any_destructor,
-      ImplementationRepository::_tc_Administration,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    ImplementationRepository::Administration_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<ImplementationRepository::Administration>::extract (
-        _tao_any,
-        ImplementationRepository::Administration::_tao_any_destructor,
-        ImplementationRepository::_tc_Administration,
-        _tao_elem
-      );
-}
diff --git a/TAO/tao/ImR_Client/ImplRepoA.h b/TAO/tao/ImR_Client/ImplRepoA.h
index aaeab08b626..cf0e7e40863 100644
--- a/TAO/tao/ImR_Client/ImplRepoA.h
+++ b/TAO/tao/ImR_Client/ImplRepoA.h
@@ -26,163 +26,19 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:805
+// be\be_codegen.cpp:390
 
 #ifndef _TAO_IDL_ORIG_IMPLREPOA_H_
 #define _TAO_IDL_ORIG_IMPLREPOA_H_
 
 #include /**/ "ace/pre.h"
 
-#include "imr_client_export.h"
 #include "tao/ImR_Client/ImplRepoC.h"
 
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_decl.cpp:49
-
-extern TAO_IMR_Client_Export ::CORBA::TypeCode_ptr const _tc_AlreadyRegistered;
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_decl.cpp:49
-
-extern TAO_IMR_Client_Export ::CORBA::TypeCode_ptr const _tc_CannotActivate;
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_decl.cpp:49
-
-extern TAO_IMR_Client_Export ::CORBA::TypeCode_ptr const _tc_NotFound;
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_decl.cpp:49
-
-extern TAO_IMR_Client_Export ::CORBA::TypeCode_ptr const _tc_EnvironmentVariable;
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_decl.cpp:49
-
-extern TAO_IMR_Client_Export ::CORBA::TypeCode_ptr const _tc_EnvironmentList;
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_decl.cpp:49
-
-extern TAO_IMR_Client_Export ::CORBA::TypeCode_ptr const _tc_ActivationMode;
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_decl.cpp:49
-
-extern TAO_IMR_Client_Export ::CORBA::TypeCode_ptr const _tc_StartupOptions;
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_decl.cpp:49
-
-extern TAO_IMR_Client_Export ::CORBA::TypeCode_ptr const _tc_ServerInformation;
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_decl.cpp:49
-
-extern TAO_IMR_Client_Export ::CORBA::TypeCode_ptr const _tc_ServerInformationList;
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_decl.cpp:49
-
-extern TAO_IMR_Client_Export ::CORBA::TypeCode_ptr const _tc_ServerInformationIterator;
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_decl.cpp:49
-
-extern TAO_IMR_Client_Export ::CORBA::TypeCode_ptr const _tc_Administration;
-
-// TAO_IDL - Generated from
-// be\be_visitor_exception/any_op_ch.cpp:53
-
-TAO_IMR_Client_Export void operator<<= (CORBA::Any &, const ImplementationRepository::AlreadyRegistered &); // copying version
-TAO_IMR_Client_Export void operator<<= (CORBA::Any &, ImplementationRepository::AlreadyRegistered*); // noncopying version
-TAO_IMR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::AlreadyRegistered *&); // deprecated
-TAO_IMR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const ImplementationRepository::AlreadyRegistered *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_exception/any_op_ch.cpp:53
-
-TAO_IMR_Client_Export void operator<<= (CORBA::Any &, const ImplementationRepository::CannotActivate &); // copying version
-TAO_IMR_Client_Export void operator<<= (CORBA::Any &, ImplementationRepository::CannotActivate*); // noncopying version
-TAO_IMR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::CannotActivate *&); // deprecated
-TAO_IMR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const ImplementationRepository::CannotActivate *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_exception/any_op_ch.cpp:53
-
-TAO_IMR_Client_Export void operator<<= (CORBA::Any &, const ImplementationRepository::NotFound &); // copying version
-TAO_IMR_Client_Export void operator<<= (CORBA::Any &, ImplementationRepository::NotFound*); // noncopying version
-TAO_IMR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::NotFound *&); // deprecated
-TAO_IMR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const ImplementationRepository::NotFound *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/any_op_ch.cpp:53
-
-TAO_IMR_Client_Export void operator<<= (CORBA::Any &, const ImplementationRepository::EnvironmentVariable &); // copying version
-TAO_IMR_Client_Export void operator<<= (CORBA::Any &, ImplementationRepository::EnvironmentVariable*); // noncopying version
-TAO_IMR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::EnvironmentVariable *&); // deprecated
-TAO_IMR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const ImplementationRepository::EnvironmentVariable *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:53
-
-TAO_IMR_Client_Export void operator<<= (CORBA::Any &, const ImplementationRepository::EnvironmentList &); // copying version
-TAO_IMR_Client_Export void operator<<= (CORBA::Any &, ImplementationRepository::EnvironmentList*); // noncopying version
-TAO_IMR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::EnvironmentList *&); // deprecated
-TAO_IMR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const ImplementationRepository::EnvironmentList *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_enum/any_op_ch.cpp:52
-
-TAO_IMR_Client_Export void operator<<= (CORBA::Any &, ImplementationRepository::ActivationMode);
-TAO_IMR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::ActivationMode &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/any_op_ch.cpp:53
-
-TAO_IMR_Client_Export void operator<<= (CORBA::Any &, const ImplementationRepository::StartupOptions &); // copying version
-TAO_IMR_Client_Export void operator<<= (CORBA::Any &, ImplementationRepository::StartupOptions*); // noncopying version
-TAO_IMR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::StartupOptions *&); // deprecated
-TAO_IMR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const ImplementationRepository::StartupOptions *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/any_op_ch.cpp:53
-
-TAO_IMR_Client_Export void operator<<= (CORBA::Any &, const ImplementationRepository::ServerInformation &); // copying version
-TAO_IMR_Client_Export void operator<<= (CORBA::Any &, ImplementationRepository::ServerInformation*); // noncopying version
-TAO_IMR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::ServerInformation *&); // deprecated
-TAO_IMR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const ImplementationRepository::ServerInformation *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:53
-
-TAO_IMR_Client_Export void operator<<= (CORBA::Any &, const ImplementationRepository::ServerInformationList &); // copying version
-TAO_IMR_Client_Export void operator<<= (CORBA::Any &, ImplementationRepository::ServerInformationList*); // noncopying version
-TAO_IMR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::ServerInformationList *&); // deprecated
-TAO_IMR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const ImplementationRepository::ServerInformationList *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:53
-
-TAO_IMR_Client_Export void operator<<= (CORBA::Any &, ImplementationRepository::ServerInformationIterator_ptr); // copying
-TAO_IMR_Client_Export void operator<<= (CORBA::Any &, ImplementationRepository::ServerInformationIterator_ptr *); // non-copying
-TAO_IMR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::ServerInformationIterator_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:53
-
-TAO_IMR_Client_Export void operator<<= (CORBA::Any &, ImplementationRepository::Administration_ptr); // copying
-TAO_IMR_Client_Export void operator<<= (CORBA::Any &, ImplementationRepository::Administration_ptr *); // non-copying
-TAO_IMR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::Administration_ptr &);
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include /**/ "ace/post.h"
-
 #endif /* ifndef */
+
diff --git a/TAO/tao/ImR_Client/ImplRepoC.cpp b/TAO/tao/ImR_Client/ImplRepoC.cpp
index 68ea6e3b79b..a78ad315d52 100644
--- a/TAO/tao/ImR_Client/ImplRepoC.cpp
+++ b/TAO/tao/ImR_Client/ImplRepoC.cpp
@@ -26,14 +26,27 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// .\be\be_codegen.cpp:291
-
-
+// be\be_codegen.cpp:277
+
+
+#include "tao/AnyTypeCode/Null_RefCount_Policy.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Enum_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Objref_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Sequence_TypeCode_Static.h"
+#include "tao/AnyTypeCode/String_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Struct_TypeCode_Static.h"
+#include "tao/AnyTypeCode/TypeCode_Struct_Field.h"
 #include "ImplRepoC.h"
 #include "tao/CDR.h"
 #include "tao/Exception_Data.h"
 #include "tao/Invocation_Adapter.h"
 #include "tao/Object_T.h"
+#include "tao/AnyTypeCode/Any.h"
+#include "tao/AnyTypeCode/Any_Impl_T.h"
+#include "tao/AnyTypeCode/Any_Dual_Impl_T.h"
+#include "tao/AnyTypeCode/Any_Basic_Impl_T.h"
 #include "tao/Basic_Arguments.h"
 #include "tao/Object_Argument_T.h"
 #include "tao/Special_Basic_Arguments.h"
@@ -41,24 +54,23 @@
 #include "tao/Var_Size_Argument_T.h"
 #include "ace/OS_NS_string.h"
 
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
 #if !defined (__ACE_INLINE__)
 #include "ImplRepoC.inl"
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// .\be\be_visitor_arg_traits.cpp:69
+// be\be_visitor_arg_traits.cpp:70
 
 // Arg traits specializations.
 namespace TAO
 {
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_IMPLEMENTATIONREPOSITORY_SERVEROBJECT__ARG_TRAITS_CS_)
-#define _IMPLEMENTATIONREPOSITORY_SERVEROBJECT__ARG_TRAITS_CS_
-
+#if !defined (_IMPLEMENTATIONREPOSITORY_SERVEROBJECT__ARG_TRAITS_)
+#define _IMPLEMENTATIONREPOSITORY_SERVEROBJECT__ARG_TRAITS_
+  
   template<>
   class  Arg_Traits<ImplementationRepository::ServerObject>
     : public
@@ -73,13 +85,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // .\be\be_visitor_arg_traits.cpp:772
-
-#if !defined (_IMPLEMENTATIONREPOSITORY_STARTUPOPTIONS__ARG_TRAITS_CS_)
-#define _IMPLEMENTATIONREPOSITORY_STARTUPOPTIONS__ARG_TRAITS_CS_
+  // be\be_visitor_arg_traits.cpp:888
 
+#if !defined (_IMPLEMENTATIONREPOSITORY_STARTUPOPTIONS__ARG_TRAITS_)
+#define _IMPLEMENTATIONREPOSITORY_STARTUPOPTIONS__ARG_TRAITS_
+  
   template<>
   class Arg_Traits<ImplementationRepository::StartupOptions>
     : public
@@ -93,13 +105,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // .\be\be_visitor_arg_traits.cpp:772
-
-#if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATION__ARG_TRAITS_CS_)
-#define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATION__ARG_TRAITS_CS_
+  // be\be_visitor_arg_traits.cpp:888
 
+#if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATION__ARG_TRAITS_)
+#define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATION__ARG_TRAITS_
+  
   template<>
   class Arg_Traits<ImplementationRepository::ServerInformation>
     : public
@@ -113,13 +125,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // .\be\be_visitor_arg_traits.cpp:489
-
-#if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST__ARG_TRAITS_CS_)
-#define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST__ARG_TRAITS_CS_
+  // be\be_visitor_arg_traits.cpp:590
 
+#if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST__ARG_TRAITS_)
+#define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST__ARG_TRAITS_
+  
   template<>
   class Arg_Traits<ImplementationRepository::ServerInformationList>
     : public
@@ -133,10 +145,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR__ARG_TRAITS_CS_)
-#define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR__ARG_TRAITS_CS_
-
+#if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR__ARG_TRAITS_)
+#define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR__ARG_TRAITS_
+  
   template<>
   class  Arg_Traits<ImplementationRepository::ServerInformationIterator>
     : public
@@ -154,11 +169,11 @@ namespace TAO
 }
 
 
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_exception/exception_cs.cpp:63
+// TAO_IDL - Generated from 
+// be\be_visitor_exception/exception_cs.cpp:63
 
 ImplementationRepository::AlreadyRegistered::AlreadyRegistered (void)
-  : CORBA::UserException (
+  : ::CORBA::UserException (
         "IDL:ImplementationRepository/AlreadyRegistered:1.0",
         "AlreadyRegistered"
       )
@@ -170,7 +185,7 @@ ImplementationRepository::AlreadyRegistered::~AlreadyRegistered (void)
 }
 
 ImplementationRepository::AlreadyRegistered::AlreadyRegistered (const ::ImplementationRepository::AlreadyRegistered &_tao_excp)
-  : CORBA::UserException (
+  : ::CORBA::UserException (
         _tao_excp._rep_id (),
         _tao_excp._name ()
       )
@@ -180,7 +195,7 @@ ImplementationRepository::AlreadyRegistered::AlreadyRegistered (const ::Implemen
 ImplementationRepository::AlreadyRegistered&
 ImplementationRepository::AlreadyRegistered::operator= (const ::ImplementationRepository::AlreadyRegistered &_tao_excp)
 {
-  this->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp);
+  this->ACE_NESTED_CLASS ( ::CORBA, UserException)::operator= (_tao_excp);
   return *this;
 }
 
@@ -192,28 +207,28 @@ void ImplementationRepository::AlreadyRegistered::_tao_any_destructor (void *_ta
 }
 
 ImplementationRepository::AlreadyRegistered *
-ImplementationRepository::AlreadyRegistered::_downcast (CORBA::Exception *_tao_excp)
+ImplementationRepository::AlreadyRegistered::_downcast ( ::CORBA::Exception *_tao_excp)
 {
   return dynamic_cast<AlreadyRegistered *> (_tao_excp);
 }
 
 const ImplementationRepository::AlreadyRegistered *
-ImplementationRepository::AlreadyRegistered::_downcast (CORBA::Exception const *_tao_excp)
+ImplementationRepository::AlreadyRegistered::_downcast ( ::CORBA::Exception const *_tao_excp)
 {
   return dynamic_cast<const AlreadyRegistered *> (_tao_excp);
 }
 
-CORBA::Exception *ImplementationRepository::AlreadyRegistered::_alloc (void)
+::CORBA::Exception *ImplementationRepository::AlreadyRegistered::_alloc (void)
 {
-  CORBA::Exception *retval = 0;
+  ::CORBA::Exception *retval = 0;
   ACE_NEW_RETURN (retval, ::ImplementationRepository::AlreadyRegistered, 0);
   return retval;
 }
 
-CORBA::Exception *
+::CORBA::Exception *
 ImplementationRepository::AlreadyRegistered::_tao_duplicate (void) const
 {
-  CORBA::Exception *result = 0;
+  ::CORBA::Exception *result = 0;
   ACE_NEW_RETURN (
       result,
       ::ImplementationRepository::AlreadyRegistered (*this),
@@ -236,8 +251,8 @@ void ImplementationRepository::AlreadyRegistered::_tao_encode (
     {
       return;
     }
- 
-  ACE_THROW (CORBA::MARSHAL ());
+  
+  ACE_THROW ( ::CORBA::MARSHAL ());
 }
 
 void ImplementationRepository::AlreadyRegistered::_tao_decode (
@@ -249,21 +264,44 @@ void ImplementationRepository::AlreadyRegistered::_tao_decode (
     {
       return;
     }
- 
-  ACE_THROW (CORBA::MARSHAL ());
+  
+  ACE_THROW ( ::CORBA::MARSHAL ());
 }
 
 // TAO extension - the virtual _type method.
-CORBA::TypeCode_ptr ImplementationRepository::AlreadyRegistered::_tao_type (void) const
+::CORBA::TypeCode_ptr ImplementationRepository::AlreadyRegistered::_tao_type (void) const
 {
   return ::ImplementationRepository::_tc_AlreadyRegistered;
 }
 
 // TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_exception/exception_cs.cpp:63
+// be\be_visitor_typecode/struct_typecode.cpp:87
+
+static TAO::TypeCode::Struct_Field<char const *, ::CORBA::TypeCode_ptr const *> const * const _tao_fields_ImplementationRepository_AlreadyRegistered = 0;
+static TAO::TypeCode::Struct<char const *,
+                      ::CORBA::TypeCode_ptr const *,
+                      TAO::TypeCode::Struct_Field<char const *, ::CORBA::TypeCode_ptr const *> const *,
+                      TAO::Null_RefCount_Policy>
+  _tao_tc_ImplementationRepository_AlreadyRegistered (
+    ::CORBA::tk_except,
+    "IDL:ImplementationRepository/AlreadyRegistered:1.0",
+    "AlreadyRegistered",
+    _tao_fields_ImplementationRepository_AlreadyRegistered,
+    0);
+  
+namespace ImplementationRepository
+{
+  ::CORBA::TypeCode_ptr const _tc_AlreadyRegistered =
+    &_tao_tc_ImplementationRepository_AlreadyRegistered;
+}
+
+
+
+// TAO_IDL - Generated from 
+// be\be_visitor_exception/exception_cs.cpp:63
 
 ImplementationRepository::CannotActivate::CannotActivate (void)
-  : CORBA::UserException (
+  : ::CORBA::UserException (
         "IDL:ImplementationRepository/CannotActivate:1.0",
         "CannotActivate"
       )
@@ -275,19 +313,19 @@ ImplementationRepository::CannotActivate::~CannotActivate (void)
 }
 
 ImplementationRepository::CannotActivate::CannotActivate (const ::ImplementationRepository::CannotActivate &_tao_excp)
-  : CORBA::UserException (
+  : ::CORBA::UserException (
         _tao_excp._rep_id (),
         _tao_excp._name ()
       )
 {
-  this->reason = CORBA::string_dup (_tao_excp.reason.in ());
+  this->reason = ::CORBA::string_dup (_tao_excp.reason.in ());
 }
 
 ImplementationRepository::CannotActivate&
 ImplementationRepository::CannotActivate::operator= (const ::ImplementationRepository::CannotActivate &_tao_excp)
 {
-  this->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp);
-  this->reason = CORBA::string_dup (_tao_excp.reason.in ());
+  this->ACE_NESTED_CLASS ( ::CORBA, UserException)::operator= (_tao_excp);
+  this->reason = ::CORBA::string_dup (_tao_excp.reason.in ());
   return *this;
 }
 
@@ -299,28 +337,28 @@ void ImplementationRepository::CannotActivate::_tao_any_destructor (void *_tao_v
 }
 
 ImplementationRepository::CannotActivate *
-ImplementationRepository::CannotActivate::_downcast (CORBA::Exception *_tao_excp)
+ImplementationRepository::CannotActivate::_downcast ( ::CORBA::Exception *_tao_excp)
 {
   return dynamic_cast<CannotActivate *> (_tao_excp);
 }
 
 const ImplementationRepository::CannotActivate *
-ImplementationRepository::CannotActivate::_downcast (CORBA::Exception const *_tao_excp)
+ImplementationRepository::CannotActivate::_downcast ( ::CORBA::Exception const *_tao_excp)
 {
   return dynamic_cast<const CannotActivate *> (_tao_excp);
 }
 
-CORBA::Exception *ImplementationRepository::CannotActivate::_alloc (void)
+::CORBA::Exception *ImplementationRepository::CannotActivate::_alloc (void)
 {
-  CORBA::Exception *retval = 0;
+  ::CORBA::Exception *retval = 0;
   ACE_NEW_RETURN (retval, ::ImplementationRepository::CannotActivate, 0);
   return retval;
 }
 
-CORBA::Exception *
+::CORBA::Exception *
 ImplementationRepository::CannotActivate::_tao_duplicate (void) const
 {
-  CORBA::Exception *result = 0;
+  ::CORBA::Exception *result = 0;
   ACE_NEW_RETURN (
       result,
       ::ImplementationRepository::CannotActivate (*this),
@@ -343,8 +381,8 @@ void ImplementationRepository::CannotActivate::_tao_encode (
     {
       return;
     }
- 
-  ACE_THROW (CORBA::MARSHAL ());
+  
+  ACE_THROW ( ::CORBA::MARSHAL ());
 }
 
 void ImplementationRepository::CannotActivate::_tao_decode (
@@ -356,37 +394,64 @@ void ImplementationRepository::CannotActivate::_tao_decode (
     {
       return;
     }
- 
-  ACE_THROW (CORBA::MARSHAL ());
+  
+  ACE_THROW ( ::CORBA::MARSHAL ());
 }
 
 
 
 // TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_exception/exception_ctor.cpp:66
+// be\be_visitor_exception/exception_ctor.cpp:66
 
 ImplementationRepository::CannotActivate::CannotActivate (
     const char * _tao_reason
   )
-  : CORBA::UserException (
+  : ::CORBA::UserException (
         "IDL:ImplementationRepository/CannotActivate:1.0",
         "CannotActivate"
       )
 {
-  this->reason = CORBA::string_dup (_tao_reason);
+  this->reason = ::CORBA::string_dup (_tao_reason);
 }
 
 // TAO extension - the virtual _type method.
-CORBA::TypeCode_ptr ImplementationRepository::CannotActivate::_tao_type (void) const
+::CORBA::TypeCode_ptr ImplementationRepository::CannotActivate::_tao_type (void) const
 {
   return ::ImplementationRepository::_tc_CannotActivate;
 }
 
 // TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_exception/exception_cs.cpp:63
+// be\be_visitor_typecode/struct_typecode.cpp:87
+
+static TAO::TypeCode::Struct_Field<char const *, ::CORBA::TypeCode_ptr const *> const _tao_fields_ImplementationRepository_CannotActivate[] =
+  {
+    { "reason", &CORBA::_tc_string }
+    
+  };
+static TAO::TypeCode::Struct<char const *,
+                      ::CORBA::TypeCode_ptr const *,
+                      TAO::TypeCode::Struct_Field<char const *, ::CORBA::TypeCode_ptr const *> const *,
+                      TAO::Null_RefCount_Policy>
+  _tao_tc_ImplementationRepository_CannotActivate (
+    ::CORBA::tk_except,
+    "IDL:ImplementationRepository/CannotActivate:1.0",
+    "CannotActivate",
+    _tao_fields_ImplementationRepository_CannotActivate,
+    1);
+  
+namespace ImplementationRepository
+{
+  ::CORBA::TypeCode_ptr const _tc_CannotActivate =
+    &_tao_tc_ImplementationRepository_CannotActivate;
+}
+
+
+
+// TAO_IDL - Generated from 
+// be\be_visitor_exception/exception_cs.cpp:63
 
 ImplementationRepository::NotFound::NotFound (void)
-  : CORBA::UserException (
+  : ::CORBA::UserException (
         "IDL:ImplementationRepository/NotFound:1.0",
         "NotFound"
       )
@@ -398,7 +463,7 @@ ImplementationRepository::NotFound::~NotFound (void)
 }
 
 ImplementationRepository::NotFound::NotFound (const ::ImplementationRepository::NotFound &_tao_excp)
-  : CORBA::UserException (
+  : ::CORBA::UserException (
         _tao_excp._rep_id (),
         _tao_excp._name ()
       )
@@ -408,7 +473,7 @@ ImplementationRepository::NotFound::NotFound (const ::ImplementationRepository::
 ImplementationRepository::NotFound&
 ImplementationRepository::NotFound::operator= (const ::ImplementationRepository::NotFound &_tao_excp)
 {
-  this->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp);
+  this->ACE_NESTED_CLASS ( ::CORBA, UserException)::operator= (_tao_excp);
   return *this;
 }
 
@@ -420,28 +485,28 @@ void ImplementationRepository::NotFound::_tao_any_destructor (void *_tao_void_po
 }
 
 ImplementationRepository::NotFound *
-ImplementationRepository::NotFound::_downcast (CORBA::Exception *_tao_excp)
+ImplementationRepository::NotFound::_downcast ( ::CORBA::Exception *_tao_excp)
 {
   return dynamic_cast<NotFound *> (_tao_excp);
 }
 
 const ImplementationRepository::NotFound *
-ImplementationRepository::NotFound::_downcast (CORBA::Exception const *_tao_excp)
+ImplementationRepository::NotFound::_downcast ( ::CORBA::Exception const *_tao_excp)
 {
   return dynamic_cast<const NotFound *> (_tao_excp);
 }
 
-CORBA::Exception *ImplementationRepository::NotFound::_alloc (void)
+::CORBA::Exception *ImplementationRepository::NotFound::_alloc (void)
 {
-  CORBA::Exception *retval = 0;
+  ::CORBA::Exception *retval = 0;
   ACE_NEW_RETURN (retval, ::ImplementationRepository::NotFound, 0);
   return retval;
 }
 
-CORBA::Exception *
+::CORBA::Exception *
 ImplementationRepository::NotFound::_tao_duplicate (void) const
 {
-  CORBA::Exception *result = 0;
+  ::CORBA::Exception *result = 0;
   ACE_NEW_RETURN (
       result,
       ::ImplementationRepository::NotFound (*this),
@@ -464,8 +529,8 @@ void ImplementationRepository::NotFound::_tao_encode (
     {
       return;
     }
- 
-  ACE_THROW (CORBA::MARSHAL ());
+  
+  ACE_THROW ( ::CORBA::MARSHAL ());
 }
 
 void ImplementationRepository::NotFound::_tao_decode (
@@ -477,20 +542,71 @@ void ImplementationRepository::NotFound::_tao_decode (
     {
       return;
     }
- 
-  ACE_THROW (CORBA::MARSHAL ());
+  
+  ACE_THROW ( ::CORBA::MARSHAL ());
 }
 
 // TAO extension - the virtual _type method.
-CORBA::TypeCode_ptr ImplementationRepository::NotFound::_tao_type (void) const
+::CORBA::TypeCode_ptr ImplementationRepository::NotFound::_tao_type (void) const
 {
   return ::ImplementationRepository::_tc_NotFound;
 }
 
 // TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_structure/structure_cs.cpp:66
+// be\be_visitor_typecode/struct_typecode.cpp:87
 
-void
+static TAO::TypeCode::Struct_Field<char const *, ::CORBA::TypeCode_ptr const *> const * const _tao_fields_ImplementationRepository_NotFound = 0;
+static TAO::TypeCode::Struct<char const *,
+                      ::CORBA::TypeCode_ptr const *,
+                      TAO::TypeCode::Struct_Field<char const *, ::CORBA::TypeCode_ptr const *> const *,
+                      TAO::Null_RefCount_Policy>
+  _tao_tc_ImplementationRepository_NotFound (
+    ::CORBA::tk_except,
+    "IDL:ImplementationRepository/NotFound:1.0",
+    "NotFound",
+    _tao_fields_ImplementationRepository_NotFound,
+    0);
+  
+namespace ImplementationRepository
+{
+  ::CORBA::TypeCode_ptr const _tc_NotFound =
+    &_tao_tc_ImplementationRepository_NotFound;
+}
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/struct_typecode.cpp:87
+
+static TAO::TypeCode::Struct_Field<char const *, ::CORBA::TypeCode_ptr const *> const _tao_fields_ImplementationRepository_EnvironmentVariable[] =
+  {
+    { "name", &CORBA::_tc_string },
+    { "value", &CORBA::_tc_string }
+    
+  };
+static TAO::TypeCode::Struct<char const *,
+                      ::CORBA::TypeCode_ptr const *,
+                      TAO::TypeCode::Struct_Field<char const *, ::CORBA::TypeCode_ptr const *> const *,
+                      TAO::Null_RefCount_Policy>
+  _tao_tc_ImplementationRepository_EnvironmentVariable (
+    ::CORBA::tk_struct,
+    "IDL:ImplementationRepository/EnvironmentVariable:1.0",
+    "EnvironmentVariable",
+    _tao_fields_ImplementationRepository_EnvironmentVariable,
+    2);
+  
+namespace ImplementationRepository
+{
+  ::CORBA::TypeCode_ptr const _tc_EnvironmentVariable =
+    &_tao_tc_ImplementationRepository_EnvironmentVariable;
+}
+
+
+
+// TAO_IDL - Generated from 
+// be\be_visitor_structure/structure_cs.cpp:66
+
+void 
 ImplementationRepository::EnvironmentVariable::_tao_any_destructor (
     void *_tao_void_pointer
   )
@@ -500,8 +616,8 @@ ImplementationRepository::EnvironmentVariable::_tao_any_destructor (
   delete _tao_tmp_pointer;
 }
 
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_sequence/sequence_cs.cpp:65
+// TAO_IDL - Generated from 
+// be\be_visitor_sequence/sequence_cs.cpp:65
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST_CS_)
 #define _IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST_CS_
@@ -510,22 +626,22 @@ ImplementationRepository::EnvironmentList::EnvironmentList (void)
 {}
 
 ImplementationRepository::EnvironmentList::EnvironmentList (
-    CORBA::ULong max
+    ::CORBA::ULong max
   )
   : TAO_Unbounded_Sequence<
-        ImplementationRepository::EnvironmentVariable
+        EnvironmentVariable
       >
     (max)
 {}
 
 ImplementationRepository::EnvironmentList::EnvironmentList (
-    CORBA::ULong max,
-    CORBA::ULong length,
+    ::CORBA::ULong max,
+    ::CORBA::ULong length,
     ImplementationRepository::EnvironmentVariable * buffer,
-    CORBA::Boolean release
+    ::CORBA::Boolean release
   )
   : TAO_Unbounded_Sequence<
-        ImplementationRepository::EnvironmentVariable
+        EnvironmentVariable
       >
     (max, length, buffer, release)
 {}
@@ -534,7 +650,7 @@ ImplementationRepository::EnvironmentList::EnvironmentList (
     const EnvironmentList &seq
   )
   : TAO_Unbounded_Sequence<
-        ImplementationRepository::EnvironmentVariable
+        EnvironmentVariable
       >
     (seq)
 {}
@@ -554,9 +670,123 @@ void ImplementationRepository::EnvironmentList::_tao_any_destructor (
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_structure/structure_cs.cpp:66
+// be\be_visitor_typecode/alias_typecode.cpp:50
 
-void
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:937
+
+
+#ifndef _TAO_TYPECODE_ImplementationRepository_EnvironmentList_GUARD
+#define _TAO_TYPECODE_ImplementationRepository_EnvironmentList_GUARD
+namespace TAO
+{
+  namespace TypeCode
+  {
+    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
+                            TAO::Null_RefCount_Policy>
+      ImplementationRepository_EnvironmentList_0 (
+        ::CORBA::tk_sequence,
+        &ImplementationRepository::_tc_EnvironmentVariable,
+        0U);
+      
+    ::CORBA::TypeCode_ptr const tc_ImplementationRepository_EnvironmentList_0 =
+      &ImplementationRepository_EnvironmentList_0;
+    
+  }
+}
+
+
+#endif /* _TAO_TYPECODE_ImplementationRepository_EnvironmentList_GUARD */
+
+static TAO::TypeCode::Alias<char const *,
+                            ::CORBA::TypeCode_ptr const *,
+                            TAO::Null_RefCount_Policy>
+  _tao_tc_ImplementationRepository_EnvironmentList (
+    ::CORBA::tk_alias,
+    "IDL:ImplementationRepository/EnvironmentList:1.0",
+    "EnvironmentList",
+    &TAO::TypeCode::tc_ImplementationRepository_EnvironmentList_0);
+  
+namespace ImplementationRepository
+{
+  ::CORBA::TypeCode_ptr const _tc_EnvironmentList =
+    &_tao_tc_ImplementationRepository_EnvironmentList;
+}
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/enum_typecode.cpp:34
+
+static char const * const _tao_enumerators_ImplementationRepository_ActivationMode[] =
+  {
+    "NORMAL",
+    "MANUAL",
+    "PER_CLIENT",
+    "AUTO_START"
+    
+  };
+
+static TAO::TypeCode::Enum<char const *,
+                           char const * const *,
+                           TAO::Null_RefCount_Policy>
+  _tao_tc_ImplementationRepository_ActivationMode (
+    "IDL:ImplementationRepository/ActivationMode:1.0",
+    "ActivationMode",
+    _tao_enumerators_ImplementationRepository_ActivationMode,
+    4);
+  
+namespace ImplementationRepository
+{
+  ::CORBA::TypeCode_ptr const _tc_ActivationMode =
+    &_tao_tc_ImplementationRepository_ActivationMode;
+}
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/struct_typecode.cpp:87
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:937
+
+static TAO::TypeCode::Struct_Field<char const *, ::CORBA::TypeCode_ptr const *> const _tao_fields_ImplementationRepository_StartupOptions[] =
+  {
+    { "command_line", &CORBA::_tc_string },
+    { "environment", &ImplementationRepository::_tc_EnvironmentList },
+    { "working_directory", &CORBA::_tc_string },
+    { "activation", &ImplementationRepository::_tc_ActivationMode },
+    { "activator", &CORBA::_tc_string },
+    { "start_limit", &CORBA::_tc_long }
+    
+  };
+static TAO::TypeCode::Struct<char const *,
+                      ::CORBA::TypeCode_ptr const *,
+                      TAO::TypeCode::Struct_Field<char const *, ::CORBA::TypeCode_ptr const *> const *,
+                      TAO::Null_RefCount_Policy>
+  _tao_tc_ImplementationRepository_StartupOptions (
+    ::CORBA::tk_struct,
+    "IDL:ImplementationRepository/StartupOptions:1.0",
+    "StartupOptions",
+    _tao_fields_ImplementationRepository_StartupOptions,
+    6);
+  
+namespace ImplementationRepository
+{
+  ::CORBA::TypeCode_ptr const _tc_StartupOptions =
+    &_tao_tc_ImplementationRepository_StartupOptions;
+}
+
+
+
+// TAO_IDL - Generated from 
+// be\be_visitor_structure/structure_cs.cpp:66
+
+void 
 ImplementationRepository::StartupOptions::_tao_any_destructor (
     void *_tao_void_pointer
   )
@@ -567,9 +797,38 @@ ImplementationRepository::StartupOptions::_tao_any_destructor (
 }
 
 // TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_structure/structure_cs.cpp:66
+// be\be_visitor_typecode/struct_typecode.cpp:87
 
-void
+static TAO::TypeCode::Struct_Field<char const *, ::CORBA::TypeCode_ptr const *> const _tao_fields_ImplementationRepository_ServerInformation[] =
+  {
+    { "server", &CORBA::_tc_string },
+    { "startup", &ImplementationRepository::_tc_StartupOptions },
+    { "partial_ior", &CORBA::_tc_string }
+    
+  };
+static TAO::TypeCode::Struct<char const *,
+                      ::CORBA::TypeCode_ptr const *,
+                      TAO::TypeCode::Struct_Field<char const *, ::CORBA::TypeCode_ptr const *> const *,
+                      TAO::Null_RefCount_Policy>
+  _tao_tc_ImplementationRepository_ServerInformation (
+    ::CORBA::tk_struct,
+    "IDL:ImplementationRepository/ServerInformation:1.0",
+    "ServerInformation",
+    _tao_fields_ImplementationRepository_ServerInformation,
+    3);
+  
+namespace ImplementationRepository
+{
+  ::CORBA::TypeCode_ptr const _tc_ServerInformation =
+    &_tao_tc_ImplementationRepository_ServerInformation;
+}
+
+
+
+// TAO_IDL - Generated from 
+// be\be_visitor_structure/structure_cs.cpp:66
+
+void 
 ImplementationRepository::ServerInformation::_tao_any_destructor (
     void *_tao_void_pointer
   )
@@ -579,8 +838,8 @@ ImplementationRepository::ServerInformation::_tao_any_destructor (
   delete _tao_tmp_pointer;
 }
 
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_sequence/sequence_cs.cpp:65
+// TAO_IDL - Generated from 
+// be\be_visitor_sequence/sequence_cs.cpp:65
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST_CS_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST_CS_
@@ -589,22 +848,22 @@ ImplementationRepository::ServerInformationList::ServerInformationList (void)
 {}
 
 ImplementationRepository::ServerInformationList::ServerInformationList (
-    CORBA::ULong max
+    ::CORBA::ULong max
   )
   : TAO_Unbounded_Sequence<
-        ImplementationRepository::ServerInformation
+        ServerInformation
       >
     (max)
 {}
 
 ImplementationRepository::ServerInformationList::ServerInformationList (
-    CORBA::ULong max,
-    CORBA::ULong length,
+    ::CORBA::ULong max,
+    ::CORBA::ULong length,
     ImplementationRepository::ServerInformation * buffer,
-    CORBA::Boolean release
+    ::CORBA::Boolean release
   )
   : TAO_Unbounded_Sequence<
-        ImplementationRepository::ServerInformation
+        ServerInformation
       >
     (max, length, buffer, release)
 {}
@@ -613,7 +872,7 @@ ImplementationRepository::ServerInformationList::ServerInformationList (
     const ServerInformationList &seq
   )
   : TAO_Unbounded_Sequence<
-        ImplementationRepository::ServerInformation
+        ServerInformation
       >
     (seq)
 {}
@@ -633,7 +892,55 @@ void ImplementationRepository::ServerInformationList::_tao_any_destructor (
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_cs.cpp:60
+// be\be_visitor_typecode/alias_typecode.cpp:50
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:937
+
+
+#ifndef _TAO_TYPECODE_ImplementationRepository_ServerInformationList_GUARD
+#define _TAO_TYPECODE_ImplementationRepository_ServerInformationList_GUARD
+namespace TAO
+{
+  namespace TypeCode
+  {
+    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
+                            TAO::Null_RefCount_Policy>
+      ImplementationRepository_ServerInformationList_0 (
+        ::CORBA::tk_sequence,
+        &ImplementationRepository::_tc_ServerInformation,
+        0U);
+      
+    ::CORBA::TypeCode_ptr const tc_ImplementationRepository_ServerInformationList_0 =
+      &ImplementationRepository_ServerInformationList_0;
+    
+  }
+}
+
+
+#endif /* _TAO_TYPECODE_ImplementationRepository_ServerInformationList_GUARD */
+
+static TAO::TypeCode::Alias<char const *,
+                            ::CORBA::TypeCode_ptr const *,
+                            TAO::Null_RefCount_Policy>
+  _tao_tc_ImplementationRepository_ServerInformationList (
+    ::CORBA::tk_alias,
+    "IDL:ImplementationRepository/ServerInformationList:1.0",
+    "ServerInformationList",
+    &TAO::TypeCode::tc_ImplementationRepository_ServerInformationList_0);
+  
+namespace ImplementationRepository
+{
+  ::CORBA::TypeCode_ptr const _tc_ServerInformationList =
+    &_tao_tc_ImplementationRepository_ServerInformationList;
+}
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for ImplementationRepository::ServerInformationIterator.
 
@@ -659,54 +966,54 @@ TAO::Objref_Traits<ImplementationRepository::ServerInformationIterator>::nil (vo
   return ImplementationRepository::ServerInformationIterator::_nil ();
 }
 
-CORBA::Boolean
+::CORBA::Boolean
 TAO::Objref_Traits<ImplementationRepository::ServerInformationIterator>::marshal (
     ImplementationRepository::ServerInformationIterator_ptr p,
     TAO_OutputCDR & cdr
   )
 {
-  return CORBA::Object::marshal (p, cdr);
+  return ::CORBA::Object::marshal (p, cdr);
 }
 
 // Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker *
+TAO::Collocation_Proxy_Broker * 
 (*ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
+    ::CORBA::Object_ptr obj
   ) = 0;
 
 // TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_cs.cpp:78
+// be\be_visitor_operation/operation_cs.cpp:78
 
-CORBA::Boolean ImplementationRepository::ServerInformationIterator::next_n (
+::CORBA::Boolean ImplementationRepository::ServerInformationIterator::next_n (
     ::CORBA::ULong how_many,
     ::ImplementationRepository::ServerInformationList_out servers
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
-    CORBA::SystemException
+    ::CORBA::SystemException
   ))
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ACE_NESTED_CLASS ( ::CORBA, Object)::tao_object_initialize (this);
     }
- 
+  
   if (this->the_TAO_ServerInformationIterator_Proxy_Broker_ == 0)
     {
       ImplementationRepository_ServerInformationIterator_setup_collocation ();
     }
- 
+  
   TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::ret_val _tao_retval;
   TAO::Arg_Traits< ::CORBA::ULong>::in_arg_val _tao_how_many (how_many);
   TAO::Arg_Traits< ::ImplementationRepository::ServerInformationList>::out_arg_val _tao_servers (servers);
- 
+  
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
       &_tao_how_many,
       &_tao_servers
     };
- 
+  
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -715,40 +1022,40 @@ CORBA::Boolean ImplementationRepository::ServerInformationIterator::next_n (
       6,
       this->the_TAO_ServerInformationIterator_Proxy_Broker_
     );
- 
+  
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
- 
+  
   return _tao_retval.retn ();
 }
 
 // TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_cs.cpp:78
+// be\be_visitor_operation/operation_cs.cpp:78
 
 void ImplementationRepository::ServerInformationIterator::destroy (
     ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
-    CORBA::SystemException
+    ::CORBA::SystemException
   ))
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ACE_NESTED_CLASS ( ::CORBA, Object)::tao_object_initialize (this);
     }
- 
+  
   if (this->the_TAO_ServerInformationIterator_Proxy_Broker_ == 0)
     {
       ImplementationRepository_ServerInformationIterator_setup_collocation ();
     }
- 
+  
   TAO::Arg_Traits< void>::ret_val _tao_retval;
- 
+  
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval
     };
- 
+  
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -757,7 +1064,7 @@ void ImplementationRepository::ServerInformationIterator::destroy (
       7,
       this->the_TAO_ServerInformationIterator_Proxy_Broker_
     );
- 
+  
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
@@ -781,7 +1088,7 @@ ImplementationRepository::ServerInformationIterator::ImplementationRepository_Se
 ImplementationRepository::ServerInformationIterator::~ServerInformationIterator (void)
 {}
 
-void
+void 
 ImplementationRepository::ServerInformationIterator::_tao_any_destructor (void *_tao_void_pointer)
 {
   ServerInformationIterator *_tao_tmp_pointer =
@@ -791,7 +1098,7 @@ ImplementationRepository::ServerInformationIterator::_tao_any_destructor (void *
 
 ImplementationRepository::ServerInformationIterator_ptr
 ImplementationRepository::ServerInformationIterator::_narrow (
-    CORBA::Object_ptr _tao_objref
+    ::CORBA::Object_ptr _tao_objref
     ACE_ENV_ARG_DECL
   )
 {
@@ -806,7 +1113,7 @@ ImplementationRepository::ServerInformationIterator::_narrow (
 
 ImplementationRepository::ServerInformationIterator_ptr
 ImplementationRepository::ServerInformationIterator::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
+    ::CORBA::Object_ptr _tao_objref
     ACE_ENV_ARG_DECL
   )
 {
@@ -826,7 +1133,7 @@ ImplementationRepository::ServerInformationIterator::_duplicate (ServerInformati
     {
       obj->_add_ref ();
     }
- 
+  
   return obj;
 }
 
@@ -836,7 +1143,7 @@ ImplementationRepository::ServerInformationIterator::_tao_release (ServerInforma
   CORBA::release (obj);
 }
 
-CORBA::Boolean
+::CORBA::Boolean
 ImplementationRepository::ServerInformationIterator::_is_a (
     const char *value
     ACE_ENV_ARG_DECL
@@ -857,7 +1164,7 @@ ImplementationRepository::ServerInformationIterator::_is_a (
     }
   else
     {
-      return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a (
+      return this->ACE_NESTED_CLASS ( ::CORBA, Object)::_is_a (
           value
           ACE_ENV_ARG_PARAMETER
         );
@@ -869,14 +1176,32 @@ const char* ImplementationRepository::ServerInformationIterator::_interface_repo
   return "IDL:ImplementationRepository/ServerInformationIterator:1.0";
 }
 
-CORBA::Boolean
+::CORBA::Boolean
 ImplementationRepository::ServerInformationIterator::marshal (TAO_OutputCDR &cdr)
 {
   return (cdr << this);
 }
 
 // TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_cs.cpp:60
+// be\be_visitor_typecode/objref_typecode.cpp:76
+
+static TAO::TypeCode::Objref<char const *,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_ImplementationRepository_ServerInformationIterator (
+    ::CORBA::tk_objref,
+    "IDL:ImplementationRepository/ServerInformationIterator:1.0",
+    "ServerInformationIterator");
+  
+namespace ImplementationRepository
+{
+  ::CORBA::TypeCode_ptr const _tc_ServerInformationIterator =
+    &_tao_tc_ImplementationRepository_ServerInformationIterator;
+}
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for ImplementationRepository::Administration.
 
@@ -902,69 +1227,73 @@ TAO::Objref_Traits<ImplementationRepository::Administration>::nil (void)
   return ImplementationRepository::Administration::_nil ();
 }
 
-CORBA::Boolean
+::CORBA::Boolean
 TAO::Objref_Traits<ImplementationRepository::Administration>::marshal (
     ImplementationRepository::Administration_ptr p,
     TAO_OutputCDR & cdr
   )
 {
-  return CORBA::Object::marshal (p, cdr);
+  return ::CORBA::Object::marshal (p, cdr);
 }
 
 // Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker *
+TAO::Collocation_Proxy_Broker * 
 (*ImplementationRepository__TAO_Administration_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
+    ::CORBA::Object_ptr obj
   ) = 0;
 
 // TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_cs.cpp:78
+// be\be_visitor_operation/operation_cs.cpp:78
 
 void ImplementationRepository::Administration::activate_server (
     const char * server
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
-    CORBA::SystemException,
+    ::CORBA::SystemException,
     ::ImplementationRepository::NotFound,
     ::ImplementationRepository::CannotActivate
   ))
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ACE_NESTED_CLASS ( ::CORBA, Object)::tao_object_initialize (this);
     }
- 
+  
   if (this->the_TAO_Administration_Proxy_Broker_ == 0)
     {
       ImplementationRepository_Administration_setup_collocation ();
     }
- 
+  
   TAO::Arg_Traits< void>::ret_val _tao_retval;
   TAO::Arg_Traits< ::CORBA::Char *>::in_arg_val _tao_server (server);
- 
+  
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
       &_tao_server
     };
- 
+  
   static TAO::Exception_Data
-  _tao_ImplementationRepository_Administration_activate_server_exceptiondata [] =
+  _tao_ImplementationRepository_Administration_activate_server_exceptiondata [] = 
     {
       {
         "IDL:ImplementationRepository/NotFound:1.0",
-        ImplementationRepository::NotFound::_alloc,
-        ImplementationRepository::_tc_NotFound
+        ImplementationRepository::NotFound::_alloc
+#if TAO_HAS_INTERCEPTORS == 1
+        , ImplementationRepository::_tc_NotFound
+#endif /* TAO_HAS_INTERCEPTORS */
       },
- 
+      
       {
         "IDL:ImplementationRepository/CannotActivate:1.0",
-        ImplementationRepository::CannotActivate::_alloc,
-        ImplementationRepository::_tc_CannotActivate
+        ImplementationRepository::CannotActivate::_alloc
+#if TAO_HAS_INTERCEPTORS == 1
+        , ImplementationRepository::_tc_CannotActivate
+#endif /* TAO_HAS_INTERCEPTORS */
       }
     };
- 
+  
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -973,7 +1302,7 @@ void ImplementationRepository::Administration::activate_server (
       15,
       this->the_TAO_Administration_Proxy_Broker_
     );
- 
+  
   _tao_call.invoke (
       _tao_ImplementationRepository_Administration_activate_server_exceptiondata,
       2
@@ -983,7 +1312,7 @@ void ImplementationRepository::Administration::activate_server (
 }
 
 // TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_cs.cpp:78
+// be\be_visitor_operation/operation_cs.cpp:78
 
 void ImplementationRepository::Administration::add_or_update_server (
     const char * server,
@@ -991,41 +1320,43 @@ void ImplementationRepository::Administration::add_or_update_server (
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
-    CORBA::SystemException,
+    ::CORBA::SystemException,
     ::ImplementationRepository::NotFound
   ))
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ACE_NESTED_CLASS ( ::CORBA, Object)::tao_object_initialize (this);
     }
- 
+  
   if (this->the_TAO_Administration_Proxy_Broker_ == 0)
     {
       ImplementationRepository_Administration_setup_collocation ();
     }
- 
+  
   TAO::Arg_Traits< void>::ret_val _tao_retval;
   TAO::Arg_Traits< ::CORBA::Char *>::in_arg_val _tao_server (server);
   TAO::Arg_Traits< ::ImplementationRepository::StartupOptions>::in_arg_val _tao_options (options);
- 
+  
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
       &_tao_server,
       &_tao_options
     };
- 
+  
   static TAO::Exception_Data
-  _tao_ImplementationRepository_Administration_add_or_update_server_exceptiondata [] =
+  _tao_ImplementationRepository_Administration_add_or_update_server_exceptiondata [] = 
     {
       {
         "IDL:ImplementationRepository/NotFound:1.0",
-        ImplementationRepository::NotFound::_alloc,
-        ImplementationRepository::_tc_NotFound
+        ImplementationRepository::NotFound::_alloc
+#if TAO_HAS_INTERCEPTORS == 1
+        , ImplementationRepository::_tc_NotFound
+#endif /* TAO_HAS_INTERCEPTORS */
       }
     };
- 
+  
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -1034,7 +1365,7 @@ void ImplementationRepository::Administration::add_or_update_server (
       20,
       this->the_TAO_Administration_Proxy_Broker_
     );
- 
+  
   _tao_call.invoke (
       _tao_ImplementationRepository_Administration_add_or_update_server_exceptiondata,
       1
@@ -1044,46 +1375,48 @@ void ImplementationRepository::Administration::add_or_update_server (
 }
 
 // TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_cs.cpp:78
+// be\be_visitor_operation/operation_cs.cpp:78
 
 void ImplementationRepository::Administration::remove_server (
     const char * server
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
-    CORBA::SystemException,
+    ::CORBA::SystemException,
     ::ImplementationRepository::NotFound
   ))
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ACE_NESTED_CLASS ( ::CORBA, Object)::tao_object_initialize (this);
     }
- 
+  
   if (this->the_TAO_Administration_Proxy_Broker_ == 0)
     {
       ImplementationRepository_Administration_setup_collocation ();
     }
- 
+  
   TAO::Arg_Traits< void>::ret_val _tao_retval;
   TAO::Arg_Traits< ::CORBA::Char *>::in_arg_val _tao_server (server);
- 
+  
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
       &_tao_server
     };
- 
+  
   static TAO::Exception_Data
-  _tao_ImplementationRepository_Administration_remove_server_exceptiondata [] =
+  _tao_ImplementationRepository_Administration_remove_server_exceptiondata [] = 
     {
       {
         "IDL:ImplementationRepository/NotFound:1.0",
-        ImplementationRepository::NotFound::_alloc,
-        ImplementationRepository::_tc_NotFound
+        ImplementationRepository::NotFound::_alloc
+#if TAO_HAS_INTERCEPTORS == 1
+        , ImplementationRepository::_tc_NotFound
+#endif /* TAO_HAS_INTERCEPTORS */
       }
     };
- 
+  
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -1092,7 +1425,7 @@ void ImplementationRepository::Administration::remove_server (
       13,
       this->the_TAO_Administration_Proxy_Broker_
     );
- 
+  
   _tao_call.invoke (
       _tao_ImplementationRepository_Administration_remove_server_exceptiondata,
       1
@@ -1102,46 +1435,48 @@ void ImplementationRepository::Administration::remove_server (
 }
 
 // TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_cs.cpp:78
+// be\be_visitor_operation/operation_cs.cpp:78
 
 void ImplementationRepository::Administration::shutdown_server (
     const char * server
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
-    CORBA::SystemException,
+    ::CORBA::SystemException,
     ::ImplementationRepository::NotFound
   ))
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ACE_NESTED_CLASS ( ::CORBA, Object)::tao_object_initialize (this);
     }
- 
+  
   if (this->the_TAO_Administration_Proxy_Broker_ == 0)
     {
       ImplementationRepository_Administration_setup_collocation ();
     }
- 
+  
   TAO::Arg_Traits< void>::ret_val _tao_retval;
   TAO::Arg_Traits< ::CORBA::Char *>::in_arg_val _tao_server (server);
- 
+  
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
       &_tao_server
     };
- 
+  
   static TAO::Exception_Data
-  _tao_ImplementationRepository_Administration_shutdown_server_exceptiondata [] =
+  _tao_ImplementationRepository_Administration_shutdown_server_exceptiondata [] = 
     {
       {
         "IDL:ImplementationRepository/NotFound:1.0",
-        ImplementationRepository::NotFound::_alloc,
-        ImplementationRepository::_tc_NotFound
+        ImplementationRepository::NotFound::_alloc
+#if TAO_HAS_INTERCEPTORS == 1
+        , ImplementationRepository::_tc_NotFound
+#endif /* TAO_HAS_INTERCEPTORS */
       }
     };
- 
+  
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -1150,7 +1485,7 @@ void ImplementationRepository::Administration::shutdown_server (
       15,
       this->the_TAO_Administration_Proxy_Broker_
     );
- 
+  
   _tao_call.invoke (
       _tao_ImplementationRepository_Administration_shutdown_server_exceptiondata,
       1
@@ -1160,7 +1495,7 @@ void ImplementationRepository::Administration::shutdown_server (
 }
 
 // TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_cs.cpp:78
+// be\be_visitor_operation/operation_cs.cpp:78
 
 void ImplementationRepository::Administration::server_is_running (
     const char * server,
@@ -1169,25 +1504,25 @@ void ImplementationRepository::Administration::server_is_running (
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
-    CORBA::SystemException,
+    ::CORBA::SystemException,
     ::ImplementationRepository::NotFound
   ))
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ACE_NESTED_CLASS ( ::CORBA, Object)::tao_object_initialize (this);
     }
- 
+  
   if (this->the_TAO_Administration_Proxy_Broker_ == 0)
     {
       ImplementationRepository_Administration_setup_collocation ();
     }
- 
+  
   TAO::Arg_Traits< void>::ret_val _tao_retval;
   TAO::Arg_Traits< ::CORBA::Char *>::in_arg_val _tao_server (server);
   TAO::Arg_Traits< ::CORBA::Char *>::in_arg_val _tao_partial_ior (partial_ior);
   TAO::Arg_Traits< ::ImplementationRepository::ServerObject>::in_arg_val _tao_server_object (server_object);
- 
+  
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
@@ -1195,17 +1530,19 @@ void ImplementationRepository::Administration::server_is_running (
       &_tao_partial_ior,
       &_tao_server_object
     };
- 
+  
   static TAO::Exception_Data
-  _tao_ImplementationRepository_Administration_server_is_running_exceptiondata [] =
+  _tao_ImplementationRepository_Administration_server_is_running_exceptiondata [] = 
     {
       {
         "IDL:ImplementationRepository/NotFound:1.0",
-        ImplementationRepository::NotFound::_alloc,
-        ImplementationRepository::_tc_NotFound
+        ImplementationRepository::NotFound::_alloc
+#if TAO_HAS_INTERCEPTORS == 1
+        , ImplementationRepository::_tc_NotFound
+#endif /* TAO_HAS_INTERCEPTORS */
       }
     };
- 
+  
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -1214,7 +1551,7 @@ void ImplementationRepository::Administration::server_is_running (
       17,
       this->the_TAO_Administration_Proxy_Broker_
     );
- 
+  
   _tao_call.invoke (
       _tao_ImplementationRepository_Administration_server_is_running_exceptiondata,
       1
@@ -1224,46 +1561,48 @@ void ImplementationRepository::Administration::server_is_running (
 }
 
 // TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_cs.cpp:78
+// be\be_visitor_operation/operation_cs.cpp:78
 
 void ImplementationRepository::Administration::server_is_shutting_down (
     const char * server
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
-    CORBA::SystemException,
+    ::CORBA::SystemException,
     ::ImplementationRepository::NotFound
   ))
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ACE_NESTED_CLASS ( ::CORBA, Object)::tao_object_initialize (this);
     }
- 
+  
   if (this->the_TAO_Administration_Proxy_Broker_ == 0)
     {
       ImplementationRepository_Administration_setup_collocation ();
     }
- 
+  
   TAO::Arg_Traits< void>::ret_val _tao_retval;
   TAO::Arg_Traits< ::CORBA::Char *>::in_arg_val _tao_server (server);
- 
+  
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
       &_tao_server
     };
- 
+  
   static TAO::Exception_Data
-  _tao_ImplementationRepository_Administration_server_is_shutting_down_exceptiondata [] =
+  _tao_ImplementationRepository_Administration_server_is_shutting_down_exceptiondata [] = 
     {
       {
         "IDL:ImplementationRepository/NotFound:1.0",
-        ImplementationRepository::NotFound::_alloc,
-        ImplementationRepository::_tc_NotFound
+        ImplementationRepository::NotFound::_alloc
+#if TAO_HAS_INTERCEPTORS == 1
+        , ImplementationRepository::_tc_NotFound
+#endif /* TAO_HAS_INTERCEPTORS */
       }
     };
- 
+  
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -1272,7 +1611,7 @@ void ImplementationRepository::Administration::server_is_shutting_down (
       23,
       this->the_TAO_Administration_Proxy_Broker_
     );
- 
+  
   _tao_call.invoke (
       _tao_ImplementationRepository_Administration_server_is_shutting_down_exceptiondata,
       1
@@ -1282,7 +1621,7 @@ void ImplementationRepository::Administration::server_is_shutting_down (
 }
 
 // TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_cs.cpp:78
+// be\be_visitor_operation/operation_cs.cpp:78
 
 void ImplementationRepository::Administration::find (
     const char * server,
@@ -1290,30 +1629,30 @@ void ImplementationRepository::Administration::find (
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
-    CORBA::SystemException
+    ::CORBA::SystemException
   ))
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ACE_NESTED_CLASS ( ::CORBA, Object)::tao_object_initialize (this);
     }
- 
+  
   if (this->the_TAO_Administration_Proxy_Broker_ == 0)
     {
       ImplementationRepository_Administration_setup_collocation ();
     }
- 
+  
   TAO::Arg_Traits< void>::ret_val _tao_retval;
   TAO::Arg_Traits< ::CORBA::Char *>::in_arg_val _tao_server (server);
   TAO::Arg_Traits< ::ImplementationRepository::ServerInformation>::out_arg_val _tao_info (info);
- 
+  
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
       &_tao_server,
       &_tao_info
     };
- 
+  
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -1322,13 +1661,13 @@ void ImplementationRepository::Administration::find (
       4,
       this->the_TAO_Administration_Proxy_Broker_
     );
- 
+  
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 // TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_cs.cpp:78
+// be\be_visitor_operation/operation_cs.cpp:78
 
 void ImplementationRepository::Administration::list (
     ::CORBA::ULong how_many,
@@ -1337,24 +1676,24 @@ void ImplementationRepository::Administration::list (
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
-    CORBA::SystemException
+    ::CORBA::SystemException
   ))
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ACE_NESTED_CLASS ( ::CORBA, Object)::tao_object_initialize (this);
     }
- 
+  
   if (this->the_TAO_Administration_Proxy_Broker_ == 0)
     {
       ImplementationRepository_Administration_setup_collocation ();
     }
- 
+  
   TAO::Arg_Traits< void>::ret_val _tao_retval;
   TAO::Arg_Traits< ::CORBA::ULong>::in_arg_val _tao_how_many (how_many);
   TAO::Arg_Traits< ::ImplementationRepository::ServerInformationList>::out_arg_val _tao_server_list (server_list);
   TAO::Arg_Traits< ::ImplementationRepository::ServerInformationIterator>::out_arg_val _tao_server_iterator (server_iterator);
- 
+  
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
@@ -1362,7 +1701,7 @@ void ImplementationRepository::Administration::list (
       &_tao_server_list,
       &_tao_server_iterator
     };
- 
+  
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -1371,13 +1710,13 @@ void ImplementationRepository::Administration::list (
       4,
       this->the_TAO_Administration_Proxy_Broker_
     );
- 
+  
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 // TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_cs.cpp:78
+// be\be_visitor_operation/operation_cs.cpp:78
 
 void ImplementationRepository::Administration::shutdown (
     ::CORBA::Boolean activators,
@@ -1385,30 +1724,30 @@ void ImplementationRepository::Administration::shutdown (
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
-    CORBA::SystemException
+    ::CORBA::SystemException
   ))
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ACE_NESTED_CLASS ( ::CORBA, Object)::tao_object_initialize (this);
     }
- 
+  
   if (this->the_TAO_Administration_Proxy_Broker_ == 0)
     {
       ImplementationRepository_Administration_setup_collocation ();
     }
- 
+  
   TAO::Arg_Traits< void>::ret_val _tao_retval;
   TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val _tao_activators (activators);
   TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val _tao_servers (servers);
- 
+  
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
       &_tao_activators,
       &_tao_servers
     };
- 
+  
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -1418,7 +1757,7 @@ void ImplementationRepository::Administration::shutdown (
       this->the_TAO_Administration_Proxy_Broker_,
       TAO::TAO_ONEWAY_INVOCATION
     );
- 
+  
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
@@ -1442,7 +1781,7 @@ ImplementationRepository::Administration::ImplementationRepository_Administratio
 ImplementationRepository::Administration::~Administration (void)
 {}
 
-void
+void 
 ImplementationRepository::Administration::_tao_any_destructor (void *_tao_void_pointer)
 {
   Administration *_tao_tmp_pointer =
@@ -1452,7 +1791,7 @@ ImplementationRepository::Administration::_tao_any_destructor (void *_tao_void_p
 
 ImplementationRepository::Administration_ptr
 ImplementationRepository::Administration::_narrow (
-    CORBA::Object_ptr _tao_objref
+    ::CORBA::Object_ptr _tao_objref
     ACE_ENV_ARG_DECL
   )
 {
@@ -1467,7 +1806,7 @@ ImplementationRepository::Administration::_narrow (
 
 ImplementationRepository::Administration_ptr
 ImplementationRepository::Administration::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
+    ::CORBA::Object_ptr _tao_objref
     ACE_ENV_ARG_DECL
   )
 {
@@ -1487,7 +1826,7 @@ ImplementationRepository::Administration::_duplicate (Administration_ptr obj)
     {
       obj->_add_ref ();
     }
- 
+  
   return obj;
 }
 
@@ -1497,7 +1836,7 @@ ImplementationRepository::Administration::_tao_release (Administration_ptr obj)
   CORBA::release (obj);
 }
 
-CORBA::Boolean
+::CORBA::Boolean
 ImplementationRepository::Administration::_is_a (
     const char *value
     ACE_ENV_ARG_DECL
@@ -1518,7 +1857,7 @@ ImplementationRepository::Administration::_is_a (
     }
   else
     {
-      return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a (
+      return this->ACE_NESTED_CLASS ( ::CORBA, Object)::_is_a (
           value
           ACE_ENV_ARG_PARAMETER
         );
@@ -1530,16 +1869,842 @@ const char* ImplementationRepository::Administration::_interface_repository_id (
   return "IDL:ImplementationRepository/Administration:1.0";
 }
 
-CORBA::Boolean
+::CORBA::Boolean
 ImplementationRepository::Administration::marshal (TAO_OutputCDR &cdr)
 {
   return (cdr << this);
 }
 
 // TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_exception/cdr_op_cs.cpp:60
+// be\be_visitor_typecode/objref_typecode.cpp:76
+
+static TAO::TypeCode::Objref<char const *,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_ImplementationRepository_Administration (
+    ::CORBA::tk_objref,
+    "IDL:ImplementationRepository/Administration:1.0",
+    "Administration");
+  
+namespace ImplementationRepository
+{
+  ::CORBA::TypeCode_ptr const _tc_Administration =
+    &_tao_tc_ImplementationRepository_Administration;
+}
+
+
+
+// TAO_IDL - Generated from 
+// be\be_visitor_exception/any_op_cs.cpp:50
+
+namespace TAO
+{
+  template<>
+  ::CORBA::Boolean
+  Any_Dual_Impl_T<ImplementationRepository::AlreadyRegistered>::demarshal_value (
+      TAO_InputCDR & cdr
+    )
+  {
+    ::CORBA::String_var id;
+    
+    if (!(cdr >> id.out ()))
+      {
+        return false;
+      }
+    
+    ACE_TRY_NEW_ENV
+      {
+        this->value_->_tao_decode (cdr ACE_ENV_ARG_PARAMETER);
+        ACE_TRY_CHECK;
+      }
+    ACE_CATCHANY
+      {
+        return false;
+      }
+    ACE_ENDTRY;
+    
+    return true;
+  }
+}
+
+// Copying insertion.
+void operator<<= (
+    ::CORBA::Any &_tao_any,
+    const ImplementationRepository::AlreadyRegistered &_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<ImplementationRepository::AlreadyRegistered>::insert_copy (
+      _tao_any,
+      ImplementationRepository::AlreadyRegistered::_tao_any_destructor,
+      ImplementationRepository::_tc_AlreadyRegistered,
+      _tao_elem
+    );
+}
+
+// Non-copying insertion.
+void operator<<= (
+    ::CORBA::Any &_tao_any,
+    ImplementationRepository::AlreadyRegistered *_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<ImplementationRepository::AlreadyRegistered>::insert (
+      _tao_any,
+      ImplementationRepository::AlreadyRegistered::_tao_any_destructor,
+      ImplementationRepository::_tc_AlreadyRegistered,
+      _tao_elem
+    );
+}
+
+// Extraction to non-const pointer (deprecated).
+::CORBA::Boolean operator>>= (
+    const ::CORBA::Any &_tao_any,
+    ImplementationRepository::AlreadyRegistered *&_tao_elem
+  )
+{
+  return _tao_any >>= const_cast<
+      const ImplementationRepository::AlreadyRegistered *&> (
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+::CORBA::Boolean operator>>= (
+    const ::CORBA::Any &_tao_any,
+    const ImplementationRepository::AlreadyRegistered *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Dual_Impl_T<ImplementationRepository::AlreadyRegistered>::extract (
+        _tao_any,
+        ImplementationRepository::AlreadyRegistered::_tao_any_destructor,
+        ImplementationRepository::_tc_AlreadyRegistered,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from 
+// be\be_visitor_exception/any_op_cs.cpp:50
+
+namespace TAO
+{
+  template<>
+  ::CORBA::Boolean
+  Any_Dual_Impl_T<ImplementationRepository::CannotActivate>::demarshal_value (
+      TAO_InputCDR & cdr
+    )
+  {
+    ::CORBA::String_var id;
+    
+    if (!(cdr >> id.out ()))
+      {
+        return false;
+      }
+    
+    ACE_TRY_NEW_ENV
+      {
+        this->value_->_tao_decode (cdr ACE_ENV_ARG_PARAMETER);
+        ACE_TRY_CHECK;
+      }
+    ACE_CATCHANY
+      {
+        return false;
+      }
+    ACE_ENDTRY;
+    
+    return true;
+  }
+}
+
+// Copying insertion.
+void operator<<= (
+    ::CORBA::Any &_tao_any,
+    const ImplementationRepository::CannotActivate &_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<ImplementationRepository::CannotActivate>::insert_copy (
+      _tao_any,
+      ImplementationRepository::CannotActivate::_tao_any_destructor,
+      ImplementationRepository::_tc_CannotActivate,
+      _tao_elem
+    );
+}
+
+// Non-copying insertion.
+void operator<<= (
+    ::CORBA::Any &_tao_any,
+    ImplementationRepository::CannotActivate *_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<ImplementationRepository::CannotActivate>::insert (
+      _tao_any,
+      ImplementationRepository::CannotActivate::_tao_any_destructor,
+      ImplementationRepository::_tc_CannotActivate,
+      _tao_elem
+    );
+}
+
+// Extraction to non-const pointer (deprecated).
+::CORBA::Boolean operator>>= (
+    const ::CORBA::Any &_tao_any,
+    ImplementationRepository::CannotActivate *&_tao_elem
+  )
+{
+  return _tao_any >>= const_cast<
+      const ImplementationRepository::CannotActivate *&> (
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+::CORBA::Boolean operator>>= (
+    const ::CORBA::Any &_tao_any,
+    const ImplementationRepository::CannotActivate *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Dual_Impl_T<ImplementationRepository::CannotActivate>::extract (
+        _tao_any,
+        ImplementationRepository::CannotActivate::_tao_any_destructor,
+        ImplementationRepository::_tc_CannotActivate,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from 
+// be\be_visitor_exception/any_op_cs.cpp:50
+
+namespace TAO
+{
+  template<>
+  ::CORBA::Boolean
+  Any_Dual_Impl_T<ImplementationRepository::NotFound>::demarshal_value (
+      TAO_InputCDR & cdr
+    )
+  {
+    ::CORBA::String_var id;
+    
+    if (!(cdr >> id.out ()))
+      {
+        return false;
+      }
+    
+    ACE_TRY_NEW_ENV
+      {
+        this->value_->_tao_decode (cdr ACE_ENV_ARG_PARAMETER);
+        ACE_TRY_CHECK;
+      }
+    ACE_CATCHANY
+      {
+        return false;
+      }
+    ACE_ENDTRY;
+    
+    return true;
+  }
+}
+
+// Copying insertion.
+void operator<<= (
+    ::CORBA::Any &_tao_any,
+    const ImplementationRepository::NotFound &_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<ImplementationRepository::NotFound>::insert_copy (
+      _tao_any,
+      ImplementationRepository::NotFound::_tao_any_destructor,
+      ImplementationRepository::_tc_NotFound,
+      _tao_elem
+    );
+}
+
+// Non-copying insertion.
+void operator<<= (
+    ::CORBA::Any &_tao_any,
+    ImplementationRepository::NotFound *_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<ImplementationRepository::NotFound>::insert (
+      _tao_any,
+      ImplementationRepository::NotFound::_tao_any_destructor,
+      ImplementationRepository::_tc_NotFound,
+      _tao_elem
+    );
+}
+
+// Extraction to non-const pointer (deprecated).
+::CORBA::Boolean operator>>= (
+    const ::CORBA::Any &_tao_any,
+    ImplementationRepository::NotFound *&_tao_elem
+  )
+{
+  return _tao_any >>= const_cast<
+      const ImplementationRepository::NotFound *&> (
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+::CORBA::Boolean operator>>= (
+    const ::CORBA::Any &_tao_any,
+    const ImplementationRepository::NotFound *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Dual_Impl_T<ImplementationRepository::NotFound>::extract (
+        _tao_any,
+        ImplementationRepository::NotFound::_tao_any_destructor,
+        ImplementationRepository::_tc_NotFound,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from 
+// be\be_visitor_structure/any_op_cs.cpp:54
+
+// Copying insertion.
+void operator<<= (
+    ::CORBA::Any &_tao_any,
+    const ImplementationRepository::EnvironmentVariable &_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<ImplementationRepository::EnvironmentVariable>::insert_copy (
+      _tao_any,
+      ImplementationRepository::EnvironmentVariable::_tao_any_destructor,
+      ImplementationRepository::_tc_EnvironmentVariable,
+      _tao_elem
+    );
+}
+
+// Non-copying insertion.
+void operator<<= (
+    ::CORBA::Any &_tao_any,
+    ImplementationRepository::EnvironmentVariable *_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<ImplementationRepository::EnvironmentVariable>::insert (
+      _tao_any,
+      ImplementationRepository::EnvironmentVariable::_tao_any_destructor,
+      ImplementationRepository::_tc_EnvironmentVariable,
+      _tao_elem
+    );
+}
+
+// Extraction to non-const pointer (deprecated).
+::CORBA::Boolean operator>>= (
+    const ::CORBA::Any &_tao_any,
+    ImplementationRepository::EnvironmentVariable *&_tao_elem
+  )
+{
+  return _tao_any >>= const_cast<
+      const ImplementationRepository::EnvironmentVariable *&> (
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+::CORBA::Boolean operator>>= (
+    const ::CORBA::Any &_tao_any,
+    const ImplementationRepository::EnvironmentVariable *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Dual_Impl_T<ImplementationRepository::EnvironmentVariable>::extract (
+        _tao_any,
+        ImplementationRepository::EnvironmentVariable::_tao_any_destructor,
+        ImplementationRepository::_tc_EnvironmentVariable,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from 
+// be\be_visitor_sequence/any_op_cs.cpp:54
+
+
+// Copying insertion.
+void operator<<= (
+    ::CORBA::Any &_tao_any,
+    const ImplementationRepository::EnvironmentList &_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<ImplementationRepository::EnvironmentList>::insert_copy (
+      _tao_any,
+      ImplementationRepository::EnvironmentList::_tao_any_destructor,
+      TAO::TypeCode::tc_ImplementationRepository_EnvironmentList_0,
+      _tao_elem
+    );
+}
+
+// Non-copying insertion.
+void operator<<= (
+    ::CORBA::Any &_tao_any,
+    ImplementationRepository::EnvironmentList *_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<ImplementationRepository::EnvironmentList>::insert (
+      _tao_any,
+      ImplementationRepository::EnvironmentList::_tao_any_destructor,
+      TAO::TypeCode::tc_ImplementationRepository_EnvironmentList_0,
+      _tao_elem
+    );
+}
+
+// Extraction to non-const pointer (deprecated).
+::CORBA::Boolean operator>>= (
+    const ::CORBA::Any &_tao_any,
+    ImplementationRepository::EnvironmentList *&_tao_elem
+  )
+{
+  return _tao_any >>= const_cast<
+      const ImplementationRepository::EnvironmentList *&> (
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+::CORBA::Boolean operator>>= (
+    const ::CORBA::Any &_tao_any,
+    const ImplementationRepository::EnvironmentList *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Dual_Impl_T<ImplementationRepository::EnvironmentList>::extract (
+        _tao_any,
+        ImplementationRepository::EnvironmentList::_tao_any_destructor,
+        TAO::TypeCode::tc_ImplementationRepository_EnvironmentList_0,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_enum/any_op_cs.cpp:52
+
+void operator<<= (
+    ::CORBA::Any &_tao_any,
+    ImplementationRepository::ActivationMode _tao_elem
+  )
+{
+  TAO::Any_Basic_Impl_T<ImplementationRepository::ActivationMode>::insert (
+      _tao_any,
+      ImplementationRepository::_tc_ActivationMode,
+      _tao_elem
+    );
+}
+
+::CORBA::Boolean operator>>= (
+    const ::CORBA::Any &_tao_any,
+    ImplementationRepository::ActivationMode &_tao_elem
+  )
+{
+  return
+    TAO::Any_Basic_Impl_T<ImplementationRepository::ActivationMode>::extract (
+        _tao_any,
+        ImplementationRepository::_tc_ActivationMode,
+        _tao_elem 
+      );
+}
+
+// TAO_IDL - Generated from 
+// be\be_visitor_structure/any_op_cs.cpp:54
+
+// Copying insertion.
+void operator<<= (
+    ::CORBA::Any &_tao_any,
+    const ImplementationRepository::StartupOptions &_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<ImplementationRepository::StartupOptions>::insert_copy (
+      _tao_any,
+      ImplementationRepository::StartupOptions::_tao_any_destructor,
+      ImplementationRepository::_tc_StartupOptions,
+      _tao_elem
+    );
+}
+
+// Non-copying insertion.
+void operator<<= (
+    ::CORBA::Any &_tao_any,
+    ImplementationRepository::StartupOptions *_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<ImplementationRepository::StartupOptions>::insert (
+      _tao_any,
+      ImplementationRepository::StartupOptions::_tao_any_destructor,
+      ImplementationRepository::_tc_StartupOptions,
+      _tao_elem
+    );
+}
+
+// Extraction to non-const pointer (deprecated).
+::CORBA::Boolean operator>>= (
+    const ::CORBA::Any &_tao_any,
+    ImplementationRepository::StartupOptions *&_tao_elem
+  )
+{
+  return _tao_any >>= const_cast<
+      const ImplementationRepository::StartupOptions *&> (
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+::CORBA::Boolean operator>>= (
+    const ::CORBA::Any &_tao_any,
+    const ImplementationRepository::StartupOptions *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Dual_Impl_T<ImplementationRepository::StartupOptions>::extract (
+        _tao_any,
+        ImplementationRepository::StartupOptions::_tao_any_destructor,
+        ImplementationRepository::_tc_StartupOptions,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from 
+// be\be_visitor_structure/any_op_cs.cpp:54
+
+// Copying insertion.
+void operator<<= (
+    ::CORBA::Any &_tao_any,
+    const ImplementationRepository::ServerInformation &_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<ImplementationRepository::ServerInformation>::insert_copy (
+      _tao_any,
+      ImplementationRepository::ServerInformation::_tao_any_destructor,
+      ImplementationRepository::_tc_ServerInformation,
+      _tao_elem
+    );
+}
+
+// Non-copying insertion.
+void operator<<= (
+    ::CORBA::Any &_tao_any,
+    ImplementationRepository::ServerInformation *_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<ImplementationRepository::ServerInformation>::insert (
+      _tao_any,
+      ImplementationRepository::ServerInformation::_tao_any_destructor,
+      ImplementationRepository::_tc_ServerInformation,
+      _tao_elem
+    );
+}
+
+// Extraction to non-const pointer (deprecated).
+::CORBA::Boolean operator>>= (
+    const ::CORBA::Any &_tao_any,
+    ImplementationRepository::ServerInformation *&_tao_elem
+  )
+{
+  return _tao_any >>= const_cast<
+      const ImplementationRepository::ServerInformation *&> (
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+::CORBA::Boolean operator>>= (
+    const ::CORBA::Any &_tao_any,
+    const ImplementationRepository::ServerInformation *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Dual_Impl_T<ImplementationRepository::ServerInformation>::extract (
+        _tao_any,
+        ImplementationRepository::ServerInformation::_tao_any_destructor,
+        ImplementationRepository::_tc_ServerInformation,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from 
+// be\be_visitor_sequence/any_op_cs.cpp:54
+
+
+// Copying insertion.
+void operator<<= (
+    ::CORBA::Any &_tao_any,
+    const ImplementationRepository::ServerInformationList &_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<ImplementationRepository::ServerInformationList>::insert_copy (
+      _tao_any,
+      ImplementationRepository::ServerInformationList::_tao_any_destructor,
+      TAO::TypeCode::tc_ImplementationRepository_ServerInformationList_0,
+      _tao_elem
+    );
+}
+
+// Non-copying insertion.
+void operator<<= (
+    ::CORBA::Any &_tao_any,
+    ImplementationRepository::ServerInformationList *_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<ImplementationRepository::ServerInformationList>::insert (
+      _tao_any,
+      ImplementationRepository::ServerInformationList::_tao_any_destructor,
+      TAO::TypeCode::tc_ImplementationRepository_ServerInformationList_0,
+      _tao_elem
+    );
+}
+
+// Extraction to non-const pointer (deprecated).
+::CORBA::Boolean operator>>= (
+    const ::CORBA::Any &_tao_any,
+    ImplementationRepository::ServerInformationList *&_tao_elem
+  )
+{
+  return _tao_any >>= const_cast<
+      const ImplementationRepository::ServerInformationList *&> (
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+::CORBA::Boolean operator>>= (
+    const ::CORBA::Any &_tao_any,
+    const ImplementationRepository::ServerInformationList *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Dual_Impl_T<ImplementationRepository::ServerInformationList>::extract (
+        _tao_any,
+        ImplementationRepository::ServerInformationList::_tao_any_destructor,
+        TAO::TypeCode::tc_ImplementationRepository_ServerInformationList_0,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_cs.cpp:51
+
+namespace TAO
+{
+  template<>
+  ::CORBA::Boolean
+  Any_Impl_T<ImplementationRepository::ServerInformationIterator>::to_object (
+      ::CORBA::Object_ptr &_tao_elem
+    ) const
+  {
+    _tao_elem = ::CORBA::Object::_duplicate (this->value_);
+    return true;
+  }
+}
+
+#if defined (ACE_ANY_OPS_USE_NAMESPACE)
+
+namespace ImplementationRepository
+{
+  
+  
+  // Copying insertion.
+  void
+  operator<<= (
+      ::CORBA::Any &_tao_any,
+      ServerInformationIterator_ptr _tao_elem
+    )
+  {
+    ServerInformationIterator_ptr _tao_objptr =
+      ServerInformationIterator::_duplicate (_tao_elem);
+    _tao_any <<= &_tao_objptr;
+  }
+  
+  // Non-copying insertion.
+  void
+  operator<<= (
+      ::CORBA::Any &_tao_any,
+      ServerInformationIterator_ptr *_tao_elem
+    )
+  {
+    TAO::Any_Impl_T<ServerInformationIterator>::insert (
+        _tao_any,
+        ServerInformationIterator::_tao_any_destructor,
+        _tc_ServerInformationIterator,
+        *_tao_elem
+      );
+  }
+  
+  ::CORBA::Boolean
+  operator>>= (
+      const ::CORBA::Any &_tao_any,
+      ServerInformationIterator_ptr &_tao_elem
+    )
+  {
+    return
+      TAO::Any_Impl_T<ServerInformationIterator>::extract (
+          _tao_any,
+          ServerInformationIterator::_tao_any_destructor,
+          _tc_ServerInformationIterator,
+          _tao_elem
+        );
+  }
+}
+
+#else
+
+
+// Copying insertion.
+void
+operator<<= (
+    ::CORBA::Any &_tao_any,
+    ImplementationRepository::ServerInformationIterator_ptr _tao_elem
+  )
+{
+  ImplementationRepository::ServerInformationIterator_ptr _tao_objptr =
+    ImplementationRepository::ServerInformationIterator::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    ::CORBA::Any &_tao_any,
+    ImplementationRepository::ServerInformationIterator_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<ImplementationRepository::ServerInformationIterator>::insert (
+      _tao_any,
+      ImplementationRepository::ServerInformationIterator::_tao_any_destructor,
+      ImplementationRepository::_tc_ServerInformationIterator,
+      *_tao_elem
+    );
+}
+
+::CORBA::Boolean
+operator>>= (
+    const ::CORBA::Any &_tao_any,
+    ImplementationRepository::ServerInformationIterator_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<ImplementationRepository::ServerInformationIterator>::extract (
+        _tao_any,
+        ImplementationRepository::ServerInformationIterator::_tao_any_destructor,
+        ImplementationRepository::_tc_ServerInformationIterator,
+        _tao_elem
+      );
+}
+
+#endif
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_cs.cpp:51
+
+namespace TAO
+{
+  template<>
+  ::CORBA::Boolean
+  Any_Impl_T<ImplementationRepository::Administration>::to_object (
+      ::CORBA::Object_ptr &_tao_elem
+    ) const
+  {
+    _tao_elem = ::CORBA::Object::_duplicate (this->value_);
+    return true;
+  }
+}
+
+#if defined (ACE_ANY_OPS_USE_NAMESPACE)
+
+namespace ImplementationRepository
+{
+  
+  
+  // Copying insertion.
+  void
+  operator<<= (
+      ::CORBA::Any &_tao_any,
+      Administration_ptr _tao_elem
+    )
+  {
+    Administration_ptr _tao_objptr =
+      Administration::_duplicate (_tao_elem);
+    _tao_any <<= &_tao_objptr;
+  }
+  
+  // Non-copying insertion.
+  void
+  operator<<= (
+      ::CORBA::Any &_tao_any,
+      Administration_ptr *_tao_elem
+    )
+  {
+    TAO::Any_Impl_T<Administration>::insert (
+        _tao_any,
+        Administration::_tao_any_destructor,
+        _tc_Administration,
+        *_tao_elem
+      );
+  }
+  
+  ::CORBA::Boolean
+  operator>>= (
+      const ::CORBA::Any &_tao_any,
+      Administration_ptr &_tao_elem
+    )
+  {
+    return
+      TAO::Any_Impl_T<Administration>::extract (
+          _tao_any,
+          Administration::_tao_any_destructor,
+          _tc_Administration,
+          _tao_elem
+        );
+  }
+}
+
+#else
+
+
+// Copying insertion.
+void
+operator<<= (
+    ::CORBA::Any &_tao_any,
+    ImplementationRepository::Administration_ptr _tao_elem
+  )
+{
+  ImplementationRepository::Administration_ptr _tao_objptr =
+    ImplementationRepository::Administration::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    ::CORBA::Any &_tao_any,
+    ImplementationRepository::Administration_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<ImplementationRepository::Administration>::insert (
+      _tao_any,
+      ImplementationRepository::Administration::_tao_any_destructor,
+      ImplementationRepository::_tc_Administration,
+      *_tao_elem
+    );
+}
+
+::CORBA::Boolean
+operator>>= (
+    const ::CORBA::Any &_tao_any,
+    ImplementationRepository::Administration_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<ImplementationRepository::Administration>::extract (
+        _tao_any,
+        ImplementationRepository::Administration::_tao_any_destructor,
+        ImplementationRepository::_tc_Administration,
+        _tao_elem
+      );
+}
+
+#endif
+
+// TAO_IDL - Generated from
+// be\be_visitor_exception/cdr_op_cs.cpp:60
 
-CORBA::Boolean operator<< (
+::CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
     const ImplementationRepository::AlreadyRegistered &_tao_aggregate
   )
@@ -1548,7 +2713,7 @@ CORBA::Boolean operator<< (
   return (strm << _tao_aggregate._rep_id ());
 }
 
-CORBA::Boolean operator>> (
+::CORBA::Boolean operator>> (
     TAO_InputCDR &,
     ImplementationRepository::AlreadyRegistered&
   )
@@ -1557,9 +2722,9 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_exception/cdr_op_cs.cpp:60
+// be\be_visitor_exception/cdr_op_cs.cpp:60
 
-CORBA::Boolean operator<< (
+::CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
     const ImplementationRepository::CannotActivate &_tao_aggregate
   )
@@ -1578,7 +2743,7 @@ CORBA::Boolean operator<< (
     }
 }
 
-CORBA::Boolean operator>> (
+::CORBA::Boolean operator>> (
     TAO_InputCDR &strm,
     ImplementationRepository::CannotActivate &_tao_aggregate
   )
@@ -1590,9 +2755,9 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_exception/cdr_op_cs.cpp:60
+// be\be_visitor_exception/cdr_op_cs.cpp:60
 
-CORBA::Boolean operator<< (
+::CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
     const ImplementationRepository::NotFound &_tao_aggregate
   )
@@ -1601,7 +2766,7 @@ CORBA::Boolean operator<< (
   return (strm << _tao_aggregate._rep_id ());
 }
 
-CORBA::Boolean operator>> (
+::CORBA::Boolean operator>> (
     TAO_InputCDR &,
     ImplementationRepository::NotFound&
   )
@@ -1610,9 +2775,9 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_structure/cdr_op_cs.cpp:61
+// be\be_visitor_structure/cdr_op_cs.cpp:61
 
-CORBA::Boolean operator<< (
+::CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
     const ImplementationRepository::EnvironmentVariable &_tao_aggregate
   )
@@ -1622,7 +2787,7 @@ CORBA::Boolean operator<< (
     (strm << _tao_aggregate.value.in ());
 }
 
-CORBA::Boolean operator>> (
+::CORBA::Boolean operator>> (
     TAO_InputCDR &strm,
     ImplementationRepository::EnvironmentVariable &_tao_aggregate
   )
@@ -1633,41 +2798,41 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_sequence/cdr_op_cs.cpp:96
+// be\be_visitor_sequence/cdr_op_cs.cpp:96
 
 #if !defined _TAO_CDR_OP_ImplementationRepository_EnvironmentList_CPP_
 #define _TAO_CDR_OP_ImplementationRepository_EnvironmentList_CPP_
 
-CORBA::Boolean operator<< (
+::CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
     const ImplementationRepository::EnvironmentList &_tao_sequence
   )
 {
-  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
- 
+  const ::CORBA::ULong _tao_seq_len = _tao_sequence.length ();
+  
   if (strm << _tao_seq_len)
     {
       // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = true;
- 
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
+      ::CORBA::Boolean _tao_marshal_flag = true;
+      
+      for ( ::CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag = (strm << _tao_sequence[i]);
         }
- 
+      
       return _tao_marshal_flag;
     }
- 
+  
   return false;
 }
 
-CORBA::Boolean operator>> (
+::CORBA::Boolean operator>> (
     TAO_InputCDR &strm,
     ImplementationRepository::EnvironmentList &_tao_sequence
   )
 {
-  CORBA::ULong _tao_seq_len;
- 
+  ::CORBA::ULong _tao_seq_len;
+  
   if (strm >> _tao_seq_len)
     {
       // Add a check to the length of the sequence
@@ -1677,58 +2842,58 @@ CORBA::Boolean operator>> (
         {
           return false;
         }
- 
+      
       // Set the length of the sequence.
       _tao_sequence.length (_tao_seq_len);
- 
+      
       // If length is 0 we return true.
-      if (0 >= _tao_seq_len)
+      if (0 >= _tao_seq_len) 
         {
           return true;
         }
- 
+      
       // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = true;
- 
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
+      ::CORBA::Boolean _tao_marshal_flag = true;
+      
+      for ( ::CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag = (strm >> _tao_sequence[i]);
         }
- 
+      
       return _tao_marshal_flag;
- 
+    
     }
- 
+  
   return false;
 }
 
 #endif /* _TAO_CDR_OP_ImplementationRepository_EnvironmentList_CPP_ */
 
 // TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_enum/cdr_op_cs.cpp:51
+// be\be_visitor_enum/cdr_op_cs.cpp:51
 
-CORBA::Boolean operator<< (TAO_OutputCDR & strm, ImplementationRepository::ActivationMode _tao_enumerator)
+::CORBA::Boolean operator<< (TAO_OutputCDR & strm, ImplementationRepository::ActivationMode _tao_enumerator)
 {
-  return strm << static_cast<CORBA::ULong> (_tao_enumerator);
+  return strm << static_cast< ::CORBA::ULong> (_tao_enumerator);
 }
 
-CORBA::Boolean operator>> (TAO_InputCDR & strm, ImplementationRepository::ActivationMode & _tao_enumerator)
+::CORBA::Boolean operator>> (TAO_InputCDR & strm, ImplementationRepository::ActivationMode & _tao_enumerator)
 {
-  CORBA::ULong _tao_temp = 0;
-  CORBA::Boolean const _tao_success = strm >> _tao_temp;
- 
+  ::CORBA::ULong _tao_temp = 0;
+  ::CORBA::Boolean const _tao_success = strm >> _tao_temp;
+  
   if (_tao_success)
     {
       _tao_enumerator = static_cast<ImplementationRepository::ActivationMode> (_tao_temp);
     }
- 
+  
   return _tao_success;
 }
 
 // TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_structure/cdr_op_cs.cpp:61
+// be\be_visitor_structure/cdr_op_cs.cpp:61
 
-CORBA::Boolean operator<< (
+::CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
     const ImplementationRepository::StartupOptions &_tao_aggregate
   )
@@ -1742,7 +2907,7 @@ CORBA::Boolean operator<< (
     (strm << _tao_aggregate.start_limit);
 }
 
-CORBA::Boolean operator>> (
+::CORBA::Boolean operator>> (
     TAO_InputCDR &strm,
     ImplementationRepository::StartupOptions &_tao_aggregate
   )
@@ -1757,9 +2922,9 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_structure/cdr_op_cs.cpp:61
+// be\be_visitor_structure/cdr_op_cs.cpp:61
 
-CORBA::Boolean operator<< (
+::CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
     const ImplementationRepository::ServerInformation &_tao_aggregate
   )
@@ -1770,7 +2935,7 @@ CORBA::Boolean operator<< (
     (strm << _tao_aggregate.partial_ior.in ());
 }
 
-CORBA::Boolean operator>> (
+::CORBA::Boolean operator>> (
     TAO_InputCDR &strm,
     ImplementationRepository::ServerInformation &_tao_aggregate
   )
@@ -1782,41 +2947,41 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_sequence/cdr_op_cs.cpp:96
+// be\be_visitor_sequence/cdr_op_cs.cpp:96
 
 #if !defined _TAO_CDR_OP_ImplementationRepository_ServerInformationList_CPP_
 #define _TAO_CDR_OP_ImplementationRepository_ServerInformationList_CPP_
 
-CORBA::Boolean operator<< (
+::CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
     const ImplementationRepository::ServerInformationList &_tao_sequence
   )
 {
-  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
- 
+  const ::CORBA::ULong _tao_seq_len = _tao_sequence.length ();
+  
   if (strm << _tao_seq_len)
     {
       // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = true;
- 
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
+      ::CORBA::Boolean _tao_marshal_flag = true;
+      
+      for ( ::CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag = (strm << _tao_sequence[i]);
         }
- 
+      
       return _tao_marshal_flag;
     }
- 
+  
   return false;
 }
 
-CORBA::Boolean operator>> (
+::CORBA::Boolean operator>> (
     TAO_InputCDR &strm,
     ImplementationRepository::ServerInformationList &_tao_sequence
   )
 {
-  CORBA::ULong _tao_seq_len;
- 
+  ::CORBA::ULong _tao_seq_len;
+  
   if (strm >> _tao_seq_len)
     {
       // Add a check to the length of the sequence
@@ -1826,101 +2991,101 @@ CORBA::Boolean operator>> (
         {
           return false;
         }
- 
+      
       // Set the length of the sequence.
       _tao_sequence.length (_tao_seq_len);
- 
+      
       // If length is 0 we return true.
-      if (0 >= _tao_seq_len)
+      if (0 >= _tao_seq_len) 
         {
           return true;
         }
- 
+      
       // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = true;
- 
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
+      ::CORBA::Boolean _tao_marshal_flag = true;
+      
+      for ( ::CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag = (strm >> _tao_sequence[i]);
         }
- 
+      
       return _tao_marshal_flag;
- 
+    
     }
- 
+  
   return false;
 }
 
 #endif /* _TAO_CDR_OP_ImplementationRepository_ServerInformationList_CPP_ */
 
 // TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_interface/cdr_op_cs.cpp:63
+// be\be_visitor_interface/cdr_op_cs.cpp:63
 
-CORBA::Boolean operator<< (
+::CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
     const ImplementationRepository::ServerInformationIterator_ptr _tao_objref
   )
 {
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
+  ::CORBA::Object_ptr _tao_corba_obj = _tao_objref;
   return (strm << _tao_corba_obj);
 }
 
-CORBA::Boolean operator>> (
+::CORBA::Boolean operator>> (
     TAO_InputCDR &strm,
     ImplementationRepository::ServerInformationIterator_ptr &_tao_objref
   )
 {
-  CORBA::Object_var obj;
- 
+  ::CORBA::Object_var obj;
+  
   if (!(strm >> obj.inout ()))
     {
       return false;
     }
- 
+  
   typedef ::ImplementationRepository::ServerInformationIterator RHS_SCOPED_NAME;
- 
+  
   // Narrow to the right type.
   _tao_objref =
     TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow (
         obj.in (),
         ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Factory_function_pointer
       );
- 
+    
   return 1;
 }
 
 // TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_interface/cdr_op_cs.cpp:63
+// be\be_visitor_interface/cdr_op_cs.cpp:63
 
-CORBA::Boolean operator<< (
+::CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
     const ImplementationRepository::Administration_ptr _tao_objref
   )
 {
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
+  ::CORBA::Object_ptr _tao_corba_obj = _tao_objref;
   return (strm << _tao_corba_obj);
 }
 
-CORBA::Boolean operator>> (
+::CORBA::Boolean operator>> (
     TAO_InputCDR &strm,
     ImplementationRepository::Administration_ptr &_tao_objref
   )
 {
-  CORBA::Object_var obj;
- 
+  ::CORBA::Object_var obj;
+  
   if (!(strm >> obj.inout ()))
     {
       return false;
     }
- 
+  
   typedef ::ImplementationRepository::Administration RHS_SCOPED_NAME;
- 
+  
   // Narrow to the right type.
   _tao_objref =
     TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow (
         obj.in (),
         ImplementationRepository__TAO_Administration_Proxy_Broker_Factory_function_pointer
       );
- 
+    
   return 1;
 }
diff --git a/TAO/tao/ImR_Client/ImplRepoC.h b/TAO/tao/ImR_Client/ImplRepoC.h
index dc542c79243..f72b14fc1e2 100644
--- a/TAO/tao/ImR_Client/ImplRepoC.h
+++ b/TAO/tao/ImR_Client/ImplRepoC.h
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// .\be\be_codegen.cpp:153
+// be\be_codegen.cpp:154
 
 #ifndef _TAO_IDL_IMPLREPOC_H_
 #define _TAO_IDL_IMPLREPOC_H_
@@ -41,34 +41,27 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "imr_client_export.h"
-#include "ServerObjectC.h"
-
+#include "tao/AnyTypeCode/AnyTypeCode_methods.h"
 #include "tao/ORB.h"
 #include "tao/SystemException.h"
 #include "tao/Environment.h"
 #include "tao/Object.h"
+#include "tao/ImR_Client/ServerObjectA.h"
 #include "tao/Sequence_T.h"
 #include "tao/Objref_VarOut_T.h"
 #include "tao/Seq_Var_T.h"
 #include "tao/Seq_Out_T.h"
 #include "tao/VarOut_T.h"
 
+#include "tao/ImR_Client/ServerObjectC.h"
+
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
 #endif
 #define TAO_EXPORT_MACRO TAO_IMR_Client_Export
 
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_root/root_ch.cpp:62
+// TAO_IDL - Generated from 
+// be\be_visitor_root/root_ch.cpp:62
 
 namespace TAO
 {
@@ -77,35 +70,35 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_ch.cpp:48
+// be\be_visitor_module/module_ch.cpp:49
 
 namespace ImplementationRepository
 {
- 
+  
   // TAO_IDL - Generated from
-  // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_exception/exception_ch.cpp:51
+  // be\be_visitor_exception/exception_ch.cpp:53
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_ALREADYREGISTERED_CH_)
 #define _IMPLEMENTATIONREPOSITORY_ALREADYREGISTERED_CH_
- 
-  class TAO_IMR_Client_Export AlreadyRegistered : public CORBA::UserException
+  
+  class TAO_IMR_Client_Export AlreadyRegistered : public ::CORBA::UserException
   {
   public:
- 
+    
     AlreadyRegistered (void);
     AlreadyRegistered (const AlreadyRegistered &);
     ~AlreadyRegistered (void);
 
     AlreadyRegistered &operator= (const AlreadyRegistered &);
- 
+    
     static void _tao_any_destructor (void *);
- 
-    static AlreadyRegistered *_downcast (CORBA::Exception *);
-    static const AlreadyRegistered *_downcast (CORBA::Exception const *);
- 
-    static CORBA::Exception *_alloc (void);
- 
-    virtual CORBA::Exception *_tao_duplicate (void) const;
+    
+    static AlreadyRegistered *_downcast ( ::CORBA::Exception *);
+    static const AlreadyRegistered *_downcast ( ::CORBA::Exception const *);
+    
+    static ::CORBA::Exception *_alloc (void);
+    
+    virtual ::CORBA::Exception *_tao_duplicate (void) const;
 
     virtual void _raise (void) const;
 
@@ -113,50 +106,50 @@ namespace ImplementationRepository
         TAO_OutputCDR &
         ACE_ENV_ARG_DECL
       ) const;
- 
+    
     virtual void _tao_decode (
         TAO_InputCDR &
         ACE_ENV_ARG_DECL
       );
- 
+    
     // TAO_IDL - Generated from
-    // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_exception/exception_ch.cpp:127
- 
-    virtual CORBA::TypeCode_ptr _tao_type (void) const;
+    // be\be_visitor_exception/exception_ch.cpp:129
+    
+    virtual ::CORBA::TypeCode_ptr _tao_type (void) const;
   };
- 
+  
   // TAO_IDL - Generated from
-  // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/typecode_decl.cpp:44
- 
+  // be\be_visitor_typecode/typecode_decl.cpp:49
+  
   extern TAO_IMR_Client_Export ::CORBA::TypeCode_ptr const _tc_AlreadyRegistered;
 
 #endif /* end #if !defined */
- 
+  
   // TAO_IDL - Generated from
-  // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_exception/exception_ch.cpp:51
+  // be\be_visitor_exception/exception_ch.cpp:53
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_CANNOTACTIVATE_CH_)
 #define _IMPLEMENTATIONREPOSITORY_CANNOTACTIVATE_CH_
- 
-  class TAO_IMR_Client_Export CannotActivate : public CORBA::UserException
+  
+  class TAO_IMR_Client_Export CannotActivate : public ::CORBA::UserException
   {
   public:
- 
+    
     TAO_String_Manager reason;
     CannotActivate (void);
     CannotActivate (const CannotActivate &);
     ~CannotActivate (void);
 
     CannotActivate &operator= (const CannotActivate &);
- 
+    
     static void _tao_any_destructor (void *);
- 
-    static CannotActivate *_downcast (CORBA::Exception *);
-    static const CannotActivate *_downcast (CORBA::Exception const *);
- 
-    static CORBA::Exception *_alloc (void);
- 
-    virtual CORBA::Exception *_tao_duplicate (void) const;
+    
+    static CannotActivate *_downcast ( ::CORBA::Exception *);
+    static const CannotActivate *_downcast ( ::CORBA::Exception const *);
+    
+    static ::CORBA::Exception *_alloc (void);
+    
+    virtual ::CORBA::Exception *_tao_duplicate (void) const;
 
     virtual void _raise (void) const;
 
@@ -164,56 +157,56 @@ namespace ImplementationRepository
         TAO_OutputCDR &
         ACE_ENV_ARG_DECL
       ) const;
- 
+    
     virtual void _tao_decode (
         TAO_InputCDR &
         ACE_ENV_ARG_DECL
       );
- 
+    
     // TAO_IDL - Generated from
-    // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_exception/exception_ctor.cpp:66
- 
+    // be\be_visitor_exception/exception_ctor.cpp:66
+    
     CannotActivate (
         const char * _tao_reason
       );
- 
+    
     // TAO_IDL - Generated from
-    // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_exception/exception_ch.cpp:127
- 
-    virtual CORBA::TypeCode_ptr _tao_type (void) const;
+    // be\be_visitor_exception/exception_ch.cpp:129
+    
+    virtual ::CORBA::TypeCode_ptr _tao_type (void) const;
   };
- 
+  
   // TAO_IDL - Generated from
-  // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/typecode_decl.cpp:44
- 
+  // be\be_visitor_typecode/typecode_decl.cpp:49
+  
   extern TAO_IMR_Client_Export ::CORBA::TypeCode_ptr const _tc_CannotActivate;
 
 #endif /* end #if !defined */
- 
+  
   // TAO_IDL - Generated from
-  // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_exception/exception_ch.cpp:51
+  // be\be_visitor_exception/exception_ch.cpp:53
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_NOTFOUND_CH_)
 #define _IMPLEMENTATIONREPOSITORY_NOTFOUND_CH_
- 
-  class TAO_IMR_Client_Export NotFound : public CORBA::UserException
+  
+  class TAO_IMR_Client_Export NotFound : public ::CORBA::UserException
   {
   public:
- 
+    
     NotFound (void);
     NotFound (const NotFound &);
     ~NotFound (void);
 
     NotFound &operator= (const NotFound &);
- 
+    
     static void _tao_any_destructor (void *);
- 
-    static NotFound *_downcast (CORBA::Exception *);
-    static const NotFound *_downcast (CORBA::Exception const *);
- 
-    static CORBA::Exception *_alloc (void);
- 
-    virtual CORBA::Exception *_tao_duplicate (void) const;
+    
+    static NotFound *_downcast ( ::CORBA::Exception *);
+    static const NotFound *_downcast ( ::CORBA::Exception const *);
+    
+    static ::CORBA::Exception *_alloc (void);
+    
+    virtual ::CORBA::Exception *_tao_duplicate (void) const;
 
     virtual void _raise (void) const;
 
@@ -221,75 +214,75 @@ namespace ImplementationRepository
         TAO_OutputCDR &
         ACE_ENV_ARG_DECL
       ) const;
- 
+    
     virtual void _tao_decode (
         TAO_InputCDR &
         ACE_ENV_ARG_DECL
       );
- 
+    
     // TAO_IDL - Generated from
-    // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_exception/exception_ch.cpp:127
- 
-    virtual CORBA::TypeCode_ptr _tao_type (void) const;
+    // be\be_visitor_exception/exception_ch.cpp:129
+    
+    virtual ::CORBA::TypeCode_ptr _tao_type (void) const;
   };
- 
+  
   // TAO_IDL - Generated from
-  // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/typecode_decl.cpp:44
- 
+  // be\be_visitor_typecode/typecode_decl.cpp:49
+  
   extern TAO_IMR_Client_Export ::CORBA::TypeCode_ptr const _tc_NotFound;
 
 #endif /* end #if !defined */
- 
+  
   // TAO_IDL - Generated from
-  // .\be\be_type.cpp:258
- 
+  // be\be_type.cpp:258
+  
   struct EnvironmentVariable;
- 
+  
   typedef
     TAO_Var_Var_T<
         EnvironmentVariable
       >
     EnvironmentVariable_var;
- 
+  
   typedef
     TAO_Out_T<
         EnvironmentVariable,
         EnvironmentVariable_var
       >
     EnvironmentVariable_out;
- 
+  
   // TAO_IDL - Generated from
-  // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_structure/structure_ch.cpp:52
- 
+  // be\be_visitor_structure/structure_ch.cpp:57
+  
   struct TAO_IMR_Client_Export EnvironmentVariable
   {
     typedef EnvironmentVariable_var _var_type;
- 
+    
     static void _tao_any_destructor (void *);
     TAO_String_Manager name;
     TAO_String_Manager value;
   };
- 
+  
   // TAO_IDL - Generated from
-  // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/typecode_decl.cpp:44
- 
+  // be\be_visitor_typecode/typecode_decl.cpp:49
+  
   extern TAO_IMR_Client_Export ::CORBA::TypeCode_ptr const _tc_EnvironmentVariable;
- 
+  
   // TAO_IDL - Generated from
-  // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_sequence/sequence_ch.cpp:101
+  // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST_CH_)
 #define _IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST_CH_
- 
+  
   class EnvironmentList;
- 
+  
   typedef
     TAO_VarSeq_Var_T<
         EnvironmentList,
         EnvironmentVariable
       >
     EnvironmentList_var;
- 
+  
   typedef
     TAO_Seq_Out_T<
         EnvironmentList,
@@ -297,7 +290,7 @@ namespace ImplementationRepository
         EnvironmentVariable
       >
     EnvironmentList_out;
- 
+  
   class TAO_IMR_Client_Export EnvironmentList
     : public
         TAO_Unbounded_Sequence<
@@ -306,31 +299,31 @@ namespace ImplementationRepository
   {
   public:
     EnvironmentList (void);
-    EnvironmentList (CORBA::ULong max);
+    EnvironmentList ( ::CORBA::ULong max);
     EnvironmentList (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        EnvironmentVariable* buffer,
-        CORBA::Boolean release = 0
+        ::CORBA::ULong max,
+        ::CORBA::ULong length,
+        EnvironmentVariable* buffer, 
+        ::CORBA::Boolean release = 0
       );
     EnvironmentList (const EnvironmentList &);
     ~EnvironmentList (void);
- 
+    
     static void _tao_any_destructor (void *);
- 
+    
     typedef EnvironmentList_var _var_type;
   };
 
 #endif /* end #if !defined */
- 
+  
   // TAO_IDL - Generated from
-  // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/typecode_decl.cpp:44
- 
+  // be\be_visitor_typecode/typecode_decl.cpp:49
+  
   extern TAO_IMR_Client_Export ::CORBA::TypeCode_ptr const _tc_EnvironmentList;
- 
+  
   // TAO_IDL - Generated from
-  // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_enum/enum_ch.cpp:57
- 
+  // be\be_visitor_enum/enum_ch.cpp:57
+  
   enum ActivationMode
   {
     NORMAL,
@@ -338,104 +331,104 @@ namespace ImplementationRepository
     PER_CLIENT,
     AUTO_START
   };
- 
+  
   typedef ActivationMode &ActivationMode_out;
- 
+  
   // TAO_IDL - Generated from
-  // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/typecode_decl.cpp:44
- 
+  // be\be_visitor_typecode/typecode_decl.cpp:49
+  
   extern TAO_IMR_Client_Export ::CORBA::TypeCode_ptr const _tc_ActivationMode;
- 
+  
   // TAO_IDL - Generated from
-  // .\be\be_type.cpp:258
- 
+  // be\be_type.cpp:258
+  
   struct StartupOptions;
- 
+  
   typedef
     TAO_Var_Var_T<
         StartupOptions
       >
     StartupOptions_var;
- 
+  
   typedef
     TAO_Out_T<
         StartupOptions,
         StartupOptions_var
       >
     StartupOptions_out;
- 
+  
   // TAO_IDL - Generated from
-  // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_structure/structure_ch.cpp:52
- 
+  // be\be_visitor_structure/structure_ch.cpp:57
+  
   struct TAO_IMR_Client_Export StartupOptions
   {
     typedef StartupOptions_var _var_type;
- 
+    
     static void _tao_any_destructor (void *);
     TAO_String_Manager command_line;
     ImplementationRepository::EnvironmentList environment;
     TAO_String_Manager working_directory;
     ImplementationRepository::ActivationMode activation;
     TAO_String_Manager activator;
-    CORBA::Long start_limit;
+    ::CORBA::Long start_limit;
   };
- 
+  
   // TAO_IDL - Generated from
-  // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/typecode_decl.cpp:44
- 
+  // be\be_visitor_typecode/typecode_decl.cpp:49
+  
   extern TAO_IMR_Client_Export ::CORBA::TypeCode_ptr const _tc_StartupOptions;
- 
+  
   // TAO_IDL - Generated from
-  // .\be\be_type.cpp:258
- 
+  // be\be_type.cpp:258
+  
   struct ServerInformation;
- 
+  
   typedef
     TAO_Var_Var_T<
         ServerInformation
       >
     ServerInformation_var;
- 
+  
   typedef
     TAO_Out_T<
         ServerInformation,
         ServerInformation_var
       >
     ServerInformation_out;
- 
+  
   // TAO_IDL - Generated from
-  // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_structure/structure_ch.cpp:52
- 
+  // be\be_visitor_structure/structure_ch.cpp:57
+  
   struct TAO_IMR_Client_Export ServerInformation
   {
     typedef ServerInformation_var _var_type;
- 
+    
     static void _tao_any_destructor (void *);
     TAO_String_Manager server;
     ImplementationRepository::StartupOptions startup;
     TAO_String_Manager partial_ior;
   };
- 
+  
   // TAO_IDL - Generated from
-  // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/typecode_decl.cpp:44
- 
+  // be\be_visitor_typecode/typecode_decl.cpp:49
+  
   extern TAO_IMR_Client_Export ::CORBA::TypeCode_ptr const _tc_ServerInformation;
- 
+  
   // TAO_IDL - Generated from
-  // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_sequence/sequence_ch.cpp:101
+  // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST_CH_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST_CH_
- 
+  
   class ServerInformationList;
- 
+  
   typedef
     TAO_VarSeq_Var_T<
         ServerInformationList,
         ServerInformation
       >
     ServerInformationList_var;
- 
+  
   typedef
     TAO_Seq_Out_T<
         ServerInformationList,
@@ -443,7 +436,7 @@ namespace ImplementationRepository
         ServerInformation
       >
     ServerInformationList_out;
- 
+  
   class TAO_IMR_Client_Export ServerInformationList
     : public
         TAO_Unbounded_Sequence<
@@ -452,43 +445,43 @@ namespace ImplementationRepository
   {
   public:
     ServerInformationList (void);
-    ServerInformationList (CORBA::ULong max);
+    ServerInformationList ( ::CORBA::ULong max);
     ServerInformationList (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        ServerInformation* buffer,
-        CORBA::Boolean release = 0
+        ::CORBA::ULong max,
+        ::CORBA::ULong length,
+        ServerInformation* buffer, 
+        ::CORBA::Boolean release = 0
       );
     ServerInformationList (const ServerInformationList &);
     ~ServerInformationList (void);
- 
+    
     static void _tao_any_destructor (void *);
- 
+    
     typedef ServerInformationList_var _var_type;
   };
 
 #endif /* end #if !defined */
- 
+  
   // TAO_IDL - Generated from
-  // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/typecode_decl.cpp:44
- 
+  // be\be_visitor_typecode/typecode_decl.cpp:49
+  
   extern TAO_IMR_Client_Export ::CORBA::TypeCode_ptr const _tc_ServerInformationList;
- 
+  
   // TAO_IDL - Generated from
-  // .\be\be_interface.cpp:598
+  // be\be_interface.cpp:598
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR__VAR_OUT_CH_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR__VAR_OUT_CH_
- 
+  
   class ServerInformationIterator;
   typedef ServerInformationIterator *ServerInformationIterator_ptr;
- 
+  
   typedef
     TAO_Objref_Var_T<
         ServerInformationIterator
       >
     ServerInformationIterator_var;
- 
+  
   typedef
     TAO_Objref_Out_T<
         ServerInformationIterator
@@ -496,131 +489,131 @@ namespace ImplementationRepository
     ServerInformationIterator_out;
 
 #endif /* end #if !defined */
- 
+  
   // TAO_IDL - Generated from
-  // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_ch.cpp:54
+  // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR_CH_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR_CH_
- 
+  
   class TAO_IMR_Client_Export ServerInformationIterator
-    : public virtual CORBA::Object
+    : public virtual ::CORBA::Object
   {
   public:
     friend class TAO::Narrow_Utils<ServerInformationIterator>;
     typedef ServerInformationIterator_ptr _ptr_type;
     typedef ServerInformationIterator_var _var_type;
- 
+    
     // The static operations.
     static ServerInformationIterator_ptr _duplicate (ServerInformationIterator_ptr obj);
- 
+    
     static void _tao_release (ServerInformationIterator_ptr obj);
- 
+    
     static ServerInformationIterator_ptr _narrow (
-        CORBA::Object_ptr obj
+        ::CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
- 
+    
     static ServerInformationIterator_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
+        ::CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
- 
+    
     static ServerInformationIterator_ptr _nil (void)
     {
       return static_cast<ServerInformationIterator_ptr> (0);
     }
- 
+    
     static void _tao_any_destructor (void *);
- 
+    
     // TAO_IDL - Generated from
-    // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
- 
-    virtual CORBA::Boolean next_n (
+    // be\be_visitor_operation/operation_ch.cpp:46
+    
+    virtual ::CORBA::Boolean next_n (
         ::CORBA::ULong how_many,
         ::ImplementationRepository::ServerInformationList_out servers
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
+        ::CORBA::SystemException
       ));
- 
+    
     // TAO_IDL - Generated from
-    // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
- 
+    // be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void destroy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
+        ::CORBA::SystemException
       ));
- 
+    
     // TAO_IDL - Generated from
-    // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_ch.cpp:210
- 
-    virtual CORBA::Boolean _is_a (
+    // be\be_visitor_interface/interface_ch.cpp:210
+    
+    virtual ::CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
- 
+    
     virtual const char* _interface_repository_id (void) const;
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+    virtual ::CORBA::Boolean marshal (TAO_OutputCDR &cdr);
   private:
     TAO::Collocation_Proxy_Broker *the_TAO_ServerInformationIterator_Proxy_Broker_;
- 
+  
   protected:
     // Concrete interface only.
     ServerInformationIterator (void);
- 
+    
     // These methods travese the inheritance tree and set the
     // parents piece of the given class in the right mode.
     virtual void ImplementationRepository_ServerInformationIterator_setup_collocation (void);
- 
+    
     // Concrete non-local interface only.
     ServerInformationIterator (
         IOP::IOR *ior,
         TAO_ORB_Core *orb_core = 0
       );
- 
+    
     // Non-local interface only.
     ServerInformationIterator (
         TAO_Stub *objref,
-        CORBA::Boolean _tao_collocated = 0,
+        ::CORBA::Boolean _tao_collocated = 0,
         TAO_Abstract_ServantBase *servant = 0,
         TAO_ORB_Core *orb_core = 0
       );
- 
+    
     virtual ~ServerInformationIterator (void);
- 
+  
   private:
     // Private and unimplemented for concrete interfaces.
     ServerInformationIterator (const ServerInformationIterator &);
- 
+    
     void operator= (const ServerInformationIterator &);
   };
 
 #endif /* end #if !defined */
- 
+  
   // TAO_IDL - Generated from
-  // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/typecode_decl.cpp:44
- 
+  // be\be_visitor_typecode/typecode_decl.cpp:49
+  
   extern TAO_IMR_Client_Export ::CORBA::TypeCode_ptr const _tc_ServerInformationIterator;
- 
+  
   // TAO_IDL - Generated from
-  // .\be\be_interface.cpp:598
+  // be\be_interface.cpp:598
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_ADMINISTRATION__VAR_OUT_CH_)
 #define _IMPLEMENTATIONREPOSITORY_ADMINISTRATION__VAR_OUT_CH_
- 
+  
   class Administration;
   typedef Administration *Administration_ptr;
- 
+  
   typedef
     TAO_Objref_Var_T<
         Administration
       >
     Administration_var;
- 
+  
   typedef
     TAO_Objref_Out_T<
         Administration
@@ -628,96 +621,96 @@ namespace ImplementationRepository
     Administration_out;
 
 #endif /* end #if !defined */
- 
+  
   // TAO_IDL - Generated from
-  // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_ch.cpp:54
+  // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_ADMINISTRATION_CH_)
 #define _IMPLEMENTATIONREPOSITORY_ADMINISTRATION_CH_
- 
+  
   class TAO_IMR_Client_Export Administration
-    : public virtual CORBA::Object
+    : public virtual ::CORBA::Object
   {
   public:
     friend class TAO::Narrow_Utils<Administration>;
     typedef Administration_ptr _ptr_type;
     typedef Administration_var _var_type;
- 
+    
     // The static operations.
     static Administration_ptr _duplicate (Administration_ptr obj);
- 
+    
     static void _tao_release (Administration_ptr obj);
- 
+    
     static Administration_ptr _narrow (
-        CORBA::Object_ptr obj
+        ::CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
- 
+    
     static Administration_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
+        ::CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
- 
+    
     static Administration_ptr _nil (void)
     {
       return static_cast<Administration_ptr> (0);
     }
- 
+    
     static void _tao_any_destructor (void *);
- 
+    
     // TAO_IDL - Generated from
-    // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
- 
+    // be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void activate_server (
         const char * server
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException,
+        ::CORBA::SystemException,
         ::ImplementationRepository::NotFound,
         ::ImplementationRepository::CannotActivate
       ));
- 
+    
     // TAO_IDL - Generated from
-    // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
- 
+    // be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void add_or_update_server (
         const char * server,
         const ::ImplementationRepository::StartupOptions & options
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException,
+        ::CORBA::SystemException,
         ::ImplementationRepository::NotFound
       ));
- 
+    
     // TAO_IDL - Generated from
-    // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
- 
+    // be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void remove_server (
         const char * server
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException,
+        ::CORBA::SystemException,
         ::ImplementationRepository::NotFound
       ));
- 
+    
     // TAO_IDL - Generated from
-    // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
- 
+    // be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void shutdown_server (
         const char * server
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException,
+        ::CORBA::SystemException,
         ::ImplementationRepository::NotFound
       ));
- 
+    
     // TAO_IDL - Generated from
-    // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
- 
+    // be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void server_is_running (
         const char * server,
         const char * partial_ior,
@@ -725,37 +718,37 @@ namespace ImplementationRepository
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException,
+        ::CORBA::SystemException,
         ::ImplementationRepository::NotFound
       ));
- 
+    
     // TAO_IDL - Generated from
-    // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
- 
+    // be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void server_is_shutting_down (
         const char * server
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException,
+        ::CORBA::SystemException,
         ::ImplementationRepository::NotFound
       ));
- 
+    
     // TAO_IDL - Generated from
-    // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
- 
+    // be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void find (
         const char * server,
         ::ImplementationRepository::ServerInformation_out info
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
+        ::CORBA::SystemException
       ));
- 
+    
     // TAO_IDL - Generated from
-    // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
- 
+    // be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void list (
         ::CORBA::ULong how_many,
         ::ImplementationRepository::ServerInformationList_out server_list,
@@ -763,104 +756,104 @@ namespace ImplementationRepository
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
+        ::CORBA::SystemException
       ));
- 
+    
     // TAO_IDL - Generated from
-    // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
- 
+    // be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void shutdown (
         ::CORBA::Boolean activators,
         ::CORBA::Boolean servers
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
+        ::CORBA::SystemException
       ));
- 
+    
     // TAO_IDL - Generated from
-    // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_ch.cpp:210
- 
-    virtual CORBA::Boolean _is_a (
+    // be\be_visitor_interface/interface_ch.cpp:210
+    
+    virtual ::CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
- 
+    
     virtual const char* _interface_repository_id (void) const;
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+    virtual ::CORBA::Boolean marshal (TAO_OutputCDR &cdr);
   private:
     TAO::Collocation_Proxy_Broker *the_TAO_Administration_Proxy_Broker_;
- 
+  
   protected:
     // Concrete interface only.
     Administration (void);
- 
+    
     // These methods travese the inheritance tree and set the
     // parents piece of the given class in the right mode.
     virtual void ImplementationRepository_Administration_setup_collocation (void);
- 
+    
     // Concrete non-local interface only.
     Administration (
         IOP::IOR *ior,
         TAO_ORB_Core *orb_core = 0
       );
- 
+    
     // Non-local interface only.
     Administration (
         TAO_Stub *objref,
-        CORBA::Boolean _tao_collocated = 0,
+        ::CORBA::Boolean _tao_collocated = 0,
         TAO_Abstract_ServantBase *servant = 0,
         TAO_ORB_Core *orb_core = 0
       );
- 
+    
     virtual ~Administration (void);
- 
+  
   private:
     // Private and unimplemented for concrete interfaces.
     Administration (const Administration &);
- 
+    
     void operator= (const Administration &);
   };
 
 #endif /* end #if !defined */
- 
+  
   // TAO_IDL - Generated from
-  // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/typecode_decl.cpp:44
- 
+  // be\be_visitor_typecode/typecode_decl.cpp:49
+  
   extern TAO_IMR_Client_Export ::CORBA::TypeCode_ptr const _tc_Administration;
 
 // TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_ch.cpp:66
+// be\be_visitor_module/module_ch.cpp:78
 
 } // module ImplementationRepository
 
 // Proxy Broker Factory function pointer declarations.
 
 // TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_root/root.cpp:139
+// be\be_visitor_root/root.cpp:139
 
 extern TAO_IMR_Client_Export
 TAO::Collocation_Proxy_Broker *
 (*ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
+    ::CORBA::Object_ptr obj
   );
 
 extern TAO_IMR_Client_Export
 TAO::Collocation_Proxy_Broker *
 (*ImplementationRepository__TAO_Administration_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
+    ::CORBA::Object_ptr obj
   );
 
 // TAO_IDL - Generated from
-// .\be\be_visitor_traits.cpp:61
+// be\be_visitor_traits.cpp:61
 
 // Traits specializations.
 namespace TAO
 {
 
-#if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR__TRAITS_CH_)
-#define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR__TRAITS_CH_
- 
+#if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR__TRAITS_)
+#define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR__TRAITS_
+  
   template<>
   struct TAO_IMR_Client_Export Objref_Traits< ::ImplementationRepository::ServerInformationIterator>
   {
@@ -871,7 +864,7 @@ namespace TAO
         ::ImplementationRepository::ServerInformationIterator_ptr
       );
     static ::ImplementationRepository::ServerInformationIterator_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static ::CORBA::Boolean marshal (
         ::ImplementationRepository::ServerInformationIterator_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -879,9 +872,9 @@ namespace TAO
 
 #endif /* end #if !defined */
 
-#if !defined (_IMPLEMENTATIONREPOSITORY_ADMINISTRATION__TRAITS_CH_)
-#define _IMPLEMENTATIONREPOSITORY_ADMINISTRATION__TRAITS_CH_
- 
+#if !defined (_IMPLEMENTATIONREPOSITORY_ADMINISTRATION__TRAITS_)
+#define _IMPLEMENTATIONREPOSITORY_ADMINISTRATION__TRAITS_
+  
   template<>
   struct TAO_IMR_Client_Export Objref_Traits< ::ImplementationRepository::Administration>
   {
@@ -892,7 +885,7 @@ namespace TAO
         ::ImplementationRepository::Administration_ptr
       );
     static ::ImplementationRepository::Administration_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static ::CORBA::Boolean marshal (
         ::ImplementationRepository::Administration_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -902,124 +895,154 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_exception/any_op_ch.cpp:52
+// be\be_visitor_exception/any_op_ch.cpp:53
 
-TAO_IMR_Client_Export void operator<<= (CORBA::Any &, const ImplementationRepository::AlreadyRegistered &); // copying version
-TAO_IMR_Client_Export void operator<<= (CORBA::Any &, ImplementationRepository::AlreadyRegistered*); // noncopying version
-TAO_IMR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::AlreadyRegistered *&); // deprecated
-TAO_IMR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const ImplementationRepository::AlreadyRegistered *&);
+TAO_IMR_Client_Export void operator<<= (::CORBA::Any &, const ImplementationRepository::AlreadyRegistered &); // copying version
+TAO_IMR_Client_Export void operator<<= (::CORBA::Any &, ImplementationRepository::AlreadyRegistered*); // noncopying version
+TAO_IMR_Client_Export ::CORBA::Boolean operator>>= (const ::CORBA::Any &, ImplementationRepository::AlreadyRegistered *&); // deprecated
+TAO_IMR_Client_Export ::CORBA::Boolean operator>>= (const ::CORBA::Any &, const ImplementationRepository::AlreadyRegistered *&);
 
 // TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_exception/any_op_ch.cpp:52
+// be\be_visitor_exception/any_op_ch.cpp:53
 
-TAO_IMR_Client_Export void operator<<= (CORBA::Any &, const ImplementationRepository::CannotActivate &); // copying version
-TAO_IMR_Client_Export void operator<<= (CORBA::Any &, ImplementationRepository::CannotActivate*); // noncopying version
-TAO_IMR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::CannotActivate *&); // deprecated
-TAO_IMR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const ImplementationRepository::CannotActivate *&);
+TAO_IMR_Client_Export void operator<<= (::CORBA::Any &, const ImplementationRepository::CannotActivate &); // copying version
+TAO_IMR_Client_Export void operator<<= (::CORBA::Any &, ImplementationRepository::CannotActivate*); // noncopying version
+TAO_IMR_Client_Export ::CORBA::Boolean operator>>= (const ::CORBA::Any &, ImplementationRepository::CannotActivate *&); // deprecated
+TAO_IMR_Client_Export ::CORBA::Boolean operator>>= (const ::CORBA::Any &, const ImplementationRepository::CannotActivate *&);
 
 // TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_exception/any_op_ch.cpp:52
+// be\be_visitor_exception/any_op_ch.cpp:53
 
-TAO_IMR_Client_Export void operator<<= (CORBA::Any &, const ImplementationRepository::NotFound &); // copying version
-TAO_IMR_Client_Export void operator<<= (CORBA::Any &, ImplementationRepository::NotFound*); // noncopying version
-TAO_IMR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::NotFound *&); // deprecated
-TAO_IMR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const ImplementationRepository::NotFound *&);
+TAO_IMR_Client_Export void operator<<= (::CORBA::Any &, const ImplementationRepository::NotFound &); // copying version
+TAO_IMR_Client_Export void operator<<= (::CORBA::Any &, ImplementationRepository::NotFound*); // noncopying version
+TAO_IMR_Client_Export ::CORBA::Boolean operator>>= (const ::CORBA::Any &, ImplementationRepository::NotFound *&); // deprecated
+TAO_IMR_Client_Export ::CORBA::Boolean operator>>= (const ::CORBA::Any &, const ImplementationRepository::NotFound *&);
 
 // TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_structure/any_op_ch.cpp:52
+// be\be_visitor_structure/any_op_ch.cpp:53
 
-TAO_IMR_Client_Export void operator<<= (CORBA::Any &, const ImplementationRepository::EnvironmentVariable &); // copying version
-TAO_IMR_Client_Export void operator<<= (CORBA::Any &, ImplementationRepository::EnvironmentVariable*); // noncopying version
-TAO_IMR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::EnvironmentVariable *&); // deprecated
-TAO_IMR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const ImplementationRepository::EnvironmentVariable *&);
+TAO_IMR_Client_Export void operator<<= (::CORBA::Any &, const ImplementationRepository::EnvironmentVariable &); // copying version
+TAO_IMR_Client_Export void operator<<= (::CORBA::Any &, ImplementationRepository::EnvironmentVariable*); // noncopying version
+TAO_IMR_Client_Export ::CORBA::Boolean operator>>= (const ::CORBA::Any &, ImplementationRepository::EnvironmentVariable *&); // deprecated
+TAO_IMR_Client_Export ::CORBA::Boolean operator>>= (const ::CORBA::Any &, const ImplementationRepository::EnvironmentVariable *&);
 
 // TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_sequence/any_op_ch.cpp:52
+// be\be_visitor_sequence/any_op_ch.cpp:53
 
-TAO_IMR_Client_Export void operator<<= (CORBA::Any &, const ImplementationRepository::EnvironmentList &); // copying version
-TAO_IMR_Client_Export void operator<<= (CORBA::Any &, ImplementationRepository::EnvironmentList*); // noncopying version
-TAO_IMR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::EnvironmentList *&); // deprecated
-TAO_IMR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const ImplementationRepository::EnvironmentList *&);
+TAO_IMR_Client_Export void operator<<= ( ::CORBA::Any &, const ImplementationRepository::EnvironmentList &); // copying version
+TAO_IMR_Client_Export void operator<<= ( ::CORBA::Any &, ImplementationRepository::EnvironmentList*); // noncopying version
+TAO_IMR_Client_Export ::CORBA::Boolean operator>>= (const ::CORBA::Any &, ImplementationRepository::EnvironmentList *&); // deprecated
+TAO_IMR_Client_Export ::CORBA::Boolean operator>>= (const ::CORBA::Any &, const ImplementationRepository::EnvironmentList *&);
 
 // TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_enum/any_op_ch.cpp:51
+// be\be_visitor_enum/any_op_ch.cpp:52
 
-TAO_IMR_Client_Export void operator<<= (CORBA::Any &, ImplementationRepository::ActivationMode);
-TAO_IMR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::ActivationMode &);
+TAO_IMR_Client_Export void operator<<= (::CORBA::Any &, ImplementationRepository::ActivationMode);
+TAO_IMR_Client_Export ::CORBA::Boolean operator>>= (const ::CORBA::Any &, ImplementationRepository::ActivationMode &);
 
 // TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_structure/any_op_ch.cpp:52
+// be\be_visitor_structure/any_op_ch.cpp:53
 
-TAO_IMR_Client_Export void operator<<= (CORBA::Any &, const ImplementationRepository::StartupOptions &); // copying version
-TAO_IMR_Client_Export void operator<<= (CORBA::Any &, ImplementationRepository::StartupOptions*); // noncopying version
-TAO_IMR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::StartupOptions *&); // deprecated
-TAO_IMR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const ImplementationRepository::StartupOptions *&);
+TAO_IMR_Client_Export void operator<<= (::CORBA::Any &, const ImplementationRepository::StartupOptions &); // copying version
+TAO_IMR_Client_Export void operator<<= (::CORBA::Any &, ImplementationRepository::StartupOptions*); // noncopying version
+TAO_IMR_Client_Export ::CORBA::Boolean operator>>= (const ::CORBA::Any &, ImplementationRepository::StartupOptions *&); // deprecated
+TAO_IMR_Client_Export ::CORBA::Boolean operator>>= (const ::CORBA::Any &, const ImplementationRepository::StartupOptions *&);
 
 // TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_structure/any_op_ch.cpp:52
+// be\be_visitor_structure/any_op_ch.cpp:53
 
-TAO_IMR_Client_Export void operator<<= (CORBA::Any &, const ImplementationRepository::ServerInformation &); // copying version
-TAO_IMR_Client_Export void operator<<= (CORBA::Any &, ImplementationRepository::ServerInformation*); // noncopying version
-TAO_IMR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::ServerInformation *&); // deprecated
-TAO_IMR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const ImplementationRepository::ServerInformation *&);
+TAO_IMR_Client_Export void operator<<= (::CORBA::Any &, const ImplementationRepository::ServerInformation &); // copying version
+TAO_IMR_Client_Export void operator<<= (::CORBA::Any &, ImplementationRepository::ServerInformation*); // noncopying version
+TAO_IMR_Client_Export ::CORBA::Boolean operator>>= (const ::CORBA::Any &, ImplementationRepository::ServerInformation *&); // deprecated
+TAO_IMR_Client_Export ::CORBA::Boolean operator>>= (const ::CORBA::Any &, const ImplementationRepository::ServerInformation *&);
 
 // TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_sequence/any_op_ch.cpp:52
+// be\be_visitor_sequence/any_op_ch.cpp:53
 
-TAO_IMR_Client_Export void operator<<= (CORBA::Any &, const ImplementationRepository::ServerInformationList &); // copying version
-TAO_IMR_Client_Export void operator<<= (CORBA::Any &, ImplementationRepository::ServerInformationList*); // noncopying version
-TAO_IMR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::ServerInformationList *&); // deprecated
-TAO_IMR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const ImplementationRepository::ServerInformationList *&);
+TAO_IMR_Client_Export void operator<<= ( ::CORBA::Any &, const ImplementationRepository::ServerInformationList &); // copying version
+TAO_IMR_Client_Export void operator<<= ( ::CORBA::Any &, ImplementationRepository::ServerInformationList*); // noncopying version
+TAO_IMR_Client_Export ::CORBA::Boolean operator>>= (const ::CORBA::Any &, ImplementationRepository::ServerInformationList *&); // deprecated
+TAO_IMR_Client_Export ::CORBA::Boolean operator>>= (const ::CORBA::Any &, const ImplementationRepository::ServerInformationList *&);
 
 // TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_interface/any_op_ch.cpp:52
+// be\be_visitor_interface/any_op_ch.cpp:54
+
+
 
-TAO_IMR_Client_Export void operator<<= (CORBA::Any &, ImplementationRepository::ServerInformationIterator_ptr); // copying
-TAO_IMR_Client_Export void operator<<= (CORBA::Any &, ImplementationRepository::ServerInformationIterator_ptr *); // non-copying
-TAO_IMR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::ServerInformationIterator_ptr &);
+#if defined (ACE_ANY_OPS_USE_NAMESPACE)
+
+namespace ImplementationRepository
+{
+  TAO_IMR_Client_Export void operator<<= ( ::CORBA::Any &, ServerInformationIterator_ptr); // copying
+  TAO_IMR_Client_Export void operator<<= ( ::CORBA::Any &, ServerInformationIterator_ptr *); // non-copying
+  TAO_IMR_Client_Export ::CORBA::Boolean operator>>= (const ::CORBA::Any &, ServerInformationIterator_ptr &);
+}
+
+#else
+
+TAO_IMR_Client_Export void operator<<= (::CORBA::Any &, ImplementationRepository::ServerInformationIterator_ptr); // copying
+TAO_IMR_Client_Export void operator<<= (::CORBA::Any &, ImplementationRepository::ServerInformationIterator_ptr *); // non-copying
+TAO_IMR_Client_Export ::CORBA::Boolean operator>>= (const ::CORBA::Any &, ImplementationRepository::ServerInformationIterator_ptr &);
+
+#endif
 
 // TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_interface/any_op_ch.cpp:52
+// be\be_visitor_interface/any_op_ch.cpp:54
+
+
+
+#if defined (ACE_ANY_OPS_USE_NAMESPACE)
 
-TAO_IMR_Client_Export void operator<<= (CORBA::Any &, ImplementationRepository::Administration_ptr); // copying
-TAO_IMR_Client_Export void operator<<= (CORBA::Any &, ImplementationRepository::Administration_ptr *); // non-copying
-TAO_IMR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::Administration_ptr &);
+namespace ImplementationRepository
+{
+  TAO_IMR_Client_Export void operator<<= ( ::CORBA::Any &, Administration_ptr); // copying
+  TAO_IMR_Client_Export void operator<<= ( ::CORBA::Any &, Administration_ptr *); // non-copying
+  TAO_IMR_Client_Export ::CORBA::Boolean operator>>= (const ::CORBA::Any &, Administration_ptr &);
+}
+
+#else
+
+TAO_IMR_Client_Export void operator<<= (::CORBA::Any &, ImplementationRepository::Administration_ptr); // copying
+TAO_IMR_Client_Export void operator<<= (::CORBA::Any &, ImplementationRepository::Administration_ptr *); // non-copying
+TAO_IMR_Client_Export ::CORBA::Boolean operator>>= (const ::CORBA::Any &, ImplementationRepository::Administration_ptr &);
+
+#endif
 
 // TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_exception/cdr_op_ch.cpp:52
+// be\be_visitor_exception/cdr_op_ch.cpp:52
 
-TAO_IMR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::AlreadyRegistered &);
-TAO_IMR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::AlreadyRegistered &);
+TAO_IMR_Client_Export ::CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::AlreadyRegistered &);
+TAO_IMR_Client_Export ::CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::AlreadyRegistered &);
 
 // TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_exception/cdr_op_ch.cpp:52
+// be\be_visitor_exception/cdr_op_ch.cpp:52
 
-TAO_IMR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::CannotActivate &);
-TAO_IMR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::CannotActivate &);
+TAO_IMR_Client_Export ::CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::CannotActivate &);
+TAO_IMR_Client_Export ::CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::CannotActivate &);
 
 // TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_exception/cdr_op_ch.cpp:52
+// be\be_visitor_exception/cdr_op_ch.cpp:52
 
-TAO_IMR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::NotFound &);
-TAO_IMR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::NotFound &);
+TAO_IMR_Client_Export ::CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::NotFound &);
+TAO_IMR_Client_Export ::CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::NotFound &);
 
 // TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_structure/cdr_op_ch.cpp:54
+// be\be_visitor_structure/cdr_op_ch.cpp:54
 
-TAO_IMR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::EnvironmentVariable &);
-TAO_IMR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::EnvironmentVariable &);
+TAO_IMR_Client_Export ::CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::EnvironmentVariable &);
+TAO_IMR_Client_Export ::CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::EnvironmentVariable &);
 
 // TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_sequence/cdr_op_ch.cpp:71
+// be\be_visitor_sequence/cdr_op_ch.cpp:71
 
 #if !defined _TAO_CDR_OP_ImplementationRepository_EnvironmentList_H_
 #define _TAO_CDR_OP_ImplementationRepository_EnvironmentList_H_
 
-TAO_IMR_Client_Export CORBA::Boolean operator<< (
+TAO_IMR_Client_Export ::CORBA::Boolean operator<< (
     TAO_OutputCDR &,
     const ImplementationRepository::EnvironmentList &
   );
-TAO_IMR_Client_Export CORBA::Boolean operator>> (
+TAO_IMR_Client_Export ::CORBA::Boolean operator>> (
     TAO_InputCDR &,
     ImplementationRepository::EnvironmentList &
   );
@@ -1027,34 +1050,34 @@ TAO_IMR_Client_Export CORBA::Boolean operator>> (
 #endif /* _TAO_CDR_OP_ImplementationRepository_EnvironmentList_H_ */
 
 // TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_enum/cdr_op_ch.cpp:50
+// be\be_visitor_enum/cdr_op_ch.cpp:50
 
-TAO_IMR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, ImplementationRepository::ActivationMode);
-TAO_IMR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::ActivationMode &);
+TAO_IMR_Client_Export ::CORBA::Boolean operator<< (TAO_OutputCDR &, ImplementationRepository::ActivationMode);
+TAO_IMR_Client_Export ::CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::ActivationMode &);
 
 // TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_structure/cdr_op_ch.cpp:54
+// be\be_visitor_structure/cdr_op_ch.cpp:54
 
-TAO_IMR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::StartupOptions &);
-TAO_IMR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::StartupOptions &);
+TAO_IMR_Client_Export ::CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::StartupOptions &);
+TAO_IMR_Client_Export ::CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::StartupOptions &);
 
 // TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_structure/cdr_op_ch.cpp:54
+// be\be_visitor_structure/cdr_op_ch.cpp:54
 
-TAO_IMR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::ServerInformation &);
-TAO_IMR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::ServerInformation &);
+TAO_IMR_Client_Export ::CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::ServerInformation &);
+TAO_IMR_Client_Export ::CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::ServerInformation &);
 
 // TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_sequence/cdr_op_ch.cpp:71
+// be\be_visitor_sequence/cdr_op_ch.cpp:71
 
 #if !defined _TAO_CDR_OP_ImplementationRepository_ServerInformationList_H_
 #define _TAO_CDR_OP_ImplementationRepository_ServerInformationList_H_
 
-TAO_IMR_Client_Export CORBA::Boolean operator<< (
+TAO_IMR_Client_Export ::CORBA::Boolean operator<< (
     TAO_OutputCDR &,
     const ImplementationRepository::ServerInformationList &
   );
-TAO_IMR_Client_Export CORBA::Boolean operator>> (
+TAO_IMR_Client_Export ::CORBA::Boolean operator>> (
     TAO_InputCDR &,
     ImplementationRepository::ServerInformationList &
   );
@@ -1062,32 +1085,24 @@ TAO_IMR_Client_Export CORBA::Boolean operator>> (
 #endif /* _TAO_CDR_OP_ImplementationRepository_ServerInformationList_H_ */
 
 // TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_interface/cdr_op_ch.cpp:55
+// be\be_visitor_interface/cdr_op_ch.cpp:55
 
-TAO_IMR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::ServerInformationIterator_ptr );
-TAO_IMR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::ServerInformationIterator_ptr &);
+TAO_IMR_Client_Export ::CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::ServerInformationIterator_ptr );
+TAO_IMR_Client_Export ::CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::ServerInformationIterator_ptr &);
 
 // TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_interface/cdr_op_ch.cpp:55
+// be\be_visitor_interface/cdr_op_ch.cpp:55
 
-TAO_IMR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::Administration_ptr );
-TAO_IMR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::Administration_ptr &);
+TAO_IMR_Client_Export ::CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::Administration_ptr );
+TAO_IMR_Client_Export ::CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::Administration_ptr &);
 
 // TAO_IDL - Generated from
-// .\be\be_codegen.cpp:955
+// be\be_codegen.cpp:1040
 
 #if defined (__ACE_INLINE__)
 #include "ImplRepoC.inl"
 #endif /* defined INLINE */
 
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
-
 #include /**/ "ace/post.h"
 
 #endif /* ifndef */
diff --git a/TAO/tao/ImR_Client/ImplRepoC.inl b/TAO/tao/ImR_Client/ImplRepoC.inl
index 6b7e1bc5fff..3ed7c4ecff0 100644
--- a/TAO/tao/ImR_Client/ImplRepoC.inl
+++ b/TAO/tao/ImR_Client/ImplRepoC.inl
@@ -27,7 +27,7 @@
 
 
 // TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_ci.cpp:70
+// be\be_visitor_interface/interface_ci.cpp:70
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR___CI_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR___CI_
@@ -35,7 +35,7 @@
 ACE_INLINE
 ImplementationRepository::ServerInformationIterator::ServerInformationIterator (
     TAO_Stub *objref,
-    CORBA::Boolean _tao_collocated,
+    ::CORBA::Boolean _tao_collocated,
     TAO_Abstract_ServantBase *servant,
     TAO_ORB_Core *oc
   )
@@ -55,7 +55,7 @@ ImplementationRepository::ServerInformationIterator::ServerInformationIterator (
     IOP::IOR *ior,
     TAO_ORB_Core *oc
   )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
+  : ACE_NESTED_CLASS ( ::CORBA, Object) (ior, oc),
     the_TAO_ServerInformationIterator_Proxy_Broker_ (0)
 {
 }
@@ -63,7 +63,7 @@ ImplementationRepository::ServerInformationIterator::ServerInformationIterator (
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_ci.cpp:70
+// be\be_visitor_interface/interface_ci.cpp:70
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_ADMINISTRATION___CI_)
 #define _IMPLEMENTATIONREPOSITORY_ADMINISTRATION___CI_
@@ -71,7 +71,7 @@ ImplementationRepository::ServerInformationIterator::ServerInformationIterator (
 ACE_INLINE
 ImplementationRepository::Administration::Administration (
     TAO_Stub *objref,
-    CORBA::Boolean _tao_collocated,
+    ::CORBA::Boolean _tao_collocated,
     TAO_Abstract_ServantBase *servant,
     TAO_ORB_Core *oc
   )
@@ -91,7 +91,7 @@ ImplementationRepository::Administration::Administration (
     IOP::IOR *ior,
     TAO_ORB_Core *oc
   )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
+  : ACE_NESTED_CLASS ( ::CORBA, Object) (ior, oc),
     the_TAO_Administration_Proxy_Broker_ (0)
 {
 }
diff --git a/TAO/tao/ImR_Client/ImplRepoS.cpp b/TAO/tao/ImR_Client/ImplRepoS.cpp
index 99f1aa0147b..a221fec0660 100644
--- a/TAO/tao/ImR_Client/ImplRepoS.cpp
+++ b/TAO/tao/ImR_Client/ImplRepoS.cpp
@@ -26,15 +26,13 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 
-// TAO_IDL - Generated from
-// .\be\be_codegen.cpp:599
+// TAO_IDL - Generated from 
+// be\be_codegen.cpp:553
 
 #ifndef _TAO_IDL_IMPLREPOS_CPP_
 #define _TAO_IDL_IMPLREPOS_CPP_
 
 
-#include "tao/AnyTypeCode/TypeCode.h"
-#include "tao/AnyTypeCode/DynamicC.h"
 #include "ImplRepoS.h"
 #include "tao/PortableServer/Operation_Table_Perfect_Hash.h"
 #include "tao/PortableServer/Direct_Collocation_Upcall_Wrapper.h"
@@ -56,6 +54,8 @@
 #include "tao/Stub.h"
 #include "tao/IFR_Client_Adapter.h"
 #include "tao/Object_T.h"
+#include "tao/AnyTypeCode/TypeCode.h"
+#include "tao/AnyTypeCode/DynamicC.h"
 #include "tao/CDR.h"
 #include "tao/operation_details.h"
 #include "tao/PortableInterceptor.h"
@@ -67,20 +67,19 @@
 #include "ace/Dynamic_Service.h"
 #include "ace/Malloc_Allocator.h"
 
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus
-#endif /* __BORLANDC__ */
-
 // TAO_IDL - Generated from
-// .\be\be_visitor_arg_traits.cpp:69
+// be\be_visitor_arg_traits.cpp:70
 
 // Arg traits specializations.
 namespace TAO
 {
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_IMPLEMENTATIONREPOSITORY_SERVEROBJECT__SARG_TRAITS_SS_)
-#define _IMPLEMENTATIONREPOSITORY_SERVEROBJECT__SARG_TRAITS_SS_
-
+#if !defined (_IMPLEMENTATIONREPOSITORY_SERVEROBJECT__SARG_TRAITS_)
+#define _IMPLEMENTATIONREPOSITORY_SERVEROBJECT__SARG_TRAITS_
+  
   template<>
   class  SArg_Traits<ImplementationRepository::ServerObject>
     : public
@@ -94,13 +93,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // .\be\be_visitor_arg_traits.cpp:772
-
-#if !defined (_IMPLEMENTATIONREPOSITORY_STARTUPOPTIONS__SARG_TRAITS_SS_)
-#define _IMPLEMENTATIONREPOSITORY_STARTUPOPTIONS__SARG_TRAITS_SS_
+  // be\be_visitor_arg_traits.cpp:888
 
+#if !defined (_IMPLEMENTATIONREPOSITORY_STARTUPOPTIONS__SARG_TRAITS_)
+#define _IMPLEMENTATIONREPOSITORY_STARTUPOPTIONS__SARG_TRAITS_
+  
   template<>
   class SArg_Traits<ImplementationRepository::StartupOptions>
     : public
@@ -114,13 +113,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // .\be\be_visitor_arg_traits.cpp:772
-
-#if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATION__SARG_TRAITS_SS_)
-#define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATION__SARG_TRAITS_SS_
+  // be\be_visitor_arg_traits.cpp:888
 
+#if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATION__SARG_TRAITS_)
+#define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATION__SARG_TRAITS_
+  
   template<>
   class SArg_Traits<ImplementationRepository::ServerInformation>
     : public
@@ -134,13 +133,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // .\be\be_visitor_arg_traits.cpp:489
-
-#if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST__SARG_TRAITS_SS_)
-#define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST__SARG_TRAITS_SS_
+  // be\be_visitor_arg_traits.cpp:590
 
+#if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST__SARG_TRAITS_)
+#define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST__SARG_TRAITS_
+  
   template<>
   class SArg_Traits<ImplementationRepository::ServerInformationList>
     : public
@@ -154,10 +153,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR__SARG_TRAITS_SS_)
-#define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR__SARG_TRAITS_SS_
-
+#if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR__SARG_TRAITS_)
+#define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR__SARG_TRAITS_
+  
   template<>
   class  SArg_Traits<ImplementationRepository::ServerInformationIterator>
     : public
@@ -175,15 +177,18 @@ namespace TAO
 
 
 // TAO_IDL - Generated from
-// .\be\be_visitor_arg_traits.cpp:69
+// be\be_visitor_arg_traits.cpp:70
 
 // Arg traits specializations.
 namespace TAO
 {
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_IMPLEMENTATIONREPOSITORY_SERVEROBJECT__ARG_TRAITS_SS_)
-#define _IMPLEMENTATIONREPOSITORY_SERVEROBJECT__ARG_TRAITS_SS_
-
+#if !defined (_IMPLEMENTATIONREPOSITORY_SERVEROBJECT__ARG_TRAITS_)
+#define _IMPLEMENTATIONREPOSITORY_SERVEROBJECT__ARG_TRAITS_
+  
   template<>
   class  Arg_Traits<ImplementationRepository::ServerObject>
     : public
@@ -198,13 +203,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // .\be\be_visitor_arg_traits.cpp:772
-
-#if !defined (_IMPLEMENTATIONREPOSITORY_STARTUPOPTIONS__ARG_TRAITS_SS_)
-#define _IMPLEMENTATIONREPOSITORY_STARTUPOPTIONS__ARG_TRAITS_SS_
+  // be\be_visitor_arg_traits.cpp:888
 
+#if !defined (_IMPLEMENTATIONREPOSITORY_STARTUPOPTIONS__ARG_TRAITS_)
+#define _IMPLEMENTATIONREPOSITORY_STARTUPOPTIONS__ARG_TRAITS_
+  
   template<>
   class Arg_Traits<ImplementationRepository::StartupOptions>
     : public
@@ -218,13 +223,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // .\be\be_visitor_arg_traits.cpp:772
-
-#if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATION__ARG_TRAITS_SS_)
-#define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATION__ARG_TRAITS_SS_
+  // be\be_visitor_arg_traits.cpp:888
 
+#if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATION__ARG_TRAITS_)
+#define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATION__ARG_TRAITS_
+  
   template<>
   class Arg_Traits<ImplementationRepository::ServerInformation>
     : public
@@ -238,13 +243,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // .\be\be_visitor_arg_traits.cpp:489
-
-#if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST__ARG_TRAITS_SS_)
-#define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST__ARG_TRAITS_SS_
+  // be\be_visitor_arg_traits.cpp:590
 
+#if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST__ARG_TRAITS_)
+#define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST__ARG_TRAITS_
+  
   template<>
   class Arg_Traits<ImplementationRepository::ServerInformationList>
     : public
@@ -258,10 +263,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR__ARG_TRAITS_SS_)
-#define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR__ARG_TRAITS_SS_
-
+#if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR__ARG_TRAITS_)
+#define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR__ARG_TRAITS_
+  
   template<>
   class  Arg_Traits<ImplementationRepository::ServerInformationIterator>
     : public
@@ -280,7 +288,7 @@ namespace TAO
 
 
 // TAO_IDL - Generated from
-// .\be\be_interface.cpp:1455
+// be\be_interface.cpp:1465
 
 class TAO_ImplementationRepository_ServerInformationIterator_Perfect_Hash_OpTable
   : public TAO_Perfect_Hash_OpTable
@@ -293,9 +301,9 @@ public:
 };
 
 /* 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,0 -a -o -t -p -K opname -L C++ -Z TAO_ImplementationRepository_ServerInformationIterator_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: c:\ACE\latest\ACE_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0 -a -o -t -p -K opname -L C++ -Z TAO_ImplementationRepository_ServerInformationIterator_Perfect_Hash_OpTable -N lookup  */
 unsigned int
-TAO_ImplementationRepository_ServerInformationIterator_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
+TAO_ImplementationRepository_ServerInformationIterator_Perfect_Hash_OpTable::hash (const char *str, size_t len)
 {
   static const unsigned char asso_values[] =
     {
@@ -346,18 +354,18 @@ TAO_ImplementationRepository_ServerInformationIterator_Perfect_Hash_OpTable::has
 }
 
 const TAO_operation_db_entry *
-TAO_ImplementationRepository_ServerInformationIterator_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len)
+TAO_ImplementationRepository_ServerInformationIterator_Perfect_Hash_OpTable::lookup (const char *str, size_t len)
 {
   enum
     {
-      TOTAL_KEYWORDS = 6,
+      TOTAL_KEYWORDS = 7,
       MIN_WORD_LENGTH = 5,
-      MAX_WORD_LENGTH = 13,
+      MAX_WORD_LENGTH = 14,
       MIN_HASH_VALUE = 5,
       MAX_HASH_VALUE = 15,
       HASH_VALUE_RANGE = 11,
       DUPLICATES = 0,
-      WORDLIST_SIZE = 11
+      WORDLIST_SIZE = 12
     };
 
   static const TAO_operation_db_entry  wordlist[] =
@@ -370,7 +378,7 @@ TAO_ImplementationRepository_ServerInformationIterator_Perfect_Hash_OpTable::loo
       {"_component", &POA_ImplementationRepository::ServerInformationIterator::_component_skel, 0},
       {"",0,0},{"",0,0},
       {"_non_existent", &POA_ImplementationRepository::ServerInformationIterator::_non_existent_skel, 0},
-      {"",0,0},
+      {"_repository_id", &POA_ImplementationRepository::ServerInformationIterator::_repository_id_skel, 0},
       {"_interface", &POA_ImplementationRepository::ServerInformationIterator::_interface_skel, 0},
     };
 
@@ -395,7 +403,7 @@ static TAO_ImplementationRepository_ServerInformationIterator_Perfect_Hash_OpTab
 //
 
 // TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_interface/strategized_proxy_broker_ss.cpp:40
+// be\be_visitor_interface/strategized_proxy_broker_ss.cpp:40
 
 // Factory function Implementation.
 POA_ImplementationRepository::_TAO_ServerInformationIterator_Strategized_Proxy_Broker *
@@ -403,7 +411,7 @@ POA_ImplementationRepository::_TAO_ServerInformationIterator_Strategized_Proxy_B
 {
   static POA_ImplementationRepository::_TAO_ServerInformationIterator_Strategized_Proxy_Broker
   strategized_proxy_broker;
-
+  
   return &strategized_proxy_broker;
 }
 
@@ -417,22 +425,22 @@ POA_ImplementationRepository::_TAO_ServerInformationIterator_Strategized_Proxy_B
 
 TAO::Collocation_Strategy
 POA_ImplementationRepository::_TAO_ServerInformationIterator_Strategized_Proxy_Broker::get_strategy (
-    CORBA::Object_ptr obj
+    ::CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL
   )
-  ACE_THROW_SPEC ((CORBA::SystemException))
+  ACE_THROW_SPEC (( ::CORBA::SystemException))
 {
   TAO::Collocation_Strategy strategy =
     TAO_ORB_Core::collocation_strategy (obj ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (TAO::TAO_CS_REMOTE_STRATEGY);
-
+  
   return strategy;
 }
 
 void
 POA_ImplementationRepository::_TAO_ServerInformationIterator_Strategized_Proxy_Broker::dispatch (
-    CORBA::Object_ptr obj,
-    CORBA::Object_out forward_obj,
+    ::CORBA::Object_ptr obj,
+    ::CORBA::Object_out forward_obj,
     TAO::Argument ** args,
     int num_args,
     const char * op,
@@ -440,17 +448,17 @@ POA_ImplementationRepository::_TAO_ServerInformationIterator_Strategized_Proxy_B
     TAO::Collocation_Strategy strategy
     ACE_ENV_ARG_DECL
   )
-  ACE_THROW_SPEC ((CORBA::Exception))
+  ACE_THROW_SPEC (( ::CORBA::Exception))
 {
   TAO::Direct_Collocation_Upcall_Wrapper collocation_upcall_wrapper;
   collocation_upcall_wrapper.upcall (
-    obj,
-    forward_obj,
-    args,
-    num_args,
-    op,
-    op_len,
-    strategy
+    obj, 
+    forward_obj, 
+    args, 
+    num_args, 
+    op, 
+    op_len, 
+    strategy 
     ACE_ENV_ARG_PARAMETER);
 }
 
@@ -459,10 +467,10 @@ POA_ImplementationRepository::_TAO_ServerInformationIterator_Strategized_Proxy_B
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_ss.cpp:813
+// be\be_visitor_interface/interface_ss.cpp:921
 
 TAO::Collocation_Proxy_Broker *
-ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Factory_function (CORBA::Object_ptr)
+ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Factory_function ( ::CORBA::Object_ptr)
 {
   return
     ::POA_ImplementationRepository::_TAO_ServerInformationIterator_Strategized_Proxy_Broker::the_TAO_ServerInformationIterator_Strategized_Proxy_Broker ();
@@ -471,9 +479,9 @@ ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Factory_fun
 int
 ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Factory_Initializer (size_t)
 {
-  ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Factory_function_pointer =
+  ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Factory_function_pointer = 
     ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Factory_function;
-
+  
   return 0;
 }
 
@@ -492,18 +500,21 @@ ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Stub_Factor
 POA_ImplementationRepository::_TAO_ServerInformationIterator_Direct_Proxy_Impl::_TAO_ServerInformationIterator_Direct_Proxy_Impl (void)
 {}
 
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/direct_proxy_impl_ss.cpp:42
+POA_ImplementationRepository::_TAO_ServerInformationIterator_Direct_Proxy_Impl::~_TAO_ServerInformationIterator_Direct_Proxy_Impl (void)
+{}
+
+// TAO_IDL - Generated from 
+// be\be_visitor_operation/direct_proxy_impl_ss.cpp:42
 
 void
 POA_ImplementationRepository::_TAO_ServerInformationIterator_Direct_Proxy_Impl::next_n (
     TAO_Abstract_ServantBase  *servant,
     TAO::Argument ** args,
-    int
+    int 
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
-    CORBA::SystemException
+    ::CORBA::SystemException
   ))
 {
   ((TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::ret_val *) args[0])->arg () =
@@ -516,18 +527,18 @@ POA_ImplementationRepository::_TAO_ServerInformationIterator_Direct_Proxy_Impl::
         );
   ACE_CHECK;
 }
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/direct_proxy_impl_ss.cpp:42
+// TAO_IDL - Generated from 
+// be\be_visitor_operation/direct_proxy_impl_ss.cpp:42
 
 void
 POA_ImplementationRepository::_TAO_ServerInformationIterator_Direct_Proxy_Impl::destroy (
     TAO_Abstract_ServantBase  *servant,
     TAO::Argument **,
-    int
+    int 
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
-    CORBA::SystemException
+    ::CORBA::SystemException
   ))
 {
   dynamic_cast<POA_ImplementationRepository::ServerInformationIterator_ptr>
@@ -543,8 +554,8 @@ POA_ImplementationRepository::_TAO_ServerInformationIterator_Direct_Proxy_Impl::
 //           End Direct Proxy Implementation
 ///////////////////////////////////////////////////////////////////////
 
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_ss.cpp:103
+// TAO_IDL - Generated from 
+// be\be_visitor_interface/interface_ss.cpp:103
 
 POA_ImplementationRepository::ServerInformationIterator::ServerInformationIterator (void)
   : TAO_ServantBase ()
@@ -563,11 +574,11 @@ POA_ImplementationRepository::ServerInformationIterator::~ServerInformationItera
 }
 namespace POA_ImplementationRepository
 {
-
-
+  
+  
   // TAO_IDL - Generated from
-  // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/upcall_command_ss.cpp:127
-
+  // be\be_visitor_operation/upcall_command_ss.cpp:127
+  
   class next_n_ServerInformationIterator
     : public TAO::Upcall_Command
   {
@@ -581,46 +592,46 @@ namespace POA_ImplementationRepository
       , args_ (args)
     {
     }
-
+    
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-
+      
       TAO::SArg_Traits< ::CORBA::ULong>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::ULong, TAO::SArg_Traits< ::CORBA::ULong>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
-
+        
       TAO::SArg_Traits< ::ImplementationRepository::ServerInformationList>::out_arg_type arg_2 =
         TAO::Portable_Server::get_out_arg< ::ImplementationRepository::ServerInformationList, TAO::SArg_Traits< ::ImplementationRepository::ServerInformationList>::out_arg_type> (
           this->operation_details_,
           this->args_,
           2);
-
-
+        
+      
       retval =
         this->servant_->next_n (
           arg_1
           , arg_2
           ACE_ENV_ARG_PARAMETER);
-
+        
     }
-
+  
   private:
     POA_ImplementationRepository::ServerInformationIterator * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-
+  
 }
 
 
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ss.cpp:192
+// TAO_IDL - Generated from 
+// be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_ImplementationRepository::ServerInformationIterator::next_n_skel (
     TAO_ServerRequest & server_request,
@@ -629,26 +640,26 @@ void POA_ImplementationRepository::ServerInformationIterator::next_n_skel (
     ACE_ENV_ARG_DECL
   )
 {
-
-
+  
+  
 #if TAO_HAS_INTERCEPTORS == 1
-  static CORBA::TypeCode_ptr const * const exceptions = 0;
-  static CORBA::ULong const nexceptions = 0;
+  static ::CORBA::TypeCode_ptr const * const exceptions = 0;
+  static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-
+  
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::ULong>::in_arg_val _tao_how_many;
   TAO::SArg_Traits< ::ImplementationRepository::ServerInformationList>::out_arg_val _tao_servers;
-
+  
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_how_many,
       &_tao_servers
     };
-
+  
   static size_t const nargs = 3;
-
+  
   POA_ImplementationRepository::ServerInformationIterator * const impl =
     static_cast<POA_ImplementationRepository::ServerInformationIterator *> (servant);
 
@@ -656,7 +667,7 @@ void POA_ImplementationRepository::ServerInformationIterator::next_n_skel (
     impl,
     server_request.operation_details (),
     args);
-
+  
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -669,15 +680,15 @@ void POA_ImplementationRepository::ServerInformationIterator::next_n_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-
+  
 }
 namespace POA_ImplementationRepository
 {
-
-
+  
+  
   // TAO_IDL - Generated from
-  // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/upcall_command_ss.cpp:127
-
+  // be\be_visitor_operation/upcall_command_ss.cpp:127
+  
   class destroy_ServerInformationIterator
     : public TAO::Upcall_Command
   {
@@ -687,23 +698,23 @@ namespace POA_ImplementationRepository
       : servant_ (servant)
     {
     }
-
+    
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       this->servant_->destroy (
         ACE_ENV_SINGLE_ARG_PARAMETER);
-
+      
     }
-
+  
   private:
     POA_ImplementationRepository::ServerInformationIterator * const servant_;
   };
-
+  
 }
 
 
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ss.cpp:192
+// TAO_IDL - Generated from 
+// be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_ImplementationRepository::ServerInformationIterator::destroy_skel (
     TAO_ServerRequest & server_request,
@@ -712,28 +723,28 @@ void POA_ImplementationRepository::ServerInformationIterator::destroy_skel (
     ACE_ENV_ARG_DECL
   )
 {
-
-
+  
+  
 #if TAO_HAS_INTERCEPTORS == 1
-  static CORBA::TypeCode_ptr const * const exceptions = 0;
-  static CORBA::ULong const nexceptions = 0;
+  static ::CORBA::TypeCode_ptr const * const exceptions = 0;
+  static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-
+  
   TAO::SArg_Traits< void>::ret_val retval;
-
+  
   TAO::Argument * const args[] =
     {
       &retval
     };
-
+  
   static size_t const nargs = 1;
-
+  
   POA_ImplementationRepository::ServerInformationIterator * const impl =
     static_cast<POA_ImplementationRepository::ServerInformationIterator *> (servant);
 
   destroy_ServerInformationIterator command (
     impl);
-
+  
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -746,19 +757,19 @@ void POA_ImplementationRepository::ServerInformationIterator::destroy_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-
+  
 }
 
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_ss.cpp:169
+// TAO_IDL - Generated from 
+// be\be_visitor_interface/interface_ss.cpp:169
 
 namespace POA_ImplementationRepository
 {
-
-
+  
+  
   // TAO_IDL - Generated from
-  // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/upcall_command_ss.cpp:127
-
+  // be\be_visitor_operation/upcall_command_ss.cpp:127
+  
   class _is_a_ServerInformationIterator_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -772,68 +783,68 @@ namespace POA_ImplementationRepository
       , args_ (args)
     {
     }
-
+    
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-
+      
       TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
-
-
+        
+      
       retval =
         this->servant_-> _is_a (
           arg_1
           ACE_ENV_ARG_PARAMETER);
-
+        
     }
-
+  
   private:
     POA_ImplementationRepository::ServerInformationIterator * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-
+  
 }
 void POA_ImplementationRepository::ServerInformationIterator::_is_a_skel (
-    TAO_ServerRequest & server_request,
+    TAO_ServerRequest & server_request, 
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-
-
+  
+  
 #if TAO_HAS_INTERCEPTORS == 1
-  static CORBA::TypeCode_ptr const * const exceptions = 0;
-  static CORBA::ULong const nexceptions = 0;
+  static ::CORBA::TypeCode_ptr const * const exceptions = 0;
+  static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-
+  
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
-
+  
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_repository_id
     };
-
+  
   static size_t const nargs = 2;
-
+  
   POA_ImplementationRepository::ServerInformationIterator * const impl =
     static_cast<POA_ImplementationRepository::ServerInformationIterator *> (servant);
-
+  
   _is_a_ServerInformationIterator_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-
+  
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -846,16 +857,16 @@ void POA_ImplementationRepository::ServerInformationIterator::_is_a_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-
+  
 }
 
 namespace POA_ImplementationRepository
 {
-
-
+  
+  
   // TAO_IDL - Generated from
-  // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/upcall_command_ss.cpp:127
-
+  // be\be_visitor_operation/upcall_command_ss.cpp:127
+  
   class _non_existent_ServerInformationIterator_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -869,59 +880,59 @@ namespace POA_ImplementationRepository
       , args_ (args)
     {
     }
-
+    
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-
-
+      
+      
       retval =
         this->servant_-> _non_existent (
           ACE_ENV_SINGLE_ARG_PARAMETER);
-
+        
     }
-
+  
   private:
     POA_ImplementationRepository::ServerInformationIterator * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-
+  
 }
 void POA_ImplementationRepository::ServerInformationIterator::_non_existent_skel (
-    TAO_ServerRequest & server_request,
+    TAO_ServerRequest & server_request, 
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-
-
+  
+  
 #if TAO_HAS_INTERCEPTORS == 1
-  static CORBA::TypeCode_ptr const * const exceptions = 0;
-  static CORBA::ULong const nexceptions = 0;
+  static ::CORBA::TypeCode_ptr const * const exceptions = 0;
+  static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-
+  
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-
+  
   TAO::Argument * const args[] =
     {
       &retval
     };
-
+  
   static size_t const nargs = 1;
-
+  
   POA_ImplementationRepository::ServerInformationIterator * const impl =
     static_cast<POA_ImplementationRepository::ServerInformationIterator *> (servant);
-
+  
   _non_existent_ServerInformationIterator_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-
+  
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -934,18 +945,106 @@ void POA_ImplementationRepository::ServerInformationIterator::_non_existent_skel
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
+  
+}
 
+namespace POA_ImplementationRepository
+{
+  
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_operation/upcall_command_ss.cpp:127
+  
+  class _repository_id_ServerInformationIterator_Upcall_Command
+    : public TAO::Upcall_Command
+  {
+  public:
+    inline _repository_id_ServerInformationIterator_Upcall_Command (
+      POA_ImplementationRepository::ServerInformationIterator * servant,
+      TAO_Operation_Details const * operation_details,
+      TAO::Argument * const args[])
+      : servant_ (servant)
+      , operation_details_ (operation_details)
+      , args_ (args)
+    {
+    }
+    
+    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+    {
+      TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
+        TAO::Portable_Server::get_ret_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type> (
+          this->operation_details_,
+          this->args_);
+      
+      
+      retval =
+        this->servant_-> _repository_id (
+          ACE_ENV_SINGLE_ARG_PARAMETER);
+        
+    }
+  
+  private:
+    POA_ImplementationRepository::ServerInformationIterator * const servant_;
+    TAO_Operation_Details const * const operation_details_;
+    TAO::Argument * const * const args_;
+  };
+  
+}
+void POA_ImplementationRepository::ServerInformationIterator::_repository_id_skel (
+    TAO_ServerRequest & server_request, 
+    void * TAO_INTERCEPTOR (servant_upcall),
+    void * servant
+    ACE_ENV_ARG_DECL
+  )
+{
+  
+  
+#if TAO_HAS_INTERCEPTORS == 1
+  static ::CORBA::TypeCode_ptr const * const exceptions = 0;
+  static ::CORBA::ULong const nexceptions = 0;
+#endif /* TAO_HAS_INTERCEPTORS */
+  
+  TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
+  
+  TAO::Argument * const args[] =
+    {
+      &retval
+    };
+  
+  static size_t const nargs = 1;
+  
+  POA_ImplementationRepository::ServerInformationIterator * const impl =
+    static_cast<POA_ImplementationRepository::ServerInformationIterator *> (servant);
+  
+  _repository_id_ServerInformationIterator_Upcall_Command command (
+    impl,
+    server_request.operation_details (),
+    args);
+  
+  TAO::Upcall_Wrapper upcall_wrapper;
+  upcall_wrapper.upcall (server_request
+                         , args
+                         , nargs
+                         , command
+#if TAO_HAS_INTERCEPTORS == 1
+                         , servant_upcall
+                         , exceptions
+                         , nexceptions
+#endif  /* TAO_HAS_INTERCEPTORS == 1 */
+                         ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+  
 }
 
 
 
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_ss.cpp:393
+// TAO_IDL - Generated from 
+// be\be_visitor_interface/interface_ss.cpp:501
 
 
 
 void POA_ImplementationRepository::ServerInformationIterator::_interface_skel (
-    TAO_ServerRequest & server_request,
+    TAO_ServerRequest & server_request, 
     void * /* servant_upcall */,
     void * servant
     ACE_ENV_ARG_DECL
@@ -955,43 +1054,43 @@ void POA_ImplementationRepository::ServerInformationIterator::_interface_skel (
     ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
         TAO_ORB_Core::ifr_client_adapter_name ()
       );
-
+    
   if (_tao_adapter == 0)
     {
-      ACE_THROW (CORBA::INTF_REPOS (CORBA::OMGVMCID | 1,
-                                    CORBA::COMPLETED_NO));
+      ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
+                                        ::CORBA::COMPLETED_NO));
     }
-
+  
   POA_ImplementationRepository::ServerInformationIterator * const impl =
     static_cast<POA_ImplementationRepository::ServerInformationIterator *> (servant);
-  CORBA::InterfaceDef_ptr _tao_retval =
+  ::CORBA::InterfaceDef_ptr _tao_retval = 
     impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-
+  
   server_request.init_reply ();
   TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-
-  CORBA::Boolean const _tao_result =
+  
+  ::CORBA::Boolean const _tao_result =
     _tao_adapter->interfacedef_cdr_insert (
         _tao_out,
         _tao_retval
       );
-
+  
   _tao_adapter->dispose (_tao_retval);
-
+  
   if (_tao_result == 0)
     {
-      ACE_THROW (CORBA::MARSHAL ());
+      ACE_THROW ( ::CORBA::MARSHAL ());
     }
 }
 
 namespace POA_ImplementationRepository
 {
-
-
+  
+  
   // TAO_IDL - Generated from
-  // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/upcall_command_ss.cpp:127
-
+  // be\be_visitor_operation/upcall_command_ss.cpp:127
+  
   class _get_component_ServerInformationIterator_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -1005,59 +1104,59 @@ namespace POA_ImplementationRepository
       , args_ (args)
     {
     }
-
+    
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Object, TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-
-
+      
+      
       retval =
         this->servant_-> _get_component (
           ACE_ENV_SINGLE_ARG_PARAMETER);
-
+        
     }
-
+  
   private:
     POA_ImplementationRepository::ServerInformationIterator * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-
+  
 }
 void POA_ImplementationRepository::ServerInformationIterator::_component_skel (
-    TAO_ServerRequest & server_request,
+    TAO_ServerRequest & server_request, 
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-
-
+  
+  
 #if TAO_HAS_INTERCEPTORS == 1
-  static CORBA::TypeCode_ptr const * const exceptions = 0;
-  static CORBA::ULong const nexceptions = 0;
+  static ::CORBA::TypeCode_ptr const * const exceptions = 0;
+  static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-
+  
   TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-
+  
   TAO::Argument * const args[] =
     {
       &retval
     };
-
+  
   static size_t const nargs = 1;
-
+  
   POA_ImplementationRepository::ServerInformationIterator * const impl =
     static_cast<POA_ImplementationRepository::ServerInformationIterator *> (servant);
-
+  
   _get_component_ServerInformationIterator_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-
+  
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -1070,10 +1169,10 @@ void POA_ImplementationRepository::ServerInformationIterator::_component_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-
+  
 }
 
-CORBA::Boolean POA_ImplementationRepository::ServerInformationIterator::_is_a (
+::CORBA::Boolean POA_ImplementationRepository::ServerInformationIterator::_is_a (
     const char* value
     ACE_ENV_ARG_DECL_NOT_USED
   )
@@ -1097,7 +1196,7 @@ const char* POA_ImplementationRepository::ServerInformationIterator::_interface_
 }
 
 // TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_ss.cpp:754
+// be\be_visitor_interface/interface_ss.cpp:862
 
 void POA_ImplementationRepository::ServerInformationIterator::_dispatch (
     TAO_ServerRequest & req,
@@ -1112,29 +1211,29 @@ void POA_ImplementationRepository::ServerInformationIterator::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_ss.cpp:705
+// be\be_visitor_interface/interface_ss.cpp:813
 
 ImplementationRepository::ServerInformationIterator *
 POA_ImplementationRepository::ServerInformationIterator::_this (ACE_ENV_SINGLE_ARG_DECL)
 {
   TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   TAO_Stub_Auto_Ptr safe_stub (stub);
-  CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-
-  CORBA::Boolean _tao_opt_colloc =
+  ::CORBA::Object_ptr tmp = CORBA::Object::_nil ();
+  
+  ::CORBA::Boolean _tao_opt_colloc =
     stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-
+  
   ACE_NEW_RETURN (
       tmp,
-      CORBA::Object (stub, _tao_opt_colloc, this),
+      ::CORBA::Object (stub, _tao_opt_colloc, this),
       0
     );
-
-  CORBA::Object_var obj = tmp;
+  
+  ::CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
-
+  
   typedef ::ImplementationRepository::ServerInformationIterator STUB_SCOPED_NAME;
   return
     TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
@@ -1144,7 +1243,7 @@ POA_ImplementationRepository::ServerInformationIterator::_this (ACE_ENV_SINGLE_A
 }
 
 // TAO_IDL - Generated from
-// .\be\be_interface.cpp:1455
+// be\be_interface.cpp:1465
 
 class TAO_ImplementationRepository_Administration_Perfect_Hash_OpTable
   : public TAO_Perfect_Hash_OpTable
@@ -1157,9 +1256,9 @@ public:
 };
 
 /* 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,0 -a -o -t -p -K opname -L C++ -Z TAO_ImplementationRepository_Administration_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: c:\ACE\latest\ACE_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0 -a -o -t -p -K opname -L C++ -Z TAO_ImplementationRepository_Administration_Perfect_Hash_OpTable -N lookup  */
 unsigned int
-TAO_ImplementationRepository_Administration_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
+TAO_ImplementationRepository_Administration_Perfect_Hash_OpTable::hash (const char *str, size_t len)
 {
   static const unsigned char asso_values[] =
     {
@@ -1177,7 +1276,7 @@ TAO_ImplementationRepository_Administration_Perfect_Hash_OpTable::hash (const ch
      26, 26, 26, 26, 26, 26, 26, 26, 26,  0,
      26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
      26, 26, 26, 26, 26, 26, 26, 26, 26,  5,
-     26, 26,  0,  9,  0,  5, 26, 26, 26, 26,
+     26, 26,  5, 14,  0,  5, 26, 26, 26, 26,
      26, 26, 26, 26, 26, 26, 26, 10, 26,  0,
      26, 26, 26,  0, 26, 26, 26, 26, 26, 26,
      26, 26,  0,  4, 26, 26, 26, 26, 26, 26,
@@ -1201,7 +1300,7 @@ TAO_ImplementationRepository_Administration_Perfect_Hash_OpTable::hash (const ch
      26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
      26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
      26, 26, 26, 26, 26,  0, 26,  5, 26, 26,
-      0,  9,  0,  5, 26, 26, 26, 26, 10, 26,
+      5, 14,  0,  5, 26, 26, 26, 26, 10, 26,
       0, 26, 26, 26,  0,  0,  4, 26, 26, 26,
      26, 26, 26, 26, 26, 26, 26, 26,
 #endif /* ACE_MVS */
@@ -1210,27 +1309,25 @@ TAO_ImplementationRepository_Administration_Perfect_Hash_OpTable::hash (const ch
 }
 
 const TAO_operation_db_entry *
-TAO_ImplementationRepository_Administration_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len)
+TAO_ImplementationRepository_Administration_Perfect_Hash_OpTable::lookup (const char *str, size_t len)
 {
   enum
     {
-      TOTAL_KEYWORDS = 13,
+      TOTAL_KEYWORDS = 14,
       MIN_WORD_LENGTH = 4,
       MAX_WORD_LENGTH = 23,
-      MIN_HASH_VALUE = 4,
+      MIN_HASH_VALUE = 8,
       MAX_HASH_VALUE = 25,
-      HASH_VALUE_RANGE = 22,
+      HASH_VALUE_RANGE = 18,
       DUPLICATES = 0,
-      WORDLIST_SIZE = 17
+      WORDLIST_SIZE = 22
     };
 
   static const TAO_operation_db_entry  wordlist[] =
     {
-      {"",0,0},{"",0,0},{"",0,0},{"",0,0},
-      {"find", &POA_ImplementationRepository::Administration::find_skel, &POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::find},
-      {"",0,0},{"",0,0},{"",0,0},
+      {"",0,0},{"",0,0},{"",0,0},{"",0,0},{"",0,0},{"",0,0},{"",0,0},{"",0,0},
       {"shutdown", &POA_ImplementationRepository::Administration::shutdown_skel, &POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::shutdown},
-      {"",0,0},
+      {"find", &POA_ImplementationRepository::Administration::find_skel, &POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::find},
       {"_is_a", &POA_ImplementationRepository::Administration::_is_a_skel, 0},
       {"",0,0},{"",0,0},
       {"remove_server", &POA_ImplementationRepository::Administration::remove_server_skel, &POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::remove_server},
@@ -1239,12 +1336,12 @@ TAO_ImplementationRepository_Administration_Perfect_Hash_OpTable::lookup (const
       {"",0,0},
       {"_non_existent", &POA_ImplementationRepository::Administration::_non_existent_skel, 0},
       {"list", &POA_ImplementationRepository::Administration::list_skel, &POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::list},
-      {"_interface", &POA_ImplementationRepository::Administration::_interface_skel, 0},
+      {"_repository_id", &POA_ImplementationRepository::Administration::_repository_id_skel, 0},
       {"activate_server", &POA_ImplementationRepository::Administration::activate_server_skel, &POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::activate_server},
       {"",0,0},
       {"server_is_running", &POA_ImplementationRepository::Administration::server_is_running_skel, &POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::server_is_running},
       {"server_is_shutting_down", &POA_ImplementationRepository::Administration::server_is_shutting_down_skel, &POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::server_is_shutting_down},
-      {"",0,0},
+      {"_interface", &POA_ImplementationRepository::Administration::_interface_skel, 0},
       {"add_or_update_server", &POA_ImplementationRepository::Administration::add_or_update_server_skel, &POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::add_or_update_server},
     };
 
@@ -1269,7 +1366,7 @@ static TAO_ImplementationRepository_Administration_Perfect_Hash_OpTable tao_Impl
 //
 
 // TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_interface/strategized_proxy_broker_ss.cpp:40
+// be\be_visitor_interface/strategized_proxy_broker_ss.cpp:40
 
 // Factory function Implementation.
 POA_ImplementationRepository::_TAO_Administration_Strategized_Proxy_Broker *
@@ -1277,7 +1374,7 @@ POA_ImplementationRepository::_TAO_Administration_Strategized_Proxy_Broker::the_
 {
   static POA_ImplementationRepository::_TAO_Administration_Strategized_Proxy_Broker
   strategized_proxy_broker;
-
+  
   return &strategized_proxy_broker;
 }
 
@@ -1291,22 +1388,22 @@ POA_ImplementationRepository::_TAO_Administration_Strategized_Proxy_Broker::~_TA
 
 TAO::Collocation_Strategy
 POA_ImplementationRepository::_TAO_Administration_Strategized_Proxy_Broker::get_strategy (
-    CORBA::Object_ptr obj
+    ::CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL
   )
-  ACE_THROW_SPEC ((CORBA::SystemException))
+  ACE_THROW_SPEC (( ::CORBA::SystemException))
 {
   TAO::Collocation_Strategy strategy =
     TAO_ORB_Core::collocation_strategy (obj ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (TAO::TAO_CS_REMOTE_STRATEGY);
-
+  
   return strategy;
 }
 
 void
 POA_ImplementationRepository::_TAO_Administration_Strategized_Proxy_Broker::dispatch (
-    CORBA::Object_ptr obj,
-    CORBA::Object_out forward_obj,
+    ::CORBA::Object_ptr obj,
+    ::CORBA::Object_out forward_obj,
     TAO::Argument ** args,
     int num_args,
     const char * op,
@@ -1314,17 +1411,17 @@ POA_ImplementationRepository::_TAO_Administration_Strategized_Proxy_Broker::disp
     TAO::Collocation_Strategy strategy
     ACE_ENV_ARG_DECL
   )
-  ACE_THROW_SPEC ((CORBA::Exception))
+  ACE_THROW_SPEC (( ::CORBA::Exception))
 {
   TAO::Direct_Collocation_Upcall_Wrapper collocation_upcall_wrapper;
   collocation_upcall_wrapper.upcall (
-    obj,
-    forward_obj,
-    args,
-    num_args,
-    op,
-    op_len,
-    strategy
+    obj, 
+    forward_obj, 
+    args, 
+    num_args, 
+    op, 
+    op_len, 
+    strategy 
     ACE_ENV_ARG_PARAMETER);
 }
 
@@ -1333,10 +1430,10 @@ POA_ImplementationRepository::_TAO_Administration_Strategized_Proxy_Broker::disp
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_ss.cpp:813
+// be\be_visitor_interface/interface_ss.cpp:921
 
 TAO::Collocation_Proxy_Broker *
-ImplementationRepository__TAO_Administration_Proxy_Broker_Factory_function (CORBA::Object_ptr)
+ImplementationRepository__TAO_Administration_Proxy_Broker_Factory_function ( ::CORBA::Object_ptr)
 {
   return
     ::POA_ImplementationRepository::_TAO_Administration_Strategized_Proxy_Broker::the_TAO_Administration_Strategized_Proxy_Broker ();
@@ -1345,9 +1442,9 @@ ImplementationRepository__TAO_Administration_Proxy_Broker_Factory_function (CORB
 int
 ImplementationRepository__TAO_Administration_Proxy_Broker_Factory_Initializer (size_t)
 {
-  ImplementationRepository__TAO_Administration_Proxy_Broker_Factory_function_pointer =
+  ImplementationRepository__TAO_Administration_Proxy_Broker_Factory_function_pointer = 
     ImplementationRepository__TAO_Administration_Proxy_Broker_Factory_function;
-
+  
   return 0;
 }
 
@@ -1366,18 +1463,21 @@ ImplementationRepository__TAO_Administration_Proxy_Broker_Stub_Factory_Initializ
 POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::_TAO_Administration_Direct_Proxy_Impl (void)
 {}
 
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/direct_proxy_impl_ss.cpp:42
+POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::~_TAO_Administration_Direct_Proxy_Impl (void)
+{}
+
+// TAO_IDL - Generated from 
+// be\be_visitor_operation/direct_proxy_impl_ss.cpp:42
 
 void
 POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::activate_server (
     TAO_Abstract_ServantBase  *servant,
     TAO::Argument ** args,
-    int
+    int 
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
-    CORBA::SystemException,
+    ::CORBA::SystemException,
     ::ImplementationRepository::NotFound,
     ::ImplementationRepository::CannotActivate
   ))
@@ -1390,18 +1490,18 @@ POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::activate_se
       );
   ACE_CHECK;
 }
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/direct_proxy_impl_ss.cpp:42
+// TAO_IDL - Generated from 
+// be\be_visitor_operation/direct_proxy_impl_ss.cpp:42
 
 void
 POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::add_or_update_server (
     TAO_Abstract_ServantBase  *servant,
     TAO::Argument ** args,
-    int
+    int 
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
-    CORBA::SystemException,
+    ::CORBA::SystemException,
     ::ImplementationRepository::NotFound
   ))
 {
@@ -1414,18 +1514,18 @@ POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::add_or_upda
       );
   ACE_CHECK;
 }
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/direct_proxy_impl_ss.cpp:42
+// TAO_IDL - Generated from 
+// be\be_visitor_operation/direct_proxy_impl_ss.cpp:42
 
 void
 POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::remove_server (
     TAO_Abstract_ServantBase  *servant,
     TAO::Argument ** args,
-    int
+    int 
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
-    CORBA::SystemException,
+    ::CORBA::SystemException,
     ::ImplementationRepository::NotFound
   ))
 {
@@ -1437,18 +1537,18 @@ POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::remove_serv
       );
   ACE_CHECK;
 }
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/direct_proxy_impl_ss.cpp:42
+// TAO_IDL - Generated from 
+// be\be_visitor_operation/direct_proxy_impl_ss.cpp:42
 
 void
 POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::shutdown_server (
     TAO_Abstract_ServantBase  *servant,
     TAO::Argument ** args,
-    int
+    int 
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
-    CORBA::SystemException,
+    ::CORBA::SystemException,
     ::ImplementationRepository::NotFound
   ))
 {
@@ -1460,18 +1560,18 @@ POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::shutdown_se
       );
   ACE_CHECK;
 }
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/direct_proxy_impl_ss.cpp:42
+// TAO_IDL - Generated from 
+// be\be_visitor_operation/direct_proxy_impl_ss.cpp:42
 
 void
 POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::server_is_running (
     TAO_Abstract_ServantBase  *servant,
     TAO::Argument ** args,
-    int
+    int 
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
-    CORBA::SystemException,
+    ::CORBA::SystemException,
     ::ImplementationRepository::NotFound
   ))
 {
@@ -1485,18 +1585,18 @@ POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::server_is_r
       );
   ACE_CHECK;
 }
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/direct_proxy_impl_ss.cpp:42
+// TAO_IDL - Generated from 
+// be\be_visitor_operation/direct_proxy_impl_ss.cpp:42
 
 void
 POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::server_is_shutting_down (
     TAO_Abstract_ServantBase  *servant,
     TAO::Argument ** args,
-    int
+    int 
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
-    CORBA::SystemException,
+    ::CORBA::SystemException,
     ::ImplementationRepository::NotFound
   ))
 {
@@ -1508,18 +1608,18 @@ POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::server_is_s
       );
   ACE_CHECK;
 }
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/direct_proxy_impl_ss.cpp:42
+// TAO_IDL - Generated from 
+// be\be_visitor_operation/direct_proxy_impl_ss.cpp:42
 
 void
 POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::find (
     TAO_Abstract_ServantBase  *servant,
     TAO::Argument ** args,
-    int
+    int 
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
-    CORBA::SystemException
+    ::CORBA::SystemException
   ))
 {
   dynamic_cast<POA_ImplementationRepository::Administration_ptr>
@@ -1531,18 +1631,18 @@ POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::find (
       );
   ACE_CHECK;
 }
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/direct_proxy_impl_ss.cpp:42
+// TAO_IDL - Generated from 
+// be\be_visitor_operation/direct_proxy_impl_ss.cpp:42
 
 void
 POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::list (
     TAO_Abstract_ServantBase  *servant,
     TAO::Argument ** args,
-    int
+    int 
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
-    CORBA::SystemException
+    ::CORBA::SystemException
   ))
 {
   dynamic_cast<POA_ImplementationRepository::Administration_ptr>
@@ -1555,18 +1655,18 @@ POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::list (
       );
   ACE_CHECK;
 }
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/direct_proxy_impl_ss.cpp:42
+// TAO_IDL - Generated from 
+// be\be_visitor_operation/direct_proxy_impl_ss.cpp:42
 
 void
 POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::shutdown (
     TAO_Abstract_ServantBase  *servant,
     TAO::Argument ** args,
-    int
+    int 
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
-    CORBA::SystemException
+    ::CORBA::SystemException
   ))
 {
   dynamic_cast<POA_ImplementationRepository::Administration_ptr>
@@ -1584,8 +1684,8 @@ POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::shutdown (
 //           End Direct Proxy Implementation
 ///////////////////////////////////////////////////////////////////////
 
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_ss.cpp:103
+// TAO_IDL - Generated from 
+// be\be_visitor_interface/interface_ss.cpp:103
 
 POA_ImplementationRepository::Administration::Administration (void)
   : TAO_ServantBase ()
@@ -1604,11 +1704,11 @@ POA_ImplementationRepository::Administration::~Administration (void)
 }
 namespace POA_ImplementationRepository
 {
-
-
+  
+  
   // TAO_IDL - Generated from
-  // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/upcall_command_ss.cpp:127
-
+  // be\be_visitor_operation/upcall_command_ss.cpp:127
+  
   class activate_server_Administration
     : public TAO::Upcall_Command
   {
@@ -1622,7 +1722,7 @@ namespace POA_ImplementationRepository
       , args_ (args)
     {
     }
-
+    
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
@@ -1630,24 +1730,24 @@ namespace POA_ImplementationRepository
           this->operation_details_,
           this->args_,
           1);
-
+        
       this->servant_->activate_server (
         arg_1
         ACE_ENV_ARG_PARAMETER);
-
+      
     }
-
+  
   private:
     POA_ImplementationRepository::Administration * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-
+  
 }
 
 
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ss.cpp:192
+// TAO_IDL - Generated from 
+// be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_ImplementationRepository::Administration::activate_server_skel (
     TAO_ServerRequest & server_request,
@@ -1656,28 +1756,28 @@ void POA_ImplementationRepository::Administration::activate_server_skel (
     ACE_ENV_ARG_DECL
   )
 {
-
-
+  
+  
 #if TAO_HAS_INTERCEPTORS == 1
-  static CORBA::TypeCode_ptr const exceptions[] =
+  static ::CORBA::TypeCode_ptr const exceptions[] = 
     {
       ImplementationRepository::_tc_NotFound,
       ImplementationRepository::_tc_CannotActivate
     };
-  static CORBA::ULong const nexceptions = 2;
+  static ::CORBA::ULong const nexceptions = 2;
 #endif /* TAO_HAS_INTERCEPTORS */
-
+  
   TAO::SArg_Traits< void>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_server;
-
+  
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_server
     };
-
+  
   static size_t const nargs = 2;
-
+  
   POA_ImplementationRepository::Administration * const impl =
     static_cast<POA_ImplementationRepository::Administration *> (servant);
 
@@ -1685,7 +1785,7 @@ void POA_ImplementationRepository::Administration::activate_server_skel (
     impl,
     server_request.operation_details (),
     args);
-
+  
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -1698,15 +1798,15 @@ void POA_ImplementationRepository::Administration::activate_server_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-
+  
 }
 namespace POA_ImplementationRepository
 {
-
-
+  
+  
   // TAO_IDL - Generated from
-  // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/upcall_command_ss.cpp:127
-
+  // be\be_visitor_operation/upcall_command_ss.cpp:127
+  
   class add_or_update_server_Administration
     : public TAO::Upcall_Command
   {
@@ -1720,7 +1820,7 @@ namespace POA_ImplementationRepository
       , args_ (args)
     {
     }
-
+    
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
@@ -1728,31 +1828,31 @@ namespace POA_ImplementationRepository
           this->operation_details_,
           this->args_,
           1);
-
+        
       TAO::SArg_Traits< ::ImplementationRepository::StartupOptions>::in_arg_type arg_2 =
         TAO::Portable_Server::get_in_arg< ::ImplementationRepository::StartupOptions, TAO::SArg_Traits< ::ImplementationRepository::StartupOptions>::in_arg_type> (
           this->operation_details_,
           this->args_,
           2);
-
+        
       this->servant_->add_or_update_server (
         arg_1
         , arg_2
         ACE_ENV_ARG_PARAMETER);
-
+      
     }
-
+  
   private:
     POA_ImplementationRepository::Administration * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-
+  
 }
 
 
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ss.cpp:192
+// TAO_IDL - Generated from 
+// be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_ImplementationRepository::Administration::add_or_update_server_skel (
     TAO_ServerRequest & server_request,
@@ -1761,29 +1861,29 @@ void POA_ImplementationRepository::Administration::add_or_update_server_skel (
     ACE_ENV_ARG_DECL
   )
 {
-
-
+  
+  
 #if TAO_HAS_INTERCEPTORS == 1
-  static CORBA::TypeCode_ptr const exceptions[] =
+  static ::CORBA::TypeCode_ptr const exceptions[] = 
     {
       ImplementationRepository::_tc_NotFound
     };
-  static CORBA::ULong const nexceptions = 1;
+  static ::CORBA::ULong const nexceptions = 1;
 #endif /* TAO_HAS_INTERCEPTORS */
-
+  
   TAO::SArg_Traits< void>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_server;
   TAO::SArg_Traits< ::ImplementationRepository::StartupOptions>::in_arg_val _tao_options;
-
+  
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_server,
       &_tao_options
     };
-
+  
   static size_t const nargs = 3;
-
+  
   POA_ImplementationRepository::Administration * const impl =
     static_cast<POA_ImplementationRepository::Administration *> (servant);
 
@@ -1791,7 +1891,7 @@ void POA_ImplementationRepository::Administration::add_or_update_server_skel (
     impl,
     server_request.operation_details (),
     args);
-
+  
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -1804,15 +1904,15 @@ void POA_ImplementationRepository::Administration::add_or_update_server_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-
+  
 }
 namespace POA_ImplementationRepository
 {
-
-
+  
+  
   // TAO_IDL - Generated from
-  // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/upcall_command_ss.cpp:127
-
+  // be\be_visitor_operation/upcall_command_ss.cpp:127
+  
   class remove_server_Administration
     : public TAO::Upcall_Command
   {
@@ -1826,7 +1926,7 @@ namespace POA_ImplementationRepository
       , args_ (args)
     {
     }
-
+    
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
@@ -1834,24 +1934,24 @@ namespace POA_ImplementationRepository
           this->operation_details_,
           this->args_,
           1);
-
+        
       this->servant_->remove_server (
         arg_1
         ACE_ENV_ARG_PARAMETER);
-
+      
     }
-
+  
   private:
     POA_ImplementationRepository::Administration * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-
+  
 }
 
 
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ss.cpp:192
+// TAO_IDL - Generated from 
+// be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_ImplementationRepository::Administration::remove_server_skel (
     TAO_ServerRequest & server_request,
@@ -1860,27 +1960,27 @@ void POA_ImplementationRepository::Administration::remove_server_skel (
     ACE_ENV_ARG_DECL
   )
 {
-
-
+  
+  
 #if TAO_HAS_INTERCEPTORS == 1
-  static CORBA::TypeCode_ptr const exceptions[] =
+  static ::CORBA::TypeCode_ptr const exceptions[] = 
     {
       ImplementationRepository::_tc_NotFound
     };
-  static CORBA::ULong const nexceptions = 1;
+  static ::CORBA::ULong const nexceptions = 1;
 #endif /* TAO_HAS_INTERCEPTORS */
-
+  
   TAO::SArg_Traits< void>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_server;
-
+  
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_server
     };
-
+  
   static size_t const nargs = 2;
-
+  
   POA_ImplementationRepository::Administration * const impl =
     static_cast<POA_ImplementationRepository::Administration *> (servant);
 
@@ -1888,7 +1988,7 @@ void POA_ImplementationRepository::Administration::remove_server_skel (
     impl,
     server_request.operation_details (),
     args);
-
+  
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -1901,15 +2001,15 @@ void POA_ImplementationRepository::Administration::remove_server_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-
+  
 }
 namespace POA_ImplementationRepository
 {
-
-
+  
+  
   // TAO_IDL - Generated from
-  // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/upcall_command_ss.cpp:127
-
+  // be\be_visitor_operation/upcall_command_ss.cpp:127
+  
   class shutdown_server_Administration
     : public TAO::Upcall_Command
   {
@@ -1923,7 +2023,7 @@ namespace POA_ImplementationRepository
       , args_ (args)
     {
     }
-
+    
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
@@ -1931,24 +2031,24 @@ namespace POA_ImplementationRepository
           this->operation_details_,
           this->args_,
           1);
-
+        
       this->servant_->shutdown_server (
         arg_1
         ACE_ENV_ARG_PARAMETER);
-
+      
     }
-
+  
   private:
     POA_ImplementationRepository::Administration * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-
+  
 }
 
 
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ss.cpp:192
+// TAO_IDL - Generated from 
+// be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_ImplementationRepository::Administration::shutdown_server_skel (
     TAO_ServerRequest & server_request,
@@ -1957,27 +2057,27 @@ void POA_ImplementationRepository::Administration::shutdown_server_skel (
     ACE_ENV_ARG_DECL
   )
 {
-
-
+  
+  
 #if TAO_HAS_INTERCEPTORS == 1
-  static CORBA::TypeCode_ptr const exceptions[] =
+  static ::CORBA::TypeCode_ptr const exceptions[] = 
     {
       ImplementationRepository::_tc_NotFound
     };
-  static CORBA::ULong const nexceptions = 1;
+  static ::CORBA::ULong const nexceptions = 1;
 #endif /* TAO_HAS_INTERCEPTORS */
-
+  
   TAO::SArg_Traits< void>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_server;
-
+  
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_server
     };
-
+  
   static size_t const nargs = 2;
-
+  
   POA_ImplementationRepository::Administration * const impl =
     static_cast<POA_ImplementationRepository::Administration *> (servant);
 
@@ -1985,7 +2085,7 @@ void POA_ImplementationRepository::Administration::shutdown_server_skel (
     impl,
     server_request.operation_details (),
     args);
-
+  
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -1998,15 +2098,15 @@ void POA_ImplementationRepository::Administration::shutdown_server_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-
+  
 }
 namespace POA_ImplementationRepository
 {
-
-
+  
+  
   // TAO_IDL - Generated from
-  // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/upcall_command_ss.cpp:127
-
+  // be\be_visitor_operation/upcall_command_ss.cpp:127
+  
   class server_is_running_Administration
     : public TAO::Upcall_Command
   {
@@ -2020,7 +2120,7 @@ namespace POA_ImplementationRepository
       , args_ (args)
     {
     }
-
+    
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
@@ -2028,38 +2128,38 @@ namespace POA_ImplementationRepository
           this->operation_details_,
           this->args_,
           1);
-
+        
       TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_2 =
         TAO::Portable_Server::get_in_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type> (
           this->operation_details_,
           this->args_,
           2);
-
+        
       TAO::SArg_Traits< ::ImplementationRepository::ServerObject>::in_arg_type arg_3 =
         TAO::Portable_Server::get_in_arg< ::ImplementationRepository::ServerObject, TAO::SArg_Traits< ::ImplementationRepository::ServerObject>::in_arg_type> (
           this->operation_details_,
           this->args_,
           3);
-
+        
       this->servant_->server_is_running (
         arg_1
         , arg_2
         , arg_3
         ACE_ENV_ARG_PARAMETER);
-
+      
     }
-
+  
   private:
     POA_ImplementationRepository::Administration * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-
+  
 }
 
 
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ss.cpp:192
+// TAO_IDL - Generated from 
+// be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_ImplementationRepository::Administration::server_is_running_skel (
     TAO_ServerRequest & server_request,
@@ -2068,21 +2168,21 @@ void POA_ImplementationRepository::Administration::server_is_running_skel (
     ACE_ENV_ARG_DECL
   )
 {
-
-
+  
+  
 #if TAO_HAS_INTERCEPTORS == 1
-  static CORBA::TypeCode_ptr const exceptions[] =
+  static ::CORBA::TypeCode_ptr const exceptions[] = 
     {
       ImplementationRepository::_tc_NotFound
     };
-  static CORBA::ULong const nexceptions = 1;
+  static ::CORBA::ULong const nexceptions = 1;
 #endif /* TAO_HAS_INTERCEPTORS */
-
+  
   TAO::SArg_Traits< void>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_server;
   TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_partial_ior;
   TAO::SArg_Traits< ::ImplementationRepository::ServerObject>::in_arg_val _tao_server_object;
-
+  
   TAO::Argument * const args[] =
     {
       &retval,
@@ -2090,9 +2190,9 @@ void POA_ImplementationRepository::Administration::server_is_running_skel (
       &_tao_partial_ior,
       &_tao_server_object
     };
-
+  
   static size_t const nargs = 4;
-
+  
   POA_ImplementationRepository::Administration * const impl =
     static_cast<POA_ImplementationRepository::Administration *> (servant);
 
@@ -2100,7 +2200,7 @@ void POA_ImplementationRepository::Administration::server_is_running_skel (
     impl,
     server_request.operation_details (),
     args);
-
+  
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -2113,15 +2213,15 @@ void POA_ImplementationRepository::Administration::server_is_running_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-
+  
 }
 namespace POA_ImplementationRepository
 {
-
-
+  
+  
   // TAO_IDL - Generated from
-  // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/upcall_command_ss.cpp:127
-
+  // be\be_visitor_operation/upcall_command_ss.cpp:127
+  
   class server_is_shutting_down_Administration
     : public TAO::Upcall_Command
   {
@@ -2135,7 +2235,7 @@ namespace POA_ImplementationRepository
       , args_ (args)
     {
     }
-
+    
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
@@ -2143,24 +2243,24 @@ namespace POA_ImplementationRepository
           this->operation_details_,
           this->args_,
           1);
-
+        
       this->servant_->server_is_shutting_down (
         arg_1
         ACE_ENV_ARG_PARAMETER);
-
+      
     }
-
+  
   private:
     POA_ImplementationRepository::Administration * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-
+  
 }
 
 
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ss.cpp:192
+// TAO_IDL - Generated from 
+// be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_ImplementationRepository::Administration::server_is_shutting_down_skel (
     TAO_ServerRequest & server_request,
@@ -2169,27 +2269,27 @@ void POA_ImplementationRepository::Administration::server_is_shutting_down_skel
     ACE_ENV_ARG_DECL
   )
 {
-
-
+  
+  
 #if TAO_HAS_INTERCEPTORS == 1
-  static CORBA::TypeCode_ptr const exceptions[] =
+  static ::CORBA::TypeCode_ptr const exceptions[] = 
     {
       ImplementationRepository::_tc_NotFound
     };
-  static CORBA::ULong const nexceptions = 1;
+  static ::CORBA::ULong const nexceptions = 1;
 #endif /* TAO_HAS_INTERCEPTORS */
-
+  
   TAO::SArg_Traits< void>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_server;
-
+  
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_server
     };
-
+  
   static size_t const nargs = 2;
-
+  
   POA_ImplementationRepository::Administration * const impl =
     static_cast<POA_ImplementationRepository::Administration *> (servant);
 
@@ -2197,7 +2297,7 @@ void POA_ImplementationRepository::Administration::server_is_shutting_down_skel
     impl,
     server_request.operation_details (),
     args);
-
+  
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -2210,15 +2310,15 @@ void POA_ImplementationRepository::Administration::server_is_shutting_down_skel
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-
+  
 }
 namespace POA_ImplementationRepository
 {
-
-
+  
+  
   // TAO_IDL - Generated from
-  // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/upcall_command_ss.cpp:127
-
+  // be\be_visitor_operation/upcall_command_ss.cpp:127
+  
   class find_Administration
     : public TAO::Upcall_Command
   {
@@ -2232,7 +2332,7 @@ namespace POA_ImplementationRepository
       , args_ (args)
     {
     }
-
+    
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
@@ -2240,31 +2340,31 @@ namespace POA_ImplementationRepository
           this->operation_details_,
           this->args_,
           1);
-
+        
       TAO::SArg_Traits< ::ImplementationRepository::ServerInformation>::out_arg_type arg_2 =
         TAO::Portable_Server::get_out_arg< ::ImplementationRepository::ServerInformation, TAO::SArg_Traits< ::ImplementationRepository::ServerInformation>::out_arg_type> (
           this->operation_details_,
           this->args_,
           2);
-
+        
       this->servant_->find (
         arg_1
         , arg_2
         ACE_ENV_ARG_PARAMETER);
-
+      
     }
-
+  
   private:
     POA_ImplementationRepository::Administration * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-
+  
 }
 
 
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ss.cpp:192
+// TAO_IDL - Generated from 
+// be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_ImplementationRepository::Administration::find_skel (
     TAO_ServerRequest & server_request,
@@ -2273,26 +2373,26 @@ void POA_ImplementationRepository::Administration::find_skel (
     ACE_ENV_ARG_DECL
   )
 {
-
-
+  
+  
 #if TAO_HAS_INTERCEPTORS == 1
-  static CORBA::TypeCode_ptr const * const exceptions = 0;
-  static CORBA::ULong const nexceptions = 0;
+  static ::CORBA::TypeCode_ptr const * const exceptions = 0;
+  static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-
+  
   TAO::SArg_Traits< void>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_server;
   TAO::SArg_Traits< ::ImplementationRepository::ServerInformation>::out_arg_val _tao_info;
-
+  
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_server,
       &_tao_info
     };
-
+  
   static size_t const nargs = 3;
-
+  
   POA_ImplementationRepository::Administration * const impl =
     static_cast<POA_ImplementationRepository::Administration *> (servant);
 
@@ -2300,7 +2400,7 @@ void POA_ImplementationRepository::Administration::find_skel (
     impl,
     server_request.operation_details (),
     args);
-
+  
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -2313,15 +2413,15 @@ void POA_ImplementationRepository::Administration::find_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-
+  
 }
 namespace POA_ImplementationRepository
 {
-
-
+  
+  
   // TAO_IDL - Generated from
-  // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/upcall_command_ss.cpp:127
-
+  // be\be_visitor_operation/upcall_command_ss.cpp:127
+  
   class list_Administration
     : public TAO::Upcall_Command
   {
@@ -2335,7 +2435,7 @@ namespace POA_ImplementationRepository
       , args_ (args)
     {
     }
-
+    
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::ULong>::in_arg_type arg_1 =
@@ -2343,38 +2443,38 @@ namespace POA_ImplementationRepository
           this->operation_details_,
           this->args_,
           1);
-
+        
       TAO::SArg_Traits< ::ImplementationRepository::ServerInformationList>::out_arg_type arg_2 =
         TAO::Portable_Server::get_out_arg< ::ImplementationRepository::ServerInformationList, TAO::SArg_Traits< ::ImplementationRepository::ServerInformationList>::out_arg_type> (
           this->operation_details_,
           this->args_,
           2);
-
+        
       TAO::SArg_Traits< ::ImplementationRepository::ServerInformationIterator>::out_arg_type arg_3 =
         TAO::Portable_Server::get_out_arg< ::ImplementationRepository::ServerInformationIterator, TAO::SArg_Traits< ::ImplementationRepository::ServerInformationIterator>::out_arg_type> (
           this->operation_details_,
           this->args_,
           3);
-
+        
       this->servant_->list (
         arg_1
         , arg_2
         , arg_3
         ACE_ENV_ARG_PARAMETER);
-
+      
     }
-
+  
   private:
     POA_ImplementationRepository::Administration * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-
+  
 }
 
 
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ss.cpp:192
+// TAO_IDL - Generated from 
+// be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_ImplementationRepository::Administration::list_skel (
     TAO_ServerRequest & server_request,
@@ -2383,18 +2483,18 @@ void POA_ImplementationRepository::Administration::list_skel (
     ACE_ENV_ARG_DECL
   )
 {
-
-
+  
+  
 #if TAO_HAS_INTERCEPTORS == 1
-  static CORBA::TypeCode_ptr const * const exceptions = 0;
-  static CORBA::ULong const nexceptions = 0;
+  static ::CORBA::TypeCode_ptr const * const exceptions = 0;
+  static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-
+  
   TAO::SArg_Traits< void>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::ULong>::in_arg_val _tao_how_many;
   TAO::SArg_Traits< ::ImplementationRepository::ServerInformationList>::out_arg_val _tao_server_list;
   TAO::SArg_Traits< ::ImplementationRepository::ServerInformationIterator>::out_arg_val _tao_server_iterator;
-
+  
   TAO::Argument * const args[] =
     {
       &retval,
@@ -2402,9 +2502,9 @@ void POA_ImplementationRepository::Administration::list_skel (
       &_tao_server_list,
       &_tao_server_iterator
     };
-
+  
   static size_t const nargs = 4;
-
+  
   POA_ImplementationRepository::Administration * const impl =
     static_cast<POA_ImplementationRepository::Administration *> (servant);
 
@@ -2412,7 +2512,7 @@ void POA_ImplementationRepository::Administration::list_skel (
     impl,
     server_request.operation_details (),
     args);
-
+  
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -2425,15 +2525,15 @@ void POA_ImplementationRepository::Administration::list_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-
+  
 }
 namespace POA_ImplementationRepository
 {
-
-
+  
+  
   // TAO_IDL - Generated from
-  // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/upcall_command_ss.cpp:127
-
+  // be\be_visitor_operation/upcall_command_ss.cpp:127
+  
   class shutdown_Administration
     : public TAO::Upcall_Command
   {
@@ -2447,7 +2547,7 @@ namespace POA_ImplementationRepository
       , args_ (args)
     {
     }
-
+    
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_type arg_1 =
@@ -2455,31 +2555,31 @@ namespace POA_ImplementationRepository
           this->operation_details_,
           this->args_,
           1);
-
+        
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_type arg_2 =
         TAO::Portable_Server::get_in_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_type> (
           this->operation_details_,
           this->args_,
           2);
-
+        
       this->servant_->shutdown (
         arg_1
         , arg_2
         ACE_ENV_ARG_PARAMETER);
-
+      
     }
-
+  
   private:
     POA_ImplementationRepository::Administration * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-
+  
 }
 
 
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ss.cpp:192
+// TAO_IDL - Generated from 
+// be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_ImplementationRepository::Administration::shutdown_skel (
     TAO_ServerRequest & server_request,
@@ -2488,26 +2588,26 @@ void POA_ImplementationRepository::Administration::shutdown_skel (
     ACE_ENV_ARG_DECL
   )
 {
-
-
+  
+  
 #if TAO_HAS_INTERCEPTORS == 1
-  static CORBA::TypeCode_ptr const * const exceptions = 0;
-  static CORBA::ULong const nexceptions = 0;
+  static ::CORBA::TypeCode_ptr const * const exceptions = 0;
+  static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-
+  
   TAO::SArg_Traits< void>::ret_val retval;
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val _tao_activators;
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val _tao_servers;
-
+  
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_activators,
       &_tao_servers
     };
-
+  
   static size_t const nargs = 3;
-
+  
   POA_ImplementationRepository::Administration * const impl =
     static_cast<POA_ImplementationRepository::Administration *> (servant);
 
@@ -2515,7 +2615,7 @@ void POA_ImplementationRepository::Administration::shutdown_skel (
     impl,
     server_request.operation_details (),
     args);
-
+  
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -2528,19 +2628,19 @@ void POA_ImplementationRepository::Administration::shutdown_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-
+  
 }
 
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_ss.cpp:169
+// TAO_IDL - Generated from 
+// be\be_visitor_interface/interface_ss.cpp:169
 
 namespace POA_ImplementationRepository
 {
-
-
+  
+  
   // TAO_IDL - Generated from
-  // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/upcall_command_ss.cpp:127
-
+  // be\be_visitor_operation/upcall_command_ss.cpp:127
+  
   class _is_a_Administration_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -2554,68 +2654,68 @@ namespace POA_ImplementationRepository
       , args_ (args)
     {
     }
-
+    
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-
+      
       TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
-
-
+        
+      
       retval =
         this->servant_-> _is_a (
           arg_1
           ACE_ENV_ARG_PARAMETER);
-
+        
     }
-
+  
   private:
     POA_ImplementationRepository::Administration * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-
+  
 }
 void POA_ImplementationRepository::Administration::_is_a_skel (
-    TAO_ServerRequest & server_request,
+    TAO_ServerRequest & server_request, 
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-
-
+  
+  
 #if TAO_HAS_INTERCEPTORS == 1
-  static CORBA::TypeCode_ptr const * const exceptions = 0;
-  static CORBA::ULong const nexceptions = 0;
+  static ::CORBA::TypeCode_ptr const * const exceptions = 0;
+  static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-
+  
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
-
+  
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_repository_id
     };
-
+  
   static size_t const nargs = 2;
-
+  
   POA_ImplementationRepository::Administration * const impl =
     static_cast<POA_ImplementationRepository::Administration *> (servant);
-
+  
   _is_a_Administration_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-
+  
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -2628,16 +2728,16 @@ void POA_ImplementationRepository::Administration::_is_a_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-
+  
 }
 
 namespace POA_ImplementationRepository
 {
-
-
+  
+  
   // TAO_IDL - Generated from
-  // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/upcall_command_ss.cpp:127
-
+  // be\be_visitor_operation/upcall_command_ss.cpp:127
+  
   class _non_existent_Administration_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -2651,59 +2751,59 @@ namespace POA_ImplementationRepository
       , args_ (args)
     {
     }
-
+    
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-
-
+      
+      
       retval =
         this->servant_-> _non_existent (
           ACE_ENV_SINGLE_ARG_PARAMETER);
-
+        
     }
-
+  
   private:
     POA_ImplementationRepository::Administration * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-
+  
 }
 void POA_ImplementationRepository::Administration::_non_existent_skel (
-    TAO_ServerRequest & server_request,
+    TAO_ServerRequest & server_request, 
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-
-
+  
+  
 #if TAO_HAS_INTERCEPTORS == 1
-  static CORBA::TypeCode_ptr const * const exceptions = 0;
-  static CORBA::ULong const nexceptions = 0;
+  static ::CORBA::TypeCode_ptr const * const exceptions = 0;
+  static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-
+  
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-
+  
   TAO::Argument * const args[] =
     {
       &retval
     };
-
+  
   static size_t const nargs = 1;
-
+  
   POA_ImplementationRepository::Administration * const impl =
     static_cast<POA_ImplementationRepository::Administration *> (servant);
-
+  
   _non_existent_Administration_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-
+  
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -2716,18 +2816,106 @@ void POA_ImplementationRepository::Administration::_non_existent_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
+  
+}
 
+namespace POA_ImplementationRepository
+{
+  
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_operation/upcall_command_ss.cpp:127
+  
+  class _repository_id_Administration_Upcall_Command
+    : public TAO::Upcall_Command
+  {
+  public:
+    inline _repository_id_Administration_Upcall_Command (
+      POA_ImplementationRepository::Administration * servant,
+      TAO_Operation_Details const * operation_details,
+      TAO::Argument * const args[])
+      : servant_ (servant)
+      , operation_details_ (operation_details)
+      , args_ (args)
+    {
+    }
+    
+    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+    {
+      TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
+        TAO::Portable_Server::get_ret_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type> (
+          this->operation_details_,
+          this->args_);
+      
+      
+      retval =
+        this->servant_-> _repository_id (
+          ACE_ENV_SINGLE_ARG_PARAMETER);
+        
+    }
+  
+  private:
+    POA_ImplementationRepository::Administration * const servant_;
+    TAO_Operation_Details const * const operation_details_;
+    TAO::Argument * const * const args_;
+  };
+  
+}
+void POA_ImplementationRepository::Administration::_repository_id_skel (
+    TAO_ServerRequest & server_request, 
+    void * TAO_INTERCEPTOR (servant_upcall),
+    void * servant
+    ACE_ENV_ARG_DECL
+  )
+{
+  
+  
+#if TAO_HAS_INTERCEPTORS == 1
+  static ::CORBA::TypeCode_ptr const * const exceptions = 0;
+  static ::CORBA::ULong const nexceptions = 0;
+#endif /* TAO_HAS_INTERCEPTORS */
+  
+  TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
+  
+  TAO::Argument * const args[] =
+    {
+      &retval
+    };
+  
+  static size_t const nargs = 1;
+  
+  POA_ImplementationRepository::Administration * const impl =
+    static_cast<POA_ImplementationRepository::Administration *> (servant);
+  
+  _repository_id_Administration_Upcall_Command command (
+    impl,
+    server_request.operation_details (),
+    args);
+  
+  TAO::Upcall_Wrapper upcall_wrapper;
+  upcall_wrapper.upcall (server_request
+                         , args
+                         , nargs
+                         , command
+#if TAO_HAS_INTERCEPTORS == 1
+                         , servant_upcall
+                         , exceptions
+                         , nexceptions
+#endif  /* TAO_HAS_INTERCEPTORS == 1 */
+                         ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+  
 }
 
 
 
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_ss.cpp:393
+// TAO_IDL - Generated from 
+// be\be_visitor_interface/interface_ss.cpp:501
 
 
 
 void POA_ImplementationRepository::Administration::_interface_skel (
-    TAO_ServerRequest & server_request,
+    TAO_ServerRequest & server_request, 
     void * /* servant_upcall */,
     void * servant
     ACE_ENV_ARG_DECL
@@ -2737,43 +2925,43 @@ void POA_ImplementationRepository::Administration::_interface_skel (
     ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
         TAO_ORB_Core::ifr_client_adapter_name ()
       );
-
+    
   if (_tao_adapter == 0)
     {
-      ACE_THROW (CORBA::INTF_REPOS (CORBA::OMGVMCID | 1,
-                                    CORBA::COMPLETED_NO));
+      ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
+                                        ::CORBA::COMPLETED_NO));
     }
-
+  
   POA_ImplementationRepository::Administration * const impl =
     static_cast<POA_ImplementationRepository::Administration *> (servant);
-  CORBA::InterfaceDef_ptr _tao_retval =
+  ::CORBA::InterfaceDef_ptr _tao_retval = 
     impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-
+  
   server_request.init_reply ();
   TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-
-  CORBA::Boolean const _tao_result =
+  
+  ::CORBA::Boolean const _tao_result =
     _tao_adapter->interfacedef_cdr_insert (
         _tao_out,
         _tao_retval
       );
-
+  
   _tao_adapter->dispose (_tao_retval);
-
+  
   if (_tao_result == 0)
     {
-      ACE_THROW (CORBA::MARSHAL ());
+      ACE_THROW ( ::CORBA::MARSHAL ());
     }
 }
 
 namespace POA_ImplementationRepository
 {
-
-
+  
+  
   // TAO_IDL - Generated from
-  // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/upcall_command_ss.cpp:127
-
+  // be\be_visitor_operation/upcall_command_ss.cpp:127
+  
   class _get_component_Administration_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -2787,59 +2975,59 @@ namespace POA_ImplementationRepository
       , args_ (args)
     {
     }
-
+    
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Object, TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-
-
+      
+      
       retval =
         this->servant_-> _get_component (
           ACE_ENV_SINGLE_ARG_PARAMETER);
-
+        
     }
-
+  
   private:
     POA_ImplementationRepository::Administration * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-
+  
 }
 void POA_ImplementationRepository::Administration::_component_skel (
-    TAO_ServerRequest & server_request,
+    TAO_ServerRequest & server_request, 
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-
-
+  
+  
 #if TAO_HAS_INTERCEPTORS == 1
-  static CORBA::TypeCode_ptr const * const exceptions = 0;
-  static CORBA::ULong const nexceptions = 0;
+  static ::CORBA::TypeCode_ptr const * const exceptions = 0;
+  static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-
+  
   TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-
+  
   TAO::Argument * const args[] =
     {
       &retval
     };
-
+  
   static size_t const nargs = 1;
-
+  
   POA_ImplementationRepository::Administration * const impl =
     static_cast<POA_ImplementationRepository::Administration *> (servant);
-
+  
   _get_component_Administration_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-
+  
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -2852,10 +3040,10 @@ void POA_ImplementationRepository::Administration::_component_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-
+  
 }
 
-CORBA::Boolean POA_ImplementationRepository::Administration::_is_a (
+::CORBA::Boolean POA_ImplementationRepository::Administration::_is_a (
     const char* value
     ACE_ENV_ARG_DECL_NOT_USED
   )
@@ -2879,7 +3067,7 @@ const char* POA_ImplementationRepository::Administration::_interface_repository_
 }
 
 // TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_ss.cpp:754
+// be\be_visitor_interface/interface_ss.cpp:862
 
 void POA_ImplementationRepository::Administration::_dispatch (
     TAO_ServerRequest & req,
@@ -2894,29 +3082,29 @@ void POA_ImplementationRepository::Administration::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_ss.cpp:705
+// be\be_visitor_interface/interface_ss.cpp:813
 
 ImplementationRepository::Administration *
 POA_ImplementationRepository::Administration::_this (ACE_ENV_SINGLE_ARG_DECL)
 {
   TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   TAO_Stub_Auto_Ptr safe_stub (stub);
-  CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-
-  CORBA::Boolean _tao_opt_colloc =
+  ::CORBA::Object_ptr tmp = CORBA::Object::_nil ();
+  
+  ::CORBA::Boolean _tao_opt_colloc =
     stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-
+  
   ACE_NEW_RETURN (
       tmp,
-      CORBA::Object (stub, _tao_opt_colloc, this),
+      ::CORBA::Object (stub, _tao_opt_colloc, this),
       0
     );
-
-  CORBA::Object_var obj = tmp;
+  
+  ::CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
-
+  
   typedef ::ImplementationRepository::Administration STUB_SCOPED_NAME;
   return
     TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
diff --git a/TAO/tao/ImR_Client/ImplRepoS.h b/TAO/tao/ImR_Client/ImplRepoS.h
index 8435f8704d6..8e74c1bb9ee 100644
--- a/TAO/tao/ImR_Client/ImplRepoS.h
+++ b/TAO/tao/ImR_Client/ImplRepoS.h
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// .\be\be_codegen.cpp:391
+// be\be_codegen.cpp:373
 
 #ifndef _TAO_IDL_IMPLREPOS_H_
 #define _TAO_IDL_IMPLREPOS_H_
@@ -34,6 +34,7 @@
 #include /**/ "ace/pre.h"
 
 #include "ImplRepoC.h"
+#include "tao/ImR_Client/ServerObjectS.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -43,120 +44,118 @@
 #include "tao/PortableServer/PortableServer.h"
 #include "tao/PortableServer/Servant_Base.h"
 
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
 // TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_sh.cpp:49
+// be\be_visitor_module/module_sh.cpp:49
 
 namespace POA_ImplementationRepository
 {
- 
- 
+  
+  
   // TAO_IDL - Generated from
-  // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_sh.cpp:87
- 
+  // be\be_visitor_interface/interface_sh.cpp:87
+  
   class ServerInformationIterator;
   typedef ServerInformationIterator *ServerInformationIterator_ptr;
- 
+  
   class _TAO_ServerInformationIterator_Direct_Proxy_Impl;
   class _TAO_ServerInformationIterator_Strategized_Proxy_Broker;
- 
+  
   class TAO_IMR_Client_Export ServerInformationIterator
     : public virtual PortableServer::ServantBase
   {
   protected:
     ServerInformationIterator (void);
- 
+  
   public:
     // Useful for template programming.
     typedef ::ImplementationRepository::ServerInformationIterator _stub_type;
     typedef ::ImplementationRepository::ServerInformationIterator_ptr _stub_ptr_type;
     typedef ::ImplementationRepository::ServerInformationIterator_var _stub_var_type;
- 
+    
     ServerInformationIterator (const ServerInformationIterator& rhs);
     virtual ~ServerInformationIterator (void);
- 
-    virtual CORBA::Boolean _is_a (
+    
+    virtual ::CORBA::Boolean _is_a (
         const char* logical_type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
- 
+    
     static void _is_a_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
         ACE_ENV_ARG_DECL
       );
- 
+    
     static void _non_existent_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
         ACE_ENV_ARG_DECL
       );
- 
+    
     static void _interface_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
         ACE_ENV_ARG_DECL
       );
- 
+    
     static void _component_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
         ACE_ENV_ARG_DECL
       );
- 
+    
+    static void _repository_id_skel (
+        TAO_ServerRequest & req,
+        void * servant_upcall,
+        void * servant
+        ACE_ENV_ARG_DECL
+      );
+    
     virtual void _dispatch (
         TAO_ServerRequest & req,
         void * servant_upcall
         ACE_ENV_ARG_DECL
       );
- 
+    
     ::ImplementationRepository::ServerInformationIterator *_this (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       );
- 
+    
     virtual const char* _interface_repository_id (void) const;
- 
+    
     // TAO_IDL - Generated from
-    // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_sh.cpp:45
- 
-    virtual CORBA::Boolean next_n (
+    // be\be_visitor_operation/operation_sh.cpp:45
+    
+    virtual ::CORBA::Boolean next_n (
         ::CORBA::ULong how_many,
         ::ImplementationRepository::ServerInformationList_out servers
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
+        ::CORBA::SystemException
       )) = 0;
- 
+    
     static void next_n_skel (
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
         ACE_ENV_ARG_DECL
       );
- 
+    
     // TAO_IDL - Generated from
-    // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_sh.cpp:45
- 
+    // be\be_visitor_operation/operation_sh.cpp:45
+    
     virtual void destroy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
+        ::CORBA::SystemException
       )) = 0;
- 
+    
     static void destroy_skel (
         TAO_ServerRequest & server_request,
         void * servant_upcall,
@@ -164,33 +163,33 @@ namespace POA_ImplementationRepository
         ACE_ENV_ARG_DECL
       );
   };
- 
+  
   ///////////////////////////////////////////////////////////////////////
-  //               Strategized Proxy Broker Declaration
+  //               Strategized Proxy Broker Declaration 
   //
- 
+  
   // TAO_IDL - Generated from
-  // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_interface/strategized_proxy_broker_sh.cpp:36
- 
+  // be\be_visitor_interface/strategized_proxy_broker_sh.cpp:36
+  
   class TAO_IMR_Client_Export _TAO_ServerInformationIterator_Strategized_Proxy_Broker
     : public virtual TAO::Collocation_Proxy_Broker
   {
-  public:
+  public: 
     _TAO_ServerInformationIterator_Strategized_Proxy_Broker (void);
- 
+    
     virtual ~_TAO_ServerInformationIterator_Strategized_Proxy_Broker (void);
- 
+    
     TAO::Collocation_Strategy
     get_strategy (
-        CORBA::Object_ptr obj
+        ::CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL
       )
-      ACE_THROW_SPEC ((CORBA::SystemException));
- 
+      ACE_THROW_SPEC (( ::CORBA::SystemException));
+    
     void
     dispatch (
-        CORBA::Object_ptr obj,
-        CORBA::Object_out forward_obj,
+        ::CORBA::Object_ptr obj,
+        ::CORBA::Object_out forward_obj,
         TAO::Argument ** args,
         int num_args,
         const char * op,
@@ -198,35 +197,35 @@ namespace POA_ImplementationRepository
         TAO::Collocation_Strategy strategy
         ACE_ENV_ARG_DECL
       )
-      ACE_THROW_SPEC ((CORBA::Exception));
- 
+      ACE_THROW_SPEC (( ::CORBA::Exception));
+    
     static _TAO_ServerInformationIterator_Strategized_Proxy_Broker *
     the_TAO_ServerInformationIterator_Strategized_Proxy_Broker (void);
   };
- 
+  
   //
-  //            End Strategized Proxy Broker Declaration
+  //            End Strategized Proxy Broker Declaration 
   ///////////////////////////////////////////////////////////////////////
- 
- 
- 
-  // TAO_IDL - Generated from
-  // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_interface/direct_proxy_impl_sh.cpp:31
- 
+  
+  
+  
+  // TAO_IDL - Generated from 
+  // be\be_visitor_interface/direct_proxy_impl_sh.cpp:31
+  
   ///////////////////////////////////////////////////////////////////////
   //                    Direct  Impl. Declaration
   //
- 
+  
   class TAO_IMR_Client_Export _TAO_ServerInformationIterator_Direct_Proxy_Impl
   {
   public:
     _TAO_ServerInformationIterator_Direct_Proxy_Impl (void);
- 
-    virtual ~_TAO_ServerInformationIterator_Direct_Proxy_Impl (void) {}
- 
+    
+    virtual ~_TAO_ServerInformationIterator_Direct_Proxy_Impl (void);
+    
     // TAO_IDL - Generated from
-    // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/proxy_impl_xh.cpp:24
- 
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     static void
     next_n (
         TAO_Abstract_ServantBase *servant,
@@ -235,12 +234,12 @@ namespace POA_ImplementationRepository
         ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
+        ::CORBA::SystemException
       ));
- 
+    
     // TAO_IDL - Generated from
-    // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/proxy_impl_xh.cpp:24
- 
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     static void
     destroy (
         TAO_Abstract_ServantBase *servant,
@@ -249,166 +248,173 @@ namespace POA_ImplementationRepository
         ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
+        ::CORBA::SystemException
       ));
   };
- 
+  
   //
   //                Direct  Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
- 
- 
- 
+  
+  
+  
   // TAO_IDL - Generated from
-  // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_sh.cpp:87
- 
+  // be\be_visitor_interface/interface_sh.cpp:87
+  
   class Administration;
   typedef Administration *Administration_ptr;
- 
+  
   class _TAO_Administration_Direct_Proxy_Impl;
   class _TAO_Administration_Strategized_Proxy_Broker;
- 
+  
   class TAO_IMR_Client_Export Administration
     : public virtual PortableServer::ServantBase
   {
   protected:
     Administration (void);
- 
+  
   public:
     // Useful for template programming.
     typedef ::ImplementationRepository::Administration _stub_type;
     typedef ::ImplementationRepository::Administration_ptr _stub_ptr_type;
     typedef ::ImplementationRepository::Administration_var _stub_var_type;
- 
+    
     Administration (const Administration& rhs);
     virtual ~Administration (void);
- 
-    virtual CORBA::Boolean _is_a (
+    
+    virtual ::CORBA::Boolean _is_a (
         const char* logical_type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
- 
+    
     static void _is_a_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
         ACE_ENV_ARG_DECL
       );
- 
+    
     static void _non_existent_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
         ACE_ENV_ARG_DECL
       );
- 
+    
     static void _interface_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
         ACE_ENV_ARG_DECL
       );
- 
+    
     static void _component_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
         ACE_ENV_ARG_DECL
       );
- 
+    
+    static void _repository_id_skel (
+        TAO_ServerRequest & req,
+        void * servant_upcall,
+        void * servant
+        ACE_ENV_ARG_DECL
+      );
+    
     virtual void _dispatch (
         TAO_ServerRequest & req,
         void * servant_upcall
         ACE_ENV_ARG_DECL
       );
- 
+    
     ::ImplementationRepository::Administration *_this (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       );
- 
+    
     virtual const char* _interface_repository_id (void) const;
- 
+    
     // TAO_IDL - Generated from
-    // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_sh.cpp:45
- 
+    // be\be_visitor_operation/operation_sh.cpp:45
+    
     virtual void activate_server (
         const char * server
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException,
+        ::CORBA::SystemException,
         ::ImplementationRepository::NotFound,
         ::ImplementationRepository::CannotActivate
       )) = 0;
- 
+    
     static void activate_server_skel (
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
         ACE_ENV_ARG_DECL
       );
- 
+    
     // TAO_IDL - Generated from
-    // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_sh.cpp:45
- 
+    // be\be_visitor_operation/operation_sh.cpp:45
+    
     virtual void add_or_update_server (
         const char * server,
         const ::ImplementationRepository::StartupOptions & options
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException,
+        ::CORBA::SystemException,
         ::ImplementationRepository::NotFound
       )) = 0;
- 
+    
     static void add_or_update_server_skel (
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
         ACE_ENV_ARG_DECL
       );
- 
+    
     // TAO_IDL - Generated from
-    // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_sh.cpp:45
- 
+    // be\be_visitor_operation/operation_sh.cpp:45
+    
     virtual void remove_server (
         const char * server
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException,
+        ::CORBA::SystemException,
         ::ImplementationRepository::NotFound
       )) = 0;
- 
+    
     static void remove_server_skel (
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
         ACE_ENV_ARG_DECL
       );
- 
+    
     // TAO_IDL - Generated from
-    // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_sh.cpp:45
- 
+    // be\be_visitor_operation/operation_sh.cpp:45
+    
     virtual void shutdown_server (
         const char * server
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException,
+        ::CORBA::SystemException,
         ::ImplementationRepository::NotFound
       )) = 0;
- 
+    
     static void shutdown_server_skel (
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
         ACE_ENV_ARG_DECL
       );
- 
+    
     // TAO_IDL - Generated from
-    // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_sh.cpp:45
- 
+    // be\be_visitor_operation/operation_sh.cpp:45
+    
     virtual void server_is_running (
         const char * server,
         const char * partial_ior,
@@ -416,58 +422,58 @@ namespace POA_ImplementationRepository
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException,
+        ::CORBA::SystemException,
         ::ImplementationRepository::NotFound
       )) = 0;
- 
+    
     static void server_is_running_skel (
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
         ACE_ENV_ARG_DECL
       );
- 
+    
     // TAO_IDL - Generated from
-    // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_sh.cpp:45
- 
+    // be\be_visitor_operation/operation_sh.cpp:45
+    
     virtual void server_is_shutting_down (
         const char * server
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException,
+        ::CORBA::SystemException,
         ::ImplementationRepository::NotFound
       )) = 0;
- 
+    
     static void server_is_shutting_down_skel (
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
         ACE_ENV_ARG_DECL
       );
- 
+    
     // TAO_IDL - Generated from
-    // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_sh.cpp:45
- 
+    // be\be_visitor_operation/operation_sh.cpp:45
+    
     virtual void find (
         const char * server,
         ::ImplementationRepository::ServerInformation_out info
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
+        ::CORBA::SystemException
       )) = 0;
- 
+    
     static void find_skel (
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
         ACE_ENV_ARG_DECL
       );
- 
+    
     // TAO_IDL - Generated from
-    // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_sh.cpp:45
- 
+    // be\be_visitor_operation/operation_sh.cpp:45
+    
     virtual void list (
         ::CORBA::ULong how_many,
         ::ImplementationRepository::ServerInformationList_out server_list,
@@ -475,28 +481,28 @@ namespace POA_ImplementationRepository
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
+        ::CORBA::SystemException
       )) = 0;
- 
+    
     static void list_skel (
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
         ACE_ENV_ARG_DECL
       );
- 
+    
     // TAO_IDL - Generated from
-    // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_sh.cpp:45
- 
+    // be\be_visitor_operation/operation_sh.cpp:45
+    
     virtual void shutdown (
         ::CORBA::Boolean activators,
         ::CORBA::Boolean servers
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
+        ::CORBA::SystemException
       )) = 0;
- 
+    
     static void shutdown_skel (
         TAO_ServerRequest & server_request,
         void * servant_upcall,
@@ -504,33 +510,33 @@ namespace POA_ImplementationRepository
         ACE_ENV_ARG_DECL
       );
   };
- 
+  
   ///////////////////////////////////////////////////////////////////////
-  //               Strategized Proxy Broker Declaration
+  //               Strategized Proxy Broker Declaration 
   //
- 
+  
   // TAO_IDL - Generated from
-  // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_interface/strategized_proxy_broker_sh.cpp:36
- 
+  // be\be_visitor_interface/strategized_proxy_broker_sh.cpp:36
+  
   class TAO_IMR_Client_Export _TAO_Administration_Strategized_Proxy_Broker
     : public virtual TAO::Collocation_Proxy_Broker
   {
-  public:
+  public: 
     _TAO_Administration_Strategized_Proxy_Broker (void);
- 
+    
     virtual ~_TAO_Administration_Strategized_Proxy_Broker (void);
- 
+    
     TAO::Collocation_Strategy
     get_strategy (
-        CORBA::Object_ptr obj
+        ::CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL
       )
-      ACE_THROW_SPEC ((CORBA::SystemException));
- 
+      ACE_THROW_SPEC (( ::CORBA::SystemException));
+    
     void
     dispatch (
-        CORBA::Object_ptr obj,
-        CORBA::Object_out forward_obj,
+        ::CORBA::Object_ptr obj,
+        ::CORBA::Object_out forward_obj,
         TAO::Argument ** args,
         int num_args,
         const char * op,
@@ -538,35 +544,35 @@ namespace POA_ImplementationRepository
         TAO::Collocation_Strategy strategy
         ACE_ENV_ARG_DECL
       )
-      ACE_THROW_SPEC ((CORBA::Exception));
- 
+      ACE_THROW_SPEC (( ::CORBA::Exception));
+    
     static _TAO_Administration_Strategized_Proxy_Broker *
     the_TAO_Administration_Strategized_Proxy_Broker (void);
   };
- 
+  
   //
-  //            End Strategized Proxy Broker Declaration
+  //            End Strategized Proxy Broker Declaration 
   ///////////////////////////////////////////////////////////////////////
- 
- 
- 
-  // TAO_IDL - Generated from
-  // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_interface/direct_proxy_impl_sh.cpp:31
- 
+  
+  
+  
+  // TAO_IDL - Generated from 
+  // be\be_visitor_interface/direct_proxy_impl_sh.cpp:31
+  
   ///////////////////////////////////////////////////////////////////////
   //                    Direct  Impl. Declaration
   //
- 
+  
   class TAO_IMR_Client_Export _TAO_Administration_Direct_Proxy_Impl
   {
   public:
     _TAO_Administration_Direct_Proxy_Impl (void);
- 
-    virtual ~_TAO_Administration_Direct_Proxy_Impl (void) {}
- 
+    
+    virtual ~_TAO_Administration_Direct_Proxy_Impl (void);
+    
     // TAO_IDL - Generated from
-    // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/proxy_impl_xh.cpp:24
- 
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     static void
     activate_server (
         TAO_Abstract_ServantBase *servant,
@@ -575,14 +581,14 @@ namespace POA_ImplementationRepository
         ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException,
+        ::CORBA::SystemException,
         ::ImplementationRepository::NotFound,
         ::ImplementationRepository::CannotActivate
       ));
- 
+    
     // TAO_IDL - Generated from
-    // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/proxy_impl_xh.cpp:24
- 
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     static void
     add_or_update_server (
         TAO_Abstract_ServantBase *servant,
@@ -591,13 +597,13 @@ namespace POA_ImplementationRepository
         ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException,
+        ::CORBA::SystemException,
         ::ImplementationRepository::NotFound
       ));
- 
+    
     // TAO_IDL - Generated from
-    // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/proxy_impl_xh.cpp:24
- 
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     static void
     remove_server (
         TAO_Abstract_ServantBase *servant,
@@ -606,13 +612,13 @@ namespace POA_ImplementationRepository
         ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException,
+        ::CORBA::SystemException,
         ::ImplementationRepository::NotFound
       ));
- 
+    
     // TAO_IDL - Generated from
-    // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/proxy_impl_xh.cpp:24
- 
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     static void
     shutdown_server (
         TAO_Abstract_ServantBase *servant,
@@ -621,13 +627,13 @@ namespace POA_ImplementationRepository
         ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException,
+        ::CORBA::SystemException,
         ::ImplementationRepository::NotFound
       ));
- 
+    
     // TAO_IDL - Generated from
-    // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/proxy_impl_xh.cpp:24
- 
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     static void
     server_is_running (
         TAO_Abstract_ServantBase *servant,
@@ -636,13 +642,13 @@ namespace POA_ImplementationRepository
         ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException,
+        ::CORBA::SystemException,
         ::ImplementationRepository::NotFound
       ));
- 
+    
     // TAO_IDL - Generated from
-    // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/proxy_impl_xh.cpp:24
- 
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     static void
     server_is_shutting_down (
         TAO_Abstract_ServantBase *servant,
@@ -651,13 +657,13 @@ namespace POA_ImplementationRepository
         ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException,
+        ::CORBA::SystemException,
         ::ImplementationRepository::NotFound
       ));
- 
+    
     // TAO_IDL - Generated from
-    // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/proxy_impl_xh.cpp:24
- 
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     static void
     find (
         TAO_Abstract_ServantBase *servant,
@@ -666,12 +672,12 @@ namespace POA_ImplementationRepository
         ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
+        ::CORBA::SystemException
       ));
- 
+    
     // TAO_IDL - Generated from
-    // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/proxy_impl_xh.cpp:24
- 
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     static void
     list (
         TAO_Abstract_ServantBase *servant,
@@ -680,12 +686,12 @@ namespace POA_ImplementationRepository
         ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
+        ::CORBA::SystemException
       ));
- 
+    
     // TAO_IDL - Generated from
-    // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/proxy_impl_xh.cpp:24
- 
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
+    
     static void
     shutdown (
         TAO_Abstract_ServantBase *servant,
@@ -694,33 +700,25 @@ namespace POA_ImplementationRepository
         ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
+        ::CORBA::SystemException
       ));
   };
- 
+  
   //
   //                Direct  Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
- 
- 
+  
+  
 
 // TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_sh.cpp:80
+// be\be_visitor_module/module_sh.cpp:80
 
 } // module ImplementationRepository
 
-// TAO_IDL - Generated from
-// .\be\be_codegen.cpp:995
-
-
+// TAO_IDL - Generated from 
+// be\be_codegen.cpp:1072
 
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
 
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
 
 #include /**/ "ace/post.h"
 #endif /* ifndef */
diff --git a/TAO/tao/ImR_Client/ServerObject.pidl b/TAO/tao/ImR_Client/ServerObject.pidl
index d7a1355fae7..ba18db9683c 100644
--- a/TAO/tao/ImR_Client/ServerObject.pidl
+++ b/TAO/tao/ImR_Client/ServerObject.pidl
@@ -10,7 +10,7 @@
  *
  * The command used to generate code from this file is:
  *
- *   tao_idl -Ssi -Gp -GA -Gd -Ge 1 -Sc -I$(TAO_ROOT) -Wb,export_macro=TAO_IMR_Client_Export -Wb,export_include=imr_client_export.h -Wb,pre_include="ace/pre.h" -Wb,post_include="ace/post.h" ServerObject.pidl
+ *   tao_idl -Ssi -Gp -Gd -Ge 1 -Sc -I$(TAO_ROOT) -Wb,export_macro=TAO_IMR_Client_Export -Wb,export_include=imr_client_export.h -Wb,pre_include="ace/pre.h" -Wb,post_include="ace/post.h" ServerObject.pidl
  *
  */
 //=============================================================================
diff --git a/TAO/tao/ImR_Client/ServerObjectA.cpp b/TAO/tao/ImR_Client/ServerObjectA.cpp
deleted file mode 100644
index 68257fa382a..00000000000
--- a/TAO/tao/ImR_Client/ServerObjectA.cpp
+++ /dev/null
@@ -1,111 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "tao/AnyTypeCode/Null_RefCount_Policy.h"
-#include "tao/AnyTypeCode/TypeCode_Constants.h"
-#include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
-#include "tao/AnyTypeCode/Objref_TypeCode_Static.h"
-#include "ServerObjectC.h"
-#include "tao/CDR.h"
-#include "tao/AnyTypeCode/Any.h"
-#include "tao/AnyTypeCode/Any_Impl_T.h"
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_ImplementationRepository_ServerObject (
-    CORBA::tk_objref,
-    "IDL:ImplementationRepository/ServerObject:1.0",
-    "ServerObject");
-
-namespace ImplementationRepository
-{
-  ::CORBA::TypeCode_ptr const _tc_ServerObject =
-    &_tao_tc_ImplementationRepository_ServerObject;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<ImplementationRepository::ServerObject>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    ImplementationRepository::ServerObject_ptr _tao_elem
-  )
-{
-  ImplementationRepository::ServerObject_ptr _tao_objptr =
-    ImplementationRepository::ServerObject::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    ImplementationRepository::ServerObject_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<ImplementationRepository::ServerObject>::insert (
-      _tao_any,
-      ImplementationRepository::ServerObject::_tao_any_destructor,
-      ImplementationRepository::_tc_ServerObject,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    ImplementationRepository::ServerObject_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<ImplementationRepository::ServerObject>::extract (
-        _tao_any,
-        ImplementationRepository::ServerObject::_tao_any_destructor,
-        ImplementationRepository::_tc_ServerObject,
-        _tao_elem
-      );
-}
diff --git a/TAO/tao/ImR_Client/ServerObjectA.h b/TAO/tao/ImR_Client/ServerObjectA.h
index 7dda3b08207..7ef8762309c 100644
--- a/TAO/tao/ImR_Client/ServerObjectA.h
+++ b/TAO/tao/ImR_Client/ServerObjectA.h
@@ -26,36 +26,19 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:805
+// be\be_codegen.cpp:390
 
-#ifndef _TAO_IDL_ORIG_SERVEROBJECTA_H_
-#define _TAO_IDL_ORIG_SERVEROBJECTA_H_
+#ifndef _TAO_IDL_ORIG_SERVER_OBJECTA_H_
+#define _TAO_IDL_ORIG_SERVER_OBJECTA_H_
 
 #include /**/ "ace/pre.h"
 
-#include "imr_client_export.h"
 #include "tao/ImR_Client/ServerObjectC.h"
 
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_decl.cpp:49
-
-extern TAO_IMR_Client_Export ::CORBA::TypeCode_ptr const _tc_ServerObject;
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:53
-
-TAO_IMR_Client_Export void operator<<= (CORBA::Any &, ImplementationRepository::ServerObject_ptr); // copying
-TAO_IMR_Client_Export void operator<<= (CORBA::Any &, ImplementationRepository::ServerObject_ptr *); // non-copying
-TAO_IMR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::ServerObject_ptr &);
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include /**/ "ace/post.h"
-
 #endif /* ifndef */
+
diff --git a/TAO/tao/ImR_Client/ServerObjectC.cpp b/TAO/tao/ImR_Client/ServerObjectC.cpp
index 7f5897daad1..8aa0505c7e2 100644
--- a/TAO/tao/ImR_Client/ServerObjectC.cpp
+++ b/TAO/tao/ImR_Client/ServerObjectC.cpp
@@ -26,27 +26,29 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// .\be\be_codegen.cpp:291
+// be\be_codegen.cpp:277
 
 
+#include "tao/AnyTypeCode/Null_RefCount_Policy.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Objref_TypeCode_Static.h"
 #include "ServerObjectC.h"
 #include "tao/CDR.h"
 #include "tao/Exception_Data.h"
 #include "tao/Invocation_Adapter.h"
 #include "tao/Object_T.h"
+#include "tao/AnyTypeCode/Any.h"
+#include "tao/AnyTypeCode/Any_Impl_T.h"
 #include "tao/Basic_Arguments.h"
 #include "ace/OS_NS_string.h"
 
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
 #if !defined (__ACE_INLINE__)
 #include "ServerObjectC.inl"
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// .\be\be_visitor_arg_traits.cpp:69
+// be\be_visitor_arg_traits.cpp:70
 
 // Arg traits specializations.
 namespace TAO
@@ -55,7 +57,7 @@ namespace TAO
 
 
 // TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_cs.cpp:60
+// be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for ImplementationRepository::ServerObject.
 
@@ -81,34 +83,34 @@ TAO::Objref_Traits<ImplementationRepository::ServerObject>::nil (void)
   return ImplementationRepository::ServerObject::_nil ();
 }
 
-CORBA::Boolean
+::CORBA::Boolean
 TAO::Objref_Traits<ImplementationRepository::ServerObject>::marshal (
     ImplementationRepository::ServerObject_ptr p,
     TAO_OutputCDR & cdr
   )
 {
-  return CORBA::Object::marshal (p, cdr);
+  return ::CORBA::Object::marshal (p, cdr);
 }
 
 // Function pointer for collocation factory initialization.
 TAO::Collocation_Proxy_Broker * 
 (*ImplementationRepository__TAO_ServerObject_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
+    ::CORBA::Object_ptr obj
   ) = 0;
 
 // TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_cs.cpp:78
+// be\be_visitor_operation/operation_cs.cpp:78
 
 void ImplementationRepository::ServerObject::ping (
     ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
-    CORBA::SystemException
+    ::CORBA::SystemException
   ))
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ACE_NESTED_CLASS ( ::CORBA, Object)::tao_object_initialize (this);
     }
   
   if (this->the_TAO_ServerObject_Proxy_Broker_ == 0)
@@ -137,18 +139,18 @@ void ImplementationRepository::ServerObject::ping (
 }
 
 // TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_cs.cpp:78
+// be\be_visitor_operation/operation_cs.cpp:78
 
 void ImplementationRepository::ServerObject::shutdown (
     ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
-    CORBA::SystemException
+    ::CORBA::SystemException
   ))
 {
   if (!this->is_evaluated ())
     {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+      ACE_NESTED_CLASS ( ::CORBA, Object)::tao_object_initialize (this);
     }
   
   if (this->the_TAO_ServerObject_Proxy_Broker_ == 0)
@@ -206,7 +208,7 @@ ImplementationRepository::ServerObject::_tao_any_destructor (void *_tao_void_poi
 
 ImplementationRepository::ServerObject_ptr
 ImplementationRepository::ServerObject::_narrow (
-    CORBA::Object_ptr _tao_objref
+    ::CORBA::Object_ptr _tao_objref
     ACE_ENV_ARG_DECL
   )
 {
@@ -221,7 +223,7 @@ ImplementationRepository::ServerObject::_narrow (
 
 ImplementationRepository::ServerObject_ptr
 ImplementationRepository::ServerObject::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
+    ::CORBA::Object_ptr _tao_objref
     ACE_ENV_ARG_DECL
   )
 {
@@ -251,7 +253,7 @@ ImplementationRepository::ServerObject::_tao_release (ServerObject_ptr obj)
   CORBA::release (obj);
 }
 
-CORBA::Boolean
+::CORBA::Boolean
 ImplementationRepository::ServerObject::_is_a (
     const char *value
     ACE_ENV_ARG_DECL
@@ -272,7 +274,7 @@ ImplementationRepository::ServerObject::_is_a (
     }
   else
     {
-      return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a (
+      return this->ACE_NESTED_CLASS ( ::CORBA, Object)::_is_a (
           value
           ACE_ENV_ARG_PARAMETER
         );
@@ -284,30 +286,160 @@ const char* ImplementationRepository::ServerObject::_interface_repository_id (vo
   return "IDL:ImplementationRepository/ServerObject:1.0";
 }
 
-CORBA::Boolean
+::CORBA::Boolean
 ImplementationRepository::ServerObject::marshal (TAO_OutputCDR &cdr)
 {
   return (cdr << this);
 }
 
 // TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_interface/cdr_op_cs.cpp:63
+// be\be_visitor_typecode/objref_typecode.cpp:76
+
+static TAO::TypeCode::Objref<char const *,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_ImplementationRepository_ServerObject (
+    ::CORBA::tk_objref,
+    "IDL:ImplementationRepository/ServerObject:1.0",
+    "ServerObject");
+  
+namespace ImplementationRepository
+{
+  ::CORBA::TypeCode_ptr const _tc_ServerObject =
+    &_tao_tc_ImplementationRepository_ServerObject;
+}
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_cs.cpp:51
+
+namespace TAO
+{
+  template<>
+  ::CORBA::Boolean
+  Any_Impl_T<ImplementationRepository::ServerObject>::to_object (
+      ::CORBA::Object_ptr &_tao_elem
+    ) const
+  {
+    _tao_elem = ::CORBA::Object::_duplicate (this->value_);
+    return true;
+  }
+}
+
+#if defined (ACE_ANY_OPS_USE_NAMESPACE)
+
+namespace ImplementationRepository
+{
+  
+  
+  // Copying insertion.
+  void
+  operator<<= (
+      ::CORBA::Any &_tao_any,
+      ServerObject_ptr _tao_elem
+    )
+  {
+    ServerObject_ptr _tao_objptr =
+      ServerObject::_duplicate (_tao_elem);
+    _tao_any <<= &_tao_objptr;
+  }
+  
+  // Non-copying insertion.
+  void
+  operator<<= (
+      ::CORBA::Any &_tao_any,
+      ServerObject_ptr *_tao_elem
+    )
+  {
+    TAO::Any_Impl_T<ServerObject>::insert (
+        _tao_any,
+        ServerObject::_tao_any_destructor,
+        _tc_ServerObject,
+        *_tao_elem
+      );
+  }
+  
+  ::CORBA::Boolean
+  operator>>= (
+      const ::CORBA::Any &_tao_any,
+      ServerObject_ptr &_tao_elem
+    )
+  {
+    return
+      TAO::Any_Impl_T<ServerObject>::extract (
+          _tao_any,
+          ServerObject::_tao_any_destructor,
+          _tc_ServerObject,
+          _tao_elem
+        );
+  }
+}
+
+#else
+
+
+// Copying insertion.
+void
+operator<<= (
+    ::CORBA::Any &_tao_any,
+    ImplementationRepository::ServerObject_ptr _tao_elem
+  )
+{
+  ImplementationRepository::ServerObject_ptr _tao_objptr =
+    ImplementationRepository::ServerObject::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    ::CORBA::Any &_tao_any,
+    ImplementationRepository::ServerObject_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<ImplementationRepository::ServerObject>::insert (
+      _tao_any,
+      ImplementationRepository::ServerObject::_tao_any_destructor,
+      ImplementationRepository::_tc_ServerObject,
+      *_tao_elem
+    );
+}
+
+::CORBA::Boolean
+operator>>= (
+    const ::CORBA::Any &_tao_any,
+    ImplementationRepository::ServerObject_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<ImplementationRepository::ServerObject>::extract (
+        _tao_any,
+        ImplementationRepository::ServerObject::_tao_any_destructor,
+        ImplementationRepository::_tc_ServerObject,
+        _tao_elem
+      );
+}
+
+#endif
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/cdr_op_cs.cpp:63
 
-CORBA::Boolean operator<< (
+::CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
     const ImplementationRepository::ServerObject_ptr _tao_objref
   )
 {
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
+  ::CORBA::Object_ptr _tao_corba_obj = _tao_objref;
   return (strm << _tao_corba_obj);
 }
 
-CORBA::Boolean operator>> (
+::CORBA::Boolean operator>> (
     TAO_InputCDR &strm,
     ImplementationRepository::ServerObject_ptr &_tao_objref
   )
 {
-  CORBA::Object_var obj;
+  ::CORBA::Object_var obj;
   
   if (!(strm >> obj.inout ()))
     {
diff --git a/TAO/tao/ImR_Client/ServerObjectC.h b/TAO/tao/ImR_Client/ServerObjectC.h
index 74a5178c5f4..ade33a21dee 100644
--- a/TAO/tao/ImR_Client/ServerObjectC.h
+++ b/TAO/tao/ImR_Client/ServerObjectC.h
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// .\be\be_codegen.cpp:153
+// be\be_codegen.cpp:154
 
 #ifndef _TAO_IDL_SERVEROBJECTC_H_
 #define _TAO_IDL_SERVEROBJECTC_H_
@@ -41,6 +41,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "imr_client_export.h"
+#include "tao/AnyTypeCode/AnyTypeCode_methods.h"
 #include "tao/ORB.h"
 #include "tao/SystemException.h"
 #include "tao/Environment.h"
@@ -52,17 +53,8 @@
 #endif
 #define TAO_EXPORT_MACRO TAO_IMR_Client_Export
 
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
 // TAO_IDL - Generated from 
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_root/root_ch.cpp:62
+// be\be_visitor_root/root_ch.cpp:62
 
 namespace TAO
 {
@@ -71,13 +63,13 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_ch.cpp:48
+// be\be_visitor_module/module_ch.cpp:49
 
 namespace ImplementationRepository
 {
   
   // TAO_IDL - Generated from
-  // .\be\be_interface.cpp:598
+  // be\be_interface.cpp:598
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVEROBJECT__VAR_OUT_CH_)
 #define _IMPLEMENTATIONREPOSITORY_SERVEROBJECT__VAR_OUT_CH_
@@ -100,13 +92,13 @@ namespace ImplementationRepository
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_ch.cpp:54
+  // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVEROBJECT_CH_)
 #define _IMPLEMENTATIONREPOSITORY_SERVEROBJECT_CH_
   
   class TAO_IMR_Client_Export ServerObject
-    : public virtual CORBA::Object
+    : public virtual ::CORBA::Object
   {
   public:
     friend class TAO::Narrow_Utils<ServerObject>;
@@ -119,12 +111,12 @@ namespace ImplementationRepository
     static void _tao_release (ServerObject_ptr obj);
     
     static ServerObject_ptr _narrow (
-        CORBA::Object_ptr obj
+        ::CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
     
     static ServerObject_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
+        ::CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
     
@@ -136,35 +128,35 @@ namespace ImplementationRepository
     static void _tao_any_destructor (void *);
     
     // TAO_IDL - Generated from
-    // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
+    // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void ping (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
+        ::CORBA::SystemException
       ));
     
     // TAO_IDL - Generated from
-    // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
+    // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void shutdown (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
+        ::CORBA::SystemException
       ));
     
     // TAO_IDL - Generated from
-    // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_ch.cpp:210
+    // be\be_visitor_interface/interface_ch.cpp:210
     
-    virtual CORBA::Boolean _is_a (
+    virtual ::CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
     
     virtual const char* _interface_repository_id (void) const;
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+    virtual ::CORBA::Boolean marshal (TAO_OutputCDR &cdr);
   private:
     TAO::Collocation_Proxy_Broker *the_TAO_ServerObject_Proxy_Broker_;
   
@@ -185,7 +177,7 @@ namespace ImplementationRepository
     // Non-local interface only.
     ServerObject (
         TAO_Stub *objref,
-        CORBA::Boolean _tao_collocated = 0,
+        ::CORBA::Boolean _tao_collocated = 0,
         TAO_Abstract_ServantBase *servant = 0,
         TAO_ORB_Core *orb_core = 0
       );
@@ -202,35 +194,35 @@ namespace ImplementationRepository
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:49
   
   extern TAO_IMR_Client_Export ::CORBA::TypeCode_ptr const _tc_ServerObject;
 
 // TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_ch.cpp:66
+// be\be_visitor_module/module_ch.cpp:78
 
 } // module ImplementationRepository
 
 // Proxy Broker Factory function pointer declarations.
 
 // TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_root/root.cpp:139
+// be\be_visitor_root/root.cpp:139
 
 extern TAO_IMR_Client_Export
 TAO::Collocation_Proxy_Broker *
 (*ImplementationRepository__TAO_ServerObject_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
+    ::CORBA::Object_ptr obj
   );
 
 // TAO_IDL - Generated from
-// .\be\be_visitor_traits.cpp:61
+// be\be_visitor_traits.cpp:61
 
 // Traits specializations.
 namespace TAO
 {
 
-#if !defined (_IMPLEMENTATIONREPOSITORY_SERVEROBJECT__TRAITS_CH_)
-#define _IMPLEMENTATIONREPOSITORY_SERVEROBJECT__TRAITS_CH_
+#if !defined (_IMPLEMENTATIONREPOSITORY_SERVEROBJECT__TRAITS_)
+#define _IMPLEMENTATIONREPOSITORY_SERVEROBJECT__TRAITS_
   
   template<>
   struct TAO_IMR_Client_Export Objref_Traits< ::ImplementationRepository::ServerObject>
@@ -242,7 +234,7 @@ namespace TAO
         ::ImplementationRepository::ServerObject_ptr
       );
     static ::ImplementationRepository::ServerObject_ptr nil (void);
-    static CORBA::Boolean marshal (
+    static ::CORBA::Boolean marshal (
         ::ImplementationRepository::ServerObject_ptr p,
         TAO_OutputCDR & cdr
       );
@@ -252,33 +244,40 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_interface/any_op_ch.cpp:52
+// be\be_visitor_interface/any_op_ch.cpp:54
+
+
+
+#if defined (ACE_ANY_OPS_USE_NAMESPACE)
+
+namespace ImplementationRepository
+{
+  TAO_IMR_Client_Export void operator<<= ( ::CORBA::Any &, ServerObject_ptr); // copying
+  TAO_IMR_Client_Export void operator<<= ( ::CORBA::Any &, ServerObject_ptr *); // non-copying
+  TAO_IMR_Client_Export ::CORBA::Boolean operator>>= (const ::CORBA::Any &, ServerObject_ptr &);
+}
 
-TAO_IMR_Client_Export void operator<<= (CORBA::Any &, ImplementationRepository::ServerObject_ptr); // copying
-TAO_IMR_Client_Export void operator<<= (CORBA::Any &, ImplementationRepository::ServerObject_ptr *); // non-copying
-TAO_IMR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::ServerObject_ptr &);
+#else
+
+TAO_IMR_Client_Export void operator<<= (::CORBA::Any &, ImplementationRepository::ServerObject_ptr); // copying
+TAO_IMR_Client_Export void operator<<= (::CORBA::Any &, ImplementationRepository::ServerObject_ptr *); // non-copying
+TAO_IMR_Client_Export ::CORBA::Boolean operator>>= (const ::CORBA::Any &, ImplementationRepository::ServerObject_ptr &);
+
+#endif
 
 // TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_interface/cdr_op_ch.cpp:55
+// be\be_visitor_interface/cdr_op_ch.cpp:55
 
-TAO_IMR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::ServerObject_ptr );
-TAO_IMR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::ServerObject_ptr &);
+TAO_IMR_Client_Export ::CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::ServerObject_ptr );
+TAO_IMR_Client_Export ::CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::ServerObject_ptr &);
 
 // TAO_IDL - Generated from
-// .\be\be_codegen.cpp:955
+// be\be_codegen.cpp:1040
 
 #if defined (__ACE_INLINE__)
 #include "ServerObjectC.inl"
 #endif /* defined INLINE */
 
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
-
 #include /**/ "ace/post.h"
 
 #endif /* ifndef */
diff --git a/TAO/tao/ImR_Client/ServerObjectC.inl b/TAO/tao/ImR_Client/ServerObjectC.inl
index cbfc85bee96..8cc38b5b2e0 100644
--- a/TAO/tao/ImR_Client/ServerObjectC.inl
+++ b/TAO/tao/ImR_Client/ServerObjectC.inl
@@ -27,7 +27,7 @@
 
 
 // TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_ci.cpp:70
+// be\be_visitor_interface/interface_ci.cpp:70
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVEROBJECT___CI_)
 #define _IMPLEMENTATIONREPOSITORY_SERVEROBJECT___CI_
@@ -35,7 +35,7 @@
 ACE_INLINE
 ImplementationRepository::ServerObject::ServerObject (
     TAO_Stub *objref,
-    CORBA::Boolean _tao_collocated,
+    ::CORBA::Boolean _tao_collocated,
     TAO_Abstract_ServantBase *servant,
     TAO_ORB_Core *oc
   )
@@ -55,7 +55,7 @@ ImplementationRepository::ServerObject::ServerObject (
     IOP::IOR *ior,
     TAO_ORB_Core *oc
   )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
+  : ACE_NESTED_CLASS ( ::CORBA, Object) (ior, oc),
     the_TAO_ServerObject_Proxy_Broker_ (0)
 {
 }
diff --git a/TAO/tao/ImR_Client/ServerObjectS.cpp b/TAO/tao/ImR_Client/ServerObjectS.cpp
index 9ef5dcc5bd4..913b9113fb1 100644
--- a/TAO/tao/ImR_Client/ServerObjectS.cpp
+++ b/TAO/tao/ImR_Client/ServerObjectS.cpp
@@ -26,15 +26,13 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 
-// TAO_IDL - Generated from
-// .\be\be_codegen.cpp:599
+// TAO_IDL - Generated from 
+// be\be_codegen.cpp:553
 
 #ifndef _TAO_IDL_SERVEROBJECTS_CPP_
 #define _TAO_IDL_SERVEROBJECTS_CPP_
 
 
-#include "tao/AnyTypeCode/TypeCode.h"
-#include "tao/AnyTypeCode/DynamicC.h"
 #include "ServerObjectS.h"
 #include "tao/PortableServer/Operation_Table_Perfect_Hash.h"
 #include "tao/PortableServer/Direct_Collocation_Upcall_Wrapper.h"
@@ -55,6 +53,8 @@
 #include "tao/Stub.h"
 #include "tao/IFR_Client_Adapter.h"
 #include "tao/Object_T.h"
+#include "tao/AnyTypeCode/TypeCode.h"
+#include "tao/AnyTypeCode/DynamicC.h"
 #include "tao/CDR.h"
 #include "tao/operation_details.h"
 #include "tao/PortableInterceptor.h"
@@ -62,12 +62,8 @@
 #include "ace/Dynamic_Service.h"
 #include "ace/Malloc_Allocator.h"
 
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus
-#endif /* __BORLANDC__ */
-
 // TAO_IDL - Generated from
-// .\be\be_visitor_arg_traits.cpp:69
+// be\be_visitor_arg_traits.cpp:70
 
 // Arg traits specializations.
 namespace TAO
@@ -76,7 +72,7 @@ namespace TAO
 
 
 // TAO_IDL - Generated from
-// .\be\be_visitor_arg_traits.cpp:69
+// be\be_visitor_arg_traits.cpp:70
 
 // Arg traits specializations.
 namespace TAO
@@ -85,7 +81,7 @@ namespace TAO
 
 
 // TAO_IDL - Generated from
-// .\be\be_interface.cpp:1455
+// be\be_interface.cpp:1465
 
 class TAO_ImplementationRepository_ServerObject_Perfect_Hash_OpTable
   : public TAO_Perfect_Hash_OpTable
@@ -98,9 +94,9 @@ public:
 };
 
 /* 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,0 -a -o -t -p -K opname -L C++ -Z TAO_ImplementationRepository_ServerObject_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: c:\ACE\latest\ACE_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0 -a -o -t -p -K opname -L C++ -Z TAO_ImplementationRepository_ServerObject_Perfect_Hash_OpTable -N lookup  */
 unsigned int
-TAO_ImplementationRepository_ServerObject_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
+TAO_ImplementationRepository_ServerObject_Perfect_Hash_OpTable::hash (const char *str, size_t len)
 {
   static const unsigned char asso_values[] =
     {
@@ -118,7 +114,7 @@ TAO_ImplementationRepository_ServerObject_Perfect_Hash_OpTable::hash (const char
      16, 16, 16, 16, 16, 16, 16, 16, 16,  0,
      16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
      16, 16, 16, 16, 16, 16, 16, 16, 16,  0,
-     16, 16, 16,  5, 16,  0, 16, 16, 16, 16,
+     16, 16,  0,  5, 16,  0, 16, 16, 16, 16,
      16, 16, 16, 16, 16, 16, 16, 16, 16,  0,
      16,  0, 16, 16, 16, 16, 16, 16, 16, 16,
      16, 16,  0,  0, 16, 16, 16, 16, 16, 16,
@@ -142,7 +138,7 @@ TAO_ImplementationRepository_ServerObject_Perfect_Hash_OpTable::hash (const char
      16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
      16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
      16, 16, 16, 16, 16,  0, 16,  0, 16, 16,
-     16,  5, 16,  0, 16, 16, 16, 16, 16, 16,
+      0,  5, 16,  0, 16, 16, 16, 16, 16, 16,
       0, 16,  0, 16, 16,  0,  0, 16, 16, 16,
      16, 16, 16, 16, 16, 16, 16, 16,
 #endif /* ACE_MVS */
@@ -151,18 +147,18 @@ TAO_ImplementationRepository_ServerObject_Perfect_Hash_OpTable::hash (const char
 }
 
 const TAO_operation_db_entry *
-TAO_ImplementationRepository_ServerObject_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len)
+TAO_ImplementationRepository_ServerObject_Perfect_Hash_OpTable::lookup (const char *str, size_t len)
 {
   enum
     {
-      TOTAL_KEYWORDS = 6,
+      TOTAL_KEYWORDS = 7,
       MIN_WORD_LENGTH = 4,
-      MAX_WORD_LENGTH = 13,
+      MAX_WORD_LENGTH = 14,
       MIN_HASH_VALUE = 4,
       MAX_HASH_VALUE = 15,
       HASH_VALUE_RANGE = 12,
       DUPLICATES = 0,
-      WORDLIST_SIZE = 10
+      WORDLIST_SIZE = 11
     };
 
   static const TAO_operation_db_entry  wordlist[] =
@@ -176,7 +172,7 @@ TAO_ImplementationRepository_ServerObject_Perfect_Hash_OpTable::lookup (const ch
       {"_component", &POA_ImplementationRepository::ServerObject::_component_skel, 0},
       {"",0,0},{"",0,0},
       {"_non_existent", &POA_ImplementationRepository::ServerObject::_non_existent_skel, 0},
-      {"",0,0},
+      {"_repository_id", &POA_ImplementationRepository::ServerObject::_repository_id_skel, 0},
       {"_interface", &POA_ImplementationRepository::ServerObject::_interface_skel, 0},
     };
 
@@ -201,7 +197,7 @@ static TAO_ImplementationRepository_ServerObject_Perfect_Hash_OpTable tao_Implem
 //
 
 // TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_interface/strategized_proxy_broker_ss.cpp:40
+// be\be_visitor_interface/strategized_proxy_broker_ss.cpp:40
 
 // Factory function Implementation.
 POA_ImplementationRepository::_TAO_ServerObject_Strategized_Proxy_Broker *
@@ -209,7 +205,7 @@ POA_ImplementationRepository::_TAO_ServerObject_Strategized_Proxy_Broker::the_TA
 {
   static POA_ImplementationRepository::_TAO_ServerObject_Strategized_Proxy_Broker
   strategized_proxy_broker;
-
+  
   return &strategized_proxy_broker;
 }
 
@@ -223,22 +219,22 @@ POA_ImplementationRepository::_TAO_ServerObject_Strategized_Proxy_Broker::~_TAO_
 
 TAO::Collocation_Strategy
 POA_ImplementationRepository::_TAO_ServerObject_Strategized_Proxy_Broker::get_strategy (
-    CORBA::Object_ptr obj
+    ::CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL
   )
-  ACE_THROW_SPEC ((CORBA::SystemException))
+  ACE_THROW_SPEC (( ::CORBA::SystemException))
 {
   TAO::Collocation_Strategy strategy =
     TAO_ORB_Core::collocation_strategy (obj ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (TAO::TAO_CS_REMOTE_STRATEGY);
-
+  
   return strategy;
 }
 
 void
 POA_ImplementationRepository::_TAO_ServerObject_Strategized_Proxy_Broker::dispatch (
-    CORBA::Object_ptr obj,
-    CORBA::Object_out forward_obj,
+    ::CORBA::Object_ptr obj,
+    ::CORBA::Object_out forward_obj,
     TAO::Argument ** args,
     int num_args,
     const char * op,
@@ -246,17 +242,17 @@ POA_ImplementationRepository::_TAO_ServerObject_Strategized_Proxy_Broker::dispat
     TAO::Collocation_Strategy strategy
     ACE_ENV_ARG_DECL
   )
-  ACE_THROW_SPEC ((CORBA::Exception))
+  ACE_THROW_SPEC (( ::CORBA::Exception))
 {
   TAO::Direct_Collocation_Upcall_Wrapper collocation_upcall_wrapper;
   collocation_upcall_wrapper.upcall (
-    obj,
-    forward_obj,
-    args,
-    num_args,
-    op,
-    op_len,
-    strategy
+    obj, 
+    forward_obj, 
+    args, 
+    num_args, 
+    op, 
+    op_len, 
+    strategy 
     ACE_ENV_ARG_PARAMETER);
 }
 
@@ -265,10 +261,10 @@ POA_ImplementationRepository::_TAO_ServerObject_Strategized_Proxy_Broker::dispat
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_ss.cpp:999
+// be\be_visitor_interface/interface_ss.cpp:921
 
 TAO::Collocation_Proxy_Broker *
-ImplementationRepository__TAO_ServerObject_Proxy_Broker_Factory_function (CORBA::Object_ptr)
+ImplementationRepository__TAO_ServerObject_Proxy_Broker_Factory_function ( ::CORBA::Object_ptr)
 {
   return
     ::POA_ImplementationRepository::_TAO_ServerObject_Strategized_Proxy_Broker::the_TAO_ServerObject_Strategized_Proxy_Broker ();
@@ -277,9 +273,9 @@ ImplementationRepository__TAO_ServerObject_Proxy_Broker_Factory_function (CORBA:
 int
 ImplementationRepository__TAO_ServerObject_Proxy_Broker_Factory_Initializer (size_t)
 {
-  ImplementationRepository__TAO_ServerObject_Proxy_Broker_Factory_function_pointer =
+  ImplementationRepository__TAO_ServerObject_Proxy_Broker_Factory_function_pointer = 
     ImplementationRepository__TAO_ServerObject_Proxy_Broker_Factory_function;
-
+  
   return 0;
 }
 
@@ -298,18 +294,21 @@ ImplementationRepository__TAO_ServerObject_Proxy_Broker_Stub_Factory_Initializer
 POA_ImplementationRepository::_TAO_ServerObject_Direct_Proxy_Impl::_TAO_ServerObject_Direct_Proxy_Impl (void)
 {}
 
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/direct_proxy_impl_ss.cpp:42
+POA_ImplementationRepository::_TAO_ServerObject_Direct_Proxy_Impl::~_TAO_ServerObject_Direct_Proxy_Impl (void)
+{}
+
+// TAO_IDL - Generated from 
+// be\be_visitor_operation/direct_proxy_impl_ss.cpp:42
 
 void
 POA_ImplementationRepository::_TAO_ServerObject_Direct_Proxy_Impl::ping (
     TAO_Abstract_ServantBase  *servant,
     TAO::Argument **,
-    int
+    int 
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
-    CORBA::SystemException
+    ::CORBA::SystemException
   ))
 {
   dynamic_cast<POA_ImplementationRepository::ServerObject_ptr>
@@ -319,18 +318,18 @@ POA_ImplementationRepository::_TAO_ServerObject_Direct_Proxy_Impl::ping (
       );
   ACE_CHECK;
 }
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/direct_proxy_impl_ss.cpp:42
+// TAO_IDL - Generated from 
+// be\be_visitor_operation/direct_proxy_impl_ss.cpp:42
 
 void
 POA_ImplementationRepository::_TAO_ServerObject_Direct_Proxy_Impl::shutdown (
     TAO_Abstract_ServantBase  *servant,
     TAO::Argument **,
-    int
+    int 
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
-    CORBA::SystemException
+    ::CORBA::SystemException
   ))
 {
   dynamic_cast<POA_ImplementationRepository::ServerObject_ptr>
@@ -346,8 +345,8 @@ POA_ImplementationRepository::_TAO_ServerObject_Direct_Proxy_Impl::shutdown (
 //           End Direct Proxy Implementation
 ///////////////////////////////////////////////////////////////////////
 
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_ss.cpp:103
+// TAO_IDL - Generated from 
+// be\be_visitor_interface/interface_ss.cpp:103
 
 POA_ImplementationRepository::ServerObject::ServerObject (void)
   : TAO_ServantBase ()
@@ -366,11 +365,11 @@ POA_ImplementationRepository::ServerObject::~ServerObject (void)
 }
 namespace POA_ImplementationRepository
 {
-
-
+  
+  
   // TAO_IDL - Generated from
-  // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/upcall_command_ss.cpp:127
-
+  // be\be_visitor_operation/upcall_command_ss.cpp:127
+  
   class ping_ServerObject
     : public TAO::Upcall_Command
   {
@@ -380,23 +379,23 @@ namespace POA_ImplementationRepository
       : servant_ (servant)
     {
     }
-
+    
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       this->servant_->ping (
         ACE_ENV_SINGLE_ARG_PARAMETER);
-
+      
     }
-
+  
   private:
     POA_ImplementationRepository::ServerObject * const servant_;
   };
-
+  
 }
 
 
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ss.cpp:192
+// TAO_IDL - Generated from 
+// be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_ImplementationRepository::ServerObject::ping_skel (
     TAO_ServerRequest & server_request,
@@ -405,28 +404,28 @@ void POA_ImplementationRepository::ServerObject::ping_skel (
     ACE_ENV_ARG_DECL
   )
 {
-
-
+  
+  
 #if TAO_HAS_INTERCEPTORS == 1
-  static CORBA::TypeCode_ptr const * const exceptions = 0;
-  static CORBA::ULong const nexceptions = 0;
+  static ::CORBA::TypeCode_ptr const * const exceptions = 0;
+  static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-
+  
   TAO::SArg_Traits< void>::ret_val retval;
-
+  
   TAO::Argument * const args[] =
     {
       &retval
     };
-
+  
   static size_t const nargs = 1;
-
+  
   POA_ImplementationRepository::ServerObject * const impl =
     static_cast<POA_ImplementationRepository::ServerObject *> (servant);
 
   ping_ServerObject command (
     impl);
-
+  
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -439,15 +438,15 @@ void POA_ImplementationRepository::ServerObject::ping_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-
+  
 }
 namespace POA_ImplementationRepository
 {
-
-
+  
+  
   // TAO_IDL - Generated from
-  // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/upcall_command_ss.cpp:127
-
+  // be\be_visitor_operation/upcall_command_ss.cpp:127
+  
   class shutdown_ServerObject
     : public TAO::Upcall_Command
   {
@@ -457,23 +456,23 @@ namespace POA_ImplementationRepository
       : servant_ (servant)
     {
     }
-
+    
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       this->servant_->shutdown (
         ACE_ENV_SINGLE_ARG_PARAMETER);
-
+      
     }
-
+  
   private:
     POA_ImplementationRepository::ServerObject * const servant_;
   };
-
+  
 }
 
 
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ss.cpp:192
+// TAO_IDL - Generated from 
+// be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_ImplementationRepository::ServerObject::shutdown_skel (
     TAO_ServerRequest & server_request,
@@ -482,28 +481,28 @@ void POA_ImplementationRepository::ServerObject::shutdown_skel (
     ACE_ENV_ARG_DECL
   )
 {
-
-
+  
+  
 #if TAO_HAS_INTERCEPTORS == 1
-  static CORBA::TypeCode_ptr const * const exceptions = 0;
-  static CORBA::ULong const nexceptions = 0;
+  static ::CORBA::TypeCode_ptr const * const exceptions = 0;
+  static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-
+  
   TAO::SArg_Traits< void>::ret_val retval;
-
+  
   TAO::Argument * const args[] =
     {
       &retval
     };
-
+  
   static size_t const nargs = 1;
-
+  
   POA_ImplementationRepository::ServerObject * const impl =
     static_cast<POA_ImplementationRepository::ServerObject *> (servant);
 
   shutdown_ServerObject command (
     impl);
-
+  
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -516,19 +515,19 @@ void POA_ImplementationRepository::ServerObject::shutdown_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-
+  
 }
 
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_ss.cpp:169
+// TAO_IDL - Generated from 
+// be\be_visitor_interface/interface_ss.cpp:169
 
 namespace POA_ImplementationRepository
 {
-
-
+  
+  
   // TAO_IDL - Generated from
-  // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/upcall_command_ss.cpp:127
-
+  // be\be_visitor_operation/upcall_command_ss.cpp:127
+  
   class _is_a_ServerObject_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -542,68 +541,68 @@ namespace POA_ImplementationRepository
       , args_ (args)
     {
     }
-
+    
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-
-      TAO::SArg_Traits< CORBA::Char *>::in_arg_type arg_1 =
-        TAO::Portable_Server::get_in_arg< CORBA::Char *, TAO::SArg_Traits< CORBA::Char *>::in_arg_type> (
+      
+      TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
-
-
+        
+      
       retval =
         this->servant_-> _is_a (
           arg_1
           ACE_ENV_ARG_PARAMETER);
-
+        
     }
-
+  
   private:
     POA_ImplementationRepository::ServerObject * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-
+  
 }
 void POA_ImplementationRepository::ServerObject::_is_a_skel (
-    TAO_ServerRequest & server_request,
+    TAO_ServerRequest & server_request, 
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-
-
+  
+  
 #if TAO_HAS_INTERCEPTORS == 1
-  static CORBA::TypeCode_ptr const * const exceptions = 0;
-  static CORBA::ULong const nexceptions = 0;
+  static ::CORBA::TypeCode_ptr const * const exceptions = 0;
+  static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-
+  
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  TAO::SArg_Traits< CORBA::Char *>::in_arg_val _tao_repository_id;
-
+  TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
+  
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_repository_id
     };
-
+  
   static size_t const nargs = 2;
-
+  
   POA_ImplementationRepository::ServerObject * const impl =
     static_cast<POA_ImplementationRepository::ServerObject *> (servant);
-
+  
   _is_a_ServerObject_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-
+  
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -616,16 +615,16 @@ void POA_ImplementationRepository::ServerObject::_is_a_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-
+  
 }
 
 namespace POA_ImplementationRepository
 {
-
-
+  
+  
   // TAO_IDL - Generated from
-  // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/upcall_command_ss.cpp:127
-
+  // be\be_visitor_operation/upcall_command_ss.cpp:127
+  
   class _non_existent_ServerObject_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -639,59 +638,59 @@ namespace POA_ImplementationRepository
       , args_ (args)
     {
     }
-
+    
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-
-
+      
+      
       retval =
         this->servant_-> _non_existent (
           ACE_ENV_SINGLE_ARG_PARAMETER);
-
+        
     }
-
+  
   private:
     POA_ImplementationRepository::ServerObject * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-
+  
 }
 void POA_ImplementationRepository::ServerObject::_non_existent_skel (
-    TAO_ServerRequest & server_request,
+    TAO_ServerRequest & server_request, 
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-
-
+  
+  
 #if TAO_HAS_INTERCEPTORS == 1
-  static CORBA::TypeCode_ptr const * const exceptions = 0;
-  static CORBA::ULong const nexceptions = 0;
+  static ::CORBA::TypeCode_ptr const * const exceptions = 0;
+  static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-
+  
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-
+  
   TAO::Argument * const args[] =
     {
       &retval
     };
-
+  
   static size_t const nargs = 1;
-
+  
   POA_ImplementationRepository::ServerObject * const impl =
     static_cast<POA_ImplementationRepository::ServerObject *> (servant);
-
+  
   _non_existent_ServerObject_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-
+  
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -704,18 +703,106 @@ void POA_ImplementationRepository::ServerObject::_non_existent_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
+  
+}
 
+namespace POA_ImplementationRepository
+{
+  
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_operation/upcall_command_ss.cpp:127
+  
+  class _repository_id_ServerObject_Upcall_Command
+    : public TAO::Upcall_Command
+  {
+  public:
+    inline _repository_id_ServerObject_Upcall_Command (
+      POA_ImplementationRepository::ServerObject * servant,
+      TAO_Operation_Details const * operation_details,
+      TAO::Argument * const args[])
+      : servant_ (servant)
+      , operation_details_ (operation_details)
+      , args_ (args)
+    {
+    }
+    
+    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+    {
+      TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
+        TAO::Portable_Server::get_ret_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type> (
+          this->operation_details_,
+          this->args_);
+      
+      
+      retval =
+        this->servant_-> _repository_id (
+          ACE_ENV_SINGLE_ARG_PARAMETER);
+        
+    }
+  
+  private:
+    POA_ImplementationRepository::ServerObject * const servant_;
+    TAO_Operation_Details const * const operation_details_;
+    TAO::Argument * const * const args_;
+  };
+  
+}
+void POA_ImplementationRepository::ServerObject::_repository_id_skel (
+    TAO_ServerRequest & server_request, 
+    void * TAO_INTERCEPTOR (servant_upcall),
+    void * servant
+    ACE_ENV_ARG_DECL
+  )
+{
+  
+  
+#if TAO_HAS_INTERCEPTORS == 1
+  static ::CORBA::TypeCode_ptr const * const exceptions = 0;
+  static ::CORBA::ULong const nexceptions = 0;
+#endif /* TAO_HAS_INTERCEPTORS */
+  
+  TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
+  
+  TAO::Argument * const args[] =
+    {
+      &retval
+    };
+  
+  static size_t const nargs = 1;
+  
+  POA_ImplementationRepository::ServerObject * const impl =
+    static_cast<POA_ImplementationRepository::ServerObject *> (servant);
+  
+  _repository_id_ServerObject_Upcall_Command command (
+    impl,
+    server_request.operation_details (),
+    args);
+  
+  TAO::Upcall_Wrapper upcall_wrapper;
+  upcall_wrapper.upcall (server_request
+                         , args
+                         , nargs
+                         , command
+#if TAO_HAS_INTERCEPTORS == 1
+                         , servant_upcall
+                         , exceptions
+                         , nexceptions
+#endif  /* TAO_HAS_INTERCEPTORS == 1 */
+                         ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+  
 }
 
 
 
-// TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_ss.cpp:393
+// TAO_IDL - Generated from 
+// be\be_visitor_interface/interface_ss.cpp:501
 
 
 
 void POA_ImplementationRepository::ServerObject::_interface_skel (
-    TAO_ServerRequest & server_request,
+    TAO_ServerRequest & server_request, 
     void * /* servant_upcall */,
     void * servant
     ACE_ENV_ARG_DECL
@@ -725,43 +812,43 @@ void POA_ImplementationRepository::ServerObject::_interface_skel (
     ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
         TAO_ORB_Core::ifr_client_adapter_name ()
       );
-
+    
   if (_tao_adapter == 0)
     {
-      ACE_THROW (CORBA::INTF_REPOS (CORBA::OMGVMCID | 1,
-                                    CORBA::COMPLETED_NO));
+      ACE_THROW ( ::CORBA::INTF_REPOS ( ::CORBA::OMGVMCID | 1,
+                                        ::CORBA::COMPLETED_NO));
     }
-
+  
   POA_ImplementationRepository::ServerObject * const impl =
     static_cast<POA_ImplementationRepository::ServerObject *> (servant);
-  CORBA::InterfaceDef_ptr _tao_retval =
+  ::CORBA::InterfaceDef_ptr _tao_retval = 
     impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-
+  
   server_request.init_reply ();
   TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-
-  CORBA::Boolean const _tao_result =
+  
+  ::CORBA::Boolean const _tao_result =
     _tao_adapter->interfacedef_cdr_insert (
         _tao_out,
         _tao_retval
       );
-
+  
   _tao_adapter->dispose (_tao_retval);
-
+  
   if (_tao_result == 0)
     {
-      ACE_THROW (CORBA::MARSHAL ());
+      ACE_THROW ( ::CORBA::MARSHAL ());
     }
 }
 
 namespace POA_ImplementationRepository
 {
-
-
+  
+  
   // TAO_IDL - Generated from
-  // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/upcall_command_ss.cpp:127
-
+  // be\be_visitor_operation/upcall_command_ss.cpp:127
+  
   class _get_component_ServerObject_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -775,59 +862,59 @@ namespace POA_ImplementationRepository
       , args_ (args)
     {
     }
-
+    
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Object, TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-
-
+      
+      
       retval =
         this->servant_-> _get_component (
           ACE_ENV_SINGLE_ARG_PARAMETER);
-
+        
     }
-
+  
   private:
     POA_ImplementationRepository::ServerObject * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-
+  
 }
 void POA_ImplementationRepository::ServerObject::_component_skel (
-    TAO_ServerRequest & server_request,
+    TAO_ServerRequest & server_request, 
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-
-
+  
+  
 #if TAO_HAS_INTERCEPTORS == 1
-  static CORBA::TypeCode_ptr const * const exceptions = 0;
-  static CORBA::ULong const nexceptions = 0;
+  static ::CORBA::TypeCode_ptr const * const exceptions = 0;
+  static ::CORBA::ULong const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-
+  
   TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-
+  
   TAO::Argument * const args[] =
     {
       &retval
     };
-
+  
   static size_t const nargs = 1;
-
+  
   POA_ImplementationRepository::ServerObject * const impl =
     static_cast<POA_ImplementationRepository::ServerObject *> (servant);
-
+  
   _get_component_ServerObject_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-
+  
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -840,10 +927,10 @@ void POA_ImplementationRepository::ServerObject::_component_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-
+  
 }
 
-CORBA::Boolean POA_ImplementationRepository::ServerObject::_is_a (
+::CORBA::Boolean POA_ImplementationRepository::ServerObject::_is_a (
     const char* value
     ACE_ENV_ARG_DECL_NOT_USED
   )
@@ -867,7 +954,7 @@ const char* POA_ImplementationRepository::ServerObject::_interface_repository_id
 }
 
 // TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_ss.cpp:940
+// be\be_visitor_interface/interface_ss.cpp:862
 
 void POA_ImplementationRepository::ServerObject::_dispatch (
     TAO_ServerRequest & req,
@@ -882,29 +969,29 @@ void POA_ImplementationRepository::ServerObject::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_ss.cpp:891
+// be\be_visitor_interface/interface_ss.cpp:813
 
 ImplementationRepository::ServerObject *
 POA_ImplementationRepository::ServerObject::_this (ACE_ENV_SINGLE_ARG_DECL)
 {
   TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   TAO_Stub_Auto_Ptr safe_stub (stub);
-  CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-
-  CORBA::Boolean _tao_opt_colloc =
+  ::CORBA::Object_ptr tmp = CORBA::Object::_nil ();
+  
+  ::CORBA::Boolean _tao_opt_colloc =
     stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-
+  
   ACE_NEW_RETURN (
       tmp,
-      CORBA::Object (stub, _tao_opt_colloc, this),
+      ::CORBA::Object (stub, _tao_opt_colloc, this),
       0
     );
-
-  CORBA::Object_var obj = tmp;
+  
+  ::CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
-
+  
   typedef ::ImplementationRepository::ServerObject STUB_SCOPED_NAME;
   return
     TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
diff --git a/TAO/tao/ImR_Client/ServerObjectS.h b/TAO/tao/ImR_Client/ServerObjectS.h
index 630959d12cb..f62b63a8dc3 100644
--- a/TAO/tao/ImR_Client/ServerObjectS.h
+++ b/TAO/tao/ImR_Client/ServerObjectS.h
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// .\be\be_codegen.cpp:391
+// be\be_codegen.cpp:373
 
 #ifndef _TAO_IDL_SERVEROBJECTS_H_
 #define _TAO_IDL_SERVEROBJECTS_H_
@@ -43,24 +43,15 @@
 #include "tao/PortableServer/PortableServer.h"
 #include "tao/PortableServer/Servant_Base.h"
 
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
 // TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_sh.cpp:49
+// be\be_visitor_module/module_sh.cpp:49
 
 namespace POA_ImplementationRepository
 {
   
   
   // TAO_IDL - Generated from
-  // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_sh.cpp:87
+  // be\be_visitor_interface/interface_sh.cpp:87
   
   class ServerObject;
   typedef ServerObject *ServerObject_ptr;
@@ -83,7 +74,7 @@ namespace POA_ImplementationRepository
     ServerObject (const ServerObject& rhs);
     virtual ~ServerObject (void);
     
-    virtual CORBA::Boolean _is_a (
+    virtual ::CORBA::Boolean _is_a (
         const char* logical_type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
@@ -116,6 +107,13 @@ namespace POA_ImplementationRepository
         ACE_ENV_ARG_DECL
       );
     
+    static void _repository_id_skel (
+        TAO_ServerRequest & req,
+        void * servant_upcall,
+        void * servant
+        ACE_ENV_ARG_DECL
+      );
+    
     virtual void _dispatch (
         TAO_ServerRequest & req,
         void * servant_upcall
@@ -129,13 +127,13 @@ namespace POA_ImplementationRepository
     virtual const char* _interface_repository_id (void) const;
     
     // TAO_IDL - Generated from
-    // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
     
     virtual void ping (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
+        ::CORBA::SystemException
       )) = 0;
     
     static void ping_skel (
@@ -146,13 +144,13 @@ namespace POA_ImplementationRepository
       );
     
     // TAO_IDL - Generated from
-    // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
     
     virtual void shutdown (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
+        ::CORBA::SystemException
       )) = 0;
     
     static void shutdown_skel (
@@ -168,7 +166,7 @@ namespace POA_ImplementationRepository
   //
   
   // TAO_IDL - Generated from
-  // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_interface/strategized_proxy_broker_sh.cpp:36
+  // be\be_visitor_interface/strategized_proxy_broker_sh.cpp:36
   
   class TAO_IMR_Client_Export _TAO_ServerObject_Strategized_Proxy_Broker
     : public virtual TAO::Collocation_Proxy_Broker
@@ -180,15 +178,15 @@ namespace POA_ImplementationRepository
     
     TAO::Collocation_Strategy
     get_strategy (
-        CORBA::Object_ptr obj
+        ::CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL
       )
-      ACE_THROW_SPEC ((CORBA::SystemException));
+      ACE_THROW_SPEC (( ::CORBA::SystemException));
     
     void
     dispatch (
-        CORBA::Object_ptr obj,
-        CORBA::Object_out forward_obj,
+        ::CORBA::Object_ptr obj,
+        ::CORBA::Object_out forward_obj,
         TAO::Argument ** args,
         int num_args,
         const char * op,
@@ -196,7 +194,7 @@ namespace POA_ImplementationRepository
         TAO::Collocation_Strategy strategy
         ACE_ENV_ARG_DECL
       )
-      ACE_THROW_SPEC ((CORBA::Exception));
+      ACE_THROW_SPEC (( ::CORBA::Exception));
     
     static _TAO_ServerObject_Strategized_Proxy_Broker *
     the_TAO_ServerObject_Strategized_Proxy_Broker (void);
@@ -209,7 +207,7 @@ namespace POA_ImplementationRepository
   
   
   // TAO_IDL - Generated from 
-  // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_interface/direct_proxy_impl_sh.cpp:31
+  // be\be_visitor_interface/direct_proxy_impl_sh.cpp:31
   
   ///////////////////////////////////////////////////////////////////////
   //                    Direct  Impl. Declaration
@@ -220,10 +218,10 @@ namespace POA_ImplementationRepository
   public:
     _TAO_ServerObject_Direct_Proxy_Impl (void);
     
-    virtual ~_TAO_ServerObject_Direct_Proxy_Impl (void) {}
+    virtual ~_TAO_ServerObject_Direct_Proxy_Impl (void);
     
     // TAO_IDL - Generated from
-    // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
     
     static void
     ping (
@@ -233,11 +231,11 @@ namespace POA_ImplementationRepository
         ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
+        ::CORBA::SystemException
       ));
     
     // TAO_IDL - Generated from
-    // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/proxy_impl_xh.cpp:24
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
     
     static void
     shutdown (
@@ -247,7 +245,7 @@ namespace POA_ImplementationRepository
         ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
+        ::CORBA::SystemException
       ));
   };
   
@@ -258,22 +256,14 @@ namespace POA_ImplementationRepository
   
 
 // TAO_IDL - Generated from
-// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_sh.cpp:80
+// be\be_visitor_module/module_sh.cpp:80
 
 } // module ImplementationRepository
 
 // TAO_IDL - Generated from 
-// .\be\be_codegen.cpp:995
-
-
+// be\be_codegen.cpp:1072
 
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
 
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
 
 #include /**/ "ace/post.h"
 #endif /* ifndef */
diff --git a/TAO/tao/Makefile.am b/TAO/tao/Makefile.am
index 7c04e23563c..1225b496853 100644
--- a/TAO/tao/Makefile.am
+++ b/TAO/tao/Makefile.am
@@ -2246,10 +2246,8 @@ libTAO_ImR_Client_la_CPPFLAGS = \
 
 libTAO_ImR_Client_la_SOURCES = \
   ImR_Client/ImR_Client.cpp \
-  ImR_Client/ImplRepoA.cpp \
   ImR_Client/ImplRepoC.cpp \
   ImR_Client/ImplRepoS.cpp \
-  ImR_Client/ServerObjectA.cpp \
   ImR_Client/ServerObjectC.cpp \
   ImR_Client/ServerObjectS.cpp \
   ImR_Client/ServerObject_i.cpp
diff --git a/TAO/tao/PI/ClientRequestInfo.cpp b/TAO/tao/PI/ClientRequestInfo.cpp
index 6105ebb0cb6..544a2694509 100644
--- a/TAO/tao/PI/ClientRequestInfo.cpp
+++ b/TAO/tao/PI/ClientRequestInfo.cpp
@@ -540,9 +540,13 @@ TAO_ClientRequestInfo::exception_list (Dynamic::ExceptionList &exception_list)
            i != this->invocation_->operation_details ().ex_count ();
            ++i)
         {
-          CORBA::TypeCode_ptr tcp = this->invocation_->operation_details ().ex_data ()[i].tc_ptr;
-          TAO_Pseudo_Object_Manager<CORBA::TypeCode> tcp_object (&tcp, 1);
-          exception_list[i] = tcp_object;
+          CORBA::TypeCode_ptr tcp =
+            this->invocation_->operation_details ().ex_data ()[i].tc_ptr;
+          if (!CORBA::is_nil (tcp))
+            {
+              TAO_Pseudo_Object_Manager<CORBA::TypeCode> tcp_object (&tcp, 1);
+              exception_list[i] = tcp_object;
+            }
         }
     }
   return true;