ChangeLogTag: Mon May 23 12:38:31 2005 Justin Michel <michel_j@ociweb.com>

8 files changed, 2368 insertions, 2472 deletions

diff --git a/TAO/tao/ImR_Client/ImR_Client.cpp b/TAO/tao/ImR_Client/ImR_Client.cpp
index 6c1be42c8e8..70da4aa13bf 100644
--- a/TAO/tao/ImR_Client/ImR_Client.cpp
+++ b/TAO/tao/ImR_Client/ImR_Client.cpp
@@ -23,14 +23,14 @@ namespace TAO
     ImR_Client_Adapter_Impl::imr_notify_startup (
       TAO_Root_POA* poa ACE_ENV_ARG_DECL)
     {
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG, "Notifying ImR of startup\n"));
-
       CORBA::Object_var imr = poa->orb_core ().implrepo_service ();
 
       if (CORBA::is_nil (imr.in ()))
           return;
 
+      if (TAO_debug_level > 0)
+        ACE_DEBUG ((LM_DEBUG, "Notifying ImR of startup\n"));
+
       ImplementationRepository::Administration_var imr_locator;
 
       {
@@ -167,11 +167,20 @@ namespace TAO
                                                 ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
-      ACE_CATCH (CORBA::COMM_FAILURE, ex)
+      ACE_CATCH(CORBA::COMM_FAILURE, ex)
         {
           // At the moment we call this during ORB shutdown and the ORB is
           // configured to drop replies during shutdown (it does by default in
           // the LF model) we get a COMM_FAILURE exception which we ignore
+          if (TAO_debug_level > 0)
+            ACE_DEBUG((LM_DEBUG, "Ignoring COMM_FAILURE while unregistering from ImR.\n"));
+          ACE_UNUSED_ARG (ex);
+        }
+      ACE_CATCH(CORBA::TRANSIENT, ex)
+        {
+          // Similarly, there are cases where we could get a TRANSIENT.
+          if (TAO_debug_level > 0)
+            ACE_DEBUG((LM_DEBUG, "Ignoring TRANSIENT while unregistering from ImR.\n"));
           ACE_UNUSED_ARG (ex);
         }
       ACE_CATCHANY
diff --git a/TAO/tao/ImR_Client/ImplRepo.pidl b/TAO/tao/ImR_Client/ImplRepo.pidl
index 8d15ef21da5..16d8eb4dd20 100644
--- a/TAO/tao/ImR_Client/ImplRepo.pidl
+++ b/TAO/tao/ImR_Client/ImplRepo.pidl
@@ -15,8 +15,7 @@
  */
 //=============================================================================
 
-///FUZZ: disable check_for_include/
-#include <tao/ImR_Client/ServerObject.pidl>
+#include "ServerObject.pidl"
 
 module ImplementationRepository
 {
@@ -119,27 +118,11 @@ module ImplementationRepository
     void activate_server (in string server)
       raises (NotFound, CannotActivate);
 
-    /// Register the <options> to specify how the <server> should be
-    /// restarted when a client asks for it.
-    ///
-    /// The <AlreadyRegistered> exception is raised when <server> has
-    /// already been registered with the Implementation Repository.
-    /// The <NotFound> exception is raised when the activator specified
-    /// in the options is not registered.
-    void register_server (in string server,
-                          in StartupOptions options)
-      raises (AlreadyRegistered, NotFound);
-
-    /// Update the <options> to specify how the <server> should be
-    /// restarted when a client asks for it.  Will register the server
-    /// if not already registered.
-    /// The <AlreadyRegistered> exception is raised when <server> has
-    /// already been registered with a different activator.
+    /// Add/Update the the <server> 
     /// The <NotFound> exception is raised when the activator specified
     /// in the options is not registered.
-    void reregister_server (in string server,
-                            in StartupOptions options)
-                            raises(AlreadyRegistered, NotFound);
+    void add_or_update_server (in string server, in StartupOptions options)
+      raises(NotFound);
 
     /// Remove <server> from the Implementation Repository.
     ///
@@ -175,11 +158,7 @@ module ImplementationRepository
       raises (NotFound);
 
     /// Returns the startup information for a given <server>.
-    ///
-    /// The <NotFound> exception is raised when <server> is not found
-    /// in the Implementation Repository.
-    void find (in string server, out ServerInformation info)
-      raises (NotFound);
+    void find (in string server, out ServerInformation info);
 
     /// Returns at most <how_many> servers in <server_list>.  If there
     /// are additional servers, they can be received through the
@@ -189,5 +168,9 @@ module ImplementationRepository
     void list (in unsigned long how_many,
                out ServerInformationList server_list,
                out ServerInformationIterator server_iterator);
+
+    /// Shutdown the ImR, optionally shutting down registered
+    /// activators and servers first.
+    oneway void shutdown(in boolean activators, in boolean servers);
   };
 };
diff --git a/TAO/tao/ImR_Client/ImplRepoA.cpp b/TAO/tao/ImR_Client/ImplRepoA.cpp
deleted file mode 100644
index a2cdbdc12c9..00000000000
--- a/TAO/tao/ImR_Client/ImplRepoA.cpp
+++ /dev/null
@@ -1,1069 +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 "ImplRepoC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Enum_TypeCode_Static.h"
-#include "tao/Objref_TypeCode_Static.h"
-#include "tao/Sequence_TypeCode_Static.h"
-#include "tao/String_TypeCode_Static.h"
-#include "tao/Struct_TypeCode_Static.h"
-#include "tao/TypeCode_Struct_Field.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Impl_T.h"
-#include "tao/Any_Dual_Impl_T.h"
-#include "tao/Any_Basic_Impl_T.h"
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
-
-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_typecode/struct_typecode.cpp:74
-
-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_typecode/struct_typecode.cpp:74
-
-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:74
-
-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_typecode/alias_typecode.cpp:31
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
-
-
-#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:74
-
-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_typecode/struct_typecode.cpp:74
-
-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_typecode/alias_typecode.cpp:31
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
-
-
-#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_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_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: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
-// 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/ImplRepoC.cpp b/TAO/tao/ImR_Client/ImplRepoC.cpp
index f859491a6c1..73b23df89b3 100644
--- a/TAO/tao/ImR_Client/ImplRepoC.cpp
+++ b/TAO/tao/ImR_Client/ImplRepoC.cpp
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:291
+// .\be\be_codegen.cpp:291
 
 
 #include "ImplRepoC.h"
@@ -34,6 +34,19 @@
 #include "tao/Exception_Data.h"
 #include "tao/Invocation_Adapter.h"
 #include "tao/Object_T.h"
+#include "tao/Null_RefCount_Policy.h"
+#include "tao/TypeCode_Constants.h"
+#include "tao/Alias_TypeCode_Static.h"
+#include "tao/Enum_TypeCode_Static.h"
+#include "tao/Objref_TypeCode_Static.h"
+#include "tao/Sequence_TypeCode_Static.h"
+#include "tao/String_TypeCode_Static.h"
+#include "tao/Struct_TypeCode_Static.h"
+#include "tao/TypeCode_Struct_Field.h"
+#include "tao/Recursive_Type_TypeCode.h"
+#include "tao/Any_Impl_T.h"
+#include "tao/Any_Dual_Impl_T.h"
+#include "tao/Any_Basic_Impl_T.h"
 #include "tao/Basic_Arguments.h"
 #include "tao/Object_Argument_T.h"
 #include "tao/Special_Basic_Arguments.h"
@@ -50,7 +63,7 @@
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
+// .\be\be_visitor_arg_traits.cpp:69
 
 // Arg traits specializations.
 namespace TAO
@@ -58,7 +71,7 @@ namespace TAO
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVEROBJECT__ARG_TRAITS_CS_)
 #define _IMPLEMENTATIONREPOSITORY_SERVEROBJECT__ARG_TRAITS_CS_
-  
+ 
   template<>
   class  Arg_Traits<ImplementationRepository::ServerObject>
     : public
@@ -72,13 +85,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+ 
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:751
+  // .\be\be_visitor_arg_traits.cpp:772
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_STARTUPOPTIONS__ARG_TRAITS_CS_)
 #define _IMPLEMENTATIONREPOSITORY_STARTUPOPTIONS__ARG_TRAITS_CS_
-  
+ 
   template<>
   class Arg_Traits<ImplementationRepository::StartupOptions>
     : public
@@ -91,13 +104,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+ 
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:751
+  // .\be\be_visitor_arg_traits.cpp:772
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATION__ARG_TRAITS_CS_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATION__ARG_TRAITS_CS_
-  
+ 
   template<>
   class Arg_Traits<ImplementationRepository::ServerInformation>
     : public
@@ -110,13 +123,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+ 
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:496
+  // .\be\be_visitor_arg_traits.cpp:489
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST__ARG_TRAITS_CS_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST__ARG_TRAITS_CS_
-  
+ 
   template<>
   class Arg_Traits<ImplementationRepository::ServerInformationList>
     : public
@@ -132,7 +145,7 @@ namespace TAO
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR__ARG_TRAITS_CS_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR__ARG_TRAITS_CS_
-  
+ 
   template<>
   class  Arg_Traits<ImplementationRepository::ServerInformationIterator>
     : public
@@ -149,8 +162,8 @@ namespace TAO
 }
 
 
