Merged latest HEAD branch into skeleton-refactor branch

13 files changed, 4539 insertions, 6238 deletions

diff --git a/TAO/tao/PortableServer/Default_Acceptor_Filter.cpp b/TAO/tao/PortableServer/Default_Acceptor_Filter.cpp
index 1ea5b05fcee..5737f5d6af3 100644
--- a/TAO/tao/PortableServer/Default_Acceptor_Filter.cpp
+++ b/TAO/tao/PortableServer/Default_Acceptor_Filter.cpp
@@ -7,7 +7,6 @@ ACE_RCSID (PortableServer,
            Default_Acceptor_Filter,
            "$Id$")
 
-
 TAO_Default_Acceptor_Filter::TAO_Default_Acceptor_Filter (void)
 {
 }
diff --git a/TAO/tao/PortableServer/ImplRepo.pidl b/TAO/tao/PortableServer/ImplRepo.pidl
index d28309ac66f..85851eba429 100644
--- a/TAO/tao/PortableServer/ImplRepo.pidl
+++ b/TAO/tao/PortableServer/ImplRepo.pidl
@@ -6,7 +6,7 @@
  *
  * $Id$
  *
- * This file was used to generate the code in ImplRepo{C,S,S_T}.{h,inl,cpp}
+ * This file was used to generate the code in ImplRepo{C,S,S_T}.{h,i,cpp}
  *
  * The command used to generate code from this file is:
  *
diff --git a/TAO/tao/PortableServer/ImplRepoC.cpp b/TAO/tao/PortableServer/ImplRepoC.cpp
index 079749d729c..af29fe20187 100644
--- a/TAO/tao/PortableServer/ImplRepoC.cpp
+++ b/TAO/tao/PortableServer/ImplRepoC.cpp
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be/be_codegen.cpp:303
+// be\be_codegen.cpp:302
 
 
 #include "ImplRepoC.h"
@@ -35,9 +35,6 @@
 #include "tao/Invocation_Adapter.h"
 #include "tao/Object_T.h"
 #include "tao/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"
@@ -54,7 +51,7 @@
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be/be_visitor_arg_traits.cpp:67
+// be\be_visitor_arg_traits.cpp:65
 
 // Arg traits specializations.
 namespace TAO
@@ -78,7 +75,7 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be/be_visitor_arg_traits.cpp:689
+  // be\be_visitor_arg_traits.cpp:612
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_STARTUPOPTIONS__ARG_TRAITS_CS_)
 #define _IMPLEMENTATIONREPOSITORY_STARTUPOPTIONS__ARG_TRAITS_CS_
@@ -97,7 +94,7 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be/be_visitor_arg_traits.cpp:689
+  // be\be_visitor_arg_traits.cpp:612
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATION__ARG_TRAITS_CS_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATION__ARG_TRAITS_CS_
@@ -116,7 +113,7 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be/be_visitor_arg_traits.cpp:421
+  // be\be_visitor_arg_traits.cpp:383
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST__ARG_TRAITS_CS_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST__ARG_TRAITS_CS_
@@ -153,281 +150,8 @@ namespace TAO
 }
 
 
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for ImplementationRepository::ServerObject.
-
-ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
-ImplementationRepository::ServerObject_ptr
-TAO::Objref_Traits<ImplementationRepository::ServerObject>::duplicate (
-    ImplementationRepository::ServerObject_ptr p
-  )
-{
-  return ImplementationRepository::ServerObject::_duplicate (p);
-}
-
-ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
-void
-TAO::Objref_Traits<ImplementationRepository::ServerObject>::release (
-    ImplementationRepository::ServerObject_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
-ImplementationRepository::ServerObject_ptr
-TAO::Objref_Traits<ImplementationRepository::ServerObject>::nil (void)
-{
-  return ImplementationRepository::ServerObject::_nil ();
-}
-
-ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
-CORBA::Boolean
-TAO::Objref_Traits<ImplementationRepository::ServerObject>::marshal (
-    ImplementationRepository::ServerObject_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
-(*ImplementationRepository__TAO_ServerObject_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
-// TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:78
-
-void ImplementationRepository::ServerObject::ping (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  if (!this->is_evaluated ())
-    {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
-    }
-  
-  if (this->the_TAO_ServerObject_Proxy_Broker_ == 0)
-    {
-      ImplementationRepository_ServerObject_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,
-      1,
-      "ping",
-      4,
-      this->the_TAO_ServerObject_Proxy_Broker_
-    );
-  
-  _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:78
-
-void ImplementationRepository::ServerObject::shutdown (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  if (!this->is_evaluated ())
-    {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
-    }
-  
-  if (this->the_TAO_ServerObject_Proxy_Broker_ == 0)
-    {
-      ImplementationRepository_ServerObject_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,
-      1,
-      "shutdown",
-      8,
-      this->the_TAO_ServerObject_Proxy_Broker_
-    );
-  
-  _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-ImplementationRepository::ServerObject::ServerObject (void)
- : the_TAO_ServerObject_Proxy_Broker_ (0)
-{
-  this->ImplementationRepository_ServerObject_setup_collocation ();
-}
-
-void
-ImplementationRepository::ServerObject::ImplementationRepository_ServerObject_setup_collocation ()
-{
-  if (::ImplementationRepository__TAO_ServerObject_Proxy_Broker_Factory_function_pointer)
-    {
-      this->the_TAO_ServerObject_Proxy_Broker_ =
-        ::ImplementationRepository__TAO_ServerObject_Proxy_Broker_Factory_function_pointer (this);
-    }
-}
-
-ImplementationRepository::ServerObject::~ServerObject (void)
-{}
-
-void 
-ImplementationRepository::ServerObject::_tao_any_destructor (void *_tao_void_pointer)
-{
-  ServerObject *_tao_tmp_pointer =
-    static_cast<ServerObject *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
-ImplementationRepository::ServerObject_ptr
-ImplementationRepository::ServerObject::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL
-  )
-{
-  return
-    TAO::Narrow_Utils<ServerObject>::narrow (
-        _tao_objref,
-        "IDL:ImplementationRepository/ServerObject:1.0",
-        ImplementationRepository__TAO_ServerObject_Proxy_Broker_Factory_function_pointer
-        ACE_ENV_ARG_PARAMETER
-      );
-}
-
-ImplementationRepository::ServerObject_ptr
-ImplementationRepository::ServerObject::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL
-  )
-{
-  return
-    TAO::Narrow_Utils<ServerObject>::unchecked_narrow (
-        _tao_objref,
-        "IDL:ImplementationRepository/ServerObject:1.0",
-        ImplementationRepository__TAO_ServerObject_Proxy_Broker_Factory_function_pointer
-        ACE_ENV_ARG_PARAMETER
-      );
-}
-
-ImplementationRepository::ServerObject_ptr
-ImplementationRepository::ServerObject::_duplicate (ServerObject_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-  
-  return obj;
-}
-
-CORBA::Boolean
-ImplementationRepository::ServerObject::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          (char *)value,
-          "IDL:ImplementationRepository/ServerObject:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          (char *)value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-     )
-    {
-      return 1; // success using local knowledge
-    }
-  else
-    {
-      return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a (
-          value
-          ACE_ENV_ARG_PARAMETER
-        );
-    }
-}
-
-const char* ImplementationRepository::ServerObject::_interface_repository_id (void) const
-{
-  return "IDL:ImplementationRepository/ServerObject:1.0";
-}
-
-CORBA::Boolean
-ImplementationRepository::ServerObject::marshal (TAO_OutputCDR &cdr)
-{
-  return (cdr << this);
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:290
-
-static const CORBA::Long _oc_ImplementationRepository_ServerObject[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  46,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x496d706c), 
-  ACE_NTOHL (0x656d656e), 
-  ACE_NTOHL (0x74617469), 
-  ACE_NTOHL (0x6f6e5265), 
-  ACE_NTOHL (0x706f7369), 
-  ACE_NTOHL (0x746f7279), 
-  ACE_NTOHL (0x2f536572), 
-  ACE_NTOHL (0x7665724f), 
-  ACE_NTOHL (0x626a6563), 
-  ACE_NTOHL (0x743a312e), 
-  ACE_NTOHL (0x30000000),  // repository ID = IDL:ImplementationRepository/ServerObject:1.0
-    13,
-  ACE_NTOHL (0x53657276), 
-  ACE_NTOHL (0x65724f62), 
-  ACE_NTOHL (0x6a656374), 
-  ACE_NTOHL (0x0),  // name = ServerObject
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_ImplementationRepository_ServerObject (
-    CORBA::tk_objref,
-    sizeof (_oc_ImplementationRepository_ServerObject),
-    (char *) &_oc_ImplementationRepository_ServerObject,
-    0,
-    sizeof (ImplementationRepository::ServerObject)
-  );
-
-namespace ImplementationRepository
-{
-  ::CORBA::TypeCode_ptr const _tc_ServerObject =
-    &_tc_TAO_tc_ImplementationRepository_ServerObject;
-}
-
 // TAO_IDL - Generated from 
-// be/be_visitor_exception/exception_cs.cpp:63
+// be\be_visitor_exception/exception_cs.cpp:63
 
 ImplementationRepository::AlreadyRegistered::AlreadyRegistered (void)
   : CORBA::UserException (
@@ -459,21 +183,20 @@ ImplementationRepository::AlreadyRegistered::operator= (const ::ImplementationRe
 void ImplementationRepository::AlreadyRegistered::_tao_any_destructor (void *_tao_void_pointer)
 {
   AlreadyRegistered *_tao_tmp_pointer =
-    static_cast<AlreadyRegistered*> (_tao_void_pointer);
+    static_cast<AlreadyRegistered *> (_tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
 ImplementationRepository::AlreadyRegistered *
 ImplementationRepository::AlreadyRegistered::_downcast (CORBA::Exception *_tao_excp)
 {
-  if (!ACE_OS::strcmp ("IDL:ImplementationRepository/AlreadyRegistered:1.0", _tao_excp->_rep_id ()))
-    {
-      return dynamic_cast<AlreadyRegistered *> (_tao_excp);
-    }
-  else
-    {
-      return 0;
-    }
+  return dynamic_cast<AlreadyRegistered *> (_tao_excp);
+}
+
+const ImplementationRepository::AlreadyRegistered *
+ImplementationRepository::AlreadyRegistered::_downcast (CORBA::Exception const *_tao_excp)
+{
+  return dynamic_cast<const AlreadyRegistered *> (_tao_excp);
 }
 
 CORBA::Exception *ImplementationRepository::AlreadyRegistered::_alloc (void)
@@ -533,7 +256,7 @@ CORBA::TypeCode_ptr ImplementationRepository::AlreadyRegistered::_type (void) co
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_ImplementationRepository_AlreadyRegistered[] =
 {
@@ -566,17 +289,17 @@ static CORBA::TypeCode _tc_TAO_tc_ImplementationRepository_AlreadyRegistered (
     sizeof (_oc_ImplementationRepository_AlreadyRegistered),
     (char *) &_oc_ImplementationRepository_AlreadyRegistered,
     0,
-    sizeof (ImplementationRepository::AlreadyRegistered)
+    0
   );
 
 namespace ImplementationRepository
 {
-  ::CORBA::TypeCode_ptr const _tc_AlreadyRegistered =
+  ::CORBA::TypeCode_ptr _tc_AlreadyRegistered =
     &_tc_TAO_tc_ImplementationRepository_AlreadyRegistered;
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_exception/exception_cs.cpp:63
+// be\be_visitor_exception/exception_cs.cpp:63
 
 ImplementationRepository::CannotActivate::CannotActivate (void)
   : CORBA::UserException (
@@ -610,21 +333,20 @@ ImplementationRepository::CannotActivate::operator= (const ::ImplementationRepos
 void ImplementationRepository::CannotActivate::_tao_any_destructor (void *_tao_void_pointer)
 {
   CannotActivate *_tao_tmp_pointer =
-    static_cast<CannotActivate*> (_tao_void_pointer);
+    static_cast<CannotActivate *> (_tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
 ImplementationRepository::CannotActivate *
 ImplementationRepository::CannotActivate::_downcast (CORBA::Exception *_tao_excp)
 {
-  if (!ACE_OS::strcmp ("IDL:ImplementationRepository/CannotActivate:1.0", _tao_excp->_rep_id ()))
-    {
-      return dynamic_cast<CannotActivate *> (_tao_excp);
-    }
-  else
-    {
-      return 0;
-    }
+  return dynamic_cast<CannotActivate *> (_tao_excp);
+}
+
+const ImplementationRepository::CannotActivate *
+ImplementationRepository::CannotActivate::_downcast (CORBA::Exception const *_tao_excp)
+{
+  return dynamic_cast<const CannotActivate *> (_tao_excp);
 }
 
 CORBA::Exception *ImplementationRepository::CannotActivate::_alloc (void)
@@ -680,7 +402,7 @@ void ImplementationRepository::CannotActivate::_tao_decode (
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_exception/exception_ctor.cpp:66
+// be\be_visitor_exception/exception_ctor.cpp:66
 
 ImplementationRepository::CannotActivate::CannotActivate (
     const char * _tao_reason
@@ -700,7 +422,7 @@ CORBA::TypeCode_ptr ImplementationRepository::CannotActivate::_type (void) const
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_ImplementationRepository_CannotActivate[] =
 {
@@ -736,17 +458,17 @@ static CORBA::TypeCode _tc_TAO_tc_ImplementationRepository_CannotActivate (
     sizeof (_oc_ImplementationRepository_CannotActivate),
     (char *) &_oc_ImplementationRepository_CannotActivate,
     0,
-    sizeof (ImplementationRepository::CannotActivate)
+    0
   );
 
 namespace ImplementationRepository
 {
-  ::CORBA::TypeCode_ptr const _tc_CannotActivate =
+  ::CORBA::TypeCode_ptr _tc_CannotActivate =
     &_tc_TAO_tc_ImplementationRepository_CannotActivate;
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_exception/exception_cs.cpp:63
+// be\be_visitor_exception/exception_cs.cpp:63
 
 ImplementationRepository::NotFound::NotFound (void)
   : CORBA::UserException (
@@ -778,21 +500,20 @@ ImplementationRepository::NotFound::operator= (const ::ImplementationRepository:
 void ImplementationRepository::NotFound::_tao_any_destructor (void *_tao_void_pointer)
 {
   NotFound *_tao_tmp_pointer =
-    static_cast<NotFound*> (_tao_void_pointer);
+    static_cast<NotFound *> (_tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
 ImplementationRepository::NotFound *
 ImplementationRepository::NotFound::_downcast (CORBA::Exception *_tao_excp)
 {
-  if (!ACE_OS::strcmp ("IDL:ImplementationRepository/NotFound:1.0", _tao_excp->_rep_id ()))
-    {
-      return dynamic_cast<NotFound *> (_tao_excp);
-    }
-  else
-    {
-      return 0;
-    }
+  return dynamic_cast<NotFound *> (_tao_excp);
+}
+
+const ImplementationRepository::NotFound *
+ImplementationRepository::NotFound::_downcast (CORBA::Exception const *_tao_excp)
+{
+  return dynamic_cast<const NotFound *> (_tao_excp);
 }
 
 CORBA::Exception *ImplementationRepository::NotFound::_alloc (void)
@@ -852,7 +573,7 @@ CORBA::TypeCode_ptr ImplementationRepository::NotFound::_type (void) const
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_ImplementationRepository_NotFound[] =
 {
@@ -881,71 +602,17 @@ static CORBA::TypeCode _tc_TAO_tc_ImplementationRepository_NotFound (
     sizeof (_oc_ImplementationRepository_NotFound),
     (char *) &_oc_ImplementationRepository_NotFound,
     0,
-    sizeof (ImplementationRepository::NotFound)
+    0
   );
 
 namespace ImplementationRepository
 {
-  ::CORBA::TypeCode_ptr const _tc_NotFound =
+  ::CORBA::TypeCode_ptr _tc_NotFound =
     &_tc_TAO_tc_ImplementationRepository_NotFound;
 }
 
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:290
-
-static const CORBA::Long _oc_ImplementationRepository_EnvironmentVariable[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  53,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x496d706c), 
-  ACE_NTOHL (0x656d656e), 
-  ACE_NTOHL (0x74617469), 
-  ACE_NTOHL (0x6f6e5265), 
-  ACE_NTOHL (0x706f7369), 
-  ACE_NTOHL (0x746f7279), 
-  ACE_NTOHL (0x2f456e76), 
-  ACE_NTOHL (0x69726f6e), 
-  ACE_NTOHL (0x6d656e74), 
-  ACE_NTOHL (0x56617269), 
-  ACE_NTOHL (0x61626c65), 
-  ACE_NTOHL (0x3a312e30), 
-  ACE_NTOHL (0x0),  // repository ID = IDL:ImplementationRepository/EnvironmentVariable:1.0
-    20,
-  ACE_NTOHL (0x456e7669), 
-  ACE_NTOHL (0x726f6e6d), 
-  ACE_NTOHL (0x656e7456), 
-  ACE_NTOHL (0x61726961), 
-  ACE_NTOHL (0x626c6500),  // name = EnvironmentVariable
-  2, // member count
-    5,
-  ACE_NTOHL (0x6e616d65), 
-  ACE_NTOHL (0x0),  // name = name
-    CORBA::tk_string, 
-  0U, // string length
-  6,
-  ACE_NTOHL (0x76616c75), 
-  ACE_NTOHL (0x65000000),  // name = value
-    CORBA::tk_string, 
-  0U, // string length
-};
-
-static CORBA::TypeCode _tc_TAO_tc_ImplementationRepository_EnvironmentVariable (
-    CORBA::tk_struct,
-    sizeof (_oc_ImplementationRepository_EnvironmentVariable),
-    (char *) &_oc_ImplementationRepository_EnvironmentVariable,
-    0,
-    sizeof (ImplementationRepository::EnvironmentVariable)
-  );
-
-namespace ImplementationRepository
-{
-  ::CORBA::TypeCode_ptr const _tc_EnvironmentVariable =
-    &_tc_TAO_tc_ImplementationRepository_EnvironmentVariable;
-}
-
 // TAO_IDL - Generated from 
-// be/be_visitor_structure/structure_cs.cpp:66
+// be\be_visitor_structure/structure_cs.cpp:66
 
 void 
 ImplementationRepository::EnvironmentVariable::_tao_any_destructor (
@@ -957,47 +624,8 @@ ImplementationRepository::EnvironmentVariable::_tao_any_destructor (
   delete _tao_tmp_pointer;
 }
 
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:290
-
-static const CORBA::Long _oc_ImplementationRepository_Address[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  41,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x496d706c), 
-  ACE_NTOHL (0x656d656e), 
-  ACE_NTOHL (0x74617469), 
-  ACE_NTOHL (0x6f6e5265), 
-  ACE_NTOHL (0x706f7369), 
-  ACE_NTOHL (0x746f7279), 
-  ACE_NTOHL (0x2f416464), 
-  ACE_NTOHL (0x72657373), 
-  ACE_NTOHL (0x3a312e30), 
-  ACE_NTOHL (0x0),  // repository ID = IDL:ImplementationRepository/Address:1.0
-    8,
-  ACE_NTOHL (0x41646472), 
-  ACE_NTOHL (0x65737300),  // name = Address
-    CORBA::tk_string, 
-  0U, // string length
-};
-
-static CORBA::TypeCode _tc_TAO_tc_ImplementationRepository_Address (
-    CORBA::tk_alias,
-    sizeof (_oc_ImplementationRepository_Address),
-    (char *) &_oc_ImplementationRepository_Address,
-    0,
-    sizeof (ImplementationRepository::Address)
-  );
-
-namespace ImplementationRepository
-{
-  ::CORBA::TypeCode_ptr const _tc_Address =
-    &_tc_TAO_tc_ImplementationRepository_Address;
-}
-
 // TAO_IDL - Generated from 
-// be/be_visitor_sequence/sequence_cs.cpp:65
+// be\be_visitor_sequence/sequence_cs.cpp:65
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST_CS_)
 #define _IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST_CS_
@@ -1049,316 +677,8 @@ void ImplementationRepository::EnvironmentList::_tao_any_destructor (
 
 #endif /* end #if !defined */
 
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:290
-
-static const CORBA::Long _oc_ImplementationRepository_EnvironmentList[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  49,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x496d706c), 
-  ACE_NTOHL (0x656d656e), 
-  ACE_NTOHL (0x74617469), 
-  ACE_NTOHL (0x6f6e5265), 
-  ACE_NTOHL (0x706f7369), 
-  ACE_NTOHL (0x746f7279), 
-  ACE_NTOHL (0x2f456e76), 
-  ACE_NTOHL (0x69726f6e), 
-  ACE_NTOHL (0x6d656e74), 
-  ACE_NTOHL (0x4c697374), 
-  ACE_NTOHL (0x3a312e30), 
-  ACE_NTOHL (0x0),  // repository ID = IDL:ImplementationRepository/EnvironmentList:1.0
-    16,
-  ACE_NTOHL (0x456e7669), 
-  ACE_NTOHL (0x726f6e6d), 
-  ACE_NTOHL (0x656e744c), 
-  ACE_NTOHL (0x69737400),  // name = EnvironmentList
-    CORBA::tk_sequence, // typecode kind
-  148, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_struct, // typecode kind
-    132, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      53,
-      ACE_NTOHL (0x49444c3a), 
-      ACE_NTOHL (0x496d706c), 
-      ACE_NTOHL (0x656d656e), 
-      ACE_NTOHL (0x74617469), 
-      ACE_NTOHL (0x6f6e5265), 
-      ACE_NTOHL (0x706f7369), 
-      ACE_NTOHL (0x746f7279), 
-      ACE_NTOHL (0x2f456e76), 
-      ACE_NTOHL (0x69726f6e), 
-      ACE_NTOHL (0x6d656e74), 
-      ACE_NTOHL (0x56617269), 
-      ACE_NTOHL (0x61626c65), 
-      ACE_NTOHL (0x3a312e30), 
-      ACE_NTOHL (0x0),  // repository ID = IDL:ImplementationRepository/EnvironmentVariable:1.0
-            20,
-      ACE_NTOHL (0x456e7669), 
-      ACE_NTOHL (0x726f6e6d), 
-      ACE_NTOHL (0x656e7456), 
-      ACE_NTOHL (0x61726961), 
-      ACE_NTOHL (0x626c6500),  // name = EnvironmentVariable
-      2, // member count
-            5,
-      ACE_NTOHL (0x6e616d65), 
-      ACE_NTOHL (0x0),  // name = name
-            CORBA::tk_string, 
-      0U, // string length
-      6,
-      ACE_NTOHL (0x76616c75), 
-      ACE_NTOHL (0x65000000),  // name = value
-            CORBA::tk_string, 
-      0U, // string length
-
-    0U,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_ImplementationRepository_EnvironmentList (
-    CORBA::tk_alias,
-    sizeof (_oc_ImplementationRepository_EnvironmentList),
-    (char *) &_oc_ImplementationRepository_EnvironmentList,
-    0,
-    sizeof (ImplementationRepository::EnvironmentList)
-  );
-
-namespace ImplementationRepository
-{
-  ::CORBA::TypeCode_ptr const _tc_EnvironmentList =
-    &_tc_TAO_tc_ImplementationRepository_EnvironmentList;
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:290
-
-static const CORBA::Long _oc_ImplementationRepository_ActivationMode[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  48,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x496d706c), 
-  ACE_NTOHL (0x656d656e), 
-  ACE_NTOHL (0x74617469), 
-  ACE_NTOHL (0x6f6e5265), 
-  ACE_NTOHL (0x706f7369), 
-  ACE_NTOHL (0x746f7279), 
-  ACE_NTOHL (0x2f416374), 
-  ACE_NTOHL (0x69766174), 
-  ACE_NTOHL (0x696f6e4d), 
-  ACE_NTOHL (0x6f64653a), 
-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:ImplementationRepository/ActivationMode:1.0
-  15,
-  ACE_NTOHL (0x41637469), 
-  ACE_NTOHL (0x76617469), 
-  ACE_NTOHL (0x6f6e4d6f), 
-  ACE_NTOHL (0x64650000),  // name = ActivationMode
-  4, // member count
-  7,
-  ACE_NTOHL (0x4e4f524d), 
-  ACE_NTOHL (0x414c0000),  // name = NORMAL
-  7,
-  ACE_NTOHL (0x4d414e55), 
-  ACE_NTOHL (0x414c0000),  // name = MANUAL
-  11,
-  ACE_NTOHL (0x5045525f), 
-  ACE_NTOHL (0x434c4945), 
-  ACE_NTOHL (0x4e540000),  // name = PER_CLIENT
-  11,
-  ACE_NTOHL (0x4155544f), 
-  ACE_NTOHL (0x5f535441), 
-  ACE_NTOHL (0x52540000),  // name = AUTO_START
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_ImplementationRepository_ActivationMode (
-    CORBA::tk_enum,
-    sizeof (_oc_ImplementationRepository_ActivationMode),
-    (char *) &_oc_ImplementationRepository_ActivationMode,
-    0,
-    sizeof (ImplementationRepository::ActivationMode)
-  );
-
-namespace ImplementationRepository
-{
-  ::CORBA::TypeCode_ptr const _tc_ActivationMode =
-    &_tc_TAO_tc_ImplementationRepository_ActivationMode;
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:290
-
-static const CORBA::Long _oc_ImplementationRepository_StartupOptions[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  48,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x496d706c), 
-  ACE_NTOHL (0x656d656e), 
-  ACE_NTOHL (0x74617469), 
-  ACE_NTOHL (0x6f6e5265), 
-  ACE_NTOHL (0x706f7369), 
-  ACE_NTOHL (0x746f7279), 
-  ACE_NTOHL (0x2f537461), 
-  ACE_NTOHL (0x72747570), 
-  ACE_NTOHL (0x4f707469), 
-  ACE_NTOHL (0x6f6e733a), 
-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:ImplementationRepository/StartupOptions:1.0
-    15,
-  ACE_NTOHL (0x53746172), 
-  ACE_NTOHL (0x7475704f), 
-  ACE_NTOHL (0x7074696f), 
-  ACE_NTOHL (0x6e730000),  // name = StartupOptions
-  5, // member count
-    13,
-  ACE_NTOHL (0x636f6d6d), 
-  ACE_NTOHL (0x616e645f), 
-  ACE_NTOHL (0x6c696e65), 
-  ACE_NTOHL (0x0),  // name = command_line
-    CORBA::tk_string, 
-  0U, // string length
-  12,
-  ACE_NTOHL (0x656e7669), 
-  ACE_NTOHL (0x726f6e6d), 
-  ACE_NTOHL (0x656e7400),  // name = environment
-    CORBA::tk_alias, // typecode kind for typedefs
-  236, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    49,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x496d706c), 
-    ACE_NTOHL (0x656d656e), 
-    ACE_NTOHL (0x74617469), 
-    ACE_NTOHL (0x6f6e5265), 
-    ACE_NTOHL (0x706f7369), 
-    ACE_NTOHL (0x746f7279), 
-    ACE_NTOHL (0x2f456e76), 
-    ACE_NTOHL (0x69726f6e), 
-    ACE_NTOHL (0x6d656e74), 
-    ACE_NTOHL (0x4c697374), 
-    ACE_NTOHL (0x3a312e30), 
-    ACE_NTOHL (0x0),  // repository ID = IDL:ImplementationRepository/EnvironmentList:1.0
-        16,
-    ACE_NTOHL (0x456e7669), 
-    ACE_NTOHL (0x726f6e6d), 
-    ACE_NTOHL (0x656e744c), 
-    ACE_NTOHL (0x69737400),  // name = EnvironmentList
-        CORBA::tk_sequence, // typecode kind
-    148, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      CORBA::tk_struct, // typecode kind
-      132, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        53,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x496d706c), 
-        ACE_NTOHL (0x656d656e), 
-        ACE_NTOHL (0x74617469), 
-        ACE_NTOHL (0x6f6e5265), 
-        ACE_NTOHL (0x706f7369), 
-        ACE_NTOHL (0x746f7279), 
-        ACE_NTOHL (0x2f456e76), 
-        ACE_NTOHL (0x69726f6e), 
-        ACE_NTOHL (0x6d656e74), 
-        ACE_NTOHL (0x56617269), 
-        ACE_NTOHL (0x61626c65), 
-        ACE_NTOHL (0x3a312e30), 
-        ACE_NTOHL (0x0),  // repository ID = IDL:ImplementationRepository/EnvironmentVariable:1.0
-                20,
-        ACE_NTOHL (0x456e7669), 
-        ACE_NTOHL (0x726f6e6d), 
-        ACE_NTOHL (0x656e7456), 
-        ACE_NTOHL (0x61726961), 
-        ACE_NTOHL (0x626c6500),  // name = EnvironmentVariable
-        2, // member count
-                5,
-        ACE_NTOHL (0x6e616d65), 
-        ACE_NTOHL (0x0),  // name = name
-                CORBA::tk_string, 
-        0U, // string length
-        6,
-        ACE_NTOHL (0x76616c75), 
-        ACE_NTOHL (0x65000000),  // name = value
-                CORBA::tk_string, 
-        0U, // string length
-
-      0U,
-
-
-  18,
-  ACE_NTOHL (0x776f726b), 
-  ACE_NTOHL (0x696e675f), 
-  ACE_NTOHL (0x64697265), 
-  ACE_NTOHL (0x63746f72), 
-  ACE_NTOHL (0x79000000),  // name = working_directory
-    CORBA::tk_string, 
-  0U, // string length
-  11,
-  ACE_NTOHL (0x61637469), 
-  ACE_NTOHL (0x76617469), 
-  ACE_NTOHL (0x6f6e0000),  // name = activation
-    CORBA::tk_enum, // typecode kind
-  136, // encapsulation length
-TAO_ENCAP_BYTE_ORDER, // byte order
-    48,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x496d706c), 
-    ACE_NTOHL (0x656d656e), 
-    ACE_NTOHL (0x74617469), 
-    ACE_NTOHL (0x6f6e5265), 
-    ACE_NTOHL (0x706f7369), 
-    ACE_NTOHL (0x746f7279), 
-    ACE_NTOHL (0x2f416374), 
-    ACE_NTOHL (0x69766174), 
-    ACE_NTOHL (0x696f6e4d), 
-    ACE_NTOHL (0x6f64653a), 
-    ACE_NTOHL (0x312e3000),  // repository ID = IDL:ImplementationRepository/ActivationMode:1.0
-    15,
-    ACE_NTOHL (0x41637469), 
-    ACE_NTOHL (0x76617469), 
-    ACE_NTOHL (0x6f6e4d6f), 
-    ACE_NTOHL (0x64650000),  // name = ActivationMode
-    4, // member count
-    7,
-    ACE_NTOHL (0x4e4f524d), 
-    ACE_NTOHL (0x414c0000),  // name = NORMAL
-    7,
-    ACE_NTOHL (0x4d414e55), 
-    ACE_NTOHL (0x414c0000),  // name = MANUAL
-    11,
-    ACE_NTOHL (0x5045525f), 
-    ACE_NTOHL (0x434c4945), 
-    ACE_NTOHL (0x4e540000),  // name = PER_CLIENT
-    11,
-    ACE_NTOHL (0x4155544f), 
-    ACE_NTOHL (0x5f535441), 
-    ACE_NTOHL (0x52540000),  // name = AUTO_START
-    
-  10,
-  ACE_NTOHL (0x61637469), 
-  ACE_NTOHL (0x7661746f), 
-  ACE_NTOHL (0x72000000),  // name = activator
-    CORBA::tk_string, 
-  0U, // string length
-};
-
-static CORBA::TypeCode _tc_TAO_tc_ImplementationRepository_StartupOptions (
-    CORBA::tk_struct,
-    sizeof (_oc_ImplementationRepository_StartupOptions),
-    (char *) &_oc_ImplementationRepository_StartupOptions,
-    0,
-    sizeof (ImplementationRepository::StartupOptions)
-  );
-
-namespace ImplementationRepository
-{
-  ::CORBA::TypeCode_ptr const _tc_StartupOptions =
-    &_tc_TAO_tc_ImplementationRepository_StartupOptions;
-}
-
 // TAO_IDL - Generated from 
-// be/be_visitor_structure/structure_cs.cpp:66
+// be\be_visitor_structure/structure_cs.cpp:66
 
 void 
 ImplementationRepository::StartupOptions::_tao_any_destructor (
@@ -1370,244 +690,8 @@ ImplementationRepository::StartupOptions::_tao_any_destructor (
   delete _tao_tmp_pointer;
 }
 
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:290
-
-static const CORBA::Long _oc_ImplementationRepository_ServerInformation[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  51,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x496d706c), 
-  ACE_NTOHL (0x656d656e), 
-  ACE_NTOHL (0x74617469), 
-  ACE_NTOHL (0x6f6e5265), 
-  ACE_NTOHL (0x706f7369), 
-  ACE_NTOHL (0x746f7279), 
-  ACE_NTOHL (0x2f536572), 
-  ACE_NTOHL (0x76657249), 
-  ACE_NTOHL (0x6e666f72), 
-  ACE_NTOHL (0x6d617469), 
-  ACE_NTOHL (0x6f6e3a31), 
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:ImplementationRepository/ServerInformation:1.0
-    18,
-  ACE_NTOHL (0x53657276), 
-  ACE_NTOHL (0x6572496e), 
-  ACE_NTOHL (0x666f726d), 
-  ACE_NTOHL (0x6174696f), 
-  ACE_NTOHL (0x6e000000),  // name = ServerInformation
-  4, // member count
-    15,
-  ACE_NTOHL (0x6c6f6769), 
-  ACE_NTOHL (0x63616c5f), 
-  ACE_NTOHL (0x73657276), 
-  ACE_NTOHL (0x65720000),  // name = logical_server
-    CORBA::tk_string, 
-  0U, // string length
-  7,
-  ACE_NTOHL (0x73657276), 
-  ACE_NTOHL (0x65720000),  // name = server
-    CORBA::tk_string, 
-  0U, // string length
-  8,
-  ACE_NTOHL (0x73746172), 
-  ACE_NTOHL (0x74757000),  // name = startup
-    CORBA::tk_struct, // typecode kind
-  584, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    48,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x496d706c), 
-    ACE_NTOHL (0x656d656e), 
-    ACE_NTOHL (0x74617469), 
-    ACE_NTOHL (0x6f6e5265), 
-    ACE_NTOHL (0x706f7369), 
-    ACE_NTOHL (0x746f7279), 
-    ACE_NTOHL (0x2f537461), 
-    ACE_NTOHL (0x72747570), 
-    ACE_NTOHL (0x4f707469), 
-    ACE_NTOHL (0x6f6e733a), 
-    ACE_NTOHL (0x312e3000),  // repository ID = IDL:ImplementationRepository/StartupOptions:1.0
-        15,
-    ACE_NTOHL (0x53746172), 
-    ACE_NTOHL (0x7475704f), 
-    ACE_NTOHL (0x7074696f), 
-    ACE_NTOHL (0x6e730000),  // name = StartupOptions
-    5, // member count
-        13,
-    ACE_NTOHL (0x636f6d6d), 
-    ACE_NTOHL (0x616e645f), 
-    ACE_NTOHL (0x6c696e65), 
-    ACE_NTOHL (0x0),  // name = command_line
-        CORBA::tk_string, 
-    0U, // string length
-    12,
-    ACE_NTOHL (0x656e7669), 
-    ACE_NTOHL (0x726f6e6d), 
-    ACE_NTOHL (0x656e7400),  // name = environment
-        CORBA::tk_alias, // typecode kind for typedefs
-    236, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      49,
-      ACE_NTOHL (0x49444c3a), 
-      ACE_NTOHL (0x496d706c), 
-      ACE_NTOHL (0x656d656e), 
-      ACE_NTOHL (0x74617469), 
-      ACE_NTOHL (0x6f6e5265), 
-      ACE_NTOHL (0x706f7369), 
-      ACE_NTOHL (0x746f7279), 
-      ACE_NTOHL (0x2f456e76), 
-      ACE_NTOHL (0x69726f6e), 
-      ACE_NTOHL (0x6d656e74), 
-      ACE_NTOHL (0x4c697374), 
-      ACE_NTOHL (0x3a312e30), 
-      ACE_NTOHL (0x0),  // repository ID = IDL:ImplementationRepository/EnvironmentList:1.0
-            16,
-      ACE_NTOHL (0x456e7669), 
-      ACE_NTOHL (0x726f6e6d), 
-      ACE_NTOHL (0x656e744c), 
-      ACE_NTOHL (0x69737400),  // name = EnvironmentList
-            CORBA::tk_sequence, // typecode kind
-      148, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        CORBA::tk_struct, // typecode kind
-        132, // encapsulation length
-          TAO_ENCAP_BYTE_ORDER, // byte order
-          53,
-          ACE_NTOHL (0x49444c3a), 
-          ACE_NTOHL (0x496d706c), 
-          ACE_NTOHL (0x656d656e), 
-          ACE_NTOHL (0x74617469), 
-          ACE_NTOHL (0x6f6e5265), 
-          ACE_NTOHL (0x706f7369), 
-          ACE_NTOHL (0x746f7279), 
-          ACE_NTOHL (0x2f456e76), 
-          ACE_NTOHL (0x69726f6e), 
-          ACE_NTOHL (0x6d656e74), 
-          ACE_NTOHL (0x56617269), 
-          ACE_NTOHL (0x61626c65), 
-          ACE_NTOHL (0x3a312e30), 
-          ACE_NTOHL (0x0),  // repository ID = IDL:ImplementationRepository/EnvironmentVariable:1.0
-                    20,
-          ACE_NTOHL (0x456e7669), 
-          ACE_NTOHL (0x726f6e6d), 
-          ACE_NTOHL (0x656e7456), 
-          ACE_NTOHL (0x61726961), 
-          ACE_NTOHL (0x626c6500),  // name = EnvironmentVariable
-          2, // member count
-                    5,
-          ACE_NTOHL (0x6e616d65), 
-          ACE_NTOHL (0x0),  // name = name
-                    CORBA::tk_string, 
-          0U, // string length
-          6,
-          ACE_NTOHL (0x76616c75), 
-          ACE_NTOHL (0x65000000),  // name = value
-                    CORBA::tk_string, 
-          0U, // string length
-
-        0U,
-
-
-    18,
-    ACE_NTOHL (0x776f726b), 
-    ACE_NTOHL (0x696e675f), 
-    ACE_NTOHL (0x64697265), 
-    ACE_NTOHL (0x63746f72), 
-    ACE_NTOHL (0x79000000),  // name = working_directory
-        CORBA::tk_string, 
-    0U, // string length
-    11,
-    ACE_NTOHL (0x61637469), 
-    ACE_NTOHL (0x76617469), 
-    ACE_NTOHL (0x6f6e0000),  // name = activation
-        CORBA::tk_enum, // typecode kind
-    136, // encapsulation length
-TAO_ENCAP_BYTE_ORDER, // byte order
-      48,
-      ACE_NTOHL (0x49444c3a), 
-      ACE_NTOHL (0x496d706c), 
-      ACE_NTOHL (0x656d656e), 
-      ACE_NTOHL (0x74617469), 
-      ACE_NTOHL (0x6f6e5265), 
-      ACE_NTOHL (0x706f7369), 
-      ACE_NTOHL (0x746f7279), 
-      ACE_NTOHL (0x2f416374), 
-      ACE_NTOHL (0x69766174), 
-      ACE_NTOHL (0x696f6e4d), 
-      ACE_NTOHL (0x6f64653a), 
-      ACE_NTOHL (0x312e3000),  // repository ID = IDL:ImplementationRepository/ActivationMode:1.0
-      15,
-      ACE_NTOHL (0x41637469), 
-      ACE_NTOHL (0x76617469), 
-      ACE_NTOHL (0x6f6e4d6f), 
-      ACE_NTOHL (0x64650000),  // name = ActivationMode
-      4, // member count
-      7,
-      ACE_NTOHL (0x4e4f524d), 
-      ACE_NTOHL (0x414c0000),  // name = NORMAL
-      7,
-      ACE_NTOHL (0x4d414e55), 
-      ACE_NTOHL (0x414c0000),  // name = MANUAL
-      11,
-      ACE_NTOHL (0x5045525f), 
-      ACE_NTOHL (0x434c4945), 
-      ACE_NTOHL (0x4e540000),  // name = PER_CLIENT
-      11,
-      ACE_NTOHL (0x4155544f), 
-      ACE_NTOHL (0x5f535441), 
-      ACE_NTOHL (0x52540000),  // name = AUTO_START
-      
-    10,
-    ACE_NTOHL (0x61637469), 
-    ACE_NTOHL (0x7661746f), 
-    ACE_NTOHL (0x72000000),  // name = activator
-        CORBA::tk_string, 
-    0U, // string length
-
-  9,
-  ACE_NTOHL (0x6c6f6361), 
-  ACE_NTOHL (0x74696f6e), 
-  ACE_NTOHL (0x0),  // name = location
-    CORBA::tk_alias, // typecode kind for typedefs
-  72, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    41,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x496d706c), 
-    ACE_NTOHL (0x656d656e), 
-    ACE_NTOHL (0x74617469), 
-    ACE_NTOHL (0x6f6e5265), 
-    ACE_NTOHL (0x706f7369), 
-    ACE_NTOHL (0x746f7279), 
-    ACE_NTOHL (0x2f416464), 
-    ACE_NTOHL (0x72657373), 
-    ACE_NTOHL (0x3a312e30), 
-    ACE_NTOHL (0x0),  // repository ID = IDL:ImplementationRepository/Address:1.0
-        8,
-    ACE_NTOHL (0x41646472), 
-    ACE_NTOHL (0x65737300),  // name = Address
-        CORBA::tk_string, 
-    0U, // string length
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_ImplementationRepository_ServerInformation (
-    CORBA::tk_struct,
-    sizeof (_oc_ImplementationRepository_ServerInformation),
-    (char *) &_oc_ImplementationRepository_ServerInformation,
-    0,
-    sizeof (ImplementationRepository::ServerInformation)
-  );
-
-namespace ImplementationRepository
-{
-  ::CORBA::TypeCode_ptr const _tc_ServerInformation =
-    &_tc_TAO_tc_ImplementationRepository_ServerInformation;
-}
-
 // TAO_IDL - Generated from 
-// be/be_visitor_structure/structure_cs.cpp:66
+// be\be_visitor_structure/structure_cs.cpp:66
 
 void 
 ImplementationRepository::ServerInformation::_tao_any_destructor (
@@ -1620,7 +704,7 @@ ImplementationRepository::ServerInformation::_tao_any_destructor (
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_sequence/sequence_cs.cpp:65
+// be\be_visitor_sequence/sequence_cs.cpp:65
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST_CS_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST_CS_
@@ -1673,274 +757,248 @@ void ImplementationRepository::ServerInformationList::_tao_any_destructor (
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_interface/interface_cs.cpp:60
+
+// Traits specializations for ImplementationRepository::ServerInformationIterator.
 
-static const CORBA::Long _oc_ImplementationRepository_ServerInformationList[] =
+ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
+ImplementationRepository::ServerInformationIterator_ptr
+TAO::Objref_Traits<ImplementationRepository::ServerInformationIterator>::duplicate (
+    ImplementationRepository::ServerInformationIterator_ptr p
+  )
 {
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  55,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x496d706c), 
-  ACE_NTOHL (0x656d656e), 
-  ACE_NTOHL (0x74617469), 
-  ACE_NTOHL (0x6f6e5265), 
-  ACE_NTOHL (0x706f7369), 
-  ACE_NTOHL (0x746f7279), 
-  ACE_NTOHL (0x2f536572), 
-  ACE_NTOHL (0x76657249), 
-  ACE_NTOHL (0x6e666f72), 
-  ACE_NTOHL (0x6d617469), 
-  ACE_NTOHL (0x6f6e4c69), 
-  ACE_NTOHL (0x73743a31), 
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:ImplementationRepository/ServerInformationList:1.0
-    22,
-  ACE_NTOHL (0x53657276), 
-  ACE_NTOHL (0x6572496e), 
-  ACE_NTOHL (0x666f726d), 
-  ACE_NTOHL (0x6174696f), 
-  ACE_NTOHL (0x6e4c6973), 
-  ACE_NTOHL (0x74000000),  // name = ServerInformationList
-    CORBA::tk_sequence, // typecode kind
-  852, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_struct, // typecode kind
-    836, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      51,
-      ACE_NTOHL (0x49444c3a), 
-      ACE_NTOHL (0x496d706c), 
-      ACE_NTOHL (0x656d656e), 
-      ACE_NTOHL (0x74617469), 
-      ACE_NTOHL (0x6f6e5265), 
-      ACE_NTOHL (0x706f7369), 
-      ACE_NTOHL (0x746f7279), 
-      ACE_NTOHL (0x2f536572), 
-      ACE_NTOHL (0x76657249), 
-      ACE_NTOHL (0x6e666f72), 
-      ACE_NTOHL (0x6d617469), 
-      ACE_NTOHL (0x6f6e3a31), 
-      ACE_NTOHL (0x2e300000),  // repository ID = IDL:ImplementationRepository/ServerInformation:1.0
-            18,
-      ACE_NTOHL (0x53657276), 
-      ACE_NTOHL (0x6572496e), 
-      ACE_NTOHL (0x666f726d), 
-      ACE_NTOHL (0x6174696f), 
-      ACE_NTOHL (0x6e000000),  // name = ServerInformation
-      4, // member count
-            15,
-      ACE_NTOHL (0x6c6f6769), 
-      ACE_NTOHL (0x63616c5f), 
-      ACE_NTOHL (0x73657276), 
-      ACE_NTOHL (0x65720000),  // name = logical_server
-            CORBA::tk_string, 
-      0U, // string length
+  return ImplementationRepository::ServerInformationIterator::_duplicate (p);
+}
+
+ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
+void
+TAO::Objref_Traits<ImplementationRepository::ServerInformationIterator>::release (
+    ImplementationRepository::ServerInformationIterator_ptr p
+  )
+{
+  CORBA::release (p);
+}
+
+ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
+ImplementationRepository::ServerInformationIterator_ptr
+TAO::Objref_Traits<ImplementationRepository::ServerInformationIterator>::nil (void)
+{
+  return ImplementationRepository::ServerInformationIterator::_nil ();
+}
+
+ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
+CORBA::Boolean
+TAO::Objref_Traits<ImplementationRepository::ServerInformationIterator>::marshal (
+    ImplementationRepository::ServerInformationIterator_ptr p,
+    TAO_OutputCDR & cdr
+  )
+{
+  return CORBA::Object::marshal (p, cdr);
+}
+
+// Function pointer for collocation factory initialization.
+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
+
+CORBA::Boolean ImplementationRepository::ServerInformationIterator::next_n (
+    ::CORBA::ULong how_many,
+    ::ImplementationRepository::ServerInformationList_out 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_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,
+      3,
+      "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
+
+void ImplementationRepository::ServerInformationIterator::destroy (
+    ACE_ENV_SINGLE_ARG_DECL
+  )
+  ACE_THROW_SPEC ((
+    CORBA::SystemException
+  ))
+{
+  if (!this->is_evaluated ())
+    {
+      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,
+      1,
+      "destroy",
       7,
-      ACE_NTOHL (0x73657276), 
-      ACE_NTOHL (0x65720000),  // name = server
-            CORBA::tk_string, 
-      0U, // string length
-      8,
-      ACE_NTOHL (0x73746172), 
-      ACE_NTOHL (0x74757000),  // name = startup
-            CORBA::tk_struct, // typecode kind
-      584, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        48,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x496d706c), 
-        ACE_NTOHL (0x656d656e), 
-        ACE_NTOHL (0x74617469), 
-        ACE_NTOHL (0x6f6e5265), 
-        ACE_NTOHL (0x706f7369), 
-        ACE_NTOHL (0x746f7279), 
-        ACE_NTOHL (0x2f537461), 
-        ACE_NTOHL (0x72747570), 
-        ACE_NTOHL (0x4f707469), 
-        ACE_NTOHL (0x6f6e733a), 
-        ACE_NTOHL (0x312e3000),  // repository ID = IDL:ImplementationRepository/StartupOptions:1.0
-                15,
-        ACE_NTOHL (0x53746172), 
-        ACE_NTOHL (0x7475704f), 
-        ACE_NTOHL (0x7074696f), 
-        ACE_NTOHL (0x6e730000),  // name = StartupOptions
-        5, // member count
-                13,
-        ACE_NTOHL (0x636f6d6d), 
-        ACE_NTOHL (0x616e645f), 
-        ACE_NTOHL (0x6c696e65), 
-        ACE_NTOHL (0x0),  // name = command_line
-                CORBA::tk_string, 
-        0U, // string length
-        12,
-        ACE_NTOHL (0x656e7669), 
-        ACE_NTOHL (0x726f6e6d), 
-        ACE_NTOHL (0x656e7400),  // name = environment
-                CORBA::tk_alias, // typecode kind for typedefs
-        236, // encapsulation length
-          TAO_ENCAP_BYTE_ORDER, // byte order
-          49,
-          ACE_NTOHL (0x49444c3a), 
-          ACE_NTOHL (0x496d706c), 
-          ACE_NTOHL (0x656d656e), 
-          ACE_NTOHL (0x74617469), 
-          ACE_NTOHL (0x6f6e5265), 
-          ACE_NTOHL (0x706f7369), 
-          ACE_NTOHL (0x746f7279), 
-          ACE_NTOHL (0x2f456e76), 
-          ACE_NTOHL (0x69726f6e), 
-          ACE_NTOHL (0x6d656e74), 
-          ACE_NTOHL (0x4c697374), 
-          ACE_NTOHL (0x3a312e30), 
-          ACE_NTOHL (0x0),  // repository ID = IDL:ImplementationRepository/EnvironmentList:1.0
-                    16,
-          ACE_NTOHL (0x456e7669), 
-          ACE_NTOHL (0x726f6e6d), 
-          ACE_NTOHL (0x656e744c), 
-          ACE_NTOHL (0x69737400),  // name = EnvironmentList
-                    CORBA::tk_sequence, // typecode kind
-          148, // encapsulation length
-            TAO_ENCAP_BYTE_ORDER, // byte order
-            CORBA::tk_struct, // typecode kind
-            132, // encapsulation length
-              TAO_ENCAP_BYTE_ORDER, // byte order
-              53,
-              ACE_NTOHL (0x49444c3a), 
-              ACE_NTOHL (0x496d706c), 
-              ACE_NTOHL (0x656d656e), 
-              ACE_NTOHL (0x74617469), 
-              ACE_NTOHL (0x6f6e5265), 
-              ACE_NTOHL (0x706f7369), 
-              ACE_NTOHL (0x746f7279), 
-              ACE_NTOHL (0x2f456e76), 
-              ACE_NTOHL (0x69726f6e), 
-              ACE_NTOHL (0x6d656e74), 
-              ACE_NTOHL (0x56617269), 
-              ACE_NTOHL (0x61626c65), 
-              ACE_NTOHL (0x3a312e30), 
-              ACE_NTOHL (0x0),  // repository ID = IDL:ImplementationRepository/EnvironmentVariable:1.0
-                            20,
-              ACE_NTOHL (0x456e7669), 
-              ACE_NTOHL (0x726f6e6d), 
-              ACE_NTOHL (0x656e7456), 
-              ACE_NTOHL (0x61726961), 
-              ACE_NTOHL (0x626c6500),  // name = EnvironmentVariable
-              2, // member count
-                            5,
-              ACE_NTOHL (0x6e616d65), 
-              ACE_NTOHL (0x0),  // name = name
-                            CORBA::tk_string, 
-              0U, // string length
-              6,
-              ACE_NTOHL (0x76616c75), 
-              ACE_NTOHL (0x65000000),  // name = value
-                            CORBA::tk_string, 
-              0U, // string length
-
-            0U,
-
-
-        18,
-        ACE_NTOHL (0x776f726b), 
-        ACE_NTOHL (0x696e675f), 
-        ACE_NTOHL (0x64697265), 
-        ACE_NTOHL (0x63746f72), 
-        ACE_NTOHL (0x79000000),  // name = working_directory
-                CORBA::tk_string, 
-        0U, // string length
-        11,
-        ACE_NTOHL (0x61637469), 
-        ACE_NTOHL (0x76617469), 
-        ACE_NTOHL (0x6f6e0000),  // name = activation
-                CORBA::tk_enum, // typecode kind
-        136, // encapsulation length
-TAO_ENCAP_BYTE_ORDER, // byte order
-          48,
-          ACE_NTOHL (0x49444c3a), 
-          ACE_NTOHL (0x496d706c), 
-          ACE_NTOHL (0x656d656e), 
-          ACE_NTOHL (0x74617469), 
-          ACE_NTOHL (0x6f6e5265), 
-          ACE_NTOHL (0x706f7369), 
-          ACE_NTOHL (0x746f7279), 
-          ACE_NTOHL (0x2f416374), 
-          ACE_NTOHL (0x69766174), 
-          ACE_NTOHL (0x696f6e4d), 
-          ACE_NTOHL (0x6f64653a), 
-          ACE_NTOHL (0x312e3000),  // repository ID = IDL:ImplementationRepository/ActivationMode:1.0
-          15,
-          ACE_NTOHL (0x41637469), 
-          ACE_NTOHL (0x76617469), 
-          ACE_NTOHL (0x6f6e4d6f), 
-          ACE_NTOHL (0x64650000),  // name = ActivationMode
-          4, // member count
-          7,
-          ACE_NTOHL (0x4e4f524d), 
-          ACE_NTOHL (0x414c0000),  // name = NORMAL
-          7,
-          ACE_NTOHL (0x4d414e55), 
-          ACE_NTOHL (0x414c0000),  // name = MANUAL
-          11,
-          ACE_NTOHL (0x5045525f), 
-          ACE_NTOHL (0x434c4945), 
-          ACE_NTOHL (0x4e540000),  // name = PER_CLIENT
-          11,
-          ACE_NTOHL (0x4155544f), 
-          ACE_NTOHL (0x5f535441), 
-          ACE_NTOHL (0x52540000),  // name = AUTO_START
-          
-        10,
-        ACE_NTOHL (0x61637469), 
-        ACE_NTOHL (0x7661746f), 
-        ACE_NTOHL (0x72000000),  // name = activator
-                CORBA::tk_string, 
-        0U, // string length
-
-      9,
-      ACE_NTOHL (0x6c6f6361), 
-      ACE_NTOHL (0x74696f6e), 
-      ACE_NTOHL (0x0),  // name = location
-            CORBA::tk_alias, // typecode kind for typedefs
-      72, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        41,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x496d706c), 
-        ACE_NTOHL (0x656d656e), 
-        ACE_NTOHL (0x74617469), 
-        ACE_NTOHL (0x6f6e5265), 
-        ACE_NTOHL (0x706f7369), 
-        ACE_NTOHL (0x746f7279), 
-        ACE_NTOHL (0x2f416464), 
-        ACE_NTOHL (0x72657373), 
-        ACE_NTOHL (0x3a312e30), 
-        ACE_NTOHL (0x0),  // repository ID = IDL:ImplementationRepository/Address:1.0
-                8,
-        ACE_NTOHL (0x41646472), 
-        ACE_NTOHL (0x65737300),  // name = Address
-                CORBA::tk_string, 
-        0U, // string length
-
-
-    0U,
+      this->the_TAO_ServerInformationIterator_Proxy_Broker_
+    );
+  
+  _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+}
 
-};
+ImplementationRepository::ServerInformationIterator::ServerInformationIterator (void)
+ : the_TAO_ServerInformationIterator_Proxy_Broker_ (0)
+{
+  this->ImplementationRepository_ServerInformationIterator_setup_collocation ();
+}
 
-static CORBA::TypeCode _tc_TAO_tc_ImplementationRepository_ServerInformationList (
-    CORBA::tk_alias,
-    sizeof (_oc_ImplementationRepository_ServerInformationList),
-    (char *) &_oc_ImplementationRepository_ServerInformationList,
-    0,
-    sizeof (ImplementationRepository::ServerInformationList)
-  );
+void
+ImplementationRepository::ServerInformationIterator::ImplementationRepository_ServerInformationIterator_setup_collocation ()
+{
+  if (::ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Factory_function_pointer)
+    {
+      this->the_TAO_ServerInformationIterator_Proxy_Broker_ =
+        ::ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Factory_function_pointer (this);
+    }
+}
 
-namespace ImplementationRepository
+ImplementationRepository::ServerInformationIterator::~ServerInformationIterator (void)
+{}
+
+void 
+ImplementationRepository::ServerInformationIterator::_tao_any_destructor (void *_tao_void_pointer)
 {
-  ::CORBA::TypeCode_ptr const _tc_ServerInformationList =
-    &_tc_TAO_tc_ImplementationRepository_ServerInformationList;
+  ServerInformationIterator *_tao_tmp_pointer =
+    static_cast<ServerInformationIterator *> (_tao_void_pointer);
+  CORBA::release (_tao_tmp_pointer);
+}
+
+ImplementationRepository::ServerInformationIterator_ptr
+ImplementationRepository::ServerInformationIterator::_narrow (
+    CORBA::Object_ptr _tao_objref
+    ACE_ENV_ARG_DECL
+  )
+{
+  return
+    TAO::Narrow_Utils<ServerInformationIterator>::narrow (
+        _tao_objref,
+        "IDL:ImplementationRepository/ServerInformationIterator:1.0",
+        ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Factory_function_pointer
+        ACE_ENV_ARG_PARAMETER
+      );
+}
+
+ImplementationRepository::ServerInformationIterator_ptr
+ImplementationRepository::ServerInformationIterator::_unchecked_narrow (
+    CORBA::Object_ptr _tao_objref
+    ACE_ENV_ARG_DECL
+  )
+{
+  return
+    TAO::Narrow_Utils<ServerInformationIterator>::unchecked_narrow (
+        _tao_objref,
+        "IDL:ImplementationRepository/ServerInformationIterator:1.0",
+        ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Factory_function_pointer
+        ACE_ENV_ARG_PARAMETER
+      );
+}
+
+ImplementationRepository::ServerInformationIterator_ptr
+ImplementationRepository::ServerInformationIterator::_duplicate (ServerInformationIterator_ptr obj)
+{
+  if (! CORBA::is_nil (obj))
+    {
+      obj->_add_ref ();
+    }
+  
+  return obj;
+}
+
+CORBA::Boolean
+ImplementationRepository::ServerInformationIterator::_is_a (
+    const char *value
+    ACE_ENV_ARG_DECL
+  )
+{
+  if (
+      !ACE_OS::strcmp (
+          value,
+          "IDL:ImplementationRepository/ServerInformationIterator:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          value,
+          "IDL:omg.org/CORBA/Object:1.0"
+        )
+    )
+    {
+      return 1; // success using local knowledge
+    }
+  else
+    {
+      return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a (
+          value
+          ACE_ENV_ARG_PARAMETER
+        );
+    }
+}
+
+const char* ImplementationRepository::ServerInformationIterator::_interface_repository_id (void) const
+{
+  return "IDL:ImplementationRepository/ServerInformationIterator:1.0";
+}
+
+CORBA::Boolean
+ImplementationRepository::ServerInformationIterator::marshal (TAO_OutputCDR &cdr)
+{
+  return (cdr << this);
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:60
+// be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for ImplementationRepository::Administration.
 
@@ -1986,7 +1044,7 @@ TAO::Collocation_Proxy_Broker *
   ) = 0;
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:78
+// be\be_visitor_operation/operation_cs.cpp:78
 
 void ImplementationRepository::Administration::activate_server (
     const char * server
@@ -2009,7 +1067,7 @@ void ImplementationRepository::Administration::activate_server (
     }
   
   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_server (server);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -2051,77 +1109,7 @@ void ImplementationRepository::Administration::activate_server (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:78
-
-char * ImplementationRepository::Administration::activate_server_with_startup (
-    const char * server,
-    ::CORBA::Long check_startup
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException,
-    ::ImplementationRepository::NotFound,
-    ::ImplementationRepository::CannotActivate
-  ))
-{
-  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< ::CORBA::Char *>::ret_val _tao_retval;
-  TAO::Arg_Traits< ::CORBA::Char *>::in_arg_val _tao_server (server);
-  TAO::Arg_Traits< CORBA::Long>::in_arg_val _tao_check_startup (check_startup);
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval,
-      &_tao_server,
-      &_tao_check_startup
-    };
-  
-  static TAO::Exception_Data
-  _tao_ImplementationRepository_Administration_activate_server_with_startup_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,
-      3,
-      "activate_server_with_startup",
-      28,
-      this->the_TAO_Administration_Proxy_Broker_
-    );
-  
-  _tao_call.invoke (
-      _tao_ImplementationRepository_Administration_activate_server_with_startup_exceptiondata,
-      2
-      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
+// be\be_visitor_operation/operation_cs.cpp:78
 
 void ImplementationRepository::Administration::register_server (
     const char * server,
@@ -2145,8 +1133,8 @@ void ImplementationRepository::Administration::register_server (
     }
   
   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::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 [] =
     {
@@ -2189,7 +1177,7 @@ void ImplementationRepository::Administration::register_server (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:78
+// be\be_visitor_operation/operation_cs.cpp:78
 
 void ImplementationRepository::Administration::reregister_server (
     const char * server,
@@ -2213,8 +1201,8 @@ void ImplementationRepository::Administration::reregister_server (
     }
   
   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::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 [] =
     {
@@ -2257,7 +1245,7 @@ void ImplementationRepository::Administration::reregister_server (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:78
+// be\be_visitor_operation/operation_cs.cpp:78
 
 void ImplementationRepository::Administration::remove_server (
     const char * server
@@ -2279,7 +1267,7 @@ void ImplementationRepository::Administration::remove_server (
     }
   
   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_server (server);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -2315,7 +1303,7 @@ void ImplementationRepository::Administration::remove_server (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:78
+// be\be_visitor_operation/operation_cs.cpp:78
 
 void ImplementationRepository::Administration::shutdown_server (
     const char * server
@@ -2337,7 +1325,7 @@ void ImplementationRepository::Administration::shutdown_server (
     }
   
   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_server (server);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -2373,11 +1361,11 @@ void ImplementationRepository::Administration::shutdown_server (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:78
+// be\be_visitor_operation/operation_cs.cpp:78
 
 void ImplementationRepository::Administration::server_is_running (
     const char * server,
-    const char * addr,
+    const char * partial_ior,
     ::ImplementationRepository::ServerObject_ptr server_object
     ACE_ENV_ARG_DECL
   )
@@ -2397,15 +1385,15 @@ void ImplementationRepository::Administration::server_is_running (
     }
   
   TAO::Arg_Traits< void>::ret_val _tao_retval;
-  TAO::Arg_Traits< ::CORBA::Char *>::in_arg_val _tao_server (server);
-  TAO::Arg_Traits< ::ImplementationRepository::Address>::in_arg_val _tao_addr (addr);
-  TAO::Arg_Traits< ::ImplementationRepository::ServerObject>::in_arg_val _tao_server_object (server_object);
+  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,
       &_tao_server,
-      &_tao_addr,
+      &_tao_partial_ior,
       &_tao_server_object
     };
   
@@ -2437,7 +1425,7 @@ void ImplementationRepository::Administration::server_is_running (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:78
+// be\be_visitor_operation/operation_cs.cpp:78
 
 void ImplementationRepository::Administration::server_is_shutting_down (
     const char * server
@@ -2459,7 +1447,7 @@ void ImplementationRepository::Administration::server_is_shutting_down (
     }
   
   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_server (server);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -2495,7 +1483,7 @@ void ImplementationRepository::Administration::server_is_shutting_down (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:78
+// be\be_visitor_operation/operation_cs.cpp:78
 
 void ImplementationRepository::Administration::find (
     const char * server,
@@ -2518,8 +1506,8 @@ void ImplementationRepository::Administration::find (
     }
   
   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::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 [] =
     {
@@ -2556,7 +1544,7 @@ void ImplementationRepository::Administration::find (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:78
+// be\be_visitor_operation/operation_cs.cpp:78
 
 void ImplementationRepository::Administration::list (
     ::CORBA::ULong how_many,
@@ -2579,9 +1567,9 @@ void ImplementationRepository::Administration::list (
     }
   
   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::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 [] =
     {
@@ -2604,106 +1592,6 @@ void ImplementationRepository::Administration::list (
   ACE_CHECK;
 }
 
-// TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:78
-
-void ImplementationRepository::Administration::shutdown_repo (
-    ACE_ENV_SINGLE_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::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      1,
-      "shutdown_repo",
-      13,
-      this->the_TAO_Administration_Proxy_Broker_
-    );
-  
-  _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:78
-
-char * ImplementationRepository::Administration::find_ior (
-    const char * object_name
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException,
-    ::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< ::CORBA::Char *>::ret_val _tao_retval;
-  TAO::Arg_Traits< ::CORBA::Char *>::in_arg_val _tao_object_name (object_name);
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval,
-      &_tao_object_name
-    };
-  
-  static TAO::Exception_Data
-  _tao_ImplementationRepository_Administration_find_ior_exceptiondata [] = 
-    {
-      {
-        "IDL:ImplementationRepository/NotFound:1.0",
-        ImplementationRepository::NotFound::_alloc,
-        ImplementationRepository::_tc_NotFound
-      }
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      2,
-      "find_ior",
-      8,
-      this->the_TAO_Administration_Proxy_Broker_
-    );
-  
-  _tao_call.invoke (
-      _tao_ImplementationRepository_Administration_find_ior_exceptiondata,
-      1
-      ACE_ENV_ARG_PARAMETER
-    );
-  ACE_CHECK_RETURN (_tao_retval.excp ());
-  
-  return _tao_retval.retn ();
-}
-
 ImplementationRepository::Administration::Administration (void)
  : the_TAO_Administration_Proxy_Broker_ (0)
 {
@@ -2780,14 +1668,14 @@ ImplementationRepository::Administration::_is_a (
 {
   if (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:ImplementationRepository/Administration:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
+    )
     {
       return 1; // success using local knowledge
     }
@@ -2812,1123 +1700,15 @@ ImplementationRepository::Administration::marshal (TAO_OutputCDR &cdr)
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:290
-
-static const CORBA::Long _oc_ImplementationRepository_Administration[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  48,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x496d706c), 
-  ACE_NTOHL (0x656d656e), 
-  ACE_NTOHL (0x74617469), 
-  ACE_NTOHL (0x6f6e5265), 
-  ACE_NTOHL (0x706f7369), 
-  ACE_NTOHL (0x746f7279), 
-  ACE_NTOHL (0x2f41646d), 
-  ACE_NTOHL (0x696e6973), 
-  ACE_NTOHL (0x74726174), 
-  ACE_NTOHL (0x696f6e3a), 
-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:ImplementationRepository/Administration:1.0
-    15,
-  ACE_NTOHL (0x41646d69), 
-  ACE_NTOHL (0x6e697374), 
-  ACE_NTOHL (0x72617469), 
-  ACE_NTOHL (0x6f6e0000),  // name = Administration
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_ImplementationRepository_Administration (
-    CORBA::tk_objref,
-    sizeof (_oc_ImplementationRepository_Administration),
-    (char *) &_oc_ImplementationRepository_Administration,
-    0,
-    sizeof (ImplementationRepository::Administration)
-  );
-
-namespace ImplementationRepository
-{
-  ::CORBA::TypeCode_ptr const _tc_Administration =
-    &_tc_TAO_tc_ImplementationRepository_Administration;
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for ImplementationRepository::ServerInformationIterator.
-
-ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
-ImplementationRepository::ServerInformationIterator_ptr
-TAO::Objref_Traits<ImplementationRepository::ServerInformationIterator>::duplicate (
-    ImplementationRepository::ServerInformationIterator_ptr p
-  )
-{
-  return ImplementationRepository::ServerInformationIterator::_duplicate (p);
-}
-
-ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
-void
-TAO::Objref_Traits<ImplementationRepository::ServerInformationIterator>::release (
-    ImplementationRepository::ServerInformationIterator_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
-ImplementationRepository::ServerInformationIterator_ptr
-TAO::Objref_Traits<ImplementationRepository::ServerInformationIterator>::nil (void)
-{
-  return ImplementationRepository::ServerInformationIterator::_nil ();
-}
-
-ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
-CORBA::Boolean
-TAO::Objref_Traits<ImplementationRepository::ServerInformationIterator>::marshal (
-    ImplementationRepository::ServerInformationIterator_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-// Function pointer for collocation factory initialization.
-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
-
-CORBA::Boolean ImplementationRepository::ServerInformationIterator::next_n (
-    ::CORBA::ULong how_many,
-    ::ImplementationRepository::ServerInformationList_out server_list
-    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_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_server_list (server_list);
-  
-  TAO::Argument *_the_tao_operation_signature [] =
-    {
-      &_tao_retval,
-      &_tao_how_many,
-      &_tao_server_list
-    };
-  
-  TAO::Invocation_Adapter _tao_call (
-      this,
-      _the_tao_operation_signature,
-      3,
-      "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
-
-void ImplementationRepository::ServerInformationIterator::destroy (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  if (!this->is_evaluated ())
-    {
-      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,
-      1,
-      "destroy",
-      7,
-      this->the_TAO_ServerInformationIterator_Proxy_Broker_
-    );
-  
-  _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-ImplementationRepository::ServerInformationIterator::ServerInformationIterator (void)
- : the_TAO_ServerInformationIterator_Proxy_Broker_ (0)
-{
-  this->ImplementationRepository_ServerInformationIterator_setup_collocation ();
-}
-
-void
-ImplementationRepository::ServerInformationIterator::ImplementationRepository_ServerInformationIterator_setup_collocation ()
-{
-  if (::ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Factory_function_pointer)
-    {
-      this->the_TAO_ServerInformationIterator_Proxy_Broker_ =
-        ::ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Factory_function_pointer (this);
-    }
-}
-
-ImplementationRepository::ServerInformationIterator::~ServerInformationIterator (void)
-{}
-
-void 
-ImplementationRepository::ServerInformationIterator::_tao_any_destructor (void *_tao_void_pointer)
-{
-  ServerInformationIterator *_tao_tmp_pointer =
-    static_cast<ServerInformationIterator *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
-ImplementationRepository::ServerInformationIterator_ptr
-ImplementationRepository::ServerInformationIterator::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL
-  )
-{
-  return
-    TAO::Narrow_Utils<ServerInformationIterator>::narrow (
-        _tao_objref,
-        "IDL:ImplementationRepository/ServerInformationIterator:1.0",
-        ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Factory_function_pointer
-        ACE_ENV_ARG_PARAMETER
-      );
-}
-
-ImplementationRepository::ServerInformationIterator_ptr
-ImplementationRepository::ServerInformationIterator::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL
-  )
-{
-  return
-    TAO::Narrow_Utils<ServerInformationIterator>::unchecked_narrow (
-        _tao_objref,
-        "IDL:ImplementationRepository/ServerInformationIterator:1.0",
-        ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Factory_function_pointer
-        ACE_ENV_ARG_PARAMETER
-      );
-}
-
-ImplementationRepository::ServerInformationIterator_ptr
-ImplementationRepository::ServerInformationIterator::_duplicate (ServerInformationIterator_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-  
-  return obj;
-}
-
-CORBA::Boolean
-ImplementationRepository::ServerInformationIterator::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          (char *)value,
-          "IDL:ImplementationRepository/ServerInformationIterator:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          (char *)value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-     )
-    {
-      return 1; // success using local knowledge
-    }
-  else
-    {
-      return this->ACE_NESTED_CLASS (CORBA, Object)::_is_a (
-          value
-          ACE_ENV_ARG_PARAMETER
-        );
-    }
-}
-
-const char* ImplementationRepository::ServerInformationIterator::_interface_repository_id (void) const
-{
-  return "IDL:ImplementationRepository/ServerInformationIterator:1.0";
-}
-
-CORBA::Boolean
-ImplementationRepository::ServerInformationIterator::marshal (TAO_OutputCDR &cdr)
-{
-  return (cdr << this);
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:290
-
-static const CORBA::Long _oc_ImplementationRepository_ServerInformationIterator[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  59,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x496d706c), 
-  ACE_NTOHL (0x656d656e), 
-  ACE_NTOHL (0x74617469), 
-  ACE_NTOHL (0x6f6e5265), 
-  ACE_NTOHL (0x706f7369), 
-  ACE_NTOHL (0x746f7279), 
-  ACE_NTOHL (0x2f536572), 
-  ACE_NTOHL (0x76657249), 
-  ACE_NTOHL (0x6e666f72), 
-  ACE_NTOHL (0x6d617469), 
-  ACE_NTOHL (0x6f6e4974), 
-  ACE_NTOHL (0x65726174), 
-  ACE_NTOHL (0x6f723a31), 
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:ImplementationRepository/ServerInformationIterator:1.0
-    26,
-  ACE_NTOHL (0x53657276), 
-  ACE_NTOHL (0x6572496e), 
-  ACE_NTOHL (0x666f726d), 
-  ACE_NTOHL (0x6174696f), 
-  ACE_NTOHL (0x6e497465), 
-  ACE_NTOHL (0x7261746f), 
-  ACE_NTOHL (0x72000000),  // name = ServerInformationIterator
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_ImplementationRepository_ServerInformationIterator (
-    CORBA::tk_objref,
-    sizeof (_oc_ImplementationRepository_ServerInformationIterator),
-    (char *) &_oc_ImplementationRepository_ServerInformationIterator,
-    0,
-    sizeof (ImplementationRepository::ServerInformationIterator)
-  );
-
-namespace ImplementationRepository
-{
-  ::CORBA::TypeCode_ptr const _tc_ServerInformationIterator =
-    &_tc_TAO_tc_ImplementationRepository_ServerInformationIterator;
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-ACE_TEMPLATE_SPECIALIZATION
-CORBA::Boolean
-TAO::Any_Impl_T<ImplementationRepository::ServerObject>::to_object (
-    CORBA::Object_ptr &_tao_elem
-  ) const
-{
-  _tao_elem = CORBA::Object::_duplicate (this->value_);
-  return 1;
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    ImplementationRepository::ServerObject_ptr _tao_elem
-  )
-{
-  ImplementationRepository::ServerObject_ptr _tao_objptr =
-    ImplementationRepository::ServerObject::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    ImplementationRepository::ServerObject_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<ImplementationRepository::ServerObject>::insert (
-      _tao_any,
-      ImplementationRepository::ServerObject::_tao_any_destructor,
-      ImplementationRepository::_tc_ServerObject,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    ImplementationRepository::ServerObject_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<ImplementationRepository::ServerObject>::extract (
-        _tao_any,
-        ImplementationRepository::ServerObject::_tao_any_destructor,
-        ImplementationRepository::_tc_ServerObject,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_exception/any_op_cs.cpp:50
-
-ACE_TEMPLATE_SPECIALIZATION
-CORBA::Boolean
-TAO::Any_Dual_Impl_T<ImplementationRepository::AlreadyRegistered>::demarshal_value (
-    TAO_InputCDR & cdr
-  )
-{
-  CORBA::String_var id;
-  
-  if ((cdr >> id.out ()) == 0)
-    {
-      return 0;
-    }
-  
-  ACE_TRY_NEW_ENV
-    {
-      this->value_->_tao_decode (cdr ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      return 0;
-    }
-  ACE_ENDTRY;
-  
-  return 1;
-}
-
-// 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
-
-ACE_TEMPLATE_SPECIALIZATION
-CORBA::Boolean
-TAO::Any_Dual_Impl_T<ImplementationRepository::CannotActivate>::demarshal_value (
-    TAO_InputCDR & cdr
-  )
-{
-  CORBA::String_var id;
-  
-  if ((cdr >> id.out ()) == 0)
-    {
-      return 0;
-    }
-  
-  ACE_TRY_NEW_ENV
-    {
-      this->value_->_tao_decode (cdr ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      return 0;
-    }
-  ACE_ENDTRY;
-  
-  return 1;
-}
-
-// 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
-
-ACE_TEMPLATE_SPECIALIZATION
-CORBA::Boolean
-TAO::Any_Dual_Impl_T<ImplementationRepository::NotFound>::demarshal_value (
-    TAO_InputCDR & cdr
-  )
-{
-  CORBA::String_var id;
-  
-  if ((cdr >> id.out ()) == 0)
-    {
-      return 0;
-    }
-  
-  ACE_TRY_NEW_ENV
-    {
-      this->value_->_tao_decode (cdr ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      return 0;
-    }
-  ACE_ENDTRY;
-  
-  return 1;
-}
-
-// 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,
-      ImplementationRepository::_tc_EnvironmentList,
-      _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,
-      ImplementationRepository::_tc_EnvironmentList,
-      _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,
-        ImplementationRepository::_tc_EnvironmentList,
-        _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,
-      ImplementationRepository::_tc_ServerInformationList,
-      _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,
-      ImplementationRepository::_tc_ServerInformationList,
-      _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,
-        ImplementationRepository::_tc_ServerInformationList,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-ACE_TEMPLATE_SPECIALIZATION
-CORBA::Boolean
-TAO::Any_Impl_T<ImplementationRepository::Administration>::to_object (
-    CORBA::Object_ptr &_tao_elem
-  ) const
-{
-  _tao_elem = CORBA::Object::_duplicate (this->value_);
-  return 1;
-}
-
-// 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
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-ACE_TEMPLATE_SPECIALIZATION
-CORBA::Boolean
-TAO::Any_Impl_T<ImplementationRepository::ServerInformationIterator>::to_object (
-    CORBA::Object_ptr &_tao_elem
-  ) const
-{
-  _tao_elem = CORBA::Object::_duplicate (this->value_);
-  return 1;
-}
-
-// 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/cdr_op_cs.cpp:63
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const ImplementationRepository::ServerObject_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    ImplementationRepository::ServerObject_ptr &_tao_objref
-  )
-{
-  CORBA::Object_var obj;
-  
-  if ((strm >> obj.inout ()) == 0)
-    {
-      return 0;
-    }
-  
-  typedef ::ImplementationRepository::ServerObject RHS_SCOPED_NAME;
-  
-  // Narrow to the right type.
-  _tao_objref =
-    TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow (
-        obj.in (),
-        ImplementationRepository__TAO_ServerObject_Proxy_Broker_Factory_function_pointer
-      );
-    
-  return 1;
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_exception/cdr_op_cs.cpp:60
+// be\be_visitor_exception/cdr_op_cs.cpp:60
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
     const ImplementationRepository::AlreadyRegistered &_tao_aggregate
   )
 {
-  // First marshal the repository ID.
-  if (strm << _tao_aggregate._rep_id ())
-    {
-      return 1;
-    }
-  else
-    {
-      return 0;
-    }
+  // Marshal the repository ID.
+  return (strm << _tao_aggregate._rep_id ());
 }
 
 CORBA::Boolean operator>> (
@@ -3936,11 +1716,11 @@ CORBA::Boolean operator>> (
     ImplementationRepository::AlreadyRegistered&
   )
 {
-  return 1;
+  return true;
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_exception/cdr_op_cs.cpp:60
+// be\be_visitor_exception/cdr_op_cs.cpp:60
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -3951,20 +1731,13 @@ CORBA::Boolean operator<< (
   if (strm << _tao_aggregate._rep_id ())
     {
       // Now marshal the members (if any).
-      if (
+      return (
         (strm << _tao_aggregate.reason.in ())
-       )
-        {
-          return 1;
-        }
-      else
-        {
-          return 0;
-        }
+       );
     }
   else
     {
-      return 0;
+      return false;
     }
 }
 
@@ -3974,35 +1747,21 @@ CORBA::Boolean operator>> (
   )
 {
   // Demarshal the members.
-  if (
+  return (
     (strm >> _tao_aggregate.reason.out ())
-  )
-    {
-      return 1;
-    }
-  else
-    {
-      return 0;
-    }
+  );
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_exception/cdr_op_cs.cpp:60
+// be\be_visitor_exception/cdr_op_cs.cpp:60
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
     const ImplementationRepository::NotFound &_tao_aggregate
   )
 {
-  // First marshal the repository ID.
-  if (strm << _tao_aggregate._rep_id ())
-    {
-      return 1;
-    }
-  else
-    {
-      return 0;
-    }
+  // Marshal the repository ID.
+  return (strm << _tao_aggregate._rep_id ());
 }
 
 CORBA::Boolean operator>> (
@@ -4010,11 +1769,11 @@ CORBA::Boolean operator>> (
     ImplementationRepository::NotFound&
   )
 {
-  return 1;
+  return true;
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_structure/cdr_op_cs.cpp:61
+// be\be_visitor_structure/cdr_op_cs.cpp:61
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -4037,7 +1796,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/cdr_op_cs.cpp:96
+// be\be_visitor_sequence/cdr_op_cs.cpp:96
 
 #if !defined _TAO_CDR_OP_ImplementationRepository_EnvironmentList_CPP_
 #define _TAO_CDR_OP_ImplementationRepository_EnvironmentList_CPP_
@@ -4052,7 +1811,7 @@ CORBA::Boolean operator<< (
   if (strm << _tao_seq_len)
     {
       // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = 1;
+      CORBA::Boolean _tao_marshal_flag = true;
       
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
@@ -4062,7 +1821,7 @@ CORBA::Boolean operator<< (
       return _tao_marshal_flag;
     }
   
-  return 0;
+  return false;
 }
 
 CORBA::Boolean operator>> (
@@ -4079,7 +1838,7 @@ CORBA::Boolean operator>> (
       // of the stream. (See bug 58.)
       if (_tao_seq_len > strm.length ())
         {
-          return 0;
+          return false;
         }
       
       // Set the length of the sequence.
@@ -4088,11 +1847,11 @@ CORBA::Boolean operator>> (
       // If length is 0 we return true.
       if (0 >= _tao_seq_len) 
         {
-          return 1;
+          return true;
         }
       
       // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = 1;
+      CORBA::Boolean _tao_marshal_flag = true;
       
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
@@ -4103,13 +1862,13 @@ CORBA::Boolean operator>> (
     
     }
   
-  return 0;
+  return false;
 }
 
 #endif /* _TAO_CDR_OP_ImplementationRepository_EnvironmentList_CPP_ */
 
 // TAO_IDL - Generated from
-// be/be_visitor_enum/cdr_op_cs.cpp:51
+// be\be_visitor_enum/cdr_op_cs.cpp:51
 
 CORBA::Boolean operator<< (TAO_OutputCDR &strm, const ImplementationRepository::ActivationMode &_tao_enumval)
 {
@@ -4131,7 +1890,7 @@ CORBA::Boolean operator>> (TAO_InputCDR &strm, ImplementationRepository::Activat
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_structure/cdr_op_cs.cpp:61
+// be\be_visitor_structure/cdr_op_cs.cpp:61
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -4143,7 +1902,8 @@ CORBA::Boolean operator<< (
     (strm << _tao_aggregate.environment) &&
     (strm << _tao_aggregate.working_directory.in ()) &&
     (strm << _tao_aggregate.activation) &&
-    (strm << _tao_aggregate.activator.in ());
+    (strm << _tao_aggregate.activator.in ()) &&
+    (strm << _tao_aggregate.start_limit);
 }
 
 CORBA::Boolean operator>> (
@@ -4156,11 +1916,12 @@ CORBA::Boolean operator>> (
     (strm >> _tao_aggregate.environment) &&
     (strm >> _tao_aggregate.working_directory.out ()) &&
     (strm >> _tao_aggregate.activation) &&
-    (strm >> _tao_aggregate.activator.out ());
+    (strm >> _tao_aggregate.activator.out ()) &&
+    (strm >> _tao_aggregate.start_limit);
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_structure/cdr_op_cs.cpp:61
+// be\be_visitor_structure/cdr_op_cs.cpp:61
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -4168,10 +1929,9 @@ CORBA::Boolean operator<< (
   )
 {
   return
-    (strm << _tao_aggregate.logical_server.in ()) &&
     (strm << _tao_aggregate.server.in ()) &&
     (strm << _tao_aggregate.startup) &&
-    (strm << _tao_aggregate.location.in ());
+    (strm << _tao_aggregate.partial_ior.in ());
 }
 
 CORBA::Boolean operator>> (
@@ -4180,14 +1940,13 @@ CORBA::Boolean operator>> (
   )
 {
   return
-    (strm >> _tao_aggregate.logical_server.out ()) &&
     (strm >> _tao_aggregate.server.out ()) &&
     (strm >> _tao_aggregate.startup) &&
-    (strm >> _tao_aggregate.location.out ());
+    (strm >> _tao_aggregate.partial_ior.out ());
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/cdr_op_cs.cpp:96
+// be\be_visitor_sequence/cdr_op_cs.cpp:96
 
 #if !defined _TAO_CDR_OP_ImplementationRepository_ServerInformationList_CPP_
 #define _TAO_CDR_OP_ImplementationRepository_ServerInformationList_CPP_
@@ -4202,7 +1961,7 @@ CORBA::Boolean operator<< (
   if (strm << _tao_seq_len)
     {
       // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = 1;
+      CORBA::Boolean _tao_marshal_flag = true;
       
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
@@ -4212,7 +1971,7 @@ CORBA::Boolean operator<< (
       return _tao_marshal_flag;
     }
   
-  return 0;
+  return false;
 }
 
 CORBA::Boolean operator>> (
@@ -4229,7 +1988,7 @@ CORBA::Boolean operator>> (
       // of the stream. (See bug 58.)
       if (_tao_seq_len > strm.length ())
         {
-          return 0;
+          return false;
         }
       
       // Set the length of the sequence.
@@ -4238,11 +1997,11 @@ CORBA::Boolean operator>> (
       // If length is 0 we return true.
       if (0 >= _tao_seq_len) 
         {
-          return 1;
+          return true;
         }
       
       // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = 1;
+      CORBA::Boolean _tao_marshal_flag = true;
       
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
@@ -4253,17 +2012,17 @@ CORBA::Boolean operator>> (
     
     }
   
-  return 0;
+  return false;
 }
 
 #endif /* _TAO_CDR_OP_ImplementationRepository_ServerInformationList_CPP_ */
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/cdr_op_cs.cpp:63
+// be\be_visitor_interface/cdr_op_cs.cpp:63
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
-    const ImplementationRepository::Administration_ptr _tao_objref
+    const ImplementationRepository::ServerInformationIterator_ptr _tao_objref
   )
 {
   CORBA::Object_ptr _tao_corba_obj = _tao_objref;
@@ -4272,34 +2031,34 @@ CORBA::Boolean operator<< (
 
 CORBA::Boolean operator>> (
     TAO_InputCDR &strm,
-    ImplementationRepository::Administration_ptr &_tao_objref
+    ImplementationRepository::ServerInformationIterator_ptr &_tao_objref
   )
 {
   CORBA::Object_var obj;
   
-  if ((strm >> obj.inout ()) == 0)
+  if (!(strm >> obj.inout ()))
     {
-      return 0;
+      return false;
     }
   
-  typedef ::ImplementationRepository::Administration RHS_SCOPED_NAME;
+  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_Administration_Proxy_Broker_Factory_function_pointer
+        ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Factory_function_pointer
       );
     
   return 1;
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/cdr_op_cs.cpp:63
+// be\be_visitor_interface/cdr_op_cs.cpp:63
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
-    const ImplementationRepository::ServerInformationIterator_ptr _tao_objref
+    const ImplementationRepository::Administration_ptr _tao_objref
   )
 {
   CORBA::Object_ptr _tao_corba_obj = _tao_objref;
@@ -4308,30 +2067,30 @@ CORBA::Boolean operator<< (
 
 CORBA::Boolean operator>> (
     TAO_InputCDR &strm,
-    ImplementationRepository::ServerInformationIterator_ptr &_tao_objref
+    ImplementationRepository::Administration_ptr &_tao_objref
   )
 {
   CORBA::Object_var obj;
   
-  if ((strm >> obj.inout ()) == 0)
+  if (!(strm >> obj.inout ()))
     {
-      return 0;
+      return false;
     }
   
-  typedef ::ImplementationRepository::ServerInformationIterator RHS_SCOPED_NAME;
+  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_ServerInformationIterator_Proxy_Broker_Factory_function_pointer
+        ImplementationRepository__TAO_Administration_Proxy_Broker_Factory_function_pointer
       );
     
   return 1;
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_root/root.cpp:1641
+// be\be_visitor_root/root.cpp:1629
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
@@ -4354,46 +2113,6 @@ CORBA::Boolean operator>> (
 #endif /* end #if !defined */
 
   template class
-    TAO::Objref_Traits<
-        ImplementationRepository::ServerObject
-      >;
-
-  template class
-    TAO_Objref_Var_T<
-        ImplementationRepository::ServerObject
-      >;
-  
-  template class
-    TAO_Objref_Out_T<
-        ImplementationRepository::ServerObject
-      >;
-
-  template class
-    TAO::Narrow_Utils<
-        ImplementationRepository::ServerObject
-      >;
-
-  template class
-    TAO::Any_Impl_T<
-        ImplementationRepository::ServerObject
-      >;
-
-  template class
-    TAO::Any_Dual_Impl_T<
-        ImplementationRepository::AlreadyRegistered
-      >;
-
-  template class
-    TAO::Any_Dual_Impl_T<
-        ImplementationRepository::CannotActivate
-      >;
-
-  template class
-    TAO::Any_Dual_Impl_T<
-        ImplementationRepository::NotFound
-      >;
-
-  template class
     TAO_Var_Var_T<
         ImplementationRepository::EnvironmentVariable
       >;
@@ -4410,11 +2129,6 @@ CORBA::Boolean operator>> (
       >;
 
   template class
-    TAO::Any_Dual_Impl_T<
-        ImplementationRepository::EnvironmentVariable
-      >;
-
-  template class
     TAO_VarSeq_Var_T<
         ImplementationRepository::EnvironmentList,
         ImplementationRepository::EnvironmentVariable
@@ -4443,16 +2157,6 @@ CORBA::Boolean operator>> (
 
 #endif /* end #if !defined */
 
-  template class
-    TAO::Any_Dual_Impl_T<
-        ImplementationRepository::EnvironmentList
-      >;
-
-  template class
-    TAO::Any_Basic_Impl_T<
-        ImplementationRepository::ActivationMode
-      >;
-
 #if !defined (_IMPLEMENTATIONREPOSITORY_STARTUPOPTIONS__ARG_TRAITS_TMPLINST_CS_)
 #define _IMPLEMENTATIONREPOSITORY_STARTUPOPTIONS__ARG_TRAITS_TMPLINST_CS_
 
@@ -4483,11 +2187,6 @@ CORBA::Boolean operator>> (
         ImplementationRepository::StartupOptions_var
       >;
 
-  template class
-    TAO::Any_Dual_Impl_T<
-        ImplementationRepository::StartupOptions
-      >;
-
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATION__ARG_TRAITS_TMPLINST_CS_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATION__ARG_TRAITS_TMPLINST_CS_
 
@@ -4518,11 +2217,6 @@ CORBA::Boolean operator>> (
         ImplementationRepository::ServerInformation_var
       >;
 
-  template class
-    TAO::Any_Dual_Impl_T<
-        ImplementationRepository::ServerInformation
-      >;
-
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST__ARG_TRAITS_TMPLINST_CS_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST__ARG_TRAITS_TMPLINST_CS_
 
@@ -4566,11 +2260,6 @@ CORBA::Boolean operator>> (
 
 #endif /* end #if !defined */
 
-  template class
-    TAO::Any_Dual_Impl_T<
-        ImplementationRepository::ServerInformationList
-      >;
-
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR__ARG_TRAITS_TMPLINST_CS_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR__ARG_TRAITS_TMPLINST_CS_
 
@@ -4616,11 +2305,6 @@ CORBA::Boolean operator>> (
       >;
 
   template class
-    TAO::Any_Impl_T<
-        ImplementationRepository::ServerInformationIterator
-      >;
-
-  template class
     TAO::In_Var_Size_Argument_T<
         ImplementationRepository::StartupOptions
       >;
@@ -4662,11 +2346,6 @@ CORBA::Boolean operator>> (
         ImplementationRepository::Administration
       >;
 
-  template class
-    TAO::Any_Impl_T<
-        ImplementationRepository::Administration
-      >;
-
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVEROBJECT__ARG_TRAITS_TMPLINST_CS_)
@@ -4688,46 +2367,6 @@ CORBA::Boolean operator>> (
 #endif /* end #if !defined */
 
 # pragma instantiate \
-    TAO::Objref_Traits< \
-        ImplementationRepository::ServerObject \
-      >
-
-# pragma instantiate \
-    TAO_Objref_Var_T< \
-        ImplementationRepository::ServerObject
-      >
-  
-# pragma instantiate \
-    TAO_Objref_Out_T< \
-        ImplementationRepository::ServerObject
-      >
-
-# pragma instantiate \
-    TAO::Narrow_Utils< \
-        ImplementationRepository::ServerObject \
-      >
-
-# pragma instantiate \
-    TAO::Any_Impl_T< \
-        ImplementationRepository::ServerObject \
-      >
-
-# pragma instantiate \
-    TAO::Any_Dual_Impl_T< \
-        ImplementationRepository::AlreadyRegistered \
-      >
-
-# pragma instantiate \
-    TAO::Any_Dual_Impl_T< \
-        ImplementationRepository::CannotActivate \
-      >
-
-# pragma instantiate \
-    TAO::Any_Dual_Impl_T< \
-        ImplementationRepository::NotFound \
-      >
-
-# pragma instantiate \
     TAO_Var_Var_T< \
         ImplementationRepository::EnvironmentVariable \
       >
@@ -4744,11 +2383,6 @@ CORBA::Boolean operator>> (
       >
 
 # pragma instantiate \
-    TAO::Any_Dual_Impl_T< \
-        ImplementationRepository::EnvironmentVariable \
-      >
-
-# pragma instantiate \
     TAO_VarSeq_Var_T< \
         ImplementationRepository::EnvironmentList, \
         ImplementationRepository::EnvironmentVariable \
@@ -4777,16 +2411,6 @@ CORBA::Boolean operator>> (
 
 #endif /* end #if !defined */
 
-# pragma instantiate \
-    TAO::Any_Dual_Impl_T< \
-        ImplementationRepository::EnvironmentList \
-      >
-
-# pragma instantiate \
-    TAO::Any_Basic_Impl_T< \
-        ImplementationRepository::ActivationMode \
-      >
-
 #if !defined (_IMPLEMENTATIONREPOSITORY_STARTUPOPTIONS__ARG_TRAITS_TMPLINST_CS_)
 #define _IMPLEMENTATIONREPOSITORY_STARTUPOPTIONS__ARG_TRAITS_TMPLINST_CS_
 
@@ -4817,11 +2441,6 @@ CORBA::Boolean operator>> (
         ImplementationRepository::StartupOptions_var \
       >
 
-# pragma instantiate \
-    TAO::Any_Dual_Impl_T< \
-        ImplementationRepository::StartupOptions \
-      >
-
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATION__ARG_TRAITS_TMPLINST_CS_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATION__ARG_TRAITS_TMPLINST_CS_
 
@@ -4852,11 +2471,6 @@ CORBA::Boolean operator>> (
         ImplementationRepository::ServerInformation_var \
       >
 
-# pragma instantiate \
-    TAO::Any_Dual_Impl_T< \
-        ImplementationRepository::ServerInformation \
-      >
-
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST__ARG_TRAITS_TMPLINST_CS_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST__ARG_TRAITS_TMPLINST_CS_
 
@@ -4900,11 +2514,6 @@ CORBA::Boolean operator>> (
 
 #endif /* end #if !defined */
 
-# pragma instantiate \
-    TAO::Any_Dual_Impl_T< \
-        ImplementationRepository::ServerInformationList \
-      >
-
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR__ARG_TRAITS_TMPLINST_CS_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR__ARG_TRAITS_TMPLINST_CS_
 
@@ -4950,11 +2559,6 @@ CORBA::Boolean operator>> (
       >
 
 # pragma instantiate \
-    TAO::Any_Impl_T< \
-        ImplementationRepository::ServerInformationIterator \
-      >
-
-# pragma instantiate \
     TAO::In_Var_Size_Argument_T< \
         ImplementationRepository::StartupOptions \
       >
@@ -4996,9 +2600,4 @@ CORBA::Boolean operator>> (
         ImplementationRepository::Administration \
       >
 
-# pragma instantiate \
-    TAO::Any_Impl_T< \
-        ImplementationRepository::Administration \
-      >
-
 #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
diff --git a/TAO/tao/PortableServer/ImplRepoC.h b/TAO/tao/PortableServer/ImplRepoC.h
index bd930cc4b79..7242d3bcd7c 100644
--- a/TAO/tao/PortableServer/ImplRepoC.h
+++ b/TAO/tao/PortableServer/ImplRepoC.h
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be/be_codegen.cpp:153
+// be\be_codegen.cpp:153
 
 #ifndef _TAO_IDL_ORIG_IMPLREPOC_H_
 #define _TAO_IDL_ORIG_IMPLREPOC_H_
@@ -51,6 +51,8 @@
 #include "tao/Seq_Out_T.h"
 #include "tao/VarOut_T.h"
 
+#include "tao/PortableServer/ServerObjectC.h"
+
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
 #endif
@@ -64,9 +66,7 @@
 #endif /* TAO_EXPORT_NESTED_CLASSES */
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -75,7 +75,7 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from 
-// be/be_visitor_root/root_ch.cpp:63
+// be\be_visitor_root/root_ch.cpp:62
 
 namespace TAO
 {
@@ -86,141 +86,13 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_module/module_ch.cpp:48
+// be\be_visitor_module/module_ch.cpp:48
 
 namespace ImplementationRepository
 {
   
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:601
-
-#if !defined (_IMPLEMENTATIONREPOSITORY_SERVEROBJECT__VAR_OUT_CH_)
-#define _IMPLEMENTATIONREPOSITORY_SERVEROBJECT__VAR_OUT_CH_
-  
-  class ServerObject;
-  typedef ServerObject *ServerObject_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        ServerObject
-      >
-    ServerObject_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        ServerObject
-      >
-    ServerObject_out;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_IMPLEMENTATIONREPOSITORY_SERVEROBJECT_CH_)
-#define _IMPLEMENTATIONREPOSITORY_SERVEROBJECT_CH_
-  
-  class TAO_PortableServer_Export ServerObject
-    : public virtual CORBA::Object
-  {
-  public:
-    friend class TAO::Narrow_Utils<ServerObject>;
-    typedef ServerObject_ptr _ptr_type;
-    typedef ServerObject_var _var_type;
-    
-    // The static operations.
-    static ServerObject_ptr _duplicate (ServerObject_ptr obj);
-    
-    static ServerObject_ptr _narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static ServerObject_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static ServerObject_ptr _nil (void)
-    {
-      return (ServerObject_ptr)0;
-    }
-    
-    static void _tao_any_destructor (void *);
-    
-    // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-    
-    virtual void ping (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-    
-    // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-    
-    virtual void shutdown (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-    
-    // TAO_IDL - Generated from
-    // be/be_visitor_interface/interface_ch.cpp:208
-    
-    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_ServerObject_Proxy_Broker_;
-  
-  protected:
-    // Concrete interface only.
-    ServerObject (void);
-    
-    // These methods travese the inheritance tree and set the
-    // parents piece of the given class in the right mode.
-    virtual void ImplementationRepository_ServerObject_setup_collocation (void);
-    
-    // Concrete non-local interface only.
-    ServerObject (
-        IOP::IOR *ior,
-        TAO_ORB_Core *orb_core = 0
-      );
-    
-    // Non-local interface only.
-    ServerObject (
-        TAO_Stub *objref,
-        CORBA::Boolean _tao_collocated = 0,
-        TAO_Abstract_ServantBase *servant = 0,
-        TAO_ORB_Core *orb_core = 0
-      );
-    
-    virtual ~ServerObject (void);
-  
-  private:
-    // Private and unimplemented for concrete interfaces.
-    ServerObject (const ServerObject &);
-    
-    void operator= (const ServerObject &);
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-  
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_ServerObject;
-  
-  // TAO_IDL - Generated from
-  // be/be_visitor_exception/exception_ch.cpp:51
+  // be\be_visitor_exception/exception_ch.cpp:51
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_ALREADYREGISTERED_CH_)
 #define _IMPLEMENTATIONREPOSITORY_ALREADYREGISTERED_CH_
@@ -238,8 +110,10 @@ namespace ImplementationRepository
     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;
@@ -255,20 +129,20 @@ namespace ImplementationRepository
       );
     
     // TAO_IDL - Generated from
-    // be/be_visitor_exception/exception_ch.cpp:125
+    // be\be_visitor_exception/exception_ch.cpp:127
     
     virtual CORBA::TypeCode_ptr _type (void) const;
   };
   
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:44
   
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_AlreadyRegistered;
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_AlreadyRegistered;
 
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be/be_visitor_exception/exception_ch.cpp:51
+  // be\be_visitor_exception/exception_ch.cpp:51
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_CANNOTACTIVATE_CH_)
 #define _IMPLEMENTATIONREPOSITORY_CANNOTACTIVATE_CH_
@@ -287,8 +161,10 @@ namespace ImplementationRepository
     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;
@@ -304,27 +180,27 @@ namespace ImplementationRepository
       );
     
     // TAO_IDL - Generated from
-    // be/be_visitor_exception/exception_ctor.cpp:66
+    // be\be_visitor_exception/exception_ctor.cpp:66
     
     CannotActivate (
         const char * _tao_reason
       );
     
     // TAO_IDL - Generated from
-    // be/be_visitor_exception/exception_ch.cpp:125
+    // be\be_visitor_exception/exception_ch.cpp:127
     
     virtual CORBA::TypeCode_ptr _type (void) const;
   };
   
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:44
   
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_CannotActivate;
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_CannotActivate;
 
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be/be_visitor_exception/exception_ch.cpp:51
+  // be\be_visitor_exception/exception_ch.cpp:51
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_NOTFOUND_CH_)
 #define _IMPLEMENTATIONREPOSITORY_NOTFOUND_CH_
@@ -342,8 +218,10 @@ namespace ImplementationRepository
     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;
@@ -359,20 +237,20 @@ namespace ImplementationRepository
       );
     
     // TAO_IDL - Generated from
-    // be/be_visitor_exception/exception_ch.cpp:125
+    // be\be_visitor_exception/exception_ch.cpp:127
     
     virtual CORBA::TypeCode_ptr _type (void) const;
   };
   
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:44
   
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_NotFound;
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotFound;
 
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be/be_type.cpp:258
+  // be\be_type.cpp:258
   
   struct EnvironmentVariable;
   
@@ -390,7 +268,7 @@ namespace ImplementationRepository
     EnvironmentVariable_out;
   
   // TAO_IDL - Generated from
-  // be/be_visitor_structure/structure_ch.cpp:52
+  // be\be_visitor_structure/structure_ch.cpp:52
   
   struct TAO_PortableServer_Export EnvironmentVariable
   {
@@ -402,24 +280,12 @@ namespace ImplementationRepository
   };
   
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-  
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_EnvironmentVariable;
-  
-  // TAO_IDL - Generated from
-  // be/be_visitor_typedef/typedef_ch.cpp:376
-  
-  typedef char * Address;
-  typedef CORBA::String_var Address_var;
-  typedef CORBA::String_out Address_out;
-  
-  // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:44
   
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_Address;
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_EnvironmentVariable;
   
   // TAO_IDL - Generated from
-  // be/be_visitor_sequence/sequence_ch.cpp:101
+  // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST_CH_)
 #define _IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST_CH_
@@ -467,12 +333,12 @@ namespace ImplementationRepository
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:44
   
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_EnvironmentList;
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_EnvironmentList;
   
   // TAO_IDL - Generated from
-  // be/be_visitor_enum/enum_ch.cpp:57
+  // be\be_visitor_enum/enum_ch.cpp:57
   
   enum ActivationMode
   {
@@ -485,12 +351,12 @@ namespace ImplementationRepository
   typedef ActivationMode &ActivationMode_out;
   
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:44
   
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_ActivationMode;
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ActivationMode;
   
   // TAO_IDL - Generated from
-  // be/be_type.cpp:258
+  // be\be_type.cpp:258
   
   struct StartupOptions;
   
@@ -508,7 +374,7 @@ namespace ImplementationRepository
     StartupOptions_out;
   
   // TAO_IDL - Generated from
-  // be/be_visitor_structure/structure_ch.cpp:52
+  // be\be_visitor_structure/structure_ch.cpp:52
   
   struct TAO_PortableServer_Export StartupOptions
   {
@@ -520,15 +386,16 @@ namespace ImplementationRepository
     TAO_String_Manager working_directory;
     ImplementationRepository::ActivationMode activation;
     TAO_String_Manager activator;
+    CORBA::Long start_limit;
   };
   
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:44
   
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_StartupOptions;
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_StartupOptions;
   
   // TAO_IDL - Generated from
-  // be/be_type.cpp:258
+  // be\be_type.cpp:258
   
   struct ServerInformation;
   
@@ -546,26 +413,25 @@ namespace ImplementationRepository
     ServerInformation_out;
   
   // TAO_IDL - Generated from
-  // be/be_visitor_structure/structure_ch.cpp:52
+  // be\be_visitor_structure/structure_ch.cpp:52
   
   struct TAO_PortableServer_Export ServerInformation
   {
     typedef ServerInformation_var _var_type;
     
     static void _tao_any_destructor (void *);
-    TAO_String_Manager logical_server;
     TAO_String_Manager server;
     ImplementationRepository::StartupOptions startup;
-    TAO_String_Manager location;
+    TAO_String_Manager partial_ior;
   };
   
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:44
   
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_ServerInformation;
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServerInformation;
   
   // TAO_IDL - Generated from
-  // be/be_visitor_sequence/sequence_ch.cpp:101
+  // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST_CH_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST_CH_
@@ -613,12 +479,12 @@ namespace ImplementationRepository
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:44
   
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_ServerInformationList;
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServerInformationList;
   
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:601
+  // be\be_interface.cpp:598
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR__VAR_OUT_CH_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR__VAR_OUT_CH_
@@ -641,7 +507,114 @@ namespace ImplementationRepository
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:601
+  // be\be_visitor_interface/interface_ch.cpp:54
+
+#if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR_CH_)
+#define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR_CH_
+  
+  class TAO_PortableServer_Export ServerInformationIterator
+    : public virtual CORBA::Object
+  {
+  public:
+    friend class TAO::Narrow_Utils<ServerInformationIterator>;
+    typedef ServerInformationIterator_ptr _ptr_type;
+    typedef ServerInformationIterator_var _var_type;
+    
+    // The static operations.
+    static ServerInformationIterator_ptr _duplicate (ServerInformationIterator_ptr obj);
+    
+    static 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
+    
+    virtual CORBA::Boolean next_n (
+        ::CORBA::ULong how_many,
+        ::ImplementationRepository::ServerInformationList_out servers
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      ));
+    
+    // TAO_IDL - Generated from
+    // 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:208
+    
+    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,
+        CORBA::Boolean _tao_collocated = 0,
+        TAO_Abstract_ServantBase *servant = 0,
+        TAO_ORB_Core *orb_core = 0
+      );
+    
+    virtual ~ServerInformationIterator (void);
+  
+  private:
+    // Private and unimplemented for concrete interfaces.
+    ServerInformationIterator (const ServerInformationIterator &);
+    
+    void operator= (const ServerInformationIterator &);
+  };
+
+#endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_typecode/typecode_decl.cpp:44
+  
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServerInformationIterator;
+  
+  // TAO_IDL - Generated from
+  // be\be_interface.cpp:598
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_ADMINISTRATION__VAR_OUT_CH_)
 #define _IMPLEMENTATIONREPOSITORY_ADMINISTRATION__VAR_OUT_CH_
@@ -664,7 +637,7 @@ namespace ImplementationRepository
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:54
+  // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_ADMINISTRATION_CH_)
 #define _IMPLEMENTATIONREPOSITORY_ADMINISTRATION_CH_
@@ -692,13 +665,13 @@ namespace ImplementationRepository
     
     static Administration_ptr _nil (void)
     {
-      return (Administration_ptr)0;
+      return static_cast<Administration_ptr> (0);
     }
     
     static void _tao_any_destructor (void *);
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
+    // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void activate_server (
         const char * server
@@ -711,21 +684,7 @@ namespace ImplementationRepository
       ));
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-    
-    virtual char * activate_server_with_startup (
-        const char * server,
-        ::CORBA::Long check_startup
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::ImplementationRepository::NotFound,
-        ::ImplementationRepository::CannotActivate
-      ));
-    
-    // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
+    // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void register_server (
         const char * server,
@@ -739,7 +698,7 @@ namespace ImplementationRepository
       ));
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
+    // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void reregister_server (
         const char * server,
@@ -753,7 +712,7 @@ namespace ImplementationRepository
       ));
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
+    // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void remove_server (
         const char * server
@@ -765,7 +724,7 @@ namespace ImplementationRepository
       ));
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
+    // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void shutdown_server (
         const char * server
@@ -777,11 +736,11 @@ namespace ImplementationRepository
       ));
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
+    // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void server_is_running (
         const char * server,
-        const char * addr,
+        const char * partial_ior,
         ::ImplementationRepository::ServerObject_ptr server_object
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
@@ -791,7 +750,7 @@ namespace ImplementationRepository
       ));
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
+    // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void server_is_shutting_down (
         const char * server
@@ -803,7 +762,7 @@ namespace ImplementationRepository
       ));
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
+    // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void find (
         const char * server,
@@ -816,7 +775,7 @@ namespace ImplementationRepository
       ));
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
+    // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void list (
         ::CORBA::ULong how_many,
@@ -829,29 +788,7 @@ namespace ImplementationRepository
       ));
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-    
-    virtual void shutdown_repo (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-    
-    // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-    
-    virtual char * find_ior (
-        const char * object_name
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::ImplementationRepository::NotFound
-      ));
-    
-    // TAO_IDL - Generated from
-    // be/be_visitor_interface/interface_ch.cpp:208
+    // be\be_visitor_interface/interface_ch.cpp:208
     
     virtual CORBA::Boolean _is_a (
         const char *type_id
@@ -897,130 +834,23 @@ namespace ImplementationRepository
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:44
   
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_Administration;
-  
-  // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR_CH_)
-#define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR_CH_
-  
-  class TAO_PortableServer_Export ServerInformationIterator
-    : public virtual CORBA::Object
-  {
-  public:
-    friend class TAO::Narrow_Utils<ServerInformationIterator>;
-    typedef ServerInformationIterator_ptr _ptr_type;
-    typedef ServerInformationIterator_var _var_type;
-    
-    // The static operations.
-    static ServerInformationIterator_ptr _duplicate (ServerInformationIterator_ptr obj);
-    
-    static 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 (ServerInformationIterator_ptr)0;
-    }
-    
-    static void _tao_any_destructor (void *);
-    
-    // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-    
-    virtual CORBA::Boolean next_n (
-        ::CORBA::ULong how_many,
-        ::ImplementationRepository::ServerInformationList_out server_list
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-    
-    // TAO_IDL - Generated from
-    // 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:208
-    
-    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,
-        CORBA::Boolean _tao_collocated = 0,
-        TAO_Abstract_ServantBase *servant = 0,
-        TAO_ORB_Core *orb_core = 0
-      );
-    
-    virtual ~ServerInformationIterator (void);
-  
-  private:
-    // Private and unimplemented for concrete interfaces.
-    ServerInformationIterator (const ServerInformationIterator &);
-    
-    void operator= (const ServerInformationIterator &);
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-  
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr const _tc_ServerInformationIterator;
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Administration;
 
 // TAO_IDL - Generated from
-// be/be_visitor_module/module_ch.cpp:66
+// 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:132
+// be\be_visitor_root/root.cpp:120
 
 extern TAO_PortableServer_Export
 TAO::Collocation_Proxy_Broker *
-(*ImplementationRepository__TAO_ServerObject_Proxy_Broker_Factory_function_pointer) (
+(*ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   );
 
@@ -1030,40 +860,13 @@ TAO::Collocation_Proxy_Broker *
     CORBA::Object_ptr obj
   );
 
-extern TAO_PortableServer_Export
-TAO::Collocation_Proxy_Broker *
-(*ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  );
-
 // TAO_IDL - Generated from
-// be/be_visitor_traits.cpp:59
+// be\be_visitor_traits.cpp:59
 
 // Traits specializations.
 namespace TAO
 {
 
-#if !defined (_IMPLEMENTATIONREPOSITORY_SERVEROBJECT__TRAITS_CH_)
-#define _IMPLEMENTATIONREPOSITORY_SERVEROBJECT__TRAITS_CH_
-  
-  ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_PortableServer_Export Objref_Traits< ::ImplementationRepository::ServerObject>
-  {
-    static ::ImplementationRepository::ServerObject_ptr duplicate (
-        ::ImplementationRepository::ServerObject_ptr
-      );
-    static void release (
-        ::ImplementationRepository::ServerObject_ptr
-      );
-    static ::ImplementationRepository::ServerObject_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::ImplementationRepository::ServerObject_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR__TRAITS_CH_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR__TRAITS_CH_
   
@@ -1108,14 +911,7 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_ch.cpp:52
-
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, ImplementationRepository::ServerObject_ptr); // copying
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, ImplementationRepository::ServerObject_ptr *); // non-copying
-TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::ServerObject_ptr &);
-
-// TAO_IDL - Generated from
-// be/be_visitor_exception/any_op_ch.cpp:52
+// be\be_visitor_exception/any_op_ch.cpp:52
 
 TAO_PortableServer_Export void operator<<= (CORBA::Any &, const ImplementationRepository::AlreadyRegistered &); // copying version
 TAO_PortableServer_Export void operator<<= (CORBA::Any &, ImplementationRepository::AlreadyRegistered*); // noncopying version
@@ -1123,7 +919,7 @@ TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, Implem
 TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const ImplementationRepository::AlreadyRegistered *&);
 
 // TAO_IDL - Generated from
-// be/be_visitor_exception/any_op_ch.cpp:52
+// be\be_visitor_exception/any_op_ch.cpp:52
 
 TAO_PortableServer_Export void operator<<= (CORBA::Any &, const ImplementationRepository::CannotActivate &); // copying version
 TAO_PortableServer_Export void operator<<= (CORBA::Any &, ImplementationRepository::CannotActivate*); // noncopying version
@@ -1131,7 +927,7 @@ TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, Implem
 TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const ImplementationRepository::CannotActivate *&);
 
 // TAO_IDL - Generated from
-// be/be_visitor_exception/any_op_ch.cpp:52
+// be\be_visitor_exception/any_op_ch.cpp:52
 
 TAO_PortableServer_Export void operator<<= (CORBA::Any &, const ImplementationRepository::NotFound &); // copying version
 TAO_PortableServer_Export void operator<<= (CORBA::Any &, ImplementationRepository::NotFound*); // noncopying version
@@ -1139,7 +935,7 @@ TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, Implem
 TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const ImplementationRepository::NotFound *&);
 
 // TAO_IDL - Generated from
-// be/be_visitor_structure/any_op_ch.cpp:52
+// be\be_visitor_structure/any_op_ch.cpp:52
 
 TAO_PortableServer_Export void operator<<= (CORBA::Any &, const ImplementationRepository::EnvironmentVariable &); // copying version
 TAO_PortableServer_Export void operator<<= (CORBA::Any &, ImplementationRepository::EnvironmentVariable*); // noncopying version
@@ -1147,7 +943,7 @@ TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, Implem
 TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const ImplementationRepository::EnvironmentVariable *&);
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/any_op_ch.cpp:52
+// be\be_visitor_sequence/any_op_ch.cpp:52
 
 TAO_PortableServer_Export void operator<<= (CORBA::Any &, const ImplementationRepository::EnvironmentList &); // copying version
 TAO_PortableServer_Export void operator<<= (CORBA::Any &, ImplementationRepository::EnvironmentList*); // noncopying version
@@ -1155,13 +951,13 @@ TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, Implem
 TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const ImplementationRepository::EnvironmentList *&);
 
 // TAO_IDL - Generated from
-// be/be_visitor_enum/any_op_ch.cpp:51
+// be\be_visitor_enum/any_op_ch.cpp:51
 
 TAO_PortableServer_Export void operator<<= (CORBA::Any &, ImplementationRepository::ActivationMode);
 TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::ActivationMode &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_structure/any_op_ch.cpp:52
+// be\be_visitor_structure/any_op_ch.cpp:52
 
 TAO_PortableServer_Export void operator<<= (CORBA::Any &, const ImplementationRepository::StartupOptions &); // copying version
 TAO_PortableServer_Export void operator<<= (CORBA::Any &, ImplementationRepository::StartupOptions*); // noncopying version
@@ -1169,7 +965,7 @@ TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, Implem
 TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const ImplementationRepository::StartupOptions *&);
 
 // TAO_IDL - Generated from
-// be/be_visitor_structure/any_op_ch.cpp:52
+// be\be_visitor_structure/any_op_ch.cpp:52
 
 TAO_PortableServer_Export void operator<<= (CORBA::Any &, const ImplementationRepository::ServerInformation &); // copying version
 TAO_PortableServer_Export void operator<<= (CORBA::Any &, ImplementationRepository::ServerInformation*); // noncopying version
@@ -1177,7 +973,7 @@ TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, Implem
 TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const ImplementationRepository::ServerInformation *&);
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/any_op_ch.cpp:52
+// be\be_visitor_sequence/any_op_ch.cpp:52
 
 TAO_PortableServer_Export void operator<<= (CORBA::Any &, const ImplementationRepository::ServerInformationList &); // copying version
 TAO_PortableServer_Export void operator<<= (CORBA::Any &, ImplementationRepository::ServerInformationList*); // noncopying version
@@ -1185,51 +981,45 @@ TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, Implem
 TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const ImplementationRepository::ServerInformationList *&);
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_ch.cpp:52
-
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, ImplementationRepository::Administration_ptr); // copying
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, ImplementationRepository::Administration_ptr *); // non-copying
-TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::Administration_ptr &);
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_ch.cpp:52
+// be\be_visitor_interface/any_op_ch.cpp:52
 
 TAO_PortableServer_Export void operator<<= (CORBA::Any &, ImplementationRepository::ServerInformationIterator_ptr); // copying
 TAO_PortableServer_Export void operator<<= (CORBA::Any &, ImplementationRepository::ServerInformationIterator_ptr *); // non-copying
 TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::ServerInformationIterator_ptr &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/cdr_op_ch.cpp:55
+// be\be_visitor_interface/any_op_ch.cpp:52
 
-TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::ServerObject_ptr );
-TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::ServerObject_ptr &);
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, ImplementationRepository::Administration_ptr); // copying
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, ImplementationRepository::Administration_ptr *); // non-copying
+TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::Administration_ptr &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_exception/cdr_op_ch.cpp:52
+// be\be_visitor_exception/cdr_op_ch.cpp:52
 
 TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::AlreadyRegistered &);
 TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::AlreadyRegistered &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_exception/cdr_op_ch.cpp:52
+// be\be_visitor_exception/cdr_op_ch.cpp:52
 
 TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::CannotActivate &);
 TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::CannotActivate &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_exception/cdr_op_ch.cpp:52
+// be\be_visitor_exception/cdr_op_ch.cpp:52
 
 TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::NotFound &);
 TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::NotFound &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_structure/cdr_op_ch.cpp:54
+// be\be_visitor_structure/cdr_op_ch.cpp:54
 
 TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::EnvironmentVariable &);
 TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::EnvironmentVariable &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/cdr_op_ch.cpp:71
+// be\be_visitor_sequence/cdr_op_ch.cpp:71
 
 #if !defined _TAO_CDR_OP_ImplementationRepository_EnvironmentList_H_
 #define _TAO_CDR_OP_ImplementationRepository_EnvironmentList_H_
@@ -1246,25 +1036,25 @@ TAO_PortableServer_Export CORBA::Boolean operator>> (
 #endif /* _TAO_CDR_OP_ImplementationRepository_EnvironmentList_H_ */
 
 // TAO_IDL - Generated from
-// be/be_visitor_enum/cdr_op_ch.cpp:50
+// be\be_visitor_enum/cdr_op_ch.cpp:50
 
 TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::ActivationMode &);
 TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::ActivationMode &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_structure/cdr_op_ch.cpp:54
+// be\be_visitor_structure/cdr_op_ch.cpp:54
 
 TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::StartupOptions &);
 TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::StartupOptions &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_structure/cdr_op_ch.cpp:54
+// be\be_visitor_structure/cdr_op_ch.cpp:54
 
 TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::ServerInformation &);
 TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::ServerInformation &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/cdr_op_ch.cpp:71
+// be\be_visitor_sequence/cdr_op_ch.cpp:71
 
 #if !defined _TAO_CDR_OP_ImplementationRepository_ServerInformationList_H_
 #define _TAO_CDR_OP_ImplementationRepository_ServerInformationList_H_
@@ -1281,25 +1071,25 @@ TAO_PortableServer_Export CORBA::Boolean operator>> (
 #endif /* _TAO_CDR_OP_ImplementationRepository_ServerInformationList_H_ */
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/cdr_op_ch.cpp:55
+// be\be_visitor_interface/cdr_op_ch.cpp:55
 
-TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::Administration_ptr );
-TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::Administration_ptr &);
+TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::ServerInformationIterator_ptr );
+TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::ServerInformationIterator_ptr &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/cdr_op_ch.cpp:55
+// be\be_visitor_interface/cdr_op_ch.cpp:55
 
-TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::ServerInformationIterator_ptr );
-TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::ServerInformationIterator_ptr &);
+TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::Administration_ptr );
+TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::Administration_ptr &);
 
 // TAO_IDL - Generated from
-// be/be_codegen.cpp:964
+// be\be_codegen.cpp:961
 
 #if defined (__ACE_INLINE__)
 #include "ImplRepoC.inl"
 #endif /* defined INLINE */
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
diff --git a/TAO/tao/PortableServer/ImplRepoC.inl b/TAO/tao/PortableServer/ImplRepoC.inl
index 29d03c18cfe..7b37ccdeaac 100644
--- a/TAO/tao/PortableServer/ImplRepoC.inl
+++ b/TAO/tao/PortableServer/ImplRepoC.inl
@@ -27,13 +27,13 @@
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ci.cpp:70
+// be\be_visitor_interface/interface_ci.cpp:70
 
-#if !defined (_IMPLEMENTATIONREPOSITORY_SERVEROBJECT___CI_)
-#define _IMPLEMENTATIONREPOSITORY_SERVEROBJECT___CI_
+#if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR___CI_)
+#define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR___CI_
 
 ACE_INLINE
-ImplementationRepository::ServerObject::ServerObject (
+ImplementationRepository::ServerInformationIterator::ServerInformationIterator (
     TAO_Stub *objref,
     CORBA::Boolean _tao_collocated,
     TAO_Abstract_ServantBase *servant,
@@ -45,25 +45,25 @@ ImplementationRepository::ServerObject::ServerObject (
         servant,
         oc
       ),
-    the_TAO_ServerObject_Proxy_Broker_ (0)
+    the_TAO_ServerInformationIterator_Proxy_Broker_ (0)
 {
-  this->ImplementationRepository_ServerObject_setup_collocation ();
+  this->ImplementationRepository_ServerInformationIterator_setup_collocation ();
 }
 
 ACE_INLINE
-ImplementationRepository::ServerObject::ServerObject (
+ImplementationRepository::ServerInformationIterator::ServerInformationIterator (
     IOP::IOR *ior,
     TAO_ORB_Core *oc
   )
   : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
-    the_TAO_ServerObject_Proxy_Broker_ (0)
+    the_TAO_ServerInformationIterator_Proxy_Broker_ (0)
 {
 }
 
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ci.cpp:70
+// be\be_visitor_interface/interface_ci.cpp:70
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_ADMINISTRATION___CI_)
 #define _IMPLEMENTATIONREPOSITORY_ADMINISTRATION___CI_
@@ -97,39 +97,3 @@ ImplementationRepository::Administration::Administration (
 }
 
 #endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ci.cpp:70
-
-#if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR___CI_)
-#define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR___CI_
-
-ACE_INLINE
-ImplementationRepository::ServerInformationIterator::ServerInformationIterator (
-    TAO_Stub *objref,
-    CORBA::Boolean _tao_collocated,
-    TAO_Abstract_ServantBase *servant,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (
-        objref,
-        _tao_collocated,
-        servant,
-        oc
-      ),
-    the_TAO_ServerInformationIterator_Proxy_Broker_ (0)
-{
-  this->ImplementationRepository_ServerInformationIterator_setup_collocation ();
-}
-
-ACE_INLINE
-ImplementationRepository::ServerInformationIterator::ServerInformationIterator (
-    IOP::IOR *ior,
-    TAO_ORB_Core *oc
-  )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
-    the_TAO_ServerInformationIterator_Proxy_Broker_ (0)
-{
-}
-
-#endif /* end #if !defined */
diff --git a/TAO/tao/PortableServer/ImplRepoS.cpp b/TAO/tao/PortableServer/ImplRepoS.cpp
index 1d7dd5545b8..07d14db1dda 100644
--- a/TAO/tao/PortableServer/ImplRepoS.cpp
+++ b/TAO/tao/PortableServer/ImplRepoS.cpp
@@ -27,7 +27,7 @@
 
 
 // TAO_IDL - Generated from 
-// be/be_codegen.cpp:611
+// be\be_codegen.cpp:609
 
 #ifndef _TAO_IDL_ORIG_IMPLREPOS_CPP_
 #define _TAO_IDL_ORIG_IMPLREPOS_CPP_
@@ -36,14 +36,6 @@
 #include "ImplRepoS.h"
 #include "tao/PortableServer/Object_Adapter.h"
 #include "tao/PortableServer/Operation_Table.h"
-#include "tao/PortableServer/Upcall_Command.h"
-#include "tao/PortableServer/Upcall_Wrapper.h"
-#include "tao/PortableServer/Basic_SArguments.h"
-#include "tao/PortableServer/Object_SArgument_T.h"
-#include "tao/PortableServer/Special_Basic_SArguments.h"
-#include "tao/PortableServer/UB_String_SArguments.h"
-#include "tao/PortableServer/Var_Size_SArgument_T.h"
-#include "tao/PortableServer/TypeCode_SArg_Traits.h"
 #include "tao/TAO_Server_Request.h"
 #include "tao/ORB_Core.h"
 #include "tao/Profile.h"
@@ -53,15 +45,21 @@
 #include "tao/Typecode.h"
 #include "tao/DynamicC.h"
 #include "tao/CDR.h"
-#include "tao/PortableInterceptor.h"
 #include "tao/Basic_Arguments.h"
 #include "tao/Object_Argument_T.h"
 #include "tao/Special_Basic_Arguments.h"
 #include "tao/UB_String_Arguments.h"
 #include "tao/Var_Size_Argument_T.h"
+#include "tao/PortableInterceptor.h"
+#if TAO_HAS_INTERCEPTORS == 1
+#include "tao/PortableServer/PICurrent_Guard.h"
+#include "tao/PortableServer/ServerRequestInfo.h"
+#include "tao/PortableServer/ServerInterceptorAdapter.h"
+#include "tao/RequestInfo_Util.h"
+#endif  /* TAO_HAS_INTERCEPTORS == 1 */
+
 #include "ace/Dynamic_Service.h"
 #include "ace/Malloc_Allocator.h"
-#include "ace/config-all.h"
 
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus
@@ -72,105 +70,7 @@
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be/be_visitor_arg_traits.cpp:67
-
-// Arg traits specializations.
-namespace TAO
-{
-
-#if !defined (_IMPLEMENTATIONREPOSITORY_SERVEROBJECT__SARG_TRAITS_SS_)
-#define _IMPLEMENTATIONREPOSITORY_SERVEROBJECT__SARG_TRAITS_SS_
-  
-  ACE_TEMPLATE_SPECIALIZATION
-  class TAO_PortableServer_Export SArg_Traits<ImplementationRepository::ServerObject>
-    : public
-        Object_SArg_Traits_T<
-            ImplementationRepository::ServerObject_ptr,
-            ImplementationRepository::ServerObject_var,
-            ImplementationRepository::ServerObject_out
-          >
-  {
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be/be_visitor_arg_traits.cpp:689
-
-#if !defined (_IMPLEMENTATIONREPOSITORY_STARTUPOPTIONS__SARG_TRAITS_SS_)
-#define _IMPLEMENTATIONREPOSITORY_STARTUPOPTIONS__SARG_TRAITS_SS_
-  
-  ACE_TEMPLATE_SPECIALIZATION
-  class TAO_PortableServer_Export SArg_Traits<ImplementationRepository::StartupOptions>
-    : public
-        Var_Size_SArg_Traits_T<
-            ImplementationRepository::StartupOptions,
-            ImplementationRepository::StartupOptions_var,
-            ImplementationRepository::StartupOptions_out
-          >
-  {
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be/be_visitor_arg_traits.cpp:689
-
-#if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATION__SARG_TRAITS_SS_)
-#define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATION__SARG_TRAITS_SS_
-  
-  ACE_TEMPLATE_SPECIALIZATION
-  class TAO_PortableServer_Export SArg_Traits<ImplementationRepository::ServerInformation>
-    : public
-        Var_Size_SArg_Traits_T<
-            ImplementationRepository::ServerInformation,
-            ImplementationRepository::ServerInformation_var,
-            ImplementationRepository::ServerInformation_out
-          >
-  {
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be/be_visitor_arg_traits.cpp:421
-
-#if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST__SARG_TRAITS_SS_)
-#define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST__SARG_TRAITS_SS_
-  
-  ACE_TEMPLATE_SPECIALIZATION
-  class TAO_PortableServer_Export SArg_Traits<ImplementationRepository::ServerInformationList>
-    : public
-        Var_Size_SArg_Traits_T<
-            ImplementationRepository::ServerInformationList,
-            ImplementationRepository::ServerInformationList_var,
-            ImplementationRepository::ServerInformationList_out
-          >
-  {
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR__SARG_TRAITS_SS_)
-#define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR__SARG_TRAITS_SS_
-  
-  ACE_TEMPLATE_SPECIALIZATION
-  class TAO_PortableServer_Export SArg_Traits<ImplementationRepository::ServerInformationIterator>
-    : public
-        Object_SArg_Traits_T<
-            ImplementationRepository::ServerInformationIterator_ptr,
-            ImplementationRepository::ServerInformationIterator_var,
-            ImplementationRepository::ServerInformationIterator_out
-          >
-  {
-  };
-
-#endif /* end #if !defined */
-}
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_arg_traits.cpp:67
+// be\be_visitor_arg_traits.cpp:65
 
 // Arg traits specializations.
 namespace TAO
@@ -194,7 +94,7 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be/be_visitor_arg_traits.cpp:689
+  // be\be_visitor_arg_traits.cpp:612
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_STARTUPOPTIONS__ARG_TRAITS_SS_)
 #define _IMPLEMENTATIONREPOSITORY_STARTUPOPTIONS__ARG_TRAITS_SS_
@@ -213,7 +113,7 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be/be_visitor_arg_traits.cpp:689
+  // be\be_visitor_arg_traits.cpp:612
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATION__ARG_TRAITS_SS_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATION__ARG_TRAITS_SS_
@@ -232,7 +132,7 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be/be_visitor_arg_traits.cpp:421
+  // be\be_visitor_arg_traits.cpp:383
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST__ARG_TRAITS_SS_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST__ARG_TRAITS_SS_
@@ -270,9 +170,9 @@ namespace TAO
 
 
 // TAO_IDL - Generated from
-// be/be_interface.cpp:1538
+// be\be_interface.cpp:1536
 
-class TAO_ImplementationRepository_ServerObject_Perfect_Hash_OpTable
+class TAO_ImplementationRepository_ServerInformationIterator_Perfect_Hash_OpTable
   : public TAO_Perfect_Hash_OpTable
 {
 private:
@@ -283,9 +183,9 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: /home/ossama/work/skeleton-refactor/ACE_wrappers/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_ImplementationRepository_ServerObject_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: c:\ace\latest\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_ImplementationRepository_ServerInformationIterator_Perfect_Hash_OpTable -N lookup  */
 unsigned int
-TAO_ImplementationRepository_ServerObject_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
+TAO_ImplementationRepository_ServerInformationIterator_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
   static const unsigned char asso_values[] =
     {
@@ -303,10 +203,10 @@ TAO_ImplementationRepository_ServerObject_Perfect_Hash_OpTable::hash (const char
      16, 16, 16, 16, 16, 16, 16, 16, 16,  0,
      16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
      16, 16, 16, 16, 16, 16, 16, 16, 16,  0,
-     16, 16, 16,  5, 16,  0, 16, 16, 16, 16,
+     16, 16,  0,  5, 16, 16, 16, 16, 16, 16,
      16, 16, 16, 16, 16, 16, 16, 16, 16,  0,
-     16,  0, 16, 16, 16, 16, 16, 16, 16, 16,
-     16, 16,  0,  0, 16, 16, 16, 16, 16, 16,
+     16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
+     16, 16, 16,  0, 16, 16, 16, 16,  0, 16,
      16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
      16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
      16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
@@ -327,42 +227,41 @@ TAO_ImplementationRepository_ServerObject_Perfect_Hash_OpTable::hash (const char
      16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
      16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
      16, 16, 16, 16, 16,  0, 16,  0, 16, 16,
-     16,  5, 16,  0, 16, 16, 16, 16, 16, 16,
-      0, 16,  0, 16, 16,  0,  0, 16, 16, 16,
-     16, 16, 16, 16, 16, 16, 16, 16,
+      0,  5, 16, 16, 16, 16, 16, 16, 16, 16,
+      0, 16, 16, 16, 16, 16,  0, 16, 16, 16,
+     16,  0, 16, 16, 16, 16, 16, 16,
 #endif /* ACE_MVS */
     };
   return len + asso_values[(int) str[len - 1]] + asso_values[(int) str[0]];
 }
 
 const class TAO_operation_db_entry *
-TAO_ImplementationRepository_ServerObject_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len)
+TAO_ImplementationRepository_ServerInformationIterator_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len)
 {
   enum
     {
       TOTAL_KEYWORDS = 6,
-      MIN_WORD_LENGTH = 4,
+      MIN_WORD_LENGTH = 5,
       MAX_WORD_LENGTH = 13,
-      MIN_HASH_VALUE = 4,
+      MIN_HASH_VALUE = 5,
       MAX_HASH_VALUE = 15,
-      HASH_VALUE_RANGE = 12,
+      HASH_VALUE_RANGE = 11,
       DUPLICATES = 0,
-      WORDLIST_SIZE = 10
+      WORDLIST_SIZE = 11
     };
 
   static const class TAO_operation_db_entry  wordlist[] =
     {
-      {"",0,0,0},{"",0,0,0},{"",0,0,0},{"",0,0,0},
-      {"ping", &POA_ImplementationRepository::ServerObject::ping_skel, &POA_ImplementationRepository::_TAO_ServerObject_ThruPOA_Proxy_Impl::ping, &POA_ImplementationRepository::_TAO_ServerObject_Direct_Proxy_Impl::ping},
-      {"_is_a", &POA_ImplementationRepository::ServerObject::_is_a_skel, 0, 0},
+      {"",0,0,0},{"",0,0,0},{"",0,0,0},{"",0,0,0},{"",0,0,0},
+      {"_is_a", &POA_ImplementationRepository::ServerInformationIterator::_is_a_skel, 0, 0},
+      {"next_n", &POA_ImplementationRepository::ServerInformationIterator::next_n_skel, &POA_ImplementationRepository::_TAO_ServerInformationIterator_ThruPOA_Proxy_Impl::next_n, &POA_ImplementationRepository::_TAO_ServerInformationIterator_Direct_Proxy_Impl::next_n},
+      {"destroy", &POA_ImplementationRepository::ServerInformationIterator::destroy_skel, &POA_ImplementationRepository::_TAO_ServerInformationIterator_ThruPOA_Proxy_Impl::destroy, &POA_ImplementationRepository::_TAO_ServerInformationIterator_Direct_Proxy_Impl::destroy},
       {"",0,0,0},{"",0,0,0},
-      {"shutdown", &POA_ImplementationRepository::ServerObject::shutdown_skel, &POA_ImplementationRepository::_TAO_ServerObject_ThruPOA_Proxy_Impl::shutdown, &POA_ImplementationRepository::_TAO_ServerObject_Direct_Proxy_Impl::shutdown},
-      {"",0,0,0},
-      {"_component", &POA_ImplementationRepository::ServerObject::_component_skel, 0, 0},
+      {"_component", &POA_ImplementationRepository::ServerInformationIterator::_component_skel, 0, 0},
       {"",0,0,0},{"",0,0,0},
-      {"_non_existent", &POA_ImplementationRepository::ServerObject::_non_existent_skel, 0, 0},
+      {"_non_existent", &POA_ImplementationRepository::ServerInformationIterator::_non_existent_skel, 0, 0},
       {"",0,0,0},
-      {"_interface", &POA_ImplementationRepository::ServerObject::_interface_skel, 0, 0},
+      {"_interface", &POA_ImplementationRepository::ServerInformationIterator::_interface_skel, 0, 0},
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -380,95 +279,326 @@ TAO_ImplementationRepository_ServerObject_Perfect_Hash_OpTable::lookup (const ch
   return 0;
 }
 
-static TAO_ImplementationRepository_ServerObject_Perfect_Hash_OpTable tao_ImplementationRepository_ServerObject_optable;
+static TAO_ImplementationRepository_ServerInformationIterator_Perfect_Hash_OpTable tao_ImplementationRepository_ServerInformationIterator_optable;
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/upcall_command_ss.cpp:49
+// be\be_visitor_interface/interceptors_ss.cpp:53
+
+#if (TAO_HAS_INTERCEPTORS == 1)
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/upcall_command_ss.cpp:52
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
-class TAO_ImplementationRepository_ServerObject_ping_Upcall_Command
-  : public TAO::Upcall_Command
+class TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n : public TAO_ServerRequestInfo
 {
 public:
+  TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n (
+      TAO_ServerRequest &_tao_server_request,
+      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      POA_ImplementationRepository::ServerInformationIterator *tao_impl,
+      const ::CORBA::ULong & how_many
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    );
   
-  inline TAO_ImplementationRepository_ServerObject_ping_Upcall_Command (
-    POA_ImplementationRepository::ServerObject * servant)
-    : servant_ (servant)
-  {
-  }
+  virtual Dynamic::ParameterList * arguments (
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException));
   
-  virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
-  {
-    this->servant_->ping (
-      ACE_ENV_SINGLE_ARG_PARAMETER
-    );
-    ACE_CHECK;
-  }
+  virtual Dynamic::ExceptionList * exceptions (
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  
+  virtual CORBA::Any * result (
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  
+  virtual char * target_most_derived_interface (
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  
+  virtual CORBA::Boolean target_is_a (
+      const char * id
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  
+  void result (CORBA::Boolean result);
 
 private:
+  TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n (
+      const TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n &
+    );
   
-  POA_ImplementationRepository::ServerObject * const servant_;
-
+  void operator= (
+      const TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n &
+    );
+  
+private:
+  POA_ImplementationRepository::ServerInformationIterator *_tao_impl;
+  
+  const ::CORBA::ULong & how_many_;
+  CORBA::Boolean _result;
 };
 
+// TAO_IDL - Generated from
+// be\be_visitor_operation/interceptors_ss.cpp:438
+
+TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n::TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n (
+    TAO_ServerRequest &_tao_server_request,
+    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    POA_ImplementationRepository::ServerInformationIterator *tao_impl,
+    const ::CORBA::ULong & how_many
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
+  : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
+    _tao_impl (tao_impl),
+    how_many_ (how_many)
+{}
+
+Dynamic::ParameterList *
+TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n::arguments (
+    ACE_ENV_SINGLE_ARG_DECL
+  )
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the argument list on demand.
+  Dynamic::ParameterList *parameter_list =
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+  
+  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
+  parameter_list->length (1);
+  CORBA::ULong len = 0;
+  
+  (*parameter_list)[len].argument <<= how_many_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+  
+  return safe_parameter_list._retn ();
+}
+
+Dynamic::ExceptionList *
+TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n::exceptions (
+    ACE_ENV_SINGLE_ARG_DECL
+  )
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the exception list on demand.
+  Dynamic::ExceptionList *exception_list =
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+  
+  return exception_list;
+}
+
+CORBA::Any * 
+TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n::result (
+    ACE_ENV_SINGLE_ARG_DECL
+  )
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the result on demand.
+  CORBA::Boolean tk_void_any = 0;
+  CORBA::Any *result_any =
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+  
+  CORBA::Any_var safe_result_any = result_any;
+  
+  (*result_any) <<= CORBA::Any::from_boolean (this->_result);
+  
+  return safe_result_any._retn ();
+}
+
+char *
+TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n::target_most_derived_interface (
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED
+  )
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  return
+    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
+}
+
+CORBA::Boolean
+TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n::target_is_a (
+    const char * id
+    ACE_ENV_ARG_DECL
+  )
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
+}
+
+void 
+TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n::result (CORBA::Boolean result)
+{
+  // Update the result.
+   this->_result = result;
+}
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/upcall_command_ss.cpp:52
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
-class TAO_ImplementationRepository_ServerObject_shutdown_Upcall_Command
-  : public TAO::Upcall_Command
+class TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy : public TAO_ServerRequestInfo
 {
 public:
+  TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy (
+      TAO_ServerRequest &_tao_server_request,
+      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      POA_ImplementationRepository::ServerInformationIterator *tao_impl
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    );
   
-  inline TAO_ImplementationRepository_ServerObject_shutdown_Upcall_Command (
-    POA_ImplementationRepository::ServerObject * servant)
-    : servant_ (servant)
-  {
-  }
+  virtual Dynamic::ParameterList * arguments (
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException));
   
-  virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
-  {
-    this->servant_->shutdown (
-      ACE_ENV_SINGLE_ARG_PARAMETER
+  virtual Dynamic::ExceptionList * exceptions (
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  
+  virtual CORBA::Any * result (
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  
+  virtual char * target_most_derived_interface (
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  
+  virtual CORBA::Boolean target_is_a (
+      const char * id
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  
+private:
+  TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy (
+      const TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy &
     );
-    ACE_CHECK;
-  }
-
+  
+  void operator= (
+      const TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy &
+    );
+  
 private:
+  POA_ImplementationRepository::ServerInformationIterator *_tao_impl;
   
-  POA_ImplementationRepository::ServerObject * const servant_;
-
 };
 
+// TAO_IDL - Generated from
+// be\be_visitor_operation/interceptors_ss.cpp:438
+
+TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy::TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy (
+    TAO_ServerRequest &_tao_server_request,
+    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    POA_ImplementationRepository::ServerInformationIterator *tao_impl
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
+  : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
+    _tao_impl (tao_impl)
+{}
+
+Dynamic::ParameterList *
+TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy::arguments (
+    ACE_ENV_SINGLE_ARG_DECL
+  )
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the argument list on demand.
+  Dynamic::ParameterList *parameter_list =
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+  
+  return parameter_list;
+}
+
+Dynamic::ExceptionList *
+TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy::exceptions (
+    ACE_ENV_SINGLE_ARG_DECL
+  )
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the exception list on demand.
+  Dynamic::ExceptionList *exception_list =
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+  
+  return exception_list;
+}
+
+CORBA::Any * 
+TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy::result (
+    ACE_ENV_SINGLE_ARG_DECL
+  )
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the result on demand.
+  CORBA::Boolean tk_void_any = 1;
+  CORBA::Any *result_any =
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+  
+  return result_any;
+}
+
+char *
+TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy::target_most_derived_interface (
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED
+  )
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  return
+    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
+}
+
+CORBA::Boolean
+TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy::target_is_a (
+    const char * id
+    ACE_ENV_ARG_DECL
+  )
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
+}
+
+#endif /* TAO_HAS_INTERCEPTORS */
+
 ///////////////////////////////////////////////////////////////////////
 //            Strategized Proxy Broker Implementation
 //
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/strategized_proxy_broker_ss.cpp:40
+// be\be_visitor_interface/strategized_proxy_broker_ss.cpp:40
 
 // Factory function Implementation.
-POA_ImplementationRepository::_TAO_ServerObject_Strategized_Proxy_Broker *
-POA_ImplementationRepository::_TAO_ServerObject_Strategized_Proxy_Broker::the_TAO_ServerObject_Strategized_Proxy_Broker (void)
+POA_ImplementationRepository::_TAO_ServerInformationIterator_Strategized_Proxy_Broker *
+POA_ImplementationRepository::_TAO_ServerInformationIterator_Strategized_Proxy_Broker::the_TAO_ServerInformationIterator_Strategized_Proxy_Broker (void)
 {
-  static POA_ImplementationRepository::_TAO_ServerObject_Strategized_Proxy_Broker
+  static POA_ImplementationRepository::_TAO_ServerInformationIterator_Strategized_Proxy_Broker
   strategized_proxy_broker;
   
   return &strategized_proxy_broker;
 }
 
-POA_ImplementationRepository::_TAO_ServerObject_Strategized_Proxy_Broker::_TAO_ServerObject_Strategized_Proxy_Broker (void)
+POA_ImplementationRepository::_TAO_ServerInformationIterator_Strategized_Proxy_Broker::_TAO_ServerInformationIterator_Strategized_Proxy_Broker (void)
 {
 }
 
-POA_ImplementationRepository::_TAO_ServerObject_Strategized_Proxy_Broker::~_TAO_ServerObject_Strategized_Proxy_Broker (void)
+POA_ImplementationRepository::_TAO_ServerInformationIterator_Strategized_Proxy_Broker::~_TAO_ServerInformationIterator_Strategized_Proxy_Broker (void)
 {
 }
 
 TAO::Collocation_Strategy
-POA_ImplementationRepository::_TAO_ServerObject_Strategized_Proxy_Broker::get_strategy (
+POA_ImplementationRepository::_TAO_ServerInformationIterator_Strategized_Proxy_Broker::get_strategy (
     CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL
   )
@@ -482,7 +612,7 @@ POA_ImplementationRepository::_TAO_ServerObject_Strategized_Proxy_Broker::get_st
 }
 
 void
-POA_ImplementationRepository::_TAO_ServerObject_Strategized_Proxy_Broker::dispatch (
+POA_ImplementationRepository::_TAO_ServerInformationIterator_Strategized_Proxy_Broker::dispatch (
     CORBA::Object_ptr obj,
     CORBA::Object_out forward_obj,
     TAO::Argument ** args,
@@ -530,7 +660,7 @@ POA_ImplementationRepository::_TAO_ServerObject_Strategized_Proxy_Broker::dispat
   
   if (status == -1)
     {
-      ACE_THROW (CORBA::BAD_OPERATION ());
+      ACE_THROW (CORBA::BAD_OPERATION (TAO::VMCID | 2, CORBA::COMPLETED_NO));
     }
   
   ACE_TRY
@@ -564,30 +694,30 @@ POA_ImplementationRepository::_TAO_ServerObject_Strategized_Proxy_Broker::dispat
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:648
+// be\be_visitor_interface/interface_ss.cpp:640
 
 TAO::Collocation_Proxy_Broker *
-ImplementationRepository__TAO_ServerObject_Proxy_Broker_Factory_function (CORBA::Object_ptr)
+ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Factory_function (CORBA::Object_ptr)
 {
   return
-    ::POA_ImplementationRepository::_TAO_ServerObject_Strategized_Proxy_Broker::the_TAO_ServerObject_Strategized_Proxy_Broker ();
+    ::POA_ImplementationRepository::_TAO_ServerInformationIterator_Strategized_Proxy_Broker::the_TAO_ServerInformationIterator_Strategized_Proxy_Broker ();
 }
 
 int
-ImplementationRepository__TAO_ServerObject_Proxy_Broker_Factory_Initializer (size_t)
+ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Factory_Initializer (size_t)
 {
-  ImplementationRepository__TAO_ServerObject_Proxy_Broker_Factory_function_pointer = 
-    ImplementationRepository__TAO_ServerObject_Proxy_Broker_Factory_function;
+  ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Factory_function_pointer = 
+    ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Factory_function;
   
   return 0;
 }
 
 static int
-ImplementationRepository__TAO_ServerObject_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
-  ImplementationRepository__TAO_ServerObject_Proxy_Broker_Factory_Initializer (
+ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
+  ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Factory_Initializer (
       reinterpret_cast<
           size_t> (
-          ImplementationRepository__TAO_ServerObject_Proxy_Broker_Factory_Initializer
+          ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Factory_Initializer
         )
     );
 
@@ -597,20 +727,20 @@ ImplementationRepository__TAO_ServerObject_Proxy_Broker_Stub_Factory_Initializer
 //
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/thru_poa_proxy_impl_ss.cpp:37
+// be\be_visitor_interface/thru_poa_proxy_impl_ss.cpp:37
 
-POA_ImplementationRepository::_TAO_ServerObject_ThruPOA_Proxy_Impl::_TAO_ServerObject_ThruPOA_Proxy_Impl (void)
+POA_ImplementationRepository::_TAO_ServerInformationIterator_ThruPOA_Proxy_Impl::_TAO_ServerInformationIterator_ThruPOA_Proxy_Impl (void)
 {}
 
 // ThruPOA Implementation of the IDL interface methods
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
-POA_ImplementationRepository::_TAO_ServerObject_ThruPOA_Proxy_Impl::ping (
+POA_ImplementationRepository::_TAO_ServerInformationIterator_ThruPOA_Proxy_Impl::next_n (
     TAO_Abstract_ServantBase *servant,
-    TAO::Argument **,
+    TAO::Argument ** args,
     int 
     ACE_ENV_ARG_DECL
   )
@@ -618,22 +748,25 @@ POA_ImplementationRepository::_TAO_ServerObject_ThruPOA_Proxy_Impl::ping (
     CORBA::SystemException
   ))
 {
-  reinterpret_cast<
-      POA_ImplementationRepository::ServerObject_ptr> (
-      servant->_downcast (
-          "IDL:ImplementationRepository/ServerObject:1.0"
-        )
-    )->ping (
-        ACE_ENV_SINGLE_ARG_PARAMETER
-      );
+  ((TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::ret_val *) args[0])->arg () =
+    reinterpret_cast<
+        POA_ImplementationRepository::ServerInformationIterator_ptr> (
+        servant->_downcast (
+            "IDL:ImplementationRepository/ServerInformationIterator:1.0"
+          )
+      )->next_n (
+          ((TAO::Arg_Traits< ::CORBA::ULong>::in_arg_val *) args[1])->arg (),
+          ((TAO::Arg_Traits< ImplementationRepository::ServerInformationList>::out_arg_val *) args[2])->arg ()
+          ACE_ENV_ARG_PARAMETER
+        );
   ACE_CHECK;
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
-POA_ImplementationRepository::_TAO_ServerObject_ThruPOA_Proxy_Impl::shutdown (
+POA_ImplementationRepository::_TAO_ServerInformationIterator_ThruPOA_Proxy_Impl::destroy (
     TAO_Abstract_ServantBase *servant,
     TAO::Argument **,
     int 
@@ -644,11 +777,11 @@ POA_ImplementationRepository::_TAO_ServerObject_ThruPOA_Proxy_Impl::shutdown (
   ))
 {
   reinterpret_cast<
-      POA_ImplementationRepository::ServerObject_ptr> (
+      POA_ImplementationRepository::ServerInformationIterator_ptr> (
       servant->_downcast (
-          "IDL:ImplementationRepository/ServerObject:1.0"
+          "IDL:ImplementationRepository/ServerInformationIterator:1.0"
         )
-    )->shutdown (
+    )->destroy (
         ACE_ENV_SINGLE_ARG_PARAMETER
       );
   ACE_CHECK;
@@ -662,16 +795,16 @@ POA_ImplementationRepository::_TAO_ServerObject_ThruPOA_Proxy_Impl::shutdown (
 //                 Direct Proxy  Implementation
 //
 
-POA_ImplementationRepository::_TAO_ServerObject_Direct_Proxy_Impl::_TAO_ServerObject_Direct_Proxy_Impl (void)
+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
+// be\be_visitor_operation/direct_proxy_impl_ss.cpp:42
 
 void
-POA_ImplementationRepository::_TAO_ServerObject_Direct_Proxy_Impl::ping (
+POA_ImplementationRepository::_TAO_ServerInformationIterator_Direct_Proxy_Impl::next_n (
     TAO_Abstract_ServantBase  *servant,
-    TAO::Argument **,
+    TAO::Argument ** args,
     int 
     ACE_ENV_ARG_DECL
   )
@@ -679,20 +812,23 @@ POA_ImplementationRepository::_TAO_ServerObject_Direct_Proxy_Impl::ping (
     CORBA::SystemException
   ))
 {
-  reinterpret_cast<
-      POA_ImplementationRepository::ServerObject_ptr> (
-      servant->_downcast (
-          "IDL:ImplementationRepository/ServerObject:1.0"
-        )
-    )->ping (
-        ACE_ENV_SINGLE_ARG_PARAMETER
-      );
+  ((TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::ret_val *) args[0])->arg () =
+    reinterpret_cast<
+        POA_ImplementationRepository::ServerInformationIterator_ptr> (
+        servant->_downcast (
+            "IDL:ImplementationRepository/ServerInformationIterator:1.0"
+          )
+      )->next_n (
+          ((TAO::Arg_Traits< ::CORBA::ULong>::in_arg_val *) args[1])->arg (),
+          ((TAO::Arg_Traits< ImplementationRepository::ServerInformationList>::out_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
+// be\be_visitor_operation/direct_proxy_impl_ss.cpp:42
 
 void
-POA_ImplementationRepository::_TAO_ServerObject_Direct_Proxy_Impl::shutdown (
+POA_ImplementationRepository::_TAO_ServerInformationIterator_Direct_Proxy_Impl::destroy (
     TAO_Abstract_ServantBase  *servant,
     TAO::Argument **,
     int 
@@ -703,11 +839,11 @@ POA_ImplementationRepository::_TAO_ServerObject_Direct_Proxy_Impl::shutdown (
   ))
 {
   reinterpret_cast<
-      POA_ImplementationRepository::ServerObject_ptr> (
+      POA_ImplementationRepository::ServerInformationIterator_ptr> (
       servant->_downcast (
-          "IDL:ImplementationRepository/ServerObject:1.0"
+          "IDL:ImplementationRepository/ServerInformationIterator:1.0"
         )
-    )->shutdown (
+    )->destroy (
         ACE_ENV_SINGLE_ARG_PARAMETER
       );
   ACE_CHECK;
@@ -718,133 +854,295 @@ POA_ImplementationRepository::_TAO_ServerObject_Direct_Proxy_Impl::shutdown (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_ss.cpp:97
+// be\be_visitor_interface/interface_ss.cpp:97
 
-POA_ImplementationRepository::ServerObject::ServerObject (void)
+POA_ImplementationRepository::ServerInformationIterator::ServerInformationIterator (void)
 {
-  this->optable_ = &tao_ImplementationRepository_ServerObject_optable;
+  this->optable_ = &tao_ImplementationRepository_ServerInformationIterator_optable;
 }
 
-POA_ImplementationRepository::ServerObject::ServerObject (const ServerObject& rhs)
+POA_ImplementationRepository::ServerInformationIterator::ServerInformationIterator (const ServerInformationIterator& rhs)
   : TAO_Abstract_ServantBase (rhs),
     TAO_ServantBase (rhs)
 {
 }
 
-POA_ImplementationRepository::ServerObject::~ServerObject (void)
+POA_ImplementationRepository::ServerInformationIterator::~ServerInformationIterator (void)
 {
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:165
+// be\be_visitor_operation/operation_ss.cpp:98
 
-void POA_ImplementationRepository::ServerObject::ping_skel (
+void POA_ImplementationRepository::ServerInformationIterator::next_n_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_servant,
-    void * TAO_INTERCEPTOR (_tao_servant_upcall)
+    void *_tao_servant_upcall
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
-#if TAO_HAS_INTERCEPTORS == 1
-  static CORBA::TypeCode_ptr const _tao_exceptions[] = {};
-  static size_t const _tao_nexceptions = 0;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
-  POA_ImplementationRepository::ServerObject * const _tao_impl =
+  TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+  POA_ImplementationRepository::ServerInformationIterator *_tao_impl =
     static_cast<
-        POA_ImplementationRepository::ServerObject *> (
+        POA_ImplementationRepository::ServerInformationIterator *> (
         _tao_servant
       );
+  CORBA::Boolean _tao_retval = 0;
+  ::CORBA::ULong how_many;
+  ::ImplementationRepository::ServerInformationList_var servers;
   
-  TAO::SArg_Traits< void>::ret_val _tao_retval;
   
-  TAO::Argument * const _tao_args [] =
+  if (!(
+      (_tao_in >> how_many)
+      ))
     {
-      &_tao_retval
-    };
-  
-  static size_t const _tao_nargs = 1;
+      TAO_InputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK;
+    }
   
-  TAO_ImplementationRepository_ServerObject_ping_Upcall_Command _tao_upcall_command (
-      _tao_impl);
+#if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
+        _tao_servant_upcall
+      );
+    
+  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
+      _tao_server_request.orb_core ()->server_request_interceptors (),
+      _tao_server_request.interceptor_count ()
+    );
   
-  TAO::Upcall_Wrapper _tao_upcall_wrapper;
-  _tao_upcall_wrapper.upcall (_tao_server_request
-                              , _tao_args
-                              , _tao_nargs
-                              , _tao_upcall_command
+  TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n _tao_ri (
+      _tao_server_request,
+      _tao_upcall,
+      _tao_impl,
+      
+      how_many
+      ACE_ENV_ARG_PARAMETER
+    );
   
-#if TAO_HAS_INTERCEPTORS == 1
-                              , _tao_servant_upcall
-                              , _tao_impl
-                              , _tao_exceptions
-                              , _tao_nexceptions
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
+  ACE_TRY
+    {
+      {
+        TAO::PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (),
+                                            true  /* Copy TSC to RSC */);
+        
+        _tao_vfr.receive_request (&_tao_ri ACE_ENV_ARG_PARAMETER);
+        ACE_TRY_CHECK;
+        
+        if (!_tao_vfr.location_forwarded ())
+          {
+#endif /* TAO_HAS_INTERCEPTORS */
+            _tao_retval = 
+              _tao_impl->next_n (
+                  how_many,
+                  
+                  servers.out ()
+                  ACE_ENV_ARG_PARAMETER
+                );
+            TAO_INTERCEPTOR_CHECK;
+#if (TAO_HAS_INTERCEPTORS == 1)
+          }
+      }
+      
+      if (!_tao_vfr.location_forwarded ())
+        {
+          CORBA::Boolean _tao_retval_info = _tao_retval;
+          _tao_ri.result (_tao_retval_info);
+          _tao_ri.reply_status (PortableInterceptor::SUCCESSFUL);
+          _tao_vfr.send_reply (&_tao_ri ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+        }
+    }
+  ACE_CATCHANY
+    {
+      _tao_ri.exception (&ACE_ANY_EXCEPTION);
+      _tao_vfr.send_exception (
+          &_tao_ri
+          ACE_ENV_ARG_PARAMETER
+        );
+      ACE_TRY_CHECK;
+      
+      PortableInterceptor::ReplyStatus _tao_status =
+        _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+      
+      if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+          || _tao_status == PortableInterceptor::USER_EXCEPTION)
+        {
+          ACE_RE_THROW;
+        }
+    }
   
-                              ACE_ENV_ARG_PARAMETER);
+# if defined (ACE_HAS_EXCEPTIONS) \
+  && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
+  ACE_CATCHALL
+    {
+      CORBA::UNKNOWN ex;
+      
+      _tao_ri.exception (&ex);
+      _tao_vfr.send_exception (
+          &_tao_ri
+          ACE_ENV_ARG_PARAMETER
+        );
+      ACE_TRY_CHECK;
+      
+      PortableInterceptor::ReplyStatus _tao_status =
+        _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+      
+      if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
+        ACE_TRY_THROW (ex);
+    }
+# endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
+  ACE_ENDTRY;
   ACE_CHECK;
+#endif /* TAO_HAS_INTERCEPTORS */
   
+  _tao_server_request.init_reply ();
+#if (TAO_HAS_INTERCEPTORS == 1)
+  if (!_tao_vfr.location_forwarded ())
+    {
+#endif /* TAO_HAS_INTERCEPTORS */
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      if (!(
+          (_tao_out << CORBA::Any::from_boolean (_tao_retval)) &&
+          (_tao_out << servers.in ())
+          ))
+        {
+          TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+        }
+#if (TAO_HAS_INTERCEPTORS == 1)
+    }
+#endif /* TAO_HAS_INTERCEPTORS */
+  
+  
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:165
+// be\be_visitor_operation/operation_ss.cpp:98
 
-void POA_ImplementationRepository::ServerObject::shutdown_skel (
+void POA_ImplementationRepository::ServerInformationIterator::destroy_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_servant,
-    void * TAO_INTERCEPTOR (_tao_servant_upcall)
+    void *_tao_servant_upcall
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
-#if TAO_HAS_INTERCEPTORS == 1
-  static CORBA::TypeCode_ptr const _tao_exceptions[] = {};
-  static size_t const _tao_nexceptions = 0;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
-  POA_ImplementationRepository::ServerObject * const _tao_impl =
+  POA_ImplementationRepository::ServerInformationIterator *_tao_impl =
     static_cast<
-        POA_ImplementationRepository::ServerObject *> (
+        POA_ImplementationRepository::ServerInformationIterator *> (
         _tao_servant
       );
+  _tao_server_request.argument_flag (0);
   
-  TAO::SArg_Traits< void>::ret_val _tao_retval;
-  
-  TAO::Argument * const _tao_args [] =
-    {
-      &_tao_retval
-    };
-  
-  static size_t const _tao_nargs = 1;
   
-  TAO_ImplementationRepository_ServerObject_shutdown_Upcall_Command _tao_upcall_command (
-      _tao_impl);
+#if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
+        _tao_servant_upcall
+      );
+    
+  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
+      _tao_server_request.orb_core ()->server_request_interceptors (),
+      _tao_server_request.interceptor_count ()
+    );
   
-  TAO::Upcall_Wrapper _tao_upcall_wrapper;
-  _tao_upcall_wrapper.upcall (_tao_server_request
-                              , _tao_args
-                              , _tao_nargs
-                              , _tao_upcall_command
+  TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy _tao_ri (
+      _tao_server_request,
+      _tao_upcall,
+      _tao_impl
+      ACE_ENV_ARG_PARAMETER
+    );
   
-#if TAO_HAS_INTERCEPTORS == 1
-                              , _tao_servant_upcall
-                              , _tao_impl
-                              , _tao_exceptions
-                              , _tao_nexceptions
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
+  ACE_TRY
+    {
+      {
+        TAO::PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (),
+                                            true  /* Copy TSC to RSC */);
+        
+        _tao_vfr.receive_request (&_tao_ri ACE_ENV_ARG_PARAMETER);
+        ACE_TRY_CHECK;
+        
+        if (!_tao_vfr.location_forwarded ())
+          {
+#endif /* TAO_HAS_INTERCEPTORS */
+            
+              _tao_impl->destroy (
+                  ACE_ENV_SINGLE_ARG_PARAMETER
+                );
+            TAO_INTERCEPTOR_CHECK;
+#if (TAO_HAS_INTERCEPTORS == 1)
+          }
+      }
+      
+      if (!_tao_vfr.location_forwarded ())
+        {
+          _tao_ri.reply_status (PortableInterceptor::SUCCESSFUL);
+          _tao_vfr.send_reply (&_tao_ri ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+        }
+    }
+  ACE_CATCHANY
+    {
+      _tao_ri.exception (&ACE_ANY_EXCEPTION);
+      _tao_vfr.send_exception (
+          &_tao_ri
+          ACE_ENV_ARG_PARAMETER
+        );
+      ACE_TRY_CHECK;
+      
+      PortableInterceptor::ReplyStatus _tao_status =
+        _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+      
+      if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+          || _tao_status == PortableInterceptor::USER_EXCEPTION)
+        {
+          ACE_RE_THROW;
+        }
+    }
   
-                              ACE_ENV_ARG_PARAMETER);
+# if defined (ACE_HAS_EXCEPTIONS) \
+  && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
+  ACE_CATCHALL
+    {
+      CORBA::UNKNOWN ex;
+      
+      _tao_ri.exception (&ex);
+      _tao_vfr.send_exception (
+          &_tao_ri
+          ACE_ENV_ARG_PARAMETER
+        );
+      ACE_TRY_CHECK;
+      
+      PortableInterceptor::ReplyStatus _tao_status =
+        _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+      
+      if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
+        ACE_TRY_THROW (ex);
+    }
+# endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
+  ACE_ENDTRY;
   ACE_CHECK;
+#endif /* TAO_HAS_INTERCEPTORS */
   
+  _tao_server_request.init_reply ();
+  
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_ss.cpp:162
+// be\be_visitor_interface/interface_ss.cpp:162
 
-void POA_ImplementationRepository::ServerObject::_is_a_skel (
+void POA_ImplementationRepository::ServerInformationIterator::_is_a_skel (
     TAO_ServerRequest &_tao_server_request, 
     void * _tao_servant,
     void * /* Servant_Upcall */
@@ -853,8 +1151,8 @@ void POA_ImplementationRepository::ServerObject::_is_a_skel (
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
   
-  POA_ImplementationRepository::ServerObject *_tao_impl =
-    (POA_ImplementationRepository::ServerObject *) _tao_servant;
+  POA_ImplementationRepository::ServerInformationIterator *_tao_impl =
+    static_cast<POA_ImplementationRepository::ServerInformationIterator *> (_tao_servant);
   
   CORBA::Boolean _tao_retval = 0;
   CORBA::String_var value;
@@ -876,15 +1174,15 @@ void POA_ImplementationRepository::ServerObject::_is_a_skel (
     }
 }
 
-void POA_ImplementationRepository::ServerObject::_non_existent_skel (
+void POA_ImplementationRepository::ServerInformationIterator::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request, 
     void * _tao_servant,
     void * /* Servant_Upcall */
     ACE_ENV_ARG_DECL
   )
 {
-  POA_ImplementationRepository::ServerObject *_tao_impl =
-    (POA_ImplementationRepository::ServerObject *) _tao_servant;
+  POA_ImplementationRepository::ServerInformationIterator *_tao_impl =
+    static_cast<POA_ImplementationRepository::ServerInformationIterator *> (_tao_servant);
   
   CORBA::Boolean _tao_retval =
     _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -899,7 +1197,7 @@ void POA_ImplementationRepository::ServerObject::_non_existent_skel (
     }
 }
 
-void POA_ImplementationRepository::ServerObject::_interface_skel (
+void POA_ImplementationRepository::ServerInformationIterator::_interface_skel (
     TAO_ServerRequest &_tao_server_request, 
     void * _tao_servant,
     void * /* Servant_Upcall */
@@ -916,8 +1214,8 @@ void POA_ImplementationRepository::ServerObject::_interface_skel (
       ACE_THROW (CORBA::INTF_REPOS ());
     }
   
-  POA_ImplementationRepository::ServerObject *_tao_impl =
-    (POA_ImplementationRepository::ServerObject *) _tao_servant;
+  POA_ImplementationRepository::ServerInformationIterator *_tao_impl =
+    static_cast<POA_ImplementationRepository::ServerInformationIterator *> (_tao_servant);
   
   CORBA::InterfaceDef_ptr _tao_retval = 
     _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -940,15 +1238,15 @@ void POA_ImplementationRepository::ServerObject::_interface_skel (
     }
 }
 
-void POA_ImplementationRepository::ServerObject::_component_skel (
+void POA_ImplementationRepository::ServerInformationIterator::_component_skel (
     TAO_ServerRequest &_tao_server_request, 
     void * _tao_object_reference,
     void * /* Servant_Upcall */
     ACE_ENV_ARG_DECL
   )
 {
-  POA_ImplementationRepository::ServerObject *_tao_impl =
-    (POA_ImplementationRepository::ServerObject *) _tao_object_reference;
+  POA_ImplementationRepository::ServerInformationIterator *_tao_impl =
+    static_cast<POA_ImplementationRepository::ServerInformationIterator *> (_tao_object_reference);
   
   CORBA::Object_var _tao_retval =
     _tao_impl->_get_component (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -963,38 +1261,32 @@ void POA_ImplementationRepository::ServerObject::_component_skel (
     }
 }
 
-CORBA::Boolean POA_ImplementationRepository::ServerObject::_is_a (
+CORBA::Boolean POA_ImplementationRepository::ServerInformationIterator::_is_a (
     const char* value
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
-  if (
+  return
+    (
       !ACE_OS::strcmp (
-          (char *)value,
-          "IDL:ImplementationRepository/ServerObject:1.0"
+          value,
+          "IDL:ImplementationRepository/ServerInformationIterator:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
-    {
-      return 1;
-    }
-  else
-    {
-      return 0;
-    }
+    );
 }
 
-void* POA_ImplementationRepository::ServerObject::_downcast (
+void* POA_ImplementationRepository::ServerInformationIterator::_downcast (
     const char* logical_type_id
   )
 {
   if (ACE_OS::strcmp (logical_type_id,
-                      "IDL:ImplementationRepository/ServerObject:1.0") == 0)
+                      "IDL:ImplementationRepository/ServerInformationIterator:1.0") == 0)
     {
-      return static_cast<POA_ImplementationRepository::ServerObject_ptr> (this);
+      return static_cast<POA_ImplementationRepository::ServerInformationIterator_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
@@ -1006,15 +1298,15 @@ void* POA_ImplementationRepository::ServerObject::_downcast (
   return 0;
 }
 
-const char* POA_ImplementationRepository::ServerObject::_interface_repository_id (void) const
+const char* POA_ImplementationRepository::ServerInformationIterator::_interface_repository_id (void) const
 {
-  return "IDL:ImplementationRepository/ServerObject:1.0";
+  return "IDL:ImplementationRepository/ServerInformationIterator:1.0";
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:584
+// be\be_visitor_interface/interface_ss.cpp:576
 
-void POA_ImplementationRepository::ServerObject::_dispatch (
+void POA_ImplementationRepository::ServerInformationIterator::_dispatch (
     TAO_ServerRequest &req,
     void *servant_upcall
     ACE_ENV_ARG_DECL
@@ -1027,10 +1319,10 @@ void POA_ImplementationRepository::ServerObject::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:526
+// be\be_visitor_interface/interface_ss.cpp:527
 
-ImplementationRepository::ServerObject *
-POA_ImplementationRepository::ServerObject::_this (ACE_ENV_SINGLE_ARG_DECL)
+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);
@@ -1038,36 +1330,28 @@ POA_ImplementationRepository::ServerObject::_this (ACE_ENV_SINGLE_ARG_DECL)
   TAO_Stub_Auto_Ptr safe_stub (stub);
   CORBA::Object_ptr tmp = CORBA::Object::_nil ();
   
-  if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ())
-    {
-      ACE_NEW_RETURN (
-          tmp,
-          CORBA::Object (stub, 1, this),
-          0
-        );
-    }
-  else
-    {
-      ACE_NEW_RETURN (
-          tmp,
-          CORBA::Object (stub, 0, this),
-          0
-        );
-    }
+  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::ServerObject STUB_SCOPED_NAME;
+  typedef ::ImplementationRepository::ServerInformationIterator STUB_SCOPED_NAME;
   return
     TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
         obj.in (),
-        ImplementationRepository__TAO_ServerObject_Proxy_Broker_Factory_function_pointer
+        ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Factory_function_pointer
       );
 }
 
 // TAO_IDL - Generated from
-// be/be_interface.cpp:1538
+// be\be_interface.cpp:1536
 
 class TAO_ImplementationRepository_Administration_Perfect_Hash_OpTable
   : public TAO_Perfect_Hash_OpTable
@@ -1080,53 +1364,53 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: /home/ossama/work/skeleton-refactor/ACE_wrappers/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_ImplementationRepository_Administration_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: c:\ace\latest\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,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)
-     34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-     34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-     34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-     34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-     34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-     34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-     34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-     34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-     34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-     34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-     34, 34, 34, 34, 34, 34, 34, 34, 34,  0,
-     34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-     34, 34, 34, 34, 34, 34, 34, 34, 34,  4,
-     34, 34,  0,  0,  0,  0, 34, 34, 34, 34,
-     34, 34, 34, 34, 34, 34, 34,  5, 34,  5,
-      0,  0, 34,  0, 34, 34, 34, 34, 34, 34,
-     34, 34,  5, 15, 34, 34, 34, 34, 34, 34,
-     34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-     34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-     34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-     34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-     34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-     34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-     34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-     34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-     34, 34, 34, 34, 34, 34,
+     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,
 #else
-     34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-     34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-     34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-     34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-     34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-     34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-     34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-     34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-     34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
-     34, 34, 34, 34, 34,  0, 34,  4, 34, 34,
-      0,  0,  0,  0, 34, 34, 34, 34,  5, 34,
-      5,  0,  0, 34,  0,  5, 15, 34, 34, 34,
-     34, 34, 34, 34, 34, 34, 34, 34,
+     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,
 #endif /* ACE_MVS */
     };
   return len + asso_values[(int) str[len - 1]] + asso_values[(int) str[0]];
@@ -1137,42 +1421,37 @@ TAO_ImplementationRepository_Administration_Perfect_Hash_OpTable::lookup (const
 {
   enum
     {
-      TOTAL_KEYWORDS = 16,
+      TOTAL_KEYWORDS = 13,
       MIN_WORD_LENGTH = 4,
-      MAX_WORD_LENGTH = 28,
+      MAX_WORD_LENGTH = 23,
       MIN_HASH_VALUE = 4,
-      MAX_HASH_VALUE = 33,
-      HASH_VALUE_RANGE = 30,
+      MAX_HASH_VALUE = 28,
+      HASH_VALUE_RANGE = 25,
       DUPLICATES = 0,
-      WORDLIST_SIZE = 20
+      WORDLIST_SIZE = 17
     };
 
   static const class TAO_operation_db_entry  wordlist[] =
     {
       {"",0,0,0},{"",0,0,0},{"",0,0,0},{"",0,0,0},
       {"find", &POA_ImplementationRepository::Administration::find_skel, &POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::find, &POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::find},
-      {"",0,0,0},{"",0,0,0},{"",0,0,0},
-      {"find_ior", &POA_ImplementationRepository::Administration::find_ior_skel, &POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::find_ior, &POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::find_ior},
-      {"_is_a", &POA_ImplementationRepository::Administration::_is_a_skel, 0, 0},
+      {"",0,0,0},{"",0,0,0},{"",0,0,0},{"",0,0,0},{"",0,0,0},
       {"_interface", &POA_ImplementationRepository::Administration::_interface_skel, 0, 0},
       {"",0,0,0},{"",0,0,0},
       {"remove_server", &POA_ImplementationRepository::Administration::remove_server_skel, &POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::remove_server, &POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::remove_server},
-      {"",0,0,0},
+      {"_is_a", &POA_ImplementationRepository::Administration::_is_a_skel, 0, 0},
       {"register_server", &POA_ImplementationRepository::Administration::register_server_skel, &POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::register_server, &POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::register_server},
       {"",0,0,0},
       {"reregister_server", &POA_ImplementationRepository::Administration::reregister_server_skel, &POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::reregister_server, &POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::reregister_server},
-      {"shutdown_repo", &POA_ImplementationRepository::Administration::shutdown_repo_skel, &POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::shutdown_repo, &POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::shutdown_repo},
-      {"activate_server", &POA_ImplementationRepository::Administration::activate_server_skel, &POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::activate_server, &POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::activate_server},
+      {"list", &POA_ImplementationRepository::Administration::list_skel, &POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::list, &POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::list},
+      {"_component", &POA_ImplementationRepository::Administration::_component_skel, 0, 0},
       {"shutdown_server", &POA_ImplementationRepository::Administration::shutdown_server_skel, &POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::shutdown_server, &POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::shutdown_server},
       {"",0,0,0},
-      {"server_is_running", &POA_ImplementationRepository::Administration::server_is_running_skel, &POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::server_is_running, &POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::server_is_running},
+      {"_non_existent", &POA_ImplementationRepository::Administration::_non_existent_skel, 0, 0},
       {"",0,0,0},
-      {"list", &POA_ImplementationRepository::Administration::list_skel, &POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::list, &POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::list},
-      {"_component", &POA_ImplementationRepository::Administration::_component_skel, 0, 0},
+      {"activate_server", &POA_ImplementationRepository::Administration::activate_server_skel, &POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::activate_server, &POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::activate_server},
       {"",0,0,0},{"",0,0,0},
-      {"_non_existent", &POA_ImplementationRepository::Administration::_non_existent_skel, 0, 0},
-      {"",0,0,0},{"",0,0,0},{"",0,0,0},
-      {"activate_server_with_startup", &POA_ImplementationRepository::Administration::activate_server_with_startup_skel, &POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::activate_server_with_startup, &POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::activate_server_with_startup},
+      {"server_is_running", &POA_ImplementationRepository::Administration::server_is_running_skel, &POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::server_is_running, &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_ThruPOA_Proxy_Impl::server_is_shutting_down, &POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::server_is_shutting_down},
     };
 
@@ -1194,415 +1473,1447 @@ TAO_ImplementationRepository_Administration_Perfect_Hash_OpTable::lookup (const
 static TAO_ImplementationRepository_Administration_Perfect_Hash_OpTable tao_ImplementationRepository_Administration_optable;
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/upcall_command_ss.cpp:49
+// be\be_visitor_interface/interceptors_ss.cpp:53
+
+#if (TAO_HAS_INTERCEPTORS == 1)
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/upcall_command_ss.cpp:52
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
-class TAO_ImplementationRepository_Administration_activate_server_Upcall_Command
-  : public TAO::Upcall_Command
+class TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server : public TAO_ServerRequestInfo
 {
 public:
+  TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server (
+      TAO_ServerRequest &_tao_server_request,
+      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      POA_ImplementationRepository::Administration *tao_impl,
+      const char * server
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    );
   
-  inline TAO_ImplementationRepository_Administration_activate_server_Upcall_Command (
-    POA_ImplementationRepository::Administration * servant,
-    TAO::Argument * const args[])
-    : servant_ (servant)
-    , args_ (args)
-  {
-  }
+  virtual Dynamic::ParameterList * arguments (
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException));
   
-  virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
-  {
-    this->servant_->activate_server (
-      static_cast<TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val *> (this->args_[1])->arg ()
-      ACE_ENV_ARG_PARAMETER
+  virtual Dynamic::ExceptionList * exceptions (
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  
+  virtual CORBA::Any * result (
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  
+  virtual char * target_most_derived_interface (
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  
+  virtual CORBA::Boolean target_is_a (
+      const char * id
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  
+private:
+  TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server (
+      const TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server &
     );
-    ACE_CHECK;
-  }
-
+  
+  void operator= (
+      const TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server &
+    );
+  
 private:
+  POA_ImplementationRepository::Administration *_tao_impl;
   
-  POA_ImplementationRepository::Administration * const servant_;
-  TAO::Argument * const * const args_;
-
+  const char * server_;
 };
 
-
 // TAO_IDL - Generated from
-// be/be_visitor_operation/upcall_command_ss.cpp:52
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
-class TAO_ImplementationRepository_Administration_activate_server_with_startup_Upcall_Command
-  : public TAO::Upcall_Command
+TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server::TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server (
+    TAO_ServerRequest &_tao_server_request,
+    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    POA_ImplementationRepository::Administration *tao_impl,
+    const char * server
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
+  : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
+    _tao_impl (tao_impl),
+    server_ (server)
+{}
+
+Dynamic::ParameterList *
+TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server::arguments (
+    ACE_ENV_SINGLE_ARG_DECL
+  )
+  ACE_THROW_SPEC ((CORBA::SystemException))
 {
-public:
+  // Generate the argument list on demand.
+  Dynamic::ParameterList *parameter_list =
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
   
-  inline TAO_ImplementationRepository_Administration_activate_server_with_startup_Upcall_Command (
-    POA_ImplementationRepository::Administration * servant,
-    TAO::Argument * const args[])
-    : servant_ (servant)
-    , args_ (args)
-  {
-  }
+  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
+  parameter_list->length (1);
+  CORBA::ULong len = 0;
+  
+  (*parameter_list)[len].argument <<= server_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
   
-  virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+  return safe_parameter_list._retn ();
+}
+
+Dynamic::ExceptionList *
+TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server::exceptions (
+    ACE_ENV_SINGLE_ARG_DECL
+  )
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the exception list on demand.
+  Dynamic::ExceptionList *exception_list =
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+  
+  Dynamic::ExceptionList_var safe_exception_list = exception_list;
+    
+  static CORBA::TypeCode_ptr _tao_ImplementationRepository_Administration_activate_server_exceptiondata[] = 
   {
-    static_cast<TAO::SArg_Traits< ::CORBA::Char *>::ret_val *> (this->args_[0])->arg () =
-      this->servant_->activate_server_with_startup (
-        static_cast<TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val *> (this->args_[1])->arg (),
-        static_cast<TAO::SArg_Traits< CORBA::Long>::in_arg_val *> (this->args_[2])->arg ()
-        ACE_ENV_ARG_PARAMETER
-      );
-    ACE_CHECK;
-  }
+    ImplementationRepository::_tc_NotFound,
+    ImplementationRepository::_tc_CannotActivate
+  };
+  
+  exception_list->length (2);
+  for (CORBA::ULong i = 0; i < 2; ++i)
+    {
+      CORBA::TypeCode_ptr tcp = _tao_ImplementationRepository_Administration_activate_server_exceptiondata[i];
+      TAO_Pseudo_Object_Manager<CORBA::TypeCode> tcp_object (&tcp, 1);
+      (*exception_list)[i] = tcp_object;
+    }
 
-private:
+  return safe_exception_list._retn ();
+}
+
+CORBA::Any * 
+TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server::result (
+    ACE_ENV_SINGLE_ARG_DECL
+  )
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the result on demand.
+  CORBA::Boolean tk_void_any = 1;
+  CORBA::Any *result_any =
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
   
-  POA_ImplementationRepository::Administration * const servant_;
-  TAO::Argument * const * const args_;
+  return result_any;
+}
 
-};
+char *
+TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server::target_most_derived_interface (
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED
+  )
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  return
+    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
+}
 
+CORBA::Boolean
+TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server::target_is_a (
+    const char * id
+    ACE_ENV_ARG_DECL
+  )
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
+}
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/upcall_command_ss.cpp:52
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
-class TAO_ImplementationRepository_Administration_register_server_Upcall_Command
-  : public TAO::Upcall_Command
+class TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server : public TAO_ServerRequestInfo
 {
 public:
+  TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server (
+      TAO_ServerRequest &_tao_server_request,
+      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      POA_ImplementationRepository::Administration *tao_impl,
+      const char * server,
+      const ::ImplementationRepository::StartupOptions & options
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    );
   
-  inline TAO_ImplementationRepository_Administration_register_server_Upcall_Command (
-    POA_ImplementationRepository::Administration * servant,
-    TAO::Argument * const args[])
-    : servant_ (servant)
-    , args_ (args)
-  {
-  }
+  virtual Dynamic::ParameterList * arguments (
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException));
   
-  virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
-  {
-    this->servant_->register_server (
-      static_cast<TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val *> (this->args_[1])->arg (),
-      static_cast<TAO::SArg_Traits< ::ImplementationRepository::StartupOptions>::in_arg_val *> (this->args_[2])->arg ()
-      ACE_ENV_ARG_PARAMETER
+  virtual Dynamic::ExceptionList * exceptions (
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  
+  virtual CORBA::Any * result (
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  
+  virtual char * target_most_derived_interface (
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  
+  virtual CORBA::Boolean target_is_a (
+      const char * id
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  
+private:
+  TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server (
+      const TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server &
     );
-    ACE_CHECK;
-  }
-
+  
+  void operator= (
+      const TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server &
+    );
+  
 private:
+  POA_ImplementationRepository::Administration *_tao_impl;
   
-  POA_ImplementationRepository::Administration * const servant_;
-  TAO::Argument * const * const args_;
-
+  const char * server_;
+  const ::ImplementationRepository::StartupOptions & options_;
 };
 
-
 // TAO_IDL - Generated from
-// be/be_visitor_operation/upcall_command_ss.cpp:52
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
-class TAO_ImplementationRepository_Administration_reregister_server_Upcall_Command
-  : public TAO::Upcall_Command
+TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server::TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server (
+    TAO_ServerRequest &_tao_server_request,
+    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    POA_ImplementationRepository::Administration *tao_impl,
+    const char * server,
+    const ::ImplementationRepository::StartupOptions & options
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
+  : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
+    _tao_impl (tao_impl),
+    server_ (server),
+    options_ (options)
+{}
+
+Dynamic::ParameterList *
+TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server::arguments (
+    ACE_ENV_SINGLE_ARG_DECL
+  )
+  ACE_THROW_SPEC ((CORBA::SystemException))
 {
-public:
+  // Generate the argument list on demand.
+  Dynamic::ParameterList *parameter_list =
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
   
-  inline TAO_ImplementationRepository_Administration_reregister_server_Upcall_Command (
-    POA_ImplementationRepository::Administration * servant,
-    TAO::Argument * const args[])
-    : servant_ (servant)
-    , args_ (args)
-  {
-  }
+  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
+  parameter_list->length (2);
+  CORBA::ULong len = 0;
+  
+  (*parameter_list)[len].argument <<= server_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
   
-  virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+  (*parameter_list)[len].argument <<=  this->options_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+  
+  return safe_parameter_list._retn ();
+}
+
+Dynamic::ExceptionList *
+TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server::exceptions (
+    ACE_ENV_SINGLE_ARG_DECL
+  )
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the exception list on demand.
+  Dynamic::ExceptionList *exception_list =
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+  
+  Dynamic::ExceptionList_var safe_exception_list = exception_list;
+    
+  static CORBA::TypeCode_ptr _tao_ImplementationRepository_Administration_register_server_exceptiondata[] = 
   {
-    this->servant_->reregister_server (
-      static_cast<TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val *> (this->args_[1])->arg (),
-      static_cast<TAO::SArg_Traits< ::ImplementationRepository::StartupOptions>::in_arg_val *> (this->args_[2])->arg ()
-      ACE_ENV_ARG_PARAMETER
-    );
-    ACE_CHECK;
-  }
+    ImplementationRepository::_tc_AlreadyRegistered,
+    ImplementationRepository::_tc_NotFound
+  };
+  
+  exception_list->length (2);
+  for (CORBA::ULong i = 0; i < 2; ++i)
+    {
+      CORBA::TypeCode_ptr tcp = _tao_ImplementationRepository_Administration_register_server_exceptiondata[i];
+      TAO_Pseudo_Object_Manager<CORBA::TypeCode> tcp_object (&tcp, 1);
+      (*exception_list)[i] = tcp_object;
+    }
 
-private:
+  return safe_exception_list._retn ();
+}
+
+CORBA::Any * 
+TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server::result (
+    ACE_ENV_SINGLE_ARG_DECL
+  )
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the result on demand.
+  CORBA::Boolean tk_void_any = 1;
+  CORBA::Any *result_any =
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
   
-  POA_ImplementationRepository::Administration * const servant_;
-  TAO::Argument * const * const args_;
+  return result_any;
+}
 
-};
+char *
+TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server::target_most_derived_interface (
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED
+  )
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  return
+    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
+}
 
+CORBA::Boolean
+TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server::target_is_a (
+    const char * id
+    ACE_ENV_ARG_DECL
+  )
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
+}
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/upcall_command_ss.cpp:52
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
-class TAO_ImplementationRepository_Administration_remove_server_Upcall_Command
-  : public TAO::Upcall_Command
+class TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server : public TAO_ServerRequestInfo
 {
 public:
+  TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server (
+      TAO_ServerRequest &_tao_server_request,
+      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      POA_ImplementationRepository::Administration *tao_impl,
+      const char * server,
+      const ::ImplementationRepository::StartupOptions & options
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    );
   
-  inline TAO_ImplementationRepository_Administration_remove_server_Upcall_Command (
-    POA_ImplementationRepository::Administration * servant,
-    TAO::Argument * const args[])
-    : servant_ (servant)
-    , args_ (args)
-  {
-  }
+  virtual Dynamic::ParameterList * arguments (
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException));
   
-  virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
-  {
-    this->servant_->remove_server (
-      static_cast<TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val *> (this->args_[1])->arg ()
-      ACE_ENV_ARG_PARAMETER
+  virtual Dynamic::ExceptionList * exceptions (
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  
+  virtual CORBA::Any * result (
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  
+  virtual char * target_most_derived_interface (
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  
+  virtual CORBA::Boolean target_is_a (
+      const char * id
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  
+private:
+  TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server (
+      const TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server &
     );
-    ACE_CHECK;
-  }
-
+  
+  void operator= (
+      const TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server &
+    );
+  
 private:
+  POA_ImplementationRepository::Administration *_tao_impl;
   
-  POA_ImplementationRepository::Administration * const servant_;
-  TAO::Argument * const * const args_;
-
+  const char * server_;
+  const ::ImplementationRepository::StartupOptions & options_;
 };
 
-
 // TAO_IDL - Generated from
-// be/be_visitor_operation/upcall_command_ss.cpp:52
+// be\be_visitor_operation/interceptors_ss.cpp:438
+
+TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server::TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server (
+    TAO_ServerRequest &_tao_server_request,
+    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    POA_ImplementationRepository::Administration *tao_impl,
+    const char * server,
+    const ::ImplementationRepository::StartupOptions & options
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
+  : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
+    _tao_impl (tao_impl),
+    server_ (server),
+    options_ (options)
+{}
 
-class TAO_ImplementationRepository_Administration_shutdown_server_Upcall_Command
-  : public TAO::Upcall_Command
+Dynamic::ParameterList *
+TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server::arguments (
+    ACE_ENV_SINGLE_ARG_DECL
+  )
+  ACE_THROW_SPEC ((CORBA::SystemException))
 {
-public:
+  // Generate the argument list on demand.
+  Dynamic::ParameterList *parameter_list =
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
   
-  inline TAO_ImplementationRepository_Administration_shutdown_server_Upcall_Command (
-    POA_ImplementationRepository::Administration * servant,
-    TAO::Argument * const args[])
-    : servant_ (servant)
-    , args_ (args)
-  {
-  }
+  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
+  parameter_list->length (2);
+  CORBA::ULong len = 0;
+  
+  (*parameter_list)[len].argument <<= server_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+  
+  (*parameter_list)[len].argument <<=  this->options_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+  
+  return safe_parameter_list._retn ();
+}
+
+Dynamic::ExceptionList *
+TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server::exceptions (
+    ACE_ENV_SINGLE_ARG_DECL
+  )
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the exception list on demand.
+  Dynamic::ExceptionList *exception_list =
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
   
-  virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+  Dynamic::ExceptionList_var safe_exception_list = exception_list;
+    
+  static CORBA::TypeCode_ptr _tao_ImplementationRepository_Administration_reregister_server_exceptiondata[] = 
   {
-    this->servant_->shutdown_server (
-      static_cast<TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val *> (this->args_[1])->arg ()
-      ACE_ENV_ARG_PARAMETER
-    );
-    ACE_CHECK;
-  }
+    ImplementationRepository::_tc_AlreadyRegistered,
+    ImplementationRepository::_tc_NotFound
+  };
+  
+  exception_list->length (2);
+  for (CORBA::ULong i = 0; i < 2; ++i)
+    {
+      CORBA::TypeCode_ptr tcp = _tao_ImplementationRepository_Administration_reregister_server_exceptiondata[i];
+      TAO_Pseudo_Object_Manager<CORBA::TypeCode> tcp_object (&tcp, 1);
+      (*exception_list)[i] = tcp_object;
+    }
 
-private:
+  return safe_exception_list._retn ();
+}
+
+CORBA::Any * 
+TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server::result (
+    ACE_ENV_SINGLE_ARG_DECL
+  )
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the result on demand.
+  CORBA::Boolean tk_void_any = 1;
+  CORBA::Any *result_any =
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
   
-  POA_ImplementationRepository::Administration * const servant_;
-  TAO::Argument * const * const args_;
+  return result_any;
+}
 
-};
+char *
+TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server::target_most_derived_interface (
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED
+  )
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  return
+    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
+}
 
+CORBA::Boolean
+TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server::target_is_a (
+    const char * id
+    ACE_ENV_ARG_DECL
+  )
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
+}
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/upcall_command_ss.cpp:52
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
-class TAO_ImplementationRepository_Administration_server_is_running_Upcall_Command
-  : public TAO::Upcall_Command
+class TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server : public TAO_ServerRequestInfo
 {
 public:
+  TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server (
+      TAO_ServerRequest &_tao_server_request,
+      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      POA_ImplementationRepository::Administration *tao_impl,
+      const char * server
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    );
   
-  inline TAO_ImplementationRepository_Administration_server_is_running_Upcall_Command (
-    POA_ImplementationRepository::Administration * servant,
-    TAO::Argument * const args[])
-    : servant_ (servant)
-    , args_ (args)
-  {
-  }
+  virtual Dynamic::ParameterList * arguments (
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException));
   
-  virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
-  {
-    this->servant_->server_is_running (
-      static_cast<TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val *> (this->args_[1])->arg (),
-      static_cast<TAO::SArg_Traits< ::ImplementationRepository::Address>::in_arg_val *> (this->args_[2])->arg (),
-      static_cast<TAO::SArg_Traits< ::ImplementationRepository::ServerObject>::in_arg_val *> (this->args_[3])->arg ()
-      ACE_ENV_ARG_PARAMETER
+  virtual Dynamic::ExceptionList * exceptions (
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  
+  virtual CORBA::Any * result (
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  
+  virtual char * target_most_derived_interface (
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  
+  virtual CORBA::Boolean target_is_a (
+      const char * id
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  
+private:
+  TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server (
+      const TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server &
     );
-    ACE_CHECK;
-  }
-
+  
+  void operator= (
+      const TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server &
+    );
+  
 private:
+  POA_ImplementationRepository::Administration *_tao_impl;
   
-  POA_ImplementationRepository::Administration * const servant_;
-  TAO::Argument * const * const args_;
-
+  const char * server_;
 };
 
-
 // TAO_IDL - Generated from
-// be/be_visitor_operation/upcall_command_ss.cpp:52
+// be\be_visitor_operation/interceptors_ss.cpp:438
 
-class TAO_ImplementationRepository_Administration_server_is_shutting_down_Upcall_Command
-  : public TAO::Upcall_Command
+TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server::TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server (
+    TAO_ServerRequest &_tao_server_request,
+    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    POA_ImplementationRepository::Administration *tao_impl,
+    const char * server
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
+  : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
+    _tao_impl (tao_impl),
+    server_ (server)
+{}
+
+Dynamic::ParameterList *
+TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server::arguments (
+    ACE_ENV_SINGLE_ARG_DECL
+  )
+  ACE_THROW_SPEC ((CORBA::SystemException))
 {
-public:
+  // Generate the argument list on demand.
+  Dynamic::ParameterList *parameter_list =
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
   
-  inline TAO_ImplementationRepository_Administration_server_is_shutting_down_Upcall_Command (
-    POA_ImplementationRepository::Administration * servant,
-    TAO::Argument * const args[])
-    : servant_ (servant)
-    , args_ (args)
-  {
-  }
+  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
+  parameter_list->length (1);
+  CORBA::ULong len = 0;
+  
+  (*parameter_list)[len].argument <<= server_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
   
-  virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+  return safe_parameter_list._retn ();
+}
+
+Dynamic::ExceptionList *
+TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server::exceptions (
+    ACE_ENV_SINGLE_ARG_DECL
+  )
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the exception list on demand.
+  Dynamic::ExceptionList *exception_list =
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+  
+  Dynamic::ExceptionList_var safe_exception_list = exception_list;
+    
+  static CORBA::TypeCode_ptr _tao_ImplementationRepository_Administration_remove_server_exceptiondata[] = 
   {
-    this->servant_->server_is_shutting_down (
-      static_cast<TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val *> (this->args_[1])->arg ()
-      ACE_ENV_ARG_PARAMETER
-    );
-    ACE_CHECK;
-  }
+    ImplementationRepository::_tc_NotFound
+  };
+  
+  exception_list->length (1);
+  for (CORBA::ULong i = 0; i < 1; ++i)
+    {
+      CORBA::TypeCode_ptr tcp = _tao_ImplementationRepository_Administration_remove_server_exceptiondata[i];
+      TAO_Pseudo_Object_Manager<CORBA::TypeCode> tcp_object (&tcp, 1);
+      (*exception_list)[i] = tcp_object;
+    }
 
-private:
+  return safe_exception_list._retn ();
+}
+
+CORBA::Any * 
+TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server::result (
+    ACE_ENV_SINGLE_ARG_DECL
+  )
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the result on demand.
+  CORBA::Boolean tk_void_any = 1;
+  CORBA::Any *result_any =
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
   
-  POA_ImplementationRepository::Administration * const servant_;
-  TAO::Argument * const * const args_;
+  return result_any;
+}
 
-};
+char *
+TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server::target_most_derived_interface (
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED
+  )
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  return
+    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
+}
 
+CORBA::Boolean
+TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server::target_is_a (
+    const char * id
+    ACE_ENV_ARG_DECL
+  )
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
+}
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/upcall_command_ss.cpp:52
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
-class TAO_ImplementationRepository_Administration_find_Upcall_Command
-  : public TAO::Upcall_Command
+class TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server : public TAO_ServerRequestInfo
 {
 public:
+  TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server (
+      TAO_ServerRequest &_tao_server_request,
+      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      POA_ImplementationRepository::Administration *tao_impl,
+      const char * server
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    );
   
-  inline TAO_ImplementationRepository_Administration_find_Upcall_Command (
-    POA_ImplementationRepository::Administration * servant,
-    TAO::Argument * const args[])
-    : servant_ (servant)
-    , args_ (args)
-  {
-  }
+  virtual Dynamic::ParameterList * arguments (
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException));
   
-  virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
-  {
-    this->servant_->find (
-      static_cast<TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val *> (this->args_[1])->arg (),
-      static_cast<TAO::SArg_Traits< ::ImplementationRepository::ServerInformation>::out_arg_val *> (this->args_[2])->arg ()
-      ACE_ENV_ARG_PARAMETER
+  virtual Dynamic::ExceptionList * exceptions (
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  
+  virtual CORBA::Any * result (
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  
+  virtual char * target_most_derived_interface (
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  
+  virtual CORBA::Boolean target_is_a (
+      const char * id
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  
+private:
+  TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server (
+      const TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server &
     );
-    ACE_CHECK;
-  }
-
+  
+  void operator= (
+      const TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server &
+    );
+  
 private:
+  POA_ImplementationRepository::Administration *_tao_impl;
   
-  POA_ImplementationRepository::Administration * const servant_;
-  TAO::Argument * const * const args_;
-
+  const char * server_;
 };
 
+// TAO_IDL - Generated from
+// be\be_visitor_operation/interceptors_ss.cpp:438
+
+TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server::TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server (
+    TAO_ServerRequest &_tao_server_request,
+    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    POA_ImplementationRepository::Administration *tao_impl,
+    const char * server
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
+  : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
+    _tao_impl (tao_impl),
+    server_ (server)
+{}
+
+Dynamic::ParameterList *
+TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server::arguments (
+    ACE_ENV_SINGLE_ARG_DECL
+  )
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the argument list on demand.
+  Dynamic::ParameterList *parameter_list =
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+  
+  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
+  parameter_list->length (1);
+  CORBA::ULong len = 0;
+  
+  (*parameter_list)[len].argument <<= server_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+  
+  return safe_parameter_list._retn ();
+}
+
+Dynamic::ExceptionList *
+TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server::exceptions (
+    ACE_ENV_SINGLE_ARG_DECL
+  )
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the exception list on demand.
+  Dynamic::ExceptionList *exception_list =
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+  
+  Dynamic::ExceptionList_var safe_exception_list = exception_list;
+    
+  static CORBA::TypeCode_ptr _tao_ImplementationRepository_Administration_shutdown_server_exceptiondata[] = 
+  {
+    ImplementationRepository::_tc_NotFound
+  };
+  
+  exception_list->length (1);
+  for (CORBA::ULong i = 0; i < 1; ++i)
+    {
+      CORBA::TypeCode_ptr tcp = _tao_ImplementationRepository_Administration_shutdown_server_exceptiondata[i];
+      TAO_Pseudo_Object_Manager<CORBA::TypeCode> tcp_object (&tcp, 1);
+      (*exception_list)[i] = tcp_object;
+    }
+
+  return safe_exception_list._retn ();
+}
+
+CORBA::Any * 
+TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server::result (
+    ACE_ENV_SINGLE_ARG_DECL
+  )
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the result on demand.
+  CORBA::Boolean tk_void_any = 1;
+  CORBA::Any *result_any =
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+  
+  return result_any;
+}
+
+char *
+TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server::target_most_derived_interface (
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED
+  )
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  return
+    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
+}
+
+CORBA::Boolean
+TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server::target_is_a (
+    const char * id
+    ACE_ENV_ARG_DECL
+  )
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
+}
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/upcall_command_ss.cpp:52
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
-class TAO_ImplementationRepository_Administration_list_Upcall_Command
-  : public TAO::Upcall_Command
+class TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running : public TAO_ServerRequestInfo
 {
 public:
+  TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running (
+      TAO_ServerRequest &_tao_server_request,
+      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      POA_ImplementationRepository::Administration *tao_impl,
+      const char * server,
+      const char * partial_ior,
+      ::ImplementationRepository::ServerObject_ptr server_object
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    );
   
-  inline TAO_ImplementationRepository_Administration_list_Upcall_Command (
-    POA_ImplementationRepository::Administration * servant,
-    TAO::Argument * const args[])
-    : servant_ (servant)
-    , args_ (args)
-  {
-  }
+  virtual Dynamic::ParameterList * arguments (
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException));
   
-  virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
-  {
-    this->servant_->list (
-      static_cast<TAO::SArg_Traits< CORBA::ULong>::in_arg_val *> (this->args_[1])->arg (),
-      static_cast<TAO::SArg_Traits< ::ImplementationRepository::ServerInformationList>::out_arg_val *> (this->args_[2])->arg (),
-      static_cast<TAO::SArg_Traits< ::ImplementationRepository::ServerInformationIterator>::out_arg_val *> (this->args_[3])->arg ()
-      ACE_ENV_ARG_PARAMETER
+  virtual Dynamic::ExceptionList * exceptions (
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  
+  virtual CORBA::Any * result (
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  
+  virtual char * target_most_derived_interface (
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  
+  virtual CORBA::Boolean target_is_a (
+      const char * id
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  
+private:
+  TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running (
+      const TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running &
     );
-    ACE_CHECK;
-  }
-
+  
+  void operator= (
+      const TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running &
+    );
+  
 private:
+  POA_ImplementationRepository::Administration *_tao_impl;
   
-  POA_ImplementationRepository::Administration * const servant_;
-  TAO::Argument * const * const args_;
-
+  const char * server_;
+  const char * partial_ior_;
+  ::ImplementationRepository::ServerObject_ptr server_object_;
 };
 
+// TAO_IDL - Generated from
+// be\be_visitor_operation/interceptors_ss.cpp:438
+
+TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running::TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running (
+    TAO_ServerRequest &_tao_server_request,
+    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    POA_ImplementationRepository::Administration *tao_impl,
+    const char * server,
+    const char * partial_ior,
+    ::ImplementationRepository::ServerObject_ptr server_object
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
+  : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
+    _tao_impl (tao_impl),
+    server_ (server),
+    partial_ior_ (partial_ior),
+    server_object_ (server_object)
+{}
+
+Dynamic::ParameterList *
+TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running::arguments (
+    ACE_ENV_SINGLE_ARG_DECL
+  )
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the argument list on demand.
+  Dynamic::ParameterList *parameter_list =
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+  
+  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
+  parameter_list->length (3);
+  CORBA::ULong len = 0;
+  
+  (*parameter_list)[len].argument <<= server_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+  
+  (*parameter_list)[len].argument <<= partial_ior_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+  
+  (*parameter_list)[len].argument <<=  this->server_object_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+  
+  return safe_parameter_list._retn ();
+}
+
+Dynamic::ExceptionList *
+TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running::exceptions (
+    ACE_ENV_SINGLE_ARG_DECL
+  )
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the exception list on demand.
+  Dynamic::ExceptionList *exception_list =
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+  
+  Dynamic::ExceptionList_var safe_exception_list = exception_list;
+    
+  static CORBA::TypeCode_ptr _tao_ImplementationRepository_Administration_server_is_running_exceptiondata[] = 
+  {
+    ImplementationRepository::_tc_NotFound
+  };
+  
+  exception_list->length (1);
+  for (CORBA::ULong i = 0; i < 1; ++i)
+    {
+      CORBA::TypeCode_ptr tcp = _tao_ImplementationRepository_Administration_server_is_running_exceptiondata[i];
+      TAO_Pseudo_Object_Manager<CORBA::TypeCode> tcp_object (&tcp, 1);
+      (*exception_list)[i] = tcp_object;
+    }
+
+  return safe_exception_list._retn ();
+}
+
+CORBA::Any * 
+TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running::result (
+    ACE_ENV_SINGLE_ARG_DECL
+  )
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the result on demand.
+  CORBA::Boolean tk_void_any = 1;
+  CORBA::Any *result_any =
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+  
+  return result_any;
+}
+
+char *
+TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running::target_most_derived_interface (
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED
+  )
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  return
+    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
+}
+
+CORBA::Boolean
+TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running::target_is_a (
+    const char * id
+    ACE_ENV_ARG_DECL
+  )
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
+}
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/upcall_command_ss.cpp:52
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
-class TAO_ImplementationRepository_Administration_shutdown_repo_Upcall_Command
-  : public TAO::Upcall_Command
+class TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting_down : public TAO_ServerRequestInfo
 {
 public:
+  TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting_down (
+      TAO_ServerRequest &_tao_server_request,
+      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      POA_ImplementationRepository::Administration *tao_impl,
+      const char * server
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    );
   
-  inline TAO_ImplementationRepository_Administration_shutdown_repo_Upcall_Command (
-    POA_ImplementationRepository::Administration * servant)
-    : servant_ (servant)
-  {
-  }
+  virtual Dynamic::ParameterList * arguments (
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException));
   
-  virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
-  {
-    this->servant_->shutdown_repo (
-      ACE_ENV_SINGLE_ARG_PARAMETER
+  virtual Dynamic::ExceptionList * exceptions (
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  
+  virtual CORBA::Any * result (
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  
+  virtual char * target_most_derived_interface (
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  
+  virtual CORBA::Boolean target_is_a (
+      const char * id
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  
+private:
+  TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting_down (
+      const TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting_down &
     );
-    ACE_CHECK;
-  }
-
+  
+  void operator= (
+      const TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting_down &
+    );
+  
 private:
+  POA_ImplementationRepository::Administration *_tao_impl;
   
-  POA_ImplementationRepository::Administration * const servant_;
-
+  const char * server_;
 };
 
+// TAO_IDL - Generated from
+// be\be_visitor_operation/interceptors_ss.cpp:438
+
+TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting_down::TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting_down (
+    TAO_ServerRequest &_tao_server_request,
+    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    POA_ImplementationRepository::Administration *tao_impl,
+    const char * server
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
+  : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
+    _tao_impl (tao_impl),
+    server_ (server)
+{}
+
+Dynamic::ParameterList *
+TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting_down::arguments (
+    ACE_ENV_SINGLE_ARG_DECL
+  )
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the argument list on demand.
+  Dynamic::ParameterList *parameter_list =
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+  
+  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
+  parameter_list->length (1);
+  CORBA::ULong len = 0;
+  
+  (*parameter_list)[len].argument <<= server_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+  
+  return safe_parameter_list._retn ();
+}
+
+Dynamic::ExceptionList *
+TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting_down::exceptions (
+    ACE_ENV_SINGLE_ARG_DECL
+  )
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the exception list on demand.
+  Dynamic::ExceptionList *exception_list =
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+  
+  Dynamic::ExceptionList_var safe_exception_list = exception_list;
+    
+  static CORBA::TypeCode_ptr _tao_ImplementationRepository_Administration_server_is_shutting_down_exceptiondata[] = 
+  {
+    ImplementationRepository::_tc_NotFound
+  };
+  
+  exception_list->length (1);
+  for (CORBA::ULong i = 0; i < 1; ++i)
+    {
+      CORBA::TypeCode_ptr tcp = _tao_ImplementationRepository_Administration_server_is_shutting_down_exceptiondata[i];
+      TAO_Pseudo_Object_Manager<CORBA::TypeCode> tcp_object (&tcp, 1);
+      (*exception_list)[i] = tcp_object;
+    }
+
+  return safe_exception_list._retn ();
+}
+
+CORBA::Any * 
+TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting_down::result (
+    ACE_ENV_SINGLE_ARG_DECL
+  )
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the result on demand.
+  CORBA::Boolean tk_void_any = 1;
+  CORBA::Any *result_any =
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+  
+  return result_any;
+}
+
+char *
+TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting_down::target_most_derived_interface (
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED
+  )
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  return
+    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
+}
+
+CORBA::Boolean
+TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting_down::target_is_a (
+    const char * id
+    ACE_ENV_ARG_DECL
+  )
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
+}
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/upcall_command_ss.cpp:52
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
-class TAO_ImplementationRepository_Administration_find_ior_Upcall_Command
-  : public TAO::Upcall_Command
+class TAO_ServerRequestInfo_ImplementationRepository_Administration_find : public TAO_ServerRequestInfo
 {
 public:
+  TAO_ServerRequestInfo_ImplementationRepository_Administration_find (
+      TAO_ServerRequest &_tao_server_request,
+      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      POA_ImplementationRepository::Administration *tao_impl,
+      const char * server
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    );
   
-  inline TAO_ImplementationRepository_Administration_find_ior_Upcall_Command (
-    POA_ImplementationRepository::Administration * servant,
-    TAO::Argument * const args[])
-    : servant_ (servant)
-    , args_ (args)
-  {
-  }
+  virtual Dynamic::ParameterList * arguments (
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  
+  virtual Dynamic::ExceptionList * exceptions (
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  
+  virtual CORBA::Any * result (
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  
+  virtual char * target_most_derived_interface (
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException));
   
-  virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+  virtual CORBA::Boolean target_is_a (
+      const char * id
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  
+private:
+  TAO_ServerRequestInfo_ImplementationRepository_Administration_find (
+      const TAO_ServerRequestInfo_ImplementationRepository_Administration_find &
+    );
+  
+  void operator= (
+      const TAO_ServerRequestInfo_ImplementationRepository_Administration_find &
+    );
+  
+private:
+  POA_ImplementationRepository::Administration *_tao_impl;
+  
+  const char * server_;
+};
+
+// TAO_IDL - Generated from
+// be\be_visitor_operation/interceptors_ss.cpp:438
+
+TAO_ServerRequestInfo_ImplementationRepository_Administration_find::TAO_ServerRequestInfo_ImplementationRepository_Administration_find (
+    TAO_ServerRequest &_tao_server_request,
+    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    POA_ImplementationRepository::Administration *tao_impl,
+    const char * server
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
+  : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
+    _tao_impl (tao_impl),
+    server_ (server)
+{}
+
+Dynamic::ParameterList *
+TAO_ServerRequestInfo_ImplementationRepository_Administration_find::arguments (
+    ACE_ENV_SINGLE_ARG_DECL
+  )
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the argument list on demand.
+  Dynamic::ParameterList *parameter_list =
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+  
+  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
+  parameter_list->length (1);
+  CORBA::ULong len = 0;
+  
+  (*parameter_list)[len].argument <<= server_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+  
+  return safe_parameter_list._retn ();
+}
+
+Dynamic::ExceptionList *
+TAO_ServerRequestInfo_ImplementationRepository_Administration_find::exceptions (
+    ACE_ENV_SINGLE_ARG_DECL
+  )
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the exception list on demand.
+  Dynamic::ExceptionList *exception_list =
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+  
+  Dynamic::ExceptionList_var safe_exception_list = exception_list;
+    
+  static CORBA::TypeCode_ptr _tao_ImplementationRepository_Administration_find_exceptiondata[] = 
   {
-    static_cast<TAO::SArg_Traits< ::CORBA::Char *>::ret_val *> (this->args_[0])->arg () =
-      this->servant_->find_ior (
-        static_cast<TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val *> (this->args_[1])->arg ()
-        ACE_ENV_ARG_PARAMETER
-      );
-    ACE_CHECK;
-  }
+    ImplementationRepository::_tc_NotFound
+  };
+  
+  exception_list->length (1);
+  for (CORBA::ULong i = 0; i < 1; ++i)
+    {
+      CORBA::TypeCode_ptr tcp = _tao_ImplementationRepository_Administration_find_exceptiondata[i];
+      TAO_Pseudo_Object_Manager<CORBA::TypeCode> tcp_object (&tcp, 1);
+      (*exception_list)[i] = tcp_object;
+    }
+
+  return safe_exception_list._retn ();
+}
+
+CORBA::Any * 
+TAO_ServerRequestInfo_ImplementationRepository_Administration_find::result (
+    ACE_ENV_SINGLE_ARG_DECL
+  )
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the result on demand.
+  CORBA::Boolean tk_void_any = 1;
+  CORBA::Any *result_any =
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+  
+  return result_any;
+}
+
+char *
+TAO_ServerRequestInfo_ImplementationRepository_Administration_find::target_most_derived_interface (
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED
+  )
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  return
+    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
+}
 
+CORBA::Boolean
+TAO_ServerRequestInfo_ImplementationRepository_Administration_find::target_is_a (
+    const char * id
+    ACE_ENV_ARG_DECL
+  )
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_operation/interceptors_ss.cpp:74
+
+class TAO_ServerRequestInfo_ImplementationRepository_Administration_list : public TAO_ServerRequestInfo
+{
+public:
+  TAO_ServerRequestInfo_ImplementationRepository_Administration_list (
+      TAO_ServerRequest &_tao_server_request,
+      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      POA_ImplementationRepository::Administration *tao_impl,
+      const ::CORBA::ULong & how_many      
+
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    );
+  
+  virtual Dynamic::ParameterList * arguments (
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  
+  virtual Dynamic::ExceptionList * exceptions (
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  
+  virtual CORBA::Any * result (
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  
+  virtual char * target_most_derived_interface (
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  
+  virtual CORBA::Boolean target_is_a (
+      const char * id
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  
 private:
+  TAO_ServerRequestInfo_ImplementationRepository_Administration_list (
+      const TAO_ServerRequestInfo_ImplementationRepository_Administration_list &
+    );
   
-  POA_ImplementationRepository::Administration * const servant_;
-  TAO::Argument * const * const args_;
+  void operator= (
+      const TAO_ServerRequestInfo_ImplementationRepository_Administration_list &
+    );
+  
+private:
+  POA_ImplementationRepository::Administration *_tao_impl;
+  
+  const ::CORBA::ULong & how_many_;  
 
 };
 
+// TAO_IDL - Generated from
+// be\be_visitor_operation/interceptors_ss.cpp:438
+
+TAO_ServerRequestInfo_ImplementationRepository_Administration_list::TAO_ServerRequestInfo_ImplementationRepository_Administration_list (
+    TAO_ServerRequest &_tao_server_request,
+    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    POA_ImplementationRepository::Administration *tao_impl,
+    const ::CORBA::ULong & how_many    
+
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
+  : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
+    _tao_impl (tao_impl),
+    how_many_ (how_many)  
+
+{}
+
+Dynamic::ParameterList *
+TAO_ServerRequestInfo_ImplementationRepository_Administration_list::arguments (
+    ACE_ENV_SINGLE_ARG_DECL
+  )
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the argument list on demand.
+  Dynamic::ParameterList *parameter_list =
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+  
+  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
+  parameter_list->length (1);
+  CORBA::ULong len = 0;
+  
+  (*parameter_list)[len].argument <<= how_many_;
+  (*parameter_list)[len].mode = CORBA::PARAM_IN;
+  len++;
+    
+
+  return safe_parameter_list._retn ();
+}
+
+Dynamic::ExceptionList *
+TAO_ServerRequestInfo_ImplementationRepository_Administration_list::exceptions (
+    ACE_ENV_SINGLE_ARG_DECL
+  )
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the exception list on demand.
+  Dynamic::ExceptionList *exception_list =
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+  
+  return exception_list;
+}
+
+CORBA::Any * 
+TAO_ServerRequestInfo_ImplementationRepository_Administration_list::result (
+    ACE_ENV_SINGLE_ARG_DECL
+  )
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the result on demand.
+  CORBA::Boolean tk_void_any = 1;
+  CORBA::Any *result_any =
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+  
+  return result_any;
+}
+
+char *
+TAO_ServerRequestInfo_ImplementationRepository_Administration_list::target_most_derived_interface (
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED
+  )
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  return
+    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
+}
+
+CORBA::Boolean
+TAO_ServerRequestInfo_ImplementationRepository_Administration_list::target_is_a (
+    const char * id
+    ACE_ENV_ARG_DECL
+  )
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
+}
+
+#endif /* TAO_HAS_INTERCEPTORS */
+
 ///////////////////////////////////////////////////////////////////////
 //            Strategized Proxy Broker Implementation
 //
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/strategized_proxy_broker_ss.cpp:40
+// be\be_visitor_interface/strategized_proxy_broker_ss.cpp:40
 
 // Factory function Implementation.
 POA_ImplementationRepository::_TAO_Administration_Strategized_Proxy_Broker *
@@ -1685,7 +2996,7 @@ POA_ImplementationRepository::_TAO_Administration_Strategized_Proxy_Broker::disp
   
   if (status == -1)
     {
-      ACE_THROW (CORBA::BAD_OPERATION ());
+      ACE_THROW (CORBA::BAD_OPERATION (TAO::VMCID | 2, CORBA::COMPLETED_NO));
     }
   
   ACE_TRY
@@ -1719,7 +3030,7 @@ POA_ImplementationRepository::_TAO_Administration_Strategized_Proxy_Broker::disp
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:648
+// be\be_visitor_interface/interface_ss.cpp:640
 
 TAO::Collocation_Proxy_Broker *
 ImplementationRepository__TAO_Administration_Proxy_Broker_Factory_function (CORBA::Object_ptr)
@@ -1752,7 +3063,7 @@ ImplementationRepository__TAO_Administration_Proxy_Broker_Stub_Factory_Initializ
 //
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/thru_poa_proxy_impl_ss.cpp:37
+// be\be_visitor_interface/thru_poa_proxy_impl_ss.cpp:37
 
 POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::_TAO_Administration_ThruPOA_Proxy_Impl (void)
 {}
@@ -1760,7 +3071,7 @@ POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::_TAO_Admin
 // ThruPOA Implementation of the IDL interface methods
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::activate_server (
@@ -1781,44 +3092,14 @@ POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::activate_s
           "IDL:ImplementationRepository/Administration:1.0"
         )
     )->activate_server (
-        ((TAO::Arg_Traits< ::CORBA::Char *>::in_arg_val *) args[1])->arg ()
+        ((TAO::Arg_Traits< CORBA::Char *>::in_arg_val *) args[1])->arg ()
         ACE_ENV_ARG_PARAMETER
       );
   ACE_CHECK;
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
-
-void
-POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::activate_server_with_startup (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int 
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException,
-    ::ImplementationRepository::NotFound,
-    ::ImplementationRepository::CannotActivate
-  ))
-{
-  ((TAO::Arg_Traits< ::CORBA::Char *>::ret_val *) args[0])->arg () =
-    reinterpret_cast<
-        POA_ImplementationRepository::Administration_ptr> (
-        servant->_downcast (
-            "IDL:ImplementationRepository/Administration:1.0"
-          )
-      )->activate_server_with_startup (
-          ((TAO::Arg_Traits< ::CORBA::Char *>::in_arg_val *) args[1])->arg (),
-          ((TAO::Arg_Traits< CORBA::Long>::in_arg_val *) args[2])->arg ()
-          ACE_ENV_ARG_PARAMETER
-        );
-  ACE_CHECK;
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::register_server (
@@ -1839,15 +3120,15 @@ POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::register_s
           "IDL:ImplementationRepository/Administration:1.0"
         )
     )->register_server (
-        ((TAO::Arg_Traits< ::CORBA::Char *>::in_arg_val *) args[1])->arg (),
-        ((TAO::Arg_Traits< ::ImplementationRepository::StartupOptions>::in_arg_val *) args[2])->arg ()
+        ((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/thru_poa_proxy_impl_ss.cpp:52
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::reregister_server (
@@ -1868,15 +3149,15 @@ POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::reregister
           "IDL:ImplementationRepository/Administration:1.0"
         )
     )->reregister_server (
-        ((TAO::Arg_Traits< ::CORBA::Char *>::in_arg_val *) args[1])->arg (),
-        ((TAO::Arg_Traits< ::ImplementationRepository::StartupOptions>::in_arg_val *) args[2])->arg ()
+        ((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/thru_poa_proxy_impl_ss.cpp:52
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::remove_server (
@@ -1896,14 +3177,14 @@ POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::remove_ser
           "IDL:ImplementationRepository/Administration:1.0"
         )
     )->remove_server (
-        ((TAO::Arg_Traits< ::CORBA::Char *>::in_arg_val *) args[1])->arg ()
+        ((TAO::Arg_Traits< CORBA::Char *>::in_arg_val *) args[1])->arg ()
         ACE_ENV_ARG_PARAMETER
       );
   ACE_CHECK;
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::shutdown_server (
@@ -1923,14 +3204,14 @@ POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::shutdown_s
           "IDL:ImplementationRepository/Administration:1.0"
         )
     )->shutdown_server (
-        ((TAO::Arg_Traits< ::CORBA::Char *>::in_arg_val *) args[1])->arg ()
+        ((TAO::Arg_Traits< CORBA::Char *>::in_arg_val *) args[1])->arg ()
         ACE_ENV_ARG_PARAMETER
       );
   ACE_CHECK;
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::server_is_running (
@@ -1950,16 +3231,16 @@ POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::server_is_
           "IDL:ImplementationRepository/Administration:1.0"
         )
     )->server_is_running (
-        ((TAO::Arg_Traits< ::CORBA::Char *>::in_arg_val *) args[1])->arg (),
-        ((TAO::Arg_Traits< ::ImplementationRepository::Address>::in_arg_val *) args[2])->arg (),
-        ((TAO::Arg_Traits< ::ImplementationRepository::ServerObject>::in_arg_val *) args[3])->arg ()
+        ((TAO::Arg_Traits< CORBA::Char *>::in_arg_val *) args[1])->arg (),
+        ((TAO::Arg_Traits< CORBA::Char *>::in_arg_val *) args[2])->arg (),
+        ((TAO::Arg_Traits< ImplementationRepository::ServerObject>::in_arg_val *) args[3])->arg ()
         ACE_ENV_ARG_PARAMETER
       );
   ACE_CHECK;
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::server_is_shutting_down (
@@ -1979,14 +3260,14 @@ POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::server_is_
           "IDL:ImplementationRepository/Administration:1.0"
         )
     )->server_is_shutting_down (
-        ((TAO::Arg_Traits< ::CORBA::Char *>::in_arg_val *) args[1])->arg ()
+        ((TAO::Arg_Traits< CORBA::Char *>::in_arg_val *) args[1])->arg ()
         ACE_ENV_ARG_PARAMETER
       );
   ACE_CHECK;
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::find (
@@ -2006,15 +3287,15 @@ POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::find (
           "IDL:ImplementationRepository/Administration:1.0"
         )
     )->find (
-        ((TAO::Arg_Traits< ::CORBA::Char *>::in_arg_val *) args[1])->arg (),
-        ((TAO::Arg_Traits< ::ImplementationRepository::ServerInformation>::out_arg_val *) args[2])->arg ()
+        ((TAO::Arg_Traits< CORBA::Char *>::in_arg_val *) args[1])->arg (),
+        ((TAO::Arg_Traits< ImplementationRepository::ServerInformation>::out_arg_val *) args[2])->arg ()
         ACE_ENV_ARG_PARAMETER
       );
   ACE_CHECK;
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::list (
@@ -2033,67 +3314,14 @@ POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::list (
           "IDL:ImplementationRepository/Administration:1.0"
         )
     )->list (
-        ((TAO::Arg_Traits< CORBA::ULong>::in_arg_val *) args[1])->arg (),
-        ((TAO::Arg_Traits< ::ImplementationRepository::ServerInformationList>::out_arg_val *) args[2])->arg (),
-        ((TAO::Arg_Traits< ::ImplementationRepository::ServerInformationIterator>::out_arg_val *) args[3])->arg ()
+        ((TAO::Arg_Traits< ::CORBA::ULong>::in_arg_val *) args[1])->arg (),
+        ((TAO::Arg_Traits< ImplementationRepository::ServerInformationList>::out_arg_val *) args[2])->arg (),
+        ((TAO::Arg_Traits< ImplementationRepository::ServerInformationIterator>::out_arg_val *) args[3])->arg ()
         ACE_ENV_ARG_PARAMETER
       );
   ACE_CHECK;
 }
 
-// TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
-
-void
-POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::shutdown_repo (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument **,
-    int 
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  reinterpret_cast<
-      POA_ImplementationRepository::Administration_ptr> (
-      servant->_downcast (
-          "IDL:ImplementationRepository/Administration:1.0"
-        )
-    )->shutdown_repo (
-        ACE_ENV_SINGLE_ARG_PARAMETER
-      );
-  ACE_CHECK;
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
-
-void
-POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::find_ior (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int 
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException,
-    ::ImplementationRepository::NotFound
-  ))
-{
-  ((TAO::Arg_Traits< ::CORBA::Char *>::ret_val *) args[0])->arg () =
-    reinterpret_cast<
-        POA_ImplementationRepository::Administration_ptr> (
-        servant->_downcast (
-            "IDL:ImplementationRepository/Administration:1.0"
-          )
-      )->find_ior (
-          ((TAO::Arg_Traits< ::CORBA::Char *>::in_arg_val *) args[1])->arg ()
-          ACE_ENV_ARG_PARAMETER
-        );
-  ACE_CHECK;
-}
-
 //
 //           End ThruPOA Proxy Implementation
 ///////////////////////////////////////////////////////////////////////
@@ -2106,7 +3334,7 @@ POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::_TAO_Admini
 {}
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/direct_proxy_impl_ss.cpp:42
+// be\be_visitor_operation/direct_proxy_impl_ss.cpp:42
 
 void
 POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::activate_server (
@@ -2127,40 +3355,12 @@ POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::activate_se
           "IDL:ImplementationRepository/Administration:1.0"
         )
     )->activate_server (
-        ((TAO::Arg_Traits< ::CORBA::Char *>::in_arg_val *) args[1])->arg ()
+        ((TAO::Arg_Traits< CORBA::Char *>::in_arg_val *) args[1])->arg ()
         ACE_ENV_ARG_PARAMETER
       );
   ACE_CHECK;
 }// TAO_IDL - Generated from 
-// be/be_visitor_operation/direct_proxy_impl_ss.cpp:42
-
-void
-POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::activate_server_with_startup (
-    TAO_Abstract_ServantBase  *servant,
-    TAO::Argument ** args,
-    int 
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException,
-    ::ImplementationRepository::NotFound,
-    ::ImplementationRepository::CannotActivate
-  ))
-{
-  ((TAO::Arg_Traits< ::CORBA::Char *>::ret_val *) args[0])->arg () =
-    reinterpret_cast<
-        POA_ImplementationRepository::Administration_ptr> (
-        servant->_downcast (
-            "IDL:ImplementationRepository/Administration:1.0"
-          )
-      )->activate_server_with_startup (
-          ((TAO::Arg_Traits< ::CORBA::Char *>::in_arg_val *) args[1])->arg (),
-          ((TAO::Arg_Traits< CORBA::Long>::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
+// be\be_visitor_operation/direct_proxy_impl_ss.cpp:42
 
 void
 POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::register_server (
@@ -2181,13 +3381,13 @@ POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::register_se
           "IDL:ImplementationRepository/Administration:1.0"
         )
     )->register_server (
-        ((TAO::Arg_Traits< ::CORBA::Char *>::in_arg_val *) args[1])->arg (),
-        ((TAO::Arg_Traits< ::ImplementationRepository::StartupOptions>::in_arg_val *) args[2])->arg ()
+        ((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
+// be\be_visitor_operation/direct_proxy_impl_ss.cpp:42
 
 void
 POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::reregister_server (
@@ -2208,13 +3408,13 @@ POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::reregister_
           "IDL:ImplementationRepository/Administration:1.0"
         )
     )->reregister_server (
-        ((TAO::Arg_Traits< ::CORBA::Char *>::in_arg_val *) args[1])->arg (),
-        ((TAO::Arg_Traits< ::ImplementationRepository::StartupOptions>::in_arg_val *) args[2])->arg ()
+        ((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
+// be\be_visitor_operation/direct_proxy_impl_ss.cpp:42
 
 void
 POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::remove_server (
@@ -2234,12 +3434,12 @@ POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::remove_serv
           "IDL:ImplementationRepository/Administration:1.0"
         )
     )->remove_server (
-        ((TAO::Arg_Traits< ::CORBA::Char *>::in_arg_val *) args[1])->arg ()
+        ((TAO::Arg_Traits< CORBA::Char *>::in_arg_val *) args[1])->arg ()
         ACE_ENV_ARG_PARAMETER
       );
   ACE_CHECK;
 }// TAO_IDL - Generated from 
-// be/be_visitor_operation/direct_proxy_impl_ss.cpp:42
+// be\be_visitor_operation/direct_proxy_impl_ss.cpp:42
 
 void
 POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::shutdown_server (
@@ -2259,12 +3459,12 @@ POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::shutdown_se
           "IDL:ImplementationRepository/Administration:1.0"
         )
     )->shutdown_server (
-        ((TAO::Arg_Traits< ::CORBA::Char *>::in_arg_val *) args[1])->arg ()
+        ((TAO::Arg_Traits< CORBA::Char *>::in_arg_val *) args[1])->arg ()
         ACE_ENV_ARG_PARAMETER
       );
   ACE_CHECK;
 }// TAO_IDL - Generated from 
-// be/be_visitor_operation/direct_proxy_impl_ss.cpp:42
+// be\be_visitor_operation/direct_proxy_impl_ss.cpp:42
 
 void
 POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::server_is_running (
@@ -2284,14 +3484,14 @@ POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::server_is_r
           "IDL:ImplementationRepository/Administration:1.0"
         )
     )->server_is_running (
-        ((TAO::Arg_Traits< ::CORBA::Char *>::in_arg_val *) args[1])->arg (),
-        ((TAO::Arg_Traits< ::ImplementationRepository::Address>::in_arg_val *) args[2])->arg (),
-        ((TAO::Arg_Traits< ::ImplementationRepository::ServerObject>::in_arg_val *) args[3])->arg ()
+        ((TAO::Arg_Traits< CORBA::Char *>::in_arg_val *) args[1])->arg (),
+        ((TAO::Arg_Traits< CORBA::Char *>::in_arg_val *) args[2])->arg (),
+        ((TAO::Arg_Traits< ImplementationRepository::ServerObject>::in_arg_val *) args[3])->arg ()
         ACE_ENV_ARG_PARAMETER
       );
   ACE_CHECK;
 }// TAO_IDL - Generated from 
-// be/be_visitor_operation/direct_proxy_impl_ss.cpp:42
+// be\be_visitor_operation/direct_proxy_impl_ss.cpp:42
 
 void
 POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::server_is_shutting_down (
@@ -2311,12 +3511,12 @@ POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::server_is_s
           "IDL:ImplementationRepository/Administration:1.0"
         )
     )->server_is_shutting_down (
-        ((TAO::Arg_Traits< ::CORBA::Char *>::in_arg_val *) args[1])->arg ()
+        ((TAO::Arg_Traits< CORBA::Char *>::in_arg_val *) args[1])->arg ()
         ACE_ENV_ARG_PARAMETER
       );
   ACE_CHECK;
 }// TAO_IDL - Generated from 
-// be/be_visitor_operation/direct_proxy_impl_ss.cpp:42
+// be\be_visitor_operation/direct_proxy_impl_ss.cpp:42
 
 void
 POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::find (
@@ -2336,13 +3536,13 @@ POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::find (
           "IDL:ImplementationRepository/Administration:1.0"
         )
     )->find (
-        ((TAO::Arg_Traits< ::CORBA::Char *>::in_arg_val *) args[1])->arg (),
-        ((TAO::Arg_Traits< ::ImplementationRepository::ServerInformation>::out_arg_val *) args[2])->arg ()
+        ((TAO::Arg_Traits< CORBA::Char *>::in_arg_val *) args[1])->arg (),
+        ((TAO::Arg_Traits< ImplementationRepository::ServerInformation>::out_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
+// be\be_visitor_operation/direct_proxy_impl_ss.cpp:42
 
 void
 POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::list (
@@ -2361,61 +3561,12 @@ POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::list (
           "IDL:ImplementationRepository/Administration:1.0"
         )
     )->list (
-        ((TAO::Arg_Traits< CORBA::ULong>::in_arg_val *) args[1])->arg (),
-        ((TAO::Arg_Traits< ::ImplementationRepository::ServerInformationList>::out_arg_val *) args[2])->arg (),
-        ((TAO::Arg_Traits< ::ImplementationRepository::ServerInformationIterator>::out_arg_val *) args[3])->arg ()
+        ((TAO::Arg_Traits< ::CORBA::ULong>::in_arg_val *) args[1])->arg (),
+        ((TAO::Arg_Traits< ImplementationRepository::ServerInformationList>::out_arg_val *) args[2])->arg (),
+        ((TAO::Arg_Traits< ImplementationRepository::ServerInformationIterator>::out_arg_val *) args[3])->arg ()
         ACE_ENV_ARG_PARAMETER
       );
   ACE_CHECK;
-}// TAO_IDL - Generated from 
-// be/be_visitor_operation/direct_proxy_impl_ss.cpp:42
-
-void
-POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::shutdown_repo (
-    TAO_Abstract_ServantBase  *servant,
-    TAO::Argument **,
-    int 
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  reinterpret_cast<
-      POA_ImplementationRepository::Administration_ptr> (
-      servant->_downcast (
-          "IDL:ImplementationRepository/Administration:1.0"
-        )
-    )->shutdown_repo (
-        ACE_ENV_SINGLE_ARG_PARAMETER
-      );
-  ACE_CHECK;
-}// TAO_IDL - Generated from 
-// be/be_visitor_operation/direct_proxy_impl_ss.cpp:42
-
-void
-POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::find_ior (
-    TAO_Abstract_ServantBase  *servant,
-    TAO::Argument ** args,
-    int 
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException,
-    ::ImplementationRepository::NotFound
-  ))
-{
-  ((TAO::Arg_Traits< ::CORBA::Char *>::ret_val *) args[0])->arg () =
-    reinterpret_cast<
-        POA_ImplementationRepository::Administration_ptr> (
-        servant->_downcast (
-            "IDL:ImplementationRepository/Administration:1.0"
-          )
-      )->find_ior (
-          ((TAO::Arg_Traits< ::CORBA::Char *>::in_arg_val *) args[1])->arg ()
-          ACE_ENV_ARG_PARAMETER
-        );
-  ACE_CHECK;
 }
 
 //
@@ -2423,7 +3574,7 @@ POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::find_ior (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_ss.cpp:97
+// be\be_visitor_interface/interface_ss.cpp:97
 
 POA_ImplementationRepository::Administration::Administration (void)
 {
@@ -2441,1529 +3592,1238 @@ POA_ImplementationRepository::Administration::~Administration (void)
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:165
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_ImplementationRepository::Administration::activate_server_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_servant,
-    void * TAO_INTERCEPTOR (_tao_servant_upcall)
+    void *_tao_servant_upcall
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
-#if TAO_HAS_INTERCEPTORS == 1
-  static CORBA::TypeCode_ptr const _tao_exceptions[] = 
-    {
-      ImplementationRepository::_tc_NotFound,
-      ImplementationRepository::_tc_CannotActivate
-    };
-  static size_t const _tao_nexceptions = 2;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
-  POA_ImplementationRepository::Administration * const _tao_impl =
+  TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+  POA_ImplementationRepository::Administration *_tao_impl =
     static_cast<
         POA_ImplementationRepository::Administration *> (
         _tao_servant
       );
+  _tao_server_request.argument_flag (0);
   
-  TAO::SArg_Traits< void>::ret_val _tao_retval;
-  TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_server;
+  ::CORBA::String_var server;
   
-  TAO::Argument * const _tao_args [] =
+  if (!(
+      (_tao_in >> server.out ())
+      ))
     {
-      &_tao_retval,
-      &_tao_server
-    };
-  
-  static size_t const _tao_nargs = 2;
-  
-  TAO_ImplementationRepository_Administration_activate_server_Upcall_Command _tao_upcall_command (
-      _tao_impl, _tao_args);
-  
-  TAO::Upcall_Wrapper _tao_upcall_wrapper;
-  _tao_upcall_wrapper.upcall (_tao_server_request
-                              , _tao_args
-                              , _tao_nargs
-                              , _tao_upcall_command
-  
-#if TAO_HAS_INTERCEPTORS == 1
-                              , _tao_servant_upcall
-                              , _tao_impl
-                              , _tao_exceptions
-                              , _tao_nexceptions
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
-  
-                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:165
-
-void POA_ImplementationRepository::Administration::activate_server_with_startup_skel (
-    TAO_ServerRequest &_tao_server_request,
-    void *_tao_servant,
-    void * TAO_INTERCEPTOR (_tao_servant_upcall)
-    ACE_ENV_ARG_DECL
-  )
-{
-  
-  
-#if TAO_HAS_INTERCEPTORS == 1
-  static CORBA::TypeCode_ptr const _tao_exceptions[] = 
-    {
-      ImplementationRepository::_tc_NotFound,
-      ImplementationRepository::_tc_CannotActivate
-    };
-  static size_t const _tao_nexceptions = 2;
-#endif /* TAO_HAS_INTERCEPTORS */
+      TAO_InputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK;
+    }
   
-  POA_ImplementationRepository::Administration * const _tao_impl =
+#if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
     static_cast<
-        POA_ImplementationRepository::Administration *> (
-        _tao_servant
+        TAO_Object_Adapter::Servant_Upcall *> (
+        _tao_servant_upcall
       );
+    
+  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
+      _tao_server_request.orb_core ()->server_request_interceptors (),
+      _tao_server_request.interceptor_count ()
+    );
   
-  TAO::SArg_Traits< ::CORBA::Char *>::ret_val _tao_retval;
-  TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_server;
-  TAO::SArg_Traits< CORBA::Long>::in_arg_val _tao_check_startup;
+  TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server _tao_ri (
+      _tao_server_request,
+      _tao_upcall,
+      _tao_impl,
+      
+      server.in ()
+      ACE_ENV_ARG_PARAMETER
+    );
   
-  TAO::Argument * const _tao_args [] =
+  ACE_TRY
     {
-      &_tao_retval,
-      &_tao_server,
-      &_tao_check_startup
-    };
-  
-  static size_t const _tao_nargs = 3;
-  
-  TAO_ImplementationRepository_Administration_activate_server_with_startup_Upcall_Command _tao_upcall_command (
-      _tao_impl, _tao_args);
-  
-  TAO::Upcall_Wrapper _tao_upcall_wrapper;
-  _tao_upcall_wrapper.upcall (_tao_server_request
-                              , _tao_args
-                              , _tao_nargs
-                              , _tao_upcall_command
-  
-#if TAO_HAS_INTERCEPTORS == 1
-                              , _tao_servant_upcall
-                              , _tao_impl
-                              , _tao_exceptions
-                              , _tao_nexceptions
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
+      {
+        TAO::PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (),
+                                            true  /* Copy TSC to RSC */);
+        
+        _tao_vfr.receive_request (&_tao_ri ACE_ENV_ARG_PARAMETER);
+        ACE_TRY_CHECK;
+        
+        if (!_tao_vfr.location_forwarded ())
+          {
+#endif /* TAO_HAS_INTERCEPTORS */
+            
+              _tao_impl->activate_server (
+                  server.in ()
+                  ACE_ENV_ARG_PARAMETER
+                );
+            TAO_INTERCEPTOR_CHECK;
+#if (TAO_HAS_INTERCEPTORS == 1)
+          }
+      }
+      
+      if (!_tao_vfr.location_forwarded ())
+        {
+          _tao_ri.reply_status (PortableInterceptor::SUCCESSFUL);
+          _tao_vfr.send_reply (&_tao_ri ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+        }
+    }
+  ACE_CATCHANY
+    {
+      _tao_ri.exception (&ACE_ANY_EXCEPTION);
+      _tao_vfr.send_exception (
+          &_tao_ri
+          ACE_ENV_ARG_PARAMETER
+        );
+      ACE_TRY_CHECK;
+      
+      PortableInterceptor::ReplyStatus _tao_status =
+        _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+      
+      if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+          || _tao_status == PortableInterceptor::USER_EXCEPTION)
+        {
+          ACE_RE_THROW;
+        }
+    }
   
-                              ACE_ENV_ARG_PARAMETER);
+# if defined (ACE_HAS_EXCEPTIONS) \
+  && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
+  ACE_CATCHALL
+    {
+      CORBA::UNKNOWN ex;
+      
+      _tao_ri.exception (&ex);
+      _tao_vfr.send_exception (
+          &_tao_ri
+          ACE_ENV_ARG_PARAMETER
+        );
+      ACE_TRY_CHECK;
+      
+      PortableInterceptor::ReplyStatus _tao_status =
+        _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+      
+      if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
+        ACE_TRY_THROW (ex);
+    }
+# endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
+  ACE_ENDTRY;
   ACE_CHECK;
+#endif /* TAO_HAS_INTERCEPTORS */
   
+  _tao_server_request.init_reply ();
+  
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:165
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_ImplementationRepository::Administration::register_server_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_servant,
-    void * TAO_INTERCEPTOR (_tao_servant_upcall)
+    void *_tao_servant_upcall
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
-#if TAO_HAS_INTERCEPTORS == 1
-  static CORBA::TypeCode_ptr const _tao_exceptions[] = 
-    {
-      ImplementationRepository::_tc_AlreadyRegistered,
-      ImplementationRepository::_tc_NotFound
-    };
-  static size_t const _tao_nexceptions = 2;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
-  POA_ImplementationRepository::Administration * const _tao_impl =
+  TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+  POA_ImplementationRepository::Administration *_tao_impl =
     static_cast<
         POA_ImplementationRepository::Administration *> (
         _tao_servant
       );
+  _tao_server_request.argument_flag (0);
   
-  TAO::SArg_Traits< void>::ret_val _tao_retval;
-  TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_server;
-  TAO::SArg_Traits< ::ImplementationRepository::StartupOptions>::in_arg_val _tao_options;
+  ::CORBA::String_var server;
+  ::ImplementationRepository::StartupOptions options;
   
-  TAO::Argument * const _tao_args [] =
+  if (!(
+      (_tao_in >> server.out ()) &&
+      (_tao_in >> options)
+      ))
     {
-      &_tao_retval,
-      &_tao_server,
-      &_tao_options
-    };
-  
-  static size_t const _tao_nargs = 3;
+      TAO_InputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK;
+    }
   
-  TAO_ImplementationRepository_Administration_register_server_Upcall_Command _tao_upcall_command (
-      _tao_impl, _tao_args);
+#if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
+        _tao_servant_upcall
+      );
+    
+  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
+      _tao_server_request.orb_core ()->server_request_interceptors (),
+      _tao_server_request.interceptor_count ()
+    );
   
-  TAO::Upcall_Wrapper _tao_upcall_wrapper;
-  _tao_upcall_wrapper.upcall (_tao_server_request
-                              , _tao_args
-                              , _tao_nargs
-                              , _tao_upcall_command
+  TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server _tao_ri (
+      _tao_server_request,
+      _tao_upcall,
+      _tao_impl,
+      
+      server.in (),
+      
+      options
+      ACE_ENV_ARG_PARAMETER
+    );
   
-#if TAO_HAS_INTERCEPTORS == 1
-                              , _tao_servant_upcall
-                              , _tao_impl
-                              , _tao_exceptions
-                              , _tao_nexceptions
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
+  ACE_TRY
+    {
+      {
+        TAO::PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (),
+                                            true  /* Copy TSC to RSC */);
+        
+        _tao_vfr.receive_request (&_tao_ri ACE_ENV_ARG_PARAMETER);
+        ACE_TRY_CHECK;
+        
+        if (!_tao_vfr.location_forwarded ())
+          {
+#endif /* TAO_HAS_INTERCEPTORS */
+            
+              _tao_impl->register_server (
+                  server.in (),
+                  
+                  options
+                  ACE_ENV_ARG_PARAMETER
+                );
+            TAO_INTERCEPTOR_CHECK;
+#if (TAO_HAS_INTERCEPTORS == 1)
+          }
+      }
+      
+      if (!_tao_vfr.location_forwarded ())
+        {
+          _tao_ri.reply_status (PortableInterceptor::SUCCESSFUL);
+          _tao_vfr.send_reply (&_tao_ri ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+        }
+    }
+  ACE_CATCHANY
+    {
+      _tao_ri.exception (&ACE_ANY_EXCEPTION);
+      _tao_vfr.send_exception (
+          &_tao_ri
+          ACE_ENV_ARG_PARAMETER
+        );
+      ACE_TRY_CHECK;
+      
+      PortableInterceptor::ReplyStatus _tao_status =
+        _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+      
+      if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+          || _tao_status == PortableInterceptor::USER_EXCEPTION)
+        {
+          ACE_RE_THROW;
+        }
+    }
   
-                              ACE_ENV_ARG_PARAMETER);
+# if defined (ACE_HAS_EXCEPTIONS) \
+  && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
+  ACE_CATCHALL
+    {
+      CORBA::UNKNOWN ex;
+      
+      _tao_ri.exception (&ex);
+      _tao_vfr.send_exception (
+          &_tao_ri
+          ACE_ENV_ARG_PARAMETER
+        );
+      ACE_TRY_CHECK;
+      
+      PortableInterceptor::ReplyStatus _tao_status =
+        _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+      
+      if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
+        ACE_TRY_THROW (ex);
+    }
+# endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
+  ACE_ENDTRY;
   ACE_CHECK;
+#endif /* TAO_HAS_INTERCEPTORS */
   
+  _tao_server_request.init_reply ();
+  
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:165
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_ImplementationRepository::Administration::reregister_server_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_servant,
-    void * TAO_INTERCEPTOR (_tao_servant_upcall)
+    void *_tao_servant_upcall
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
-#if TAO_HAS_INTERCEPTORS == 1
-  static CORBA::TypeCode_ptr const _tao_exceptions[] = 
-    {
-      ImplementationRepository::_tc_AlreadyRegistered,
-      ImplementationRepository::_tc_NotFound
-    };
-  static size_t const _tao_nexceptions = 2;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
-  POA_ImplementationRepository::Administration * const _tao_impl =
+  TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+  POA_ImplementationRepository::Administration *_tao_impl =
     static_cast<
         POA_ImplementationRepository::Administration *> (
         _tao_servant
       );
+  _tao_server_request.argument_flag (0);
   
-  TAO::SArg_Traits< void>::ret_val _tao_retval;
-  TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_server;
-  TAO::SArg_Traits< ::ImplementationRepository::StartupOptions>::in_arg_val _tao_options;
+  ::CORBA::String_var server;
+  ::ImplementationRepository::StartupOptions options;
   
-  TAO::Argument * const _tao_args [] =
+  if (!(
+      (_tao_in >> server.out ()) &&
+      (_tao_in >> options)
+      ))
     {
-      &_tao_retval,
-      &_tao_server,
-      &_tao_options
-    };
-  
-  static size_t const _tao_nargs = 3;
+      TAO_InputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK;
+    }
   
-  TAO_ImplementationRepository_Administration_reregister_server_Upcall_Command _tao_upcall_command (
-      _tao_impl, _tao_args);
+#if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
+        _tao_servant_upcall
+      );
+    
+  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
+      _tao_server_request.orb_core ()->server_request_interceptors (),
+      _tao_server_request.interceptor_count ()
+    );
   
-  TAO::Upcall_Wrapper _tao_upcall_wrapper;
-  _tao_upcall_wrapper.upcall (_tao_server_request
-                              , _tao_args
-                              , _tao_nargs
-                              , _tao_upcall_command
+  TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server _tao_ri (
+      _tao_server_request,
+      _tao_upcall,
+      _tao_impl,
+      
+      server.in (),
+      
+      options
+      ACE_ENV_ARG_PARAMETER
+    );
   
-#if TAO_HAS_INTERCEPTORS == 1
-                              , _tao_servant_upcall
-                              , _tao_impl
-                              , _tao_exceptions
-                              , _tao_nexceptions
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
+  ACE_TRY
+    {
+      {
+        TAO::PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (),
+                                            true  /* Copy TSC to RSC */);
+        
+        _tao_vfr.receive_request (&_tao_ri ACE_ENV_ARG_PARAMETER);
+        ACE_TRY_CHECK;
+        
+        if (!_tao_vfr.location_forwarded ())
+          {
+#endif /* TAO_HAS_INTERCEPTORS */
+            
+              _tao_impl->reregister_server (
+                  server.in (),
+                  
+                  options
+                  ACE_ENV_ARG_PARAMETER
+                );
+            TAO_INTERCEPTOR_CHECK;
+#if (TAO_HAS_INTERCEPTORS == 1)
+          }
+      }
+      
+      if (!_tao_vfr.location_forwarded ())
+        {
+          _tao_ri.reply_status (PortableInterceptor::SUCCESSFUL);
+          _tao_vfr.send_reply (&_tao_ri ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+        }
+    }
+  ACE_CATCHANY
+    {
+      _tao_ri.exception (&ACE_ANY_EXCEPTION);
+      _tao_vfr.send_exception (
+          &_tao_ri
+          ACE_ENV_ARG_PARAMETER
+        );
+      ACE_TRY_CHECK;
+      
+      PortableInterceptor::ReplyStatus _tao_status =
+        _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+      
+      if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+          || _tao_status == PortableInterceptor::USER_EXCEPTION)
+        {
+          ACE_RE_THROW;
+        }
+    }
   
-                              ACE_ENV_ARG_PARAMETER);
+# if defined (ACE_HAS_EXCEPTIONS) \
+  && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
+  ACE_CATCHALL
+    {
+      CORBA::UNKNOWN ex;
+      
+      _tao_ri.exception (&ex);
+      _tao_vfr.send_exception (
+          &_tao_ri
+          ACE_ENV_ARG_PARAMETER
+        );
+      ACE_TRY_CHECK;
+      
+      PortableInterceptor::ReplyStatus _tao_status =
+        _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+      
+      if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
+        ACE_TRY_THROW (ex);
+    }
+# endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
+  ACE_ENDTRY;
   ACE_CHECK;
+#endif /* TAO_HAS_INTERCEPTORS */
+  
+  _tao_server_request.init_reply ();
   
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:165
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_ImplementationRepository::Administration::remove_server_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_servant,
-    void * TAO_INTERCEPTOR (_tao_servant_upcall)
+    void *_tao_servant_upcall
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
-#if TAO_HAS_INTERCEPTORS == 1
-  static CORBA::TypeCode_ptr const _tao_exceptions[] = 
-    {
-      ImplementationRepository::_tc_NotFound
-    };
-  static size_t const _tao_nexceptions = 1;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
-  POA_ImplementationRepository::Administration * const _tao_impl =
+  TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+  POA_ImplementationRepository::Administration *_tao_impl =
     static_cast<
         POA_ImplementationRepository::Administration *> (
         _tao_servant
       );
+  _tao_server_request.argument_flag (0);
   
-  TAO::SArg_Traits< void>::ret_val _tao_retval;
-  TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_server;
+  ::CORBA::String_var server;
   
-  TAO::Argument * const _tao_args [] =
+  if (!(
+      (_tao_in >> server.out ())
+      ))
     {
-      &_tao_retval,
-      &_tao_server
-    };
-  
-  static size_t const _tao_nargs = 2;
+      TAO_InputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK;
+    }
   
-  TAO_ImplementationRepository_Administration_remove_server_Upcall_Command _tao_upcall_command (
-      _tao_impl, _tao_args);
+#if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
+        _tao_servant_upcall
+      );
+    
+  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
+      _tao_server_request.orb_core ()->server_request_interceptors (),
+      _tao_server_request.interceptor_count ()
+    );
   
-  TAO::Upcall_Wrapper _tao_upcall_wrapper;
-  _tao_upcall_wrapper.upcall (_tao_server_request
-                              , _tao_args
-                              , _tao_nargs
-                              , _tao_upcall_command
+  TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server _tao_ri (
+      _tao_server_request,
+      _tao_upcall,
+      _tao_impl,
+      
+      server.in ()
+      ACE_ENV_ARG_PARAMETER
+    );
   
-#if TAO_HAS_INTERCEPTORS == 1
-                              , _tao_servant_upcall
-                              , _tao_impl
-                              , _tao_exceptions
-                              , _tao_nexceptions
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
+  ACE_TRY
+    {
+      {
+        TAO::PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (),
+                                            true  /* Copy TSC to RSC */);
+        
+        _tao_vfr.receive_request (&_tao_ri ACE_ENV_ARG_PARAMETER);
+        ACE_TRY_CHECK;
+        
+        if (!_tao_vfr.location_forwarded ())
+          {
+#endif /* TAO_HAS_INTERCEPTORS */
+            
+              _tao_impl->remove_server (
+                  server.in ()
+                  ACE_ENV_ARG_PARAMETER
+                );
+            TAO_INTERCEPTOR_CHECK;
+#if (TAO_HAS_INTERCEPTORS == 1)
+          }
+      }
+      
+      if (!_tao_vfr.location_forwarded ())
+        {
+          _tao_ri.reply_status (PortableInterceptor::SUCCESSFUL);
+          _tao_vfr.send_reply (&_tao_ri ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+        }
+    }
+  ACE_CATCHANY
+    {
+      _tao_ri.exception (&ACE_ANY_EXCEPTION);
+      _tao_vfr.send_exception (
+          &_tao_ri
+          ACE_ENV_ARG_PARAMETER
+        );
+      ACE_TRY_CHECK;
+      
+      PortableInterceptor::ReplyStatus _tao_status =
+        _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+      
+      if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+          || _tao_status == PortableInterceptor::USER_EXCEPTION)
+        {
+          ACE_RE_THROW;
+        }
+    }
   
-                              ACE_ENV_ARG_PARAMETER);
+# if defined (ACE_HAS_EXCEPTIONS) \
+  && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
+  ACE_CATCHALL
+    {
+      CORBA::UNKNOWN ex;
+      
+      _tao_ri.exception (&ex);
+      _tao_vfr.send_exception (
+          &_tao_ri
+          ACE_ENV_ARG_PARAMETER
+        );
+      ACE_TRY_CHECK;
+      
+      PortableInterceptor::ReplyStatus _tao_status =
+        _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+      
+      if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
+        ACE_TRY_THROW (ex);
+    }
+# endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
+  ACE_ENDTRY;
   ACE_CHECK;
+#endif /* TAO_HAS_INTERCEPTORS */
   
+  _tao_server_request.init_reply ();
+  
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:165
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_ImplementationRepository::Administration::shutdown_server_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_servant,
-    void * TAO_INTERCEPTOR (_tao_servant_upcall)
+    void *_tao_servant_upcall
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
-#if TAO_HAS_INTERCEPTORS == 1
-  static CORBA::TypeCode_ptr const _tao_exceptions[] = 
-    {
-      ImplementationRepository::_tc_NotFound
-    };
-  static size_t const _tao_nexceptions = 1;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
-  POA_ImplementationRepository::Administration * const _tao_impl =
+  TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+  POA_ImplementationRepository::Administration *_tao_impl =
     static_cast<
         POA_ImplementationRepository::Administration *> (
         _tao_servant
       );
+  _tao_server_request.argument_flag (0);
   
-  TAO::SArg_Traits< void>::ret_val _tao_retval;
-  TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_server;
+  ::CORBA::String_var server;
   
-  TAO::Argument * const _tao_args [] =
+  if (!(
+      (_tao_in >> server.out ())
+      ))
     {
-      &_tao_retval,
-      &_tao_server
-    };
-  
-  static size_t const _tao_nargs = 2;
-  
-  TAO_ImplementationRepository_Administration_shutdown_server_Upcall_Command _tao_upcall_command (
-      _tao_impl, _tao_args);
-  
-  TAO::Upcall_Wrapper _tao_upcall_wrapper;
-  _tao_upcall_wrapper.upcall (_tao_server_request
-                              , _tao_args
-                              , _tao_nargs
-                              , _tao_upcall_command
-  
-#if TAO_HAS_INTERCEPTORS == 1
-                              , _tao_servant_upcall
-                              , _tao_impl
-                              , _tao_exceptions
-                              , _tao_nexceptions
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
-  
-                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:165
-
-void POA_ImplementationRepository::Administration::server_is_running_skel (
-    TAO_ServerRequest &_tao_server_request,
-    void *_tao_servant,
-    void * TAO_INTERCEPTOR (_tao_servant_upcall)
-    ACE_ENV_ARG_DECL
-  )
-{
-  
-  
-#if TAO_HAS_INTERCEPTORS == 1
-  static CORBA::TypeCode_ptr const _tao_exceptions[] = 
-    {
-      ImplementationRepository::_tc_NotFound
-    };
-  static size_t const _tao_nexceptions = 1;
-#endif /* TAO_HAS_INTERCEPTORS */
+      TAO_InputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK;
+    }
   
-  POA_ImplementationRepository::Administration * const _tao_impl =
+#if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
     static_cast<
-        POA_ImplementationRepository::Administration *> (
-        _tao_servant
+        TAO_Object_Adapter::Servant_Upcall *> (
+        _tao_servant_upcall
       );
+    
+  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
+      _tao_server_request.orb_core ()->server_request_interceptors (),
+      _tao_server_request.interceptor_count ()
+    );
   
-  TAO::SArg_Traits< void>::ret_val _tao_retval;
-  TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_server;
-  TAO::SArg_Traits< ::ImplementationRepository::Address>::in_arg_val _tao_addr;
-  TAO::SArg_Traits< ::ImplementationRepository::ServerObject>::in_arg_val _tao_server_object;
+  TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server _tao_ri (
+      _tao_server_request,
+      _tao_upcall,
+      _tao_impl,
+      
+      server.in ()
+      ACE_ENV_ARG_PARAMETER
+    );
   
-  TAO::Argument * const _tao_args [] =
+  ACE_TRY
     {
-      &_tao_retval,
-      &_tao_server,
-      &_tao_addr,
-      &_tao_server_object
-    };
-  
-  static size_t const _tao_nargs = 4;
-  
-  TAO_ImplementationRepository_Administration_server_is_running_Upcall_Command _tao_upcall_command (
-      _tao_impl, _tao_args);
-  
-  TAO::Upcall_Wrapper _tao_upcall_wrapper;
-  _tao_upcall_wrapper.upcall (_tao_server_request
-                              , _tao_args
-                              , _tao_nargs
-                              , _tao_upcall_command
-  
-#if TAO_HAS_INTERCEPTORS == 1
-                              , _tao_servant_upcall
-                              , _tao_impl
-                              , _tao_exceptions
-                              , _tao_nexceptions
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
+      {
+        TAO::PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (),
+                                            true  /* Copy TSC to RSC */);
+        
+        _tao_vfr.receive_request (&_tao_ri ACE_ENV_ARG_PARAMETER);
+        ACE_TRY_CHECK;
+        
+        if (!_tao_vfr.location_forwarded ())
+          {
+#endif /* TAO_HAS_INTERCEPTORS */
+            
+              _tao_impl->shutdown_server (
+                  server.in ()
+                  ACE_ENV_ARG_PARAMETER
+                );
+            TAO_INTERCEPTOR_CHECK;
+#if (TAO_HAS_INTERCEPTORS == 1)
+          }
+      }
+      
+      if (!_tao_vfr.location_forwarded ())
+        {
+          _tao_ri.reply_status (PortableInterceptor::SUCCESSFUL);
+          _tao_vfr.send_reply (&_tao_ri ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+        }
+    }
+  ACE_CATCHANY
+    {
+      _tao_ri.exception (&ACE_ANY_EXCEPTION);
+      _tao_vfr.send_exception (
+          &_tao_ri
+          ACE_ENV_ARG_PARAMETER
+        );
+      ACE_TRY_CHECK;
+      
+      PortableInterceptor::ReplyStatus _tao_status =
+        _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+      
+      if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+          || _tao_status == PortableInterceptor::USER_EXCEPTION)
+        {
+          ACE_RE_THROW;
+        }
+    }
   
-                              ACE_ENV_ARG_PARAMETER);
+# if defined (ACE_HAS_EXCEPTIONS) \
+  && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
+  ACE_CATCHALL
+    {
+      CORBA::UNKNOWN ex;
+      
+      _tao_ri.exception (&ex);
+      _tao_vfr.send_exception (
+          &_tao_ri
+          ACE_ENV_ARG_PARAMETER
+        );
+      ACE_TRY_CHECK;
+      
+      PortableInterceptor::ReplyStatus _tao_status =
+        _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+      
+      if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
+        ACE_TRY_THROW (ex);
+    }
+# endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
+  ACE_ENDTRY;
   ACE_CHECK;
+#endif /* TAO_HAS_INTERCEPTORS */
+  
+  _tao_server_request.init_reply ();
   
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:165
+// be\be_visitor_operation/operation_ss.cpp:98
 
-void POA_ImplementationRepository::Administration::server_is_shutting_down_skel (
+void POA_ImplementationRepository::Administration::server_is_running_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_servant,
-    void * TAO_INTERCEPTOR (_tao_servant_upcall)
+    void *_tao_servant_upcall
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
-#if TAO_HAS_INTERCEPTORS == 1
-  static CORBA::TypeCode_ptr const _tao_exceptions[] = 
-    {
-      ImplementationRepository::_tc_NotFound
-    };
-  static size_t const _tao_nexceptions = 1;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
-  POA_ImplementationRepository::Administration * const _tao_impl =
+  TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+  POA_ImplementationRepository::Administration *_tao_impl =
     static_cast<
         POA_ImplementationRepository::Administration *> (
         _tao_servant
       );
+  _tao_server_request.argument_flag (0);
   
-  TAO::SArg_Traits< void>::ret_val _tao_retval;
-  TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_server;
+  ::CORBA::String_var server;
+  ::CORBA::String_var partial_ior;
+  ::ImplementationRepository::ServerObject_var server_object;
   
-  TAO::Argument * const _tao_args [] =
+  if (!(
+      (_tao_in >> server.out ()) &&
+      (_tao_in >> partial_ior.out ()) &&
+      (_tao_in >> server_object.out ())
+      ))
     {
-      &_tao_retval,
-      &_tao_server
-    };
-  
-  static size_t const _tao_nargs = 2;
-  
-  TAO_ImplementationRepository_Administration_server_is_shutting_down_Upcall_Command _tao_upcall_command (
-      _tao_impl, _tao_args);
-  
-  TAO::Upcall_Wrapper _tao_upcall_wrapper;
-  _tao_upcall_wrapper.upcall (_tao_server_request
-                              , _tao_args
-                              , _tao_nargs
-                              , _tao_upcall_command
-  
-#if TAO_HAS_INTERCEPTORS == 1
-                              , _tao_servant_upcall
-                              , _tao_impl
-                              , _tao_exceptions
-                              , _tao_nexceptions
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
-  
-                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:165
-
-void POA_ImplementationRepository::Administration::find_skel (
-    TAO_ServerRequest &_tao_server_request,
-    void *_tao_servant,
-    void * TAO_INTERCEPTOR (_tao_servant_upcall)
-    ACE_ENV_ARG_DECL
-  )
-{
-  
-  
-#if TAO_HAS_INTERCEPTORS == 1
-  static CORBA::TypeCode_ptr const _tao_exceptions[] = 
-    {
-      ImplementationRepository::_tc_NotFound
-    };
-  static size_t const _tao_nexceptions = 1;
-#endif /* TAO_HAS_INTERCEPTORS */
+      TAO_InputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK;
+    }
   
-  POA_ImplementationRepository::Administration * const _tao_impl =
+#if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
     static_cast<
-        POA_ImplementationRepository::Administration *> (
-        _tao_servant
+        TAO_Object_Adapter::Servant_Upcall *> (
+        _tao_servant_upcall
       );
+    
+  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
+      _tao_server_request.orb_core ()->server_request_interceptors (),
+      _tao_server_request.interceptor_count ()
+    );
   
-  TAO::SArg_Traits< void>::ret_val _tao_retval;
-  TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_server;
-  TAO::SArg_Traits< ::ImplementationRepository::ServerInformation>::out_arg_val _tao_info;
+  TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running _tao_ri (
+      _tao_server_request,
+      _tao_upcall,
+      _tao_impl,
+      
+      server.in (),
+      
+      partial_ior.in (),
+      
+      server_object.in ()
+      ACE_ENV_ARG_PARAMETER
+    );
   
-  TAO::Argument * const _tao_args [] =
+  ACE_TRY
     {
-      &_tao_retval,
-      &_tao_server,
-      &_tao_info
-    };
-  
-  static size_t const _tao_nargs = 3;
-  
-  TAO_ImplementationRepository_Administration_find_Upcall_Command _tao_upcall_command (
-      _tao_impl, _tao_args);
-  
-  TAO::Upcall_Wrapper _tao_upcall_wrapper;
-  _tao_upcall_wrapper.upcall (_tao_server_request
-                              , _tao_args
-                              , _tao_nargs
-                              , _tao_upcall_command
-  
-#if TAO_HAS_INTERCEPTORS == 1
-                              , _tao_servant_upcall
-                              , _tao_impl
-                              , _tao_exceptions
-                              , _tao_nexceptions
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
+      {
+        TAO::PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (),
+                                            true  /* Copy TSC to RSC */);
+        
+        _tao_vfr.receive_request (&_tao_ri ACE_ENV_ARG_PARAMETER);
+        ACE_TRY_CHECK;
+        
+        if (!_tao_vfr.location_forwarded ())
+          {
+#endif /* TAO_HAS_INTERCEPTORS */
+            
+              _tao_impl->server_is_running (
+                  server.in (),
+                  
+                  partial_ior.in (),
+                  
+                  server_object.in ()
+                  ACE_ENV_ARG_PARAMETER
+                );
+            TAO_INTERCEPTOR_CHECK;
+#if (TAO_HAS_INTERCEPTORS == 1)
+          }
+      }
+      
+      if (!_tao_vfr.location_forwarded ())
+        {
+          _tao_ri.reply_status (PortableInterceptor::SUCCESSFUL);
+          _tao_vfr.send_reply (&_tao_ri ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+        }
+    }
+  ACE_CATCHANY
+    {
+      _tao_ri.exception (&ACE_ANY_EXCEPTION);
+      _tao_vfr.send_exception (
+          &_tao_ri
+          ACE_ENV_ARG_PARAMETER
+        );
+      ACE_TRY_CHECK;
+      
+      PortableInterceptor::ReplyStatus _tao_status =
+        _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+      
+      if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+          || _tao_status == PortableInterceptor::USER_EXCEPTION)
+        {
+          ACE_RE_THROW;
+        }
+    }
   
-                              ACE_ENV_ARG_PARAMETER);
+# if defined (ACE_HAS_EXCEPTIONS) \
+  && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
+  ACE_CATCHALL
+    {
+      CORBA::UNKNOWN ex;
+      
+      _tao_ri.exception (&ex);
+      _tao_vfr.send_exception (
+          &_tao_ri
+          ACE_ENV_ARG_PARAMETER
+        );
+      ACE_TRY_CHECK;
+      
+      PortableInterceptor::ReplyStatus _tao_status =
+        _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+      
+      if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
+        ACE_TRY_THROW (ex);
+    }
+# endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
+  ACE_ENDTRY;
   ACE_CHECK;
+#endif /* TAO_HAS_INTERCEPTORS */
   
+  _tao_server_request.init_reply ();
+  
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:165
+// be\be_visitor_operation/operation_ss.cpp:98
 
-void POA_ImplementationRepository::Administration::list_skel (
+void POA_ImplementationRepository::Administration::server_is_shutting_down_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_servant,
-    void * TAO_INTERCEPTOR (_tao_servant_upcall)
+    void *_tao_servant_upcall
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
-#if TAO_HAS_INTERCEPTORS == 1
-  static CORBA::TypeCode_ptr const _tao_exceptions[] = {};
-  static size_t const _tao_nexceptions = 0;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
-  POA_ImplementationRepository::Administration * const _tao_impl =
+  TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+  POA_ImplementationRepository::Administration *_tao_impl =
     static_cast<
         POA_ImplementationRepository::Administration *> (
         _tao_servant
       );
+  _tao_server_request.argument_flag (0);
   
-  TAO::SArg_Traits< void>::ret_val _tao_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;
+  ::CORBA::String_var server;
   
-  TAO::Argument * const _tao_args [] =
+  if (!(
+      (_tao_in >> server.out ())
+      ))
     {
-      &_tao_retval,
-      &_tao_how_many,
-      &_tao_server_list,
-      &_tao_server_iterator
-    };
-  
-  static size_t const _tao_nargs = 4;
-  
-  TAO_ImplementationRepository_Administration_list_Upcall_Command _tao_upcall_command (
-      _tao_impl, _tao_args);
-  
-  TAO::Upcall_Wrapper _tao_upcall_wrapper;
-  _tao_upcall_wrapper.upcall (_tao_server_request
-                              , _tao_args
-                              , _tao_nargs
-                              , _tao_upcall_command
-  
-#if TAO_HAS_INTERCEPTORS == 1
-                              , _tao_servant_upcall
-                              , _tao_impl
-                              , _tao_exceptions
-                              , _tao_nexceptions
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
-  
-                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:165
-
-void POA_ImplementationRepository::Administration::shutdown_repo_skel (
-    TAO_ServerRequest &_tao_server_request,
-    void *_tao_servant,
-    void * TAO_INTERCEPTOR (_tao_servant_upcall)
-    ACE_ENV_ARG_DECL
-  )
-{
-  
-  
-#if TAO_HAS_INTERCEPTORS == 1
-  static CORBA::TypeCode_ptr const _tao_exceptions[] = {};
-  static size_t const _tao_nexceptions = 0;
-#endif /* TAO_HAS_INTERCEPTORS */
+      TAO_InputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK;
+    }
   
-  POA_ImplementationRepository::Administration * const _tao_impl =
+#if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
     static_cast<
-        POA_ImplementationRepository::Administration *> (
-        _tao_servant
+        TAO_Object_Adapter::Servant_Upcall *> (
+        _tao_servant_upcall
       );
+    
+  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
+      _tao_server_request.orb_core ()->server_request_interceptors (),
+      _tao_server_request.interceptor_count ()
+    );
   
-  TAO::SArg_Traits< void>::ret_val _tao_retval;
+  TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting_down _tao_ri (
+      _tao_server_request,
+      _tao_upcall,
+      _tao_impl,
+      
+      server.in ()
+      ACE_ENV_ARG_PARAMETER
+    );
   
-  TAO::Argument * const _tao_args [] =
+  ACE_TRY
     {
-      &_tao_retval
-    };
-  
-  static size_t const _tao_nargs = 1;
-  
-  TAO_ImplementationRepository_Administration_shutdown_repo_Upcall_Command _tao_upcall_command (
-      _tao_impl);
-  
-  TAO::Upcall_Wrapper _tao_upcall_wrapper;
-  _tao_upcall_wrapper.upcall (_tao_server_request
-                              , _tao_args
-                              , _tao_nargs
-                              , _tao_upcall_command
-  
-#if TAO_HAS_INTERCEPTORS == 1
-                              , _tao_servant_upcall
-                              , _tao_impl
-                              , _tao_exceptions
-                              , _tao_nexceptions
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
+      {
+        TAO::PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (),
+                                            true  /* Copy TSC to RSC */);
+        
+        _tao_vfr.receive_request (&_tao_ri ACE_ENV_ARG_PARAMETER);
+        ACE_TRY_CHECK;
+        
+        if (!_tao_vfr.location_forwarded ())
+          {
+#endif /* TAO_HAS_INTERCEPTORS */
+            
+              _tao_impl->server_is_shutting_down (
+                  server.in ()
+                  ACE_ENV_ARG_PARAMETER
+                );
+            TAO_INTERCEPTOR_CHECK;
+#if (TAO_HAS_INTERCEPTORS == 1)
+          }
+      }
+      
+      if (!_tao_vfr.location_forwarded ())
+        {
+          _tao_ri.reply_status (PortableInterceptor::SUCCESSFUL);
+          _tao_vfr.send_reply (&_tao_ri ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+        }
+    }
+  ACE_CATCHANY
+    {
+      _tao_ri.exception (&ACE_ANY_EXCEPTION);
+      _tao_vfr.send_exception (
+          &_tao_ri
+          ACE_ENV_ARG_PARAMETER
+        );
+      ACE_TRY_CHECK;
+      
+      PortableInterceptor::ReplyStatus _tao_status =
+        _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+      
+      if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+          || _tao_status == PortableInterceptor::USER_EXCEPTION)
+        {
+          ACE_RE_THROW;
+        }
+    }
   
-                              ACE_ENV_ARG_PARAMETER);
+# if defined (ACE_HAS_EXCEPTIONS) \
+  && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
+  ACE_CATCHALL
+    {
+      CORBA::UNKNOWN ex;
+      
+      _tao_ri.exception (&ex);
+      _tao_vfr.send_exception (
+          &_tao_ri
+          ACE_ENV_ARG_PARAMETER
+        );
+      ACE_TRY_CHECK;
+      
+      PortableInterceptor::ReplyStatus _tao_status =
+        _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+      
+      if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
+        ACE_TRY_THROW (ex);
+    }
+# endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
+  ACE_ENDTRY;
   ACE_CHECK;
+#endif /* TAO_HAS_INTERCEPTORS */
   
+  _tao_server_request.init_reply ();
+  
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:165
+// be\be_visitor_operation/operation_ss.cpp:98
 
-void POA_ImplementationRepository::Administration::find_ior_skel (
+void POA_ImplementationRepository::Administration::find_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_servant,
-    void * TAO_INTERCEPTOR (_tao_servant_upcall)
+    void *_tao_servant_upcall
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
-#if TAO_HAS_INTERCEPTORS == 1
-  static CORBA::TypeCode_ptr const _tao_exceptions[] = 
-    {
-      ImplementationRepository::_tc_NotFound
-    };
-  static size_t const _tao_nexceptions = 1;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
-  POA_ImplementationRepository::Administration * const _tao_impl =
+  TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+  POA_ImplementationRepository::Administration *_tao_impl =
     static_cast<
         POA_ImplementationRepository::Administration *> (
         _tao_servant
       );
   
-  TAO::SArg_Traits< ::CORBA::Char *>::ret_val _tao_retval;
-  TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_object_name;
+  ::CORBA::String_var server;
+  ::ImplementationRepository::ServerInformation_var info;
   
-  TAO::Argument * const _tao_args [] =
+  if (!(
+      (_tao_in >> server.out ())
+      ))
     {
-      &_tao_retval,
-      &_tao_object_name
-    };
-  
-  static size_t const _tao_nargs = 2;
-  
-  TAO_ImplementationRepository_Administration_find_ior_Upcall_Command _tao_upcall_command (
-      _tao_impl, _tao_args);
-  
-  TAO::Upcall_Wrapper _tao_upcall_wrapper;
-  _tao_upcall_wrapper.upcall (_tao_server_request
-                              , _tao_args
-                              , _tao_nargs
-                              , _tao_upcall_command
-  
-#if TAO_HAS_INTERCEPTORS == 1
-                              , _tao_servant_upcall
-                              , _tao_impl
-                              , _tao_exceptions
-                              , _tao_nexceptions
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
-  
-                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_ss.cpp:162
-
-void POA_ImplementationRepository::Administration::_is_a_skel (
-    TAO_ServerRequest &_tao_server_request, 
-    void * _tao_servant,
-    void * /* Servant_Upcall */
-    ACE_ENV_ARG_DECL
-  )
-{
-  TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-  
-  POA_ImplementationRepository::Administration *_tao_impl =
-    (POA_ImplementationRepository::Administration *) _tao_servant;
-  
-  CORBA::Boolean _tao_retval = 0;
-  CORBA::String_var value;
-  
-  if (!(_tao_in >> value.out ()))
-    {
-      ACE_THROW (CORBA::MARSHAL ());
-    }
-  
-  _tao_retval = _tao_impl->_is_a (value.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  
-  _tao_server_request.init_reply ();
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
-  if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
-    {
-      ACE_THROW (CORBA::MARSHAL ());
+      TAO_InputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK;
     }
-}
-
-void POA_ImplementationRepository::Administration::_non_existent_skel (
-    TAO_ServerRequest &_tao_server_request, 
-    void * _tao_servant,
-    void * /* Servant_Upcall */
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_ImplementationRepository::Administration *_tao_impl =
-    (POA_ImplementationRepository::Administration *) _tao_servant;
   
-  CORBA::Boolean _tao_retval =
-    _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+#if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
+        _tao_servant_upcall
+      );
+    
+  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
+      _tao_server_request.orb_core ()->server_request_interceptors (),
+      _tao_server_request.interceptor_count ()
+    );
   
-  _tao_server_request.init_reply ();
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+  TAO_ServerRequestInfo_ImplementationRepository_Administration_find _tao_ri (
+      _tao_server_request,
+      _tao_upcall,
+      _tao_impl,
+      
+      server.in ()
+      ACE_ENV_ARG_PARAMETER
+    );
   
-  if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
+  ACE_TRY
     {
-      ACE_THROW (CORBA::MARSHAL ());
+      {
+        TAO::PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (),
+                                            true  /* Copy TSC to RSC */);
+        
+        _tao_vfr.receive_request (&_tao_ri ACE_ENV_ARG_PARAMETER);
+        ACE_TRY_CHECK;
+        
+        if (!_tao_vfr.location_forwarded ())
+          {
+#endif /* TAO_HAS_INTERCEPTORS */
+            
+              _tao_impl->find (
+                  server.in (),
+                  
+                  info.out ()
+                  ACE_ENV_ARG_PARAMETER
+                );
+            TAO_INTERCEPTOR_CHECK;
+#if (TAO_HAS_INTERCEPTORS == 1)
+          }
+      }
+      
+      if (!_tao_vfr.location_forwarded ())
+        {
+          _tao_ri.reply_status (PortableInterceptor::SUCCESSFUL);
+          _tao_vfr.send_reply (&_tao_ri ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+        }
     }
-}
-
-void POA_ImplementationRepository::Administration::_interface_skel (
-    TAO_ServerRequest &_tao_server_request, 
-    void * _tao_servant,
-    void * /* Servant_Upcall */
-    ACE_ENV_ARG_DECL
-  )
-{
-  TAO_IFR_Client_Adapter *_tao_adapter =
-    ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
-        TAO_ORB_Core::ifr_client_adapter_name ()
-      );
-    
-  if (_tao_adapter == 0)
+  ACE_CATCHANY
     {
-      ACE_THROW (CORBA::INTF_REPOS ());
+      _tao_ri.exception (&ACE_ANY_EXCEPTION);
+      _tao_vfr.send_exception (
+          &_tao_ri
+          ACE_ENV_ARG_PARAMETER
+        );
+      ACE_TRY_CHECK;
+      
+      PortableInterceptor::ReplyStatus _tao_status =
+        _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+      
+      if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+          || _tao_status == PortableInterceptor::USER_EXCEPTION)
+        {
+          ACE_RE_THROW;
+        }
     }
   
-  POA_ImplementationRepository::Administration *_tao_impl =
-    (POA_ImplementationRepository::Administration *) _tao_servant;
-  
-  CORBA::InterfaceDef_ptr _tao_retval = 
-    _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-  
-  _tao_server_request.init_reply ();
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
-  CORBA::Boolean _tao_result =
-    _tao_adapter->interfacedef_cdr_insert (
-        _tao_out,
-        _tao_retval
-      );
-  
-  _tao_adapter->dispose (_tao_retval);
-  
-  if (_tao_result == 0)
+# if defined (ACE_HAS_EXCEPTIONS) \
+  && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
+  ACE_CATCHALL
     {
-      ACE_THROW (CORBA::MARSHAL ());
+      CORBA::UNKNOWN ex;
+      
+      _tao_ri.exception (&ex);
+      _tao_vfr.send_exception (
+          &_tao_ri
+          ACE_ENV_ARG_PARAMETER
+        );
+      ACE_TRY_CHECK;
+      
+      PortableInterceptor::ReplyStatus _tao_status =
+        _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+      
+      if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
+        ACE_TRY_THROW (ex);
     }
-}
-
-void POA_ImplementationRepository::Administration::_component_skel (
-    TAO_ServerRequest &_tao_server_request, 
-    void * _tao_object_reference,
-    void * /* Servant_Upcall */
-    ACE_ENV_ARG_DECL
-  )
-{
-  POA_ImplementationRepository::Administration *_tao_impl =
-    (POA_ImplementationRepository::Administration *) _tao_object_reference;
-  
-  CORBA::Object_var _tao_retval =
-    _tao_impl->_get_component (ACE_ENV_SINGLE_ARG_PARAMETER);
+# endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
+  ACE_ENDTRY;
   ACE_CHECK;
+#endif /* TAO_HAS_INTERCEPTORS */
   
   _tao_server_request.init_reply ();
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  
-  if (!(_tao_out << _tao_retval.in ()))
-    {
-      ACE_THROW (CORBA::MARSHAL ());
-    }
-}
-
-CORBA::Boolean POA_ImplementationRepository::Administration::_is_a (
-    const char* value
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          (char *)value,
-          "IDL:ImplementationRepository/Administration:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          (char *)value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-     )
+#if (TAO_HAS_INTERCEPTORS == 1)
+  if (!_tao_vfr.location_forwarded ())
     {
-      return 1;
-    }
-  else
-    {
-      return 0;
-    }
-}
-
-void* POA_ImplementationRepository::Administration::_downcast (
-    const char* logical_type_id
-  )
-{
-  if (ACE_OS::strcmp (logical_type_id,
-                      "IDL:ImplementationRepository/Administration:1.0") == 0)
-    {
-      return static_cast<POA_ImplementationRepository::Administration_ptr> (this);
+#endif /* TAO_HAS_INTERCEPTORS */
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      if (!(
+          (_tao_out << info.in ())
+          ))
+        {
+          TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+        }
+#if (TAO_HAS_INTERCEPTORS == 1)
     }
+#endif /* TAO_HAS_INTERCEPTORS */
   
-  if (ACE_OS::strcmp (logical_type_id,
-                      "IDL:omg.org/CORBA/Object:1.0") == 0)
-    {
-      return static_cast<PortableServer::Servant> (this);
-    }
   
-  return 0;
-}
-
-const char* POA_ImplementationRepository::Administration::_interface_repository_id (void) const
-{
-  return "IDL:ImplementationRepository/Administration:1.0";
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:584
+// TAO_IDL - Generated from 
+// be\be_visitor_operation/operation_ss.cpp:98
 
-void POA_ImplementationRepository::Administration::_dispatch (
-    TAO_ServerRequest &req,
-    void *servant_upcall
+void POA_ImplementationRepository::Administration::list_skel (
+    TAO_ServerRequest &_tao_server_request,
+    void *_tao_servant,
+    void *_tao_servant_upcall
     ACE_ENV_ARG_DECL
   )
 {
-  this->synchronous_upcall_dispatch (req,
-                                     servant_upcall,
-                                     this
-                                     ACE_ENV_ARG_PARAMETER);
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:526
-
-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_InputCDR &_tao_in = _tao_server_request.incoming ();
+  POA_ImplementationRepository::Administration *_tao_impl =
+    static_cast<
+        POA_ImplementationRepository::Administration *> (
+        _tao_servant
+      );
   
-  TAO_Stub_Auto_Ptr safe_stub (stub);
-  CORBA::Object_ptr tmp = CORBA::Object::_nil ();
+  ::CORBA::ULong how_many;
+  ::ImplementationRepository::ServerInformationList_var server_list;
   
-  if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ())
-    {
-      ACE_NEW_RETURN (
-          tmp,
-          CORBA::Object (stub, 1, this),
-          0
-        );
-    }
-  else
-    {
-      ACE_NEW_RETURN (
-          tmp,
-          CORBA::Object (stub, 0, this),
-          0
-        );
-    }
-  
-  CORBA::Object_var obj = tmp;
-  (void) safe_stub.release ();
+  ::ImplementationRepository::ServerInformationIterator_var server_iterator;
   
-  typedef ::ImplementationRepository::Administration STUB_SCOPED_NAME;
-  return
-    TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
-        obj.in (),
-        ImplementationRepository__TAO_Administration_Proxy_Broker_Factory_function_pointer
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_interface.cpp:1538
-
-class TAO_ImplementationRepository_ServerInformationIterator_Perfect_Hash_OpTable
-  : public TAO_Perfect_Hash_OpTable
-{
-private:
-  unsigned int hash (const char *str, unsigned int len);
-
-public:
-  const TAO_operation_db_entry * lookup (const char *str, unsigned int len);
-};
-
-/* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: /home/ossama/work/skeleton-refactor/ACE_wrappers/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0,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)
-{
-  static const unsigned char asso_values[] =
-    {
-#if defined (ACE_MVS)
-     16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
-     16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
-     16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
-     16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
-     16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
-     16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
-     16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
-     16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
-     16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
-     16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
-     16, 16, 16, 16, 16, 16, 16, 16, 16,  0,
-     16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
-     16, 16, 16, 16, 16, 16, 16, 16, 16,  0,
-     16, 16,  0,  5, 16, 16, 16, 16, 16, 16,
-     16, 16, 16, 16, 16, 16, 16, 16, 16,  0,
-     16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
-     16, 16, 16,  0, 16, 16, 16, 16,  0, 16,
-     16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
-     16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
-     16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
-     16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
-     16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
-     16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
-     16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
-     16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
-     16, 16, 16, 16, 16, 16,
-#else
-     16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
-     16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
-     16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
-     16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
-     16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
-     16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
-     16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
-     16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
-     16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
-     16, 16, 16, 16, 16,  0, 16,  0, 16, 16,
-      0,  5, 16, 16, 16, 16, 16, 16, 16, 16,
-      0, 16, 16, 16, 16, 16,  0, 16, 16, 16,
-     16,  0, 16, 16, 16, 16, 16, 16,
-#endif /* ACE_MVS */
-    };
-  return len + asso_values[(int) str[len - 1]] + asso_values[(int) str[0]];
-}
-
-const class TAO_operation_db_entry *
-TAO_ImplementationRepository_ServerInformationIterator_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len)
-{
-  enum
+  if (!(
+      (_tao_in >> how_many)
+      ))
     {
-      TOTAL_KEYWORDS = 6,
-      MIN_WORD_LENGTH = 5,
-      MAX_WORD_LENGTH = 13,
-      MIN_HASH_VALUE = 5,
-      MAX_HASH_VALUE = 15,
-      HASH_VALUE_RANGE = 11,
-      DUPLICATES = 0,
-      WORDLIST_SIZE = 11
-    };
-
-  static const class TAO_operation_db_entry  wordlist[] =
-    {
-      {"",0,0,0},{"",0,0,0},{"",0,0,0},{"",0,0,0},{"",0,0,0},
-      {"_is_a", &POA_ImplementationRepository::ServerInformationIterator::_is_a_skel, 0, 0},
-      {"next_n", &POA_ImplementationRepository::ServerInformationIterator::next_n_skel, &POA_ImplementationRepository::_TAO_ServerInformationIterator_ThruPOA_Proxy_Impl::next_n, &POA_ImplementationRepository::_TAO_ServerInformationIterator_Direct_Proxy_Impl::next_n},
-      {"destroy", &POA_ImplementationRepository::ServerInformationIterator::destroy_skel, &POA_ImplementationRepository::_TAO_ServerInformationIterator_ThruPOA_Proxy_Impl::destroy, &POA_ImplementationRepository::_TAO_ServerInformationIterator_Direct_Proxy_Impl::destroy},
-      {"",0,0,0},{"",0,0,0},
-      {"_component", &POA_ImplementationRepository::ServerInformationIterator::_component_skel, 0, 0},
-      {"",0,0,0},{"",0,0,0},
-      {"_non_existent", &POA_ImplementationRepository::ServerInformationIterator::_non_existent_skel, 0, 0},
-      {"",0,0,0},
-      {"_interface", &POA_ImplementationRepository::ServerInformationIterator::_interface_skel, 0, 0},
-    };
-
-  if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-    {
-      unsigned int key = hash (str, len);
-
-      if (key <= MAX_HASH_VALUE && key >= MIN_HASH_VALUE)
-        {
-          const char *s = wordlist[key].opname_;
-
-          if (*str == *s && !strncmp (str + 1, s + 1, len - 1))
-            return &wordlist[key];
-        }
+      TAO_InputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK;
     }
-  return 0;
-}
-
-static TAO_ImplementationRepository_ServerInformationIterator_Perfect_Hash_OpTable tao_ImplementationRepository_ServerInformationIterator_optable;
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/upcall_command_ss.cpp:49
-
-// TAO_IDL - Generated from
-// be/be_visitor_operation/upcall_command_ss.cpp:52
-
-class TAO_ImplementationRepository_ServerInformationIterator_next_n_Upcall_Command
-  : public TAO::Upcall_Command
-{
-public:
-  
-  inline TAO_ImplementationRepository_ServerInformationIterator_next_n_Upcall_Command (
-    POA_ImplementationRepository::ServerInformationIterator * servant,
-    TAO::Argument * const args[])
-    : servant_ (servant)
-    , args_ (args)
-  {
-  }
   
-  virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
-  {
-    static_cast<TAO::SArg_Traits< ACE_InputCDR::to_boolean>::ret_val *> (this->args_[0])->arg () =
-      this->servant_->next_n (
-        static_cast<TAO::SArg_Traits< CORBA::ULong>::in_arg_val *> (this->args_[1])->arg (),
-        static_cast<TAO::SArg_Traits< ::ImplementationRepository::ServerInformationList>::out_arg_val *> (this->args_[2])->arg ()
-        ACE_ENV_ARG_PARAMETER
+#if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
+        _tao_servant_upcall
       );
-    ACE_CHECK;
-  }
-
-private:
-  
-  POA_ImplementationRepository::ServerInformationIterator * const servant_;
-  TAO::Argument * const * const args_;
-
-};
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_operation/upcall_command_ss.cpp:52
-
-class TAO_ImplementationRepository_ServerInformationIterator_destroy_Upcall_Command
-  : public TAO::Upcall_Command
-{
-public:
-  
-  inline TAO_ImplementationRepository_ServerInformationIterator_destroy_Upcall_Command (
-    POA_ImplementationRepository::ServerInformationIterator * servant)
-    : servant_ (servant)
-  {
-  }
-  
-  virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
-  {
-    this->servant_->destroy (
-      ACE_ENV_SINGLE_ARG_PARAMETER
+    
+  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
+      _tao_server_request.orb_core ()->server_request_interceptors (),
+      _tao_server_request.interceptor_count ()
     );
-    ACE_CHECK;
-  }
-
-private:
-  
-  POA_ImplementationRepository::ServerInformationIterator * const servant_;
-
-};
-
-///////////////////////////////////////////////////////////////////////
-//            Strategized Proxy Broker Implementation
-//
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/strategized_proxy_broker_ss.cpp:40
-
-// Factory function Implementation.
-POA_ImplementationRepository::_TAO_ServerInformationIterator_Strategized_Proxy_Broker *
-POA_ImplementationRepository::_TAO_ServerInformationIterator_Strategized_Proxy_Broker::the_TAO_ServerInformationIterator_Strategized_Proxy_Broker (void)
-{
-  static POA_ImplementationRepository::_TAO_ServerInformationIterator_Strategized_Proxy_Broker
-  strategized_proxy_broker;
-  
-  return &strategized_proxy_broker;
-}
-
-POA_ImplementationRepository::_TAO_ServerInformationIterator_Strategized_Proxy_Broker::_TAO_ServerInformationIterator_Strategized_Proxy_Broker (void)
-{
-}
-
-POA_ImplementationRepository::_TAO_ServerInformationIterator_Strategized_Proxy_Broker::~_TAO_ServerInformationIterator_Strategized_Proxy_Broker (void)
-{
-}
-
-TAO::Collocation_Strategy
-POA_ImplementationRepository::_TAO_ServerInformationIterator_Strategized_Proxy_Broker::get_strategy (
-    CORBA::Object_ptr obj
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  TAO::Collocation_Strategy strategy =
-    TAO_ORB_Core::collocation_strategy (obj ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (TAO::TAO_CS_REMOTE_STRATEGY);
   
-  return strategy;
-}
+  TAO_ServerRequestInfo_ImplementationRepository_Administration_list _tao_ri (
+      _tao_server_request,
+      _tao_upcall,
+      _tao_impl,
+      
+      how_many      
 
-void
-POA_ImplementationRepository::_TAO_ServerInformationIterator_Strategized_Proxy_Broker::dispatch (
-    CORBA::Object_ptr obj,
-    CORBA::Object_out forward_obj,
-    TAO::Argument ** args,
-    int num_args,
-    const char * op,
-    size_t op_len,
-    TAO::Collocation_Strategy strategy
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((CORBA::Exception))
-{
-  TAO_Object_Adapter::Servant_Upcall servant_upcall (
-      obj->_stubobj ()->servant_orb_var ()->orb_core ()
+      ACE_ENV_ARG_PARAMETER
     );
   
-  TAO_Collocated_Skeleton collocated_skel;
-  TAO_Abstract_ServantBase *servant = 0;
-  
-  if (strategy == TAO::TAO_CS_THRU_POA_STRATEGY)
+  ACE_TRY
     {
-      servant_upcall.prepare_for_upcall (
-          obj->_stubobj ()->object_key (),
-          op,
-          forward_obj
+      {
+        TAO::PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (),
+                                            true  /* Copy TSC to RSC */);
+        
+        _tao_vfr.receive_request (&_tao_ri ACE_ENV_ARG_PARAMETER);
+        ACE_TRY_CHECK;
+        
+        if (!_tao_vfr.location_forwarded ())
+          {
+#endif /* TAO_HAS_INTERCEPTORS */
+            
+              _tao_impl->list (
+                  how_many,
+                  
+                  server_list.out (),
+                  
+                  server_iterator.out ()
+                  ACE_ENV_ARG_PARAMETER
+                );
+            TAO_INTERCEPTOR_CHECK;
+#if (TAO_HAS_INTERCEPTORS == 1)
+          }
+      }
+      
+      if (!_tao_vfr.location_forwarded ())
+        {
+          _tao_ri.reply_status (PortableInterceptor::SUCCESSFUL);
+          _tao_vfr.send_reply (&_tao_ri ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+        }
+    }
+  ACE_CATCHANY
+    {
+      _tao_ri.exception (&ACE_ANY_EXCEPTION);
+      _tao_vfr.send_exception (
+          &_tao_ri
           ACE_ENV_ARG_PARAMETER
         );
-      ACE_CHECK;
+      ACE_TRY_CHECK;
       
-      servant_upcall.pre_invoke_collocated_request (
-          ACE_ENV_SINGLE_ARG_PARAMETER
-        );
-      ACE_CHECK;
+      PortableInterceptor::ReplyStatus _tao_status =
+        _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
       
-      servant = servant_upcall.servant ();
-    }
-  else
-    {
-      servant = obj->_servant ();
-    }
-  
-  int status = servant->_find (op,
-                               collocated_skel,
-                               strategy,
-                               op_len);
-  
-  if (status == -1)
-    {
-      ACE_THROW (CORBA::BAD_OPERATION ());
+      if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+          || _tao_status == PortableInterceptor::USER_EXCEPTION)
+        {
+          ACE_RE_THROW;
+        }
     }
   
-  ACE_TRY
+# if defined (ACE_HAS_EXCEPTIONS) \
+  && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
+  ACE_CATCHALL
     {
-      collocated_skel (servant,
-                       args,
-                       num_args
-                       ACE_ENV_ARG_PARAMETER);
+      CORBA::UNKNOWN ex;
+      
+      _tao_ri.exception (&ex);
+      _tao_vfr.send_exception (
+          &_tao_ri
+          ACE_ENV_ARG_PARAMETER
+        );
       ACE_TRY_CHECK;
+      
+      PortableInterceptor::ReplyStatus _tao_status =
+        _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+      
+      if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
+        ACE_TRY_THROW (ex);
     }
-#if (TAO_HAS_MINIMUM_CORBA == 0)
-  ACE_CATCH (PortableServer::ForwardRequest, forward_request)
-    {
-      forward_obj =
-        CORBA::Object::_duplicate (forward_request.forward_reference.in ());
-      return;
-    }
-#else
-  ACE_CATCHANY
-    {
-      ACE_UNUSED_ARG (forward_obj);
-      ACE_RE_THROW;
-    }
-#endif /* TAO_HAS_MINIMUM_CORBA */
+# endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
   ACE_ENDTRY;
   ACE_CHECK;
-}
-
-//
-//        End Strategized Proxy Broker Implementation
-///////////////////////////////////////////////////////////////////////
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:648
-
-TAO::Collocation_Proxy_Broker *
-ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Factory_function (CORBA::Object_ptr)
-{
-  return
-    ::POA_ImplementationRepository::_TAO_ServerInformationIterator_Strategized_Proxy_Broker::the_TAO_ServerInformationIterator_Strategized_Proxy_Broker ();
-}
-
-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;
-  
-  return 0;
-}
-
-static int
-ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
-  ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Factory_Initializer (
-      reinterpret_cast<
-          size_t> (
-          ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Factory_Initializer
-        )
-    );
-
-
-///////////////////////////////////////////////////////////////////////
-//                 ThruPOA Proxy  Implementation
-//
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/thru_poa_proxy_impl_ss.cpp:37
-
-POA_ImplementationRepository::_TAO_ServerInformationIterator_ThruPOA_Proxy_Impl::_TAO_ServerInformationIterator_ThruPOA_Proxy_Impl (void)
-{}
-
-// ThruPOA Implementation of the IDL interface methods
-
-// TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
-
-void
-POA_ImplementationRepository::_TAO_ServerInformationIterator_ThruPOA_Proxy_Impl::next_n (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument ** args,
-    int 
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  ((TAO::Arg_Traits< ACE_InputCDR::to_boolean>::ret_val *) args[0])->arg () =
-    reinterpret_cast<
-        POA_ImplementationRepository::ServerInformationIterator_ptr> (
-        servant->_downcast (
-            "IDL:ImplementationRepository/ServerInformationIterator:1.0"
-          )
-      )->next_n (
-          ((TAO::Arg_Traits< CORBA::ULong>::in_arg_val *) args[1])->arg (),
-          ((TAO::Arg_Traits< ::ImplementationRepository::ServerInformationList>::out_arg_val *) args[2])->arg ()
-          ACE_ENV_ARG_PARAMETER
-        );
-  ACE_CHECK;
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
-
-void
-POA_ImplementationRepository::_TAO_ServerInformationIterator_ThruPOA_Proxy_Impl::destroy (
-    TAO_Abstract_ServantBase *servant,
-    TAO::Argument **,
-    int 
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  reinterpret_cast<
-      POA_ImplementationRepository::ServerInformationIterator_ptr> (
-      servant->_downcast (
-          "IDL:ImplementationRepository/ServerInformationIterator:1.0"
-        )
-    )->destroy (
-        ACE_ENV_SINGLE_ARG_PARAMETER
-      );
-  ACE_CHECK;
-}
-
-//
-//           End ThruPOA Proxy Implementation
-///////////////////////////////////////////////////////////////////////
-
-///////////////////////////////////////////////////////////////////////
-//                 Direct Proxy  Implementation
-//
-
-POA_ImplementationRepository::_TAO_ServerInformationIterator_Direct_Proxy_Impl::_TAO_ServerInformationIterator_Direct_Proxy_Impl (void)
-{}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_operation/direct_proxy_impl_ss.cpp:42
-
-void
-POA_ImplementationRepository::_TAO_ServerInformationIterator_Direct_Proxy_Impl::next_n (
-    TAO_Abstract_ServantBase  *servant,
-    TAO::Argument ** args,
-    int 
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  ((TAO::Arg_Traits< ACE_InputCDR::to_boolean>::ret_val *) args[0])->arg () =
-    reinterpret_cast<
-        POA_ImplementationRepository::ServerInformationIterator_ptr> (
-        servant->_downcast (
-            "IDL:ImplementationRepository/ServerInformationIterator:1.0"
-          )
-      )->next_n (
-          ((TAO::Arg_Traits< CORBA::ULong>::in_arg_val *) args[1])->arg (),
-          ((TAO::Arg_Traits< ::ImplementationRepository::ServerInformationList>::out_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
-
-void
-POA_ImplementationRepository::_TAO_ServerInformationIterator_Direct_Proxy_Impl::destroy (
-    TAO_Abstract_ServantBase  *servant,
-    TAO::Argument **,
-    int 
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  reinterpret_cast<
-      POA_ImplementationRepository::ServerInformationIterator_ptr> (
-      servant->_downcast (
-          "IDL:ImplementationRepository/ServerInformationIterator:1.0"
-        )
-    )->destroy (
-        ACE_ENV_SINGLE_ARG_PARAMETER
-      );
-  ACE_CHECK;
-}
-
-//
-//           End Direct Proxy Implementation
-///////////////////////////////////////////////////////////////////////
-
-// TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_ss.cpp:97
-
-POA_ImplementationRepository::ServerInformationIterator::ServerInformationIterator (void)
-{
-  this->optable_ = &tao_ImplementationRepository_ServerInformationIterator_optable;
-}
-
-POA_ImplementationRepository::ServerInformationIterator::ServerInformationIterator (const ServerInformationIterator& rhs)
-  : TAO_Abstract_ServantBase (rhs),
-    TAO_ServantBase (rhs)
-{
-}
-
-POA_ImplementationRepository::ServerInformationIterator::~ServerInformationIterator (void)
-{
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:165
-
-void POA_ImplementationRepository::ServerInformationIterator::next_n_skel (
-    TAO_ServerRequest &_tao_server_request,
-    void *_tao_servant,
-    void * TAO_INTERCEPTOR (_tao_servant_upcall)
-    ACE_ENV_ARG_DECL
-  )
-{
-  
-  
-#if TAO_HAS_INTERCEPTORS == 1
-  static CORBA::TypeCode_ptr const _tao_exceptions[] = {};
-  static size_t const _tao_nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
   
-  POA_ImplementationRepository::ServerInformationIterator * const _tao_impl =
-    static_cast<
-        POA_ImplementationRepository::ServerInformationIterator *> (
-        _tao_servant
-      );
-  
-  TAO::SArg_Traits< ACE_InputCDR::to_boolean>::ret_val _tao_retval;
-  TAO::SArg_Traits< CORBA::ULong>::in_arg_val _tao_how_many;
-  TAO::SArg_Traits< ::ImplementationRepository::ServerInformationList>::out_arg_val _tao_server_list;
-  
-  TAO::Argument * const _tao_args [] =
+  _tao_server_request.init_reply ();
+#if (TAO_HAS_INTERCEPTORS == 1)
+  if (!_tao_vfr.location_forwarded ())
     {
-      &_tao_retval,
-      &_tao_how_many,
-      &_tao_server_list
-    };
-  
-  static size_t const _tao_nargs = 3;
-  
-  TAO_ImplementationRepository_ServerInformationIterator_next_n_Upcall_Command _tao_upcall_command (
-      _tao_impl, _tao_args);
-  
-  TAO::Upcall_Wrapper _tao_upcall_wrapper;
-  _tao_upcall_wrapper.upcall (_tao_server_request
-                              , _tao_args
-                              , _tao_nargs
-                              , _tao_upcall_command
-  
-#if TAO_HAS_INTERCEPTORS == 1
-                              , _tao_servant_upcall
-                              , _tao_impl
-                              , _tao_exceptions
-                              , _tao_nexceptions
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
-  
-                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:165
-
-void POA_ImplementationRepository::ServerInformationIterator::destroy_skel (
-    TAO_ServerRequest &_tao_server_request,
-    void *_tao_servant,
-    void * TAO_INTERCEPTOR (_tao_servant_upcall)
-    ACE_ENV_ARG_DECL
-  )
-{
-  
-  
-#if TAO_HAS_INTERCEPTORS == 1
-  static CORBA::TypeCode_ptr const _tao_exceptions[] = {};
-  static size_t const _tao_nexceptions = 0;
+#endif /* TAO_HAS_INTERCEPTORS */
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      if (!(
+          (_tao_out << server_list.in ()) &&
+          (_tao_out << server_iterator.in ())
+          ))
+        {
+          TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+        }
+#if (TAO_HAS_INTERCEPTORS == 1)
+    }
 #endif /* TAO_HAS_INTERCEPTORS */
   
-  POA_ImplementationRepository::ServerInformationIterator * const _tao_impl =
-    static_cast<
-        POA_ImplementationRepository::ServerInformationIterator *> (
-        _tao_servant
-      );
-  
-  TAO::SArg_Traits< void>::ret_val _tao_retval;
-  
-  TAO::Argument * const _tao_args [] =
-    {
-      &_tao_retval
-    };
-  
-  static size_t const _tao_nargs = 1;
-  
-  TAO_ImplementationRepository_ServerInformationIterator_destroy_Upcall_Command _tao_upcall_command (
-      _tao_impl);
-  
-  TAO::Upcall_Wrapper _tao_upcall_wrapper;
-  _tao_upcall_wrapper.upcall (_tao_server_request
-                              , _tao_args
-                              , _tao_nargs
-                              , _tao_upcall_command
-  
-#if TAO_HAS_INTERCEPTORS == 1
-                              , _tao_servant_upcall
-                              , _tao_impl
-                              , _tao_exceptions
-                              , _tao_nexceptions
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
-  
-                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
   
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_ss.cpp:162
+// be\be_visitor_interface/interface_ss.cpp:162
 
-void POA_ImplementationRepository::ServerInformationIterator::_is_a_skel (
+void POA_ImplementationRepository::Administration::_is_a_skel (
     TAO_ServerRequest &_tao_server_request, 
     void * _tao_servant,
     void * /* Servant_Upcall */
@@ -3972,8 +4832,8 @@ void POA_ImplementationRepository::ServerInformationIterator::_is_a_skel (
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
   
-  POA_ImplementationRepository::ServerInformationIterator *_tao_impl =
-    (POA_ImplementationRepository::ServerInformationIterator *) _tao_servant;
+  POA_ImplementationRepository::Administration *_tao_impl =
+    static_cast<POA_ImplementationRepository::Administration *> (_tao_servant);
   
   CORBA::Boolean _tao_retval = 0;
   CORBA::String_var value;
@@ -3995,15 +4855,15 @@ void POA_ImplementationRepository::ServerInformationIterator::_is_a_skel (
     }
 }
 
-void POA_ImplementationRepository::ServerInformationIterator::_non_existent_skel (
+void POA_ImplementationRepository::Administration::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request, 
     void * _tao_servant,
     void * /* Servant_Upcall */
     ACE_ENV_ARG_DECL
   )
 {
-  POA_ImplementationRepository::ServerInformationIterator *_tao_impl =
-    (POA_ImplementationRepository::ServerInformationIterator *) _tao_servant;
+  POA_ImplementationRepository::Administration *_tao_impl =
+    static_cast<POA_ImplementationRepository::Administration *> (_tao_servant);
   
   CORBA::Boolean _tao_retval =
     _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -4018,7 +4878,7 @@ void POA_ImplementationRepository::ServerInformationIterator::_non_existent_skel
     }
 }
 
-void POA_ImplementationRepository::ServerInformationIterator::_interface_skel (
+void POA_ImplementationRepository::Administration::_interface_skel (
     TAO_ServerRequest &_tao_server_request, 
     void * _tao_servant,
     void * /* Servant_Upcall */
@@ -4035,8 +4895,8 @@ void POA_ImplementationRepository::ServerInformationIterator::_interface_skel (
       ACE_THROW (CORBA::INTF_REPOS ());
     }
   
-  POA_ImplementationRepository::ServerInformationIterator *_tao_impl =
-    (POA_ImplementationRepository::ServerInformationIterator *) _tao_servant;
+  POA_ImplementationRepository::Administration *_tao_impl =
+    static_cast<POA_ImplementationRepository::Administration *> (_tao_servant);
   
   CORBA::InterfaceDef_ptr _tao_retval = 
     _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -4059,15 +4919,15 @@ void POA_ImplementationRepository::ServerInformationIterator::_interface_skel (
     }
 }
 
-void POA_ImplementationRepository::ServerInformationIterator::_component_skel (
+void POA_ImplementationRepository::Administration::_component_skel (
     TAO_ServerRequest &_tao_server_request, 
     void * _tao_object_reference,
     void * /* Servant_Upcall */
     ACE_ENV_ARG_DECL
   )
 {
-  POA_ImplementationRepository::ServerInformationIterator *_tao_impl =
-    (POA_ImplementationRepository::ServerInformationIterator *) _tao_object_reference;
+  POA_ImplementationRepository::Administration *_tao_impl =
+    static_cast<POA_ImplementationRepository::Administration *> (_tao_object_reference);
   
   CORBA::Object_var _tao_retval =
     _tao_impl->_get_component (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -4082,38 +4942,32 @@ void POA_ImplementationRepository::ServerInformationIterator::_component_skel (
     }
 }
 
-CORBA::Boolean POA_ImplementationRepository::ServerInformationIterator::_is_a (
+CORBA::Boolean POA_ImplementationRepository::Administration::_is_a (
     const char* value
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
-  if (
+  return
+    (
       !ACE_OS::strcmp (
-          (char *)value,
-          "IDL:ImplementationRepository/ServerInformationIterator:1.0"
+          value,
+          "IDL:ImplementationRepository/Administration:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
-    {
-      return 1;
-    }
-  else
-    {
-      return 0;
-    }
+    );
 }
 
-void* POA_ImplementationRepository::ServerInformationIterator::_downcast (
+void* POA_ImplementationRepository::Administration::_downcast (
     const char* logical_type_id
   )
 {
   if (ACE_OS::strcmp (logical_type_id,
-                      "IDL:ImplementationRepository/ServerInformationIterator:1.0") == 0)
+                      "IDL:ImplementationRepository/Administration:1.0") == 0)
     {
-      return static_cast<POA_ImplementationRepository::ServerInformationIterator_ptr> (this);
+      return static_cast<POA_ImplementationRepository::Administration_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
@@ -4125,15 +4979,15 @@ void* POA_ImplementationRepository::ServerInformationIterator::_downcast (
   return 0;
 }
 
-const char* POA_ImplementationRepository::ServerInformationIterator::_interface_repository_id (void) const
+const char* POA_ImplementationRepository::Administration::_interface_repository_id (void) const
 {
-  return "IDL:ImplementationRepository/ServerInformationIterator:1.0";
+  return "IDL:ImplementationRepository/Administration:1.0";
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:584
+// be\be_visitor_interface/interface_ss.cpp:576
 
-void POA_ImplementationRepository::ServerInformationIterator::_dispatch (
+void POA_ImplementationRepository::Administration::_dispatch (
     TAO_ServerRequest &req,
     void *servant_upcall
     ACE_ENV_ARG_DECL
@@ -4146,10 +5000,10 @@ void POA_ImplementationRepository::ServerInformationIterator::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:526
+// be\be_visitor_interface/interface_ss.cpp:527
 
-ImplementationRepository::ServerInformationIterator *
-POA_ImplementationRepository::ServerInformationIterator::_this (ACE_ENV_SINGLE_ARG_DECL)
+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);
@@ -4157,36 +5011,28 @@ POA_ImplementationRepository::ServerInformationIterator::_this (ACE_ENV_SINGLE_A
   TAO_Stub_Auto_Ptr safe_stub (stub);
   CORBA::Object_ptr tmp = CORBA::Object::_nil ();
   
-  if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ())
-    {
-      ACE_NEW_RETURN (
-          tmp,
-          CORBA::Object (stub, 1, this),
-          0
-        );
-    }
-  else
-    {
-      ACE_NEW_RETURN (
-          tmp,
-          CORBA::Object (stub, 0, this),
-          0
-        );
-    }
+  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;
+  typedef ::ImplementationRepository::Administration STUB_SCOPED_NAME;
   return
     TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
         obj.in (),
-        ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Factory_function_pointer
+        ImplementationRepository__TAO_Administration_Proxy_Broker_Factory_function_pointer
       );
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_root/root.cpp:1695
+// be\be_visitor_root/root.cpp:1683
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
diff --git a/TAO/tao/PortableServer/ImplRepoS.h b/TAO/tao/PortableServer/ImplRepoS.h
index 83a4b3b5f97..79524e52fe1 100644
--- a/TAO/tao/PortableServer/ImplRepoS.h
+++ b/TAO/tao/PortableServer/ImplRepoS.h
@@ -26,13 +26,14 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be/be_codegen.cpp:391
+// be\be_codegen.cpp:390
 
 #ifndef _TAO_IDL_ORIG_IMPLREPOS_H_
 #define _TAO_IDL_ORIG_IMPLREPOS_H_
 
 #include /**/ "ace/pre.h"
 
+#include "tao/PortableServer/ServerObjectS.h"
 #include "ImplRepoC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
@@ -44,9 +45,7 @@
 #include "tao/PortableServer/Servant_Base.h"
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -55,36 +54,36 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from
-// be/be_visitor_module/module_sh.cpp:49
+// be\be_visitor_module/module_sh.cpp:49
 
 namespace POA_ImplementationRepository
 {
   
   
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_sh.cpp:87
+  // be\be_visitor_interface/interface_sh.cpp:87
   
-  class ServerObject;
-  typedef ServerObject *ServerObject_ptr;
+  class ServerInformationIterator;
+  typedef ServerInformationIterator *ServerInformationIterator_ptr;
   
-  class _TAO_ServerObject_ThruPOA_Proxy_Impl;
-  class _TAO_ServerObject_Direct_Proxy_Impl;
-  class _TAO_ServerObject_Strategized_Proxy_Broker;
+  class _TAO_ServerInformationIterator_ThruPOA_Proxy_Impl;
+  class _TAO_ServerInformationIterator_Direct_Proxy_Impl;
+  class _TAO_ServerInformationIterator_Strategized_Proxy_Broker;
   
-  class TAO_PortableServer_Export ServerObject
+  class TAO_PortableServer_Export ServerInformationIterator
     : public virtual PortableServer::ServantBase
   {
   protected:
-    ServerObject (void);
+    ServerInformationIterator (void);
   
   public:
     // Useful for template programming.
-    typedef ::ImplementationRepository::ServerObject _stub_type;
-    typedef ::ImplementationRepository::ServerObject_ptr _stub_ptr_type;
-    typedef ::ImplementationRepository::ServerObject_var _stub_var_type;
+    typedef ::ImplementationRepository::ServerInformationIterator _stub_type;
+    typedef ::ImplementationRepository::ServerInformationIterator_ptr _stub_ptr_type;
+    typedef ::ImplementationRepository::ServerInformationIterator_var _stub_var_type;
     
-    ServerObject (const ServerObject& rhs);
-    virtual ~ServerObject (void);
+    ServerInformationIterator (const ServerInformationIterator& rhs);
+    virtual ~ServerInformationIterator (void);
     
     virtual CORBA::Boolean _is_a (
         const char* logical_type_id
@@ -129,23 +128,25 @@ namespace POA_ImplementationRepository
         ACE_ENV_ARG_DECL
       );
     
-    ::ImplementationRepository::ServerObject *_this (
+    ::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
+    // be\be_visitor_operation/operation_sh.cpp:45
     
-    virtual void ping (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+    virtual CORBA::Boolean next_n (
+        ::CORBA::ULong how_many,
+        ::ImplementationRepository::ServerInformationList_out servers
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
     
-    static void ping_skel (
+    static void next_n_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_servant,
         void *_tao_servant_upcall
@@ -153,16 +154,16 @@ namespace POA_ImplementationRepository
       );
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
     
-    virtual void shutdown (
+    virtual void destroy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
     
-    static void shutdown_skel (
+    static void destroy_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_servant,
         void *_tao_servant_upcall
@@ -175,15 +176,15 @@ namespace POA_ImplementationRepository
   //
   
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/strategized_proxy_broker_sh.cpp:36
+  // be\be_visitor_interface/strategized_proxy_broker_sh.cpp:36
   
-  class TAO_PortableServer_Export _TAO_ServerObject_Strategized_Proxy_Broker
+  class TAO_PortableServer_Export _TAO_ServerInformationIterator_Strategized_Proxy_Broker
     : public virtual TAO::Collocation_Proxy_Broker
   {
   public: 
-    _TAO_ServerObject_Strategized_Proxy_Broker (void);
+    _TAO_ServerInformationIterator_Strategized_Proxy_Broker (void);
     
-    virtual ~_TAO_ServerObject_Strategized_Proxy_Broker (void);
+    virtual ~_TAO_ServerInformationIterator_Strategized_Proxy_Broker (void);
     
     TAO::Collocation_Strategy
     get_strategy (
@@ -205,8 +206,8 @@ namespace POA_ImplementationRepository
       )
       ACE_THROW_SPEC ((CORBA::Exception));
     
-    static _TAO_ServerObject_Strategized_Proxy_Broker *
-    the_TAO_ServerObject_Strategized_Proxy_Broker (void);
+    static _TAO_ServerInformationIterator_Strategized_Proxy_Broker *
+    the_TAO_ServerInformationIterator_Strategized_Proxy_Broker (void);
   };
   
   //
@@ -219,20 +220,20 @@ namespace POA_ImplementationRepository
   //
   
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
+  // be\be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
   
-  class TAO_PortableServer_Export _TAO_ServerObject_ThruPOA_Proxy_Impl
+  class TAO_PortableServer_Export _TAO_ServerInformationIterator_ThruPOA_Proxy_Impl
   {
   public:
-    _TAO_ServerObject_ThruPOA_Proxy_Impl (void);
+    _TAO_ServerInformationIterator_ThruPOA_Proxy_Impl (void);
     
-    virtual ~_TAO_ServerObject_ThruPOA_Proxy_Impl (void) {}
+    virtual ~_TAO_ServerInformationIterator_ThruPOA_Proxy_Impl (void) {}
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
     
     static void
-    ping (
+    next_n (
         TAO_Abstract_ServantBase *servant,
         TAO::Argument ** args,
         int num_args
@@ -243,10 +244,10 @@ namespace POA_ImplementationRepository
       ));
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
     
     static void
-    shutdown (
+    destroy (
         TAO_Abstract_ServantBase *servant,
         TAO::Argument ** args,
         int num_args
@@ -262,24 +263,24 @@ namespace POA_ImplementationRepository
   ///////////////////////////////////////////////////////////////////////
   
   // TAO_IDL - Generated from 
-  // be/be_visitor_interface/direct_proxy_impl_sh.cpp:31
+  // be\be_visitor_interface/direct_proxy_impl_sh.cpp:31
   
   ///////////////////////////////////////////////////////////////////////
   //                    Direct  Impl. Declaration
   //
   
-  class TAO_PortableServer_Export _TAO_ServerObject_Direct_Proxy_Impl
+  class TAO_PortableServer_Export _TAO_ServerInformationIterator_Direct_Proxy_Impl
   {
   public:
-    _TAO_ServerObject_Direct_Proxy_Impl (void);
+    _TAO_ServerInformationIterator_Direct_Proxy_Impl (void);
     
-    virtual ~_TAO_ServerObject_Direct_Proxy_Impl (void) {}
+    virtual ~_TAO_ServerInformationIterator_Direct_Proxy_Impl (void) {}
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
     
     static void
-    ping (
+    next_n (
         TAO_Abstract_ServantBase *servant,
         TAO::Argument ** args,
         int num_args
@@ -290,10 +291,10 @@ namespace POA_ImplementationRepository
       ));
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
     
     static void
-    shutdown (
+    destroy (
         TAO_Abstract_ServantBase *servant,
         TAO::Argument ** args,
         int num_args
@@ -311,7 +312,7 @@ namespace POA_ImplementationRepository
   
   
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_sh.cpp:87
+  // be\be_visitor_interface/interface_sh.cpp:87
   
   class Administration;
   typedef Administration *Administration_ptr;
@@ -385,7 +386,7 @@ namespace POA_ImplementationRepository
     virtual const char* _interface_repository_id (void) const;
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
     
     virtual void activate_server (
         const char * server
@@ -405,28 +406,7 @@ namespace POA_ImplementationRepository
       );
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
-    
-    virtual char * activate_server_with_startup (
-        const char * server,
-        ::CORBA::Long check_startup
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::ImplementationRepository::NotFound,
-        ::ImplementationRepository::CannotActivate
-      )) = 0;
-    
-    static void activate_server_with_startup_skel (
-        TAO_ServerRequest &_tao_req,
-        void *_tao_servant,
-        void *_tao_servant_upcall
-        ACE_ENV_ARG_DECL
-      );
-    
-    // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
     
     virtual void register_server (
         const char * server,
@@ -447,7 +427,7 @@ namespace POA_ImplementationRepository
       );
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
     
     virtual void reregister_server (
         const char * server,
@@ -468,7 +448,7 @@ namespace POA_ImplementationRepository
       );
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
     
     virtual void remove_server (
         const char * server
@@ -487,7 +467,7 @@ namespace POA_ImplementationRepository
       );
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
     
     virtual void shutdown_server (
         const char * server
@@ -506,11 +486,11 @@ namespace POA_ImplementationRepository
       );
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
     
     virtual void server_is_running (
         const char * server,
-        const char * addr,
+        const char * partial_ior,
         ::ImplementationRepository::ServerObject_ptr server_object
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
@@ -527,7 +507,7 @@ namespace POA_ImplementationRepository
       );
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
     
     virtual void server_is_shutting_down (
         const char * server
@@ -546,7 +526,7 @@ namespace POA_ImplementationRepository
       );
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
     
     virtual void find (
         const char * server,
@@ -566,7 +546,7 @@ namespace POA_ImplementationRepository
       );
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
     
     virtual void list (
         ::CORBA::ULong how_many,
@@ -584,42 +564,6 @@ namespace POA_ImplementationRepository
         void *_tao_servant_upcall
         ACE_ENV_ARG_DECL
       );
-    
-    // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
-    
-    virtual void shutdown_repo (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    static void shutdown_repo_skel (
-        TAO_ServerRequest &_tao_req,
-        void *_tao_servant,
-        void *_tao_servant_upcall
-        ACE_ENV_ARG_DECL
-      );
-    
-    // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
-    
-    virtual char * find_ior (
-        const char * object_name
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::ImplementationRepository::NotFound
-      )) = 0;
-    
-    static void find_ior_skel (
-        TAO_ServerRequest &_tao_req,
-        void *_tao_servant,
-        void *_tao_servant_upcall
-        ACE_ENV_ARG_DECL
-      );
   };
   
   ///////////////////////////////////////////////////////////////////////
@@ -627,7 +571,7 @@ namespace POA_ImplementationRepository
   //
   
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/strategized_proxy_broker_sh.cpp:36
+  // be\be_visitor_interface/strategized_proxy_broker_sh.cpp:36
   
   class TAO_PortableServer_Export _TAO_Administration_Strategized_Proxy_Broker
     : public virtual TAO::Collocation_Proxy_Broker
@@ -671,7 +615,7 @@ namespace POA_ImplementationRepository
   //
   
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
+  // be\be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
   
   class TAO_PortableServer_Export _TAO_Administration_ThruPOA_Proxy_Impl
   {
@@ -681,7 +625,7 @@ namespace POA_ImplementationRepository
     virtual ~_TAO_Administration_ThruPOA_Proxy_Impl (void) {}
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
     
     static void
     activate_server (
@@ -697,23 +641,7 @@ namespace POA_ImplementationRepository
       ));
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-    
-    static void
-    activate_server_with_startup (
-        TAO_Abstract_ServantBase *servant,
-        TAO::Argument ** args,
-        int num_args
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::ImplementationRepository::NotFound,
-        ::ImplementationRepository::CannotActivate
-      ));
-    
-    // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
     
     static void
     register_server (
@@ -729,7 +657,7 @@ namespace POA_ImplementationRepository
       ));
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
     
     static void
     reregister_server (
@@ -745,7 +673,7 @@ namespace POA_ImplementationRepository
       ));
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
     
     static void
     remove_server (
@@ -760,7 +688,7 @@ namespace POA_ImplementationRepository
       ));
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
     
     static void
     shutdown_server (
@@ -775,7 +703,7 @@ namespace POA_ImplementationRepository
       ));
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
     
     static void
     server_is_running (
@@ -790,7 +718,7 @@ namespace POA_ImplementationRepository
       ));
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
     
     static void
     server_is_shutting_down (
@@ -805,7 +733,7 @@ namespace POA_ImplementationRepository
       ));
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
     
     static void
     find (
@@ -820,7 +748,7 @@ namespace POA_ImplementationRepository
       ));
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
     
     static void
     list (
@@ -832,35 +760,6 @@ namespace POA_ImplementationRepository
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
-    // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-    
-    static void
-    shutdown_repo (
-        TAO_Abstract_ServantBase *servant,
-        TAO::Argument ** args,
-        int num_args
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-    
-    // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-    
-    static void
-    find_ior (
-        TAO_Abstract_ServantBase *servant,
-        TAO::Argument ** args,
-        int num_args
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::ImplementationRepository::NotFound
-      ));
   };
   
   //
@@ -868,7 +767,7 @@ namespace POA_ImplementationRepository
   ///////////////////////////////////////////////////////////////////////
   
   // TAO_IDL - Generated from 
-  // be/be_visitor_interface/direct_proxy_impl_sh.cpp:31
+  // be\be_visitor_interface/direct_proxy_impl_sh.cpp:31
   
   ///////////////////////////////////////////////////////////////////////
   //                    Direct  Impl. Declaration
@@ -882,7 +781,7 @@ namespace POA_ImplementationRepository
     virtual ~_TAO_Administration_Direct_Proxy_Impl (void) {}
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
     
     static void
     activate_server (
@@ -898,23 +797,7 @@ namespace POA_ImplementationRepository
       ));
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-    
-    static void
-    activate_server_with_startup (
-        TAO_Abstract_ServantBase *servant,
-        TAO::Argument ** args,
-        int num_args
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::ImplementationRepository::NotFound,
-        ::ImplementationRepository::CannotActivate
-      ));
-    
-    // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
     
     static void
     register_server (
@@ -930,7 +813,7 @@ namespace POA_ImplementationRepository
       ));
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
     
     static void
     reregister_server (
@@ -946,7 +829,7 @@ namespace POA_ImplementationRepository
       ));
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
     
     static void
     remove_server (
@@ -961,7 +844,7 @@ namespace POA_ImplementationRepository
       ));
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
     
     static void
     shutdown_server (
@@ -976,7 +859,7 @@ namespace POA_ImplementationRepository
       ));
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
     
     static void
     server_is_running (
@@ -991,7 +874,7 @@ namespace POA_ImplementationRepository
       ));
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
     
     static void
     server_is_shutting_down (
@@ -1006,7 +889,7 @@ namespace POA_ImplementationRepository
       ));
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
     
     static void
     find (
@@ -1021,7 +904,7 @@ namespace POA_ImplementationRepository
       ));
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
     
     static void
     list (
@@ -1033,286 +916,6 @@ namespace POA_ImplementationRepository
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
-    // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-    
-    static void
-    shutdown_repo (
-        TAO_Abstract_ServantBase *servant,
-        TAO::Argument ** args,
-        int num_args
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-    
-    // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-    
-    static void
-    find_ior (
-        TAO_Abstract_ServantBase *servant,
-        TAO::Argument ** args,
-        int num_args
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        ::ImplementationRepository::NotFound
-      ));
-  };
-  
-  //
-  //                Direct  Proxy Impl. Declaration
-  ///////////////////////////////////////////////////////////////////////
-  
-  
-  
-  // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_sh.cpp:87
-  
-  class ServerInformationIterator;
-  typedef ServerInformationIterator *ServerInformationIterator_ptr;
-  
-  class _TAO_ServerInformationIterator_ThruPOA_Proxy_Impl;
-  class _TAO_ServerInformationIterator_Direct_Proxy_Impl;
-  class _TAO_ServerInformationIterator_Strategized_Proxy_Broker;
-  
-  class TAO_PortableServer_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
-      );
-    
-    virtual void* _downcast (
-        const char* logical_type_id
-      );
-    
-    static void _is_a_skel (
-        TAO_ServerRequest &req,
-        void *servant,
-        void *servant_upcall
-        ACE_ENV_ARG_DECL
-      );
-    
-    static void _non_existent_skel (
-        TAO_ServerRequest &req,
-        void *servant,
-        void *servant_upcall
-        ACE_ENV_ARG_DECL
-      );
-    
-    static void _interface_skel (
-        TAO_ServerRequest &req,
-        void *servant,
-        void *servant_upcall
-        ACE_ENV_ARG_DECL
-      );
-    
-    static void _component_skel (
-        TAO_ServerRequest &req,
-        void *obj,
-        void *servant_upcall
-        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
-    
-    virtual CORBA::Boolean next_n (
-        ::CORBA::ULong how_many,
-        ::ImplementationRepository::ServerInformationList_out server_list
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-    
-    static void next_n_skel (
-        TAO_ServerRequest &_tao_req,
-        void *_tao_servant,
-        void *_tao_servant_upcall
-        ACE_ENV_ARG_DECL
-      );
-    
-    // TAO_IDL - Generated from
-    // 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 &_tao_req,
-        void *_tao_servant,
-        void *_tao_servant_upcall
-        ACE_ENV_ARG_DECL
-      );
-  };
-  
-  ///////////////////////////////////////////////////////////////////////
-  //               Strategized Proxy Broker Declaration 
-  //
-  
-  // TAO_IDL - Generated from
-  // be/be_visitor_interface/strategized_proxy_broker_sh.cpp:36
-  
-  class TAO_PortableServer_Export _TAO_ServerInformationIterator_Strategized_Proxy_Broker
-    : public virtual TAO::Collocation_Proxy_Broker
-  {
-  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,
-        CORBA::Object_out forward_obj,
-        TAO::Argument ** args,
-        int num_args,
-        const char * op,
-        size_t op_len,
-        TAO::Collocation_Strategy strategy
-        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 
-  ///////////////////////////////////////////////////////////////////////
-  
-  
-  ///////////////////////////////////////////////////////////////////////
-  //                    ThruPOA Proxy Impl. Declaration
-  //
-  
-  // TAO_IDL - Generated from
-  // be/be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
-  
-  class TAO_PortableServer_Export _TAO_ServerInformationIterator_ThruPOA_Proxy_Impl
-  {
-  public:
-    _TAO_ServerInformationIterator_ThruPOA_Proxy_Impl (void);
-    
-    virtual ~_TAO_ServerInformationIterator_ThruPOA_Proxy_Impl (void) {}
-    
-    // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-    
-    static void
-    next_n (
-        TAO_Abstract_ServantBase *servant,
-        TAO::Argument ** args,
-        int num_args
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-    
-    // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-    
-    static void
-    destroy (
-        TAO_Abstract_ServantBase *servant,
-        TAO::Argument ** args,
-        int num_args
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-  };
-  
-  //
-  //                ThruPOA  Proxy Impl. Declaration
-  ///////////////////////////////////////////////////////////////////////
-  
-  // TAO_IDL - Generated from 
-  // be/be_visitor_interface/direct_proxy_impl_sh.cpp:31
-  
-  ///////////////////////////////////////////////////////////////////////
-  //                    Direct  Impl. Declaration
-  //
-  
-  class TAO_PortableServer_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
-    
-    static void
-    next_n (
-        TAO_Abstract_ServantBase *servant,
-        TAO::Argument ** args,
-        int num_args
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-    
-    // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-    
-    static void
-    destroy (
-        TAO_Abstract_ServantBase *servant,
-        TAO::Argument ** args,
-        int num_args
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
   };
   
   //
@@ -1322,19 +925,19 @@ namespace POA_ImplementationRepository
   
 
 // TAO_IDL - Generated from
-// be/be_visitor_module/module_sh.cpp:80
+// be\be_visitor_module/module_sh.cpp:80
 
 } // module ImplementationRepository
 
 // TAO_IDL - Generated from 
-// be/be_codegen.cpp:1000
+// be\be_codegen.cpp:997
 
 
 #if defined (__ACE_INLINE__)
 #include "ImplRepoS.inl"
 #endif /* defined INLINE */
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
diff --git a/TAO/tao/PortableServer/POA_Policies.cpp b/TAO/tao/PortableServer/POA_Policies.cpp
index b9517b4d302..2dd705a5344 100644
--- a/TAO/tao/PortableServer/POA_Policies.cpp
+++ b/TAO/tao/PortableServer/POA_Policies.cpp
@@ -4,7 +4,10 @@
 
 #include "tao/ORB_Constants.h"
 
-ACE_RCSID(PortableServer, POA_Policies, "$Id$")
+
+ACE_RCSID (PortableServer,
+           POA_Policies,
+           "$Id$")
 
 
 #if (TAO_HAS_MINIMUM_POA == 0)
diff --git a/TAO/tao/PortableServer/POA_Policy_Set.cpp b/TAO/tao/PortableServer/POA_Policy_Set.cpp
index cdc2c6267c3..5e42009ee4e 100644
--- a/TAO/tao/PortableServer/POA_Policy_Set.cpp
+++ b/TAO/tao/PortableServer/POA_Policy_Set.cpp
@@ -16,7 +16,7 @@ ACE_RCSID (PortableServer,
            "$Id$")
 
 
-TAO_POA_Policy_Set::TAO_POA_Policy_Set ()
+TAO_POA_Policy_Set::TAO_POA_Policy_Set (void)
   :
     impl_ (TAO_POLICY_POA_SCOPE)
 {
diff --git a/TAO/tao/PortableServer/POA_Policy_Set.i b/TAO/tao/PortableServer/POA_Policy_Set.i
index e62bf36a1d3..04b7a4e4e69 100644
--- a/TAO/tao/PortableServer/POA_Policy_Set.i
+++ b/TAO/tao/PortableServer/POA_Policy_Set.i
@@ -1,3 +1,5 @@
+// -*- C++ -*-
+//
 // $Id$
 
 ACE_INLINE CORBA::ULong
diff --git a/TAO/tao/PortableServer/PolicyS.cpp b/TAO/tao/PortableServer/PolicyS.cpp
index bb1db87382b..1ea5066806b 100644
--- a/TAO/tao/PortableServer/PolicyS.cpp
+++ b/TAO/tao/PortableServer/PolicyS.cpp
@@ -27,7 +27,7 @@
 
 
 // TAO_IDL - Generated from 
-// be/be_codegen.cpp:611
+// be\be_codegen.cpp:609
 
 #ifndef _TAO_IDL_ORIG_POLICYS_CPP_
 #define _TAO_IDL_ORIG_POLICYS_CPP_
@@ -36,11 +36,6 @@
 #include "PolicyS.h"
 #include "tao/PortableServer/Object_Adapter.h"
 #include "tao/PortableServer/Operation_Table.h"
-#include "tao/PortableServer/Upcall_Command.h"
-#include "tao/PortableServer/Upcall_Wrapper.h"
-#include "tao/PortableServer/Basic_SArguments.h"
-#include "tao/PortableServer/Object_SArgument_T.h"
-#include "tao/PortableServer/TypeCode_SArg_Traits.h"
 #include "tao/TAO_Server_Request.h"
 #include "tao/ORB_Core.h"
 #include "tao/Profile.h"
@@ -50,12 +45,18 @@
 #include "tao/Typecode.h"
 #include "tao/DynamicC.h"
 #include "tao/CDR.h"
-#include "tao/PortableInterceptor.h"
 #include "tao/Basic_Arguments.h"
 #include "tao/Object_Argument_T.h"
+#include "tao/PortableInterceptor.h"
+#if TAO_HAS_INTERCEPTORS == 1
+#include "tao/PortableServer/PICurrent_Guard.h"
+#include "tao/PortableServer/ServerRequestInfo.h"
+#include "tao/PortableServer/ServerInterceptorAdapter.h"
+#include "tao/RequestInfo_Util.h"
+#endif  /* TAO_HAS_INTERCEPTORS == 1 */
+
 #include "ace/Dynamic_Service.h"
 #include "ace/Malloc_Allocator.h"
-#include "ace/config-all.h"
 
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus
@@ -66,32 +67,7 @@
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be/be_visitor_arg_traits.cpp:67
-
-// Arg traits specializations.
-namespace TAO
-{
-
-#if !defined (_CORBA_POLICY__SARG_TRAITS_SS_)
-#define _CORBA_POLICY__SARG_TRAITS_SS_
-  
-  ACE_TEMPLATE_SPECIALIZATION
-  class TAO_PortableServer_Export SArg_Traits<CORBA::Policy>
-    : public
-        Object_SArg_Traits_T<
-            CORBA::Policy_ptr,
-            CORBA::Policy_var,
-            CORBA::Policy_out
-          >
-  {
-  };
-
-#endif /* end #if !defined */
-}
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_arg_traits.cpp:67
+// be\be_visitor_arg_traits.cpp:65
 
 // Arg traits specializations.
 namespace TAO
@@ -117,7 +93,7 @@ namespace TAO
 
 
 // TAO_IDL - Generated from
-// be/be_interface.cpp:1538
+// be\be_interface.cpp:1536
 
 class TAO_CORBA_Policy_Perfect_Hash_OpTable
   : public TAO_Perfect_Hash_OpTable
@@ -130,7 +106,7 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: /home/ossama/work/skeleton-refactor/ACE_wrappers/bin/gperf -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_Policy_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: c:\ace\latest\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_Policy_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_Policy_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -232,108 +208,433 @@ TAO_CORBA_Policy_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len
 static TAO_CORBA_Policy_Perfect_Hash_OpTable tao_CORBA_Policy_optable;
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/upcall_command_ss.cpp:49
+// be\be_visitor_interface/interceptors_ss.cpp:53
+
+#if (TAO_HAS_INTERCEPTORS == 1)
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/upcall_command_ss.cpp:52
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
-class TAO_CORBA_Policy_policy_type_get_Upcall_Command
-  : public TAO::Upcall_Command
+class TAO_ServerRequestInfo_CORBA_Policy_policy_type_get : public TAO_ServerRequestInfo
 {
 public:
+  TAO_ServerRequestInfo_CORBA_Policy_policy_type_get (
+      TAO_ServerRequest &_tao_server_request,
+      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      POA_CORBA::Policy *tao_impl
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    );
   
-  inline TAO_CORBA_Policy_policy_type_get_Upcall_Command (
-    POA_CORBA::Policy * servant,
-    TAO::Argument * const args[])
-    : servant_ (servant)
-    , args_ (args)
-  {
-  }
+  virtual Dynamic::ParameterList * arguments (
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException));
   
-  virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
-  {
-    static_cast<TAO::SArg_Traits< CORBA::PolicyType>::ret_val *> (this->args_[0])->arg () =
-      this->servant_->policy_type (
-        ACE_ENV_SINGLE_ARG_PARAMETER
-      );
-    ACE_CHECK;
-  }
+  virtual Dynamic::ExceptionList * exceptions (
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  
+  virtual CORBA::Any * result (
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  
+  virtual char * target_most_derived_interface (
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  
+  virtual CORBA::Boolean target_is_a (
+      const char * id
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  
+  void result (CORBA::PolicyType result);
 
 private:
+  TAO_ServerRequestInfo_CORBA_Policy_policy_type_get (
+      const TAO_ServerRequestInfo_CORBA_Policy_policy_type_get &
+    );
   
-  POA_CORBA::Policy * const servant_;
-  TAO::Argument * const * const args_;
-
+  void operator= (
+      const TAO_ServerRequestInfo_CORBA_Policy_policy_type_get &
+    );
+  
+private:
+  POA_CORBA::Policy *_tao_impl;
+  
+  CORBA::PolicyType _result;
 };
 
+// TAO_IDL - Generated from
+// be\be_visitor_operation/interceptors_ss.cpp:438
+
+TAO_ServerRequestInfo_CORBA_Policy_policy_type_get::TAO_ServerRequestInfo_CORBA_Policy_policy_type_get (
+    TAO_ServerRequest &_tao_server_request,
+    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    POA_CORBA::Policy *tao_impl
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
+  : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
+    _tao_impl (tao_impl)
+{}
+
+Dynamic::ParameterList *
+TAO_ServerRequestInfo_CORBA_Policy_policy_type_get::arguments (
+    ACE_ENV_SINGLE_ARG_DECL
+  )
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the argument list on demand.
+  Dynamic::ParameterList *parameter_list =
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+  
+  return parameter_list;
+}
+
+Dynamic::ExceptionList *
+TAO_ServerRequestInfo_CORBA_Policy_policy_type_get::exceptions (
+    ACE_ENV_SINGLE_ARG_DECL
+  )
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the exception list on demand.
+  Dynamic::ExceptionList *exception_list =
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+  
+  return exception_list;
+}
+
+CORBA::Any * 
+TAO_ServerRequestInfo_CORBA_Policy_policy_type_get::result (
+    ACE_ENV_SINGLE_ARG_DECL
+  )
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the result on demand.
+  CORBA::Boolean tk_void_any = 0;
+  CORBA::Any *result_any =
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+  
+  CORBA::Any_var safe_result_any = result_any;
+  
+  (*result_any) <<= this->_result;
+  
+  return safe_result_any._retn ();
+}
+
+char *
+TAO_ServerRequestInfo_CORBA_Policy_policy_type_get::target_most_derived_interface (
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED
+  )
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  return
+    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
+}
+
+CORBA::Boolean
+TAO_ServerRequestInfo_CORBA_Policy_policy_type_get::target_is_a (
+    const char * id
+    ACE_ENV_ARG_DECL
+  )
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
+}
+
+void 
+TAO_ServerRequestInfo_CORBA_Policy_policy_type_get::result (CORBA::PolicyType result)
+{
+  // Update the result.
+   this->_result = result;
+}
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/upcall_command_ss.cpp:52
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
-class TAO_CORBA_Policy_copy_Upcall_Command
-  : public TAO::Upcall_Command
+class TAO_ServerRequestInfo_CORBA_Policy_copy : public TAO_ServerRequestInfo
 {
 public:
+  TAO_ServerRequestInfo_CORBA_Policy_copy (
+      TAO_ServerRequest &_tao_server_request,
+      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      POA_CORBA::Policy *tao_impl
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    );
   
-  inline TAO_CORBA_Policy_copy_Upcall_Command (
-    POA_CORBA::Policy * servant,
-    TAO::Argument * const args[])
-    : servant_ (servant)
-    , args_ (args)
-  {
-  }
+  virtual Dynamic::ParameterList * arguments (
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException));
   
-  virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
-  {
-    static_cast<TAO::SArg_Traits< ::CORBA::Policy>::ret_val *> (this->args_[0])->arg () =
-      this->servant_->copy (
-        ACE_ENV_SINGLE_ARG_PARAMETER
-      );
-    ACE_CHECK;
-  }
+  virtual Dynamic::ExceptionList * exceptions (
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  
+  virtual CORBA::Any * result (
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  
+  virtual char * target_most_derived_interface (
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  
+  virtual CORBA::Boolean target_is_a (
+      const char * id
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  
+  void result (::CORBA::Policy_ptr result);
 
 private:
+  TAO_ServerRequestInfo_CORBA_Policy_copy (
+      const TAO_ServerRequestInfo_CORBA_Policy_copy &
+    );
   
-  POA_CORBA::Policy * const servant_;
-  TAO::Argument * const * const args_;
-
+  void operator= (
+      const TAO_ServerRequestInfo_CORBA_Policy_copy &
+    );
+  
+private:
+  POA_CORBA::Policy *_tao_impl;
+  
+  ::CORBA::Policy_ptr _result;
 };
 
+// TAO_IDL - Generated from
+// be\be_visitor_operation/interceptors_ss.cpp:438
+
+TAO_ServerRequestInfo_CORBA_Policy_copy::TAO_ServerRequestInfo_CORBA_Policy_copy (
+    TAO_ServerRequest &_tao_server_request,
+    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    POA_CORBA::Policy *tao_impl
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
+  : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
+    _tao_impl (tao_impl)
+{}
+
+Dynamic::ParameterList *
+TAO_ServerRequestInfo_CORBA_Policy_copy::arguments (
+    ACE_ENV_SINGLE_ARG_DECL
+  )
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the argument list on demand.
+  Dynamic::ParameterList *parameter_list =
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+  
+  return parameter_list;
+}
+
+Dynamic::ExceptionList *
+TAO_ServerRequestInfo_CORBA_Policy_copy::exceptions (
+    ACE_ENV_SINGLE_ARG_DECL
+  )
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the exception list on demand.
+  Dynamic::ExceptionList *exception_list =
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+  
+  return exception_list;
+}
+
+CORBA::Any * 
+TAO_ServerRequestInfo_CORBA_Policy_copy::result (
+    ACE_ENV_SINGLE_ARG_DECL
+  )
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the result on demand.
+  CORBA::Boolean tk_void_any = 0;
+  CORBA::Any *result_any =
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+  
+  CORBA::Any_var safe_result_any = result_any;
+  
+  (*result_any) <<= this->_result;
+  
+  return safe_result_any._retn ();
+}
+
+char *
+TAO_ServerRequestInfo_CORBA_Policy_copy::target_most_derived_interface (
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED
+  )
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  return
+    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
+}
+
+CORBA::Boolean
+TAO_ServerRequestInfo_CORBA_Policy_copy::target_is_a (
+    const char * id
+    ACE_ENV_ARG_DECL
+  )
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
+}
+
+void 
+TAO_ServerRequestInfo_CORBA_Policy_copy::result (::CORBA::Policy_ptr result)
+{
+  // Update the result.
+   this->_result = result;
+}
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/upcall_command_ss.cpp:52
+// be\be_visitor_operation/interceptors_ss.cpp:74
 
-class TAO_CORBA_Policy_destroy_Upcall_Command
-  : public TAO::Upcall_Command
+class TAO_ServerRequestInfo_CORBA_Policy_destroy : public TAO_ServerRequestInfo
 {
 public:
+  TAO_ServerRequestInfo_CORBA_Policy_destroy (
+      TAO_ServerRequest &_tao_server_request,
+      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      POA_CORBA::Policy *tao_impl
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    );
   
-  inline TAO_CORBA_Policy_destroy_Upcall_Command (
-    POA_CORBA::Policy * servant)
-    : servant_ (servant)
-  {
-  }
+  virtual Dynamic::ParameterList * arguments (
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException));
   
-  virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
-  {
-    this->servant_->destroy (
-      ACE_ENV_SINGLE_ARG_PARAMETER
+  virtual Dynamic::ExceptionList * exceptions (
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  
+  virtual CORBA::Any * result (
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  
+  virtual char * target_most_derived_interface (
+      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  
+  virtual CORBA::Boolean target_is_a (
+      const char * id
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  
+private:
+  TAO_ServerRequestInfo_CORBA_Policy_destroy (
+      const TAO_ServerRequestInfo_CORBA_Policy_destroy &
     );
-    ACE_CHECK;
-  }
-
+  
+  void operator= (
+      const TAO_ServerRequestInfo_CORBA_Policy_destroy &
+    );
+  
 private:
+  POA_CORBA::Policy *_tao_impl;
   
-  POA_CORBA::Policy * const servant_;
-
 };
 
+// TAO_IDL - Generated from
+// be\be_visitor_operation/interceptors_ss.cpp:438
+
+TAO_ServerRequestInfo_CORBA_Policy_destroy::TAO_ServerRequestInfo_CORBA_Policy_destroy (
+    TAO_ServerRequest &_tao_server_request,
+    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    POA_CORBA::Policy *tao_impl
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
+  : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
+    _tao_impl (tao_impl)
+{}
+
+Dynamic::ParameterList *
+TAO_ServerRequestInfo_CORBA_Policy_destroy::arguments (
+    ACE_ENV_SINGLE_ARG_DECL
+  )
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the argument list on demand.
+  Dynamic::ParameterList *parameter_list =
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+  
+  return parameter_list;
+}
+
+Dynamic::ExceptionList *
+TAO_ServerRequestInfo_CORBA_Policy_destroy::exceptions (
+    ACE_ENV_SINGLE_ARG_DECL
+  )
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the exception list on demand.
+  Dynamic::ExceptionList *exception_list =
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+  
+  return exception_list;
+}
+
+CORBA::Any * 
+TAO_ServerRequestInfo_CORBA_Policy_destroy::result (
+    ACE_ENV_SINGLE_ARG_DECL
+  )
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Generate the result on demand.
+  CORBA::Boolean tk_void_any = 1;
+  CORBA::Any *result_any =
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+  
+  return result_any;
+}
+
+char *
+TAO_ServerRequestInfo_CORBA_Policy_destroy::target_most_derived_interface (
+    ACE_ENV_SINGLE_ARG_DECL_NOT_USED
+  )
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  return
+    CORBA::string_dup (this->_tao_impl->_interface_repository_id ());
+}
+
+CORBA::Boolean
+TAO_ServerRequestInfo_CORBA_Policy_destroy::target_is_a (
+    const char * id
+    ACE_ENV_ARG_DECL
+  )
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
+}
+
+#endif /* TAO_HAS_INTERCEPTORS */
+
 ///////////////////////////////////////////////////////////////////////
 //            Strategized Proxy Broker Implementation
 //
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/strategized_proxy_broker_ss.cpp:40
+// be\be_visitor_interface/strategized_proxy_broker_ss.cpp:40
 
 // Factory function Implementation.
 POA_CORBA::_TAO_Policy_Strategized_Proxy_Broker *
@@ -416,7 +717,7 @@ POA_CORBA::_TAO_Policy_Strategized_Proxy_Broker::dispatch (
   
   if (status == -1)
     {
-      ACE_THROW (CORBA::BAD_OPERATION ());
+      ACE_THROW (CORBA::BAD_OPERATION (TAO::VMCID | 2, CORBA::COMPLETED_NO));
     }
   
   ACE_TRY
@@ -450,7 +751,7 @@ POA_CORBA::_TAO_Policy_Strategized_Proxy_Broker::dispatch (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:648
+// be\be_visitor_interface/interface_ss.cpp:652
 
 TAO::Collocation_Proxy_Broker *
 CORBA__TAO_Policy_Proxy_Broker_Factory_function (CORBA::Object_ptr)
@@ -483,7 +784,7 @@ CORBA__TAO_Policy_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
 //
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/thru_poa_proxy_impl_ss.cpp:37
+// be\be_visitor_interface/thru_poa_proxy_impl_ss.cpp:37
 
 POA_CORBA::_TAO_Policy_ThruPOA_Proxy_Impl::_TAO_Policy_ThruPOA_Proxy_Impl (void)
 {}
@@ -491,7 +792,7 @@ POA_CORBA::_TAO_Policy_ThruPOA_Proxy_Impl::_TAO_Policy_ThruPOA_Proxy_Impl (void)
 // ThruPOA Implementation of the IDL interface methods
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::_TAO_Policy_ThruPOA_Proxy_Impl::_get_policy_type (
@@ -517,7 +818,7 @@ POA_CORBA::_TAO_Policy_ThruPOA_Proxy_Impl::_get_policy_type (
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::_TAO_Policy_ThruPOA_Proxy_Impl::copy (
@@ -543,7 +844,7 @@ POA_CORBA::_TAO_Policy_ThruPOA_Proxy_Impl::copy (
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
+// be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
 void
 POA_CORBA::_TAO_Policy_ThruPOA_Proxy_Impl::destroy (
@@ -579,7 +880,7 @@ POA_CORBA::_TAO_Policy_Direct_Proxy_Impl::_TAO_Policy_Direct_Proxy_Impl (void)
 {}
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/direct_proxy_impl_ss.cpp:42
+// be\be_visitor_operation/direct_proxy_impl_ss.cpp:42
 
 void
 POA_CORBA::_TAO_Policy_Direct_Proxy_Impl::_get_policy_type (
@@ -603,7 +904,7 @@ POA_CORBA::_TAO_Policy_Direct_Proxy_Impl::_get_policy_type (
         );
   ACE_CHECK;
 }// TAO_IDL - Generated from 
-// be/be_visitor_operation/direct_proxy_impl_ss.cpp:42
+// be\be_visitor_operation/direct_proxy_impl_ss.cpp:42
 
 void
 POA_CORBA::_TAO_Policy_Direct_Proxy_Impl::copy (
@@ -627,7 +928,7 @@ POA_CORBA::_TAO_Policy_Direct_Proxy_Impl::copy (
         );
   ACE_CHECK;
 }// TAO_IDL - Generated from 
-// be/be_visitor_operation/direct_proxy_impl_ss.cpp:42
+// be\be_visitor_operation/direct_proxy_impl_ss.cpp:42
 
 void
 POA_CORBA::_TAO_Policy_Direct_Proxy_Impl::destroy (
@@ -656,7 +957,7 @@ POA_CORBA::_TAO_Policy_Direct_Proxy_Impl::destroy (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_ss.cpp:97
+// be\be_visitor_interface/interface_ss.cpp:97
 
 POA_CORBA::Policy::Policy (void)
 {
@@ -674,166 +975,392 @@ POA_CORBA::Policy::~Policy (void)
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:165
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::Policy::_get_policy_type_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_servant,
-    void * TAO_INTERCEPTOR (_tao_servant_upcall)
+    void *_tao_servant_upcall
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
-#if TAO_HAS_INTERCEPTORS == 1
-  static CORBA::TypeCode_ptr const _tao_exceptions[] = {};
-  static size_t const _tao_nexceptions = 0;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
-  POA_CORBA::Policy * const _tao_impl =
+  POA_CORBA::Policy *_tao_impl =
     static_cast<
         POA_CORBA::Policy *> (
         _tao_servant
       );
+  CORBA::PolicyType _tao_retval = 0;
   
-  TAO::SArg_Traits< CORBA::PolicyType>::ret_val _tao_retval;
-  
-  TAO::Argument * const _tao_args [] =
-    {
-      &_tao_retval
-    };
+#if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
+        _tao_servant_upcall
+      );
+    
+  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
+      _tao_server_request.orb_core ()->server_request_interceptors (),
+      _tao_server_request.interceptor_count ()
+    );
   
-  static size_t const _tao_nargs = 1;
+  TAO_ServerRequestInfo_CORBA_Policy_policy_type_get _tao_ri (
+      _tao_server_request,
+      _tao_upcall,
+      _tao_impl
+      ACE_ENV_ARG_PARAMETER
+    );
   
-  TAO_CORBA_Policy_policy_type_get_Upcall_Command _tao_upcall_command (
-      _tao_impl, _tao_args);
+  ACE_TRY
+    {
+      {
+        TAO::PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (),
+                                            true  /* Copy TSC to RSC */);
+        
+        _tao_vfr.receive_request (&_tao_ri ACE_ENV_ARG_PARAMETER);
+        ACE_TRY_CHECK;
+        
+        if (!_tao_vfr.location_forwarded ())
+          {
+#endif /* TAO_HAS_INTERCEPTORS */
+            _tao_retval = 
+              _tao_impl->policy_type (
+                  ACE_ENV_SINGLE_ARG_PARAMETER
+                );
+            TAO_INTERCEPTOR_CHECK;
+#if (TAO_HAS_INTERCEPTORS == 1)
+          }
+      }
+      
+      if (!_tao_vfr.location_forwarded ())
+        {
+          CORBA::PolicyType _tao_retval_info = _tao_retval;
+          _tao_ri.result (_tao_retval_info);
+          _tao_ri.reply_status (PortableInterceptor::SUCCESSFUL);
+          _tao_vfr.send_reply (&_tao_ri ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+        }
+    }
+  ACE_CATCHANY
+    {
+      _tao_ri.exception (&ACE_ANY_EXCEPTION);
+      _tao_vfr.send_exception (
+          &_tao_ri
+          ACE_ENV_ARG_PARAMETER
+        );
+      ACE_TRY_CHECK;
+      
+      PortableInterceptor::ReplyStatus _tao_status =
+        _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+      
+      if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+          || _tao_status == PortableInterceptor::USER_EXCEPTION)
+        {
+          ACE_RE_THROW;
+        }
+    }
   
-  TAO::Upcall_Wrapper _tao_upcall_wrapper;
-  _tao_upcall_wrapper.upcall (_tao_server_request
-                              , _tao_args
-                              , _tao_nargs
-                              , _tao_upcall_command
+# if defined (ACE_HAS_EXCEPTIONS) \
+  && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
+  ACE_CATCHALL
+    {
+      CORBA::UNKNOWN ex;
+      
+      _tao_ri.exception (&ex);
+      _tao_vfr.send_exception (
+          &_tao_ri
+          ACE_ENV_ARG_PARAMETER
+        );
+      ACE_TRY_CHECK;
+      
+      PortableInterceptor::ReplyStatus _tao_status =
+        _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+      
+      if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
+        ACE_TRY_THROW (ex);
+    }
+# endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
+  ACE_ENDTRY;
+  ACE_CHECK;
+#endif /* TAO_HAS_INTERCEPTORS */
   
-#if TAO_HAS_INTERCEPTORS == 1
-                              , _tao_servant_upcall
-                              , _tao_impl
-                              , _tao_exceptions
-                              , _tao_nexceptions
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
+  _tao_server_request.init_reply ();
+#if (TAO_HAS_INTERCEPTORS == 1)
+  if (!_tao_vfr.location_forwarded ())
+    {
+#endif /* TAO_HAS_INTERCEPTORS */
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      if (!(
+          (_tao_out << _tao_retval)
+          ))
+        {
+          TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+        }
+#if (TAO_HAS_INTERCEPTORS == 1)
+    }
+#endif /* TAO_HAS_INTERCEPTORS */
   
-                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
   
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:165
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::Policy::copy_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_servant,
-    void * TAO_INTERCEPTOR (_tao_servant_upcall)
+    void *_tao_servant_upcall
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
-#if TAO_HAS_INTERCEPTORS == 1
-  static CORBA::TypeCode_ptr const _tao_exceptions[] = {};
-  static size_t const _tao_nexceptions = 0;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
-  POA_CORBA::Policy * const _tao_impl =
+  POA_CORBA::Policy *_tao_impl =
     static_cast<
         POA_CORBA::Policy *> (
         _tao_servant
       );
+  ::CORBA::Policy_var _tao_retval;
   
-  TAO::SArg_Traits< ::CORBA::Policy>::ret_val _tao_retval;
-  
-  TAO::Argument * const _tao_args [] =
-    {
-      &_tao_retval
-    };
+#if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
+        _tao_servant_upcall
+      );
+    
+  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
+      _tao_server_request.orb_core ()->server_request_interceptors (),
+      _tao_server_request.interceptor_count ()
+    );
   
-  static size_t const _tao_nargs = 1;
+  TAO_ServerRequestInfo_CORBA_Policy_copy _tao_ri (
+      _tao_server_request,
+      _tao_upcall,
+      _tao_impl
+      ACE_ENV_ARG_PARAMETER
+    );
   
-  TAO_CORBA_Policy_copy_Upcall_Command _tao_upcall_command (
-      _tao_impl, _tao_args);
+  ACE_TRY
+    {
+      {
+        TAO::PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (),
+                                            true  /* Copy TSC to RSC */);
+        
+        _tao_vfr.receive_request (&_tao_ri ACE_ENV_ARG_PARAMETER);
+        ACE_TRY_CHECK;
+        
+        if (!_tao_vfr.location_forwarded ())
+          {
+#endif /* TAO_HAS_INTERCEPTORS */
+            _tao_retval = 
+              _tao_impl->copy (
+                  ACE_ENV_SINGLE_ARG_PARAMETER
+                );
+            TAO_INTERCEPTOR_CHECK;
+#if (TAO_HAS_INTERCEPTORS == 1)
+          }
+      }
+      
+      if (!_tao_vfr.location_forwarded ())
+        {
+          ::CORBA::Policy_ptr _tao_retval_info = _tao_retval._retn ();
+          _tao_ri.result (_tao_retval_info);
+          _tao_retval = _tao_retval_info;
+          _tao_ri.reply_status (PortableInterceptor::SUCCESSFUL);
+          _tao_vfr.send_reply (&_tao_ri ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+        }
+    }
+  ACE_CATCHANY
+    {
+      _tao_ri.exception (&ACE_ANY_EXCEPTION);
+      _tao_vfr.send_exception (
+          &_tao_ri
+          ACE_ENV_ARG_PARAMETER
+        );
+      ACE_TRY_CHECK;
+      
+      PortableInterceptor::ReplyStatus _tao_status =
+        _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+      
+      if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+          || _tao_status == PortableInterceptor::USER_EXCEPTION)
+        {
+          ACE_RE_THROW;
+        }
+    }
   
-  TAO::Upcall_Wrapper _tao_upcall_wrapper;
-  _tao_upcall_wrapper.upcall (_tao_server_request
-                              , _tao_args
-                              , _tao_nargs
-                              , _tao_upcall_command
+# if defined (ACE_HAS_EXCEPTIONS) \
+  && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
+  ACE_CATCHALL
+    {
+      CORBA::UNKNOWN ex;
+      
+      _tao_ri.exception (&ex);
+      _tao_vfr.send_exception (
+          &_tao_ri
+          ACE_ENV_ARG_PARAMETER
+        );
+      ACE_TRY_CHECK;
+      
+      PortableInterceptor::ReplyStatus _tao_status =
+        _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+      
+      if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
+        ACE_TRY_THROW (ex);
+    }
+# endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
+  ACE_ENDTRY;
+  ACE_CHECK;
+#endif /* TAO_HAS_INTERCEPTORS */
   
-#if TAO_HAS_INTERCEPTORS == 1
-                              , _tao_servant_upcall
-                              , _tao_impl
-                              , _tao_exceptions
-                              , _tao_nexceptions
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
+  _tao_server_request.init_reply ();
+#if (TAO_HAS_INTERCEPTORS == 1)
+  if (!_tao_vfr.location_forwarded ())
+    {
+#endif /* TAO_HAS_INTERCEPTORS */
+      TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
+      
+      if (!(
+          (_tao_out << _tao_retval.in ())
+          ))
+        {
+          TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+        }
+#if (TAO_HAS_INTERCEPTORS == 1)
+    }
+#endif /* TAO_HAS_INTERCEPTORS */
   
-                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
   
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_operation/operation_ss.cpp:165
+// be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::Policy::destroy_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_servant,
-    void * TAO_INTERCEPTOR (_tao_servant_upcall)
+    void *_tao_servant_upcall
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
-#if TAO_HAS_INTERCEPTORS == 1
-  static CORBA::TypeCode_ptr const _tao_exceptions[] = {};
-  static size_t const _tao_nexceptions = 0;
-#endif /* TAO_HAS_INTERCEPTORS */
-  
-  POA_CORBA::Policy * const _tao_impl =
+  POA_CORBA::Policy *_tao_impl =
     static_cast<
         POA_CORBA::Policy *> (
         _tao_servant
       );
+  _tao_server_request.argument_flag (0);
   
-  TAO::SArg_Traits< void>::ret_val _tao_retval;
-  
-  TAO::Argument * const _tao_args [] =
-    {
-      &_tao_retval
-    };
-  
-  static size_t const _tao_nargs = 1;
   
-  TAO_CORBA_Policy_destroy_Upcall_Command _tao_upcall_command (
-      _tao_impl);
+#if (TAO_HAS_INTERCEPTORS == 1)
+  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+    static_cast<
+        TAO_Object_Adapter::Servant_Upcall *> (
+        _tao_servant_upcall
+      );
+    
+  TAO_ServerRequestInterceptor_Adapter _tao_vfr (
+      _tao_server_request.orb_core ()->server_request_interceptors (),
+      _tao_server_request.interceptor_count ()
+    );
   
-  TAO::Upcall_Wrapper _tao_upcall_wrapper;
-  _tao_upcall_wrapper.upcall (_tao_server_request
-                              , _tao_args
-                              , _tao_nargs
-                              , _tao_upcall_command
+  TAO_ServerRequestInfo_CORBA_Policy_destroy _tao_ri (
+      _tao_server_request,
+      _tao_upcall,
+      _tao_impl
+      ACE_ENV_ARG_PARAMETER
+    );
   
-#if TAO_HAS_INTERCEPTORS == 1
-                              , _tao_servant_upcall
-                              , _tao_impl
-                              , _tao_exceptions
-                              , _tao_nexceptions
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
+  ACE_TRY
+    {
+      {
+        TAO::PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (),
+                                            true  /* Copy TSC to RSC */);
+        
+        _tao_vfr.receive_request (&_tao_ri ACE_ENV_ARG_PARAMETER);
+        ACE_TRY_CHECK;
+        
+        if (!_tao_vfr.location_forwarded ())
+          {
+#endif /* TAO_HAS_INTERCEPTORS */
+            
+              _tao_impl->destroy (
+                  ACE_ENV_SINGLE_ARG_PARAMETER
+                );
+            TAO_INTERCEPTOR_CHECK;
+#if (TAO_HAS_INTERCEPTORS == 1)
+          }
+      }
+      
+      if (!_tao_vfr.location_forwarded ())
+        {
+          _tao_ri.reply_status (PortableInterceptor::SUCCESSFUL);
+          _tao_vfr.send_reply (&_tao_ri ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+        }
+    }
+  ACE_CATCHANY
+    {
+      _tao_ri.exception (&ACE_ANY_EXCEPTION);
+      _tao_vfr.send_exception (
+          &_tao_ri
+          ACE_ENV_ARG_PARAMETER
+        );
+      ACE_TRY_CHECK;
+      
+      PortableInterceptor::ReplyStatus _tao_status =
+        _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+      
+      if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
+          || _tao_status == PortableInterceptor::USER_EXCEPTION)
+        {
+          ACE_RE_THROW;
+        }
+    }
   
-                              ACE_ENV_ARG_PARAMETER);
+# if defined (ACE_HAS_EXCEPTIONS) \
+  && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
+  ACE_CATCHALL
+    {
+      CORBA::UNKNOWN ex;
+      
+      _tao_ri.exception (&ex);
+      _tao_vfr.send_exception (
+          &_tao_ri
+          ACE_ENV_ARG_PARAMETER
+        );
+      ACE_TRY_CHECK;
+      
+      PortableInterceptor::ReplyStatus _tao_status =
+        _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+      
+      if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
+        ACE_TRY_THROW (ex);
+    }
+# endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
+  ACE_ENDTRY;
   ACE_CHECK;
+#endif /* TAO_HAS_INTERCEPTORS */
+  
+  _tao_server_request.init_reply ();
   
+  // In case _tao_servant_upcall is not used in this function
+  ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_ss.cpp:162
+// be\be_visitor_interface/interface_ss.cpp:162
 
 void POA_CORBA::Policy::_is_a_skel (
     TAO_ServerRequest &_tao_server_request, 
@@ -1003,7 +1530,7 @@ const char* POA_CORBA::Policy::_interface_repository_id (void) const
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:584
+// be\be_visitor_interface/interface_ss.cpp:588
 
 void POA_CORBA::Policy::_dispatch (
     TAO_ServerRequest &req,
@@ -1018,7 +1545,7 @@ void POA_CORBA::Policy::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ss.cpp:526
+// be\be_visitor_interface/interface_ss.cpp:530
 
 CORBA::Policy *
 POA_CORBA::Policy::_this (ACE_ENV_SINGLE_ARG_DECL)
@@ -1058,7 +1585,7 @@ POA_CORBA::Policy::_this (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_root/root.cpp:1695
+// be\be_visitor_root/root.cpp:1683
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
diff --git a/TAO/tao/PortableServer/PolicyS.h b/TAO/tao/PortableServer/PolicyS.h
index 6db4f0c0acd..b2c92c4402b 100644
--- a/TAO/tao/PortableServer/PolicyS.h
+++ b/TAO/tao/PortableServer/PolicyS.h
@@ -26,13 +26,14 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be/be_codegen.cpp:391
+// be\be_codegen.cpp:390
 
 #ifndef _TAO_IDL_ORIG_POLICYS_H_
 #define _TAO_IDL_ORIG_POLICYS_H_
 
 #include /**/ "ace/pre.h"
 
+#include "tao/UShortSeqS.h"
 #include "tao/PolicyC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
@@ -44,9 +45,7 @@
 #include "tao/PortableServer/Servant_Base.h"
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -55,130 +54,130 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from
-// be/be_visitor_module/module_sh.cpp:49
+// be\be_visitor_module/module_sh.cpp:49
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_sh.cpp:87
-  
+  // be\be_visitor_interface/interface_sh.cpp:87
+
   class Policy;
   typedef Policy *Policy_ptr;
-  
+
   class _TAO_Policy_ThruPOA_Proxy_Impl;
   class _TAO_Policy_Direct_Proxy_Impl;
   class _TAO_Policy_Strategized_Proxy_Broker;
-  
+
   class TAO_PortableServer_Export Policy
     : public virtual PortableServer::ServantBase
   {
   protected:
     Policy (void);
-  
+
   public:
     // Useful for template programming.
     typedef ::CORBA::Policy _stub_type;
     typedef ::CORBA::Policy_ptr _stub_ptr_type;
     typedef ::CORBA::Policy_var _stub_var_type;
-    
+
     Policy (const Policy& rhs);
     virtual ~Policy (void);
-    
+
     virtual CORBA::Boolean _is_a (
         const char* logical_type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual void* _downcast (
         const char* logical_type_id
       );
-    
+
     static void _is_a_skel (
         TAO_ServerRequest &req,
         void *servant,
         void *servant_upcall
         ACE_ENV_ARG_DECL
       );
-    
+
     static void _non_existent_skel (
         TAO_ServerRequest &req,
         void *servant,
         void *servant_upcall
         ACE_ENV_ARG_DECL
       );
-    
+
     static void _interface_skel (
         TAO_ServerRequest &req,
         void *servant,
         void *servant_upcall
         ACE_ENV_ARG_DECL
       );
-    
+
     static void _component_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *servant_upcall
         ACE_ENV_ARG_DECL
       );
-    
+
     virtual void _dispatch (
         TAO_ServerRequest &req,
         void *_servant_upcall
         ACE_ENV_ARG_DECL
       );
-    
+
     ::CORBA::Policy *_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
-    
+    // be\be_visitor_operation/operation_sh.cpp:45
+
     virtual CORBA::PolicyType policy_type (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     static void _get_policy_type_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_servant,
         void *_tao_servant_upcall
         ACE_ENV_ARG_DECL
       );
-    
+
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
-    
+    // be\be_visitor_operation/operation_sh.cpp:45
+
     virtual ::CORBA::Policy_ptr copy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     static void copy_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_servant,
         void *_tao_servant_upcall
         ACE_ENV_ARG_DECL
       );
-    
+
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
-    
+    // be\be_visitor_operation/operation_sh.cpp:45
+
     virtual void destroy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     static void destroy_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_servant,
@@ -186,14 +185,14 @@ namespace POA_CORBA
         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
-  
+  // be\be_visitor_interface/strategized_proxy_broker_sh.cpp:36
+
   class TAO_PortableServer_Export _TAO_Policy_Strategized_Proxy_Broker
     : public virtual TAO::Collocation_Proxy_Broker
   {
@@ -236,7 +235,7 @@ namespace POA_CORBA
   //
   
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
+  // be\be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
   
   class TAO_PortableServer_Export _TAO_Policy_ThruPOA_Proxy_Impl
   {
@@ -246,7 +245,7 @@ namespace POA_CORBA
     virtual ~_TAO_Policy_ThruPOA_Proxy_Impl (void) {}
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
     
     static void
     _get_policy_type (
@@ -260,7 +259,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
     
     static void
     copy (
@@ -274,7 +273,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
     
     static void
     destroy (
@@ -293,13 +292,13 @@ namespace POA_CORBA
   ///////////////////////////////////////////////////////////////////////
   
   // TAO_IDL - Generated from 
-  // be/be_visitor_interface/direct_proxy_impl_sh.cpp:31
+  // be\be_visitor_interface/direct_proxy_impl_sh.cpp:31
   
   ///////////////////////////////////////////////////////////////////////
   //                    Direct  Impl. Declaration
   //
   
-  class TAO_PortableServer_Export _TAO_Policy_Direct_Proxy_Impl
+class TAO_PortableServer_Export _TAO_Policy_Direct_Proxy_Impl
   {
   public:
     _TAO_Policy_Direct_Proxy_Impl (void);
@@ -307,7 +306,7 @@ namespace POA_CORBA
     virtual ~_TAO_Policy_Direct_Proxy_Impl (void) {}
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
     
     static void
     _get_policy_type (
@@ -321,7 +320,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
     
     static void
     copy (
@@ -335,7 +334,7 @@ namespace POA_CORBA
       ));
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
+    // be\be_visitor_operation/proxy_impl_xh.cpp:24
     
     static void
     destroy (
@@ -356,19 +355,20 @@ namespace POA_CORBA
   
 
 // TAO_IDL - Generated from
-// be/be_visitor_module/module_sh.cpp:80
+// be\be_visitor_module/module_sh.cpp:80
 
 } // module CORBA
 
 // TAO_IDL - Generated from 
-// be/be_codegen.cpp:1000
+// be\be_codegen.cpp:997
 
+#include "PolicyS_T.h"
 
 #if defined (__ACE_INLINE__)
 #include "PolicyS.inl"
 #endif /* defined INLINE */
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
diff --git a/TAO/tao/PortableServer/PortableServerA.cpp b/TAO/tao/PortableServer/PortableServerA.cpp
index 448ef21aa35..ce012e93d55 100644
--- a/TAO/tao/PortableServer/PortableServerA.cpp
+++ b/TAO/tao/PortableServer/PortableServerA.cpp
@@ -1917,9 +1917,7 @@ CORBA::Boolean operator>>= (
     PortableServer::POAList *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const PortableServer::POAList *&,
-      _tao_elem
+  return _tao_any >>= const_cast<const PortableServer::POAList *&> (_tao_elem
     );
 }
 
@@ -2004,9 +2002,7 @@ CORBA::Boolean operator>>= (
     PortableServer::ForwardRequest *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const PortableServer::ForwardRequest *&,
-      _tao_elem
+  return _tao_any >>= const_cast<const PortableServer::ForwardRequest *&> (_tao_elem
     );
 }
 
@@ -2093,9 +2089,7 @@ CORBA::Boolean operator>>= (
     PortableServer::NotAGroupObject *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const PortableServer::NotAGroupObject *&,
-      _tao_elem
+  return _tao_any >>= const_cast<const PortableServer::NotAGroupObject *&> (_tao_elem
     );
 }
 
@@ -2155,9 +2149,7 @@ CORBA::Boolean operator>>= (
     PortableServer::IDs *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const PortableServer::IDs *&,
-      _tao_elem
+  return _tao_any >>= const_cast<const PortableServer::IDs *&> (_tao_elem
     );
 }
 
@@ -2995,9 +2987,7 @@ CORBA::Boolean operator>>= (
     PortableServer::POAManager::AdapterInactive *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const PortableServer::POAManager::AdapterInactive *&,
-      _tao_elem
+  return _tao_any >>= const_cast<const PortableServer::POAManager::AdapterInactive *&> (_tao_elem
     );
 }
 
@@ -3476,9 +3466,7 @@ CORBA::Boolean operator>>= (
     PortableServer::POA::AdapterAlreadyExists *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const PortableServer::POA::AdapterAlreadyExists *&,
-      _tao_elem
+  return _tao_any >>= const_cast<const PortableServer::POA::AdapterAlreadyExists *&> (_tao_elem
     );
 }
 
@@ -3550,9 +3538,7 @@ CORBA::Boolean operator>>= (
     PortableServer::POA::AdapterNonExistent *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const PortableServer::POA::AdapterNonExistent *&,
-      _tao_elem
+  return _tao_any >>= const_cast<const PortableServer::POA::AdapterNonExistent *&> (_tao_elem
     );
 }
 
@@ -3626,9 +3612,7 @@ CORBA::Boolean operator>>= (
     PortableServer::POA::InvalidPolicy *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const PortableServer::POA::InvalidPolicy *&,
-      _tao_elem
+  return _tao_any >>= const_cast<const PortableServer::POA::InvalidPolicy *&> (_tao_elem
     );
 }
 
@@ -3702,9 +3686,7 @@ CORBA::Boolean operator>>= (
     PortableServer::POA::NoServant *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const PortableServer::POA::NoServant *&,
-      _tao_elem
+  return _tao_any >>= const_cast<const PortableServer::POA::NoServant *&> (_tao_elem
     );
 }
 
@@ -3778,9 +3760,7 @@ CORBA::Boolean operator>>= (
     PortableServer::POA::ObjectAlreadyActive *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const PortableServer::POA::ObjectAlreadyActive *&,
-      _tao_elem
+  return _tao_any >>= const_cast<const PortableServer::POA::ObjectAlreadyActive *&> (_tao_elem
     );
 }
 
@@ -3854,9 +3834,7 @@ CORBA::Boolean operator>>= (
     PortableServer::POA::ObjectNotActive *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const PortableServer::POA::ObjectNotActive *&,
-      _tao_elem
+  return _tao_any >>= const_cast<const PortableServer::POA::ObjectNotActive *&> (_tao_elem
     );
 }
 
@@ -3930,9 +3908,7 @@ CORBA::Boolean operator>>= (
     PortableServer::POA::ServantAlreadyActive *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const PortableServer::POA::ServantAlreadyActive *&,
-      _tao_elem
+  return _tao_any >>= const_cast<const PortableServer::POA::ServantAlreadyActive *&> (_tao_elem
     );
 }
 
@@ -4006,9 +3982,7 @@ CORBA::Boolean operator>>= (
     PortableServer::POA::ServantNotActive *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const PortableServer::POA::ServantNotActive *&,
-      _tao_elem
+  return _tao_any >>= const_cast<const PortableServer::POA::ServantNotActive *&> (_tao_elem
     );
 }
 
@@ -4082,9 +4056,7 @@ CORBA::Boolean operator>>= (
     PortableServer::POA::WrongAdapter *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const PortableServer::POA::WrongAdapter *&,
-      _tao_elem
+  return _tao_any >>= const_cast<const PortableServer::POA::WrongAdapter *&> (_tao_elem
     );
 }
 
@@ -4158,9 +4130,7 @@ CORBA::Boolean operator>>= (
     PortableServer::POA::WrongPolicy *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const PortableServer::POA::WrongPolicy *&,
-      _tao_elem
+  return _tao_any >>= const_cast<const PortableServer::POA::WrongPolicy *&> (_tao_elem
     );
 }
 
@@ -4303,9 +4273,7 @@ CORBA::Boolean operator>>= (
     PortableServer::Current::NoContext *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const PortableServer::Current::NoContext *&,
-      _tao_elem
+  return _tao_any >>= const_cast<const PortableServer::Current::NoContext *&> (_tao_elem
     );
 }