-// TAO_IDL - Generated from 
-// be\be_visitor_exception/exception_cs.cpp:63
+// TAO_IDL - Generated from
+// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_exception/exception_cs.cpp:63
 
 ImplementationRepository::AlreadyRegistered::AlreadyRegistered (void)
   : CORBA::UserException (
@@ -231,7 +244,7 @@ void ImplementationRepository::AlreadyRegistered::_tao_encode (
     {
       return;
     }
-  
+ 
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -244,7 +257,7 @@ void ImplementationRepository::AlreadyRegistered::_tao_decode (
     {
       return;
     }
-  
+ 
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -254,8 +267,31 @@ CORBA::TypeCode_ptr ImplementationRepository::AlreadyRegistered::_tao_type (void
   return ::ImplementationRepository::_tc_AlreadyRegistered;
 }
 
-// TAO_IDL - Generated from 
-// be\be_visitor_exception/exception_cs.cpp:63
+// 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_exception/exception_cs.cpp:63
 
 ImplementationRepository::CannotActivate::CannotActivate (void)
   : CORBA::UserException (
@@ -338,7 +374,7 @@ void ImplementationRepository::CannotActivate::_tao_encode (
     {
       return;
     }
-  
+ 
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -351,14 +387,14 @@ void ImplementationRepository::CannotActivate::_tao_decode (
     {
       return;
     }
-  
+ 
   ACE_THROW (CORBA::MARSHAL ());
 }
 
 
 
 // TAO_IDL - Generated from
-// be\be_visitor_exception/exception_ctor.cpp:66
+// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_exception/exception_ctor.cpp:66
 
 ImplementationRepository::CannotActivate::CannotActivate (
     const char * _tao_reason
@@ -377,8 +413,35 @@ CORBA::TypeCode_ptr ImplementationRepository::CannotActivate::_tao_type (void) c
   return ::ImplementationRepository::_tc_CannotActivate;
 }
 
-// TAO_IDL - Generated from 
-// be\be_visitor_exception/exception_cs.cpp:63
+// 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_exception/exception_cs.cpp:63
 
 ImplementationRepository::NotFound::NotFound (void)
   : CORBA::UserException (
@@ -459,7 +522,7 @@ void ImplementationRepository::NotFound::_tao_encode (
     {
       return;
     }
-  
+ 
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -472,7 +535,7 @@ void ImplementationRepository::NotFound::_tao_decode (
     {
       return;
     }
-  
+ 
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -482,10 +545,61 @@ CORBA::TypeCode_ptr ImplementationRepository::NotFound::_tao_type (void) const
   return ::ImplementationRepository::_tc_NotFound;
 }
 
-// TAO_IDL - Generated from 
-// be\be_visitor_structure/structure_cs.cpp:66
+// 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;
+}
+
 
-void 
+
+// TAO_IDL - Generated from
+// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_structure/structure_cs.cpp:66
+
+void
 ImplementationRepository::EnvironmentVariable::_tao_any_destructor (
     void *_tao_void_pointer
   )
@@ -495,8 +609,8 @@ ImplementationRepository::EnvironmentVariable::_tao_any_destructor (
   delete _tao_tmp_pointer;
 }
 
-// TAO_IDL - Generated from 
-// be\be_visitor_sequence/sequence_cs.cpp:65
+// TAO_IDL - Generated from
+// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_sequence/sequence_cs.cpp:65
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST_CS_)
 #define _IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST_CS_
@@ -548,10 +662,124 @@ void ImplementationRepository::EnvironmentList::_tao_any_destructor (
 
 #endif /* end #if !defined */
 
-// TAO_IDL - Generated from 
-// be\be_visitor_structure/structure_cs.cpp:66
+// 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;
+}
+
+
 
-void 
+// 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_structure/structure_cs.cpp:66
+
+void
 ImplementationRepository::StartupOptions::_tao_any_destructor (
     void *_tao_void_pointer
   )
@@ -561,10 +789,39 @@ ImplementationRepository::StartupOptions::_tao_any_destructor (
   delete _tao_tmp_pointer;
 }
 
-// TAO_IDL - Generated from 
-// be\be_visitor_structure/structure_cs.cpp:66
+// TAO_IDL - Generated from
+// c:\cvsdoc\ace_wrappers\tao\tao_idl\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
+// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_structure/structure_cs.cpp:66
+
+void
 ImplementationRepository::ServerInformation::_tao_any_destructor (
     void *_tao_void_pointer
   )
@@ -574,8 +831,8 @@ ImplementationRepository::ServerInformation::_tao_any_destructor (
   delete _tao_tmp_pointer;
 }
 
-// TAO_IDL - Generated from 
-// be\be_visitor_sequence/sequence_cs.cpp:65
+// TAO_IDL - Generated from
+// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_sequence/sequence_cs.cpp:65
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST_CS_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST_CS_
@@ -628,7 +885,55 @@ void ImplementationRepository::ServerInformationList::_tao_any_destructor (
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
+// 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_interface/interface_cs.cpp:60
 
 // Traits specializations for ImplementationRepository::ServerInformationIterator.
 
@@ -664,13 +969,13 @@ TAO::Objref_Traits<ImplementationRepository::ServerInformationIterator>::marshal
 }
 
 // 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
   ) = 0;
 
 // TAO_IDL - Generated from
-// be\be_visitor_operation/operation_cs.cpp:78
+// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_cs.cpp:78
 
 CORBA::Boolean ImplementationRepository::ServerInformationIterator::next_n (
     ::CORBA::ULong how_many,
@@ -685,23 +990,23 @@ CORBA::Boolean ImplementationRepository::ServerInformationIterator::next_n (
     {
       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,
@@ -710,15 +1015,15 @@ 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
-// be\be_visitor_operation/operation_cs.cpp:78
+// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_cs.cpp:78
 
 void ImplementationRepository::ServerInformationIterator::destroy (
     ACE_ENV_SINGLE_ARG_DECL
@@ -731,19 +1036,19 @@ void ImplementationRepository::ServerInformationIterator::destroy (
     {
       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,
@@ -752,7 +1057,7 @@ void ImplementationRepository::ServerInformationIterator::destroy (
       7,
       this->the_TAO_ServerInformationIterator_Proxy_Broker_
     );
-  
+ 
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
@@ -776,7 +1081,7 @@ ImplementationRepository::ServerInformationIterator::ImplementationRepository_Se
 ImplementationRepository::ServerInformationIterator::~ServerInformationIterator (void)
 {}
 
-void 
+void
 ImplementationRepository::ServerInformationIterator::_tao_any_destructor (void *_tao_void_pointer)
 {
   ServerInformationIterator *_tao_tmp_pointer =
@@ -821,7 +1126,7 @@ ImplementationRepository::ServerInformationIterator::_duplicate (ServerInformati
     {
       obj->_add_ref ();
     }
-  
+ 
   return obj;
 }
 
@@ -871,7 +1176,25 @@ ImplementationRepository::ServerInformationIterator::marshal (TAO_OutputCDR &cdr
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
+// 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_interface/interface_cs.cpp:60
 
 // Traits specializations for ImplementationRepository::Administration.
 
@@ -907,13 +1230,13 @@ TAO::Objref_Traits<ImplementationRepository::Administration>::marshal (
 }
 
 // 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
   ) = 0;
 
 // TAO_IDL - Generated from
-// be\be_visitor_operation/operation_cs.cpp:78
+// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_cs.cpp:78
 
 void ImplementationRepository::Administration::activate_server (
     const char * server
@@ -929,37 +1252,37 @@ void ImplementationRepository::Administration::activate_server (
     {
       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
       },
-      
+ 
       {
         "IDL:ImplementationRepository/CannotActivate:1.0",
         ImplementationRepository::CannotActivate::_alloc,
         ImplementationRepository::_tc_CannotActivate
       }
     };
-  
+ 
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -968,7 +1291,7 @@ void ImplementationRepository::Administration::activate_server (
       15,
       this->the_TAO_Administration_Proxy_Broker_
     );
-  
+ 
   _tao_call.invoke (
       _tao_ImplementationRepository_Administration_activate_server_exceptiondata,
       2
@@ -978,16 +1301,15 @@ void ImplementationRepository::Administration::activate_server (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_operation/operation_cs.cpp:78
+// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_cs.cpp:78
 
-void ImplementationRepository::Administration::register_server (
+void ImplementationRepository::Administration::add_or_update_server (
     const char * server,
     const ::ImplementationRepository::StartupOptions & options
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException,
-    ::ImplementationRepository::AlreadyRegistered,
     ::ImplementationRepository::NotFound
   ))
 {
@@ -995,126 +1317,52 @@ void ImplementationRepository::Administration::register_server (
     {
       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_register_server_exceptiondata [] = 
+  _tao_ImplementationRepository_Administration_add_or_update_server_exceptiondata [] =
     {
       {
-        "IDL:ImplementationRepository/AlreadyRegistered:1.0",
-        ImplementationRepository::AlreadyRegistered::_alloc,
-        ImplementationRepository::_tc_AlreadyRegistered
-      },
-      
-      {
         "IDL:ImplementationRepository/NotFound:1.0",
         ImplementationRepository::NotFound::_alloc,
         ImplementationRepository::_tc_NotFound
       }
     };
-  
+ 
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
       3,
-      "register_server",
-      15,
+      "add_or_update_server",
+      20,
       this->the_TAO_Administration_Proxy_Broker_
     );
-  
+ 
   _tao_call.invoke (
-      _tao_ImplementationRepository_Administration_register_server_exceptiondata,
-      2
-      ACE_ENV_ARG_PARAMETER
-    );
-  ACE_CHECK;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_operation/operation_cs.cpp:78
-
-void ImplementationRepository::Administration::reregister_server (
-    const char * server,
-    const ::ImplementationRepository::StartupOptions & options
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException,
-    ::ImplementationRepository::AlreadyRegistered,
-    ::ImplementationRepository::NotFound
-  ))
-{
-  if (!this->is_evaluated ())
-    {
-      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_reregister_server_exceptiondata [] = 
-    {
-      {
-        "IDL:ImplementationRepository/AlreadyRegistered:1.0",
-        ImplementationRepository::AlreadyRegistered::_alloc,
-        ImplementationRepository::_tc_AlreadyRegistered
-      },
-      
-      {
-        "IDL:ImplementationRepository/NotFound:1.0",
-        ImplementationRepository::NotFound::_alloc,
-        ImplementationRepository::_tc_NotFound
-      }
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      3,
-      "reregister_server",
-      17,
-      this->the_TAO_Administration_Proxy_Broker_
-    );
-  
-  _tao_call.invoke (
-      _tao_ImplementationRepository_Administration_reregister_server_exceptiondata,
-      2
+      _tao_ImplementationRepository_Administration_add_or_update_server_exceptiondata,
+      1
       ACE_ENV_ARG_PARAMETER
     );
   ACE_CHECK;
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_operation/operation_cs.cpp:78
+// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_cs.cpp:78
 
 void ImplementationRepository::Administration::remove_server (
     const char * server
@@ -1129,23 +1377,23 @@ void ImplementationRepository::Administration::remove_server (
     {
       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",
@@ -1153,7 +1401,7 @@ void ImplementationRepository::Administration::remove_server (
         ImplementationRepository::_tc_NotFound
       }
     };
-  
+ 
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -1162,7 +1410,7 @@ void ImplementationRepository::Administration::remove_server (
       13,
       this->the_TAO_Administration_Proxy_Broker_
     );
-  
+ 
   _tao_call.invoke (
       _tao_ImplementationRepository_Administration_remove_server_exceptiondata,
       1
@@ -1172,7 +1420,7 @@ void ImplementationRepository::Administration::remove_server (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_operation/operation_cs.cpp:78
+// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_cs.cpp:78
 
 void ImplementationRepository::Administration::shutdown_server (
     const char * server
@@ -1187,23 +1435,23 @@ void ImplementationRepository::Administration::shutdown_server (
     {
       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",
@@ -1211,7 +1459,7 @@ void ImplementationRepository::Administration::shutdown_server (
         ImplementationRepository::_tc_NotFound
       }
     };
-  
+ 
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -1220,7 +1468,7 @@ void ImplementationRepository::Administration::shutdown_server (
       15,
       this->the_TAO_Administration_Proxy_Broker_
     );
-  
+ 
   _tao_call.invoke (
       _tao_ImplementationRepository_Administration_shutdown_server_exceptiondata,
       1
@@ -1230,7 +1478,7 @@ void ImplementationRepository::Administration::shutdown_server (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_operation/operation_cs.cpp:78
+// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_cs.cpp:78
 
 void ImplementationRepository::Administration::server_is_running (
     const char * server,
@@ -1247,17 +1495,17 @@ void ImplementationRepository::Administration::server_is_running (
     {
       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,
@@ -1265,9 +1513,9 @@ 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",
@@ -1275,7 +1523,7 @@ void ImplementationRepository::Administration::server_is_running (
         ImplementationRepository::_tc_NotFound
       }
     };
-  
+ 
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -1284,7 +1532,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
@@ -1294,7 +1542,7 @@ void ImplementationRepository::Administration::server_is_running (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_operation/operation_cs.cpp:78
+// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_cs.cpp:78
 
 void ImplementationRepository::Administration::server_is_shutting_down (
     const char * server
@@ -1309,23 +1557,23 @@ void ImplementationRepository::Administration::server_is_shutting_down (
     {
       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",
@@ -1333,7 +1581,7 @@ void ImplementationRepository::Administration::server_is_shutting_down (
         ImplementationRepository::_tc_NotFound
       }
     };
-  
+ 
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -1342,7 +1590,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
@@ -1352,7 +1600,7 @@ void ImplementationRepository::Administration::server_is_shutting_down (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_operation/operation_cs.cpp:78
+// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_cs.cpp:78
 
 void ImplementationRepository::Administration::find (
     const char * server,
@@ -1360,41 +1608,30 @@ void ImplementationRepository::Administration::find (
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
-    CORBA::SystemException,
-    ::ImplementationRepository::NotFound
+    CORBA::SystemException
   ))
 {
   if (!this->is_evaluated ())
     {
       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
     };
-  
-  static TAO::Exception_Data
-  _tao_ImplementationRepository_Administration_find_exceptiondata [] = 
-    {
-      {
-        "IDL:ImplementationRepository/NotFound:1.0",
-        ImplementationRepository::NotFound::_alloc,
-        ImplementationRepository::_tc_NotFound
-      }
-    };
-  
+ 
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -1403,17 +1640,13 @@ void ImplementationRepository::Administration::find (
       4,
       this->the_TAO_Administration_Proxy_Broker_
     );
-  
-  _tao_call.invoke (
-      _tao_ImplementationRepository_Administration_find_exceptiondata,
-      1
-      ACE_ENV_ARG_PARAMETER
-    );
+ 
+  _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_operation/operation_cs.cpp:78
+// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_cs.cpp:78
 
 void ImplementationRepository::Administration::list (
     ::CORBA::ULong how_many,
@@ -1429,17 +1662,17 @@ void ImplementationRepository::Administration::list (
     {
       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,
@@ -1447,7 +1680,7 @@ void ImplementationRepository::Administration::list (
       &_tao_server_list,
       &_tao_server_iterator
     };
-  
+ 
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -1456,7 +1689,54 @@ 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
+
+void ImplementationRepository::Administration::shutdown (
+    ::CORBA::Boolean activators,
+    ::CORBA::Boolean servers
+    ACE_ENV_ARG_DECL
+  )
+  ACE_THROW_SPEC ((
+    CORBA::SystemException
+  ))
+{
+  if (!this->is_evaluated ())
+    {
+      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,
+      3,
+      "shutdown",
+      8,
+      this->the_TAO_Administration_Proxy_Broker_,
+      TAO::TAO_ONEWAY_INVOCATION
+    );
+ 
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
@@ -1480,7 +1760,7 @@ ImplementationRepository::Administration::ImplementationRepository_Administratio
 ImplementationRepository::Administration::~Administration (void)
 {}
 
-void 
+void
 ImplementationRepository::Administration::_tao_any_destructor (void *_tao_void_pointer)
 {
   Administration *_tao_tmp_pointer =
@@ -1525,7 +1805,7 @@ ImplementationRepository::Administration::_duplicate (Administration_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+ 
   return obj;
 }
 
@@ -1575,7 +1855,725 @@ ImplementationRepository::Administration::marshal (TAO_OutputCDR &cdr)
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_exception/cdr_op_cs.cpp:60
+// 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
+      );
+}
+
+// TAO_IDL - Generated from
+// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_exception/cdr_op_cs.cpp:60
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -1595,7 +2593,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_exception/cdr_op_cs.cpp:60
+// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_exception/cdr_op_cs.cpp:60
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -1628,7 +2626,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_exception/cdr_op_cs.cpp:60
+// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_exception/cdr_op_cs.cpp:60
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -1648,7 +2646,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_structure/cdr_op_cs.cpp:61
+// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_structure/cdr_op_cs.cpp:61
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -1671,7 +2669,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_cs.cpp:96
+// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_sequence/cdr_op_cs.cpp:96
 
 #if !defined _TAO_CDR_OP_ImplementationRepository_EnvironmentList_CPP_
 #define _TAO_CDR_OP_ImplementationRepository_EnvironmentList_CPP_
@@ -1682,20 +2680,20 @@ CORBA::Boolean operator<< (
   )
 {
   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)
         {
           _tao_marshal_flag = (strm << _tao_sequence[i]);
         }
-      
+ 
       return _tao_marshal_flag;
     }
-  
+ 
   return false;
 }
 
@@ -1705,7 +2703,7 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::ULong _tao_seq_len;
-  
+ 
   if (strm >> _tao_seq_len)
     {
       // Add a check to the length of the sequence
@@ -1715,35 +2713,35 @@ 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)
         {
           _tao_marshal_flag = (strm >> _tao_sequence[i]);
         }
-      
+ 
       return _tao_marshal_flag;
-    
+ 
     }
-  
+ 
   return false;
 }
 
 #endif /* _TAO_CDR_OP_ImplementationRepository_EnvironmentList_CPP_ */
 
 // TAO_IDL - Generated from
-// be\be_visitor_enum/cdr_op_cs.cpp:51
+// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_enum/cdr_op_cs.cpp:51
 
 CORBA::Boolean operator<< (TAO_OutputCDR & strm, ImplementationRepository::ActivationMode _tao_enumerator)
 {
@@ -1754,17 +2752,17 @@ CORBA::Boolean operator>> (TAO_InputCDR & strm, ImplementationRepository::Activa
 {
   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
-// be\be_visitor_structure/cdr_op_cs.cpp:61
+// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_structure/cdr_op_cs.cpp:61
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -1795,7 +2793,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_structure/cdr_op_cs.cpp:61
+// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_structure/cdr_op_cs.cpp:61
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -1820,7 +2818,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_cs.cpp:96
+// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_sequence/cdr_op_cs.cpp:96
 
 #if !defined _TAO_CDR_OP_ImplementationRepository_ServerInformationList_CPP_
 #define _TAO_CDR_OP_ImplementationRepository_ServerInformationList_CPP_
@@ -1831,20 +2829,20 @@ CORBA::Boolean operator<< (
   )
 {
   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)
         {
           _tao_marshal_flag = (strm << _tao_sequence[i]);
         }
-      
+ 
       return _tao_marshal_flag;
     }
-  
+ 
   return false;
 }
 
@@ -1854,7 +2852,7 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::ULong _tao_seq_len;
-  
+ 
   if (strm >> _tao_seq_len)
     {
       // Add a check to the length of the sequence
@@ -1864,35 +2862,35 @@ 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)
         {
           _tao_marshal_flag = (strm >> _tao_sequence[i]);
         }
-      
+ 
       return _tao_marshal_flag;
-    
+ 
     }
-  
+ 
   return false;
 }
 
 #endif /* _TAO_CDR_OP_ImplementationRepository_ServerInformationList_CPP_ */
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/cdr_op_cs.cpp:63
+// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_interface/cdr_op_cs.cpp:63
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -1909,26 +2907,26 @@ CORBA::Boolean operator>> (
   )
 {
   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
-// be\be_visitor_interface/cdr_op_cs.cpp:63
+// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_interface/cdr_op_cs.cpp:63
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -1945,20 +2943,20 @@ CORBA::Boolean operator>> (
   )
 {
   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 be2978194b9..e1285836169 100644
--- a/TAO/tao/ImR_Client/ImplRepoC.h
+++ b/TAO/tao/ImR_Client/ImplRepoC.h
@@ -26,10 +26,10 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:153
+// .\be\be_codegen.cpp:153
 
-#ifndef _TAO_IDL_ORIG_IMPLREPOC_H_
-#define _TAO_IDL_ORIG_IMPLREPOC_H_
+#ifndef _TAO_IDL_IMPLREPOC_H_
+#define _TAO_IDL_IMPLREPOC_H_
 
 #include /**/ "ace/pre.h"
 
@@ -67,8 +67,8 @@
 #pragma option push -w-rvl -w-rch -w-ccc -w-inl
 #endif /* __BORLANDC__ */
 
-// TAO_IDL - Generated from 
-// be\be_visitor_root/root_ch.cpp:62
+// TAO_IDL - Generated from
+// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_root/root_ch.cpp:62
 
 namespace TAO
 {
@@ -77,34 +77,34 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:48
+// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_ch.cpp:48
 
 namespace ImplementationRepository
 {
-  
+ 
   // TAO_IDL - Generated from
-  // be\be_visitor_exception/exception_ch.cpp:51
+  // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_exception/exception_ch.cpp:51
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_ALREADYREGISTERED_CH_)
 #define _IMPLEMENTATIONREPOSITORY_ALREADYREGISTERED_CH_
-  
+ 
   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;
 
     virtual void _raise (void) const;
@@ -113,49 +113,49 @@ namespace ImplementationRepository
         TAO_OutputCDR &
         ACE_ENV_ARG_DECL
       ) const;
-    
+ 
     virtual void _tao_decode (
         TAO_InputCDR &
         ACE_ENV_ARG_DECL
       );
-    
+ 
     // TAO_IDL - Generated from
-    // be\be_visitor_exception/exception_ch.cpp:127
-    
+    // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_exception/exception_ch.cpp:127
+ 
     virtual CORBA::TypeCode_ptr _tao_type (void) const;
   };
-  
+ 
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
+  // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/typecode_decl.cpp:44
+ 
   extern TAO_IMR_Client_Export ::CORBA::TypeCode_ptr const _tc_AlreadyRegistered;
 
 #endif /* end #if !defined */
-  
+ 
   // TAO_IDL - Generated from
-  // be\be_visitor_exception/exception_ch.cpp:51
+  // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_exception/exception_ch.cpp:51
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_CANNOTACTIVATE_CH_)
 #define _IMPLEMENTATIONREPOSITORY_CANNOTACTIVATE_CH_
-  
+ 
   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;
 
     virtual void _raise (void) const;
@@ -164,55 +164,55 @@ namespace ImplementationRepository
         TAO_OutputCDR &
         ACE_ENV_ARG_DECL
       ) const;
-    
+ 
     virtual void _tao_decode (
         TAO_InputCDR &
         ACE_ENV_ARG_DECL
       );
-    
+ 
     // TAO_IDL - Generated from
-    // be\be_visitor_exception/exception_ctor.cpp:66
-    
+    // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_exception/exception_ctor.cpp:66
+ 
     CannotActivate (
         const char * _tao_reason
       );
-    
+ 
     // TAO_IDL - Generated from
-    // be\be_visitor_exception/exception_ch.cpp:127
-    
+    // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_exception/exception_ch.cpp:127
+ 
     virtual CORBA::TypeCode_ptr _tao_type (void) const;
   };
-  
+ 
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
+  // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/typecode_decl.cpp:44
+ 
   extern TAO_IMR_Client_Export ::CORBA::TypeCode_ptr const _tc_CannotActivate;
 
 #endif /* end #if !defined */
-  
+ 
   // TAO_IDL - Generated from
-  // be\be_visitor_exception/exception_ch.cpp:51
+  // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_exception/exception_ch.cpp:51
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_NOTFOUND_CH_)
 #define _IMPLEMENTATIONREPOSITORY_NOTFOUND_CH_
-  
+ 
   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;
 
     virtual void _raise (void) const;
@@ -221,75 +221,75 @@ namespace ImplementationRepository
         TAO_OutputCDR &
         ACE_ENV_ARG_DECL
       ) const;
-    
+ 
     virtual void _tao_decode (
         TAO_InputCDR &
         ACE_ENV_ARG_DECL
       );
-    
+ 
     // TAO_IDL - Generated from
-    // be\be_visitor_exception/exception_ch.cpp:127
-    
+    // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_exception/exception_ch.cpp:127
+ 
     virtual CORBA::TypeCode_ptr _tao_type (void) const;
   };
-  
+ 
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
+  // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/typecode_decl.cpp:44
+ 
   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
-  // be\be_visitor_structure/structure_ch.cpp:52
-  
+  // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_structure/structure_ch.cpp:52
+ 
   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
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
+  // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/typecode_decl.cpp:44
+ 
   extern TAO_IMR_Client_Export ::CORBA::TypeCode_ptr const _tc_EnvironmentVariable;
-  
+ 
   // TAO_IDL - Generated from
-  // be\be_visitor_sequence/sequence_ch.cpp:101
+  // c:\cvsdoc\ace_wrappers\tao\tao_idl\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 +297,7 @@ namespace ImplementationRepository
         EnvironmentVariable
       >
     EnvironmentList_out;
-  
+ 
   class TAO_IMR_Client_Export EnvironmentList
     : public
         TAO_Unbounded_Sequence<
@@ -310,27 +310,27 @@ namespace ImplementationRepository
     EnvironmentList (
         CORBA::ULong max,
         CORBA::ULong length,
-        EnvironmentVariable* buffer, 
+        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
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
+  // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/typecode_decl.cpp:44
+ 
   extern TAO_IMR_Client_Export ::CORBA::TypeCode_ptr const _tc_EnvironmentList;
-  
+ 
   // TAO_IDL - Generated from
-  // be\be_visitor_enum/enum_ch.cpp:57
-  
+  // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_enum/enum_ch.cpp:57
+ 
   enum ActivationMode
   {
     NORMAL,
@@ -338,39 +338,39 @@ namespace ImplementationRepository
     PER_CLIENT,
     AUTO_START
   };
-  
+ 
   typedef ActivationMode &ActivationMode_out;
-  
+ 
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
+  // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/typecode_decl.cpp:44
+ 
   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
-  // be\be_visitor_structure/structure_ch.cpp:52
-  
+  // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_structure/structure_ch.cpp:52
+ 
   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;
@@ -379,63 +379,63 @@ namespace ImplementationRepository
     TAO_String_Manager activator;
     CORBA::Long start_limit;
   };
-  
+ 
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
+  // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/typecode_decl.cpp:44
+ 
   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
-  // be\be_visitor_structure/structure_ch.cpp:52
-  
+  // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_structure/structure_ch.cpp:52
+ 
   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
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
+  // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/typecode_decl.cpp:44
+ 
   extern TAO_IMR_Client_Export ::CORBA::TypeCode_ptr const _tc_ServerInformation;
-  
+ 
   // TAO_IDL - Generated from
-  // be\be_visitor_sequence/sequence_ch.cpp:101
+  // c:\cvsdoc\ace_wrappers\tao\tao_idl\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 +443,7 @@ namespace ImplementationRepository
         ServerInformation
       >
     ServerInformationList_out;
-  
+ 
   class TAO_IMR_Client_Export ServerInformationList
     : public
         TAO_Unbounded_Sequence<
@@ -456,39 +456,39 @@ namespace ImplementationRepository
     ServerInformationList (
         CORBA::ULong max,
         CORBA::ULong length,
-        ServerInformation* buffer, 
+        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
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
+  // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/typecode_decl.cpp:44
+ 
   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,13 +496,13 @@ namespace ImplementationRepository
     ServerInformationIterator_out;
 
 #endif /* end #if !defined */
-  
+ 
   // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
+  // c:\cvsdoc\ace_wrappers\tao\tao_idl\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
   {
@@ -510,32 +510,32 @@ namespace ImplementationRepository
     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
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+ 
     static ServerInformationIterator_ptr _unchecked_narrow (
         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
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
+    // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
+ 
     virtual CORBA::Boolean next_n (
         ::CORBA::ULong how_many,
         ::ImplementationRepository::ServerInformationList_out servers
@@ -544,44 +544,44 @@ namespace ImplementationRepository
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+ 
     // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
+    // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
+ 
     virtual void destroy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+ 
     // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:210
-    
+    // c:\cvsdoc\ace_wrappers\tao\tao_idl\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);
   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,
@@ -589,38 +589,38 @@ namespace ImplementationRepository
         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
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
+  // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/typecode_decl.cpp:44
+ 
   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,13 +628,13 @@ namespace ImplementationRepository
     Administration_out;
 
 #endif /* end #if !defined */
-  
+ 
   // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
+  // c:\cvsdoc\ace_wrappers\tao\tao_idl\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
   {
@@ -642,32 +642,32 @@ namespace ImplementationRepository
     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
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+ 
     static Administration_ptr _unchecked_narrow (
         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
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
+    // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
+ 
     virtual void activate_server (
         const char * server
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -677,38 +677,23 @@ namespace ImplementationRepository
         ::ImplementationRepository::NotFound,
         ::ImplementationRepository::CannotActivate
       ));
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual void register_server (
-        const char * server,
-        const ::ImplementationRepository::StartupOptions & options
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::ImplementationRepository::AlreadyRegistered,
-        ::ImplementationRepository::NotFound
-      ));
-    
+ 
     // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual void reregister_server (
+    // c:\cvsdoc\ace_wrappers\tao\tao_idl\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,
-        ::ImplementationRepository::AlreadyRegistered,
         ::ImplementationRepository::NotFound
       ));
-    
+ 
     // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
+    // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
+ 
     virtual void remove_server (
         const char * server
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -717,10 +702,10 @@ namespace ImplementationRepository
         CORBA::SystemException,
         ::ImplementationRepository::NotFound
       ));
-    
+ 
     // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
+    // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
+ 
     virtual void shutdown_server (
         const char * server
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -729,10 +714,10 @@ namespace ImplementationRepository
         CORBA::SystemException,
         ::ImplementationRepository::NotFound
       ));
-    
+ 
     // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
+    // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
+ 
     virtual void server_is_running (
         const char * server,
         const char * partial_ior,
@@ -743,10 +728,10 @@ namespace ImplementationRepository
         CORBA::SystemException,
         ::ImplementationRepository::NotFound
       ));
-    
+ 
     // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
+    // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
+ 
     virtual void server_is_shutting_down (
         const char * server
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -755,23 +740,22 @@ namespace ImplementationRepository
         CORBA::SystemException,
         ::ImplementationRepository::NotFound
       ));
-    
+ 
     // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
+    // c:\cvsdoc\ace_wrappers\tao\tao_idl\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,
-        ::ImplementationRepository::NotFound
+        CORBA::SystemException
       ));
-    
+ 
     // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-    
+    // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
+ 
     virtual void list (
         ::CORBA::ULong how_many,
         ::ImplementationRepository::ServerInformationList_out server_list,
@@ -781,34 +765,46 @@ namespace ImplementationRepository
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+ 
+    // TAO_IDL - Generated from
+    // c:\cvsdoc\ace_wrappers\tao\tao_idl\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
+      ));
+ 
     // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:210
-    
+    // c:\cvsdoc\ace_wrappers\tao\tao_idl\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);
   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,
@@ -816,32 +812,32 @@ namespace ImplementationRepository
         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
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
+  // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/typecode_decl.cpp:44
+ 
   extern TAO_IMR_Client_Export ::CORBA::TypeCode_ptr const _tc_Administration;
 
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
+// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_ch.cpp:66
 
 } // module ImplementationRepository
 
 // Proxy Broker Factory function pointer declarations.
 
 // TAO_IDL - Generated from
-// be\be_visitor_root/root.cpp:139
+// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_root/root.cpp:139
 
 extern TAO_IMR_Client_Export
 TAO::Collocation_Proxy_Broker *
@@ -856,7 +852,7 @@ TAO::Collocation_Proxy_Broker *
   );
 
 // TAO_IDL - Generated from
-// be\be_visitor_traits.cpp:61
+// .\be\be_visitor_traits.cpp:61
 
 // Traits specializations.
 namespace TAO
@@ -864,7 +860,7 @@ namespace TAO
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR__TRAITS_CH_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR__TRAITS_CH_
-  
+ 
   template<>
   struct TAO_IMR_Client_Export Objref_Traits< ::ImplementationRepository::ServerInformationIterator>
   {
@@ -885,7 +881,7 @@ namespace TAO
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_ADMINISTRATION__TRAITS_CH_)
 #define _IMPLEMENTATIONREPOSITORY_ADMINISTRATION__TRAITS_CH_
-  
+ 
   template<>
   struct TAO_IMR_Client_Export Objref_Traits< ::ImplementationRepository::Administration>
   {
@@ -906,7 +902,7 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_exception/any_op_ch.cpp:52
+// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_exception/any_op_ch.cpp:52
 
 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
@@ -914,7 +910,7 @@ TAO_IMR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, Implementa
 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:52
+// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_exception/any_op_ch.cpp:52
 
 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
@@ -922,7 +918,7 @@ TAO_IMR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, Implementa
 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:52
+// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_exception/any_op_ch.cpp:52
 
 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
@@ -930,7 +926,7 @@ TAO_IMR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, Implementa
 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:52
+// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_structure/any_op_ch.cpp:52
 
 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
@@ -938,7 +934,7 @@ TAO_IMR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, Implementa
 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:52
+// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_sequence/any_op_ch.cpp:52
 
 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
@@ -946,13 +942,13 @@ TAO_IMR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, Implementa
 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:51
+// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_enum/any_op_ch.cpp:51
 
 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:52
+// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_structure/any_op_ch.cpp:52
 
 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
@@ -960,7 +956,7 @@ TAO_IMR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, Implementa
 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:52
+// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_structure/any_op_ch.cpp:52
 
 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
@@ -968,7 +964,7 @@ TAO_IMR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, Implementa
 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:52
+// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_sequence/any_op_ch.cpp:52
 
 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
@@ -976,45 +972,45 @@ TAO_IMR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, Implementa
 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:52
+// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_interface/any_op_ch.cpp:52
 
 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:52
+// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_interface/any_op_ch.cpp:52
 
 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 &);
 
 // TAO_IDL - Generated from
-// be\be_visitor_exception/cdr_op_ch.cpp:52
+// c:\cvsdoc\ace_wrappers\tao\tao_idl\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_IDL - Generated from
-// be\be_visitor_exception/cdr_op_ch.cpp:52
+// c:\cvsdoc\ace_wrappers\tao\tao_idl\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_IDL - Generated from
-// be\be_visitor_exception/cdr_op_ch.cpp:52
+// c:\cvsdoc\ace_wrappers\tao\tao_idl\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_IDL - Generated from
-// be\be_visitor_structure/cdr_op_ch.cpp:54
+// c:\cvsdoc\ace_wrappers\tao\tao_idl\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_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_ch.cpp:71
+// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_sequence/cdr_op_ch.cpp:71
 
 #if !defined _TAO_CDR_OP_ImplementationRepository_EnvironmentList_H_
 #define _TAO_CDR_OP_ImplementationRepository_EnvironmentList_H_
@@ -1031,25 +1027,25 @@ TAO_IMR_Client_Export CORBA::Boolean operator>> (
 #endif /* _TAO_CDR_OP_ImplementationRepository_EnvironmentList_H_ */
 
 // TAO_IDL - Generated from
-// be\be_visitor_enum/cdr_op_ch.cpp:50
+// c:\cvsdoc\ace_wrappers\tao\tao_idl\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_IDL - Generated from
-// be\be_visitor_structure/cdr_op_ch.cpp:54
+// c:\cvsdoc\ace_wrappers\tao\tao_idl\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_IDL - Generated from
-// be\be_visitor_structure/cdr_op_ch.cpp:54
+// c:\cvsdoc\ace_wrappers\tao\tao_idl\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_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_ch.cpp:71
+// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_sequence/cdr_op_ch.cpp:71
 
 #if !defined _TAO_CDR_OP_ImplementationRepository_ServerInformationList_H_
 #define _TAO_CDR_OP_ImplementationRepository_ServerInformationList_H_
@@ -1066,19 +1062,19 @@ TAO_IMR_Client_Export CORBA::Boolean operator>> (
 #endif /* _TAO_CDR_OP_ImplementationRepository_ServerInformationList_H_ */
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/cdr_op_ch.cpp:55
+// c:\cvsdoc\ace_wrappers\tao\tao_idl\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_IDL - Generated from
-// be\be_visitor_interface/cdr_op_ch.cpp:55
+// c:\cvsdoc\ace_wrappers\tao\tao_idl\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_IDL - Generated from
-// be\be_codegen.cpp:955
+// .\be\be_codegen.cpp:955
 
 #if defined (__ACE_INLINE__)
 #include "ImplRepoC.inl"
diff --git a/TAO/tao/ImR_Client/ImplRepoC.inl b/TAO/tao/ImR_Client/ImplRepoC.inl
index 7b37ccdeaac..6b7e1bc5fff 100644
--- a/TAO/tao/ImR_Client/ImplRepoC.inl
+++ b/TAO/tao/ImR_Client/ImplRepoC.inl
@@ -27,7 +27,7 @@
 
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ci.cpp:70
+// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_ci.cpp:70
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR___CI_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR___CI_
@@ -63,7 +63,7 @@ ImplementationRepository::ServerInformationIterator::ServerInformationIterator (
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ci.cpp:70
+// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_ci.cpp:70
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_ADMINISTRATION___CI_)
 #define _IMPLEMENTATIONREPOSITORY_ADMINISTRATION___CI_
diff --git a/TAO/tao/ImR_Client/ImplRepoS.cpp b/TAO/tao/ImR_Client/ImplRepoS.cpp
index 3621e4a9e49..2b4e3fb2d6e 100644
--- a/TAO/tao/ImR_Client/ImplRepoS.cpp
+++ b/TAO/tao/ImR_Client/ImplRepoS.cpp
@@ -26,11 +26,11 @@
 //     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:599
 
-#ifndef _TAO_IDL_ORIG_IMPLREPOS_CPP_
-#define _TAO_IDL_ORIG_IMPLREPOS_CPP_
+#ifndef _TAO_IDL_IMPLREPOS_CPP_
+#define _TAO_IDL_IMPLREPOS_CPP_
 
 
 #include "ImplRepoS.h"
@@ -72,7 +72,7 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
+// .\be\be_visitor_arg_traits.cpp:69
 
 // Arg traits specializations.
 namespace TAO
@@ -80,7 +80,7 @@ namespace TAO
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVEROBJECT__SARG_TRAITS_SS_)
 #define _IMPLEMENTATIONREPOSITORY_SERVEROBJECT__SARG_TRAITS_SS_
-  
+ 
   template<>
   class  SArg_Traits<ImplementationRepository::ServerObject>
     : public
@@ -93,13 +93,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+ 
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:751
+  // .\be\be_visitor_arg_traits.cpp:772
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_STARTUPOPTIONS__SARG_TRAITS_SS_)
 #define _IMPLEMENTATIONREPOSITORY_STARTUPOPTIONS__SARG_TRAITS_SS_
-  
+ 
   template<>
   class SArg_Traits<ImplementationRepository::StartupOptions>
     : public
@@ -112,13 +112,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+ 
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:751
+  // .\be\be_visitor_arg_traits.cpp:772
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATION__SARG_TRAITS_SS_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATION__SARG_TRAITS_SS_
-  
+ 
   template<>
   class SArg_Traits<ImplementationRepository::ServerInformation>
     : public
@@ -131,13 +131,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+ 
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:496
+  // .\be\be_visitor_arg_traits.cpp:489
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST__SARG_TRAITS_SS_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST__SARG_TRAITS_SS_
-  
+ 
   template<>
   class SArg_Traits<ImplementationRepository::ServerInformationList>
     : public
@@ -153,7 +153,7 @@ namespace TAO
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR__SARG_TRAITS_SS_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR__SARG_TRAITS_SS_
-  
+ 
   template<>
   class  SArg_Traits<ImplementationRepository::ServerInformationIterator>
     : public
@@ -170,7 +170,7 @@ namespace TAO
 
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
+// .\be\be_visitor_arg_traits.cpp:69
 
 // Arg traits specializations.
 namespace TAO
@@ -178,7 +178,7 @@ namespace TAO
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVEROBJECT__ARG_TRAITS_SS_)
 #define _IMPLEMENTATIONREPOSITORY_SERVEROBJECT__ARG_TRAITS_SS_
-  
+ 
   template<>
   class  Arg_Traits<ImplementationRepository::ServerObject>
     : public
@@ -192,13 +192,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+ 
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:751
+  // .\be\be_visitor_arg_traits.cpp:772
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_STARTUPOPTIONS__ARG_TRAITS_SS_)
 #define _IMPLEMENTATIONREPOSITORY_STARTUPOPTIONS__ARG_TRAITS_SS_
-  
+ 
   template<>
   class Arg_Traits<ImplementationRepository::StartupOptions>
     : public
@@ -211,13 +211,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+ 
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:751
+  // .\be\be_visitor_arg_traits.cpp:772
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATION__ARG_TRAITS_SS_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATION__ARG_TRAITS_SS_
-  
+ 
   template<>
   class Arg_Traits<ImplementationRepository::ServerInformation>
     : public
@@ -230,13 +230,13 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-  
+ 
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:496
+  // .\be\be_visitor_arg_traits.cpp:489
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST__ARG_TRAITS_SS_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST__ARG_TRAITS_SS_
-  
+ 
   template<>
   class Arg_Traits<ImplementationRepository::ServerInformationList>
     : public
@@ -252,7 +252,7 @@ namespace TAO
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR__ARG_TRAITS_SS_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR__ARG_TRAITS_SS_
-  
+ 
   template<>
   class  Arg_Traits<ImplementationRepository::ServerInformationIterator>
     : public
@@ -270,7 +270,7 @@ namespace TAO
 
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1455
+// .\be\be_interface.cpp:1455
 
 class TAO_ImplementationRepository_ServerInformationIterator_Perfect_Hash_OpTable
   : public TAO_Perfect_Hash_OpTable
@@ -283,7 +283,7 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* 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  */
+/* 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  */
 unsigned int
 TAO_ImplementationRepository_ServerInformationIterator_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -385,7 +385,7 @@ static TAO_ImplementationRepository_ServerInformationIterator_Perfect_Hash_OpTab
 //
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/strategized_proxy_broker_ss.cpp:40
+// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_interface/strategized_proxy_broker_ss.cpp:40
 
 // Factory function Implementation.
 POA_ImplementationRepository::_TAO_ServerInformationIterator_Strategized_Proxy_Broker *
@@ -393,7 +393,7 @@ POA_ImplementationRepository::_TAO_ServerInformationIterator_Strategized_Proxy_B
 {
   static POA_ImplementationRepository::_TAO_ServerInformationIterator_Strategized_Proxy_Broker
   strategized_proxy_broker;
-  
+ 
   return &strategized_proxy_broker;
 }
 
@@ -415,7 +415,7 @@ POA_ImplementationRepository::_TAO_ServerInformationIterator_Strategized_Proxy_B
   TAO::Collocation_Strategy strategy =
     TAO_ORB_Core::collocation_strategy (obj ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (TAO::TAO_CS_REMOTE_STRATEGY);
-  
+ 
   return strategy;
 }
 
@@ -434,13 +434,13 @@ POA_ImplementationRepository::_TAO_ServerInformationIterator_Strategized_Proxy_B
 {
   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);
 }
 
@@ -449,7 +449,7 @@ POA_ImplementationRepository::_TAO_ServerInformationIterator_Strategized_Proxy_B
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:999
+// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_ss.cpp:813
 
 TAO::Collocation_Proxy_Broker *
 ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Factory_function (CORBA::Object_ptr)
@@ -461,9 +461,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;
 }
 
@@ -482,14 +482,14 @@ ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Stub_Factor
 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
+// TAO_IDL - Generated from
+// c:\cvsdoc\ace_wrappers\tao\tao_idl\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 ((
@@ -506,14 +506,14 @@ POA_ImplementationRepository::_TAO_ServerInformationIterator_Direct_Proxy_Impl::
         );
   ACE_CHECK;
 }
-// TAO_IDL - Generated from 
-// be\be_visitor_operation/direct_proxy_impl_ss.cpp:42
+// TAO_IDL - Generated from
+// c:\cvsdoc\ace_wrappers\tao\tao_idl\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 ((
@@ -533,8 +533,8 @@ POA_ImplementationRepository::_TAO_ServerInformationIterator_Direct_Proxy_Impl::
 //           End Direct Proxy Implementation
 ///////////////////////////////////////////////////////////////////////
 
-// TAO_IDL - Generated from 
-// be\be_visitor_interface/interface_ss.cpp:103
+// TAO_IDL - Generated from
+// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_ss.cpp:103
 
 POA_ImplementationRepository::ServerInformationIterator::ServerInformationIterator (void)
   : TAO_ServantBase ()
@@ -553,11 +553,11 @@ POA_ImplementationRepository::ServerInformationIterator::~ServerInformationItera
 }
 namespace POA_ImplementationRepository
 {
-  
-  
+ 
+ 
   // TAO_IDL - Generated from
-  // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+  // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/upcall_command_ss.cpp:127
+ 
   class next_n_ServerInformationIterator
     : public TAO::Upcall_Command
   {
@@ -571,46 +571,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 
-// be\be_visitor_operation/operation_ss.cpp:192
+// TAO_IDL - Generated from
+// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_ImplementationRepository::ServerInformationIterator::next_n_skel (
     TAO_ServerRequest & server_request,
@@ -619,26 +619,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 size_t 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);
 
@@ -646,7 +646,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
@@ -659,15 +659,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
-  // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+  // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/upcall_command_ss.cpp:127
+ 
   class destroy_ServerInformationIterator
     : public TAO::Upcall_Command
   {
@@ -677,23 +677,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 
-// be\be_visitor_operation/operation_ss.cpp:192
+// TAO_IDL - Generated from
+// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_ImplementationRepository::ServerInformationIterator::destroy_skel (
     TAO_ServerRequest & server_request,
@@ -702,28 +702,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 size_t 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
@@ -736,19 +736,19 @@ void POA_ImplementationRepository::ServerInformationIterator::destroy_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+ 
 }
 
-// TAO_IDL - Generated from 
-// be\be_visitor_interface/interface_ss.cpp:169
+// TAO_IDL - Generated from
+// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_ss.cpp:169
 
 namespace POA_ImplementationRepository
 {
-  
-  
+ 
+ 
   // TAO_IDL - Generated from
-  // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+  // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/upcall_command_ss.cpp:127
+ 
   class _is_a_ServerInformationIterator_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -762,68 +762,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 size_t 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
@@ -836,16 +836,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
-  // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+  // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/upcall_command_ss.cpp:127
+ 
   class _non_existent_ServerInformationIterator_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -859,59 +859,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 size_t 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
@@ -924,18 +924,18 @@ void POA_ImplementationRepository::ServerInformationIterator::_non_existent_skel
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+ 
 }
 
 
 
-// TAO_IDL - Generated from 
-// be\be_visitor_interface/interface_ss.cpp:393
+// TAO_IDL - Generated from
+// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_ss.cpp:393
 
 
 
 void POA_ImplementationRepository::ServerInformationIterator::_interface_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
     ACE_ENV_ARG_DECL
@@ -945,30 +945,30 @@ 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));
     }
-  
+ 
   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 =
     _tao_adapter->interfacedef_cdr_insert (
         _tao_out,
         _tao_retval
       );
-  
+ 
   _tao_adapter->dispose (_tao_retval);
-  
+ 
   if (_tao_result == 0)
     {
       ACE_THROW (CORBA::MARSHAL ());
@@ -977,11 +977,11 @@ void POA_ImplementationRepository::ServerInformationIterator::_interface_skel (
 
 namespace POA_ImplementationRepository
 {
-  
-  
+ 
+ 
   // TAO_IDL - Generated from
-  // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+  // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/upcall_command_ss.cpp:127
+ 
   class _get_component_ServerInformationIterator_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -995,59 +995,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 size_t 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
@@ -1060,7 +1060,7 @@ void POA_ImplementationRepository::ServerInformationIterator::_component_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+ 
 }
 
 CORBA::Boolean POA_ImplementationRepository::ServerInformationIterator::_is_a (
@@ -1087,7 +1087,7 @@ const char* POA_ImplementationRepository::ServerInformationIterator::_interface_
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:940
+// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_ss.cpp:754
 
 void POA_ImplementationRepository::ServerInformationIterator::_dispatch (
     TAO_ServerRequest & req,
@@ -1102,29 +1102,29 @@ void POA_ImplementationRepository::ServerInformationIterator::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:891
+// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_ss.cpp:705
 
 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 =
     stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-  
+ 
   ACE_NEW_RETURN (
       tmp,
       CORBA::Object (stub, _tao_opt_colloc, this),
       0
     );
-  
+ 
   CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
-  
+ 
   typedef ::ImplementationRepository::ServerInformationIterator STUB_SCOPED_NAME;
   return
     TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
@@ -1134,7 +1134,7 @@ POA_ImplementationRepository::ServerInformationIterator::_this (ACE_ENV_SINGLE_A
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1455
+// .\be\be_interface.cpp:1455
 
 class TAO_ImplementationRepository_Administration_Perfect_Hash_OpTable
   : public TAO_Perfect_Hash_OpTable
@@ -1147,53 +1147,53 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* 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  */
+/* 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  */
 unsigned int
 TAO_ImplementationRepository_Administration_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
   static const unsigned char asso_values[] =
     {
 #if defined (ACE_MVS)
-     29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
-     29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
-     29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
-     29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
-     29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
-     29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
-     29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
-     29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
-     29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
-     29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
-     29, 29, 29, 29, 29, 29, 29, 29, 29,  0,
-     29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
-     29, 29, 29, 29, 29, 29, 29, 29, 29,  9,
-     29, 29,  0,  0,  0,  5, 29, 29, 29, 29,
-     29, 29, 29, 29, 29, 29, 29,  5, 29,  0,
-     29, 29, 29,  0, 29, 29, 29, 29, 29, 29,
-     29, 29,  5,  9, 29, 29, 29, 29, 29, 29,
-     29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
-     29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
-     29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
-     29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
-     29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
-     29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
-     29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
-     29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
-     29, 29, 29, 29, 29, 29,
+     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, 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,
+     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, 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,
+     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, 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,
+     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, 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,
+     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, 26, 26, 26, 26, 26,
+     26, 26, 26, 26, 26, 26,
 #else
-     29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
-     29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
-     29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
-     29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
-     29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
-     29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
-     29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
-     29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
-     29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
-     29, 29, 29, 29, 29,  0, 29,  9, 29, 29,
-      0,  0,  0,  5, 29, 29, 29, 29,  5, 29,
-      0, 29, 29, 29,  0,  5,  9, 29, 29, 29,
-     29, 29, 29, 29, 29, 29, 29, 29,
+     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, 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,
+     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, 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,
+      0, 26, 26, 26,  0,  0,  4, 26, 26, 26,
+     26, 26, 26, 26, 26, 26, 26, 26,
 #endif /* ACE_MVS */
     };
   return len + asso_values[(int) str[len - 1]] + asso_values[(int) str[0]];
@@ -1208,8 +1208,8 @@ TAO_ImplementationRepository_Administration_Perfect_Hash_OpTable::lookup (const
       MIN_WORD_LENGTH = 4,
       MAX_WORD_LENGTH = 23,
       MIN_HASH_VALUE = 4,
-      MAX_HASH_VALUE = 28,
-      HASH_VALUE_RANGE = 25,
+      MAX_HASH_VALUE = 25,
+      HASH_VALUE_RANGE = 22,
       DUPLICATES = 0,
       WORDLIST_SIZE = 17
     };
@@ -1218,24 +1218,24 @@ TAO_ImplementationRepository_Administration_Perfect_Hash_OpTable::lookup (const
     {
       {"",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},
-      {"_interface", &POA_ImplementationRepository::Administration::_interface_skel, 0},
+      {"",0,0},{"",0,0},{"",0,0},
+      {"shutdown", &POA_ImplementationRepository::Administration::shutdown_skel, &POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::shutdown},
+      {"",0,0},
+      {"_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},
-      {"_is_a", &POA_ImplementationRepository::Administration::_is_a_skel, 0},
-      {"register_server", &POA_ImplementationRepository::Administration::register_server_skel, &POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::register_server},
-      {"",0,0},
-      {"reregister_server", &POA_ImplementationRepository::Administration::reregister_server_skel, &POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::reregister_server},
-      {"list", &POA_ImplementationRepository::Administration::list_skel, &POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::list},
       {"_component", &POA_ImplementationRepository::Administration::_component_skel, 0},
       {"shutdown_server", &POA_ImplementationRepository::Administration::shutdown_server_skel, &POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::shutdown_server},
       {"",0,0},
       {"_non_existent", &POA_ImplementationRepository::Administration::_non_existent_skel, 0},
-      {"",0,0},
+      {"list", &POA_ImplementationRepository::Administration::list_skel, &POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::list},
+      {"_interface", &POA_ImplementationRepository::Administration::_interface_skel, 0},
       {"activate_server", &POA_ImplementationRepository::Administration::activate_server_skel, &POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::activate_server},
-      {"",0,0},{"",0,0},
+      {"",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},
+      {"add_or_update_server", &POA_ImplementationRepository::Administration::add_or_update_server_skel, &POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::add_or_update_server},
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -1259,7 +1259,7 @@ static TAO_ImplementationRepository_Administration_Perfect_Hash_OpTable tao_Impl
 //
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/strategized_proxy_broker_ss.cpp:40
+// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_interface/strategized_proxy_broker_ss.cpp:40
 
 // Factory function Implementation.
 POA_ImplementationRepository::_TAO_Administration_Strategized_Proxy_Broker *
@@ -1267,7 +1267,7 @@ POA_ImplementationRepository::_TAO_Administration_Strategized_Proxy_Broker::the_
 {
   static POA_ImplementationRepository::_TAO_Administration_Strategized_Proxy_Broker
   strategized_proxy_broker;
-  
+ 
   return &strategized_proxy_broker;
 }
 
@@ -1289,7 +1289,7 @@ POA_ImplementationRepository::_TAO_Administration_Strategized_Proxy_Broker::get_
   TAO::Collocation_Strategy strategy =
     TAO_ORB_Core::collocation_strategy (obj ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (TAO::TAO_CS_REMOTE_STRATEGY);
-  
+ 
   return strategy;
 }
 
@@ -1308,13 +1308,13 @@ POA_ImplementationRepository::_TAO_Administration_Strategized_Proxy_Broker::disp
 {
   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);
 }
 
@@ -1323,7 +1323,7 @@ POA_ImplementationRepository::_TAO_Administration_Strategized_Proxy_Broker::disp
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:999
+// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_ss.cpp:813
 
 TAO::Collocation_Proxy_Broker *
 ImplementationRepository__TAO_Administration_Proxy_Broker_Factory_function (CORBA::Object_ptr)
@@ -1335,9 +1335,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;
 }
 
@@ -1356,14 +1356,14 @@ 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 
-// be\be_visitor_operation/direct_proxy_impl_ss.cpp:42
+// TAO_IDL - Generated from
+// c:\cvsdoc\ace_wrappers\tao\tao_idl\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 ((
@@ -1380,64 +1380,38 @@ POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::activate_se
       );
   ACE_CHECK;
 }
-// TAO_IDL - Generated from 
-// be\be_visitor_operation/direct_proxy_impl_ss.cpp:42
-
-void
-POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::register_server (
-    TAO_Abstract_ServantBase  *servant,
-    TAO::Argument ** args,
-    int 
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException,
-    ::ImplementationRepository::AlreadyRegistered,
-    ::ImplementationRepository::NotFound
-  ))
-{
-  dynamic_cast<POA_ImplementationRepository::Administration_ptr>
-    (servant)
-  ->register_server (
-        ((TAO::Arg_Traits< CORBA::Char *>::in_arg_val *) args[1])->arg (),
-        ((TAO::Arg_Traits< ImplementationRepository::StartupOptions>::in_arg_val *) args[2])->arg ()
-        ACE_ENV_ARG_PARAMETER
-      );
-  ACE_CHECK;
-}
-// TAO_IDL - Generated from 
-// be\be_visitor_operation/direct_proxy_impl_ss.cpp:42
+// TAO_IDL - Generated from
+// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/direct_proxy_impl_ss.cpp:42
 
 void
-POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::reregister_server (
+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,
-    ::ImplementationRepository::AlreadyRegistered,
     ::ImplementationRepository::NotFound
   ))
 {
   dynamic_cast<POA_ImplementationRepository::Administration_ptr>
     (servant)
-  ->reregister_server (
+  ->add_or_update_server (
         ((TAO::Arg_Traits< CORBA::Char *>::in_arg_val *) args[1])->arg (),
         ((TAO::Arg_Traits< ImplementationRepository::StartupOptions>::in_arg_val *) args[2])->arg ()
         ACE_ENV_ARG_PARAMETER
       );
   ACE_CHECK;
 }
-// TAO_IDL - Generated from 
-// be\be_visitor_operation/direct_proxy_impl_ss.cpp:42
+// TAO_IDL - Generated from
+// c:\cvsdoc\ace_wrappers\tao\tao_idl\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 ((
@@ -1453,14 +1427,14 @@ POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::remove_serv
       );
   ACE_CHECK;
 }
-// TAO_IDL - Generated from 
-// be\be_visitor_operation/direct_proxy_impl_ss.cpp:42
+// TAO_IDL - Generated from
+// c:\cvsdoc\ace_wrappers\tao\tao_idl\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 ((
@@ -1476,14 +1450,14 @@ POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::shutdown_se
       );
   ACE_CHECK;
 }
-// TAO_IDL - Generated from 
-// be\be_visitor_operation/direct_proxy_impl_ss.cpp:42
+// TAO_IDL - Generated from
+// c:\cvsdoc\ace_wrappers\tao\tao_idl\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 ((
@@ -1501,14 +1475,14 @@ POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::server_is_r
       );
   ACE_CHECK;
 }
-// TAO_IDL - Generated from 
-// be\be_visitor_operation/direct_proxy_impl_ss.cpp:42
+// TAO_IDL - Generated from
+// c:\cvsdoc\ace_wrappers\tao\tao_idl\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 ((
@@ -1524,19 +1498,18 @@ POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::server_is_s
       );
   ACE_CHECK;
 }
-// TAO_IDL - Generated from 
-// be\be_visitor_operation/direct_proxy_impl_ss.cpp:42
+// TAO_IDL - Generated from
+// c:\cvsdoc\ace_wrappers\tao\tao_idl\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,
-    ::ImplementationRepository::NotFound
+    CORBA::SystemException
   ))
 {
   dynamic_cast<POA_ImplementationRepository::Administration_ptr>
@@ -1548,14 +1521,14 @@ POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::find (
       );
   ACE_CHECK;
 }
-// TAO_IDL - Generated from 
-// be\be_visitor_operation/direct_proxy_impl_ss.cpp:42
+// TAO_IDL - Generated from
+// c:\cvsdoc\ace_wrappers\tao\tao_idl\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 ((
@@ -1572,14 +1545,37 @@ 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
+
+void
+POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::shutdown (
+    TAO_Abstract_ServantBase  *servant,
+    TAO::Argument ** args,
+    int
+    ACE_ENV_ARG_DECL
+  )
+  ACE_THROW_SPEC ((
+    CORBA::SystemException
+  ))
+{
+  dynamic_cast<POA_ImplementationRepository::Administration_ptr>
+    (servant)
+  ->shutdown (
+        ((TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val *) args[1])->arg (),
+        ((TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val *) args[2])->arg ()
+        ACE_ENV_ARG_PARAMETER
+      );
+  ACE_CHECK;
+}
 
 
 //
 //           End Direct Proxy Implementation
 ///////////////////////////////////////////////////////////////////////
 
-// TAO_IDL - Generated from 
-// be\be_visitor_interface/interface_ss.cpp:103
+// TAO_IDL - Generated from
+// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_ss.cpp:103
 
 POA_ImplementationRepository::Administration::Administration (void)
   : TAO_ServantBase ()
@@ -1598,11 +1594,11 @@ POA_ImplementationRepository::Administration::~Administration (void)
 }
 namespace POA_ImplementationRepository
 {
-  
-  
+ 
+ 
   // TAO_IDL - Generated from
-  // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+  // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/upcall_command_ss.cpp:127
+ 
   class activate_server_Administration
     : public TAO::Upcall_Command
   {
@@ -1616,7 +1612,7 @@ namespace POA_ImplementationRepository
       , args_ (args)
     {
     }
-    
+ 
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< CORBA::Char *>::in_arg_type arg_1 =
@@ -1624,24 +1620,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 
-// be\be_visitor_operation/operation_ss.cpp:192
+// TAO_IDL - Generated from
+// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_ImplementationRepository::Administration::activate_server_skel (
     TAO_ServerRequest & server_request,
@@ -1650,28 +1646,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 size_t 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);
 
@@ -1679,7 +1675,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
@@ -1692,20 +1688,20 @@ 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
-  // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
-  class register_server_Administration
+  // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/upcall_command_ss.cpp:127
+ 
+  class add_or_update_server_Administration
     : public TAO::Upcall_Command
   {
   public:
-    inline register_server_Administration (
+    inline add_or_update_server_Administration (
       POA_ImplementationRepository::Administration * servant,
       TAO_Operation_Details const * operation_details,
       TAO::Argument * const args[])
@@ -1714,7 +1710,7 @@ namespace POA_ImplementationRepository
       , args_ (args)
     {
     }
-    
+ 
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< CORBA::Char *>::in_arg_type arg_1 =
@@ -1722,178 +1718,70 @@ 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_->register_server (
+ 
+      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 
-// be\be_visitor_operation/operation_ss.cpp:192
-
-void POA_ImplementationRepository::Administration::register_server_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 exceptions[] = 
-    {
-      ImplementationRepository::_tc_AlreadyRegistered,
-      ImplementationRepository::_tc_NotFound
-    };
-  static size_t 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::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);
-
-  register_server_Administration 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;
-  
-}
-namespace POA_ImplementationRepository
-{
-  
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
-  class reregister_server_Administration
-    : public TAO::Upcall_Command
-  {
-  public:
-    inline reregister_server_Administration (
-      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 *>::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);
-        
-      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_->reregister_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 
-// be\be_visitor_operation/operation_ss.cpp:192
+// TAO_IDL - Generated from
+// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ss.cpp:192
 
-void POA_ImplementationRepository::Administration::reregister_server_skel (
+void POA_ImplementationRepository::Administration::add_or_update_server_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 exceptions[] = 
+  static CORBA::TypeCode_ptr const exceptions[] =
     {
-      ImplementationRepository::_tc_AlreadyRegistered,
       ImplementationRepository::_tc_NotFound
     };
-  static size_t const nexceptions = 2;
+  static size_t 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);
 
-  reregister_server_Administration command (
+  add_or_update_server_Administration command (
     impl,
     server_request.operation_details (),
     args);
-  
+ 
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -1906,15 +1794,15 @@ void POA_ImplementationRepository::Administration::reregister_server_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
-  
+  // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/upcall_command_ss.cpp:127
+ 
   class remove_server_Administration
     : public TAO::Upcall_Command
   {
@@ -1928,7 +1816,7 @@ namespace POA_ImplementationRepository
       , args_ (args)
     {
     }
-    
+ 
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< CORBA::Char *>::in_arg_type arg_1 =
@@ -1936,24 +1824,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 
-// be\be_visitor_operation/operation_ss.cpp:192
+// TAO_IDL - Generated from
+// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_ImplementationRepository::Administration::remove_server_skel (
     TAO_ServerRequest & server_request,
@@ -1962,27 +1850,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 size_t 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);
 
@@ -1990,7 +1878,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
@@ -2003,15 +1891,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
-  // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+  // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/upcall_command_ss.cpp:127
+ 
   class shutdown_server_Administration
     : public TAO::Upcall_Command
   {
@@ -2025,7 +1913,7 @@ namespace POA_ImplementationRepository
       , args_ (args)
     {
     }
-    
+ 
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< CORBA::Char *>::in_arg_type arg_1 =
@@ -2033,24 +1921,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 
-// be\be_visitor_operation/operation_ss.cpp:192
+// TAO_IDL - Generated from
+// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_ImplementationRepository::Administration::shutdown_server_skel (
     TAO_ServerRequest & server_request,
@@ -2059,27 +1947,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 size_t 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);
 
@@ -2087,7 +1975,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
@@ -2100,15 +1988,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
-  // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+  // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/upcall_command_ss.cpp:127
+ 
   class server_is_running_Administration
     : public TAO::Upcall_Command
   {
@@ -2122,7 +2010,7 @@ namespace POA_ImplementationRepository
       , args_ (args)
     {
     }
-    
+ 
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< CORBA::Char *>::in_arg_type arg_1 =
@@ -2130,38 +2018,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 
-// be\be_visitor_operation/operation_ss.cpp:192
+// TAO_IDL - Generated from
+// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_ImplementationRepository::Administration::server_is_running_skel (
     TAO_ServerRequest & server_request,
@@ -2170,21 +2058,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 size_t 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,
@@ -2192,9 +2080,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);
 
@@ -2202,7 +2090,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
@@ -2215,15 +2103,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
-  // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+  // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/upcall_command_ss.cpp:127
+ 
   class server_is_shutting_down_Administration
     : public TAO::Upcall_Command
   {
@@ -2237,7 +2125,7 @@ namespace POA_ImplementationRepository
       , args_ (args)
     {
     }
-    
+ 
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< CORBA::Char *>::in_arg_type arg_1 =
@@ -2245,24 +2133,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 
-// be\be_visitor_operation/operation_ss.cpp:192
+// TAO_IDL - Generated from
+// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_ImplementationRepository::Administration::server_is_shutting_down_skel (
     TAO_ServerRequest & server_request,
@@ -2271,27 +2159,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 size_t 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);
 
@@ -2299,7 +2187,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
@@ -2312,15 +2200,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
-  // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+  // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/upcall_command_ss.cpp:127
+ 
   class find_Administration
     : public TAO::Upcall_Command
   {
@@ -2334,7 +2222,7 @@ namespace POA_ImplementationRepository
       , args_ (args)
     {
     }
-    
+ 
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< CORBA::Char *>::in_arg_type arg_1 =
@@ -2342,31 +2230,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 
-// be\be_visitor_operation/operation_ss.cpp:192
+// TAO_IDL - Generated from
+// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_ImplementationRepository::Administration::find_skel (
     TAO_ServerRequest & server_request,
@@ -2375,29 +2263,26 @@ void POA_ImplementationRepository::Administration::find_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+ 
+ 
 #if TAO_HAS_INTERCEPTORS == 1
-  static CORBA::TypeCode_ptr const exceptions[] = 
-    {
-      ImplementationRepository::_tc_NotFound
-    };
-  static size_t const nexceptions = 1;
+  static CORBA::TypeCode_ptr const * const exceptions = 0;
+  static size_t 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);
 
@@ -2405,7 +2290,7 @@ void POA_ImplementationRepository::Administration::find_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+ 
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -2418,15 +2303,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
-  // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+  // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/upcall_command_ss.cpp:127
+ 
   class list_Administration
     : public TAO::Upcall_Command
   {
@@ -2440,7 +2325,7 @@ namespace POA_ImplementationRepository
       , args_ (args)
     {
     }
-    
+ 
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::ULong>::in_arg_type arg_1 =
@@ -2448,38 +2333,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 
-// be\be_visitor_operation/operation_ss.cpp:192
+// TAO_IDL - Generated from
+// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_ImplementationRepository::Administration::list_skel (
     TAO_ServerRequest & server_request,
@@ -2488,18 +2373,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 size_t 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,
@@ -2507,9 +2392,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);
 
@@ -2517,7 +2402,7 @@ void POA_ImplementationRepository::Administration::list_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+ 
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -2530,19 +2415,122 @@ 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
+ 
+  class shutdown_Administration
+    : public TAO::Upcall_Command
+  {
+  public:
+    inline shutdown_Administration (
+      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< ::ACE_InputCDR::to_boolean>::in_arg_type arg_1 =
+        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_,
+          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 
-// be\be_visitor_interface/interface_ss.cpp:169
+
+// TAO_IDL - Generated from
+// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ss.cpp:192
+
+void POA_ImplementationRepository::Administration::shutdown_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 size_t 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);
+
+  shutdown_Administration 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:169
 
 namespace POA_ImplementationRepository
 {
-  
-  
+ 
+ 
   // TAO_IDL - Generated from
-  // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+  // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/upcall_command_ss.cpp:127
+ 
   class _is_a_Administration_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -2556,68 +2544,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 size_t 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
@@ -2630,16 +2618,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
-  // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+  // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/upcall_command_ss.cpp:127
+ 
   class _non_existent_Administration_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -2653,59 +2641,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 size_t 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
@@ -2718,18 +2706,18 @@ void POA_ImplementationRepository::Administration::_non_existent_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+ 
 }
 
 
 
-// TAO_IDL - Generated from 
-// be\be_visitor_interface/interface_ss.cpp:393
+// TAO_IDL - Generated from
+// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_ss.cpp:393
 
 
 
 void POA_ImplementationRepository::Administration::_interface_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
     ACE_ENV_ARG_DECL
@@ -2739,30 +2727,30 @@ 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));
     }
-  
+ 
   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 =
     _tao_adapter->interfacedef_cdr_insert (
         _tao_out,
         _tao_retval
       );
-  
+ 
   _tao_adapter->dispose (_tao_retval);
-  
+ 
   if (_tao_result == 0)
     {
       ACE_THROW (CORBA::MARSHAL ());
@@ -2771,11 +2759,11 @@ void POA_ImplementationRepository::Administration::_interface_skel (
 
 namespace POA_ImplementationRepository
 {
-  
-  
+ 
+ 
   // TAO_IDL - Generated from
-  // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+  // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/upcall_command_ss.cpp:127
+ 
   class _get_component_Administration_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -2789,59 +2777,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 size_t 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
@@ -2854,7 +2842,7 @@ void POA_ImplementationRepository::Administration::_component_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+ 
 }
 
 CORBA::Boolean POA_ImplementationRepository::Administration::_is_a (
@@ -2881,7 +2869,7 @@ const char* POA_ImplementationRepository::Administration::_interface_repository_
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:940
+// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_ss.cpp:754
 
 void POA_ImplementationRepository::Administration::_dispatch (
     TAO_ServerRequest & req,
@@ -2896,29 +2884,29 @@ void POA_ImplementationRepository::Administration::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:891
+// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_ss.cpp:705
 
 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 =
     stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-  
+ 
   ACE_NEW_RETURN (
       tmp,
       CORBA::Object (stub, _tao_opt_colloc, this),
       0
     );
-  
+ 
   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 6457975c7d4..8435f8704d6 100644
--- a/TAO/tao/ImR_Client/ImplRepoS.h
+++ b/TAO/tao/ImR_Client/ImplRepoS.h
@@ -26,15 +26,14 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:391
+// .\be\be_codegen.cpp:391
 
-#ifndef _TAO_IDL_ORIG_IMPLREPOS_H_
-#define _TAO_IDL_ORIG_IMPLREPOS_H_
+#ifndef _TAO_IDL_IMPLREPOS_H_
+#define _TAO_IDL_IMPLREPOS_H_
 
 #include /**/ "ace/pre.h"
 
 #include "ImplRepoC.h"
-#include "tao/ImR_Client/ServerObjectS.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -54,84 +53,84 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_sh.cpp:49
+// c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_sh.cpp:49
 
 namespace POA_ImplementationRepository
 {
-  
-  
+ 
+ 
   // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_sh.cpp:87
-  
+  // c:\cvsdoc\ace_wrappers\tao\tao_idl\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 (
         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
       );
-    
+ 
     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
-    // be\be_visitor_operation/operation_sh.cpp:45
-    
+    // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_sh.cpp:45
+ 
     virtual CORBA::Boolean next_n (
         ::CORBA::ULong how_many,
         ::ImplementationRepository::ServerInformationList_out servers
@@ -140,24 +139,24 @@ namespace POA_ImplementationRepository
       ACE_THROW_SPEC ((
         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
-    // be\be_visitor_operation/operation_sh.cpp:45
-    
+    // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_sh.cpp:45
+ 
     virtual void destroy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+ 
     static void destroy_skel (
         TAO_ServerRequest & server_request,
         void * servant_upcall,
@@ -165,29 +164,29 @@ namespace POA_ImplementationRepository
         ACE_ENV_ARG_DECL
       );
   };
-  
+ 
   ///////////////////////////////////////////////////////////////////////
-  //               Strategized Proxy Broker Declaration 
+  //               Strategized Proxy Broker Declaration
   //
-  
+ 
   // TAO_IDL - Generated from
-  // be\be_visitor_interface/strategized_proxy_broker_sh.cpp:36
-  
+  // c:\cvsdoc\ace_wrappers\tao\tao_idl\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
         ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+ 
     void
     dispatch (
         CORBA::Object_ptr obj,
@@ -200,34 +199,34 @@ namespace POA_ImplementationRepository
         ACE_ENV_ARG_DECL
       )
       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 
-  // be\be_visitor_interface/direct_proxy_impl_sh.cpp:31
-  
+ 
+ 
+ 
+  // TAO_IDL - Generated from
+  // c:\cvsdoc\ace_wrappers\tao\tao_idl\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) {}
-    
+ 
     // TAO_IDL - Generated from
-    // be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+    // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/proxy_impl_xh.cpp:24
+ 
     static void
     next_n (
         TAO_Abstract_ServantBase *servant,
@@ -238,10 +237,10 @@ namespace POA_ImplementationRepository
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+ 
     // TAO_IDL - Generated from
-    // be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+    // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/proxy_impl_xh.cpp:24
+ 
     static void
     destroy (
         TAO_Abstract_ServantBase *servant,
@@ -253,85 +252,85 @@ namespace POA_ImplementationRepository
         CORBA::SystemException
       ));
   };
-  
+ 
   //
   //                Direct  Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-  
-  
-  
+ 
+ 
+ 
   // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_sh.cpp:87
-  
+  // c:\cvsdoc\ace_wrappers\tao\tao_idl\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 (
         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
       );
-    
+ 
     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
-    // be\be_visitor_operation/operation_sh.cpp:45
-    
+    // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_sh.cpp:45
+ 
     virtual void activate_server (
         const char * server
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -341,59 +340,37 @@ namespace POA_ImplementationRepository
         ::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
-    // be\be_visitor_operation/operation_sh.cpp:45
-    
-    virtual void register_server (
-        const char * server,
-        const ::ImplementationRepository::StartupOptions & options
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::ImplementationRepository::AlreadyRegistered,
-        ::ImplementationRepository::NotFound
-      )) = 0;
-    
-    static void register_server_skel (
-        TAO_ServerRequest & server_request,
-        void * servant_upcall,
-        void * servant
-        ACE_ENV_ARG_DECL
-      );
-    
+ 
     // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_sh.cpp:45
-    
-    virtual void reregister_server (
+    // c:\cvsdoc\ace_wrappers\tao\tao_idl\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,
-        ::ImplementationRepository::AlreadyRegistered,
         ::ImplementationRepository::NotFound
       )) = 0;
-    
-    static void reregister_server_skel (
+ 
+    static void add_or_update_server_skel (
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
         ACE_ENV_ARG_DECL
       );
-    
+ 
     // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_sh.cpp:45
-    
+    // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_sh.cpp:45
+ 
     virtual void remove_server (
         const char * server
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -402,17 +379,17 @@ namespace POA_ImplementationRepository
         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
-    // be\be_visitor_operation/operation_sh.cpp:45
-    
+    // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_sh.cpp:45
+ 
     virtual void shutdown_server (
         const char * server
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -421,17 +398,17 @@ namespace POA_ImplementationRepository
         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
-    // be\be_visitor_operation/operation_sh.cpp:45
-    
+    // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_sh.cpp:45
+ 
     virtual void server_is_running (
         const char * server,
         const char * partial_ior,
@@ -442,17 +419,17 @@ namespace POA_ImplementationRepository
         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
-    // be\be_visitor_operation/operation_sh.cpp:45
-    
+    // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_sh.cpp:45
+ 
     virtual void server_is_shutting_down (
         const char * server
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -461,37 +438,36 @@ namespace POA_ImplementationRepository
         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
-    // be\be_visitor_operation/operation_sh.cpp:45
-    
+    // c:\cvsdoc\ace_wrappers\tao\tao_idl\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,
-        ::ImplementationRepository::NotFound
+        CORBA::SystemException
       )) = 0;
-    
+ 
     static void find_skel (
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
         ACE_ENV_ARG_DECL
       );
-    
+ 
     // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_sh.cpp:45
-    
+    // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_sh.cpp:45
+ 
     virtual void list (
         ::CORBA::ULong how_many,
         ::ImplementationRepository::ServerInformationList_out server_list,
@@ -501,37 +477,56 @@ namespace POA_ImplementationRepository
       ACE_THROW_SPEC ((
         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
+ 
+    virtual void shutdown (
+        ::CORBA::Boolean activators,
+        ::CORBA::Boolean servers
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+ 
+    static void shutdown_skel (
+        TAO_ServerRequest & server_request,
+        void * servant_upcall,
+        void * servant
+        ACE_ENV_ARG_DECL
+      );
   };
-  
+ 
   ///////////////////////////////////////////////////////////////////////
-  //               Strategized Proxy Broker Declaration 
+  //               Strategized Proxy Broker Declaration
   //
-  
+ 
   // TAO_IDL - Generated from
-  // be\be_visitor_interface/strategized_proxy_broker_sh.cpp:36
-  
+  // c:\cvsdoc\ace_wrappers\tao\tao_idl\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
         ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+ 
     void
     dispatch (
         CORBA::Object_ptr obj,
@@ -544,34 +539,34 @@ namespace POA_ImplementationRepository
         ACE_ENV_ARG_DECL
       )
       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 
-  // be\be_visitor_interface/direct_proxy_impl_sh.cpp:31
-  
+ 
+ 
+ 
+  // TAO_IDL - Generated from
+  // c:\cvsdoc\ace_wrappers\tao\tao_idl\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) {}
-    
+ 
     // TAO_IDL - Generated from
-    // be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+    // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/proxy_impl_xh.cpp:24
+ 
     static void
     activate_server (
         TAO_Abstract_ServantBase *servant,
@@ -584,12 +579,12 @@ namespace POA_ImplementationRepository
         ::ImplementationRepository::NotFound,
         ::ImplementationRepository::CannotActivate
       ));
-    
+ 
     // TAO_IDL - Generated from
-    // be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+    // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/proxy_impl_xh.cpp:24
+ 
     static void
-    register_server (
+    add_or_update_server (
         TAO_Abstract_ServantBase *servant,
         TAO::Argument ** args,
         int num_args
@@ -597,15 +592,14 @@ namespace POA_ImplementationRepository
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
-        ::ImplementationRepository::AlreadyRegistered,
         ::ImplementationRepository::NotFound
       ));
-    
+ 
     // TAO_IDL - Generated from
-    // be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+    // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/proxy_impl_xh.cpp:24
+ 
     static void
-    reregister_server (
+    remove_server (
         TAO_Abstract_ServantBase *servant,
         TAO::Argument ** args,
         int num_args
@@ -613,15 +607,14 @@ namespace POA_ImplementationRepository
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
-        ::ImplementationRepository::AlreadyRegistered,
         ::ImplementationRepository::NotFound
       ));
-    
+ 
     // TAO_IDL - Generated from
-    // be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+    // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/proxy_impl_xh.cpp:24
+ 
     static void
-    remove_server (
+    shutdown_server (
         TAO_Abstract_ServantBase *servant,
         TAO::Argument ** args,
         int num_args
@@ -631,12 +624,12 @@ namespace POA_ImplementationRepository
         CORBA::SystemException,
         ::ImplementationRepository::NotFound
       ));
-    
+ 
     // TAO_IDL - Generated from
-    // be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+    // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/proxy_impl_xh.cpp:24
+ 
     static void
-    shutdown_server (
+    server_is_running (
         TAO_Abstract_ServantBase *servant,
         TAO::Argument ** args,
         int num_args
@@ -646,12 +639,12 @@ namespace POA_ImplementationRepository
         CORBA::SystemException,
         ::ImplementationRepository::NotFound
       ));
-    
+ 
     // TAO_IDL - Generated from
-    // be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+    // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/proxy_impl_xh.cpp:24
+ 
     static void
-    server_is_running (
+    server_is_shutting_down (
         TAO_Abstract_ServantBase *servant,
         TAO::Argument ** args,
         int num_args
@@ -661,42 +654,40 @@ namespace POA_ImplementationRepository
         CORBA::SystemException,
         ::ImplementationRepository::NotFound
       ));
-    
+ 
     // TAO_IDL - Generated from
-    // be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+    // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/proxy_impl_xh.cpp:24
+ 
     static void
-    server_is_shutting_down (
+    find (
         TAO_Abstract_ServantBase *servant,
         TAO::Argument ** args,
         int num_args
         ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::ImplementationRepository::NotFound
+        CORBA::SystemException
       ));
-    
+ 
     // TAO_IDL - Generated from
-    // be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+    // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/proxy_impl_xh.cpp:24
+ 
     static void
-    find (
+    list (
         TAO_Abstract_ServantBase *servant,
         TAO::Argument ** args,
         int num_args
         ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::ImplementationRepository::NotFound
+        CORBA::SystemException
       ));
-    
+ 
     // TAO_IDL - Generated from
-    // be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+    // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/proxy_impl_xh.cpp:24
+ 
     static void
-    list (
+    shutdown (
         TAO_Abstract_ServantBase *servant,
         TAO::Argument ** args,
         int num_args
@@ -706,20 +697,20 @@ namespace POA_ImplementationRepository
         CORBA::SystemException
       ));
   };
-  
+ 
   //
   //                Direct  Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-  
-  
+ 
+ 
 
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_sh.cpp:80
+// c:\cvsdoc\ace_wrappers\tao\tao_idl\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:995